fix(gatsby): test plugin name to handle symlinks, rather than path (#…

…10835)
gatsbyjs · Jan 8, 2019 · f914607 · f914607
1 parent 9b6f365
commit f914607
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/packages/gatsby/src/internal-plugins/query-runner/__tests__/query-compiler.js b/packages/gatsby/src/internal-plugins/query-runner/__tests__/query-compiler.js
@@ -68,7 +68,12 @@ describe(`resolveThemes`, () => {
   it(`returns empty array if zero themes detected`, () => {
     ;[
       [],
-      [{ resolve: path.join(base, `gatsby-plugin-whatever`) }],
+      [
+        {
+          name: `gatsby-plugin-whatever`,
+          resolve: path.join(base, `gatsby-plugin-whatever`),
+        },
+      ],
       undefined,
     ].forEach(testRun => {
       expect(resolveThemes(testRun)).toEqual([])
@@ -80,6 +85,7 @@ describe(`resolveThemes`, () => {
     expect(
       resolveThemes([
         {
+          name: theme,
           resolve: path.join(base, `gatsby-theme-example`),
         },
       ])
@@ -92,6 +98,7 @@ describe(`resolveThemes`, () => {
     expect(
       resolveThemes([
         {
+          name: theme,
           resolve: path.join(base, theme),
         },
       ])

diff --git a/packages/gatsby/src/internal-plugins/query-runner/query-compiler.js b/packages/gatsby/src/internal-plugins/query-runner/query-compiler.js
@@ -66,7 +66,7 @@ const overlayErrorID = `graphql-compiler`
 
 const resolveThemes = (plugins = []) =>
   plugins.reduce((merged, plugin) => {
-    if (plugin.resolve.includes(`gatsby-theme-`)) {
+    if (plugin.name.includes(`gatsby-theme-`)) {
       merged.push(plugin.resolve)
     }
     return merged