Skip to content

Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.

experimental: allow customizing page language (#2928)

Bogdan Chadkin1b9bdd83d8a7
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.tsx b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.tsx
index 3dba25877e..c985a9306a 100644
--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.tsx
+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.tsx
@@ -4,6 +4,7 @@ import { type FocusEventHandler, useState, useCallback, useId } from "react";
import { useStore } from "@nanostores/react";
import { useDebouncedCallback } from "use-debounce";
import { useUnmount } from "react-use";
+import * as bcp47 from "bcp-47";
import slugify from "slugify";
import { isFeatureEnabled } from "@webstudio-is/feature-flags";
import {
@@ -101,6 +102,7 @@ const fieldDefaultValues = {
title: `"Untitled"`,
description: `""`,
excludePageFromSearch: `false`,
+ language: `""`,
socialImageUrl: `""`,
socialImageAssetId: "",
status: `200`,
@@ -160,11 +162,19 @@ const Status = z
"Status code expects 2xx, 3xx, 4xx or 5xx"
);
+const Language = z
+ .string()
+ .refine(
+ (value) => bcp47.parse(value).language !== null,
+ "The language is invalid"
+ );
+
const SharedPageValues = z.object({
name: PageName,
title: PageTitle,
description: z.string().optional(),
excludePageFromSearch: z.boolean().optional(),
+ language: Language.or(EmptyString),
socialImageUrl: z.string().optional(),
status: Status.optional(),
redirect: z.optional(ProjectNewRedirectPath.or(EmptyString)),
@@ -223,6 +233,7 @@ const validateValues = (
values.excludePageFromSearch,
variableValues
),
+ language: computeExpression(values.language, variableValues),
socialImageUrl: computeExpression(values.socialImageUrl, variableValues),
status: computeExpression(values.status, variableValues),
redirect: computeExpression(values.redirect, variableValues),
@@ -278,6 +289,7 @@ const toFormValues = (
excludePageFromSearch:
page.meta.excludePageFromSearch ??
fieldDefaultValues.excludePageFromSearch,
+ language: page.meta.language ?? fieldDefaultValues.language,
status: page.meta.status ?? fieldDefaultValues.status,
redirect: page.meta.redirect ?? fieldDefaultValues.redirect,
isHomePage,
@@ -470,7 +482,7 @@ const RedirectField = ({
aliases={aliases}
variant={isLiteralExpression(value) ? "default" : "bound"}
value={value}
- onChange={(value) => onChange(value)}
+ onChange={onChange}
onRemove={(evaluatedValue) =>
onChange(JSON.stringify(evaluatedValue))
}
@@ -493,6 +505,46 @@ const RedirectField = ({
);
};
+const LanguageField = ({
+ errors,
+ value,
+ onChange,
+}: {
+ errors?: string[];
+ value: string;
+ onChange: (value: string) => void;
+}) => {
+ const id = useId();
+ const { variableValues, scope, aliases } = useStore($pageRootScope);
+ return (
+ <Grid gap={1}>
+ <Label htmlFor={id}>Language</Label>
+ <BindingControl>
+ <BindingPopover
+ scope={scope}
+ aliases={aliases}
+ variant={isLiteralExpression(value) ? "default" : "bound"}
+ value={value}
+ onChange={onChange}
+ onRemove={(evaluatedValue) =>
+ onChange(JSON.stringify(evaluatedValue))
+ }
+ />
+ <InputErrorsTooltip errors={errors}>
+ <InputField
+ color={errors && "error"}
+ id={id}
+ placeholder="en-US"
+ disabled={isLiteralExpression(value) === false}
+ value={String(computeExpression(value, variableValues))}
+ onChange={(event) => onChange(JSON.stringify(event.target.value))}
+ />
+ </InputErrorsTooltip>
+ </BindingControl>
+ </Grid>
+ );
+};
+
const usePageUrl = (
values: Values,
pathParamsDataSourceId?: DataSource["id"]
@@ -871,6 +923,14 @@ const FormFields = ({
</Grid>
</BindingControl>
</Grid>
+
+ {isFeatureEnabled("cms") && (
+ <LanguageField
+ errors={errors.language}
+ value={values.language}
+ onChange={(value) => onChange({ field: "language", value })}
+ />
+ )}
</Grid>
<Separator />
@@ -1183,6 +1243,11 @@ const updatePage = (pageId: Page["id"], values: Partial<Values>) => {
page.meta.excludePageFromSearch = values.excludePageFromSearch;
}
+ if (values.language !== undefined) {
+ page.meta.language =
+ values.language.length > 0 ? values.language : undefined;
+ }
+
if (values.status !== undefined) {
page.meta.status = values.status;
}
diff --git a/apps/builder/package.json b/apps/builder/package.json
index f580e835a0..b3f7ec5c0c 100644
--- a/apps/builder/package.json
+++ b/apps/builder/package.json
@@ -77,6 +77,7 @@
"@webstudio-is/sdk-components-react-radix": "workspace:*",
"@webstudio-is/sdk-components-react-remix": "workspace:*",
"@webstudio-is/trpc-interface": "workspace:*",
+ "bcp-47": "^2.1.0",
"change-case": "^5.0.2",
"colord": "^2.9.3",
"cookie": "^0.6.0",
diff --git a/apps/builder/remix.config.js b/apps/builder/remix.config.js
index aa019dba27..e162b8e7ee 100644
--- a/apps/builder/remix.config.js
+++ b/apps/builder/remix.config.js
@@ -39,6 +39,10 @@ module.exports = {
"change-case",
"title-case",
"react-field-sizing-content",
+ "bcp-47",
+ "is-alphanumerical",
+ "is-alphabetical",
+ "is-decimal",
],
// appDirectory: "app",
// assetsBuildDirectory: "public/build",
diff --git a/fixtures/webstudio-custom-template/app/__generated__/[script-test]._index.tsx b/fixtures/webstudio-custom-template/app/__generated__/[script-test]._index.tsx
index 89ecd98fce..8e71b9f5d7 100644
--- a/fixtures/webstudio-custom-template/app/__generated__/[script-test]._index.tsx
+++ b/fixtures/webstudio-custom-template/app/__generated__/[script-test]._index.tsx
@@ -59,6 +59,7 @@ export const getPageMeta = ({
title: "Script Test",
description: "",
excludePageFromSearch: false,
+ language: undefined,
socialImageAssetId: "",
socialImageUrl: undefined,
status: undefined,
diff --git a/fixtures/webstudio-custom-template/app/__generated__/[world]._index.tsx b/fixtures/webstudio-custom-template/app/__generated__/[world]._index.tsx
index 59c9d877d4..9da3c111f4 100644
--- a/fixtures/webstudio-custom-template/app/__generated__/[world]._index.tsx
+++ b/fixtures/webstudio-custom-template/app/__generated__/[world]._index.tsx
@@ -55,6 +55,7 @@ export const getPageMeta = ({
title: "Untitled",
description: "",
excludePageFromSearch: false,
+ language: undefined,
socialImageAssetId: undefined,
socialImageUrl: "",
status: 200,
diff --git a/fixtures/webstudio-custom-template/app/__generated__/_index.tsx b/fixtures/webstudio-custom-template/app/__generated__/_index.tsx
index 0da3516c96..5b58420ea3 100644
--- a/fixtures/webstudio-custom-template/app/__generated__/_index.tsx
+++ b/fixtures/webstudio-custom-template/app/__generated__/_index.tsx
@@ -83,6 +83,7 @@ export const getPageMeta = ({
title: "Site Title",
description: "Page description f511c297-b44f-4e4b-96bd-d013da06bada",
excludePageFromSearch: undefined,
+ language: undefined,
socialImageAssetId: undefined,
socialImageUrl: undefined,
status: undefined,
diff --git a/fixtures/webstudio-custom-template/app/routes/[script-test]._index.tsx b/fixtures/webstudio-custom-template/app/routes/[script-test]._index.tsx
index 1a8b01c000..4eda646a7c 100644
--- a/fixtures/webstudio-custom-template/app/routes/[script-test]._index.tsx
+++ b/fixtures/webstudio-custom-template/app/routes/[script-test]._index.tsx
@@ -5,6 +5,7 @@ import {
type LinkDescriptor,
type ActionArgs,
type LoaderArgs,
+ type HeadersArgs,
json,
redirect,
} from "@remix-run/server-runtime";
@@ -71,14 +72,18 @@ export const loader = async (arg: LoaderArgs) => {
// In case of CRM Data, this should be set to 0
{
status: pageMeta.status,
- headers: { "Cache-Control": "public, max-age=600" },
+ headers: {
+ "Cache-Control": "public, max-age=600",
+ "x-ws-language": pageMeta.language ?? "en",
+ },
}
);
};
-export const headers = () => {
+export const headers = ({ loaderHeaders }: HeadersArgs) => {
return {
"Cache-Control": "public, max-age=0, must-revalidate",
+ "x-ws-language": loaderHeaders.get("x-ws-language"),
};
};
diff --git a/fixtures/webstudio-custom-template/app/routes/[world]._index.tsx b/fixtures/webstudio-custom-template/app/routes/[world]._index.tsx
index 1575d5d1d9..5d949e48ab 100644
--- a/fixtures/webstudio-custom-template/app/routes/[world]._index.tsx
+++ b/fixtures/webstudio-custom-template/app/routes/[world]._index.tsx
@@ -5,6 +5,7 @@ import {
type LinkDescriptor,
type ActionArgs,
type LoaderArgs,
+ type HeadersArgs,
json,
redirect,
} from "@remix-run/server-runtime";
@@ -71,14 +72,18 @@ export const loader = async (arg: LoaderArgs) => {
// In case of CRM Data, this should be set to 0
{
status: pageMeta.status,
- headers: { "Cache-Control": "public, max-age=600" },
+ headers: {
+ "Cache-Control": "public, max-age=600",
+ "x-ws-language": pageMeta.language ?? "en",
+ },
}
);
};
-export const headers = () => {
+export const headers = ({ loaderHeaders }: HeadersArgs) => {
return {
"Cache-Control": "public, max-age=0, must-revalidate",
+ "x-ws-language": loaderHeaders.get("x-ws-language"),
};
};
diff --git a/fixtures/webstudio-custom-template/app/routes/_index.tsx b/fixtures/webstudio-custom-template/app/routes/_index.tsx
index 39dfe4e4e6..1d559bc0d1 100644
--- a/fixtures/webstudio-custom-template/app/routes/_index.tsx
+++ b/fixtures/webstudio-custom-template/app/routes/_index.tsx
@@ -5,6 +5,7 @@ import {
type LinkDescriptor,
type ActionArgs,
type LoaderArgs,
+ type HeadersArgs,
json,
redirect,
} from "@remix-run/server-runtime";
@@ -71,14 +72,18 @@ export const loader = async (arg: LoaderArgs) => {
// In case of CRM Data, this should be set to 0
{
status: pageMeta.status,
- headers: { "Cache-Control": "public, max-age=600" },
+ headers: {
+ "Cache-Control": "public, max-age=600",
+ "x-ws-language": pageMeta.language ?? "en",
+ },
}
);
};
-export const headers = () => {
+export const headers = ({ loaderHeaders }: HeadersArgs) => {
return {
"Cache-Control": "public, max-age=0, must-revalidate",
+ "x-ws-language": loaderHeaders.get("x-ws-language"),
};
};
diff --git a/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/_index.tsx b/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/_index.tsx
index 6ad1f974e6..0b7884cf3f 100644
--- a/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/_index.tsx
+++ b/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/_index.tsx
@@ -43,6 +43,7 @@ export const getPageMeta = ({
title: "Home",
description: undefined,
excludePageFromSearch: undefined,
+ language: undefined,
socialImageAssetId: undefined,
socialImageUrl: undefined,
status: undefined,
diff --git a/fixtures/webstudio-remix-netlify-edge-functions/app/routes/_index.tsx b/fixtures/webstudio-remix-netlify-edge-functions/app/routes/_index.tsx
index 39dfe4e4e6..1d559bc0d1 100644
--- a/fixtures/webstudio-remix-netlify-edge-functions/app/routes/_index.tsx
+++ b/fixtures/webstudio-remix-netlify-edge-functions/app/routes/_index.tsx
@@ -5,6 +5,7 @@ import {
type LinkDescriptor,
type ActionArgs,
type LoaderArgs,
+ type HeadersArgs,
json,
redirect,
} from "@remix-run/server-runtime";
@@ -71,14 +72,18 @@ export const loader = async (arg: LoaderArgs) => {
// In case of CRM Data, this should be set to 0
{
status: pageMeta.status,
- headers: { "Cache-Control": "public, max-age=600" },
+ headers: {
+ "Cache-Control": "public, max-age=600",
+ "x-ws-language": pageMeta.language ?? "en",
+ },
}
);
};
-export const headers = () => {
+export const headers = ({ loaderHeaders }: HeadersArgs) => {
return {
"Cache-Control": "public, max-age=0, must-revalidate",
+ "x-ws-language": loaderHeaders.get("x-ws-language"),
};
};
diff --git a/fixtures/webstudio-remix-netlify-functions/app/__generated__/_index.tsx b/fixtures/webstudio-remix-netlify-functions/app/__generated__/_index.tsx
index 6ad1f974e6..0b7884cf3f 100644
--- a/fixtures/webstudio-remix-netlify-functions/app/__generated__/_index.tsx
+++ b/fixtures/webstudio-remix-netlify-functions/app/__generated__/_index.tsx
@@ -43,6 +43,7 @@ export const getPageMeta = ({
title: "Home",
description: undefined,
excludePageFromSearch: undefined,
+ language: undefined,
socialImageAssetId: undefined,
socialImageUrl: undefined,
status: undefined,
diff --git a/fixtures/webstudio-remix-netlify-functions/app/routes/_index.tsx b/fixtures/webstudio-remix-netlify-functions/app/routes/_index.tsx
index 39dfe4e4e6..1d559bc0d1 100644
--- a/fixtures/webstudio-remix-netlify-functions/app/routes/_index.tsx
+++ b/fixtures/webstudio-remix-netlify-functions/app/routes/_index.tsx
@@ -5,6 +5,7 @@ import {
type LinkDescriptor,
type ActionArgs,
type LoaderArgs,
+ type HeadersArgs,
json,
redirect,
} from "@remix-run/server-runtime";
@@ -71,14 +72,18 @@ export const loader = async (arg: LoaderArgs) => {
// In case of CRM Data, this should be set to 0
{
status: pageMeta.status,
- headers: { "Cache-Control": "public, max-age=600" },
+ headers: {
+ "Cache-Control": "public, max-age=600",
+ "x-ws-language": pageMeta.language ?? "en",
+ },
}
);
};
-export const headers = () => {
+export const headers = ({ loaderHeaders }: HeadersArgs) => {
return {
"Cache-Control": "public, max-age=0, must-revalidate",
+ "x-ws-language": loaderHeaders.get("x-ws-language"),
};
};
diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[_route_with_symbols_]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[_route_with_symbols_]._index.tsx
index 3cba96c094..973f96368e 100644
--- a/fixtures/webstudio-remix-vercel/app/__generated__/[_route_with_symbols_]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[_route_with_symbols_]._index.tsx
@@ -78,6 +78,7 @@ export const getPageMeta = ({
title: "RouteWithSymbols",
description: "",
excludePageFromSearch: undefined,
+ language: undefined,
socialImageAssetId: undefined,
socialImageUrl: undefined,
status: undefined,
diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.tsx
index 76e792a785..10aa32fd90 100644
--- a/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.tsx
@@ -87,6 +87,7 @@ export const getPageMeta = ({
title: "form",
description: "",
excludePageFromSearch: undefined,
+ language: undefined,
socialImageAssetId: undefined,
socialImageUrl: undefined,
status: undefined,
diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[heading-with-id]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[heading-with-id]._index.tsx
index faf22e14cc..13cb382481 100644
--- a/fixtures/webstudio-remix-vercel/app/__generated__/[heading-with-id]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[heading-with-id]._index.tsx
@@ -78,6 +78,7 @@ export const getPageMeta = ({
title: "heading-with-id",
description: "",
excludePageFromSearch: undefined,
+ language: undefined,
socialImageAssetId: undefined,
socialImageUrl: undefined,
status: undefined,
diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[nested].[nested-page]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[nested].[nested-page]._index.tsx
index 65674c847e..7852a733d8 100644
--- a/fixtures/webstudio-remix-vercel/app/__generated__/[nested].[nested-page]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[nested].[nested-page]._index.tsx
@@ -78,6 +78,7 @@ export const getPageMeta = ({
title: "Nested Page",
description: "",
excludePageFromSearch: false,
+ language: undefined,
socialImageAssetId: "",
socialImageUrl: undefined,
status: undefined,
diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.tsx
index 06bbf238bb..1d68071954 100644
--- a/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.tsx
@@ -90,6 +90,7 @@ export const getPageMeta = ({
description:
"Delve deep into the radix roots of feline behaviors. At KittyNoTouchy, we dissect the core essence, or 'radix', of what makes cats the enigmatic creatures they are. Join us as we explore the radix of their instincts, habits, and quirks.",
excludePageFromSearch: true,
+ language: undefined,
socialImageAssetId: "88d5e2ff-b8f2-4899-aaf8-dde4ade6da10",
socialImageUrl: undefined,
status: undefined,
diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[resources]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[resources]._index.tsx
index 29583a3d02..44cd43491c 100644
--- a/fixtures/webstudio-remix-vercel/app/__generated__/[resources]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[resources]._index.tsx
@@ -81,6 +81,7 @@ export const getPageMeta = ({
title: "resources",
description: "",
excludePageFromSearch: false,
+ language: undefined,
socialImageAssetId: "",
socialImageUrl: undefined,
status: undefined,
diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/_index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/_index.tsx
index dab58ff5fb..4bb120a77b 100644
--- a/fixtures/webstudio-remix-vercel/app/__generated__/_index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/__generated__/_index.tsx
@@ -88,6 +88,7 @@ export const getPageMeta = ({
description:
"Dive into the world of felines and discover why some whiskers are best left untouched. From intriguing cat behaviors to protective measures, \nKittyGuardedZone is your go-to hub for all things 'hands-off' in the cat realm.",
excludePageFromSearch: undefined,
+ language: undefined,
socialImageAssetId: "cd939c56-bcdd-4e64-bd9c-567a9bccd3da",
socialImageUrl: undefined,
status: undefined,
diff --git a/fixtures/webstudio-remix-vercel/app/routes/[_route_with_symbols_]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[_route_with_symbols_]._index.tsx
index 5cd09060c8..ad9adde70f 100644
--- a/fixtures/webstudio-remix-vercel/app/routes/[_route_with_symbols_]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/routes/[_route_with_symbols_]._index.tsx
@@ -5,6 +5,7 @@ import {
type LinkDescriptor,
type ActionArgs,
type LoaderArgs,
+ type HeadersArgs,
json,
redirect,
} from "@remix-run/server-runtime";
@@ -71,14 +72,18 @@ export const loader = async (arg: LoaderArgs) => {
// In case of CRM Data, this should be set to 0
{
status: pageMeta.status,
- headers: { "Cache-Control": "public, max-age=600" },
+ headers: {
+ "Cache-Control": "public, max-age=600",
+ "x-ws-language": pageMeta.language ?? "en",
+ },
}
);
};
-export const headers = () => {
+export const headers = ({ loaderHeaders }: HeadersArgs) => {
return {
"Cache-Control": "public, max-age=0, must-revalidate",
+ "x-ws-language": loaderHeaders.get("x-ws-language"),
};
};
diff --git a/fixtures/webstudio-remix-vercel/app/routes/[form]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[form]._index.tsx
index 9bfbdfa87f..e58e461db4 100644
--- a/fixtures/webstudio-remix-vercel/app/routes/[form]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/routes/[form]._index.tsx
@@ -5,6 +5,7 @@ import {
type LinkDescriptor,
type ActionArgs,
type LoaderArgs,
+ type HeadersArgs,
json,
redirect,
} from "@remix-run/server-runtime";
@@ -71,14 +72,18 @@ export const loader = async (arg: LoaderArgs) => {
// In case of CRM Data, this should be set to 0
{
status: pageMeta.status,
- headers: { "Cache-Control": "public, max-age=600" },
+ headers: {
+ "Cache-Control": "public, max-age=600",
+ "x-ws-language": pageMeta.language ?? "en",
+ },
}
);
};
-export const headers = () => {
+export const headers = ({ loaderHeaders }: HeadersArgs) => {
return {
"Cache-Control": "public, max-age=0, must-revalidate",
+ "x-ws-language": loaderHeaders.get("x-ws-language"),
};
};
diff --git a/fixtures/webstudio-remix-vercel/app/routes/[heading-with-id]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[heading-with-id]._index.tsx
index 5c534e1838..05e487e734 100644
--- a/fixtures/webstudio-remix-vercel/app/routes/[heading-with-id]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/routes/[heading-with-id]._index.tsx
@@ -5,6 +5,7 @@ import {
type LinkDescriptor,
type ActionArgs,
type LoaderArgs,
+ type HeadersArgs,
json,
redirect,
} from "@remix-run/server-runtime";
@@ -71,14 +72,18 @@ export const loader = async (arg: LoaderArgs) => {
// In case of CRM Data, this should be set to 0
{
status: pageMeta.status,
- headers: { "Cache-Control": "public, max-age=600" },
+ headers: {
+ "Cache-Control": "public, max-age=600",
+ "x-ws-language": pageMeta.language ?? "en",
+ },
}
);
};
-export const headers = () => {
+export const headers = ({ loaderHeaders }: HeadersArgs) => {
return {
"Cache-Control": "public, max-age=0, must-revalidate",
+ "x-ws-language": loaderHeaders.get("x-ws-language"),
};
};
diff --git a/fixtures/webstudio-remix-vercel/app/routes/[nested].[nested-page]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[nested].[nested-page]._index.tsx
index 12a73c9015..f4c73bd324 100644
--- a/fixtures/webstudio-remix-vercel/app/routes/[nested].[nested-page]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/routes/[nested].[nested-page]._index.tsx
@@ -5,6 +5,7 @@ import {
type LinkDescriptor,
type ActionArgs,
type LoaderArgs,
+ type HeadersArgs,
json,
redirect,
} from "@remix-run/server-runtime";
@@ -71,14 +72,18 @@ export const loader = async (arg: LoaderArgs) => {
// In case of CRM Data, this should be set to 0
{
status: pageMeta.status,
- headers: { "Cache-Control": "public, max-age=600" },
+ headers: {
+ "Cache-Control": "public, max-age=600",
+ "x-ws-language": pageMeta.language ?? "en",
+ },
}
);
};
-export const headers = () => {
+export const headers = ({ loaderHeaders }: HeadersArgs) => {
return {
"Cache-Control": "public, max-age=0, must-revalidate",
+ "x-ws-language": loaderHeaders.get("x-ws-language"),
};
};
diff --git a/fixtures/webstudio-remix-vercel/app/routes/[radix]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[radix]._index.tsx
index 9dd572fe4f..85447c91fc 100644
--- a/fixtures/webstudio-remix-vercel/app/routes/[radix]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/routes/[radix]._index.tsx
@@ -5,6 +5,7 @@ import {
type LinkDescriptor,
type ActionArgs,
type LoaderArgs,
+ type HeadersArgs,
json,
redirect,
} from "@remix-run/server-runtime";
@@ -71,14 +72,18 @@ export const loader = async (arg: LoaderArgs) => {
// In case of CRM Data, this should be set to 0
{
status: pageMeta.status,
- headers: { "Cache-Control": "public, max-age=600" },
+ headers: {
+ "Cache-Control": "public, max-age=600",
+ "x-ws-language": pageMeta.language ?? "en",
+ },
}
);
};
-export const headers = () => {
+export const headers = ({ loaderHeaders }: HeadersArgs) => {
return {
"Cache-Control": "public, max-age=0, must-revalidate",
+ "x-ws-language": loaderHeaders.get("x-ws-language"),
};
};
diff --git a/fixtures/webstudio-remix-vercel/app/routes/[resources]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[resources]._index.tsx
index b6cc3640f6..cfbd3e39d3 100644
--- a/fixtures/webstudio-remix-vercel/app/routes/[resources]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/routes/[resources]._index.tsx
@@ -5,6 +5,7 @@ import {
type LinkDescriptor,
type ActionArgs,
type LoaderArgs,
+ type HeadersArgs,
json,
redirect,
} from "@remix-run/server-runtime";
@@ -71,14 +72,18 @@ export const loader = async (arg: LoaderArgs) => {
// In case of CRM Data, this should be set to 0
{
status: pageMeta.status,
- headers: { "Cache-Control": "public, max-age=600" },
+ headers: {
+ "Cache-Control": "public, max-age=600",
+ "x-ws-language": pageMeta.language ?? "en",
+ },
}
);
};
-export const headers = () => {
+export const headers = ({ loaderHeaders }: HeadersArgs) => {
return {
"Cache-Control": "public, max-age=0, must-revalidate",
+ "x-ws-language": loaderHeaders.get("x-ws-language"),
};
};
diff --git a/fixtures/webstudio-remix-vercel/app/routes/_index.tsx b/fixtures/webstudio-remix-vercel/app/routes/_index.tsx
index 39dfe4e4e6..1d559bc0d1 100644
--- a/fixtures/webstudio-remix-vercel/app/routes/_index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/routes/_index.tsx
@@ -5,6 +5,7 @@ import {
type LinkDescriptor,
type ActionArgs,
type LoaderArgs,
+ type HeadersArgs,
json,
redirect,
} from "@remix-run/server-runtime";
@@ -71,14 +72,18 @@ export const loader = async (arg: LoaderArgs) => {
// In case of CRM Data, this should be set to 0
{
status: pageMeta.status,
- headers: { "Cache-Control": "public, max-age=600" },
+ headers: {
+ "Cache-Control": "public, max-age=600",
+ "x-ws-language": pageMeta.language ?? "en",
+ },
}
);
};
-export const headers = () => {
+export const headers = ({ loaderHeaders }: HeadersArgs) => {
return {
"Cache-Control": "public, max-age=0, must-revalidate",
+ "x-ws-language": loaderHeaders.get("x-ws-language"),
};
};
diff --git a/packages/cli/templates/defaults/__templates__/route-template.tsx b/packages/cli/templates/defaults/__templates__/route-template.tsx
index 2b04be8c6e..cfb66de0e1 100644
--- a/packages/cli/templates/defaults/__templates__/route-template.tsx
+++ b/packages/cli/templates/defaults/__templates__/route-template.tsx
@@ -5,6 +5,7 @@ import {
type LinkDescriptor,
type ActionArgs,
type LoaderArgs,
+ type HeadersArgs,
json,
redirect,
} from "@remix-run/server-runtime";
@@ -71,14 +72,18 @@ export const loader = async (arg: LoaderArgs) => {
// In case of CRM Data, this should be set to 0
{
status: pageMeta.status,
- headers: { "Cache-Control": "public, max-age=600" },
+ headers: {
+ "Cache-Control": "public, max-age=600",
+ "x-ws-language": pageMeta.language ?? "en",
+ },
}
);
};
-export const headers = () => {
+export const headers = ({ loaderHeaders }: HeadersArgs) => {
return {
"Cache-Control": "public, max-age=0, must-revalidate",
+ "x-ws-language": loaderHeaders.get("x-ws-language"),
};
};
diff --git a/packages/react-sdk/src/page-meta-generator.test.ts b/packages/react-sdk/src/page-meta-generator.test.ts
index dccf204bc0..0c42ecd7c8 100644
--- a/packages/react-sdk/src/page-meta-generator.test.ts
+++ b/packages/react-sdk/src/page-meta-generator.test.ts
@@ -31,6 +31,7 @@ test("generate minimal static page meta factory", () => {
title: "Page title",
description: undefined,
excludePageFromSearch: undefined,
+ language: undefined,
socialImageAssetId: undefined,
socialImageUrl: undefined,
status: undefined,
@@ -56,6 +57,7 @@ test("generate complete static page meta factory", () => {
meta: {
description: `"Page description"`,
excludePageFromSearch: "true",
+ language: `"en-US"`,
socialImageAssetId: "social-image-name",
status: `302`,
redirect: `"/new-path"`,
@@ -79,6 +81,7 @@ test("generate complete static page meta factory", () => {
title: "Page title",
description: "Page description",
excludePageFromSearch: true,
+ language: "en-US",
socialImageAssetId: "social-image-name",
socialImageUrl: undefined,
status: 302,
@@ -127,6 +130,7 @@ test("generate asset url instead of id", () => {
title: "Page title",
description: undefined,
excludePageFromSearch: undefined,
+ language: undefined,
socialImageAssetId: undefined,
socialImageUrl: "https://my-image",
status: undefined,
@@ -170,6 +174,7 @@ test("generate custom meta ignoring empty property name", () => {
title: "Page title",
description: undefined,
excludePageFromSearch: undefined,
+ language: undefined,
socialImageAssetId: undefined,
socialImageUrl: undefined,
status: undefined,
@@ -221,6 +226,7 @@ test("generate page meta factory with variables", () => {
title: VariableName,
description: undefined,
excludePageFromSearch: undefined,
+ language: undefined,
socialImageAssetId: undefined,
socialImageUrl: undefined,
status: undefined,
@@ -268,6 +274,7 @@ test("generate page meta factory with path params", () => {
title: PathParams?.slug,
description: undefined,
excludePageFromSearch: undefined,
+ language: undefined,
socialImageAssetId: undefined,
socialImageUrl: undefined,
status: undefined,
@@ -315,6 +322,7 @@ test("generate page meta factory with resources", () => {
title: CmsPage?.data?.title,
description: undefined,
excludePageFromSearch: undefined,
+ language: undefined,
socialImageAssetId: undefined,
socialImageUrl: undefined,
status: undefined,
@@ -383,6 +391,7 @@ test("generate page meta factory without unused variables", () => {
title: UsedName,
description: undefined,
excludePageFromSearch: undefined,
+ language: undefined,
socialImageAssetId: undefined,
socialImageUrl: undefined,
status: undefined,
diff --git a/packages/react-sdk/src/page-meta-generator.ts b/packages/react-sdk/src/page-meta-generator.ts
index bd290b33db..7aac7a9853 100644
--- a/packages/react-sdk/src/page-meta-generator.ts
+++ b/packages/react-sdk/src/page-meta-generator.ts
@@ -11,6 +11,7 @@ export type PageMeta = {
title: string;
description?: string;
excludePageFromSearch?: boolean;
+ language?: string;
socialImageAssetId?: Asset["id"];
socialImageUrl?: string;
status?: number;
@@ -48,6 +49,12 @@ export const generatePageMeta = ({
usedDataSources,
scope: localScope,
});
+ const languageExpression = generateExpression({
+ expression: page.meta.language ?? "undefined",
+ dataSources,
+ usedDataSources,
+ scope: localScope,
+ });
const socialImageAssetIdExpression = JSON.stringify(
page.meta.socialImageAssetId
);
@@ -125,6 +132,7 @@ export const generatePageMeta = ({
generated += ` title: ${titleExpression},\n`;
generated += ` description: ${descriptionExpression},\n`;
generated += ` excludePageFromSearch: ${excludePageFromSearchExpression},\n`;
+ generated += ` language: ${languageExpression},\n`;
generated += ` socialImageAssetId: ${socialImageAssetIdExpression},\n`;
generated += ` socialImageUrl: ${socialImageUrlExpression},\n`;
generated += ` status: ${statusExpression},\n`;
diff --git a/packages/sdk/src/schema/pages.ts b/packages/sdk/src/schema/pages.ts
index 4ec47e18e6..fc4c2038bf 100644
--- a/packages/sdk/src/schema/pages.ts
+++ b/packages/sdk/src/schema/pages.ts
@@ -44,6 +44,7 @@ const commonPageFields = {
description: z.string().optional(),
title: z.string().optional(),
excludePageFromSearch: z.string().optional(),
+ language: z.string().optional(),
socialImageAssetId: z.string().optional(),
socialImageUrl: z.string().optional(),
status: z.string().optional(),
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index cdaf5acb4f..3e2747846f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -232,6 +232,9 @@ importers:
'@webstudio-is/trpc-interface':
specifier: workspace:*
version: link:../../packages/trpc-interface
+ bcp-47:
+ specifier: ^2.1.0
+ version: 2.1.0
change-case:
specifier: ^5.0.2
version: 5.0.2
@@ -9190,6 +9193,14 @@ packages:
engines: {node: '>=10.0.0'}
dev: true
+ resolution: {integrity: sha512-9IIS3UPrvIa1Ej+lVDdDwO7zLehjqsaByECw0bu2RRGP73jALm6FYbzI5gWbgHLvNdkvfXB5YrSbocZdOS0c0w==}
+ dependencies:
+ is-alphabetical: 2.0.1
+ is-alphanumerical: 2.0.1
+ is-decimal: 2.0.1
+ dev: false
+
resolution: {integrity: sha512-aVNobHnJqLiUelTaHat9DZ1qM2w0C0Eym4LPI/3JxOnSokGVdsl1T1kN7TFvsEAD8G47A6VKQ0TVHqbBnYMJlQ==}
engines: {node: '>=12.0.0'}
@@ -11938,14 +11949,12 @@ packages:
resolution: {integrity: sha512-FWyyY60MeTNyeSRpkM2Iry0G9hpr7/9kD40mD/cGQEuilcZYS4okz8SN2Q6rLCJ8gbCt6fN+rC+6tMGS99LaxQ==}
- dev: true
resolution: {integrity: sha512-hmbYhX/9MUMF5uh7tOXyK/n0ZvWpad5caBA17GsC6vyuCqaWliRG5K1qS9inmUhEMaOBIW7/whAnSwveW/LtZw==}
dependencies:
is-alphabetical: 2.0.1
is-decimal: 2.0.1
- dev: true
resolution: {integrity: sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==}
@@ -12026,7 +12035,6 @@ packages:
resolution: {integrity: sha512-AAB9hiomQs5DXWcRB1rqsxGUstbRroFOPPVAomNk/3XHR5JyEZChOyTWe2oayKnsSsr/kcGqF+z6yuH6HHpN0A==}
- dev: true
resolution: {integrity: sha512-YDoFpuZWu1VRXlsnlYMzKyVRITXj7Ej/V9gXQ2/pAe7X1J7M/RNOqaIYi6qUn+B7nGyB9pDXrv02dsB58d2ZAQ==}