Skip to content
This repository was archived by the owner on Dec 15, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 18 additions & 13 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,13 @@
"temp": "^0.8.3"
},
"dependencies": {
"acorn": "^6.1.1",
"ast-util": "^0.6.0",
"encoding-down": "~5.0.0",
"indent-string": "^3.2.0",
"leveldown": "~4.0.0",
"levelup": "~3.0.0",
"encoding-down": "~5.0.0",
"recast": "^0.12.6",
"recast": "^0.17.5",
"resolve": "^1.5.0",
"source-map": "^0.5.6"
}
Expand Down
11 changes: 10 additions & 1 deletion src/file-require-transform.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,16 @@ module.exports = class FileRequireTransform {
// supported inside javascript strings) with escape unicode sequences.
source = "module.exports = " + source.replace(/\u2028/g, '\\u2028').replace(/\u2029/g, '\\u2029')
}
this.ast = recast.parse(source)
this.ast = recast.parse(source, {
parser: {
parse(source) {
return require('recast/parsers/acorn').parse(source, {
ecmaVersion: 9,
sourceType: 'script'
})
}
}
})
this.lazyRequireFunctionsByVariableName = new Map()
this.replaceDeferredRequiresWithLazyFunctions()
this.replaceReferencesToDeferredRequiresWithFunctionCalls()
Expand Down
10 changes: 10 additions & 0 deletions test/unit/file-require-transform.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,16 @@ suite('FileRequireTransform', () => {
)
})

test('Object spread properties', () => {
const source = 'let {a, b, ...rest} = {a: 1, b: 2, c: 3}'
assert.equal(
new FileRequireTransform({source, didFindRequire: () => false}).apply(),
dedent`
let {a, b, ...rest} = {a: 1, b: 2, c: 3}
`
)
})

test('path resolution', () => {
const baseDirPath = path.resolve(__dirname, '..', 'fixtures', 'module-1')
const filePath = path.join(baseDirPath, 'dir', 'entry.js')
Expand Down