Skip to content

Commit

Permalink
Detect additional export syntaxes
Browse files Browse the repository at this point in the history
  • Loading branch information
m-allanson committed Mar 16, 2018
1 parent 582f20c commit 0aa0495
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 3 deletions.
12 changes: 12 additions & 0 deletions packages/gatsby/src/bootstrap/__tests__/resolve-module-exports.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ describe(`Resolve module exports`, () => {
const MOCK_FILE_INFO = {
"/bad/file": `const exports.blah = () = }}}`,
"/simple/export": `exports.foo = '';`,
"/export/const": `export const fooConst = '';`,
"/module/exports": `module.exports.barExports = '';`,
"/multiple/export": `exports.bar = () => ''; exports.baz = {}; exports.foo = '';`,
"/import/with/export": `import React from 'react'; exports.baz = '';`,
"/realistic/export": `
Expand Down Expand Up @@ -136,6 +138,16 @@ describe(`Resolve module exports`, () => {
expect(result).toEqual([`baz`])
})

it(`Resolves an exported const`, () => {
const result = resolveModuleExports(`/export/const`, resolver)
expect(result).toEqual([`fooConst`])
})

it(`Resolves module.exports`, () => {
const result = resolveModuleExports(`/module/exports`, resolver)
expect(result).toEqual([`barExports`])
})

it(`Resolves exports from a larger file`, () => {
const result = resolveModuleExports(`/realistic/export`, resolver)
expect(result).toEqual([`replaceHistory`, `replaceComponentRenderer`])
Expand Down
22 changes: 19 additions & 3 deletions packages/gatsby/src/bootstrap/resolve-module-exports.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
const fs = require(`fs`)
const babylon = require(`babylon`)
const traverse = require(`babel-traverse`).default
const get = require(`lodash/get`)

/**
* Given a `require.resolve()` compatible path pointing to a JS module,
Expand Down Expand Up @@ -45,12 +46,27 @@ module.exports = (modulePath, resolver = require.resolve) => {

// extract names of exports from file
traverse(ast, {
// get foo from `export const foo = bar`
ExportNamedDeclaration: function ExportNamedDeclaration(astPath) {
const exportName = get(astPath, `node.declaration.declarations[0].id.name`)
if (exportName) exportNames.push(exportName)
},
AssignmentExpression: function AssignmentExpression(astPath) {
const nodeLeft = astPath.node.left

if (nodeLeft.type !== `MemberExpression`) return

// get foo from `exports.foo = bar`
if (get(nodeLeft, `object.name`) === `exports`) {
exportNames.push(nodeLeft.property.name)
}

// get foo from `module.exports.foo = bar`
if (
astPath.node.left.type === `MemberExpression` &&
astPath.node.left.object.name === `exports`
get(nodeLeft, `object.object.name`) === `module` &&
get(nodeLeft, `object.property.name`) === `exports`
) {
exportNames.push(astPath.node.left.property.name)
exportNames.push(nodeLeft.property.name)
}
},
})
Expand Down

0 comments on commit 0aa0495

Please sign in to comment.