fix(gatsby): ignore __esModule export in gatsby-node exports (gatsbyj…

…s#13081) I introduced bug/regression in gatsbyjs#13053 by not removing `__esModule` export name from resolved export names - it break some plugins Fixes: gatsbyjs#13079
ajordanow · Apr 3, 2019 · 1c78ffb · 1c78ffb
1 parent bb43fe0
commit 1c78ffb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/packages/gatsby/src/bootstrap/__mocks__/require/exports.js b/packages/gatsby/src/bootstrap/__mocks__/require/exports.js
@@ -1,2 +1,3 @@
 exports.foo = () => {}
 exports.bar = () => {}
+exports.__esModule = true
diff --git a/packages/gatsby/src/bootstrap/__mocks__/require/unusual-exports.js b/packages/gatsby/src/bootstrap/__mocks__/require/unusual-exports.js
@@ -4,3 +4,6 @@ Object.defineProperty(exports, `foo`, {
     return () => {}
   },
 })
+Object.defineProperty(exports, `__esModule`, {
+  value: true,
+})
diff --git a/packages/gatsby/src/bootstrap/resolve-module-exports.js b/packages/gatsby/src/bootstrap/resolve-module-exports.js
@@ -123,7 +123,9 @@ https://gatsby.dev/no-mixed-modules
 module.exports = (modulePath, { mode = `analysis`, resolver } = {}) => {
   if (mode === `require`) {
     try {
-      return Object.keys(require(modulePath))
+      return Object.keys(require(modulePath)).filter(
+        exportName => exportName !== `__esModule`
+      )
     } catch {
       return []
     }