fix(gatsby): correctly inject static query in theme components

packages/gatsby/src/internal-plugins/query-runner/__tests__/query-compiler.js

@@ -0,0 +1,96 @@
+jest.mock(`glob`, () => {
+  const sync = jest.fn().mockImplementation(() => [])
+  return {
+    sync,
+  }
+})
+const path = require(`path`)
+const glob = require(`glob`)
+const { resolveThemes, Runner } = require(`../query-compiler`)
+
+const base = path.resolve(``)
+
+describe(`Runner`, () => {
+  beforeEach(() => {
+    glob.sync.mockClear()
+  })
+
+  it(`returns a file parser instance`, async () => {
+    const runner = new Runner(base, [], {})
+
+    const parser = await runner.parseEverything()
+
+    expect(parser).toEqual(new Map())
+  })
+
+  describe(`expected directories`, () => {
+    it(`compiles src directory`, async () => {
+      const runner = new Runner(base, [], {})
+
+      await runner.parseEverything()
+
+      expect(glob.sync).toHaveBeenCalledWith(
+        expect.stringContaining(path.join(base, `src`)),
+        expect.any(Object)
+      )
+    })
+
+    it(`compiles fragments directory`, async () => {
+      const runner = new Runner(base, [], {})
+
+      await runner.parseEverything()
+
+      expect(glob.sync).toHaveBeenCalledWith(
+        expect.stringContaining(path.join(base, `src`)),
+        expect.any(Object)
+      )
+    })
+
+    it(`compiles themes directory(s)`, async () => {
+      const theme = `gatsby-theme-whatever`
+      const runner = new Runner(base, [path.join(`node_modules`, theme)], {})
+
+      await runner.parseEverything()
+
+      expect(glob.sync).toHaveBeenCalledWith(
+        expect.stringContaining(path.join(base, `node_modules`, theme)),
+        expect.any(Object)
+      )
+    })
+  })
+})
+
+describe(`resolveThemes`, () => {
+  it(`returns empty array if zero themes detected`, () => {
+    ;[
+      [],
+      [{ resolve: path.join(base, `gatsby-plugin-whatever`) }],
+      undefined,
+    ].forEach(testRun => {
+      expect(resolveThemes(base, testRun)).toEqual([])
+    })
+  })
+
+  it(`returns plugins matching gatsby-theme prefix`, () => {
+    const theme = `gatsby-theme-example`
+    expect(
+      resolveThemes(base, [
+        {
+          resolve: path.join(base, `gatsby-theme-example`),
+        },
+      ])
+    ).toEqual([theme])
+  })
+
+  it(`handles scoped packages`, () => {
+    const theme = `@dschau/gatsby-theme-example`
+
+    expect(
+      resolveThemes(base, [
+        {
+          resolve: path.join(base, theme),
+        },
+      ])
+    ).toEqual([theme])
+  })
+})

packages/gatsby/src/internal-plugins/query-runner/query-compiler.js

@@ -64,15 +64,24 @@ const validationRules = [
 let lastRunHadErrors = null
 const overlayErrorID = `graphql-compiler`
 
+const resolveThemes = (base, plugins = []) =>
+  plugins.reduce((merged, plugin) => {
+    if (plugin.resolve.includes(`gatsby-theme-`)) {
+      merged.push(path.relative(base, plugin.resolve))
+    }
+    return merged
+  }, [])
+
 class Runner {
-  baseDir: string
+  base: string
+  additional: string[]
   schema: GraphQLSchema
   errors: string[]
   fragmentsDir: string
 
-  constructor(baseDir: string, fragmentsDir: string, schema: GraphQLSchema) {
-    this.baseDir = baseDir
-    this.fragmentsDir = fragmentsDir
+  constructor(base: string, additional: string[], schema: GraphQLSchema) {
+    this.base = base
+    this.additional = additional
     this.schema = schema
   }
 
@@ -91,14 +100,20 @@ class Runner {
   }
 
   async parseEverything() {
-    // FIXME: this should all use gatsby's configuration to determine parsable
-    // files (and how to parse them)
-    let files = glob.sync(`${this.fragmentsDir}/**/*.+(t|j)s?(x)`, {
-      nodir: true,
-    })
-    files = files.concat(
-      glob.sync(`${this.baseDir}/**/*.+(t|j)s?(x)`, { nodir: true })
-    )
+    const filesRegex = `/**/*.+(t|j)s?(x)`
+    let files = [`${this.base}/src`, `${this.base}/.cache/fragments`]
+      .concat(
+        this.additional.map(additional => path.join(this.base, additional))
+      )
+      .reduce(
+        (merged, base) =>
+          merged.concat(
+            glob.sync(`${base}${filesRegex}`, {
+              nodir: true,
+            })
+          ),
+        []
+      )
     files = files.filter(d => !d.match(/\.d\.ts$/))
     files = files.map(normalize)
 
@@ -217,14 +232,14 @@ class Runner {
     return compiledNodes
   }
 }
-export { Runner }
+export { Runner, resolveThemes }
 
 export default async function compile(): Promise<Map<string, RootQuery>> {
-  const { program, schema } = store.getState()
+  const { program, schema, plugins } = store.getState()
 
   const runner = new Runner(
-    `${program.directory}/src`,
-    `${program.directory}/.cache/fragments`,
+    program.directory,
+    resolveThemes(program.directory, plugins),
     schema
   )