Merge branch 'main' into dev/static-page-get-path-issues

yext · Nov 3, 2023 · 79f1b27 · 79f1b27
2 parents da55b5e + 8a7a60d
commit 79f1b27
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/packages/pages/src/common/src/template/hydration.ts b/packages/pages/src/common/src/template/hydration.ts
@@ -36,7 +36,7 @@ export const getHydrationTemplateDev = (
     render(
     {
         Page: Component,
-        pageProps: ${JSON.stringify(props)},
+        pageProps: ${getPagePropsString(props)},
     }
     );
   `;
@@ -76,12 +76,18 @@ export const getHydrationTemplate = (
         render.render(
         {
             Page: component.default,
-            pageProps: ${JSON.stringify(props)},
+            pageProps: ${getPagePropsString(props)},
         }
         );
     `;
 };
 
+const getPagePropsString = (props: TemplateRenderProps) => {
+  return `JSON.parse(decodeURIComponent("${encodeURIComponent(
+    JSON.stringify(props)
+  )}"))`;
+};
+
 const makeAbsolute = (path: string): string => {
   if (!path.startsWith("/")) {
     return "/" + path;