fix(gatsby): ignore __esModule property when resolving module expor…

…ts (#9226)
gatsbyjs · Oct 18, 2018 · c57f1e0 · c57f1e0
1 parent 35eacd7
commit c57f1e0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/packages/gatsby/src/bootstrap/__tests__/resolve-module-exports.js b/packages/gatsby/src/bootstrap/__tests__/resolve-module-exports.js
@@ -107,6 +107,10 @@ describe(`Resolve module exports`, () => {
         return createElement(ReplaceComponentRenderer, { ...props, loader })
       }
     `,
+    "/esmodule/export": `
+      exports.__esModule = true;
+      exports.foo = '';
+    `,
   }
 
   beforeEach(() => {
@@ -165,4 +169,9 @@ describe(`Resolve module exports`, () => {
     const result = resolveModuleExports(`/realistic/export`, resolver)
     expect(result).toEqual([`replaceHistory`, `replaceComponentRenderer`])
   })
+
+  it(`Ignores exports.__esModule`, () => {
+    const result = resolveModuleExports(`/esmodule/export`, resolver)
+    expect(result).toEqual([`foo`])
+  })
 })
diff --git a/packages/gatsby/src/bootstrap/resolve-module-exports.js b/packages/gatsby/src/bootstrap/resolve-module-exports.js
@@ -75,6 +75,9 @@ module.exports = (modulePath, resolver = require.resolve) => {
 
       if (nodeLeft.type !== `MemberExpression`) return
 
+      // ignore marker property `__esModule`
+      if (get(nodeLeft, `property.name`) === `__esModule`) return
+
       // get foo from `exports.foo = bar`
       if (get(nodeLeft, `object.name`) === `exports`) {
         isCommonJS = true