Switch to an Object for static query results from a Map

gatsbyjs · Jul 29, 2020 · 26cac8a · 26cac8a
1 parent 6fecdea
commit 26cac8a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 30 deletions.
diff --git a/packages/gatsby/cache-dir/ensure-resources.js b/packages/gatsby/cache-dir/ensure-resources.js
@@ -82,7 +82,6 @@ Run \`gatsby clean\` to remove any cached elements.`
       )
     }
 
-    console.log({ pageResources: this.state.pageResources })
     return this.props.children(this.state)
   }
 }

diff --git a/packages/gatsby/cache-dir/gatsby-browser-entry.js b/packages/gatsby/cache-dir/gatsby-browser-entry.js
@@ -35,17 +35,14 @@ const StaticQuery = props => {
 
   return (
     <StaticQueryContext.Consumer>
-      {staticQueryData => {
-        console.log({ staticQueryData })
-        return (
-          <StaticQueryDataRenderer
-            data={data}
-            query={query}
-            render={render || children}
-            staticQueryData={staticQueryData}
-          />
-        )
-      }}
+      {staticQueryData => (
+        <StaticQueryDataRenderer
+          data={data}
+          query={query}
+          render={render || children}
+          staticQueryData={staticQueryData}
+        />
+      )}
     </StaticQueryContext.Consumer>
   )
 }
@@ -77,10 +74,6 @@ useStaticQuery(graphql\`${query}\`);
   if (context?.[query]?.data) {
     return context[query].data
   } else {
-    console.log({
-      context: context,
-      query: query,
-    })
     throw new Error(
       `The result of this StaticQuery could not be fetched.\n\n` +
         `This is likely a bug in Gatsby and if refreshing the page does not fix it, ` +

diff --git a/packages/gatsby/cache-dir/loader.js b/packages/gatsby/cache-dir/loader.js
@@ -92,7 +92,7 @@ export class BaseLoader {
     // }
     this.pageDb = new Map()
     this.inFlightDb = new Map()
-    this.staticQueryDb = new Map()
+    this.staticQueryDb = {}
     this.pageDataDb = new Map()
     this.prefetchTriggered = new Set()
     this.prefetchCompleted = new Set()
@@ -207,10 +207,8 @@ export class BaseLoader {
   // TODO check all uses of this and whether they use undefined for page resources not exist
   loadPage(rawPath) {
     const pagePath = findPath(rawPath)
-    console.log({ pageDb: this.pageDb })
     if (this.pageDb.has(pagePath)) {
       const page = this.pageDb.get(pagePath)
-      console.log({ payload: page.payload })
       return Promise.resolve(page.payload)
     }
 
@@ -260,8 +258,8 @@ export class BaseLoader {
       const staticQueryBatchPromise = Promise.all(
         staticQueryHashes.map(staticQueryHash => {
           // Check for cache in case this static query result has already been loaded
-          if (this.staticQueryDb.has(staticQueryHash)) {
-            const jsonPayload = this.staticQueryDb.get(staticQueryHash)
+          if (this.staticQueryDb[staticQueryHash]) {
+            const jsonPayload = this.staticQueryDb[staticQueryHash]
             return { staticQueryHash, jsonPayload }
           }
 
@@ -277,7 +275,7 @@ export class BaseLoader {
 
         staticQueryResults.forEach(({ staticQueryHash, jsonPayload }) => {
           staticQueryResultsMap[staticQueryHash] = jsonPayload
-          this.staticQueryDb.set(staticQueryHash, jsonPayload)
+          this.staticQueryDb[staticQueryHash] = jsonPayload
         })
 
         return staticQueryResultsMap
@@ -531,7 +529,7 @@ export const publicLoader = {
   isPageNotFound: rawPath => instance.isPageNotFound(rawPath),
   hovering: rawPath => instance.hovering(rawPath),
   loadAppData: () => instance.loadAppData(),
-  getStaticQueryDb: () => Object.fromEntries(instance.staticQueryDb),
+  getStaticQueryResults: () => instance.staticQueryDb,
 }
 
 export default publicLoader
diff --git a/packages/gatsby/cache-dir/production-app.js b/packages/gatsby/cache-dir/production-app.js
@@ -71,13 +71,7 @@ apiRunnerAsync(`onClientEntry`).then(() => {
           {({ location }) => (
             <EnsureResources location={location}>
               {({ pageResources, location }) => {
-                const staticQueryResults = publicLoader.getStaticQueryDb()
-
-                console.log({
-                  pageResources: pageResources.staticQueryResults,
-                  staticQueryResults,
-                })
-
+                const staticQueryResults = publicLoader.getStaticQueryResults()
                 return (
                   <StaticQueryContext.Provider value={staticQueryResults}>
                     <DataContext.Provider value={{ pageResources, location }}>
-Original file line number
+Diff line change
@@ Expand Up / @@ -82,7 +82,6 @@ Run \`gatsby clean\` to remove any cached elements.` @@
           )
         }
-        console.log({ pageResources: this.state.pageResources })
         return this.props.children(this.state)
       }
     }
@@ Expand Down @@