feat(gatsby): Traverse re-exports in static query mapper (gatsbyjs#36943

)

integration-tests/artifacts/__tests__/index.js

@@ -426,6 +426,15 @@ describe(`First run (baseline)`, () => {
       expect(staticQueryHashes.sort()).toEqual(queries.map(hashQuery).sort())
     })
 
+    test(`are written correctly when a re-exported query is imported`, async () => {
+      const queries = [titleQuery, ...globalQueries]
+      const pagePath = `/import-re-export/`
+
+      const { staticQueryHashes } = await readPageData(publicDir, pagePath)
+
+      expect(staticQueryHashes.sort()).toEqual(queries.map(hashQuery).sort())
+    })
+
     test(`are written correctly when dynamically imported`, async () => {
       const queries = [titleQuery, ...globalQueries]
       const pagePath = `/dynamic/`

integration-tests/artifacts/src/components/title-named-export.js

@@ -0,0 +1,7 @@
+import React from "react"
+import { useTitle } from "../hooks/use-title"
+
+export function Title() {
+  const title = useTitle()
+  return <div>{title}</div>
+}

integration-tests/artifacts/src/components/title-re-export.js

@@ -0,0 +1 @@
+export { Title as TitleReExport } from "./title-named-export"

integration-tests/artifacts/src/pages/import-re-export.js

@@ -0,0 +1,6 @@
+import React from "react"
+import { TitleReExport } from "../components/title-re-export"
+
+export default function ImportReExport() {
+  return <TitleReExport />
+}

packages/gatsby/src/utils/webpack/plugins/static-query-mapper.ts

@@ -240,13 +240,7 @@ export class StaticQueryMapper {
             compilation.moduleGraph.getIncomingConnections(module)
           for (const connection of incomingConnections) {
             if (connection.originModule instanceof NormalModule) {
-              const shouldTraverse =
-                connection.dependency?.type !==
-                `harmony export imported specifier`
-
-              if (shouldTraverse) {
-                traverseModule(connection.originModule, config, visitedModules)
-              }
+              traverseModule(connection.originModule, config, visitedModules)
             }
           }
         }