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.

fix: Resolve issue with script tag compilation in self-hosted Project Settings (#3483)

Ivan Starkovef81ccfafd3f
diff --git a/fixtures/webstudio-cloudflare-template/app/__generated__/_index.server.tsx b/fixtures/webstudio-cloudflare-template/app/__generated__/_index.server.tsx
index 8add12c869..70fd9e49dd 100644
--- a/fixtures/webstudio-cloudflare-template/app/__generated__/_index.server.tsx
+++ b/fixtures/webstudio-cloudflare-template/app/__generated__/_index.server.tsx
@@ -38,5 +38,3 @@ export const getRemixParams = ({ ...params }: Params): Params => {
export const projectId = "d845c167-ea07-4875-b08d-83e97c09dcce";
export const contactEmail = "[email protected]";
-
-export const customCode = "";
diff --git a/fixtures/webstudio-cloudflare-template/app/__generated__/_index.tsx b/fixtures/webstudio-cloudflare-template/app/__generated__/_index.tsx
index 2fdcfda98c..2e92863469 100644
--- a/fixtures/webstudio-cloudflare-template/app/__generated__/_index.tsx
+++ b/fixtures/webstudio-cloudflare-template/app/__generated__/_index.tsx
@@ -21,6 +21,10 @@ export const pageFontAssets: FontAsset[] = [];
export const pageBackgroundImageAssets: ImageAsset[] = [];
+export const CustomCode = () => {
+ return <></>;
+};
+
const Page = ({}: { system: any }) => {
return (
<Body
diff --git a/fixtures/webstudio-cloudflare-template/app/root.tsx b/fixtures/webstudio-cloudflare-template/app/root.tsx
index 5755b9b230..40cefeeec7 100644
--- a/fixtures/webstudio-cloudflare-template/app/root.tsx
+++ b/fixtures/webstudio-cloudflare-template/app/root.tsx
@@ -1,13 +1,31 @@
-import { Links, Meta, Outlet } from "@remix-run/react";
+/* eslint-disable @typescript-eslint/ban-ts-comment */
+
+import { Links, Meta, Outlet, useMatches } from "@remix-run/react";
+// @todo think about how to make __generated__ typeable
+// @ts-ignore
+import { CustomCode } from "./__generated__/_index";
const Root = () => {
+ // Get language from matches
+ const matches = useMatches();
+
+ const lastMatchWithLanguage = matches.findLast((match) => {
+ // @ts-ignore
+ const language = match?.data?.pageMeta?.language;
+ return language != null;
+ });
+
+ // @ts-ignore
+ const lang = lastMatchWithLanguage?.data?.pageMeta?.language ?? "en";
+
return (
- <html lang="en">
+ <html lang={lang}>
<head>
<meta charSet="utf-8" />
<meta name="viewport" content="width=device-width,initial-scale=1" />
<Meta />
<Links />
+ <CustomCode />
</head>
<Outlet />
</html>
diff --git a/fixtures/webstudio-cloudflare-template/app/routes/_index.tsx b/fixtures/webstudio-cloudflare-template/app/routes/_index.tsx
index e1800c8845..154079140c 100644
--- a/fixtures/webstudio-cloudflare-template/app/routes/_index.tsx
+++ b/fixtures/webstudio-cloudflare-template/app/routes/_index.tsx
@@ -81,7 +81,6 @@ export const loader = async (arg: LoaderFunctionArgs) => {
status: pageMeta.status,
headers: {
"Cache-Control": "public, max-age=600",
- "x-ws-language": pageMeta.language ?? "en",
},
}
);
@@ -90,7 +89,6 @@ export const loader = async (arg: LoaderFunctionArgs) => {
export const headers: HeadersFunction = ({ loaderHeaders }) => {
return {
"Cache-Control": "public, max-age=0, must-revalidate",
- "x-ws-language": loaderHeaders.get("x-ws-language") ?? "",
};
};
diff --git a/fixtures/webstudio-cloudflare-template/tsconfig.json b/fixtures/webstudio-cloudflare-template/tsconfig.json
index 15f458bd9c..3ec9051136 100644
--- a/fixtures/webstudio-cloudflare-template/tsconfig.json
+++ b/fixtures/webstudio-cloudflare-template/tsconfig.json
@@ -8,7 +8,7 @@
"**/.client/**/*.tsx"
],
"compilerOptions": {
- "lib": ["DOM", "DOM.Iterable", "ES2022"],
+ "lib": ["DOM", "DOM.Iterable", "ES2023"],
"types": [
"@remix-run/cloudflare",
"vite/client",
diff --git a/fixtures/webstudio-custom-template/app/__generated__/[script-test]._index.server.tsx b/fixtures/webstudio-custom-template/app/__generated__/[script-test]._index.server.tsx
index a0ef6e6c51..f8f2d700f1 100644
--- a/fixtures/webstudio-custom-template/app/__generated__/[script-test]._index.server.tsx
+++ b/fixtures/webstudio-custom-template/app/__generated__/[script-test]._index.server.tsx
@@ -38,6 +38,3 @@ export const getRemixParams = ({ ...params }: Params): Params => {
export const projectId = "0d856812-61d8-4014-a20a-82e01c0eb8ee";
export const contactEmail = "[email protected]";
-
-export const customCode =
- '<script>console.log(\'HELLO\')</script>\n<meta property="saas:test" content="test">';
diff --git a/fixtures/webstudio-custom-template/app/__generated__/[sitemap.xml]._index.server.tsx b/fixtures/webstudio-custom-template/app/__generated__/[sitemap.xml]._index.server.tsx
index 3b21ec5193..31e4f0b8a4 100644
--- a/fixtures/webstudio-custom-template/app/__generated__/[sitemap.xml]._index.server.tsx
+++ b/fixtures/webstudio-custom-template/app/__generated__/[sitemap.xml]._index.server.tsx
@@ -64,6 +64,3 @@ export const getRemixParams = ({ ...params }: Params): Params => {
export const projectId = "0d856812-61d8-4014-a20a-82e01c0eb8ee";
export const contactEmail = "[email protected]";
-
-export const customCode =
- '<script>console.log(\'HELLO\')</script>\n<meta property="saas:test" content="test">';
diff --git a/fixtures/webstudio-custom-template/app/__generated__/[world]._index.server.tsx b/fixtures/webstudio-custom-template/app/__generated__/[world]._index.server.tsx
index 1d4ce43b9c..2c9793258f 100644
--- a/fixtures/webstudio-custom-template/app/__generated__/[world]._index.server.tsx
+++ b/fixtures/webstudio-custom-template/app/__generated__/[world]._index.server.tsx
@@ -38,6 +38,3 @@ export const getRemixParams = ({ ...params }: Params): Params => {
export const projectId = "0d856812-61d8-4014-a20a-82e01c0eb8ee";
export const contactEmail = "[email protected]";
-
-export const customCode =
- '<script>console.log(\'HELLO\')</script>\n<meta property="saas:test" content="test">';
diff --git a/fixtures/webstudio-custom-template/app/__generated__/_index.server.tsx b/fixtures/webstudio-custom-template/app/__generated__/_index.server.tsx
index 8d4a3ceb0a..70de49cb3b 100644
--- a/fixtures/webstudio-custom-template/app/__generated__/_index.server.tsx
+++ b/fixtures/webstudio-custom-template/app/__generated__/_index.server.tsx
@@ -38,6 +38,3 @@ export const getRemixParams = ({ ...params }: Params): Params => {
export const projectId = "0d856812-61d8-4014-a20a-82e01c0eb8ee";
export const contactEmail = "[email protected]";
-
-export const customCode =
- '<script>console.log(\'HELLO\')</script>\n<meta property="saas:test" content="test">';
diff --git a/fixtures/webstudio-custom-template/app/__generated__/_index.tsx b/fixtures/webstudio-custom-template/app/__generated__/_index.tsx
index 784c1cba16..d06e071530 100644
--- a/fixtures/webstudio-custom-template/app/__generated__/_index.tsx
+++ b/fixtures/webstudio-custom-template/app/__generated__/_index.tsx
@@ -74,6 +74,31 @@ export const pageBackgroundImageAssets: ImageAsset[] = [
},
];
+const Script = ({ children, ...props }: Record<string, string | boolean>) => {
+ if (children == null) {
+ return <script {...props} />;
+ }
+
+ return <script {...props} dangerouslySetInnerHTML={{ __html: children }} />;
+};
+const Style = ({ children, ...props }: Record<string, string | boolean>) => {
+ if (children == null) {
+ return <style {...props} />;
+ }
+
+ return <style {...props} dangerouslySetInnerHTML={{ __html: children }} />;
+};
+
+export const CustomCode = () => {
+ return (
+ <>
+ <Script>{`console.log('HELLO')`}</Script>
+ {`\n`}
+ <meta property="saas:test" content="test"></meta>
+ </>
+ );
+};
+
const Page = ({}: { system: any }) => {
return (
<Body
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 fab658fbb1..43cf209571 100644
--- a/fixtures/webstudio-custom-template/app/routes/[script-test]._index.tsx
+++ b/fixtures/webstudio-custom-template/app/routes/[script-test]._index.tsx
@@ -81,7 +81,6 @@ export const loader = async (arg: LoaderFunctionArgs) => {
status: pageMeta.status,
headers: {
"Cache-Control": "public, max-age=600",
- "x-ws-language": pageMeta.language ?? "en",
},
}
);
@@ -90,7 +89,6 @@ export const loader = async (arg: LoaderFunctionArgs) => {
export const headers: HeadersFunction = ({ loaderHeaders }) => {
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 8e6a462c0b..686b00e556 100644
--- a/fixtures/webstudio-custom-template/app/routes/[world]._index.tsx
+++ b/fixtures/webstudio-custom-template/app/routes/[world]._index.tsx
@@ -81,7 +81,6 @@ export const loader = async (arg: LoaderFunctionArgs) => {
status: pageMeta.status,
headers: {
"Cache-Control": "public, max-age=600",
- "x-ws-language": pageMeta.language ?? "en",
},
}
);
@@ -90,7 +89,6 @@ export const loader = async (arg: LoaderFunctionArgs) => {
export const headers: HeadersFunction = ({ loaderHeaders }) => {
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 e1800c8845..154079140c 100644
--- a/fixtures/webstudio-custom-template/app/routes/_index.tsx
+++ b/fixtures/webstudio-custom-template/app/routes/_index.tsx
@@ -81,7 +81,6 @@ export const loader = async (arg: LoaderFunctionArgs) => {
status: pageMeta.status,
headers: {
"Cache-Control": "public, max-age=600",
- "x-ws-language": pageMeta.language ?? "en",
},
}
);
@@ -90,7 +89,6 @@ export const loader = async (arg: LoaderFunctionArgs) => {
export const headers: HeadersFunction = ({ loaderHeaders }) => {
return {
"Cache-Control": "public, max-age=0, must-revalidate",
- "x-ws-language": loaderHeaders.get("x-ws-language") ?? "",
};
};
diff --git a/fixtures/webstudio-custom-template/tsconfig.json b/fixtures/webstudio-custom-template/tsconfig.json
index 3a82133653..f99a0e1462 100644
--- a/fixtures/webstudio-custom-template/tsconfig.json
+++ b/fixtures/webstudio-custom-template/tsconfig.json
@@ -1,7 +1,7 @@
{
"include": ["**/*.ts", "**/*.tsx", "**/*.mjs"],
"compilerOptions": {
- "lib": ["DOM", "DOM.Iterable", "ES2022"],
+ "lib": ["DOM", "DOM.Iterable", "ES2023"],
"types": ["@remix-run/node", "vite/client"],
"isolatedModules": true,
"esModuleInterop": true,
diff --git a/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/_index.server.tsx b/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/_index.server.tsx
index 8add12c869..70fd9e49dd 100644
--- a/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/_index.server.tsx
+++ b/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/_index.server.tsx
@@ -38,5 +38,3 @@ export const getRemixParams = ({ ...params }: Params): Params => {
export const projectId = "d845c167-ea07-4875-b08d-83e97c09dcce";
export const contactEmail = "[email protected]";
-
-export const customCode = "";
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 2fdcfda98c..2e92863469 100644
--- a/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/_index.tsx
+++ b/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/_index.tsx
@@ -21,6 +21,10 @@ export const pageFontAssets: FontAsset[] = [];
export const pageBackgroundImageAssets: ImageAsset[] = [];
+export const CustomCode = () => {
+ return <></>;
+};
+
const Page = ({}: { system: any }) => {
return (
<Body
diff --git a/fixtures/webstudio-remix-netlify-edge-functions/app/root.tsx b/fixtures/webstudio-remix-netlify-edge-functions/app/root.tsx
index 5755b9b230..40cefeeec7 100644
--- a/fixtures/webstudio-remix-netlify-edge-functions/app/root.tsx
+++ b/fixtures/webstudio-remix-netlify-edge-functions/app/root.tsx
@@ -1,13 +1,31 @@
-import { Links, Meta, Outlet } from "@remix-run/react";
+/* eslint-disable @typescript-eslint/ban-ts-comment */
+
+import { Links, Meta, Outlet, useMatches } from "@remix-run/react";
+// @todo think about how to make __generated__ typeable
+// @ts-ignore
+import { CustomCode } from "./__generated__/_index";
const Root = () => {
+ // Get language from matches
+ const matches = useMatches();
+
+ const lastMatchWithLanguage = matches.findLast((match) => {
+ // @ts-ignore
+ const language = match?.data?.pageMeta?.language;
+ return language != null;
+ });
+
+ // @ts-ignore
+ const lang = lastMatchWithLanguage?.data?.pageMeta?.language ?? "en";
+
return (
- <html lang="en">
+ <html lang={lang}>
<head>
<meta charSet="utf-8" />
<meta name="viewport" content="width=device-width,initial-scale=1" />
<Meta />
<Links />
+ <CustomCode />
</head>
<Outlet />
</html>
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 e1800c8845..154079140c 100644
--- a/fixtures/webstudio-remix-netlify-edge-functions/app/routes/_index.tsx
+++ b/fixtures/webstudio-remix-netlify-edge-functions/app/routes/_index.tsx
@@ -81,7 +81,6 @@ export const loader = async (arg: LoaderFunctionArgs) => {
status: pageMeta.status,
headers: {
"Cache-Control": "public, max-age=600",
- "x-ws-language": pageMeta.language ?? "en",
},
}
);
@@ -90,7 +89,6 @@ export const loader = async (arg: LoaderFunctionArgs) => {
export const headers: HeadersFunction = ({ loaderHeaders }) => {
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/tsconfig.json b/fixtures/webstudio-remix-netlify-edge-functions/tsconfig.json
index 3a82133653..f99a0e1462 100644
--- a/fixtures/webstudio-remix-netlify-edge-functions/tsconfig.json
+++ b/fixtures/webstudio-remix-netlify-edge-functions/tsconfig.json
@@ -1,7 +1,7 @@
{
"include": ["**/*.ts", "**/*.tsx", "**/*.mjs"],
"compilerOptions": {
- "lib": ["DOM", "DOM.Iterable", "ES2022"],
+ "lib": ["DOM", "DOM.Iterable", "ES2023"],
"types": ["@remix-run/node", "vite/client"],
"isolatedModules": true,
"esModuleInterop": true,
diff --git a/fixtures/webstudio-remix-netlify-functions/app/__generated__/_index.server.tsx b/fixtures/webstudio-remix-netlify-functions/app/__generated__/_index.server.tsx
index 8add12c869..70fd9e49dd 100644
--- a/fixtures/webstudio-remix-netlify-functions/app/__generated__/_index.server.tsx
+++ b/fixtures/webstudio-remix-netlify-functions/app/__generated__/_index.server.tsx
@@ -38,5 +38,3 @@ export const getRemixParams = ({ ...params }: Params): Params => {
export const projectId = "d845c167-ea07-4875-b08d-83e97c09dcce";
export const contactEmail = "[email protected]";
-
-export const customCode = "";
diff --git a/fixtures/webstudio-remix-netlify-functions/app/__generated__/_index.tsx b/fixtures/webstudio-remix-netlify-functions/app/__generated__/_index.tsx
index 2fdcfda98c..2e92863469 100644
--- a/fixtures/webstudio-remix-netlify-functions/app/__generated__/_index.tsx
+++ b/fixtures/webstudio-remix-netlify-functions/app/__generated__/_index.tsx
@@ -21,6 +21,10 @@ export const pageFontAssets: FontAsset[] = [];
export const pageBackgroundImageAssets: ImageAsset[] = [];
+export const CustomCode = () => {
+ return <></>;
+};
+
const Page = ({}: { system: any }) => {
return (
<Body
diff --git a/fixtures/webstudio-remix-netlify-functions/app/root.tsx b/fixtures/webstudio-remix-netlify-functions/app/root.tsx
index 5755b9b230..40cefeeec7 100644
--- a/fixtures/webstudio-remix-netlify-functions/app/root.tsx
+++ b/fixtures/webstudio-remix-netlify-functions/app/root.tsx
@@ -1,13 +1,31 @@
-import { Links, Meta, Outlet } from "@remix-run/react";
+/* eslint-disable @typescript-eslint/ban-ts-comment */
+
+import { Links, Meta, Outlet, useMatches } from "@remix-run/react";
+// @todo think about how to make __generated__ typeable
+// @ts-ignore
+import { CustomCode } from "./__generated__/_index";
const Root = () => {
+ // Get language from matches
+ const matches = useMatches();
+
+ const lastMatchWithLanguage = matches.findLast((match) => {
+ // @ts-ignore
+ const language = match?.data?.pageMeta?.language;
+ return language != null;
+ });
+
+ // @ts-ignore
+ const lang = lastMatchWithLanguage?.data?.pageMeta?.language ?? "en";
+
return (
- <html lang="en">
+ <html lang={lang}>
<head>
<meta charSet="utf-8" />
<meta name="viewport" content="width=device-width,initial-scale=1" />
<Meta />
<Links />
+ <CustomCode />
</head>
<Outlet />
</html>
diff --git a/fixtures/webstudio-remix-netlify-functions/app/routes/_index.tsx b/fixtures/webstudio-remix-netlify-functions/app/routes/_index.tsx
index e1800c8845..154079140c 100644
--- a/fixtures/webstudio-remix-netlify-functions/app/routes/_index.tsx
+++ b/fixtures/webstudio-remix-netlify-functions/app/routes/_index.tsx
@@ -81,7 +81,6 @@ export const loader = async (arg: LoaderFunctionArgs) => {
status: pageMeta.status,
headers: {
"Cache-Control": "public, max-age=600",
- "x-ws-language": pageMeta.language ?? "en",
},
}
);
@@ -90,7 +89,6 @@ export const loader = async (arg: LoaderFunctionArgs) => {
export const headers: HeadersFunction = ({ loaderHeaders }) => {
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/tsconfig.json b/fixtures/webstudio-remix-netlify-functions/tsconfig.json
index 3a82133653..f99a0e1462 100644
--- a/fixtures/webstudio-remix-netlify-functions/tsconfig.json
+++ b/fixtures/webstudio-remix-netlify-functions/tsconfig.json
@@ -1,7 +1,7 @@
{
"include": ["**/*.ts", "**/*.tsx", "**/*.mjs"],
"compilerOptions": {
- "lib": ["DOM", "DOM.Iterable", "ES2022"],
+ "lib": ["DOM", "DOM.Iterable", "ES2023"],
"types": ["@remix-run/node", "vite/client"],
"isolatedModules": true,
"esModuleInterop": true,
diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[_route_with_symbols_]._index.server.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[_route_with_symbols_]._index.server.tsx
index e424b9eda4..05f49bc58e 100644
--- a/fixtures/webstudio-remix-vercel/app/__generated__/[_route_with_symbols_]._index.server.tsx
+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[_route_with_symbols_]._index.server.tsx
@@ -38,5 +38,3 @@ export const getRemixParams = ({ ...params }: Params): Params => {
export const projectId = "cddc1d44-af37-4cb6-a430-d300cf6f932d";
export const contactEmail = "[email protected]";
-
-export const customCode = "<script>console.log('KittyGuardedZone')</script>";
diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.server.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.server.tsx
index bff101d531..8639701a32 100644
--- a/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.server.tsx
+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.server.tsx
@@ -40,5 +40,3 @@ export const getRemixParams = ({ ...params }: Params): Params => {
export const projectId = "cddc1d44-af37-4cb6-a430-d300cf6f932d";
export const contactEmail = "[email protected]";
-
-export const customCode = "<script>console.log('KittyGuardedZone')</script>";
diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[heading-with-id]._index.server.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[heading-with-id]._index.server.tsx
index 7f36e291ad..5dcc54b264 100644
--- a/fixtures/webstudio-remix-vercel/app/__generated__/[heading-with-id]._index.server.tsx
+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[heading-with-id]._index.server.tsx
@@ -38,5 +38,3 @@ export const getRemixParams = ({ ...params }: Params): Params => {
export const projectId = "cddc1d44-af37-4cb6-a430-d300cf6f932d";
export const contactEmail = "[email protected]";
-
-export const customCode = "<script>console.log('KittyGuardedZone')</script>";
diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[nested].[nested-page]._index.server.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[nested].[nested-page]._index.server.tsx
index 9ae50e09a5..81aba09dff 100644
--- a/fixtures/webstudio-remix-vercel/app/__generated__/[nested].[nested-page]._index.server.tsx
+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[nested].[nested-page]._index.server.tsx
@@ -38,5 +38,3 @@ export const getRemixParams = ({ ...params }: Params): Params => {
export const projectId = "cddc1d44-af37-4cb6-a430-d300cf6f932d";
export const contactEmail = "[email protected]";
-
-export const customCode = "<script>console.log('KittyGuardedZone')</script>";
diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.server.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.server.tsx
index 46f649235e..b3b3ab75ff 100644
--- a/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.server.tsx
+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.server.tsx
@@ -39,5 +39,3 @@ export const getRemixParams = ({ ...params }: Params): Params => {
export const projectId = "cddc1d44-af37-4cb6-a430-d300cf6f932d";
export const contactEmail = "[email protected]";
-
-export const customCode = "<script>console.log('KittyGuardedZone')</script>";
diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[resources]._index.server.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[resources]._index.server.tsx
index 81f92eb46c..5fdc4dfb18 100644
--- a/fixtures/webstudio-remix-vercel/app/__generated__/[resources]._index.server.tsx
+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[resources]._index.server.tsx
@@ -64,5 +64,3 @@ export const getRemixParams = ({ ...params }: Params): Params => {
export const projectId = "cddc1d44-af37-4cb6-a430-d300cf6f932d";
export const contactEmail = "[email protected]";
-
-export const customCode = "<script>console.log('KittyGuardedZone')</script>";
diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/_index.server.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/_index.server.tsx
index f8c92b5fa9..3348742d7a 100644
--- a/fixtures/webstudio-remix-vercel/app/__generated__/_index.server.tsx
+++ b/fixtures/webstudio-remix-vercel/app/__generated__/_index.server.tsx
@@ -44,5 +44,3 @@ export const getRemixParams = ({ ...params }: Params): Params => {
export const projectId = "cddc1d44-af37-4cb6-a430-d300cf6f932d";
export const contactEmail = "[email protected]";
-
-export const customCode = "<script>console.log('KittyGuardedZone')</script>";
diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/_index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/_index.tsx
index 5a3a15e0ad..4039b8330b 100644
--- a/fixtures/webstudio-remix-vercel/app/__generated__/_index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/__generated__/_index.tsx
@@ -47,6 +47,30 @@ export const pageFontAssets: FontAsset[] = [];
export const pageBackgroundImageAssets: ImageAsset[] = [];
+const Script = ({ children, ...props }: Record<string, string | boolean>) => {
+ if (children == null) {
+ return <script {...props} />;
+ }
+
+ return <script {...props} dangerouslySetInnerHTML={{ __html: children }} />;
+};
+const Style = ({ children, ...props }: Record<string, string | boolean>) => {
+ if (children == null) {
+ return <style {...props} />;
+ }
+
+ return <style {...props} dangerouslySetInnerHTML={{ __html: children }} />;
+};
+
+export const CustomCode = () => {
+ return (
+ <>
+ <Script>{`console.log('KittyGuardedZone')`}</Script>
+ {`\n`}
+ </>
+ );
+};
+
const Page = ({}: { system: any }) => {
return (
<Body
diff --git a/fixtures/webstudio-remix-vercel/app/root.tsx b/fixtures/webstudio-remix-vercel/app/root.tsx
index 5755b9b230..40cefeeec7 100644
--- a/fixtures/webstudio-remix-vercel/app/root.tsx
+++ b/fixtures/webstudio-remix-vercel/app/root.tsx
@@ -1,13 +1,31 @@
-import { Links, Meta, Outlet } from "@remix-run/react";
+/* eslint-disable @typescript-eslint/ban-ts-comment */
+
+import { Links, Meta, Outlet, useMatches } from "@remix-run/react";
+// @todo think about how to make __generated__ typeable
+// @ts-ignore
+import { CustomCode } from "./__generated__/_index";
const Root = () => {
+ // Get language from matches
+ const matches = useMatches();
+
+ const lastMatchWithLanguage = matches.findLast((match) => {
+ // @ts-ignore
+ const language = match?.data?.pageMeta?.language;
+ return language != null;
+ });
+
+ // @ts-ignore
+ const lang = lastMatchWithLanguage?.data?.pageMeta?.language ?? "en";
+
return (
- <html lang="en">
+ <html lang={lang}>
<head>
<meta charSet="utf-8" />
<meta name="viewport" content="width=device-width,initial-scale=1" />
<Meta />
<Links />
+ <CustomCode />
</head>
<Outlet />
</html>
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 c50fc1587a..a07511214d 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
@@ -81,7 +81,6 @@ export const loader = async (arg: LoaderFunctionArgs) => {
status: pageMeta.status,
headers: {
"Cache-Control": "public, max-age=600",
- "x-ws-language": pageMeta.language ?? "en",
},
}
);
@@ -90,7 +89,6 @@ export const loader = async (arg: LoaderFunctionArgs) => {
export const headers: HeadersFunction = ({ loaderHeaders }) => {
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 78eda705a1..21ddfaba6b 100644
--- a/fixtures/webstudio-remix-vercel/app/routes/[form]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/routes/[form]._index.tsx
@@ -81,7 +81,6 @@ export const loader = async (arg: LoaderFunctionArgs) => {
status: pageMeta.status,
headers: {
"Cache-Control": "public, max-age=600",
- "x-ws-language": pageMeta.language ?? "en",
},
}
);
@@ -90,7 +89,6 @@ export const loader = async (arg: LoaderFunctionArgs) => {
export const headers: HeadersFunction = ({ loaderHeaders }) => {
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 54b3c9b2b0..e99f5f3f69 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
@@ -81,7 +81,6 @@ export const loader = async (arg: LoaderFunctionArgs) => {
status: pageMeta.status,
headers: {
"Cache-Control": "public, max-age=600",
- "x-ws-language": pageMeta.language ?? "en",
},
}
);
@@ -90,7 +89,6 @@ export const loader = async (arg: LoaderFunctionArgs) => {
export const headers: HeadersFunction = ({ loaderHeaders }) => {
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 79ffef799c..24f694240c 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
@@ -81,7 +81,6 @@ export const loader = async (arg: LoaderFunctionArgs) => {
status: pageMeta.status,
headers: {
"Cache-Control": "public, max-age=600",
- "x-ws-language": pageMeta.language ?? "en",
},
}
);
@@ -90,7 +89,6 @@ export const loader = async (arg: LoaderFunctionArgs) => {
export const headers: HeadersFunction = ({ loaderHeaders }) => {
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 3235310a9d..591b2f3b29 100644
--- a/fixtures/webstudio-remix-vercel/app/routes/[radix]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/routes/[radix]._index.tsx
@@ -81,7 +81,6 @@ export const loader = async (arg: LoaderFunctionArgs) => {
status: pageMeta.status,
headers: {
"Cache-Control": "public, max-age=600",
- "x-ws-language": pageMeta.language ?? "en",
},
}
);
@@ -90,7 +89,6 @@ export const loader = async (arg: LoaderFunctionArgs) => {
export const headers: HeadersFunction = ({ loaderHeaders }) => {
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 e69b39912f..b66ca97a20 100644
--- a/fixtures/webstudio-remix-vercel/app/routes/[resources]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/routes/[resources]._index.tsx
@@ -81,7 +81,6 @@ export const loader = async (arg: LoaderFunctionArgs) => {
status: pageMeta.status,
headers: {
"Cache-Control": "public, max-age=600",
- "x-ws-language": pageMeta.language ?? "en",
},
}
);
@@ -90,7 +89,6 @@ export const loader = async (arg: LoaderFunctionArgs) => {
export const headers: HeadersFunction = ({ loaderHeaders }) => {
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 e1800c8845..154079140c 100644
--- a/fixtures/webstudio-remix-vercel/app/routes/_index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/routes/_index.tsx
@@ -81,7 +81,6 @@ export const loader = async (arg: LoaderFunctionArgs) => {
status: pageMeta.status,
headers: {
"Cache-Control": "public, max-age=600",
- "x-ws-language": pageMeta.language ?? "en",
},
}
);
@@ -90,7 +89,6 @@ export const loader = async (arg: LoaderFunctionArgs) => {
export const headers: HeadersFunction = ({ loaderHeaders }) => {
return {
"Cache-Control": "public, max-age=0, must-revalidate",
- "x-ws-language": loaderHeaders.get("x-ws-language") ?? "",
};
};
diff --git a/fixtures/webstudio-remix-vercel/tsconfig.json b/fixtures/webstudio-remix-vercel/tsconfig.json
index 3a82133653..f99a0e1462 100644
--- a/fixtures/webstudio-remix-vercel/tsconfig.json
+++ b/fixtures/webstudio-remix-vercel/tsconfig.json
@@ -1,7 +1,7 @@
{
"include": ["**/*.ts", "**/*.tsx", "**/*.mjs"],
"compilerOptions": {
- "lib": ["DOM", "DOM.Iterable", "ES2022"],
+ "lib": ["DOM", "DOM.Iterable", "ES2023"],
"types": ["@remix-run/node", "vite/client"],
"isolatedModules": true,
"esModuleInterop": true,
diff --git a/packages/cli/__generated__/_index.server.tsx b/packages/cli/__generated__/_index.server.tsx
index 9a6907ed0c..e936eb850e 100644
--- a/packages/cli/__generated__/_index.server.tsx
+++ b/packages/cli/__generated__/_index.server.tsx
@@ -31,5 +31,3 @@ export const getRemixParams = ({ ...params }: Params): Params => {
export const projectId = "project-id";
export const contactEmail: undefined | string = undefined;
-
-export const customCode = "";
diff --git a/packages/cli/__generated__/_index.tsx b/packages/cli/__generated__/_index.tsx
index 0e07c4732f..89b0db3083 100644
--- a/packages/cli/__generated__/_index.tsx
+++ b/packages/cli/__generated__/_index.tsx
@@ -15,6 +15,8 @@ export const pageFontAssets: FontAsset[] = [];
export const pageBackgroundImageAssets: ImageAsset[] = [];
+export const CustomCode = () => null;
+
const Page = (_props: { system: any }) => {
return <></>;
};
diff --git a/packages/cli/jest.config.js b/packages/cli/jest.config.js
new file mode 100644
index 0000000000..e7fc137533
--- /dev/null
+++ b/packages/cli/jest.config.js
@@ -0,0 +1 @@
+export { default } from "@webstudio-is/jest-config";
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 4d4cdccbed..367557fa0e 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -20,7 +20,8 @@
"checks": "pnpm typecheck",
"build": "rm -rf lib && esbuild src/cli.ts --outdir=lib --bundle --format=esm --packages=external",
"local-run": "tsx --no-warnings ./src/bin.ts",
- "dev": "esbuild src/cli.ts --watch --bundle --format=esm --packages=external --outdir=./lib"
+ "dev": "esbuild src/cli.ts --watch --bundle --format=esm --packages=external --outdir=./lib",
+ "test": "NODE_OPTIONS=--experimental-vm-modules jest"
},
"license": "AGPL-3.0-or-later",
"dependencies": {
@@ -32,9 +33,11 @@
"@webstudio-is/sdk-components-react": "workspace:*",
"@webstudio-is/sdk-components-react-radix": "workspace:*",
"@webstudio-is/sdk-components-react-remix": "workspace:*",
+ "change-case": "^5.0.2",
"deepmerge": "^4.3.1",
"env-paths": "^3.0.0",
"execa": "^7.2.0",
+ "parse5": "7.1.2",
"p-limit": "^4.0.0",
"picocolors": "^1.0.1",
"strip-indent": "^4.0.0",
@@ -43,6 +46,7 @@
"zod": "^3.22.4"
},
"devDependencies": {
+ "@jest/globals": "^29.7.0",
"@netlify/remix-adapter": "^2.4.0",
"@netlify/remix-edge-adapter": "3.3.0",
"@remix-run/cloudflare": "^2.9.2",
@@ -56,6 +60,7 @@
"@types/react-dom": "^18.2.25",
"@types/yargs": "^17.0.32",
"@webstudio-is/form-handlers": "workspace:*",
+ "@webstudio-is/jest-config": "workspace:*",
"@webstudio-is/tsconfig": "workspace:*",
"react": "18.3.0-canary-14898b6a9-20240318",
"react-dom": "18.3.0-canary-14898b6a9-20240318",
diff --git a/packages/cli/src/html-to-jsx.test.ts b/packages/cli/src/html-to-jsx.test.ts
new file mode 100644
index 0000000000..549f6c7da9
--- /dev/null
+++ b/packages/cli/src/html-to-jsx.test.ts
@@ -0,0 +1,243 @@
+import { test, expect } from "@jest/globals";
+import * as React from "react";
+import ReactDOMServer from "react-dom/server";
+import esbuild from "esbuild";
+import { htmlToJsx } from "./html-to-jsx";
+import prettier from "prettier";
+
+/**
+ * Converts HTML to JSX, renders the JSX to HTML.
+ */
+const convertHtmlToJsxAndRenderToHtml = async (htmlCode: string) => {
+ const jsxCode = htmlToJsx(htmlCode);
+
+ const jsxComponentCode = `
+ const Script = ({children, ...props}) => {
+ if (children == null) {
+ return <script {...props} />;
+ }
+
+ return <script {...props} dangerouslySetInnerHTML={{__html: children}} />;
+ };
+
+ const Style = ({children, ...props}) => {
+ if (children == null) {
+ return <style {...props} />;
+ }
+
+ return <style {...props} dangerouslySetInnerHTML={{__html: children}} />;
+ };
+
+ const MyComponent = () => (
+ <>
+ ${jsxCode}
+ </>
+ );`;
+
+ const jsxCompiled = await esbuild.transform(jsxComponentCode, {
+ loader: "jsx",
+ format: "cjs",
+ });
+
+ const renderFunction = new Function(
+ "React",
+ "ReactDOMServer",
+ `${jsxCompiled.code}; return ReactDOMServer.renderToString(React.createElement(MyComponent));`
+ );
+
+ const result = renderFunction(React, ReactDOMServer);
+
+ return (
+ result
+ // replace to fix that renderToString(<input type="text" disabled />) results in <input type="text" disabled="">
+ .replace(/\s(\w+)=""/g, " $1")
+ // &amp; is replaced with & in attributes as its'ok
+ .replace(/(?<=\w="[^"]*)&amp;(?=[^"]*")/g, "&")
+ // renderToString can add comment <!-- -->
+ .replace(/\n\s*<!-- -->/g, "")
+ // <link rel="preload is set by react for all eager images
+ .replace(/<link rel="preload".*\/>/g, "")
+ );
+};
+
+const formatHtml = async (htmlCode: string) => {
+ return await prettier.format(htmlCode, { parser: "html" });
+};
+
+test("Simple conversion works", async () => {
+ const htmlCode = `
+ <div id="1" class="hello world">Hello World</div>
+ dsdsd
+ <span>eee</span>
+ <input type="text" disabled />
+ `;
+ const result = await convertHtmlToJsxAndRenderToHtml(htmlCode);
+
+ expect(await formatHtml(htmlCode)).toBe(await formatHtml(result));
+});
+
+test("Simple script conversion works", async () => {
+ const htmlCode = `
+ <script>
+ console.log('Hello World');
+ </script>
+ `;
+ const result = await convertHtmlToJsxAndRenderToHtml(htmlCode);
+
+ expect(await formatHtml(htmlCode)).toBe(await formatHtml(result));
+});
+
+test("Script conversion works with various chars", async () => {
+ const htmlCode = `
+ <script>
+ const a = {
+ z: 1,
+ y: \`2\`,
+ };
+
+ console.log('</'+'Script>' + "ddd");
+
+ const z = \`
+ eee
+ \`;
+ </script>
+ `;
+ const result = await convertHtmlToJsxAndRenderToHtml(htmlCode);
+
+ expect(await formatHtml(htmlCode)).toBe(await formatHtml(result));
+});
+
+test("Supports script src and meta", async () => {
+ const htmlCode = `
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <script src="hello/world" async defer></script>
+ <script src="hello/world2"></script>
+ `;
+ const result = await convertHtmlToJsxAndRenderToHtml(htmlCode);
+
+ expect(await formatHtml(htmlCode)).toBe(await formatHtml(result));
+});
+
+test("Should not fail", async () => {
+ const htmlCode = `
+ </s a="sd"><p><a><script src><scri pt>
+ `;
+ const result = await convertHtmlToJsxAndRenderToHtml(htmlCode);
+ expect(result).toMatchInlineSnapshot(`
+"
+ <p><a><script src><scri pt>
+ </script></a></p>"
+`);
+});
+
+test("noscript works", async () => {
+ const htmlCode = `
+ <noscript><img height="1" width="1" style="display:none"
+ src="https://www.facebook.com/tr?id=1045295173245773&ev=PageView&noscript=1"
+ /></noscript>
+ `;
+ const result = await convertHtmlToJsxAndRenderToHtml(htmlCode);
+
+ expect(await formatHtml(htmlCode)).toBe(await formatHtml(result));
+});
+
+test("Skip non modern brosers if", async () => {
+ const htmlCode = `<!-- [if lt IE 9]><script>console.log('Hello World');</script><![endif] -->`;
+ const result = await convertHtmlToJsxAndRenderToHtml(htmlCode);
+ expect(result).toMatchInlineSnapshot(`""`);
+});
+
+test("Support styles", async () => {
+ const htmlCode = `
+ <style>
+ .text-field[type="email"]:invalid + div,
+ .text-field[type="email"]:invalid:focus + div,
+ .text-field:valid + label, .form-field-secondary:valid + label
+ {
+ display: block;
+ background-image: linear-gradient(180deg,#c8c7fe,#fbf8ff);
+ }
+ </style>
+
+ <style>
+ @font-face {
+ font-family: "icons";
+ src: url("data:application/x-font-ttf;charset=utf-8;base64,AAEAAAAA==") format("truetype");
+ font-weight: normal;
+ font-style: normal;
+ }
+ </style>
+ `;
+
+ const result = await convertHtmlToJsxAndRenderToHtml(htmlCode);
+
+ expect(await formatHtml(htmlCode)).toBe(await formatHtml(result));
+});
+
+test("Real User Script Works", async () => {
+ const htmlCode = `
+ <script type="text/javascript">
+ (function (C, A, L) { let p = function (a, ar) { a.q.push(ar); }; let d = C.document; C.Cal = C.Cal || function () { let cal = C.Cal; let ar = arguments; if (!cal.loaded) { cal.ns = {}; cal.q = cal.q || []; d.head.appendChild(d.createElement("script")).src = A; cal.loaded = true; } if (ar[0] === L) { const api = function () { p(api, arguments); }; const namespace = ar[1]; api.q = api.q || []; typeof namespace === "string" ? (cal.ns[namespace] = api) && p(api, ar) : p(cal, ar); return; } p(cal, ar); }; })(window, "https://app.cal.com/embed/embed.js", "init");
+Cal("init", {origin:"https://cal.com"});
+
+ Cal("floatingButton", {"calLink":"fedir-davydov/30min","hideButtonIcon":true,"buttonText":"Schedule free 30 min call","buttonColor":"#0F68EE","buttonTextColor":"#FAFAFB"});
+ Cal("ui", {"styles":{"branding":{"brandColor":"#000000"}},"hideEventTypeDetails":false,"layout":"month_view"});
+ </script>
+
+ <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
+ new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+ 'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+ })(window,document,'script','dataLayer','GTM-EEE');</script>
+
+
+ <script>
+ !function(f,b,e,v,n,t,s)
+ {if(f.fbq)return;n=f.fbq=function(){n.callMethod?
+ n.callMethod.apply(n,arguments):n.queue.push(arguments)};
+ if(!f._fbq)f._fbq=n;n.push=n;n.loaded=!0;n.version='2.0';
+ n.queue=[];t=b.createElement(e);t.async=!0;
+ t.src=v;s=b.getElementsByTagName(e)[0];
+ s.parentNode.insertBefore(t,s)}(window, document,'script',
+ 'https://connect.facebook.net/en_US/fbevents.js');
+ fbq('init', '11111');
+ fbq('track', 'PageView');
+ </script>
+
+
+ <script src="https://t.usermaven.com/lib.js"
+ data-key="UMdXVreRwT"
+ data-tracking-host="https://events.usermaven.com"
+ data-autocapture="true"
+ defer>
+ </script>
+ <script>window.usermaven = window.usermaven || (function(){(window.usermavenQ = window.usermavenQ || []).push(arguments);})</script>
+
+ <noscript><img height="1" width="1" style="display:none"
+ src="https://www.facebook.com/tr?id=11111&ev=PageView&noscript=1"
+ /></noscript>
+
+ <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@splidejs/[email protected]/dist/css/splide.min.css">
+
+ <script type="module">
+ import Chatbot from "https://cdn.jsdelivr.net/gh/ceelee/FlowiseChatEmbed@latest/dist/web.js"
+ Chatbot.initFull({
+ chatflowid: "",
+ apiHost: "https://eee.eee-eee-eee-eee.com",
+ theme: {
+ chatWindow: {
+ welcomeMessage: "Hi there! How can I help?",
+ }
+ }
+ })
+ </script>
+ <script>
+ !function(t,e){var o,n,p,r;e.__SV||(window.posthog=e,e._i=[],e.init=function(i,s,a){function g(t,e){var o=e.split(".");2==o.length&&(t=t[o[0]],e=o[1]),t[e]=function(){t.push([e].concat(Array.prototype.slice.call(arguments,0)))}}(p=t.createElement("script")).type="text/javascript",p.async=!0,p.src=s.api_host.replace(".i.posthog.com","-assets.i.posthog.com")+"/static/array.js",(r=t.getElementsByTagName("script")[0]).parentNode.insertBefore(p,r);var u=e;for(void 0!==a?u=e[a]=[]:a="posthog",u.people=u.people||[],u.toString=function(t){var e="posthog";return"posthog"!==a&&(e+="."+a),t||(e+=" (stub)"),e},u.people.toString=function(){return u.toString(1)+".people (stub)"},o="capture identify alias people.set people.set_once set_config register register_once unregister opt_out_capturing has_opted_out_capturing opt_in_capturing reset isFeatureEnabled onFeatureFlags getFeatureFlag getFeatureFlagPayload reloadFeatureFlags group updateEarlyAccessFeatureEnrollment getEarlyAccessFeatures getActiveMatchingSurveys getSurveys onSessionId".split(" "),n=0;n<o.length;n++)g(u,o[n]);e._i.push([i,s,a])},e.__SV=1)}(document,window.posthog||[]);
+ posthog.init('dsdsdsdsdsd',{api_host:'https://us.i.posthog.com', person_profiles: 'identified_only' // or 'always' to create profiles for anonymous users as well
+ })
+ </script>
+ `;
+ const result = await convertHtmlToJsxAndRenderToHtml(htmlCode);
+
+ expect(await formatHtml(htmlCode)).toBe(await formatHtml(result));
+});
diff --git a/packages/cli/src/html-to-jsx.ts b/packages/cli/src/html-to-jsx.ts
new file mode 100644
index 0000000000..89e7151c09
--- /dev/null
+++ b/packages/cli/src/html-to-jsx.ts
@@ -0,0 +1,168 @@
+import {
+ parseFragment,
+ defaultTreeAdapter,
+ type DefaultTreeAdapterMap,
+} from "parse5";
+import { camelCase } from "change-case";
+
+const BOOLEAN_ATTRIBUTES = new Set([
+ "async",
+ "autofocus",
+ "autoplay",
+ "checked",
+ "contenteditable",
+ "controls",
+ "default",
+ "defer",
+ "disabled",
+ "formnovalidate",
+ "hidden",
+ "ismap",
+ "itemscope",
+ "loop",
+ "multiple",
+ "muted",
+ "nomodule",
+ "novalidate",
+ "open",
+ "playsinline",
+ "readonly",
+ "required",
+ "reversed",
+ "scoped",
+ "selected",
+ "truespeed",
+]);
+
+const isBooleanAttr = (name: string) =>
+ BOOLEAN_ATTRIBUTES.has(name.toLowerCase());
+
+type WalkNode =
+ | { type: "text"; value: string }
+ | {
+ type: "element-start";
+ tagName: string;
+ attributes: [name: string, value: string][];
+ }
+ | { type: "element-end"; tagName: string };
+
+// eslint-disable-next-line func-style
+function* walkChildNodes(
+ node: DefaultTreeAdapterMap["node"]
+): IterableIterator<WalkNode> {
+ if (
+ defaultTreeAdapter.isCommentNode(node) ||
+ defaultTreeAdapter.isTextNode(node) ||
+ defaultTreeAdapter.isDocumentTypeNode(node)
+ ) {
+ throw new Error("Unsupported node type");
+ }
+
+ for (const childNode of node.childNodes) {
+ if (defaultTreeAdapter.isCommentNode(childNode)) {
+ continue;
+ }
+
+ if (defaultTreeAdapter.isTextNode(childNode)) {
+ yield { type: "text", value: childNode.value };
+ continue;
+ }
+
+ if (false === defaultTreeAdapter.isElementNode(childNode)) {
+ continue;
+ }
+
+ const attributes: [string, string][] = childNode.attrs.map((attr) => [
+ attr.name,
+ attr.value,
+ ]);
+
+ yield { type: "element-start", tagName: childNode.tagName, attributes };
+ yield* walkChildNodes(childNode);
+ yield { type: "element-end", tagName: childNode.tagName };
+ }
+}
+
+const convertStyleString = (style: string) => {
+ const styles = style
+ .split(";")
+ .map((style) => style.trim())
+ .map((style) => style.split(":").map((part) => part.trim()));
+
+ const res: Record<string, string> = {};
+ for (const [name, value] of styles) {
+ res[camelCase(name)] = value;
+ }
+ return JSON.stringify(res);
+};
+
+const toAttrString = (name: string, value: string) => {
+ const attName = name.toLowerCase();
+ const jsxName = attName === "class" ? "className" : attName;
+
+ if (value === "" && isBooleanAttr(attName)) {
+ return `${jsxName}`;
+ }
+
+ if (attName === "style") {
+ return `${jsxName}={${convertStyleString(value)}}`;
+ }
+
+ return `${jsxName}="${value}"`;
+};
+
+const attributesToString = (attributes: [string, string][]) =>
+ attributes
+ .map(([attName, value]) => ` ${toAttrString(attName, value)}`)
+ .join("");
+
+const convertTagName = (tagName: string) => {
+ const tag = tagName.toLowerCase();
+ if (tag === "script") {
+ return "Script";
+ }
+
+ if (tag === "style") {
+ return "Style";
+ }
+
+ return tag;
+};
+
+const escapeValue = (value: string) =>
+ value
+ .replace(/\\/g, "\\\\")
+ .replace(/`/g, "\\`")
+ .replace(/\$/g, "\\$")
+ .replace(/\r/g, "\\r")
+ .replace(/\n/g, "\\n");
+
+export const htmlToJsx = (html: string) => {
+ const parsedHtml = parseFragment(html, { scriptingEnabled: false });
+
+ let result = "";
+
+ for (const walkNode of walkChildNodes(parsedHtml)) {
+ switch (walkNode.type) {
+ case "text": {
+ const escapedValue = escapeValue(walkNode.value);
+
+ result += escapedValue ? "{`" + escapedValue + "`}" : "";
+ break;
+ }
+
+ case "element-start": {
+ const tag = convertTagName(walkNode.tagName);
+ result += `<${tag}${attributesToString(walkNode.attributes)}>`;
+ break;
+ }
+
+ case "element-end": {
+ result += `</${convertTagName(walkNode.tagName)}>`;
+ break;
+ }
+ }
+ }
+
+ return result;
+};
diff --git a/packages/cli/src/prebuild.ts b/packages/cli/src/prebuild.ts
index ec4adf3fc9..b389d7bf4d 100644
--- a/packages/cli/src/prebuild.ts
+++ b/packages/cli/src/prebuild.ts
@@ -61,6 +61,7 @@ import {
isFileExists,
} from "./fs-utils";
import type * as sharedConstants from "../templates/defaults/app/constants.mjs";
+import { htmlToJsx } from "./html-to-jsx";
const limit = pLimit(10);
@@ -628,6 +629,10 @@ export const prebuild = async (options: {
const favIconAsset = assets.get(projectMeta?.faviconAssetId ?? "");
const socialImageAsset = assets.get(pageMeta.socialImageAssetId ?? "");
+ const pagePath = getPagePath(pageData.page.id, siteData.build.pages);
+ const remixRoute = generateRemixRoute(pagePath);
+ const fileName = `${remixRoute}.tsx`;
+
// MARK: - TODO: XML GENERATION
const pageExports = `/* eslint-disable */
/* This is a auto generated file for building the project */ \n
@@ -652,6 +657,37 @@ export const prebuild = async (options: {
export const pageBackgroundImageAssets: ImageAsset[] =
${JSON.stringify(pageBackgroundImageAssets)}
+ ${
+ remixRoute === "_index"
+ ? `
+ ${
+ projectMeta?.code
+ ? `
+ const Script = ({children, ...props}: Record<string, string | boolean>) => {
+ if (children == null) {
+ return <script {...props} />;
+ }
+
+ return <script {...props} dangerouslySetInnerHTML={{__html: children}} />;
+ };
+ const Style = ({children, ...props}: Record<string, string | boolean>) => {
+ if (children == null) {
+ return <style {...props} />;
+ }
+
+ return <style {...props} dangerouslySetInnerHTML={{__html: children}} />;
+ };
+ `
+ : ""
+ }
+
+ export const CustomCode = () => {
+ return (<>${projectMeta?.code ? htmlToJsx(projectMeta.code) : ""}</>);
+ }
+ `
+ : ""
+ }
+
${xmlPresentationComponents}
${pageComponent}
@@ -683,28 +719,8 @@ export const prebuild = async (options: {
export const projectId = "${siteData.build.projectId}";
export const contactEmail = ${JSON.stringify(contactEmail)};
-
- export const customCode = ${JSON.stringify(
- projectMeta?.code?.trim() ?? ""
- )};
`;
- /*
- The _index is mandatory.
- Let's say there is a route /test.one.tsx and then there is a /test.tsx route.
- Remix doesn't pick the /test.tsx by default unless we mention the _index at the end.
-
- Or else it picks the first route that matches the /test as a layout and not a independent route.
- So, we need to mark the pages as _index at the end. So deep nested routes works as expected.
-
- Details:
- https://remix.run/docs/en/main/file-conventions/route-files-v2#nested-urls-without-layout-nesting
- */
-
- const pagePath = getPagePath(pageData.page.id, siteData.build.pages);
- const remixRoute = generateRemixRoute(pagePath);
- const fileName = `${remixRoute}.tsx`;
-
const routeFileContent = (
documentType === "html" ? routeFileTemplate : routeXmlFileTemplate
)
diff --git a/packages/cli/templates/cloudflare/tsconfig.json b/packages/cli/templates/cloudflare/tsconfig.json
index ca551e0086..32a71c1efa 100644
--- a/packages/cli/templates/cloudflare/tsconfig.json
+++ b/packages/cli/templates/cloudflare/tsconfig.json
@@ -8,7 +8,7 @@
"**/.client/**/*.tsx"
],
"compilerOptions": {
- "lib": ["DOM", "DOM.Iterable", "ES2022"],
+ "lib": ["DOM", "DOM.Iterable", "ES2023"],
"types": [
"@remix-run/cloudflare",
"vite/client",
diff --git a/packages/cli/templates/defaults/app/root.tsx b/packages/cli/templates/defaults/app/root.tsx
index 5755b9b230..40cefeeec7 100644
--- a/packages/cli/templates/defaults/app/root.tsx
+++ b/packages/cli/templates/defaults/app/root.tsx
@@ -1,13 +1,31 @@
-import { Links, Meta, Outlet } from "@remix-run/react";
+/* eslint-disable @typescript-eslint/ban-ts-comment */
+
+import { Links, Meta, Outlet, useMatches } from "@remix-run/react";
+// @todo think about how to make __generated__ typeable
+// @ts-ignore
+import { CustomCode } from "./__generated__/_index";
const Root = () => {
+ // Get language from matches
+ const matches = useMatches();
+
+ const lastMatchWithLanguage = matches.findLast((match) => {
+ // @ts-ignore
+ const language = match?.data?.pageMeta?.language;
+ return language != null;
+ });
+
+ // @ts-ignore
+ const lang = lastMatchWithLanguage?.data?.pageMeta?.language ?? "en";
+
return (
- <html lang="en">
+ <html lang={lang}>
<head>
<meta charSet="utf-8" />
<meta name="viewport" content="width=device-width,initial-scale=1" />
<Meta />
<Links />
+ <CustomCode />
</head>
<Outlet />
</html>
diff --git a/packages/cli/templates/defaults/app/route-templates/html.tsx b/packages/cli/templates/defaults/app/route-templates/html.tsx
index c337e6f00d..0b9b81247b 100644
--- a/packages/cli/templates/defaults/app/route-templates/html.tsx
+++ b/packages/cli/templates/defaults/app/route-templates/html.tsx
@@ -81,7 +81,6 @@ export const loader = async (arg: LoaderFunctionArgs) => {
status: pageMeta.status,
headers: {
"Cache-Control": "public, max-age=600",
- "x-ws-language": pageMeta.language ?? "en",
},
}
);
@@ -90,7 +89,6 @@ export const loader = async (arg: LoaderFunctionArgs) => {
export const headers: HeadersFunction = ({ loaderHeaders }) => {
return {
"Cache-Control": "public, max-age=0, must-revalidate",
- "x-ws-language": loaderHeaders.get("x-ws-language") ?? "",
};
};
diff --git a/packages/cli/templates/defaults/tsconfig.json b/packages/cli/templates/defaults/tsconfig.json
index 75063d6afc..c15d3bfc17 100644
--- a/packages/cli/templates/defaults/tsconfig.json
+++ b/packages/cli/templates/defaults/tsconfig.json
@@ -1,7 +1,7 @@
{
"include": ["**/*.ts", "**/*.tsx", "**/*.mjs"],
"compilerOptions": {
- "lib": ["DOM", "DOM.Iterable", "ES2022"],
+ "lib": ["DOM", "DOM.Iterable", "ESNext"],
"types": ["@remix-run/node", "vite/client"],
"isolatedModules": true,
"esModuleInterop": true,
diff --git a/packages/cli/templates/internal/tsconfig.json b/packages/cli/templates/internal/tsconfig.json
index 3a82133653..f99a0e1462 100644
--- a/packages/cli/templates/internal/tsconfig.json
+++ b/packages/cli/templates/internal/tsconfig.json
@@ -1,7 +1,7 @@
{
"include": ["**/*.ts", "**/*.tsx", "**/*.mjs"],
"compilerOptions": {
- "lib": ["DOM", "DOM.Iterable", "ES2022"],
+ "lib": ["DOM", "DOM.Iterable", "ES2023"],
"types": ["@remix-run/node", "vite/client"],
"isolatedModules": true,
"esModuleInterop": true,
diff --git a/packages/cli/templates/saas-helpers/tsconfig.json b/packages/cli/templates/saas-helpers/tsconfig.json
index 15f458bd9c..3ec9051136 100644
--- a/packages/cli/templates/saas-helpers/tsconfig.json
+++ b/packages/cli/templates/saas-helpers/tsconfig.json
@@ -8,7 +8,7 @@
"**/.client/**/*.tsx"
],
"compilerOptions": {
- "lib": ["DOM", "DOM.Iterable", "ES2022"],
+ "lib": ["DOM", "DOM.Iterable", "ES2023"],
"types": [
"@remix-run/cloudflare",
"vite/client",
diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json
index 6ede9c3049..1c1b7838e1 100644
--- a/packages/cli/tsconfig.json
+++ b/packages/cli/tsconfig.json
@@ -2,6 +2,7 @@
"extends": "@webstudio-is/tsconfig/base.json",
"include": ["**/*.ts", "**/*.tsx", "**/*.mjs"],
"compilerOptions": {
+ "lib": ["DOM", "DOM.Iterable", "ESNext"],
"types": ["vite/client"],
"module": "esnext",
"allowJs": true,
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3f3afcad3c..70b446c66f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -959,6 +959,9 @@ importers:
'@webstudio-is/sdk-components-react-remix':
specifier: workspace:*
version: link:../sdk-components-react-remix
+ change-case:
+ specifier: ^5.0.2
+ version: 5.0.2
deepmerge:
specifier: ^4.3.1
version: 4.3.1
@@ -971,6 +974,9 @@ importers:
p-limit:
specifier: ^4.0.0
version: 4.0.0
+ parse5:
+ specifier: 7.1.2
+ version: 7.1.2
picocolors:
specifier: ^1.0.1
version: 1.0.1
@@ -987,6 +993,9 @@ importers:
specifier: ^3.22.4
version: 3.22.4
devDependencies:
+ '@jest/globals':
+ specifier: ^29.7.0
+ version: 29.7.0
'@netlify/remix-adapter':
specifier: ^2.4.0
@@ -1026,6 +1035,9 @@ importers:
'@webstudio-is/form-handlers':
specifier: workspace:*
version: link:../form-handlers
+ '@webstudio-is/jest-config':
+ specifier: workspace:*
+ version: link:../jest-config
'@webstudio-is/tsconfig':
specifier: workspace:*
version: link:../tsconfig