Revert "feat(gatsby): Track static queries by template (#25120)" (#25493)

This reverts commit 6b39645.

Author: freiksenet

.circleci/config.yml

@@ -281,12 +281,6 @@ jobs:
       - e2e-test:
           test_path: integration-tests/structured-logging
 
-  integration_tests_artifacts:
-    executor: node
-    steps:
-      - e2e-test:
-          test_path: integration-tests/artifacts
-
   e2e_tests_path-prefix:
     <<: *e2e-executor
     environment:
@@ -576,8 +570,6 @@ workflows:
           <<: *e2e-test-workflow
       - integration_tests_structured_logging:
           <<: *e2e-test-workflow
-      - integration_tests_artifacts:
-          <<: *e2e-test-workflow
       - integration_tests_gatsby_cli:
           requires:
             - bootstrap

integration-tests/artifacts/LICENSE

@@ -432,5 +432,4 @@ export {
   StringInterpolationNotAllowedError,
   EmptyGraphQLTagError,
   GraphQLSyntaxError,
-  murmurhash,
 }

integration-tests/artifacts/README.md

@@ -1,11 +1,8 @@
 import { Span } from "opentracing"
 import webpack from "webpack"
-import { isEqual } from "lodash"
 import flatMap from "lodash/flatMap"
 
 import webpackConfig from "../utils/webpack.config"
-import { store } from "../redux"
-import { mapTemplatesToStaticQueryHashes } from "../utils/map-pages-to-static-query-hashes"
 
 import { IProgram } from "./types"
 
@@ -26,44 +23,7 @@ export const buildProductionBundle = async (
   )
 
   return new Promise((resolve, reject) => {
-    const compiler = webpack(compilerConfig)
-
-    compiler.hooks.compilation.tap(`webpack-dep-tree-plugin`, compilation => {
-      compilation.hooks.seal.tap(`webpack-dep-tree-plugin`, () => {
-        const state = store.getState()
-        const mapOfTemplatesToStaticQueryHashes = mapTemplatesToStaticQueryHashes(
-          state,
-          compilation
-        )
-
-        mapOfTemplatesToStaticQueryHashes.forEach(
-          (staticQueryHashes, componentPath) => {
-            if (
-              !isEqual(
-                state.staticQueriesByTemplate.get(componentPath),
-                staticQueryHashes.map(String)
-              )
-            ) {
-              store.dispatch({
-                type: `ADD_PENDING_TEMPLATE_DATA_WRITE`,
-                payload: {
-                  componentPath,
-                },
-              })
-              store.dispatch({
-                type: `SET_STATIC_QUERIES_BY_TEMPLATE`,
-                payload: {
-                  componentPath,
-                  staticQueryHashes,
-                },
-              })
-            }
-          }
-        )
-      })
-    })
-
-    compiler.run((err, stats) => {
+    webpack(compilerConfig).run((err, stats) => {
       if (err) {
         return reject(err)
       }

integration-tests/artifacts/__tests__/static-queries.js

@@ -204,7 +204,7 @@ module.exports = async (program: IProgram): Promise<void> => {
             })
             queryWatcher.startWatchDeletePage()
 
-            await startWebpackServer({ program, app, workerPool, store })
+            await startWebpackServer({ program, app, workerPool })
           },
         },
       },

integration-tests/artifacts/gatsby-browser.js

@@ -58,7 +58,6 @@ Object {
     "pagePaths": Set {},
     "templatePaths": Set {},
   },
-  "staticQueriesByTemplate": Map {},
   "staticQueryComponents": Map {},
   "status": Object {
     "PLUGINS_HASH": "",

integration-tests/artifacts/gatsby-config.js

@@ -86,7 +86,6 @@ export const saveState = (): void => {
     pageDataStats: state.pageDataStats,
     pageData: state.pageData,
     pendingPageDataWrites: state.pendingPageDataWrites,
-    staticQueriesByTemplate: state.staticQueriesByTemplate,
   })
 }
 

integration-tests/artifacts/gatsby-ssr.js

@@ -25,7 +25,6 @@ import { flattenedPluginsReducer } from "./flattened-plugins"
 import { pendingPageDataWritesReducer } from "./pending-page-data-writes"
 import { schemaCustomizationReducer } from "./schema-customization"
 import { inferenceMetadataReducer } from "./inference-metadata"
-import { staticQueriesByTemplateReducer } from "./static-queries-by-template"
 
 /**
  * @property exports.nodesTouched Set<string>
@@ -58,5 +57,4 @@ export {
   pageDataStatsReducer as pageDataStats,
   pageDataReducer as pageData,
   pendingPageDataWritesReducer as pendingPageDataWrites,
-  staticQueriesByTemplateReducer as staticQueriesByTemplate,
 }

integration-tests/artifacts/jest.config.js

@@ -199,7 +199,6 @@ export interface IGatsbyState {
     IGatsbyStaticQueryComponents["id"],
     IGatsbyStaticQueryComponents
   >
-  staticQueriesByTemplate: Map<SystemPath, Identifier[]>
   pendingPageDataWrites: {
     pagePaths: Set<string>
     templatePaths: Set<SystemPath>
@@ -256,7 +255,6 @@ export interface ICachedReduxState {
   webpackCompilationHash: IGatsbyState["webpackCompilationHash"]
   pageDataStats: IGatsbyState["pageDataStats"]
   pageData: IGatsbyState["pageData"]
-  staticQueriesByTemplate: IGatsbyState["staticQueriesByTemplate"]
   pendingPageDataWrites: IGatsbyState["pendingPageDataWrites"]
 }
 
@@ -306,7 +304,6 @@ export type ActionsUnion =
   | ICreateJobAction
   | ISetJobAction
   | IEndJobAction
-  | ISetStaticQueriesByTemplateAction
   | IAddPendingPageDataWriteAction
   | IAddPendingTemplateDataWriteAction
   | IClearPendingPageDataWritesAction
@@ -582,14 +579,6 @@ export interface IRemoveTemplateComponentAction {
   }
 }
 
-export interface ISetStaticQueriesByTemplateAction {
-  type: `SET_STATIC_QUERIES_BY_TEMPLATE`
-  payload: {
-    componentPath: string
-    staticQueryHashes: Identifier[]
-  }
-}
-
 export interface IAddPendingPageDataWriteAction {
   type: `ADD_PENDING_PAGE_DATA_WRITE`
   payload: {

integration-tests/artifacts/package.json

@@ -3,7 +3,6 @@ import report from "gatsby-cli/lib/reporter"
 import formatWebpackMessages from "react-dev-utils/formatWebpackMessages"
 import chalk from "chalk"
 import { Compiler } from "webpack"
-import { isEqual } from "lodash"
 
 import {
   reportWebpackWarnings,
@@ -21,19 +20,17 @@ import {
   markWebpackStatusAsDone,
 } from "../utils/webpack-status"
 import { enqueueFlush } from "../utils/page-data"
-import { mapTemplatesToStaticQueryHashes } from "../utils/map-pages-to-static-query-hashes"
 
 export async function startWebpackServer({
   program,
   app,
   workerPool,
-  store,
 }: Partial<IBuildContext>): Promise<{
   compiler: Compiler
   websocketManager: WebsocketManager
 }> {
-  if (!program || !app || !store) {
-    report.panic(`Missing required params`)
+  if (!program || !app) {
+    throw new Error(`Missing required params`)
   }
   let { compiler, webpackActivity, websocketManager } = await startServer(
     program,
@@ -112,45 +109,9 @@ export async function startWebpackServer({
         webpackActivity.end()
         webpackActivity = null
       }
-
-      if (isSuccessful) {
-        const state = store.getState()
-        const mapOfTemplatesToStaticQueryHashes = mapTemplatesToStaticQueryHashes(
-          state,
-          stats.compilation
-        )
-
-        mapOfTemplatesToStaticQueryHashes.forEach(
-          (staticQueryHashes, componentPath) => {
-            if (
-              !isEqual(
-                state.staticQueriesByTemplate.get(componentPath),
-                staticQueryHashes.map(String)
-              )
-            ) {
-              store.dispatch({
-                type: `ADD_PENDING_TEMPLATE_DATA_WRITE`,
-                payload: {
-                  componentPath,
-                },
-              })
-              store.dispatch({
-                type: `SET_STATIC_QUERIES_BY_TEMPLATE`,
-                payload: {
-                  componentPath,
-                  staticQueryHashes,
-                },
-              })
-            }
-          }
-        )
-
-        enqueueFlush()
-      }
-
+      enqueueFlush()
       markWebpackStatusAsDone()
       done()
-
       resolve({ compiler, websocketManager })
     })
   })

integration-tests/artifacts/src/components/author.js

@@ -11,7 +11,6 @@ interface IPageData {
   componentChunkName: IGatsbyPage["componentChunkName"]
   matchPath?: IGatsbyPage["matchPath"]
   path: IGatsbyPage["path"]
-  staticQueryHashes: string[]
 }
 
 export interface IPageDataWithQueryResult extends IPageData {
@@ -56,12 +55,7 @@ export async function removePageData(
 
 export async function writePageData(
   publicDir: string,
-  {
-    componentChunkName,
-    matchPath,
-    path: pagePath,
-    staticQueryHashes,
-  }: IPageData
+  { componentChunkName, matchPath, path: pagePath }: IPageData
 ): Promise<IPageDataWithQueryResult> {
   const inputFilePath = path.join(
     publicDir,
@@ -77,7 +71,6 @@ export async function writePageData(
     path: pagePath,
     matchPath,
     result,
-    staticQueryHashes,
   }
   const bodyStr = JSON.stringify(body)
   // transform asset size to kB (from bytes) to fit 64 bit to numbers
@@ -109,13 +102,7 @@ export async function flush(): Promise<void> {
   }
   isFlushPending = false
   isFlushing = true
-  const {
-    pendingPageDataWrites,
-    components,
-    pages,
-    program,
-    staticQueriesByTemplate,
-  } = store.getState()
+  const { pendingPageDataWrites, components, pages, program } = store.getState()
 
   const { pagePaths, templatePaths } = pendingPageDataWrites
 
@@ -140,15 +127,9 @@ export async function flush(): Promise<void> {
     // them, a page might not exist anymore щ（ﾟДﾟщ）
     // This is why we need this check
     if (page) {
-      const staticQueryHashes =
-        staticQueriesByTemplate.get(page.componentPath)?.map(String) || []
-
       const result = await writePageData(
         path.join(program.directory, `public`),
-        {
-          ...page,
-          staticQueryHashes,
-        }
+        page
       )
 
       if (program?._?.[0] === `develop`) {