diff --git a/src/Chunk.ts b/src/Chunk.ts index 5de92f14a35..74b095ae887 100644 --- a/src/Chunk.ts +++ b/src/Chunk.ts @@ -1015,7 +1015,7 @@ export default class Chunk { } } else if (variable instanceof SyntheticNamedExportVariable) { expression = local; - if (format === 'es' && exportName !== 'default') { + if (format === 'es') { local = variable.renderName!; } } diff --git a/src/ast/nodes/Identifier.ts b/src/ast/nodes/Identifier.ts index d6b2a1e36e3..7b5a1d3a11f 100644 --- a/src/ast/nodes/Identifier.ts +++ b/src/ast/nodes/Identifier.ts @@ -175,6 +175,40 @@ export default class Identifier extends NodeBase implements PatternNode { this.getVariableRespectingTDZ().includeCallArguments(context, args); } + isPossibleTDZ(): boolean { + // return cached value to avoid issues with the next tree-shaking pass + if (this.isTDZAccess !== null) return this.isTDZAccess; + + if ( + !(this.variable instanceof LocalVariable) || + !this.variable.kind || + !(this.variable.kind in tdzVariableKinds) + ) { + return (this.isTDZAccess = false); + } + + let decl_id; + if ( + this.variable.declarations && + this.variable.declarations.length === 1 && + (decl_id = this.variable.declarations[0] as any) && + this.start < decl_id.start && + closestParentFunctionOrProgram(this) === closestParentFunctionOrProgram(decl_id) + ) { + // a variable accessed before its declaration + // in the same function or at top level of module + return (this.isTDZAccess = true); + } + + if (!this.variable.initReached) { + // Either a const/let TDZ violation or + // var use before declaration was encountered. + return (this.isTDZAccess = true); + } + + return (this.isTDZAccess = false); + } + markDeclarationReached(): void { this.variable!.initReached = true; } @@ -231,40 +265,6 @@ export default class Identifier extends NodeBase implements PatternNode { } return this.variable!; } - - private isPossibleTDZ(): boolean { - // return cached value to avoid issues with the next tree-shaking pass - if (this.isTDZAccess !== null) return this.isTDZAccess; - - if ( - !(this.variable instanceof LocalVariable) || - !this.variable.kind || - !(this.variable.kind in tdzVariableKinds) - ) { - return (this.isTDZAccess = false); - } - - let decl_id; - if ( - this.variable.declarations && - this.variable.declarations.length === 1 && - (decl_id = this.variable.declarations[0] as any) && - this.start < decl_id.start && - closestParentFunctionOrProgram(this) === closestParentFunctionOrProgram(decl_id) - ) { - // a variable accessed before its declaration - // in the same function or at top level of module - return (this.isTDZAccess = true); - } - - if (!this.variable.initReached) { - // Either a const/let TDZ violation or - // var use before declaration was encountered. - return (this.isTDZAccess = true); - } - - return (this.isTDZAccess = false); - } } function closestParentFunctionOrProgram(node: any): any { diff --git a/src/ast/variables/ExportDefaultVariable.ts b/src/ast/variables/ExportDefaultVariable.ts index 7a42353cad4..9561e20d007 100644 --- a/src/ast/variables/ExportDefaultVariable.ts +++ b/src/ast/variables/ExportDefaultVariable.ts @@ -54,6 +54,7 @@ export default class ExportDefaultVariable extends LocalVariable { return this.originalId && (this.hasId || !( + this.originalId.isPossibleTDZ() || this.originalId.variable.isReassigned || this.originalId.variable instanceof UndefinedVariable || // this avoids a circular dependency diff --git a/src/finalisers/es.ts b/src/finalisers/es.ts index 839b8e54cb6..ca3be08ab49 100644 --- a/src/finalisers/es.ts +++ b/src/finalisers/es.ts @@ -114,18 +114,14 @@ function getExportBlock(exports: ChunkExports, _: string, varOrConst: string): s const exportBlock: string[] = []; const exportDeclaration: string[] = []; for (const specifier of exports) { - if (specifier.exported === 'default') { - exportBlock.push(`export default ${specifier.local};`); - } else { - if (specifier.expression) { - exportBlock.push(`${varOrConst} ${specifier.local}${_}=${_}${specifier.expression};`); - } - exportDeclaration.push( - specifier.exported === specifier.local - ? specifier.local - : `${specifier.local} as ${specifier.exported}` - ); + if (specifier.expression) { + exportBlock.push(`${varOrConst} ${specifier.local}${_}=${_}${specifier.expression};`); } + exportDeclaration.push( + specifier.exported === specifier.local + ? specifier.local + : `${specifier.local} as ${specifier.exported}` + ); } if (exportDeclaration.length) { exportBlock.push(`export${_}{${_}${exportDeclaration.join(`,${_}`)}${_}};`); diff --git a/src/finalisers/shared/getExportBlock.ts b/src/finalisers/shared/getExportBlock.ts index 2381396ad86..73018c58a51 100644 --- a/src/finalisers/shared/getExportBlock.ts +++ b/src/finalisers/shared/getExportBlock.ts @@ -5,6 +5,7 @@ import { isDefaultAProperty, namespaceInteropHelpersByInteropType } from '../../utils/interopHelpers'; +import { RESERVED_NAMES } from '../../utils/reservedNames'; export function getExportBlock( exports: ChunkExports, @@ -65,9 +66,9 @@ export function getExportBlock( } } - for (const chunkExport of exports) { - const lhs = `exports.${chunkExport.exported}`; - const rhs = chunkExport.local; + for (const { exported, local } of exports) { + const lhs = `exports${RESERVED_NAMES[exported] ? `['${exported}']` : `.${exported}`}`; + const rhs = local; if (lhs !== rhs) { if (exportBlock) exportBlock += n; exportBlock += `${lhs}${_}=${_}${rhs};`; diff --git a/test/chunking-form/samples/basic-chunking/_expected/es/main1.js b/test/chunking-form/samples/basic-chunking/_expected/es/main1.js index f2e4ef52928..c5a66ab8a40 100644 --- a/test/chunking-form/samples/basic-chunking/_expected/es/main1.js +++ b/test/chunking-form/samples/basic-chunking/_expected/es/main1.js @@ -11,4 +11,4 @@ class Main1 { } } -export default Main1; +export { Main1 as default }; diff --git a/test/chunking-form/samples/basic-chunking/_expected/es/main2.js b/test/chunking-form/samples/basic-chunking/_expected/es/main2.js index a7a28b48588..995e80e48e8 100644 --- a/test/chunking-form/samples/basic-chunking/_expected/es/main2.js +++ b/test/chunking-form/samples/basic-chunking/_expected/es/main2.js @@ -16,4 +16,4 @@ class Main2 { } } -export default Main2; +export { Main2 as default }; diff --git a/test/chunking-form/samples/chunk-export-deshadowing/_expected/es/main1.js b/test/chunking-form/samples/chunk-export-deshadowing/_expected/es/main1.js index d08c5b42593..1a95e5325f9 100644 --- a/test/chunking-form/samples/chunk-export-deshadowing/_expected/es/main1.js +++ b/test/chunking-form/samples/chunk-export-deshadowing/_expected/es/main1.js @@ -6,4 +6,4 @@ class Main1 { } } -export default Main1; +export { Main1 as default }; diff --git a/test/chunking-form/samples/chunk-export-deshadowing/_expected/es/main2.js b/test/chunking-form/samples/chunk-export-deshadowing/_expected/es/main2.js index dc15f820234..96dee8313a6 100644 --- a/test/chunking-form/samples/chunk-export-deshadowing/_expected/es/main2.js +++ b/test/chunking-form/samples/chunk-export-deshadowing/_expected/es/main2.js @@ -6,4 +6,4 @@ class Main2 { } } -export default Main2; +export { Main2 as default }; diff --git a/test/chunking-form/samples/chunk-live-bindings/_expected/es/main1.js b/test/chunking-form/samples/chunk-live-bindings/_expected/es/main1.js index 4ab6a281f36..9359183629d 100644 --- a/test/chunking-form/samples/chunk-live-bindings/_expected/es/main1.js +++ b/test/chunking-form/samples/chunk-live-bindings/_expected/es/main1.js @@ -7,4 +7,4 @@ class Main1 { } } -export default Main1; +export { Main1 as default }; diff --git a/test/chunking-form/samples/chunk-live-bindings/_expected/es/main2.js b/test/chunking-form/samples/chunk-live-bindings/_expected/es/main2.js index 07b5d8e9ba6..5e6b4eb1b81 100644 --- a/test/chunking-form/samples/chunk-live-bindings/_expected/es/main2.js +++ b/test/chunking-form/samples/chunk-live-bindings/_expected/es/main2.js @@ -7,4 +7,4 @@ class Main2 { } } -export default Main2; +export { Main2 as default }; diff --git a/test/chunking-form/samples/chunk-namespace-boundary/_expected/es/main1.js b/test/chunking-form/samples/chunk-namespace-boundary/_expected/es/main1.js index c1d90952e9d..fac65c8e84a 100644 --- a/test/chunking-form/samples/chunk-namespace-boundary/_expected/es/main1.js +++ b/test/chunking-form/samples/chunk-namespace-boundary/_expected/es/main1.js @@ -5,4 +5,4 @@ var cjs = commonjsGlobal.fn; var main1 = shared.map(cjs); -export default main1; +export { main1 as default }; diff --git a/test/chunking-form/samples/chunk-namespace-boundary/_expected/es/main2.js b/test/chunking-form/samples/chunk-namespace-boundary/_expected/es/main2.js index 13af1f3fb55..85079115460 100644 --- a/test/chunking-form/samples/chunk-namespace-boundary/_expected/es/main2.js +++ b/test/chunking-form/samples/chunk-namespace-boundary/_expected/es/main2.js @@ -2,4 +2,4 @@ import { s as shared } from './generated-shared.js'; var main2 = shared.map(d => d + 2); -export default main2; +export { main2 as default }; diff --git a/test/chunking-form/samples/chunking-compact/_expected/es/main1.js b/test/chunking-form/samples/chunking-compact/_expected/es/main1.js index b761b539ad2..eb401d6b2ba 100644 --- a/test/chunking-form/samples/chunking-compact/_expected/es/main1.js +++ b/test/chunking-form/samples/chunking-compact/_expected/es/main1.js @@ -5,4 +5,4 @@ import {f as fn$1}from'./generated-dep2.js';function fn () { fn(); fn$1(); } -}export default Main1; \ No newline at end of file +}export{Main1 as default}; \ No newline at end of file diff --git a/test/chunking-form/samples/chunking-compact/_expected/es/main2.js b/test/chunking-form/samples/chunking-compact/_expected/es/main2.js index 2cf11d86262..96f500f0236 100644 --- a/test/chunking-form/samples/chunking-compact/_expected/es/main2.js +++ b/test/chunking-form/samples/chunking-compact/_expected/es/main2.js @@ -9,4 +9,4 @@ import {f as fn$3}from'./generated-dep2.js';import {fn as fn$2}from'external';fu fn(); fn$3(); } -}export default Main2; \ No newline at end of file +}export{Main2 as default}; \ No newline at end of file diff --git a/test/chunking-form/samples/chunking-externals/_expected/es/main1.js b/test/chunking-form/samples/chunking-externals/_expected/es/main1.js index f2e4ef52928..c5a66ab8a40 100644 --- a/test/chunking-form/samples/chunking-externals/_expected/es/main1.js +++ b/test/chunking-form/samples/chunking-externals/_expected/es/main1.js @@ -11,4 +11,4 @@ class Main1 { } } -export default Main1; +export { Main1 as default }; diff --git a/test/chunking-form/samples/chunking-externals/_expected/es/main2.js b/test/chunking-form/samples/chunking-externals/_expected/es/main2.js index 8080906328a..9c840b20316 100644 --- a/test/chunking-form/samples/chunking-externals/_expected/es/main2.js +++ b/test/chunking-form/samples/chunking-externals/_expected/es/main2.js @@ -18,4 +18,4 @@ class Main2 { } } -export default Main2; +export { Main2 as default }; diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/es/main1.js b/test/chunking-form/samples/chunking-source-maps/_expected/es/main1.js index 4075e0cecd4..3b9b307b1ff 100644 --- a/test/chunking-form/samples/chunking-source-maps/_expected/es/main1.js +++ b/test/chunking-form/samples/chunking-source-maps/_expected/es/main1.js @@ -11,5 +11,5 @@ class Main1 { } } -export default Main1; +export { Main1 as default }; //# sourceMappingURL=main1.js.map diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/es/main2.js b/test/chunking-form/samples/chunking-source-maps/_expected/es/main2.js index 4165c094c98..4e290139213 100644 --- a/test/chunking-form/samples/chunking-source-maps/_expected/es/main2.js +++ b/test/chunking-form/samples/chunking-source-maps/_expected/es/main2.js @@ -16,5 +16,5 @@ class Main2 { } } -export default Main2; +export { Main2 as default }; //# sourceMappingURL=main2.js.map diff --git a/test/chunking-form/samples/deconflict-system-default-export-variable/_expected/es/main.js b/test/chunking-form/samples/deconflict-system-default-export-variable/_expected/es/main.js index bceb98a95d2..f287fb3f56d 100644 --- a/test/chunking-form/samples/deconflict-system-default-export-variable/_expected/es/main.js +++ b/test/chunking-form/samples/deconflict-system-default-export-variable/_expected/es/main.js @@ -2,4 +2,4 @@ import * as other from './other.js'; var main = other + "extended"; -export default main; +export { main as default }; diff --git a/test/chunking-form/samples/default-identifier-renaming/_expected/es/main1.js b/test/chunking-form/samples/default-identifier-renaming/_expected/es/main1.js index 55f323e9053..6336b9e0b47 100644 --- a/test/chunking-form/samples/default-identifier-renaming/_expected/es/main1.js +++ b/test/chunking-form/samples/default-identifier-renaming/_expected/es/main1.js @@ -2,4 +2,4 @@ import { d as data } from './generated-shared.js'; var main1 = data.map(d => d + 1); -export default main1; +export { main1 as default }; diff --git a/test/chunking-form/samples/default-identifier-renaming/_expected/es/main2.js b/test/chunking-form/samples/default-identifier-renaming/_expected/es/main2.js index 422b5bdc434..e008f3b390b 100644 --- a/test/chunking-form/samples/default-identifier-renaming/_expected/es/main2.js +++ b/test/chunking-form/samples/default-identifier-renaming/_expected/es/main2.js @@ -2,4 +2,4 @@ import { d as data } from './generated-shared.js'; var main2 = data.map(d => d + 2); -export default main2; +export { main2 as default }; diff --git a/test/chunking-form/samples/default-reexport-namespace/_expected/es/one.js b/test/chunking-form/samples/default-reexport-namespace/_expected/es/one.js index db8b271506d..e710d5327c1 100644 --- a/test/chunking-form/samples/default-reexport-namespace/_expected/es/one.js +++ b/test/chunking-form/samples/default-reexport-namespace/_expected/es/one.js @@ -1,3 +1,3 @@ const __icon__ = {}; -export default __icon__; +export { __icon__ as default }; diff --git a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/nested/chunk.js b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/nested/chunk.js index c52ce8abedf..f7834ef9f0e 100644 --- a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/nested/chunk.js +++ b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/nested/chunk.js @@ -2,6 +2,6 @@ define(['require', 'exports'], function (require, exports) { 'use strict'; var solved = 'nested/chunk.js:solved:assets/asset-solved-28a7ac89.txt:../assets/asset-solved-28a7ac89.txt'; - exports.default = solved; + exports['default'] = solved; }); diff --git a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/cjs/nested/chunk.js b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/cjs/nested/chunk.js index 5ddc0c99e0d..f5dcbc0f036 100644 --- a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/cjs/nested/chunk.js +++ b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/cjs/nested/chunk.js @@ -2,4 +2,4 @@ var solved = 'nested/chunk.js:solved:assets/asset-solved-28a7ac89.txt:../assets/asset-solved-28a7ac89.txt'; -exports.default = solved; +exports['default'] = solved; diff --git a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/es/nested/chunk.js b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/es/nested/chunk.js index 1af7c01e941..407e86ebd52 100644 --- a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/es/nested/chunk.js +++ b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/es/nested/chunk.js @@ -1,3 +1,3 @@ var solved = 'nested/chunk.js:solved:assets/asset-solved-28a7ac89.txt:../assets/asset-solved-28a7ac89.txt'; -export default solved; +export { solved as default }; diff --git a/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/es/generated-dep.js b/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/es/generated-dep.js index 630536069ae..47d1cc6ec49 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/es/generated-dep.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/es/generated-dep.js @@ -1,3 +1,3 @@ var value = 42; -export default value; +export { value as default }; diff --git a/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/amd/components/sub/index.js b/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/amd/components/sub/index.js index 812fe417fb5..61356b3c008 100644 --- a/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/amd/components/sub/index.js +++ b/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/amd/components/sub/index.js @@ -3,7 +3,7 @@ define(['exports'], function (exports) { 'use strict'; const foo = 'bar'; var bar = () => {}; - exports.default = bar; + exports['default'] = bar; exports.foo = foo; Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/cjs/components/sub/index.js b/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/cjs/components/sub/index.js index 8ffc494cbe4..a37c5b92fab 100644 --- a/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/cjs/components/sub/index.js +++ b/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/cjs/components/sub/index.js @@ -5,5 +5,5 @@ Object.defineProperty(exports, '__esModule', { value: true }); const foo = 'bar'; var bar = () => {}; -exports.default = bar; +exports['default'] = bar; exports.foo = foo; diff --git a/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/es/components/sub/index.js b/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/es/components/sub/index.js index 3b438c25222..1ee02cde7d7 100644 --- a/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/es/components/sub/index.js +++ b/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/es/components/sub/index.js @@ -1,5 +1,4 @@ const foo = 'bar'; var bar = () => {}; -export default bar; -export { foo }; +export { bar as default, foo }; diff --git a/test/chunking-form/samples/deprecated/manual-chunks/_expected/es/main.js b/test/chunking-form/samples/deprecated/manual-chunks/_expected/es/main.js index 55591e37b6a..6982299f90d 100644 --- a/test/chunking-form/samples/deprecated/manual-chunks/_expected/es/main.js +++ b/test/chunking-form/samples/deprecated/manual-chunks/_expected/es/main.js @@ -13,4 +13,4 @@ class Main { } } -export default Main; +export { Main as default }; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_expected/es/default.js b/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_expected/es/default.js index 97dcda8cdc9..888d95cb398 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_expected/es/default.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_expected/es/default.js @@ -1,3 +1,3 @@ var foo = 'default'; -export default foo; +export { foo as default }; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/es/commonjs.js b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/es/commonjs.js index 75c39f48f46..a301391b5fc 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/es/commonjs.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/es/commonjs.js @@ -9,4 +9,4 @@ console.log(external, value); var commonjs = 42; -export default commonjs; +export { commonjs as default }; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-dynamic-namespace/_expected/es/m2.js b/test/chunking-form/samples/deprecated/preserve-modules-dynamic-namespace/_expected/es/m2.js index 0ee68395af0..2e316b8ff07 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-dynamic-namespace/_expected/es/m2.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-dynamic-namespace/_expected/es/m2.js @@ -1,3 +1,3 @@ var m2 = {a:1}; -export default m2; +export { m2 as default }; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-dynamic-namespace/_expected/es/m3.js b/test/chunking-form/samples/deprecated/preserve-modules-dynamic-namespace/_expected/es/m3.js index 0d65aa10bb9..4e4d52f9878 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-dynamic-namespace/_expected/es/m3.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-dynamic-namespace/_expected/es/m3.js @@ -1,3 +1,3 @@ var m3 = {b:2}; -export default m3; +export { m3 as default }; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-empty/_expected/es/two.js b/test/chunking-form/samples/deprecated/preserve-modules-empty/_expected/es/two.js index 0938a073152..2c1648548f6 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-empty/_expected/es/two.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-empty/_expected/es/two.js @@ -1,3 +1,3 @@ var a = {}; -export default a; +export { a as default }; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/entry-foo-es-ts.ts.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/entry-foo-es-ts.ts.js index 8ac2b2169a4..2685886fe7a 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/entry-foo-es-ts.ts.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/entry-foo-es-ts.ts.js @@ -1,3 +1,3 @@ var foo = 42; -export default foo; +export { foo as default }; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/entry-no-ext-es-.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/entry-no-ext-es-.js index e630b7b5e9d..ae037040be2 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/entry-no-ext-es-.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/entry-no-ext-es-.js @@ -1,3 +1,3 @@ var noExt = 'no-ext'; -export default noExt; +export { noExt as default }; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/nested/entry-bar-es-ts.ts.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/nested/entry-bar-es-ts.ts.js index bbf65d4599d..f383a373551 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/nested/entry-bar-es-ts.ts.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/nested/entry-bar-es-ts.ts.js @@ -1,3 +1,3 @@ var bar = 'banana'; -export default bar; +export { bar as default }; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/nested/entry-baz-es-ts.ts.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/nested/entry-baz-es-ts.ts.js index 03a3023d32b..11a48a575ed 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/nested/entry-baz-es-ts.ts.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/nested/entry-baz-es-ts.ts.js @@ -1,3 +1,3 @@ var baz = 'whatever'; -export default baz; +export { baz as default }; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-id-case-sensitive/_expected/es/_virtual/_One1.js b/test/chunking-form/samples/deprecated/preserve-modules-id-case-sensitive/_expected/es/_virtual/_One1.js index 3ea816df737..0a993ba1f64 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-id-case-sensitive/_expected/es/_virtual/_One1.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-id-case-sensitive/_expected/es/_virtual/_One1.js @@ -1,3 +1,3 @@ var c = 'One1.js'; -export default c; +export { c as default }; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-id-case-sensitive/_expected/es/_virtual/_One2.js b/test/chunking-form/samples/deprecated/preserve-modules-id-case-sensitive/_expected/es/_virtual/_One2.js index d889775b3d6..127ca31fe6f 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-id-case-sensitive/_expected/es/_virtual/_One2.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-id-case-sensitive/_expected/es/_virtual/_One2.js @@ -1,3 +1,3 @@ var b = 'One.js'; -export default b; +export { b as default }; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-id-case-sensitive/_expected/es/_virtual/_one.js b/test/chunking-form/samples/deprecated/preserve-modules-id-case-sensitive/_expected/es/_virtual/_one.js index 615c3de0ca9..d53f39de114 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-id-case-sensitive/_expected/es/_virtual/_one.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-id-case-sensitive/_expected/es/_virtual/_one.js @@ -1,3 +1,3 @@ var a = 'one.js'; -export default a; +export { a as default }; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/amd/default.js b/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/amd/default.js index e8359fc2e7b..36548304b3d 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/amd/default.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/amd/default.js @@ -2,7 +2,7 @@ define(['exports'], function (exports) { 'use strict'; var foo = 'default'; - exports.default = foo; + exports['default'] = foo; Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/cjs/default.js b/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/cjs/default.js index bc9cb9bdcb9..23b09fb3b57 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/cjs/default.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/cjs/default.js @@ -4,4 +4,4 @@ Object.defineProperty(exports, '__esModule', { value: true }); var foo = 'default'; -exports.default = foo; +exports['default'] = foo; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/es/default.js b/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/es/default.js index 97dcda8cdc9..888d95cb398 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/es/default.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/es/default.js @@ -1,3 +1,3 @@ var foo = 'default'; -export default foo; +export { foo as default }; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-non-entry-imports/_expected/es/dep2.js b/test/chunking-form/samples/deprecated/preserve-modules-non-entry-imports/_expected/es/dep2.js index e39ccfc8db2..4987d698ddd 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-non-entry-imports/_expected/es/dep2.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-non-entry-imports/_expected/es/dep2.js @@ -1,3 +1,3 @@ function foo() {} -export default foo; +export { foo as default }; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-reaching-outside/_expected/es/lib/main.js b/test/chunking-form/samples/deprecated/preserve-modules-reaching-outside/_expected/es/lib/main.js index 6285f240de1..7e0751fbcb0 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-reaching-outside/_expected/es/lib/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-reaching-outside/_expected/es/lib/main.js @@ -6,4 +6,4 @@ class Main { } } -export default Main; +export { Main as default }; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-scriptified-assets/_expected/es/answer.num.js b/test/chunking-form/samples/deprecated/preserve-modules-scriptified-assets/_expected/es/answer.num.js index b91051d4a13..bc6c6c354cd 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-scriptified-assets/_expected/es/answer.num.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-scriptified-assets/_expected/es/answer.num.js @@ -1,3 +1,3 @@ var answer = 42; -export default answer; +export { answer as default }; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-scriptified-assets/_expected/es/lorem.str.js b/test/chunking-form/samples/deprecated/preserve-modules-scriptified-assets/_expected/es/lorem.str.js index 64a054f651b..20a4e34f1ea 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-scriptified-assets/_expected/es/lorem.str.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-scriptified-assets/_expected/es/lorem.str.js @@ -1,3 +1,3 @@ var lorem = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."; -export default lorem; +export { lorem as default }; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-scriptified-assets/_expected/es/no-ext.js b/test/chunking-form/samples/deprecated/preserve-modules-scriptified-assets/_expected/es/no-ext.js index b1b723a7068..10cc7f5851b 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-scriptified-assets/_expected/es/no-ext.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-scriptified-assets/_expected/es/no-ext.js @@ -1,3 +1,3 @@ var noExt = "COULDN'T TRANSFORM"; -export default noExt; +export { noExt as default }; diff --git a/test/chunking-form/samples/deprecated/preserve-modules/_expected/es/main1.js b/test/chunking-form/samples/deprecated/preserve-modules/_expected/es/main1.js index db71b463402..a7780fee299 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules/_expected/es/main1.js +++ b/test/chunking-form/samples/deprecated/preserve-modules/_expected/es/main1.js @@ -8,4 +8,4 @@ class Main1 { } } -export default Main1; +export { Main1 as default }; diff --git a/test/chunking-form/samples/deprecated/preserve-modules/_expected/es/main2.js b/test/chunking-form/samples/deprecated/preserve-modules/_expected/es/main2.js index a3b4ef89ff7..4e89541f07e 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules/_expected/es/main2.js +++ b/test/chunking-form/samples/deprecated/preserve-modules/_expected/es/main2.js @@ -8,4 +8,4 @@ class Main2 { } } -export default Main2; +export { Main2 as default }; diff --git a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/amd/generated-separate.js b/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/amd/generated-separate.js index 39394a740ad..d7c34b5681d 100644 --- a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/amd/generated-separate.js +++ b/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/amd/generated-separate.js @@ -4,7 +4,7 @@ define(['exports'], function (exports) { 'use strict'; const x = 2; console.log('separate'); - exports.default = separate; + exports['default'] = separate; exports.x = x; }); diff --git a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/cjs/generated-separate.js b/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/cjs/generated-separate.js index d1aecc86c45..d0283dad2e0 100644 --- a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/cjs/generated-separate.js +++ b/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/cjs/generated-separate.js @@ -4,5 +4,5 @@ var separate = 'separate'; const x = 2; console.log('separate'); -exports.default = separate; +exports['default'] = separate; exports.x = x; diff --git a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/es/generated-separate.js b/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/es/generated-separate.js index fd70da9ecd3..19236ddf914 100644 --- a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/es/generated-separate.js +++ b/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/es/generated-separate.js @@ -2,5 +2,4 @@ var separate = 'separate'; const x = 2; console.log('separate'); -export default separate; -export { x }; +export { separate as default, x }; diff --git a/test/chunking-form/samples/dynamic-import-only-default/_expected/amd/generated-other.js b/test/chunking-form/samples/dynamic-import-only-default/_expected/amd/generated-other.js index 290138d02f8..5eee5c01515 100644 --- a/test/chunking-form/samples/dynamic-import-only-default/_expected/amd/generated-other.js +++ b/test/chunking-form/samples/dynamic-import-only-default/_expected/amd/generated-other.js @@ -2,6 +2,6 @@ define(['exports'], function (exports) { 'use strict'; var other = 42; - exports.default = other; + exports['default'] = other; }); diff --git a/test/chunking-form/samples/dynamic-import-only-default/_expected/cjs/generated-other.js b/test/chunking-form/samples/dynamic-import-only-default/_expected/cjs/generated-other.js index 412f406fb8d..c367827f78c 100644 --- a/test/chunking-form/samples/dynamic-import-only-default/_expected/cjs/generated-other.js +++ b/test/chunking-form/samples/dynamic-import-only-default/_expected/cjs/generated-other.js @@ -2,4 +2,4 @@ var other = 42; -exports.default = other; +exports['default'] = other; diff --git a/test/chunking-form/samples/dynamic-import-only-default/_expected/es/entry.js b/test/chunking-form/samples/dynamic-import-only-default/_expected/es/entry.js index 6071e090095..1b16d549a54 100644 --- a/test/chunking-form/samples/dynamic-import-only-default/_expected/es/entry.js +++ b/test/chunking-form/samples/dynamic-import-only-default/_expected/es/entry.js @@ -1,3 +1,3 @@ var entry = 42; -export default entry; +export { entry as default }; diff --git a/test/chunking-form/samples/dynamic-import-only-default/_expected/es/generated-other.js b/test/chunking-form/samples/dynamic-import-only-default/_expected/es/generated-other.js index fbe3caedc6c..53819e1d13a 100644 --- a/test/chunking-form/samples/dynamic-import-only-default/_expected/es/generated-other.js +++ b/test/chunking-form/samples/dynamic-import-only-default/_expected/es/generated-other.js @@ -1,3 +1,3 @@ var other = 42; -export default other; +export { other as default }; diff --git a/test/chunking-form/samples/dynamic-import-only-default/_expected/es/main.js b/test/chunking-form/samples/dynamic-import-only-default/_expected/es/main.js index fcf4f050e93..7ba00bc9455 100644 --- a/test/chunking-form/samples/dynamic-import-only-default/_expected/es/main.js +++ b/test/chunking-form/samples/dynamic-import-only-default/_expected/es/main.js @@ -1,3 +1,3 @@ var main = Promise.all([import('./entry.js'), import('./generated-other.js')]); -export default main; +export { main as default }; diff --git a/test/chunking-form/samples/dynamic-import-synthetic-exports-preserve-modules/_expected/es/lib.js b/test/chunking-form/samples/dynamic-import-synthetic-exports-preserve-modules/_expected/es/lib.js index 27160dc1838..221382243d9 100644 --- a/test/chunking-form/samples/dynamic-import-synthetic-exports-preserve-modules/_expected/es/lib.js +++ b/test/chunking-form/samples/dynamic-import-synthetic-exports-preserve-modules/_expected/es/lib.js @@ -1,4 +1,4 @@ const __moduleExports = { foo: 'bar' }; var lib = 'baz'; -export default lib; +export { lib as default }; diff --git a/test/chunking-form/samples/dynamically-import-untainted-entry/_expected/es/main.js b/test/chunking-form/samples/dynamically-import-untainted-entry/_expected/es/main.js index d862de816a3..c3e30233192 100644 --- a/test/chunking-form/samples/dynamically-import-untainted-entry/_expected/es/main.js +++ b/test/chunking-form/samples/dynamically-import-untainted-entry/_expected/es/main.js @@ -1,3 +1,3 @@ var main = 42; -export default main; +export { main as default }; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/es/generated-name.js b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/es/generated-name.js index 6c5f12c4a68..d626e696e41 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/es/generated-name.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/es/generated-name.js @@ -1,3 +1,3 @@ var value1 = 42; -export default value1; +export { value1 as default }; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/es/generated-name2.js b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/es/generated-name2.js index 6409a036d0c..c1bd37a20f9 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/es/generated-name2.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/es/generated-name2.js @@ -1,3 +1,3 @@ var value3 = 44; -export default value3; +export { value3 as default }; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/es/generated-secondName.js b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/es/generated-secondName.js index 04479022dca..3c5f124193e 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/es/generated-secondName.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/es/generated-secondName.js @@ -1,3 +1,3 @@ var value2 = 43; -export default value2; +export { value2 as default }; diff --git a/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/es/generated-dep.js b/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/es/generated-dep.js index 630536069ae..47d1cc6ec49 100644 --- a/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/es/generated-dep.js +++ b/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/es/generated-dep.js @@ -1,3 +1,3 @@ var value = 42; -export default value; +export { value as default }; diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/es/entry-deb-es.js b/test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/es/entry-deb-es.js index 77446c947a7..d3540098970 100644 --- a/test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/es/entry-deb-es.js +++ b/test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/es/entry-deb-es.js @@ -1,3 +1,3 @@ var deb = 'string'; -export default deb; +export { deb as default }; diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/chunk-deb-c542d45b-amd.js b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/chunk-deb-c542d45b-amd.js index 1bc94d104bd..309ef04a522 100644 --- a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/chunk-deb-c542d45b-amd.js +++ b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/chunk-deb-c542d45b-amd.js @@ -2,6 +2,6 @@ define(['exports'], function (exports) { 'use strict'; var deb = 'string'; - exports.default = deb; + exports['default'] = deb; }); diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/chunk-deb-19c947c3-cjs.js b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/chunk-deb-19c947c3-cjs.js index f51dbd7a36a..e15f83c3109 100644 --- a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/chunk-deb-19c947c3-cjs.js +++ b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/chunk-deb-19c947c3-cjs.js @@ -2,4 +2,4 @@ var deb = 'string'; -exports.default = deb; +exports['default'] = deb; diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/chunk-deb-607fe03f-es.js b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/chunk-deb-607fe03f-es.js index 77446c947a7..d3540098970 100644 --- a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/chunk-deb-607fe03f-es.js +++ b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/chunk-deb-607fe03f-es.js @@ -1,3 +1,3 @@ var deb = 'string'; -export default deb; +export { deb as default }; diff --git a/test/chunking-form/samples/entry-chunk-export-mode/_expected/es/main2.js b/test/chunking-form/samples/entry-chunk-export-mode/_expected/es/main2.js index 83b8044f5b7..46f993dbcc3 100644 --- a/test/chunking-form/samples/entry-chunk-export-mode/_expected/es/main2.js +++ b/test/chunking-form/samples/entry-chunk-export-mode/_expected/es/main2.js @@ -2,4 +2,4 @@ function fn () { console.log('main fn'); } -export default fn; +export { fn as default }; diff --git a/test/chunking-form/samples/entry-point-without-own-code/_expected/es/m2.js b/test/chunking-form/samples/entry-point-without-own-code/_expected/es/m2.js index ba5d9f8731a..2e0ed575641 100644 --- a/test/chunking-form/samples/entry-point-without-own-code/_expected/es/m2.js +++ b/test/chunking-form/samples/entry-point-without-own-code/_expected/es/m2.js @@ -1,3 +1,3 @@ var m2 = 'm2'; -export default m2; +export { m2 as default }; diff --git a/test/chunking-form/samples/export-default-from-entry/_expected/es/dep.js b/test/chunking-form/samples/export-default-from-entry/_expected/es/dep.js index 1df3b791cce..deb0fc0b34a 100644 --- a/test/chunking-form/samples/export-default-from-entry/_expected/es/dep.js +++ b/test/chunking-form/samples/export-default-from-entry/_expected/es/dep.js @@ -1,3 +1,3 @@ var dep = 42; -export default dep; +export { dep as default }; diff --git a/test/chunking-form/samples/import-variable-duplicates/_expected/es/first.js b/test/chunking-form/samples/import-variable-duplicates/_expected/es/first.js index 7a022e55d7c..af30557f465 100644 --- a/test/chunking-form/samples/import-variable-duplicates/_expected/es/first.js +++ b/test/chunking-form/samples/import-variable-duplicates/_expected/es/first.js @@ -1,3 +1,3 @@ var head2 = 'first'; -export default head2; +export { head2 as default }; diff --git a/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/amd/components/sub/index.js b/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/amd/components/sub/index.js index 812fe417fb5..61356b3c008 100644 --- a/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/amd/components/sub/index.js +++ b/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/amd/components/sub/index.js @@ -3,7 +3,7 @@ define(['exports'], function (exports) { 'use strict'; const foo = 'bar'; var bar = () => {}; - exports.default = bar; + exports['default'] = bar; exports.foo = foo; Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/cjs/components/sub/index.js b/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/cjs/components/sub/index.js index 8ffc494cbe4..a37c5b92fab 100644 --- a/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/cjs/components/sub/index.js +++ b/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/cjs/components/sub/index.js @@ -5,5 +5,5 @@ Object.defineProperty(exports, '__esModule', { value: true }); const foo = 'bar'; var bar = () => {}; -exports.default = bar; +exports['default'] = bar; exports.foo = foo; diff --git a/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/es/components/sub/index.js b/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/es/components/sub/index.js index 3b438c25222..1ee02cde7d7 100644 --- a/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/es/components/sub/index.js +++ b/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/es/components/sub/index.js @@ -1,5 +1,4 @@ const foo = 'bar'; var bar = () => {}; -export default bar; -export { foo }; +export { bar as default, foo }; diff --git a/test/chunking-form/samples/manual-chunks/_expected/es/main.js b/test/chunking-form/samples/manual-chunks/_expected/es/main.js index 55591e37b6a..6982299f90d 100644 --- a/test/chunking-form/samples/manual-chunks/_expected/es/main.js +++ b/test/chunking-form/samples/manual-chunks/_expected/es/main.js @@ -13,4 +13,4 @@ class Main { } } -export default Main; +export { Main as default }; diff --git a/test/chunking-form/samples/missing-export/_expected/amd/dep.js b/test/chunking-form/samples/missing-export/_expected/amd/dep.js index b0a4d553740..c932a60471e 100644 --- a/test/chunking-form/samples/missing-export/_expected/amd/dep.js +++ b/test/chunking-form/samples/missing-export/_expected/amd/dep.js @@ -6,7 +6,7 @@ define(['exports'], function (exports) { 'use strict'; sideEffect(arg); } - exports.default = _missingExportShim; + exports['default'] = _missingExportShim; exports.missingExport = _missingExportShim; exports.missingFn = _missingExportShim; exports.x = x; diff --git a/test/chunking-form/samples/missing-export/_expected/cjs/dep.js b/test/chunking-form/samples/missing-export/_expected/cjs/dep.js index fcee436f762..5f8459792a5 100644 --- a/test/chunking-form/samples/missing-export/_expected/cjs/dep.js +++ b/test/chunking-form/samples/missing-export/_expected/cjs/dep.js @@ -8,7 +8,7 @@ function x (arg) { sideEffect(arg); } -exports.default = _missingExportShim; +exports['default'] = _missingExportShim; exports.missingExport = _missingExportShim; exports.missingFn = _missingExportShim; exports.x = x; diff --git a/test/chunking-form/samples/missing-export/_expected/es/dep.js b/test/chunking-form/samples/missing-export/_expected/es/dep.js index 5fe7b66c9fe..f5a92f04745 100644 --- a/test/chunking-form/samples/missing-export/_expected/es/dep.js +++ b/test/chunking-form/samples/missing-export/_expected/es/dep.js @@ -4,5 +4,4 @@ function x (arg) { sideEffect(arg); } -export default _missingExportShim; -export { _missingExportShim as missingExport, _missingExportShim as missingFn, x }; +export { _missingExportShim as default, _missingExportShim as missingExport, _missingExportShim as missingFn, x }; diff --git a/test/chunking-form/samples/namespace-reexports/_expected/amd/hsl2hsv.js b/test/chunking-form/samples/namespace-reexports/_expected/amd/hsl2hsv.js index 3b4de4c78d8..a3999a32813 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/amd/hsl2hsv.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/amd/hsl2hsv.js @@ -9,7 +9,7 @@ define(['exports'], function (exports) { 'use strict'; var p = 5; - exports.default = hsl2hsv; + exports['default'] = hsl2hsv; exports.p = p; Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/chunking-form/samples/namespace-reexports/_expected/amd/main.js b/test/chunking-form/samples/namespace-reexports/_expected/amd/main.js index 66a16c83d6c..5e34f8aa2ca 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/amd/main.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/amd/main.js @@ -3,7 +3,7 @@ define(['exports', './generated-index', './hsl2hsv'], function (exports, index, console.log(hsl2hsv.p); var main = new Map(Object.entries(index.lib)); - exports.default = main; + exports['default'] = main; Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/chunking-form/samples/namespace-reexports/_expected/cjs/hsl2hsv.js b/test/chunking-form/samples/namespace-reexports/_expected/cjs/hsl2hsv.js index 9f38e088474..b218034fab6 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/cjs/hsl2hsv.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/cjs/hsl2hsv.js @@ -11,5 +11,5 @@ var hsl2hsv = (h, s, l) => { var p = 5; -exports.default = hsl2hsv; +exports['default'] = hsl2hsv; exports.p = p; diff --git a/test/chunking-form/samples/namespace-reexports/_expected/cjs/main.js b/test/chunking-form/samples/namespace-reexports/_expected/cjs/main.js index 4ac898f1a3f..23b31036829 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/cjs/main.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/cjs/main.js @@ -8,4 +8,4 @@ var hsl2hsv = require('./hsl2hsv.js'); console.log(hsl2hsv.p); var main = new Map(Object.entries(index.lib)); -exports.default = main; +exports['default'] = main; diff --git a/test/chunking-form/samples/namespace-reexports/_expected/es/hsl2hsv.js b/test/chunking-form/samples/namespace-reexports/_expected/es/hsl2hsv.js index e2b167b0949..ed70b7b160c 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/es/hsl2hsv.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/es/hsl2hsv.js @@ -7,5 +7,4 @@ var hsl2hsv = (h, s, l) => { var p = 5; -export default hsl2hsv; -export { p }; +export { hsl2hsv as default, p }; diff --git a/test/chunking-form/samples/namespace-reexports/_expected/es/main.js b/test/chunking-form/samples/namespace-reexports/_expected/es/main.js index 716aeaba0fa..afa6b6f2359 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/es/main.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/es/main.js @@ -4,4 +4,4 @@ import { p } from './hsl2hsv.js'; console.log(p); var main = new Map(Object.entries(lib)); -export default main; +export { main as default }; diff --git a/test/chunking-form/samples/namespace-tostring/dynamic-import-default-mode/_expected/es/foo.js b/test/chunking-form/samples/namespace-tostring/dynamic-import-default-mode/_expected/es/foo.js index 8ac2b2169a4..2685886fe7a 100644 --- a/test/chunking-form/samples/namespace-tostring/dynamic-import-default-mode/_expected/es/foo.js +++ b/test/chunking-form/samples/namespace-tostring/dynamic-import-default-mode/_expected/es/foo.js @@ -1,3 +1,3 @@ var foo = 42; -export default foo; +export { foo as default }; diff --git a/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/es/default.js b/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/es/default.js index 97dcda8cdc9..888d95cb398 100644 --- a/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/es/default.js +++ b/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/es/default.js @@ -1,3 +1,3 @@ var foo = 'default'; -export default foo; +export { foo as default }; diff --git a/test/chunking-form/samples/preserve-modules-commonjs/_expected/es/commonjs.js b/test/chunking-form/samples/preserve-modules-commonjs/_expected/es/commonjs.js index 75c39f48f46..a301391b5fc 100644 --- a/test/chunking-form/samples/preserve-modules-commonjs/_expected/es/commonjs.js +++ b/test/chunking-form/samples/preserve-modules-commonjs/_expected/es/commonjs.js @@ -9,4 +9,4 @@ console.log(external, value); var commonjs = 42; -export default commonjs; +export { commonjs as default }; diff --git a/test/chunking-form/samples/preserve-modules-default-mode-namespace/_expected/es/lib.js b/test/chunking-form/samples/preserve-modules-default-mode-namespace/_expected/es/lib.js index 53bd733a775..67d49bee15f 100644 --- a/test/chunking-form/samples/preserve-modules-default-mode-namespace/_expected/es/lib.js +++ b/test/chunking-form/samples/preserve-modules-default-mode-namespace/_expected/es/lib.js @@ -1,3 +1,3 @@ var lib = 'foo'; -export default lib; +export { lib as default }; diff --git a/test/chunking-form/samples/preserve-modules-default-mode-namespace2/_expected/es/lib.js b/test/chunking-form/samples/preserve-modules-default-mode-namespace2/_expected/es/lib.js index 53bd733a775..67d49bee15f 100644 --- a/test/chunking-form/samples/preserve-modules-default-mode-namespace2/_expected/es/lib.js +++ b/test/chunking-form/samples/preserve-modules-default-mode-namespace2/_expected/es/lib.js @@ -1,3 +1,3 @@ var lib = 'foo'; -export default lib; +export { lib as default }; diff --git a/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/es/m2.js b/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/es/m2.js index 0ee68395af0..2e316b8ff07 100644 --- a/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/es/m2.js +++ b/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/es/m2.js @@ -1,3 +1,3 @@ var m2 = {a:1}; -export default m2; +export { m2 as default }; diff --git a/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/es/m3.js b/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/es/m3.js index 0d65aa10bb9..4e4d52f9878 100644 --- a/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/es/m3.js +++ b/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/es/m3.js @@ -1,3 +1,3 @@ var m3 = {b:2}; -export default m3; +export { m3 as default }; diff --git a/test/chunking-form/samples/preserve-modules-empty/_expected/es/two.js b/test/chunking-form/samples/preserve-modules-empty/_expected/es/two.js index 0938a073152..2c1648548f6 100644 --- a/test/chunking-form/samples/preserve-modules-empty/_expected/es/two.js +++ b/test/chunking-form/samples/preserve-modules-empty/_expected/es/two.js @@ -1,3 +1,3 @@ var a = {}; -export default a; +export { a as default }; diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/entry-foo-es-ts.ts.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/entry-foo-es-ts.ts.js index 8ac2b2169a4..2685886fe7a 100644 --- a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/entry-foo-es-ts.ts.js +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/entry-foo-es-ts.ts.js @@ -1,3 +1,3 @@ var foo = 42; -export default foo; +export { foo as default }; diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/entry-lorem-es-str.str.str.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/entry-lorem-es-str.str.str.js index 64a054f651b..20a4e34f1ea 100644 --- a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/entry-lorem-es-str.str.str.js +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/entry-lorem-es-str.str.str.js @@ -1,3 +1,3 @@ var lorem = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."; -export default lorem; +export { lorem as default }; diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/entry-no-ext-es-.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/entry-no-ext-es-.js index e630b7b5e9d..ae037040be2 100644 --- a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/entry-no-ext-es-.js +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/entry-no-ext-es-.js @@ -1,3 +1,3 @@ var noExt = 'no-ext'; -export default noExt; +export { noExt as default }; diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/nested/entry-bar-es-ts.ts.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/nested/entry-bar-es-ts.ts.js index bbf65d4599d..f383a373551 100644 --- a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/nested/entry-bar-es-ts.ts.js +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/nested/entry-bar-es-ts.ts.js @@ -1,3 +1,3 @@ var bar = 'banana'; -export default bar; +export { bar as default }; diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/nested/entry-baz-es-ts.ts.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/nested/entry-baz-es-ts.ts.js index 03a3023d32b..11a48a575ed 100644 --- a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/nested/entry-baz-es-ts.ts.js +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/nested/entry-baz-es-ts.ts.js @@ -1,3 +1,3 @@ var baz = 'whatever'; -export default baz; +export { baz as default }; diff --git a/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/es/_virtual/_One1.js b/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/es/_virtual/_One1.js index 3ea816df737..0a993ba1f64 100644 --- a/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/es/_virtual/_One1.js +++ b/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/es/_virtual/_One1.js @@ -1,3 +1,3 @@ var c = 'One1.js'; -export default c; +export { c as default }; diff --git a/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/es/_virtual/_One2.js b/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/es/_virtual/_One2.js index d889775b3d6..127ca31fe6f 100644 --- a/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/es/_virtual/_One2.js +++ b/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/es/_virtual/_One2.js @@ -1,3 +1,3 @@ var b = 'One.js'; -export default b; +export { b as default }; diff --git a/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/es/_virtual/_one.js b/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/es/_virtual/_one.js index 615c3de0ca9..d53f39de114 100644 --- a/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/es/_virtual/_one.js +++ b/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/es/_virtual/_one.js @@ -1,3 +1,3 @@ var a = 'one.js'; -export default a; +export { a as default }; diff --git a/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/amd/default.js b/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/amd/default.js index e8359fc2e7b..36548304b3d 100644 --- a/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/amd/default.js +++ b/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/amd/default.js @@ -2,7 +2,7 @@ define(['exports'], function (exports) { 'use strict'; var foo = 'default'; - exports.default = foo; + exports['default'] = foo; Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/cjs/default.js b/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/cjs/default.js index bc9cb9bdcb9..23b09fb3b57 100644 --- a/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/cjs/default.js +++ b/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/cjs/default.js @@ -4,4 +4,4 @@ Object.defineProperty(exports, '__esModule', { value: true }); var foo = 'default'; -exports.default = foo; +exports['default'] = foo; diff --git a/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/es/default.js b/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/es/default.js index 97dcda8cdc9..888d95cb398 100644 --- a/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/es/default.js +++ b/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/es/default.js @@ -1,3 +1,3 @@ var foo = 'default'; -export default foo; +export { foo as default }; diff --git a/test/chunking-form/samples/preserve-modules-non-entry-imports/_expected/es/dep2.js b/test/chunking-form/samples/preserve-modules-non-entry-imports/_expected/es/dep2.js index e39ccfc8db2..4987d698ddd 100644 --- a/test/chunking-form/samples/preserve-modules-non-entry-imports/_expected/es/dep2.js +++ b/test/chunking-form/samples/preserve-modules-non-entry-imports/_expected/es/dep2.js @@ -1,3 +1,3 @@ function foo() {} -export default foo; +export { foo as default }; diff --git a/test/chunking-form/samples/preserve-modules-reaching-outside/_expected/es/lib/main.js b/test/chunking-form/samples/preserve-modules-reaching-outside/_expected/es/lib/main.js index 6285f240de1..7e0751fbcb0 100644 --- a/test/chunking-form/samples/preserve-modules-reaching-outside/_expected/es/lib/main.js +++ b/test/chunking-form/samples/preserve-modules-reaching-outside/_expected/es/lib/main.js @@ -6,4 +6,4 @@ class Main { } } -export default Main; +export { Main as default }; diff --git a/test/chunking-form/samples/preserve-modules-root/_expected/es/below/module.js b/test/chunking-form/samples/preserve-modules-root/_expected/es/below/module.js index 3933207d721..b0b5587c304 100644 --- a/test/chunking-form/samples/preserve-modules-root/_expected/es/below/module.js +++ b/test/chunking-form/samples/preserve-modules-root/_expected/es/below/module.js @@ -7,4 +7,4 @@ var module = { base2, }; -export default module; +export { module as default }; diff --git a/test/chunking-form/samples/preserve-modules-root/_expected/es/under-build.js b/test/chunking-form/samples/preserve-modules-root/_expected/es/under-build.js index d2328847049..17be990060c 100644 --- a/test/chunking-form/samples/preserve-modules-root/_expected/es/under-build.js +++ b/test/chunking-form/samples/preserve-modules-root/_expected/es/under-build.js @@ -7,4 +7,4 @@ var underBuild = { base }; -export default underBuild; +export { underBuild as default }; diff --git a/test/chunking-form/samples/preserve-modules-scriptified-assets/_expected/es/answer.num.js b/test/chunking-form/samples/preserve-modules-scriptified-assets/_expected/es/answer.num.js index b91051d4a13..bc6c6c354cd 100644 --- a/test/chunking-form/samples/preserve-modules-scriptified-assets/_expected/es/answer.num.js +++ b/test/chunking-form/samples/preserve-modules-scriptified-assets/_expected/es/answer.num.js @@ -1,3 +1,3 @@ var answer = 42; -export default answer; +export { answer as default }; diff --git a/test/chunking-form/samples/preserve-modules-scriptified-assets/_expected/es/lorem.str.js b/test/chunking-form/samples/preserve-modules-scriptified-assets/_expected/es/lorem.str.js index 64a054f651b..20a4e34f1ea 100644 --- a/test/chunking-form/samples/preserve-modules-scriptified-assets/_expected/es/lorem.str.js +++ b/test/chunking-form/samples/preserve-modules-scriptified-assets/_expected/es/lorem.str.js @@ -1,3 +1,3 @@ var lorem = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."; -export default lorem; +export { lorem as default }; diff --git a/test/chunking-form/samples/preserve-modules-scriptified-assets/_expected/es/no-ext.js b/test/chunking-form/samples/preserve-modules-scriptified-assets/_expected/es/no-ext.js index b1b723a7068..10cc7f5851b 100644 --- a/test/chunking-form/samples/preserve-modules-scriptified-assets/_expected/es/no-ext.js +++ b/test/chunking-form/samples/preserve-modules-scriptified-assets/_expected/es/no-ext.js @@ -1,3 +1,3 @@ var noExt = "COULDN'T TRANSFORM"; -export default noExt; +export { noExt as default }; diff --git a/test/chunking-form/samples/preserve-modules/_expected/es/main1.js b/test/chunking-form/samples/preserve-modules/_expected/es/main1.js index db71b463402..a7780fee299 100644 --- a/test/chunking-form/samples/preserve-modules/_expected/es/main1.js +++ b/test/chunking-form/samples/preserve-modules/_expected/es/main1.js @@ -8,4 +8,4 @@ class Main1 { } } -export default Main1; +export { Main1 as default }; diff --git a/test/chunking-form/samples/preserve-modules/_expected/es/main2.js b/test/chunking-form/samples/preserve-modules/_expected/es/main2.js index a3b4ef89ff7..4e89541f07e 100644 --- a/test/chunking-form/samples/preserve-modules/_expected/es/main2.js +++ b/test/chunking-form/samples/preserve-modules/_expected/es/main2.js @@ -8,4 +8,4 @@ class Main2 { } } -export default Main2; +export { Main2 as default }; diff --git a/test/chunking-form/samples/sanitize-chunk-names/_expected/es/_virtual_entry-1.js b/test/chunking-form/samples/sanitize-chunk-names/_expected/es/_virtual_entry-1.js index 9fa2c9b2926..85a32d22298 100644 --- a/test/chunking-form/samples/sanitize-chunk-names/_expected/es/_virtual_entry-1.js +++ b/test/chunking-form/samples/sanitize-chunk-names/_expected/es/_virtual_entry-1.js @@ -1,3 +1,3 @@ var _virtual_entry1 = "\u0000virtual:entry-1"; -export default _virtual_entry1; +export { _virtual_entry1 as default }; diff --git a/test/chunking-form/samples/sanitize-chunk-names/_expected/es/_virtual_entry-2.js b/test/chunking-form/samples/sanitize-chunk-names/_expected/es/_virtual_entry-2.js index c228f2ab38b..8d56d3ff099 100644 --- a/test/chunking-form/samples/sanitize-chunk-names/_expected/es/_virtual_entry-2.js +++ b/test/chunking-form/samples/sanitize-chunk-names/_expected/es/_virtual_entry-2.js @@ -1,3 +1,3 @@ var _virtual_entry2 = "\u0000virtual:entry-2"; -export default _virtual_entry2; +export { _virtual_entry2 as default }; diff --git a/test/chunking-form/samples/sanitize-internal-exports/_expected/amd/generated-lazy.js b/test/chunking-form/samples/sanitize-internal-exports/_expected/amd/generated-lazy.js index 2a891f78402..312d8af823c 100644 --- a/test/chunking-form/samples/sanitize-internal-exports/_expected/amd/generated-lazy.js +++ b/test/chunking-form/samples/sanitize-internal-exports/_expected/amd/generated-lazy.js @@ -2,6 +2,6 @@ define(['exports', './main'], function (exports, main) { 'use strict'; var lazy = () => main.v1; - exports.default = lazy; + exports['default'] = lazy; }); diff --git a/test/chunking-form/samples/sanitize-internal-exports/_expected/cjs/generated-lazy.js b/test/chunking-form/samples/sanitize-internal-exports/_expected/cjs/generated-lazy.js index fdaab011450..58751964479 100644 --- a/test/chunking-form/samples/sanitize-internal-exports/_expected/cjs/generated-lazy.js +++ b/test/chunking-form/samples/sanitize-internal-exports/_expected/cjs/generated-lazy.js @@ -4,4 +4,4 @@ var main = require('./main.js'); var lazy = () => main.v1; -exports.default = lazy; +exports['default'] = lazy; diff --git a/test/chunking-form/samples/sanitize-internal-exports/_expected/es/generated-lazy.js b/test/chunking-form/samples/sanitize-internal-exports/_expected/es/generated-lazy.js index b2a43ed12d5..e798025c4ad 100644 --- a/test/chunking-form/samples/sanitize-internal-exports/_expected/es/generated-lazy.js +++ b/test/chunking-form/samples/sanitize-internal-exports/_expected/es/generated-lazy.js @@ -2,4 +2,4 @@ import { v1 } from './main.js'; var lazy = () => v1; -export default lazy; +export { lazy as default }; 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 index e8e776d75c4..98f55136a53 100644 --- 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 @@ -1,3 +1,3 @@ var main = { one: { two: { three: { four: 42 } } } }; -export default main; +export { main as default }; 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 index 90a5c6eebb0..b2f465ad1c0 100644 --- 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 @@ -2,4 +2,5 @@ import main from './main.js'; -export default main.one; +var one = main.one; +export { one as default }; 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 index f9bb1e916dc..9726b0aadd9 100644 --- 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 @@ -2,4 +2,5 @@ import main from './main.js'; -export default main.one.two; +var two = main.one.two; +export { two as default }; 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 index 1a9f5e0da78..03300653ad4 100644 --- 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 @@ -2,4 +2,5 @@ import main from './main.js'; -export default main.one.two.three; +var three = main.one.two.three; +export { three as default }; 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 index 03ca87e27a3..d3e85222f17 100644 --- 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 @@ -2,4 +2,5 @@ import main from './main.js'; -export default main.one.two.three.four; +var four = main.one.two.three.four; +export { four as default }; diff --git a/test/chunking-form/samples/tree-shaken-dynamic-hash/_expected/es/bed29d35.js b/test/chunking-form/samples/tree-shaken-dynamic-hash/_expected/es/bed29d35.js index ed075f84a16..d23b07b5840 100644 --- a/test/chunking-form/samples/tree-shaken-dynamic-hash/_expected/es/bed29d35.js +++ b/test/chunking-form/samples/tree-shaken-dynamic-hash/_expected/es/bed29d35.js @@ -1,3 +1,3 @@ var main = null; -export default main; +export { main as default }; diff --git a/test/cli/samples/config-cjs-dirname/_expected.js b/test/cli/samples/config-cjs-dirname/_expected.js index 6e0be4aa7be..e630a2462b6 100644 --- a/test/cli/samples/config-cjs-dirname/_expected.js +++ b/test/cli/samples/config-cjs-dirname/_expected.js @@ -2,4 +2,4 @@ console.log('nested/plugin.js'); console.log('plugin.js'); var main = 42; -export default main; +export { main as default }; diff --git a/test/cli/samples/config-multiple-getfilename/_expected/es-main.js b/test/cli/samples/config-multiple-getfilename/_expected/es-main.js index d862de816a3..c3e30233192 100644 --- a/test/cli/samples/config-multiple-getfilename/_expected/es-main.js +++ b/test/cli/samples/config-multiple-getfilename/_expected/es-main.js @@ -1,3 +1,3 @@ var main = 42; -export default main; +export { main as default }; diff --git a/test/cli/samples/multiple-targets-shared-config/_expected/es.js b/test/cli/samples/multiple-targets-shared-config/_expected/es.js index 9c36d9fe10b..dfc3c74445f 100644 --- a/test/cli/samples/multiple-targets-shared-config/_expected/es.js +++ b/test/cli/samples/multiple-targets-shared-config/_expected/es.js @@ -1,4 +1,4 @@ var main = 0; -export default main; +export { main as default }; //# sourceMappingURL=es.js.map diff --git a/test/cli/samples/multiple-targets/_expected/es.js b/test/cli/samples/multiple-targets/_expected/es.js index d3265929a72..88bc45275ad 100644 --- a/test/cli/samples/multiple-targets/_expected/es.js +++ b/test/cli/samples/multiple-targets/_expected/es.js @@ -1,3 +1,3 @@ var main = 0; -export default main; +export { main as default }; diff --git a/test/cli/samples/silent-onwarn/_expected.js b/test/cli/samples/silent-onwarn/_expected.js index 29af3b17871..2a1f0d5785d 100644 --- a/test/cli/samples/silent-onwarn/_expected.js +++ b/test/cli/samples/silent-onwarn/_expected.js @@ -2,4 +2,4 @@ var doIt = () => console.log('main'); doIt(); -export default doIt; +export { doIt as default }; diff --git a/test/cli/samples/stdin/json/_expected.js b/test/cli/samples/stdin/json/_expected.js index 2fa6079fa2d..46e0e3a0967 100644 --- a/test/cli/samples/stdin/json/_expected.js +++ b/test/cli/samples/stdin/json/_expected.js @@ -5,5 +5,4 @@ var _ = { bar: bar }; -export default _; -export { bar, foo }; +export { bar, _ as default, foo }; diff --git a/test/cli/samples/stdin/self-import/_expected.js b/test/cli/samples/stdin/self-import/_expected.js index 00ecc7931f4..cd76283f274 100644 --- a/test/cli/samples/stdin/self-import/_expected.js +++ b/test/cli/samples/stdin/self-import/_expected.js @@ -8,4 +8,4 @@ var a = 4; console.log(a, b); exports.b = b; -exports.default = a; +exports['default'] = a; diff --git a/test/cli/samples/wait-for-bundle-input-object/_expected/first.js b/test/cli/samples/wait-for-bundle-input-object/_expected/first.js index 785eab34675..bb02369248d 100644 --- a/test/cli/samples/wait-for-bundle-input-object/_expected/first.js +++ b/test/cli/samples/wait-for-bundle-input-object/_expected/first.js @@ -1,3 +1,3 @@ var first = 'first'; -export default first; +export { first as default }; diff --git a/test/cli/samples/wait-for-bundle-input-object/_expected/second.js b/test/cli/samples/wait-for-bundle-input-object/_expected/second.js index 899b1b288b5..1f1f99ca5b0 100644 --- a/test/cli/samples/wait-for-bundle-input-object/_expected/second.js +++ b/test/cli/samples/wait-for-bundle-input-object/_expected/second.js @@ -1,3 +1,3 @@ var second = 'second'; -export default second; +export { second as default }; diff --git a/test/cli/samples/wait-for-bundle-input-object/_expected/third.js b/test/cli/samples/wait-for-bundle-input-object/_expected/third.js index dce57281308..c7c9bd05263 100644 --- a/test/cli/samples/wait-for-bundle-input-object/_expected/third.js +++ b/test/cli/samples/wait-for-bundle-input-object/_expected/third.js @@ -1,3 +1,3 @@ var third = 'third'; -export default third; +export { third as default }; diff --git a/test/cli/samples/wait-for-bundle-input/_expected.js b/test/cli/samples/wait-for-bundle-input/_expected.js index d862de816a3..c3e30233192 100644 --- a/test/cli/samples/wait-for-bundle-input/_expected.js +++ b/test/cli/samples/wait-for-bundle-input/_expected.js @@ -1,3 +1,3 @@ var main = 42; -export default main; +export { main as default }; diff --git a/test/cli/samples/watch/bundle-error/_expected/main.js b/test/cli/samples/watch/bundle-error/_expected/main.js index d862de816a3..c3e30233192 100644 --- a/test/cli/samples/watch/bundle-error/_expected/main.js +++ b/test/cli/samples/watch/bundle-error/_expected/main.js @@ -1,3 +1,3 @@ var main = 42; -export default main; +export { main as default }; diff --git a/test/cli/samples/watch/close-error/_expected/main.js b/test/cli/samples/watch/close-error/_expected/main.js index d862de816a3..c3e30233192 100644 --- a/test/cli/samples/watch/close-error/_expected/main.js +++ b/test/cli/samples/watch/close-error/_expected/main.js @@ -1,3 +1,3 @@ var main = 42; -export default main; +export { main as default }; diff --git a/test/cli/samples/watch/close-stdin/_expected/out.js b/test/cli/samples/watch/close-stdin/_expected/out.js index d862de816a3..c3e30233192 100644 --- a/test/cli/samples/watch/close-stdin/_expected/out.js +++ b/test/cli/samples/watch/close-stdin/_expected/out.js @@ -1,3 +1,3 @@ var main = 42; -export default main; +export { main as default }; diff --git a/test/form/samples/acorn-external-plugins/_expected.js b/test/form/samples/acorn-external-plugins/_expected.js index 8f865a3e6ee..d8d3733104a 100644 --- a/test/form/samples/acorn-external-plugins/_expected.js +++ b/test/form/samples/acorn-external-plugins/_expected.js @@ -1,3 +1,3 @@ var main =
This is not JavaScript
; -export default main; +export { main as default }; diff --git a/test/form/samples/big-int/_expected.js b/test/form/samples/big-int/_expected.js index 88a90aaf59d..98a593c45e6 100644 --- a/test/form/samples/big-int/_expected.js +++ b/test/form/samples/big-int/_expected.js @@ -17,4 +17,4 @@ function isSafe (int) { return min<=int && int<=max; } -export default isSafe; +export { isSafe as default }; diff --git a/test/form/samples/builtin-prototypes/object-expression/_expected.js b/test/form/samples/builtin-prototypes/object-expression/_expected.js index e69de29bb2d..8b137891791 100644 --- a/test/form/samples/builtin-prototypes/object-expression/_expected.js +++ b/test/form/samples/builtin-prototypes/object-expression/_expected.js @@ -0,0 +1 @@ + diff --git a/test/form/samples/compact/_expected/es.js b/test/form/samples/compact/_expected/es.js index a580d524969..80d65c2df82 100644 --- a/test/form/samples/compact/_expected/es.js +++ b/test/form/samples/compact/_expected/es.js @@ -3,4 +3,4 @@ function foo () { console.log( x ); } // trailing comment -export default foo; \ No newline at end of file +export{foo as default}; \ No newline at end of file diff --git a/test/form/samples/deconflict-format-specific-globals/_expected/es.js b/test/form/samples/deconflict-format-specific-globals/_expected/es.js index 7242dcffa80..e7755c6fa1b 100644 --- a/test/form/samples/deconflict-format-specific-globals/_expected/es.js +++ b/test/form/samples/deconflict-format-specific-globals/_expected/es.js @@ -45,4 +45,4 @@ function nested2() { nested2(); -export default value; +export { value as default }; diff --git a/test/form/samples/default-export-class/_expected/es.js b/test/form/samples/default-export-class/_expected/es.js index 42c0fbaed1d..a40aeb82b7c 100644 --- a/test/form/samples/default-export-class/_expected/es.js +++ b/test/form/samples/default-export-class/_expected/es.js @@ -4,4 +4,4 @@ class main { } } -export default main; +export { main as default }; diff --git a/test/form/samples/default-export-live-binding/_config.js b/test/form/samples/default-export-live-binding/_config.js new file mode 100644 index 00000000000..47ad69ccce6 --- /dev/null +++ b/test/form/samples/default-export-live-binding/_config.js @@ -0,0 +1,6 @@ +module.exports = { + description: 'allows live bindings for default exports', + options: { + output: { exports: 'named', name: 'bundle' } + } +}; diff --git a/test/form/samples/default-export-live-binding/_expected/amd.js b/test/form/samples/default-export-live-binding/_expected/amd.js new file mode 100644 index 00000000000..dcf3f3e73c8 --- /dev/null +++ b/test/form/samples/default-export-live-binding/_expected/amd.js @@ -0,0 +1,10 @@ +define(['exports'], function (exports) { 'use strict'; + + exports['default'] = null; + const setFoo = value => (exports['default'] = value); + + exports.setFoo = setFoo; + + Object.defineProperty(exports, '__esModule', { value: true }); + +}); diff --git a/test/form/samples/default-export-live-binding/_expected/cjs.js b/test/form/samples/default-export-live-binding/_expected/cjs.js new file mode 100644 index 00000000000..19777b37912 --- /dev/null +++ b/test/form/samples/default-export-live-binding/_expected/cjs.js @@ -0,0 +1,8 @@ +'use strict'; + +Object.defineProperty(exports, '__esModule', { value: true }); + +exports['default'] = null; +const setFoo = value => (exports['default'] = value); + +exports.setFoo = setFoo; diff --git a/test/form/samples/default-export-live-binding/_expected/es.js b/test/form/samples/default-export-live-binding/_expected/es.js new file mode 100644 index 00000000000..ada29959104 --- /dev/null +++ b/test/form/samples/default-export-live-binding/_expected/es.js @@ -0,0 +1,4 @@ +let foo = null; +const setFoo = value => (foo = value); + +export { foo as default, setFoo }; diff --git a/test/form/samples/default-export-live-binding/_expected/iife.js b/test/form/samples/default-export-live-binding/_expected/iife.js new file mode 100644 index 00000000000..6a74073476e --- /dev/null +++ b/test/form/samples/default-export-live-binding/_expected/iife.js @@ -0,0 +1,13 @@ +var bundle = (function (exports) { + 'use strict'; + + exports['default'] = null; + const setFoo = value => (exports['default'] = value); + + exports.setFoo = setFoo; + + Object.defineProperty(exports, '__esModule', { value: true }); + + return exports; + +}({})); diff --git a/test/form/samples/default-export-live-binding/_expected/system.js b/test/form/samples/default-export-live-binding/_expected/system.js new file mode 100644 index 00000000000..f64c633d298 --- /dev/null +++ b/test/form/samples/default-export-live-binding/_expected/system.js @@ -0,0 +1,11 @@ +System.register('bundle', [], function (exports) { + 'use strict'; + return { + execute: function () { + + let foo = exports('default', null); + const setFoo = exports('setFoo', value => (foo = exports('default', value))); + + } + }; +}); diff --git a/test/form/samples/default-export-live-binding/_expected/umd.js b/test/form/samples/default-export-live-binding/_expected/umd.js new file mode 100644 index 00000000000..6aa6c152f19 --- /dev/null +++ b/test/form/samples/default-export-live-binding/_expected/umd.js @@ -0,0 +1,14 @@ +(function (global, factory) { + typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) : + typeof define === 'function' && define.amd ? define(['exports'], factory) : + (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.bundle = {})); +}(this, (function (exports) { 'use strict'; + + exports['default'] = null; + const setFoo = value => (exports['default'] = value); + + exports.setFoo = setFoo; + + Object.defineProperty(exports, '__esModule', { value: true }); + +}))); diff --git a/test/form/samples/default-export-live-binding/main.js b/test/form/samples/default-export-live-binding/main.js new file mode 100644 index 00000000000..35cb61e045c --- /dev/null +++ b/test/form/samples/default-export-live-binding/main.js @@ -0,0 +1,3 @@ +let foo = null; +const setFoo = value => (foo = value); +export { foo as default, setFoo }; diff --git a/test/form/samples/default-export-mode/_expected/es.js b/test/form/samples/default-export-mode/_expected/es.js index d862de816a3..c3e30233192 100644 --- a/test/form/samples/default-export-mode/_expected/es.js +++ b/test/form/samples/default-export-mode/_expected/es.js @@ -1,3 +1,3 @@ var main = 42; -export default main; +export { main as default }; diff --git a/test/form/samples/deprecated/interop-false/_expected/es.js b/test/form/samples/deprecated/interop-false/_expected/es.js index d5e775e86a2..d121fafb290 100644 --- a/test/form/samples/deprecated/interop-false/_expected/es.js +++ b/test/form/samples/deprecated/interop-false/_expected/es.js @@ -2,4 +2,4 @@ import View from 'core/view'; var main = View.extend({}); -export default main; +export { main as default }; diff --git a/test/form/samples/export-default-2/_expected/es.js b/test/form/samples/export-default-2/_expected/es.js index 095bf806d8f..1f6587a8542 100644 --- a/test/form/samples/export-default-2/_expected/es.js +++ b/test/form/samples/export-default-2/_expected/es.js @@ -1,3 +1,3 @@ var bar = 1; -export default bar; +export { bar as default }; diff --git a/test/form/samples/export-default-3/_expected/es.js b/test/form/samples/export-default-3/_expected/es.js index 095bf806d8f..1f6587a8542 100644 --- a/test/form/samples/export-default-3/_expected/es.js +++ b/test/form/samples/export-default-3/_expected/es.js @@ -1,3 +1,3 @@ var bar = 1; -export default bar; +export { bar as default }; diff --git a/test/form/samples/export-default-4/_expected/es.js b/test/form/samples/export-default-4/_expected/es.js index d862de816a3..c3e30233192 100644 --- a/test/form/samples/export-default-4/_expected/es.js +++ b/test/form/samples/export-default-4/_expected/es.js @@ -1,3 +1,3 @@ var main = 42; -export default main; +export { main as default }; diff --git a/test/form/samples/export-default-global/_expected/es.js b/test/form/samples/export-default-global/_expected/es.js index 9ac6503fbb0..c5178223ac9 100644 --- a/test/form/samples/export-default-global/_expected/es.js +++ b/test/form/samples/export-default-global/_expected/es.js @@ -2,4 +2,4 @@ var value = global; console.log(value); -export default value; +export { value as default }; diff --git a/test/form/samples/export-default/_expected/es.js b/test/form/samples/export-default/_expected/es.js index d862de816a3..c3e30233192 100644 --- a/test/form/samples/export-default/_expected/es.js +++ b/test/form/samples/export-default/_expected/es.js @@ -1,3 +1,3 @@ var main = 42; -export default main; +export { main as default }; diff --git a/test/form/samples/external-empty-import-no-global-b/_expected/es.js b/test/form/samples/external-empty-import-no-global-b/_expected/es.js index 6c29fd8c045..106fcf0c2db 100644 --- a/test/form/samples/external-empty-import-no-global-b/_expected/es.js +++ b/test/form/samples/external-empty-import-no-global-b/_expected/es.js @@ -5,4 +5,4 @@ x(); var main = new WeakMap(); -export default main; +export { main as default }; diff --git a/test/form/samples/external-empty-import-no-global/_expected/es.js b/test/form/samples/external-empty-import-no-global/_expected/es.js index 7ac0688f155..67622e85cd7 100644 --- a/test/form/samples/external-empty-import-no-global/_expected/es.js +++ b/test/form/samples/external-empty-import-no-global/_expected/es.js @@ -2,4 +2,4 @@ import 'babel-polyfill'; var main = new WeakMap(); -export default main; +export { main as default }; diff --git a/test/form/samples/import-specifier-deshadowing/_expected/es.js b/test/form/samples/import-specifier-deshadowing/_expected/es.js index 9cfd965e950..2ae42d3f88e 100644 --- a/test/form/samples/import-specifier-deshadowing/_expected/es.js +++ b/test/form/samples/import-specifier-deshadowing/_expected/es.js @@ -8,4 +8,4 @@ var Sticky = function () { return Sticky; }(); -export default Sticky; +export { Sticky as default }; diff --git a/test/form/samples/indent-false/_expected/es.js b/test/form/samples/indent-false/_expected/es.js index 2710c80e469..7232a6b2644 100644 --- a/test/form/samples/indent-false/_expected/es.js +++ b/test/form/samples/indent-false/_expected/es.js @@ -2,4 +2,4 @@ function foo () { console.log( 'not indented' ); } -export default foo; +export { foo as default }; diff --git a/test/form/samples/indent-spaces/_expected/es.js b/test/form/samples/indent-spaces/_expected/es.js index d4b23ef94cd..c141611cbbb 100644 --- a/test/form/samples/indent-spaces/_expected/es.js +++ b/test/form/samples/indent-spaces/_expected/es.js @@ -2,4 +2,4 @@ function foo () { console.log( 'indented with tabs' ); } -export default foo; +export { foo as default }; diff --git a/test/form/samples/indent-true-spaces/_expected/es.js b/test/form/samples/indent-true-spaces/_expected/es.js index 3263bb6425b..b31c3b61edd 100644 --- a/test/form/samples/indent-true-spaces/_expected/es.js +++ b/test/form/samples/indent-true-spaces/_expected/es.js @@ -2,4 +2,4 @@ function foo () { console.log( 'indented with spaces' ); } -export default foo; +export { foo as default }; diff --git a/test/form/samples/indent-true/_expected/es.js b/test/form/samples/indent-true/_expected/es.js index d4b23ef94cd..c141611cbbb 100644 --- a/test/form/samples/indent-true/_expected/es.js +++ b/test/form/samples/indent-true/_expected/es.js @@ -2,4 +2,4 @@ function foo () { console.log( 'indented with tabs' ); } -export default foo; +export { foo as default }; diff --git a/test/form/samples/intro-and-outro/_expected/es.js b/test/form/samples/intro-and-outro/_expected/es.js index 067f92bffe2..055fe211abc 100644 --- a/test/form/samples/intro-and-outro/_expected/es.js +++ b/test/form/samples/intro-and-outro/_expected/es.js @@ -15,7 +15,7 @@ console.log( b ); var main = 42; -export default main; +export { main as default }; /* this is an outro */ diff --git a/test/form/samples/json-parse-is-not-pure/_expected/es.js b/test/form/samples/json-parse-is-not-pure/_expected/es.js index 6c8e625ed61..8223400baae 100644 --- a/test/form/samples/json-parse-is-not-pure/_expected/es.js +++ b/test/form/samples/json-parse-is-not-pure/_expected/es.js @@ -7,4 +7,4 @@ var main = (input) => { } }; -export default main; +export { main as default }; diff --git a/test/form/samples/json-stringify-is-not-pure/_expected/es.js b/test/form/samples/json-stringify-is-not-pure/_expected/es.js index 8228a4a9e8c..c5f3b695787 100644 --- a/test/form/samples/json-stringify-is-not-pure/_expected/es.js +++ b/test/form/samples/json-stringify-is-not-pure/_expected/es.js @@ -7,4 +7,4 @@ var main = (input) => { } }; -export default main; +export { main as default }; diff --git a/test/form/samples/namespace-tostring/entry-default/_expected/es.js b/test/form/samples/namespace-tostring/entry-default/_expected/es.js index 96b6f747e58..9f84202e42f 100644 --- a/test/form/samples/namespace-tostring/entry-default/_expected/es.js +++ b/test/form/samples/namespace-tostring/entry-default/_expected/es.js @@ -1,3 +1,3 @@ var main = { foo: 42 }; -export default main; +export { main as default }; diff --git a/test/form/samples/namespaced-default-exports/_expected/es.js b/test/form/samples/namespaced-default-exports/_expected/es.js index d862de816a3..c3e30233192 100644 --- a/test/form/samples/namespaced-default-exports/_expected/es.js +++ b/test/form/samples/namespaced-default-exports/_expected/es.js @@ -1,3 +1,3 @@ var main = 42; -export default main; +export { main as default }; diff --git a/test/form/samples/prefer-const/_expected/es.js b/test/form/samples/prefer-const/_expected/es.js index 24735286aa8..83d2861ae30 100644 --- a/test/form/samples/prefer-const/_expected/es.js +++ b/test/form/samples/prefer-const/_expected/es.js @@ -14,4 +14,4 @@ console.log( name ); const main = 42; -export default main; +export { main as default }; diff --git a/test/form/samples/pure-class-field/_expected.js b/test/form/samples/pure-class-field/_expected.js index b03c81c0cd0..fb9b18d9965 100644 --- a/test/form/samples/pure-class-field/_expected.js +++ b/test/form/samples/pure-class-field/_expected.js @@ -3,4 +3,4 @@ class main { static [/*#__PURE__*/ W()]; } -export default main; +export { main as default }; diff --git a/test/form/samples/side-effect-b/_expected/es.js b/test/form/samples/side-effect-b/_expected/es.js index d862de816a3..c3e30233192 100644 --- a/test/form/samples/side-effect-b/_expected/es.js +++ b/test/form/samples/side-effect-b/_expected/es.js @@ -1,3 +1,3 @@ var main = 42; -export default main; +export { main as default }; diff --git a/test/form/samples/side-effect-c/_expected/es.js b/test/form/samples/side-effect-c/_expected/es.js index d862de816a3..c3e30233192 100644 --- a/test/form/samples/side-effect-c/_expected/es.js +++ b/test/form/samples/side-effect-c/_expected/es.js @@ -1,3 +1,3 @@ var main = 42; -export default main; +export { main as default }; diff --git a/test/form/samples/side-effect-d/_expected/es.js b/test/form/samples/side-effect-d/_expected/es.js index d862de816a3..c3e30233192 100644 --- a/test/form/samples/side-effect-d/_expected/es.js +++ b/test/form/samples/side-effect-d/_expected/es.js @@ -1,3 +1,3 @@ var main = 42; -export default main; +export { main as default }; diff --git a/test/form/samples/side-effect-default-reexport/_expected.js b/test/form/samples/side-effect-default-reexport/_expected.js index ae3ab580f02..6593edd35d0 100644 --- a/test/form/samples/side-effect-default-reexport/_expected.js +++ b/test/form/samples/side-effect-default-reexport/_expected.js @@ -43,4 +43,4 @@ Menu.Item2 = Item; console.log('test-package-default-export', Menu$1.Item); console.log('test-package-named-export', NamedExport.Item); -export default Menu; +export { Menu as default }; diff --git a/test/form/samples/side-effect-e/_expected/es.js b/test/form/samples/side-effect-e/_expected/es.js index c7e2fb24792..3067a16c289 100644 --- a/test/form/samples/side-effect-e/_expected/es.js +++ b/test/form/samples/side-effect-e/_expected/es.js @@ -13,4 +13,4 @@ foo(); var main = 42; -export default main; +export { main as default }; diff --git a/test/form/samples/side-effect-f/_expected/es.js b/test/form/samples/side-effect-f/_expected/es.js index d862de816a3..c3e30233192 100644 --- a/test/form/samples/side-effect-f/_expected/es.js +++ b/test/form/samples/side-effect-f/_expected/es.js @@ -1,3 +1,3 @@ var main = 42; -export default main; +export { main as default }; diff --git a/test/form/samples/side-effect-g/_expected/es.js b/test/form/samples/side-effect-g/_expected/es.js index d862de816a3..c3e30233192 100644 --- a/test/form/samples/side-effect-g/_expected/es.js +++ b/test/form/samples/side-effect-g/_expected/es.js @@ -1,3 +1,3 @@ var main = 42; -export default main; +export { main as default }; diff --git a/test/form/samples/side-effect-h/_expected/es.js b/test/form/samples/side-effect-h/_expected/es.js index 1462a922a75..1d5410d073d 100644 --- a/test/form/samples/side-effect-h/_expected/es.js +++ b/test/form/samples/side-effect-h/_expected/es.js @@ -8,4 +8,4 @@ foo(); var main = 42; -export default main; +export { main as default }; diff --git a/test/form/samples/side-effect-i/_expected/es.js b/test/form/samples/side-effect-i/_expected/es.js index 32ac89e9576..b57755fc1f8 100644 --- a/test/form/samples/side-effect-i/_expected/es.js +++ b/test/form/samples/side-effect-i/_expected/es.js @@ -4,4 +4,4 @@ if ( !ok ) { var main = 42; -export default main; +export { main as default }; diff --git a/test/form/samples/side-effect-j/_expected/es.js b/test/form/samples/side-effect-j/_expected/es.js index 54e415f780b..2ae18abac12 100644 --- a/test/form/samples/side-effect-j/_expected/es.js +++ b/test/form/samples/side-effect-j/_expected/es.js @@ -4,4 +4,4 @@ augment = y => y.augmented = true; function x () {} augment( x ); -export default x; +export { x as default }; diff --git a/test/form/samples/side-effect-k/_expected/es.js b/test/form/samples/side-effect-k/_expected/es.js index 864798663d0..85fa8ade3ee 100644 --- a/test/form/samples/side-effect-k/_expected/es.js +++ b/test/form/samples/side-effect-k/_expected/es.js @@ -21,4 +21,4 @@ function augment ( x ) { function x () {} augment( x.prototype ); -export default x; +export { x as default }; diff --git a/test/function/samples/default-export-before-declaration/_config.js b/test/function/samples/default-export-before-declaration/_config.js new file mode 100644 index 00000000000..53b098db90c --- /dev/null +++ b/test/function/samples/default-export-before-declaration/_config.js @@ -0,0 +1,8 @@ +const assert = require('assert'); + +module.exports = { + description: 'handles default exports before a variable is declared', + exports(exports) { + assert.strictEqual(exports, undefined); + } +}; diff --git a/test/function/samples/default-export-before-declaration/main.js b/test/function/samples/default-export-before-declaration/main.js new file mode 100644 index 00000000000..83d89bb4ea4 --- /dev/null +++ b/test/function/samples/default-export-before-declaration/main.js @@ -0,0 +1,2 @@ +export default foo; +var foo = true; diff --git a/test/hooks/index.js b/test/hooks/index.js index d6093164a47..43937ed0a50 100644 --- a/test/hooks/index.js +++ b/test/hooks/index.js @@ -211,7 +211,7 @@ describe('hooks', () => { .then(({ output }) => { assert.strictEqual( output[0].code, - `var input = new URL('chunk-928cb70b.js', import.meta.url).href;\n\nexport default input;\n` + `var input = new URL('chunk-928cb70b.js', import.meta.url).href;\n\nexport { input as default };\n` ); assert.strictEqual(output[1].fileName, 'chunk-928cb70b.js'); assert.strictEqual(output[1].code, `console.log('chunk');\n`); @@ -236,7 +236,7 @@ describe('hooks', () => { .then(({ output }) => { assert.strictEqual( output[0].code, - `var input = new URL('chunk-928cb70b.js', import.meta.url).href;\n\nexport default input;\n` + `var input = new URL('chunk-928cb70b.js', import.meta.url).href;\n\nexport { input as default };\n` ); assert.strictEqual(output[1].fileName, 'chunk-928cb70b.js'); assert.strictEqual(output[1].code, `console.log('chunk');\n`); @@ -258,7 +258,7 @@ describe('hooks', () => { .then(({ output }) => { assert.strictEqual( output[0].code, - `var input = new URL('chunk-928cb70b.js', import.meta.url).href;\n\nexport default input;\n` + `var input = new URL('chunk-928cb70b.js', import.meta.url).href;\n\nexport { input as default };\n` ); assert.strictEqual(output[1].fileName, 'chunk-928cb70b.js'); assert.strictEqual(output[1].code, `console.log('chunk');\n`); @@ -319,7 +319,7 @@ describe('hooks', () => { .then(({ output }) => { assert.strictEqual( output[0].code, - `var input = new URL('assets/test-0a676135.ext', import.meta.url).href;\n\nexport default input;\n` + `var input = new URL('assets/test-0a676135.ext', import.meta.url).href;\n\nexport { input as default };\n` ); assert.strictEqual(output[1].fileName, 'assets/test-0a676135.ext'); assert.strictEqual(output[1].source, 'hello world'); @@ -344,7 +344,7 @@ describe('hooks', () => { .then(({ output }) => { assert.strictEqual( output[0].code, - `var input = new URL('assets/test-0a676135.ext', import.meta.url).href;\n\nexport default input;\n` + `var input = new URL('assets/test-0a676135.ext', import.meta.url).href;\n\nexport { input as default };\n` ); assert.strictEqual(output[1].fileName, 'assets/test-0a676135.ext'); assert.strictEqual(output[1].source, 'hello world'); @@ -366,7 +366,7 @@ describe('hooks', () => { .then(({ output }) => { assert.strictEqual( output[0].code, - `var input = new URL('assets/test-0a676135.ext', import.meta.url).href;\n\nexport default input;\n` + `var input = new URL('assets/test-0a676135.ext', import.meta.url).href;\n\nexport { input as default };\n` ); assert.strictEqual(output[1].fileName, 'assets/test-0a676135.ext'); assert.strictEqual(output[1].source, 'hello world'); @@ -415,7 +415,7 @@ describe('hooks', () => { output[0].code, `console.log('imported');\n\n` + `var input = new URL('assets/test-09aeb845.ext', import.meta.url).href;\n\n` + - `export default input;\n` + `export { input as default };\n` ); assert.strictEqual(output[1].fileName, 'assets/test-09aeb845.ext'); assert.strictEqual(output[1].source, 'first run'); @@ -448,7 +448,7 @@ describe('hooks', () => { output[0].code, `console.log('imported');\n\n` + `var input = new URL('assets/test-ce5fc71b.ext', import.meta.url).href;\n\n` + - `export default input;\n` + `export { input as default };\n` ); assert.strictEqual(output[1].fileName, 'assets/test-ce5fc71b.ext'); assert.strictEqual(output[1].source, 'second run'); @@ -485,7 +485,7 @@ describe('hooks', () => { .then(({ output }) => { assert.strictEqual( output[0].code, - `var input = new URL('assets/test-0a676135.ext', import.meta.url).href;\n\nexport default input;\n` + `var input = new URL('assets/test-0a676135.ext', import.meta.url).href;\n\nexport { input as default };\n` ); assert.strictEqual(output[1].fileName, 'assets/test-0a676135.ext'); assert.strictEqual(output[1].source, 'hello world'); @@ -1023,7 +1023,7 @@ describe('hooks', () => { assert.strictEqual(outputBundle['assets/test-0a676135.ext'].source, 'hello world'); assert.strictEqual( outputBundle['input.js'].code, - `var input = new URL('assets/test-0a676135.ext', import.meta.url).href;\n\nexport default input;\n` + `var input = new URL('assets/test-0a676135.ext', import.meta.url).href;\n\nexport { input as default };\n` ); } } @@ -1144,7 +1144,7 @@ describe('hooks', () => { .then(({ output }) => { assert.strictEqual( output[0].code, - `var input = new URL('chunk-928cb70b.js', import.meta.url).href;\n\nexport default input;\n` + `var input = new URL('chunk-928cb70b.js', import.meta.url).href;\n\nexport { input as default };\n` ); assert.strictEqual(output[1].fileName, 'chunk-928cb70b.js'); assert.strictEqual(output[1].code, `console.log('chunk');\n`); @@ -1169,7 +1169,7 @@ describe('hooks', () => { .then(({ output }) => { assert.strictEqual( output[0].code, - `var input = new URL('chunk-928cb70b.js', import.meta.url).href;\n\nexport default input;\n` + `var input = new URL('chunk-928cb70b.js', import.meta.url).href;\n\nexport { input as default };\n` ); assert.strictEqual(output[1].fileName, 'chunk-928cb70b.js'); assert.strictEqual(output[1].code, `console.log('chunk');\n`); @@ -1191,7 +1191,7 @@ describe('hooks', () => { .then(({ output }) => { assert.strictEqual( output[0].code, - `var input = new URL('chunk-928cb70b.js', import.meta.url).href;\n\nexport default input;\n` + `var input = new URL('chunk-928cb70b.js', import.meta.url).href;\n\nexport { input as default };\n` ); assert.strictEqual(output[1].fileName, 'chunk-928cb70b.js'); assert.strictEqual(output[1].code, `console.log('chunk');\n`); @@ -1220,7 +1220,7 @@ describe('hooks', () => { .then(({ output }) => { assert.strictEqual( output[0].code, - `var input = new URL('assets/test-0a676135.ext', import.meta.url).href;\n\nexport default input;\n` + `var input = new URL('assets/test-0a676135.ext', import.meta.url).href;\n\nexport { input as default };\n` ); assert.strictEqual(output[1].fileName, 'assets/test-0a676135.ext'); assert.strictEqual(output[1].source, 'hello world'); @@ -1247,7 +1247,7 @@ describe('hooks', () => { .then(({ output }) => { assert.strictEqual( output[0].code, - `var input = new URL('assets/test-0a676135.ext', import.meta.url).href;\n\nexport default input;\n` + `var input = new URL('assets/test-0a676135.ext', import.meta.url).href;\n\nexport { input as default };\n` ); assert.strictEqual(output[1].fileName, 'assets/test-0a676135.ext'); assert.strictEqual(output[1].source, 'hello world'); @@ -1271,7 +1271,7 @@ describe('hooks', () => { .then(({ output }) => { assert.strictEqual( output[0].code, - `var input = new URL('assets/test-0a676135.ext', import.meta.url).href;\n\nexport default input;\n` + `var input = new URL('assets/test-0a676135.ext', import.meta.url).href;\n\nexport { input as default };\n` ); assert.strictEqual(output[1].fileName, 'assets/test-0a676135.ext'); assert.strictEqual(output[1].source, 'hello world'); @@ -1306,7 +1306,7 @@ describe('hooks', () => { .then(({ output }) => { assert.strictEqual( output[0].code, - `var input = new URL('assets/test-0a676135.ext', import.meta.url).href;\n\nexport default input;\n` + `var input = new URL('assets/test-0a676135.ext', import.meta.url).href;\n\nexport { input as default };\n` ); assert.strictEqual(output[1].fileName, 'assets/test-0a676135.ext'); assert.strictEqual(output[1].source, 'hello world'); diff --git a/test/misc/bundle-information.js b/test/misc/bundle-information.js index 925581ca626..e45ac2fa5e3 100644 --- a/test/misc/bundle-information.js +++ b/test/misc/bundle-information.js @@ -35,7 +35,7 @@ describe('The bundle object', () => { output.map(chunk => chunk.code), [ `import { u as used, s as shared } from './generated-shared-c4fdd061.js';\n\nconsole.log("input1", used, shared);const out = true;\n\nexport { out };\n`, - `import './generated-shared-c4fdd061.js';\n\nconsole.log("input2");var input2 = 42;\n\nexport default input2;\n`, + `import './generated-shared-c4fdd061.js';\n\nconsole.log("input2");var input2 = 42;\n\nexport { input2 as default };\n`, `console.log("shared");const used = "used"; var shared = "stuff";\n\nexport { shared as s, used as u };\n` ], 'code' diff --git a/test/misc/misc.js b/test/misc/misc.js index 2e679758ca8..60f7f4b0997 100644 --- a/test/misc/misc.js +++ b/test/misc/misc.js @@ -175,7 +175,10 @@ describe('misc', () => { .rollup(options) .then(bundle => bundle.generate(options)) .then(output => - assert.strictEqual(output.output[0].code, 'var input = 42;\n\nexport default input;\n') + assert.strictEqual( + output.output[0].code, + 'var input = 42;\n\nexport { input as default };\n' + ) ); });