From e68beeb5bbb4721a3bab306df8cb82f90cf3eb6a Mon Sep 17 00:00:00 2001 From: Eric Eldredge Date: Tue, 10 May 2022 16:42:21 -0400 Subject: [PATCH] Add tests for chained reexports from a hybrid module (#7980) * Add test for chained reexports from a hybrid module This captures a case where a CJS export is missing. * Add test for reexports as default from a hybrid module This captures a case where packaging fails with `Asset was skipped or not found`. * Use strict equality checks * nit: match similar test terminology Co-authored-by: Niklas Mischkulnig <4586894+mischnic@users.noreply.github.com> --- .../es6/re-export-default-hybrid/a.js | 3 +++ .../es6/re-export-default-hybrid/b.js | 2 ++ .../es6/re-export-default-hybrid/c.js | 2 ++ .../es6/re-export-default-hybrid/d.js | 1 + .../scope-hoisting/es6/re-export-hybrid/a.js | 3 +++ .../scope-hoisting/es6/re-export-hybrid/b.js | 1 + .../scope-hoisting/es6/re-export-hybrid/c.js | 2 ++ .../scope-hoisting/es6/re-export-hybrid/d.js | 1 + .../integration-tests/test/scope-hoisting.js | 22 +++++++++++++++++++ 9 files changed, 37 insertions(+) create mode 100644 packages/core/integration-tests/test/integration/scope-hoisting/es6/re-export-default-hybrid/a.js create mode 100644 packages/core/integration-tests/test/integration/scope-hoisting/es6/re-export-default-hybrid/b.js create mode 100644 packages/core/integration-tests/test/integration/scope-hoisting/es6/re-export-default-hybrid/c.js create mode 100644 packages/core/integration-tests/test/integration/scope-hoisting/es6/re-export-default-hybrid/d.js create mode 100644 packages/core/integration-tests/test/integration/scope-hoisting/es6/re-export-hybrid/a.js create mode 100644 packages/core/integration-tests/test/integration/scope-hoisting/es6/re-export-hybrid/b.js create mode 100644 packages/core/integration-tests/test/integration/scope-hoisting/es6/re-export-hybrid/c.js create mode 100644 packages/core/integration-tests/test/integration/scope-hoisting/es6/re-export-hybrid/d.js diff --git a/packages/core/integration-tests/test/integration/scope-hoisting/es6/re-export-default-hybrid/a.js b/packages/core/integration-tests/test/integration/scope-hoisting/es6/re-export-default-hybrid/a.js new file mode 100644 index 00000000000..7f129231c85 --- /dev/null +++ b/packages/core/integration-tests/test/integration/scope-hoisting/es6/re-export-default-hybrid/a.js @@ -0,0 +1,3 @@ +import b from './b'; + +output = b.foo + b.bar; diff --git a/packages/core/integration-tests/test/integration/scope-hoisting/es6/re-export-default-hybrid/b.js b/packages/core/integration-tests/test/integration/scope-hoisting/es6/re-export-default-hybrid/b.js new file mode 100644 index 00000000000..1d134aa51d1 --- /dev/null +++ b/packages/core/integration-tests/test/integration/scope-hoisting/es6/re-export-default-hybrid/b.js @@ -0,0 +1,2 @@ +import * as c from './c'; +export default c; diff --git a/packages/core/integration-tests/test/integration/scope-hoisting/es6/re-export-default-hybrid/c.js b/packages/core/integration-tests/test/integration/scope-hoisting/es6/re-export-default-hybrid/c.js new file mode 100644 index 00000000000..29a35de9403 --- /dev/null +++ b/packages/core/integration-tests/test/integration/scope-hoisting/es6/re-export-default-hybrid/c.js @@ -0,0 +1,2 @@ +export foo from './d'; +export const bar = require('./d'); diff --git a/packages/core/integration-tests/test/integration/scope-hoisting/es6/re-export-default-hybrid/d.js b/packages/core/integration-tests/test/integration/scope-hoisting/es6/re-export-default-hybrid/d.js new file mode 100644 index 00000000000..bd816eaba4c --- /dev/null +++ b/packages/core/integration-tests/test/integration/scope-hoisting/es6/re-export-default-hybrid/d.js @@ -0,0 +1 @@ +module.exports = 1; diff --git a/packages/core/integration-tests/test/integration/scope-hoisting/es6/re-export-hybrid/a.js b/packages/core/integration-tests/test/integration/scope-hoisting/es6/re-export-hybrid/a.js new file mode 100644 index 00000000000..d1d39e3bc64 --- /dev/null +++ b/packages/core/integration-tests/test/integration/scope-hoisting/es6/re-export-hybrid/a.js @@ -0,0 +1,3 @@ +import {foo, bar} from './b'; + +output = foo + bar; diff --git a/packages/core/integration-tests/test/integration/scope-hoisting/es6/re-export-hybrid/b.js b/packages/core/integration-tests/test/integration/scope-hoisting/es6/re-export-hybrid/b.js new file mode 100644 index 00000000000..34a28aa08d0 --- /dev/null +++ b/packages/core/integration-tests/test/integration/scope-hoisting/es6/re-export-hybrid/b.js @@ -0,0 +1 @@ +export * from './c'; diff --git a/packages/core/integration-tests/test/integration/scope-hoisting/es6/re-export-hybrid/c.js b/packages/core/integration-tests/test/integration/scope-hoisting/es6/re-export-hybrid/c.js new file mode 100644 index 00000000000..29a35de9403 --- /dev/null +++ b/packages/core/integration-tests/test/integration/scope-hoisting/es6/re-export-hybrid/c.js @@ -0,0 +1,2 @@ +export foo from './d'; +export const bar = require('./d'); diff --git a/packages/core/integration-tests/test/integration/scope-hoisting/es6/re-export-hybrid/d.js b/packages/core/integration-tests/test/integration/scope-hoisting/es6/re-export-hybrid/d.js new file mode 100644 index 00000000000..bd816eaba4c --- /dev/null +++ b/packages/core/integration-tests/test/integration/scope-hoisting/es6/re-export-hybrid/d.js @@ -0,0 +1 @@ +module.exports = 1; diff --git a/packages/core/integration-tests/test/scope-hoisting.js b/packages/core/integration-tests/test/scope-hoisting.js index 63ddafd760a..2c9508fe405 100644 --- a/packages/core/integration-tests/test/scope-hoisting.js +++ b/packages/core/integration-tests/test/scope-hoisting.js @@ -1997,6 +1997,28 @@ describe('scope hoisting', function () { assert(new output[3]() instanceof output[2]); }); + it('should support chained reexports from hybrid modules', async function () { + let b = await bundle( + path.join( + __dirname, + '/integration/scope-hoisting/es6/re-export-hybrid/a.js', + ), + ); + let output = await run(b); + assert.strictEqual(output, 2); + }); + + it('should support chained reexports as default from hybrid modules', async function () { + let b = await bundle( + path.join( + __dirname, + '/integration/scope-hoisting/es6/re-export-default-hybrid/a.js', + ), + ); + let output = await run(b); + assert.strictEqual(output, 2); + }); + it('support chained namespace reexports of CommonJS', async function () { let b = await bundle( path.join(