From 4c94c86d2d738ba8102211fd602c8a42944e3af4 Mon Sep 17 00:00:00 2001 From: shellscape Date: Wed, 8 Jan 2020 19:54:28 -0500 Subject: [PATCH 1/2] fix(commonjs): dashes in filename, legal identifier --- packages/commonjs/src/transform.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/commonjs/src/transform.js b/packages/commonjs/src/transform.js index 95e913197..1bd6e8fcf 100644 --- a/packages/commonjs/src/transform.js +++ b/packages/commonjs/src/transform.js @@ -22,7 +22,7 @@ const functionType = /^(?:FunctionDeclaration|FunctionExpression|ArrowFunctionEx function deconflict(scope, globals, identifier) { let i = 1; - let deconflicted = identifier; + let deconflicted = makeLegalIdentifier(identifier); while (scope.contains(deconflicted) || globals.has(deconflicted) || deconflicted in blacklist) { deconflicted = `${identifier}_${i}`; From f519582be983f5508e2323d919599246fb171396 Mon Sep 17 00:00:00 2001 From: shellscape Date: Fri, 7 Feb 2020 07:38:58 -0500 Subject: [PATCH 2/2] test: add test for files with hyphens --- .../commonjs/test/fixtures/function/dash-name/_config.js | 8 ++++++++ .../test/fixtures/function/dash-name/dash-name.js | 1 + .../commonjs/test/fixtures/function/dash-name/main.js | 3 +++ packages/commonjs/test/form.js | 2 +- 4 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 packages/commonjs/test/fixtures/function/dash-name/_config.js create mode 100644 packages/commonjs/test/fixtures/function/dash-name/dash-name.js create mode 100644 packages/commonjs/test/fixtures/function/dash-name/main.js diff --git a/packages/commonjs/test/fixtures/function/dash-name/_config.js b/packages/commonjs/test/fixtures/function/dash-name/_config.js new file mode 100644 index 000000000..4fd62f385 --- /dev/null +++ b/packages/commonjs/test/fixtures/function/dash-name/_config.js @@ -0,0 +1,8 @@ +module.exports = { + options: { + output: { + file: 'output/bundle.js', + format: 'cjs' + } + } +}; diff --git a/packages/commonjs/test/fixtures/function/dash-name/dash-name.js b/packages/commonjs/test/fixtures/function/dash-name/dash-name.js new file mode 100644 index 000000000..ec01c2c14 --- /dev/null +++ b/packages/commonjs/test/fixtures/function/dash-name/dash-name.js @@ -0,0 +1 @@ +module.exports = true; diff --git a/packages/commonjs/test/fixtures/function/dash-name/main.js b/packages/commonjs/test/fixtures/function/dash-name/main.js new file mode 100644 index 000000000..20f5d9935 --- /dev/null +++ b/packages/commonjs/test/fixtures/function/dash-name/main.js @@ -0,0 +1,3 @@ +import value from './dash-name'; + +t.truthy(value); diff --git a/packages/commonjs/test/form.js b/packages/commonjs/test/form.js index 403d94634..0ecf6e33d 100644 --- a/packages/commonjs/test/form.js +++ b/packages/commonjs/test/form.js @@ -53,9 +53,9 @@ readdirSync('./fixtures/form').forEach((dir) => { } const expected = readFileSync(outputFile, 'utf-8').trim(); - const transformed = transform.call(transformContext, input, id); const actual = (transformed ? transformed.code : input).trim().replace(/\0/g, '_'); + t.is(actual, expected); }); });