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.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
fix: Reload scripts in HTML Embed on dynamic pages (#3587)
Ivan Starkov5e27dec1f4f7
diff --git a/fixtures/webstudio-cloudflare-template/app/routes/_index.tsx b/fixtures/webstudio-cloudflare-template/app/routes/_index.tsxindex 23d15c2f1f..511314bbd5 100644--- a/fixtures/webstudio-cloudflare-template/app/routes/_index.tsx+++ b/fixtures/webstudio-cloudflare-template/app/routes/_index.tsx@@ -316,7 +316,7 @@ export const action = async ({};const Outlet = () => {- const { system, resources } = useLoaderData<typeof loader>();+ const { system, resources, url } = useLoaderData<typeof loader>();return (<ReactSdkContext.Providervalue={{@@ -326,7 +326,8 @@ const Outlet = () => {resources,}}>- <Page system={system} />+ {/* Use the URL as the key to force scripts in HTML Embed to reload on dynamic pages */}+ <Page key={url} system={system} /></ReactSdkContext.Provider>);};diff --git a/fixtures/webstudio-custom-template/app/routes/[script-test]._index.tsx b/fixtures/webstudio-custom-template/app/routes/[script-test]._index.tsxindex dcfca65379..eb04d76dc0 100644--- a/fixtures/webstudio-custom-template/app/routes/[script-test]._index.tsx+++ b/fixtures/webstudio-custom-template/app/routes/[script-test]._index.tsx@@ -316,7 +316,7 @@ export const action = async ({};const Outlet = () => {- const { system, resources } = useLoaderData<typeof loader>();+ const { system, resources, url } = useLoaderData<typeof loader>();return (<ReactSdkContext.Providervalue={{@@ -326,7 +326,8 @@ const Outlet = () => {resources,}}>- <Page system={system} />+ {/* Use the URL as the key to force scripts in HTML Embed to reload on dynamic pages */}+ <Page key={url} system={system} /></ReactSdkContext.Provider>);};diff --git a/fixtures/webstudio-custom-template/app/routes/[world]._index.tsx b/fixtures/webstudio-custom-template/app/routes/[world]._index.tsxindex b2fbca6b23..5fde250469 100644--- a/fixtures/webstudio-custom-template/app/routes/[world]._index.tsx+++ b/fixtures/webstudio-custom-template/app/routes/[world]._index.tsx@@ -316,7 +316,7 @@ export const action = async ({};const Outlet = () => {- const { system, resources } = useLoaderData<typeof loader>();+ const { system, resources, url } = useLoaderData<typeof loader>();return (<ReactSdkContext.Providervalue={{@@ -326,7 +326,8 @@ const Outlet = () => {resources,}}>- <Page system={system} />+ {/* Use the URL as the key to force scripts in HTML Embed to reload on dynamic pages */}+ <Page key={url} system={system} /></ReactSdkContext.Provider>);};diff --git a/fixtures/webstudio-custom-template/app/routes/_index.tsx b/fixtures/webstudio-custom-template/app/routes/_index.tsxindex 23d15c2f1f..511314bbd5 100644--- a/fixtures/webstudio-custom-template/app/routes/_index.tsx+++ b/fixtures/webstudio-custom-template/app/routes/_index.tsx@@ -316,7 +316,7 @@ export const action = async ({};const Outlet = () => {- const { system, resources } = useLoaderData<typeof loader>();+ const { system, resources, url } = useLoaderData<typeof loader>();return (<ReactSdkContext.Providervalue={{@@ -326,7 +326,8 @@ const Outlet = () => {resources,}}>- <Page system={system} />+ {/* Use the URL as the key to force scripts in HTML Embed to reload on dynamic pages */}+ <Page key={url} system={system} /></ReactSdkContext.Provider>);};diff --git a/fixtures/webstudio-remix-netlify-edge-functions/app/routes/_index.tsx b/fixtures/webstudio-remix-netlify-edge-functions/app/routes/_index.tsxindex 23d15c2f1f..511314bbd5 100644--- a/fixtures/webstudio-remix-netlify-edge-functions/app/routes/_index.tsx+++ b/fixtures/webstudio-remix-netlify-edge-functions/app/routes/_index.tsx@@ -316,7 +316,7 @@ export const action = async ({};const Outlet = () => {- const { system, resources } = useLoaderData<typeof loader>();+ const { system, resources, url } = useLoaderData<typeof loader>();return (<ReactSdkContext.Providervalue={{@@ -326,7 +326,8 @@ const Outlet = () => {resources,}}>- <Page system={system} />+ {/* Use the URL as the key to force scripts in HTML Embed to reload on dynamic pages */}+ <Page key={url} system={system} /></ReactSdkContext.Provider>);};diff --git a/fixtures/webstudio-remix-netlify-functions/app/routes/_index.tsx b/fixtures/webstudio-remix-netlify-functions/app/routes/_index.tsxindex 23d15c2f1f..511314bbd5 100644--- a/fixtures/webstudio-remix-netlify-functions/app/routes/_index.tsx+++ b/fixtures/webstudio-remix-netlify-functions/app/routes/_index.tsx@@ -316,7 +316,7 @@ export const action = async ({};const Outlet = () => {- const { system, resources } = useLoaderData<typeof loader>();+ const { system, resources, url } = useLoaderData<typeof loader>();return (<ReactSdkContext.Providervalue={{@@ -326,7 +326,8 @@ const Outlet = () => {resources,}}>- <Page system={system} />+ {/* Use the URL as the key to force scripts in HTML Embed to reload on dynamic pages */}+ <Page key={url} system={system} /></ReactSdkContext.Provider>);};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.tsxindex 21205407d9..4faf2aead9 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@@ -316,7 +316,7 @@ export const action = async ({};const Outlet = () => {- const { system, resources } = useLoaderData<typeof loader>();+ const { system, resources, url } = useLoaderData<typeof loader>();return (<ReactSdkContext.Providervalue={{@@ -326,7 +326,8 @@ const Outlet = () => {resources,}}>- <Page system={system} />+ {/* Use the URL as the key to force scripts in HTML Embed to reload on dynamic pages */}+ <Page key={url} system={system} /></ReactSdkContext.Provider>);};diff --git a/fixtures/webstudio-remix-vercel/app/routes/[form]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[form]._index.tsxindex ec1967ffdb..1c51692c37 100644--- a/fixtures/webstudio-remix-vercel/app/routes/[form]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/routes/[form]._index.tsx@@ -316,7 +316,7 @@ export const action = async ({};const Outlet = () => {- const { system, resources } = useLoaderData<typeof loader>();+ const { system, resources, url } = useLoaderData<typeof loader>();return (<ReactSdkContext.Providervalue={{@@ -326,7 +326,8 @@ const Outlet = () => {resources,}}>- <Page system={system} />+ {/* Use the URL as the key to force scripts in HTML Embed to reload on dynamic pages */}+ <Page key={url} system={system} /></ReactSdkContext.Provider>);};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.tsxindex ec800825b4..00dc214ac7 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@@ -316,7 +316,7 @@ export const action = async ({};const Outlet = () => {- const { system, resources } = useLoaderData<typeof loader>();+ const { system, resources, url } = useLoaderData<typeof loader>();return (<ReactSdkContext.Providervalue={{@@ -326,7 +326,8 @@ const Outlet = () => {resources,}}>- <Page system={system} />+ {/* Use the URL as the key to force scripts in HTML Embed to reload on dynamic pages */}+ <Page key={url} system={system} /></ReactSdkContext.Provider>);};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.tsxindex 511b3f043e..c5697f5cf9 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@@ -316,7 +316,7 @@ export const action = async ({};const Outlet = () => {- const { system, resources } = useLoaderData<typeof loader>();+ const { system, resources, url } = useLoaderData<typeof loader>();return (<ReactSdkContext.Providervalue={{@@ -326,7 +326,8 @@ const Outlet = () => {resources,}}>- <Page system={system} />+ {/* Use the URL as the key to force scripts in HTML Embed to reload on dynamic pages */}+ <Page key={url} system={system} /></ReactSdkContext.Provider>);};diff --git a/fixtures/webstudio-remix-vercel/app/routes/[radix]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[radix]._index.tsxindex daa861e4a1..3677d4f37e 100644--- a/fixtures/webstudio-remix-vercel/app/routes/[radix]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/routes/[radix]._index.tsx@@ -316,7 +316,7 @@ export const action = async ({};const Outlet = () => {- const { system, resources } = useLoaderData<typeof loader>();+ const { system, resources, url } = useLoaderData<typeof loader>();return (<ReactSdkContext.Providervalue={{@@ -326,7 +326,8 @@ const Outlet = () => {resources,}}>- <Page system={system} />+ {/* Use the URL as the key to force scripts in HTML Embed to reload on dynamic pages */}+ <Page key={url} system={system} /></ReactSdkContext.Provider>);};diff --git a/fixtures/webstudio-remix-vercel/app/routes/[resources]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[resources]._index.tsxindex 68cd17874a..fb4fbd5aff 100644--- a/fixtures/webstudio-remix-vercel/app/routes/[resources]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/routes/[resources]._index.tsx@@ -316,7 +316,7 @@ export const action = async ({};const Outlet = () => {- const { system, resources } = useLoaderData<typeof loader>();+ const { system, resources, url } = useLoaderData<typeof loader>();return (<ReactSdkContext.Providervalue={{@@ -326,7 +326,8 @@ const Outlet = () => {resources,}}>- <Page system={system} />+ {/* Use the URL as the key to force scripts in HTML Embed to reload on dynamic pages */}+ <Page key={url} system={system} /></ReactSdkContext.Provider>);};diff --git a/fixtures/webstudio-remix-vercel/app/routes/_index.tsx b/fixtures/webstudio-remix-vercel/app/routes/_index.tsxindex 23d15c2f1f..511314bbd5 100644--- a/fixtures/webstudio-remix-vercel/app/routes/_index.tsx+++ b/fixtures/webstudio-remix-vercel/app/routes/_index.tsx@@ -316,7 +316,7 @@ export const action = async ({};const Outlet = () => {- const { system, resources } = useLoaderData<typeof loader>();+ const { system, resources, url } = useLoaderData<typeof loader>();return (<ReactSdkContext.Providervalue={{@@ -326,7 +326,8 @@ const Outlet = () => {resources,}}>- <Page system={system} />+ {/* Use the URL as the key to force scripts in HTML Embed to reload on dynamic pages */}+ <Page key={url} system={system} /></ReactSdkContext.Provider>);};diff --git a/packages/cli/templates/defaults/app/route-templates/html.tsx b/packages/cli/templates/defaults/app/route-templates/html.tsxindex e2ab0912cd..a57261ff91 100644--- a/packages/cli/templates/defaults/app/route-templates/html.tsx+++ b/packages/cli/templates/defaults/app/route-templates/html.tsx@@ -316,7 +316,7 @@ export const action = async ({};const Outlet = () => {- const { system, resources } = useLoaderData<typeof loader>();+ const { system, resources, url } = useLoaderData<typeof loader>();return (<ReactSdkContext.Providervalue={{@@ -326,7 +326,8 @@ const Outlet = () => {resources,}}>- <Page system={system} />+ {/* Use the URL as the key to force scripts in HTML Embed to reload on dynamic pages */}+ <Page key={url} system={system} /></ReactSdkContext.Provider>);};diff --git a/packages/sdk-components-react/src/html-embed-patchers.ts b/packages/sdk-components-react/src/html-embed-patchers.tsindex 75d3585816..759b2acea0 100644--- a/packages/sdk-components-react/src/html-embed-patchers.ts+++ b/packages/sdk-components-react/src/html-embed-patchers.ts@@ -25,8 +25,6 @@ export const patchDomEvents = () => {domContentLoadedPatched = true;- console.info("Patching DOMContentLoaded event listener");-const originalAddEventListener = document.addEventListener;const originalWindowAddEventListener = window.addEventListener;diff --git a/packages/sdk-components-react/src/html-embed.tsx b/packages/sdk-components-react/src/html-embed.tsxindex 1a493885dd..c5c4ce6076 100644--- a/packages/sdk-components-react/src/html-embed.tsx+++ b/packages/sdk-components-react/src/html-embed.tsx@@ -70,7 +70,6 @@ const processSyncTasks = async (syncTasks: ScriptTask[]) => {patchDomEvents();- console.info("Start processing sync tasks");processing = true;while (syncTasksQueue.length > 0) {@@ -81,7 +80,6 @@ const processSyncTasks = async (syncTasks: ScriptTask[]) => {executeDomEvents();processing = false;- console.info("Stop processing sync tasks");};// Inspiration https://ghinda.net/article/script-tags