diff --git a/src/Chunk.ts b/src/Chunk.ts index a2492d8ca97..dfa43a94543 100644 --- a/src/Chunk.ts +++ b/src/Chunk.ts @@ -215,6 +215,11 @@ export default class Chunk { for (const importer of module.includedDynamicImporters) { if (!chunkModules.has(importer)) { this.dynamicEntryModules.push(module); + // Modules with synthetic exports need an artifical namespace for dynamic imports + if (module.syntheticNamedExports) { + module.namespace.include(); + this.exports.add(module.namespace); + } } } if (module.implicitlyLoadedAfter.size > 0) { @@ -347,6 +352,7 @@ export default class Chunk { } } for (const module of this.dynamicEntryModules) { + if (module.syntheticNamedExports) continue; if (!this.facadeModule && this.canModuleBeFacade(module, exposedVariables)) { this.facadeModule = module; this.facadeChunkByModule.set(module, this); diff --git a/src/Module.ts b/src/Module.ts index 02b30f5e5ad..55232bf100e 100644 --- a/src/Module.ts +++ b/src/Module.ts @@ -295,7 +295,9 @@ export default class Module { return error({ code: Errors.SYNTHETIC_NAMED_EXPORTS_NEED_DEFAULT, id: this.id, - message: `Modules with 'syntheticNamedExports' need a default export.` + message: `Module "${relativeId( + this.id + )}" that is marked to have "syntheticNamedExports" needs a default export.` }); } return this.defaultExport; diff --git a/src/ast/nodes/ImportExpression.ts b/src/ast/nodes/ImportExpression.ts index 1fce1562ab4..f89ed79fcc8 100644 --- a/src/ast/nodes/ImportExpression.ts +++ b/src/ast/nodes/ImportExpression.ts @@ -73,7 +73,7 @@ export default class Import extends NodeBase { if (namespaceExportName) { const _ = options.compact ? '' : ' '; const s = options.compact ? '' : ';'; - code.appendLeft( + code.prependLeft( this.end, `.then(function${_}(n)${_}{${_}return n.${namespaceExportName}${s}${_}})` ); diff --git a/test/chunking-form/samples/synthetic-named-exports-chained-default-reexport/_expected/amd/generated-component.js b/test/chunking-form/samples/synthetic-named-exports-chained-default-reexport/_expected/amd/generated-component.js deleted file mode 100644 index 10722e4e4bd..00000000000 --- a/test/chunking-form/samples/synthetic-named-exports-chained-default-reexport/_expected/amd/generated-component.js +++ /dev/null @@ -1,5 +0,0 @@ -define(['./generated-main'], function (main) { 'use strict'; - - console.log(main.lib, main.lib.named, main.lib.named.named); - -}); diff --git a/test/chunking-form/samples/synthetic-named-exports-chained-default-reexport/_expected/cjs/generated-component.js b/test/chunking-form/samples/synthetic-named-exports-chained-default-reexport/_expected/cjs/generated-component.js deleted file mode 100644 index b98ad50feed..00000000000 --- a/test/chunking-form/samples/synthetic-named-exports-chained-default-reexport/_expected/cjs/generated-component.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict'; - -var main = require('./generated-main.js'); - -console.log(main.lib, main.lib.named, main.lib.named.named); diff --git a/test/chunking-form/samples/synthetic-named-exports-chained-default-reexport/_expected/es/generated-component.js b/test/chunking-form/samples/synthetic-named-exports-chained-default-reexport/_expected/es/generated-component.js deleted file mode 100644 index 8fc1627e77e..00000000000 --- a/test/chunking-form/samples/synthetic-named-exports-chained-default-reexport/_expected/es/generated-component.js +++ /dev/null @@ -1,3 +0,0 @@ -import { l as lib } from './generated-main.js'; - -console.log(lib, lib.named, lib.named.named); diff --git a/test/chunking-form/samples/synthetic-named-exports-chained-default-reexport/_expected/system/generated-component.js b/test/chunking-form/samples/synthetic-named-exports-chained-default-reexport/_expected/system/generated-component.js deleted file mode 100644 index 477c02e1268..00000000000 --- a/test/chunking-form/samples/synthetic-named-exports-chained-default-reexport/_expected/system/generated-component.js +++ /dev/null @@ -1,14 +0,0 @@ -System.register(['./generated-main.js'], function () { - 'use strict'; - var lib; - return { - setters: [function (module) { - lib = module.l; - }], - execute: function () { - - console.log(lib, lib.named, lib.named.named); - - } - }; -}); diff --git a/test/chunking-form/samples/synthetic-named-exports-default-reexport/_expected/amd/generated-component.js b/test/chunking-form/samples/synthetic-named-exports-default-reexport/_expected/amd/generated-component.js deleted file mode 100644 index 557a39676b8..00000000000 --- a/test/chunking-form/samples/synthetic-named-exports-default-reexport/_expected/amd/generated-component.js +++ /dev/null @@ -1,5 +0,0 @@ -define(['./main'], function (main) { 'use strict'; - - console.log(main.lib, main.lib.someExport); - -}); diff --git a/test/chunking-form/samples/synthetic-named-exports-default-reexport/_expected/cjs/generated-component.js b/test/chunking-form/samples/synthetic-named-exports-default-reexport/_expected/cjs/generated-component.js deleted file mode 100644 index a9c4f4404a8..00000000000 --- a/test/chunking-form/samples/synthetic-named-exports-default-reexport/_expected/cjs/generated-component.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict'; - -var main = require('./main.js'); - -console.log(main.lib, main.lib.someExport); diff --git a/test/chunking-form/samples/synthetic-named-exports-default-reexport/_expected/es/generated-component.js b/test/chunking-form/samples/synthetic-named-exports-default-reexport/_expected/es/generated-component.js deleted file mode 100644 index f522984b4df..00000000000 --- a/test/chunking-form/samples/synthetic-named-exports-default-reexport/_expected/es/generated-component.js +++ /dev/null @@ -1,3 +0,0 @@ -import { lib } from './main.js'; - -console.log(lib, lib.someExport); diff --git a/test/chunking-form/samples/synthetic-named-exports-default-reexport/_expected/es/main.js b/test/chunking-form/samples/synthetic-named-exports-default-reexport/_expected/es/main.js deleted file mode 100644 index 6df3efc0668..00000000000 --- a/test/chunking-form/samples/synthetic-named-exports-default-reexport/_expected/es/main.js +++ /dev/null @@ -1,7 +0,0 @@ -var lib = {}; - -console.log('side-effect', lib); - -const component = import('./generated-component.js'); - -export { component, lib }; diff --git a/test/chunking-form/samples/synthetic-named-exports-default-reexport/_expected/system/generated-component.js b/test/chunking-form/samples/synthetic-named-exports-default-reexport/_expected/system/generated-component.js deleted file mode 100644 index 79d40ab6b81..00000000000 --- a/test/chunking-form/samples/synthetic-named-exports-default-reexport/_expected/system/generated-component.js +++ /dev/null @@ -1,14 +0,0 @@ -System.register(['./main.js'], function () { - 'use strict'; - var lib; - return { - setters: [function (module) { - lib = module.lib; - }], - execute: function () { - - console.log(lib, lib.someExport); - - } - }; -}); diff --git a/test/chunking-form/samples/synthetic-named-exports/_config.js b/test/chunking-form/samples/synthetic-named-exports/_config.js deleted file mode 100644 index 5c2ea3f35df..00000000000 --- a/test/chunking-form/samples/synthetic-named-exports/_config.js +++ /dev/null @@ -1,30 +0,0 @@ -module.exports = { - description: 'synthetic named exports', - options: { - input: ['main.js'], - plugins: [ - { - resolveId(id) { - if (id.endsWith('dep1.js')) { - return id; - } - return null; - }, - load(id) { - if (id.endsWith('dep1.js')) { - return { - code: ` -const d = { - fn: 42, - hello: 'hola' -}; -export default d;`, - syntheticNamedExports: true - }; - } - return null; - } - } - ] - } -}; diff --git a/test/chunking-form/samples/synthetic-named-exports/_expected/amd/main.js b/test/chunking-form/samples/synthetic-named-exports/_expected/amd/main.js deleted file mode 100644 index 569d66e02bb..00000000000 --- a/test/chunking-form/samples/synthetic-named-exports/_expected/amd/main.js +++ /dev/null @@ -1,12 +0,0 @@ -define(function () { 'use strict'; - - const d = { - fn: 42, - hello: 'hola' - }; - - console.log(d.fn); - console.log(d.foo); - console.log(d["some-prop"]); - -}); diff --git a/test/chunking-form/samples/synthetic-named-exports/_expected/cjs/main.js b/test/chunking-form/samples/synthetic-named-exports/_expected/cjs/main.js deleted file mode 100644 index cd2f4f43d7b..00000000000 --- a/test/chunking-form/samples/synthetic-named-exports/_expected/cjs/main.js +++ /dev/null @@ -1,10 +0,0 @@ -'use strict'; - -const d = { - fn: 42, - hello: 'hola' -}; - -console.log(d.fn); -console.log(d.foo); -console.log(d["some-prop"]); diff --git a/test/chunking-form/samples/synthetic-named-exports/_expected/es/main.js b/test/chunking-form/samples/synthetic-named-exports/_expected/es/main.js deleted file mode 100644 index ecd2e3e91a7..00000000000 --- a/test/chunking-form/samples/synthetic-named-exports/_expected/es/main.js +++ /dev/null @@ -1,8 +0,0 @@ -const d = { - fn: 42, - hello: 'hola' -}; - -console.log(d.fn); -console.log(d.foo); -console.log(d["some-prop"]); diff --git a/test/chunking-form/samples/synthetic-named-exports/_expected/system/main.js b/test/chunking-form/samples/synthetic-named-exports/_expected/system/main.js deleted file mode 100644 index 6b161eef8ae..00000000000 --- a/test/chunking-form/samples/synthetic-named-exports/_expected/system/main.js +++ /dev/null @@ -1,17 +0,0 @@ -System.register([], function () { - 'use strict'; - return { - execute: function () { - - const d = { - fn: 42, - hello: 'hola' - }; - - console.log(d.fn); - console.log(d.foo); - console.log(d["some-prop"]); - - } - }; -}); diff --git a/test/chunking-form/samples/synthetic-named-exports-chained-default-reexport/_config.js b/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_config.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-chained-default-reexport/_config.js rename to test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_config.js diff --git a/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/amd/generated-component.js b/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/amd/generated-component.js new file mode 100644 index 00000000000..2f235fc0f72 --- /dev/null +++ b/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/amd/generated-component.js @@ -0,0 +1,11 @@ +define(['exports', './generated-main'], function (exports, main) { 'use strict'; + + var component = { lib: main.lib, lib2: main.lib.named, lib3: main.lib.named.named }; + + var component$1 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign(/*#__PURE__*/Object.create(null), component, { + 'default': component + })); + + exports.component = component$1; + +}); diff --git a/test/chunking-form/samples/synthetic-named-exports-chained-default-reexport/_expected/amd/generated-main.js b/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/amd/generated-main.js similarity index 77% rename from test/chunking-form/samples/synthetic-named-exports-chained-default-reexport/_expected/amd/generated-main.js rename to test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/amd/generated-main.js index fe09f7042fa..bb7506c4c4e 100644 --- a/test/chunking-form/samples/synthetic-named-exports-chained-default-reexport/_expected/amd/generated-main.js +++ b/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/amd/generated-main.js @@ -6,7 +6,7 @@ define(['require', 'exports'], function (require, exports) { 'use strict'; console.log('side-effect', lib.named.named); - const component = new Promise(function (resolve, reject) { require(['./generated-component'], resolve, reject) }); + const component = new Promise(function (resolve, reject) { require(['./generated-component'], resolve, reject) }).then(function (n) { return n.component; }); exports.component = component; exports.lib = lib; diff --git a/test/chunking-form/samples/synthetic-named-exports-chained-default-reexport/_expected/amd/main.js b/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/amd/main.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-chained-default-reexport/_expected/amd/main.js rename to test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/amd/main.js diff --git a/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/cjs/generated-component.js b/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/cjs/generated-component.js new file mode 100644 index 00000000000..58f27d2e15e --- /dev/null +++ b/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/cjs/generated-component.js @@ -0,0 +1,11 @@ +'use strict'; + +var main = require('./generated-main.js'); + +var component = { lib: main.lib, lib2: main.lib.named, lib3: main.lib.named.named }; + +var component$1 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign(/*#__PURE__*/Object.create(null), component, { + 'default': component +})); + +exports.component = component$1; diff --git a/test/chunking-form/samples/synthetic-named-exports-chained-default-reexport/_expected/cjs/generated-main.js b/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/cjs/generated-main.js similarity index 75% rename from test/chunking-form/samples/synthetic-named-exports-chained-default-reexport/_expected/cjs/generated-main.js rename to test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/cjs/generated-main.js index 8a2ad71358c..5dd3d0fedd3 100644 --- a/test/chunking-form/samples/synthetic-named-exports-chained-default-reexport/_expected/cjs/generated-main.js +++ b/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/cjs/generated-main.js @@ -6,7 +6,7 @@ console.log('side-effect', lib.named); console.log('side-effect', lib.named.named); -const component = Promise.resolve().then(function () { return require('./generated-component.js'); }); +const component = Promise.resolve().then(function () { return require('./generated-component.js'); }).then(function (n) { return n.component; }); exports.component = component; exports.lib = lib; diff --git a/test/chunking-form/samples/synthetic-named-exports-chained-default-reexport/_expected/cjs/main.js b/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/cjs/main.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-chained-default-reexport/_expected/cjs/main.js rename to test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/cjs/main.js diff --git a/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/es/generated-component.js b/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/es/generated-component.js new file mode 100644 index 00000000000..c3a53df5f49 --- /dev/null +++ b/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/es/generated-component.js @@ -0,0 +1,9 @@ +import { l as lib } from './generated-main.js'; + +var component = { lib, lib2: lib.named, lib3: lib.named.named }; + +var component$1 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign(/*#__PURE__*/Object.create(null), component, { + 'default': component +})); + +export { component$1 as c }; diff --git a/test/chunking-form/samples/synthetic-named-exports-chained-default-reexport/_expected/es/generated-main.js b/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/es/generated-main.js similarity index 64% rename from test/chunking-form/samples/synthetic-named-exports-chained-default-reexport/_expected/es/generated-main.js rename to test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/es/generated-main.js index b8598bac797..5541045e78b 100644 --- a/test/chunking-form/samples/synthetic-named-exports-chained-default-reexport/_expected/es/generated-main.js +++ b/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/es/generated-main.js @@ -4,6 +4,6 @@ console.log('side-effect', lib.named); console.log('side-effect', lib.named.named); -const component = import('./generated-component.js'); +const component = import('./generated-component.js').then(function (n) { return n.c; }); export { component as c, lib as l }; diff --git a/test/chunking-form/samples/synthetic-named-exports-chained-default-reexport/_expected/es/main.js b/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/es/main.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-chained-default-reexport/_expected/es/main.js rename to test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/es/main.js diff --git a/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/system/generated-component.js b/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/system/generated-component.js new file mode 100644 index 00000000000..0336366b0a3 --- /dev/null +++ b/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/system/generated-component.js @@ -0,0 +1,19 @@ +System.register(['./generated-main.js'], function (exports) { + 'use strict'; + var lib; + return { + setters: [function (module) { + lib = module.l; + }], + execute: function () { + + var component = { lib, lib2: lib.named, lib3: lib.named.named }; + + var component$1 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign(/*#__PURE__*/Object.create(null), component, { + 'default': component + })); + exports('c', component$1); + + } + }; +}); diff --git a/test/chunking-form/samples/synthetic-named-exports-chained-default-reexport/_expected/system/generated-main.js b/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/system/generated-main.js similarity index 86% rename from test/chunking-form/samples/synthetic-named-exports-chained-default-reexport/_expected/system/generated-main.js rename to test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/system/generated-main.js index b1a94a5bd00..22b25341239 100644 --- a/test/chunking-form/samples/synthetic-named-exports-chained-default-reexport/_expected/system/generated-main.js +++ b/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/system/generated-main.js @@ -9,7 +9,7 @@ System.register([], function (exports, module) { console.log('side-effect', lib.named.named); - const component = exports('c', module.import('./generated-component.js')); + const component = exports('c', module.import('./generated-component.js').then(function (n) { return n.c; })); } }; diff --git a/test/chunking-form/samples/synthetic-named-exports-chained-default-reexport/_expected/system/main.js b/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/system/main.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-chained-default-reexport/_expected/system/main.js rename to test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/system/main.js diff --git a/test/chunking-form/samples/synthetic-named-exports-chained-default-reexport/component.js b/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/component.js similarity index 72% rename from test/chunking-form/samples/synthetic-named-exports-chained-default-reexport/component.js rename to test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/component.js index 27a06e45b58..00ae4a16972 100644 --- a/test/chunking-form/samples/synthetic-named-exports-chained-default-reexport/component.js +++ b/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/component.js @@ -1,4 +1,4 @@ import lib from './lib'; import lib2 from './lib-reexport2'; import lib3 from './lib-reexport'; -console.log(lib, lib2, lib3); +export default { lib, lib2, lib3 }; diff --git a/test/chunking-form/samples/synthetic-named-exports-chained-default-reexport/lib-reexport.js b/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/lib-reexport.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-chained-default-reexport/lib-reexport.js rename to test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/lib-reexport.js diff --git a/test/chunking-form/samples/synthetic-named-exports-chained-default-reexport/lib-reexport2.js b/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/lib-reexport2.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-chained-default-reexport/lib-reexport2.js rename to test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/lib-reexport2.js diff --git a/test/chunking-form/samples/synthetic-named-exports-chained-default-reexport/lib.js b/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/lib.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-chained-default-reexport/lib.js rename to test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/lib.js diff --git a/test/chunking-form/samples/synthetic-named-exports-chained-default-reexport/main.js b/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/main.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-chained-default-reexport/main.js rename to test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/main.js diff --git a/test/chunking-form/samples/deduplicate-synthetic-named-exports-and-default/_config.js b/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_config.js similarity index 100% rename from test/chunking-form/samples/deduplicate-synthetic-named-exports-and-default/_config.js rename to test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_config.js diff --git a/test/chunking-form/samples/deduplicate-synthetic-named-exports-and-default/_expected/amd/generated-lib.js b/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/amd/generated-lib.js similarity index 100% rename from test/chunking-form/samples/deduplicate-synthetic-named-exports-and-default/_expected/amd/generated-lib.js rename to test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/amd/generated-lib.js diff --git a/test/chunking-form/samples/deduplicate-synthetic-named-exports-and-default/_expected/amd/main1.js b/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/amd/main1.js similarity index 100% rename from test/chunking-form/samples/deduplicate-synthetic-named-exports-and-default/_expected/amd/main1.js rename to test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/amd/main1.js diff --git a/test/chunking-form/samples/deduplicate-synthetic-named-exports-and-default/_expected/amd/main2.js b/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/amd/main2.js similarity index 100% rename from test/chunking-form/samples/deduplicate-synthetic-named-exports-and-default/_expected/amd/main2.js rename to test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/amd/main2.js diff --git a/test/chunking-form/samples/deduplicate-synthetic-named-exports-and-default/_expected/amd/main3.js b/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/amd/main3.js similarity index 100% rename from test/chunking-form/samples/deduplicate-synthetic-named-exports-and-default/_expected/amd/main3.js rename to test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/amd/main3.js diff --git a/test/chunking-form/samples/deduplicate-synthetic-named-exports-and-default/_expected/cjs/generated-lib.js b/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/cjs/generated-lib.js similarity index 100% rename from test/chunking-form/samples/deduplicate-synthetic-named-exports-and-default/_expected/cjs/generated-lib.js rename to test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/cjs/generated-lib.js diff --git a/test/chunking-form/samples/deduplicate-synthetic-named-exports-and-default/_expected/cjs/main1.js b/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/cjs/main1.js similarity index 100% rename from test/chunking-form/samples/deduplicate-synthetic-named-exports-and-default/_expected/cjs/main1.js rename to test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/cjs/main1.js diff --git a/test/chunking-form/samples/deduplicate-synthetic-named-exports-and-default/_expected/cjs/main2.js b/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/cjs/main2.js similarity index 100% rename from test/chunking-form/samples/deduplicate-synthetic-named-exports-and-default/_expected/cjs/main2.js rename to test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/cjs/main2.js diff --git a/test/chunking-form/samples/deduplicate-synthetic-named-exports-and-default/_expected/cjs/main3.js b/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/cjs/main3.js similarity index 100% rename from test/chunking-form/samples/deduplicate-synthetic-named-exports-and-default/_expected/cjs/main3.js rename to test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/cjs/main3.js diff --git a/test/chunking-form/samples/deduplicate-synthetic-named-exports-and-default/_expected/es/generated-lib.js b/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/es/generated-lib.js similarity index 100% rename from test/chunking-form/samples/deduplicate-synthetic-named-exports-and-default/_expected/es/generated-lib.js rename to test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/es/generated-lib.js diff --git a/test/chunking-form/samples/deduplicate-synthetic-named-exports-and-default/_expected/es/main1.js b/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/es/main1.js similarity index 100% rename from test/chunking-form/samples/deduplicate-synthetic-named-exports-and-default/_expected/es/main1.js rename to test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/es/main1.js diff --git a/test/chunking-form/samples/deduplicate-synthetic-named-exports-and-default/_expected/es/main2.js b/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/es/main2.js similarity index 100% rename from test/chunking-form/samples/deduplicate-synthetic-named-exports-and-default/_expected/es/main2.js rename to test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/es/main2.js diff --git a/test/chunking-form/samples/deduplicate-synthetic-named-exports-and-default/_expected/es/main3.js b/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/es/main3.js similarity index 100% rename from test/chunking-form/samples/deduplicate-synthetic-named-exports-and-default/_expected/es/main3.js rename to test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/es/main3.js diff --git a/test/chunking-form/samples/deduplicate-synthetic-named-exports-and-default/_expected/system/generated-lib.js b/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/system/generated-lib.js similarity index 100% rename from test/chunking-form/samples/deduplicate-synthetic-named-exports-and-default/_expected/system/generated-lib.js rename to test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/system/generated-lib.js diff --git a/test/chunking-form/samples/deduplicate-synthetic-named-exports-and-default/_expected/system/main1.js b/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/system/main1.js similarity index 100% rename from test/chunking-form/samples/deduplicate-synthetic-named-exports-and-default/_expected/system/main1.js rename to test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/system/main1.js diff --git a/test/chunking-form/samples/deduplicate-synthetic-named-exports-and-default/_expected/system/main2.js b/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/system/main2.js similarity index 100% rename from test/chunking-form/samples/deduplicate-synthetic-named-exports-and-default/_expected/system/main2.js rename to test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/system/main2.js diff --git a/test/chunking-form/samples/deduplicate-synthetic-named-exports-and-default/_expected/system/main3.js b/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/system/main3.js similarity index 100% rename from test/chunking-form/samples/deduplicate-synthetic-named-exports-and-default/_expected/system/main3.js rename to test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/system/main3.js diff --git a/test/chunking-form/samples/deduplicate-synthetic-named-exports-and-default/lib.js b/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/lib.js similarity index 100% rename from test/chunking-form/samples/deduplicate-synthetic-named-exports-and-default/lib.js rename to test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/lib.js diff --git a/test/chunking-form/samples/deduplicate-synthetic-named-exports-and-default/main1.js b/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/main1.js similarity index 100% rename from test/chunking-form/samples/deduplicate-synthetic-named-exports-and-default/main1.js rename to test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/main1.js diff --git a/test/chunking-form/samples/deduplicate-synthetic-named-exports-and-default/main2.js b/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/main2.js similarity index 100% rename from test/chunking-form/samples/deduplicate-synthetic-named-exports-and-default/main2.js rename to test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/main2.js diff --git a/test/chunking-form/samples/deduplicate-synthetic-named-exports-and-default/main3.js b/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/main3.js similarity index 100% rename from test/chunking-form/samples/deduplicate-synthetic-named-exports-and-default/main3.js rename to test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/main3.js diff --git a/test/chunking-form/samples/synthetic-named-exports-default-reexport/_config.js b/test/chunking-form/samples/synthetic-named-exports/default-reexport/_config.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-default-reexport/_config.js rename to test/chunking-form/samples/synthetic-named-exports/default-reexport/_config.js diff --git a/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/amd/generated-component.js b/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/amd/generated-component.js new file mode 100644 index 00000000000..c882ef815da --- /dev/null +++ b/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/amd/generated-component.js @@ -0,0 +1,11 @@ +define(['exports', './main'], function (exports, main) { 'use strict'; + + var component = { lib: main.lib, someExport: main.lib.someExport }; + + var component$1 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign(/*#__PURE__*/Object.create(null), component, { + 'default': component + })); + + exports.component = component$1; + +}); diff --git a/test/chunking-form/samples/synthetic-named-exports-default-reexport/_expected/amd/main.js b/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/amd/main.js similarity index 76% rename from test/chunking-form/samples/synthetic-named-exports-default-reexport/_expected/amd/main.js rename to test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/amd/main.js index bffe5f5a8b2..0674d98842c 100644 --- a/test/chunking-form/samples/synthetic-named-exports-default-reexport/_expected/amd/main.js +++ b/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/amd/main.js @@ -4,7 +4,7 @@ define(['require', 'exports'], function (require, exports) { 'use strict'; console.log('side-effect', lib); - const component = new Promise(function (resolve, reject) { require(['./generated-component'], resolve, reject) }); + const component = new Promise(function (resolve, reject) { require(['./generated-component'], resolve, reject) }).then(function (n) { return n.component; }); exports.component = component; exports.lib = lib; diff --git a/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/cjs/generated-component.js b/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/cjs/generated-component.js new file mode 100644 index 00000000000..14615547735 --- /dev/null +++ b/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/cjs/generated-component.js @@ -0,0 +1,11 @@ +'use strict'; + +var main = require('./main.js'); + +var component = { lib: main.lib, someExport: main.lib.someExport }; + +var component$1 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign(/*#__PURE__*/Object.create(null), component, { + 'default': component +})); + +exports.component = component$1; diff --git a/test/chunking-form/samples/synthetic-named-exports-default-reexport/_expected/cjs/main.js b/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/cjs/main.js similarity index 74% rename from test/chunking-form/samples/synthetic-named-exports-default-reexport/_expected/cjs/main.js rename to test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/cjs/main.js index 084d4ca7773..17f88ab1c4e 100644 --- a/test/chunking-form/samples/synthetic-named-exports-default-reexport/_expected/cjs/main.js +++ b/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/cjs/main.js @@ -6,7 +6,7 @@ var lib = {}; console.log('side-effect', lib); -const component = Promise.resolve().then(function () { return require('./generated-component.js'); }); +const component = Promise.resolve().then(function () { return require('./generated-component.js'); }).then(function (n) { return n.component; }); exports.component = component; exports.lib = lib; diff --git a/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/es/generated-component.js b/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/es/generated-component.js new file mode 100644 index 00000000000..43f2816ca83 --- /dev/null +++ b/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/es/generated-component.js @@ -0,0 +1,9 @@ +import { lib } from './main.js'; + +var component = { lib, someExport: lib.someExport }; + +var component$1 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign(/*#__PURE__*/Object.create(null), component, { + 'default': component +})); + +export { component$1 as c }; diff --git a/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/es/main.js b/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/es/main.js new file mode 100644 index 00000000000..42f9ca2b564 --- /dev/null +++ b/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/es/main.js @@ -0,0 +1,7 @@ +var lib = {}; + +console.log('side-effect', lib); + +const component = import('./generated-component.js').then(function (n) { return n.c; }); + +export { component, lib }; diff --git a/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/system/generated-component.js b/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/system/generated-component.js new file mode 100644 index 00000000000..974cee4dec1 --- /dev/null +++ b/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/system/generated-component.js @@ -0,0 +1,19 @@ +System.register(['./main.js'], function (exports) { + 'use strict'; + var lib; + return { + setters: [function (module) { + lib = module.lib; + }], + execute: function () { + + var component = { lib, someExport: lib.someExport }; + + var component$1 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign(/*#__PURE__*/Object.create(null), component, { + 'default': component + })); + exports('c', component$1); + + } + }; +}); diff --git a/test/chunking-form/samples/synthetic-named-exports-default-reexport/_expected/system/main.js b/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/system/main.js similarity index 81% rename from test/chunking-form/samples/synthetic-named-exports-default-reexport/_expected/system/main.js rename to test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/system/main.js index 1efdddca9f9..bc136b49a0a 100644 --- a/test/chunking-form/samples/synthetic-named-exports-default-reexport/_expected/system/main.js +++ b/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/system/main.js @@ -7,7 +7,7 @@ System.register([], function (exports, module) { console.log('side-effect', lib); - const component = exports('component', module.import('./generated-component.js')); + const component = exports('component', module.import('./generated-component.js').then(function (n) { return n.c; })); } }; diff --git a/test/chunking-form/samples/synthetic-named-exports-default-reexport/component.js b/test/chunking-form/samples/synthetic-named-exports/default-reexport/component.js similarity index 58% rename from test/chunking-form/samples/synthetic-named-exports-default-reexport/component.js rename to test/chunking-form/samples/synthetic-named-exports/default-reexport/component.js index 3ca8a6c05b6..ab9afa97b0a 100644 --- a/test/chunking-form/samples/synthetic-named-exports-default-reexport/component.js +++ b/test/chunking-form/samples/synthetic-named-exports/default-reexport/component.js @@ -1,2 +1,2 @@ import lib, { someExport } from './lib-reexport'; -console.log(lib, someExport); +export default { lib, someExport }; diff --git a/test/chunking-form/samples/synthetic-named-exports-default-reexport/lib-reexport.js b/test/chunking-form/samples/synthetic-named-exports/default-reexport/lib-reexport.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-default-reexport/lib-reexport.js rename to test/chunking-form/samples/synthetic-named-exports/default-reexport/lib-reexport.js diff --git a/test/chunking-form/samples/synthetic-named-exports-default-reexport/lib.js b/test/chunking-form/samples/synthetic-named-exports/default-reexport/lib.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-default-reexport/lib.js rename to test/chunking-form/samples/synthetic-named-exports/default-reexport/lib.js diff --git a/test/chunking-form/samples/synthetic-named-exports-default-reexport/main.js b/test/chunking-form/samples/synthetic-named-exports/default-reexport/main.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-default-reexport/main.js rename to test/chunking-form/samples/synthetic-named-exports/default-reexport/main.js diff --git a/test/chunking-form/samples/synthetic-named-exports/dynamic-import/_config.js b/test/chunking-form/samples/synthetic-named-exports/dynamic-import/_config.js new file mode 100644 index 00000000000..9a5dad50910 --- /dev/null +++ b/test/chunking-form/samples/synthetic-named-exports/dynamic-import/_config.js @@ -0,0 +1,15 @@ +module.exports = { + description: 'synthetic named exports', + options: { + input: ['main.js'], + plugins: [ + { + transform(code, id) { + if (id.endsWith('dep.js')) { + return { code, syntheticNamedExports: true }; + } + } + } + ] + } +}; diff --git a/test/chunking-form/samples/synthetic-named-exports/dynamic-import/_expected/amd/generated-dep.js b/test/chunking-form/samples/synthetic-named-exports/dynamic-import/_expected/amd/generated-dep.js new file mode 100644 index 00000000000..dce8fca82c1 --- /dev/null +++ b/test/chunking-form/samples/synthetic-named-exports/dynamic-import/_expected/amd/generated-dep.js @@ -0,0 +1,13 @@ +define(['exports'], function (exports) { 'use strict'; + + var dep = { foo: 1 }; + const bar = 2; + + var dep$1 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign(/*#__PURE__*/Object.create(null), dep, { + 'default': dep, + bar: bar + })); + + exports.dep = dep$1; + +}); diff --git a/test/chunking-form/samples/synthetic-named-exports/dynamic-import/_expected/amd/main.js b/test/chunking-form/samples/synthetic-named-exports/dynamic-import/_expected/amd/main.js new file mode 100644 index 00000000000..edbdecbe1b0 --- /dev/null +++ b/test/chunking-form/samples/synthetic-named-exports/dynamic-import/_expected/amd/main.js @@ -0,0 +1,5 @@ +define(['require'], function (require) { 'use strict'; + + new Promise(function (resolve, reject) { require(['./generated-dep'], resolve, reject) }).then(function (n) { return n.dep; }).then(({ foo, bar, baz }) => console.log(foo, bar, baz)); + +}); diff --git a/test/chunking-form/samples/synthetic-named-exports/dynamic-import/_expected/cjs/generated-dep.js b/test/chunking-form/samples/synthetic-named-exports/dynamic-import/_expected/cjs/generated-dep.js new file mode 100644 index 00000000000..cdb9f3cb23d --- /dev/null +++ b/test/chunking-form/samples/synthetic-named-exports/dynamic-import/_expected/cjs/generated-dep.js @@ -0,0 +1,11 @@ +'use strict'; + +var dep = { foo: 1 }; +const bar = 2; + +var dep$1 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign(/*#__PURE__*/Object.create(null), dep, { + 'default': dep, + bar: bar +})); + +exports.dep = dep$1; diff --git a/test/chunking-form/samples/synthetic-named-exports/dynamic-import/_expected/cjs/main.js b/test/chunking-form/samples/synthetic-named-exports/dynamic-import/_expected/cjs/main.js new file mode 100644 index 00000000000..8266970f2e4 --- /dev/null +++ b/test/chunking-form/samples/synthetic-named-exports/dynamic-import/_expected/cjs/main.js @@ -0,0 +1,3 @@ +'use strict'; + +Promise.resolve().then(function () { return require('./generated-dep.js'); }).then(function (n) { return n.dep; }).then(({ foo, bar, baz }) => console.log(foo, bar, baz)); diff --git a/test/chunking-form/samples/synthetic-named-exports/dynamic-import/_expected/es/generated-dep.js b/test/chunking-form/samples/synthetic-named-exports/dynamic-import/_expected/es/generated-dep.js new file mode 100644 index 00000000000..e7de5ffdecb --- /dev/null +++ b/test/chunking-form/samples/synthetic-named-exports/dynamic-import/_expected/es/generated-dep.js @@ -0,0 +1,9 @@ +var dep = { foo: 1 }; +const bar = 2; + +var dep$1 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign(/*#__PURE__*/Object.create(null), dep, { + 'default': dep, + bar: bar +})); + +export { dep$1 as d }; diff --git a/test/chunking-form/samples/synthetic-named-exports/dynamic-import/_expected/es/main.js b/test/chunking-form/samples/synthetic-named-exports/dynamic-import/_expected/es/main.js new file mode 100644 index 00000000000..96a63594b47 --- /dev/null +++ b/test/chunking-form/samples/synthetic-named-exports/dynamic-import/_expected/es/main.js @@ -0,0 +1 @@ +import('./generated-dep.js').then(function (n) { return n.d; }).then(({ foo, bar, baz }) => console.log(foo, bar, baz)); diff --git a/test/chunking-form/samples/synthetic-named-exports/dynamic-import/_expected/system/generated-dep.js b/test/chunking-form/samples/synthetic-named-exports/dynamic-import/_expected/system/generated-dep.js new file mode 100644 index 00000000000..09f22b8706e --- /dev/null +++ b/test/chunking-form/samples/synthetic-named-exports/dynamic-import/_expected/system/generated-dep.js @@ -0,0 +1,17 @@ +System.register([], function (exports) { + 'use strict'; + return { + execute: function () { + + var dep = { foo: 1 }; + const bar = 2; + + var dep$1 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign(/*#__PURE__*/Object.create(null), dep, { + 'default': dep, + bar: bar + })); + exports('d', dep$1); + + } + }; +}); diff --git a/test/chunking-form/samples/synthetic-named-exports/dynamic-import/_expected/system/main.js b/test/chunking-form/samples/synthetic-named-exports/dynamic-import/_expected/system/main.js new file mode 100644 index 00000000000..577783aa881 --- /dev/null +++ b/test/chunking-form/samples/synthetic-named-exports/dynamic-import/_expected/system/main.js @@ -0,0 +1,10 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + module.import('./generated-dep.js').then(function (n) { return n.d; }).then(({ foo, bar, baz }) => console.log(foo, bar, baz)); + + } + }; +}); diff --git a/test/chunking-form/samples/synthetic-named-exports/dynamic-import/dep.js b/test/chunking-form/samples/synthetic-named-exports/dynamic-import/dep.js new file mode 100644 index 00000000000..da2d2a0eb0d --- /dev/null +++ b/test/chunking-form/samples/synthetic-named-exports/dynamic-import/dep.js @@ -0,0 +1,2 @@ +export default { foo: 1 }; +export const bar = 2; diff --git a/test/chunking-form/samples/synthetic-named-exports/dynamic-import/main.js b/test/chunking-form/samples/synthetic-named-exports/dynamic-import/main.js new file mode 100644 index 00000000000..66ee9dd6303 --- /dev/null +++ b/test/chunking-form/samples/synthetic-named-exports/dynamic-import/main.js @@ -0,0 +1 @@ +import('./dep.js').then(({ foo, bar, baz }) => console.log(foo, bar, baz)); diff --git a/test/chunking-form/samples/synthetic-named-exports-global-conflict/_config.js b/test/chunking-form/samples/synthetic-named-exports/global-conflict/_config.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-global-conflict/_config.js rename to test/chunking-form/samples/synthetic-named-exports/global-conflict/_config.js diff --git a/test/chunking-form/samples/synthetic-named-exports-global-conflict/_expected/amd/main.js b/test/chunking-form/samples/synthetic-named-exports/global-conflict/_expected/amd/main.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-global-conflict/_expected/amd/main.js rename to test/chunking-form/samples/synthetic-named-exports/global-conflict/_expected/amd/main.js diff --git a/test/chunking-form/samples/synthetic-named-exports-global-conflict/_expected/cjs/main.js b/test/chunking-form/samples/synthetic-named-exports/global-conflict/_expected/cjs/main.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-global-conflict/_expected/cjs/main.js rename to test/chunking-form/samples/synthetic-named-exports/global-conflict/_expected/cjs/main.js diff --git a/test/chunking-form/samples/synthetic-named-exports-global-conflict/_expected/es/main.js b/test/chunking-form/samples/synthetic-named-exports/global-conflict/_expected/es/main.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-global-conflict/_expected/es/main.js rename to test/chunking-form/samples/synthetic-named-exports/global-conflict/_expected/es/main.js diff --git a/test/chunking-form/samples/synthetic-named-exports-global-conflict/_expected/system/main.js b/test/chunking-form/samples/synthetic-named-exports/global-conflict/_expected/system/main.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-global-conflict/_expected/system/main.js rename to test/chunking-form/samples/synthetic-named-exports/global-conflict/_expected/system/main.js diff --git a/test/chunking-form/samples/synthetic-named-exports-global-conflict/dep.js b/test/chunking-form/samples/synthetic-named-exports/global-conflict/dep.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-global-conflict/dep.js rename to test/chunking-form/samples/synthetic-named-exports/global-conflict/dep.js diff --git a/test/chunking-form/samples/synthetic-named-exports-global-conflict/main.js b/test/chunking-form/samples/synthetic-named-exports/global-conflict/main.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-global-conflict/main.js rename to test/chunking-form/samples/synthetic-named-exports/global-conflict/main.js diff --git a/test/chunking-form/samples/synthetic-named-exports/main.js b/test/chunking-form/samples/synthetic-named-exports/main.js deleted file mode 100644 index 5b675b95c0f..00000000000 --- a/test/chunking-form/samples/synthetic-named-exports/main.js +++ /dev/null @@ -1,6 +0,0 @@ -import {fn, foo} from './dep1.js'; -import * as ns from './dep1.js'; - -console.log(fn); -console.log(foo); -console.log(ns['some-prop']); \ No newline at end of file diff --git a/test/chunking-form/samples/mixed-synthetic-named-exports-2/_config.js b/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports-2/_config.js similarity index 100% rename from test/chunking-form/samples/mixed-synthetic-named-exports-2/_config.js rename to test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports-2/_config.js diff --git a/test/chunking-form/samples/mixed-synthetic-named-exports-2/_expected/amd/generated-dep2.js b/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports-2/_expected/amd/generated-dep2.js similarity index 100% rename from test/chunking-form/samples/mixed-synthetic-named-exports-2/_expected/amd/generated-dep2.js rename to test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports-2/_expected/amd/generated-dep2.js diff --git a/test/chunking-form/samples/mixed-synthetic-named-exports-2/_expected/amd/main.js b/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports-2/_expected/amd/main.js similarity index 100% rename from test/chunking-form/samples/mixed-synthetic-named-exports-2/_expected/amd/main.js rename to test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports-2/_expected/amd/main.js diff --git a/test/chunking-form/samples/mixed-synthetic-named-exports-2/_expected/amd/main2.js b/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports-2/_expected/amd/main2.js similarity index 100% rename from test/chunking-form/samples/mixed-synthetic-named-exports-2/_expected/amd/main2.js rename to test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports-2/_expected/amd/main2.js diff --git a/test/chunking-form/samples/mixed-synthetic-named-exports-2/_expected/cjs/generated-dep2.js b/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports-2/_expected/cjs/generated-dep2.js similarity index 100% rename from test/chunking-form/samples/mixed-synthetic-named-exports-2/_expected/cjs/generated-dep2.js rename to test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports-2/_expected/cjs/generated-dep2.js diff --git a/test/chunking-form/samples/mixed-synthetic-named-exports-2/_expected/cjs/main.js b/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports-2/_expected/cjs/main.js similarity index 100% rename from test/chunking-form/samples/mixed-synthetic-named-exports-2/_expected/cjs/main.js rename to test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports-2/_expected/cjs/main.js diff --git a/test/chunking-form/samples/mixed-synthetic-named-exports-2/_expected/cjs/main2.js b/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports-2/_expected/cjs/main2.js similarity index 100% rename from test/chunking-form/samples/mixed-synthetic-named-exports-2/_expected/cjs/main2.js rename to test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports-2/_expected/cjs/main2.js diff --git a/test/chunking-form/samples/mixed-synthetic-named-exports-2/_expected/es/generated-dep2.js b/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports-2/_expected/es/generated-dep2.js similarity index 100% rename from test/chunking-form/samples/mixed-synthetic-named-exports-2/_expected/es/generated-dep2.js rename to test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports-2/_expected/es/generated-dep2.js diff --git a/test/chunking-form/samples/mixed-synthetic-named-exports-2/_expected/es/main.js b/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports-2/_expected/es/main.js similarity index 100% rename from test/chunking-form/samples/mixed-synthetic-named-exports-2/_expected/es/main.js rename to test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports-2/_expected/es/main.js diff --git a/test/chunking-form/samples/mixed-synthetic-named-exports-2/_expected/es/main2.js b/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports-2/_expected/es/main2.js similarity index 100% rename from test/chunking-form/samples/mixed-synthetic-named-exports-2/_expected/es/main2.js rename to test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports-2/_expected/es/main2.js diff --git a/test/chunking-form/samples/mixed-synthetic-named-exports-2/_expected/system/generated-dep2.js b/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports-2/_expected/system/generated-dep2.js similarity index 100% rename from test/chunking-form/samples/mixed-synthetic-named-exports-2/_expected/system/generated-dep2.js rename to test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports-2/_expected/system/generated-dep2.js diff --git a/test/chunking-form/samples/mixed-synthetic-named-exports-2/_expected/system/main.js b/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports-2/_expected/system/main.js similarity index 100% rename from test/chunking-form/samples/mixed-synthetic-named-exports-2/_expected/system/main.js rename to test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports-2/_expected/system/main.js diff --git a/test/chunking-form/samples/mixed-synthetic-named-exports-2/_expected/system/main2.js b/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports-2/_expected/system/main2.js similarity index 100% rename from test/chunking-form/samples/mixed-synthetic-named-exports-2/_expected/system/main2.js rename to test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports-2/_expected/system/main2.js diff --git a/test/chunking-form/samples/mixed-synthetic-named-exports-2/dep1.js b/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports-2/dep1.js similarity index 100% rename from test/chunking-form/samples/mixed-synthetic-named-exports-2/dep1.js rename to test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports-2/dep1.js diff --git a/test/chunking-form/samples/mixed-synthetic-named-exports-2/dep2.js b/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports-2/dep2.js similarity index 100% rename from test/chunking-form/samples/mixed-synthetic-named-exports-2/dep2.js rename to test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports-2/dep2.js diff --git a/test/chunking-form/samples/mixed-synthetic-named-exports-2/main.js b/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports-2/main.js similarity index 100% rename from test/chunking-form/samples/mixed-synthetic-named-exports-2/main.js rename to test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports-2/main.js diff --git a/test/chunking-form/samples/mixed-synthetic-named-exports-2/main2.js b/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports-2/main2.js similarity index 100% rename from test/chunking-form/samples/mixed-synthetic-named-exports-2/main2.js rename to test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports-2/main2.js diff --git a/test/chunking-form/samples/mixed-synthetic-named-exports/_config.js b/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/_config.js similarity index 100% rename from test/chunking-form/samples/mixed-synthetic-named-exports/_config.js rename to test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/_config.js diff --git a/test/chunking-form/samples/mixed-synthetic-named-exports/_expected/amd/main.js b/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/_expected/amd/main.js similarity index 100% rename from test/chunking-form/samples/mixed-synthetic-named-exports/_expected/amd/main.js rename to test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/_expected/amd/main.js diff --git a/test/chunking-form/samples/mixed-synthetic-named-exports/_expected/cjs/main.js b/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/_expected/cjs/main.js similarity index 100% rename from test/chunking-form/samples/mixed-synthetic-named-exports/_expected/cjs/main.js rename to test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/_expected/cjs/main.js diff --git a/test/chunking-form/samples/mixed-synthetic-named-exports/_expected/es/main.js b/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/_expected/es/main.js similarity index 100% rename from test/chunking-form/samples/mixed-synthetic-named-exports/_expected/es/main.js rename to test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/_expected/es/main.js diff --git a/test/chunking-form/samples/mixed-synthetic-named-exports/_expected/system/main.js b/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/_expected/system/main.js similarity index 100% rename from test/chunking-form/samples/mixed-synthetic-named-exports/_expected/system/main.js rename to test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/_expected/system/main.js diff --git a/test/chunking-form/samples/mixed-synthetic-named-exports/dep1.js b/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/dep1.js similarity index 100% rename from test/chunking-form/samples/mixed-synthetic-named-exports/dep1.js rename to test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/dep1.js diff --git a/test/chunking-form/samples/mixed-synthetic-named-exports/dep2.js b/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/dep2.js similarity index 100% rename from test/chunking-form/samples/mixed-synthetic-named-exports/dep2.js rename to test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/dep2.js diff --git a/test/chunking-form/samples/mixed-synthetic-named-exports/main.js b/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/main.js similarity index 100% rename from test/chunking-form/samples/mixed-synthetic-named-exports/main.js rename to test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/main.js diff --git a/test/chunking-form/samples/synthetic-named-exports-multi-level/_config.js b/test/chunking-form/samples/synthetic-named-exports/multi-level/_config.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-multi-level/_config.js rename to test/chunking-form/samples/synthetic-named-exports/multi-level/_config.js diff --git a/test/chunking-form/samples/synthetic-named-exports-multi-level/_expected/amd/main.js b/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/amd/main.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-multi-level/_expected/amd/main.js rename to test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/amd/main.js diff --git a/test/chunking-form/samples/synthetic-named-exports-multi-level/_expected/amd/main2.js b/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/amd/main2.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-multi-level/_expected/amd/main2.js rename to test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/amd/main2.js diff --git a/test/chunking-form/samples/synthetic-named-exports-multi-level/_expected/amd/main3.js b/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/amd/main3.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-multi-level/_expected/amd/main3.js rename to test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/amd/main3.js diff --git a/test/chunking-form/samples/synthetic-named-exports-multi-level/_expected/amd/main4.js b/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/amd/main4.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-multi-level/_expected/amd/main4.js rename to test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/amd/main4.js diff --git a/test/chunking-form/samples/synthetic-named-exports-multi-level/_expected/amd/main5.js b/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/amd/main5.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-multi-level/_expected/amd/main5.js rename to test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/amd/main5.js diff --git a/test/chunking-form/samples/synthetic-named-exports-multi-level/_expected/cjs/main.js b/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/cjs/main.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-multi-level/_expected/cjs/main.js rename to test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/cjs/main.js diff --git a/test/chunking-form/samples/synthetic-named-exports-multi-level/_expected/cjs/main2.js b/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/cjs/main2.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-multi-level/_expected/cjs/main2.js rename to test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/cjs/main2.js diff --git a/test/chunking-form/samples/synthetic-named-exports-multi-level/_expected/cjs/main3.js b/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/cjs/main3.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-multi-level/_expected/cjs/main3.js rename to test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/cjs/main3.js diff --git a/test/chunking-form/samples/synthetic-named-exports-multi-level/_expected/cjs/main4.js b/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/cjs/main4.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-multi-level/_expected/cjs/main4.js rename to test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/cjs/main4.js diff --git a/test/chunking-form/samples/synthetic-named-exports-multi-level/_expected/cjs/main5.js b/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/cjs/main5.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-multi-level/_expected/cjs/main5.js rename to test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/cjs/main5.js diff --git a/test/chunking-form/samples/synthetic-named-exports-multi-level/_expected/es/main.js b/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/es/main.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-multi-level/_expected/es/main.js rename to test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/es/main.js diff --git a/test/chunking-form/samples/synthetic-named-exports-multi-level/_expected/es/main2.js b/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/es/main2.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-multi-level/_expected/es/main2.js rename to test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/es/main2.js diff --git a/test/chunking-form/samples/synthetic-named-exports-multi-level/_expected/es/main3.js b/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/es/main3.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-multi-level/_expected/es/main3.js rename to test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/es/main3.js diff --git a/test/chunking-form/samples/synthetic-named-exports-multi-level/_expected/es/main4.js b/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/es/main4.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-multi-level/_expected/es/main4.js rename to test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/es/main4.js diff --git a/test/chunking-form/samples/synthetic-named-exports-multi-level/_expected/es/main5.js b/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/es/main5.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-multi-level/_expected/es/main5.js rename to test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/es/main5.js diff --git a/test/chunking-form/samples/synthetic-named-exports-multi-level/_expected/system/main.js b/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/system/main.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-multi-level/_expected/system/main.js rename to test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/system/main.js diff --git a/test/chunking-form/samples/synthetic-named-exports-multi-level/_expected/system/main2.js b/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/system/main2.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-multi-level/_expected/system/main2.js rename to test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/system/main2.js diff --git a/test/chunking-form/samples/synthetic-named-exports-multi-level/_expected/system/main3.js b/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/system/main3.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-multi-level/_expected/system/main3.js rename to test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/system/main3.js diff --git a/test/chunking-form/samples/synthetic-named-exports-multi-level/_expected/system/main4.js b/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/system/main4.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-multi-level/_expected/system/main4.js rename to test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/system/main4.js diff --git a/test/chunking-form/samples/synthetic-named-exports-multi-level/_expected/system/main5.js b/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/system/main5.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-multi-level/_expected/system/main5.js rename to test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/system/main5.js diff --git a/test/chunking-form/samples/synthetic-named-exports-multi-level/main.js b/test/chunking-form/samples/synthetic-named-exports/multi-level/main.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-multi-level/main.js rename to test/chunking-form/samples/synthetic-named-exports/multi-level/main.js diff --git a/test/chunking-form/samples/synthetic-named-exports-multi-level/main2.js b/test/chunking-form/samples/synthetic-named-exports/multi-level/main2.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-multi-level/main2.js rename to test/chunking-form/samples/synthetic-named-exports/multi-level/main2.js diff --git a/test/chunking-form/samples/synthetic-named-exports-multi-level/main3.js b/test/chunking-form/samples/synthetic-named-exports/multi-level/main3.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-multi-level/main3.js rename to test/chunking-form/samples/synthetic-named-exports/multi-level/main3.js diff --git a/test/chunking-form/samples/synthetic-named-exports-multi-level/main4.js b/test/chunking-form/samples/synthetic-named-exports/multi-level/main4.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-multi-level/main4.js rename to test/chunking-form/samples/synthetic-named-exports/multi-level/main4.js diff --git a/test/chunking-form/samples/synthetic-named-exports-multi-level/main5.js b/test/chunking-form/samples/synthetic-named-exports/multi-level/main5.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-multi-level/main5.js rename to test/chunking-form/samples/synthetic-named-exports/multi-level/main5.js diff --git a/test/chunking-form/samples/synthetic-named-exports-namespace/_config.js b/test/chunking-form/samples/synthetic-named-exports/namespace/_config.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-namespace/_config.js rename to test/chunking-form/samples/synthetic-named-exports/namespace/_config.js diff --git a/test/chunking-form/samples/synthetic-named-exports-namespace/_expected/amd/main.js b/test/chunking-form/samples/synthetic-named-exports/namespace/_expected/amd/main.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-namespace/_expected/amd/main.js rename to test/chunking-form/samples/synthetic-named-exports/namespace/_expected/amd/main.js diff --git a/test/chunking-form/samples/synthetic-named-exports-namespace/_expected/cjs/main.js b/test/chunking-form/samples/synthetic-named-exports/namespace/_expected/cjs/main.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-namespace/_expected/cjs/main.js rename to test/chunking-form/samples/synthetic-named-exports/namespace/_expected/cjs/main.js diff --git a/test/chunking-form/samples/synthetic-named-exports-namespace/_expected/es/main.js b/test/chunking-form/samples/synthetic-named-exports/namespace/_expected/es/main.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-namespace/_expected/es/main.js rename to test/chunking-form/samples/synthetic-named-exports/namespace/_expected/es/main.js diff --git a/test/chunking-form/samples/synthetic-named-exports-namespace/_expected/system/main.js b/test/chunking-form/samples/synthetic-named-exports/namespace/_expected/system/main.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-namespace/_expected/system/main.js rename to test/chunking-form/samples/synthetic-named-exports/namespace/_expected/system/main.js diff --git a/test/chunking-form/samples/synthetic-named-exports-namespace/dep.js b/test/chunking-form/samples/synthetic-named-exports/namespace/dep.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-namespace/dep.js rename to test/chunking-form/samples/synthetic-named-exports/namespace/dep.js diff --git a/test/chunking-form/samples/synthetic-named-exports-namespace/main.js b/test/chunking-form/samples/synthetic-named-exports/namespace/main.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-namespace/main.js rename to test/chunking-form/samples/synthetic-named-exports/namespace/main.js diff --git a/test/chunking-form/samples/synthetic-named-exports-namespace/synthetic.js b/test/chunking-form/samples/synthetic-named-exports/namespace/synthetic.js similarity index 100% rename from test/chunking-form/samples/synthetic-named-exports-namespace/synthetic.js rename to test/chunking-form/samples/synthetic-named-exports/namespace/synthetic.js diff --git a/test/function/samples/synthetic-exports-need-default/_config.js b/test/function/samples/synthetic-exports-need-default/_config.js index 7e77cd9721d..957f4118e60 100644 --- a/test/function/samples/synthetic-exports-need-default/_config.js +++ b/test/function/samples/synthetic-exports-need-default/_config.js @@ -19,7 +19,8 @@ module.exports = { error: { code: 'SYNTHETIC_NAMED_EXPORTS_NEED_DEFAULT', id: './dep.js', - message: "Modules with 'syntheticNamedExports' need a default export.", + message: + 'Module "./dep.js" that is marked to have "syntheticNamedExports" needs a default export.', watchFiles: [path.resolve(__dirname, 'main.js'), './dep.js'] } }; diff --git a/test/function/samples/synthetic-named-exports-dynamic-import/_config.js b/test/function/samples/synthetic-named-exports-dynamic-import/_config.js new file mode 100644 index 00000000000..3c20cf5b7b5 --- /dev/null +++ b/test/function/samples/synthetic-named-exports-dynamic-import/_config.js @@ -0,0 +1,23 @@ +const assert = require('assert'); + +module.exports = { + description: 'supports dynamically importing a module with synthetic named exports', + options: { + plugins: [ + { + transform(code, id) { + if (id.endsWith('dep.js')) { + return { code, syntheticNamedExports: true }; + } + } + } + ] + }, + async exports(exports) { + const namespace = await exports; + assert.strictEqual(namespace.foo, 'foo'); + assert.strictEqual(namespace.bar, 'bar'); + assert.strictEqual(namespace.baz, undefined); + assert.deepStrictEqual(namespace.default, { foo: 'foo' }); + } +}; diff --git a/test/function/samples/synthetic-named-exports-dynamic-import/dep.js b/test/function/samples/synthetic-named-exports-dynamic-import/dep.js new file mode 100644 index 00000000000..0e21040e99f --- /dev/null +++ b/test/function/samples/synthetic-named-exports-dynamic-import/dep.js @@ -0,0 +1,2 @@ +export default { foo: 'foo' }; +export const bar = 'bar'; diff --git a/test/function/samples/synthetic-named-exports-dynamic-import/main.js b/test/function/samples/synthetic-named-exports-dynamic-import/main.js new file mode 100644 index 00000000000..46eb008dc64 --- /dev/null +++ b/test/function/samples/synthetic-named-exports-dynamic-import/main.js @@ -0,0 +1 @@ +export default import('./dep.js');