inline page-data object in html when it contains serverData

gatsbyjs · Sep 11, 2021 · bdf42b5 · bdf42b5
1 parent 709271e
commit bdf42b5
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/packages/gatsby/cache-dir/loader.js b/packages/gatsby/cache-dir/loader.js
@@ -487,7 +487,7 @@ const createComponentUrls = componentChunkName =>
   )
 
 export class ProdLoader extends BaseLoader {
-  constructor(asyncRequires, matchPaths) {
+  constructor(asyncRequires, matchPaths, pageData) {
     const loadComponent = chunkName => {
       if (!asyncRequires.components[chunkName]) {
         throw new Error(
@@ -504,6 +504,14 @@ export class ProdLoader extends BaseLoader {
     }
 
     super(loadComponent, matchPaths)
+
+    if (pageData) {
+      this.pageDataDb.set(pageData.path, {
+        pagePath: pageData.path,
+        payload: pageData,
+        status: `success`,
+      })
+    }
   }
 
   doPrefetch(pagePath) {

diff --git a/packages/gatsby/cache-dir/production-app.js b/packages/gatsby/cache-dir/production-app.js
@@ -25,7 +25,7 @@ import stripPrefix from "./strip-prefix"
 // Generated during bootstrap
 import matchPaths from "$virtual/match-paths.json"
 
-const loader = new ProdLoader(asyncRequires, matchPaths)
+const loader = new ProdLoader(asyncRequires, matchPaths, window.pageData)
 setLoader(loader)
 loader.setApiRunner(apiRunner)
 

diff --git a/packages/gatsby/cache-dir/static-entry.js b/packages/gatsby/cache-dir/static-entry.js
@@ -110,6 +110,7 @@ export default async function staticPage({
   scripts,
   reversedStyles,
   reversedScripts,
+  inlinePageData = false,
 }) {
   // for this to work we need this function to be sync or at least ensure there is single execution of it at a time
   global.unsafeBuiltinUsage = []
@@ -330,7 +331,7 @@ export default async function staticPage({
       )
     })
 
-    if (pageData) {
+    if (pageData && !inlinePageData) {
       headComponents.push(
         <link
           as="fetch"
@@ -393,7 +394,9 @@ export default async function staticPage({
     })
 
     // Add page metadata for the current page
-    const windowPageData = `/*<![CDATA[*/window.pagePath="${pagePath}";/*]]>*/`
+    const windowPageData = `/*<![CDATA[*/window.pagePath="${pagePath}";${
+      inlinePageData ? `window.pageData=${JSON.stringify(pageData)};` : ``
+    }/*]]>*/`
 
     postBodyComponents.push(
       <script

diff --git a/packages/gatsby/src/utils/page-ssr-module/entry.ts b/packages/gatsby/src/utils/page-ssr-module/entry.ts
@@ -165,6 +165,7 @@ export async function renderHTML({
     pageData,
     staticQueryContext,
     ...data.templateDetails.assets,
+    inlinePageData: data.page.mode === `SSR` && data.results.serverData,
   })
 
   return results.html