From fae9d805a82cd4564575f6858349e0ce9aca80f9 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Tue, 30 Aug 2022 14:08:42 +0200 Subject: [PATCH] [v3.0] Improve interop defaults (#4611) * Dummy commit * Change default for output.interop to "default", deprecate boolean and add "compat" * Add esModule: 'if-default-prop' and make it the default value * Statically resolve Symbol.toStringTag --- docs/01-command-line-reference.md | 2 +- docs/999-big-list-of-options.md | 180 +++++++++++------- src/Chunk.ts | 29 ++- src/ast/nodes/ImportExpression.ts | 2 +- src/ast/nodes/MemberExpression.ts | 41 ++-- src/ast/nodes/shared/Expression.ts | 10 +- src/ast/nodes/shared/knownGlobals.ts | 30 ++- src/ast/utils/PathTracker.ts | 7 +- src/ast/variables/GlobalVariable.ts | 9 +- src/ast/variables/NamespaceVariable.ts | 13 +- src/finalisers/amd.ts | 3 +- src/finalisers/cjs.ts | 3 +- src/finalisers/iife.ts | 3 +- src/finalisers/index.ts | 1 + src/finalisers/shared/getExportBlock.ts | 6 +- src/finalisers/shared/getInteropBlock.ts | 2 +- src/finalisers/umd.ts | 3 +- src/rollup/types.d.ts | 6 +- src/utils/deconflictChunk.ts | 6 +- src/utils/interopHelpers.ts | 66 +++++-- src/utils/options/normalizeOutputOptions.ts | 54 ++---- .../_expected/amd/some/where/main.js | 2 - .../_expected/cjs/some/where/main.js | 2 - .../_expected/amd/some/where/main.js | 2 - .../_expected/cjs/some/where/main.js | 2 - .../samples/amd-id-auto/_expected/amd/main.js | 2 - .../samples/amd-id-auto/_expected/cjs/main.js | 2 - .../_expected/amd/generated-dep.js | 6 +- .../_expected/cjs/generated-dep.js | 6 +- .../_expected/amd/main1.js | 2 - .../_expected/amd/main2.js | 2 - .../_expected/cjs/main1.js | 2 - .../_expected/cjs/main2.js | 2 - .../chunking-reexport/_expected/amd/main1.js | 2 - .../chunking-reexport/_expected/amd/main2.js | 2 - .../chunking-reexport/_expected/cjs/main1.js | 2 - .../chunking-reexport/_expected/cjs/main2.js | 2 - .../_expected/amd/main1.js | 2 - .../_expected/amd/main2.js | 2 - .../_expected/cjs/main1.js | 2 - .../_expected/cjs/main2.js | 2 - .../_expected/amd/main1.js | 2 - .../_expected/amd/main2.js | 2 - .../_expected/cjs/main1.js | 2 - .../_expected/cjs/main2.js | 2 - .../_expected/amd/main1.js | 2 - .../_expected/amd/main2.js | 2 - .../_expected/cjs/main1.js | 2 - .../_expected/cjs/main2.js | 2 - .../_expected/amd/main1.js | 2 - .../_expected/amd/main2.js | 2 - .../_expected/amd/main3.js | 2 - .../_expected/cjs/main1.js | 2 - .../_expected/cjs/main2.js | 2 - .../_expected/cjs/main3.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/other.js | 2 - .../_expected/cjs/other.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/a.js | 2 - .../_expected/amd/b.js | 2 - .../_expected/amd/one.js | 2 - .../_expected/cjs/a.js | 2 - .../_expected/cjs/b.js | 2 - .../_expected/cjs/one.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/main.js | 5 +- .../_expected/cjs/main.js | 5 +- .../_expected/amd/entry.js | 2 - .../_expected/cjs/entry.js | 2 - .../dynamic-import-name/_expected/amd/main.js | 5 +- .../dynamic-import-name/_expected/cjs/main.js | 5 +- .../_expected/amd/generated-buildStart.js | 2 - .../_expected/cjs/generated-buildStart.js | 2 - .../_expected/amd/components/index.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/components/index.js | 2 - .../_expected/cjs/main.js | 2 - .../_config.js | 15 -- .../_expected/amd/false.js | 7 - .../_expected/amd/true.js | 11 -- .../_expected/cjs/false.js | 7 - .../_expected/cjs/true.js | 11 -- .../_expected/es/false.js | 1 - .../_expected/es/true.js | 1 - .../_expected/system/false.js | 13 -- .../_expected/system/true.js | 13 -- .../false.js | 1 - .../true.js | 1 - .../_expected/amd/main2.js | 2 - .../_expected/cjs/main2.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/dep1.js | 2 - .../_expected/amd/dep2.js | 2 - .../_expected/cjs/dep1.js | 2 - .../_expected/cjs/dep2.js | 2 - .../_expected/amd/named.js | 2 - .../_expected/cjs/named.js | 2 - .../_expected/amd/_virtual/other.js | 2 - .../_expected/amd/commonjs.js | 6 +- .../_expected/amd/main.js | 6 +- .../_expected/cjs/_virtual/other.js | 2 - .../_expected/cjs/commonjs.js | 6 +- .../_expected/cjs/main.js | 6 +- .../_expected/amd/dynamic-included.js | 2 - .../_expected/cjs/dynamic-included.js | 2 - .../_expected/amd/m1.js | 2 - .../_expected/cjs/m1.js | 2 - .../_expected/amd/dep.js | 2 - .../_expected/amd/main1.js | 2 - .../_expected/amd/main2.js | 2 - .../_expected/cjs/dep.js | 2 - .../_expected/cjs/main1.js | 2 - .../_expected/cjs/main2.js | 2 - ...n-amd-2ef83a76.js => main-amd-db420a01.js} | 2 - ...n-cjs-82d6d41f.js => main-cjs-319b4e92.js} | 2 - .../_expected/amd/named.js | 2 - .../_expected/cjs/named.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/amd/module-a/v1/index.js | 2 - .../_expected/amd/module-b/v1/index.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/cjs/module-a/v1/index.js | 2 - .../_expected/cjs/module-b/v1/index.js | 2 - .../amd/inner/more_inner/something.js | 2 - .../_expected/amd/main.js | 2 - .../cjs/inner/more_inner/something.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/main.js | 8 +- .../_expected/amd/proxy.js | 6 +- .../_expected/cjs/main.js | 8 +- .../_expected/cjs/proxy.js | 6 +- .../_expected/amd/dep.js | 2 - .../_expected/cjs/dep.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/_virtual/_virtualModule.js | 2 - .../_expected/cjs/_virtual/_virtualModule.js | 2 - .../_expected/amd/deps/dep1.js | 2 - .../_expected/amd/deps/dep2.js | 2 - .../_expected/amd/deps/dep3.js | 2 - .../_expected/amd/lib/lib1.js | 2 - .../_expected/amd/lib/lib2.js | 2 - .../_expected/cjs/deps/dep1.js | 2 - .../_expected/cjs/deps/dep2.js | 2 - .../_expected/cjs/deps/dep3.js | 2 - .../_expected/cjs/lib/lib1.js | 2 - .../_expected/cjs/lib/lib2.js | 2 - .../_expected/amd/main.js | 5 +- .../_expected/cjs/main.js | 5 +- .../_expected/amd/main.js | 5 +- .../_expected/cjs/main.js | 5 +- .../_expected/amd/main1.js | 2 - .../_expected/amd/main2.js | 2 - .../_expected/cjs/main1.js | 2 - .../_expected/cjs/main2.js | 2 - .../_expected/amd/entry.js | 2 - .../_expected/cjs/entry.js | 2 - .../dynamic-import/_expected/amd/main.js | 2 - .../dynamic-import/_expected/cjs/main.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/generated-buildStart.js | 2 - .../_expected/cjs/generated-buildStart.js | 2 - .../_expected/amd/custom/build-start-chunk.js | 2 - .../_expected/cjs/custom/build-start-chunk.js | 2 - .../_expected/amd/generated-emitted2.js | 2 - .../_expected/cjs/generated-emitted2.js | 2 - .../_expected/amd/generated-emitted2.js | 2 - .../_expected/cjs/generated-emitted2.js | 2 - .../emit-chunk/_expected/amd/main.js | 5 +- .../emit-chunk/_expected/cjs/main.js | 5 +- .../_expected/amd/explicit-name1.js | 2 - .../_expected/amd/explicit-name2.js | 2 - .../_expected/amd/mainChunk.js | 2 - .../_expected/amd/mainChunkFacade.js | 2 - .../_expected/cjs/explicit-name1.js | 2 - .../_expected/cjs/explicit-name2.js | 2 - .../_expected/cjs/mainChunk.js | 2 - .../_expected/cjs/mainChunkFacade.js | 2 - .../reference-files/_expected/amd/main.js | 2 - .../reference-files/_expected/cjs/main.js | 2 - .../set-asset-source/_expected/amd/main.js | 2 - .../set-asset-source/_expected/cjs/main.js | 2 - .../_expected/amd/main1-alias.js | 2 - .../entry-aliases/_expected/amd/main1.js | 2 - .../_expected/cjs/main1-alias.js | 2 - .../entry-aliases/_expected/cjs/main1.js | 2 - .../_expected/amd/m1.js | 2 - .../_expected/cjs/m1.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../samples/external-imports/_config.js | 3 +- .../_expected/amd/main-default.js | 10 +- .../_expected/amd/main-namespace.js | 12 +- .../_expected/cjs/main-default.js | 10 +- .../_expected/cjs/main-namespace.js | 12 +- .../samples/external-reexports/_config.js | 3 +- .../_expected/amd/main-default.js | 12 +- .../_expected/amd/main-named.js | 2 - .../_expected/amd/main-namespace.js | 14 +- .../_expected/cjs/main-default.js | 12 +- .../_expected/cjs/main-named.js | 2 - .../_expected/cjs/main-namespace.js | 14 +- .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../single-dependency/_expected/amd/main.js | 2 - .../single-dependency/_expected/cjs/main.js | 2 - .../import-meta-url/_expected/amd/main.js | 2 - .../import-meta-url/_expected/cjs/main.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/main1.js | 2 - .../_expected/amd/main2.js | 2 - .../_expected/cjs/main1.js | 2 - .../_expected/cjs/main2.js | 2 - .../_expected/amd/main1.js | 2 - .../_expected/amd/main2.js | 2 - .../_expected/cjs/main1.js | 2 - .../_expected/cjs/main2.js | 2 - .../_expected/amd/main1.js | 2 - .../_expected/amd/main2.js | 2 - .../_expected/cjs/main1.js | 2 - .../_expected/cjs/main2.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../single-dynamic/_expected/amd/main.js | 2 - .../single-dynamic/_expected/cjs/main.js | 2 - .../_expected/amd/components/index.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/components/index.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/main2.js | 2 - .../_expected/cjs/main2.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/1.js | 2 - .../_expected/amd/2.js | 2 - .../_expected/amd/3.js | 2 - .../_expected/amd/4.js | 2 - .../_expected/amd/5.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/1.js | 2 - .../_expected/cjs/2.js | 2 - .../_expected/cjs/3.js | 2 - .../_expected/cjs/4.js | 2 - .../_expected/cjs/5.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/dep.js | 2 +- .../_expected/cjs/dep.js | 2 +- .../_expected/amd/dep1.js | 2 - .../_expected/amd/dep2.js | 2 - .../_expected/cjs/dep1.js | 2 - .../_expected/cjs/dep2.js | 2 - .../_expected/amd/other.js | 2 - .../_expected/cjs/other.js | 2 - .../_expected/amd/main1.js | 2 - .../_expected/cjs/main1.js | 2 - .../_expected/amd/main2.js | 2 - .../_expected/cjs/main2.js | 2 - .../_expected/amd/index.js | 2 - .../_expected/cjs/index.js | 2 - .../nested-chunks/_expected/amd/main1.js | 5 +- .../_expected/amd/nested/main2.js | 5 +- .../nested-chunks/_expected/cjs/main1.js | 5 +- .../_expected/cjs/nested/main2.js | 5 +- .../allow-extension/_expected/amd/main.js | 2 - .../allow-extension/_expected/cjs/main.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../exports-only/_expected/amd/main.js | 2 - .../exports-only/_expected/cjs/main.js | 2 - .../false/_expected/amd/main.js | 2 - .../false/_expected/cjs/main.js | 2 - .../amd/generated-allow-extension.js | 2 - .../_expected/amd/generated-false.js | 2 - .../_expected/amd/generated-not-specified.js | 2 - .../_expected/amd/generated-strict.js | 2 - .../cjs/generated-allow-extension.js | 2 - .../_expected/cjs/generated-false.js | 2 - .../_expected/cjs/generated-not-specified.js | 2 - .../_expected/cjs/generated-strict.js | 2 - .../strict/_expected/amd/main.js | 2 - .../strict/_expected/cjs/main.js | 2 - .../_expected/amd/named.js | 2 - .../_expected/cjs/named.js | 2 - .../_expected/amd/_virtual/other.js | 2 - .../_expected/amd/commonjs.js | 6 +- .../_expected/amd/main.js | 6 +- .../_expected/cjs/_virtual/other.js | 2 - .../_expected/cjs/commonjs.js | 6 +- .../_expected/cjs/main.js | 6 +- .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/dynamic-included.js | 2 - .../_expected/cjs/dynamic-included.js | 2 - .../_expected/amd/m1.js | 2 - .../_expected/cjs/m1.js | 2 - .../_expected/amd/dep.js | 2 - .../_expected/amd/main1.js | 2 - .../_expected/amd/main2.js | 2 - .../_expected/cjs/dep.js | 2 - .../_expected/cjs/main1.js | 2 - .../_expected/cjs/main2.js | 2 - ...n-amd-51321eb1.js => main-amd-c6b04a3d.js} | 2 - ...n-cjs-92cd000c.js => main-cjs-7c9c9af9.js} | 2 - .../_expected/amd/named.js | 2 - .../_expected/cjs/named.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/amd/module-a/v1/index.js | 2 - .../_expected/amd/module-b/v1/index.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/cjs/module-a/v1/index.js | 2 - .../_expected/cjs/module-b/v1/index.js | 2 - .../amd/inner/more_inner/something.js | 2 - .../_expected/amd/main.js | 2 - .../cjs/inner/more_inner/something.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/main.js | 8 +- .../_expected/amd/proxy.js | 6 +- .../_expected/cjs/main.js | 8 +- .../_expected/cjs/proxy.js | 6 +- .../_expected/amd/dep.js | 2 - .../_expected/cjs/dep.js | 2 - .../_expected/amd/_virtual/index.js | 2 - .../_expected/cjs/_virtual/index.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - ...40.mjs => _virtualModule-amd-03552e5c.mjs} | 2 - ..._virtualWithAssetExt.str-amd-724c602d.mjs} | 2 - ...e.mjs => _virtualWithExt-amd-e9dc1b7e.mjs} | 2 - ...amd-eb6187f3.mjs => main-amd-7efb1bed.mjs} | 2 +- ...9a.mjs => _virtualModule-cjs-bbe1ad5e.mjs} | 2 - ..._virtualWithAssetExt.str-cjs-0e561611.mjs} | 2 - ...d.mjs => _virtualWithExt-cjs-b148ca33.mjs} | 2 - ...cjs-d0c7e6cf.mjs => main-cjs-f7b1940b.mjs} | 6 +- .../_expected/amd/_virtual/_virtualModule.js | 2 - .../_expected/cjs/_virtual/_virtualModule.js | 2 - .../_expected/amd/deps/dep1.js | 2 - .../_expected/amd/deps/dep2.js | 2 - .../_expected/amd/deps/dep3.js | 2 - .../_expected/amd/lib/lib1.js | 2 - .../_expected/amd/lib/lib2.js | 2 - .../_expected/cjs/deps/dep1.js | 2 - .../_expected/cjs/deps/dep2.js | 2 - .../_expected/cjs/deps/dep3.js | 2 - .../_expected/cjs/lib/lib1.js | 2 - .../_expected/cjs/lib/lib2.js | 2 - .../reexport-from-entry/_expected/amd/main.js | 2 - .../_expected/amd/otherEntry.js | 2 - .../reexport-from-entry/_expected/cjs/main.js | 2 - .../_expected/cjs/otherEntry.js | 2 - .../_expected/amd/main.js | 25 ++- .../_expected/cjs/main.js | 25 ++- .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/a.js | 2 - .../_expected/amd/b.js | 2 - .../_expected/amd/one.js | 2 - .../_expected/cjs/a.js | 2 - .../_expected/cjs/b.js | 2 - .../_expected/cjs/one.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/main1.js | 2 - .../_expected/amd/main3.js | 2 - .../_expected/cjs/main1.js | 2 - .../_expected/cjs/main3.js | 2 - .../default-reexport/_expected/amd/main.js | 2 - .../default-reexport/_expected/cjs/main.js | 2 - .../entry/_expected/amd/main.js | 2 - .../entry/_expected/cjs/main.js | 2 - .../global-conflict/_expected/amd/main.js | 2 - .../global-conflict/_expected/cjs/main.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../namespace/_expected/amd/main.js | 2 - .../namespace/_expected/cjs/main.js | 2 - test/cli/samples/context/_expected.js | 2 - .../samples/format-aliases/_expected/amd.js | 11 +- .../samples/format-aliases/_expected/cjs.js | 11 +- .../format-aliases/_expected/commonjs.js | 11 +- .../samples/format-aliases/_expected/iife.js | 11 +- .../samples/format-aliases/_expected/umd.js | 11 +- test/cli/samples/interop/_config.js | 2 +- .../paths-output-option/rollup.config.js | 3 +- .../plugin/advanced-esm/_expected/cjs.js | 4 +- .../samples/plugin/advanced/_expected/cjs.js | 4 - test/cli/samples/plugin/basic/_expected.js | 2 - .../plugin/named-export/_expected/cjs.js | 2 +- .../stdin/config-file/_expected/cjs.js | 2 - .../no-stdin-config-file/_expected/cjs.js | 2 - .../_expected/amd.js | 2 - .../_expected/cjs.js | 2 - .../_expected/iife.js | 2 - .../_expected/umd.js | 2 - .../_expected/amd.js | 2 - .../_expected/cjs.js | 2 - .../_expected/iife.js | 2 - .../_expected/umd.js | 2 - .../assignment-to-exports/_expected/amd.js | 2 - .../assignment-to-exports/_expected/cjs.js | 2 - .../assignment-to-exports/_expected/iife.js | 2 - .../assignment-to-exports/_expected/umd.js | 2 - .../compact-named-export/_expected/amd.js | 2 +- .../compact-named-export/_expected/cjs.js | 2 +- .../compact-named-export/_expected/iife.js | 2 +- .../compact-named-export/_expected/umd.js | 2 +- test/form/samples/compact/_expected/amd.js | 4 +- test/form/samples/compact/_expected/cjs.js | 4 +- test/form/samples/compact/_expected/iife.js | 4 +- test/form/samples/compact/_expected/umd.js | 4 +- .../computed-properties/_expected/amd.js | 2 - .../computed-properties/_expected/cjs.js | 2 - .../computed-properties/_expected/iife.js | 2 - .../computed-properties/_expected/umd.js | 2 - .../_expected/amd.js | 2 - .../_expected/cjs.js | 2 - .../_expected/iife.js | 2 - .../_expected/umd.js | 2 - .../_config.js | 3 +- .../_expected/amd.js | 4 +- .../_expected/cjs.js | 4 +- .../_expected/iife.js | 4 +- .../_expected/umd.js | 4 +- .../dedupes-external-imports/_expected/amd.js | 2 - .../dedupes-external-imports/_expected/cjs.js | 2 - .../_expected/iife.js | 2 - .../dedupes-external-imports/_expected/umd.js | 2 - .../interop-boolean-per-dependency/_config.js | 16 -- .../_expected/amd.js | 32 ---- .../_expected/cjs.js | 33 ---- .../_expected/es.js | 10 - .../_expected/iife.js | 33 ---- .../_expected/system.js | 24 --- .../_expected/umd.js | 36 ---- .../interop-boolean-per-dependency/main.js | 10 - .../_config.js | 17 -- .../_expected/amd.js | 46 ----- .../_expected/cjs.js | 47 ----- .../_expected/es.js | 6 - .../_expected/iife.js | 49 ----- .../_expected/system.js | 15 -- .../_expected/umd.js | 50 ----- .../main.js | 4 - .../interop-false-reexport/_config.js | 13 -- .../interop-false-reexport/_expected/amd.js | 13 -- .../interop-false-reexport/_expected/cjs.js | 13 -- .../interop-false-reexport/_expected/es.js | 1 - .../interop-false-reexport/_expected/iife.js | 16 -- .../_expected/system.js | 13 -- .../interop-false-reexport/_expected/umd.js | 15 -- .../deprecated/interop-false-reexport/main.js | 2 - .../deprecated/interop-false/_config.js | 13 -- .../deprecated/interop-false/_expected/amd.js | 7 - .../deprecated/interop-false/_expected/cjs.js | 7 - .../deprecated/interop-false/_expected/es.js | 5 - .../interop-false/_expected/iife.js | 8 - .../interop-false/_expected/system.js | 14 -- .../deprecated/interop-false/_expected/umd.js | 11 -- .../samples/deprecated/interop-false/main.js | 2 - .../_config.js | 21 -- .../_expected.js | 27 --- .../main.js | 10 - .../entry-named/_expected/amd.js | 2 +- .../entry-named/_expected/cjs.js | 2 +- .../entry-named/_expected/iife.js | 2 +- .../entry-named/_expected/umd.js | 2 +- .../_expected/amd.js | 7 +- .../_expected/cjs.js | 7 +- .../_expected/iife.js | 2 - .../_expected/umd.js | 2 - .../_expected/amd.js | 7 +- .../_expected/cjs.js | 7 +- .../_expected/iife.js | 2 - .../_expected/umd.js | 2 - .../_expected/amd.js | 11 +- .../_expected/cjs.js | 11 +- .../export-all-before-named/_expected/amd.js | 2 - .../export-all-before-named/_expected/cjs.js | 2 - .../export-all-before-named/_expected/iife.js | 2 - .../export-all-before-named/_expected/umd.js | 2 - .../export-all-from-internal/_expected/amd.js | 2 - .../export-all-from-internal/_expected/cjs.js | 2 - .../_expected/iife.js | 2 - .../export-all-from-internal/_expected/umd.js | 2 - .../export-all-multiple/_expected/amd.js | 2 - .../export-all-multiple/_expected/cjs.js | 2 - .../export-all-multiple/_expected/iife.js | 2 - .../export-all-multiple/_expected/umd.js | 2 - .../samples/export-default-import/_config.js | 1 + .../export-default-import/_expected/amd.js | 6 +- .../export-default-import/_expected/cjs.js | 6 +- .../export-default-import/_expected/iife.js | 6 +- .../export-default-import/_expected/umd.js | 6 +- .../samples/export-globals/_expected/amd.js | 2 - .../samples/export-globals/_expected/cjs.js | 2 - .../samples/export-globals/_expected/iife.js | 2 - .../samples/export-globals/_expected/umd.js | 2 - .../export-live-bindings/_expected/amd.js | 2 - .../export-live-bindings/_expected/cjs.js | 2 - .../export-live-bindings/_expected/iife.js | 2 - .../export-live-bindings/_expected/umd.js | 2 - .../export-namespace-as/_expected/amd.js | 2 - .../export-namespace-as/_expected/cjs.js | 2 - .../export-namespace-as/_expected/iife.js | 2 - .../export-namespace-as/_expected/umd.js | 2 - .../_expected/amd.js | 2 - .../_expected/cjs.js | 2 - .../_expected/iife.js | 2 - .../_expected/umd.js | 2 - .../samples/extend-exports/_expected/amd.js | 2 - .../samples/extend-exports/_expected/cjs.js | 2 - .../samples/extend-exports/_expected/iife.js | 2 - .../samples/extend-exports/_expected/umd.js | 2 - .../_expected/amd.js | 2 - .../_expected/cjs.js | 2 - .../_expected/iife.js | 2 - .../_expected/umd.js | 2 - .../external-deshadowing/_expected/amd.js | 8 +- .../external-deshadowing/_expected/cjs.js | 8 +- .../external-deshadowing/_expected/iife.js | 8 +- .../external-deshadowing/_expected/umd.js | 8 +- .../external-export-tracing/_expected/amd.js | 2 - .../external-export-tracing/_expected/cjs.js | 2 - .../external-export-tracing/_expected/iife.js | 2 - .../external-export-tracing/_expected/umd.js | 2 - .../_expected/amd.js | 8 +- .../_expected/cjs.js | 8 +- .../_expected/iife.js | 8 +- .../_expected/umd.js | 8 +- .../samples/external-imports/_expected/amd.js | 13 +- .../samples/external-imports/_expected/cjs.js | 13 +- .../external-imports/_expected/iife.js | 13 +- .../samples/external-imports/_expected/umd.js | 13 +- .../_expected/amd.js | 5 +- .../_expected/cjs.js | 5 +- .../_expected/iife.js | 5 +- .../_expected/umd.js | 5 +- .../_expected/amd.js | 7 +- .../_expected/cjs.js | 7 +- .../_expected/iife.js | 7 +- .../_expected/umd.js | 7 +- test/form/samples/freeze/_expected/amd.js | 2 - test/form/samples/freeze/_expected/cjs.js | 2 - test/form/samples/freeze/_expected/iife.js | 2 - test/form/samples/freeze/_expected/umd.js | 2 - .../function-mutation/_expected/amd.js | 2 - .../function-mutation/_expected/cjs.js | 2 - .../function-mutation/_expected/iife.js | 2 - .../function-mutation/_expected/umd.js | 2 - .../arrow-functions-false/_config.js | 2 +- .../arrow-functions-false/_expected/amd.js | 12 +- .../arrow-functions-false/_expected/cjs.js | 12 +- .../arrow-functions-false/_expected/es.js | 6 +- .../arrow-functions-false/_expected/iife.js | 10 +- .../arrow-functions-false/_expected/system.js | 6 +- .../arrow-functions-false/_expected/umd.js | 10 +- .../arrow-functions-true/_config.js | 2 +- .../arrow-functions-true/_expected/amd.js | 12 +- .../arrow-functions-true/_expected/cjs.js | 12 +- .../arrow-functions-true/_expected/es.js | 6 +- .../arrow-functions-true/_expected/iife.js | 10 +- .../arrow-functions-true/_expected/system.js | 6 +- .../arrow-functions-true/_expected/umd.js | 10 +- .../const-bindings-false/_config.js | 3 +- .../const-bindings-false/_expected/amd.js | 2 +- .../const-bindings-false/_expected/cjs.js | 2 +- .../const-bindings-false/_expected/iife.js | 2 +- .../const-bindings-false/_expected/umd.js | 2 +- .../const-bindings-true/_config.js | 3 +- .../const-bindings-true/_expected/amd.js | 2 +- .../const-bindings-true/_expected/cjs.js | 2 +- .../const-bindings-true/_expected/iife.js | 2 +- .../const-bindings-true/_expected/umd.js | 2 +- .../_config.js | 1 + .../_expected/amd.js | 2 +- .../_expected/cjs.js | 2 +- .../_expected/iife.js | 2 +- .../_expected/umd.js | 2 +- .../_config.js | 1 + .../_expected/amd.js | 2 +- .../_expected/cjs.js | 2 +- .../_expected/iife.js | 2 +- .../_expected/umd.js | 2 +- .../arrow-functions-false/_config.js | 2 +- .../arrow-functions-false/_expected/amd.js | 29 ++- .../arrow-functions-false/_expected/cjs.js | 29 ++- .../arrow-functions-false/_expected/es.js | 8 +- .../arrow-functions-false/_expected/iife.js | 29 ++- .../arrow-functions-false/_expected/system.js | 10 +- .../arrow-functions-false/_expected/umd.js | 29 ++- .../arrow-functions-false/main.js | 4 +- .../arrow-functions-true/_config.js | 2 +- .../arrow-functions-true/_expected/amd.js | 29 ++- .../arrow-functions-true/_expected/cjs.js | 29 ++- .../arrow-functions-true/_expected/es.js | 8 +- .../arrow-functions-true/_expected/iife.js | 29 ++- .../arrow-functions-true/_expected/system.js | 10 +- .../arrow-functions-true/_expected/umd.js | 29 ++- .../const-bindings-false/_config.js | 3 +- .../const-bindings-false/_expected/amd.js | 11 +- .../const-bindings-false/_expected/cjs.js | 11 +- .../const-bindings-false/_expected/iife.js | 11 +- .../const-bindings-false/_expected/umd.js | 11 +- .../const-bindings-true/_config.js | 3 +- .../const-bindings-true/_expected/amd.js | 11 +- .../const-bindings-true/_expected/cjs.js | 11 +- .../const-bindings-true/_expected/iife.js | 11 +- .../const-bindings-true/_expected/umd.js | 11 +- .../_config.js | 1 + .../_expected/amd.js | 4 +- .../_expected/cjs.js | 4 +- .../_expected/iife.js | 4 +- .../_expected/umd.js | 4 +- .../_config.js | 1 + .../_expected/amd.js | 4 +- .../_expected/cjs.js | 4 +- .../_expected/iife.js | 4 +- .../_expected/umd.js | 4 +- .../samples/globals-function/_expected/amd.js | 7 +- .../samples/globals-function/_expected/cjs.js | 7 +- .../globals-function/_expected/iife.js | 7 +- .../samples/globals-function/_expected/umd.js | 7 +- .../guessed-global-names/_expected/amd.js | 6 +- .../guessed-global-names/_expected/cjs.js | 6 +- .../guessed-global-names/_expected/iife.js | 6 +- .../guessed-global-names/_expected/umd.js | 6 +- .../import-expression/_expected/amd.js | 5 +- .../import-expression/_expected/cjs.js | 5 +- .../_expected/amd.js | 10 +- .../_expected/cjs.js | 10 +- .../_expected/iife.js | 10 +- .../_expected/umd.js | 10 +- .../samples/import-namespace/_expected/amd.js | 7 +- .../samples/import-namespace/_expected/cjs.js | 7 +- .../import-namespace/_expected/iife.js | 7 +- .../samples/import-namespace/_expected/umd.js | 7 +- .../_expected/amd.js | 2 - .../_expected/cjs.js | 2 - .../_expected/iife.js | 2 - .../_expected/umd.js | 2 - .../samples/intro-and-outro/_expected/amd.js | 6 +- .../samples/intro-and-outro/_expected/cjs.js | 6 +- .../samples/intro-and-outro/_expected/iife.js | 6 +- .../samples/intro-and-outro/_expected/umd.js | 6 +- .../_expected/amd.js | 2 - .../_expected/cjs.js | 2 - .../_expected/iife.js | 2 - .../_expected/umd.js | 2 - test/form/samples/mjs/_expected/amd.js | 2 - test/form/samples/mjs/_expected/cjs.js | 2 - test/form/samples/mjs/_expected/iife.js | 2 - test/form/samples/mjs/_expected/umd.js | 2 - .../_expected/amd.js | 2 - .../_expected/cjs.js | 2 - .../_expected/iife.js | 2 - .../_expected/umd.js | 2 - .../samples/module-name-wat/_expected/amd.js | 2 - .../samples/module-name-wat/_expected/cjs.js | 2 - .../samples/module-name-wat/_expected/iife.js | 2 - .../samples/module-name-wat/_expected/umd.js | 2 - .../module-name-with-dashes/_expected/amd.js | 2 - .../module-name-with-dashes/_expected/cjs.js | 2 - .../module-name-with-dashes/_expected/iife.js | 2 - .../module-name-with-dashes/_expected/umd.js | 2 - .../samples/multiple-exports/_expected/amd.js | 2 - .../samples/multiple-exports/_expected/cjs.js | 2 - .../multiple-exports/_expected/iife.js | 2 - .../samples/multiple-exports/_expected/umd.js | 2 - .../_expected/amd.js | 7 +- .../_expected/cjs.js | 7 +- .../_expected/iife.js | 7 +- .../_expected/umd.js | 7 +- .../_expected/amd.js | 7 +- .../_expected/cjs.js | 7 +- .../_expected/iife.js | 7 +- .../_expected/umd.js | 7 +- .../_expected.js | 4 +- .../namespace-reexport-name/_expected/amd.js | 2 - .../namespace-reexport-name/_expected/cjs.js | 2 - .../namespace-reexport-name/_expected/iife.js | 2 - .../namespace-reexport-name/_expected/umd.js | 2 - .../namespace-self-import/_expected/amd.js | 2 - .../namespace-self-import/_expected/cjs.js | 2 - .../namespace-self-import/_expected/iife.js | 2 - .../namespace-self-import/_expected/umd.js | 2 - .../entry-named/_expected/amd.js | 2 + .../entry-named/_expected/cjs.js | 2 + .../entry-named/_expected/es.js | 3 +- .../entry-named/_expected/iife.js | 2 + .../entry-named/_expected/system.js | 1 + .../entry-named/_expected/umd.js | 2 + .../namespace-tostring/entry-named/main.js | 1 + .../_config.js | 9 + .../_expected.js | 5 + .../foo.js | 1 + .../main.js | 10 + .../namespaced-named-exports/_expected/amd.js | 2 - .../namespaced-named-exports/_expected/cjs.js | 2 - .../_expected/iife.js | 2 - .../namespaced-named-exports/_expected/umd.js | 2 - .../_expected/amd.js | 2 - .../_expected/cjs.js | 2 - .../_expected/iife.js | 2 - .../_expected/umd.js | 2 - .../_expected/amd.js | 2 +- .../_expected/cjs.js | 2 +- .../_expected/iife.js | 2 +- .../_expected/umd.js | 2 +- .../_expected/amd.js | 7 +- .../_expected/cjs.js | 7 +- .../_expected/iife.js | 2 - .../_expected/umd.js | 2 - .../_expected/amd.js | 9 +- .../_expected/cjs.js | 9 +- .../_expected/iife.js | 9 +- .../_expected/umd.js | 9 +- .../output-named-library/_expected/amd.js | 2 - .../output-named-library/_expected/cjs.js | 2 - .../output-named-library/_expected/iife.js | 2 - .../output-named-library/_expected/umd.js | 2 - .../_expected/amd.js | 2 - .../_expected/cjs.js | 2 - .../_expected/iife.js | 2 - .../_expected/umd.js | 2 - .../samples/paths-function/_expected/amd.js | 11 +- .../samples/paths-function/_expected/cjs.js | 11 +- .../samples/paths-function/_expected/iife.js | 6 +- .../samples/paths-function/_expected/umd.js | 6 +- .../samples/paths-relative/_expected/amd.js | 6 +- .../samples/paths-relative/_expected/cjs.js | 6 +- .../samples/paths-relative/_expected/iife.js | 6 +- .../samples/paths-relative/_expected/umd.js | 6 +- test/form/samples/paths/_expected/amd.js | 6 +- test/form/samples/paths/_expected/cjs.js | 6 +- test/form/samples/paths/_expected/iife.js | 6 +- test/form/samples/paths/_expected/umd.js | 6 +- .../pattern-assignments/_expected/amd.js | 2 - .../pattern-assignments/_expected/cjs.js | 2 - .../pattern-assignments/_expected/iife.js | 2 - .../pattern-assignments/_expected/umd.js | 2 - .../_expected/amd.js | 2 - .../_expected/cjs.js | 2 - .../_expected/iife.js | 2 - .../_expected/umd.js | 2 - .../probe-external-namespace/_expected/amd.js | 5 +- .../probe-external-namespace/_expected/cjs.js | 5 +- .../_expected/iife.js | 5 +- .../probe-external-namespace/_expected/umd.js | 5 +- .../protect-cjs-globals/_expected/amd.js | 2 - .../protect-cjs-globals/_expected/cjs.js | 2 - .../protect-cjs-globals/_expected/iife.js | 2 - .../protect-cjs-globals/_expected/umd.js | 2 - .../re-export-aliasing/_expected/amd.js | 2 - .../re-export-aliasing/_expected/cjs.js | 2 - .../re-export-aliasing/_expected/iife.js | 2 - .../re-export-aliasing/_expected/umd.js | 2 - .../_expected/amd.js | 2 - .../_expected/cjs.js | 2 - .../_expected/iife.js | 2 - .../_expected/umd.js | 2 - .../_expected/amd.js | 9 +- .../_expected/cjs.js | 9 +- .../_expected/iife.js | 9 +- .../_expected/umd.js | 9 +- .../_expected/amd.js | 9 +- .../_expected/cjs.js | 9 +- .../_expected/iife.js | 9 +- .../_expected/umd.js | 11 +- .../_expected/amd.js | 11 +- .../_expected/cjs.js | 11 +- .../_expected/iife.js | 11 +- .../_expected/umd.js | 11 +- .../_expected/amd.js | 6 +- .../_expected/cjs.js | 6 +- .../_expected/iife.js | 6 +- .../_expected/umd.js | 6 +- .../reexport-external-name/_expected/amd.js | 2 - .../reexport-external-name/_expected/cjs.js | 2 - .../reexport-external-name/_expected/iife.js | 2 - .../reexport-external-name/_expected/umd.js | 2 - .../_expected/amd.js | 7 +- .../_expected/cjs.js | 7 +- .../_expected/iife.js | 7 +- .../_expected/umd.js | 7 +- .../_expected/amd.js | 2 - .../_expected/cjs.js | 2 - .../_expected/iife.js | 2 - .../_expected/umd.js | 2 - .../_expected/amd.js | 9 +- .../_expected/cjs.js | 9 +- .../_expected/iife.js | 9 +- .../_expected/umd.js | 9 +- .../_expected/amd.js | 8 +- .../_expected/cjs.js | 8 +- .../_expected/iife.js | 8 +- .../_expected/umd.js | 8 +- .../_expected/amd.js | 2 - .../_expected/cjs.js | 2 - .../_expected/iife.js | 2 - .../_expected/umd.js | 2 - .../_expected/amd.js | 2 - .../_expected/cjs.js | 2 - .../_expected/iife.js | 2 - .../_expected/umd.js | 2 - .../_expected/amd.js | 13 +- .../_expected/cjs.js | 13 +- .../_expected/iife.js | 8 +- .../_expected/umd.js | 8 +- .../_expected/amd.js | 2 - .../_expected/cjs.js | 2 - .../_expected/iife.js | 2 - .../_expected/umd.js | 2 - .../side-effects-delete/_expected/amd.js | 2 - .../side-effects-delete/_expected/cjs.js | 2 - .../side-effects-delete/_expected/iife.js | 2 - .../side-effects-delete/_expected/umd.js | 2 - .../simplified-initializer/_expected/amd.js | 2 - .../simplified-initializer/_expected/cjs.js | 2 - .../simplified-initializer/_expected/iife.js | 2 - .../simplified-initializer/_expected/umd.js | 2 - .../umd-noconflict-extend/_expected/amd.js | 2 - .../umd-noconflict-extend/_expected/cjs.js | 2 - .../umd-noconflict-extend/_expected/iife.js | 2 - .../umd-noconflict-extend/_expected/umd.js | 2 - .../_expected/amd.js | 2 - .../_expected/cjs.js | 2 - .../_expected/iife.js | 2 - .../_expected/umd.js | 2 - .../samples/umd-noconflict/_expected/amd.js | 2 - .../samples/umd-noconflict/_expected/cjs.js | 2 - .../samples/umd-noconflict/_expected/iife.js | 2 - .../samples/umd-noconflict/_expected/umd.js | 2 - .../updating-assignments/_expected/amd.js | 2 - .../updating-assignments/_expected/cjs.js | 2 - .../updating-assignments/_expected/iife.js | 2 - .../updating-assignments/_expected/umd.js | 2 - .../samples/url-external/_expected/amd.js | 6 +- .../samples/url-external/_expected/cjs.js | 6 +- .../samples/url-external/_expected/iife.js | 6 +- .../samples/url-external/_expected/umd.js | 6 +- .../_expected/amd.js | 6 +- .../_expected/cjs.js | 6 +- .../_expected/iife.js | 6 +- .../_expected/umd.js | 6 +- .../deconflicts-interop-boolean/_config.js | 25 --- .../deconflicts-interop-boolean/main.js | 10 - .../deprecated/interop-false/_config.js | 69 ------- .../samples/deprecated/interop-false/main.js | 29 --- .../interop-true-live-bindings/_config.js | 69 ------- .../interop-true-live-bindings/main.js | 45 ----- .../interop-true-no-live-bindings/_config.js | 56 ------ .../interop-true-no-live-bindings/main.js | 24 --- .../interop-false-function/_config.js | 17 -- .../interop-false-function/main.js | 1 - .../deprecations/interop-false/_config.js | 16 -- .../deprecations/interop-false/main.js | 1 - .../interop-true-function/_config.js | 17 -- .../interop-true-function/main.js | 1 - .../deprecations/interop-true/_config.js | 16 -- .../samples/deprecations/interop-true/main.js | 1 - .../_config.js | 3 +- .../_config.js | 3 +- .../samples/external-live-binding/_config.js | 3 +- .../interop-default-conflict/_config.js | 3 +- .../samples/invalid-interop/_config.js | 2 +- .../samples/output-options-hook/_config.js | 2 +- test/misc/iife.js | 2 - test/watch/index.js | 1 - 906 files changed, 986 insertions(+), 3700 deletions(-) delete mode 100644 test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_config.js delete mode 100644 test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/amd/false.js delete mode 100644 test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/amd/true.js delete mode 100644 test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/cjs/false.js delete mode 100644 test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/cjs/true.js delete mode 100644 test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/es/false.js delete mode 100644 test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/es/true.js delete mode 100644 test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/system/false.js delete mode 100644 test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/system/true.js delete mode 100644 test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/false.js delete mode 100644 test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/true.js rename test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/{main-amd-2ef83a76.js => main-amd-db420a01.js} (80%) rename test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/{main-cjs-82d6d41f.js => main-cjs-319b4e92.js} (82%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/{main-amd-51321eb1.js => main-amd-c6b04a3d.js} (87%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/{main-cjs-92cd000c.js => main-cjs-7c9c9af9.js} (89%) rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/{_virtualModule-amd-4e388e40.mjs => _virtualModule-amd-03552e5c.mjs} (65%) rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/{_virtualWithAssetExt.str-amd-4deed186.mjs => _virtualWithAssetExt.str-amd-724c602d.mjs} (65%) rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/{_virtualWithExt-amd-41e5e75e.mjs => _virtualWithExt-amd-e9dc1b7e.mjs} (65%) rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/{main-amd-eb6187f3.mjs => main-amd-7efb1bed.mjs} (53%) rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/{_virtualModule-cjs-650c7f9a.mjs => _virtualModule-cjs-bbe1ad5e.mjs} (52%) rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/{_virtualWithAssetExt.str-cjs-63fd96f4.mjs => _virtualWithAssetExt.str-cjs-0e561611.mjs} (53%) rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/{_virtualWithExt-cjs-c612470d.mjs => _virtualWithExt-cjs-b148ca33.mjs} (53%) rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/{main-cjs-d0c7e6cf.mjs => main-cjs-f7b1940b.mjs} (56%) delete mode 100644 test/form/samples/deprecated/interop-boolean-per-dependency/_config.js delete mode 100644 test/form/samples/deprecated/interop-boolean-per-dependency/_expected/amd.js delete mode 100644 test/form/samples/deprecated/interop-boolean-per-dependency/_expected/cjs.js delete mode 100644 test/form/samples/deprecated/interop-boolean-per-dependency/_expected/es.js delete mode 100644 test/form/samples/deprecated/interop-boolean-per-dependency/_expected/iife.js delete mode 100644 test/form/samples/deprecated/interop-boolean-per-dependency/_expected/system.js delete mode 100644 test/form/samples/deprecated/interop-boolean-per-dependency/_expected/umd.js delete mode 100644 test/form/samples/deprecated/interop-boolean-per-dependency/main.js delete mode 100644 test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_config.js delete mode 100644 test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/amd.js delete mode 100644 test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/cjs.js delete mode 100644 test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/es.js delete mode 100644 test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/iife.js delete mode 100644 test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/system.js delete mode 100644 test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/umd.js delete mode 100644 test/form/samples/deprecated/interop-boolean-per-reexported-dependency/main.js delete mode 100644 test/form/samples/deprecated/interop-false-reexport/_config.js delete mode 100644 test/form/samples/deprecated/interop-false-reexport/_expected/amd.js delete mode 100644 test/form/samples/deprecated/interop-false-reexport/_expected/cjs.js delete mode 100644 test/form/samples/deprecated/interop-false-reexport/_expected/es.js delete mode 100644 test/form/samples/deprecated/interop-false-reexport/_expected/iife.js delete mode 100644 test/form/samples/deprecated/interop-false-reexport/_expected/system.js delete mode 100644 test/form/samples/deprecated/interop-false-reexport/_expected/umd.js delete mode 100644 test/form/samples/deprecated/interop-false-reexport/main.js delete mode 100644 test/form/samples/deprecated/interop-false/_config.js delete mode 100644 test/form/samples/deprecated/interop-false/_expected/amd.js delete mode 100644 test/form/samples/deprecated/interop-false/_expected/cjs.js delete mode 100644 test/form/samples/deprecated/interop-false/_expected/es.js delete mode 100644 test/form/samples/deprecated/interop-false/_expected/iife.js delete mode 100644 test/form/samples/deprecated/interop-false/_expected/system.js delete mode 100644 test/form/samples/deprecated/interop-false/_expected/umd.js delete mode 100644 test/form/samples/deprecated/interop-false/main.js delete mode 100644 test/form/samples/deprecated/interop-per-dependency-no-live-binding-boolean/_config.js delete mode 100644 test/form/samples/deprecated/interop-per-dependency-no-live-binding-boolean/_expected.js delete mode 100644 test/form/samples/deprecated/interop-per-dependency-no-live-binding-boolean/main.js create mode 100644 test/form/samples/namespace-tostring/inlined-namespace-static-resolution/_config.js create mode 100644 test/form/samples/namespace-tostring/inlined-namespace-static-resolution/_expected.js create mode 100644 test/form/samples/namespace-tostring/inlined-namespace-static-resolution/foo.js create mode 100644 test/form/samples/namespace-tostring/inlined-namespace-static-resolution/main.js delete mode 100644 test/function/samples/deprecated/deconflicts-interop-boolean/_config.js delete mode 100644 test/function/samples/deprecated/deconflicts-interop-boolean/main.js delete mode 100644 test/function/samples/deprecated/interop-false/_config.js delete mode 100644 test/function/samples/deprecated/interop-false/main.js delete mode 100644 test/function/samples/deprecated/interop-true-live-bindings/_config.js delete mode 100644 test/function/samples/deprecated/interop-true-live-bindings/main.js delete mode 100644 test/function/samples/deprecated/interop-true-no-live-bindings/_config.js delete mode 100644 test/function/samples/deprecated/interop-true-no-live-bindings/main.js delete mode 100644 test/function/samples/deprecations/interop-false-function/_config.js delete mode 100644 test/function/samples/deprecations/interop-false-function/main.js delete mode 100644 test/function/samples/deprecations/interop-false/_config.js delete mode 100644 test/function/samples/deprecations/interop-false/main.js delete mode 100644 test/function/samples/deprecations/interop-true-function/_config.js delete mode 100644 test/function/samples/deprecations/interop-true-function/main.js delete mode 100644 test/function/samples/deprecations/interop-true/_config.js delete mode 100644 test/function/samples/deprecations/interop-true/main.js diff --git a/docs/01-command-line-reference.md b/docs/01-command-line-reference.md index c31c13b229c..a3f61d9635e 100755 --- a/docs/01-command-line-reference.md +++ b/docs/01-command-line-reference.md @@ -374,7 +374,7 @@ Many options have command line equivalents. In those cases, any arguments passed --generatedCode Which code features to use (es5/es2015) --no-hoistTransitiveImports Do not hoist transitive imports into entry chunks --no-indent Don't indent result ---no-interop Do not include interop block +--interop Handle default/namespace imports from AMD/CommonJS --inlineDynamicImports Create single bundle when using dynamic imports --intro Code to insert at top of bundle (inside wrapper) --no-makeAbsoluteExternalsRelative Prevent normalization of external imports diff --git a/docs/999-big-list-of-options.md b/docs/999-big-list-of-options.md index d67982e5bd3..82598e7de4c 100755 --- a/docs/999-big-list-of-options.md +++ b/docs/999-big-list-of-options.md @@ -591,15 +591,11 @@ const foo = null; export { foo as void }; // cjs output with reservedNamesAsProps: false -Object.defineProperty(exports, '__esModule', { value: true }); - const foo = null; exports['void'] = foo; // cjs output with reservedNamesAsProps: true -Object.defineProperty(exports, '__esModule', { value: true }); - const foo = null; exports.void = foo; @@ -614,25 +610,18 @@ Whether to allow the use of `Symbol` in auto-generated code snippets. Currently, export const foo = 42; // cjs output with symbols: false -Object.defineProperty(exports, '__esModule', { value: true }); - const foo = 42; exports.foo = foo; // cjs output with symbols: true -Object.defineProperties(exports, { - __esModule: { value: true }, - [Symbol.toStringTag]: { value: 'Module' } -}); +Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' }); const foo = 42; exports.foo = foo; ``` -Note: The `__esModule` flag in the example can be prevented via the [`output.esModule`](https://rollupjs.org/guide/en/#outputesmodule) option. - #### output.hoistTransitiveImports Type: `boolean`
CLI: `--hoistTransitiveImports`/`--no-hoistTransitiveImports`
Default: `true` @@ -647,9 +636,9 @@ This will inline dynamic imports instead of creating new chunks to create a sing #### output.interop -Type: `"auto" | "esModule" | "default" | "defaultOnly" | boolean | ((id: string) => "auto" | "esModule" | "default" | "defaultOnly" | boolean)`
CLI: `--interop `
Default: `true` +Type: `"compat" | "auto" | "esModule" | "default" | "defaultOnly" | ((id: string) => "compat" | "auto" | "esModule" | "default" | "defaultOnly")`
CLI: `--interop `
Default: `"default"` -Controls how Rollup handles default, namespace and dynamic imports from external dependencies in formats like CommonJS that do not natively support these concepts. Note that even though `true` is the current default value, this value is deprecated and will be replaced by `"auto"` in the next major version of Rollup. In the examples, we will be using the CommonJS format, but the interop similarly applies to AMD, IIFE and UMD targets as well. +Controls how Rollup handles default, namespace and dynamic imports from external dependencies in formats like CommonJS that do not natively support these concepts. Note that the default mode of "default" mimics NodeJS behavior and is different from TypeScript `esModuleInterop`. To get TypeScript's behavior, explicitly set the value to `"auto"`. In the examples, we will be using the CommonJS format, but the choice of interop similarly applies to AMD, IIFE and UMD targets as well. To understand the different values, assume we are bundling the following code for a `cjs` target: @@ -661,11 +650,50 @@ import('external2').then(console.log); Keep in mind that for Rollup, `import * as ext_namespace from 'external'; console.log(ext_namespace.bar);` is completely equivalent to `import {bar} from 'external'; console.log(bar);` and will produce the same code. In the example above however, the namespace object itself is passed to a global function as well, which means we need it as a properly formed object. -- `"esModule"` assumes that required modules are transpiled ES modules where the required value corresponds to the module namespace, and the default export is the `.default` property of the exported object: +- `"default"` assumes that the required value should be treated as the default export of the imported module, just like when importing CommonJS from an ES module context in NodeJS. Named imports are supported as well, which are treated as properties of the default import. To create the namespace object, Rollup injects these helpers: + + ```js + var external = require('external1'); + + function _interopNamespaceDefault(e) { + var n = Object.create(null); + if (e) { + Object.keys(e).forEach(function (k) { + if (k !== 'default') { + var d = Object.getOwnPropertyDescriptor(e, k); + Object.defineProperty( + n, + k, + d.get + ? d + : { + enumerable: true, + get: function () { + return e[k]; + } + } + ); + } + }); + } + n.default = e; + return Object.freeze(n); + } + + var external__namespace = /*#__PURE__*/ _interopNamespaceDefault(external); + console.log(external, external__namespace.bar, external__namespace); + Promise.resolve() + .then(function () { + return /*#__PURE__*/ _interopNamespaceDefault(require('external2')); + }) + .then(console.log); + ``` + +- `"esModule"` assumes that required modules are transpiled ES modules where the required value corresponds to the module namespace, and the default export is the `.default` property of the exported object. This is the only interop type that will not inject any helper functions: ```js var external = require('external1'); - console.log(external['default'], external.bar, external); + console.log(external.default, external.bar, external); Promise.resolve() .then(function () { return require('external2'); @@ -675,12 +703,13 @@ Keep in mind that for Rollup, `import * as ext_namespace from 'external'; consol When `esModule` is used, Rollup adds no additional interop helpers and also supports live-bindings for default exports. -- `"default"` assumes that the required value should be treated as the default export of the imported module, just like when importing CommonJS from an ES module context in Node. In contrast to Node, though, named imports are supported as well which are treated as properties of the default import. To create the namespace object, Rollup injects helpers: +- `"auto"` combines both `"esModule"` and `"default"` by injecting helpers that contain code that detects at runtime if the required value contains the [`__esModule` property](guide/en/#outputesmodule). Adding this property is a hack implemented by TypeScript `esModuleInterop`, Babel and other tools to signify that the required value is the namespace of a transpiled ES module.: ```js var external = require('external1'); - function _interopNamespaceDefault(e) { + function _interopNamespace(e) { + if (e && e.__esModule) return e; var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -701,63 +730,79 @@ Keep in mind that for Rollup, `import * as ext_namespace from 'external'; consol } }); } - n['default'] = e; + n.default = e; return Object.freeze(n); } - var external__namespace = /*#__PURE__*/ _interopNamespaceDefault(external); - console.log(external, external.bar, external__namespace); + var external__namespace = /*#__PURE__*/ _interopNamespace(external); + console.log(external__namespace.default, external__namespace.bar, external__namespace); Promise.resolve() .then(function () { - return /*#__PURE__*/ _interopNamespaceDefault(require('external2')); + return /*#__PURE__*/ _interopNamespace(require('external2')); }) .then(console.log); ``` -- `"auto"` combines both `"esModule"` and `"default"` by injecting helpers that contain code that detects at runtime if the required value contains the [`__esModule` property](guide/en/#outputesmodule). Adding this property is a standard implemented by Rollup, Babel and many other tools to signify that the required value is the namespace of a transpiled ES module: + Note how Rollup is reusing the created namespace object to get the `default` export. If the namespace object is not needed, Rollup will use a simpler helper: + + ```js + // input + import ext_default from 'external'; + console.log(ext_default); + + // output + var ext_default = require('external'); + + function _interopDefault(e) { + return e && e.__esModule ? e : { default: e }; + } + + var ext_default__default = /*#__PURE__*/ _interopDefault(ext_default); + console.log(ext_default__default.default); + ``` + +- `compat` is equivalent to `"auto"` except that it uses a slightly different helper for the default export that checks for the presence of a `default` property instead of the `__esModule` property. Except for the rare situation where a CommonJS module exports a property `"default"` that should not be the default export, this often helps to make interop "just work" as it does not rely on idiosyncratic hacks but instead uses duck-typing: ```js var external = require('external1'); - function _interopNamespace(e) { - if (e && e.__esModule) { - return e; - } else { - var n = Object.create(null); - if (e) { - Object.keys(e).forEach(function (k) { - if (k !== 'default') { - var d = Object.getOwnPropertyDescriptor(e, k); - Object.defineProperty( - n, - k, - d.get - ? d - : { - enumerable: true, - get: function () { - return e[k]; - } + function _interopNamespaceCompat(e) { + if (e && typeof e === 'object' && 'default' in e) return e; + var n = Object.create(null); + if (e) { + Object.keys(e).forEach(function (k) { + if (k !== 'default') { + var d = Object.getOwnPropertyDescriptor(e, k); + Object.defineProperty( + n, + k, + d.get + ? d + : { + enumerable: true, + get: function () { + return e[k]; } - ); - } - }); - } - n['default'] = e; - return Object.freeze(n); + } + ); + } + }); } + n.default = e; + return Object.freeze(n); } - var external__namespace = /*#__PURE__*/ _interopNamespace(external); - console.log(external__namespace['default'], external.bar, external__namespace); + var external__namespace = /*#__PURE__*/ _interopNamespaceCompat(external); + + console.log(external__namespace.default, external__namespace.bar, external__namespace); Promise.resolve() .then(function () { - return /*#__PURE__*/ _interopNamespace(require('external2')); + return /*#__PURE__*/ _interopNamespaceCompat(require('external2')); }) .then(console.log); ``` - Note how Rollup is reusing the created namespace object to get the `default` export. If the namespace object is not needed, Rollup will use a simpler helper: + Similar to `"auto"`, Rollup will use a simpler helper if the namespace is not needed: ```js // input @@ -767,12 +812,13 @@ Keep in mind that for Rollup, `import * as ext_namespace from 'external'; consol // output var ext_default = require('external'); - function _interopDefault(e) { - return e && e.__esModule ? e : { default: e }; + function _interopDefaultCompat(e) { + return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - var ext_default__default = /*#__PURE__*/ _interopDefault(ext_default); - console.log(ext_default__default['default']); + var ext_default__default = /*#__PURE__*/ _interopDefaultCompat(ext_default); + + console.log(ext_default__default.default); ``` - `"defaultOnly"` is similar to `"default"` except for the following: @@ -822,14 +868,6 @@ Keep in mind that for Rollup, `import * as ext_namespace from 'external'; consol }; ``` -- `true` is equivalent to `"auto"` except that it uses a slightly different helper for the default export that checks for the presence of a `default` property instead of the `__esModule` property. - - ☢️ _This value is deprecated and will be removed in a future Rollup version._ - -- `false` is equivalent to using `default` when importing a default export and `esModule` when importing a namespace. - - ☢️ _This value is deprecated and will be removed in a future Rollup version._ - There are some additional options that have an effect on the generated interop code: - Setting [`output.externalLiveBindings`](guide/en/#outputexternallivebindings) to `false` will generate simplified namespace helpers as well as simplified code for extracted default imports. @@ -1380,9 +1418,15 @@ export default { #### output.esModule -Type: `boolean`
CLI: `--esModule`/`--no-esModule`
Default: `true` +Type: `boolean | "if-default-prop"`
CLI: `--esModule`/`--no-esModule`
Default: `"if-default-prop"` -Whether to add a `__esModule: true` property when generating exports for non-ES formats. This property signifies that the exported value is the namespace of an ES module and that the default export of this module corresponds to the `.default` property of the exported object. By default, Rollup adds this property when using [named exports mode](guide/en/#outputexports) for a chunk. See also [`output.interop`](https://rollupjs.org/guide/en/#outputinterop). +Whether to add a `__esModule: true` property when generating exports for non-ES formats. This property signifies that the exported value is the namespace of an ES module and that the default export of this module corresponds to the `.default` property of the exported object. + +- `true` will always add the property when using [named exports mode](guide/en/#outputexports), which is similar to what other tools do. +- `"if-default-prop"` will only add the property when using named exports mode and there also is a default export. The subtle difference is that if there is no default export, consumers of the CommonJS version of your library will get all named exports as default export instead of an error or `undefined`. We chose to make this the default value as the `__esModule` property is not a standard followed by any JavaScript runtime and leads to many interop issues, so we want to limit its use to the cases where it is really needed. +- `false` on the other hand will never add the property even if the default export would become a property `.default`. + +See also [`output.interop`](https://rollupjs.org/guide/en/#outputinterop). #### output.exports @@ -1456,8 +1500,6 @@ Example: export { x } from 'external'; // CJS output with externalLiveBindings: true -Object.defineProperty(exports, '__esModule', { value: true }); - var external = require('external'); Object.defineProperty(exports, 'x', { @@ -1468,8 +1510,6 @@ Object.defineProperty(exports, 'x', { }); // CJS output with externalLiveBindings: false -Object.defineProperty(exports, '__esModule', { value: true }); - var external = require('external'); exports.x = external.x; diff --git a/src/Chunk.ts b/src/Chunk.ts index 2aa50904ea3..d9ad298f60f 100644 --- a/src/Chunk.ts +++ b/src/Chunk.ts @@ -587,9 +587,25 @@ export default class Chunk { const renderedDependencies = [...this.getRenderedDependencies().values()]; const renderedExports = exportMode === 'none' ? [] : this.getChunkExportDeclarations(format); - const hasExports = - renderedExports.length !== 0 || - renderedDependencies.some(dep => (dep.reexports && dep.reexports.length !== 0)!); + let hasExports = renderedExports.length !== 0; + let hasDefaultExport = false; + for (const { reexports } of renderedDependencies) { + if (reexports?.length) { + hasExports = true; + if (reexports.some(reexport => reexport.reexported === 'default')) { + hasDefaultExport = true; + break; + } + } + } + if (!hasDefaultExport) { + for (const { exported } of renderedExports) { + if (exported === 'default') { + hasDefaultExport = true; + break; + } + } + } const { intro, outro, banner, footer } = await createAddons( outputOptions, @@ -602,6 +618,7 @@ export default class Chunk { accessedGlobals, dependencies: renderedDependencies, exports: renderedExports, + hasDefaultExport, hasExports, id: preliminaryFileName.fileName, indent, @@ -789,11 +806,11 @@ export default class Chunk { dependencies.add(chunk); if (addNonNamespacesAndInteropHelpers) { if (variable.name === 'default') { - if (defaultInteropHelpersByInteropType[String(interop(module.id))]) { + if (defaultInteropHelpersByInteropType[interop(module.id)]) { deconflictedDefault.add(chunk); } } else if (variable.name === '*') { - if (namespaceInteropHelpersByInteropType[String(interop(module.id))]) { + if (namespaceInteropHelpersByInteropType[interop(module.id)]) { deconflictedNamespace.add(chunk); } } @@ -976,7 +993,7 @@ export default class Chunk { } needsLiveBinding = externalLiveBindings && - (imported !== 'default' || isDefaultAProperty(String(interop(module.id)), true)); + (imported !== 'default' || isDefaultAProperty(interop(module.id), true)); } } getOrCreate(reexportSpecifiers, dependency, () => []).push({ diff --git a/src/ast/nodes/ImportExpression.ts b/src/ast/nodes/ImportExpression.ts index 8d2e8574e84..316d7ea9377 100644 --- a/src/ast/nodes/ImportExpression.ts +++ b/src/ast/nodes/ImportExpression.ts @@ -243,7 +243,7 @@ function getInteropHelper( ): string | null { return exportMode === 'external' ? namespaceInteropHelpersByInteropType[ - String(interop(resolution instanceof ExternalModule ? resolution.id : null)) + interop(resolution instanceof ExternalModule ? resolution.id : null) ] : exportMode === 'default' ? INTEROP_NAMESPACE_DEFAULT_ONLY_VARIABLE diff --git a/src/ast/nodes/MemberExpression.ts b/src/ast/nodes/MemberExpression.ts index cf525fe17a5..10031dd9737 100644 --- a/src/ast/nodes/MemberExpression.ts +++ b/src/ast/nodes/MemberExpression.ts @@ -21,10 +21,12 @@ import { type ObjectPathKey, type PathTracker, SHARED_RECURSION_TRACKER, + SymbolToStringTag, UNKNOWN_PATH, UnknownKey, UnknownNonAccessorKey } from '../utils/PathTracker'; +import { UNDEFINED_EXPRESSION } from '../values'; import ExternalVariable from '../variables/ExternalVariable'; import type NamespaceVariable from '../variables/NamespaceVariable'; import type Variable from '../variables/Variable'; @@ -101,7 +103,7 @@ export default class MemberExpression extends NodeBase implements DeoptimizableE private assignmentDeoptimized = false; private bound = false; private expressionsToBeDeoptimized: DeoptimizableEntity[] = []; - private replacement: string | null = null; + private isUndefined = false; bind(): void { this.bound = true; @@ -115,8 +117,8 @@ export default class MemberExpression extends NodeBase implements DeoptimizableE ); if (!resolvedVariable) { super.bind(); - } else if (typeof resolvedVariable === 'string') { - this.replacement = resolvedVariable; + } else if (resolvedVariable === 'undefined') { + this.isUndefined = true; } else { this.variable = resolvedVariable; this.scope.addNamespaceMemberAccess(getStringFromPath(path!), resolvedVariable); @@ -140,7 +142,7 @@ export default class MemberExpression extends NodeBase implements DeoptimizableE if (path.length === 0) this.disallowNamespaceReassignment(); if (this.variable) { this.variable.deoptimizePath(path); - } else if (!this.replacement) { + } else if (!this.isUndefined) { if (path.length < MAX_PATH_DEPTH) { const propertyKey = this.getPropertyKey(); this.object.deoptimizePath([ @@ -158,7 +160,7 @@ export default class MemberExpression extends NodeBase implements DeoptimizableE ): void { if (this.variable) { this.variable.deoptimizeThisOnInteractionAtPath(interaction, path, recursionTracker); - } else if (!this.replacement) { + } else if (!this.isUndefined) { if (path.length < MAX_PATH_DEPTH) { this.object.deoptimizeThisOnInteractionAtPath( interaction, @@ -179,8 +181,8 @@ export default class MemberExpression extends NodeBase implements DeoptimizableE if (this.variable) { return this.variable.getLiteralValueAtPath(path, recursionTracker, origin); } - if (this.replacement) { - return UnknownValue; + if (this.isUndefined) { + return undefined; } this.expressionsToBeDeoptimized.push(origin); if (path.length < MAX_PATH_DEPTH) { @@ -207,8 +209,8 @@ export default class MemberExpression extends NodeBase implements DeoptimizableE origin ); } - if (this.replacement) { - return UNKNOWN_EXPRESSION; + if (this.isUndefined) { + return UNDEFINED_EXPRESSION; } this.expressionsToBeDeoptimized.push(origin); if (path.length < MAX_PATH_DEPTH) { @@ -250,7 +252,7 @@ export default class MemberExpression extends NodeBase implements DeoptimizableE if (this.variable) { return this.variable.hasEffectsOnInteractionAtPath(path, interaction, context); } - if (this.replacement) { + if (this.isUndefined) { return true; } if (path.length < MAX_PATH_DEPTH) { @@ -306,11 +308,11 @@ export default class MemberExpression extends NodeBase implements DeoptimizableE renderedSurroundingElement }: NodeRenderOptions = BLANK ): void { - if (this.variable || this.replacement) { + if (this.variable || this.isUndefined) { const { snippets: { getPropertyAccess } } = options; - let replacement = this.variable ? this.variable.getName(getPropertyAccess) : this.replacement; + let replacement = this.variable ? this.variable.getName(getPropertyAccess) : 'undefined'; if (renderedParentType && isCalleeOfRenderedParent) replacement = '0, ' + replacement; code.overwrite(this.start, this.end, replacement!, { contentOnly: true, @@ -341,7 +343,7 @@ export default class MemberExpression extends NodeBase implements DeoptimizableE // Namespaces are not bound and should not be deoptimized this.bound && propertyReadSideEffects && - !(this.variable || this.replacement) + !(this.variable || this.isUndefined) ) { const propertyKey = this.getPropertyKey(); this.object.deoptimizeThisOnInteractionAtPath( @@ -361,7 +363,7 @@ export default class MemberExpression extends NodeBase implements DeoptimizableE // Namespaces are not bound and should not be deoptimized this.bound && propertyReadSideEffects && - !(this.variable || this.replacement) + !(this.variable || this.isUndefined) ) { this.object.deoptimizeThisOnInteractionAtPath( this.assignmentInteraction, @@ -391,7 +393,12 @@ export default class MemberExpression extends NodeBase implements DeoptimizableE if (this.propertyKey === null) { this.propertyKey = UnknownKey; const value = this.property.getLiteralValueAtPath(EMPTY_PATH, SHARED_RECURSION_TRACKER, this); - return (this.propertyKey = typeof value === 'symbol' ? UnknownKey : String(value)); + return (this.propertyKey = + value === SymbolToStringTag + ? value + : typeof value === 'symbol' + ? UnknownKey + : String(value)); } return this.propertyKey; } @@ -400,7 +407,7 @@ export default class MemberExpression extends NodeBase implements DeoptimizableE const { propertyReadSideEffects } = this.context.options .treeshake as NormalizedTreeshakingOptions; return ( - !(this.variable || this.replacement) && + !(this.variable || this.isUndefined) && propertyReadSideEffects && (propertyReadSideEffects === 'always' || this.object.hasEffectsOnInteractionAtPath( @@ -430,7 +437,7 @@ function resolveNamespaceVariables( baseVariable: Variable, path: PathWithPositions, astContext: AstContext -): Variable | string | null { +): Variable | 'undefined' | null { if (path.length === 0) return baseVariable; if (!baseVariable.isNamespace || baseVariable instanceof ExternalVariable) return null; const exportName = path[0].key; diff --git a/src/ast/nodes/shared/Expression.ts b/src/ast/nodes/shared/Expression.ts index 1b718c0382a..8bda33b0575 100644 --- a/src/ast/nodes/shared/Expression.ts +++ b/src/ast/nodes/shared/Expression.ts @@ -6,7 +6,7 @@ import { NodeInteractionCalled, NodeInteractionWithThisArg } from '../../NodeInteractions'; -import { ObjectPath, PathTracker, UNKNOWN_PATH } from '../../utils/PathTracker'; +import { ObjectPath, PathTracker, SymbolToStringTag, UNKNOWN_PATH } from '../../utils/PathTracker'; import { LiteralValue } from '../Literal'; import SpreadElement from '../SpreadElement'; import { IncludeChildren } from './Node'; @@ -14,7 +14,11 @@ import { IncludeChildren } from './Node'; export const UnknownValue = Symbol('Unknown Value'); export const UnknownTruthyValue = Symbol('Unknown Truthy Value'); -export type LiteralValueOrUnknown = LiteralValue | typeof UnknownValue | typeof UnknownTruthyValue; +export type LiteralValueOrUnknown = + | LiteralValue + | typeof UnknownValue + | typeof UnknownTruthyValue + | typeof SymbolToStringTag; export interface InclusionOptions { /** @@ -39,7 +43,7 @@ export class ExpressionEntity implements WritableEntity { /** * If possible it returns a stringifyable literal value for this node that can be used * for inlining or comparing values. - * Otherwise it should return UnknownValue. + * Otherwise, it should return UnknownValue. */ getLiteralValueAtPath( _path: ObjectPath, diff --git a/src/ast/nodes/shared/knownGlobals.ts b/src/ast/nodes/shared/knownGlobals.ts index bffb9c98813..2ef63dac179 100644 --- a/src/ast/nodes/shared/knownGlobals.ts +++ b/src/ast/nodes/shared/knownGlobals.ts @@ -3,11 +3,13 @@ import { HasEffectsContext } from '../../ExecutionContext'; import { NODE_INTERACTION_UNKNOWN_ASSIGNMENT, NodeInteractionCalled } from '../../NodeInteractions'; import type { ObjectPath } from '../../utils/PathTracker'; -import { UNKNOWN_NON_ACCESSOR_PATH } from '../../utils/PathTracker'; +import { SymbolToStringTag, UNKNOWN_NON_ACCESSOR_PATH } from '../../utils/PathTracker'; +import { LiteralValueOrUnknown, UnknownTruthyValue } from './Expression'; const ValueProperties = Symbol('Value Properties'); interface ValueDescription { + getLiteralValue(): LiteralValueOrUnknown; hasEffectsWhenCalled(interaction: NodeInteractionCalled, context: HasEffectsContext): boolean; } @@ -17,16 +19,18 @@ interface GlobalDescription { __proto__: null; } +const getTruthyLiteralValue = (): LiteralValueOrUnknown => UnknownTruthyValue; +const returnFalse = () => false; +const returnTrue = () => true; + const PURE: ValueDescription = { - hasEffectsWhenCalled() { - return false; - } + getLiteralValue: getTruthyLiteralValue, + hasEffectsWhenCalled: returnFalse }; const IMPURE: ValueDescription = { - hasEffectsWhenCalled() { - return true; - } + getLiteralValue: getTruthyLiteralValue, + hasEffectsWhenCalled: returnTrue }; // We use shortened variables to reduce file size here @@ -46,6 +50,7 @@ const PF: GlobalDescription = { const MUTATES_ARG_WITHOUT_ACCESSOR: GlobalDescription = { __proto__: null, [ValueProperties]: { + getLiteralValue: getTruthyLiteralValue, hasEffectsWhenCalled({ args }, context) { return ( !args.length || @@ -253,7 +258,16 @@ const knownGlobals: GlobalDescription = { [ValueProperties]: PURE, for: PF, keyFor: PF, - prototype: O + prototype: O, + toStringTag: { + __proto__: null, + [ValueProperties]: { + getLiteralValue() { + return SymbolToStringTag; + }, + hasEffectsWhenCalled: returnTrue + } + } }, SyntaxError: PC, toLocaleString: O, diff --git a/src/ast/utils/PathTracker.ts b/src/ast/utils/PathTracker.ts index 5b0679a6187..9a840c7545f 100644 --- a/src/ast/utils/PathTracker.ts +++ b/src/ast/utils/PathTracker.ts @@ -4,11 +4,14 @@ import type { Entity } from '../Entity'; export const UnknownKey = Symbol('Unknown Key'); export const UnknownNonAccessorKey = Symbol('Unknown Non-Accessor Key'); export const UnknownInteger = Symbol('Unknown Integer'); +export const SymbolToStringTag = Symbol('Symbol.toStringTag'); + export type ObjectPathKey = | string | typeof UnknownKey | typeof UnknownNonAccessorKey - | typeof UnknownInteger; + | typeof UnknownInteger + | typeof SymbolToStringTag; export type ObjectPath = ObjectPathKey[]; export const EMPTY_PATH: ObjectPath = []; @@ -25,6 +28,7 @@ const EntitiesKey = Symbol('Entities'); interface EntityPaths { [pathSegment: string]: EntityPaths; [EntitiesKey]: Set; + [SymbolToStringTag]?: EntityPaths; [UnknownInteger]?: EntityPaths; [UnknownKey]?: EntityPaths; [UnknownNonAccessorKey]?: EntityPaths; @@ -72,6 +76,7 @@ export const SHARED_RECURSION_TRACKER = new PathTracker(); interface DiscriminatedEntityPaths { [pathSegment: string]: DiscriminatedEntityPaths; [EntitiesKey]: Map>; + [SymbolToStringTag]?: DiscriminatedEntityPaths; [UnknownInteger]?: DiscriminatedEntityPaths; [UnknownKey]?: DiscriminatedEntityPaths; [UnknownNonAccessorKey]?: DiscriminatedEntityPaths; diff --git a/src/ast/variables/GlobalVariable.ts b/src/ast/variables/GlobalVariable.ts index d3959d8f905..45a53e25f79 100644 --- a/src/ast/variables/GlobalVariable.ts +++ b/src/ast/variables/GlobalVariable.ts @@ -6,11 +6,7 @@ import { INTERACTION_CALLED, NodeInteraction } from '../NodeInteractions'; -import { - LiteralValueOrUnknown, - UnknownTruthyValue, - UnknownValue -} from '../nodes/shared/Expression'; +import { LiteralValueOrUnknown, UnknownValue } from '../nodes/shared/Expression'; import { getGlobalAtPath } from '../nodes/shared/knownGlobals'; import type { ObjectPath } from '../utils/PathTracker'; import { PathTracker } from '../utils/PathTracker'; @@ -26,7 +22,8 @@ export default class GlobalVariable extends Variable { _recursionTracker: PathTracker, _origin: DeoptimizableEntity ): LiteralValueOrUnknown { - return getGlobalAtPath([this.name, ...path]) ? UnknownTruthyValue : UnknownValue; + const globalAtPath = getGlobalAtPath([this.name, ...path]); + return globalAtPath ? globalAtPath.getLiteralValue() : UnknownValue; } hasEffectsOnInteractionAtPath( diff --git a/src/ast/variables/NamespaceVariable.ts b/src/ast/variables/NamespaceVariable.ts index efc910fb188..05c047b95a0 100644 --- a/src/ast/variables/NamespaceVariable.ts +++ b/src/ast/variables/NamespaceVariable.ts @@ -1,9 +1,9 @@ -import type Module from '../../Module'; -import type { AstContext } from '../../Module'; +import Module, { AstContext } from '../../Module'; import { getToStringTagValue, MERGE_NAMESPACES_VARIABLE } from '../../utils/interopHelpers'; import type { RenderOptions } from '../../utils/renderHelpers'; import { getSystemExportStatement } from '../../utils/systemJsRendering'; import type Identifier from '../nodes/Identifier'; +import { LiteralValueOrUnknown } from '../nodes/shared/Expression'; import type ChildScope from '../scopes/ChildScope'; import Variable from './Variable'; @@ -28,6 +28,11 @@ export default class NamespaceVariable extends Variable { this.name = identifier.name; } + getLiteralValueAtPath(): LiteralValueOrUnknown { + // This can only happen for Symbol.toStringTag right now + return 'Module'; + } + getMemberVariables(): { [name: string]: Variable } { if (this.memberVariables) { return this.memberVariables; @@ -44,6 +49,10 @@ export default class NamespaceVariable extends Variable { return (this.memberVariables = memberVariables); } + hasEffectsOnInteractionAtPath(): boolean { + return false; + } + include(): void { this.included = true; this.context.includeAllExports(); diff --git a/src/finalisers/amd.ts b/src/finalisers/amd.ts index 84360d431fe..a88e070afd3 100644 --- a/src/finalisers/amd.ts +++ b/src/finalisers/amd.ts @@ -13,6 +13,7 @@ export default function amd( accessedGlobals, dependencies, exports, + hasDefaultExport, hasExports, id, indent: t, @@ -86,7 +87,7 @@ export default function amd( ); let namespaceMarkers = getNamespaceMarkers( namedExportsMode && hasExports, - isEntryFacade && esModule, + isEntryFacade && (esModule === true || (esModule === 'if-default-prop' && hasDefaultExport)), isModuleFacade && namespaceToStringTag, snippets ); diff --git a/src/finalisers/cjs.ts b/src/finalisers/cjs.ts index c7852b62634..f94552d8dd0 100644 --- a/src/finalisers/cjs.ts +++ b/src/finalisers/cjs.ts @@ -12,6 +12,7 @@ export default function cjs( accessedGlobals, dependencies, exports, + hasDefaultExport, hasExports, indent: t, intro, @@ -36,7 +37,7 @@ export default function cjs( const useStrict = strict ? `'use strict';${n}${n}` : ''; let namespaceMarkers = getNamespaceMarkers( namedExportsMode && hasExports, - isEntryFacade && esModule, + isEntryFacade && (esModule === true || (esModule === 'if-default-prop' && hasDefaultExport)), isModuleFacade && namespaceToStringTag, snippets ); diff --git a/src/finalisers/iife.ts b/src/finalisers/iife.ts index ec011dfd80f..18d42a53b7e 100644 --- a/src/finalisers/iife.ts +++ b/src/finalisers/iife.ts @@ -20,6 +20,7 @@ export default function iife( accessedGlobals, dependencies, exports, + hasDefaultExport, hasExports, indent: t, intro, @@ -118,7 +119,7 @@ export default function iife( ); let namespaceMarkers = getNamespaceMarkers( namedExportsMode && hasExports, - esModule, + esModule === true || (esModule === 'if-default-prop' && hasDefaultExport), namespaceToStringTag, snippets ); diff --git a/src/finalisers/index.ts b/src/finalisers/index.ts index 13a8aa1454e..d4edacb73c4 100644 --- a/src/finalisers/index.ts +++ b/src/finalisers/index.ts @@ -13,6 +13,7 @@ export interface FinaliserOptions { accessedGlobals: Set; dependencies: ChunkDependency[]; exports: ChunkExports; + hasDefaultExport: boolean; hasExports: boolean; id: string; indent: string; diff --git a/src/finalisers/shared/getExportBlock.ts b/src/finalisers/shared/getExportBlock.ts index 4d6fe42436d..2fc93be2738 100644 --- a/src/finalisers/shared/getExportBlock.ts +++ b/src/finalisers/shared/getExportBlock.ts @@ -166,7 +166,7 @@ function getReexportedImportName( ) { if (imported === 'default') { if (!isChunk) { - const moduleInterop = String(interop(moduleId)); + const moduleInterop = interop(moduleId); const variableName = defaultInteropHelpersByInteropType[moduleInterop] ? defaultVariableName : moduleVariableName; @@ -180,9 +180,7 @@ function getReexportedImportName( } if (imported === '*') { return ( - isChunk - ? !depNamedExportsMode - : namespaceInteropHelpersByInteropType[String(interop(moduleId))] + isChunk ? !depNamedExportsMode : namespaceInteropHelpersByInteropType[interop(moduleId)] ) ? namespaceVariableName : moduleVariableName; diff --git a/src/finalisers/shared/getInteropBlock.ts b/src/finalisers/shared/getInteropBlock.ts index a305a7f4875..6e44303c2a7 100644 --- a/src/finalisers/shared/getInteropBlock.ts +++ b/src/finalisers/shared/getInteropBlock.ts @@ -58,7 +58,7 @@ export default function getInteropBlock( } } } else { - const moduleInterop = String(interop(importPath)); + const moduleInterop = interop(importPath); let hasDefault = false; let hasNamespace = false; for (const { imported, reexported } of [ diff --git a/src/finalisers/umd.ts b/src/finalisers/umd.ts index b4a886d6e1a..b2e098f102d 100644 --- a/src/finalisers/umd.ts +++ b/src/finalisers/umd.ts @@ -39,6 +39,7 @@ export default function umd( accessedGlobals, dependencies, exports, + hasDefaultExport, hasExports, id, indent: t, @@ -203,7 +204,7 @@ export default function umd( ); let namespaceMarkers = getNamespaceMarkers( namedExportsMode && hasExports, - esModule, + esModule === true || (esModule === 'if-default-prop' && hasDefaultExport), namespaceToStringTag, snippets ); diff --git a/src/rollup/types.d.ts b/src/rollup/types.d.ts index f03e6fdb480..ae4afdd78cd 100644 --- a/src/rollup/types.d.ts +++ b/src/rollup/types.d.ts @@ -563,7 +563,7 @@ interface GeneratedCodeOptions extends Partial { export type OptionsPaths = Record | ((id: string) => string); -export type InteropType = boolean | 'auto' | 'esModule' | 'default' | 'defaultOnly'; +export type InteropType = 'compat' | 'auto' | 'esModule' | 'default' | 'defaultOnly'; export type GetInterop = (id: string | null) => InteropType; @@ -613,7 +613,7 @@ export interface OutputOptions { /** @deprecated Use the "renderDynamicImport" plugin hook instead. */ dynamicImportFunction?: string; entryFileNames?: string | ((chunkInfo: PreRenderedChunk) => string); - esModule?: boolean; + esModule?: boolean | 'if-default-prop'; exports?: 'default' | 'named' | 'none' | 'auto'; extend?: boolean; externalLiveBindings?: boolean; @@ -663,7 +663,7 @@ export interface NormalizedOutputOptions { /** @deprecated Use the "renderDynamicImport" plugin hook instead. */ dynamicImportFunction: string | undefined; entryFileNames: string | ((chunkInfo: PreRenderedChunk) => string); - esModule: boolean; + esModule: boolean | 'if-default-prop'; exports: 'default' | 'named' | 'none' | 'auto'; extend: boolean; externalLiveBindings: boolean; diff --git a/src/utils/deconflictChunk.ts b/src/utils/deconflictChunk.ts index 1ebcd189e3f..1f6b271dee1 100644 --- a/src/utils/deconflictChunk.ts +++ b/src/utils/deconflictChunk.ts @@ -156,7 +156,7 @@ function deconflictImportsOther( for (const externalModule of deconflictedDefault) { if ( deconflictedNamespace.has(externalModule) && - canDefaultBeTakenFromNamespace(String(interop(externalModule.id)), externalLiveBindings) + canDefaultBeTakenFromNamespace(interop(externalModule.id), externalLiveBindings) ) { externalModule.defaultVariableName = externalModule.namespaceVariableName; } else { @@ -172,7 +172,7 @@ function deconflictImportsOther( const chunk = externalChunkByModule.get(module)!; const name = variable.name; if (name === 'default') { - const moduleInterop = String(interop(module.id)); + const moduleInterop = interop(module.id); const variableName = defaultInteropHelpersByInteropType[moduleInterop] ? chunk.defaultVariableName : chunk.variableName; @@ -184,7 +184,7 @@ function deconflictImportsOther( } else if (name === '*') { variable.setRenderNames( null, - namespaceInteropHelpersByInteropType[String(interop(module.id))] + namespaceInteropHelpersByInteropType[interop(module.id)] ? chunk.namespaceVariableName : chunk.variableName ); diff --git a/src/utils/interopHelpers.ts b/src/utils/interopHelpers.ts index 1fff502d0a5..30c9421e5b1 100644 --- a/src/utils/interopHelpers.ts +++ b/src/utils/interopHelpers.ts @@ -1,40 +1,41 @@ +import { InteropType } from '../rollup/types'; import { GenerateCodeSnippets } from './generateCodeSnippets'; const INTEROP_DEFAULT_VARIABLE = '_interopDefault'; -const INTEROP_DEFAULT_LEGACY_VARIABLE = '_interopDefaultLegacy'; +const INTEROP_DEFAULT_COMPAT_VARIABLE = '_interopDefaultCompat'; const INTEROP_NAMESPACE_VARIABLE = '_interopNamespace'; +const INTEROP_NAMESPACE_COMPAT_VARIABLE = '_interopNamespaceCompat'; const INTEROP_NAMESPACE_DEFAULT_VARIABLE = '_interopNamespaceDefault'; export const INTEROP_NAMESPACE_DEFAULT_ONLY_VARIABLE = '_interopNamespaceDefaultOnly'; export const MERGE_NAMESPACES_VARIABLE = '_mergeNamespaces'; -export const defaultInteropHelpersByInteropType: { [interopType: string]: string | null } = { +export const defaultInteropHelpersByInteropType: { [T in InteropType]: string | null } = { auto: INTEROP_DEFAULT_VARIABLE, + compat: INTEROP_DEFAULT_COMPAT_VARIABLE, default: null, defaultOnly: null, - esModule: null, - false: null, - true: INTEROP_DEFAULT_LEGACY_VARIABLE + esModule: null }; -export const isDefaultAProperty = (interopType: string, externalLiveBindings: boolean): boolean => +export const isDefaultAProperty = ( + interopType: InteropType, + externalLiveBindings: boolean +): boolean => interopType === 'esModule' || - (externalLiveBindings && (interopType === 'auto' || interopType === 'true')); + (externalLiveBindings && (interopType === 'auto' || interopType === 'compat')); -export const namespaceInteropHelpersByInteropType: { [interopType: string]: string | null } = { +export const namespaceInteropHelpersByInteropType: { [T in InteropType]: string | null } = { auto: INTEROP_NAMESPACE_VARIABLE, + compat: INTEROP_NAMESPACE_COMPAT_VARIABLE, default: INTEROP_NAMESPACE_DEFAULT_VARIABLE, defaultOnly: INTEROP_NAMESPACE_DEFAULT_ONLY_VARIABLE, - esModule: null, - false: null, - true: INTEROP_NAMESPACE_VARIABLE + esModule: null }; export const canDefaultBeTakenFromNamespace = ( - interopType: string, + interopType: InteropType, externalLiveBindings: boolean -): boolean => - isDefaultAProperty(interopType, externalLiveBindings) && - defaultInteropHelpersByInteropType[interopType] === INTEROP_DEFAULT_VARIABLE; +): boolean => interopType !== 'esModule' && isDefaultAProperty(interopType, externalLiveBindings); export const getHelpersBlock = ( additionalHelpers: ReadonlySet | null, @@ -75,15 +76,15 @@ const HELPER_GENERATORS: { usedHelpers: ReadonlySet ) => string; } = { - [INTEROP_DEFAULT_LEGACY_VARIABLE](_t, snippets, liveBindings) { + [INTEROP_DEFAULT_COMPAT_VARIABLE](_t, snippets, liveBindings) { const { _, getDirectReturnFunction, n } = snippets; const [left, right] = getDirectReturnFunction(['e'], { functionReturn: true, lineBreakIndent: null, - name: INTEROP_DEFAULT_LEGACY_VARIABLE + name: INTEROP_DEFAULT_COMPAT_VARIABLE }); return ( - `${left}e${_}&&${_}typeof e${_}===${_}'object'${_}&&${_}'default'${_}in e${_}?${_}` + + `${left}${getIsCompatNamespace(snippets)}${_}?${_}` + `${ liveBindings ? getDefaultLiveBinding(snippets) : getDefaultStatic(snippets) }${right}${n}${n}` @@ -103,6 +104,32 @@ const HELPER_GENERATORS: { }${right}${n}${n}` ); }, + [INTEROP_NAMESPACE_COMPAT_VARIABLE]( + t, + snippets, + liveBindings, + freeze, + namespaceToStringTag, + usedHelpers + ) { + const { _, getDirectReturnFunction, n } = snippets; + if (usedHelpers.has(INTEROP_NAMESPACE_DEFAULT_VARIABLE)) { + const [left, right] = getDirectReturnFunction(['e'], { + functionReturn: true, + lineBreakIndent: null, + name: INTEROP_NAMESPACE_COMPAT_VARIABLE + }); + return `${left}${getIsCompatNamespace( + snippets + )}${_}?${_}e${_}:${_}${INTEROP_NAMESPACE_DEFAULT_VARIABLE}(e)${right}${n}${n}`; + } + return ( + `function ${INTEROP_NAMESPACE_COMPAT_VARIABLE}(e)${_}{${n}` + + `${t}if${_}(${getIsCompatNamespace(snippets)})${_}return e;${n}` + + createNamespaceObject(t, t, snippets, liveBindings, freeze, namespaceToStringTag) + + `}${n}${n}` + ); + }, [INTEROP_NAMESPACE_DEFAULT_ONLY_VARIABLE]( _t, snippets, @@ -197,6 +224,9 @@ const getDefaultLiveBinding = ({ _, getObject }: GenerateCodeSnippets) => const getDefaultStatic = ({ _, getPropertyAccess }: GenerateCodeSnippets) => `e${getPropertyAccess('default')}${_}:${_}e`; +const getIsCompatNamespace = ({ _ }: GenerateCodeSnippets) => + `e${_}&&${_}typeof e${_}===${_}'object'${_}&&${_}'default'${_}in e`; + const createNamespaceObject = ( t: string, i: string, diff --git a/src/utils/options/normalizeOutputOptions.ts b/src/utils/options/normalizeOutputOptions.ts index ff1f7739b6c..31261080a7b 100644 --- a/src/utils/options/normalizeOutputOptions.ts +++ b/src/utils/options/normalizeOutputOptions.ts @@ -44,7 +44,7 @@ export function normalizeOutputOptions( dir: getDir(config, file), dynamicImportFunction: getDynamicImportFunction(config, inputOptions, format), entryFileNames: getEntryFileNames(config, unsetOptions), - esModule: config.esModule ?? true, + esModule: config.esModule ?? 'if-default-prop', exports: getExports(config, unsetOptions), extend: config.extend || false, externalLiveBindings: config.externalLiveBindings ?? true, @@ -57,7 +57,7 @@ export function normalizeOutputOptions( hoistTransitiveImports: config.hoistTransitiveImports ?? true, indent: getIndent(config, compact), inlineDynamicImports, - interop: getInterop(config, inputOptions), + interop: getInterop(config), intro: getAddon(config, 'intro'), manualChunks: getManualChunks(config, inlineDynamicImports, preserveModules, inputOptions), minifyInternalExports: getMinifyInternalExports(config, format, compact), @@ -382,47 +382,27 @@ const getIndent = (config: OutputOptions, compact: boolean): NormalizedOutputOpt }; const ALLOWED_INTEROP_TYPES: ReadonlySet = new Set([ + 'compat', 'auto', 'esModule', 'default', - 'defaultOnly', - true, - false + 'defaultOnly' ]); -const getInterop = ( - config: OutputOptions, - inputOptions: NormalizedInputOptions -): NormalizedOutputOptions['interop'] => { +const getInterop = (config: OutputOptions): NormalizedOutputOptions['interop'] => { const configInterop = config.interop; - const validatedInteropTypes = new Set(); const validateInterop = (interop: InteropType): InteropType => { - if (!validatedInteropTypes.has(interop)) { - validatedInteropTypes.add(interop); - if (!ALLOWED_INTEROP_TYPES.has(interop)) { - return error( - errInvalidOption( - 'output.interop', - 'outputinterop', - `use one of ${Array.from(ALLOWED_INTEROP_TYPES, value => JSON.stringify(value)).join( - ', ' - )}`, - interop - ) - ); - } - if (typeof interop === 'boolean') { - warnDeprecation( - { - message: `The boolean value "${interop}" for the "output.interop" option is deprecated. Use ${ - interop ? '"auto"' : '"esModule", "default" or "defaultOnly"' - } instead.`, - url: 'https://rollupjs.org/guide/en/#outputinterop' - }, - true, - inputOptions - ); - } + if (!ALLOWED_INTEROP_TYPES.has(interop)) { + return error( + errInvalidOption( + 'output.interop', + 'outputinterop', + `use one of ${Array.from(ALLOWED_INTEROP_TYPES, value => JSON.stringify(value)).join( + ', ' + )}`, + interop + ) + ); } return interop; }; @@ -437,7 +417,7 @@ const getInterop = ( ? interopPerId[id] : validateInterop((interopPerId[id] = configInterop(id))); } - return configInterop === undefined ? () => true : () => validateInterop(configInterop); + return configInterop === undefined ? () => 'default' : () => validateInterop(configInterop); }; const getManualChunks = ( diff --git a/test/chunking-form/samples/amd-id-auto-base-path-concat/_expected/amd/some/where/main.js b/test/chunking-form/samples/amd-id-auto-base-path-concat/_expected/amd/some/where/main.js index a2493c3bbbb..6aef214406d 100644 --- a/test/chunking-form/samples/amd-id-auto-base-path-concat/_expected/amd/some/where/main.js +++ b/test/chunking-form/samples/amd-id-auto-base-path-concat/_expected/amd/some/where/main.js @@ -6,8 +6,6 @@ define('some/where/main', ['require', 'exports'], (function (require, exports) { exports.getA = getA; - Object.defineProperty(exports, '__esModule', { value: true }); - })); define('some/where/generated-a', ['exports'], (function (exports) { 'use strict'; diff --git a/test/chunking-form/samples/amd-id-auto-base-path-concat/_expected/cjs/some/where/main.js b/test/chunking-form/samples/amd-id-auto-base-path-concat/_expected/cjs/some/where/main.js index 9fb4e75ab81..90dfebf79be 100644 --- a/test/chunking-form/samples/amd-id-auto-base-path-concat/_expected/cjs/some/where/main.js +++ b/test/chunking-form/samples/amd-id-auto-base-path-concat/_expected/cjs/some/where/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - function getA() { return Promise.resolve().then(function () { return require('./generated-a.js'); }); } diff --git a/test/chunking-form/samples/amd-id-auto-base-path/_expected/amd/some/where/main.js b/test/chunking-form/samples/amd-id-auto-base-path/_expected/amd/some/where/main.js index a0da0405f6a..5fa585eca08 100644 --- a/test/chunking-form/samples/amd-id-auto-base-path/_expected/amd/some/where/main.js +++ b/test/chunking-form/samples/amd-id-auto-base-path/_expected/amd/some/where/main.js @@ -6,6 +6,4 @@ define('some/where/main', ['require', 'exports'], (function (require, exports) { exports.getA = getA; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/amd-id-auto-base-path/_expected/cjs/some/where/main.js b/test/chunking-form/samples/amd-id-auto-base-path/_expected/cjs/some/where/main.js index ec865e5ed72..a413360c169 100644 --- a/test/chunking-form/samples/amd-id-auto-base-path/_expected/cjs/some/where/main.js +++ b/test/chunking-form/samples/amd-id-auto-base-path/_expected/cjs/some/where/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - function getA() { return Promise.resolve().then(function () { return require('./chunks/generated-a.js'); }); } diff --git a/test/chunking-form/samples/amd-id-auto/_expected/amd/main.js b/test/chunking-form/samples/amd-id-auto/_expected/amd/main.js index de47e9cc856..c1e974db3cb 100644 --- a/test/chunking-form/samples/amd-id-auto/_expected/amd/main.js +++ b/test/chunking-form/samples/amd-id-auto/_expected/amd/main.js @@ -6,6 +6,4 @@ define('main', ['require', 'exports'], (function (require, exports) { 'use stric exports.getA = getA; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/amd-id-auto/_expected/cjs/main.js b/test/chunking-form/samples/amd-id-auto/_expected/cjs/main.js index 9fb4e75ab81..90dfebf79be 100644 --- a/test/chunking-form/samples/amd-id-auto/_expected/cjs/main.js +++ b/test/chunking-form/samples/amd-id-auto/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - function getA() { return Promise.resolve().then(function () { return require('./generated-a.js'); }); } diff --git a/test/chunking-form/samples/avoid-chunk-import-hoisting/_expected/amd/generated-dep.js b/test/chunking-form/samples/avoid-chunk-import-hoisting/_expected/amd/generated-dep.js index b6226aef1e7..5c17fa81a3c 100644 --- a/test/chunking-form/samples/avoid-chunk-import-hoisting/_expected/amd/generated-dep.js +++ b/test/chunking-form/samples/avoid-chunk-import-hoisting/_expected/amd/generated-dep.js @@ -1,10 +1,6 @@ define(['exports', 'lib'], (function (exports, value) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var value__default = /*#__PURE__*/_interopDefaultLegacy(value); - - var dep = 2 * value__default.default; + var dep = 2 * value; exports.dep = dep; diff --git a/test/chunking-form/samples/avoid-chunk-import-hoisting/_expected/cjs/generated-dep.js b/test/chunking-form/samples/avoid-chunk-import-hoisting/_expected/cjs/generated-dep.js index 21fbde11ec0..be61e76d631 100644 --- a/test/chunking-form/samples/avoid-chunk-import-hoisting/_expected/cjs/generated-dep.js +++ b/test/chunking-form/samples/avoid-chunk-import-hoisting/_expected/cjs/generated-dep.js @@ -2,10 +2,6 @@ var value = require('lib'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -var value__default = /*#__PURE__*/_interopDefaultLegacy(value); - -var dep = 2 * value__default.default; +var dep = 2 * value; exports.dep = dep; diff --git a/test/chunking-form/samples/chunk-export-renaming/_expected/amd/main1.js b/test/chunking-form/samples/chunk-export-renaming/_expected/amd/main1.js index 4d7e54ea184..9bb15a1ac26 100644 --- a/test/chunking-form/samples/chunk-export-renaming/_expected/amd/main1.js +++ b/test/chunking-form/samples/chunk-export-renaming/_expected/amd/main1.js @@ -4,6 +4,4 @@ define(['exports', './generated-one'], (function (exports, one) { 'use strict'; exports.ItemOne = one.One; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/chunk-export-renaming/_expected/amd/main2.js b/test/chunking-form/samples/chunk-export-renaming/_expected/amd/main2.js index cbf9f95648c..7eea3c04e06 100644 --- a/test/chunking-form/samples/chunk-export-renaming/_expected/amd/main2.js +++ b/test/chunking-form/samples/chunk-export-renaming/_expected/amd/main2.js @@ -8,6 +8,4 @@ define(['exports', './generated-one'], (function (exports, one) { 'use strict'; exports.ItemTwo = Two; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/chunk-export-renaming/_expected/cjs/main1.js b/test/chunking-form/samples/chunk-export-renaming/_expected/cjs/main1.js index 357f059b4fd..66df4796b19 100644 --- a/test/chunking-form/samples/chunk-export-renaming/_expected/cjs/main1.js +++ b/test/chunking-form/samples/chunk-export-renaming/_expected/cjs/main1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var one = require('./generated-one.js'); diff --git a/test/chunking-form/samples/chunk-export-renaming/_expected/cjs/main2.js b/test/chunking-form/samples/chunk-export-renaming/_expected/cjs/main2.js index d990bcc5d17..83c41c90a5f 100644 --- a/test/chunking-form/samples/chunk-export-renaming/_expected/cjs/main2.js +++ b/test/chunking-form/samples/chunk-export-renaming/_expected/cjs/main2.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var one = require('./generated-one.js'); class Two { diff --git a/test/chunking-form/samples/chunking-reexport/_expected/amd/main1.js b/test/chunking-form/samples/chunking-reexport/_expected/amd/main1.js index d9d7da1d797..314412599d7 100644 --- a/test/chunking-form/samples/chunking-reexport/_expected/amd/main1.js +++ b/test/chunking-form/samples/chunking-reexport/_expected/amd/main1.js @@ -7,6 +7,4 @@ define(['exports', './generated-dep', 'external'], (function (exports, dep, exte get: function () { return external.asdf; } }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/chunking-reexport/_expected/amd/main2.js b/test/chunking-form/samples/chunking-reexport/_expected/amd/main2.js index d9d7da1d797..314412599d7 100644 --- a/test/chunking-form/samples/chunking-reexport/_expected/amd/main2.js +++ b/test/chunking-form/samples/chunking-reexport/_expected/amd/main2.js @@ -7,6 +7,4 @@ define(['exports', './generated-dep', 'external'], (function (exports, dep, exte get: function () { return external.asdf; } }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/chunking-reexport/_expected/cjs/main1.js b/test/chunking-form/samples/chunking-reexport/_expected/cjs/main1.js index f233286783a..357f61ce300 100644 --- a/test/chunking-form/samples/chunking-reexport/_expected/cjs/main1.js +++ b/test/chunking-form/samples/chunking-reexport/_expected/cjs/main1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - require('./generated-dep.js'); var external = require('external'); diff --git a/test/chunking-form/samples/chunking-reexport/_expected/cjs/main2.js b/test/chunking-form/samples/chunking-reexport/_expected/cjs/main2.js index f233286783a..357f61ce300 100644 --- a/test/chunking-form/samples/chunking-reexport/_expected/cjs/main2.js +++ b/test/chunking-form/samples/chunking-reexport/_expected/cjs/main2.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - require('./generated-dep.js'); var external = require('external'); diff --git a/test/chunking-form/samples/chunking-star-external/_expected/amd/main1.js b/test/chunking-form/samples/chunking-star-external/_expected/amd/main1.js index e34775037dc..956a525cc31 100644 --- a/test/chunking-form/samples/chunking-star-external/_expected/amd/main1.js +++ b/test/chunking-form/samples/chunking-star-external/_expected/amd/main1.js @@ -15,6 +15,4 @@ define(['exports', 'starexternal1', 'external1', './generated-dep', 'starexterna }); }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/chunking-star-external/_expected/amd/main2.js b/test/chunking-form/samples/chunking-star-external/_expected/amd/main2.js index 02a71db9a76..cbb03920d30 100644 --- a/test/chunking-form/samples/chunking-star-external/_expected/amd/main2.js +++ b/test/chunking-form/samples/chunking-star-external/_expected/amd/main2.js @@ -15,6 +15,4 @@ define(['exports', './generated-dep', 'external2', 'starexternal2'], (function ( }); }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/chunking-star-external/_expected/cjs/main1.js b/test/chunking-form/samples/chunking-star-external/_expected/cjs/main1.js index 5513455af97..2bd5eb12d01 100644 --- a/test/chunking-form/samples/chunking-star-external/_expected/cjs/main1.js +++ b/test/chunking-form/samples/chunking-star-external/_expected/cjs/main1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var starexternal1 = require('starexternal1'); var external1 = require('external1'); var dep = require('./generated-dep.js'); diff --git a/test/chunking-form/samples/chunking-star-external/_expected/cjs/main2.js b/test/chunking-form/samples/chunking-star-external/_expected/cjs/main2.js index 49123251978..aa8e50ce9d9 100644 --- a/test/chunking-form/samples/chunking-star-external/_expected/cjs/main2.js +++ b/test/chunking-form/samples/chunking-star-external/_expected/cjs/main2.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var dep = require('./generated-dep.js'); var external2 = require('external2'); var starexternal2 = require('starexternal2'); diff --git a/test/chunking-form/samples/circular-entry-points/_expected/amd/main1.js b/test/chunking-form/samples/circular-entry-points/_expected/amd/main1.js index b6b9f602189..8d0155c964a 100644 --- a/test/chunking-form/samples/circular-entry-points/_expected/amd/main1.js +++ b/test/chunking-form/samples/circular-entry-points/_expected/amd/main1.js @@ -4,6 +4,4 @@ define(['exports', './generated-main1'], (function (exports, main2) { 'use stric exports.p = main2.p$1; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/circular-entry-points/_expected/amd/main2.js b/test/chunking-form/samples/circular-entry-points/_expected/amd/main2.js index 275616cebbd..4d88775c4b9 100644 --- a/test/chunking-form/samples/circular-entry-points/_expected/amd/main2.js +++ b/test/chunking-form/samples/circular-entry-points/_expected/amd/main2.js @@ -4,6 +4,4 @@ define(['exports', './generated-main1'], (function (exports, main2) { 'use stric exports.p = main2.p; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/circular-entry-points/_expected/cjs/main1.js b/test/chunking-form/samples/circular-entry-points/_expected/cjs/main1.js index a5ec2910766..60e2d37cd2d 100644 --- a/test/chunking-form/samples/circular-entry-points/_expected/cjs/main1.js +++ b/test/chunking-form/samples/circular-entry-points/_expected/cjs/main1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var main2 = require('./generated-main1.js'); diff --git a/test/chunking-form/samples/circular-entry-points/_expected/cjs/main2.js b/test/chunking-form/samples/circular-entry-points/_expected/cjs/main2.js index 0b9366cd0e2..51adca0c695 100644 --- a/test/chunking-form/samples/circular-entry-points/_expected/cjs/main2.js +++ b/test/chunking-form/samples/circular-entry-points/_expected/cjs/main2.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var main2 = require('./generated-main1.js'); diff --git a/test/chunking-form/samples/circular-entry-points2/_expected/amd/main1.js b/test/chunking-form/samples/circular-entry-points2/_expected/amd/main1.js index 4e9568a2ef1..dbb53a4ecbc 100644 --- a/test/chunking-form/samples/circular-entry-points2/_expected/amd/main1.js +++ b/test/chunking-form/samples/circular-entry-points2/_expected/amd/main1.js @@ -4,6 +4,4 @@ define(['exports', './main2'], (function (exports, main2) { 'use strict'; exports.p = main2.p2; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/circular-entry-points2/_expected/amd/main2.js b/test/chunking-form/samples/circular-entry-points2/_expected/amd/main2.js index 6cd945aa892..6cbe142452c 100644 --- a/test/chunking-form/samples/circular-entry-points2/_expected/amd/main2.js +++ b/test/chunking-form/samples/circular-entry-points2/_expected/amd/main2.js @@ -23,6 +23,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.p = p$1; exports.p2 = p; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/circular-entry-points2/_expected/cjs/main1.js b/test/chunking-form/samples/circular-entry-points2/_expected/cjs/main1.js index 3e8554d3bd1..1679b725edb 100644 --- a/test/chunking-form/samples/circular-entry-points2/_expected/cjs/main1.js +++ b/test/chunking-form/samples/circular-entry-points2/_expected/cjs/main1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var main2 = require('./main2.js'); diff --git a/test/chunking-form/samples/circular-entry-points2/_expected/cjs/main2.js b/test/chunking-form/samples/circular-entry-points2/_expected/cjs/main2.js index 953be18833a..3b79ebd98ca 100644 --- a/test/chunking-form/samples/circular-entry-points2/_expected/cjs/main2.js +++ b/test/chunking-form/samples/circular-entry-points2/_expected/cjs/main2.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - class C$1 { fn (num) { console.log(num - p); diff --git a/test/chunking-form/samples/circular-entry-points3/_expected/amd/main1.js b/test/chunking-form/samples/circular-entry-points3/_expected/amd/main1.js index b6b9f602189..8d0155c964a 100644 --- a/test/chunking-form/samples/circular-entry-points3/_expected/amd/main1.js +++ b/test/chunking-form/samples/circular-entry-points3/_expected/amd/main1.js @@ -4,6 +4,4 @@ define(['exports', './generated-main1'], (function (exports, main2) { 'use stric exports.p = main2.p$1; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/circular-entry-points3/_expected/amd/main2.js b/test/chunking-form/samples/circular-entry-points3/_expected/amd/main2.js index 1110470d7bd..bfbdfd84014 100644 --- a/test/chunking-form/samples/circular-entry-points3/_expected/amd/main2.js +++ b/test/chunking-form/samples/circular-entry-points3/_expected/amd/main2.js @@ -5,6 +5,4 @@ define(['exports', './generated-main1'], (function (exports, main2) { 'use stric exports.p = main2.p; exports.p2 = main2.p$1; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/circular-entry-points3/_expected/amd/main3.js b/test/chunking-form/samples/circular-entry-points3/_expected/amd/main3.js index 48588553c3f..9cb9dfb1a65 100644 --- a/test/chunking-form/samples/circular-entry-points3/_expected/amd/main3.js +++ b/test/chunking-form/samples/circular-entry-points3/_expected/amd/main3.js @@ -4,6 +4,4 @@ define(['exports', './generated-main1'], (function (exports, main2) { 'use stric exports.C = main2.C; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/circular-entry-points3/_expected/cjs/main1.js b/test/chunking-form/samples/circular-entry-points3/_expected/cjs/main1.js index a5ec2910766..60e2d37cd2d 100644 --- a/test/chunking-form/samples/circular-entry-points3/_expected/cjs/main1.js +++ b/test/chunking-form/samples/circular-entry-points3/_expected/cjs/main1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var main2 = require('./generated-main1.js'); diff --git a/test/chunking-form/samples/circular-entry-points3/_expected/cjs/main2.js b/test/chunking-form/samples/circular-entry-points3/_expected/cjs/main2.js index bc1e103d7c1..61eb5726bae 100644 --- a/test/chunking-form/samples/circular-entry-points3/_expected/cjs/main2.js +++ b/test/chunking-form/samples/circular-entry-points3/_expected/cjs/main2.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var main2 = require('./generated-main1.js'); diff --git a/test/chunking-form/samples/circular-entry-points3/_expected/cjs/main3.js b/test/chunking-form/samples/circular-entry-points3/_expected/cjs/main3.js index e89188ab5e8..79ae2479f2f 100644 --- a/test/chunking-form/samples/circular-entry-points3/_expected/cjs/main3.js +++ b/test/chunking-form/samples/circular-entry-points3/_expected/cjs/main3.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var main2 = require('./generated-main1.js'); diff --git a/test/chunking-form/samples/circular-manual-chunks/_expected/amd/main.js b/test/chunking-form/samples/circular-manual-chunks/_expected/amd/main.js index 19755239562..0fbe5aa7e54 100644 --- a/test/chunking-form/samples/circular-manual-chunks/_expected/amd/main.js +++ b/test/chunking-form/samples/circular-manual-chunks/_expected/amd/main.js @@ -4,6 +4,4 @@ define(['exports', './generated-lib1', './generated-lib2'], (function (exports, exports.lib1 = lib1.lib1; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/circular-manual-chunks/_expected/cjs/main.js b/test/chunking-form/samples/circular-manual-chunks/_expected/cjs/main.js index 8ca369a5e0b..0a949dc0f1c 100644 --- a/test/chunking-form/samples/circular-manual-chunks/_expected/cjs/main.js +++ b/test/chunking-form/samples/circular-manual-chunks/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var lib1 = require('./generated-lib1.js'); require('./generated-lib2.js'); diff --git a/test/chunking-form/samples/deconflict-system-default-export-variable/_expected/amd/other.js b/test/chunking-form/samples/deconflict-system-default-export-variable/_expected/amd/other.js index 20c904832f2..7d812cecd83 100644 --- a/test/chunking-form/samples/deconflict-system-default-export-variable/_expected/amd/other.js +++ b/test/chunking-form/samples/deconflict-system-default-export-variable/_expected/amd/other.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.foo = foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deconflict-system-default-export-variable/_expected/cjs/other.js b/test/chunking-form/samples/deconflict-system-default-export-variable/_expected/cjs/other.js index f2628893cb0..02c04a3e7f9 100644 --- a/test/chunking-form/samples/deconflict-system-default-export-variable/_expected/cjs/other.js +++ b/test/chunking-form/samples/deconflict-system-default-export-variable/_expected/cjs/other.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const foo = 'bar'; exports.foo = foo; diff --git a/test/chunking-form/samples/default-reexport-namespace/_expected/amd/main.js b/test/chunking-form/samples/default-reexport-namespace/_expected/amd/main.js index 40306c8ae42..57c5ace9748 100644 --- a/test/chunking-form/samples/default-reexport-namespace/_expected/amd/main.js +++ b/test/chunking-form/samples/default-reexport-namespace/_expected/amd/main.js @@ -12,6 +12,4 @@ define(['exports', './one'], (function (exports, one) { 'use strict'; exports.Component_one = __component__; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/default-reexport-namespace/_expected/cjs/main.js b/test/chunking-form/samples/default-reexport-namespace/_expected/cjs/main.js index 9333ccc880a..2da32d95433 100644 --- a/test/chunking-form/samples/default-reexport-namespace/_expected/cjs/main.js +++ b/test/chunking-form/samples/default-reexport-namespace/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var one = require('./one.js'); const __icon__ = {}; diff --git a/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/amd/a.js b/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/amd/a.js index 569e0dbc58b..3cffb947ed7 100644 --- a/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/amd/a.js +++ b/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/amd/a.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.a = a; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/amd/b.js b/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/amd/b.js index bc6adf18b83..b24bc116cef 100644 --- a/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/amd/b.js +++ b/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/amd/b.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.b = b; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/amd/one.js b/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/amd/one.js index 3db39871d7d..2c0c07355e0 100644 --- a/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/amd/one.js +++ b/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/amd/one.js @@ -4,6 +4,4 @@ define(['exports', './b'], (function (exports, b) { 'use strict'; exports.d = d; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/cjs/a.js b/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/cjs/a.js index 97007408241..418c69d2577 100644 --- a/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/cjs/a.js +++ b/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/cjs/a.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const a = 1; exports.a = a; diff --git a/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/cjs/b.js b/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/cjs/b.js index 3c417e8458a..f3fc6f22489 100644 --- a/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/cjs/b.js +++ b/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/cjs/b.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const b = 2; exports.b = b; diff --git a/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/cjs/one.js b/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/cjs/one.js index 9eea4c87a9f..98e3a99e3a3 100644 --- a/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/cjs/one.js +++ b/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/cjs/one.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var b = require('./b.js'); const d = b.b + 4; diff --git a/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/amd/main.js b/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/amd/main.js index 19755239562..0fbe5aa7e54 100644 --- a/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/amd/main.js @@ -4,6 +4,4 @@ define(['exports', './generated-lib1', './generated-lib2'], (function (exports, exports.lib1 = lib1.lib1; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/cjs/main.js index 8ca369a5e0b..0a949dc0f1c 100644 --- a/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var lib1 = require('./generated-lib1.js'); require('./generated-lib2.js'); diff --git a/test/chunking-form/samples/deprecated/dynamic-import-comments/_expected/amd/main.js b/test/chunking-form/samples/deprecated/dynamic-import-comments/_expected/amd/main.js index b40d13c4fb0..62b0ebc0898 100644 --- a/test/chunking-form/samples/deprecated/dynamic-import-comments/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/dynamic-import-comments/_expected/amd/main.js @@ -1,7 +1,6 @@ define(['require'], (function (require) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -20,6 +19,6 @@ define(['require'], (function (require) { 'use strict'; new Promise(function (resolve, reject) { require([ /* webpackChunkName: "chunk-name" */ - './foo'/*suffix*/], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }); + './foo'/*suffix*/], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); })); diff --git a/test/chunking-form/samples/deprecated/dynamic-import-comments/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/dynamic-import-comments/_expected/cjs/main.js index 6216ba28435..7d584ac8257 100644 --- a/test/chunking-form/samples/deprecated/dynamic-import-comments/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/dynamic-import-comments/_expected/cjs/main.js @@ -1,7 +1,6 @@ 'use strict'; -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -18,6 +17,6 @@ function _interopNamespace(e) { return Object.freeze(n); } -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require( +Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require( /* webpackChunkName: "chunk-name" */ './foo.js'/*suffix*/)); }); diff --git a/test/chunking-form/samples/deprecated/dynamic-import-inlining-object/_expected/amd/entry.js b/test/chunking-form/samples/deprecated/dynamic-import-inlining-object/_expected/amd/entry.js index ac76d2d7dd1..a7385ad2c1b 100644 --- a/test/chunking-form/samples/deprecated/dynamic-import-inlining-object/_expected/amd/entry.js +++ b/test/chunking-form/samples/deprecated/dynamic-import-inlining-object/_expected/amd/entry.js @@ -12,6 +12,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.bar = bar; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/dynamic-import-inlining-object/_expected/cjs/entry.js b/test/chunking-form/samples/deprecated/dynamic-import-inlining-object/_expected/cjs/entry.js index 188ad126796..e20ce0c5bb8 100644 --- a/test/chunking-form/samples/deprecated/dynamic-import-inlining-object/_expected/cjs/entry.js +++ b/test/chunking-form/samples/deprecated/dynamic-import-inlining-object/_expected/cjs/entry.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const bar = 2; Promise.resolve().then(function () { return foo$1; }); diff --git a/test/chunking-form/samples/deprecated/dynamic-import-name/_expected/amd/main.js b/test/chunking-form/samples/deprecated/dynamic-import-name/_expected/amd/main.js index ed323619e64..28f0faf67ab 100644 --- a/test/chunking-form/samples/deprecated/dynamic-import-name/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/dynamic-import-name/_expected/amd/main.js @@ -1,7 +1,6 @@ define(['require'], (function (require) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -18,6 +17,6 @@ define(['require'], (function (require) { 'use strict'; return Object.freeze(n); } - new Promise(function (resolve, reject) { require(['./foo'], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }).then(result => console.log(result)); + new Promise(function (resolve, reject) { require(['./foo'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }).then(result => console.log(result)); })); diff --git a/test/chunking-form/samples/deprecated/dynamic-import-name/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/dynamic-import-name/_expected/cjs/main.js index c15561377c9..df6892e0d79 100644 --- a/test/chunking-form/samples/deprecated/dynamic-import-name/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/dynamic-import-name/_expected/cjs/main.js @@ -1,7 +1,6 @@ 'use strict'; -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -18,4 +17,4 @@ function _interopNamespace(e) { return Object.freeze(n); } -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('./foo.js')); }).then(result => console.log(result)); +Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('./foo.js')); }).then(result => console.log(result)); diff --git a/test/chunking-form/samples/deprecated/emit-file-chunk-facade/_expected/amd/generated-buildStart.js b/test/chunking-form/samples/deprecated/emit-file-chunk-facade/_expected/amd/generated-buildStart.js index 61abbcd2ed9..ffe42cfb359 100644 --- a/test/chunking-form/samples/deprecated/emit-file-chunk-facade/_expected/amd/generated-buildStart.js +++ b/test/chunking-form/samples/deprecated/emit-file-chunk-facade/_expected/amd/generated-buildStart.js @@ -4,6 +4,4 @@ define(['exports', './generated-build-starter'], (function (exports, buildStarte exports.buildStartValue = buildStarter.value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/emit-file-chunk-facade/_expected/cjs/generated-buildStart.js b/test/chunking-form/samples/deprecated/emit-file-chunk-facade/_expected/cjs/generated-buildStart.js index 66c05cca4ba..7f8a521cd91 100644 --- a/test/chunking-form/samples/deprecated/emit-file-chunk-facade/_expected/cjs/generated-buildStart.js +++ b/test/chunking-form/samples/deprecated/emit-file-chunk-facade/_expected/cjs/generated-buildStart.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var buildStarter = require('./generated-build-starter.js'); diff --git a/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/amd/components/index.js b/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/amd/components/index.js index 25cc1e39f2d..a03efcb5e7a 100644 --- a/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/amd/components/index.js +++ b/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/amd/components/index.js @@ -5,6 +5,4 @@ define(['exports', './sub/index'], (function (exports, index) { 'use strict'; exports.foo = index.foo; exports.baz = baz; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/amd/main.js b/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/amd/main.js index 03a4f176ca1..c17dc35d934 100644 --- a/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/amd/main.js @@ -5,6 +5,4 @@ define(['exports', './components/index', './components/sub/index'], (function (e exports.baz = index.baz; exports.foo = index$1.foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/cjs/components/index.js b/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/cjs/components/index.js index 46429b712ad..c6e74030a5f 100644 --- a/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/cjs/components/index.js +++ b/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/cjs/components/index.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var index = require('./sub/index.js'); const baz = { bar: index.default }; diff --git a/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/cjs/main.js index e8c88da6582..6bcd93609e4 100644 --- a/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var index = require('./components/index.js'); var index$1 = require('./components/sub/index.js'); diff --git a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_config.js b/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_config.js deleted file mode 100644 index a6459df9326..00000000000 --- a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_config.js +++ /dev/null @@ -1,15 +0,0 @@ -module.exports = { - description: - 'allows to configure the interop type per reexported default from an external dependency for boolean values', - options: { - strictDeprecations: false, - input: ['false', 'true'], - external: id => id.startsWith('external'), - output: { - interop(id) { - return JSON.parse(id.split('-')[1]); - } - } - }, - expectedWarnings: ['DEPRECATED_FEATURE'] -}; diff --git a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/amd/false.js b/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/amd/false.js deleted file mode 100644 index fd40147c9a0..00000000000 --- a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/amd/false.js +++ /dev/null @@ -1,7 +0,0 @@ -define(['external-false'], (function (externalFalse) { 'use strict'; - - - - return externalFalse; - -})); diff --git a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/amd/true.js b/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/amd/true.js deleted file mode 100644 index 1ef4c5c9b36..00000000000 --- a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/amd/true.js +++ /dev/null @@ -1,11 +0,0 @@ -define(['external-true'], (function (externalTrue) { 'use strict'; - - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var externalTrue__default = /*#__PURE__*/_interopDefaultLegacy(externalTrue); - - - - return externalTrue__default.default; - -})); diff --git a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/cjs/false.js b/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/cjs/false.js deleted file mode 100644 index 0450ae893d0..00000000000 --- a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/cjs/false.js +++ /dev/null @@ -1,7 +0,0 @@ -'use strict'; - -var externalFalse = require('external-false'); - - - -module.exports = externalFalse; diff --git a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/cjs/true.js b/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/cjs/true.js deleted file mode 100644 index a2348669ff1..00000000000 --- a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/cjs/true.js +++ /dev/null @@ -1,11 +0,0 @@ -'use strict'; - -var externalTrue = require('external-true'); - -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -var externalTrue__default = /*#__PURE__*/_interopDefaultLegacy(externalTrue); - - - -module.exports = externalTrue__default.default; diff --git a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/es/false.js b/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/es/false.js deleted file mode 100644 index f79e708482b..00000000000 --- a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/es/false.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from 'external-false'; diff --git a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/es/true.js b/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/es/true.js deleted file mode 100644 index 1cbae04dc52..00000000000 --- a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/es/true.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from 'external-true'; diff --git a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/system/false.js b/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/system/false.js deleted file mode 100644 index 7c4ad1c9f40..00000000000 --- a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/system/false.js +++ /dev/null @@ -1,13 +0,0 @@ -System.register(['external-false'], (function (exports) { - 'use strict'; - return { - setters: [function (module) { - exports('default', module.default); - }], - execute: (function () { - - - - }) - }; -})); diff --git a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/system/true.js b/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/system/true.js deleted file mode 100644 index 1466f81662a..00000000000 --- a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/system/true.js +++ /dev/null @@ -1,13 +0,0 @@ -System.register(['external-true'], (function (exports) { - 'use strict'; - return { - setters: [function (module) { - exports('default', module.default); - }], - execute: (function () { - - - - }) - }; -})); diff --git a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/false.js b/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/false.js deleted file mode 100644 index f79e708482b..00000000000 --- a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/false.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from 'external-false'; diff --git a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/true.js b/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/true.js deleted file mode 100644 index 1cbae04dc52..00000000000 --- a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/true.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from 'external-true'; diff --git a/test/chunking-form/samples/deprecated/manual-chunk-avoid-facade/_expected/amd/main2.js b/test/chunking-form/samples/deprecated/manual-chunk-avoid-facade/_expected/amd/main2.js index ca9c827728d..0c42189302d 100644 --- a/test/chunking-form/samples/deprecated/manual-chunk-avoid-facade/_expected/amd/main2.js +++ b/test/chunking-form/samples/deprecated/manual-chunk-avoid-facade/_expected/amd/main2.js @@ -6,6 +6,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.reexported = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/manual-chunk-avoid-facade/_expected/cjs/main2.js b/test/chunking-form/samples/deprecated/manual-chunk-avoid-facade/_expected/cjs/main2.js index f7d33362bcc..58617370ca4 100644 --- a/test/chunking-form/samples/deprecated/manual-chunk-avoid-facade/_expected/cjs/main2.js +++ b/test/chunking-form/samples/deprecated/manual-chunk-avoid-facade/_expected/cjs/main2.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const value = 42; console.log('main2', value); diff --git a/test/chunking-form/samples/deprecated/manual-chunk-contains-entry-conflict/_expected/amd/main.js b/test/chunking-form/samples/deprecated/manual-chunk-contains-entry-conflict/_expected/amd/main.js index 9077cbb0e1f..0dce9285fd6 100644 --- a/test/chunking-form/samples/deprecated/manual-chunk-contains-entry-conflict/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/manual-chunk-contains-entry-conflict/_expected/amd/main.js @@ -8,6 +8,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.value = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/manual-chunk-contains-entry-conflict/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/manual-chunk-contains-entry-conflict/_expected/cjs/main.js index 5da9ebd5132..fe59aaab6b9 100644 --- a/test/chunking-form/samples/deprecated/manual-chunk-contains-entry-conflict/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/manual-chunk-contains-entry-conflict/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - console.log('dep'); console.log('main'); diff --git a/test/chunking-form/samples/deprecated/manual-chunk-contains-entry-match/_expected/amd/main.js b/test/chunking-form/samples/deprecated/manual-chunk-contains-entry-match/_expected/amd/main.js index 9077cbb0e1f..0dce9285fd6 100644 --- a/test/chunking-form/samples/deprecated/manual-chunk-contains-entry-match/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/manual-chunk-contains-entry-match/_expected/amd/main.js @@ -8,6 +8,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.value = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/manual-chunk-contains-entry-match/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/manual-chunk-contains-entry-match/_expected/cjs/main.js index 5da9ebd5132..fe59aaab6b9 100644 --- a/test/chunking-form/samples/deprecated/manual-chunk-contains-entry-match/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/manual-chunk-contains-entry-match/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - console.log('dep'); console.log('main'); diff --git a/test/chunking-form/samples/deprecated/manual-chunk-is-entry-conflict/_expected/amd/main.js b/test/chunking-form/samples/deprecated/manual-chunk-is-entry-conflict/_expected/amd/main.js index 9077cbb0e1f..0dce9285fd6 100644 --- a/test/chunking-form/samples/deprecated/manual-chunk-is-entry-conflict/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/manual-chunk-is-entry-conflict/_expected/amd/main.js @@ -8,6 +8,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.value = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/manual-chunk-is-entry-conflict/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/manual-chunk-is-entry-conflict/_expected/cjs/main.js index 5da9ebd5132..fe59aaab6b9 100644 --- a/test/chunking-form/samples/deprecated/manual-chunk-is-entry-conflict/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/manual-chunk-is-entry-conflict/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - console.log('dep'); console.log('main'); diff --git a/test/chunking-form/samples/deprecated/manual-chunk-is-entry-match/_expected/amd/main.js b/test/chunking-form/samples/deprecated/manual-chunk-is-entry-match/_expected/amd/main.js index 9077cbb0e1f..0dce9285fd6 100644 --- a/test/chunking-form/samples/deprecated/manual-chunk-is-entry-match/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/manual-chunk-is-entry-match/_expected/amd/main.js @@ -8,6 +8,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.value = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/manual-chunk-is-entry-match/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/manual-chunk-is-entry-match/_expected/cjs/main.js index 5da9ebd5132..fe59aaab6b9 100644 --- a/test/chunking-form/samples/deprecated/manual-chunk-is-entry-match/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/manual-chunk-is-entry-match/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - console.log('dep'); console.log('main'); diff --git a/test/chunking-form/samples/deprecated/missing-export-reused-deconflicting/_expected/amd/dep1.js b/test/chunking-form/samples/deprecated/missing-export-reused-deconflicting/_expected/amd/dep1.js index 3c213e8b5a6..1ebb9552c37 100644 --- a/test/chunking-form/samples/deprecated/missing-export-reused-deconflicting/_expected/amd/dep1.js +++ b/test/chunking-form/samples/deprecated/missing-export-reused-deconflicting/_expected/amd/dep1.js @@ -14,6 +14,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.missing1 = _missingExportShim; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/missing-export-reused-deconflicting/_expected/amd/dep2.js b/test/chunking-form/samples/deprecated/missing-export-reused-deconflicting/_expected/amd/dep2.js index e22f7bd7c3e..94c9d52cf2c 100644 --- a/test/chunking-form/samples/deprecated/missing-export-reused-deconflicting/_expected/amd/dep2.js +++ b/test/chunking-form/samples/deprecated/missing-export-reused-deconflicting/_expected/amd/dep2.js @@ -11,6 +11,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.missing2 = _missingExportShim; exports.previousShimmedExport = _missingExportShim$1; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/missing-export-reused-deconflicting/_expected/cjs/dep1.js b/test/chunking-form/samples/deprecated/missing-export-reused-deconflicting/_expected/cjs/dep1.js index 58c566f2849..a024bcd6f7f 100644 --- a/test/chunking-form/samples/deprecated/missing-export-reused-deconflicting/_expected/cjs/dep1.js +++ b/test/chunking-form/samples/deprecated/missing-export-reused-deconflicting/_expected/cjs/dep1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var _missingExportShim = void 0; console.log('This is the output when a missing export is used internally but not reexported'); diff --git a/test/chunking-form/samples/deprecated/missing-export-reused-deconflicting/_expected/cjs/dep2.js b/test/chunking-form/samples/deprecated/missing-export-reused-deconflicting/_expected/cjs/dep2.js index 8a01d991453..f411ae56976 100644 --- a/test/chunking-form/samples/deprecated/missing-export-reused-deconflicting/_expected/cjs/dep2.js +++ b/test/chunking-form/samples/deprecated/missing-export-reused-deconflicting/_expected/cjs/dep2.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var _missingExportShim = void 0; console.log('This is the output when a missing export is reexported'); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_expected/amd/named.js b/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_expected/amd/named.js index 1afc6d3f7b8..2896dcf1065 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_expected/amd/named.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_expected/amd/named.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.value = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_expected/cjs/named.js b/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_expected/cjs/named.js index 491f8569447..ec20bc0d7ff 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_expected/cjs/named.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_expected/cjs/named.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const value = 'named'; exports.value = value; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/amd/_virtual/other.js b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/amd/_virtual/other.js index 4ded5921f4d..ab90c1d68e7 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/amd/_virtual/other.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/amd/_virtual/other.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.__exports = other; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/amd/commonjs.js b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/amd/commonjs.js index 65e2726bcbd..a9011e2b81f 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/amd/commonjs.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/amd/commonjs.js @@ -1,10 +1,6 @@ define(['external', './other', './_virtual/other'], (function (require$$0, other$1, other) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0); - - const external = require$$0__default.default; + const external = require$$0; const { value } = other.__exports; console.log(external, value); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/amd/main.js b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/amd/main.js index 0dd74645631..baedd1b3022 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/amd/main.js @@ -1,9 +1,5 @@ define(['./commonjs', 'external'], (function (commonjs, require$$0) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0); - - console.log(commonjs, require$$0__default.default); + console.log(commonjs, require$$0); })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/_virtual/other.js b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/_virtual/other.js index bc3ca602c7c..6569c1d2a46 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/_virtual/other.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/_virtual/other.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var other = {}; exports.__exports = other; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/commonjs.js b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/commonjs.js index 90ae84b17dc..18480b84377 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/commonjs.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/commonjs.js @@ -4,11 +4,7 @@ var require$$0 = require('external'); require('./other.js'); var other = require('./_virtual/other.js'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0); - -const external = require$$0__default.default; +const external = require$$0; const { value } = other.__exports; console.log(external, value); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/main.js index 9d28549cb8b..a38e116467f 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/main.js @@ -3,8 +3,4 @@ var commonjs = require('./commonjs.js'); var require$$0 = require('external'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0); - -console.log(commonjs, require$$0__default.default); +console.log(commonjs, require$$0); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-dynamic-imports/_expected/amd/dynamic-included.js b/test/chunking-form/samples/deprecated/preserve-modules-dynamic-imports/_expected/amd/dynamic-included.js index b32da5f0cc8..19414d6fd6d 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-dynamic-imports/_expected/amd/dynamic-included.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-dynamic-imports/_expected/amd/dynamic-included.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.value = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-dynamic-imports/_expected/cjs/dynamic-included.js b/test/chunking-form/samples/deprecated/preserve-modules-dynamic-imports/_expected/cjs/dynamic-included.js index 2c8d642e303..7ce0b0473fe 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-dynamic-imports/_expected/cjs/dynamic-included.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-dynamic-imports/_expected/cjs/dynamic-included.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const value = 'included'; exports.value = value; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-dynamic-namespace/_expected/amd/m1.js b/test/chunking-form/samples/deprecated/preserve-modules-dynamic-namespace/_expected/amd/m1.js index 1933cc959ba..f5475ebcc07 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-dynamic-namespace/_expected/amd/m1.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-dynamic-namespace/_expected/amd/m1.js @@ -5,6 +5,4 @@ define(['exports', './m2', './m3'], (function (exports, m2, m3) { 'use strict'; exports.m2 = m2; exports.m3 = m3; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-dynamic-namespace/_expected/cjs/m1.js b/test/chunking-form/samples/deprecated/preserve-modules-dynamic-namespace/_expected/cjs/m1.js index 2dcf78656c6..bd9f1e27347 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-dynamic-namespace/_expected/cjs/m1.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-dynamic-namespace/_expected/cjs/m1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var m2 = require('./m2.js'); var m3 = require('./m3.js'); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/amd/dep.js b/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/amd/dep.js index 3c6da13690d..42ccc5f1207 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/amd/dep.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/amd/dep.js @@ -5,6 +5,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.bar = foo; exports.foo = foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/amd/main1.js b/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/amd/main1.js index 6a9c4156910..a9086d328ff 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/amd/main1.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/amd/main1.js @@ -5,6 +5,4 @@ define(['exports', './dep'], (function (exports, dep) { 'use strict'; exports.bar = dep.foo; exports.foo = dep.foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/amd/main2.js b/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/amd/main2.js index 518837a6cba..43cad3604ac 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/amd/main2.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/amd/main2.js @@ -4,6 +4,4 @@ define(['exports', './dep'], (function (exports, dep) { 'use strict'; exports.bar = dep.foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/cjs/dep.js b/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/cjs/dep.js index 7bf4532c451..ce2fd9a6532 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/cjs/dep.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/cjs/dep.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const foo = 1; exports.bar = foo; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/cjs/main1.js b/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/cjs/main1.js index 801c4e75c53..f9483644b72 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/cjs/main1.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/cjs/main1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var dep = require('./dep.js'); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/cjs/main2.js b/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/cjs/main2.js index 1c1f62cd337..68babfaabf9 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/cjs/main2.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/cjs/main2.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var dep = require('./dep.js'); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/main-amd-2ef83a76.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/main-amd-db420a01.js similarity index 80% rename from test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/main-amd-2ef83a76.js rename to test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/main-amd-db420a01.js index ea7055ed7f0..92eec8fa3bb 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/main-amd-2ef83a76.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/main-amd-db420a01.js @@ -7,6 +7,4 @@ define(['exports', './foo-amd-0f9dc16c', './nested/bar-amd-f038b10c', './nested/ exports.baz = baz; exports.noExt = noExt; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/main-cjs-82d6d41f.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/main-cjs-319b4e92.js similarity index 82% rename from test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/main-cjs-82d6d41f.js rename to test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/main-cjs-319b4e92.js index b2e54b9afe2..5feb8352e00 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/main-cjs-82d6d41f.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/main-cjs-319b4e92.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var foo = require('./foo-cjs-0d5774b5.js'); var bar = require('./nested/bar-cjs-abedc91d.js'); var baz = require('./nested/baz-cjs-4a9c02fc.js'); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/amd/named.js b/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/amd/named.js index 1afc6d3f7b8..2896dcf1065 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/amd/named.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/amd/named.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.value = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/cjs/named.js b/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/cjs/named.js index 491f8569447..ec20bc0d7ff 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/cjs/named.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/cjs/named.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const value = 'named'; exports.value = value; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/amd/main.js b/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/amd/main.js index 7b07b87a9e6..0a1b6a12cba 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/amd/main.js @@ -5,6 +5,4 @@ define(['exports', './module-a/v1/index', './module-b/v1/index'], (function (exp exports.ModuleA_V1 = index; exports.ModuleB_V1 = index$1; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/amd/module-a/v1/index.js b/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/amd/module-a/v1/index.js index 315abd02795..6b677084b74 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/amd/module-a/v1/index.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/amd/module-a/v1/index.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.TEST_MODULE_A = TEST_MODULE_A; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/amd/module-b/v1/index.js b/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/amd/module-b/v1/index.js index dfd4f52cf95..5d1b35b6a7e 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/amd/module-b/v1/index.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/amd/module-b/v1/index.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.TEST_MODULE_B = TEST_MODULE_B; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/cjs/main.js index 632ce47b9ae..85ed071a23c 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var index = require('./module-a/v1/index.js'); var index$1 = require('./module-b/v1/index.js'); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/cjs/module-a/v1/index.js b/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/cjs/module-a/v1/index.js index a8ab4802133..6f57cdac859 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/cjs/module-a/v1/index.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/cjs/module-a/v1/index.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const TEST_MODULE_A = 'A'; exports.TEST_MODULE_A = TEST_MODULE_A; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/cjs/module-b/v1/index.js b/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/cjs/module-b/v1/index.js index 2c2b23c7d63..99cce36ed4d 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/cjs/module-b/v1/index.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/cjs/module-b/v1/index.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const TEST_MODULE_B = 'A'; exports.TEST_MODULE_B = TEST_MODULE_B; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-nested-export/_expected/amd/inner/more_inner/something.js b/test/chunking-form/samples/deprecated/preserve-modules-nested-export/_expected/amd/inner/more_inner/something.js index 8f479d12f01..9e690e2c1a8 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-nested-export/_expected/amd/inner/more_inner/something.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-nested-export/_expected/amd/inner/more_inner/something.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.Something = Something; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-nested-export/_expected/amd/main.js b/test/chunking-form/samples/deprecated/preserve-modules-nested-export/_expected/amd/main.js index 48856b23109..8519607224b 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-nested-export/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-nested-export/_expected/amd/main.js @@ -4,6 +4,4 @@ define(['exports', './inner/more_inner/something', './inner/some_effect'], (func exports.Something = something.Something; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-nested-export/_expected/cjs/inner/more_inner/something.js b/test/chunking-form/samples/deprecated/preserve-modules-nested-export/_expected/cjs/inner/more_inner/something.js index 32f3040b7c0..12aa3ba79a7 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-nested-export/_expected/cjs/inner/more_inner/something.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-nested-export/_expected/cjs/inner/more_inner/something.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const Something = 'Hello World'; exports.Something = Something; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-nested-export/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/preserve-modules-nested-export/_expected/cjs/main.js index ffa1d0bc5bb..affdcc85a46 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-nested-export/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-nested-export/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var something = require('./inner/more_inner/something.js'); require('./inner/some_effect.js'); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/amd/main.js b/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/amd/main.js index f3229946c06..b58d356d5af 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/amd/main.js @@ -1,10 +1,6 @@ define(['external'], (function (path) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var path__default = /*#__PURE__*/_interopDefaultLegacy(path); - - console.log(path__default.default.normalize('foo\\bar')); - console.log(path__default.default.normalize('foo\\bar')); + console.log(path.normalize('foo\\bar')); + console.log(path.normalize('foo\\bar')); })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/amd/proxy.js b/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/amd/proxy.js index 9f25625718f..40b6b7b8b15 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/amd/proxy.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/amd/proxy.js @@ -1,11 +1,7 @@ define(['external'], (function (path) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - var path__default = /*#__PURE__*/_interopDefaultLegacy(path); - - - return path__default.default; + return path; })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/cjs/main.js index 7072d29b676..7db07e7274a 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/cjs/main.js @@ -2,9 +2,5 @@ var path = require('external'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -var path__default = /*#__PURE__*/_interopDefaultLegacy(path); - -console.log(path__default.default.normalize('foo\\bar')); -console.log(path__default.default.normalize('foo\\bar')); +console.log(path.normalize('foo\\bar')); +console.log(path.normalize('foo\\bar')); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/cjs/proxy.js b/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/cjs/proxy.js index 4696b104731..de6089fad1b 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/cjs/proxy.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/cjs/proxy.js @@ -2,10 +2,6 @@ var path = require('external'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } -var path__default = /*#__PURE__*/_interopDefaultLegacy(path); - - -module.exports = path__default.default; +module.exports = path; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-reaching-outside/_expected/amd/dep.js b/test/chunking-form/samples/deprecated/preserve-modules-reaching-outside/_expected/amd/dep.js index 075d3efdd11..e919531b930 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-reaching-outside/_expected/amd/dep.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-reaching-outside/_expected/amd/dep.js @@ -6,6 +6,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.fn = fn; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-reaching-outside/_expected/cjs/dep.js b/test/chunking-form/samples/deprecated/preserve-modules-reaching-outside/_expected/cjs/dep.js index b67a1e41d97..119bca3ddc7 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-reaching-outside/_expected/cjs/dep.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-reaching-outside/_expected/cjs/dep.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - function fn () { console.log('dep fn'); } diff --git a/test/chunking-form/samples/deprecated/preserve-modules-scriptified-assets/_expected/amd/main.js b/test/chunking-form/samples/deprecated/preserve-modules-scriptified-assets/_expected/amd/main.js index 75f282a2bc1..11b93e1cea6 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-scriptified-assets/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-scriptified-assets/_expected/amd/main.js @@ -6,6 +6,4 @@ define(['exports', './answer.num', './lorem.str', './no-ext'], (function (export exports.lorem = lorem; exports.noExt = noExt; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-scriptified-assets/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/preserve-modules-scriptified-assets/_expected/cjs/main.js index 0c13700934e..463a11a27e6 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-scriptified-assets/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-scriptified-assets/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var answer = require('./answer.num.js'); var lorem = require('./lorem.str.js'); var noExt = require('./no-ext.js'); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/amd/_virtual/_virtualModule.js b/test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/amd/_virtual/_virtualModule.js index ce212753ac0..dc4e209f365 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/amd/_virtual/_virtualModule.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/amd/_virtual/_virtualModule.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.virtual = virtual; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/cjs/_virtual/_virtualModule.js b/test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/cjs/_virtual/_virtualModule.js index 3b40ebf67c2..266f8b02432 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/cjs/_virtual/_virtualModule.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/cjs/_virtual/_virtualModule.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const virtual = "Virtual!"; exports.virtual = virtual; diff --git a/test/chunking-form/samples/deprecated/preserve-modules/_expected/amd/deps/dep1.js b/test/chunking-form/samples/deprecated/preserve-modules/_expected/amd/deps/dep1.js index 9e70a0993ae..59783d02d35 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules/_expected/amd/deps/dep1.js +++ b/test/chunking-form/samples/deprecated/preserve-modules/_expected/amd/deps/dep1.js @@ -6,6 +6,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.fn = fn; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules/_expected/amd/deps/dep2.js b/test/chunking-form/samples/deprecated/preserve-modules/_expected/amd/deps/dep2.js index adf251cb993..2ab2557abf3 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules/_expected/amd/deps/dep2.js +++ b/test/chunking-form/samples/deprecated/preserve-modules/_expected/amd/deps/dep2.js @@ -7,6 +7,4 @@ define(['exports', '../lib/lib2'], (function (exports, lib2) { 'use strict'; exports.fn = fn; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules/_expected/amd/deps/dep3.js b/test/chunking-form/samples/deprecated/preserve-modules/_expected/amd/deps/dep3.js index 5e20b792948..3b871ce769d 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules/_expected/amd/deps/dep3.js +++ b/test/chunking-form/samples/deprecated/preserve-modules/_expected/amd/deps/dep3.js @@ -7,6 +7,4 @@ define(['exports', '../lib/lib1'], (function (exports, lib1) { 'use strict'; exports.fn = fn; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules/_expected/amd/lib/lib1.js b/test/chunking-form/samples/deprecated/preserve-modules/_expected/amd/lib/lib1.js index aa9fbe18f60..6d846653cf3 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules/_expected/amd/lib/lib1.js +++ b/test/chunking-form/samples/deprecated/preserve-modules/_expected/amd/lib/lib1.js @@ -6,6 +6,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.fn = fn; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules/_expected/amd/lib/lib2.js b/test/chunking-form/samples/deprecated/preserve-modules/_expected/amd/lib/lib2.js index d05a867696b..be6d55fa49d 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules/_expected/amd/lib/lib2.js +++ b/test/chunking-form/samples/deprecated/preserve-modules/_expected/amd/lib/lib2.js @@ -6,6 +6,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.fn = fn; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules/_expected/cjs/deps/dep1.js b/test/chunking-form/samples/deprecated/preserve-modules/_expected/cjs/deps/dep1.js index 94bfa086430..5d2f022faa9 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules/_expected/cjs/deps/dep1.js +++ b/test/chunking-form/samples/deprecated/preserve-modules/_expected/cjs/deps/dep1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - function fn () { console.log('dep1 fn'); } diff --git a/test/chunking-form/samples/deprecated/preserve-modules/_expected/cjs/deps/dep2.js b/test/chunking-form/samples/deprecated/preserve-modules/_expected/cjs/deps/dep2.js index a9f8fb62635..1c35a7c280c 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules/_expected/cjs/deps/dep2.js +++ b/test/chunking-form/samples/deprecated/preserve-modules/_expected/cjs/deps/dep2.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var lib2 = require('../lib/lib2.js'); function fn () { diff --git a/test/chunking-form/samples/deprecated/preserve-modules/_expected/cjs/deps/dep3.js b/test/chunking-form/samples/deprecated/preserve-modules/_expected/cjs/deps/dep3.js index eb901c61adc..9459cf55dea 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules/_expected/cjs/deps/dep3.js +++ b/test/chunking-form/samples/deprecated/preserve-modules/_expected/cjs/deps/dep3.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var lib1 = require('../lib/lib1.js'); function fn () { diff --git a/test/chunking-form/samples/deprecated/preserve-modules/_expected/cjs/lib/lib1.js b/test/chunking-form/samples/deprecated/preserve-modules/_expected/cjs/lib/lib1.js index 135c3023fcc..6a9d99129d3 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules/_expected/cjs/lib/lib1.js +++ b/test/chunking-form/samples/deprecated/preserve-modules/_expected/cjs/lib/lib1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - function fn () { console.log('lib1 fn'); } diff --git a/test/chunking-form/samples/deprecated/preserve-modules/_expected/cjs/lib/lib2.js b/test/chunking-form/samples/deprecated/preserve-modules/_expected/cjs/lib/lib2.js index ee3ad249352..cf6e36b03dd 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules/_expected/cjs/lib/lib2.js +++ b/test/chunking-form/samples/deprecated/preserve-modules/_expected/cjs/lib/lib2.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - function fn () { console.log('lib2 fn'); } diff --git a/test/chunking-form/samples/dynamic-import-dynamic/_expected/amd/main.js b/test/chunking-form/samples/dynamic-import-dynamic/_expected/amd/main.js index 84122f3a1f2..a04b21a401f 100644 --- a/test/chunking-form/samples/dynamic-import-dynamic/_expected/amd/main.js +++ b/test/chunking-form/samples/dynamic-import-dynamic/_expected/amd/main.js @@ -1,7 +1,6 @@ define(['require'], (function (require) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -20,6 +19,6 @@ define(['require'], (function (require) { 'use strict'; var dep = 'dep'; - (function (t) { return new Promise(function (resolve, reject) { require([t], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }); })(dep); + (function (t) { return new Promise(function (resolve, reject) { require([t], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); })(dep); })); diff --git a/test/chunking-form/samples/dynamic-import-dynamic/_expected/cjs/main.js b/test/chunking-form/samples/dynamic-import-dynamic/_expected/cjs/main.js index a0c08a47bcc..21521560d39 100644 --- a/test/chunking-form/samples/dynamic-import-dynamic/_expected/cjs/main.js +++ b/test/chunking-form/samples/dynamic-import-dynamic/_expected/cjs/main.js @@ -1,7 +1,6 @@ 'use strict'; -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -20,4 +19,4 @@ function _interopNamespace(e) { var dep = 'dep'; -(function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(t)); }); })(dep); +(function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require(t)); }); })(dep); diff --git a/test/chunking-form/samples/dynamic-import-external/_expected/amd/main.js b/test/chunking-form/samples/dynamic-import-external/_expected/amd/main.js index d667b2de221..e28d7b1e460 100644 --- a/test/chunking-form/samples/dynamic-import-external/_expected/amd/main.js +++ b/test/chunking-form/samples/dynamic-import-external/_expected/amd/main.js @@ -1,7 +1,6 @@ define(['require'], (function (require) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -18,6 +17,6 @@ define(['require'], (function (require) { 'use strict'; return Object.freeze(n); } - new Promise(function (resolve, reject) { require(['./foo'], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }); + new Promise(function (resolve, reject) { require(['./foo'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); })); diff --git a/test/chunking-form/samples/dynamic-import-external/_expected/cjs/main.js b/test/chunking-form/samples/dynamic-import-external/_expected/cjs/main.js index 485758ed548..e2a92e81f32 100644 --- a/test/chunking-form/samples/dynamic-import-external/_expected/cjs/main.js +++ b/test/chunking-form/samples/dynamic-import-external/_expected/cjs/main.js @@ -1,7 +1,6 @@ 'use strict'; -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -18,4 +17,4 @@ function _interopNamespace(e) { return Object.freeze(n); } -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('./foo.js')); }); +Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('./foo.js')); }); diff --git a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/amd/main1.js b/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/amd/main1.js index 4af76516b89..0ca64ff90de 100644 --- a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/amd/main1.js +++ b/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/amd/main1.js @@ -16,6 +16,4 @@ define(['require', 'exports', './generated-separate'], (function (require, expor exports.inlined = inlined; exports.separate = separate; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/amd/main2.js b/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/amd/main2.js index 1849d957060..d75901a1ce6 100644 --- a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/amd/main2.js +++ b/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/amd/main2.js @@ -4,6 +4,4 @@ define(['require', 'exports'], (function (require, exports) { 'use strict'; exports.separate = separate; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/cjs/main1.js b/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/cjs/main1.js index 61ce73abd7f..29a1c11edd3 100644 --- a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/cjs/main1.js +++ b/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/cjs/main1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - require('./generated-separate.js'); var inlined$1 = 'inlined'; diff --git a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/cjs/main2.js b/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/cjs/main2.js index 0978a48dcc1..dc5b3882f18 100644 --- a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/cjs/main2.js +++ b/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/cjs/main2.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const separate = Promise.resolve().then(function () { return require('./generated-separate.js'); }); exports.separate = separate; diff --git a/test/chunking-form/samples/dynamic-import-inlining-object/_expected/amd/entry.js b/test/chunking-form/samples/dynamic-import-inlining-object/_expected/amd/entry.js index ac76d2d7dd1..a7385ad2c1b 100644 --- a/test/chunking-form/samples/dynamic-import-inlining-object/_expected/amd/entry.js +++ b/test/chunking-form/samples/dynamic-import-inlining-object/_expected/amd/entry.js @@ -12,6 +12,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.bar = bar; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/dynamic-import-inlining-object/_expected/cjs/entry.js b/test/chunking-form/samples/dynamic-import-inlining-object/_expected/cjs/entry.js index 188ad126796..e20ce0c5bb8 100644 --- a/test/chunking-form/samples/dynamic-import-inlining-object/_expected/cjs/entry.js +++ b/test/chunking-form/samples/dynamic-import-inlining-object/_expected/cjs/entry.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const bar = 2; Promise.resolve().then(function () { return foo$1; }); diff --git a/test/chunking-form/samples/dynamic-import/_expected/amd/main.js b/test/chunking-form/samples/dynamic-import/_expected/amd/main.js index b242019a378..cfede414f1c 100644 --- a/test/chunking-form/samples/dynamic-import/_expected/amd/main.js +++ b/test/chunking-form/samples/dynamic-import/_expected/amd/main.js @@ -4,6 +4,4 @@ define(['exports', './chunks/main'], (function (exports, main) { 'use strict'; exports.promise = main.promise; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/dynamic-import/_expected/cjs/main.js b/test/chunking-form/samples/dynamic-import/_expected/cjs/main.js index 4f5cbe2bc72..382cd3044e4 100644 --- a/test/chunking-form/samples/dynamic-import/_expected/cjs/main.js +++ b/test/chunking-form/samples/dynamic-import/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var main = require('./chunks/main.js'); diff --git a/test/chunking-form/samples/dynamically-import-facaded-entry/_expected/amd/main.js b/test/chunking-form/samples/dynamically-import-facaded-entry/_expected/amd/main.js index 6b03c36fd41..def925166fc 100644 --- a/test/chunking-form/samples/dynamically-import-facaded-entry/_expected/amd/main.js +++ b/test/chunking-form/samples/dynamically-import-facaded-entry/_expected/amd/main.js @@ -4,6 +4,4 @@ define(['exports', './generated-main'], (function (exports, main) { 'use strict' exports.promise = main.promise; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/dynamically-import-facaded-entry/_expected/cjs/main.js b/test/chunking-form/samples/dynamically-import-facaded-entry/_expected/cjs/main.js index 200a21c5ca7..67dac3123bc 100644 --- a/test/chunking-form/samples/dynamically-import-facaded-entry/_expected/cjs/main.js +++ b/test/chunking-form/samples/dynamically-import-facaded-entry/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var main = require('./generated-main.js'); diff --git a/test/chunking-form/samples/dynamically-import-non-preserved-entry/_expected/amd/main.js b/test/chunking-form/samples/dynamically-import-non-preserved-entry/_expected/amd/main.js index 85d87cb9a1a..640a1a11a0d 100644 --- a/test/chunking-form/samples/dynamically-import-non-preserved-entry/_expected/amd/main.js +++ b/test/chunking-form/samples/dynamically-import-non-preserved-entry/_expected/amd/main.js @@ -12,6 +12,4 @@ define(['require', 'exports'], (function (require, exports) { 'use strict'; exports.main = main; exports.value = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/dynamically-import-non-preserved-entry/_expected/cjs/main.js b/test/chunking-form/samples/dynamically-import-non-preserved-entry/_expected/cjs/main.js index 47b69e30cb8..dd3b86b6851 100644 --- a/test/chunking-form/samples/dynamically-import-non-preserved-entry/_expected/cjs/main.js +++ b/test/chunking-form/samples/dynamically-import-non-preserved-entry/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var value = 42; const promise = Promise.resolve().then(function () { return require('./generated-dynamic.js'); }).then(result => console.log('main', result, value)); diff --git a/test/chunking-form/samples/dynamically-import-tainted-entry/_expected/amd/main.js b/test/chunking-form/samples/dynamically-import-tainted-entry/_expected/amd/main.js index f1407e820a4..1f52e8ff64c 100644 --- a/test/chunking-form/samples/dynamically-import-tainted-entry/_expected/amd/main.js +++ b/test/chunking-form/samples/dynamically-import-tainted-entry/_expected/amd/main.js @@ -13,6 +13,4 @@ define(['require', 'exports'], (function (require, exports) { 'use strict'; exports.promise = promise; exports.value = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/dynamically-import-tainted-entry/_expected/cjs/main.js b/test/chunking-form/samples/dynamically-import-tainted-entry/_expected/cjs/main.js index 703b184ddd1..17d46d28972 100644 --- a/test/chunking-form/samples/dynamically-import-tainted-entry/_expected/cjs/main.js +++ b/test/chunking-form/samples/dynamically-import-tainted-entry/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var value = 42; const promise = Promise.resolve().then(function () { return require('./generated-dynamic.js'); }).then(result => console.log('main', result, value)); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/amd/generated-buildStart.js b/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/amd/generated-buildStart.js index 61abbcd2ed9..ffe42cfb359 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/amd/generated-buildStart.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/amd/generated-buildStart.js @@ -4,6 +4,4 @@ define(['exports', './generated-build-starter'], (function (exports, buildStarte exports.buildStartValue = buildStarter.value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/cjs/generated-buildStart.js b/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/cjs/generated-buildStart.js index 66c05cca4ba..7f8a521cd91 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/cjs/generated-buildStart.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/cjs/generated-buildStart.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var buildStarter = require('./generated-build-starter.js'); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/amd/custom/build-start-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/amd/custom/build-start-chunk.js index 2c62b003b26..7c5d4d08bf9 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/amd/custom/build-start-chunk.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/amd/custom/build-start-chunk.js @@ -4,6 +4,4 @@ define(['exports', '../generated-buildStart'], (function (exports, buildStart) { exports.id = buildStart.id; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/cjs/custom/build-start-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/cjs/custom/build-start-chunk.js index 6aaa72e953f..325b51890ce 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/cjs/custom/build-start-chunk.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/cjs/custom/build-start-chunk.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var buildStart = require('../generated-buildStart.js'); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/amd/generated-emitted2.js b/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/amd/generated-emitted2.js index 223116a8054..4dd558a916d 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/amd/generated-emitted2.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/amd/generated-emitted2.js @@ -4,6 +4,4 @@ define(['exports', './generated-emitted'], (function (exports, emitted) { 'use s exports.id = emitted.id; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/cjs/generated-emitted2.js b/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/cjs/generated-emitted2.js index cea7e87b55c..8fcbdb1da0a 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/cjs/generated-emitted2.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/cjs/generated-emitted2.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var emitted = require('./generated-emitted.js'); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/amd/generated-emitted2.js b/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/amd/generated-emitted2.js index 223116a8054..4dd558a916d 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/amd/generated-emitted2.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/amd/generated-emitted2.js @@ -4,6 +4,4 @@ define(['exports', './generated-emitted'], (function (exports, emitted) { 'use s exports.id = emitted.id; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/cjs/generated-emitted2.js b/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/cjs/generated-emitted2.js index cea7e87b55c..8fcbdb1da0a 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/cjs/generated-emitted2.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/cjs/generated-emitted2.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var emitted = require('./generated-emitted.js'); diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/main.js b/test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/main.js index 72858888136..2c569ebaf8a 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/main.js @@ -1,7 +1,6 @@ define(['require', './generated-dep'], (function (require, dep) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -18,7 +17,7 @@ define(['require', './generated-dep'], (function (require, dep) { 'use strict'; return Object.freeze(n); } - new Promise(function (resolve, reject) { require(['./ext\'ernal'], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }); + new Promise(function (resolve, reject) { require(['./ext\'ernal'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); console.log('main', dep.value); diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/main.js b/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/main.js index de27507bbed..97a11cdece2 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/main.js @@ -2,8 +2,7 @@ var dep = require('./generated-dep.js'); -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -20,6 +19,6 @@ function _interopNamespace(e) { return Object.freeze(n); } -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('./ext\'ernal')); }); +Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('./ext\'ernal')); }); console.log('main', dep.value); diff --git a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/amd/explicit-name1.js b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/amd/explicit-name1.js index f21572ce121..d6a2055d06e 100644 --- a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/amd/explicit-name1.js +++ b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/amd/explicit-name1.js @@ -4,6 +4,4 @@ define(['exports', './mainChunk'], (function (exports, mainChunk) { 'use strict' exports.value = mainChunk.value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/amd/explicit-name2.js b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/amd/explicit-name2.js index f21572ce121..d6a2055d06e 100644 --- a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/amd/explicit-name2.js +++ b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/amd/explicit-name2.js @@ -4,6 +4,4 @@ define(['exports', './mainChunk'], (function (exports, mainChunk) { 'use strict' exports.value = mainChunk.value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/amd/mainChunk.js b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/amd/mainChunk.js index 106eba6b3f5..947ad1cbafd 100644 --- a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/amd/mainChunk.js +++ b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/amd/mainChunk.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.value = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/amd/mainChunkFacade.js b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/amd/mainChunkFacade.js index f21572ce121..d6a2055d06e 100644 --- a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/amd/mainChunkFacade.js +++ b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/amd/mainChunkFacade.js @@ -4,6 +4,4 @@ define(['exports', './mainChunk'], (function (exports, mainChunk) { 'use strict' exports.value = mainChunk.value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/cjs/explicit-name1.js b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/cjs/explicit-name1.js index 4353ca57beb..2c1766ca185 100644 --- a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/cjs/explicit-name1.js +++ b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/cjs/explicit-name1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var mainChunk = require('./mainChunk.js'); diff --git a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/cjs/explicit-name2.js b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/cjs/explicit-name2.js index 4353ca57beb..2c1766ca185 100644 --- a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/cjs/explicit-name2.js +++ b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/cjs/explicit-name2.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var mainChunk = require('./mainChunk.js'); diff --git a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/cjs/mainChunk.js b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/cjs/mainChunk.js index 181fa0fd711..9549eb32880 100644 --- a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/cjs/mainChunk.js +++ b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/cjs/mainChunk.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const value = 42; exports.value = value; diff --git a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/cjs/mainChunkFacade.js b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/cjs/mainChunkFacade.js index 4353ca57beb..2c1766ca185 100644 --- a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/cjs/mainChunkFacade.js +++ b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/cjs/mainChunkFacade.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var mainChunk = require('./mainChunk.js'); diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/amd/main.js b/test/chunking-form/samples/emit-file/reference-files/_expected/amd/main.js index 91b63f05a04..e5681989434 100644 --- a/test/chunking-form/samples/emit-file/reference-files/_expected/amd/main.js +++ b/test/chunking-form/samples/emit-file/reference-files/_expected/amd/main.js @@ -16,6 +16,4 @@ define(['require', 'exports'], (function (require, exports) { 'use strict'; exports.showImage = showImage; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/main.js b/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/main.js index 8b80ca97386..7b1418ccbc7 100644 --- a/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/main.js +++ b/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var logo = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/logo1-60bc15c4.svg').href : new URL('assets/logo1-60bc15c4.svg', document.currentScript && document.currentScript.src || document.baseURI).href); function showImage(url) { diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/main.js b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/main.js index 431afc714b9..ea3be902633 100644 --- a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/main.js +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/main.js @@ -20,6 +20,4 @@ define(['require', 'exports'], (function (require, exports) { 'use strict'; exports.renderStartNamed = renderStartNamed; exports.renderStartNamedImmediately = renderStartNamedImmediately; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/main.js b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/main.js index bd63ea33c1f..0ee875dbfdd 100644 --- a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/main.js +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const renderStart = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/renderStart-981aa2ea.txt').href : new URL('assets/renderStart-981aa2ea.txt', document.currentScript && document.currentScript.src || document.baseURI).href); const renderStartNamed = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/renderStart.txt').href : new URL('renderStart.txt', document.currentScript && document.currentScript.src || document.baseURI).href); const renderStartNamedImmediately = 'renderStart.txt'; diff --git a/test/chunking-form/samples/entry-aliases/_expected/amd/main1-alias.js b/test/chunking-form/samples/entry-aliases/_expected/amd/main1-alias.js index 14f85073f84..8971d94bc68 100644 --- a/test/chunking-form/samples/entry-aliases/_expected/amd/main1-alias.js +++ b/test/chunking-form/samples/entry-aliases/_expected/amd/main1-alias.js @@ -4,6 +4,4 @@ define(['exports', './generated-dep'], (function (exports, dep) { 'use strict'; exports.name = dep.name; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/entry-aliases/_expected/amd/main1.js b/test/chunking-form/samples/entry-aliases/_expected/amd/main1.js index 14f85073f84..8971d94bc68 100644 --- a/test/chunking-form/samples/entry-aliases/_expected/amd/main1.js +++ b/test/chunking-form/samples/entry-aliases/_expected/amd/main1.js @@ -4,6 +4,4 @@ define(['exports', './generated-dep'], (function (exports, dep) { 'use strict'; exports.name = dep.name; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/entry-aliases/_expected/cjs/main1-alias.js b/test/chunking-form/samples/entry-aliases/_expected/cjs/main1-alias.js index 50083991d6f..1fc5317171f 100644 --- a/test/chunking-form/samples/entry-aliases/_expected/cjs/main1-alias.js +++ b/test/chunking-form/samples/entry-aliases/_expected/cjs/main1-alias.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var dep = require('./generated-dep.js'); diff --git a/test/chunking-form/samples/entry-aliases/_expected/cjs/main1.js b/test/chunking-form/samples/entry-aliases/_expected/cjs/main1.js index 50083991d6f..1fc5317171f 100644 --- a/test/chunking-form/samples/entry-aliases/_expected/cjs/main1.js +++ b/test/chunking-form/samples/entry-aliases/_expected/cjs/main1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var dep = require('./generated-dep.js'); diff --git a/test/chunking-form/samples/entry-point-without-own-code/_expected/amd/m1.js b/test/chunking-form/samples/entry-point-without-own-code/_expected/amd/m1.js index 1d023d3bc04..f28945e1828 100644 --- a/test/chunking-form/samples/entry-point-without-own-code/_expected/amd/m1.js +++ b/test/chunking-form/samples/entry-point-without-own-code/_expected/amd/m1.js @@ -4,6 +4,4 @@ define(['exports', './m2'], (function (exports, m2) { 'use strict'; exports.m2 = m2; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/entry-point-without-own-code/_expected/cjs/m1.js b/test/chunking-form/samples/entry-point-without-own-code/_expected/cjs/m1.js index f1de24e56e2..5c65692eec7 100644 --- a/test/chunking-form/samples/entry-point-without-own-code/_expected/cjs/m1.js +++ b/test/chunking-form/samples/entry-point-without-own-code/_expected/cjs/m1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var m2 = require('./m2.js'); diff --git a/test/chunking-form/samples/export-default-from-entry/_expected/amd/main.js b/test/chunking-form/samples/export-default-from-entry/_expected/amd/main.js index c2aa7ff9acc..ae54c23e6a2 100644 --- a/test/chunking-form/samples/export-default-from-entry/_expected/amd/main.js +++ b/test/chunking-form/samples/export-default-from-entry/_expected/amd/main.js @@ -4,6 +4,4 @@ define(['exports', './dep'], (function (exports, dep) { 'use strict'; exports.value = dep; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/export-default-from-entry/_expected/cjs/main.js b/test/chunking-form/samples/export-default-from-entry/_expected/cjs/main.js index d5b48cc5a0a..e855a76e250 100644 --- a/test/chunking-form/samples/export-default-from-entry/_expected/cjs/main.js +++ b/test/chunking-form/samples/export-default-from-entry/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var dep = require('./dep.js'); diff --git a/test/chunking-form/samples/external-imports/_config.js b/test/chunking-form/samples/external-imports/_config.js index faff03e56ea..1270c73478a 100644 --- a/test/chunking-form/samples/external-imports/_config.js +++ b/test/chunking-form/samples/external-imports/_config.js @@ -2,6 +2,7 @@ module.exports = { description: 'uses correct interop per chunk when importing from external modules', options: { external: module => module.includes('external'), - input: ['main-default.js', 'main-named.js', 'main-namespace'] + input: ['main-default.js', 'main-named.js', 'main-namespace'], + output: { interop: 'compat' } } }; diff --git a/test/chunking-form/samples/external-imports/_expected/amd/main-default.js b/test/chunking-form/samples/external-imports/_expected/amd/main-default.js index 7e19565f96a..0465dafdcfe 100644 --- a/test/chunking-form/samples/external-imports/_expected/amd/main-default.js +++ b/test/chunking-form/samples/external-imports/_expected/amd/main-default.js @@ -1,11 +1,11 @@ define(['external-all', 'external-default', 'external-default-named', 'external-default-namespace'], (function (foo, bar, baz, quux) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } + function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); - var bar__default = /*#__PURE__*/_interopDefaultLegacy(bar); - var baz__default = /*#__PURE__*/_interopDefaultLegacy(baz); - var quux__default = /*#__PURE__*/_interopDefaultLegacy(quux); + var foo__default = /*#__PURE__*/_interopDefaultCompat(foo); + var bar__default = /*#__PURE__*/_interopDefaultCompat(bar); + var baz__default = /*#__PURE__*/_interopDefaultCompat(baz); + var quux__default = /*#__PURE__*/_interopDefaultCompat(quux); console.log(foo__default.default, bar__default.default, baz__default.default, quux__default.default); diff --git a/test/chunking-form/samples/external-imports/_expected/amd/main-namespace.js b/test/chunking-form/samples/external-imports/_expected/amd/main-namespace.js index ae94b975183..cbe35642050 100644 --- a/test/chunking-form/samples/external-imports/_expected/amd/main-namespace.js +++ b/test/chunking-form/samples/external-imports/_expected/amd/main-namespace.js @@ -1,7 +1,7 @@ define(['external-all', 'external-namespace', 'external-default-namespace', 'external-named-namespace'], (function (foo, bar, quux, quux$1) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceCompat(e) { + if (e && typeof e === 'object' && 'default' in e) return e; var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -18,10 +18,10 @@ define(['external-all', 'external-namespace', 'external-default-namespace', 'ext return Object.freeze(n); } - var foo__namespace = /*#__PURE__*/_interopNamespace(foo); - var bar__namespace = /*#__PURE__*/_interopNamespace(bar); - var quux__namespace = /*#__PURE__*/_interopNamespace(quux); - var quux__namespace$1 = /*#__PURE__*/_interopNamespace(quux$1); + var foo__namespace = /*#__PURE__*/_interopNamespaceCompat(foo); + var bar__namespace = /*#__PURE__*/_interopNamespaceCompat(bar); + var quux__namespace = /*#__PURE__*/_interopNamespaceCompat(quux); + var quux__namespace$1 = /*#__PURE__*/_interopNamespaceCompat(quux$1); console.log(foo__namespace, bar__namespace, quux__namespace, quux__namespace$1); diff --git a/test/chunking-form/samples/external-imports/_expected/cjs/main-default.js b/test/chunking-form/samples/external-imports/_expected/cjs/main-default.js index 3f77e482e39..090e9cdf2b7 100644 --- a/test/chunking-form/samples/external-imports/_expected/cjs/main-default.js +++ b/test/chunking-form/samples/external-imports/_expected/cjs/main-default.js @@ -5,11 +5,11 @@ var bar = require('external-default'); var baz = require('external-default-named'); var quux = require('external-default-namespace'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } +function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } -var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); -var bar__default = /*#__PURE__*/_interopDefaultLegacy(bar); -var baz__default = /*#__PURE__*/_interopDefaultLegacy(baz); -var quux__default = /*#__PURE__*/_interopDefaultLegacy(quux); +var foo__default = /*#__PURE__*/_interopDefaultCompat(foo); +var bar__default = /*#__PURE__*/_interopDefaultCompat(bar); +var baz__default = /*#__PURE__*/_interopDefaultCompat(baz); +var quux__default = /*#__PURE__*/_interopDefaultCompat(quux); console.log(foo__default.default, bar__default.default, baz__default.default, quux__default.default); diff --git a/test/chunking-form/samples/external-imports/_expected/cjs/main-namespace.js b/test/chunking-form/samples/external-imports/_expected/cjs/main-namespace.js index b66a228ee87..8624513d356 100644 --- a/test/chunking-form/samples/external-imports/_expected/cjs/main-namespace.js +++ b/test/chunking-form/samples/external-imports/_expected/cjs/main-namespace.js @@ -5,8 +5,8 @@ var bar = require('external-namespace'); var quux = require('external-default-namespace'); var quux$1 = require('external-named-namespace'); -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceCompat(e) { + if (e && typeof e === 'object' && 'default' in e) return e; var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -23,9 +23,9 @@ function _interopNamespace(e) { return Object.freeze(n); } -var foo__namespace = /*#__PURE__*/_interopNamespace(foo); -var bar__namespace = /*#__PURE__*/_interopNamespace(bar); -var quux__namespace = /*#__PURE__*/_interopNamespace(quux); -var quux__namespace$1 = /*#__PURE__*/_interopNamespace(quux$1); +var foo__namespace = /*#__PURE__*/_interopNamespaceCompat(foo); +var bar__namespace = /*#__PURE__*/_interopNamespaceCompat(bar); +var quux__namespace = /*#__PURE__*/_interopNamespaceCompat(quux); +var quux__namespace$1 = /*#__PURE__*/_interopNamespaceCompat(quux$1); console.log(foo__namespace, bar__namespace, quux__namespace, quux__namespace$1); diff --git a/test/chunking-form/samples/external-reexports/_config.js b/test/chunking-form/samples/external-reexports/_config.js index e110d316f0f..c50aa2ac32a 100644 --- a/test/chunking-form/samples/external-reexports/_config.js +++ b/test/chunking-form/samples/external-reexports/_config.js @@ -2,6 +2,7 @@ module.exports = { description: 'uses correct interop per chunk when reexporting from external modules', options: { external: module => module.includes('external'), - input: ['main-default.js', 'main-named.js', 'main-namespace'] + input: ['main-default.js', 'main-named.js', 'main-namespace'], + output: { interop: 'compat' } } }; diff --git a/test/chunking-form/samples/external-reexports/_expected/amd/main-default.js b/test/chunking-form/samples/external-reexports/_expected/amd/main-default.js index 895439b5285..f701dc34d38 100644 --- a/test/chunking-form/samples/external-reexports/_expected/amd/main-default.js +++ b/test/chunking-form/samples/external-reexports/_expected/amd/main-default.js @@ -1,11 +1,11 @@ define(['exports', 'external-all', 'external-default', 'external-default-named', 'external-default-namespace'], (function (exports, externalAll, externalDefault, externalDefaultNamed, externalDefaultNamespace) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } + function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - var externalAll__default = /*#__PURE__*/_interopDefaultLegacy(externalAll); - var externalDefault__default = /*#__PURE__*/_interopDefaultLegacy(externalDefault); - var externalDefaultNamed__default = /*#__PURE__*/_interopDefaultLegacy(externalDefaultNamed); - var externalDefaultNamespace__default = /*#__PURE__*/_interopDefaultLegacy(externalDefaultNamespace); + var externalAll__default = /*#__PURE__*/_interopDefaultCompat(externalAll); + var externalDefault__default = /*#__PURE__*/_interopDefaultCompat(externalDefault); + var externalDefaultNamed__default = /*#__PURE__*/_interopDefaultCompat(externalDefaultNamed); + var externalDefaultNamespace__default = /*#__PURE__*/_interopDefaultCompat(externalDefaultNamespace); @@ -26,6 +26,4 @@ define(['exports', 'external-all', 'external-default', 'external-default-named', get: function () { return externalDefaultNamespace__default.default; } }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/external-reexports/_expected/amd/main-named.js b/test/chunking-form/samples/external-reexports/_expected/amd/main-named.js index 891e382aff5..1f3aa187801 100644 --- a/test/chunking-form/samples/external-reexports/_expected/amd/main-named.js +++ b/test/chunking-form/samples/external-reexports/_expected/amd/main-named.js @@ -19,6 +19,4 @@ define(['exports', 'external-all', 'external-named', 'external-default-named', ' get: function () { return externalNamedNamespace.quux; } }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/external-reexports/_expected/amd/main-namespace.js b/test/chunking-form/samples/external-reexports/_expected/amd/main-namespace.js index c2d64922a8b..193ce4b4b72 100644 --- a/test/chunking-form/samples/external-reexports/_expected/amd/main-namespace.js +++ b/test/chunking-form/samples/external-reexports/_expected/amd/main-namespace.js @@ -1,7 +1,7 @@ define(['exports', 'external-all', 'external-namespace', 'external-default-namespace', 'external-named-namespace'], (function (exports, externalAll, externalNamespace$1, externalDefaultNamespace, externalNamedNamespace) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceCompat(e) { + if (e && typeof e === 'object' && 'default' in e) return e; var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -18,10 +18,10 @@ define(['exports', 'external-all', 'external-namespace', 'external-default-names return Object.freeze(n); } - var externalAll__namespace = /*#__PURE__*/_interopNamespace(externalAll); - var externalNamespace__namespace = /*#__PURE__*/_interopNamespace(externalNamespace$1); - var externalDefaultNamespace__namespace = /*#__PURE__*/_interopNamespace(externalDefaultNamespace); - var externalNamedNamespace__namespace = /*#__PURE__*/_interopNamespace(externalNamedNamespace); + var externalAll__namespace = /*#__PURE__*/_interopNamespaceCompat(externalAll); + var externalNamespace__namespace = /*#__PURE__*/_interopNamespaceCompat(externalNamespace$1); + var externalDefaultNamespace__namespace = /*#__PURE__*/_interopNamespaceCompat(externalDefaultNamespace); + var externalNamedNamespace__namespace = /*#__PURE__*/_interopNamespaceCompat(externalNamedNamespace); const externalNamespace = 1; const externalNamespace__ns = 1; @@ -32,6 +32,4 @@ define(['exports', 'external-all', 'external-namespace', 'external-default-names exports.baz = externalDefaultNamespace__namespace; exports.quux = externalNamedNamespace__namespace; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/external-reexports/_expected/cjs/main-default.js b/test/chunking-form/samples/external-reexports/_expected/cjs/main-default.js index 6f1fee7c3ef..84cce20da3e 100644 --- a/test/chunking-form/samples/external-reexports/_expected/cjs/main-default.js +++ b/test/chunking-form/samples/external-reexports/_expected/cjs/main-default.js @@ -1,18 +1,16 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var externalAll = require('external-all'); var externalDefault = require('external-default'); var externalDefaultNamed = require('external-default-named'); var externalDefaultNamespace = require('external-default-namespace'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } +function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } -var externalAll__default = /*#__PURE__*/_interopDefaultLegacy(externalAll); -var externalDefault__default = /*#__PURE__*/_interopDefaultLegacy(externalDefault); -var externalDefaultNamed__default = /*#__PURE__*/_interopDefaultLegacy(externalDefaultNamed); -var externalDefaultNamespace__default = /*#__PURE__*/_interopDefaultLegacy(externalDefaultNamespace); +var externalAll__default = /*#__PURE__*/_interopDefaultCompat(externalAll); +var externalDefault__default = /*#__PURE__*/_interopDefaultCompat(externalDefault); +var externalDefaultNamed__default = /*#__PURE__*/_interopDefaultCompat(externalDefaultNamed); +var externalDefaultNamespace__default = /*#__PURE__*/_interopDefaultCompat(externalDefaultNamespace); diff --git a/test/chunking-form/samples/external-reexports/_expected/cjs/main-named.js b/test/chunking-form/samples/external-reexports/_expected/cjs/main-named.js index bc69060bc97..970c52c85ac 100644 --- a/test/chunking-form/samples/external-reexports/_expected/cjs/main-named.js +++ b/test/chunking-form/samples/external-reexports/_expected/cjs/main-named.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var externalAll = require('external-all'); var externalNamed = require('external-named'); var externalDefaultNamed = require('external-default-named'); diff --git a/test/chunking-form/samples/external-reexports/_expected/cjs/main-namespace.js b/test/chunking-form/samples/external-reexports/_expected/cjs/main-namespace.js index a8cf1521fea..03779a6b5a2 100644 --- a/test/chunking-form/samples/external-reexports/_expected/cjs/main-namespace.js +++ b/test/chunking-form/samples/external-reexports/_expected/cjs/main-namespace.js @@ -1,14 +1,12 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var externalAll = require('external-all'); var externalNamespace$1 = require('external-namespace'); var externalDefaultNamespace = require('external-default-namespace'); var externalNamedNamespace = require('external-named-namespace'); -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceCompat(e) { + if (e && typeof e === 'object' && 'default' in e) return e; var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -25,10 +23,10 @@ function _interopNamespace(e) { return Object.freeze(n); } -var externalAll__namespace = /*#__PURE__*/_interopNamespace(externalAll); -var externalNamespace__namespace = /*#__PURE__*/_interopNamespace(externalNamespace$1); -var externalDefaultNamespace__namespace = /*#__PURE__*/_interopNamespace(externalDefaultNamespace); -var externalNamedNamespace__namespace = /*#__PURE__*/_interopNamespace(externalNamedNamespace); +var externalAll__namespace = /*#__PURE__*/_interopNamespaceCompat(externalAll); +var externalNamespace__namespace = /*#__PURE__*/_interopNamespaceCompat(externalNamespace$1); +var externalDefaultNamespace__namespace = /*#__PURE__*/_interopNamespaceCompat(externalDefaultNamespace); +var externalNamedNamespace__namespace = /*#__PURE__*/_interopNamespaceCompat(externalNamedNamespace); const externalNamespace = 1; const externalNamespace__ns = 1; diff --git a/test/chunking-form/samples/generated-code/reserved-names-as-props-false/_expected/amd/main.js b/test/chunking-form/samples/generated-code/reserved-names-as-props-false/_expected/amd/main.js index 5779adef5f3..25748951123 100644 --- a/test/chunking-form/samples/generated-code/reserved-names-as-props-false/_expected/amd/main.js +++ b/test/chunking-form/samples/generated-code/reserved-names-as-props-false/_expected/amd/main.js @@ -4,6 +4,4 @@ define(['exports', './main2'], (function (exports, main2) { 'use strict'; exports.foo = main2["default"]; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/generated-code/reserved-names-as-props-false/_expected/cjs/main.js b/test/chunking-form/samples/generated-code/reserved-names-as-props-false/_expected/cjs/main.js index f14366b620b..92ccdef0867 100644 --- a/test/chunking-form/samples/generated-code/reserved-names-as-props-false/_expected/cjs/main.js +++ b/test/chunking-form/samples/generated-code/reserved-names-as-props-false/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var main2 = require('./main2.js'); diff --git a/test/chunking-form/samples/generated-code/reserved-names-as-props-true/_expected/amd/main.js b/test/chunking-form/samples/generated-code/reserved-names-as-props-true/_expected/amd/main.js index 14123895ca1..22ced0f4756 100644 --- a/test/chunking-form/samples/generated-code/reserved-names-as-props-true/_expected/amd/main.js +++ b/test/chunking-form/samples/generated-code/reserved-names-as-props-true/_expected/amd/main.js @@ -4,6 +4,4 @@ define(['exports', './main2'], (function (exports, main2) { 'use strict'; exports.foo = main2.default; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/generated-code/reserved-names-as-props-true/_expected/cjs/main.js b/test/chunking-form/samples/generated-code/reserved-names-as-props-true/_expected/cjs/main.js index 4a0da3bc26d..4bf51892080 100644 --- a/test/chunking-form/samples/generated-code/reserved-names-as-props-true/_expected/cjs/main.js +++ b/test/chunking-form/samples/generated-code/reserved-names-as-props-true/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var main2 = require('./main2.js'); diff --git a/test/chunking-form/samples/implicit-dependencies/shared-dependency-no-side-effect/_expected/amd/main.js b/test/chunking-form/samples/implicit-dependencies/shared-dependency-no-side-effect/_expected/amd/main.js index 16ad2ab66a4..6fd637014ea 100644 --- a/test/chunking-form/samples/implicit-dependencies/shared-dependency-no-side-effect/_expected/amd/main.js +++ b/test/chunking-form/samples/implicit-dependencies/shared-dependency-no-side-effect/_expected/amd/main.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.foo = foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/implicit-dependencies/shared-dependency-no-side-effect/_expected/cjs/main.js b/test/chunking-form/samples/implicit-dependencies/shared-dependency-no-side-effect/_expected/cjs/main.js index de59b01ec34..71c76a07cc0 100644 --- a/test/chunking-form/samples/implicit-dependencies/shared-dependency-no-side-effect/_expected/cjs/main.js +++ b/test/chunking-form/samples/implicit-dependencies/shared-dependency-no-side-effect/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const foo = 'foo'; exports.foo = foo; diff --git a/test/chunking-form/samples/implicit-dependencies/shared-dependency-reexport/_expected/amd/main.js b/test/chunking-form/samples/implicit-dependencies/shared-dependency-reexport/_expected/amd/main.js index 5609f28706f..069c69d1b48 100644 --- a/test/chunking-form/samples/implicit-dependencies/shared-dependency-reexport/_expected/amd/main.js +++ b/test/chunking-form/samples/implicit-dependencies/shared-dependency-reexport/_expected/amd/main.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.foo = foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/implicit-dependencies/shared-dependency-reexport/_expected/cjs/main.js b/test/chunking-form/samples/implicit-dependencies/shared-dependency-reexport/_expected/cjs/main.js index 686f63da865..5c12b1c2f79 100644 --- a/test/chunking-form/samples/implicit-dependencies/shared-dependency-reexport/_expected/cjs/main.js +++ b/test/chunking-form/samples/implicit-dependencies/shared-dependency-reexport/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const foo = 'shared'; exports.foo = foo; diff --git a/test/chunking-form/samples/implicit-dependencies/single-dependency/_expected/amd/main.js b/test/chunking-form/samples/implicit-dependencies/single-dependency/_expected/amd/main.js index ba729f3515b..609c853c574 100644 --- a/test/chunking-form/samples/implicit-dependencies/single-dependency/_expected/amd/main.js +++ b/test/chunking-form/samples/implicit-dependencies/single-dependency/_expected/amd/main.js @@ -6,6 +6,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.value = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/implicit-dependencies/single-dependency/_expected/cjs/main.js b/test/chunking-form/samples/implicit-dependencies/single-dependency/_expected/cjs/main.js index 4677b07af09..a8d51732214 100644 --- a/test/chunking-form/samples/implicit-dependencies/single-dependency/_expected/cjs/main.js +++ b/test/chunking-form/samples/implicit-dependencies/single-dependency/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const value = 42; console.log(value); diff --git a/test/chunking-form/samples/import-meta-url/_expected/amd/main.js b/test/chunking-form/samples/import-meta-url/_expected/amd/main.js index 26107772edc..97856a276bc 100644 --- a/test/chunking-form/samples/import-meta-url/_expected/amd/main.js +++ b/test/chunking-form/samples/import-meta-url/_expected/amd/main.js @@ -13,6 +13,4 @@ define(['module', 'require', 'exports'], (function (module, require, exports) { exports.log = log; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/import-meta-url/_expected/cjs/main.js b/test/chunking-form/samples/import-meta-url/_expected/cjs/main.js index 0713b95c0b4..1d0b5b83048 100644 --- a/test/chunking-form/samples/import-meta-url/_expected/cjs/main.js +++ b/test/chunking-form/samples/import-meta-url/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - function log(url) { if (typeof document === 'undefined') { console.log(url); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/amd/main.js b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/amd/main.js index c2b32ef1887..08a469fe7a0 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/amd/main.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/amd/main.js @@ -6,6 +6,4 @@ define(['require', 'exports'], (function (require, exports) { 'use strict'; exports.shared = shared; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/cjs/main.js b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/cjs/main.js index d90a9e09166..1526f9dd5a0 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/cjs/main.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const shared = 'shared'; Promise.resolve().then(function () { return require('./generated-dynamic1.js'); }); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-1/_expected/amd/main.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-1/_expected/amd/main.js index 0d97999c4f2..e6637b66148 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-1/_expected/amd/main.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-1/_expected/amd/main.js @@ -24,6 +24,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.value = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-1/_expected/cjs/main.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-1/_expected/cjs/main.js index cb766ee459d..4cc450416cd 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-1/_expected/cjs/main.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-1/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - Promise.resolve().then(function () { return main; }).then(console.log); console.log('dep1'); const value1 = 'dep1'; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/amd/main.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/amd/main.js index aff018855fa..90307101cfa 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/amd/main.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/amd/main.js @@ -7,6 +7,4 @@ define(['require', 'exports'], (function (require, exports) { 'use strict'; exports.value = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/cjs/main.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/cjs/main.js index eed79993ff0..e547a8b0a6d 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/cjs/main.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const value = 'shared'; console.log('dynamic1', value); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/amd/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/amd/main1.js index 2e72a76c9d0..6332d864ba6 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/amd/main1.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/amd/main1.js @@ -7,6 +7,4 @@ define(['require', 'exports', './generated-from-main-1-and-dynamic', './generate exports.value2 = fromMain1And2.value2; exports.value3 = fromMain1And2.value3; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/amd/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/amd/main2.js index bc2f6665325..7ac0888d98d 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/amd/main2.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/amd/main2.js @@ -6,6 +6,4 @@ define(['require', 'exports', './generated-from-main-1-and-2'], (function (requi exports.value2 = fromMain1And2.value2; exports.value3 = fromMain1And2.value3; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/cjs/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/cjs/main1.js index 4d2113add8e..649a253a15e 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/cjs/main1.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/cjs/main1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var fromMain1AndDynamic = require('./generated-from-main-1-and-dynamic.js'); var fromMain1And2 = require('./generated-from-main-1-and-2.js'); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/cjs/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/cjs/main2.js index af0a1590d26..fde80335cbe 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/cjs/main2.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/cjs/main2.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var fromMain1And2 = require('./generated-from-main-1-and-2.js'); console.log('main2', fromMain1And2.value2, fromMain1And2.value3); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/amd/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/amd/main1.js index 0f6831e92e0..208aca62975 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/amd/main1.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/amd/main1.js @@ -8,6 +8,4 @@ define(['require', 'exports', './generated-dep1', './generated-dep2'], (function exports.value1 = dep1.value1; exports.value2 = dep2.value2; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/amd/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/amd/main2.js index 5dfbe5e71c2..27a36093db2 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/amd/main2.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/amd/main2.js @@ -5,6 +5,4 @@ define(['require', 'exports', './generated-dep2'], (function (require, exports, exports.value2 = dep2.value2; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/cjs/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/cjs/main1.js index 3134e2d98eb..4d238a7c135 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/cjs/main1.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/cjs/main1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var dep1 = require('./generated-dep1.js'); var dep2 = require('./generated-dep2.js'); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/cjs/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/cjs/main2.js index 782db267adf..ff0bde842e1 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/cjs/main2.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/cjs/main2.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var dep2 = require('./generated-dep2.js'); console.log('main2', dep2.value2); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/amd/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/amd/main1.js index 1c6cbfe5814..cb1d05e77eb 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/amd/main1.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/amd/main1.js @@ -8,6 +8,4 @@ define(['require', 'exports', './generated-dep2'], (function (require, exports, exports.value2 = dep2.value2; exports.value1 = value1; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/amd/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/amd/main2.js index 2b7072da53e..fb1681eb43e 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/amd/main2.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/amd/main2.js @@ -5,6 +5,4 @@ define(['require', 'exports', './generated-dep2'], (function (require, exports, exports.value2 = dep2.value2; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/cjs/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/cjs/main1.js index 77a24bd8173..204a4307432 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/cjs/main1.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/cjs/main1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var dep2 = require('./generated-dep2.js'); const value1 = 'shared1'; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/cjs/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/cjs/main2.js index 86e101c64c8..2b88a744f0b 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/cjs/main2.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/cjs/main2.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var dep2 = require('./generated-dep2.js'); console.log('main2', dep2.value2); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/amd/main.js b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/amd/main.js index 36b7342f05f..7bcf0392fbe 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/amd/main.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/amd/main.js @@ -10,6 +10,4 @@ define(['require', 'exports'], (function (require, exports) { 'use strict'; exports.value = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/cjs/main.js b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/cjs/main.js index 70c72b3bb02..ca520ae599f 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/cjs/main.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const value = 'shared'; console.log('a', value); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/amd/main.js b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/amd/main.js index 0035c3786e1..f279110b6b4 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/amd/main.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/amd/main.js @@ -7,6 +7,4 @@ define(['require', 'exports'], (function (require, exports) { 'use strict'; exports.value = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/cjs/main.js b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/cjs/main.js index 7d1b02e1eea..2f20576f18a 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/cjs/main.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const value = 'shared'; console.log('main', value); diff --git a/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/amd/components/index.js b/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/amd/components/index.js index 25cc1e39f2d..a03efcb5e7a 100644 --- a/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/amd/components/index.js +++ b/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/amd/components/index.js @@ -5,6 +5,4 @@ define(['exports', './sub/index'], (function (exports, index) { 'use strict'; exports.foo = index.foo; exports.baz = baz; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/amd/main.js b/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/amd/main.js index 03a4f176ca1..c17dc35d934 100644 --- a/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/amd/main.js +++ b/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/amd/main.js @@ -5,6 +5,4 @@ define(['exports', './components/index', './components/sub/index'], (function (e exports.baz = index.baz; exports.foo = index$1.foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/cjs/components/index.js b/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/cjs/components/index.js index 46429b712ad..c6e74030a5f 100644 --- a/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/cjs/components/index.js +++ b/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/cjs/components/index.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var index = require('./sub/index.js'); const baz = { bar: index.default }; diff --git a/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/cjs/main.js b/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/cjs/main.js index e8c88da6582..6bcd93609e4 100644 --- a/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/cjs/main.js +++ b/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var index = require('./components/index.js'); var index$1 = require('./components/sub/index.js'); diff --git a/test/chunking-form/samples/manual-chunk-avoid-facade/_expected/amd/main2.js b/test/chunking-form/samples/manual-chunk-avoid-facade/_expected/amd/main2.js index ca9c827728d..0c42189302d 100644 --- a/test/chunking-form/samples/manual-chunk-avoid-facade/_expected/amd/main2.js +++ b/test/chunking-form/samples/manual-chunk-avoid-facade/_expected/amd/main2.js @@ -6,6 +6,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.reexported = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/manual-chunk-avoid-facade/_expected/cjs/main2.js b/test/chunking-form/samples/manual-chunk-avoid-facade/_expected/cjs/main2.js index f7d33362bcc..58617370ca4 100644 --- a/test/chunking-form/samples/manual-chunk-avoid-facade/_expected/cjs/main2.js +++ b/test/chunking-form/samples/manual-chunk-avoid-facade/_expected/cjs/main2.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const value = 42; console.log('main2', value); diff --git a/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/amd/main.js b/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/amd/main.js index 9077cbb0e1f..0dce9285fd6 100644 --- a/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/amd/main.js +++ b/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/amd/main.js @@ -8,6 +8,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.value = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/cjs/main.js b/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/cjs/main.js index 5da9ebd5132..fe59aaab6b9 100644 --- a/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/cjs/main.js +++ b/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - console.log('dep'); console.log('main'); diff --git a/test/chunking-form/samples/manual-chunk-contains-entry-match/_expected/amd/main.js b/test/chunking-form/samples/manual-chunk-contains-entry-match/_expected/amd/main.js index 9077cbb0e1f..0dce9285fd6 100644 --- a/test/chunking-form/samples/manual-chunk-contains-entry-match/_expected/amd/main.js +++ b/test/chunking-form/samples/manual-chunk-contains-entry-match/_expected/amd/main.js @@ -8,6 +8,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.value = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/manual-chunk-contains-entry-match/_expected/cjs/main.js b/test/chunking-form/samples/manual-chunk-contains-entry-match/_expected/cjs/main.js index 5da9ebd5132..fe59aaab6b9 100644 --- a/test/chunking-form/samples/manual-chunk-contains-entry-match/_expected/cjs/main.js +++ b/test/chunking-form/samples/manual-chunk-contains-entry-match/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - console.log('dep'); console.log('main'); diff --git a/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/amd/main.js b/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/amd/main.js index 9077cbb0e1f..0dce9285fd6 100644 --- a/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/amd/main.js +++ b/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/amd/main.js @@ -8,6 +8,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.value = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/cjs/main.js b/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/cjs/main.js index 5da9ebd5132..fe59aaab6b9 100644 --- a/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/cjs/main.js +++ b/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - console.log('dep'); console.log('main'); diff --git a/test/chunking-form/samples/manual-chunk-is-entry-match/_expected/amd/main.js b/test/chunking-form/samples/manual-chunk-is-entry-match/_expected/amd/main.js index 9077cbb0e1f..0dce9285fd6 100644 --- a/test/chunking-form/samples/manual-chunk-is-entry-match/_expected/amd/main.js +++ b/test/chunking-form/samples/manual-chunk-is-entry-match/_expected/amd/main.js @@ -8,6 +8,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.value = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/manual-chunk-is-entry-match/_expected/cjs/main.js b/test/chunking-form/samples/manual-chunk-is-entry-match/_expected/cjs/main.js index 5da9ebd5132..fe59aaab6b9 100644 --- a/test/chunking-form/samples/manual-chunk-is-entry-match/_expected/cjs/main.js +++ b/test/chunking-form/samples/manual-chunk-is-entry-match/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - console.log('dep'); console.log('main'); diff --git a/test/chunking-form/samples/max-parallel-file-operations/_expected/amd/1.js b/test/chunking-form/samples/max-parallel-file-operations/_expected/amd/1.js index e22765045cc..d17df8438e0 100644 --- a/test/chunking-form/samples/max-parallel-file-operations/_expected/amd/1.js +++ b/test/chunking-form/samples/max-parallel-file-operations/_expected/amd/1.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.x1 = x1; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/max-parallel-file-operations/_expected/amd/2.js b/test/chunking-form/samples/max-parallel-file-operations/_expected/amd/2.js index 0018c038f7b..12aef8ef5da 100644 --- a/test/chunking-form/samples/max-parallel-file-operations/_expected/amd/2.js +++ b/test/chunking-form/samples/max-parallel-file-operations/_expected/amd/2.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.x2 = x2; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/max-parallel-file-operations/_expected/amd/3.js b/test/chunking-form/samples/max-parallel-file-operations/_expected/amd/3.js index 6f9fd129364..79e3ea0bf2a 100644 --- a/test/chunking-form/samples/max-parallel-file-operations/_expected/amd/3.js +++ b/test/chunking-form/samples/max-parallel-file-operations/_expected/amd/3.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.x3 = x3; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/max-parallel-file-operations/_expected/amd/4.js b/test/chunking-form/samples/max-parallel-file-operations/_expected/amd/4.js index 53152abbb6b..d81dcbbc35a 100644 --- a/test/chunking-form/samples/max-parallel-file-operations/_expected/amd/4.js +++ b/test/chunking-form/samples/max-parallel-file-operations/_expected/amd/4.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.x4 = x4; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/max-parallel-file-operations/_expected/amd/5.js b/test/chunking-form/samples/max-parallel-file-operations/_expected/amd/5.js index 23c4447f099..5578006da1f 100644 --- a/test/chunking-form/samples/max-parallel-file-operations/_expected/amd/5.js +++ b/test/chunking-form/samples/max-parallel-file-operations/_expected/amd/5.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.x5 = x5; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/max-parallel-file-operations/_expected/amd/main.js b/test/chunking-form/samples/max-parallel-file-operations/_expected/amd/main.js index 3c7ff656f2a..958c6a79b82 100644 --- a/test/chunking-form/samples/max-parallel-file-operations/_expected/amd/main.js +++ b/test/chunking-form/samples/max-parallel-file-operations/_expected/amd/main.js @@ -8,6 +8,4 @@ define(['exports', './1', './2', './3', './4', './5'], (function (exports, _1, _ exports.x4 = _4.x4; exports.x5 = _5.x5; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/max-parallel-file-operations/_expected/cjs/1.js b/test/chunking-form/samples/max-parallel-file-operations/_expected/cjs/1.js index 6f07f500e85..5e709389809 100644 --- a/test/chunking-form/samples/max-parallel-file-operations/_expected/cjs/1.js +++ b/test/chunking-form/samples/max-parallel-file-operations/_expected/cjs/1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const x1 = 1; exports.x1 = x1; diff --git a/test/chunking-form/samples/max-parallel-file-operations/_expected/cjs/2.js b/test/chunking-form/samples/max-parallel-file-operations/_expected/cjs/2.js index b497b79cafa..0bff1b9044e 100644 --- a/test/chunking-form/samples/max-parallel-file-operations/_expected/cjs/2.js +++ b/test/chunking-form/samples/max-parallel-file-operations/_expected/cjs/2.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const x2 = 2; exports.x2 = x2; diff --git a/test/chunking-form/samples/max-parallel-file-operations/_expected/cjs/3.js b/test/chunking-form/samples/max-parallel-file-operations/_expected/cjs/3.js index 4e662215ed1..cc7401957bb 100644 --- a/test/chunking-form/samples/max-parallel-file-operations/_expected/cjs/3.js +++ b/test/chunking-form/samples/max-parallel-file-operations/_expected/cjs/3.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const x3 = 3; exports.x3 = x3; diff --git a/test/chunking-form/samples/max-parallel-file-operations/_expected/cjs/4.js b/test/chunking-form/samples/max-parallel-file-operations/_expected/cjs/4.js index fb8fcf8e9c7..b0a26d49675 100644 --- a/test/chunking-form/samples/max-parallel-file-operations/_expected/cjs/4.js +++ b/test/chunking-form/samples/max-parallel-file-operations/_expected/cjs/4.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const x4 = 4; exports.x4 = x4; diff --git a/test/chunking-form/samples/max-parallel-file-operations/_expected/cjs/5.js b/test/chunking-form/samples/max-parallel-file-operations/_expected/cjs/5.js index 3000d97261f..b2a5c8b24ea 100644 --- a/test/chunking-form/samples/max-parallel-file-operations/_expected/cjs/5.js +++ b/test/chunking-form/samples/max-parallel-file-operations/_expected/cjs/5.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const x5 = 5; exports.x5 = x5; diff --git a/test/chunking-form/samples/max-parallel-file-operations/_expected/cjs/main.js b/test/chunking-form/samples/max-parallel-file-operations/_expected/cjs/main.js index a1149dc2a55..f3acc7bcdbf 100644 --- a/test/chunking-form/samples/max-parallel-file-operations/_expected/cjs/main.js +++ b/test/chunking-form/samples/max-parallel-file-operations/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var _1 = require('./1.js'); var _2 = require('./2.js'); var _3 = require('./3.js'); diff --git a/test/chunking-form/samples/missing-export-compact/_expected/amd/dep.js b/test/chunking-form/samples/missing-export-compact/_expected/amd/dep.js index c6c8e6f3d37..88127064eb5 100644 --- a/test/chunking-form/samples/missing-export-compact/_expected/amd/dep.js +++ b/test/chunking-form/samples/missing-export-compact/_expected/amd/dep.js @@ -1,3 +1,3 @@ define(['exports'],(function(exports){'use strict';var _missingExportShim=void 0;function x (arg) { sideEffect(arg); -}exports.missingExport=_missingExportShim;exports.missingFn=_missingExportShim;exports.x=x;Object.defineProperty(exports,'__esModule',{value:true});})); \ No newline at end of file +}exports.missingExport=_missingExportShim;exports.missingFn=_missingExportShim;exports.x=x;})); \ No newline at end of file diff --git a/test/chunking-form/samples/missing-export-compact/_expected/cjs/dep.js b/test/chunking-form/samples/missing-export-compact/_expected/cjs/dep.js index 7dba4c72167..3ba21254500 100644 --- a/test/chunking-form/samples/missing-export-compact/_expected/cjs/dep.js +++ b/test/chunking-form/samples/missing-export-compact/_expected/cjs/dep.js @@ -1,3 +1,3 @@ -'use strict';Object.defineProperty(exports,'__esModule',{value:true});var _missingExportShim=void 0;function x (arg) { +'use strict';var _missingExportShim=void 0;function x (arg) { sideEffect(arg); }exports.missingExport=_missingExportShim;exports.missingFn=_missingExportShim;exports.x=x; \ No newline at end of file diff --git a/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/amd/dep1.js b/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/amd/dep1.js index 3c213e8b5a6..1ebb9552c37 100644 --- a/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/amd/dep1.js +++ b/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/amd/dep1.js @@ -14,6 +14,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.missing1 = _missingExportShim; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/amd/dep2.js b/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/amd/dep2.js index e22f7bd7c3e..94c9d52cf2c 100644 --- a/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/amd/dep2.js +++ b/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/amd/dep2.js @@ -11,6 +11,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.missing2 = _missingExportShim; exports.previousShimmedExport = _missingExportShim$1; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/cjs/dep1.js b/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/cjs/dep1.js index 58c566f2849..a024bcd6f7f 100644 --- a/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/cjs/dep1.js +++ b/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/cjs/dep1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var _missingExportShim = void 0; console.log('This is the output when a missing export is used internally but not reexported'); diff --git a/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/cjs/dep2.js b/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/cjs/dep2.js index 8a01d991453..f411ae56976 100644 --- a/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/cjs/dep2.js +++ b/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/cjs/dep2.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var _missingExportShim = void 0; console.log('This is the output when a missing export is reexported'); diff --git a/test/chunking-form/samples/multiple-entry-points/_expected/amd/other.js b/test/chunking-form/samples/multiple-entry-points/_expected/amd/other.js index 2d51b556b06..d53c6b95fe7 100644 --- a/test/chunking-form/samples/multiple-entry-points/_expected/amd/other.js +++ b/test/chunking-form/samples/multiple-entry-points/_expected/amd/other.js @@ -4,6 +4,4 @@ define(['exports', './chunks/shared'], (function (exports, shared) { 'use strict exports.sharedValue = shared.sharedValue; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/multiple-entry-points/_expected/cjs/other.js b/test/chunking-form/samples/multiple-entry-points/_expected/cjs/other.js index 40cf77c3578..3239bae8072 100644 --- a/test/chunking-form/samples/multiple-entry-points/_expected/cjs/other.js +++ b/test/chunking-form/samples/multiple-entry-points/_expected/cjs/other.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var shared = require('./chunks/shared.js'); diff --git a/test/chunking-form/samples/namespace-imports-from-chunks/_expected/amd/main1.js b/test/chunking-form/samples/namespace-imports-from-chunks/_expected/amd/main1.js index f72310a337f..7d5df252b9d 100644 --- a/test/chunking-form/samples/namespace-imports-from-chunks/_expected/amd/main1.js +++ b/test/chunking-form/samples/namespace-imports-from-chunks/_expected/amd/main1.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.p = p; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/namespace-imports-from-chunks/_expected/cjs/main1.js b/test/chunking-form/samples/namespace-imports-from-chunks/_expected/cjs/main1.js index 64b0a704dde..eb9a14fc40b 100644 --- a/test/chunking-form/samples/namespace-imports-from-chunks/_expected/cjs/main1.js +++ b/test/chunking-form/samples/namespace-imports-from-chunks/_expected/cjs/main1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var p = 42; exports.p = p; diff --git a/test/chunking-form/samples/namespace-object-import/_expected/amd/main2.js b/test/chunking-form/samples/namespace-object-import/_expected/amd/main2.js index 6db8489eedf..6d7842ba8d4 100644 --- a/test/chunking-form/samples/namespace-object-import/_expected/amd/main2.js +++ b/test/chunking-form/samples/namespace-object-import/_expected/amd/main2.js @@ -5,6 +5,4 @@ define(['exports', './generated-main2'], (function (exports, main2) { 'use stric exports.a = main2.a; exports.b = main2.b; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/namespace-object-import/_expected/cjs/main2.js b/test/chunking-form/samples/namespace-object-import/_expected/cjs/main2.js index 688bfd2c811..473d5bd10b2 100644 --- a/test/chunking-form/samples/namespace-object-import/_expected/cjs/main2.js +++ b/test/chunking-form/samples/namespace-object-import/_expected/cjs/main2.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var main2 = require('./generated-main2.js'); diff --git a/test/chunking-form/samples/namespace-reexports/_expected/amd/index.js b/test/chunking-form/samples/namespace-reexports/_expected/amd/index.js index b24f601c22c..8da4a0f9746 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/amd/index.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/amd/index.js @@ -4,6 +4,4 @@ define(['exports', './hsl2hsv', './generated-index'], (function (exports, hsl2hs exports.hsl2hsv = hsl2hsv.default; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/namespace-reexports/_expected/cjs/index.js b/test/chunking-form/samples/namespace-reexports/_expected/cjs/index.js index c2a0180929c..1249fe336ad 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/cjs/index.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/cjs/index.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var hsl2hsv = require('./hsl2hsv.js'); require('./generated-index.js'); diff --git a/test/chunking-form/samples/nested-chunks/_expected/amd/main1.js b/test/chunking-form/samples/nested-chunks/_expected/amd/main1.js index 2621e4974cd..653c379fd13 100644 --- a/test/chunking-form/samples/nested-chunks/_expected/amd/main1.js +++ b/test/chunking-form/samples/nested-chunks/_expected/amd/main1.js @@ -1,7 +1,6 @@ define(['require', './generated-dep'], (function (require, dep) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -21,6 +20,6 @@ define(['require', './generated-dep'], (function (require, dep) { 'use strict'; console.log('main1', dep.value); new Promise(function (resolve, reject) { require(['./generated-dynamic'], resolve, reject); }).then(result => console.log(result)); - new Promise(function (resolve, reject) { require(['./external'], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }).then(result => console.log(result)); + new Promise(function (resolve, reject) { require(['./external'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }).then(result => console.log(result)); })); diff --git a/test/chunking-form/samples/nested-chunks/_expected/amd/nested/main2.js b/test/chunking-form/samples/nested-chunks/_expected/amd/nested/main2.js index b6e52abe504..4df02a79b5e 100644 --- a/test/chunking-form/samples/nested-chunks/_expected/amd/nested/main2.js +++ b/test/chunking-form/samples/nested-chunks/_expected/amd/nested/main2.js @@ -1,7 +1,6 @@ define(['require', '../generated-dep'], (function (require, dep) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -21,6 +20,6 @@ define(['require', '../generated-dep'], (function (require, dep) { 'use strict'; console.log('main2', dep.value); new Promise(function (resolve, reject) { require(['../generated-dynamic'], resolve, reject); }).then(result => console.log(result)); - new Promise(function (resolve, reject) { require(['../external'], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }).then(result => console.log(result)); + new Promise(function (resolve, reject) { require(['../external'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }).then(result => console.log(result)); })); diff --git a/test/chunking-form/samples/nested-chunks/_expected/cjs/main1.js b/test/chunking-form/samples/nested-chunks/_expected/cjs/main1.js index 1dd811a9882..f3593ce6497 100644 --- a/test/chunking-form/samples/nested-chunks/_expected/cjs/main1.js +++ b/test/chunking-form/samples/nested-chunks/_expected/cjs/main1.js @@ -2,8 +2,7 @@ var dep = require('./generated-dep.js'); -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -23,4 +22,4 @@ function _interopNamespace(e) { console.log('main1', dep.value); Promise.resolve().then(function () { return require('./generated-dynamic.js'); }).then(result => console.log(result)); -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('./external.js')); }).then(result => console.log(result)); +Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('./external.js')); }).then(result => console.log(result)); diff --git a/test/chunking-form/samples/nested-chunks/_expected/cjs/nested/main2.js b/test/chunking-form/samples/nested-chunks/_expected/cjs/nested/main2.js index a0f68416c72..9c920a66810 100644 --- a/test/chunking-form/samples/nested-chunks/_expected/cjs/nested/main2.js +++ b/test/chunking-form/samples/nested-chunks/_expected/cjs/nested/main2.js @@ -2,8 +2,7 @@ var dep = require('../generated-dep.js'); -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -23,4 +22,4 @@ function _interopNamespace(e) { console.log('main2', dep.value); Promise.resolve().then(function () { return require('../generated-dynamic.js'); }).then(result => console.log(result)); -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('../external.js')); }).then(result => console.log(result)); +Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('../external.js')); }).then(result => console.log(result)); diff --git a/test/chunking-form/samples/preserve-entry-signatures/allow-extension/_expected/amd/main.js b/test/chunking-form/samples/preserve-entry-signatures/allow-extension/_expected/amd/main.js index 29b06bc0d51..7de2080ff71 100644 --- a/test/chunking-form/samples/preserve-entry-signatures/allow-extension/_expected/amd/main.js +++ b/test/chunking-form/samples/preserve-entry-signatures/allow-extension/_expected/amd/main.js @@ -11,6 +11,4 @@ define(['require', 'exports'], (function (require, exports) { 'use strict'; exports.shared = shared; exports.unused = unused; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-entry-signatures/allow-extension/_expected/cjs/main.js b/test/chunking-form/samples/preserve-entry-signatures/allow-extension/_expected/cjs/main.js index 896c5006615..637f70585c5 100644 --- a/test/chunking-form/samples/preserve-entry-signatures/allow-extension/_expected/cjs/main.js +++ b/test/chunking-form/samples/preserve-entry-signatures/allow-extension/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const shared = 'shared'; const unused = 'unused'; diff --git a/test/chunking-form/samples/preserve-entry-signatures/exports-only-no-exports/_expected/amd/main.js b/test/chunking-form/samples/preserve-entry-signatures/exports-only-no-exports/_expected/amd/main.js index 316c925cb04..cd6807e1b06 100644 --- a/test/chunking-form/samples/preserve-entry-signatures/exports-only-no-exports/_expected/amd/main.js +++ b/test/chunking-form/samples/preserve-entry-signatures/exports-only-no-exports/_expected/amd/main.js @@ -8,6 +8,4 @@ define(['require', 'exports'], (function (require, exports) { 'use strict'; exports.shared = shared; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-entry-signatures/exports-only-no-exports/_expected/cjs/main.js b/test/chunking-form/samples/preserve-entry-signatures/exports-only-no-exports/_expected/cjs/main.js index 9b8458335f7..90c998ec33b 100644 --- a/test/chunking-form/samples/preserve-entry-signatures/exports-only-no-exports/_expected/cjs/main.js +++ b/test/chunking-form/samples/preserve-entry-signatures/exports-only-no-exports/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const shared = 'shared'; Promise.resolve().then(function () { return require('./generated-dynamic.js'); }); diff --git a/test/chunking-form/samples/preserve-entry-signatures/exports-only/_expected/amd/main.js b/test/chunking-form/samples/preserve-entry-signatures/exports-only/_expected/amd/main.js index b2dd693821c..eb2d7c46ed3 100644 --- a/test/chunking-form/samples/preserve-entry-signatures/exports-only/_expected/amd/main.js +++ b/test/chunking-form/samples/preserve-entry-signatures/exports-only/_expected/amd/main.js @@ -5,6 +5,4 @@ define(['exports', './generated-main'], (function (exports, main) { 'use strict' exports.dynamic = main.dynamic; exports.unused = main.unused; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-entry-signatures/exports-only/_expected/cjs/main.js b/test/chunking-form/samples/preserve-entry-signatures/exports-only/_expected/cjs/main.js index 85dcc48bca5..48b0c5d8247 100644 --- a/test/chunking-form/samples/preserve-entry-signatures/exports-only/_expected/cjs/main.js +++ b/test/chunking-form/samples/preserve-entry-signatures/exports-only/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var main = require('./generated-main.js'); diff --git a/test/chunking-form/samples/preserve-entry-signatures/false/_expected/amd/main.js b/test/chunking-form/samples/preserve-entry-signatures/false/_expected/amd/main.js index 316c925cb04..cd6807e1b06 100644 --- a/test/chunking-form/samples/preserve-entry-signatures/false/_expected/amd/main.js +++ b/test/chunking-form/samples/preserve-entry-signatures/false/_expected/amd/main.js @@ -8,6 +8,4 @@ define(['require', 'exports'], (function (require, exports) { 'use strict'; exports.shared = shared; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-entry-signatures/false/_expected/cjs/main.js b/test/chunking-form/samples/preserve-entry-signatures/false/_expected/cjs/main.js index 9b8458335f7..90c998ec33b 100644 --- a/test/chunking-form/samples/preserve-entry-signatures/false/_expected/cjs/main.js +++ b/test/chunking-form/samples/preserve-entry-signatures/false/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const shared = 'shared'; Promise.resolve().then(function () { return require('./generated-dynamic.js'); }); diff --git a/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/amd/generated-allow-extension.js b/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/amd/generated-allow-extension.js index d730d436836..2eb0839b29b 100644 --- a/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/amd/generated-allow-extension.js +++ b/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/amd/generated-allow-extension.js @@ -9,6 +9,4 @@ define(['require', 'exports'], (function (require, exports) { 'use strict'; exports.shared = shared; exports.unused = unused; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/amd/generated-false.js b/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/amd/generated-false.js index 1727b442b8b..7fcf256410f 100644 --- a/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/amd/generated-false.js +++ b/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/amd/generated-false.js @@ -7,6 +7,4 @@ define(['require', 'exports'], (function (require, exports) { 'use strict'; exports.shared = shared; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/amd/generated-not-specified.js b/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/amd/generated-not-specified.js index 5e1bbde2976..bc3999b11e6 100644 --- a/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/amd/generated-not-specified.js +++ b/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/amd/generated-not-specified.js @@ -9,6 +9,4 @@ define(['require', 'exports'], (function (require, exports) { 'use strict'; exports.shared = shared; exports.unused = unused; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/amd/generated-strict.js b/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/amd/generated-strict.js index c2fcdba5861..52495b70f4d 100644 --- a/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/amd/generated-strict.js +++ b/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/amd/generated-strict.js @@ -4,6 +4,4 @@ define(['exports', './generated-main'], (function (exports, strict) { 'use stric exports.unused = strict.unused; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/cjs/generated-allow-extension.js b/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/cjs/generated-allow-extension.js index 09e16f7d592..4e1da50883f 100644 --- a/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/cjs/generated-allow-extension.js +++ b/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/cjs/generated-allow-extension.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const shared = 'shared'; console.log(shared); diff --git a/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/cjs/generated-false.js b/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/cjs/generated-false.js index 1d3c3154aad..ff45728699a 100644 --- a/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/cjs/generated-false.js +++ b/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/cjs/generated-false.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const shared = 'shared'; console.log(shared); diff --git a/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/cjs/generated-not-specified.js b/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/cjs/generated-not-specified.js index a54ad55bd99..dfd2786741d 100644 --- a/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/cjs/generated-not-specified.js +++ b/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/cjs/generated-not-specified.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const shared = 'shared'; console.log(shared); diff --git a/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/cjs/generated-strict.js b/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/cjs/generated-strict.js index bc762b95755..564f9fdbe94 100644 --- a/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/cjs/generated-strict.js +++ b/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/cjs/generated-strict.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var strict = require('./generated-main.js'); diff --git a/test/chunking-form/samples/preserve-entry-signatures/strict/_expected/amd/main.js b/test/chunking-form/samples/preserve-entry-signatures/strict/_expected/amd/main.js index b2dd693821c..eb2d7c46ed3 100644 --- a/test/chunking-form/samples/preserve-entry-signatures/strict/_expected/amd/main.js +++ b/test/chunking-form/samples/preserve-entry-signatures/strict/_expected/amd/main.js @@ -5,6 +5,4 @@ define(['exports', './generated-main'], (function (exports, main) { 'use strict' exports.dynamic = main.dynamic; exports.unused = main.unused; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-entry-signatures/strict/_expected/cjs/main.js b/test/chunking-form/samples/preserve-entry-signatures/strict/_expected/cjs/main.js index 85dcc48bca5..48b0c5d8247 100644 --- a/test/chunking-form/samples/preserve-entry-signatures/strict/_expected/cjs/main.js +++ b/test/chunking-form/samples/preserve-entry-signatures/strict/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var main = require('./generated-main.js'); diff --git a/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/amd/named.js b/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/amd/named.js index 1afc6d3f7b8..2896dcf1065 100644 --- a/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/amd/named.js +++ b/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/amd/named.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.value = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/cjs/named.js b/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/cjs/named.js index 491f8569447..ec20bc0d7ff 100644 --- a/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/cjs/named.js +++ b/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/cjs/named.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const value = 'named'; exports.value = value; diff --git a/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/_virtual/other.js b/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/_virtual/other.js index 4ded5921f4d..ab90c1d68e7 100644 --- a/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/_virtual/other.js +++ b/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/_virtual/other.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.__exports = other; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/commonjs.js b/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/commonjs.js index 65e2726bcbd..a9011e2b81f 100644 --- a/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/commonjs.js +++ b/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/commonjs.js @@ -1,10 +1,6 @@ define(['external', './other', './_virtual/other'], (function (require$$0, other$1, other) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0); - - const external = require$$0__default.default; + const external = require$$0; const { value } = other.__exports; console.log(external, value); diff --git a/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/main.js b/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/main.js index 0dd74645631..baedd1b3022 100644 --- a/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/main.js +++ b/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/main.js @@ -1,9 +1,5 @@ define(['./commonjs', 'external'], (function (commonjs, require$$0) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0); - - console.log(commonjs, require$$0__default.default); + console.log(commonjs, require$$0); })); diff --git a/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/_virtual/other.js b/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/_virtual/other.js index bc3ca602c7c..6569c1d2a46 100644 --- a/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/_virtual/other.js +++ b/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/_virtual/other.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var other = {}; exports.__exports = other; diff --git a/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/commonjs.js b/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/commonjs.js index 90ae84b17dc..18480b84377 100644 --- a/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/commonjs.js +++ b/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/commonjs.js @@ -4,11 +4,7 @@ var require$$0 = require('external'); require('./other.js'); var other = require('./_virtual/other.js'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0); - -const external = require$$0__default.default; +const external = require$$0; const { value } = other.__exports; console.log(external, value); diff --git a/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/main.js b/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/main.js index 9d28549cb8b..a38e116467f 100644 --- a/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/main.js +++ b/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/main.js @@ -3,8 +3,4 @@ var commonjs = require('./commonjs.js'); var require$$0 = require('external'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0); - -console.log(commonjs, require$$0__default.default); +console.log(commonjs, require$$0); diff --git a/test/chunking-form/samples/preserve-modules-default-mode-namespace/_expected/amd/main.js b/test/chunking-form/samples/preserve-modules-default-mode-namespace/_expected/amd/main.js index 5b33bd51aa0..523aba257a4 100644 --- a/test/chunking-form/samples/preserve-modules-default-mode-namespace/_expected/amd/main.js +++ b/test/chunking-form/samples/preserve-modules-default-mode-namespace/_expected/amd/main.js @@ -9,6 +9,4 @@ define(['require', 'exports', './lib'], (function (require, exports, lib) { 'use exports.lib = lib__namespace; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules-default-mode-namespace/_expected/cjs/main.js b/test/chunking-form/samples/preserve-modules-default-mode-namespace/_expected/cjs/main.js index 5b2984073cd..31a192f780e 100644 --- a/test/chunking-form/samples/preserve-modules-default-mode-namespace/_expected/cjs/main.js +++ b/test/chunking-form/samples/preserve-modules-default-mode-namespace/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var lib = require('./lib.js'); function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, default: e }); } diff --git a/test/chunking-form/samples/preserve-modules-dynamic-imports/_expected/amd/dynamic-included.js b/test/chunking-form/samples/preserve-modules-dynamic-imports/_expected/amd/dynamic-included.js index b32da5f0cc8..19414d6fd6d 100644 --- a/test/chunking-form/samples/preserve-modules-dynamic-imports/_expected/amd/dynamic-included.js +++ b/test/chunking-form/samples/preserve-modules-dynamic-imports/_expected/amd/dynamic-included.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.value = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules-dynamic-imports/_expected/cjs/dynamic-included.js b/test/chunking-form/samples/preserve-modules-dynamic-imports/_expected/cjs/dynamic-included.js index 2c8d642e303..7ce0b0473fe 100644 --- a/test/chunking-form/samples/preserve-modules-dynamic-imports/_expected/cjs/dynamic-included.js +++ b/test/chunking-form/samples/preserve-modules-dynamic-imports/_expected/cjs/dynamic-included.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const value = 'included'; exports.value = value; diff --git a/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/amd/m1.js b/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/amd/m1.js index 1933cc959ba..f5475ebcc07 100644 --- a/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/amd/m1.js +++ b/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/amd/m1.js @@ -5,6 +5,4 @@ define(['exports', './m2', './m3'], (function (exports, m2, m3) { 'use strict'; exports.m2 = m2; exports.m3 = m3; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/cjs/m1.js b/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/cjs/m1.js index 2dcf78656c6..bd9f1e27347 100644 --- a/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/cjs/m1.js +++ b/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/cjs/m1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var m2 = require('./m2.js'); var m3 = require('./m3.js'); diff --git a/test/chunking-form/samples/preserve-modules-export-alias/_expected/amd/dep.js b/test/chunking-form/samples/preserve-modules-export-alias/_expected/amd/dep.js index 3c6da13690d..42ccc5f1207 100644 --- a/test/chunking-form/samples/preserve-modules-export-alias/_expected/amd/dep.js +++ b/test/chunking-form/samples/preserve-modules-export-alias/_expected/amd/dep.js @@ -5,6 +5,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.bar = foo; exports.foo = foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules-export-alias/_expected/amd/main1.js b/test/chunking-form/samples/preserve-modules-export-alias/_expected/amd/main1.js index 6a9c4156910..a9086d328ff 100644 --- a/test/chunking-form/samples/preserve-modules-export-alias/_expected/amd/main1.js +++ b/test/chunking-form/samples/preserve-modules-export-alias/_expected/amd/main1.js @@ -5,6 +5,4 @@ define(['exports', './dep'], (function (exports, dep) { 'use strict'; exports.bar = dep.foo; exports.foo = dep.foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules-export-alias/_expected/amd/main2.js b/test/chunking-form/samples/preserve-modules-export-alias/_expected/amd/main2.js index 518837a6cba..43cad3604ac 100644 --- a/test/chunking-form/samples/preserve-modules-export-alias/_expected/amd/main2.js +++ b/test/chunking-form/samples/preserve-modules-export-alias/_expected/amd/main2.js @@ -4,6 +4,4 @@ define(['exports', './dep'], (function (exports, dep) { 'use strict'; exports.bar = dep.foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules-export-alias/_expected/cjs/dep.js b/test/chunking-form/samples/preserve-modules-export-alias/_expected/cjs/dep.js index 7bf4532c451..ce2fd9a6532 100644 --- a/test/chunking-form/samples/preserve-modules-export-alias/_expected/cjs/dep.js +++ b/test/chunking-form/samples/preserve-modules-export-alias/_expected/cjs/dep.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const foo = 1; exports.bar = foo; diff --git a/test/chunking-form/samples/preserve-modules-export-alias/_expected/cjs/main1.js b/test/chunking-form/samples/preserve-modules-export-alias/_expected/cjs/main1.js index 801c4e75c53..f9483644b72 100644 --- a/test/chunking-form/samples/preserve-modules-export-alias/_expected/cjs/main1.js +++ b/test/chunking-form/samples/preserve-modules-export-alias/_expected/cjs/main1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var dep = require('./dep.js'); diff --git a/test/chunking-form/samples/preserve-modules-export-alias/_expected/cjs/main2.js b/test/chunking-form/samples/preserve-modules-export-alias/_expected/cjs/main2.js index 1c1f62cd337..68babfaabf9 100644 --- a/test/chunking-form/samples/preserve-modules-export-alias/_expected/cjs/main2.js +++ b/test/chunking-form/samples/preserve-modules-export-alias/_expected/cjs/main2.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var dep = require('./dep.js'); diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/main-amd-51321eb1.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/main-amd-c6b04a3d.js similarity index 87% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/main-amd-51321eb1.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/main-amd-c6b04a3d.js index c9c83013097..55eaa129472 100644 --- a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/main-amd-51321eb1.js +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/main-amd-c6b04a3d.js @@ -12,6 +12,4 @@ define(['exports', './nested/a-amd-5dc7856c', './b.str-amd-f73e15b9', './c-amd-c exports.h = h; exports.x = noExt; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/main-cjs-92cd000c.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/main-cjs-7c9c9af9.js similarity index 89% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/main-cjs-92cd000c.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/main-cjs-7c9c9af9.js index b1dea40f98f..89e6a423970 100644 --- a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/main-cjs-92cd000c.js +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/main-cjs-7c9c9af9.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var a = require('./nested/a-cjs-80f9b8c3.js'); var b = require('./b.str-cjs-6703f3b2.js'); var c = require('./c-cjs-71ac0098.js'); diff --git a/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/amd/named.js b/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/amd/named.js index 1afc6d3f7b8..2896dcf1065 100644 --- a/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/amd/named.js +++ b/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/amd/named.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.value = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/cjs/named.js b/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/cjs/named.js index 491f8569447..ec20bc0d7ff 100644 --- a/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/cjs/named.js +++ b/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/cjs/named.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const value = 'named'; exports.value = value; diff --git a/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/amd/main.js b/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/amd/main.js index 7b07b87a9e6..0a1b6a12cba 100644 --- a/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/amd/main.js +++ b/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/amd/main.js @@ -5,6 +5,4 @@ define(['exports', './module-a/v1/index', './module-b/v1/index'], (function (exp exports.ModuleA_V1 = index; exports.ModuleB_V1 = index$1; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/amd/module-a/v1/index.js b/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/amd/module-a/v1/index.js index 315abd02795..6b677084b74 100644 --- a/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/amd/module-a/v1/index.js +++ b/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/amd/module-a/v1/index.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.TEST_MODULE_A = TEST_MODULE_A; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/amd/module-b/v1/index.js b/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/amd/module-b/v1/index.js index dfd4f52cf95..5d1b35b6a7e 100644 --- a/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/amd/module-b/v1/index.js +++ b/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/amd/module-b/v1/index.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.TEST_MODULE_B = TEST_MODULE_B; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/cjs/main.js b/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/cjs/main.js index 632ce47b9ae..85ed071a23c 100644 --- a/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/cjs/main.js +++ b/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var index = require('./module-a/v1/index.js'); var index$1 = require('./module-b/v1/index.js'); diff --git a/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/cjs/module-a/v1/index.js b/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/cjs/module-a/v1/index.js index a8ab4802133..6f57cdac859 100644 --- a/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/cjs/module-a/v1/index.js +++ b/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/cjs/module-a/v1/index.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const TEST_MODULE_A = 'A'; exports.TEST_MODULE_A = TEST_MODULE_A; diff --git a/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/cjs/module-b/v1/index.js b/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/cjs/module-b/v1/index.js index 2c2b23c7d63..99cce36ed4d 100644 --- a/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/cjs/module-b/v1/index.js +++ b/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/cjs/module-b/v1/index.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const TEST_MODULE_B = 'A'; exports.TEST_MODULE_B = TEST_MODULE_B; diff --git a/test/chunking-form/samples/preserve-modules-nested-export/_expected/amd/inner/more_inner/something.js b/test/chunking-form/samples/preserve-modules-nested-export/_expected/amd/inner/more_inner/something.js index 8f479d12f01..9e690e2c1a8 100644 --- a/test/chunking-form/samples/preserve-modules-nested-export/_expected/amd/inner/more_inner/something.js +++ b/test/chunking-form/samples/preserve-modules-nested-export/_expected/amd/inner/more_inner/something.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.Something = Something; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules-nested-export/_expected/amd/main.js b/test/chunking-form/samples/preserve-modules-nested-export/_expected/amd/main.js index 48856b23109..8519607224b 100644 --- a/test/chunking-form/samples/preserve-modules-nested-export/_expected/amd/main.js +++ b/test/chunking-form/samples/preserve-modules-nested-export/_expected/amd/main.js @@ -4,6 +4,4 @@ define(['exports', './inner/more_inner/something', './inner/some_effect'], (func exports.Something = something.Something; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules-nested-export/_expected/cjs/inner/more_inner/something.js b/test/chunking-form/samples/preserve-modules-nested-export/_expected/cjs/inner/more_inner/something.js index 32f3040b7c0..12aa3ba79a7 100644 --- a/test/chunking-form/samples/preserve-modules-nested-export/_expected/cjs/inner/more_inner/something.js +++ b/test/chunking-form/samples/preserve-modules-nested-export/_expected/cjs/inner/more_inner/something.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const Something = 'Hello World'; exports.Something = Something; diff --git a/test/chunking-form/samples/preserve-modules-nested-export/_expected/cjs/main.js b/test/chunking-form/samples/preserve-modules-nested-export/_expected/cjs/main.js index ffa1d0bc5bb..affdcc85a46 100644 --- a/test/chunking-form/samples/preserve-modules-nested-export/_expected/cjs/main.js +++ b/test/chunking-form/samples/preserve-modules-nested-export/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var something = require('./inner/more_inner/something.js'); require('./inner/some_effect.js'); diff --git a/test/chunking-form/samples/preserve-modules-proxy-import/_expected/amd/main.js b/test/chunking-form/samples/preserve-modules-proxy-import/_expected/amd/main.js index f3229946c06..b58d356d5af 100644 --- a/test/chunking-form/samples/preserve-modules-proxy-import/_expected/amd/main.js +++ b/test/chunking-form/samples/preserve-modules-proxy-import/_expected/amd/main.js @@ -1,10 +1,6 @@ define(['external'], (function (path) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var path__default = /*#__PURE__*/_interopDefaultLegacy(path); - - console.log(path__default.default.normalize('foo\\bar')); - console.log(path__default.default.normalize('foo\\bar')); + console.log(path.normalize('foo\\bar')); + console.log(path.normalize('foo\\bar')); })); diff --git a/test/chunking-form/samples/preserve-modules-proxy-import/_expected/amd/proxy.js b/test/chunking-form/samples/preserve-modules-proxy-import/_expected/amd/proxy.js index 9f25625718f..40b6b7b8b15 100644 --- a/test/chunking-form/samples/preserve-modules-proxy-import/_expected/amd/proxy.js +++ b/test/chunking-form/samples/preserve-modules-proxy-import/_expected/amd/proxy.js @@ -1,11 +1,7 @@ define(['external'], (function (path) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - var path__default = /*#__PURE__*/_interopDefaultLegacy(path); - - - return path__default.default; + return path; })); diff --git a/test/chunking-form/samples/preserve-modules-proxy-import/_expected/cjs/main.js b/test/chunking-form/samples/preserve-modules-proxy-import/_expected/cjs/main.js index 7072d29b676..7db07e7274a 100644 --- a/test/chunking-form/samples/preserve-modules-proxy-import/_expected/cjs/main.js +++ b/test/chunking-form/samples/preserve-modules-proxy-import/_expected/cjs/main.js @@ -2,9 +2,5 @@ var path = require('external'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -var path__default = /*#__PURE__*/_interopDefaultLegacy(path); - -console.log(path__default.default.normalize('foo\\bar')); -console.log(path__default.default.normalize('foo\\bar')); +console.log(path.normalize('foo\\bar')); +console.log(path.normalize('foo\\bar')); diff --git a/test/chunking-form/samples/preserve-modules-proxy-import/_expected/cjs/proxy.js b/test/chunking-form/samples/preserve-modules-proxy-import/_expected/cjs/proxy.js index 4696b104731..de6089fad1b 100644 --- a/test/chunking-form/samples/preserve-modules-proxy-import/_expected/cjs/proxy.js +++ b/test/chunking-form/samples/preserve-modules-proxy-import/_expected/cjs/proxy.js @@ -2,10 +2,6 @@ var path = require('external'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } -var path__default = /*#__PURE__*/_interopDefaultLegacy(path); - - -module.exports = path__default.default; +module.exports = path; diff --git a/test/chunking-form/samples/preserve-modules-reaching-outside/_expected/amd/dep.js b/test/chunking-form/samples/preserve-modules-reaching-outside/_expected/amd/dep.js index 075d3efdd11..e919531b930 100644 --- a/test/chunking-form/samples/preserve-modules-reaching-outside/_expected/amd/dep.js +++ b/test/chunking-form/samples/preserve-modules-reaching-outside/_expected/amd/dep.js @@ -6,6 +6,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.fn = fn; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules-reaching-outside/_expected/cjs/dep.js b/test/chunking-form/samples/preserve-modules-reaching-outside/_expected/cjs/dep.js index b67a1e41d97..119bca3ddc7 100644 --- a/test/chunking-form/samples/preserve-modules-reaching-outside/_expected/cjs/dep.js +++ b/test/chunking-form/samples/preserve-modules-reaching-outside/_expected/cjs/dep.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - function fn () { console.log('dep fn'); } diff --git a/test/chunking-form/samples/preserve-modules-root/_expected/amd/_virtual/index.js b/test/chunking-form/samples/preserve-modules-root/_expected/amd/_virtual/index.js index 1a20725899e..de1c8bfd4b5 100644 --- a/test/chunking-form/samples/preserve-modules-root/_expected/amd/_virtual/index.js +++ b/test/chunking-form/samples/preserve-modules-root/_expected/amd/_virtual/index.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.__exports = myBasePkg; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules-root/_expected/cjs/_virtual/index.js b/test/chunking-form/samples/preserve-modules-root/_expected/cjs/_virtual/index.js index ad613c469e5..a63ab9198a2 100644 --- a/test/chunking-form/samples/preserve-modules-root/_expected/cjs/_virtual/index.js +++ b/test/chunking-form/samples/preserve-modules-root/_expected/cjs/_virtual/index.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var myBasePkg = {}; exports.__exports = myBasePkg; diff --git a/test/chunking-form/samples/preserve-modules-scriptified-assets/_expected/amd/main.js b/test/chunking-form/samples/preserve-modules-scriptified-assets/_expected/amd/main.js index 75f282a2bc1..11b93e1cea6 100644 --- a/test/chunking-form/samples/preserve-modules-scriptified-assets/_expected/amd/main.js +++ b/test/chunking-form/samples/preserve-modules-scriptified-assets/_expected/amd/main.js @@ -6,6 +6,4 @@ define(['exports', './answer.num', './lorem.str', './no-ext'], (function (export exports.lorem = lorem; exports.noExt = noExt; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules-scriptified-assets/_expected/cjs/main.js b/test/chunking-form/samples/preserve-modules-scriptified-assets/_expected/cjs/main.js index 0c13700934e..463a11a27e6 100644 --- a/test/chunking-form/samples/preserve-modules-scriptified-assets/_expected/cjs/main.js +++ b/test/chunking-form/samples/preserve-modules-scriptified-assets/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var answer = require('./answer.num.js'); var lorem = require('./lorem.str.js'); var noExt = require('./no-ext.js'); diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualModule-amd-4e388e40.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualModule-amd-03552e5c.mjs similarity index 65% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualModule-amd-4e388e40.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualModule-amd-03552e5c.mjs index ce212753ac0..dc4e209f365 100644 --- a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualModule-amd-4e388e40.mjs +++ b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualModule-amd-03552e5c.mjs @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.virtual = virtual; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualWithAssetExt.str-amd-4deed186.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualWithAssetExt.str-amd-724c602d.mjs similarity index 65% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualWithAssetExt.str-amd-4deed186.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualWithAssetExt.str-amd-724c602d.mjs index 41ae4d0466c..9884d224922 100644 --- a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualWithAssetExt.str-amd-4deed186.mjs +++ b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualWithAssetExt.str-amd-724c602d.mjs @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.virtual3 = virtual3; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualWithExt-amd-41e5e75e.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualWithExt-amd-e9dc1b7e.mjs similarity index 65% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualWithExt-amd-41e5e75e.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualWithExt-amd-e9dc1b7e.mjs index b59abe59669..93ea3381bfa 100644 --- a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualWithExt-amd-41e5e75e.mjs +++ b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualWithExt-amd-e9dc1b7e.mjs @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.virtual2 = virtual2; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/main-amd-eb6187f3.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/main-amd-7efb1bed.mjs similarity index 53% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/main-amd-eb6187f3.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/main-amd-7efb1bed.mjs index 8b67d09757f..05b7abceb0f 100644 --- a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/main-amd-eb6187f3.mjs +++ b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/main-amd-7efb1bed.mjs @@ -1,4 +1,4 @@ -define(['./_virtual/_virtualModule-amd-4e388e40.mjs', './_virtual/_virtualWithExt-amd-41e5e75e.mjs', './_virtual/_virtualWithAssetExt.str-amd-4deed186.mjs'], (function (_virtualModule, _virtualWithExt, _virtualWithAssetExt) { 'use strict'; +define(['./_virtual/_virtualModule-amd-03552e5c.mjs', './_virtual/_virtualWithExt-amd-e9dc1b7e.mjs', './_virtual/_virtualWithAssetExt.str-amd-724c602d.mjs'], (function (_virtualModule, _virtualWithExt, _virtualWithAssetExt) { 'use strict'; assert.equal(_virtualModule.virtual, 'Virtual!'); assert.equal(_virtualWithExt.virtual2, 'Virtual2!'); diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualModule-cjs-650c7f9a.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualModule-cjs-bbe1ad5e.mjs similarity index 52% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualModule-cjs-650c7f9a.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualModule-cjs-bbe1ad5e.mjs index 3b40ebf67c2..266f8b02432 100644 --- a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualModule-cjs-650c7f9a.mjs +++ b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualModule-cjs-bbe1ad5e.mjs @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const virtual = "Virtual!"; exports.virtual = virtual; diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualWithAssetExt.str-cjs-63fd96f4.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualWithAssetExt.str-cjs-0e561611.mjs similarity index 53% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualWithAssetExt.str-cjs-63fd96f4.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualWithAssetExt.str-cjs-0e561611.mjs index 1be612fa656..86d86076aa7 100644 --- a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualWithAssetExt.str-cjs-63fd96f4.mjs +++ b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualWithAssetExt.str-cjs-0e561611.mjs @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const virtual3 = "Virtual3!"; exports.virtual3 = virtual3; diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualWithExt-cjs-c612470d.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualWithExt-cjs-b148ca33.mjs similarity index 53% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualWithExt-cjs-c612470d.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualWithExt-cjs-b148ca33.mjs index 6c1f17fcbe4..97d09a41ce6 100644 --- a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualWithExt-cjs-c612470d.mjs +++ b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualWithExt-cjs-b148ca33.mjs @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const virtual2 = "Virtual2!"; exports.virtual2 = virtual2; diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/main-cjs-d0c7e6cf.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/main-cjs-f7b1940b.mjs similarity index 56% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/main-cjs-d0c7e6cf.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/main-cjs-f7b1940b.mjs index 17c1d84ef96..7246a157d47 100644 --- a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/main-cjs-d0c7e6cf.mjs +++ b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/main-cjs-f7b1940b.mjs @@ -1,8 +1,8 @@ 'use strict'; -var _virtualModule = require('./_virtual/_virtualModule-cjs-650c7f9a.mjs'); -var _virtualWithExt = require('./_virtual/_virtualWithExt-cjs-c612470d.mjs'); -var _virtualWithAssetExt = require('./_virtual/_virtualWithAssetExt.str-cjs-63fd96f4.mjs'); +var _virtualModule = require('./_virtual/_virtualModule-cjs-bbe1ad5e.mjs'); +var _virtualWithExt = require('./_virtual/_virtualWithExt-cjs-b148ca33.mjs'); +var _virtualWithAssetExt = require('./_virtual/_virtualWithAssetExt.str-cjs-0e561611.mjs'); assert.equal(_virtualModule.virtual, 'Virtual!'); assert.equal(_virtualWithExt.virtual2, 'Virtual2!'); diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules/_expected/amd/_virtual/_virtualModule.js b/test/chunking-form/samples/preserve-modules-virtual-modules/_expected/amd/_virtual/_virtualModule.js index ce212753ac0..dc4e209f365 100644 --- a/test/chunking-form/samples/preserve-modules-virtual-modules/_expected/amd/_virtual/_virtualModule.js +++ b/test/chunking-form/samples/preserve-modules-virtual-modules/_expected/amd/_virtual/_virtualModule.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.virtual = virtual; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules/_expected/cjs/_virtual/_virtualModule.js b/test/chunking-form/samples/preserve-modules-virtual-modules/_expected/cjs/_virtual/_virtualModule.js index 3b40ebf67c2..266f8b02432 100644 --- a/test/chunking-form/samples/preserve-modules-virtual-modules/_expected/cjs/_virtual/_virtualModule.js +++ b/test/chunking-form/samples/preserve-modules-virtual-modules/_expected/cjs/_virtual/_virtualModule.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const virtual = "Virtual!"; exports.virtual = virtual; diff --git a/test/chunking-form/samples/preserve-modules/_expected/amd/deps/dep1.js b/test/chunking-form/samples/preserve-modules/_expected/amd/deps/dep1.js index 9e70a0993ae..59783d02d35 100644 --- a/test/chunking-form/samples/preserve-modules/_expected/amd/deps/dep1.js +++ b/test/chunking-form/samples/preserve-modules/_expected/amd/deps/dep1.js @@ -6,6 +6,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.fn = fn; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules/_expected/amd/deps/dep2.js b/test/chunking-form/samples/preserve-modules/_expected/amd/deps/dep2.js index adf251cb993..2ab2557abf3 100644 --- a/test/chunking-form/samples/preserve-modules/_expected/amd/deps/dep2.js +++ b/test/chunking-form/samples/preserve-modules/_expected/amd/deps/dep2.js @@ -7,6 +7,4 @@ define(['exports', '../lib/lib2'], (function (exports, lib2) { 'use strict'; exports.fn = fn; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules/_expected/amd/deps/dep3.js b/test/chunking-form/samples/preserve-modules/_expected/amd/deps/dep3.js index 5e20b792948..3b871ce769d 100644 --- a/test/chunking-form/samples/preserve-modules/_expected/amd/deps/dep3.js +++ b/test/chunking-form/samples/preserve-modules/_expected/amd/deps/dep3.js @@ -7,6 +7,4 @@ define(['exports', '../lib/lib1'], (function (exports, lib1) { 'use strict'; exports.fn = fn; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules/_expected/amd/lib/lib1.js b/test/chunking-form/samples/preserve-modules/_expected/amd/lib/lib1.js index aa9fbe18f60..6d846653cf3 100644 --- a/test/chunking-form/samples/preserve-modules/_expected/amd/lib/lib1.js +++ b/test/chunking-form/samples/preserve-modules/_expected/amd/lib/lib1.js @@ -6,6 +6,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.fn = fn; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules/_expected/amd/lib/lib2.js b/test/chunking-form/samples/preserve-modules/_expected/amd/lib/lib2.js index d05a867696b..be6d55fa49d 100644 --- a/test/chunking-form/samples/preserve-modules/_expected/amd/lib/lib2.js +++ b/test/chunking-form/samples/preserve-modules/_expected/amd/lib/lib2.js @@ -6,6 +6,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.fn = fn; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules/_expected/cjs/deps/dep1.js b/test/chunking-form/samples/preserve-modules/_expected/cjs/deps/dep1.js index 94bfa086430..5d2f022faa9 100644 --- a/test/chunking-form/samples/preserve-modules/_expected/cjs/deps/dep1.js +++ b/test/chunking-form/samples/preserve-modules/_expected/cjs/deps/dep1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - function fn () { console.log('dep1 fn'); } diff --git a/test/chunking-form/samples/preserve-modules/_expected/cjs/deps/dep2.js b/test/chunking-form/samples/preserve-modules/_expected/cjs/deps/dep2.js index a9f8fb62635..1c35a7c280c 100644 --- a/test/chunking-form/samples/preserve-modules/_expected/cjs/deps/dep2.js +++ b/test/chunking-form/samples/preserve-modules/_expected/cjs/deps/dep2.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var lib2 = require('../lib/lib2.js'); function fn () { diff --git a/test/chunking-form/samples/preserve-modules/_expected/cjs/deps/dep3.js b/test/chunking-form/samples/preserve-modules/_expected/cjs/deps/dep3.js index eb901c61adc..9459cf55dea 100644 --- a/test/chunking-form/samples/preserve-modules/_expected/cjs/deps/dep3.js +++ b/test/chunking-form/samples/preserve-modules/_expected/cjs/deps/dep3.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var lib1 = require('../lib/lib1.js'); function fn () { diff --git a/test/chunking-form/samples/preserve-modules/_expected/cjs/lib/lib1.js b/test/chunking-form/samples/preserve-modules/_expected/cjs/lib/lib1.js index 135c3023fcc..6a9d99129d3 100644 --- a/test/chunking-form/samples/preserve-modules/_expected/cjs/lib/lib1.js +++ b/test/chunking-form/samples/preserve-modules/_expected/cjs/lib/lib1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - function fn () { console.log('lib1 fn'); } diff --git a/test/chunking-form/samples/preserve-modules/_expected/cjs/lib/lib2.js b/test/chunking-form/samples/preserve-modules/_expected/cjs/lib/lib2.js index ee3ad249352..cf6e36b03dd 100644 --- a/test/chunking-form/samples/preserve-modules/_expected/cjs/lib/lib2.js +++ b/test/chunking-form/samples/preserve-modules/_expected/cjs/lib/lib2.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - function fn () { console.log('lib2 fn'); } diff --git a/test/chunking-form/samples/reexport-from-entry/_expected/amd/main.js b/test/chunking-form/samples/reexport-from-entry/_expected/amd/main.js index 8b85c58c9bf..cf1d940d8f5 100644 --- a/test/chunking-form/samples/reexport-from-entry/_expected/amd/main.js +++ b/test/chunking-form/samples/reexport-from-entry/_expected/amd/main.js @@ -5,6 +5,4 @@ define(['exports', './generated-otherEntry'], (function (exports, otherEntry) { exports.a = otherEntry.a; exports.c = otherEntry.c; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/reexport-from-entry/_expected/amd/otherEntry.js b/test/chunking-form/samples/reexport-from-entry/_expected/amd/otherEntry.js index 3cfe39bf80b..e24b7772193 100644 --- a/test/chunking-form/samples/reexport-from-entry/_expected/amd/otherEntry.js +++ b/test/chunking-form/samples/reexport-from-entry/_expected/amd/otherEntry.js @@ -5,6 +5,4 @@ define(['exports', './generated-otherEntry'], (function (exports, otherEntry) { exports.b = otherEntry.b; exports.c = otherEntry.c; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/reexport-from-entry/_expected/cjs/main.js b/test/chunking-form/samples/reexport-from-entry/_expected/cjs/main.js index f20f54e462f..9724777d3fa 100644 --- a/test/chunking-form/samples/reexport-from-entry/_expected/cjs/main.js +++ b/test/chunking-form/samples/reexport-from-entry/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var otherEntry = require('./generated-otherEntry.js'); diff --git a/test/chunking-form/samples/reexport-from-entry/_expected/cjs/otherEntry.js b/test/chunking-form/samples/reexport-from-entry/_expected/cjs/otherEntry.js index 683a67be054..7cbc7f97253 100644 --- a/test/chunking-form/samples/reexport-from-entry/_expected/cjs/otherEntry.js +++ b/test/chunking-form/samples/reexport-from-entry/_expected/cjs/otherEntry.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var otherEntry = require('./generated-otherEntry.js'); diff --git a/test/chunking-form/samples/resolve-dynamic-import/_expected/amd/main.js b/test/chunking-form/samples/resolve-dynamic-import/_expected/amd/main.js index 6d2c7a27f75..9b96903bba5 100644 --- a/test/chunking-form/samples/resolve-dynamic-import/_expected/amd/main.js +++ b/test/chunking-form/samples/resolve-dynamic-import/_expected/amd/main.js @@ -1,7 +1,6 @@ define(['require', './direct-relative-external', 'to-indirect-relative-external', 'direct-absolute-external', 'to-indirect-absolute-external'], (function (require, directRelativeExternal, toIndirectRelativeExternal, directAbsoluteExternal, toIndirectAbsoluteExternal) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -20,10 +19,10 @@ define(['require', './direct-relative-external', 'to-indirect-relative-external' // nested Promise.resolve().then(function () { return existing; }); - new Promise(function (resolve, reject) { require(['./direct-relative-external'], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }); - new Promise(function (resolve, reject) { require(['to-indirect-relative-external'], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }); - new Promise(function (resolve, reject) { require(['direct-absolute-external'], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }); - new Promise(function (resolve, reject) { require(['to-indirect-absolute-external'], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }); + new Promise(function (resolve, reject) { require(['./direct-relative-external'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); + new Promise(function (resolve, reject) { require(['to-indirect-relative-external'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); + new Promise(function (resolve, reject) { require(['direct-absolute-external'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); + new Promise(function (resolve, reject) { require(['to-indirect-absolute-external'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); const value = 'existing'; console.log('existing'); @@ -35,14 +34,14 @@ define(['require', './direct-relative-external', 'to-indirect-relative-external' //main Promise.resolve().then(function () { return existing; }); - new Promise(function (resolve, reject) { require(['./direct-relative-external'], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }); - new Promise(function (resolve, reject) { require(['to-indirect-relative-external'], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }); - new Promise(function (resolve, reject) { require(['direct-absolute-external'], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }); - new Promise(function (resolve, reject) { require(['to-indirect-absolute-external'], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }); + new Promise(function (resolve, reject) { require(['./direct-relative-external'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); + new Promise(function (resolve, reject) { require(['to-indirect-relative-external'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); + new Promise(function (resolve, reject) { require(['direct-absolute-external'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); + new Promise(function (resolve, reject) { require(['to-indirect-absolute-external'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); - (function (t) { return new Promise(function (resolve, reject) { require([t], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }); })('dynamic-direct-external' + unknown); - new Promise(function (resolve, reject) { require(['to-dynamic-indirect-external'], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }); + (function (t) { return new Promise(function (resolve, reject) { require([t], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); })('dynamic-direct-external' + unknown); + new Promise(function (resolve, reject) { require(['to-dynamic-indirect-external'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); Promise.resolve().then(function () { return existing; }); - (function (t) { return new Promise(function (resolve, reject) { require([t], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }); })('my' + 'replacement'); + (function (t) { return new Promise(function (resolve, reject) { require([t], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); })('my' + 'replacement'); })); diff --git a/test/chunking-form/samples/resolve-dynamic-import/_expected/cjs/main.js b/test/chunking-form/samples/resolve-dynamic-import/_expected/cjs/main.js index d398abdb3cd..288899da9cd 100644 --- a/test/chunking-form/samples/resolve-dynamic-import/_expected/cjs/main.js +++ b/test/chunking-form/samples/resolve-dynamic-import/_expected/cjs/main.js @@ -5,8 +5,7 @@ require('to-indirect-relative-external'); require('direct-absolute-external'); require('to-indirect-absolute-external'); -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -25,10 +24,10 @@ function _interopNamespace(e) { // nested Promise.resolve().then(function () { return existing; }); -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('./direct-relative-external')); }); -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('to-indirect-relative-external')); }); -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('direct-absolute-external')); }); -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('to-indirect-absolute-external')); }); +Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('./direct-relative-external')); }); +Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('to-indirect-relative-external')); }); +Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('direct-absolute-external')); }); +Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('to-indirect-absolute-external')); }); const value = 'existing'; console.log('existing'); @@ -40,12 +39,12 @@ var existing = /*#__PURE__*/Object.freeze({ //main Promise.resolve().then(function () { return existing; }); -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('./direct-relative-external')); }); -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('to-indirect-relative-external')); }); -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('direct-absolute-external')); }); -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('to-indirect-absolute-external')); }); +Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('./direct-relative-external')); }); +Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('to-indirect-relative-external')); }); +Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('direct-absolute-external')); }); +Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('to-indirect-absolute-external')); }); -(function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(t)); }); })('dynamic-direct-external' + unknown); -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('to-dynamic-indirect-external')); }); +(function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require(t)); }); })('dynamic-direct-external' + unknown); +Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('to-dynamic-indirect-external')); }); Promise.resolve().then(function () { return existing; }); -(function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(t)); }); })('my' + 'replacement'); +(function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require(t)); }); })('my' + 'replacement'); diff --git a/test/chunking-form/samples/sanitize-internal-exports/_expected/amd/main.js b/test/chunking-form/samples/sanitize-internal-exports/_expected/amd/main.js index 731b8e8dde7..05da39c0842 100644 --- a/test/chunking-form/samples/sanitize-internal-exports/_expected/amd/main.js +++ b/test/chunking-form/samples/sanitize-internal-exports/_expected/amd/main.js @@ -549,6 +549,4 @@ define(['require', 'exports'], (function (require, exports) { 'use strict'; exports.v98 = v98; exports.v99 = v99; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/sanitize-internal-exports/_expected/cjs/main.js b/test/chunking-form/samples/sanitize-internal-exports/_expected/cjs/main.js index 37dd0facd48..a496761c74c 100644 --- a/test/chunking-form/samples/sanitize-internal-exports/_expected/cjs/main.js +++ b/test/chunking-form/samples/sanitize-internal-exports/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var v1, v2, v3, diff --git a/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/amd/a.js b/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/amd/a.js index 569e0dbc58b..3cffb947ed7 100644 --- a/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/amd/a.js +++ b/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/amd/a.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.a = a; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/amd/b.js b/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/amd/b.js index bc6adf18b83..b24bc116cef 100644 --- a/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/amd/b.js +++ b/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/amd/b.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.b = b; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/amd/one.js b/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/amd/one.js index 3db39871d7d..2c0c07355e0 100644 --- a/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/amd/one.js +++ b/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/amd/one.js @@ -4,6 +4,4 @@ define(['exports', './b'], (function (exports, b) { 'use strict'; exports.d = d; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/cjs/a.js b/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/cjs/a.js index 97007408241..418c69d2577 100644 --- a/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/cjs/a.js +++ b/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/cjs/a.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const a = 1; exports.a = a; diff --git a/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/cjs/b.js b/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/cjs/b.js index 3c417e8458a..f3fc6f22489 100644 --- a/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/cjs/b.js +++ b/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/cjs/b.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const b = 2; exports.b = b; diff --git a/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/cjs/one.js b/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/cjs/one.js index 9eea4c87a9f..98e3a99e3a3 100644 --- a/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/cjs/one.js +++ b/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/cjs/one.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var b = require('./b.js'); const d = b.b + 4; diff --git a/test/chunking-form/samples/side-effect-free-dependencies/module-side-effects-reexports-1/_expected/amd/main.js b/test/chunking-form/samples/side-effect-free-dependencies/module-side-effects-reexports-1/_expected/amd/main.js index 106eba6b3f5..947ad1cbafd 100644 --- a/test/chunking-form/samples/side-effect-free-dependencies/module-side-effects-reexports-1/_expected/amd/main.js +++ b/test/chunking-form/samples/side-effect-free-dependencies/module-side-effects-reexports-1/_expected/amd/main.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.value = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/side-effect-free-dependencies/module-side-effects-reexports-1/_expected/cjs/main.js b/test/chunking-form/samples/side-effect-free-dependencies/module-side-effects-reexports-1/_expected/cjs/main.js index 181fa0fd711..9549eb32880 100644 --- a/test/chunking-form/samples/side-effect-free-dependencies/module-side-effects-reexports-1/_expected/cjs/main.js +++ b/test/chunking-form/samples/side-effect-free-dependencies/module-side-effects-reexports-1/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const value = 42; exports.value = value; diff --git a/test/chunking-form/samples/side-effect-free-dependencies/module-side-effects-reexports-2/_expected/amd/main.js b/test/chunking-form/samples/side-effect-free-dependencies/module-side-effects-reexports-2/_expected/amd/main.js index 106eba6b3f5..947ad1cbafd 100644 --- a/test/chunking-form/samples/side-effect-free-dependencies/module-side-effects-reexports-2/_expected/amd/main.js +++ b/test/chunking-form/samples/side-effect-free-dependencies/module-side-effects-reexports-2/_expected/amd/main.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.value = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/side-effect-free-dependencies/module-side-effects-reexports-2/_expected/cjs/main.js b/test/chunking-form/samples/side-effect-free-dependencies/module-side-effects-reexports-2/_expected/cjs/main.js index 181fa0fd711..9549eb32880 100644 --- a/test/chunking-form/samples/side-effect-free-dependencies/module-side-effects-reexports-2/_expected/cjs/main.js +++ b/test/chunking-form/samples/side-effect-free-dependencies/module-side-effects-reexports-2/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const value = 42; exports.value = value; diff --git a/test/chunking-form/samples/side-effect-free-dependencies/module-side-effects-reexports-3/_expected/amd/main.js b/test/chunking-form/samples/side-effect-free-dependencies/module-side-effects-reexports-3/_expected/amd/main.js index 106eba6b3f5..947ad1cbafd 100644 --- a/test/chunking-form/samples/side-effect-free-dependencies/module-side-effects-reexports-3/_expected/amd/main.js +++ b/test/chunking-form/samples/side-effect-free-dependencies/module-side-effects-reexports-3/_expected/amd/main.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.value = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/side-effect-free-dependencies/module-side-effects-reexports-3/_expected/cjs/main.js b/test/chunking-form/samples/side-effect-free-dependencies/module-side-effects-reexports-3/_expected/cjs/main.js index 181fa0fd711..9549eb32880 100644 --- a/test/chunking-form/samples/side-effect-free-dependencies/module-side-effects-reexports-3/_expected/cjs/main.js +++ b/test/chunking-form/samples/side-effect-free-dependencies/module-side-effects-reexports-3/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const value = 42; exports.value = value; diff --git a/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/amd/main.js b/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/amd/main.js index 93ff4794d05..5499ce03b53 100644 --- a/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/amd/main.js +++ b/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/amd/main.js @@ -5,6 +5,4 @@ define(['exports', './generated-main'], (function (exports, main) { 'use strict' exports.component = main.component; exports.lib = main.lib.named.named; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/cjs/main.js b/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/cjs/main.js index 351234d241f..e8fba38781c 100644 --- a/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/cjs/main.js +++ b/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var main = require('./generated-main.js'); diff --git a/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/amd/main1.js b/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/amd/main1.js index 5b254674d37..07a94775028 100644 --- a/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/amd/main1.js +++ b/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/amd/main1.js @@ -5,6 +5,4 @@ define(['exports', './generated-lib'], (function (exports, lib) { 'use strict'; exports.lib = lib.lib; exports.foo = lib.lib.foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/amd/main3.js b/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/amd/main3.js index 90dcca15826..be4a1a8fdf9 100644 --- a/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/amd/main3.js +++ b/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/amd/main3.js @@ -4,6 +4,4 @@ define(['exports', './generated-lib'], (function (exports, lib) { 'use strict'; exports.foo = lib.lib.foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/cjs/main1.js b/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/cjs/main1.js index c161933fa8b..4f7923b2b8c 100644 --- a/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/cjs/main1.js +++ b/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/cjs/main1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var lib = require('./generated-lib.js'); diff --git a/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/cjs/main3.js b/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/cjs/main3.js index 060e43c4807..3f2efa8bba9 100644 --- a/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/cjs/main3.js +++ b/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/cjs/main3.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var lib = require('./generated-lib.js'); diff --git a/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/amd/main.js b/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/amd/main.js index e8c39a4648c..12f2cfbf093 100644 --- a/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/amd/main.js +++ b/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/amd/main.js @@ -9,6 +9,4 @@ define(['require', 'exports'], (function (require, exports) { 'use strict'; exports.component = component; exports.lib = lib; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/cjs/main.js b/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/cjs/main.js index 17f88ab1c4e..76efd251ca5 100644 --- a/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/cjs/main.js +++ b/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var lib = {}; console.log('side-effect', lib); diff --git a/test/chunking-form/samples/synthetic-named-exports/entry/_expected/amd/main.js b/test/chunking-form/samples/synthetic-named-exports/entry/_expected/amd/main.js index 182dfc2f44b..140a5f9b811 100644 --- a/test/chunking-form/samples/synthetic-named-exports/entry/_expected/amd/main.js +++ b/test/chunking-form/samples/synthetic-named-exports/entry/_expected/amd/main.js @@ -4,6 +4,4 @@ define(['exports', './generated-main'], (function (exports, main) { 'use strict' exports.exists = main.exists; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/synthetic-named-exports/entry/_expected/cjs/main.js b/test/chunking-form/samples/synthetic-named-exports/entry/_expected/cjs/main.js index b940c24073e..65f17c50da2 100644 --- a/test/chunking-form/samples/synthetic-named-exports/entry/_expected/cjs/main.js +++ b/test/chunking-form/samples/synthetic-named-exports/entry/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var main = require('./generated-main.js'); diff --git a/test/chunking-form/samples/synthetic-named-exports/global-conflict/_expected/amd/main.js b/test/chunking-form/samples/synthetic-named-exports/global-conflict/_expected/amd/main.js index 822ed58c023..ef1566d4b26 100644 --- a/test/chunking-form/samples/synthetic-named-exports/global-conflict/_expected/amd/main.js +++ b/test/chunking-form/samples/synthetic-named-exports/global-conflict/_expected/amd/main.js @@ -6,6 +6,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.foo = dep.foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/synthetic-named-exports/global-conflict/_expected/cjs/main.js b/test/chunking-form/samples/synthetic-named-exports/global-conflict/_expected/cjs/main.js index 124960daafa..a711eb778e6 100644 --- a/test/chunking-form/samples/synthetic-named-exports/global-conflict/_expected/cjs/main.js +++ b/test/chunking-form/samples/synthetic-named-exports/global-conflict/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var dep = { foo: 'bar' }; // This should log a global variable console.log(foo); diff --git a/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/_expected/amd/main.js b/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/_expected/amd/main.js index af5bbb30df2..32e6432d861 100644 --- a/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/_expected/amd/main.js +++ b/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/_expected/amd/main.js @@ -38,6 +38,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.foo = foo; exports.stuff = d.stuff; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/_expected/cjs/main.js b/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/_expected/cjs/main.js index 197e99045cb..78b17fa7603 100644 --- a/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/_expected/cjs/main.js +++ b/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - function _mergeNamespaces(n, m) { m.forEach(function (e) { e && typeof e !== 'string' && !Array.isArray(e) && Object.keys(e).forEach(function (k) { diff --git a/test/chunking-form/samples/synthetic-named-exports/namespace/_expected/amd/main.js b/test/chunking-form/samples/synthetic-named-exports/namespace/_expected/amd/main.js index b0f04364402..28d6891f05f 100644 --- a/test/chunking-form/samples/synthetic-named-exports/namespace/_expected/amd/main.js +++ b/test/chunking-form/samples/synthetic-named-exports/namespace/_expected/amd/main.js @@ -42,6 +42,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.dep = dep$1; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/synthetic-named-exports/namespace/_expected/cjs/main.js b/test/chunking-form/samples/synthetic-named-exports/namespace/_expected/cjs/main.js index 861323745ad..613d8bd9614 100644 --- a/test/chunking-form/samples/synthetic-named-exports/namespace/_expected/cjs/main.js +++ b/test/chunking-form/samples/synthetic-named-exports/namespace/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - function _mergeNamespaces(n, m) { m.forEach(function (e) { e && typeof e !== 'string' && !Array.isArray(e) && Object.keys(e).forEach(function (k) { diff --git a/test/cli/samples/context/_expected.js b/test/cli/samples/context/_expected.js index 882cf0cbf21..53752c4dfa7 100644 --- a/test/cli/samples/context/_expected.js +++ b/test/cli/samples/context/_expected.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - console.log(window); const foo = 42; diff --git a/test/cli/samples/format-aliases/_expected/amd.js b/test/cli/samples/format-aliases/_expected/amd.js index 22a7eb51011..7ba10bc5c83 100644 --- a/test/cli/samples/format-aliases/_expected/amd.js +++ b/test/cli/samples/format-aliases/_expected/amd.js @@ -1,16 +1,7 @@ define(['exports', 'external'], (function (exports, external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var external__default = /*#__PURE__*/_interopDefaultLegacy(external); - console.log('main'); - Object.defineProperty(exports, 'value', { - enumerable: true, - get: function () { return external__default.default; } - }); - - Object.defineProperty(exports, '__esModule', { value: true }); + exports.value = external; })); diff --git a/test/cli/samples/format-aliases/_expected/cjs.js b/test/cli/samples/format-aliases/_expected/cjs.js index 4e3e2e578f2..fffa8f1676f 100644 --- a/test/cli/samples/format-aliases/_expected/cjs.js +++ b/test/cli/samples/format-aliases/_expected/cjs.js @@ -1,16 +1,7 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var external = require('external'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -var external__default = /*#__PURE__*/_interopDefaultLegacy(external); - console.log('main'); -Object.defineProperty(exports, 'value', { - enumerable: true, - get: function () { return external__default.default; } -}); +exports.value = external; diff --git a/test/cli/samples/format-aliases/_expected/commonjs.js b/test/cli/samples/format-aliases/_expected/commonjs.js index 4e3e2e578f2..fffa8f1676f 100644 --- a/test/cli/samples/format-aliases/_expected/commonjs.js +++ b/test/cli/samples/format-aliases/_expected/commonjs.js @@ -1,16 +1,7 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var external = require('external'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -var external__default = /*#__PURE__*/_interopDefaultLegacy(external); - console.log('main'); -Object.defineProperty(exports, 'value', { - enumerable: true, - get: function () { return external__default.default; } -}); +exports.value = external; diff --git a/test/cli/samples/format-aliases/_expected/iife.js b/test/cli/samples/format-aliases/_expected/iife.js index 97b71077a83..666d2511e3c 100644 --- a/test/cli/samples/format-aliases/_expected/iife.js +++ b/test/cli/samples/format-aliases/_expected/iife.js @@ -1,18 +1,9 @@ var bundle = (function (exports, external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var external__default = /*#__PURE__*/_interopDefaultLegacy(external); - console.log('main'); - Object.defineProperty(exports, 'value', { - enumerable: true, - get: function () { return external__default.default; } - }); - - Object.defineProperty(exports, '__esModule', { value: true }); + exports.value = external; return exports; diff --git a/test/cli/samples/format-aliases/_expected/umd.js b/test/cli/samples/format-aliases/_expected/umd.js index a3281cd2bc3..0047ebd22ad 100644 --- a/test/cli/samples/format-aliases/_expected/umd.js +++ b/test/cli/samples/format-aliases/_expected/umd.js @@ -4,17 +4,8 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.bundle = {}, global.external)); })(this, (function (exports, external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var external__default = /*#__PURE__*/_interopDefaultLegacy(external); - console.log('main'); - Object.defineProperty(exports, 'value', { - enumerable: true, - get: function () { return external__default.default; } - }); - - Object.defineProperty(exports, '__esModule', { value: true }); + exports.value = external; })); diff --git a/test/cli/samples/interop/_config.js b/test/cli/samples/interop/_config.js index 2e1b21bdbf9..fc70bd51768 100644 --- a/test/cli/samples/interop/_config.js +++ b/test/cli/samples/interop/_config.js @@ -1,4 +1,4 @@ module.exports = { description: 'does not include the interop block', - command: 'rollup -i main.js -f cjs --external test --no-interop' + command: 'rollup -i main.js -f cjs --external test --interop default' }; diff --git a/test/cli/samples/paths-output-option/rollup.config.js b/test/cli/samples/paths-output-option/rollup.config.js index e4efe603e4f..c4933f5f317 100644 --- a/test/cli/samples/paths-output-option/rollup.config.js +++ b/test/cli/samples/paths-output-option/rollup.config.js @@ -5,7 +5,6 @@ module.exports = { format: 'cjs', paths: { foo: 'bar' - }, - interop: false + } } }; diff --git a/test/cli/samples/plugin/advanced-esm/_expected/cjs.js b/test/cli/samples/plugin/advanced-esm/_expected/cjs.js index a1e3d7e0f30..f4e035f2a64 100644 --- a/test/cli/samples/plugin/advanced-esm/_expected/cjs.js +++ b/test/cli/samples/plugin/advanced-esm/_expected/cjs.js @@ -1,8 +1,6 @@ "use strict"; -Object.defineProperty(exports, "__esModule", { - value: !0 -}), console.log("esm-test: node_modules/print/index.js"); +console.log("esm-test: node_modules/print/index.js"); console.log("esm-test: node_modules/foo/index.js"); diff --git a/test/cli/samples/plugin/advanced/_expected/cjs.js b/test/cli/samples/plugin/advanced/_expected/cjs.js index 755dfc90ce8..baf744eb5ac 100644 --- a/test/cli/samples/plugin/advanced/_expected/cjs.js +++ b/test/cli/samples/plugin/advanced/_expected/cjs.js @@ -1,9 +1,5 @@ "use strict"; -Object.defineProperty(exports, "__esModule", { - value: !0 -}); - var t = function(t) { console.log(t); }, o = function() { diff --git a/test/cli/samples/plugin/basic/_expected.js b/test/cli/samples/plugin/basic/_expected.js index c6d4a07ef77..eac860b0927 100644 --- a/test/cli/samples/plugin/basic/_expected.js +++ b/test/cli/samples/plugin/basic/_expected.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var Bar = function Bar(value) { this.x = value; }; diff --git a/test/cli/samples/plugin/named-export/_expected/cjs.js b/test/cli/samples/plugin/named-export/_expected/cjs.js index 112c5d4af42..f9867eaf325 100644 --- a/test/cli/samples/plugin/named-export/_expected/cjs.js +++ b/test/cli/samples/plugin/named-export/_expected/cjs.js @@ -1 +1 @@ -"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var t=function(t){this.x=t};t.prototype.output=function(){console.log(this.x)},new t(123).output(),exports.Bar=t; +"use strict";var t=function(t){this.x=t};t.prototype.output=function(){console.log(this.x)},new t(123).output(),exports.Bar=t; diff --git a/test/cli/samples/stdin/config-file/_expected/cjs.js b/test/cli/samples/stdin/config-file/_expected/cjs.js index ece324c0d9e..6add2511b1c 100644 --- a/test/cli/samples/stdin/config-file/_expected/cjs.js +++ b/test/cli/samples/stdin/config-file/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const PRINT = x => console.log(x); var C = 123; diff --git a/test/cli/samples/stdin/no-stdin-config-file/_expected/cjs.js b/test/cli/samples/stdin/no-stdin-config-file/_expected/cjs.js index ad2b476f9ed..ce8fc1d9fef 100644 --- a/test/cli/samples/stdin/no-stdin-config-file/_expected/cjs.js +++ b/test/cli/samples/stdin/no-stdin-config-file/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const PRINT = x => console.log(x); exports.PRINT = PRINT; diff --git a/test/form/samples/assignment-to-array-buffer-view/_expected/amd.js b/test/form/samples/assignment-to-array-buffer-view/_expected/amd.js index 3fb733de8b7..a1975c8d08c 100644 --- a/test/form/samples/assignment-to-array-buffer-view/_expected/amd.js +++ b/test/form/samples/assignment-to-array-buffer-view/_expected/amd.js @@ -9,6 +9,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.view8 = view8; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/assignment-to-array-buffer-view/_expected/cjs.js b/test/form/samples/assignment-to-array-buffer-view/_expected/cjs.js index 1c6f45c06e4..4ed86ce4035 100644 --- a/test/form/samples/assignment-to-array-buffer-view/_expected/cjs.js +++ b/test/form/samples/assignment-to-array-buffer-view/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var buffer = new ArrayBuffer( 8 ); var view8 = new Int8Array( buffer ); diff --git a/test/form/samples/assignment-to-array-buffer-view/_expected/iife.js b/test/form/samples/assignment-to-array-buffer-view/_expected/iife.js index 06946572de0..411c2483655 100644 --- a/test/form/samples/assignment-to-array-buffer-view/_expected/iife.js +++ b/test/form/samples/assignment-to-array-buffer-view/_expected/iife.js @@ -10,8 +10,6 @@ var bundle = (function (exports) { exports.view8 = view8; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/assignment-to-array-buffer-view/_expected/umd.js b/test/form/samples/assignment-to-array-buffer-view/_expected/umd.js index dc975670d9d..7d64178bdeb 100644 --- a/test/form/samples/assignment-to-array-buffer-view/_expected/umd.js +++ b/test/form/samples/assignment-to-array-buffer-view/_expected/umd.js @@ -13,6 +13,4 @@ exports.view8 = view8; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/assignment-to-exports-class-declaration/_expected/amd.js b/test/form/samples/assignment-to-exports-class-declaration/_expected/amd.js index 7289cef4e18..da832accde6 100644 --- a/test/form/samples/assignment-to-exports-class-declaration/_expected/amd.js +++ b/test/form/samples/assignment-to-exports-class-declaration/_expected/amd.js @@ -3,6 +3,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.Foo = class Foo {}; exports.Foo = lol( exports.Foo ); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/assignment-to-exports-class-declaration/_expected/cjs.js b/test/form/samples/assignment-to-exports-class-declaration/_expected/cjs.js index d291984995d..cc841d47787 100644 --- a/test/form/samples/assignment-to-exports-class-declaration/_expected/cjs.js +++ b/test/form/samples/assignment-to-exports-class-declaration/_expected/cjs.js @@ -1,6 +1,4 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - exports.Foo = class Foo {}; exports.Foo = lol( exports.Foo ); diff --git a/test/form/samples/assignment-to-exports-class-declaration/_expected/iife.js b/test/form/samples/assignment-to-exports-class-declaration/_expected/iife.js index d8a1d8dbc91..de9e3facacb 100644 --- a/test/form/samples/assignment-to-exports-class-declaration/_expected/iife.js +++ b/test/form/samples/assignment-to-exports-class-declaration/_expected/iife.js @@ -4,8 +4,6 @@ var myModule = (function (exports) { exports.Foo = class Foo {}; exports.Foo = lol( exports.Foo ); - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/assignment-to-exports-class-declaration/_expected/umd.js b/test/form/samples/assignment-to-exports-class-declaration/_expected/umd.js index 9c03e14e51e..6dbf8df37b0 100644 --- a/test/form/samples/assignment-to-exports-class-declaration/_expected/umd.js +++ b/test/form/samples/assignment-to-exports-class-declaration/_expected/umd.js @@ -7,6 +7,4 @@ exports.Foo = class Foo {}; exports.Foo = lol( exports.Foo ); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/assignment-to-exports/_expected/amd.js b/test/form/samples/assignment-to-exports/_expected/amd.js index 37b3240bc56..0399eb4f93b 100644 --- a/test/form/samples/assignment-to-exports/_expected/amd.js +++ b/test/form/samples/assignment-to-exports/_expected/amd.js @@ -27,6 +27,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.foo1 = foo1; exports.foo2 = foo2; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/assignment-to-exports/_expected/cjs.js b/test/form/samples/assignment-to-exports/_expected/cjs.js index 2adec04748f..7423913d78b 100644 --- a/test/form/samples/assignment-to-exports/_expected/cjs.js +++ b/test/form/samples/assignment-to-exports/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - // Unassigned export var foo1; diff --git a/test/form/samples/assignment-to-exports/_expected/iife.js b/test/form/samples/assignment-to-exports/_expected/iife.js index 80b15ba0840..dcceb411557 100644 --- a/test/form/samples/assignment-to-exports/_expected/iife.js +++ b/test/form/samples/assignment-to-exports/_expected/iife.js @@ -28,8 +28,6 @@ var bundle = (function (exports) { exports.foo1 = foo1; exports.foo2 = foo2; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/assignment-to-exports/_expected/umd.js b/test/form/samples/assignment-to-exports/_expected/umd.js index 2f2b3ebda8f..36f0efb2e55 100644 --- a/test/form/samples/assignment-to-exports/_expected/umd.js +++ b/test/form/samples/assignment-to-exports/_expected/umd.js @@ -31,6 +31,4 @@ exports.foo1 = foo1; exports.foo2 = foo2; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/compact-named-export/_expected/amd.js b/test/form/samples/compact-named-export/_expected/amd.js index b420631d6ca..5945f0f0fc5 100644 --- a/test/form/samples/compact-named-export/_expected/amd.js +++ b/test/form/samples/compact-named-export/_expected/amd.js @@ -2,4 +2,4 @@ define(['exports'],(function(exports){'use strict';exports.x = 42; exports.x+=1; exports.x=exports.x+1; exports.x++; -++exports.x;Object.defineProperty(exports,'__esModule',{value:true});})); \ No newline at end of file +++exports.x;})); \ No newline at end of file diff --git a/test/form/samples/compact-named-export/_expected/cjs.js b/test/form/samples/compact-named-export/_expected/cjs.js index 28ef8bf08b2..019dacd8bed 100644 --- a/test/form/samples/compact-named-export/_expected/cjs.js +++ b/test/form/samples/compact-named-export/_expected/cjs.js @@ -1,4 +1,4 @@ -'use strict';Object.defineProperty(exports,'__esModule',{value:true});exports.x = 42; +'use strict';exports.x = 42; exports.x+=1; exports.x=exports.x+1; exports.x++; diff --git a/test/form/samples/compact-named-export/_expected/iife.js b/test/form/samples/compact-named-export/_expected/iife.js index c553017f559..6a8e9b55a6e 100644 --- a/test/form/samples/compact-named-export/_expected/iife.js +++ b/test/form/samples/compact-named-export/_expected/iife.js @@ -2,4 +2,4 @@ var foo=(function(exports){'use strict';exports.x = 42; exports.x+=1; exports.x=exports.x+1; exports.x++; -++exports.x;Object.defineProperty(exports,'__esModule',{value:true});return exports;})({}); \ No newline at end of file +++exports.x;return exports;})({}); \ No newline at end of file diff --git a/test/form/samples/compact-named-export/_expected/umd.js b/test/form/samples/compact-named-export/_expected/umd.js index 7edaad31a3f..026339711b8 100644 --- a/test/form/samples/compact-named-export/_expected/umd.js +++ b/test/form/samples/compact-named-export/_expected/umd.js @@ -2,4 +2,4 @@ exports.x+=1; exports.x=exports.x+1; exports.x++; -++exports.x;Object.defineProperty(exports,'__esModule',{value:true});})); \ No newline at end of file +++exports.x;})); \ No newline at end of file diff --git a/test/form/samples/compact/_expected/amd.js b/test/form/samples/compact/_expected/amd.js index 146e3204729..cbe6c518856 100644 --- a/test/form/samples/compact/_expected/amd.js +++ b/test/form/samples/compact/_expected/amd.js @@ -1,6 +1,6 @@ -define(['external'],(function(x){'use strict';function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e:{default:e}}var x__default=/*#__PURE__*/_interopDefaultLegacy(x);var self=/*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({__proto__:null,get default(){return foo}},Symbol.toStringTag,{value:'Module'}));console.log(self); +define(['external'],(function(x){'use strict';var self=/*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({__proto__:null,get default(){return foo}},Symbol.toStringTag,{value:'Module'}));console.log(self); function foo () { - console.log( x__default.default ); + console.log( x ); } // trailing comment return foo;})); \ No newline at end of file diff --git a/test/form/samples/compact/_expected/cjs.js b/test/form/samples/compact/_expected/cjs.js index 556d2621072..546ece8a356 100644 --- a/test/form/samples/compact/_expected/cjs.js +++ b/test/form/samples/compact/_expected/cjs.js @@ -1,6 +1,6 @@ -'use strict';var x=require('external');function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e:{default:e}}var x__default=/*#__PURE__*/_interopDefaultLegacy(x);var self=/*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({__proto__:null,get default(){return foo}},Symbol.toStringTag,{value:'Module'}));console.log(self); +'use strict';var x=require('external');var self=/*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({__proto__:null,get default(){return foo}},Symbol.toStringTag,{value:'Module'}));console.log(self); function foo () { - console.log( x__default.default ); + console.log( x ); } // trailing comment module.exports=foo; \ No newline at end of file diff --git a/test/form/samples/compact/_expected/iife.js b/test/form/samples/compact/_expected/iife.js index ef194b120b1..07347b86a4f 100644 --- a/test/form/samples/compact/_expected/iife.js +++ b/test/form/samples/compact/_expected/iife.js @@ -1,6 +1,6 @@ -var foo=(function(x){'use strict';function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e:{default:e}}var x__default=/*#__PURE__*/_interopDefaultLegacy(x);var self=/*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({__proto__:null,get default(){return foo}},Symbol.toStringTag,{value:'Module'}));console.log(self); +var foo=(function(x){'use strict';var self=/*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({__proto__:null,get default(){return foo}},Symbol.toStringTag,{value:'Module'}));console.log(self); function foo () { - console.log( x__default.default ); + console.log( x ); } // trailing comment return foo;})(x); \ No newline at end of file diff --git a/test/form/samples/compact/_expected/umd.js b/test/form/samples/compact/_expected/umd.js index b5e41db0152..8347e816cf1 100644 --- a/test/form/samples/compact/_expected/umd.js +++ b/test/form/samples/compact/_expected/umd.js @@ -1,6 +1,6 @@ -(function(g,f){typeof exports==='object'&&typeof module!=='undefined'?module.exports=f(require('external')):typeof define==='function'&&define.amd?define(['external'],f):(g=typeof globalThis!=='undefined'?globalThis:g||self,g.foo=f(g.x));})(this,(function(x){'use strict';function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e:{default:e}}var x__default=/*#__PURE__*/_interopDefaultLegacy(x);var self=/*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({__proto__:null,get default(){return foo}},Symbol.toStringTag,{value:'Module'}));console.log(self); +(function(g,f){typeof exports==='object'&&typeof module!=='undefined'?module.exports=f(require('external')):typeof define==='function'&&define.amd?define(['external'],f):(g=typeof globalThis!=='undefined'?globalThis:g||self,g.foo=f(g.x));})(this,(function(x){'use strict';var self=/*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({__proto__:null,get default(){return foo}},Symbol.toStringTag,{value:'Module'}));console.log(self); function foo () { - console.log( x__default.default ); + console.log( x ); } // trailing comment return foo;})); \ No newline at end of file diff --git a/test/form/samples/computed-properties/_expected/amd.js b/test/form/samples/computed-properties/_expected/amd.js index 40333eee903..2d2e59712a8 100644 --- a/test/form/samples/computed-properties/_expected/amd.js +++ b/test/form/samples/computed-properties/_expected/amd.js @@ -16,6 +16,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.X = X; exports.x = x; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/computed-properties/_expected/cjs.js b/test/form/samples/computed-properties/_expected/cjs.js index 25c4292652b..605d4a3e54e 100644 --- a/test/form/samples/computed-properties/_expected/cjs.js +++ b/test/form/samples/computed-properties/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var foo = 'foo'; var bar = 'bar'; var baz = 'baz'; diff --git a/test/form/samples/computed-properties/_expected/iife.js b/test/form/samples/computed-properties/_expected/iife.js index 8ea16e57067..07c70d5cc19 100644 --- a/test/form/samples/computed-properties/_expected/iife.js +++ b/test/form/samples/computed-properties/_expected/iife.js @@ -17,8 +17,6 @@ var computedProperties = (function (exports) { exports.X = X; exports.x = x; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/computed-properties/_expected/umd.js b/test/form/samples/computed-properties/_expected/umd.js index 27dd4ba1dc0..44eec078c82 100644 --- a/test/form/samples/computed-properties/_expected/umd.js +++ b/test/form/samples/computed-properties/_expected/umd.js @@ -20,6 +20,4 @@ exports.X = X; exports.x = x; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/deconflict-format-specific-exports/_expected/amd.js b/test/form/samples/deconflict-format-specific-exports/_expected/amd.js index 5fea2c3ba2d..d63529d37a4 100644 --- a/test/form/samples/deconflict-format-specific-exports/_expected/amd.js +++ b/test/form/samples/deconflict-format-specific-exports/_expected/amd.js @@ -24,6 +24,4 @@ define(['exports'], (function (exports) { 'use strict'; nestedConflict(); nestedNoConflict(); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/deconflict-format-specific-exports/_expected/cjs.js b/test/form/samples/deconflict-format-specific-exports/_expected/cjs.js index 21cadc195ec..6eed1a121d6 100644 --- a/test/form/samples/deconflict-format-specific-exports/_expected/cjs.js +++ b/test/form/samples/deconflict-format-specific-exports/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const exports$1 = { x: 42 }; diff --git a/test/form/samples/deconflict-format-specific-exports/_expected/iife.js b/test/form/samples/deconflict-format-specific-exports/_expected/iife.js index a256ea4a9a5..dd871c2513e 100644 --- a/test/form/samples/deconflict-format-specific-exports/_expected/iife.js +++ b/test/form/samples/deconflict-format-specific-exports/_expected/iife.js @@ -25,8 +25,6 @@ var bundle = (function (exports) { nestedConflict(); nestedNoConflict(); - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/deconflict-format-specific-exports/_expected/umd.js b/test/form/samples/deconflict-format-specific-exports/_expected/umd.js index bb5430f0523..144ca0900b0 100644 --- a/test/form/samples/deconflict-format-specific-exports/_expected/umd.js +++ b/test/form/samples/deconflict-format-specific-exports/_expected/umd.js @@ -28,6 +28,4 @@ nestedConflict(); nestedNoConflict(); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/deconflict-format-specific-globals/_config.js b/test/form/samples/deconflict-format-specific-globals/_config.js index 5dc0b5bb2bb..4c42972e3f4 100644 --- a/test/form/samples/deconflict-format-specific-globals/_config.js +++ b/test/form/samples/deconflict-format-specific-globals/_config.js @@ -4,7 +4,8 @@ module.exports = { external: 'external', output: { globals: { external: 'external' }, - name: 'bundle' + name: 'bundle', + interop: 'auto' } } }; diff --git a/test/form/samples/deconflict-format-specific-globals/_expected/amd.js b/test/form/samples/deconflict-format-specific-globals/_expected/amd.js index 4b0cd42156a..7f5bb01e4f9 100644 --- a/test/form/samples/deconflict-format-specific-globals/_expected/amd.js +++ b/test/form/samples/deconflict-format-specific-globals/_expected/amd.js @@ -1,6 +1,6 @@ define(['module', 'require', 'external'], (function (module, require, external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } + function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; } function _interopNamespace(e) { if (e && e.__esModule) return e; @@ -20,7 +20,7 @@ define(['module', 'require', 'external'], (function (module, require, external) return Object.freeze(n); } - var external__default = /*#__PURE__*/_interopDefaultLegacy(external); + var external__default = /*#__PURE__*/_interopDefault(external); console.log(external__default.default); diff --git a/test/form/samples/deconflict-format-specific-globals/_expected/cjs.js b/test/form/samples/deconflict-format-specific-globals/_expected/cjs.js index c6df69f8468..eb647e0f07d 100644 --- a/test/form/samples/deconflict-format-specific-globals/_expected/cjs.js +++ b/test/form/samples/deconflict-format-specific-globals/_expected/cjs.js @@ -2,7 +2,7 @@ var external = require('external'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } +function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; } function _interopNamespace(e) { if (e && e.__esModule) return e; @@ -22,7 +22,7 @@ function _interopNamespace(e) { return Object.freeze(n); } -var external__default = /*#__PURE__*/_interopDefaultLegacy(external); +var external__default = /*#__PURE__*/_interopDefault(external); console.log(external__default.default); diff --git a/test/form/samples/deconflict-format-specific-globals/_expected/iife.js b/test/form/samples/deconflict-format-specific-globals/_expected/iife.js index d9deaf1c1b4..5b4060e86c6 100644 --- a/test/form/samples/deconflict-format-specific-globals/_expected/iife.js +++ b/test/form/samples/deconflict-format-specific-globals/_expected/iife.js @@ -1,9 +1,9 @@ var bundle = (function (external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } + function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; } - var external__default = /*#__PURE__*/_interopDefaultLegacy(external); + var external__default = /*#__PURE__*/_interopDefault(external); console.log(external__default.default); diff --git a/test/form/samples/deconflict-format-specific-globals/_expected/umd.js b/test/form/samples/deconflict-format-specific-globals/_expected/umd.js index 537e3f21df2..1af00375785 100644 --- a/test/form/samples/deconflict-format-specific-globals/_expected/umd.js +++ b/test/form/samples/deconflict-format-specific-globals/_expected/umd.js @@ -4,9 +4,9 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, global.bundle = factory(global.external)); })(this, (function (external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } + function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; } - var external__default = /*#__PURE__*/_interopDefaultLegacy(external); + var external__default = /*#__PURE__*/_interopDefault(external); console.log(external__default.default); diff --git a/test/form/samples/dedupes-external-imports/_expected/amd.js b/test/form/samples/dedupes-external-imports/_expected/amd.js index 153c87bcbd5..d0c85ec3616 100644 --- a/test/form/samples/dedupes-external-imports/_expected/amd.js +++ b/test/form/samples/dedupes-external-imports/_expected/amd.js @@ -29,6 +29,4 @@ define(['exports', 'external'], (function (exports, external) { 'use strict'; exports.baz = baz; exports.foo = foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/dedupes-external-imports/_expected/cjs.js b/test/form/samples/dedupes-external-imports/_expected/cjs.js index 08e53049670..e456043e7fa 100644 --- a/test/form/samples/dedupes-external-imports/_expected/cjs.js +++ b/test/form/samples/dedupes-external-imports/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var external = require('external'); class Foo extends external.Component { diff --git a/test/form/samples/dedupes-external-imports/_expected/iife.js b/test/form/samples/dedupes-external-imports/_expected/iife.js index c525bfb78f8..45d749bd275 100644 --- a/test/form/samples/dedupes-external-imports/_expected/iife.js +++ b/test/form/samples/dedupes-external-imports/_expected/iife.js @@ -30,8 +30,6 @@ var myBundle = (function (exports, external) { exports.baz = baz; exports.foo = foo; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}, external); diff --git a/test/form/samples/dedupes-external-imports/_expected/umd.js b/test/form/samples/dedupes-external-imports/_expected/umd.js index 529c85fa6b3..0fc435e239f 100644 --- a/test/form/samples/dedupes-external-imports/_expected/umd.js +++ b/test/form/samples/dedupes-external-imports/_expected/umd.js @@ -33,6 +33,4 @@ exports.baz = baz; exports.foo = foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/deprecated/interop-boolean-per-dependency/_config.js b/test/form/samples/deprecated/interop-boolean-per-dependency/_config.js deleted file mode 100644 index 4dc5108a105..00000000000 --- a/test/form/samples/deprecated/interop-boolean-per-dependency/_config.js +++ /dev/null @@ -1,16 +0,0 @@ -module.exports = { - description: 'allows to configure the interop type per external dependency for boolean values', - options: { - strictDeprecations: false, - external: id => id.startsWith('external'), - output: { - interop(id) { - return JSON.parse(id.split('-')[1]); - }, - globals(id) { - return id.replace('-', ''); - } - } - }, - expectedWarnings: ['DEPRECATED_FEATURE'] -}; diff --git a/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/amd.js b/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/amd.js deleted file mode 100644 index 76b1c10be43..00000000000 --- a/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/amd.js +++ /dev/null @@ -1,32 +0,0 @@ -define(['require', 'external-false', 'external-true'], (function (require, fooFalse, fooTrue) { 'use strict'; - - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - function _interopNamespace(e) { - if (e && e.__esModule) return e; - var n = Object.create(null); - if (e) { - Object.keys(e).forEach(function (k) { - if (k !== 'default') { - var d = Object.getOwnPropertyDescriptor(e, k); - Object.defineProperty(n, k, d.get ? d : { - enumerable: true, - get: function () { return e[k]; } - }); - } - }); - } - n.default = e; - return Object.freeze(n); - } - - var fooTrue__default = /*#__PURE__*/_interopDefaultLegacy(fooTrue); - var fooTrue__namespace = /*#__PURE__*/_interopNamespace(fooTrue); - - console.log(fooFalse, fooFalse.barFalse, fooFalse); - console.log(fooTrue__default.default, fooTrue.barTrue, fooTrue__namespace); - - new Promise(function (resolve, reject) { require(['external-false'], resolve, reject); }).then(console.log); - new Promise(function (resolve, reject) { require(['external-true'], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }).then(console.log); - -})); diff --git a/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/cjs.js b/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/cjs.js deleted file mode 100644 index d3f21a6ff4b..00000000000 --- a/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/cjs.js +++ /dev/null @@ -1,33 +0,0 @@ -'use strict'; - -var fooFalse = require('external-false'); -var fooTrue = require('external-true'); - -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -function _interopNamespace(e) { - if (e && e.__esModule) return e; - var n = Object.create(null); - if (e) { - Object.keys(e).forEach(function (k) { - if (k !== 'default') { - var d = Object.getOwnPropertyDescriptor(e, k); - Object.defineProperty(n, k, d.get ? d : { - enumerable: true, - get: function () { return e[k]; } - }); - } - }); - } - n.default = e; - return Object.freeze(n); -} - -var fooTrue__default = /*#__PURE__*/_interopDefaultLegacy(fooTrue); -var fooTrue__namespace = /*#__PURE__*/_interopNamespace(fooTrue); - -console.log(fooFalse, fooFalse.barFalse, fooFalse); -console.log(fooTrue__default.default, fooTrue.barTrue, fooTrue__namespace); - -Promise.resolve().then(function () { return require('external-false'); }).then(console.log); -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('external-true')); }).then(console.log); diff --git a/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/es.js b/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/es.js deleted file mode 100644 index acdcb2a663b..00000000000 --- a/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/es.js +++ /dev/null @@ -1,10 +0,0 @@ -import * as fooFalse from 'external-false'; -import fooFalse__default, { barFalse } from 'external-false'; -import * as fooTrue from 'external-true'; -import fooTrue__default, { barTrue } from 'external-true'; - -console.log(fooFalse__default, barFalse, fooFalse); -console.log(fooTrue__default, barTrue, fooTrue); - -import('external-false').then(console.log); -import('external-true').then(console.log); diff --git a/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/iife.js b/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/iife.js deleted file mode 100644 index 45e6be18923..00000000000 --- a/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/iife.js +++ /dev/null @@ -1,33 +0,0 @@ -(function (fooFalse, fooTrue) { - 'use strict'; - - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - function _interopNamespace(e) { - if (e && e.__esModule) return e; - var n = Object.create(null); - if (e) { - Object.keys(e).forEach(function (k) { - if (k !== 'default') { - var d = Object.getOwnPropertyDescriptor(e, k); - Object.defineProperty(n, k, d.get ? d : { - enumerable: true, - get: function () { return e[k]; } - }); - } - }); - } - n.default = e; - return Object.freeze(n); - } - - var fooTrue__default = /*#__PURE__*/_interopDefaultLegacy(fooTrue); - var fooTrue__namespace = /*#__PURE__*/_interopNamespace(fooTrue); - - console.log(fooFalse, fooFalse.barFalse, fooFalse); - console.log(fooTrue__default.default, fooTrue.barTrue, fooTrue__namespace); - - import('external-false').then(console.log); - import('external-true').then(console.log); - -})(externalfalse, externaltrue); diff --git a/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/system.js b/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/system.js deleted file mode 100644 index 6b2ca469478..00000000000 --- a/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/system.js +++ /dev/null @@ -1,24 +0,0 @@ -System.register(['external-false', 'external-true'], (function (exports, module) { - 'use strict'; - var fooFalse__default, barFalse, fooFalse, fooTrue__default, barTrue, fooTrue; - return { - setters: [function (module) { - fooFalse__default = module.default; - barFalse = module.barFalse; - fooFalse = module; - }, function (module) { - fooTrue__default = module.default; - barTrue = module.barTrue; - fooTrue = module; - }], - execute: (function () { - - console.log(fooFalse__default, barFalse, fooFalse); - console.log(fooTrue__default, barTrue, fooTrue); - - module.import('external-false').then(console.log); - module.import('external-true').then(console.log); - - }) - }; -})); diff --git a/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/umd.js b/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/umd.js deleted file mode 100644 index c3e73ba99d7..00000000000 --- a/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/umd.js +++ /dev/null @@ -1,36 +0,0 @@ -(function (global, factory) { - typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('external-false'), require('external-true')) : - typeof define === 'function' && define.amd ? define(['external-false', 'external-true'], factory) : - (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.externalfalse, global.externaltrue)); -})(this, (function (fooFalse, fooTrue) { 'use strict'; - - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - function _interopNamespace(e) { - if (e && e.__esModule) return e; - var n = Object.create(null); - if (e) { - Object.keys(e).forEach(function (k) { - if (k !== 'default') { - var d = Object.getOwnPropertyDescriptor(e, k); - Object.defineProperty(n, k, d.get ? d : { - enumerable: true, - get: function () { return e[k]; } - }); - } - }); - } - n.default = e; - return Object.freeze(n); - } - - var fooTrue__default = /*#__PURE__*/_interopDefaultLegacy(fooTrue); - var fooTrue__namespace = /*#__PURE__*/_interopNamespace(fooTrue); - - console.log(fooFalse, fooFalse.barFalse, fooFalse); - console.log(fooTrue__default.default, fooTrue.barTrue, fooTrue__namespace); - - import('external-false').then(console.log); - import('external-true').then(console.log); - -})); diff --git a/test/form/samples/deprecated/interop-boolean-per-dependency/main.js b/test/form/samples/deprecated/interop-boolean-per-dependency/main.js deleted file mode 100644 index c39f04ba19a..00000000000 --- a/test/form/samples/deprecated/interop-boolean-per-dependency/main.js +++ /dev/null @@ -1,10 +0,0 @@ -import fooFalse, { barFalse } from 'external-false'; -import fooTrue, { barTrue } from 'external-true'; -import * as externalFalse from 'external-false'; -import * as externalTrue from 'external-true'; - -console.log(fooFalse, barFalse, externalFalse); -console.log(fooTrue, barTrue, externalTrue); - -import('external-false').then(console.log); -import('external-true').then(console.log); diff --git a/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_config.js b/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_config.js deleted file mode 100644 index 9c8e4000438..00000000000 --- a/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_config.js +++ /dev/null @@ -1,17 +0,0 @@ -module.exports = { - description: 'allows to configure the interop type per reexported external dependency', - options: { - strictDeprecations: false, - external: id => id.startsWith('external'), - output: { - interop(id) { - return JSON.parse(id.split('-')[1]); - }, - globals(id) { - return id.replace('-', ''); - }, - name: 'bundle' - } - }, - expectedWarnings: ['DEPRECATED_FEATURE'] -}; diff --git a/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/amd.js b/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/amd.js deleted file mode 100644 index 3e060c42b32..00000000000 --- a/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/amd.js +++ /dev/null @@ -1,46 +0,0 @@ -define(['exports', 'external-false', 'external-true'], (function (exports, externalFalse, externalTrue) { 'use strict'; - - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - function _interopNamespace(e) { - if (e && e.__esModule) return e; - var n = Object.create(null); - if (e) { - Object.keys(e).forEach(function (k) { - if (k !== 'default') { - var d = Object.getOwnPropertyDescriptor(e, k); - Object.defineProperty(n, k, d.get ? d : { - enumerable: true, - get: function () { return e[k]; } - }); - } - }); - } - n.default = e; - return Object.freeze(n); - } - - var externalTrue__namespace = /*#__PURE__*/_interopNamespace(externalTrue); - var externalTrue__default = /*#__PURE__*/_interopDefaultLegacy(externalTrue); - - - - Object.defineProperty(exports, 'barFalse', { - enumerable: true, - get: function () { return externalFalse.barFalse; } - }); - exports.externalFalse = externalFalse; - exports.fooFalse = externalFalse; - Object.defineProperty(exports, 'barTrue', { - enumerable: true, - get: function () { return externalTrue.barTrue; } - }); - exports.externalTrue = externalTrue__namespace; - Object.defineProperty(exports, 'fooTrue', { - enumerable: true, - get: function () { return externalTrue__default.default; } - }); - - Object.defineProperty(exports, '__esModule', { value: true }); - -})); diff --git a/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/cjs.js b/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/cjs.js deleted file mode 100644 index 5a05ffa8672..00000000000 --- a/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/cjs.js +++ /dev/null @@ -1,47 +0,0 @@ -'use strict'; - -Object.defineProperty(exports, '__esModule', { value: true }); - -var externalFalse = require('external-false'); -var externalTrue = require('external-true'); - -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -function _interopNamespace(e) { - if (e && e.__esModule) return e; - var n = Object.create(null); - if (e) { - Object.keys(e).forEach(function (k) { - if (k !== 'default') { - var d = Object.getOwnPropertyDescriptor(e, k); - Object.defineProperty(n, k, d.get ? d : { - enumerable: true, - get: function () { return e[k]; } - }); - } - }); - } - n.default = e; - return Object.freeze(n); -} - -var externalTrue__namespace = /*#__PURE__*/_interopNamespace(externalTrue); -var externalTrue__default = /*#__PURE__*/_interopDefaultLegacy(externalTrue); - - - -Object.defineProperty(exports, 'barFalse', { - enumerable: true, - get: function () { return externalFalse.barFalse; } -}); -exports.externalFalse = externalFalse; -exports.fooFalse = externalFalse; -Object.defineProperty(exports, 'barTrue', { - enumerable: true, - get: function () { return externalTrue.barTrue; } -}); -exports.externalTrue = externalTrue__namespace; -Object.defineProperty(exports, 'fooTrue', { - enumerable: true, - get: function () { return externalTrue__default.default; } -}); diff --git a/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/es.js b/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/es.js deleted file mode 100644 index 048911f2e2b..00000000000 --- a/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/es.js +++ /dev/null @@ -1,6 +0,0 @@ -import * as externalFalse from 'external-false'; -export { externalFalse }; -export { barFalse, default as fooFalse } from 'external-false'; -import * as externalTrue from 'external-true'; -export { externalTrue }; -export { barTrue, default as fooTrue } from 'external-true'; diff --git a/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/iife.js b/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/iife.js deleted file mode 100644 index eea95a66469..00000000000 --- a/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/iife.js +++ /dev/null @@ -1,49 +0,0 @@ -var bundle = (function (exports, externalFalse, externalTrue) { - 'use strict'; - - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - function _interopNamespace(e) { - if (e && e.__esModule) return e; - var n = Object.create(null); - if (e) { - Object.keys(e).forEach(function (k) { - if (k !== 'default') { - var d = Object.getOwnPropertyDescriptor(e, k); - Object.defineProperty(n, k, d.get ? d : { - enumerable: true, - get: function () { return e[k]; } - }); - } - }); - } - n.default = e; - return Object.freeze(n); - } - - var externalTrue__namespace = /*#__PURE__*/_interopNamespace(externalTrue); - var externalTrue__default = /*#__PURE__*/_interopDefaultLegacy(externalTrue); - - - - Object.defineProperty(exports, 'barFalse', { - enumerable: true, - get: function () { return externalFalse.barFalse; } - }); - exports.externalFalse = externalFalse; - exports.fooFalse = externalFalse; - Object.defineProperty(exports, 'barTrue', { - enumerable: true, - get: function () { return externalTrue.barTrue; } - }); - exports.externalTrue = externalTrue__namespace; - Object.defineProperty(exports, 'fooTrue', { - enumerable: true, - get: function () { return externalTrue__default.default; } - }); - - Object.defineProperty(exports, '__esModule', { value: true }); - - return exports; - -})({}, externalfalse, externaltrue); diff --git a/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/system.js b/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/system.js deleted file mode 100644 index 6c44ff7c55a..00000000000 --- a/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/system.js +++ /dev/null @@ -1,15 +0,0 @@ -System.register('bundle', ['external-false', 'external-true'], (function (exports) { - 'use strict'; - return { - setters: [function (module) { - exports({ barFalse: module.barFalse, externalFalse: module, fooFalse: module.default }); - }, function (module) { - exports({ barTrue: module.barTrue, externalTrue: module, fooTrue: module.default }); - }], - execute: (function () { - - - - }) - }; -})); diff --git a/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/umd.js b/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/umd.js deleted file mode 100644 index 1e4fcec3613..00000000000 --- a/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/umd.js +++ /dev/null @@ -1,50 +0,0 @@ -(function (global, factory) { - typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('external-false'), require('external-true')) : - typeof define === 'function' && define.amd ? define(['exports', 'external-false', 'external-true'], factory) : - (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.bundle = {}, global.externalfalse, global.externaltrue)); -})(this, (function (exports, externalFalse, externalTrue) { 'use strict'; - - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - function _interopNamespace(e) { - if (e && e.__esModule) return e; - var n = Object.create(null); - if (e) { - Object.keys(e).forEach(function (k) { - if (k !== 'default') { - var d = Object.getOwnPropertyDescriptor(e, k); - Object.defineProperty(n, k, d.get ? d : { - enumerable: true, - get: function () { return e[k]; } - }); - } - }); - } - n.default = e; - return Object.freeze(n); - } - - var externalTrue__namespace = /*#__PURE__*/_interopNamespace(externalTrue); - var externalTrue__default = /*#__PURE__*/_interopDefaultLegacy(externalTrue); - - - - Object.defineProperty(exports, 'barFalse', { - enumerable: true, - get: function () { return externalFalse.barFalse; } - }); - exports.externalFalse = externalFalse; - exports.fooFalse = externalFalse; - Object.defineProperty(exports, 'barTrue', { - enumerable: true, - get: function () { return externalTrue.barTrue; } - }); - exports.externalTrue = externalTrue__namespace; - Object.defineProperty(exports, 'fooTrue', { - enumerable: true, - get: function () { return externalTrue__default.default; } - }); - - Object.defineProperty(exports, '__esModule', { value: true }); - -})); diff --git a/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/main.js b/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/main.js deleted file mode 100644 index c6f8983e9ce..00000000000 --- a/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/main.js +++ /dev/null @@ -1,4 +0,0 @@ -export { default as fooFalse, barFalse } from 'external-false'; -export { default as fooTrue, barTrue } from 'external-true'; -export * as externalFalse from 'external-false'; -export * as externalTrue from 'external-true'; diff --git a/test/form/samples/deprecated/interop-false-reexport/_config.js b/test/form/samples/deprecated/interop-false-reexport/_config.js deleted file mode 100644 index 9d26b513865..00000000000 --- a/test/form/samples/deprecated/interop-false-reexport/_config.js +++ /dev/null @@ -1,13 +0,0 @@ -module.exports = { - description: 'reexports with interop: false', - options: { - strictDeprecations: false, - external: ['external'], - output: { - globals: { external: 'external' }, - name: 'foo', - interop: false - } - }, - expectedWarnings: ['DEPRECATED_FEATURE'] -}; diff --git a/test/form/samples/deprecated/interop-false-reexport/_expected/amd.js b/test/form/samples/deprecated/interop-false-reexport/_expected/amd.js deleted file mode 100644 index 598871b8e1e..00000000000 --- a/test/form/samples/deprecated/interop-false-reexport/_expected/amd.js +++ /dev/null @@ -1,13 +0,0 @@ -define(['exports', 'external'], (function (exports, external) { 'use strict'; - - - - exports.p = external; - Object.defineProperty(exports, 'q', { - enumerable: true, - get: function () { return external.p; } - }); - - Object.defineProperty(exports, '__esModule', { value: true }); - -})); diff --git a/test/form/samples/deprecated/interop-false-reexport/_expected/cjs.js b/test/form/samples/deprecated/interop-false-reexport/_expected/cjs.js deleted file mode 100644 index efe5055bf89..00000000000 --- a/test/form/samples/deprecated/interop-false-reexport/_expected/cjs.js +++ /dev/null @@ -1,13 +0,0 @@ -'use strict'; - -Object.defineProperty(exports, '__esModule', { value: true }); - -var external = require('external'); - - - -exports.p = external; -Object.defineProperty(exports, 'q', { - enumerable: true, - get: function () { return external.p; } -}); diff --git a/test/form/samples/deprecated/interop-false-reexport/_expected/es.js b/test/form/samples/deprecated/interop-false-reexport/_expected/es.js deleted file mode 100644 index e80bd564609..00000000000 --- a/test/form/samples/deprecated/interop-false-reexport/_expected/es.js +++ /dev/null @@ -1 +0,0 @@ -export { default as p, p as q } from 'external'; diff --git a/test/form/samples/deprecated/interop-false-reexport/_expected/iife.js b/test/form/samples/deprecated/interop-false-reexport/_expected/iife.js deleted file mode 100644 index d72f38bcae7..00000000000 --- a/test/form/samples/deprecated/interop-false-reexport/_expected/iife.js +++ /dev/null @@ -1,16 +0,0 @@ -var foo = (function (exports, external) { - 'use strict'; - - - - exports.p = external; - Object.defineProperty(exports, 'q', { - enumerable: true, - get: function () { return external.p; } - }); - - Object.defineProperty(exports, '__esModule', { value: true }); - - return exports; - -})({}, external); diff --git a/test/form/samples/deprecated/interop-false-reexport/_expected/system.js b/test/form/samples/deprecated/interop-false-reexport/_expected/system.js deleted file mode 100644 index 4db92a3dbe1..00000000000 --- a/test/form/samples/deprecated/interop-false-reexport/_expected/system.js +++ /dev/null @@ -1,13 +0,0 @@ -System.register('foo', ['external'], (function (exports) { - 'use strict'; - return { - setters: [function (module) { - exports({ p: module.default, q: module.p }); - }], - execute: (function () { - - - - }) - }; -})); diff --git a/test/form/samples/deprecated/interop-false-reexport/_expected/umd.js b/test/form/samples/deprecated/interop-false-reexport/_expected/umd.js deleted file mode 100644 index 80beced23ee..00000000000 --- a/test/form/samples/deprecated/interop-false-reexport/_expected/umd.js +++ /dev/null @@ -1,15 +0,0 @@ -(function (global, factory) { - typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('external')) : - typeof define === 'function' && define.amd ? define(['exports', 'external'], factory) : - (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.foo = {}, global.external)); -})(this, (function (exports, external) { 'use strict'; - - exports.p = external; - Object.defineProperty(exports, 'q', { - enumerable: true, - get: function () { return external.p; } - }); - - Object.defineProperty(exports, '__esModule', { value: true }); - -})); diff --git a/test/form/samples/deprecated/interop-false-reexport/main.js b/test/form/samples/deprecated/interop-false-reexport/main.js deleted file mode 100644 index 9552bfcdcef..00000000000 --- a/test/form/samples/deprecated/interop-false-reexport/main.js +++ /dev/null @@ -1,2 +0,0 @@ -export { p as q } from 'external'; -export { default as p } from 'external'; \ No newline at end of file diff --git a/test/form/samples/deprecated/interop-false/_config.js b/test/form/samples/deprecated/interop-false/_config.js deleted file mode 100644 index 883a0a2211d..00000000000 --- a/test/form/samples/deprecated/interop-false/_config.js +++ /dev/null @@ -1,13 +0,0 @@ -module.exports = { - description: 'getInterop with interop: false', - expectedWarnings: ['UNUSED_EXTERNAL_IMPORT', 'DEPRECATED_FEATURE'], - options: { - strictDeprecations: false, - external: ['core/view'], - output: { - globals: { 'core/view': 'View' }, - name: 'foo', - interop: false - } - } -}; diff --git a/test/form/samples/deprecated/interop-false/_expected/amd.js b/test/form/samples/deprecated/interop-false/_expected/amd.js deleted file mode 100644 index b582dd201de..00000000000 --- a/test/form/samples/deprecated/interop-false/_expected/amd.js +++ /dev/null @@ -1,7 +0,0 @@ -define(['core/view'], (function (View) { 'use strict'; - - var main = View.extend({}); - - return main; - -})); diff --git a/test/form/samples/deprecated/interop-false/_expected/cjs.js b/test/form/samples/deprecated/interop-false/_expected/cjs.js deleted file mode 100644 index 8396bc764b9..00000000000 --- a/test/form/samples/deprecated/interop-false/_expected/cjs.js +++ /dev/null @@ -1,7 +0,0 @@ -'use strict'; - -var View = require('core/view'); - -var main = View.extend({}); - -module.exports = main; diff --git a/test/form/samples/deprecated/interop-false/_expected/es.js b/test/form/samples/deprecated/interop-false/_expected/es.js deleted file mode 100644 index d121fafb290..00000000000 --- a/test/form/samples/deprecated/interop-false/_expected/es.js +++ /dev/null @@ -1,5 +0,0 @@ -import View from 'core/view'; - -var main = View.extend({}); - -export { main as default }; diff --git a/test/form/samples/deprecated/interop-false/_expected/iife.js b/test/form/samples/deprecated/interop-false/_expected/iife.js deleted file mode 100644 index 00dd680d3e6..00000000000 --- a/test/form/samples/deprecated/interop-false/_expected/iife.js +++ /dev/null @@ -1,8 +0,0 @@ -var foo = (function (View) { - 'use strict'; - - var main = View.extend({}); - - return main; - -})(View); diff --git a/test/form/samples/deprecated/interop-false/_expected/system.js b/test/form/samples/deprecated/interop-false/_expected/system.js deleted file mode 100644 index 0ed7c4a452c..00000000000 --- a/test/form/samples/deprecated/interop-false/_expected/system.js +++ /dev/null @@ -1,14 +0,0 @@ -System.register('foo', ['core/view'], (function (exports) { - 'use strict'; - var View; - return { - setters: [function (module) { - View = module.default; - }], - execute: (function () { - - var main = exports('default', View.extend({})); - - }) - }; -})); diff --git a/test/form/samples/deprecated/interop-false/_expected/umd.js b/test/form/samples/deprecated/interop-false/_expected/umd.js deleted file mode 100644 index 3b808b1a16c..00000000000 --- a/test/form/samples/deprecated/interop-false/_expected/umd.js +++ /dev/null @@ -1,11 +0,0 @@ -(function (global, factory) { - typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory(require('core/view')) : - typeof define === 'function' && define.amd ? define(['core/view'], factory) : - (global = typeof globalThis !== 'undefined' ? globalThis : global || self, global.foo = factory(global.View)); -})(this, (function (View) { 'use strict'; - - var main = View.extend({}); - - return main; - -})); diff --git a/test/form/samples/deprecated/interop-false/main.js b/test/form/samples/deprecated/interop-false/main.js deleted file mode 100644 index 31688d4a16a..00000000000 --- a/test/form/samples/deprecated/interop-false/main.js +++ /dev/null @@ -1,2 +0,0 @@ -import View, { name } from 'core/view'; -export default View.extend({}); diff --git a/test/form/samples/deprecated/interop-per-dependency-no-live-binding-boolean/_config.js b/test/form/samples/deprecated/interop-per-dependency-no-live-binding-boolean/_config.js deleted file mode 100644 index 8a30d5398ae..00000000000 --- a/test/form/samples/deprecated/interop-per-dependency-no-live-binding-boolean/_config.js +++ /dev/null @@ -1,21 +0,0 @@ -const checkedIds = new Set(); - -module.exports = { - description: 'allows to configure the interop type per external dependency for boolean values', - options: { - strictDeprecations: false, - external: id => id.startsWith('external'), - output: { - externalLiveBindings: false, - interop(id) { - if (checkedIds.has(id)) { - throw new Error(`Interop for id ${id} has been requested twice.`); - } - checkedIds.add(id); - return JSON.parse(id.split('-')[1]); - }, - format: 'cjs' - } - }, - expectedWarnings: ['DEPRECATED_FEATURE'] -}; diff --git a/test/form/samples/deprecated/interop-per-dependency-no-live-binding-boolean/_expected.js b/test/form/samples/deprecated/interop-per-dependency-no-live-binding-boolean/_expected.js deleted file mode 100644 index fb954e76564..00000000000 --- a/test/form/samples/deprecated/interop-per-dependency-no-live-binding-boolean/_expected.js +++ /dev/null @@ -1,27 +0,0 @@ -'use strict'; - -var fooFalse = require('external-false'); -var fooTrue = require('external-true'); - -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; } - -function _interopNamespace(e) { - if (e && e.__esModule) return e; - var n = Object.create(null); - if (e) { - for (var k in e) { - n[k] = e[k]; - } - } - n.default = e; - return Object.freeze(n); -} - -var fooTrue__default = /*#__PURE__*/_interopDefaultLegacy(fooTrue); -var fooTrue__namespace = /*#__PURE__*/_interopNamespace(fooTrue); - -console.log(fooFalse, fooFalse.barFalse, fooFalse); -console.log(fooTrue__default, fooTrue.barTrue, fooTrue__namespace); - -Promise.resolve().then(function () { return require('external-false'); }).then(console.log); -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('external-true')); }).then(console.log); diff --git a/test/form/samples/deprecated/interop-per-dependency-no-live-binding-boolean/main.js b/test/form/samples/deprecated/interop-per-dependency-no-live-binding-boolean/main.js deleted file mode 100644 index c39f04ba19a..00000000000 --- a/test/form/samples/deprecated/interop-per-dependency-no-live-binding-boolean/main.js +++ /dev/null @@ -1,10 +0,0 @@ -import fooFalse, { barFalse } from 'external-false'; -import fooTrue, { barTrue } from 'external-true'; -import * as externalFalse from 'external-false'; -import * as externalTrue from 'external-true'; - -console.log(fooFalse, barFalse, externalFalse); -console.log(fooTrue, barTrue, externalTrue); - -import('external-false').then(console.log); -import('external-true').then(console.log); diff --git a/test/form/samples/deprecated/namespace-tostring/entry-named/_expected/amd.js b/test/form/samples/deprecated/namespace-tostring/entry-named/_expected/amd.js index a686695eb27..9b68f32c6d1 100644 --- a/test/form/samples/deprecated/namespace-tostring/entry-named/_expected/amd.js +++ b/test/form/samples/deprecated/namespace-tostring/entry-named/_expected/amd.js @@ -4,6 +4,6 @@ define(['exports'], (function (exports) { 'use strict'; exports.foo = foo; - Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: 'Module' } }); + Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' }); })); diff --git a/test/form/samples/deprecated/namespace-tostring/entry-named/_expected/cjs.js b/test/form/samples/deprecated/namespace-tostring/entry-named/_expected/cjs.js index 0a7f7b36138..3ced9f15180 100644 --- a/test/form/samples/deprecated/namespace-tostring/entry-named/_expected/cjs.js +++ b/test/form/samples/deprecated/namespace-tostring/entry-named/_expected/cjs.js @@ -1,6 +1,6 @@ 'use strict'; -Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: 'Module' } }); +Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' }); const foo = 42; diff --git a/test/form/samples/deprecated/namespace-tostring/entry-named/_expected/iife.js b/test/form/samples/deprecated/namespace-tostring/entry-named/_expected/iife.js index caef71c5aaa..031b5a7ba73 100644 --- a/test/form/samples/deprecated/namespace-tostring/entry-named/_expected/iife.js +++ b/test/form/samples/deprecated/namespace-tostring/entry-named/_expected/iife.js @@ -5,7 +5,7 @@ var bundle = (function (exports) { exports.foo = foo; - Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: 'Module' } }); + Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' }); return exports; diff --git a/test/form/samples/deprecated/namespace-tostring/entry-named/_expected/umd.js b/test/form/samples/deprecated/namespace-tostring/entry-named/_expected/umd.js index d1b1697e7cd..f69065ef0da 100644 --- a/test/form/samples/deprecated/namespace-tostring/entry-named/_expected/umd.js +++ b/test/form/samples/deprecated/namespace-tostring/entry-named/_expected/umd.js @@ -8,6 +8,6 @@ exports.foo = foo; - Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: 'Module' } }); + Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' }); })); diff --git a/test/form/samples/dynamic-import-this-arrow/_expected/amd.js b/test/form/samples/dynamic-import-this-arrow/_expected/amd.js index dc89b48f154..8385cbfa3df 100644 --- a/test/form/samples/dynamic-import-this-arrow/_expected/amd.js +++ b/test/form/samples/dynamic-import-this-arrow/_expected/amd.js @@ -1,7 +1,6 @@ define(['require', 'exports', 'input'], (function (require, exports, input) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(k => { @@ -24,7 +23,7 @@ define(['require', 'exports', 'input'], (function (require, exports, input) { 'u } getImport() { - return new Promise((resolve, reject) => require([this.outputPath], m => resolve(/*#__PURE__*/_interopNamespace(m)), reject)); + return new Promise((resolve, reject) => require([this.outputPath], m => resolve(/*#__PURE__*/_interopNamespaceDefault(m)), reject)); } } @@ -32,6 +31,4 @@ define(['require', 'exports', 'input'], (function (require, exports, input) { 'u exports.promise = promise; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/dynamic-import-this-arrow/_expected/cjs.js b/test/form/samples/dynamic-import-this-arrow/_expected/cjs.js index a7c6e99b31e..5a9c79f87e3 100644 --- a/test/form/samples/dynamic-import-this-arrow/_expected/cjs.js +++ b/test/form/samples/dynamic-import-this-arrow/_expected/cjs.js @@ -1,11 +1,8 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var input = require('input'); -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(k => { @@ -28,7 +25,7 @@ class Importer { } getImport() { - return Promise.resolve().then(() => /*#__PURE__*/_interopNamespace(require(this.outputPath))); + return Promise.resolve().then(() => /*#__PURE__*/_interopNamespaceDefault(require(this.outputPath))); } } diff --git a/test/form/samples/dynamic-import-this-arrow/_expected/iife.js b/test/form/samples/dynamic-import-this-arrow/_expected/iife.js index cae64e05522..0cf64319d02 100644 --- a/test/form/samples/dynamic-import-this-arrow/_expected/iife.js +++ b/test/form/samples/dynamic-import-this-arrow/_expected/iife.js @@ -15,8 +15,6 @@ var bundle = (function (exports, input) { exports.promise = promise; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}, input); diff --git a/test/form/samples/dynamic-import-this-arrow/_expected/umd.js b/test/form/samples/dynamic-import-this-arrow/_expected/umd.js index 012afb22eb7..dae70b6a615 100644 --- a/test/form/samples/dynamic-import-this-arrow/_expected/umd.js +++ b/test/form/samples/dynamic-import-this-arrow/_expected/umd.js @@ -18,6 +18,4 @@ exports.promise = promise; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/dynamic-import-this-function/_expected/amd.js b/test/form/samples/dynamic-import-this-function/_expected/amd.js index cf8e54d6ebf..bfec23bb7f0 100644 --- a/test/form/samples/dynamic-import-this-function/_expected/amd.js +++ b/test/form/samples/dynamic-import-this-function/_expected/amd.js @@ -1,7 +1,6 @@ define(['require', 'exports', 'input'], (function (require, exports, input) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -24,7 +23,7 @@ define(['require', 'exports', 'input'], (function (require, exports, input) { 'u } getImport() { - return (function (t) { return new Promise(function (resolve, reject) { require([t], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }); })(this.outputPath); + return (function (t) { return new Promise(function (resolve, reject) { require([t], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); })(this.outputPath); } } @@ -32,6 +31,4 @@ define(['require', 'exports', 'input'], (function (require, exports, input) { 'u exports.promise = promise; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/dynamic-import-this-function/_expected/cjs.js b/test/form/samples/dynamic-import-this-function/_expected/cjs.js index 574c40649fa..64d752617c3 100644 --- a/test/form/samples/dynamic-import-this-function/_expected/cjs.js +++ b/test/form/samples/dynamic-import-this-function/_expected/cjs.js @@ -1,11 +1,8 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var input = require('input'); -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -28,7 +25,7 @@ class Importer { } getImport() { - return (function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(t)); }); })(this.outputPath); + return (function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require(t)); }); })(this.outputPath); } } diff --git a/test/form/samples/dynamic-import-this-function/_expected/iife.js b/test/form/samples/dynamic-import-this-function/_expected/iife.js index cae64e05522..0cf64319d02 100644 --- a/test/form/samples/dynamic-import-this-function/_expected/iife.js +++ b/test/form/samples/dynamic-import-this-function/_expected/iife.js @@ -15,8 +15,6 @@ var bundle = (function (exports, input) { exports.promise = promise; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}, input); diff --git a/test/form/samples/dynamic-import-this-function/_expected/umd.js b/test/form/samples/dynamic-import-this-function/_expected/umd.js index 012afb22eb7..dae70b6a615 100644 --- a/test/form/samples/dynamic-import-this-function/_expected/umd.js +++ b/test/form/samples/dynamic-import-this-function/_expected/umd.js @@ -18,6 +18,4 @@ exports.promise = promise; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/dynamic-import-unresolvable/_expected/amd.js b/test/form/samples/dynamic-import-unresolvable/_expected/amd.js index 826e7a13727..8f187653112 100644 --- a/test/form/samples/dynamic-import-unresolvable/_expected/amd.js +++ b/test/form/samples/dynamic-import-unresolvable/_expected/amd.js @@ -1,7 +1,6 @@ define(['require'], (function (require) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -18,9 +17,9 @@ define(['require'], (function (require) { 'use strict'; return Object.freeze(n); } - (function (t) { return new Promise(function (resolve, reject) { require([t], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }); })(`${globalThis.unknown}`); - (function (t) { return new Promise(function (resolve, reject) { require([t], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }); })(`My ${globalThis.unknown}`); - (function (t) { return new Promise(function (resolve, reject) { require([t], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }); })('./seven.js'); - new Promise(function (resolve, reject) { require(['./seven'], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }); + (function (t) { return new Promise(function (resolve, reject) { require([t], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); })(`${globalThis.unknown}`); + (function (t) { return new Promise(function (resolve, reject) { require([t], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); })(`My ${globalThis.unknown}`); + (function (t) { return new Promise(function (resolve, reject) { require([t], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); })('./seven.js'); + new Promise(function (resolve, reject) { require(['./seven'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); })); diff --git a/test/form/samples/dynamic-import-unresolvable/_expected/cjs.js b/test/form/samples/dynamic-import-unresolvable/_expected/cjs.js index ce7352d16f6..6fd33278166 100644 --- a/test/form/samples/dynamic-import-unresolvable/_expected/cjs.js +++ b/test/form/samples/dynamic-import-unresolvable/_expected/cjs.js @@ -1,7 +1,6 @@ 'use strict'; -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -18,7 +17,7 @@ function _interopNamespace(e) { return Object.freeze(n); } -(function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(t)); }); })(`${globalThis.unknown}`); -(function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(t)); }); })(`My ${globalThis.unknown}`); -(function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(t)); }); })('./seven.js'); -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('./seven.js')); }); +(function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require(t)); }); })(`${globalThis.unknown}`); +(function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require(t)); }); })(`My ${globalThis.unknown}`); +(function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require(t)); }); })('./seven.js'); +Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('./seven.js')); }); diff --git a/test/form/samples/export-all-before-named/_expected/amd.js b/test/form/samples/export-all-before-named/_expected/amd.js index d271281340d..e81dc2517b3 100644 --- a/test/form/samples/export-all-before-named/_expected/amd.js +++ b/test/form/samples/export-all-before-named/_expected/amd.js @@ -12,6 +12,4 @@ define(['exports', 'external'], (function (exports, external) { 'use strict'; }); }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/export-all-before-named/_expected/cjs.js b/test/form/samples/export-all-before-named/_expected/cjs.js index 989b8a04595..81d3faca82a 100644 --- a/test/form/samples/export-all-before-named/_expected/cjs.js +++ b/test/form/samples/export-all-before-named/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var external = require('external'); function internalFn(path) { diff --git a/test/form/samples/export-all-before-named/_expected/iife.js b/test/form/samples/export-all-before-named/_expected/iife.js index 304ac19d1cc..ca25dc01317 100644 --- a/test/form/samples/export-all-before-named/_expected/iife.js +++ b/test/form/samples/export-all-before-named/_expected/iife.js @@ -13,8 +13,6 @@ var exposedInternals = (function (exports, external) { }); }); - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}, external); diff --git a/test/form/samples/export-all-before-named/_expected/umd.js b/test/form/samples/export-all-before-named/_expected/umd.js index 05be621a124..5eaf0dd684c 100644 --- a/test/form/samples/export-all-before-named/_expected/umd.js +++ b/test/form/samples/export-all-before-named/_expected/umd.js @@ -16,6 +16,4 @@ }); }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/export-all-from-internal/_expected/amd.js b/test/form/samples/export-all-from-internal/_expected/amd.js index 05abfb593d8..c9db0af538d 100644 --- a/test/form/samples/export-all-from-internal/_expected/amd.js +++ b/test/form/samples/export-all-from-internal/_expected/amd.js @@ -6,6 +6,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.a = a; exports.b = b; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/export-all-from-internal/_expected/cjs.js b/test/form/samples/export-all-from-internal/_expected/cjs.js index e208b74e989..869bba079af 100644 --- a/test/form/samples/export-all-from-internal/_expected/cjs.js +++ b/test/form/samples/export-all-from-internal/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const a = 1; const b = 2; diff --git a/test/form/samples/export-all-from-internal/_expected/iife.js b/test/form/samples/export-all-from-internal/_expected/iife.js index a6c96fc0e1d..4ba6ea0a271 100644 --- a/test/form/samples/export-all-from-internal/_expected/iife.js +++ b/test/form/samples/export-all-from-internal/_expected/iife.js @@ -7,8 +7,6 @@ var exposedInternals = (function (exports) { exports.a = a; exports.b = b; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/export-all-from-internal/_expected/umd.js b/test/form/samples/export-all-from-internal/_expected/umd.js index 6d492f62c91..c0a8d223420 100644 --- a/test/form/samples/export-all-from-internal/_expected/umd.js +++ b/test/form/samples/export-all-from-internal/_expected/umd.js @@ -10,6 +10,4 @@ exports.a = a; exports.b = b; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/export-all-multiple/_expected/amd.js b/test/form/samples/export-all-multiple/_expected/amd.js index 6b8f83e558f..ab273e62230 100644 --- a/test/form/samples/export-all-multiple/_expected/amd.js +++ b/test/form/samples/export-all-multiple/_expected/amd.js @@ -21,6 +21,4 @@ define(['exports', 'foo', 'bar', 'baz'], (function (exports, foo, bar, baz) { 'u }); }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/export-all-multiple/_expected/cjs.js b/test/form/samples/export-all-multiple/_expected/cjs.js index 29b4dc5fe67..83bd195de61 100644 --- a/test/form/samples/export-all-multiple/_expected/cjs.js +++ b/test/form/samples/export-all-multiple/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var foo = require('foo'); var bar = require('bar'); var baz = require('baz'); diff --git a/test/form/samples/export-all-multiple/_expected/iife.js b/test/form/samples/export-all-multiple/_expected/iife.js index 021b7c159df..d759e3eef5f 100644 --- a/test/form/samples/export-all-multiple/_expected/iife.js +++ b/test/form/samples/export-all-multiple/_expected/iife.js @@ -22,8 +22,6 @@ var myBundle = (function (exports, foo, bar, baz) { }); }); - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}, foo, bar, baz); diff --git a/test/form/samples/export-all-multiple/_expected/umd.js b/test/form/samples/export-all-multiple/_expected/umd.js index e950c182405..549b4f2fccc 100644 --- a/test/form/samples/export-all-multiple/_expected/umd.js +++ b/test/form/samples/export-all-multiple/_expected/umd.js @@ -23,6 +23,4 @@ }); }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/export-default-import/_config.js b/test/form/samples/export-default-import/_config.js index 2feb1b34171..db487edf7b3 100644 --- a/test/form/samples/export-default-import/_config.js +++ b/test/form/samples/export-default-import/_config.js @@ -4,6 +4,7 @@ module.exports = { external: ['x'], output: { globals: { x: 'x' }, + interop: 'compat', name: 'myBundle' } } diff --git a/test/form/samples/export-default-import/_expected/amd.js b/test/form/samples/export-default-import/_expected/amd.js index 8a36e16825f..538d331f39a 100644 --- a/test/form/samples/export-default-import/_expected/amd.js +++ b/test/form/samples/export-default-import/_expected/amd.js @@ -1,8 +1,8 @@ define(['exports', 'x'], (function (exports, x) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } + function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - var x__default = /*#__PURE__*/_interopDefaultLegacy(x); + var x__default = /*#__PURE__*/_interopDefaultCompat(x); @@ -11,6 +11,4 @@ define(['exports', 'x'], (function (exports, x) { 'use strict'; get: function () { return x__default.default; } }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/export-default-import/_expected/cjs.js b/test/form/samples/export-default-import/_expected/cjs.js index a927d62a2b8..5cc40d61741 100644 --- a/test/form/samples/export-default-import/_expected/cjs.js +++ b/test/form/samples/export-default-import/_expected/cjs.js @@ -1,12 +1,10 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var x = require('x'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } +function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } -var x__default = /*#__PURE__*/_interopDefaultLegacy(x); +var x__default = /*#__PURE__*/_interopDefaultCompat(x); diff --git a/test/form/samples/export-default-import/_expected/iife.js b/test/form/samples/export-default-import/_expected/iife.js index 36b937562e7..a90c26c292f 100644 --- a/test/form/samples/export-default-import/_expected/iife.js +++ b/test/form/samples/export-default-import/_expected/iife.js @@ -1,9 +1,9 @@ var myBundle = (function (exports, x) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } + function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - var x__default = /*#__PURE__*/_interopDefaultLegacy(x); + var x__default = /*#__PURE__*/_interopDefaultCompat(x); @@ -12,8 +12,6 @@ var myBundle = (function (exports, x) { get: function () { return x__default.default; } }); - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}, x); diff --git a/test/form/samples/export-default-import/_expected/umd.js b/test/form/samples/export-default-import/_expected/umd.js index 0b042722e58..c069d52635d 100644 --- a/test/form/samples/export-default-import/_expected/umd.js +++ b/test/form/samples/export-default-import/_expected/umd.js @@ -4,9 +4,9 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.myBundle = {}, global.x)); })(this, (function (exports, x) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } + function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - var x__default = /*#__PURE__*/_interopDefaultLegacy(x); + var x__default = /*#__PURE__*/_interopDefaultCompat(x); @@ -15,6 +15,4 @@ get: function () { return x__default.default; } }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/export-globals/_expected/amd.js b/test/form/samples/export-globals/_expected/amd.js index bb48fc7d4cf..5b28ab9cc66 100644 --- a/test/form/samples/export-globals/_expected/amd.js +++ b/test/form/samples/export-globals/_expected/amd.js @@ -6,6 +6,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.isNaN = isNaN$1; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/export-globals/_expected/cjs.js b/test/form/samples/export-globals/_expected/cjs.js index c83da075373..2f1ab86f010 100644 --- a/test/form/samples/export-globals/_expected/cjs.js +++ b/test/form/samples/export-globals/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const localIsNaN = isNaN; const isNaN$1 = localIsNaN; diff --git a/test/form/samples/export-globals/_expected/iife.js b/test/form/samples/export-globals/_expected/iife.js index ac24624ddfb..208fb78b5ec 100644 --- a/test/form/samples/export-globals/_expected/iife.js +++ b/test/form/samples/export-globals/_expected/iife.js @@ -7,8 +7,6 @@ var myBundle = (function (exports) { exports.isNaN = isNaN$1; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/export-globals/_expected/umd.js b/test/form/samples/export-globals/_expected/umd.js index c07e271c069..b67e0006f5e 100644 --- a/test/form/samples/export-globals/_expected/umd.js +++ b/test/form/samples/export-globals/_expected/umd.js @@ -10,6 +10,4 @@ exports.isNaN = isNaN$1; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/export-live-bindings/_expected/amd.js b/test/form/samples/export-live-bindings/_expected/amd.js index 7d95bcef014..9d26797adbe 100644 --- a/test/form/samples/export-live-bindings/_expected/amd.js +++ b/test/form/samples/export-live-bindings/_expected/amd.js @@ -32,6 +32,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.updateBaz = update; exports.updateFoo = update$2; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/export-live-bindings/_expected/cjs.js b/test/form/samples/export-live-bindings/_expected/cjs.js index 3650e960cbb..c0655cff2a4 100644 --- a/test/form/samples/export-live-bindings/_expected/cjs.js +++ b/test/form/samples/export-live-bindings/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - function update$2 () { exports.foo += 10; } diff --git a/test/form/samples/export-live-bindings/_expected/iife.js b/test/form/samples/export-live-bindings/_expected/iife.js index cd910a4079b..1ae944f4734 100644 --- a/test/form/samples/export-live-bindings/_expected/iife.js +++ b/test/form/samples/export-live-bindings/_expected/iife.js @@ -33,8 +33,6 @@ var iife = (function (exports) { exports.updateBaz = update; exports.updateFoo = update$2; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/export-live-bindings/_expected/umd.js b/test/form/samples/export-live-bindings/_expected/umd.js index 937f28a162a..a85d6b84d3b 100644 --- a/test/form/samples/export-live-bindings/_expected/umd.js +++ b/test/form/samples/export-live-bindings/_expected/umd.js @@ -36,6 +36,4 @@ exports.updateBaz = update; exports.updateFoo = update$2; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/export-namespace-as/_expected/amd.js b/test/form/samples/export-namespace-as/_expected/amd.js index a1ec2936e97..687d8701467 100644 --- a/test/form/samples/export-namespace-as/_expected/amd.js +++ b/test/form/samples/export-namespace-as/_expected/amd.js @@ -11,6 +11,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.dep = dep; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/export-namespace-as/_expected/cjs.js b/test/form/samples/export-namespace-as/_expected/cjs.js index f4d06b1841a..af62789cd80 100644 --- a/test/form/samples/export-namespace-as/_expected/cjs.js +++ b/test/form/samples/export-namespace-as/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const foo = 'foo1'; const bar = 'bar1'; diff --git a/test/form/samples/export-namespace-as/_expected/iife.js b/test/form/samples/export-namespace-as/_expected/iife.js index f5621fcf0bf..ddabe060114 100644 --- a/test/form/samples/export-namespace-as/_expected/iife.js +++ b/test/form/samples/export-namespace-as/_expected/iife.js @@ -12,8 +12,6 @@ var bundle = (function (exports) { exports.dep = dep; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/export-namespace-as/_expected/umd.js b/test/form/samples/export-namespace-as/_expected/umd.js index 84efdfa408b..2ce76a08cac 100644 --- a/test/form/samples/export-namespace-as/_expected/umd.js +++ b/test/form/samples/export-namespace-as/_expected/umd.js @@ -15,6 +15,4 @@ exports.dep = dep; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/exports-at-end-if-possible/_expected/amd.js b/test/form/samples/exports-at-end-if-possible/_expected/amd.js index e54ab39117e..9bf1231a7b7 100644 --- a/test/form/samples/exports-at-end-if-possible/_expected/amd.js +++ b/test/form/samples/exports-at-end-if-possible/_expected/amd.js @@ -8,6 +8,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.FOO = FOO; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/exports-at-end-if-possible/_expected/cjs.js b/test/form/samples/exports-at-end-if-possible/_expected/cjs.js index f62037c89b9..57d55d3cb81 100644 --- a/test/form/samples/exports-at-end-if-possible/_expected/cjs.js +++ b/test/form/samples/exports-at-end-if-possible/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var FOO = 'foo'; console.log( FOO ); diff --git a/test/form/samples/exports-at-end-if-possible/_expected/iife.js b/test/form/samples/exports-at-end-if-possible/_expected/iife.js index 7575534a46f..81f75f465ed 100644 --- a/test/form/samples/exports-at-end-if-possible/_expected/iife.js +++ b/test/form/samples/exports-at-end-if-possible/_expected/iife.js @@ -9,8 +9,6 @@ var myBundle = (function (exports) { exports.FOO = FOO; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/exports-at-end-if-possible/_expected/umd.js b/test/form/samples/exports-at-end-if-possible/_expected/umd.js index 3f885ef27a9..b9ae739b3b7 100644 --- a/test/form/samples/exports-at-end-if-possible/_expected/umd.js +++ b/test/form/samples/exports-at-end-if-possible/_expected/umd.js @@ -12,6 +12,4 @@ exports.FOO = FOO; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/extend-exports/_expected/amd.js b/test/form/samples/extend-exports/_expected/amd.js index f8bddcee737..abf361b15be 100644 --- a/test/form/samples/extend-exports/_expected/amd.js +++ b/test/form/samples/extend-exports/_expected/amd.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.answer = answer; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/extend-exports/_expected/cjs.js b/test/form/samples/extend-exports/_expected/cjs.js index 316e49a5c1b..94b8c7ce11f 100644 --- a/test/form/samples/extend-exports/_expected/cjs.js +++ b/test/form/samples/extend-exports/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const answer = 42; exports.answer = answer; diff --git a/test/form/samples/extend-exports/_expected/iife.js b/test/form/samples/extend-exports/_expected/iife.js index b6cd7c4fa9b..ad53d6c41f6 100644 --- a/test/form/samples/extend-exports/_expected/iife.js +++ b/test/form/samples/extend-exports/_expected/iife.js @@ -5,6 +5,4 @@ exports.answer = answer; - Object.defineProperty(exports, '__esModule', { value: true }); - })(this.foo = this.foo || {}); diff --git a/test/form/samples/extend-exports/_expected/umd.js b/test/form/samples/extend-exports/_expected/umd.js index 00da9b65fef..853481054c3 100644 --- a/test/form/samples/extend-exports/_expected/umd.js +++ b/test/form/samples/extend-exports/_expected/umd.js @@ -8,6 +8,4 @@ exports.answer = answer; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/extend-namespaced-exports/_expected/amd.js b/test/form/samples/extend-namespaced-exports/_expected/amd.js index f8bddcee737..abf361b15be 100644 --- a/test/form/samples/extend-namespaced-exports/_expected/amd.js +++ b/test/form/samples/extend-namespaced-exports/_expected/amd.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.answer = answer; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/extend-namespaced-exports/_expected/cjs.js b/test/form/samples/extend-namespaced-exports/_expected/cjs.js index 316e49a5c1b..94b8c7ce11f 100644 --- a/test/form/samples/extend-namespaced-exports/_expected/cjs.js +++ b/test/form/samples/extend-namespaced-exports/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const answer = 42; exports.answer = answer; diff --git a/test/form/samples/extend-namespaced-exports/_expected/iife.js b/test/form/samples/extend-namespaced-exports/_expected/iife.js index 8c0662c80e5..76ebf3dc5dd 100644 --- a/test/form/samples/extend-namespaced-exports/_expected/iife.js +++ b/test/form/samples/extend-namespaced-exports/_expected/iife.js @@ -7,6 +7,4 @@ this.foo.bar = this.foo.bar || {}; exports.answer = answer; - Object.defineProperty(exports, '__esModule', { value: true }); - })(this.foo.bar.baz = this.foo.bar.baz || {}); diff --git a/test/form/samples/extend-namespaced-exports/_expected/umd.js b/test/form/samples/extend-namespaced-exports/_expected/umd.js index 119a86b2fb5..7e77624dadb 100644 --- a/test/form/samples/extend-namespaced-exports/_expected/umd.js +++ b/test/form/samples/extend-namespaced-exports/_expected/umd.js @@ -8,6 +8,4 @@ exports.answer = answer; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/external-deshadowing/_expected/amd.js b/test/form/samples/external-deshadowing/_expected/amd.js index 27144d0ed2f..122452ecd6f 100644 --- a/test/form/samples/external-deshadowing/_expected/amd.js +++ b/test/form/samples/external-deshadowing/_expected/amd.js @@ -1,20 +1,14 @@ define(['exports', 'a', 'b'], (function (exports, a, Test$1) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var Test__default = /*#__PURE__*/_interopDefaultLegacy(Test$1); - const Test = () => { console.log(a.Test); }; const Test1 = () => { - console.log(Test__default.default); + console.log(Test$1); }; exports.Test = Test; exports.Test1 = Test1; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/external-deshadowing/_expected/cjs.js b/test/form/samples/external-deshadowing/_expected/cjs.js index f6693c582dd..9f00f05c1a9 100644 --- a/test/form/samples/external-deshadowing/_expected/cjs.js +++ b/test/form/samples/external-deshadowing/_expected/cjs.js @@ -1,20 +1,14 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var a = require('a'); var Test$1 = require('b'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -var Test__default = /*#__PURE__*/_interopDefaultLegacy(Test$1); - const Test = () => { console.log(a.Test); }; const Test1 = () => { - console.log(Test__default.default); + console.log(Test$1); }; exports.Test = Test; diff --git a/test/form/samples/external-deshadowing/_expected/iife.js b/test/form/samples/external-deshadowing/_expected/iife.js index fed67f8075e..a201360e0ee 100644 --- a/test/form/samples/external-deshadowing/_expected/iife.js +++ b/test/form/samples/external-deshadowing/_expected/iife.js @@ -1,23 +1,17 @@ var myBundle = (function (exports, a, Test$1) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var Test__default = /*#__PURE__*/_interopDefaultLegacy(Test$1); - const Test = () => { console.log(a.Test); }; const Test1 = () => { - console.log(Test__default.default); + console.log(Test$1); }; exports.Test = Test; exports.Test1 = Test1; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}, a, b); diff --git a/test/form/samples/external-deshadowing/_expected/umd.js b/test/form/samples/external-deshadowing/_expected/umd.js index c3bd9447f1c..98eb524c2df 100644 --- a/test/form/samples/external-deshadowing/_expected/umd.js +++ b/test/form/samples/external-deshadowing/_expected/umd.js @@ -4,21 +4,15 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.myBundle = {}, global.a, global.b)); })(this, (function (exports, a, Test$1) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var Test__default = /*#__PURE__*/_interopDefaultLegacy(Test$1); - const Test = () => { console.log(a.Test); }; const Test1 = () => { - console.log(Test__default.default); + console.log(Test$1); }; exports.Test = Test; exports.Test1 = Test1; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/external-export-tracing/_expected/amd.js b/test/form/samples/external-export-tracing/_expected/amd.js index 434d4d85ff7..7302309f5fe 100644 --- a/test/form/samples/external-export-tracing/_expected/amd.js +++ b/test/form/samples/external-export-tracing/_expected/amd.js @@ -7,6 +7,4 @@ define(['exports', 'external'], (function (exports, external) { 'use strict'; get: function () { return external.p; } }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/external-export-tracing/_expected/cjs.js b/test/form/samples/external-export-tracing/_expected/cjs.js index f7e2ce636b9..0c1dd2d83b6 100644 --- a/test/form/samples/external-export-tracing/_expected/cjs.js +++ b/test/form/samples/external-export-tracing/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var external = require('external'); diff --git a/test/form/samples/external-export-tracing/_expected/iife.js b/test/form/samples/external-export-tracing/_expected/iife.js index e57a9a135f6..a205fe2e3b4 100644 --- a/test/form/samples/external-export-tracing/_expected/iife.js +++ b/test/form/samples/external-export-tracing/_expected/iife.js @@ -8,8 +8,6 @@ var myBundle = (function (exports, external) { get: function () { return external.p; } }); - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}, external); diff --git a/test/form/samples/external-export-tracing/_expected/umd.js b/test/form/samples/external-export-tracing/_expected/umd.js index bce4dec43ec..f03e9c224d3 100644 --- a/test/form/samples/external-export-tracing/_expected/umd.js +++ b/test/form/samples/external-export-tracing/_expected/umd.js @@ -9,6 +9,4 @@ get: function () { return external.p; } }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/external-imports-custom-names/_expected/amd.js b/test/form/samples/external-imports-custom-names/_expected/amd.js index 91b8c9ba9e9..624cea58dd0 100644 --- a/test/form/samples/external-imports-custom-names/_expected/amd.js +++ b/test/form/samples/external-imports-custom-names/_expected/amd.js @@ -1,11 +1,7 @@ define(['jquery'], (function ($) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var $__default = /*#__PURE__*/_interopDefaultLegacy($); - - $__default.default( function () { - $__default.default( 'body' ).html( '

hello world!

' ); + $( function () { + $( 'body' ).html( '

hello world!

' ); }); })); diff --git a/test/form/samples/external-imports-custom-names/_expected/cjs.js b/test/form/samples/external-imports-custom-names/_expected/cjs.js index edfe3b1f1f6..f9889a5926e 100644 --- a/test/form/samples/external-imports-custom-names/_expected/cjs.js +++ b/test/form/samples/external-imports-custom-names/_expected/cjs.js @@ -2,10 +2,6 @@ var $ = require('jquery'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -var $__default = /*#__PURE__*/_interopDefaultLegacy($); - -$__default.default( function () { - $__default.default( 'body' ).html( '

hello world!

' ); +$( function () { + $( 'body' ).html( '

hello world!

' ); }); diff --git a/test/form/samples/external-imports-custom-names/_expected/iife.js b/test/form/samples/external-imports-custom-names/_expected/iife.js index 4de45cc8218..a7957b8efa2 100644 --- a/test/form/samples/external-imports-custom-names/_expected/iife.js +++ b/test/form/samples/external-imports-custom-names/_expected/iife.js @@ -1,12 +1,8 @@ (function ($) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var $__default = /*#__PURE__*/_interopDefaultLegacy($); - - $__default.default( function () { - $__default.default( 'body' ).html( '

hello world!

' ); + $( function () { + $( 'body' ).html( '

hello world!

' ); }); })(jQuery); diff --git a/test/form/samples/external-imports-custom-names/_expected/umd.js b/test/form/samples/external-imports-custom-names/_expected/umd.js index 07145d896ea..5c76e5cfc63 100644 --- a/test/form/samples/external-imports-custom-names/_expected/umd.js +++ b/test/form/samples/external-imports-custom-names/_expected/umd.js @@ -4,12 +4,8 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.jQuery)); })(this, (function ($) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var $__default = /*#__PURE__*/_interopDefaultLegacy($); - - $__default.default( function () { - $__default.default( 'body' ).html( '

hello world!

' ); + $( function () { + $( 'body' ).html( '

hello world!

' ); }); })); diff --git a/test/form/samples/external-imports/_expected/amd.js b/test/form/samples/external-imports/_expected/amd.js index 42bcbdb27b9..4e59b501e11 100644 --- a/test/form/samples/external-imports/_expected/amd.js +++ b/test/form/samples/external-imports/_expected/amd.js @@ -1,9 +1,6 @@ define(['factory', 'baz', 'shipping-port', 'alphabet'], (function (factory, baz, containers, alphabet) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -20,14 +17,12 @@ define(['factory', 'baz', 'shipping-port', 'alphabet'], (function (factory, baz, return Object.freeze(n); } - var factory__default = /*#__PURE__*/_interopDefaultLegacy(factory); - var containers__namespace = /*#__PURE__*/_interopNamespace(containers); - var alphabet__default = /*#__PURE__*/_interopDefaultLegacy(alphabet); + var containers__namespace = /*#__PURE__*/_interopNamespaceDefault(containers); - factory__default.default( null ); + factory( null ); baz.foo( baz.bar, containers.port ); containers__namespace.forEach( console.log, console ); console.log( alphabet.a ); - console.log( alphabet__default.default.length ); + console.log( alphabet.length ); })); diff --git a/test/form/samples/external-imports/_expected/cjs.js b/test/form/samples/external-imports/_expected/cjs.js index ebf57a39c9b..c267c41c964 100644 --- a/test/form/samples/external-imports/_expected/cjs.js +++ b/test/form/samples/external-imports/_expected/cjs.js @@ -5,10 +5,7 @@ var baz = require('baz'); var containers = require('shipping-port'); var alphabet = require('alphabet'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -25,12 +22,10 @@ function _interopNamespace(e) { return Object.freeze(n); } -var factory__default = /*#__PURE__*/_interopDefaultLegacy(factory); -var containers__namespace = /*#__PURE__*/_interopNamespace(containers); -var alphabet__default = /*#__PURE__*/_interopDefaultLegacy(alphabet); +var containers__namespace = /*#__PURE__*/_interopNamespaceDefault(containers); -factory__default.default( null ); +factory( null ); baz.foo( baz.bar, containers.port ); containers__namespace.forEach( console.log, console ); console.log( alphabet.a ); -console.log( alphabet__default.default.length ); +console.log( alphabet.length ); diff --git a/test/form/samples/external-imports/_expected/iife.js b/test/form/samples/external-imports/_expected/iife.js index a7e69332fa0..d62456725f8 100644 --- a/test/form/samples/external-imports/_expected/iife.js +++ b/test/form/samples/external-imports/_expected/iife.js @@ -1,10 +1,7 @@ (function (factory, baz, containers, alphabet) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -21,14 +18,12 @@ return Object.freeze(n); } - var factory__default = /*#__PURE__*/_interopDefaultLegacy(factory); - var containers__namespace = /*#__PURE__*/_interopNamespace(containers); - var alphabet__default = /*#__PURE__*/_interopDefaultLegacy(alphabet); + var containers__namespace = /*#__PURE__*/_interopNamespaceDefault(containers); - factory__default.default( null ); + factory( null ); baz.foo( baz.bar, containers.port ); containers__namespace.forEach( console.log, console ); console.log( alphabet.a ); - console.log( alphabet__default.default.length ); + console.log( alphabet.length ); })(factory, baz, containers, alphabet); diff --git a/test/form/samples/external-imports/_expected/umd.js b/test/form/samples/external-imports/_expected/umd.js index 69b8fb8c657..bbcd4235d49 100644 --- a/test/form/samples/external-imports/_expected/umd.js +++ b/test/form/samples/external-imports/_expected/umd.js @@ -4,10 +4,7 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.factory, global.baz, global.containers, global.alphabet)); })(this, (function (factory, baz, containers, alphabet) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -24,14 +21,12 @@ return Object.freeze(n); } - var factory__default = /*#__PURE__*/_interopDefaultLegacy(factory); - var containers__namespace = /*#__PURE__*/_interopNamespace(containers); - var alphabet__default = /*#__PURE__*/_interopDefaultLegacy(alphabet); + var containers__namespace = /*#__PURE__*/_interopNamespaceDefault(containers); - factory__default.default( null ); + factory( null ); baz.foo( baz.bar, containers.port ); containers__namespace.forEach( console.log, console ); console.log( alphabet.a ); - console.log( alphabet__default.default.length ); + console.log( alphabet.length ); })); diff --git a/test/form/samples/external-namespace-and-named/_expected/amd.js b/test/form/samples/external-namespace-and-named/_expected/amd.js index 7ded640b815..c5bb406d9cf 100644 --- a/test/form/samples/external-namespace-and-named/_expected/amd.js +++ b/test/form/samples/external-namespace-and-named/_expected/amd.js @@ -1,7 +1,6 @@ define(['foo'], (function (foo) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -18,7 +17,7 @@ define(['foo'], (function (foo) { 'use strict'; return Object.freeze(n); } - var foo__namespace = /*#__PURE__*/_interopNamespace(foo); + var foo__namespace = /*#__PURE__*/_interopNamespaceDefault(foo); console.log(foo__namespace); console.log(foo.blah); diff --git a/test/form/samples/external-namespace-and-named/_expected/cjs.js b/test/form/samples/external-namespace-and-named/_expected/cjs.js index 455dfb3bdd0..3c3f9bed195 100644 --- a/test/form/samples/external-namespace-and-named/_expected/cjs.js +++ b/test/form/samples/external-namespace-and-named/_expected/cjs.js @@ -2,8 +2,7 @@ var foo = require('foo'); -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -20,7 +19,7 @@ function _interopNamespace(e) { return Object.freeze(n); } -var foo__namespace = /*#__PURE__*/_interopNamespace(foo); +var foo__namespace = /*#__PURE__*/_interopNamespaceDefault(foo); console.log(foo__namespace); console.log(foo.blah); diff --git a/test/form/samples/external-namespace-and-named/_expected/iife.js b/test/form/samples/external-namespace-and-named/_expected/iife.js index 0ab29315763..f83d069253e 100644 --- a/test/form/samples/external-namespace-and-named/_expected/iife.js +++ b/test/form/samples/external-namespace-and-named/_expected/iife.js @@ -1,8 +1,7 @@ (function (foo) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -19,7 +18,7 @@ return Object.freeze(n); } - var foo__namespace = /*#__PURE__*/_interopNamespace(foo); + var foo__namespace = /*#__PURE__*/_interopNamespaceDefault(foo); console.log(foo__namespace); console.log(foo.blah); diff --git a/test/form/samples/external-namespace-and-named/_expected/umd.js b/test/form/samples/external-namespace-and-named/_expected/umd.js index 23da07905a8..064917cbecc 100644 --- a/test/form/samples/external-namespace-and-named/_expected/umd.js +++ b/test/form/samples/external-namespace-and-named/_expected/umd.js @@ -4,8 +4,7 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.foo)); })(this, (function (foo) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -22,7 +21,7 @@ return Object.freeze(n); } - var foo__namespace = /*#__PURE__*/_interopNamespace(foo); + var foo__namespace = /*#__PURE__*/_interopNamespaceDefault(foo); console.log(foo__namespace); console.log(foo.blah); diff --git a/test/form/samples/external-namespace-reexport/_expected/amd.js b/test/form/samples/external-namespace-reexport/_expected/amd.js index 7d83265b5d4..0aa09e1e5bc 100644 --- a/test/form/samples/external-namespace-reexport/_expected/amd.js +++ b/test/form/samples/external-namespace-reexport/_expected/amd.js @@ -1,7 +1,6 @@ define(['exports', 'highcharts'], (function (exports, highcharts) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -18,12 +17,10 @@ define(['exports', 'highcharts'], (function (exports, highcharts) { 'use strict' return Object.freeze(n); } - var highcharts__namespace = /*#__PURE__*/_interopNamespace(highcharts); + var highcharts__namespace = /*#__PURE__*/_interopNamespaceDefault(highcharts); exports.Highcharts = highcharts__namespace; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/external-namespace-reexport/_expected/cjs.js b/test/form/samples/external-namespace-reexport/_expected/cjs.js index 51918a9aca1..f6c032ceac1 100644 --- a/test/form/samples/external-namespace-reexport/_expected/cjs.js +++ b/test/form/samples/external-namespace-reexport/_expected/cjs.js @@ -1,11 +1,8 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var highcharts = require('highcharts'); -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -22,7 +19,7 @@ function _interopNamespace(e) { return Object.freeze(n); } -var highcharts__namespace = /*#__PURE__*/_interopNamespace(highcharts); +var highcharts__namespace = /*#__PURE__*/_interopNamespaceDefault(highcharts); diff --git a/test/form/samples/external-namespace-reexport/_expected/iife.js b/test/form/samples/external-namespace-reexport/_expected/iife.js index c46734271db..490db1dc774 100644 --- a/test/form/samples/external-namespace-reexport/_expected/iife.js +++ b/test/form/samples/external-namespace-reexport/_expected/iife.js @@ -1,8 +1,7 @@ var myBundle = (function (exports, highcharts) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -19,14 +18,12 @@ var myBundle = (function (exports, highcharts) { return Object.freeze(n); } - var highcharts__namespace = /*#__PURE__*/_interopNamespace(highcharts); + var highcharts__namespace = /*#__PURE__*/_interopNamespaceDefault(highcharts); exports.Highcharts = highcharts__namespace; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}, highcharts); diff --git a/test/form/samples/external-namespace-reexport/_expected/umd.js b/test/form/samples/external-namespace-reexport/_expected/umd.js index 47d0d527774..85c14cbfb00 100644 --- a/test/form/samples/external-namespace-reexport/_expected/umd.js +++ b/test/form/samples/external-namespace-reexport/_expected/umd.js @@ -4,8 +4,7 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.myBundle = {}, global.highcharts)); })(this, (function (exports, highcharts) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -22,12 +21,10 @@ return Object.freeze(n); } - var highcharts__namespace = /*#__PURE__*/_interopNamespace(highcharts); + var highcharts__namespace = /*#__PURE__*/_interopNamespaceDefault(highcharts); exports.Highcharts = highcharts__namespace; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/freeze/_expected/amd.js b/test/form/samples/freeze/_expected/amd.js index 478b4f113a1..10afc7b2dfc 100644 --- a/test/form/samples/freeze/_expected/amd.js +++ b/test/form/samples/freeze/_expected/amd.js @@ -17,6 +17,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.a = a; exports.b = b; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/freeze/_expected/cjs.js b/test/form/samples/freeze/_expected/cjs.js index 2ee4ef34da1..4d7c8742215 100644 --- a/test/form/samples/freeze/_expected/cjs.js +++ b/test/form/samples/freeze/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const foo = 1; const bar = 2; diff --git a/test/form/samples/freeze/_expected/iife.js b/test/form/samples/freeze/_expected/iife.js index dbacfaa734c..16d7de3fad2 100644 --- a/test/form/samples/freeze/_expected/iife.js +++ b/test/form/samples/freeze/_expected/iife.js @@ -18,8 +18,6 @@ var myBundle = (function (exports) { exports.a = a; exports.b = b; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/freeze/_expected/umd.js b/test/form/samples/freeze/_expected/umd.js index 8725f865161..ca42a4eeccf 100644 --- a/test/form/samples/freeze/_expected/umd.js +++ b/test/form/samples/freeze/_expected/umd.js @@ -21,6 +21,4 @@ exports.a = a; exports.b = b; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/function-mutation/_expected/amd.js b/test/form/samples/function-mutation/_expected/amd.js index 2cd946dc877..25fec9ef334 100644 --- a/test/form/samples/function-mutation/_expected/amd.js +++ b/test/form/samples/function-mutation/_expected/amd.js @@ -45,6 +45,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.g = g; exports.i = i; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/function-mutation/_expected/cjs.js b/test/form/samples/function-mutation/_expected/cjs.js index 51b5d461cf8..5291f114edb 100644 --- a/test/form/samples/function-mutation/_expected/cjs.js +++ b/test/form/samples/function-mutation/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - function foo () { console.log( 'foo' ); } diff --git a/test/form/samples/function-mutation/_expected/iife.js b/test/form/samples/function-mutation/_expected/iife.js index dff16f1dfd3..8ee2f0ac6fc 100644 --- a/test/form/samples/function-mutation/_expected/iife.js +++ b/test/form/samples/function-mutation/_expected/iife.js @@ -46,8 +46,6 @@ var bundle = (function (exports) { exports.g = g; exports.i = i; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/function-mutation/_expected/umd.js b/test/form/samples/function-mutation/_expected/umd.js index 4ebe59cad08..d7d3e2fe237 100644 --- a/test/form/samples/function-mutation/_expected/umd.js +++ b/test/form/samples/function-mutation/_expected/umd.js @@ -49,6 +49,4 @@ exports.g = g; exports.i = i; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/generated-code-compact/arrow-functions-false/_config.js b/test/form/samples/generated-code-compact/arrow-functions-false/_config.js index 20bea552d16..b09e03b16ce 100644 --- a/test/form/samples/generated-code-compact/arrow-functions-false/_config.js +++ b/test/form/samples/generated-code-compact/arrow-functions-false/_config.js @@ -22,7 +22,7 @@ module.exports = { if (id === 'externalAuto') { return 'auto'; } - return true; + return 'compat'; }, name: 'bundle', noConflict: true diff --git a/test/form/samples/generated-code-compact/arrow-functions-false/_expected/amd.js b/test/form/samples/generated-code-compact/arrow-functions-false/_expected/amd.js index 5298f10a873..e0d2fd3d469 100644 --- a/test/form/samples/generated-code-compact/arrow-functions-false/_expected/amd.js +++ b/test/form/samples/generated-code-compact/arrow-functions-false/_expected/amd.js @@ -1,12 +1,12 @@ -define(['require','exports','externalNoImport','external','externalAuto','externalDefault','externalDefaultOnly'],(function(require,exports,externalNoImport,defaultLegacy,externalAuto,externalDefault,externalDefaultOnly){'use strict';function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e:{default:e}}function _interopDefault(e){return e&&e.__esModule?e:{default:e}}function _interopNamespaceDefaultOnly(e){return Object.freeze({__proto__:null,default:e})}function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n.default=e;return Object.freeze(n)}function _interopNamespace(e){return e&&e.__esModule?e:_interopNamespaceDefault(e)}function _mergeNamespaces(n, m){m.forEach(function(e){e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(function(k){if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})});return Object.freeze(n);}var defaultLegacy__namespace=/*#__PURE__*/_interopNamespace(defaultLegacy);var defaultLegacy__default=/*#__PURE__*/_interopDefaultLegacy(defaultLegacy);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0; +define(['require','exports','externalNoImport','external','externalAuto','externalDefault','externalDefaultOnly'],(function(require,exports,externalNoImport,defaultCompat,externalAuto,externalDefault,externalDefaultOnly){'use strict';function _interopDefault(e){return e&&e.__esModule?e:{default:e}}function _interopNamespaceCompat(e){return e&&typeof e==='object'&&'default'in e?e:_interopNamespaceDefault(e)}function _interopNamespaceDefaultOnly(e){return Object.freeze({__proto__:null,default:e})}function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n.default=e;return Object.freeze(n)}function _mergeNamespaces(n, m){m.forEach(function(e){e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(function(k){if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})});return Object.freeze(n);}var defaultCompat__namespace=/*#__PURE__*/_interopNamespaceCompat(defaultCompat);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0; -({ a: exports.a } = defaultLegacy.b); -console.log({ a: exports.a } = defaultLegacy.b); +({ a: exports.a } = defaultCompat.b); +console.log({ a: exports.a } = defaultCompat.b); Promise.resolve().then(function(){return main}).then(console.log); -new Promise(function(c,e){require(['external'],function(m){c(/*#__PURE__*/_interopNamespace(m))},e)}).then(console.log); -console.log(defaultLegacy__default.default); +new Promise(function(c,e){require(['external'],function(m){c(/*#__PURE__*/_interopNamespaceCompat(m))},e)}).then(console.log); +console.log(defaultCompat__namespace.default); console.log(externalAuto__default.default); console.log(externalDefault__namespace); -console.log(externalDefaultOnly__namespace);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return exports.a},foo:foo},[defaultLegacy__namespace]);Object.defineProperty(exports,'foo',{enumerable:true,get:function(){return defaultLegacy.foo}});Object.keys(defaultLegacy).forEach(function(k){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:function(){return defaultLegacy[k]}})});Object.defineProperty(exports,'__esModule',{value:true});})); \ No newline at end of file +console.log(externalDefaultOnly__namespace);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return exports.a},foo:foo},[defaultCompat__namespace]);Object.defineProperty(exports,'foo',{enumerable:true,get:function(){return defaultCompat.foo}});Object.keys(defaultCompat).forEach(function(k){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:function(){return defaultCompat[k]}})});})); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/arrow-functions-false/_expected/cjs.js b/test/form/samples/generated-code-compact/arrow-functions-false/_expected/cjs.js index ff9d26b33fb..fcf3f0cf16a 100644 --- a/test/form/samples/generated-code-compact/arrow-functions-false/_expected/cjs.js +++ b/test/form/samples/generated-code-compact/arrow-functions-false/_expected/cjs.js @@ -1,12 +1,12 @@ -'use strict';Object.defineProperty(exports,'__esModule',{value:true});require('externalNoImport');var defaultLegacy=require('external'),externalAuto=require('externalAuto'),externalDefault=require('externalDefault'),externalDefaultOnly=require('externalDefaultOnly');function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e:{default:e}}function _interopDefault(e){return e&&e.__esModule?e:{default:e}}function _interopNamespaceDefaultOnly(e){return Object.freeze({__proto__:null,default:e})}function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n.default=e;return Object.freeze(n)}function _interopNamespace(e){return e&&e.__esModule?e:_interopNamespaceDefault(e)}function _mergeNamespaces(n, m){m.forEach(function(e){e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(function(k){if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})});return Object.freeze(n);}var defaultLegacy__namespace=/*#__PURE__*/_interopNamespace(defaultLegacy);var defaultLegacy__default=/*#__PURE__*/_interopDefaultLegacy(defaultLegacy);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0; +'use strict';require('externalNoImport');var defaultCompat=require('external'),externalAuto=require('externalAuto'),externalDefault=require('externalDefault'),externalDefaultOnly=require('externalDefaultOnly');function _interopDefault(e){return e&&e.__esModule?e:{default:e}}function _interopNamespaceCompat(e){return e&&typeof e==='object'&&'default'in e?e:_interopNamespaceDefault(e)}function _interopNamespaceDefaultOnly(e){return Object.freeze({__proto__:null,default:e})}function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n.default=e;return Object.freeze(n)}function _mergeNamespaces(n, m){m.forEach(function(e){e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(function(k){if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})});return Object.freeze(n);}var defaultCompat__namespace=/*#__PURE__*/_interopNamespaceCompat(defaultCompat);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0; -({ a: exports.a } = defaultLegacy.b); -console.log({ a: exports.a } = defaultLegacy.b); +({ a: exports.a } = defaultCompat.b); +console.log({ a: exports.a } = defaultCompat.b); Promise.resolve().then(function(){return main}).then(console.log); -Promise.resolve().then(function(){return /*#__PURE__*/_interopNamespace(require('external'))}).then(console.log); -console.log(defaultLegacy__default.default); +Promise.resolve().then(function(){return /*#__PURE__*/_interopNamespaceCompat(require('external'))}).then(console.log); +console.log(defaultCompat__namespace.default); console.log(externalAuto__default.default); console.log(externalDefault__namespace); -console.log(externalDefaultOnly__namespace);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return exports.a},foo:foo},[defaultLegacy__namespace]);Object.defineProperty(exports,'foo',{enumerable:true,get:function(){return defaultLegacy.foo}});Object.keys(defaultLegacy).forEach(function(k){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:function(){return defaultLegacy[k]}})}); \ No newline at end of file +console.log(externalDefaultOnly__namespace);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return exports.a},foo:foo},[defaultCompat__namespace]);Object.defineProperty(exports,'foo',{enumerable:true,get:function(){return defaultCompat.foo}});Object.keys(defaultCompat).forEach(function(k){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:function(){return defaultCompat[k]}})}); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/arrow-functions-false/_expected/es.js b/test/form/samples/generated-code-compact/arrow-functions-false/_expected/es.js index 1b203b91c4b..02ee2e9e379 100644 --- a/test/form/samples/generated-code-compact/arrow-functions-false/_expected/es.js +++ b/test/form/samples/generated-code-compact/arrow-functions-false/_expected/es.js @@ -1,4 +1,4 @@ -import'externalNoImport';import*as defaultLegacy from'external';import defaultLegacy__default,{b}from'external';export*from'external';export{foo}from'external';import externalAuto from'externalAuto';import*as externalDefault from'externalDefault';import*as externalDefaultOnly from'externalDefaultOnly';function _mergeNamespaces(n, m){m.forEach(function(e){e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(function(k){if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})});return Object.freeze(n);}let a; +import'externalNoImport';import*as defaultCompat from'external';import defaultCompat__default,{b}from'external';export*from'external';export{foo}from'external';import externalAuto from'externalAuto';import*as externalDefault from'externalDefault';import*as externalDefaultOnly from'externalDefaultOnly';function _mergeNamespaces(n, m){m.forEach(function(e){e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(function(k){if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})});return Object.freeze(n);}let a; ({ a } = b); console.log({ a } = b); @@ -6,7 +6,7 @@ console.log({ a } = b); Promise.resolve().then(function(){return main}).then(console.log); import('external').then(console.log); -console.log(defaultLegacy__default); +console.log(defaultCompat__default); console.log(externalAuto); console.log(externalDefault); -console.log(externalDefaultOnly);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return a},foo:foo},[defaultLegacy]);export{a}; \ No newline at end of file +console.log(externalDefaultOnly);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return a},foo:foo},[defaultCompat]);export{a}; \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/arrow-functions-false/_expected/iife.js b/test/form/samples/generated-code-compact/arrow-functions-false/_expected/iife.js index 0b5de2983bb..7ab3db90751 100644 --- a/test/form/samples/generated-code-compact/arrow-functions-false/_expected/iife.js +++ b/test/form/samples/generated-code-compact/arrow-functions-false/_expected/iife.js @@ -1,12 +1,12 @@ -var bundle=(function(exports,externalNoImport,defaultLegacy,externalAuto,externalDefault,externalDefaultOnly){'use strict';function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e:{default:e}}function _interopDefault(e){return e&&e.__esModule?e:{default:e}}function _interopNamespaceDefaultOnly(e){return Object.freeze({__proto__:null,default:e})}function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n.default=e;return Object.freeze(n)}function _interopNamespace(e){return e&&e.__esModule?e:_interopNamespaceDefault(e)}function _mergeNamespaces(n, m){m.forEach(function(e){e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(function(k){if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})});return Object.freeze(n);}var defaultLegacy__namespace=/*#__PURE__*/_interopNamespace(defaultLegacy);var defaultLegacy__default=/*#__PURE__*/_interopDefaultLegacy(defaultLegacy);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0; +var bundle=(function(exports,externalNoImport,defaultCompat,externalAuto,externalDefault,externalDefaultOnly){'use strict';function _interopDefault(e){return e&&e.__esModule?e:{default:e}}function _interopNamespaceCompat(e){return e&&typeof e==='object'&&'default'in e?e:_interopNamespaceDefault(e)}function _interopNamespaceDefaultOnly(e){return Object.freeze({__proto__:null,default:e})}function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n.default=e;return Object.freeze(n)}function _mergeNamespaces(n, m){m.forEach(function(e){e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(function(k){if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})});return Object.freeze(n);}var defaultCompat__namespace=/*#__PURE__*/_interopNamespaceCompat(defaultCompat);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0; -({ a: exports.a } = defaultLegacy.b); -console.log({ a: exports.a } = defaultLegacy.b); +({ a: exports.a } = defaultCompat.b); +console.log({ a: exports.a } = defaultCompat.b); Promise.resolve().then(function(){return main}).then(console.log); import('external').then(console.log); -console.log(defaultLegacy__default.default); +console.log(defaultCompat__namespace.default); console.log(externalAuto__default.default); console.log(externalDefault__namespace); -console.log(externalDefaultOnly__namespace);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return exports.a},foo:foo},[defaultLegacy__namespace]);Object.defineProperty(exports,'foo',{enumerable:true,get:function(){return defaultLegacy.foo}});Object.keys(defaultLegacy).forEach(function(k){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:function(){return defaultLegacy[k]}})});Object.defineProperty(exports,'__esModule',{value:true});return exports;})({},null,defaultLegacy,externalAuto,externalDefault,externalDefaultOnly); \ No newline at end of file +console.log(externalDefaultOnly__namespace);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return exports.a},foo:foo},[defaultCompat__namespace]);Object.defineProperty(exports,'foo',{enumerable:true,get:function(){return defaultCompat.foo}});Object.keys(defaultCompat).forEach(function(k){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:function(){return defaultCompat[k]}})});return exports;})({},null,defaultCompat,externalAuto,externalDefault,externalDefaultOnly); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/arrow-functions-false/_expected/system.js b/test/form/samples/generated-code-compact/arrow-functions-false/_expected/system.js index c95c2219262..446dc2a099f 100644 --- a/test/form/samples/generated-code-compact/arrow-functions-false/_expected/system.js +++ b/test/form/samples/generated-code-compact/arrow-functions-false/_expected/system.js @@ -1,4 +1,4 @@ -System.register('bundle',['externalNoImport','external','externalAuto','externalDefault','externalDefaultOnly'],(function(exports,module){'use strict';var _starExcludes={a:1,default:1,foo:1};var b,defaultLegacy,defaultLegacy__default,externalAuto,externalDefault,externalDefaultOnly;return{setters:[function(){},function(module){b=module.b;defaultLegacy=module;defaultLegacy__default=module.default;var setter={foo:module.foo};for(var name in module){if(!_starExcludes[name])setter[name]=module[name];}exports(setter);},function(module){externalAuto=module.default;},function(module){externalDefault=module;},function(module){externalDefaultOnly=module;}],execute:(function(){function _mergeNamespaces(n, m){m.forEach(function(e){e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(function(k){if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})});return Object.freeze(n);}let a; exports('a',a); +System.register('bundle',['externalNoImport','external','externalAuto','externalDefault','externalDefaultOnly'],(function(exports,module){'use strict';var _starExcludes={a:1,default:1,foo:1};var b,defaultCompat,defaultCompat__default,externalAuto,externalDefault,externalDefaultOnly;return{setters:[function(){},function(module){b=module.b;defaultCompat=module;defaultCompat__default=module.default;var setter={foo:module.foo};for(var name in module){if(!_starExcludes[name])setter[name]=module[name];}exports(setter);},function(module){externalAuto=module.default;},function(module){externalDefault=module;},function(module){externalDefaultOnly=module;}],execute:(function(){function _mergeNamespaces(n, m){m.forEach(function(e){e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(function(k){if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})});return Object.freeze(n);}let a; exports('a',a); (function(v){return exports('a',a),v})({ a } = b); console.log(function(v){return exports('a',a),v}({ a } = b)); @@ -6,7 +6,7 @@ console.log(function(v){return exports('a',a),v}({ a } = b)); Promise.resolve().then(function(){return main}).then(console.log); module.import('external').then(console.log); -console.log(defaultLegacy__default); +console.log(defaultCompat__default); console.log(externalAuto); console.log(externalDefault); -console.log(externalDefaultOnly);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return a},foo:foo},[defaultLegacy]);})}})); \ No newline at end of file +console.log(externalDefaultOnly);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return a},foo:foo},[defaultCompat]);})}})); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/arrow-functions-false/_expected/umd.js b/test/form/samples/generated-code-compact/arrow-functions-false/_expected/umd.js index a982903db27..3598e466331 100644 --- a/test/form/samples/generated-code-compact/arrow-functions-false/_expected/umd.js +++ b/test/form/samples/generated-code-compact/arrow-functions-false/_expected/umd.js @@ -1,12 +1,12 @@ -(function(g,f){typeof exports==='object'&&typeof module!=='undefined'?f(exports,require('externalNoImport'),require('external'),require('externalAuto'),require('externalDefault'),require('externalDefaultOnly')):typeof define==='function'&&define.amd?define(['exports','externalNoImport','external','externalAuto','externalDefault','externalDefaultOnly'],f):(g=typeof globalThis!=='undefined'?globalThis:g||self,(function(){var current=g.bundle;var e=g.bundle={};f(e,null,g.defaultLegacy,g.externalAuto,g.externalDefault,g.externalDefaultOnly);e.noConflict=function(){g.bundle=current;return e};})());})(this,(function(exports,externalNoImport,defaultLegacy,externalAuto,externalDefault,externalDefaultOnly){'use strict';function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e:{default:e}}function _interopDefault(e){return e&&e.__esModule?e:{default:e}}function _interopNamespaceDefaultOnly(e){return Object.freeze({__proto__:null,default:e})}function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n.default=e;return Object.freeze(n)}function _interopNamespace(e){return e&&e.__esModule?e:_interopNamespaceDefault(e)}function _mergeNamespaces(n, m){m.forEach(function(e){e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(function(k){if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})});return Object.freeze(n);}var defaultLegacy__namespace=/*#__PURE__*/_interopNamespace(defaultLegacy);var defaultLegacy__default=/*#__PURE__*/_interopDefaultLegacy(defaultLegacy);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0; +(function(g,f){typeof exports==='object'&&typeof module!=='undefined'?f(exports,require('externalNoImport'),require('external'),require('externalAuto'),require('externalDefault'),require('externalDefaultOnly')):typeof define==='function'&&define.amd?define(['exports','externalNoImport','external','externalAuto','externalDefault','externalDefaultOnly'],f):(g=typeof globalThis!=='undefined'?globalThis:g||self,(function(){var current=g.bundle;var e=g.bundle={};f(e,null,g.defaultCompat,g.externalAuto,g.externalDefault,g.externalDefaultOnly);e.noConflict=function(){g.bundle=current;return e};})());})(this,(function(exports,externalNoImport,defaultCompat,externalAuto,externalDefault,externalDefaultOnly){'use strict';function _interopDefault(e){return e&&e.__esModule?e:{default:e}}function _interopNamespaceCompat(e){return e&&typeof e==='object'&&'default'in e?e:_interopNamespaceDefault(e)}function _interopNamespaceDefaultOnly(e){return Object.freeze({__proto__:null,default:e})}function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n.default=e;return Object.freeze(n)}function _mergeNamespaces(n, m){m.forEach(function(e){e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(function(k){if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})});return Object.freeze(n);}var defaultCompat__namespace=/*#__PURE__*/_interopNamespaceCompat(defaultCompat);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0; -({ a: exports.a } = defaultLegacy.b); -console.log({ a: exports.a } = defaultLegacy.b); +({ a: exports.a } = defaultCompat.b); +console.log({ a: exports.a } = defaultCompat.b); Promise.resolve().then(function(){return main}).then(console.log); import('external').then(console.log); -console.log(defaultLegacy__default.default); +console.log(defaultCompat__namespace.default); console.log(externalAuto__default.default); console.log(externalDefault__namespace); -console.log(externalDefaultOnly__namespace);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return exports.a},foo:foo},[defaultLegacy__namespace]);Object.defineProperty(exports,'foo',{enumerable:true,get:function(){return defaultLegacy.foo}});Object.keys(defaultLegacy).forEach(function(k){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:function(){return defaultLegacy[k]}})});Object.defineProperty(exports,'__esModule',{value:true});})); \ No newline at end of file +console.log(externalDefaultOnly__namespace);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return exports.a},foo:foo},[defaultCompat__namespace]);Object.defineProperty(exports,'foo',{enumerable:true,get:function(){return defaultCompat.foo}});Object.keys(defaultCompat).forEach(function(k){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:function(){return defaultCompat[k]}})});})); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/arrow-functions-true/_config.js b/test/form/samples/generated-code-compact/arrow-functions-true/_config.js index 732ebcf703c..345a5cb345e 100644 --- a/test/form/samples/generated-code-compact/arrow-functions-true/_config.js +++ b/test/form/samples/generated-code-compact/arrow-functions-true/_config.js @@ -22,7 +22,7 @@ module.exports = { if (id === 'externalAuto') { return 'auto'; } - return true; + return 'compat'; }, name: 'bundle', noConflict: true diff --git a/test/form/samples/generated-code-compact/arrow-functions-true/_expected/amd.js b/test/form/samples/generated-code-compact/arrow-functions-true/_expected/amd.js index 98ce0838042..7689ec45a54 100644 --- a/test/form/samples/generated-code-compact/arrow-functions-true/_expected/amd.js +++ b/test/form/samples/generated-code-compact/arrow-functions-true/_expected/amd.js @@ -1,12 +1,12 @@ -define(['require','exports','externalNoImport','external','externalAuto','externalDefault','externalDefaultOnly'],(function(require,exports,externalNoImport,defaultLegacy,externalAuto,externalDefault,externalDefaultOnly){'use strict';var _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{default:e};var _interopDefault=e=>e&&e.__esModule?e:{default:e};var _interopNamespaceDefaultOnly=e=>Object.freeze({__proto__:null,default:e});function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(k=>{if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}})}n.default=e;return Object.freeze(n)}var _interopNamespace=e=>e&&e.__esModule?e:_interopNamespaceDefault(e);function _mergeNamespaces(n, m){m.forEach(e=>e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(k=>{if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}));return Object.freeze(n);}var defaultLegacy__namespace=/*#__PURE__*/_interopNamespace(defaultLegacy);var defaultLegacy__default=/*#__PURE__*/_interopDefaultLegacy(defaultLegacy);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0; +define(['require','exports','externalNoImport','external','externalAuto','externalDefault','externalDefaultOnly'],(function(require,exports,externalNoImport,defaultCompat,externalAuto,externalDefault,externalDefaultOnly){'use strict';var _interopDefault=e=>e&&e.__esModule?e:{default:e};var _interopNamespaceCompat=e=>e&&typeof e==='object'&&'default'in e?e:_interopNamespaceDefault(e);var _interopNamespaceDefaultOnly=e=>Object.freeze({__proto__:null,default:e});function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(k=>{if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}})}n.default=e;return Object.freeze(n)}function _mergeNamespaces(n, m){m.forEach(e=>e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(k=>{if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}));return Object.freeze(n);}var defaultCompat__namespace=/*#__PURE__*/_interopNamespaceCompat(defaultCompat);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0; -({ a: exports.a } = defaultLegacy.b); -console.log({ a: exports.a } = defaultLegacy.b); +({ a: exports.a } = defaultCompat.b); +console.log({ a: exports.a } = defaultCompat.b); Promise.resolve().then(()=>main).then(console.log); -new Promise((c,e)=>require(['external'],m=>c(/*#__PURE__*/_interopNamespace(m)),e)).then(console.log); -console.log(defaultLegacy__default.default); +new Promise((c,e)=>require(['external'],m=>c(/*#__PURE__*/_interopNamespaceCompat(m)),e)).then(console.log); +console.log(defaultCompat__namespace.default); console.log(externalAuto__default.default); console.log(externalDefault__namespace); -console.log(externalDefaultOnly__namespace);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return exports.a},foo:foo},[defaultLegacy__namespace]);Object.defineProperty(exports,'foo',{enumerable:true,get:()=>defaultLegacy.foo});Object.keys(defaultLegacy).forEach(k=>{if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>defaultLegacy[k]})});Object.defineProperty(exports,'__esModule',{value:true});})); \ No newline at end of file +console.log(externalDefaultOnly__namespace);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return exports.a},foo:foo},[defaultCompat__namespace]);Object.defineProperty(exports,'foo',{enumerable:true,get:()=>defaultCompat.foo});Object.keys(defaultCompat).forEach(k=>{if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>defaultCompat[k]})});})); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/arrow-functions-true/_expected/cjs.js b/test/form/samples/generated-code-compact/arrow-functions-true/_expected/cjs.js index acf4df81d4d..85fda17837c 100644 --- a/test/form/samples/generated-code-compact/arrow-functions-true/_expected/cjs.js +++ b/test/form/samples/generated-code-compact/arrow-functions-true/_expected/cjs.js @@ -1,12 +1,12 @@ -'use strict';Object.defineProperty(exports,'__esModule',{value:true});require('externalNoImport');var defaultLegacy=require('external'),externalAuto=require('externalAuto'),externalDefault=require('externalDefault'),externalDefaultOnly=require('externalDefaultOnly');var _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{default:e};var _interopDefault=e=>e&&e.__esModule?e:{default:e};var _interopNamespaceDefaultOnly=e=>Object.freeze({__proto__:null,default:e});function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(k=>{if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}})}n.default=e;return Object.freeze(n)}var _interopNamespace=e=>e&&e.__esModule?e:_interopNamespaceDefault(e);function _mergeNamespaces(n, m){m.forEach(e=>e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(k=>{if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}));return Object.freeze(n);}var defaultLegacy__namespace=/*#__PURE__*/_interopNamespace(defaultLegacy);var defaultLegacy__default=/*#__PURE__*/_interopDefaultLegacy(defaultLegacy);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0; +'use strict';require('externalNoImport');var defaultCompat=require('external'),externalAuto=require('externalAuto'),externalDefault=require('externalDefault'),externalDefaultOnly=require('externalDefaultOnly');var _interopDefault=e=>e&&e.__esModule?e:{default:e};var _interopNamespaceCompat=e=>e&&typeof e==='object'&&'default'in e?e:_interopNamespaceDefault(e);var _interopNamespaceDefaultOnly=e=>Object.freeze({__proto__:null,default:e});function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(k=>{if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}})}n.default=e;return Object.freeze(n)}function _mergeNamespaces(n, m){m.forEach(e=>e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(k=>{if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}));return Object.freeze(n);}var defaultCompat__namespace=/*#__PURE__*/_interopNamespaceCompat(defaultCompat);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0; -({ a: exports.a } = defaultLegacy.b); -console.log({ a: exports.a } = defaultLegacy.b); +({ a: exports.a } = defaultCompat.b); +console.log({ a: exports.a } = defaultCompat.b); Promise.resolve().then(()=>main).then(console.log); -Promise.resolve().then(()=>/*#__PURE__*/_interopNamespace(require('external'))).then(console.log); -console.log(defaultLegacy__default.default); +Promise.resolve().then(()=>/*#__PURE__*/_interopNamespaceCompat(require('external'))).then(console.log); +console.log(defaultCompat__namespace.default); console.log(externalAuto__default.default); console.log(externalDefault__namespace); -console.log(externalDefaultOnly__namespace);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return exports.a},foo:foo},[defaultLegacy__namespace]);Object.defineProperty(exports,'foo',{enumerable:true,get:()=>defaultLegacy.foo});Object.keys(defaultLegacy).forEach(k=>{if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>defaultLegacy[k]})}); \ No newline at end of file +console.log(externalDefaultOnly__namespace);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return exports.a},foo:foo},[defaultCompat__namespace]);Object.defineProperty(exports,'foo',{enumerable:true,get:()=>defaultCompat.foo});Object.keys(defaultCompat).forEach(k=>{if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>defaultCompat[k]})}); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/arrow-functions-true/_expected/es.js b/test/form/samples/generated-code-compact/arrow-functions-true/_expected/es.js index 4f12cc48ad6..76de101e176 100644 --- a/test/form/samples/generated-code-compact/arrow-functions-true/_expected/es.js +++ b/test/form/samples/generated-code-compact/arrow-functions-true/_expected/es.js @@ -1,4 +1,4 @@ -import'externalNoImport';import*as defaultLegacy from'external';import defaultLegacy__default,{b}from'external';export*from'external';export{foo}from'external';import externalAuto from'externalAuto';import*as externalDefault from'externalDefault';import*as externalDefaultOnly from'externalDefaultOnly';function _mergeNamespaces(n, m){m.forEach(e=>e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(k=>{if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}));return Object.freeze(n);}let a; +import'externalNoImport';import*as defaultCompat from'external';import defaultCompat__default,{b}from'external';export*from'external';export{foo}from'external';import externalAuto from'externalAuto';import*as externalDefault from'externalDefault';import*as externalDefaultOnly from'externalDefaultOnly';function _mergeNamespaces(n, m){m.forEach(e=>e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(k=>{if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}));return Object.freeze(n);}let a; ({ a } = b); console.log({ a } = b); @@ -6,7 +6,7 @@ console.log({ a } = b); Promise.resolve().then(()=>main).then(console.log); import('external').then(console.log); -console.log(defaultLegacy__default); +console.log(defaultCompat__default); console.log(externalAuto); console.log(externalDefault); -console.log(externalDefaultOnly);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return a},foo:foo},[defaultLegacy]);export{a}; \ No newline at end of file +console.log(externalDefaultOnly);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return a},foo:foo},[defaultCompat]);export{a}; \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/arrow-functions-true/_expected/iife.js b/test/form/samples/generated-code-compact/arrow-functions-true/_expected/iife.js index ea984fcfb66..291cda49728 100644 --- a/test/form/samples/generated-code-compact/arrow-functions-true/_expected/iife.js +++ b/test/form/samples/generated-code-compact/arrow-functions-true/_expected/iife.js @@ -1,12 +1,12 @@ -var bundle=(function(exports,externalNoImport,defaultLegacy,externalAuto,externalDefault,externalDefaultOnly){'use strict';var _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{default:e};var _interopDefault=e=>e&&e.__esModule?e:{default:e};var _interopNamespaceDefaultOnly=e=>Object.freeze({__proto__:null,default:e});function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(k=>{if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}})}n.default=e;return Object.freeze(n)}var _interopNamespace=e=>e&&e.__esModule?e:_interopNamespaceDefault(e);function _mergeNamespaces(n, m){m.forEach(e=>e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(k=>{if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}));return Object.freeze(n);}var defaultLegacy__namespace=/*#__PURE__*/_interopNamespace(defaultLegacy);var defaultLegacy__default=/*#__PURE__*/_interopDefaultLegacy(defaultLegacy);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0; +var bundle=(function(exports,externalNoImport,defaultCompat,externalAuto,externalDefault,externalDefaultOnly){'use strict';var _interopDefault=e=>e&&e.__esModule?e:{default:e};var _interopNamespaceCompat=e=>e&&typeof e==='object'&&'default'in e?e:_interopNamespaceDefault(e);var _interopNamespaceDefaultOnly=e=>Object.freeze({__proto__:null,default:e});function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(k=>{if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}})}n.default=e;return Object.freeze(n)}function _mergeNamespaces(n, m){m.forEach(e=>e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(k=>{if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}));return Object.freeze(n);}var defaultCompat__namespace=/*#__PURE__*/_interopNamespaceCompat(defaultCompat);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0; -({ a: exports.a } = defaultLegacy.b); -console.log({ a: exports.a } = defaultLegacy.b); +({ a: exports.a } = defaultCompat.b); +console.log({ a: exports.a } = defaultCompat.b); Promise.resolve().then(()=>main).then(console.log); import('external').then(console.log); -console.log(defaultLegacy__default.default); +console.log(defaultCompat__namespace.default); console.log(externalAuto__default.default); console.log(externalDefault__namespace); -console.log(externalDefaultOnly__namespace);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return exports.a},foo:foo},[defaultLegacy__namespace]);Object.defineProperty(exports,'foo',{enumerable:true,get:()=>defaultLegacy.foo});Object.keys(defaultLegacy).forEach(k=>{if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>defaultLegacy[k]})});Object.defineProperty(exports,'__esModule',{value:true});return exports;})({},null,defaultLegacy,externalAuto,externalDefault,externalDefaultOnly); \ No newline at end of file +console.log(externalDefaultOnly__namespace);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return exports.a},foo:foo},[defaultCompat__namespace]);Object.defineProperty(exports,'foo',{enumerable:true,get:()=>defaultCompat.foo});Object.keys(defaultCompat).forEach(k=>{if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>defaultCompat[k]})});return exports;})({},null,defaultCompat,externalAuto,externalDefault,externalDefaultOnly); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/arrow-functions-true/_expected/system.js b/test/form/samples/generated-code-compact/arrow-functions-true/_expected/system.js index 4999e129f9e..e677a789e92 100644 --- a/test/form/samples/generated-code-compact/arrow-functions-true/_expected/system.js +++ b/test/form/samples/generated-code-compact/arrow-functions-true/_expected/system.js @@ -1,4 +1,4 @@ -System.register('bundle',['externalNoImport','external','externalAuto','externalDefault','externalDefaultOnly'],(function(exports,module){'use strict';var _starExcludes={a:1,default:1,foo:1};var b,defaultLegacy,defaultLegacy__default,externalAuto,externalDefault,externalDefaultOnly;return{setters:[()=>{},module=>{b=module.b;defaultLegacy=module;defaultLegacy__default=module.default;var setter={foo:module.foo};for(var name in module){if(!_starExcludes[name])setter[name]=module[name];}exports(setter);},module=>{externalAuto=module.default;},module=>{externalDefault=module;},module=>{externalDefaultOnly=module;}],execute:(function(){function _mergeNamespaces(n, m){m.forEach(e=>e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(k=>{if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}));return Object.freeze(n);}let a; exports('a',a); +System.register('bundle',['externalNoImport','external','externalAuto','externalDefault','externalDefaultOnly'],(function(exports,module){'use strict';var _starExcludes={a:1,default:1,foo:1};var b,defaultCompat,defaultCompat__default,externalAuto,externalDefault,externalDefaultOnly;return{setters:[()=>{},module=>{b=module.b;defaultCompat=module;defaultCompat__default=module.default;var setter={foo:module.foo};for(var name in module){if(!_starExcludes[name])setter[name]=module[name];}exports(setter);},module=>{externalAuto=module.default;},module=>{externalDefault=module;},module=>{externalDefaultOnly=module;}],execute:(function(){function _mergeNamespaces(n, m){m.forEach(e=>e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(k=>{if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}));return Object.freeze(n);}let a; exports('a',a); (v=>(exports('a',a),v))({ a } = b); console.log((v=>(exports('a',a),v))({ a } = b)); @@ -6,7 +6,7 @@ console.log((v=>(exports('a',a),v))({ a } = b)); Promise.resolve().then(()=>main).then(console.log); module.import('external').then(console.log); -console.log(defaultLegacy__default); +console.log(defaultCompat__default); console.log(externalAuto); console.log(externalDefault); -console.log(externalDefaultOnly);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return a},foo:foo},[defaultLegacy]);})}})); \ No newline at end of file +console.log(externalDefaultOnly);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return a},foo:foo},[defaultCompat]);})}})); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/arrow-functions-true/_expected/umd.js b/test/form/samples/generated-code-compact/arrow-functions-true/_expected/umd.js index 61d913890b2..9a6101cb85c 100644 --- a/test/form/samples/generated-code-compact/arrow-functions-true/_expected/umd.js +++ b/test/form/samples/generated-code-compact/arrow-functions-true/_expected/umd.js @@ -1,12 +1,12 @@ -(function(g,f){typeof exports==='object'&&typeof module!=='undefined'?f(exports,require('externalNoImport'),require('external'),require('externalAuto'),require('externalDefault'),require('externalDefaultOnly')):typeof define==='function'&&define.amd?define(['exports','externalNoImport','external','externalAuto','externalDefault','externalDefaultOnly'],f):(g=typeof globalThis!=='undefined'?globalThis:g||self,(()=>{var current=g.bundle;var e=g.bundle={};f(e,null,g.defaultLegacy,g.externalAuto,g.externalDefault,g.externalDefaultOnly);e.noConflict=()=>{g.bundle=current;return e};})());})(this,(function(exports,externalNoImport,defaultLegacy,externalAuto,externalDefault,externalDefaultOnly){'use strict';var _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{default:e};var _interopDefault=e=>e&&e.__esModule?e:{default:e};var _interopNamespaceDefaultOnly=e=>Object.freeze({__proto__:null,default:e});function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(k=>{if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}})}n.default=e;return Object.freeze(n)}var _interopNamespace=e=>e&&e.__esModule?e:_interopNamespaceDefault(e);function _mergeNamespaces(n, m){m.forEach(e=>e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(k=>{if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}));return Object.freeze(n);}var defaultLegacy__namespace=/*#__PURE__*/_interopNamespace(defaultLegacy);var defaultLegacy__default=/*#__PURE__*/_interopDefaultLegacy(defaultLegacy);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0; +(function(g,f){typeof exports==='object'&&typeof module!=='undefined'?f(exports,require('externalNoImport'),require('external'),require('externalAuto'),require('externalDefault'),require('externalDefaultOnly')):typeof define==='function'&&define.amd?define(['exports','externalNoImport','external','externalAuto','externalDefault','externalDefaultOnly'],f):(g=typeof globalThis!=='undefined'?globalThis:g||self,(()=>{var current=g.bundle;var e=g.bundle={};f(e,null,g.defaultCompat,g.externalAuto,g.externalDefault,g.externalDefaultOnly);e.noConflict=()=>{g.bundle=current;return e};})());})(this,(function(exports,externalNoImport,defaultCompat,externalAuto,externalDefault,externalDefaultOnly){'use strict';var _interopDefault=e=>e&&e.__esModule?e:{default:e};var _interopNamespaceCompat=e=>e&&typeof e==='object'&&'default'in e?e:_interopNamespaceDefault(e);var _interopNamespaceDefaultOnly=e=>Object.freeze({__proto__:null,default:e});function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(k=>{if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}})}n.default=e;return Object.freeze(n)}function _mergeNamespaces(n, m){m.forEach(e=>e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(k=>{if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}));return Object.freeze(n);}var defaultCompat__namespace=/*#__PURE__*/_interopNamespaceCompat(defaultCompat);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0; -({ a: exports.a } = defaultLegacy.b); -console.log({ a: exports.a } = defaultLegacy.b); +({ a: exports.a } = defaultCompat.b); +console.log({ a: exports.a } = defaultCompat.b); Promise.resolve().then(()=>main).then(console.log); import('external').then(console.log); -console.log(defaultLegacy__default.default); +console.log(defaultCompat__namespace.default); console.log(externalAuto__default.default); console.log(externalDefault__namespace); -console.log(externalDefaultOnly__namespace);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return exports.a},foo:foo},[defaultLegacy__namespace]);Object.defineProperty(exports,'foo',{enumerable:true,get:()=>defaultLegacy.foo});Object.keys(defaultLegacy).forEach(k=>{if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>defaultLegacy[k]})});Object.defineProperty(exports,'__esModule',{value:true});})); \ No newline at end of file +console.log(externalDefaultOnly__namespace);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return exports.a},foo:foo},[defaultCompat__namespace]);Object.defineProperty(exports,'foo',{enumerable:true,get:()=>defaultCompat.foo});Object.keys(defaultCompat).forEach(k=>{if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>defaultCompat[k]})});})); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/const-bindings-false/_config.js b/test/form/samples/generated-code-compact/const-bindings-false/_config.js index 352d0840221..2fb5b8ce3f2 100644 --- a/test/form/samples/generated-code-compact/const-bindings-false/_config.js +++ b/test/form/samples/generated-code-compact/const-bindings-false/_config.js @@ -9,7 +9,8 @@ module.exports = { generatedCode: { arrowFunctions: true, constBindings: true }, name: 'bundle', noConflict: true, - exports: 'named' + exports: 'named', + interop: 'compat' }, plugins: [ { diff --git a/test/form/samples/generated-code-compact/const-bindings-false/_expected/amd.js b/test/form/samples/generated-code-compact/const-bindings-false/_expected/amd.js index 71099ae619c..645c204d3ba 100644 --- a/test/form/samples/generated-code-compact/const-bindings-false/_expected/amd.js +++ b/test/form/samples/generated-code-compact/const-bindings-false/_expected/amd.js @@ -1,2 +1,2 @@ -define(['exports','external'],(function(exports,foo$1){'use strict';const _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{default:e};function _interopNamespace(e){if(e&&e.__esModule)return e;const n=Object.create(null);if(e){for(const k in e){if(k!=='default'){const d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}}n.default=e;return Object.freeze(n)}const foo__default=/*#__PURE__*/_interopDefaultLegacy(foo$1);const foo__namespace=/*#__PURE__*/_interopNamespace(foo$1);const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__default.default, foo__namespace, other, bar, _missingExportShim); +define(['exports','external'],(function(exports,foo$1){'use strict';function _interopNamespaceCompat(e){if(e&&typeof e==='object'&&'default'in e)return e;const n=Object.create(null);if(e){for(const k in e){if(k!=='default'){const d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}}n.default=e;return Object.freeze(n)}const foo__namespace=/*#__PURE__*/_interopNamespaceCompat(foo$1);const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__namespace.default, foo__namespace, other, bar, _missingExportShim); const main = 42;exports.default=main;exports.syntheticMissing=synthetic.syntheticMissing;for(const k in foo$1){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>foo$1[k]})}Object.defineProperty(exports,'__esModule',{value:true});})); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/const-bindings-false/_expected/cjs.js b/test/form/samples/generated-code-compact/const-bindings-false/_expected/cjs.js index 8fded61c14e..263b9234c0b 100644 --- a/test/form/samples/generated-code-compact/const-bindings-false/_expected/cjs.js +++ b/test/form/samples/generated-code-compact/const-bindings-false/_expected/cjs.js @@ -1,2 +1,2 @@ -'use strict';Object.defineProperty(exports,'__esModule',{value:true});const foo$1=require('external');const _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{default:e};function _interopNamespace(e){if(e&&e.__esModule)return e;const n=Object.create(null);if(e){for(const k in e){if(k!=='default'){const d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}}n.default=e;return Object.freeze(n)}const foo__default=/*#__PURE__*/_interopDefaultLegacy(foo$1);const foo__namespace=/*#__PURE__*/_interopNamespace(foo$1);const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__default.default, foo__namespace, other, bar, _missingExportShim); +'use strict';Object.defineProperty(exports,'__esModule',{value:true});const foo$1=require('external');function _interopNamespaceCompat(e){if(e&&typeof e==='object'&&'default'in e)return e;const n=Object.create(null);if(e){for(const k in e){if(k!=='default'){const d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}}n.default=e;return Object.freeze(n)}const foo__namespace=/*#__PURE__*/_interopNamespaceCompat(foo$1);const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__namespace.default, foo__namespace, other, bar, _missingExportShim); const main = 42;exports.default=main;exports.syntheticMissing=synthetic.syntheticMissing;for(const k in foo$1){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>foo$1[k]})} \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/const-bindings-false/_expected/iife.js b/test/form/samples/generated-code-compact/const-bindings-false/_expected/iife.js index 0fc1f82e8b7..6acde7c628c 100644 --- a/test/form/samples/generated-code-compact/const-bindings-false/_expected/iife.js +++ b/test/form/samples/generated-code-compact/const-bindings-false/_expected/iife.js @@ -1,2 +1,2 @@ -var bundle=(function(exports,foo$1){'use strict';const _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{default:e};function _interopNamespace(e){if(e&&e.__esModule)return e;const n=Object.create(null);if(e){for(const k in e){if(k!=='default'){const d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}}n.default=e;return Object.freeze(n)}const foo__default=/*#__PURE__*/_interopDefaultLegacy(foo$1);const foo__namespace=/*#__PURE__*/_interopNamespace(foo$1);const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__default.default, foo__namespace, other, bar, _missingExportShim); +var bundle=(function(exports,foo$1){'use strict';function _interopNamespaceCompat(e){if(e&&typeof e==='object'&&'default'in e)return e;const n=Object.create(null);if(e){for(const k in e){if(k!=='default'){const d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}}n.default=e;return Object.freeze(n)}const foo__namespace=/*#__PURE__*/_interopNamespaceCompat(foo$1);const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__namespace.default, foo__namespace, other, bar, _missingExportShim); const main = 42;exports.default=main;exports.syntheticMissing=synthetic.syntheticMissing;for(const k in foo$1){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>foo$1[k]})}Object.defineProperty(exports,'__esModule',{value:true});return exports;})({},foo$1); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/const-bindings-false/_expected/umd.js b/test/form/samples/generated-code-compact/const-bindings-false/_expected/umd.js index 548efc0d285..e5162886113 100644 --- a/test/form/samples/generated-code-compact/const-bindings-false/_expected/umd.js +++ b/test/form/samples/generated-code-compact/const-bindings-false/_expected/umd.js @@ -1,2 +1,2 @@ -(function(g,f){typeof exports==='object'&&typeof module!=='undefined'?f(exports,require('external')):typeof define==='function'&&define.amd?define(['exports','external'],f):(g=typeof globalThis!=='undefined'?globalThis:g||self,(()=>{const current=g.bundle;const e=g.bundle={};f(e,g.foo$1);e.noConflict=()=>{g.bundle=current;return e};})());})(this,(function(exports,foo$1){'use strict';const _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{default:e};function _interopNamespace(e){if(e&&e.__esModule)return e;const n=Object.create(null);if(e){for(const k in e){if(k!=='default'){const d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}}n.default=e;return Object.freeze(n)}const foo__default=/*#__PURE__*/_interopDefaultLegacy(foo$1);const foo__namespace=/*#__PURE__*/_interopNamespace(foo$1);const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__default.default, foo__namespace, other, bar, _missingExportShim); +(function(g,f){typeof exports==='object'&&typeof module!=='undefined'?f(exports,require('external')):typeof define==='function'&&define.amd?define(['exports','external'],f):(g=typeof globalThis!=='undefined'?globalThis:g||self,(()=>{const current=g.bundle;const e=g.bundle={};f(e,g.foo$1);e.noConflict=()=>{g.bundle=current;return e};})());})(this,(function(exports,foo$1){'use strict';function _interopNamespaceCompat(e){if(e&&typeof e==='object'&&'default'in e)return e;const n=Object.create(null);if(e){for(const k in e){if(k!=='default'){const d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}}n.default=e;return Object.freeze(n)}const foo__namespace=/*#__PURE__*/_interopNamespaceCompat(foo$1);const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__namespace.default, foo__namespace, other, bar, _missingExportShim); const main = 42;exports.default=main;exports.syntheticMissing=synthetic.syntheticMissing;for(const k in foo$1){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>foo$1[k]})}Object.defineProperty(exports,'__esModule',{value:true});})); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/const-bindings-true/_config.js b/test/form/samples/generated-code-compact/const-bindings-true/_config.js index d4743e7b4d8..28048b41d2b 100644 --- a/test/form/samples/generated-code-compact/const-bindings-true/_config.js +++ b/test/form/samples/generated-code-compact/const-bindings-true/_config.js @@ -9,7 +9,8 @@ module.exports = { generatedCode: { arrowFunctions: true, constBindings: true }, name: 'bundle', noConflict: true, - exports: 'named' + exports: 'named', + interop: 'compat' }, plugins: [ { diff --git a/test/form/samples/generated-code-compact/const-bindings-true/_expected/amd.js b/test/form/samples/generated-code-compact/const-bindings-true/_expected/amd.js index 71099ae619c..645c204d3ba 100644 --- a/test/form/samples/generated-code-compact/const-bindings-true/_expected/amd.js +++ b/test/form/samples/generated-code-compact/const-bindings-true/_expected/amd.js @@ -1,2 +1,2 @@ -define(['exports','external'],(function(exports,foo$1){'use strict';const _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{default:e};function _interopNamespace(e){if(e&&e.__esModule)return e;const n=Object.create(null);if(e){for(const k in e){if(k!=='default'){const d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}}n.default=e;return Object.freeze(n)}const foo__default=/*#__PURE__*/_interopDefaultLegacy(foo$1);const foo__namespace=/*#__PURE__*/_interopNamespace(foo$1);const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__default.default, foo__namespace, other, bar, _missingExportShim); +define(['exports','external'],(function(exports,foo$1){'use strict';function _interopNamespaceCompat(e){if(e&&typeof e==='object'&&'default'in e)return e;const n=Object.create(null);if(e){for(const k in e){if(k!=='default'){const d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}}n.default=e;return Object.freeze(n)}const foo__namespace=/*#__PURE__*/_interopNamespaceCompat(foo$1);const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__namespace.default, foo__namespace, other, bar, _missingExportShim); const main = 42;exports.default=main;exports.syntheticMissing=synthetic.syntheticMissing;for(const k in foo$1){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>foo$1[k]})}Object.defineProperty(exports,'__esModule',{value:true});})); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/const-bindings-true/_expected/cjs.js b/test/form/samples/generated-code-compact/const-bindings-true/_expected/cjs.js index 8fded61c14e..263b9234c0b 100644 --- a/test/form/samples/generated-code-compact/const-bindings-true/_expected/cjs.js +++ b/test/form/samples/generated-code-compact/const-bindings-true/_expected/cjs.js @@ -1,2 +1,2 @@ -'use strict';Object.defineProperty(exports,'__esModule',{value:true});const foo$1=require('external');const _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{default:e};function _interopNamespace(e){if(e&&e.__esModule)return e;const n=Object.create(null);if(e){for(const k in e){if(k!=='default'){const d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}}n.default=e;return Object.freeze(n)}const foo__default=/*#__PURE__*/_interopDefaultLegacy(foo$1);const foo__namespace=/*#__PURE__*/_interopNamespace(foo$1);const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__default.default, foo__namespace, other, bar, _missingExportShim); +'use strict';Object.defineProperty(exports,'__esModule',{value:true});const foo$1=require('external');function _interopNamespaceCompat(e){if(e&&typeof e==='object'&&'default'in e)return e;const n=Object.create(null);if(e){for(const k in e){if(k!=='default'){const d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}}n.default=e;return Object.freeze(n)}const foo__namespace=/*#__PURE__*/_interopNamespaceCompat(foo$1);const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__namespace.default, foo__namespace, other, bar, _missingExportShim); const main = 42;exports.default=main;exports.syntheticMissing=synthetic.syntheticMissing;for(const k in foo$1){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>foo$1[k]})} \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/const-bindings-true/_expected/iife.js b/test/form/samples/generated-code-compact/const-bindings-true/_expected/iife.js index 0fc1f82e8b7..6acde7c628c 100644 --- a/test/form/samples/generated-code-compact/const-bindings-true/_expected/iife.js +++ b/test/form/samples/generated-code-compact/const-bindings-true/_expected/iife.js @@ -1,2 +1,2 @@ -var bundle=(function(exports,foo$1){'use strict';const _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{default:e};function _interopNamespace(e){if(e&&e.__esModule)return e;const n=Object.create(null);if(e){for(const k in e){if(k!=='default'){const d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}}n.default=e;return Object.freeze(n)}const foo__default=/*#__PURE__*/_interopDefaultLegacy(foo$1);const foo__namespace=/*#__PURE__*/_interopNamespace(foo$1);const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__default.default, foo__namespace, other, bar, _missingExportShim); +var bundle=(function(exports,foo$1){'use strict';function _interopNamespaceCompat(e){if(e&&typeof e==='object'&&'default'in e)return e;const n=Object.create(null);if(e){for(const k in e){if(k!=='default'){const d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}}n.default=e;return Object.freeze(n)}const foo__namespace=/*#__PURE__*/_interopNamespaceCompat(foo$1);const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__namespace.default, foo__namespace, other, bar, _missingExportShim); const main = 42;exports.default=main;exports.syntheticMissing=synthetic.syntheticMissing;for(const k in foo$1){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>foo$1[k]})}Object.defineProperty(exports,'__esModule',{value:true});return exports;})({},foo$1); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/const-bindings-true/_expected/umd.js b/test/form/samples/generated-code-compact/const-bindings-true/_expected/umd.js index 548efc0d285..e5162886113 100644 --- a/test/form/samples/generated-code-compact/const-bindings-true/_expected/umd.js +++ b/test/form/samples/generated-code-compact/const-bindings-true/_expected/umd.js @@ -1,2 +1,2 @@ -(function(g,f){typeof exports==='object'&&typeof module!=='undefined'?f(exports,require('external')):typeof define==='function'&&define.amd?define(['exports','external'],f):(g=typeof globalThis!=='undefined'?globalThis:g||self,(()=>{const current=g.bundle;const e=g.bundle={};f(e,g.foo$1);e.noConflict=()=>{g.bundle=current;return e};})());})(this,(function(exports,foo$1){'use strict';const _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{default:e};function _interopNamespace(e){if(e&&e.__esModule)return e;const n=Object.create(null);if(e){for(const k in e){if(k!=='default'){const d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}}n.default=e;return Object.freeze(n)}const foo__default=/*#__PURE__*/_interopDefaultLegacy(foo$1);const foo__namespace=/*#__PURE__*/_interopNamespace(foo$1);const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__default.default, foo__namespace, other, bar, _missingExportShim); +(function(g,f){typeof exports==='object'&&typeof module!=='undefined'?f(exports,require('external')):typeof define==='function'&&define.amd?define(['exports','external'],f):(g=typeof globalThis!=='undefined'?globalThis:g||self,(()=>{const current=g.bundle;const e=g.bundle={};f(e,g.foo$1);e.noConflict=()=>{g.bundle=current;return e};})());})(this,(function(exports,foo$1){'use strict';function _interopNamespaceCompat(e){if(e&&typeof e==='object'&&'default'in e)return e;const n=Object.create(null);if(e){for(const k in e){if(k!=='default'){const d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}}n.default=e;return Object.freeze(n)}const foo__namespace=/*#__PURE__*/_interopNamespaceCompat(foo$1);const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__namespace.default, foo__namespace, other, bar, _missingExportShim); const main = 42;exports.default=main;exports.syntheticMissing=synthetic.syntheticMissing;for(const k in foo$1){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>foo$1[k]})}Object.defineProperty(exports,'__esModule',{value:true});})); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/reserved-names-as-props-false-no-external-live-bindings/_config.js b/test/form/samples/generated-code-compact/reserved-names-as-props-false-no-external-live-bindings/_config.js index 66ac340dc97..f31104e00eb 100644 --- a/test/form/samples/generated-code-compact/reserved-names-as-props-false-no-external-live-bindings/_config.js +++ b/test/form/samples/generated-code-compact/reserved-names-as-props-false-no-external-live-bindings/_config.js @@ -7,6 +7,7 @@ module.exports = { exports: 'named', externalLiveBindings: false, generatedCode: { reservedNamesAsProps: false }, + interop: 'compat', name: 'bundle' } } diff --git a/test/form/samples/generated-code-compact/reserved-names-as-props-false-no-external-live-bindings/_expected/amd.js b/test/form/samples/generated-code-compact/reserved-names-as-props-false-no-external-live-bindings/_expected/amd.js index 467fab53f0c..64e977fcb73 100644 --- a/test/form/samples/generated-code-compact/reserved-names-as-props-false-no-external-live-bindings/_expected/amd.js +++ b/test/form/samples/generated-code-compact/reserved-names-as-props-false-no-external-live-bindings/_expected/amd.js @@ -1 +1 @@ -define(['external'],(function(ns){'use strict';function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e["default"]:e}var ns__default=/*#__PURE__*/_interopDefaultLegacy(ns);console.log(ns__default);})); \ No newline at end of file +define(['external'],(function(ns){'use strict';function _interopDefaultCompat(e){return e&&typeof e==='object'&&'default'in e?e["default"]:e}var ns__default=/*#__PURE__*/_interopDefaultCompat(ns);console.log(ns__default);})); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/reserved-names-as-props-false-no-external-live-bindings/_expected/cjs.js b/test/form/samples/generated-code-compact/reserved-names-as-props-false-no-external-live-bindings/_expected/cjs.js index 33875c7f8c9..a83347d0f31 100644 --- a/test/form/samples/generated-code-compact/reserved-names-as-props-false-no-external-live-bindings/_expected/cjs.js +++ b/test/form/samples/generated-code-compact/reserved-names-as-props-false-no-external-live-bindings/_expected/cjs.js @@ -1 +1 @@ -'use strict';var ns=require('external');function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e["default"]:e}var ns__default=/*#__PURE__*/_interopDefaultLegacy(ns);console.log(ns__default); \ No newline at end of file +'use strict';var ns=require('external');function _interopDefaultCompat(e){return e&&typeof e==='object'&&'default'in e?e["default"]:e}var ns__default=/*#__PURE__*/_interopDefaultCompat(ns);console.log(ns__default); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/reserved-names-as-props-false-no-external-live-bindings/_expected/iife.js b/test/form/samples/generated-code-compact/reserved-names-as-props-false-no-external-live-bindings/_expected/iife.js index 9d06e3d645f..a0d54cfb8fb 100644 --- a/test/form/samples/generated-code-compact/reserved-names-as-props-false-no-external-live-bindings/_expected/iife.js +++ b/test/form/samples/generated-code-compact/reserved-names-as-props-false-no-external-live-bindings/_expected/iife.js @@ -1 +1 @@ -(function(ns){'use strict';function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e["default"]:e}var ns__default=/*#__PURE__*/_interopDefaultLegacy(ns);console.log(ns__default);})(ns); \ No newline at end of file +(function(ns){'use strict';function _interopDefaultCompat(e){return e&&typeof e==='object'&&'default'in e?e["default"]:e}var ns__default=/*#__PURE__*/_interopDefaultCompat(ns);console.log(ns__default);})(ns); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/reserved-names-as-props-false-no-external-live-bindings/_expected/umd.js b/test/form/samples/generated-code-compact/reserved-names-as-props-false-no-external-live-bindings/_expected/umd.js index a4e8cd89d2f..f6cd3ee9e31 100644 --- a/test/form/samples/generated-code-compact/reserved-names-as-props-false-no-external-live-bindings/_expected/umd.js +++ b/test/form/samples/generated-code-compact/reserved-names-as-props-false-no-external-live-bindings/_expected/umd.js @@ -1 +1 @@ -(function(g,f){typeof exports==='object'&&typeof module!=='undefined'?f(require('external')):typeof define==='function'&&define.amd?define(['external'],f):(g=typeof globalThis!=='undefined'?globalThis:g||self,f(g.ns));})(this,(function(ns){'use strict';function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e["default"]:e}var ns__default=/*#__PURE__*/_interopDefaultLegacy(ns);console.log(ns__default);})); \ No newline at end of file +(function(g,f){typeof exports==='object'&&typeof module!=='undefined'?f(require('external')):typeof define==='function'&&define.amd?define(['external'],f):(g=typeof globalThis!=='undefined'?globalThis:g||self,f(g.ns));})(this,(function(ns){'use strict';function _interopDefaultCompat(e){return e&&typeof e==='object'&&'default'in e?e["default"]:e}var ns__default=/*#__PURE__*/_interopDefaultCompat(ns);console.log(ns__default);})); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/reserved-names-as-props-true-no-external-live-bindings/_config.js b/test/form/samples/generated-code-compact/reserved-names-as-props-true-no-external-live-bindings/_config.js index 3b41aab3c05..dda576dc7c1 100644 --- a/test/form/samples/generated-code-compact/reserved-names-as-props-true-no-external-live-bindings/_config.js +++ b/test/form/samples/generated-code-compact/reserved-names-as-props-true-no-external-live-bindings/_config.js @@ -7,6 +7,7 @@ module.exports = { exports: 'named', externalLiveBindings: false, generatedCode: { reservedNamesAsProps: true }, + interop: 'compat', name: 'bundle' } } diff --git a/test/form/samples/generated-code-compact/reserved-names-as-props-true-no-external-live-bindings/_expected/amd.js b/test/form/samples/generated-code-compact/reserved-names-as-props-true-no-external-live-bindings/_expected/amd.js index e47aa46cc33..e2454cec019 100644 --- a/test/form/samples/generated-code-compact/reserved-names-as-props-true-no-external-live-bindings/_expected/amd.js +++ b/test/form/samples/generated-code-compact/reserved-names-as-props-true-no-external-live-bindings/_expected/amd.js @@ -1 +1 @@ -define(['external'],(function(ns){'use strict';function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e.default:e}var ns__default=/*#__PURE__*/_interopDefaultLegacy(ns);console.log(ns__default);})); \ No newline at end of file +define(['external'],(function(ns){'use strict';function _interopDefaultCompat(e){return e&&typeof e==='object'&&'default'in e?e.default:e}var ns__default=/*#__PURE__*/_interopDefaultCompat(ns);console.log(ns__default);})); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/reserved-names-as-props-true-no-external-live-bindings/_expected/cjs.js b/test/form/samples/generated-code-compact/reserved-names-as-props-true-no-external-live-bindings/_expected/cjs.js index c787c3bb410..6e1fa869425 100644 --- a/test/form/samples/generated-code-compact/reserved-names-as-props-true-no-external-live-bindings/_expected/cjs.js +++ b/test/form/samples/generated-code-compact/reserved-names-as-props-true-no-external-live-bindings/_expected/cjs.js @@ -1 +1 @@ -'use strict';var ns=require('external');function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e.default:e}var ns__default=/*#__PURE__*/_interopDefaultLegacy(ns);console.log(ns__default); \ No newline at end of file +'use strict';var ns=require('external');function _interopDefaultCompat(e){return e&&typeof e==='object'&&'default'in e?e.default:e}var ns__default=/*#__PURE__*/_interopDefaultCompat(ns);console.log(ns__default); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/reserved-names-as-props-true-no-external-live-bindings/_expected/iife.js b/test/form/samples/generated-code-compact/reserved-names-as-props-true-no-external-live-bindings/_expected/iife.js index 5d047f834e5..a58f85215a7 100644 --- a/test/form/samples/generated-code-compact/reserved-names-as-props-true-no-external-live-bindings/_expected/iife.js +++ b/test/form/samples/generated-code-compact/reserved-names-as-props-true-no-external-live-bindings/_expected/iife.js @@ -1 +1 @@ -(function(ns){'use strict';function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e.default:e}var ns__default=/*#__PURE__*/_interopDefaultLegacy(ns);console.log(ns__default);})(ns); \ No newline at end of file +(function(ns){'use strict';function _interopDefaultCompat(e){return e&&typeof e==='object'&&'default'in e?e.default:e}var ns__default=/*#__PURE__*/_interopDefaultCompat(ns);console.log(ns__default);})(ns); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/reserved-names-as-props-true-no-external-live-bindings/_expected/umd.js b/test/form/samples/generated-code-compact/reserved-names-as-props-true-no-external-live-bindings/_expected/umd.js index a96fd0c487b..3a2813ff820 100644 --- a/test/form/samples/generated-code-compact/reserved-names-as-props-true-no-external-live-bindings/_expected/umd.js +++ b/test/form/samples/generated-code-compact/reserved-names-as-props-true-no-external-live-bindings/_expected/umd.js @@ -1 +1 @@ -(function(g,f){typeof exports==='object'&&typeof module!=='undefined'?f(require('external')):typeof define==='function'&&define.amd?define(['external'],f):(g=typeof globalThis!=='undefined'?globalThis:g||self,f(g.ns));})(this,(function(ns){'use strict';function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e.default:e}var ns__default=/*#__PURE__*/_interopDefaultLegacy(ns);console.log(ns__default);})); \ No newline at end of file +(function(g,f){typeof exports==='object'&&typeof module!=='undefined'?f(require('external')):typeof define==='function'&&define.amd?define(['external'],f):(g=typeof globalThis!=='undefined'?globalThis:g||self,f(g.ns));})(this,(function(ns){'use strict';function _interopDefaultCompat(e){return e&&typeof e==='object'&&'default'in e?e.default:e}var ns__default=/*#__PURE__*/_interopDefaultCompat(ns);console.log(ns__default);})); \ No newline at end of file diff --git a/test/form/samples/generated-code/arrow-functions-false/_config.js b/test/form/samples/generated-code/arrow-functions-false/_config.js index 5ffc687a54e..bf7c98bcae7 100644 --- a/test/form/samples/generated-code/arrow-functions-false/_config.js +++ b/test/form/samples/generated-code/arrow-functions-false/_config.js @@ -21,7 +21,7 @@ module.exports = { if (id === 'externalAuto') { return 'auto'; } - return true; + return 'compat'; }, name: 'bundle', noConflict: true diff --git a/test/form/samples/generated-code/arrow-functions-false/_expected/amd.js b/test/form/samples/generated-code/arrow-functions-false/_expected/amd.js index bb144ef7a7c..1c6cbec4b06 100644 --- a/test/form/samples/generated-code/arrow-functions-false/_expected/amd.js +++ b/test/form/samples/generated-code/arrow-functions-false/_expected/amd.js @@ -1,9 +1,9 @@ -define(['require', 'exports', 'externalNoImport', 'external', 'externalAuto', 'externalDefault', 'externalDefaultOnly'], (function (require, exports, externalNoImport, defaultLegacy, externalAuto, externalDefault, externalDefaultOnly) { 'use strict'; - - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } +define(['require', 'exports', 'externalNoImport', 'external', 'externalAuto', 'externalDefault', 'externalDefaultOnly'], (function (require, exports, externalNoImport, defaultCompat, externalAuto, externalDefault, externalDefaultOnly) { 'use strict'; function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; } + function _interopNamespaceCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : _interopNamespaceDefault(e); } + function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, default: e }); } function _interopNamespaceDefault(e) { @@ -23,8 +23,6 @@ define(['require', 'exports', 'externalNoImport', 'external', 'externalAuto', 'e return Object.freeze(n); } - function _interopNamespace (e) { return e && e.__esModule ? e : _interopNamespaceDefault(e); } - function _mergeNamespaces(n, m) { m.forEach(function (e) { e && typeof e !== 'string' && !Array.isArray(e) && Object.keys(e).forEach(function (k) { @@ -40,21 +38,20 @@ define(['require', 'exports', 'externalNoImport', 'external', 'externalAuto', 'e return Object.freeze(n); } - var defaultLegacy__namespace = /*#__PURE__*/_interopNamespace(defaultLegacy); - var defaultLegacy__default = /*#__PURE__*/_interopDefaultLegacy(defaultLegacy); + var defaultCompat__namespace = /*#__PURE__*/_interopNamespaceCompat(defaultCompat); var externalAuto__default = /*#__PURE__*/_interopDefault(externalAuto); var externalDefault__namespace = /*#__PURE__*/_interopNamespaceDefault(externalDefault); var externalDefaultOnly__namespace = /*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly); exports.a = void 0; - ({ a: exports.a } = defaultLegacy.b); - console.log({ a: exports.a } = defaultLegacy.b); + ({ a: exports.a } = defaultCompat.b); + console.log({ a: exports.a } = defaultCompat.b); Promise.resolve().then(function () { return main; }).then(console.log); - new Promise(function (resolve, reject) { require(['external'], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }).then(console.log); - console.log(defaultLegacy__default.default); + new Promise(function (resolve, reject) { require(['external'], function (m) { resolve(/*#__PURE__*/_interopNamespaceCompat(m)); }, reject); }).then(console.log); + console.log(defaultCompat__namespace.default); console.log(externalAuto__default.default); console.log(externalDefault__namespace); console.log(externalDefaultOnly__namespace); @@ -63,19 +60,17 @@ define(['require', 'exports', 'externalNoImport', 'external', 'externalAuto', 'e __proto__: null, get a () { return exports.a; }, foo: foo - }, [defaultLegacy__namespace]); + }, [defaultCompat__namespace]); Object.defineProperty(exports, 'foo', { enumerable: true, - get: function () { return defaultLegacy.foo; } + get: function () { return defaultCompat.foo; } }); - Object.keys(defaultLegacy).forEach(function (k) { + Object.keys(defaultCompat).forEach(function (k) { if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, { enumerable: true, - get: function () { return defaultLegacy[k]; } + get: function () { return defaultCompat[k]; } }); }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/generated-code/arrow-functions-false/_expected/cjs.js b/test/form/samples/generated-code/arrow-functions-false/_expected/cjs.js index c82e667e46f..0de832bd967 100644 --- a/test/form/samples/generated-code/arrow-functions-false/_expected/cjs.js +++ b/test/form/samples/generated-code/arrow-functions-false/_expected/cjs.js @@ -1,17 +1,15 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - require('externalNoImport'); -var defaultLegacy = require('external'); +var defaultCompat = require('external'); var externalAuto = require('externalAuto'); var externalDefault = require('externalDefault'); var externalDefaultOnly = require('externalDefaultOnly'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; } +function _interopNamespaceCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : _interopNamespaceDefault(e); } + function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, default: e }); } function _interopNamespaceDefault(e) { @@ -31,8 +29,6 @@ function _interopNamespaceDefault(e) { return Object.freeze(n); } -function _interopNamespace (e) { return e && e.__esModule ? e : _interopNamespaceDefault(e); } - function _mergeNamespaces(n, m) { m.forEach(function (e) { e && typeof e !== 'string' && !Array.isArray(e) && Object.keys(e).forEach(function (k) { @@ -48,21 +44,20 @@ function _mergeNamespaces(n, m) { return Object.freeze(n); } -var defaultLegacy__namespace = /*#__PURE__*/_interopNamespace(defaultLegacy); -var defaultLegacy__default = /*#__PURE__*/_interopDefaultLegacy(defaultLegacy); +var defaultCompat__namespace = /*#__PURE__*/_interopNamespaceCompat(defaultCompat); var externalAuto__default = /*#__PURE__*/_interopDefault(externalAuto); var externalDefault__namespace = /*#__PURE__*/_interopNamespaceDefault(externalDefault); var externalDefaultOnly__namespace = /*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly); exports.a = void 0; -({ a: exports.a } = defaultLegacy.b); -console.log({ a: exports.a } = defaultLegacy.b); +({ a: exports.a } = defaultCompat.b); +console.log({ a: exports.a } = defaultCompat.b); Promise.resolve().then(function () { return main; }).then(console.log); -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('external')); }).then(console.log); -console.log(defaultLegacy__default.default); +Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceCompat(require('external')); }).then(console.log); +console.log(defaultCompat__namespace.default); console.log(externalAuto__default.default); console.log(externalDefault__namespace); console.log(externalDefaultOnly__namespace); @@ -71,15 +66,15 @@ var main = /*#__PURE__*/_mergeNamespaces({ __proto__: null, get a () { return exports.a; }, foo: foo -}, [defaultLegacy__namespace]); +}, [defaultCompat__namespace]); Object.defineProperty(exports, 'foo', { enumerable: true, - get: function () { return defaultLegacy.foo; } + get: function () { return defaultCompat.foo; } }); -Object.keys(defaultLegacy).forEach(function (k) { +Object.keys(defaultCompat).forEach(function (k) { if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, { enumerable: true, - get: function () { return defaultLegacy[k]; } + get: function () { return defaultCompat[k]; } }); }); diff --git a/test/form/samples/generated-code/arrow-functions-false/_expected/es.js b/test/form/samples/generated-code/arrow-functions-false/_expected/es.js index edbd196c43e..74722401369 100644 --- a/test/form/samples/generated-code/arrow-functions-false/_expected/es.js +++ b/test/form/samples/generated-code/arrow-functions-false/_expected/es.js @@ -1,6 +1,6 @@ import 'externalNoImport'; -import * as defaultLegacy from 'external'; -import defaultLegacy__default, { b } from 'external'; +import * as defaultCompat from 'external'; +import defaultCompat__default, { b } from 'external'; export * from 'external'; export { foo } from 'external'; import externalAuto from 'externalAuto'; @@ -30,7 +30,7 @@ console.log({ a } = b); Promise.resolve().then(function () { return main; }).then(console.log); import('external').then(console.log); -console.log(defaultLegacy__default); +console.log(defaultCompat__default); console.log(externalAuto); console.log(externalDefault); console.log(externalDefaultOnly); @@ -39,6 +39,6 @@ var main = /*#__PURE__*/_mergeNamespaces({ __proto__: null, get a () { return a; }, foo: foo -}, [defaultLegacy]); +}, [defaultCompat]); export { a }; diff --git a/test/form/samples/generated-code/arrow-functions-false/_expected/iife.js b/test/form/samples/generated-code/arrow-functions-false/_expected/iife.js index f0af8e5dfe6..d7dacf56299 100644 --- a/test/form/samples/generated-code/arrow-functions-false/_expected/iife.js +++ b/test/form/samples/generated-code/arrow-functions-false/_expected/iife.js @@ -1,10 +1,10 @@ -var bundle = (function (exports, externalNoImport, defaultLegacy, externalAuto, externalDefault, externalDefaultOnly) { +var bundle = (function (exports, externalNoImport, defaultCompat, externalAuto, externalDefault, externalDefaultOnly) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; } + function _interopNamespaceCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : _interopNamespaceDefault(e); } + function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, default: e }); } function _interopNamespaceDefault(e) { @@ -24,8 +24,6 @@ var bundle = (function (exports, externalNoImport, defaultLegacy, externalAuto, return Object.freeze(n); } - function _interopNamespace (e) { return e && e.__esModule ? e : _interopNamespaceDefault(e); } - function _mergeNamespaces(n, m) { m.forEach(function (e) { e && typeof e !== 'string' && !Array.isArray(e) && Object.keys(e).forEach(function (k) { @@ -41,21 +39,20 @@ var bundle = (function (exports, externalNoImport, defaultLegacy, externalAuto, return Object.freeze(n); } - var defaultLegacy__namespace = /*#__PURE__*/_interopNamespace(defaultLegacy); - var defaultLegacy__default = /*#__PURE__*/_interopDefaultLegacy(defaultLegacy); + var defaultCompat__namespace = /*#__PURE__*/_interopNamespaceCompat(defaultCompat); var externalAuto__default = /*#__PURE__*/_interopDefault(externalAuto); var externalDefault__namespace = /*#__PURE__*/_interopNamespaceDefault(externalDefault); var externalDefaultOnly__namespace = /*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly); exports.a = void 0; - ({ a: exports.a } = defaultLegacy.b); - console.log({ a: exports.a } = defaultLegacy.b); + ({ a: exports.a } = defaultCompat.b); + console.log({ a: exports.a } = defaultCompat.b); Promise.resolve().then(function () { return main; }).then(console.log); import('external').then(console.log); - console.log(defaultLegacy__default.default); + console.log(defaultCompat__namespace.default); console.log(externalAuto__default.default); console.log(externalDefault__namespace); console.log(externalDefaultOnly__namespace); @@ -64,21 +61,19 @@ var bundle = (function (exports, externalNoImport, defaultLegacy, externalAuto, __proto__: null, get a () { return exports.a; }, foo: foo - }, [defaultLegacy__namespace]); + }, [defaultCompat__namespace]); Object.defineProperty(exports, 'foo', { enumerable: true, - get: function () { return defaultLegacy.foo; } + get: function () { return defaultCompat.foo; } }); - Object.keys(defaultLegacy).forEach(function (k) { + Object.keys(defaultCompat).forEach(function (k) { if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, { enumerable: true, - get: function () { return defaultLegacy[k]; } + get: function () { return defaultCompat[k]; } }); }); - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; -})({}, null, defaultLegacy, externalAuto, externalDefault, externalDefaultOnly); +})({}, null, defaultCompat, externalAuto, externalDefault, externalDefaultOnly); diff --git a/test/form/samples/generated-code/arrow-functions-false/_expected/system.js b/test/form/samples/generated-code/arrow-functions-false/_expected/system.js index 5b07838fe50..933d11fa21c 100644 --- a/test/form/samples/generated-code/arrow-functions-false/_expected/system.js +++ b/test/form/samples/generated-code/arrow-functions-false/_expected/system.js @@ -5,12 +5,12 @@ System.register('bundle', ['externalNoImport', 'external', 'externalAuto', 'exte default: 1, foo: 1 }; - var b, defaultLegacy, defaultLegacy__default, externalAuto, externalDefault, externalDefaultOnly; + var b, defaultCompat, defaultCompat__default, externalAuto, externalDefault, externalDefaultOnly; return { setters: [function () {}, function (module) { b = module.b; - defaultLegacy = module; - defaultLegacy__default = module.default; + defaultCompat = module; + defaultCompat__default = module.default; var setter = { foo: module.foo }; for (var name in module) { if (!_starExcludes[name]) setter[name] = module[name]; @@ -48,7 +48,7 @@ System.register('bundle', ['externalNoImport', 'external', 'externalAuto', 'exte Promise.resolve().then(function () { return main; }).then(console.log); module.import('external').then(console.log); - console.log(defaultLegacy__default); + console.log(defaultCompat__default); console.log(externalAuto); console.log(externalDefault); console.log(externalDefaultOnly); @@ -57,7 +57,7 @@ System.register('bundle', ['externalNoImport', 'external', 'externalAuto', 'exte __proto__: null, get a () { return a; }, foo: foo - }, [defaultLegacy]); + }, [defaultCompat]); }) }; diff --git a/test/form/samples/generated-code/arrow-functions-false/_expected/umd.js b/test/form/samples/generated-code/arrow-functions-false/_expected/umd.js index f14112ad9c8..59f091df315 100644 --- a/test/form/samples/generated-code/arrow-functions-false/_expected/umd.js +++ b/test/form/samples/generated-code/arrow-functions-false/_expected/umd.js @@ -4,15 +4,15 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, (function () { var current = global.bundle; var exports = global.bundle = {}; - factory(exports, null, global.defaultLegacy, global.externalAuto, global.externalDefault, global.externalDefaultOnly); + factory(exports, null, global.defaultCompat, global.externalAuto, global.externalDefault, global.externalDefaultOnly); exports.noConflict = function () { global.bundle = current; return exports; }; })()); -})(this, (function (exports, externalNoImport, defaultLegacy, externalAuto, externalDefault, externalDefaultOnly) { 'use strict'; - - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } +})(this, (function (exports, externalNoImport, defaultCompat, externalAuto, externalDefault, externalDefaultOnly) { 'use strict'; function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; } + function _interopNamespaceCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : _interopNamespaceDefault(e); } + function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, default: e }); } function _interopNamespaceDefault(e) { @@ -32,8 +32,6 @@ return Object.freeze(n); } - function _interopNamespace (e) { return e && e.__esModule ? e : _interopNamespaceDefault(e); } - function _mergeNamespaces(n, m) { m.forEach(function (e) { e && typeof e !== 'string' && !Array.isArray(e) && Object.keys(e).forEach(function (k) { @@ -49,21 +47,20 @@ return Object.freeze(n); } - var defaultLegacy__namespace = /*#__PURE__*/_interopNamespace(defaultLegacy); - var defaultLegacy__default = /*#__PURE__*/_interopDefaultLegacy(defaultLegacy); + var defaultCompat__namespace = /*#__PURE__*/_interopNamespaceCompat(defaultCompat); var externalAuto__default = /*#__PURE__*/_interopDefault(externalAuto); var externalDefault__namespace = /*#__PURE__*/_interopNamespaceDefault(externalDefault); var externalDefaultOnly__namespace = /*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly); exports.a = void 0; - ({ a: exports.a } = defaultLegacy.b); - console.log({ a: exports.a } = defaultLegacy.b); + ({ a: exports.a } = defaultCompat.b); + console.log({ a: exports.a } = defaultCompat.b); Promise.resolve().then(function () { return main; }).then(console.log); import('external').then(console.log); - console.log(defaultLegacy__default.default); + console.log(defaultCompat__namespace.default); console.log(externalAuto__default.default); console.log(externalDefault__namespace); console.log(externalDefaultOnly__namespace); @@ -72,19 +69,17 @@ __proto__: null, get a () { return exports.a; }, foo: foo - }, [defaultLegacy__namespace]); + }, [defaultCompat__namespace]); Object.defineProperty(exports, 'foo', { enumerable: true, - get: function () { return defaultLegacy.foo; } + get: function () { return defaultCompat.foo; } }); - Object.keys(defaultLegacy).forEach(function (k) { + Object.keys(defaultCompat).forEach(function (k) { if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, { enumerable: true, - get: function () { return defaultLegacy[k]; } + get: function () { return defaultCompat[k]; } }); }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/generated-code/arrow-functions-false/main.js b/test/form/samples/generated-code/arrow-functions-false/main.js index 67951acbf27..06db4163961 100644 --- a/test/form/samples/generated-code/arrow-functions-false/main.js +++ b/test/form/samples/generated-code/arrow-functions-false/main.js @@ -11,8 +11,8 @@ import('external').then(console.log); export * from 'external'; export { foo } from 'external'; -import defaultLegacy from 'external'; -console.log(defaultLegacy); +import defaultCompat from 'external'; +console.log(defaultCompat); import externalAuto from 'externalAuto'; console.log(externalAuto); diff --git a/test/form/samples/generated-code/arrow-functions-true/_config.js b/test/form/samples/generated-code/arrow-functions-true/_config.js index 82d6f99c5fe..a119e583b16 100644 --- a/test/form/samples/generated-code/arrow-functions-true/_config.js +++ b/test/form/samples/generated-code/arrow-functions-true/_config.js @@ -21,7 +21,7 @@ module.exports = { if (id === 'externalAuto') { return 'auto'; } - return true; + return 'compat'; }, name: 'bundle', noConflict: true diff --git a/test/form/samples/generated-code/arrow-functions-true/_expected/amd.js b/test/form/samples/generated-code/arrow-functions-true/_expected/amd.js index 2aef795f6cb..4f34def0725 100644 --- a/test/form/samples/generated-code/arrow-functions-true/_expected/amd.js +++ b/test/form/samples/generated-code/arrow-functions-true/_expected/amd.js @@ -1,9 +1,9 @@ -define(['require', 'exports', 'externalNoImport', 'external', 'externalAuto', 'externalDefault', 'externalDefaultOnly'], (function (require, exports, externalNoImport, defaultLegacy, externalAuto, externalDefault, externalDefaultOnly) { 'use strict'; - - var _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { default: e }; +define(['require', 'exports', 'externalNoImport', 'external', 'externalAuto', 'externalDefault', 'externalDefaultOnly'], (function (require, exports, externalNoImport, defaultCompat, externalAuto, externalDefault, externalDefaultOnly) { 'use strict'; var _interopDefault = e => e && e.__esModule ? e : { default: e }; + var _interopNamespaceCompat = e => e && typeof e === 'object' && 'default' in e ? e : _interopNamespaceDefault(e); + var _interopNamespaceDefaultOnly = e => Object.freeze({ __proto__: null, default: e }); function _interopNamespaceDefault(e) { @@ -23,8 +23,6 @@ define(['require', 'exports', 'externalNoImport', 'external', 'externalAuto', 'e return Object.freeze(n); } - var _interopNamespace = e => e && e.__esModule ? e : _interopNamespaceDefault(e); - function _mergeNamespaces(n, m) { m.forEach(e => e && typeof e !== 'string' && !Array.isArray(e) && Object.keys(e).forEach(k => { @@ -40,21 +38,20 @@ define(['require', 'exports', 'externalNoImport', 'external', 'externalAuto', 'e return Object.freeze(n); } - var defaultLegacy__namespace = /*#__PURE__*/_interopNamespace(defaultLegacy); - var defaultLegacy__default = /*#__PURE__*/_interopDefaultLegacy(defaultLegacy); + var defaultCompat__namespace = /*#__PURE__*/_interopNamespaceCompat(defaultCompat); var externalAuto__default = /*#__PURE__*/_interopDefault(externalAuto); var externalDefault__namespace = /*#__PURE__*/_interopNamespaceDefault(externalDefault); var externalDefaultOnly__namespace = /*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly); exports.a = void 0; - ({ a: exports.a } = defaultLegacy.b); - console.log({ a: exports.a } = defaultLegacy.b); + ({ a: exports.a } = defaultCompat.b); + console.log({ a: exports.a } = defaultCompat.b); Promise.resolve().then(() => main).then(console.log); - new Promise((resolve, reject) => require(['external'], m => resolve(/*#__PURE__*/_interopNamespace(m)), reject)).then(console.log); - console.log(defaultLegacy__default.default); + new Promise((resolve, reject) => require(['external'], m => resolve(/*#__PURE__*/_interopNamespaceCompat(m)), reject)).then(console.log); + console.log(defaultCompat__namespace.default); console.log(externalAuto__default.default); console.log(externalDefault__namespace); console.log(externalDefaultOnly__namespace); @@ -63,19 +60,17 @@ define(['require', 'exports', 'externalNoImport', 'external', 'externalAuto', 'e __proto__: null, get a () { return exports.a; }, foo: foo - }, [defaultLegacy__namespace]); + }, [defaultCompat__namespace]); Object.defineProperty(exports, 'foo', { enumerable: true, - get: () => defaultLegacy.foo + get: () => defaultCompat.foo }); - Object.keys(defaultLegacy).forEach(k => { + Object.keys(defaultCompat).forEach(k => { if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, { enumerable: true, - get: () => defaultLegacy[k] + get: () => defaultCompat[k] }); }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/generated-code/arrow-functions-true/_expected/cjs.js b/test/form/samples/generated-code/arrow-functions-true/_expected/cjs.js index e78cfb3efd0..f22a7a8125b 100644 --- a/test/form/samples/generated-code/arrow-functions-true/_expected/cjs.js +++ b/test/form/samples/generated-code/arrow-functions-true/_expected/cjs.js @@ -1,17 +1,15 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - require('externalNoImport'); -var defaultLegacy = require('external'); +var defaultCompat = require('external'); var externalAuto = require('externalAuto'); var externalDefault = require('externalDefault'); var externalDefaultOnly = require('externalDefaultOnly'); -var _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { default: e }; - var _interopDefault = e => e && e.__esModule ? e : { default: e }; +var _interopNamespaceCompat = e => e && typeof e === 'object' && 'default' in e ? e : _interopNamespaceDefault(e); + var _interopNamespaceDefaultOnly = e => Object.freeze({ __proto__: null, default: e }); function _interopNamespaceDefault(e) { @@ -31,8 +29,6 @@ function _interopNamespaceDefault(e) { return Object.freeze(n); } -var _interopNamespace = e => e && e.__esModule ? e : _interopNamespaceDefault(e); - function _mergeNamespaces(n, m) { m.forEach(e => e && typeof e !== 'string' && !Array.isArray(e) && Object.keys(e).forEach(k => { @@ -48,21 +44,20 @@ function _mergeNamespaces(n, m) { return Object.freeze(n); } -var defaultLegacy__namespace = /*#__PURE__*/_interopNamespace(defaultLegacy); -var defaultLegacy__default = /*#__PURE__*/_interopDefaultLegacy(defaultLegacy); +var defaultCompat__namespace = /*#__PURE__*/_interopNamespaceCompat(defaultCompat); var externalAuto__default = /*#__PURE__*/_interopDefault(externalAuto); var externalDefault__namespace = /*#__PURE__*/_interopNamespaceDefault(externalDefault); var externalDefaultOnly__namespace = /*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly); exports.a = void 0; -({ a: exports.a } = defaultLegacy.b); -console.log({ a: exports.a } = defaultLegacy.b); +({ a: exports.a } = defaultCompat.b); +console.log({ a: exports.a } = defaultCompat.b); Promise.resolve().then(() => main).then(console.log); -Promise.resolve().then(() => /*#__PURE__*/_interopNamespace(require('external'))).then(console.log); -console.log(defaultLegacy__default.default); +Promise.resolve().then(() => /*#__PURE__*/_interopNamespaceCompat(require('external'))).then(console.log); +console.log(defaultCompat__namespace.default); console.log(externalAuto__default.default); console.log(externalDefault__namespace); console.log(externalDefaultOnly__namespace); @@ -71,15 +66,15 @@ var main = /*#__PURE__*/_mergeNamespaces({ __proto__: null, get a () { return exports.a; }, foo: foo -}, [defaultLegacy__namespace]); +}, [defaultCompat__namespace]); Object.defineProperty(exports, 'foo', { enumerable: true, - get: () => defaultLegacy.foo + get: () => defaultCompat.foo }); -Object.keys(defaultLegacy).forEach(k => { +Object.keys(defaultCompat).forEach(k => { if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, { enumerable: true, - get: () => defaultLegacy[k] + get: () => defaultCompat[k] }); }); diff --git a/test/form/samples/generated-code/arrow-functions-true/_expected/es.js b/test/form/samples/generated-code/arrow-functions-true/_expected/es.js index 9d0d056095d..bed422f4b5c 100644 --- a/test/form/samples/generated-code/arrow-functions-true/_expected/es.js +++ b/test/form/samples/generated-code/arrow-functions-true/_expected/es.js @@ -1,6 +1,6 @@ import 'externalNoImport'; -import * as defaultLegacy from 'external'; -import defaultLegacy__default, { b } from 'external'; +import * as defaultCompat from 'external'; +import defaultCompat__default, { b } from 'external'; export * from 'external'; export { foo } from 'external'; import externalAuto from 'externalAuto'; @@ -30,7 +30,7 @@ console.log({ a } = b); Promise.resolve().then(() => main).then(console.log); import('external').then(console.log); -console.log(defaultLegacy__default); +console.log(defaultCompat__default); console.log(externalAuto); console.log(externalDefault); console.log(externalDefaultOnly); @@ -39,6 +39,6 @@ var main = /*#__PURE__*/_mergeNamespaces({ __proto__: null, get a () { return a; }, foo: foo -}, [defaultLegacy]); +}, [defaultCompat]); export { a }; diff --git a/test/form/samples/generated-code/arrow-functions-true/_expected/iife.js b/test/form/samples/generated-code/arrow-functions-true/_expected/iife.js index d5ec7c12442..f6bdef0a3ec 100644 --- a/test/form/samples/generated-code/arrow-functions-true/_expected/iife.js +++ b/test/form/samples/generated-code/arrow-functions-true/_expected/iife.js @@ -1,10 +1,10 @@ -var bundle = (function (exports, externalNoImport, defaultLegacy, externalAuto, externalDefault, externalDefaultOnly) { +var bundle = (function (exports, externalNoImport, defaultCompat, externalAuto, externalDefault, externalDefaultOnly) { 'use strict'; - var _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { default: e }; - var _interopDefault = e => e && e.__esModule ? e : { default: e }; + var _interopNamespaceCompat = e => e && typeof e === 'object' && 'default' in e ? e : _interopNamespaceDefault(e); + var _interopNamespaceDefaultOnly = e => Object.freeze({ __proto__: null, default: e }); function _interopNamespaceDefault(e) { @@ -24,8 +24,6 @@ var bundle = (function (exports, externalNoImport, defaultLegacy, externalAuto, return Object.freeze(n); } - var _interopNamespace = e => e && e.__esModule ? e : _interopNamespaceDefault(e); - function _mergeNamespaces(n, m) { m.forEach(e => e && typeof e !== 'string' && !Array.isArray(e) && Object.keys(e).forEach(k => { @@ -41,21 +39,20 @@ var bundle = (function (exports, externalNoImport, defaultLegacy, externalAuto, return Object.freeze(n); } - var defaultLegacy__namespace = /*#__PURE__*/_interopNamespace(defaultLegacy); - var defaultLegacy__default = /*#__PURE__*/_interopDefaultLegacy(defaultLegacy); + var defaultCompat__namespace = /*#__PURE__*/_interopNamespaceCompat(defaultCompat); var externalAuto__default = /*#__PURE__*/_interopDefault(externalAuto); var externalDefault__namespace = /*#__PURE__*/_interopNamespaceDefault(externalDefault); var externalDefaultOnly__namespace = /*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly); exports.a = void 0; - ({ a: exports.a } = defaultLegacy.b); - console.log({ a: exports.a } = defaultLegacy.b); + ({ a: exports.a } = defaultCompat.b); + console.log({ a: exports.a } = defaultCompat.b); Promise.resolve().then(() => main).then(console.log); import('external').then(console.log); - console.log(defaultLegacy__default.default); + console.log(defaultCompat__namespace.default); console.log(externalAuto__default.default); console.log(externalDefault__namespace); console.log(externalDefaultOnly__namespace); @@ -64,21 +61,19 @@ var bundle = (function (exports, externalNoImport, defaultLegacy, externalAuto, __proto__: null, get a () { return exports.a; }, foo: foo - }, [defaultLegacy__namespace]); + }, [defaultCompat__namespace]); Object.defineProperty(exports, 'foo', { enumerable: true, - get: () => defaultLegacy.foo + get: () => defaultCompat.foo }); - Object.keys(defaultLegacy).forEach(k => { + Object.keys(defaultCompat).forEach(k => { if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, { enumerable: true, - get: () => defaultLegacy[k] + get: () => defaultCompat[k] }); }); - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; -})({}, null, defaultLegacy, externalAuto, externalDefault, externalDefaultOnly); +})({}, null, defaultCompat, externalAuto, externalDefault, externalDefaultOnly); diff --git a/test/form/samples/generated-code/arrow-functions-true/_expected/system.js b/test/form/samples/generated-code/arrow-functions-true/_expected/system.js index 086b7891f5b..dd089462dfe 100644 --- a/test/form/samples/generated-code/arrow-functions-true/_expected/system.js +++ b/test/form/samples/generated-code/arrow-functions-true/_expected/system.js @@ -5,12 +5,12 @@ System.register('bundle', ['externalNoImport', 'external', 'externalAuto', 'exte default: 1, foo: 1 }; - var b, defaultLegacy, defaultLegacy__default, externalAuto, externalDefault, externalDefaultOnly; + var b, defaultCompat, defaultCompat__default, externalAuto, externalDefault, externalDefaultOnly; return { setters: [() => {}, module => { b = module.b; - defaultLegacy = module; - defaultLegacy__default = module.default; + defaultCompat = module; + defaultCompat__default = module.default; var setter = { foo: module.foo }; for (var name in module) { if (!_starExcludes[name]) setter[name] = module[name]; @@ -48,7 +48,7 @@ System.register('bundle', ['externalNoImport', 'external', 'externalAuto', 'exte Promise.resolve().then(() => main).then(console.log); module.import('external').then(console.log); - console.log(defaultLegacy__default); + console.log(defaultCompat__default); console.log(externalAuto); console.log(externalDefault); console.log(externalDefaultOnly); @@ -57,7 +57,7 @@ System.register('bundle', ['externalNoImport', 'external', 'externalAuto', 'exte __proto__: null, get a () { return a; }, foo: foo - }, [defaultLegacy]); + }, [defaultCompat]); }) }; diff --git a/test/form/samples/generated-code/arrow-functions-true/_expected/umd.js b/test/form/samples/generated-code/arrow-functions-true/_expected/umd.js index 249d5a42ea5..a3c40435f99 100644 --- a/test/form/samples/generated-code/arrow-functions-true/_expected/umd.js +++ b/test/form/samples/generated-code/arrow-functions-true/_expected/umd.js @@ -4,15 +4,15 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, (() => { var current = global.bundle; var exports = global.bundle = {}; - factory(exports, null, global.defaultLegacy, global.externalAuto, global.externalDefault, global.externalDefaultOnly); + factory(exports, null, global.defaultCompat, global.externalAuto, global.externalDefault, global.externalDefaultOnly); exports.noConflict = () => { global.bundle = current; return exports; }; })()); -})(this, (function (exports, externalNoImport, defaultLegacy, externalAuto, externalDefault, externalDefaultOnly) { 'use strict'; - - var _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { default: e }; +})(this, (function (exports, externalNoImport, defaultCompat, externalAuto, externalDefault, externalDefaultOnly) { 'use strict'; var _interopDefault = e => e && e.__esModule ? e : { default: e }; + var _interopNamespaceCompat = e => e && typeof e === 'object' && 'default' in e ? e : _interopNamespaceDefault(e); + var _interopNamespaceDefaultOnly = e => Object.freeze({ __proto__: null, default: e }); function _interopNamespaceDefault(e) { @@ -32,8 +32,6 @@ return Object.freeze(n); } - var _interopNamespace = e => e && e.__esModule ? e : _interopNamespaceDefault(e); - function _mergeNamespaces(n, m) { m.forEach(e => e && typeof e !== 'string' && !Array.isArray(e) && Object.keys(e).forEach(k => { @@ -49,21 +47,20 @@ return Object.freeze(n); } - var defaultLegacy__namespace = /*#__PURE__*/_interopNamespace(defaultLegacy); - var defaultLegacy__default = /*#__PURE__*/_interopDefaultLegacy(defaultLegacy); + var defaultCompat__namespace = /*#__PURE__*/_interopNamespaceCompat(defaultCompat); var externalAuto__default = /*#__PURE__*/_interopDefault(externalAuto); var externalDefault__namespace = /*#__PURE__*/_interopNamespaceDefault(externalDefault); var externalDefaultOnly__namespace = /*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly); exports.a = void 0; - ({ a: exports.a } = defaultLegacy.b); - console.log({ a: exports.a } = defaultLegacy.b); + ({ a: exports.a } = defaultCompat.b); + console.log({ a: exports.a } = defaultCompat.b); Promise.resolve().then(() => main).then(console.log); import('external').then(console.log); - console.log(defaultLegacy__default.default); + console.log(defaultCompat__namespace.default); console.log(externalAuto__default.default); console.log(externalDefault__namespace); console.log(externalDefaultOnly__namespace); @@ -72,19 +69,17 @@ __proto__: null, get a () { return exports.a; }, foo: foo - }, [defaultLegacy__namespace]); + }, [defaultCompat__namespace]); Object.defineProperty(exports, 'foo', { enumerable: true, - get: () => defaultLegacy.foo + get: () => defaultCompat.foo }); - Object.keys(defaultLegacy).forEach(k => { + Object.keys(defaultCompat).forEach(k => { if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, { enumerable: true, - get: () => defaultLegacy[k] + get: () => defaultCompat[k] }); }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/generated-code/const-bindings-false/_config.js b/test/form/samples/generated-code/const-bindings-false/_config.js index 7cad0c89a3a..2cb64b60a47 100644 --- a/test/form/samples/generated-code/const-bindings-false/_config.js +++ b/test/form/samples/generated-code/const-bindings-false/_config.js @@ -8,7 +8,8 @@ module.exports = { generatedCode: { arrowFunctions: true, constBindings: false }, name: 'bundle', noConflict: true, - exports: 'named' + exports: 'named', + interop: 'compat' }, plugins: [ { diff --git a/test/form/samples/generated-code/const-bindings-false/_expected/amd.js b/test/form/samples/generated-code/const-bindings-false/_expected/amd.js index 34c15ed7a43..de384dd28eb 100644 --- a/test/form/samples/generated-code/const-bindings-false/_expected/amd.js +++ b/test/form/samples/generated-code/const-bindings-false/_expected/amd.js @@ -1,9 +1,7 @@ define(['exports', 'external'], (function (exports, foo$1) { 'use strict'; - var _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { default: e }; - - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceCompat(e) { + if (e && typeof e === 'object' && 'default' in e) return e; var n = Object.create(null); if (e) { Object.keys(e).forEach(k => { @@ -20,8 +18,7 @@ define(['exports', 'external'], (function (exports, foo$1) { 'use strict'; return Object.freeze(n); } - var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo$1); - var foo__namespace = /*#__PURE__*/_interopNamespace(foo$1); + var foo__namespace = /*#__PURE__*/_interopNamespaceCompat(foo$1); var _missingExportShim = void 0; @@ -35,7 +32,7 @@ define(['exports', 'external'], (function (exports, foo$1) { 'use strict'; var synthetic = { bar: 'baz' }; - console.log(foo__default.default, foo__namespace, other, bar, _missingExportShim); + console.log(foo__namespace.default, foo__namespace, other, bar, _missingExportShim); var main = 42; exports.default = main; diff --git a/test/form/samples/generated-code/const-bindings-false/_expected/cjs.js b/test/form/samples/generated-code/const-bindings-false/_expected/cjs.js index 591e6a99709..d55a4241e1f 100644 --- a/test/form/samples/generated-code/const-bindings-false/_expected/cjs.js +++ b/test/form/samples/generated-code/const-bindings-false/_expected/cjs.js @@ -4,10 +4,8 @@ Object.defineProperty(exports, '__esModule', { value: true }); var foo$1 = require('external'); -var _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { default: e }; - -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceCompat(e) { + if (e && typeof e === 'object' && 'default' in e) return e; var n = Object.create(null); if (e) { Object.keys(e).forEach(k => { @@ -24,8 +22,7 @@ function _interopNamespace(e) { return Object.freeze(n); } -var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo$1); -var foo__namespace = /*#__PURE__*/_interopNamespace(foo$1); +var foo__namespace = /*#__PURE__*/_interopNamespaceCompat(foo$1); var _missingExportShim = void 0; @@ -39,7 +36,7 @@ var other = /*#__PURE__*/Object.freeze({ var synthetic = { bar: 'baz' }; -console.log(foo__default.default, foo__namespace, other, bar, _missingExportShim); +console.log(foo__namespace.default, foo__namespace, other, bar, _missingExportShim); var main = 42; exports.default = main; diff --git a/test/form/samples/generated-code/const-bindings-false/_expected/iife.js b/test/form/samples/generated-code/const-bindings-false/_expected/iife.js index 959076fdfeb..46e57327e09 100644 --- a/test/form/samples/generated-code/const-bindings-false/_expected/iife.js +++ b/test/form/samples/generated-code/const-bindings-false/_expected/iife.js @@ -1,10 +1,8 @@ var bundle = (function (exports, foo$1) { 'use strict'; - var _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { default: e }; - - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceCompat(e) { + if (e && typeof e === 'object' && 'default' in e) return e; var n = Object.create(null); if (e) { Object.keys(e).forEach(k => { @@ -21,8 +19,7 @@ var bundle = (function (exports, foo$1) { return Object.freeze(n); } - var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo$1); - var foo__namespace = /*#__PURE__*/_interopNamespace(foo$1); + var foo__namespace = /*#__PURE__*/_interopNamespaceCompat(foo$1); var _missingExportShim = void 0; @@ -36,7 +33,7 @@ var bundle = (function (exports, foo$1) { var synthetic = { bar: 'baz' }; - console.log(foo__default.default, foo__namespace, other, bar, _missingExportShim); + console.log(foo__namespace.default, foo__namespace, other, bar, _missingExportShim); var main = 42; exports.default = main; diff --git a/test/form/samples/generated-code/const-bindings-false/_expected/umd.js b/test/form/samples/generated-code/const-bindings-false/_expected/umd.js index a6d9a787c9c..6caeabea714 100644 --- a/test/form/samples/generated-code/const-bindings-false/_expected/umd.js +++ b/test/form/samples/generated-code/const-bindings-false/_expected/umd.js @@ -9,10 +9,8 @@ })()); })(this, (function (exports, foo$1) { 'use strict'; - var _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { default: e }; - - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceCompat(e) { + if (e && typeof e === 'object' && 'default' in e) return e; var n = Object.create(null); if (e) { Object.keys(e).forEach(k => { @@ -29,8 +27,7 @@ return Object.freeze(n); } - var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo$1); - var foo__namespace = /*#__PURE__*/_interopNamespace(foo$1); + var foo__namespace = /*#__PURE__*/_interopNamespaceCompat(foo$1); var _missingExportShim = void 0; @@ -44,7 +41,7 @@ var synthetic = { bar: 'baz' }; - console.log(foo__default.default, foo__namespace, other, bar, _missingExportShim); + console.log(foo__namespace.default, foo__namespace, other, bar, _missingExportShim); var main = 42; exports.default = main; diff --git a/test/form/samples/generated-code/const-bindings-true/_config.js b/test/form/samples/generated-code/const-bindings-true/_config.js index 2c5978fd11d..e02a884ab9e 100644 --- a/test/form/samples/generated-code/const-bindings-true/_config.js +++ b/test/form/samples/generated-code/const-bindings-true/_config.js @@ -8,7 +8,8 @@ module.exports = { generatedCode: { arrowFunctions: true, constBindings: true }, name: 'bundle', noConflict: true, - exports: 'named' + exports: 'named', + interop: 'compat' }, plugins: [ { diff --git a/test/form/samples/generated-code/const-bindings-true/_expected/amd.js b/test/form/samples/generated-code/const-bindings-true/_expected/amd.js index 7300b016a19..6226a50c21d 100644 --- a/test/form/samples/generated-code/const-bindings-true/_expected/amd.js +++ b/test/form/samples/generated-code/const-bindings-true/_expected/amd.js @@ -1,9 +1,7 @@ define(['exports', 'external'], (function (exports, foo$1) { 'use strict'; - const _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { default: e }; - - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceCompat(e) { + if (e && typeof e === 'object' && 'default' in e) return e; const n = Object.create(null); if (e) { for (const k in e) { @@ -20,8 +18,7 @@ define(['exports', 'external'], (function (exports, foo$1) { 'use strict'; return Object.freeze(n); } - const foo__default = /*#__PURE__*/_interopDefaultLegacy(foo$1); - const foo__namespace = /*#__PURE__*/_interopNamespace(foo$1); + const foo__namespace = /*#__PURE__*/_interopNamespaceCompat(foo$1); const _missingExportShim = void 0; @@ -35,7 +32,7 @@ define(['exports', 'external'], (function (exports, foo$1) { 'use strict'; const synthetic = { bar: 'baz' }; - console.log(foo__default.default, foo__namespace, other, bar, _missingExportShim); + console.log(foo__namespace.default, foo__namespace, other, bar, _missingExportShim); const main = 42; exports.default = main; diff --git a/test/form/samples/generated-code/const-bindings-true/_expected/cjs.js b/test/form/samples/generated-code/const-bindings-true/_expected/cjs.js index cf9a6e53ad7..5745e3a8771 100644 --- a/test/form/samples/generated-code/const-bindings-true/_expected/cjs.js +++ b/test/form/samples/generated-code/const-bindings-true/_expected/cjs.js @@ -4,10 +4,8 @@ Object.defineProperty(exports, '__esModule', { value: true }); const foo$1 = require('external'); -const _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { default: e }; - -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceCompat(e) { + if (e && typeof e === 'object' && 'default' in e) return e; const n = Object.create(null); if (e) { for (const k in e) { @@ -24,8 +22,7 @@ function _interopNamespace(e) { return Object.freeze(n); } -const foo__default = /*#__PURE__*/_interopDefaultLegacy(foo$1); -const foo__namespace = /*#__PURE__*/_interopNamespace(foo$1); +const foo__namespace = /*#__PURE__*/_interopNamespaceCompat(foo$1); const _missingExportShim = void 0; @@ -39,7 +36,7 @@ const other = /*#__PURE__*/Object.freeze({ const synthetic = { bar: 'baz' }; -console.log(foo__default.default, foo__namespace, other, bar, _missingExportShim); +console.log(foo__namespace.default, foo__namespace, other, bar, _missingExportShim); const main = 42; exports.default = main; diff --git a/test/form/samples/generated-code/const-bindings-true/_expected/iife.js b/test/form/samples/generated-code/const-bindings-true/_expected/iife.js index 81e6daa79d0..86073523347 100644 --- a/test/form/samples/generated-code/const-bindings-true/_expected/iife.js +++ b/test/form/samples/generated-code/const-bindings-true/_expected/iife.js @@ -1,10 +1,8 @@ var bundle = (function (exports, foo$1) { 'use strict'; - const _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { default: e }; - - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceCompat(e) { + if (e && typeof e === 'object' && 'default' in e) return e; const n = Object.create(null); if (e) { for (const k in e) { @@ -21,8 +19,7 @@ var bundle = (function (exports, foo$1) { return Object.freeze(n); } - const foo__default = /*#__PURE__*/_interopDefaultLegacy(foo$1); - const foo__namespace = /*#__PURE__*/_interopNamespace(foo$1); + const foo__namespace = /*#__PURE__*/_interopNamespaceCompat(foo$1); const _missingExportShim = void 0; @@ -36,7 +33,7 @@ var bundle = (function (exports, foo$1) { const synthetic = { bar: 'baz' }; - console.log(foo__default.default, foo__namespace, other, bar, _missingExportShim); + console.log(foo__namespace.default, foo__namespace, other, bar, _missingExportShim); const main = 42; exports.default = main; diff --git a/test/form/samples/generated-code/const-bindings-true/_expected/umd.js b/test/form/samples/generated-code/const-bindings-true/_expected/umd.js index 09bd65f10cb..9f60baee7dc 100644 --- a/test/form/samples/generated-code/const-bindings-true/_expected/umd.js +++ b/test/form/samples/generated-code/const-bindings-true/_expected/umd.js @@ -9,10 +9,8 @@ })()); })(this, (function (exports, foo$1) { 'use strict'; - const _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { default: e }; - - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceCompat(e) { + if (e && typeof e === 'object' && 'default' in e) return e; const n = Object.create(null); if (e) { for (const k in e) { @@ -29,8 +27,7 @@ return Object.freeze(n); } - const foo__default = /*#__PURE__*/_interopDefaultLegacy(foo$1); - const foo__namespace = /*#__PURE__*/_interopNamespace(foo$1); + const foo__namespace = /*#__PURE__*/_interopNamespaceCompat(foo$1); const _missingExportShim = void 0; @@ -44,7 +41,7 @@ const synthetic = { bar: 'baz' }; - console.log(foo__default.default, foo__namespace, other, bar, _missingExportShim); + console.log(foo__namespace.default, foo__namespace, other, bar, _missingExportShim); const main = 42; exports.default = main; diff --git a/test/form/samples/generated-code/reserved-names-as-props-false-no-external-live-bindings/_config.js b/test/form/samples/generated-code/reserved-names-as-props-false-no-external-live-bindings/_config.js index 34a550f3bd4..18dbe14d544 100644 --- a/test/form/samples/generated-code/reserved-names-as-props-false-no-external-live-bindings/_config.js +++ b/test/form/samples/generated-code/reserved-names-as-props-false-no-external-live-bindings/_config.js @@ -6,6 +6,7 @@ module.exports = { exports: 'named', externalLiveBindings: false, generatedCode: { reservedNamesAsProps: false }, + interop: 'compat', name: 'bundle' } } diff --git a/test/form/samples/generated-code/reserved-names-as-props-false-no-external-live-bindings/_expected/amd.js b/test/form/samples/generated-code/reserved-names-as-props-false-no-external-live-bindings/_expected/amd.js index e30042a3041..6ac599a7021 100644 --- a/test/form/samples/generated-code/reserved-names-as-props-false-no-external-live-bindings/_expected/amd.js +++ b/test/form/samples/generated-code/reserved-names-as-props-false-no-external-live-bindings/_expected/amd.js @@ -1,8 +1,8 @@ define(['external'], (function (ns) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e["default"] : e; } + function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e["default"] : e; } - var ns__default = /*#__PURE__*/_interopDefaultLegacy(ns); + var ns__default = /*#__PURE__*/_interopDefaultCompat(ns); console.log(ns__default); diff --git a/test/form/samples/generated-code/reserved-names-as-props-false-no-external-live-bindings/_expected/cjs.js b/test/form/samples/generated-code/reserved-names-as-props-false-no-external-live-bindings/_expected/cjs.js index 907253ae7e0..b77bbc6913c 100644 --- a/test/form/samples/generated-code/reserved-names-as-props-false-no-external-live-bindings/_expected/cjs.js +++ b/test/form/samples/generated-code/reserved-names-as-props-false-no-external-live-bindings/_expected/cjs.js @@ -2,8 +2,8 @@ var ns = require('external'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e["default"] : e; } +function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e["default"] : e; } -var ns__default = /*#__PURE__*/_interopDefaultLegacy(ns); +var ns__default = /*#__PURE__*/_interopDefaultCompat(ns); console.log(ns__default); diff --git a/test/form/samples/generated-code/reserved-names-as-props-false-no-external-live-bindings/_expected/iife.js b/test/form/samples/generated-code/reserved-names-as-props-false-no-external-live-bindings/_expected/iife.js index e66aad0a58d..bf53405f8a8 100644 --- a/test/form/samples/generated-code/reserved-names-as-props-false-no-external-live-bindings/_expected/iife.js +++ b/test/form/samples/generated-code/reserved-names-as-props-false-no-external-live-bindings/_expected/iife.js @@ -1,9 +1,9 @@ (function (ns) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e["default"] : e; } + function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e["default"] : e; } - var ns__default = /*#__PURE__*/_interopDefaultLegacy(ns); + var ns__default = /*#__PURE__*/_interopDefaultCompat(ns); console.log(ns__default); diff --git a/test/form/samples/generated-code/reserved-names-as-props-false-no-external-live-bindings/_expected/umd.js b/test/form/samples/generated-code/reserved-names-as-props-false-no-external-live-bindings/_expected/umd.js index c42dfe07472..e0b80cf8905 100644 --- a/test/form/samples/generated-code/reserved-names-as-props-false-no-external-live-bindings/_expected/umd.js +++ b/test/form/samples/generated-code/reserved-names-as-props-false-no-external-live-bindings/_expected/umd.js @@ -4,9 +4,9 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.ns)); })(this, (function (ns) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e["default"] : e; } + function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e["default"] : e; } - var ns__default = /*#__PURE__*/_interopDefaultLegacy(ns); + var ns__default = /*#__PURE__*/_interopDefaultCompat(ns); console.log(ns__default); diff --git a/test/form/samples/generated-code/reserved-names-as-props-true-no-external-live-bindings/_config.js b/test/form/samples/generated-code/reserved-names-as-props-true-no-external-live-bindings/_config.js index 1c44b2cb7e2..60cf1f3f1f3 100644 --- a/test/form/samples/generated-code/reserved-names-as-props-true-no-external-live-bindings/_config.js +++ b/test/form/samples/generated-code/reserved-names-as-props-true-no-external-live-bindings/_config.js @@ -6,6 +6,7 @@ module.exports = { exports: 'named', externalLiveBindings: false, generatedCode: { reservedNamesAsProps: true }, + interop: 'compat', name: 'bundle' } } diff --git a/test/form/samples/generated-code/reserved-names-as-props-true-no-external-live-bindings/_expected/amd.js b/test/form/samples/generated-code/reserved-names-as-props-true-no-external-live-bindings/_expected/amd.js index f5b6c6d62ee..36efb5f32f7 100644 --- a/test/form/samples/generated-code/reserved-names-as-props-true-no-external-live-bindings/_expected/amd.js +++ b/test/form/samples/generated-code/reserved-names-as-props-true-no-external-live-bindings/_expected/amd.js @@ -1,8 +1,8 @@ define(['external'], (function (ns) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; } + function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; } - var ns__default = /*#__PURE__*/_interopDefaultLegacy(ns); + var ns__default = /*#__PURE__*/_interopDefaultCompat(ns); console.log(ns__default); diff --git a/test/form/samples/generated-code/reserved-names-as-props-true-no-external-live-bindings/_expected/cjs.js b/test/form/samples/generated-code/reserved-names-as-props-true-no-external-live-bindings/_expected/cjs.js index 6e1ec59b058..8b89b78436a 100644 --- a/test/form/samples/generated-code/reserved-names-as-props-true-no-external-live-bindings/_expected/cjs.js +++ b/test/form/samples/generated-code/reserved-names-as-props-true-no-external-live-bindings/_expected/cjs.js @@ -2,8 +2,8 @@ var ns = require('external'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; } +function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; } -var ns__default = /*#__PURE__*/_interopDefaultLegacy(ns); +var ns__default = /*#__PURE__*/_interopDefaultCompat(ns); console.log(ns__default); diff --git a/test/form/samples/generated-code/reserved-names-as-props-true-no-external-live-bindings/_expected/iife.js b/test/form/samples/generated-code/reserved-names-as-props-true-no-external-live-bindings/_expected/iife.js index 0de7dc26e90..55b181d08c9 100644 --- a/test/form/samples/generated-code/reserved-names-as-props-true-no-external-live-bindings/_expected/iife.js +++ b/test/form/samples/generated-code/reserved-names-as-props-true-no-external-live-bindings/_expected/iife.js @@ -1,9 +1,9 @@ (function (ns) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; } + function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; } - var ns__default = /*#__PURE__*/_interopDefaultLegacy(ns); + var ns__default = /*#__PURE__*/_interopDefaultCompat(ns); console.log(ns__default); diff --git a/test/form/samples/generated-code/reserved-names-as-props-true-no-external-live-bindings/_expected/umd.js b/test/form/samples/generated-code/reserved-names-as-props-true-no-external-live-bindings/_expected/umd.js index 7d2ff45a2c8..12939110059 100644 --- a/test/form/samples/generated-code/reserved-names-as-props-true-no-external-live-bindings/_expected/umd.js +++ b/test/form/samples/generated-code/reserved-names-as-props-true-no-external-live-bindings/_expected/umd.js @@ -4,9 +4,9 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.ns)); })(this, (function (ns) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; } + function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; } - var ns__default = /*#__PURE__*/_interopDefaultLegacy(ns); + var ns__default = /*#__PURE__*/_interopDefaultCompat(ns); console.log(ns__default); diff --git a/test/form/samples/globals-function/_expected/amd.js b/test/form/samples/globals-function/_expected/amd.js index b8736c6909d..719a1d9c314 100644 --- a/test/form/samples/globals-function/_expected/amd.js +++ b/test/form/samples/globals-function/_expected/amd.js @@ -1,10 +1,5 @@ define(['a', 'b'], (function (a, b) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var a__default = /*#__PURE__*/_interopDefaultLegacy(a); - var b__default = /*#__PURE__*/_interopDefaultLegacy(b); - - console.log(a__default.default, b__default.default); + console.log(a, b); })); diff --git a/test/form/samples/globals-function/_expected/cjs.js b/test/form/samples/globals-function/_expected/cjs.js index a5cfa0f4c59..be7de890703 100644 --- a/test/form/samples/globals-function/_expected/cjs.js +++ b/test/form/samples/globals-function/_expected/cjs.js @@ -3,9 +3,4 @@ var a = require('a'); var b = require('b'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -var a__default = /*#__PURE__*/_interopDefaultLegacy(a); -var b__default = /*#__PURE__*/_interopDefaultLegacy(b); - -console.log(a__default.default, b__default.default); +console.log(a, b); diff --git a/test/form/samples/globals-function/_expected/iife.js b/test/form/samples/globals-function/_expected/iife.js index c2d769a4c02..7d7aea264c0 100644 --- a/test/form/samples/globals-function/_expected/iife.js +++ b/test/form/samples/globals-function/_expected/iife.js @@ -1,11 +1,6 @@ (function (a, b) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var a__default = /*#__PURE__*/_interopDefaultLegacy(a); - var b__default = /*#__PURE__*/_interopDefaultLegacy(b); - - console.log(a__default.default, b__default.default); + console.log(a, b); })(thisIsA, thisIsB); diff --git a/test/form/samples/globals-function/_expected/umd.js b/test/form/samples/globals-function/_expected/umd.js index 182b04b0711..7e62c1ce521 100644 --- a/test/form/samples/globals-function/_expected/umd.js +++ b/test/form/samples/globals-function/_expected/umd.js @@ -4,11 +4,6 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.thisIsA, global.thisIsB)); })(this, (function (a, b) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var a__default = /*#__PURE__*/_interopDefaultLegacy(a); - var b__default = /*#__PURE__*/_interopDefaultLegacy(b); - - console.log(a__default.default, b__default.default); + console.log(a, b); })); diff --git a/test/form/samples/guessed-global-names/_expected/amd.js b/test/form/samples/guessed-global-names/_expected/amd.js index 2cc39b2b133..2d81a6a092e 100644 --- a/test/form/samples/guessed-global-names/_expected/amd.js +++ b/test/form/samples/guessed-global-names/_expected/amd.js @@ -1,9 +1,5 @@ define(['unchanged', 'changed', 'special-character', 'with/slash', './relative'], (function (unchanged, changedName, specialCharacter, slash, relative_js) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var changedName__default = /*#__PURE__*/_interopDefaultLegacy(changedName); - - console.log(unchanged.foo, changedName__default.default, specialCharacter.bar, slash.baz, relative_js.quux); + console.log(unchanged.foo, changedName, specialCharacter.bar, slash.baz, relative_js.quux); })); diff --git a/test/form/samples/guessed-global-names/_expected/cjs.js b/test/form/samples/guessed-global-names/_expected/cjs.js index 42fa486ebc2..4a0861f19af 100644 --- a/test/form/samples/guessed-global-names/_expected/cjs.js +++ b/test/form/samples/guessed-global-names/_expected/cjs.js @@ -6,8 +6,4 @@ var specialCharacter = require('special-character'); var slash = require('with/slash'); var relative_js = require('./relative.js'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -var changedName__default = /*#__PURE__*/_interopDefaultLegacy(changedName); - -console.log(unchanged.foo, changedName__default.default, specialCharacter.bar, slash.baz, relative_js.quux); +console.log(unchanged.foo, changedName, specialCharacter.bar, slash.baz, relative_js.quux); diff --git a/test/form/samples/guessed-global-names/_expected/iife.js b/test/form/samples/guessed-global-names/_expected/iife.js index 774fc89c12c..80d65b02ac9 100644 --- a/test/form/samples/guessed-global-names/_expected/iife.js +++ b/test/form/samples/guessed-global-names/_expected/iife.js @@ -1,10 +1,6 @@ (function (unchanged, changedName, specialCharacter, slash, relative_js) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var changedName__default = /*#__PURE__*/_interopDefaultLegacy(changedName); - - console.log(unchanged.foo, changedName__default.default, specialCharacter.bar, slash.baz, relative_js.quux); + console.log(unchanged.foo, changedName, specialCharacter.bar, slash.baz, relative_js.quux); })(unchanged, changedName, specialCharacter, slash, relative_js); diff --git a/test/form/samples/guessed-global-names/_expected/umd.js b/test/form/samples/guessed-global-names/_expected/umd.js index 6995fd75f6d..a4cc825e023 100644 --- a/test/form/samples/guessed-global-names/_expected/umd.js +++ b/test/form/samples/guessed-global-names/_expected/umd.js @@ -4,10 +4,6 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.unchanged, global.changedName, global.specialCharacter, global.slash, global.relative_js)); })(this, (function (unchanged, changedName, specialCharacter, slash, relative_js) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var changedName__default = /*#__PURE__*/_interopDefaultLegacy(changedName); - - console.log(unchanged.foo, changedName__default.default, specialCharacter.bar, slash.baz, relative_js.quux); + console.log(unchanged.foo, changedName, specialCharacter.bar, slash.baz, relative_js.quux); })); diff --git a/test/form/samples/import-expression/_expected/amd.js b/test/form/samples/import-expression/_expected/amd.js index 5a3b3a9457b..46b13e91831 100644 --- a/test/form/samples/import-expression/_expected/amd.js +++ b/test/form/samples/import-expression/_expected/amd.js @@ -1,7 +1,6 @@ define(['require', 'external'], (function (require, external) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -18,7 +17,7 @@ define(['require', 'external'], (function (require, external) { 'use strict'; return Object.freeze(n); } - (function (t) { return new Promise(function (resolve, reject) { require([t], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }); })(external.join('a', 'b')); + (function (t) { return new Promise(function (resolve, reject) { require([t], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); })(external.join('a', 'b')); console.log(external.join); })); diff --git a/test/form/samples/import-expression/_expected/cjs.js b/test/form/samples/import-expression/_expected/cjs.js index d48f6f43ae4..e982928f093 100644 --- a/test/form/samples/import-expression/_expected/cjs.js +++ b/test/form/samples/import-expression/_expected/cjs.js @@ -2,8 +2,7 @@ var external = require('external'); -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -20,5 +19,5 @@ function _interopNamespace(e) { return Object.freeze(n); } -(function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(t)); }); })(external.join('a', 'b')); +(function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require(t)); }); })(external.join('a', 'b')); console.log(external.join); diff --git a/test/form/samples/import-external-namespace-and-default/_expected/amd.js b/test/form/samples/import-external-namespace-and-default/_expected/amd.js index 2703b9ba535..61835687399 100644 --- a/test/form/samples/import-external-namespace-and-default/_expected/amd.js +++ b/test/form/samples/import-external-namespace-and-default/_expected/amd.js @@ -1,9 +1,6 @@ define(['foo'], (function (foo) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -20,11 +17,10 @@ define(['foo'], (function (foo) { 'use strict'; return Object.freeze(n); } - var foo__namespace = /*#__PURE__*/_interopNamespace(foo); - var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); + var foo__namespace = /*#__PURE__*/_interopNamespaceDefault(foo); console.log( foo__namespace.bar ); - console.log( foo__default.default ); + console.log( foo ); })); diff --git a/test/form/samples/import-external-namespace-and-default/_expected/cjs.js b/test/form/samples/import-external-namespace-and-default/_expected/cjs.js index b392641f76a..a87e8e98b7d 100644 --- a/test/form/samples/import-external-namespace-and-default/_expected/cjs.js +++ b/test/form/samples/import-external-namespace-and-default/_expected/cjs.js @@ -2,10 +2,7 @@ var foo = require('foo'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -22,9 +19,8 @@ function _interopNamespace(e) { return Object.freeze(n); } -var foo__namespace = /*#__PURE__*/_interopNamespace(foo); -var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); +var foo__namespace = /*#__PURE__*/_interopNamespaceDefault(foo); console.log( foo__namespace.bar ); -console.log( foo__default.default ); +console.log( foo ); diff --git a/test/form/samples/import-external-namespace-and-default/_expected/iife.js b/test/form/samples/import-external-namespace-and-default/_expected/iife.js index 37ba63c7508..c8b2179cde3 100644 --- a/test/form/samples/import-external-namespace-and-default/_expected/iife.js +++ b/test/form/samples/import-external-namespace-and-default/_expected/iife.js @@ -1,10 +1,7 @@ (function (foo) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -21,11 +18,10 @@ return Object.freeze(n); } - var foo__namespace = /*#__PURE__*/_interopNamespace(foo); - var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); + var foo__namespace = /*#__PURE__*/_interopNamespaceDefault(foo); console.log( foo__namespace.bar ); - console.log( foo__default.default ); + console.log( foo ); })(foo); diff --git a/test/form/samples/import-external-namespace-and-default/_expected/umd.js b/test/form/samples/import-external-namespace-and-default/_expected/umd.js index 23b32c37e50..16e31de8fd9 100644 --- a/test/form/samples/import-external-namespace-and-default/_expected/umd.js +++ b/test/form/samples/import-external-namespace-and-default/_expected/umd.js @@ -4,10 +4,7 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.foo)); })(this, (function (foo) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -24,11 +21,10 @@ return Object.freeze(n); } - var foo__namespace = /*#__PURE__*/_interopNamespace(foo); - var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); + var foo__namespace = /*#__PURE__*/_interopNamespaceDefault(foo); console.log( foo__namespace.bar ); - console.log( foo__default.default ); + console.log( foo ); })); diff --git a/test/form/samples/import-namespace/_expected/amd.js b/test/form/samples/import-namespace/_expected/amd.js index 61e955f5b41..4ca4e92e3e2 100644 --- a/test/form/samples/import-namespace/_expected/amd.js +++ b/test/form/samples/import-namespace/_expected/amd.js @@ -1,7 +1,6 @@ define(['foo', 'bar'], (function (foo, bar) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -18,8 +17,8 @@ define(['foo', 'bar'], (function (foo, bar) { 'use strict'; return Object.freeze(n); } - var foo__namespace = /*#__PURE__*/_interopNamespace(foo); - var bar__namespace = /*#__PURE__*/_interopNamespace(bar); + var foo__namespace = /*#__PURE__*/_interopNamespaceDefault(foo); + var bar__namespace = /*#__PURE__*/_interopNamespaceDefault(bar); foo__namespace.x(); console.log(bar__namespace); diff --git a/test/form/samples/import-namespace/_expected/cjs.js b/test/form/samples/import-namespace/_expected/cjs.js index df05a8c94e7..fc036591852 100644 --- a/test/form/samples/import-namespace/_expected/cjs.js +++ b/test/form/samples/import-namespace/_expected/cjs.js @@ -3,8 +3,7 @@ var foo = require('foo'); var bar = require('bar'); -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -21,8 +20,8 @@ function _interopNamespace(e) { return Object.freeze(n); } -var foo__namespace = /*#__PURE__*/_interopNamespace(foo); -var bar__namespace = /*#__PURE__*/_interopNamespace(bar); +var foo__namespace = /*#__PURE__*/_interopNamespaceDefault(foo); +var bar__namespace = /*#__PURE__*/_interopNamespaceDefault(bar); foo__namespace.x(); console.log(bar__namespace); diff --git a/test/form/samples/import-namespace/_expected/iife.js b/test/form/samples/import-namespace/_expected/iife.js index a715dc986d1..e1c6cd61b7e 100644 --- a/test/form/samples/import-namespace/_expected/iife.js +++ b/test/form/samples/import-namespace/_expected/iife.js @@ -1,8 +1,7 @@ (function (foo, bar) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -19,8 +18,8 @@ return Object.freeze(n); } - var foo__namespace = /*#__PURE__*/_interopNamespace(foo); - var bar__namespace = /*#__PURE__*/_interopNamespace(bar); + var foo__namespace = /*#__PURE__*/_interopNamespaceDefault(foo); + var bar__namespace = /*#__PURE__*/_interopNamespaceDefault(bar); foo__namespace.x(); console.log(bar__namespace); diff --git a/test/form/samples/import-namespace/_expected/umd.js b/test/form/samples/import-namespace/_expected/umd.js index 4ede307ad43..cf37bab5994 100644 --- a/test/form/samples/import-namespace/_expected/umd.js +++ b/test/form/samples/import-namespace/_expected/umd.js @@ -4,8 +4,7 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.foo, global.bar)); })(this, (function (foo, bar) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -22,8 +21,8 @@ return Object.freeze(n); } - var foo__namespace = /*#__PURE__*/_interopNamespace(foo); - var bar__namespace = /*#__PURE__*/_interopNamespace(bar); + var foo__namespace = /*#__PURE__*/_interopNamespaceDefault(foo); + var bar__namespace = /*#__PURE__*/_interopNamespaceDefault(bar); foo__namespace.x(); console.log(bar__namespace); diff --git a/test/form/samples/interop-per-reexported-dependency/_expected/amd.js b/test/form/samples/interop-per-reexported-dependency/_expected/amd.js index e8eb900c887..51d0d3b00fc 100644 --- a/test/form/samples/interop-per-reexported-dependency/_expected/amd.js +++ b/test/form/samples/interop-per-reexported-dependency/_expected/amd.js @@ -50,6 +50,4 @@ define(['exports', 'external-auto', 'external-default', 'external-defaultOnly', get: function () { return externalEsModule.default; } }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/interop-per-reexported-dependency/_expected/cjs.js b/test/form/samples/interop-per-reexported-dependency/_expected/cjs.js index d515000f136..7c6ceb7ab79 100644 --- a/test/form/samples/interop-per-reexported-dependency/_expected/cjs.js +++ b/test/form/samples/interop-per-reexported-dependency/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var externalAuto = require('external-auto'); var externalDefault = require('external-default'); var externalDefaultOnly = require('external-defaultOnly'); diff --git a/test/form/samples/interop-per-reexported-dependency/_expected/iife.js b/test/form/samples/interop-per-reexported-dependency/_expected/iife.js index 4d8a103d757..13ae54405de 100644 --- a/test/form/samples/interop-per-reexported-dependency/_expected/iife.js +++ b/test/form/samples/interop-per-reexported-dependency/_expected/iife.js @@ -51,8 +51,6 @@ var bundle = (function (exports, externalAuto, externalDefault, externalDefaultO get: function () { return externalEsModule.default; } }); - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}, externalauto, externaldefault, externaldefaultOnly, externalesModule); diff --git a/test/form/samples/interop-per-reexported-dependency/_expected/umd.js b/test/form/samples/interop-per-reexported-dependency/_expected/umd.js index 33b723de6a0..e2a2294a9f7 100644 --- a/test/form/samples/interop-per-reexported-dependency/_expected/umd.js +++ b/test/form/samples/interop-per-reexported-dependency/_expected/umd.js @@ -54,6 +54,4 @@ get: function () { return externalEsModule.default; } }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/intro-and-outro/_expected/amd.js b/test/form/samples/intro-and-outro/_expected/amd.js index 548789f255c..9b87d2fb7fe 100644 --- a/test/form/samples/intro-and-outro/_expected/amd.js +++ b/test/form/samples/intro-and-outro/_expected/amd.js @@ -10,11 +10,7 @@ define(['external'], (function (a) { 'use strict'; // intro 4 - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var a__default = /*#__PURE__*/_interopDefaultLegacy(a); - - console.log( a__default.default ); + console.log( a ); console.log( a.b ); var main = 42; diff --git a/test/form/samples/intro-and-outro/_expected/cjs.js b/test/form/samples/intro-and-outro/_expected/cjs.js index ff2672e3c92..fbad540caf3 100644 --- a/test/form/samples/intro-and-outro/_expected/cjs.js +++ b/test/form/samples/intro-and-outro/_expected/cjs.js @@ -12,11 +12,7 @@ var a = require('external'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -var a__default = /*#__PURE__*/_interopDefaultLegacy(a); - -console.log( a__default.default ); +console.log( a ); console.log( a.b ); var main = 42; diff --git a/test/form/samples/intro-and-outro/_expected/iife.js b/test/form/samples/intro-and-outro/_expected/iife.js index 3be40368b99..aca33e2f112 100644 --- a/test/form/samples/intro-and-outro/_expected/iife.js +++ b/test/form/samples/intro-and-outro/_expected/iife.js @@ -11,11 +11,7 @@ var foo = (function (a) { // intro 4 - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var a__default = /*#__PURE__*/_interopDefaultLegacy(a); - - console.log( a__default.default ); + console.log( a ); console.log( a.b ); var main = 42; diff --git a/test/form/samples/intro-and-outro/_expected/umd.js b/test/form/samples/intro-and-outro/_expected/umd.js index 75485b207cc..6aec22600e3 100644 --- a/test/form/samples/intro-and-outro/_expected/umd.js +++ b/test/form/samples/intro-and-outro/_expected/umd.js @@ -14,11 +14,7 @@ // intro 4 - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var a__default = /*#__PURE__*/_interopDefaultLegacy(a); - - console.log( a__default.default ); + console.log( a ); console.log( a.b ); var main = 42; diff --git a/test/form/samples/logical-expression/mutate-logical-expression/_expected/amd.js b/test/form/samples/logical-expression/mutate-logical-expression/_expected/amd.js index a25f0ef6211..5b474e013d4 100644 --- a/test/form/samples/logical-expression/mutate-logical-expression/_expected/amd.js +++ b/test/form/samples/logical-expression/mutate-logical-expression/_expected/amd.js @@ -16,6 +16,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.bExp = bExp; exports.cExp = cExp; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/logical-expression/mutate-logical-expression/_expected/cjs.js b/test/form/samples/logical-expression/mutate-logical-expression/_expected/cjs.js index cb639a91a09..2a72123b962 100644 --- a/test/form/samples/logical-expression/mutate-logical-expression/_expected/cjs.js +++ b/test/form/samples/logical-expression/mutate-logical-expression/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var aExp = {}; var logicalAExp = aExp || {}; logicalAExp.bar = 1; diff --git a/test/form/samples/logical-expression/mutate-logical-expression/_expected/iife.js b/test/form/samples/logical-expression/mutate-logical-expression/_expected/iife.js index 863d7482562..7dcdf795cbf 100644 --- a/test/form/samples/logical-expression/mutate-logical-expression/_expected/iife.js +++ b/test/form/samples/logical-expression/mutate-logical-expression/_expected/iife.js @@ -17,8 +17,6 @@ var bundle = (function (exports) { exports.bExp = bExp; exports.cExp = cExp; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/logical-expression/mutate-logical-expression/_expected/umd.js b/test/form/samples/logical-expression/mutate-logical-expression/_expected/umd.js index 74e5e61bca4..f14730028f0 100644 --- a/test/form/samples/logical-expression/mutate-logical-expression/_expected/umd.js +++ b/test/form/samples/logical-expression/mutate-logical-expression/_expected/umd.js @@ -20,6 +20,4 @@ exports.bExp = bExp; exports.cExp = cExp; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/mjs/_expected/amd.js b/test/form/samples/mjs/_expected/amd.js index d8e615c3994..387e4aaf6c2 100644 --- a/test/form/samples/mjs/_expected/amd.js +++ b/test/form/samples/mjs/_expected/amd.js @@ -7,6 +7,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.depJs = dep$1; exports.depMjs = dep; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/mjs/_expected/cjs.js b/test/form/samples/mjs/_expected/cjs.js index e4cae3624e3..50133a96f36 100644 --- a/test/form/samples/mjs/_expected/cjs.js +++ b/test/form/samples/mjs/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var dep$1 = 'js'; var dep = 'mjs'; diff --git a/test/form/samples/mjs/_expected/iife.js b/test/form/samples/mjs/_expected/iife.js index 745dcc22103..f6988777ecd 100644 --- a/test/form/samples/mjs/_expected/iife.js +++ b/test/form/samples/mjs/_expected/iife.js @@ -8,8 +8,6 @@ var myBundle = (function (exports) { exports.depJs = dep$1; exports.depMjs = dep; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/mjs/_expected/umd.js b/test/form/samples/mjs/_expected/umd.js index 4a8cae15efa..1fcc3857b96 100644 --- a/test/form/samples/mjs/_expected/umd.js +++ b/test/form/samples/mjs/_expected/umd.js @@ -11,6 +11,4 @@ exports.depJs = dep$1; exports.depMjs = dep; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/module-name-scoped-package/_expected/amd.js b/test/form/samples/module-name-scoped-package/_expected/amd.js index 0e083577469..30fcfbbe3fd 100644 --- a/test/form/samples/module-name-scoped-package/_expected/amd.js +++ b/test/form/samples/module-name-scoped-package/_expected/amd.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.foo = foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/module-name-scoped-package/_expected/cjs.js b/test/form/samples/module-name-scoped-package/_expected/cjs.js index 796e3ef7f16..0814d99690d 100644 --- a/test/form/samples/module-name-scoped-package/_expected/cjs.js +++ b/test/form/samples/module-name-scoped-package/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - let foo = 'foo'; exports.foo = foo; diff --git a/test/form/samples/module-name-scoped-package/_expected/iife.js b/test/form/samples/module-name-scoped-package/_expected/iife.js index b607a7a4859..6568d188a8b 100644 --- a/test/form/samples/module-name-scoped-package/_expected/iife.js +++ b/test/form/samples/module-name-scoped-package/_expected/iife.js @@ -5,6 +5,4 @@ exports.foo = foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })(this["@scoped/npm-package"] = this["@scoped/npm-package"] || {}); diff --git a/test/form/samples/module-name-scoped-package/_expected/umd.js b/test/form/samples/module-name-scoped-package/_expected/umd.js index d6011624a7d..9fd7f3b9c0e 100644 --- a/test/form/samples/module-name-scoped-package/_expected/umd.js +++ b/test/form/samples/module-name-scoped-package/_expected/umd.js @@ -8,6 +8,4 @@ exports.foo = foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/module-name-wat/_expected/amd.js b/test/form/samples/module-name-wat/_expected/amd.js index 0e083577469..30fcfbbe3fd 100644 --- a/test/form/samples/module-name-wat/_expected/amd.js +++ b/test/form/samples/module-name-wat/_expected/amd.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.foo = foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/module-name-wat/_expected/cjs.js b/test/form/samples/module-name-wat/_expected/cjs.js index 796e3ef7f16..0814d99690d 100644 --- a/test/form/samples/module-name-wat/_expected/cjs.js +++ b/test/form/samples/module-name-wat/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - let foo = 'foo'; exports.foo = foo; diff --git a/test/form/samples/module-name-wat/_expected/iife.js b/test/form/samples/module-name-wat/_expected/iife.js index 14410de5ed2..999bbce831e 100644 --- a/test/form/samples/module-name-wat/_expected/iife.js +++ b/test/form/samples/module-name-wat/_expected/iife.js @@ -8,8 +8,6 @@ this.foo["@scoped/npm-package"].bar["why-would-you-do-this"] = (function (export exports.foo = foo; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/module-name-wat/_expected/umd.js b/test/form/samples/module-name-wat/_expected/umd.js index 91ab706544b..87d8fb89915 100644 --- a/test/form/samples/module-name-wat/_expected/umd.js +++ b/test/form/samples/module-name-wat/_expected/umd.js @@ -8,6 +8,4 @@ exports.foo = foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/module-name-with-dashes/_expected/amd.js b/test/form/samples/module-name-with-dashes/_expected/amd.js index 0e083577469..30fcfbbe3fd 100644 --- a/test/form/samples/module-name-with-dashes/_expected/amd.js +++ b/test/form/samples/module-name-with-dashes/_expected/amd.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.foo = foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/module-name-with-dashes/_expected/cjs.js b/test/form/samples/module-name-with-dashes/_expected/cjs.js index 796e3ef7f16..0814d99690d 100644 --- a/test/form/samples/module-name-with-dashes/_expected/cjs.js +++ b/test/form/samples/module-name-with-dashes/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - let foo = 'foo'; exports.foo = foo; diff --git a/test/form/samples/module-name-with-dashes/_expected/iife.js b/test/form/samples/module-name-with-dashes/_expected/iife.js index 2a1351bea45..2576c4735ca 100644 --- a/test/form/samples/module-name-with-dashes/_expected/iife.js +++ b/test/form/samples/module-name-with-dashes/_expected/iife.js @@ -5,6 +5,4 @@ exports.foo = foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })(this["module-name-with-dashes"] = this["module-name-with-dashes"] || {}); diff --git a/test/form/samples/module-name-with-dashes/_expected/umd.js b/test/form/samples/module-name-with-dashes/_expected/umd.js index 515aa3ee6ed..be8d785c33b 100644 --- a/test/form/samples/module-name-with-dashes/_expected/umd.js +++ b/test/form/samples/module-name-with-dashes/_expected/umd.js @@ -8,6 +8,4 @@ exports.foo = foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/multiple-exports/_expected/amd.js b/test/form/samples/multiple-exports/_expected/amd.js index 66f40f43b4e..fb736e6346e 100644 --- a/test/form/samples/multiple-exports/_expected/amd.js +++ b/test/form/samples/multiple-exports/_expected/amd.js @@ -6,6 +6,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.bar = bar; exports.foo = foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/multiple-exports/_expected/cjs.js b/test/form/samples/multiple-exports/_expected/cjs.js index 20d23e9d884..1301b1283b9 100644 --- a/test/form/samples/multiple-exports/_expected/cjs.js +++ b/test/form/samples/multiple-exports/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var foo = 1; var bar = 2; diff --git a/test/form/samples/multiple-exports/_expected/iife.js b/test/form/samples/multiple-exports/_expected/iife.js index 7fb67aefa87..2ad00847523 100644 --- a/test/form/samples/multiple-exports/_expected/iife.js +++ b/test/form/samples/multiple-exports/_expected/iife.js @@ -7,8 +7,6 @@ var myBundle = (function (exports) { exports.bar = bar; exports.foo = foo; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/multiple-exports/_expected/umd.js b/test/form/samples/multiple-exports/_expected/umd.js index 0edff421aca..4f557b3813b 100644 --- a/test/form/samples/multiple-exports/_expected/umd.js +++ b/test/form/samples/multiple-exports/_expected/umd.js @@ -10,6 +10,4 @@ exports.bar = bar; exports.foo = foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/namespace-import-reexport-2/_expected/amd.js b/test/form/samples/namespace-import-reexport-2/_expected/amd.js index 79c684faa8d..3b1389908c4 100644 --- a/test/form/samples/namespace-import-reexport-2/_expected/amd.js +++ b/test/form/samples/namespace-import-reexport-2/_expected/amd.js @@ -1,7 +1,6 @@ define(['exports', 'external1', 'external2'], (function (exports, external1, external2) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -18,7 +17,7 @@ define(['exports', 'external1', 'external2'], (function (exports, external1, ext return Object.freeze(n); } - var external2__namespace = /*#__PURE__*/_interopNamespace(external2); + var external2__namespace = /*#__PURE__*/_interopNamespaceDefault(external2); @@ -28,6 +27,4 @@ define(['exports', 'external1', 'external2'], (function (exports, external1, ext }); exports.ext = external2__namespace; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/namespace-import-reexport-2/_expected/cjs.js b/test/form/samples/namespace-import-reexport-2/_expected/cjs.js index ffe8f9944fa..d9360a66598 100644 --- a/test/form/samples/namespace-import-reexport-2/_expected/cjs.js +++ b/test/form/samples/namespace-import-reexport-2/_expected/cjs.js @@ -1,12 +1,9 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var external1 = require('external1'); var external2 = require('external2'); -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -23,7 +20,7 @@ function _interopNamespace(e) { return Object.freeze(n); } -var external2__namespace = /*#__PURE__*/_interopNamespace(external2); +var external2__namespace = /*#__PURE__*/_interopNamespaceDefault(external2); diff --git a/test/form/samples/namespace-import-reexport-2/_expected/iife.js b/test/form/samples/namespace-import-reexport-2/_expected/iife.js index 31f1791b236..4d51d2e3c4e 100644 --- a/test/form/samples/namespace-import-reexport-2/_expected/iife.js +++ b/test/form/samples/namespace-import-reexport-2/_expected/iife.js @@ -1,8 +1,7 @@ var iife = (function (exports, external1, external2) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -19,7 +18,7 @@ var iife = (function (exports, external1, external2) { return Object.freeze(n); } - var external2__namespace = /*#__PURE__*/_interopNamespace(external2); + var external2__namespace = /*#__PURE__*/_interopNamespaceDefault(external2); @@ -29,8 +28,6 @@ var iife = (function (exports, external1, external2) { }); exports.ext = external2__namespace; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}, external1, external2); diff --git a/test/form/samples/namespace-import-reexport-2/_expected/umd.js b/test/form/samples/namespace-import-reexport-2/_expected/umd.js index 8e6295fc176..699e9056791 100644 --- a/test/form/samples/namespace-import-reexport-2/_expected/umd.js +++ b/test/form/samples/namespace-import-reexport-2/_expected/umd.js @@ -4,8 +4,7 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.iife = {}, global.external1, global.external2)); })(this, (function (exports, external1, external2) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -22,7 +21,7 @@ return Object.freeze(n); } - var external2__namespace = /*#__PURE__*/_interopNamespace(external2); + var external2__namespace = /*#__PURE__*/_interopNamespaceDefault(external2); @@ -32,6 +31,4 @@ }); exports.ext = external2__namespace; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/namespace-import-reexport/_expected/amd.js b/test/form/samples/namespace-import-reexport/_expected/amd.js index 27cff5030e9..bef93879c10 100644 --- a/test/form/samples/namespace-import-reexport/_expected/amd.js +++ b/test/form/samples/namespace-import-reexport/_expected/amd.js @@ -1,7 +1,6 @@ define(['exports', 'external-package'], (function (exports, externalPackage) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -18,12 +17,10 @@ define(['exports', 'external-package'], (function (exports, externalPackage) { ' return Object.freeze(n); } - var externalPackage__namespace = /*#__PURE__*/_interopNamespace(externalPackage); + var externalPackage__namespace = /*#__PURE__*/_interopNamespaceDefault(externalPackage); exports.ext = externalPackage__namespace; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/namespace-import-reexport/_expected/cjs.js b/test/form/samples/namespace-import-reexport/_expected/cjs.js index 8ad9f0bf3f0..019cf183b3b 100644 --- a/test/form/samples/namespace-import-reexport/_expected/cjs.js +++ b/test/form/samples/namespace-import-reexport/_expected/cjs.js @@ -1,11 +1,8 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var externalPackage = require('external-package'); -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -22,7 +19,7 @@ function _interopNamespace(e) { return Object.freeze(n); } -var externalPackage__namespace = /*#__PURE__*/_interopNamespace(externalPackage); +var externalPackage__namespace = /*#__PURE__*/_interopNamespaceDefault(externalPackage); diff --git a/test/form/samples/namespace-import-reexport/_expected/iife.js b/test/form/samples/namespace-import-reexport/_expected/iife.js index 1234882b9b4..ce7e2147e87 100644 --- a/test/form/samples/namespace-import-reexport/_expected/iife.js +++ b/test/form/samples/namespace-import-reexport/_expected/iife.js @@ -1,8 +1,7 @@ var iife = (function (exports, externalPackage) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -19,14 +18,12 @@ var iife = (function (exports, externalPackage) { return Object.freeze(n); } - var externalPackage__namespace = /*#__PURE__*/_interopNamespace(externalPackage); + var externalPackage__namespace = /*#__PURE__*/_interopNamespaceDefault(externalPackage); exports.ext = externalPackage__namespace; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}, externalPackage); diff --git a/test/form/samples/namespace-import-reexport/_expected/umd.js b/test/form/samples/namespace-import-reexport/_expected/umd.js index 656da0111b9..a274c3b5b76 100644 --- a/test/form/samples/namespace-import-reexport/_expected/umd.js +++ b/test/form/samples/namespace-import-reexport/_expected/umd.js @@ -4,8 +4,7 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.iife = {}, global.externalPackage)); })(this, (function (exports, externalPackage) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -22,12 +21,10 @@ return Object.freeze(n); } - var externalPackage__namespace = /*#__PURE__*/_interopNamespace(externalPackage); + var externalPackage__namespace = /*#__PURE__*/_interopNamespaceDefault(externalPackage); exports.ext = externalPackage__namespace; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/namespace-missing-export-effects/_expected.js b/test/form/samples/namespace-missing-export-effects/_expected.js index 8895a217864..d2825d5c2fc 100644 --- a/test/form/samples/namespace-missing-export-effects/_expected.js +++ b/test/form/samples/namespace-missing-export-effects/_expected.js @@ -1,5 +1,5 @@ -if (!undefined) console.log(1); -if (undefined()) console.log(2); +console.log(1); +if (undefined()) ; const foo = undefined; foo.bar; (0, undefined)(); diff --git a/test/form/samples/namespace-reexport-name/_expected/amd.js b/test/form/samples/namespace-reexport-name/_expected/amd.js index f1b3a02f1b3..6634da5cab0 100644 --- a/test/form/samples/namespace-reexport-name/_expected/amd.js +++ b/test/form/samples/namespace-reexport-name/_expected/amd.js @@ -14,6 +14,4 @@ define(['exports', 'external'], (function (exports, external) { 'use strict'; }); }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/namespace-reexport-name/_expected/cjs.js b/test/form/samples/namespace-reexport-name/_expected/cjs.js index d7d1b79238a..89d7b994b7b 100644 --- a/test/form/samples/namespace-reexport-name/_expected/cjs.js +++ b/test/form/samples/namespace-reexport-name/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var external = require('external'); const renamedIndirectOverride = external.indirectOverride; diff --git a/test/form/samples/namespace-reexport-name/_expected/iife.js b/test/form/samples/namespace-reexport-name/_expected/iife.js index 1d4cc35c91a..19a5683d8d2 100644 --- a/test/form/samples/namespace-reexport-name/_expected/iife.js +++ b/test/form/samples/namespace-reexport-name/_expected/iife.js @@ -15,8 +15,6 @@ var bundle = (function (exports, external) { }); }); - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}, external); diff --git a/test/form/samples/namespace-reexport-name/_expected/umd.js b/test/form/samples/namespace-reexport-name/_expected/umd.js index 4fe6c1e6c15..9c182ed1488 100644 --- a/test/form/samples/namespace-reexport-name/_expected/umd.js +++ b/test/form/samples/namespace-reexport-name/_expected/umd.js @@ -18,6 +18,4 @@ }); }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/namespace-self-import/_expected/amd.js b/test/form/samples/namespace-self-import/_expected/amd.js index f0792df1896..7e2de6bb781 100644 --- a/test/form/samples/namespace-self-import/_expected/amd.js +++ b/test/form/samples/namespace-self-import/_expected/amd.js @@ -11,6 +11,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.p = p; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/namespace-self-import/_expected/cjs.js b/test/form/samples/namespace-self-import/_expected/cjs.js index 286ebc2c57a..8ce75a0202c 100644 --- a/test/form/samples/namespace-self-import/_expected/cjs.js +++ b/test/form/samples/namespace-self-import/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var self = /*#__PURE__*/Object.freeze({ __proto__: null, get p () { return p; } diff --git a/test/form/samples/namespace-self-import/_expected/iife.js b/test/form/samples/namespace-self-import/_expected/iife.js index a91d523de39..cbb4aa0c432 100644 --- a/test/form/samples/namespace-self-import/_expected/iife.js +++ b/test/form/samples/namespace-self-import/_expected/iife.js @@ -12,8 +12,6 @@ var iife = (function (exports) { exports.p = p; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/namespace-self-import/_expected/umd.js b/test/form/samples/namespace-self-import/_expected/umd.js index 79df178d711..586f27e7895 100644 --- a/test/form/samples/namespace-self-import/_expected/umd.js +++ b/test/form/samples/namespace-self-import/_expected/umd.js @@ -15,6 +15,4 @@ exports.p = p; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/namespace-tostring/entry-named/_expected/amd.js b/test/form/samples/namespace-tostring/entry-named/_expected/amd.js index a686695eb27..71a562107fa 100644 --- a/test/form/samples/namespace-tostring/entry-named/_expected/amd.js +++ b/test/form/samples/namespace-tostring/entry-named/_expected/amd.js @@ -1,7 +1,9 @@ define(['exports'], (function (exports) { 'use strict'; const foo = 42; + var main = 43; + exports.default = main; exports.foo = foo; Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: 'Module' } }); diff --git a/test/form/samples/namespace-tostring/entry-named/_expected/cjs.js b/test/form/samples/namespace-tostring/entry-named/_expected/cjs.js index 0a7f7b36138..450bed9063f 100644 --- a/test/form/samples/namespace-tostring/entry-named/_expected/cjs.js +++ b/test/form/samples/namespace-tostring/entry-named/_expected/cjs.js @@ -3,5 +3,7 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: 'Module' } }); const foo = 42; +var main = 43; +exports.default = main; exports.foo = foo; diff --git a/test/form/samples/namespace-tostring/entry-named/_expected/es.js b/test/form/samples/namespace-tostring/entry-named/_expected/es.js index b72a22eac84..0c66d6bd04f 100644 --- a/test/form/samples/namespace-tostring/entry-named/_expected/es.js +++ b/test/form/samples/namespace-tostring/entry-named/_expected/es.js @@ -1,3 +1,4 @@ const foo = 42; +var main = 43; -export { foo }; +export { main as default, foo }; diff --git a/test/form/samples/namespace-tostring/entry-named/_expected/iife.js b/test/form/samples/namespace-tostring/entry-named/_expected/iife.js index caef71c5aaa..011a32e5fec 100644 --- a/test/form/samples/namespace-tostring/entry-named/_expected/iife.js +++ b/test/form/samples/namespace-tostring/entry-named/_expected/iife.js @@ -2,7 +2,9 @@ var bundle = (function (exports) { 'use strict'; const foo = 42; + var main = 43; + exports.default = main; exports.foo = foo; Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: 'Module' } }); diff --git a/test/form/samples/namespace-tostring/entry-named/_expected/system.js b/test/form/samples/namespace-tostring/entry-named/_expected/system.js index 53ad1b79c2f..c9a80a4a76c 100644 --- a/test/form/samples/namespace-tostring/entry-named/_expected/system.js +++ b/test/form/samples/namespace-tostring/entry-named/_expected/system.js @@ -4,6 +4,7 @@ System.register('bundle', [], (function (exports) { execute: (function () { const foo = exports('foo', 42); + var main = exports('default', 43); }) }; diff --git a/test/form/samples/namespace-tostring/entry-named/_expected/umd.js b/test/form/samples/namespace-tostring/entry-named/_expected/umd.js index d1b1697e7cd..45a1f7c818c 100644 --- a/test/form/samples/namespace-tostring/entry-named/_expected/umd.js +++ b/test/form/samples/namespace-tostring/entry-named/_expected/umd.js @@ -5,7 +5,9 @@ })(this, (function (exports) { 'use strict'; const foo = 42; + var main = 43; + exports.default = main; exports.foo = foo; Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: 'Module' } }); diff --git a/test/form/samples/namespace-tostring/entry-named/main.js b/test/form/samples/namespace-tostring/entry-named/main.js index 9d7381d29f6..fb4655c7e32 100644 --- a/test/form/samples/namespace-tostring/entry-named/main.js +++ b/test/form/samples/namespace-tostring/entry-named/main.js @@ -1 +1,2 @@ export const foo = 42; +export default 43; diff --git a/test/form/samples/namespace-tostring/inlined-namespace-static-resolution/_config.js b/test/form/samples/namespace-tostring/inlined-namespace-static-resolution/_config.js new file mode 100644 index 00000000000..afa80193c59 --- /dev/null +++ b/test/form/samples/namespace-tostring/inlined-namespace-static-resolution/_config.js @@ -0,0 +1,9 @@ +module.exports = { + description: 'statically resolves Symbol.toStringTag for inlined namespaces', + expectedWarnings: ['MISSING_EXPORT'], + options: { + output: { + generatedCode: { symbols: true } + } + } +}; diff --git a/test/form/samples/namespace-tostring/inlined-namespace-static-resolution/_expected.js b/test/form/samples/namespace-tostring/inlined-namespace-static-resolution/_expected.js new file mode 100644 index 00000000000..91824e2b5ac --- /dev/null +++ b/test/form/samples/namespace-tostring/inlined-namespace-static-resolution/_expected.js @@ -0,0 +1,5 @@ +console.log('OK'); + +console.log('OK'); + +console.log('OK'); diff --git a/test/form/samples/namespace-tostring/inlined-namespace-static-resolution/foo.js b/test/form/samples/namespace-tostring/inlined-namespace-static-resolution/foo.js new file mode 100644 index 00000000000..308e102fe9a --- /dev/null +++ b/test/form/samples/namespace-tostring/inlined-namespace-static-resolution/foo.js @@ -0,0 +1 @@ +export const bar = 42; diff --git a/test/form/samples/namespace-tostring/inlined-namespace-static-resolution/main.js b/test/form/samples/namespace-tostring/inlined-namespace-static-resolution/main.js new file mode 100644 index 00000000000..0e4f8743818 --- /dev/null +++ b/test/form/samples/namespace-tostring/inlined-namespace-static-resolution/main.js @@ -0,0 +1,10 @@ +import * as foo from './foo'; + +if (foo[Symbol.toStringTag]) console.log('OK'); +else console.log('FAIL'); + +if (foo.bar) console.log('OK'); +else console.log('FAIL'); + +if (foo.foo) console.log('FAIL'); +else console.log('OK'); diff --git a/test/form/samples/namespaced-named-exports/_expected/amd.js b/test/form/samples/namespaced-named-exports/_expected/amd.js index 824f7df5d11..17e9e504d62 100644 --- a/test/form/samples/namespaced-named-exports/_expected/amd.js +++ b/test/form/samples/namespaced-named-exports/_expected/amd.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.answer = answer; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/namespaced-named-exports/_expected/cjs.js b/test/form/samples/namespaced-named-exports/_expected/cjs.js index f58e06dbe20..9ac4d858bc4 100644 --- a/test/form/samples/namespaced-named-exports/_expected/cjs.js +++ b/test/form/samples/namespaced-named-exports/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var answer = 42; exports.answer = answer; diff --git a/test/form/samples/namespaced-named-exports/_expected/iife.js b/test/form/samples/namespaced-named-exports/_expected/iife.js index 1853388f6d9..6863e4b811f 100644 --- a/test/form/samples/namespaced-named-exports/_expected/iife.js +++ b/test/form/samples/namespaced-named-exports/_expected/iife.js @@ -7,8 +7,6 @@ this.foo.bar.baz = (function (exports) { exports.answer = answer; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/namespaced-named-exports/_expected/umd.js b/test/form/samples/namespaced-named-exports/_expected/umd.js index e830109c53c..73df328eaa4 100644 --- a/test/form/samples/namespaced-named-exports/_expected/umd.js +++ b/test/form/samples/namespaced-named-exports/_expected/umd.js @@ -8,6 +8,4 @@ exports.answer = answer; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/namespaces-have-null-prototype/_expected/amd.js b/test/form/samples/namespaces-have-null-prototype/_expected/amd.js index 618e00a3277..7aad5f7cfbf 100644 --- a/test/form/samples/namespaces-have-null-prototype/_expected/amd.js +++ b/test/form/samples/namespaces-have-null-prototype/_expected/amd.js @@ -17,6 +17,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.a = a; exports.b = b; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/namespaces-have-null-prototype/_expected/cjs.js b/test/form/samples/namespaces-have-null-prototype/_expected/cjs.js index 445e1b89d69..2dba5073811 100644 --- a/test/form/samples/namespaces-have-null-prototype/_expected/cjs.js +++ b/test/form/samples/namespaces-have-null-prototype/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const foo = 1; const bar = 2; diff --git a/test/form/samples/namespaces-have-null-prototype/_expected/iife.js b/test/form/samples/namespaces-have-null-prototype/_expected/iife.js index 9eae062a49f..f6c3a9d8b6e 100644 --- a/test/form/samples/namespaces-have-null-prototype/_expected/iife.js +++ b/test/form/samples/namespaces-have-null-prototype/_expected/iife.js @@ -18,8 +18,6 @@ var myBundle = (function (exports) { exports.a = a; exports.b = b; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/namespaces-have-null-prototype/_expected/umd.js b/test/form/samples/namespaces-have-null-prototype/_expected/umd.js index a2742478ff3..b6da0338171 100644 --- a/test/form/samples/namespaces-have-null-prototype/_expected/umd.js +++ b/test/form/samples/namespaces-have-null-prototype/_expected/umd.js @@ -21,6 +21,4 @@ exports.a = a; exports.b = b; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/no-external-live-bindings-compact/_expected/amd.js b/test/form/samples/no-external-live-bindings-compact/_expected/amd.js index 901bd3c2d02..2c3116ec8c0 100644 --- a/test/form/samples/no-external-live-bindings-compact/_expected/amd.js +++ b/test/form/samples/no-external-live-bindings-compact/_expected/amd.js @@ -1 +1 @@ -define(['require','exports','external1','external2'],(function(require,exports,external1,external2){'use strict';function _interopNamespace(e){if(e&&e.__esModule)return e;var n=Object.create(null);if(e){for(var k in e){n[k]=e[k];}}n.default=e;return Object.freeze(n)}const dynamic = new Promise(function(c,e){require(['external3'],function(m){c(/*#__PURE__*/_interopNamespace(m))},e)});exports.external1=external1.external1;exports.dynamic=dynamic;for(var k in external2){if(k!=='default'&&!exports.hasOwnProperty(k))exports[k]=external2[k]}Object.defineProperty(exports,'__esModule',{value:true});})); \ No newline at end of file +define(['require','exports','external1','external2'],(function(require,exports,external1,external2){'use strict';function _interopNamespaceDefault(e){var n=Object.create(null);if(e){for(var k in e){n[k]=e[k];}}n.default=e;return Object.freeze(n)}const dynamic = new Promise(function(c,e){require(['external3'],function(m){c(/*#__PURE__*/_interopNamespaceDefault(m))},e)});exports.external1=external1.external1;exports.dynamic=dynamic;for(var k in external2){if(k!=='default'&&!exports.hasOwnProperty(k))exports[k]=external2[k]}})); \ No newline at end of file diff --git a/test/form/samples/no-external-live-bindings-compact/_expected/cjs.js b/test/form/samples/no-external-live-bindings-compact/_expected/cjs.js index cbc1ad31c9a..5916ba0514e 100644 --- a/test/form/samples/no-external-live-bindings-compact/_expected/cjs.js +++ b/test/form/samples/no-external-live-bindings-compact/_expected/cjs.js @@ -1 +1 @@ -'use strict';Object.defineProperty(exports,'__esModule',{value:true});var external1=require('external1'),external2=require('external2');function _interopNamespace(e){if(e&&e.__esModule)return e;var n=Object.create(null);if(e){for(var k in e){n[k]=e[k];}}n.default=e;return Object.freeze(n)}const dynamic = Promise.resolve().then(function(){return /*#__PURE__*/_interopNamespace(require('external3'))});exports.external1=external1.external1;exports.dynamic=dynamic;for(var k in external2){if(k!=='default'&&!exports.hasOwnProperty(k))exports[k]=external2[k]} \ No newline at end of file +'use strict';var external1=require('external1'),external2=require('external2');function _interopNamespaceDefault(e){var n=Object.create(null);if(e){for(var k in e){n[k]=e[k];}}n.default=e;return Object.freeze(n)}const dynamic = Promise.resolve().then(function(){return /*#__PURE__*/_interopNamespaceDefault(require('external3'))});exports.external1=external1.external1;exports.dynamic=dynamic;for(var k in external2){if(k!=='default'&&!exports.hasOwnProperty(k))exports[k]=external2[k]} \ No newline at end of file diff --git a/test/form/samples/no-external-live-bindings-compact/_expected/iife.js b/test/form/samples/no-external-live-bindings-compact/_expected/iife.js index 06fd0501b80..44af1471935 100644 --- a/test/form/samples/no-external-live-bindings-compact/_expected/iife.js +++ b/test/form/samples/no-external-live-bindings-compact/_expected/iife.js @@ -1 +1 @@ -var bundle=(function(exports,external1,external2){'use strict';const dynamic = import('external3');exports.external1=external1.external1;exports.dynamic=dynamic;for(var k in external2){if(k!=='default'&&!exports.hasOwnProperty(k))exports[k]=external2[k]}Object.defineProperty(exports,'__esModule',{value:true});return exports;})({},external1,external2); \ No newline at end of file +var bundle=(function(exports,external1,external2){'use strict';const dynamic = import('external3');exports.external1=external1.external1;exports.dynamic=dynamic;for(var k in external2){if(k!=='default'&&!exports.hasOwnProperty(k))exports[k]=external2[k]}return exports;})({},external1,external2); \ No newline at end of file diff --git a/test/form/samples/no-external-live-bindings-compact/_expected/umd.js b/test/form/samples/no-external-live-bindings-compact/_expected/umd.js index 376cb159b91..267786fd17d 100644 --- a/test/form/samples/no-external-live-bindings-compact/_expected/umd.js +++ b/test/form/samples/no-external-live-bindings-compact/_expected/umd.js @@ -1 +1 @@ -(function(g,f){typeof exports==='object'&&typeof module!=='undefined'?f(exports,require('external1'),require('external2')):typeof define==='function'&&define.amd?define(['exports','external1','external2'],f):(g=typeof globalThis!=='undefined'?globalThis:g||self,f(g.bundle={},g.external1,g.external2));})(this,(function(exports,external1,external2){'use strict';const dynamic = import('external3');exports.external1=external1.external1;exports.dynamic=dynamic;for(var k in external2){if(k!=='default'&&!exports.hasOwnProperty(k))exports[k]=external2[k]}Object.defineProperty(exports,'__esModule',{value:true});})); \ No newline at end of file +(function(g,f){typeof exports==='object'&&typeof module!=='undefined'?f(exports,require('external1'),require('external2')):typeof define==='function'&&define.amd?define(['exports','external1','external2'],f):(g=typeof globalThis!=='undefined'?globalThis:g||self,f(g.bundle={},g.external1,g.external2));})(this,(function(exports,external1,external2){'use strict';const dynamic = import('external3');exports.external1=external1.external1;exports.dynamic=dynamic;for(var k in external2){if(k!=='default'&&!exports.hasOwnProperty(k))exports[k]=external2[k]}})); \ No newline at end of file diff --git a/test/form/samples/no-external-live-bindings/_expected/amd.js b/test/form/samples/no-external-live-bindings/_expected/amd.js index 95c816b2a75..46fe8d1c810 100644 --- a/test/form/samples/no-external-live-bindings/_expected/amd.js +++ b/test/form/samples/no-external-live-bindings/_expected/amd.js @@ -1,7 +1,6 @@ define(['require', 'exports', 'external1', 'external2'], (function (require, exports, external1, external2) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { for (var k in e) { @@ -12,7 +11,7 @@ define(['require', 'exports', 'external1', 'external2'], (function (require, exp return Object.freeze(n); } - const dynamic = new Promise(function (resolve, reject) { require(['external3'], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }); + const dynamic = new Promise(function (resolve, reject) { require(['external3'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); exports.external1 = external1.external1; exports.dynamic = dynamic; @@ -20,6 +19,4 @@ define(['require', 'exports', 'external1', 'external2'], (function (require, exp if (k !== 'default' && !exports.hasOwnProperty(k)) exports[k] = external2[k]; } - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/no-external-live-bindings/_expected/cjs.js b/test/form/samples/no-external-live-bindings/_expected/cjs.js index f116aa53894..0303fbd1d56 100644 --- a/test/form/samples/no-external-live-bindings/_expected/cjs.js +++ b/test/form/samples/no-external-live-bindings/_expected/cjs.js @@ -1,12 +1,9 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var external1 = require('external1'); var external2 = require('external2'); -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { for (var k in e) { @@ -17,7 +14,7 @@ function _interopNamespace(e) { return Object.freeze(n); } -const dynamic = Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('external3')); }); +const dynamic = Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('external3')); }); exports.external1 = external1.external1; exports.dynamic = dynamic; diff --git a/test/form/samples/no-external-live-bindings/_expected/iife.js b/test/form/samples/no-external-live-bindings/_expected/iife.js index 5bee7f640b5..06927fa4cdd 100644 --- a/test/form/samples/no-external-live-bindings/_expected/iife.js +++ b/test/form/samples/no-external-live-bindings/_expected/iife.js @@ -9,8 +9,6 @@ var bundle = (function (exports, external1, external2) { if (k !== 'default' && !exports.hasOwnProperty(k)) exports[k] = external2[k]; } - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}, external1, external2); diff --git a/test/form/samples/no-external-live-bindings/_expected/umd.js b/test/form/samples/no-external-live-bindings/_expected/umd.js index 5ce46e0ec54..1186ec6c76a 100644 --- a/test/form/samples/no-external-live-bindings/_expected/umd.js +++ b/test/form/samples/no-external-live-bindings/_expected/umd.js @@ -12,6 +12,4 @@ if (k !== 'default' && !exports.hasOwnProperty(k)) exports[k] = external2[k]; } - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/ns-external-star-reexport/_expected/amd.js b/test/form/samples/ns-external-star-reexport/_expected/amd.js index 3cc56437cc0..8eb9be8902f 100644 --- a/test/form/samples/ns-external-star-reexport/_expected/amd.js +++ b/test/form/samples/ns-external-star-reexport/_expected/amd.js @@ -1,7 +1,6 @@ define(['exports', 'external1', 'external2'], (function (exports, external1, external2) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -33,8 +32,8 @@ define(['exports', 'external1', 'external2'], (function (exports, external1, ext return Object.freeze(n); } - var external1__namespace = /*#__PURE__*/_interopNamespace(external1); - var external2__namespace = /*#__PURE__*/_interopNamespace(external2); + var external1__namespace = /*#__PURE__*/_interopNamespaceDefault(external1); + var external2__namespace = /*#__PURE__*/_interopNamespaceDefault(external2); var reexportExternal = /*#__PURE__*/_mergeNamespaces({ __proto__: null @@ -55,6 +54,4 @@ define(['exports', 'external1', 'external2'], (function (exports, external1, ext exports.external = reexportExternal; exports.externalOverride = reexportExternalsWithOverride$1; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/ns-external-star-reexport/_expected/cjs.js b/test/form/samples/ns-external-star-reexport/_expected/cjs.js index 18ae7a4217f..1991adf9634 100644 --- a/test/form/samples/ns-external-star-reexport/_expected/cjs.js +++ b/test/form/samples/ns-external-star-reexport/_expected/cjs.js @@ -1,12 +1,9 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var external1 = require('external1'); var external2 = require('external2'); -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -38,8 +35,8 @@ function _mergeNamespaces(n, m) { return Object.freeze(n); } -var external1__namespace = /*#__PURE__*/_interopNamespace(external1); -var external2__namespace = /*#__PURE__*/_interopNamespace(external2); +var external1__namespace = /*#__PURE__*/_interopNamespaceDefault(external1); +var external2__namespace = /*#__PURE__*/_interopNamespaceDefault(external2); var reexportExternal = /*#__PURE__*/_mergeNamespaces({ __proto__: null diff --git a/test/form/samples/ns-external-star-reexport/_expected/iife.js b/test/form/samples/ns-external-star-reexport/_expected/iife.js index 8c03f6c64b6..0ed10a3c0bb 100644 --- a/test/form/samples/ns-external-star-reexport/_expected/iife.js +++ b/test/form/samples/ns-external-star-reexport/_expected/iife.js @@ -1,8 +1,7 @@ var bundle = (function (exports, external1, external2) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -34,8 +33,8 @@ var bundle = (function (exports, external1, external2) { return Object.freeze(n); } - var external1__namespace = /*#__PURE__*/_interopNamespace(external1); - var external2__namespace = /*#__PURE__*/_interopNamespace(external2); + var external1__namespace = /*#__PURE__*/_interopNamespaceDefault(external1); + var external2__namespace = /*#__PURE__*/_interopNamespaceDefault(external2); var reexportExternal = /*#__PURE__*/_mergeNamespaces({ __proto__: null @@ -56,8 +55,6 @@ var bundle = (function (exports, external1, external2) { exports.external = reexportExternal; exports.externalOverride = reexportExternalsWithOverride$1; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}, external1, external2); diff --git a/test/form/samples/ns-external-star-reexport/_expected/umd.js b/test/form/samples/ns-external-star-reexport/_expected/umd.js index cf0b527b152..d23f8c02a58 100644 --- a/test/form/samples/ns-external-star-reexport/_expected/umd.js +++ b/test/form/samples/ns-external-star-reexport/_expected/umd.js @@ -4,8 +4,7 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.bundle = {}, global.external1, global.external2)); })(this, (function (exports, external1, external2) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -37,8 +36,8 @@ return Object.freeze(n); } - var external1__namespace = /*#__PURE__*/_interopNamespace(external1); - var external2__namespace = /*#__PURE__*/_interopNamespace(external2); + var external1__namespace = /*#__PURE__*/_interopNamespaceDefault(external1); + var external2__namespace = /*#__PURE__*/_interopNamespaceDefault(external2); var reexportExternal = /*#__PURE__*/_mergeNamespaces({ __proto__: null @@ -59,6 +58,4 @@ exports.external = reexportExternal; exports.externalOverride = reexportExternalsWithOverride$1; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/output-named-library/_expected/amd.js b/test/form/samples/output-named-library/_expected/amd.js index e7a86ac713a..2d2b0559bd8 100644 --- a/test/form/samples/output-named-library/_expected/amd.js +++ b/test/form/samples/output-named-library/_expected/amd.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.valueOnLib = valueOnLib; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/output-named-library/_expected/cjs.js b/test/form/samples/output-named-library/_expected/cjs.js index 9b595a69c87..45a2994456d 100644 --- a/test/form/samples/output-named-library/_expected/cjs.js +++ b/test/form/samples/output-named-library/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const valueOnLib = 42; exports.valueOnLib = valueOnLib; diff --git a/test/form/samples/output-named-library/_expected/iife.js b/test/form/samples/output-named-library/_expected/iife.js index 57d5a9a9094..d1cd25a943f 100644 --- a/test/form/samples/output-named-library/_expected/iife.js +++ b/test/form/samples/output-named-library/_expected/iife.js @@ -5,8 +5,6 @@ var libraryName = (function (exports) { exports.valueOnLib = valueOnLib; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/output-named-library/_expected/umd.js b/test/form/samples/output-named-library/_expected/umd.js index fba8d4bd67e..144735e8bc0 100644 --- a/test/form/samples/output-named-library/_expected/umd.js +++ b/test/form/samples/output-named-library/_expected/umd.js @@ -8,6 +8,4 @@ exports.valueOnLib = valueOnLib; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/override-external-namespace/_expected/amd.js b/test/form/samples/override-external-namespace/_expected/amd.js index fc03dcf6dea..8910f9431c9 100644 --- a/test/form/samples/override-external-namespace/_expected/amd.js +++ b/test/form/samples/override-external-namespace/_expected/amd.js @@ -15,6 +15,4 @@ define(['exports', 'external'], (function (exports, external) { 'use strict'; }); }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/override-external-namespace/_expected/cjs.js b/test/form/samples/override-external-namespace/_expected/cjs.js index 0facc0aac55..1f13331dd05 100644 --- a/test/form/samples/override-external-namespace/_expected/cjs.js +++ b/test/form/samples/override-external-namespace/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var external = require('external'); const a = 'defined'; diff --git a/test/form/samples/override-external-namespace/_expected/iife.js b/test/form/samples/override-external-namespace/_expected/iife.js index d6e095526e8..c571fe44af3 100644 --- a/test/form/samples/override-external-namespace/_expected/iife.js +++ b/test/form/samples/override-external-namespace/_expected/iife.js @@ -16,8 +16,6 @@ var bundle = (function (exports, external) { }); }); - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}, external); diff --git a/test/form/samples/override-external-namespace/_expected/umd.js b/test/form/samples/override-external-namespace/_expected/umd.js index 2b09422a428..3e0f5749b3d 100644 --- a/test/form/samples/override-external-namespace/_expected/umd.js +++ b/test/form/samples/override-external-namespace/_expected/umd.js @@ -19,6 +19,4 @@ }); }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/paths-function/_expected/amd.js b/test/form/samples/paths-function/_expected/amd.js index d86757e3a28..66f042c62a6 100644 --- a/test/form/samples/paths-function/_expected/amd.js +++ b/test/form/samples/paths-function/_expected/amd.js @@ -1,9 +1,6 @@ define(['require', 'https://unpkg.com/foo'], (function (require, foo) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -20,10 +17,8 @@ define(['require', 'https://unpkg.com/foo'], (function (require, foo) { 'use str return Object.freeze(n); } - var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); - - assert.equal(foo__default.default, 42); + assert.equal(foo, 42); - new Promise(function (resolve, reject) { require(['https://unpkg.com/foo'], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }).then(({ default: foo }) => assert.equal(foo, 42)); + new Promise(function (resolve, reject) { require(['https://unpkg.com/foo'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }).then(({ default: foo }) => assert.equal(foo, 42)); })); diff --git a/test/form/samples/paths-function/_expected/cjs.js b/test/form/samples/paths-function/_expected/cjs.js index d85e58b3614..61b8caa4a1b 100644 --- a/test/form/samples/paths-function/_expected/cjs.js +++ b/test/form/samples/paths-function/_expected/cjs.js @@ -2,10 +2,7 @@ var foo = require('https://unpkg.com/foo'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -22,8 +19,6 @@ function _interopNamespace(e) { return Object.freeze(n); } -var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); - -assert.equal(foo__default.default, 42); +assert.equal(foo, 42); -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('https://unpkg.com/foo')); }).then(({ default: foo }) => assert.equal(foo, 42)); +Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('https://unpkg.com/foo')); }).then(({ default: foo }) => assert.equal(foo, 42)); diff --git a/test/form/samples/paths-function/_expected/iife.js b/test/form/samples/paths-function/_expected/iife.js index 1a736358b08..a2f93548c2f 100644 --- a/test/form/samples/paths-function/_expected/iife.js +++ b/test/form/samples/paths-function/_expected/iife.js @@ -1,11 +1,7 @@ (function (foo) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); - - assert.equal(foo__default.default, 42); + assert.equal(foo, 42); import('https://unpkg.com/foo').then(({ default: foo }) => assert.equal(foo, 42)); diff --git a/test/form/samples/paths-function/_expected/umd.js b/test/form/samples/paths-function/_expected/umd.js index d1c2568d1ee..91b7c727d08 100644 --- a/test/form/samples/paths-function/_expected/umd.js +++ b/test/form/samples/paths-function/_expected/umd.js @@ -4,11 +4,7 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.foo)); })(this, (function (foo) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); - - assert.equal(foo__default.default, 42); + assert.equal(foo, 42); import('https://unpkg.com/foo').then(({ default: foo }) => assert.equal(foo, 42)); diff --git a/test/form/samples/paths-relative/_expected/amd.js b/test/form/samples/paths-relative/_expected/amd.js index 3b5d4343c72..08876ce9dff 100644 --- a/test/form/samples/paths-relative/_expected/amd.js +++ b/test/form/samples/paths-relative/_expected/amd.js @@ -1,9 +1,5 @@ define(['../foo'], (function (foo) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); - - assert.equal( foo__default.default, 42 ); + assert.equal( foo, 42 ); })); diff --git a/test/form/samples/paths-relative/_expected/cjs.js b/test/form/samples/paths-relative/_expected/cjs.js index 2640cb3ebd9..4aed31b14ac 100644 --- a/test/form/samples/paths-relative/_expected/cjs.js +++ b/test/form/samples/paths-relative/_expected/cjs.js @@ -2,8 +2,4 @@ var foo = require('../foo'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); - -assert.equal( foo__default.default, 42 ); +assert.equal( foo, 42 ); diff --git a/test/form/samples/paths-relative/_expected/iife.js b/test/form/samples/paths-relative/_expected/iife.js index 729f13791c4..944073903ef 100644 --- a/test/form/samples/paths-relative/_expected/iife.js +++ b/test/form/samples/paths-relative/_expected/iife.js @@ -1,10 +1,6 @@ (function (foo) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); - - assert.equal( foo__default.default, 42 ); + assert.equal( foo, 42 ); })(foo); diff --git a/test/form/samples/paths-relative/_expected/umd.js b/test/form/samples/paths-relative/_expected/umd.js index 3d585ee2dea..1257109fff6 100644 --- a/test/form/samples/paths-relative/_expected/umd.js +++ b/test/form/samples/paths-relative/_expected/umd.js @@ -4,10 +4,6 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.foo)); })(this, (function (foo) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); - - assert.equal( foo__default.default, 42 ); + assert.equal( foo, 42 ); })); diff --git a/test/form/samples/paths/_expected/amd.js b/test/form/samples/paths/_expected/amd.js index 08a7fe93cee..216804bd681 100644 --- a/test/form/samples/paths/_expected/amd.js +++ b/test/form/samples/paths/_expected/amd.js @@ -1,9 +1,5 @@ define(['https://unpkg.com/foo'], (function (foo) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); - - assert.equal( foo__default.default, 42 ); + assert.equal( foo, 42 ); })); diff --git a/test/form/samples/paths/_expected/cjs.js b/test/form/samples/paths/_expected/cjs.js index d49ae246388..225b214b204 100644 --- a/test/form/samples/paths/_expected/cjs.js +++ b/test/form/samples/paths/_expected/cjs.js @@ -2,8 +2,4 @@ var foo = require('https://unpkg.com/foo'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); - -assert.equal( foo__default.default, 42 ); +assert.equal( foo, 42 ); diff --git a/test/form/samples/paths/_expected/iife.js b/test/form/samples/paths/_expected/iife.js index 729f13791c4..944073903ef 100644 --- a/test/form/samples/paths/_expected/iife.js +++ b/test/form/samples/paths/_expected/iife.js @@ -1,10 +1,6 @@ (function (foo) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); - - assert.equal( foo__default.default, 42 ); + assert.equal( foo, 42 ); })(foo); diff --git a/test/form/samples/paths/_expected/umd.js b/test/form/samples/paths/_expected/umd.js index 3a41bd6e83c..163e84dda72 100644 --- a/test/form/samples/paths/_expected/umd.js +++ b/test/form/samples/paths/_expected/umd.js @@ -4,10 +4,6 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.foo)); })(this, (function (foo) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); - - assert.equal( foo__default.default, 42 ); + assert.equal( foo, 42 ); })); diff --git a/test/form/samples/pattern-assignments/_expected/amd.js b/test/form/samples/pattern-assignments/_expected/amd.js index f940a27220d..8ab0b9501c5 100644 --- a/test/form/samples/pattern-assignments/_expected/amd.js +++ b/test/form/samples/pattern-assignments/_expected/amd.js @@ -39,6 +39,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.u = u; exports.v = v; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/pattern-assignments/_expected/cjs.js b/test/form/samples/pattern-assignments/_expected/cjs.js index f663cfac812..4e1887b44fd 100644 --- a/test/form/samples/pattern-assignments/_expected/cjs.js +++ b/test/form/samples/pattern-assignments/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var effect = () => console.log( 'effect' ); var { a } = { a: effect }; diff --git a/test/form/samples/pattern-assignments/_expected/iife.js b/test/form/samples/pattern-assignments/_expected/iife.js index 2cbaf059823..2c099588d58 100644 --- a/test/form/samples/pattern-assignments/_expected/iife.js +++ b/test/form/samples/pattern-assignments/_expected/iife.js @@ -40,8 +40,6 @@ var bundle = (function (exports) { exports.u = u; exports.v = v; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/pattern-assignments/_expected/umd.js b/test/form/samples/pattern-assignments/_expected/umd.js index 2b85f898faa..1f35fee60c5 100644 --- a/test/form/samples/pattern-assignments/_expected/umd.js +++ b/test/form/samples/pattern-assignments/_expected/umd.js @@ -43,6 +43,4 @@ exports.u = u; exports.v = v; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/preserves-comments-after-imports/_expected/amd.js b/test/form/samples/preserves-comments-after-imports/_expected/amd.js index 66dc63f5caa..a923b337417 100644 --- a/test/form/samples/preserves-comments-after-imports/_expected/amd.js +++ b/test/form/samples/preserves-comments-after-imports/_expected/amd.js @@ -8,6 +8,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.obj = obj; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/preserves-comments-after-imports/_expected/cjs.js b/test/form/samples/preserves-comments-after-imports/_expected/cjs.js index 723b1cb3ec0..8b15cd1f241 100644 --- a/test/form/samples/preserves-comments-after-imports/_expected/cjs.js +++ b/test/form/samples/preserves-comments-after-imports/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - /** A comment for a number */ var number = 5; diff --git a/test/form/samples/preserves-comments-after-imports/_expected/iife.js b/test/form/samples/preserves-comments-after-imports/_expected/iife.js index dc0d9a8c7e0..64982e6ee3e 100644 --- a/test/form/samples/preserves-comments-after-imports/_expected/iife.js +++ b/test/form/samples/preserves-comments-after-imports/_expected/iife.js @@ -9,8 +9,6 @@ var myBundle = (function (exports) { exports.obj = obj; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/preserves-comments-after-imports/_expected/umd.js b/test/form/samples/preserves-comments-after-imports/_expected/umd.js index 220feb47624..6ebd8d6cbd3 100644 --- a/test/form/samples/preserves-comments-after-imports/_expected/umd.js +++ b/test/form/samples/preserves-comments-after-imports/_expected/umd.js @@ -12,6 +12,4 @@ exports.obj = obj; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/probe-external-namespace/_expected/amd.js b/test/form/samples/probe-external-namespace/_expected/amd.js index 9fdd37741c9..0393b9db83f 100644 --- a/test/form/samples/probe-external-namespace/_expected/amd.js +++ b/test/form/samples/probe-external-namespace/_expected/amd.js @@ -1,7 +1,6 @@ define(['external'], (function (external) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -18,7 +17,7 @@ define(['external'], (function (external) { 'use strict'; return Object.freeze(n); } - var external__namespace = /*#__PURE__*/_interopNamespace(external); + var external__namespace = /*#__PURE__*/_interopNamespaceDefault(external); console.log(external__namespace.default, external__namespace.foo); diff --git a/test/form/samples/probe-external-namespace/_expected/cjs.js b/test/form/samples/probe-external-namespace/_expected/cjs.js index 118f8b5f72b..20d721ce273 100644 --- a/test/form/samples/probe-external-namespace/_expected/cjs.js +++ b/test/form/samples/probe-external-namespace/_expected/cjs.js @@ -2,8 +2,7 @@ var external = require('external'); -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -20,6 +19,6 @@ function _interopNamespace(e) { return Object.freeze(n); } -var external__namespace = /*#__PURE__*/_interopNamespace(external); +var external__namespace = /*#__PURE__*/_interopNamespaceDefault(external); console.log(external__namespace.default, external__namespace.foo); diff --git a/test/form/samples/probe-external-namespace/_expected/iife.js b/test/form/samples/probe-external-namespace/_expected/iife.js index 49e2a5d52f4..e57dda8a159 100644 --- a/test/form/samples/probe-external-namespace/_expected/iife.js +++ b/test/form/samples/probe-external-namespace/_expected/iife.js @@ -1,8 +1,7 @@ (function (external) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -19,7 +18,7 @@ return Object.freeze(n); } - var external__namespace = /*#__PURE__*/_interopNamespace(external); + var external__namespace = /*#__PURE__*/_interopNamespaceDefault(external); console.log(external__namespace.default, external__namespace.foo); diff --git a/test/form/samples/probe-external-namespace/_expected/umd.js b/test/form/samples/probe-external-namespace/_expected/umd.js index f995a6adbf0..375181b3374 100644 --- a/test/form/samples/probe-external-namespace/_expected/umd.js +++ b/test/form/samples/probe-external-namespace/_expected/umd.js @@ -4,8 +4,7 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.external)); })(this, (function (external) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -22,7 +21,7 @@ return Object.freeze(n); } - var external__namespace = /*#__PURE__*/_interopNamespace(external); + var external__namespace = /*#__PURE__*/_interopNamespaceDefault(external); console.log(external__namespace.default, external__namespace.foo); diff --git a/test/form/samples/protect-cjs-globals/_expected/amd.js b/test/form/samples/protect-cjs-globals/_expected/amd.js index 17a88fc547b..2f06d90e7b6 100644 --- a/test/form/samples/protect-cjs-globals/_expected/amd.js +++ b/test/form/samples/protect-cjs-globals/_expected/amd.js @@ -12,6 +12,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.module = module; exports.require = require; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/protect-cjs-globals/_expected/cjs.js b/test/form/samples/protect-cjs-globals/_expected/cjs.js index 513260e0d7d..1303a625cb0 100644 --- a/test/form/samples/protect-cjs-globals/_expected/cjs.js +++ b/test/form/samples/protect-cjs-globals/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const exports$1 = 1; const require$1 = 2; const module$1 = 3; diff --git a/test/form/samples/protect-cjs-globals/_expected/iife.js b/test/form/samples/protect-cjs-globals/_expected/iife.js index 00172dddd39..37e2831d6fa 100644 --- a/test/form/samples/protect-cjs-globals/_expected/iife.js +++ b/test/form/samples/protect-cjs-globals/_expected/iife.js @@ -13,8 +13,6 @@ var bundle = (function (exports) { exports.module = module; exports.require = require; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/protect-cjs-globals/_expected/umd.js b/test/form/samples/protect-cjs-globals/_expected/umd.js index edcfbfc7349..91c7e195e56 100644 --- a/test/form/samples/protect-cjs-globals/_expected/umd.js +++ b/test/form/samples/protect-cjs-globals/_expected/umd.js @@ -16,6 +16,4 @@ exports.module = module; exports.require = require; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/re-export-aliasing/_expected/amd.js b/test/form/samples/re-export-aliasing/_expected/amd.js index fc944e56023..887ae736960 100644 --- a/test/form/samples/re-export-aliasing/_expected/amd.js +++ b/test/form/samples/re-export-aliasing/_expected/amd.js @@ -7,6 +7,4 @@ define(['exports', 'd'], (function (exports, d) { 'use strict'; get: function () { return d.d; } }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/re-export-aliasing/_expected/cjs.js b/test/form/samples/re-export-aliasing/_expected/cjs.js index 4daace86d00..d5b742f7313 100644 --- a/test/form/samples/re-export-aliasing/_expected/cjs.js +++ b/test/form/samples/re-export-aliasing/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var d = require('d'); diff --git a/test/form/samples/re-export-aliasing/_expected/iife.js b/test/form/samples/re-export-aliasing/_expected/iife.js index 4271c780612..d65fce2c1ef 100644 --- a/test/form/samples/re-export-aliasing/_expected/iife.js +++ b/test/form/samples/re-export-aliasing/_expected/iife.js @@ -8,8 +8,6 @@ var reexportsAliasingExternal = (function (exports, d) { get: function () { return d.d; } }); - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}, d); diff --git a/test/form/samples/re-export-aliasing/_expected/umd.js b/test/form/samples/re-export-aliasing/_expected/umd.js index ac9465b82b4..6c9b34df21e 100644 --- a/test/form/samples/re-export-aliasing/_expected/umd.js +++ b/test/form/samples/re-export-aliasing/_expected/umd.js @@ -9,6 +9,4 @@ get: function () { return d.d; } }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/reassigned-exported-functions-and-classes/_expected/amd.js b/test/form/samples/reassigned-exported-functions-and-classes/_expected/amd.js index b65b3e3e61d..9b2fa64c035 100644 --- a/test/form/samples/reassigned-exported-functions-and-classes/_expected/amd.js +++ b/test/form/samples/reassigned-exported-functions-and-classes/_expected/amd.js @@ -9,6 +9,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.bar = bar; exports.foo = foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/reassigned-exported-functions-and-classes/_expected/cjs.js b/test/form/samples/reassigned-exported-functions-and-classes/_expected/cjs.js index 953927befc5..d9fbc579806 100644 --- a/test/form/samples/reassigned-exported-functions-and-classes/_expected/cjs.js +++ b/test/form/samples/reassigned-exported-functions-and-classes/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - function foo () {} foo = 1; diff --git a/test/form/samples/reassigned-exported-functions-and-classes/_expected/iife.js b/test/form/samples/reassigned-exported-functions-and-classes/_expected/iife.js index d5c2406026d..8ba9c38e0cf 100644 --- a/test/form/samples/reassigned-exported-functions-and-classes/_expected/iife.js +++ b/test/form/samples/reassigned-exported-functions-and-classes/_expected/iife.js @@ -10,8 +10,6 @@ var bundle = (function (exports) { exports.bar = bar; exports.foo = foo; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/reassigned-exported-functions-and-classes/_expected/umd.js b/test/form/samples/reassigned-exported-functions-and-classes/_expected/umd.js index 453e5038a22..e749c11030a 100644 --- a/test/form/samples/reassigned-exported-functions-and-classes/_expected/umd.js +++ b/test/form/samples/reassigned-exported-functions-and-classes/_expected/umd.js @@ -13,6 +13,4 @@ exports.bar = bar; exports.foo = foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/reexport-external-default-and-name/_expected/amd.js b/test/form/samples/reexport-external-default-and-name/_expected/amd.js index a669904d5a3..d2d4e5a5285 100644 --- a/test/form/samples/reexport-external-default-and-name/_expected/amd.js +++ b/test/form/samples/reexport-external-default-and-name/_expected/amd.js @@ -1,15 +1,8 @@ define(['exports', 'external'], (function (exports, external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var external__default = /*#__PURE__*/_interopDefaultLegacy(external); - const value = 42; - Object.defineProperty(exports, 'default', { - enumerable: true, - get: function () { return external__default.default; } - }); + exports.default = external; exports.value = value; Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/form/samples/reexport-external-default-and-name/_expected/cjs.js b/test/form/samples/reexport-external-default-and-name/_expected/cjs.js index d7d1e5c461e..d0527409c8c 100644 --- a/test/form/samples/reexport-external-default-and-name/_expected/cjs.js +++ b/test/form/samples/reexport-external-default-and-name/_expected/cjs.js @@ -4,14 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); var external = require('external'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -var external__default = /*#__PURE__*/_interopDefaultLegacy(external); - const value = 42; -Object.defineProperty(exports, 'default', { - enumerable: true, - get: function () { return external__default.default; } -}); +exports.default = external; exports.value = value; diff --git a/test/form/samples/reexport-external-default-and-name/_expected/iife.js b/test/form/samples/reexport-external-default-and-name/_expected/iife.js index c1645066a84..2f9d0738092 100644 --- a/test/form/samples/reexport-external-default-and-name/_expected/iife.js +++ b/test/form/samples/reexport-external-default-and-name/_expected/iife.js @@ -1,16 +1,9 @@ var bundle = (function (exports, external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var external__default = /*#__PURE__*/_interopDefaultLegacy(external); - const value = 42; - Object.defineProperty(exports, 'default', { - enumerable: true, - get: function () { return external__default.default; } - }); + exports.default = external; exports.value = value; Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/form/samples/reexport-external-default-and-name/_expected/umd.js b/test/form/samples/reexport-external-default-and-name/_expected/umd.js index d313110b9f7..cf28cf2fa92 100644 --- a/test/form/samples/reexport-external-default-and-name/_expected/umd.js +++ b/test/form/samples/reexport-external-default-and-name/_expected/umd.js @@ -4,16 +4,9 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.bundle = {}, global.external)); })(this, (function (exports, external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var external__default = /*#__PURE__*/_interopDefaultLegacy(external); - const value = 42; - Object.defineProperty(exports, 'default', { - enumerable: true, - get: function () { return external__default.default; } - }); + exports.default = external; exports.value = value; Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/form/samples/reexport-external-default-and-namespace/_expected/amd.js b/test/form/samples/reexport-external-default-and-namespace/_expected/amd.js index 102151066ae..7cccdf868c7 100644 --- a/test/form/samples/reexport-external-default-and-namespace/_expected/amd.js +++ b/test/form/samples/reexport-external-default-and-namespace/_expected/amd.js @@ -1,15 +1,8 @@ define(['exports', 'external'], (function (exports, external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - var external__default = /*#__PURE__*/_interopDefaultLegacy(external); - - - Object.defineProperty(exports, 'default', { - enumerable: true, - get: function () { return external__default.default; } - }); + exports.default = external; Object.keys(external).forEach(function (k) { if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, { enumerable: true, diff --git a/test/form/samples/reexport-external-default-and-namespace/_expected/cjs.js b/test/form/samples/reexport-external-default-and-namespace/_expected/cjs.js index de5e5297412..aa21672db80 100644 --- a/test/form/samples/reexport-external-default-and-namespace/_expected/cjs.js +++ b/test/form/samples/reexport-external-default-and-namespace/_expected/cjs.js @@ -4,16 +4,9 @@ Object.defineProperty(exports, '__esModule', { value: true }); var external = require('external'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } -var external__default = /*#__PURE__*/_interopDefaultLegacy(external); - - -Object.defineProperty(exports, 'default', { - enumerable: true, - get: function () { return external__default.default; } -}); +exports.default = external; Object.keys(external).forEach(function (k) { if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, { enumerable: true, diff --git a/test/form/samples/reexport-external-default-and-namespace/_expected/iife.js b/test/form/samples/reexport-external-default-and-namespace/_expected/iife.js index 46649762cbe..d90110ce57e 100644 --- a/test/form/samples/reexport-external-default-and-namespace/_expected/iife.js +++ b/test/form/samples/reexport-external-default-and-namespace/_expected/iife.js @@ -1,16 +1,9 @@ var bundle = (function (exports, external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - var external__default = /*#__PURE__*/_interopDefaultLegacy(external); - - - Object.defineProperty(exports, 'default', { - enumerable: true, - get: function () { return external__default.default; } - }); + exports.default = external; Object.keys(external).forEach(function (k) { if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, { enumerable: true, diff --git a/test/form/samples/reexport-external-default-and-namespace/_expected/umd.js b/test/form/samples/reexport-external-default-and-namespace/_expected/umd.js index 6f4b7f3df18..d2208e0e63e 100644 --- a/test/form/samples/reexport-external-default-and-namespace/_expected/umd.js +++ b/test/form/samples/reexport-external-default-and-namespace/_expected/umd.js @@ -4,16 +4,7 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.bundle = {}, global.external)); })(this, (function (exports, external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var external__default = /*#__PURE__*/_interopDefaultLegacy(external); - - - - Object.defineProperty(exports, 'default', { - enumerable: true, - get: function () { return external__default.default; } - }); + exports.default = external; Object.keys(external).forEach(function (k) { if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, { enumerable: true, diff --git a/test/form/samples/reexport-external-default-as-name-and-name/_expected/amd.js b/test/form/samples/reexport-external-default-as-name-and-name/_expected/amd.js index 5d7360082ef..0f081608f76 100644 --- a/test/form/samples/reexport-external-default-as-name-and-name/_expected/amd.js +++ b/test/form/samples/reexport-external-default-as-name-and-name/_expected/amd.js @@ -1,16 +1,7 @@ define(['exports', 'external'], (function (exports, external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var external__default = /*#__PURE__*/_interopDefaultLegacy(external); - console.log(external.value); - Object.defineProperty(exports, 'reexported', { - enumerable: true, - get: function () { return external__default.default; } - }); - - Object.defineProperty(exports, '__esModule', { value: true }); + exports.reexported = external; })); diff --git a/test/form/samples/reexport-external-default-as-name-and-name/_expected/cjs.js b/test/form/samples/reexport-external-default-as-name-and-name/_expected/cjs.js index fc6ceddb25c..5c131e7b0d0 100644 --- a/test/form/samples/reexport-external-default-as-name-and-name/_expected/cjs.js +++ b/test/form/samples/reexport-external-default-as-name-and-name/_expected/cjs.js @@ -1,16 +1,7 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var external = require('external'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -var external__default = /*#__PURE__*/_interopDefaultLegacy(external); - console.log(external.value); -Object.defineProperty(exports, 'reexported', { - enumerable: true, - get: function () { return external__default.default; } -}); +exports.reexported = external; diff --git a/test/form/samples/reexport-external-default-as-name-and-name/_expected/iife.js b/test/form/samples/reexport-external-default-as-name-and-name/_expected/iife.js index 2d197722e9e..4d449cf4fbc 100644 --- a/test/form/samples/reexport-external-default-as-name-and-name/_expected/iife.js +++ b/test/form/samples/reexport-external-default-as-name-and-name/_expected/iife.js @@ -1,18 +1,9 @@ var bundle = (function (exports, external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var external__default = /*#__PURE__*/_interopDefaultLegacy(external); - console.log(external.value); - Object.defineProperty(exports, 'reexported', { - enumerable: true, - get: function () { return external__default.default; } - }); - - Object.defineProperty(exports, '__esModule', { value: true }); + exports.reexported = external; return exports; diff --git a/test/form/samples/reexport-external-default-as-name-and-name/_expected/umd.js b/test/form/samples/reexport-external-default-as-name-and-name/_expected/umd.js index b981b42659c..487302a71d7 100644 --- a/test/form/samples/reexport-external-default-as-name-and-name/_expected/umd.js +++ b/test/form/samples/reexport-external-default-as-name-and-name/_expected/umd.js @@ -4,17 +4,8 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.bundle = {}, global.external)); })(this, (function (exports, external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var external__default = /*#__PURE__*/_interopDefaultLegacy(external); - console.log(external.value); - Object.defineProperty(exports, 'reexported', { - enumerable: true, - get: function () { return external__default.default; } - }); - - Object.defineProperty(exports, '__esModule', { value: true }); + exports.reexported = external; })); diff --git a/test/form/samples/reexport-external-default/_expected/amd.js b/test/form/samples/reexport-external-default/_expected/amd.js index 28e931f7401..df0a0fe358d 100644 --- a/test/form/samples/reexport-external-default/_expected/amd.js +++ b/test/form/samples/reexport-external-default/_expected/amd.js @@ -1,11 +1,7 @@ define(['external1', 'external2'], (function (external1, external2) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var external2__default = /*#__PURE__*/_interopDefaultLegacy(external2); - console.log(external1.foo); - return external2__default.default; + return external2; })); diff --git a/test/form/samples/reexport-external-default/_expected/cjs.js b/test/form/samples/reexport-external-default/_expected/cjs.js index cdc47489681..f05bf510667 100644 --- a/test/form/samples/reexport-external-default/_expected/cjs.js +++ b/test/form/samples/reexport-external-default/_expected/cjs.js @@ -3,10 +3,6 @@ var external1 = require('external1'); var external2 = require('external2'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -var external2__default = /*#__PURE__*/_interopDefaultLegacy(external2); - console.log(external1.foo); -module.exports = external2__default.default; +module.exports = external2; diff --git a/test/form/samples/reexport-external-default/_expected/iife.js b/test/form/samples/reexport-external-default/_expected/iife.js index d13b93d68b8..e6f3e1f291c 100644 --- a/test/form/samples/reexport-external-default/_expected/iife.js +++ b/test/form/samples/reexport-external-default/_expected/iife.js @@ -1,12 +1,8 @@ var bundle = (function (external1, external2) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var external2__default = /*#__PURE__*/_interopDefaultLegacy(external2); - console.log(external1.foo); - return external2__default.default; + return external2; })(external1, external2); diff --git a/test/form/samples/reexport-external-default/_expected/umd.js b/test/form/samples/reexport-external-default/_expected/umd.js index d5c89f07f77..1546f7688bf 100644 --- a/test/form/samples/reexport-external-default/_expected/umd.js +++ b/test/form/samples/reexport-external-default/_expected/umd.js @@ -4,12 +4,8 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, global.bundle = factory(global.external1, global.external2)); })(this, (function (external1, external2) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var external2__default = /*#__PURE__*/_interopDefaultLegacy(external2); - console.log(external1.foo); - return external2__default.default; + return external2; })); diff --git a/test/form/samples/reexport-external-name/_expected/amd.js b/test/form/samples/reexport-external-name/_expected/amd.js index 4ab93afabb1..684bd771d5f 100644 --- a/test/form/samples/reexport-external-name/_expected/amd.js +++ b/test/form/samples/reexport-external-name/_expected/amd.js @@ -11,6 +11,4 @@ define(['exports', 'external1', 'external2'], (function (exports, external1, ext get: function () { return external2.foo; } }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/reexport-external-name/_expected/cjs.js b/test/form/samples/reexport-external-name/_expected/cjs.js index 7c751b91393..5aa22d86840 100644 --- a/test/form/samples/reexport-external-name/_expected/cjs.js +++ b/test/form/samples/reexport-external-name/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var external1 = require('external1'); var external2 = require('external2'); diff --git a/test/form/samples/reexport-external-name/_expected/iife.js b/test/form/samples/reexport-external-name/_expected/iife.js index 6c685860aba..e3109dc3fe6 100644 --- a/test/form/samples/reexport-external-name/_expected/iife.js +++ b/test/form/samples/reexport-external-name/_expected/iife.js @@ -12,8 +12,6 @@ var bundle = (function (exports, external1, external2) { get: function () { return external2.foo; } }); - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}, external1, external2); diff --git a/test/form/samples/reexport-external-name/_expected/umd.js b/test/form/samples/reexport-external-name/_expected/umd.js index cc485108d86..055a5d51d42 100644 --- a/test/form/samples/reexport-external-name/_expected/umd.js +++ b/test/form/samples/reexport-external-name/_expected/umd.js @@ -13,6 +13,4 @@ get: function () { return external2.foo; } }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/reexport-external-namespace-as/_expected/amd.js b/test/form/samples/reexport-external-namespace-as/_expected/amd.js index 79a5868b488..a34c79682d0 100644 --- a/test/form/samples/reexport-external-namespace-as/_expected/amd.js +++ b/test/form/samples/reexport-external-namespace-as/_expected/amd.js @@ -1,7 +1,6 @@ define(['exports', 'external'], (function (exports, external) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -18,13 +17,11 @@ define(['exports', 'external'], (function (exports, external) { 'use strict'; return Object.freeze(n); } - var external__namespace = /*#__PURE__*/_interopNamespace(external); + var external__namespace = /*#__PURE__*/_interopNamespaceDefault(external); exports.external = external__namespace; exports.indirect = external__namespace; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/reexport-external-namespace-as/_expected/cjs.js b/test/form/samples/reexport-external-namespace-as/_expected/cjs.js index eba021c3513..c32f787db01 100644 --- a/test/form/samples/reexport-external-namespace-as/_expected/cjs.js +++ b/test/form/samples/reexport-external-namespace-as/_expected/cjs.js @@ -1,11 +1,8 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var external = require('external'); -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -22,7 +19,7 @@ function _interopNamespace(e) { return Object.freeze(n); } -var external__namespace = /*#__PURE__*/_interopNamespace(external); +var external__namespace = /*#__PURE__*/_interopNamespaceDefault(external); diff --git a/test/form/samples/reexport-external-namespace-as/_expected/iife.js b/test/form/samples/reexport-external-namespace-as/_expected/iife.js index 4dd7d351d13..3e5601fed23 100644 --- a/test/form/samples/reexport-external-namespace-as/_expected/iife.js +++ b/test/form/samples/reexport-external-namespace-as/_expected/iife.js @@ -1,8 +1,7 @@ var bundle = (function (exports, external) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -19,15 +18,13 @@ var bundle = (function (exports, external) { return Object.freeze(n); } - var external__namespace = /*#__PURE__*/_interopNamespace(external); + var external__namespace = /*#__PURE__*/_interopNamespaceDefault(external); exports.external = external__namespace; exports.indirect = external__namespace; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}, external); diff --git a/test/form/samples/reexport-external-namespace-as/_expected/umd.js b/test/form/samples/reexport-external-namespace-as/_expected/umd.js index c94f64d32b4..7c6d425494d 100644 --- a/test/form/samples/reexport-external-namespace-as/_expected/umd.js +++ b/test/form/samples/reexport-external-namespace-as/_expected/umd.js @@ -4,8 +4,7 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.bundle = {}, global.external)); })(this, (function (exports, external) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -22,13 +21,11 @@ return Object.freeze(n); } - var external__namespace = /*#__PURE__*/_interopNamespace(external); + var external__namespace = /*#__PURE__*/_interopNamespaceDefault(external); exports.external = external__namespace; exports.indirect = external__namespace; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/reexport-external-namespace/_expected/amd.js b/test/form/samples/reexport-external-namespace/_expected/amd.js index 6431ea29f45..ed258cf8567 100644 --- a/test/form/samples/reexport-external-namespace/_expected/amd.js +++ b/test/form/samples/reexport-external-namespace/_expected/amd.js @@ -9,6 +9,4 @@ define(['exports', 'external'], (function (exports, external) { 'use strict'; }); }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/reexport-external-namespace/_expected/cjs.js b/test/form/samples/reexport-external-namespace/_expected/cjs.js index c7424a46c98..79c07555fd1 100644 --- a/test/form/samples/reexport-external-namespace/_expected/cjs.js +++ b/test/form/samples/reexport-external-namespace/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var external = require('external'); diff --git a/test/form/samples/reexport-external-namespace/_expected/iife.js b/test/form/samples/reexport-external-namespace/_expected/iife.js index a6f3b8c782d..c70e4c538ae 100644 --- a/test/form/samples/reexport-external-namespace/_expected/iife.js +++ b/test/form/samples/reexport-external-namespace/_expected/iife.js @@ -10,8 +10,6 @@ var bundle = (function (exports, external) { }); }); - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}, external); diff --git a/test/form/samples/reexport-external-namespace/_expected/umd.js b/test/form/samples/reexport-external-namespace/_expected/umd.js index 6f396ee06cf..495c87ce597 100644 --- a/test/form/samples/reexport-external-namespace/_expected/umd.js +++ b/test/form/samples/reexport-external-namespace/_expected/umd.js @@ -11,6 +11,4 @@ }); }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/reexport-used-external-namespace-as/_expected/amd.js b/test/form/samples/reexport-used-external-namespace-as/_expected/amd.js index c6a07316ff6..e707fe759d5 100644 --- a/test/form/samples/reexport-used-external-namespace-as/_expected/amd.js +++ b/test/form/samples/reexport-used-external-namespace-as/_expected/amd.js @@ -1,7 +1,6 @@ define(['exports', 'external1', 'external2'], (function (exports, imported1, external2) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -18,14 +17,12 @@ define(['exports', 'external1', 'external2'], (function (exports, imported1, ext return Object.freeze(n); } - var imported1__namespace = /*#__PURE__*/_interopNamespace(imported1); - var external2__namespace = /*#__PURE__*/_interopNamespace(external2); + var imported1__namespace = /*#__PURE__*/_interopNamespaceDefault(imported1); + var external2__namespace = /*#__PURE__*/_interopNamespaceDefault(external2); console.log(imported1__namespace, external2.imported2); exports.external1 = imported1__namespace; exports.external2 = external2__namespace; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/reexport-used-external-namespace-as/_expected/cjs.js b/test/form/samples/reexport-used-external-namespace-as/_expected/cjs.js index f746a20ebe9..8ad9c96cf65 100644 --- a/test/form/samples/reexport-used-external-namespace-as/_expected/cjs.js +++ b/test/form/samples/reexport-used-external-namespace-as/_expected/cjs.js @@ -1,12 +1,9 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var imported1 = require('external1'); var external2 = require('external2'); -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -23,8 +20,8 @@ function _interopNamespace(e) { return Object.freeze(n); } -var imported1__namespace = /*#__PURE__*/_interopNamespace(imported1); -var external2__namespace = /*#__PURE__*/_interopNamespace(external2); +var imported1__namespace = /*#__PURE__*/_interopNamespaceDefault(imported1); +var external2__namespace = /*#__PURE__*/_interopNamespaceDefault(external2); console.log(imported1__namespace, external2.imported2); diff --git a/test/form/samples/reexport-used-external-namespace-as/_expected/iife.js b/test/form/samples/reexport-used-external-namespace-as/_expected/iife.js index f7c413002ce..53940a08b7c 100644 --- a/test/form/samples/reexport-used-external-namespace-as/_expected/iife.js +++ b/test/form/samples/reexport-used-external-namespace-as/_expected/iife.js @@ -1,8 +1,7 @@ var bundle = (function (exports, imported1, external2) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -19,16 +18,14 @@ var bundle = (function (exports, imported1, external2) { return Object.freeze(n); } - var imported1__namespace = /*#__PURE__*/_interopNamespace(imported1); - var external2__namespace = /*#__PURE__*/_interopNamespace(external2); + var imported1__namespace = /*#__PURE__*/_interopNamespaceDefault(imported1); + var external2__namespace = /*#__PURE__*/_interopNamespaceDefault(external2); console.log(imported1__namespace, external2.imported2); exports.external1 = imported1__namespace; exports.external2 = external2__namespace; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}, external1, external2); diff --git a/test/form/samples/reexport-used-external-namespace-as/_expected/umd.js b/test/form/samples/reexport-used-external-namespace-as/_expected/umd.js index b7021bad6c9..5808e7786d4 100644 --- a/test/form/samples/reexport-used-external-namespace-as/_expected/umd.js +++ b/test/form/samples/reexport-used-external-namespace-as/_expected/umd.js @@ -4,8 +4,7 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.bundle = {}, global.external1, global.external2)); })(this, (function (exports, imported1, external2) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -22,14 +21,12 @@ return Object.freeze(n); } - var imported1__namespace = /*#__PURE__*/_interopNamespace(imported1); - var external2__namespace = /*#__PURE__*/_interopNamespace(external2); + var imported1__namespace = /*#__PURE__*/_interopNamespaceDefault(imported1); + var external2__namespace = /*#__PURE__*/_interopNamespaceDefault(external2); console.log(imported1__namespace, external2.imported2); exports.external1 = imported1__namespace; exports.external2 = external2__namespace; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/relative-external-with-global/_expected/amd.js b/test/form/samples/relative-external-with-global/_expected/amd.js index 4f00dfc7f9c..0efe40c013d 100644 --- a/test/form/samples/relative-external-with-global/_expected/amd.js +++ b/test/form/samples/relative-external-with-global/_expected/amd.js @@ -1,13 +1,9 @@ define(['./lib/throttle'], (function (throttle) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var throttle__default = /*#__PURE__*/_interopDefaultLegacy(throttle); - - throttle__default.default( () => { + throttle( () => { console.log( '.' ); }, 500 ); - window.addEventListener( 'mousemove', throttle__default.default ); + window.addEventListener( 'mousemove', throttle ); })); diff --git a/test/form/samples/relative-external-with-global/_expected/cjs.js b/test/form/samples/relative-external-with-global/_expected/cjs.js index 2f3d278976f..2e861b58a7b 100644 --- a/test/form/samples/relative-external-with-global/_expected/cjs.js +++ b/test/form/samples/relative-external-with-global/_expected/cjs.js @@ -2,12 +2,8 @@ var throttle = require('./lib/throttle.js'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -var throttle__default = /*#__PURE__*/_interopDefaultLegacy(throttle); - -throttle__default.default( () => { +throttle( () => { console.log( '.' ); }, 500 ); -window.addEventListener( 'mousemove', throttle__default.default ); +window.addEventListener( 'mousemove', throttle ); diff --git a/test/form/samples/relative-external-with-global/_expected/iife.js b/test/form/samples/relative-external-with-global/_expected/iife.js index 8413a4a0115..47aa0cd2a28 100644 --- a/test/form/samples/relative-external-with-global/_expected/iife.js +++ b/test/form/samples/relative-external-with-global/_expected/iife.js @@ -1,14 +1,10 @@ (function (throttle) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var throttle__default = /*#__PURE__*/_interopDefaultLegacy(throttle); - - throttle__default.default( () => { + throttle( () => { console.log( '.' ); }, 500 ); - window.addEventListener( 'mousemove', throttle__default.default ); + window.addEventListener( 'mousemove', throttle ); })(Lib.throttle); diff --git a/test/form/samples/relative-external-with-global/_expected/umd.js b/test/form/samples/relative-external-with-global/_expected/umd.js index 23a67e887e1..89ef40b9479 100644 --- a/test/form/samples/relative-external-with-global/_expected/umd.js +++ b/test/form/samples/relative-external-with-global/_expected/umd.js @@ -4,14 +4,10 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.Lib.throttle)); })(this, (function (throttle) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var throttle__default = /*#__PURE__*/_interopDefaultLegacy(throttle); - - throttle__default.default( () => { + throttle( () => { console.log( '.' ); }, 500 ); - window.addEventListener( 'mousemove', throttle__default.default ); + window.addEventListener( 'mousemove', throttle ); })); diff --git a/test/form/samples/render-declaration-semicolons/_expected/amd.js b/test/form/samples/render-declaration-semicolons/_expected/amd.js index d59f1f9da9e..d5bb2f96660 100644 --- a/test/form/samples/render-declaration-semicolons/_expected/amd.js +++ b/test/form/samples/render-declaration-semicolons/_expected/amd.js @@ -29,6 +29,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.o = o; exports.p = p; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/render-declaration-semicolons/_expected/cjs.js b/test/form/samples/render-declaration-semicolons/_expected/cjs.js index c7e1b4cb0c7..21c4947ddaa 100644 --- a/test/form/samples/render-declaration-semicolons/_expected/cjs.js +++ b/test/form/samples/render-declaration-semicolons/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var a, b; console.log(a, b); diff --git a/test/form/samples/render-declaration-semicolons/_expected/iife.js b/test/form/samples/render-declaration-semicolons/_expected/iife.js index 120e97bed76..70af482ab1a 100644 --- a/test/form/samples/render-declaration-semicolons/_expected/iife.js +++ b/test/form/samples/render-declaration-semicolons/_expected/iife.js @@ -30,8 +30,6 @@ var bundle = (function (exports) { exports.o = o; exports.p = p; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/render-declaration-semicolons/_expected/umd.js b/test/form/samples/render-declaration-semicolons/_expected/umd.js index faf114da317..6f84eb14f44 100644 --- a/test/form/samples/render-declaration-semicolons/_expected/umd.js +++ b/test/form/samples/render-declaration-semicolons/_expected/umd.js @@ -33,6 +33,4 @@ exports.o = o; exports.p = p; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/render-named-export-declarations/_expected/amd.js b/test/form/samples/render-named-export-declarations/_expected/amd.js index 6a18a15abef..613cc34c2e4 100644 --- a/test/form/samples/render-named-export-declarations/_expected/amd.js +++ b/test/form/samples/render-named-export-declarations/_expected/amd.js @@ -17,6 +17,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.cFoo = cFoo; exports.dBar = dBar; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/render-named-export-declarations/_expected/cjs.js b/test/form/samples/render-named-export-declarations/_expected/cjs.js index f21aa19e750..9fb89410f31 100644 --- a/test/form/samples/render-named-export-declarations/_expected/cjs.js +++ b/test/form/samples/render-named-export-declarations/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var aFoo; exports.aBar = void 0; exports.aBar = 2; diff --git a/test/form/samples/render-named-export-declarations/_expected/iife.js b/test/form/samples/render-named-export-declarations/_expected/iife.js index 5267bf9d448..34eab475362 100644 --- a/test/form/samples/render-named-export-declarations/_expected/iife.js +++ b/test/form/samples/render-named-export-declarations/_expected/iife.js @@ -18,8 +18,6 @@ var bundle = (function (exports) { exports.cFoo = cFoo; exports.dBar = dBar; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/render-named-export-declarations/_expected/umd.js b/test/form/samples/render-named-export-declarations/_expected/umd.js index 9be6795e9cf..c889ff37651 100644 --- a/test/form/samples/render-named-export-declarations/_expected/umd.js +++ b/test/form/samples/render-named-export-declarations/_expected/umd.js @@ -21,6 +21,4 @@ exports.cFoo = cFoo; exports.dBar = dBar; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/resolve-external-dynamic-imports/_expected/amd.js b/test/form/samples/resolve-external-dynamic-imports/_expected/amd.js index 977288b9039..8e6ef4e1af5 100644 --- a/test/form/samples/resolve-external-dynamic-imports/_expected/amd.js +++ b/test/form/samples/resolve-external-dynamic-imports/_expected/amd.js @@ -1,9 +1,6 @@ define(['require', 'exports', 'external'], (function (require, exports, myExternal) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -20,15 +17,11 @@ define(['require', 'exports', 'external'], (function (require, exports, myExtern return Object.freeze(n); } - var myExternal__default = /*#__PURE__*/_interopDefaultLegacy(myExternal); - - const test = () => myExternal__default.default; + const test = () => myExternal; - const someDynamicImport = () => new Promise(function (resolve, reject) { require(['external'], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }); + const someDynamicImport = () => new Promise(function (resolve, reject) { require(['external'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); exports.someDynamicImport = someDynamicImport; exports.test = test; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/resolve-external-dynamic-imports/_expected/cjs.js b/test/form/samples/resolve-external-dynamic-imports/_expected/cjs.js index 1f856a94f92..c18ed55b1b4 100644 --- a/test/form/samples/resolve-external-dynamic-imports/_expected/cjs.js +++ b/test/form/samples/resolve-external-dynamic-imports/_expected/cjs.js @@ -1,13 +1,8 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var myExternal = require('external'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -24,11 +19,9 @@ function _interopNamespace(e) { return Object.freeze(n); } -var myExternal__default = /*#__PURE__*/_interopDefaultLegacy(myExternal); - -const test = () => myExternal__default.default; +const test = () => myExternal; -const someDynamicImport = () => Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('external')); }); +const someDynamicImport = () => Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('external')); }); exports.someDynamicImport = someDynamicImport; exports.test = test; diff --git a/test/form/samples/resolve-external-dynamic-imports/_expected/iife.js b/test/form/samples/resolve-external-dynamic-imports/_expected/iife.js index d4cb2062380..dd9cc63ac78 100644 --- a/test/form/samples/resolve-external-dynamic-imports/_expected/iife.js +++ b/test/form/samples/resolve-external-dynamic-imports/_expected/iife.js @@ -1,19 +1,13 @@ var bundle = (function (exports, myExternal) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var myExternal__default = /*#__PURE__*/_interopDefaultLegacy(myExternal); - - const test = () => myExternal__default.default; + const test = () => myExternal; const someDynamicImport = () => import('external'); exports.someDynamicImport = someDynamicImport; exports.test = test; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}, myExternal); diff --git a/test/form/samples/resolve-external-dynamic-imports/_expected/umd.js b/test/form/samples/resolve-external-dynamic-imports/_expected/umd.js index 607a075eef9..b66451582d9 100644 --- a/test/form/samples/resolve-external-dynamic-imports/_expected/umd.js +++ b/test/form/samples/resolve-external-dynamic-imports/_expected/umd.js @@ -4,17 +4,11 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.bundle = {}, global.myExternal)); })(this, (function (exports, myExternal) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var myExternal__default = /*#__PURE__*/_interopDefaultLegacy(myExternal); - - const test = () => myExternal__default.default; + const test = () => myExternal; const someDynamicImport = () => import('external'); exports.someDynamicImport = someDynamicImport; exports.test = test; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/resolve-import-meta-url-export/_expected/amd.js b/test/form/samples/resolve-import-meta-url-export/_expected/amd.js index 90ecd765508..f68ef1ec247 100644 --- a/test/form/samples/resolve-import-meta-url-export/_expected/amd.js +++ b/test/form/samples/resolve-import-meta-url-export/_expected/amd.js @@ -6,6 +6,4 @@ define(['module', 'exports'], (function (module, exports) { 'use strict'; exports.meta = meta; exports.url = url; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/resolve-import-meta-url-export/_expected/cjs.js b/test/form/samples/resolve-import-meta-url-export/_expected/cjs.js index 13803f6f4ab..c99ee245fd6 100644 --- a/test/form/samples/resolve-import-meta-url-export/_expected/cjs.js +++ b/test/form/samples/resolve-import-meta-url-export/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const url = 'url'; const meta = 'meta'; diff --git a/test/form/samples/resolve-import-meta-url-export/_expected/iife.js b/test/form/samples/resolve-import-meta-url-export/_expected/iife.js index a4c48f8c50f..0341d484e2c 100644 --- a/test/form/samples/resolve-import-meta-url-export/_expected/iife.js +++ b/test/form/samples/resolve-import-meta-url-export/_expected/iife.js @@ -7,8 +7,6 @@ var bundle = (function (exports) { exports.meta = meta; exports.url = url; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/resolve-import-meta-url-export/_expected/umd.js b/test/form/samples/resolve-import-meta-url-export/_expected/umd.js index 92b28d4a0b7..1220e540a99 100644 --- a/test/form/samples/resolve-import-meta-url-export/_expected/umd.js +++ b/test/form/samples/resolve-import-meta-url-export/_expected/umd.js @@ -10,6 +10,4 @@ exports.meta = meta; exports.url = url; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/side-effects-delete/_expected/amd.js b/test/form/samples/side-effects-delete/_expected/amd.js index 0abd4b8301a..b7ea318adf5 100644 --- a/test/form/samples/side-effects-delete/_expected/amd.js +++ b/test/form/samples/side-effects-delete/_expected/amd.js @@ -7,6 +7,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.x = x; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/side-effects-delete/_expected/cjs.js b/test/form/samples/side-effects-delete/_expected/cjs.js index cdaada5d697..e6921aece27 100644 --- a/test/form/samples/side-effects-delete/_expected/cjs.js +++ b/test/form/samples/side-effects-delete/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var x = {foo: 'bar'}; delete x.foo; diff --git a/test/form/samples/side-effects-delete/_expected/iife.js b/test/form/samples/side-effects-delete/_expected/iife.js index 0040d79d24c..90c7a370402 100644 --- a/test/form/samples/side-effects-delete/_expected/iife.js +++ b/test/form/samples/side-effects-delete/_expected/iife.js @@ -8,8 +8,6 @@ var myBundle = (function (exports) { exports.x = x; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/side-effects-delete/_expected/umd.js b/test/form/samples/side-effects-delete/_expected/umd.js index 2fb476fd0cf..d91938bdd0c 100644 --- a/test/form/samples/side-effects-delete/_expected/umd.js +++ b/test/form/samples/side-effects-delete/_expected/umd.js @@ -11,6 +11,4 @@ exports.x = x; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/simplified-initializer/_expected/amd.js b/test/form/samples/simplified-initializer/_expected/amd.js index 6819298bda7..a1219a0a4d0 100644 --- a/test/form/samples/simplified-initializer/_expected/amd.js +++ b/test/form/samples/simplified-initializer/_expected/amd.js @@ -8,6 +8,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.b = b; exports.c = c; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/simplified-initializer/_expected/cjs.js b/test/form/samples/simplified-initializer/_expected/cjs.js index 495e50393b3..188f321a643 100644 --- a/test/form/samples/simplified-initializer/_expected/cjs.js +++ b/test/form/samples/simplified-initializer/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const a = window.config ? 1 : 2; const b = 1 ; const c = 2; diff --git a/test/form/samples/simplified-initializer/_expected/iife.js b/test/form/samples/simplified-initializer/_expected/iife.js index 150de538b8a..e89d9eba578 100644 --- a/test/form/samples/simplified-initializer/_expected/iife.js +++ b/test/form/samples/simplified-initializer/_expected/iife.js @@ -9,8 +9,6 @@ var bundle = (function (exports) { exports.b = b; exports.c = c; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/simplified-initializer/_expected/umd.js b/test/form/samples/simplified-initializer/_expected/umd.js index 7acdf13041f..dc1af22f9d6 100644 --- a/test/form/samples/simplified-initializer/_expected/umd.js +++ b/test/form/samples/simplified-initializer/_expected/umd.js @@ -12,6 +12,4 @@ exports.b = b; exports.c = c; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/umd-noconflict-extend/_expected/amd.js b/test/form/samples/umd-noconflict-extend/_expected/amd.js index 092454a1efe..7854ff6b6a0 100644 --- a/test/form/samples/umd-noconflict-extend/_expected/amd.js +++ b/test/form/samples/umd-noconflict-extend/_expected/amd.js @@ -12,6 +12,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.number = number; exports.setting = setting; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/umd-noconflict-extend/_expected/cjs.js b/test/form/samples/umd-noconflict-extend/_expected/cjs.js index 05952881691..94847dc35a0 100644 --- a/test/form/samples/umd-noconflict-extend/_expected/cjs.js +++ b/test/form/samples/umd-noconflict-extend/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - function doThings() { console.log( 'doing things...' ); } diff --git a/test/form/samples/umd-noconflict-extend/_expected/iife.js b/test/form/samples/umd-noconflict-extend/_expected/iife.js index aa51ff5b9d3..3458187fb27 100644 --- a/test/form/samples/umd-noconflict-extend/_expected/iife.js +++ b/test/form/samples/umd-noconflict-extend/_expected/iife.js @@ -13,6 +13,4 @@ exports.number = number; exports.setting = setting; - Object.defineProperty(exports, '__esModule', { value: true }); - })(this.FooBar = this.FooBar || {}); diff --git a/test/form/samples/umd-noconflict-extend/_expected/umd.js b/test/form/samples/umd-noconflict-extend/_expected/umd.js index 6e452e207d3..d3628d82101 100644 --- a/test/form/samples/umd-noconflict-extend/_expected/umd.js +++ b/test/form/samples/umd-noconflict-extend/_expected/umd.js @@ -21,6 +21,4 @@ exports.number = number; exports.setting = setting; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/umd-noconflict-namespaced/_expected/amd.js b/test/form/samples/umd-noconflict-namespaced/_expected/amd.js index 092454a1efe..7854ff6b6a0 100644 --- a/test/form/samples/umd-noconflict-namespaced/_expected/amd.js +++ b/test/form/samples/umd-noconflict-namespaced/_expected/amd.js @@ -12,6 +12,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.number = number; exports.setting = setting; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/umd-noconflict-namespaced/_expected/cjs.js b/test/form/samples/umd-noconflict-namespaced/_expected/cjs.js index 05952881691..94847dc35a0 100644 --- a/test/form/samples/umd-noconflict-namespaced/_expected/cjs.js +++ b/test/form/samples/umd-noconflict-namespaced/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - function doThings() { console.log( 'doing things...' ); } diff --git a/test/form/samples/umd-noconflict-namespaced/_expected/iife.js b/test/form/samples/umd-noconflict-namespaced/_expected/iife.js index 93be5fa03fe..9499324cf8e 100644 --- a/test/form/samples/umd-noconflict-namespaced/_expected/iife.js +++ b/test/form/samples/umd-noconflict-namespaced/_expected/iife.js @@ -16,8 +16,6 @@ this.my.name.spaced.module = (function (exports) { exports.number = number; exports.setting = setting; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/umd-noconflict-namespaced/_expected/umd.js b/test/form/samples/umd-noconflict-namespaced/_expected/umd.js index 81960e08580..7bc84974f32 100644 --- a/test/form/samples/umd-noconflict-namespaced/_expected/umd.js +++ b/test/form/samples/umd-noconflict-namespaced/_expected/umd.js @@ -21,6 +21,4 @@ exports.number = number; exports.setting = setting; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/umd-noconflict/_expected/amd.js b/test/form/samples/umd-noconflict/_expected/amd.js index 092454a1efe..7854ff6b6a0 100644 --- a/test/form/samples/umd-noconflict/_expected/amd.js +++ b/test/form/samples/umd-noconflict/_expected/amd.js @@ -12,6 +12,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.number = number; exports.setting = setting; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/umd-noconflict/_expected/cjs.js b/test/form/samples/umd-noconflict/_expected/cjs.js index 05952881691..94847dc35a0 100644 --- a/test/form/samples/umd-noconflict/_expected/cjs.js +++ b/test/form/samples/umd-noconflict/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - function doThings() { console.log( 'doing things...' ); } diff --git a/test/form/samples/umd-noconflict/_expected/iife.js b/test/form/samples/umd-noconflict/_expected/iife.js index 82360ea4bd7..257d74ec593 100644 --- a/test/form/samples/umd-noconflict/_expected/iife.js +++ b/test/form/samples/umd-noconflict/_expected/iife.js @@ -13,8 +13,6 @@ var FooBar = (function (exports) { exports.number = number; exports.setting = setting; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/umd-noconflict/_expected/umd.js b/test/form/samples/umd-noconflict/_expected/umd.js index b7324ca82a4..a6ac7db34f1 100644 --- a/test/form/samples/umd-noconflict/_expected/umd.js +++ b/test/form/samples/umd-noconflict/_expected/umd.js @@ -21,6 +21,4 @@ exports.number = number; exports.setting = setting; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/updating-assignments/_expected/amd.js b/test/form/samples/updating-assignments/_expected/amd.js index 0d08c9de51e..b93e3af25aa 100644 --- a/test/form/samples/updating-assignments/_expected/amd.js +++ b/test/form/samples/updating-assignments/_expected/amd.js @@ -15,6 +15,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.x ^= 2; exports.x |= 2; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/updating-assignments/_expected/cjs.js b/test/form/samples/updating-assignments/_expected/cjs.js index 3824b02062a..fe8c94b26dd 100644 --- a/test/form/samples/updating-assignments/_expected/cjs.js +++ b/test/form/samples/updating-assignments/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - exports.x = 1; exports.x = 2; exports.x += 1; diff --git a/test/form/samples/updating-assignments/_expected/iife.js b/test/form/samples/updating-assignments/_expected/iife.js index f4243a16550..913bb7b37b6 100644 --- a/test/form/samples/updating-assignments/_expected/iife.js +++ b/test/form/samples/updating-assignments/_expected/iife.js @@ -16,8 +16,6 @@ var bundle = (function (exports) { exports.x ^= 2; exports.x |= 2; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/updating-assignments/_expected/umd.js b/test/form/samples/updating-assignments/_expected/umd.js index eb0dee7fe24..66d4cfdb2c9 100644 --- a/test/form/samples/updating-assignments/_expected/umd.js +++ b/test/form/samples/updating-assignments/_expected/umd.js @@ -19,6 +19,4 @@ exports.x ^= 2; exports.x |= 2; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/url-external/_expected/amd.js b/test/form/samples/url-external/_expected/amd.js index 4a75a167eff..57ddf13f248 100644 --- a/test/form/samples/url-external/_expected/amd.js +++ b/test/form/samples/url-external/_expected/amd.js @@ -1,9 +1,5 @@ define(['https://external.com/external.js'], (function (external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var external__default = /*#__PURE__*/_interopDefaultLegacy(external); - - console.log(external__default.default); + console.log(external); })); diff --git a/test/form/samples/url-external/_expected/cjs.js b/test/form/samples/url-external/_expected/cjs.js index 4f5d019db04..bf3ba7bb58a 100644 --- a/test/form/samples/url-external/_expected/cjs.js +++ b/test/form/samples/url-external/_expected/cjs.js @@ -2,8 +2,4 @@ var external = require('https://external.com/external.js'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -var external__default = /*#__PURE__*/_interopDefaultLegacy(external); - -console.log(external__default.default); +console.log(external); diff --git a/test/form/samples/url-external/_expected/iife.js b/test/form/samples/url-external/_expected/iife.js index 03017f759d7..c458d91ba9a 100644 --- a/test/form/samples/url-external/_expected/iife.js +++ b/test/form/samples/url-external/_expected/iife.js @@ -1,10 +1,6 @@ (function (external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var external__default = /*#__PURE__*/_interopDefaultLegacy(external); - - console.log(external__default.default); + console.log(external); })(external); diff --git a/test/form/samples/url-external/_expected/umd.js b/test/form/samples/url-external/_expected/umd.js index 1aea4ccc054..e7d4db18e29 100644 --- a/test/form/samples/url-external/_expected/umd.js +++ b/test/form/samples/url-external/_expected/umd.js @@ -4,10 +4,6 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.external)); })(this, (function (external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var external__default = /*#__PURE__*/_interopDefaultLegacy(external); - - console.log(external__default.default); + console.log(external); })); diff --git a/test/form/samples/use-global-map-for-export-name/_expected/amd.js b/test/form/samples/use-global-map-for-export-name/_expected/amd.js index 83e1731931b..82874afc7ff 100644 --- a/test/form/samples/use-global-map-for-export-name/_expected/amd.js +++ b/test/form/samples/use-global-map-for-export-name/_expected/amd.js @@ -1,10 +1,6 @@ define(['leaflet'], (function (L) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var L__default = /*#__PURE__*/_interopDefaultLegacy(L); - - L__default.default.terminator = function(options) { + L.terminator = function(options) { }; })); diff --git a/test/form/samples/use-global-map-for-export-name/_expected/cjs.js b/test/form/samples/use-global-map-for-export-name/_expected/cjs.js index 891c5d20dc6..3a86b17b793 100644 --- a/test/form/samples/use-global-map-for-export-name/_expected/cjs.js +++ b/test/form/samples/use-global-map-for-export-name/_expected/cjs.js @@ -2,9 +2,5 @@ var L = require('leaflet'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -var L__default = /*#__PURE__*/_interopDefaultLegacy(L); - -L__default.default.terminator = function(options) { +L.terminator = function(options) { }; diff --git a/test/form/samples/use-global-map-for-export-name/_expected/iife.js b/test/form/samples/use-global-map-for-export-name/_expected/iife.js index c02cd28d3f9..651a4174f76 100644 --- a/test/form/samples/use-global-map-for-export-name/_expected/iife.js +++ b/test/form/samples/use-global-map-for-export-name/_expected/iife.js @@ -1,11 +1,7 @@ (function (L) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var L__default = /*#__PURE__*/_interopDefaultLegacy(L); - - L__default.default.terminator = function(options) { + L.terminator = function(options) { }; })(L); diff --git a/test/form/samples/use-global-map-for-export-name/_expected/umd.js b/test/form/samples/use-global-map-for-export-name/_expected/umd.js index 741e99d9f12..c46f94e9d07 100644 --- a/test/form/samples/use-global-map-for-export-name/_expected/umd.js +++ b/test/form/samples/use-global-map-for-export-name/_expected/umd.js @@ -4,11 +4,7 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.L)); })(this, (function (L) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var L__default = /*#__PURE__*/_interopDefaultLegacy(L); - - L__default.default.terminator = function(options) { + L.terminator = function(options) { }; })); diff --git a/test/function/samples/deprecated/deconflicts-interop-boolean/_config.js b/test/function/samples/deprecated/deconflicts-interop-boolean/_config.js deleted file mode 100644 index fa488ae7c81..00000000000 --- a/test/function/samples/deprecated/deconflicts-interop-boolean/_config.js +++ /dev/null @@ -1,25 +0,0 @@ -module.exports = { - description: 'deconflicts the interop function for "true"', - options: { - strictDeprecations: false, - external(id) { - return id.startsWith('external'); - }, - output: { - interop: true - } - }, - context: { - require: () => { - return Object.defineProperty({ foo: 'foo', default: 'bar' }, '__esModule', { value: true }); - } - }, - warnings: [ - { - code: 'DEPRECATED_FEATURE', - message: - 'The boolean value "true" for the "output.interop" option is deprecated. Use "auto" instead.', - url: 'https://rollupjs.org/guide/en/#outputinterop' - } - ] -}; diff --git a/test/function/samples/deprecated/deconflicts-interop-boolean/main.js b/test/function/samples/deprecated/deconflicts-interop-boolean/main.js deleted file mode 100644 index 9d819c8a98c..00000000000 --- a/test/function/samples/deprecated/deconflicts-interop-boolean/main.js +++ /dev/null @@ -1,10 +0,0 @@ -import external1 from 'external'; -import * as external2 from 'external'; - -const _interopDefaultLegacy = null; -const _interopNamespace = null; - -assert.strictEqual(_interopDefaultLegacy, null); -assert.strictEqual(_interopNamespace, null); -assert.strictEqual(external1, 'bar'); -assert.deepStrictEqual(external2, { default: 'bar', foo: 'foo' }); diff --git a/test/function/samples/deprecated/interop-false/_config.js b/test/function/samples/deprecated/interop-false/_config.js deleted file mode 100644 index 4651e9ab514..00000000000 --- a/test/function/samples/deprecated/interop-false/_config.js +++ /dev/null @@ -1,69 +0,0 @@ -let fooModule = 'foo'; -let barModule = 'bar'; -let barCjs = 'bar'; -let fooDefault = 'foo'; -let barDefault = 'bar'; - -module.exports = { - description: 'handles interop "false" with live-bindings support', - options: { - strictDeprecations: false, - external: id => id.startsWith('external') || id === 'update', - output: { - interop: false, - format: 'cjs' - } - }, - context: { - require(id) { - switch (id) { - case 'external-module': - return Object.defineProperty( - { - get default() { - return fooModule; - }, - get barModule() { - return barModule; - } - }, - '__esModule', - { value: true } - ); - case 'external-cjs': - return { - get barCjs() { - return barCjs; - } - }; - case 'external-cjs-with-default': - return { - get default() { - return fooDefault; - }, - get barDefault() { - return barDefault; - } - }; - case 'update': - return () => { - fooModule = 'foo2'; - barModule = 'bar2'; - barCjs = 'bar2'; - fooDefault = 'foo2'; - barDefault = 'bar2'; - }; - default: - throw new Error(`Unexpected import "${id}"`); - } - } - }, - warnings: [ - { - code: 'DEPRECATED_FEATURE', - message: - 'The boolean value "false" for the "output.interop" option is deprecated. Use "esModule", "default" or "defaultOnly" instead.', - url: 'https://rollupjs.org/guide/en/#outputinterop' - } - ] -}; diff --git a/test/function/samples/deprecated/interop-false/main.js b/test/function/samples/deprecated/interop-false/main.js deleted file mode 100644 index ef2d7bbd26a..00000000000 --- a/test/function/samples/deprecated/interop-false/main.js +++ /dev/null @@ -1,29 +0,0 @@ -import fooModule, { barModule } from 'external-module'; -import * as bazModule from 'external-module'; -import fooCjs, { barCjs } from 'external-cjs'; -import * as bazCjs from 'external-cjs'; -import fooDefault, { barDefault } from 'external-cjs-with-default'; -import * as bazDefault from 'external-cjs-with-default'; -import update from 'update'; - -assert.deepStrictEqual(fooModule, { barModule: 'bar', default: 'foo' }, 'module'); -assert.strictEqual(barModule, 'bar', 'module'); -assert.deepStrictEqual(bazModule, { barModule: 'bar', default: 'foo' }, 'module'); -assert.deepStrictEqual(fooCjs, { barCjs: 'bar' }, 'cjs'); -assert.strictEqual(barCjs, 'bar', 'cjs'); -assert.deepStrictEqual(bazCjs, { barCjs: 'bar' }, 'cjs'); -assert.deepStrictEqual(fooDefault, { barDefault: 'bar', default: 'foo' }, 'default'); -assert.strictEqual(barDefault, 'bar', 'default'); -assert.deepStrictEqual(bazDefault, { barDefault: 'bar', default: 'foo' }, 'default'); - -update(); - -assert.deepStrictEqual(fooModule, { barModule: 'bar2', default: 'foo2' }, 'module'); -assert.strictEqual(barModule, 'bar2', 'module'); -assert.deepStrictEqual(bazModule, { barModule: 'bar2', default: 'foo2' }, 'module'); -assert.deepStrictEqual(fooCjs, { barCjs: 'bar2' }, 'cjs'); -assert.strictEqual(barCjs, 'bar2', 'cjs'); -assert.deepStrictEqual(bazCjs, { barCjs: 'bar2' }, 'cjs'); -assert.deepStrictEqual(fooDefault, { barDefault: 'bar2', default: 'foo2' }, 'default'); -assert.strictEqual(barDefault, 'bar2', 'default'); -assert.deepStrictEqual(bazDefault, { barDefault: 'bar2', default: 'foo2' }, 'default'); diff --git a/test/function/samples/deprecated/interop-true-live-bindings/_config.js b/test/function/samples/deprecated/interop-true-live-bindings/_config.js deleted file mode 100644 index 13a9669136b..00000000000 --- a/test/function/samples/deprecated/interop-true-live-bindings/_config.js +++ /dev/null @@ -1,69 +0,0 @@ -let fooModule = 'foo'; -let barModule = 'bar'; -let barCjs = 'bar'; -let fooDefault = 'foo'; -let barDefault = 'bar'; - -module.exports = { - description: 'handles interop "true" with live-bindings support', - options: { - strictDeprecations: false, - external: id => id.startsWith('external') || id === 'update', - output: { - interop: true, - format: 'cjs' - } - }, - context: { - require(id) { - switch (id) { - case 'external-module': - return Object.defineProperty( - { - get default() { - return fooModule; - }, - get barModule() { - return barModule; - } - }, - '__esModule', - { value: true } - ); - case 'external-cjs': - return { - get barCjs() { - return barCjs; - } - }; - case 'external-cjs-with-default': - return { - get default() { - return fooDefault; - }, - get barDefault() { - return barDefault; - } - }; - case 'update': - return () => { - fooModule = 'foo2'; - barModule = 'bar2'; - barCjs = 'bar2'; - fooDefault = 'foo2'; - barDefault = 'bar2'; - }; - default: - throw new Error(`Unexpected import "${id}"`); - } - } - }, - warnings: [ - { - code: 'DEPRECATED_FEATURE', - message: - 'The boolean value "true" for the "output.interop" option is deprecated. Use "auto" instead.', - url: 'https://rollupjs.org/guide/en/#outputinterop' - } - ] -}; diff --git a/test/function/samples/deprecated/interop-true-live-bindings/main.js b/test/function/samples/deprecated/interop-true-live-bindings/main.js deleted file mode 100644 index 6d04bcb4cd0..00000000000 --- a/test/function/samples/deprecated/interop-true-live-bindings/main.js +++ /dev/null @@ -1,45 +0,0 @@ -import fooModule, { barModule } from 'external-module'; -import * as bazModule from 'external-module'; -import fooCjs, { barCjs } from 'external-cjs'; -import * as bazCjs from 'external-cjs'; -import fooDefault, { barDefault } from 'external-cjs-with-default'; -import * as bazDefault from 'external-cjs-with-default'; -import update from 'update'; - -assert.strictEqual(fooModule, 'foo', 'module'); -assert.strictEqual(barModule, 'bar', 'module'); -assert.deepStrictEqual(bazModule, { barModule: 'bar', default: 'foo' }, 'module'); -assert.deepStrictEqual(fooCjs, { barCjs: 'bar' }, 'cjs'); -assert.strictEqual(barCjs, 'bar', 'cjs'); -assert.deepStrictEqual( - bazCjs, - { __proto__: null, barCjs: 'bar', default: { barCjs: 'bar' } }, - 'cjs' -); -assert.deepStrictEqual(fooDefault, 'foo', 'default'); -assert.strictEqual(barDefault, 'bar', 'default'); -assert.deepStrictEqual( - bazDefault, - { __proto__: null, barDefault: 'bar', default: { barDefault: 'bar', default: 'foo' } }, - 'default' -); - -update(); - -assert.strictEqual(fooModule, 'foo2', 'module'); -assert.strictEqual(barModule, 'bar2', 'module'); -assert.deepStrictEqual(bazModule, { barModule: 'bar2', default: 'foo2' }, 'module'); -assert.deepStrictEqual(fooCjs, { barCjs: 'bar2' }, 'cjs'); -assert.strictEqual(barCjs, 'bar2', 'cjs'); -assert.deepStrictEqual( - bazCjs, - { __proto__: null, barCjs: 'bar2', default: { barCjs: 'bar2' } }, - 'cjs' -); -assert.deepStrictEqual(fooDefault, 'foo2', 'default'); -assert.strictEqual(barDefault, 'bar2', 'default'); -assert.deepStrictEqual( - bazDefault, - { __proto__: null, barDefault: 'bar2', default: { barDefault: 'bar2', default: 'foo2' } }, - 'default' -); diff --git a/test/function/samples/deprecated/interop-true-no-live-bindings/_config.js b/test/function/samples/deprecated/interop-true-no-live-bindings/_config.js deleted file mode 100644 index 5bba6bb7ecc..00000000000 --- a/test/function/samples/deprecated/interop-true-no-live-bindings/_config.js +++ /dev/null @@ -1,56 +0,0 @@ -module.exports = { - description: 'handles interop "true" without live-bindings support', - options: { - strictDeprecations: false, - external: id => id.startsWith('external') || id === 'update', - output: { - interop: true, - format: 'cjs', - externalLiveBindings: false - } - }, - context: { - require(id) { - switch (id) { - case 'external-module': - return Object.defineProperty( - { - get default() { - return 'foo'; - }, - get barModule() { - return 'bar'; - } - }, - '__esModule', - { value: true } - ); - case 'external-cjs': - return { - get barCjs() { - return 'bar'; - } - }; - case 'external-cjs-with-default': - return { - get default() { - return 'foo'; - }, - get barDefault() { - return 'bar'; - } - }; - default: - throw new Error(`Unexpected import "${id}"`); - } - } - }, - warnings: [ - { - code: 'DEPRECATED_FEATURE', - message: - 'The boolean value "true" for the "output.interop" option is deprecated. Use "auto" instead.', - url: 'https://rollupjs.org/guide/en/#outputinterop' - } - ] -}; diff --git a/test/function/samples/deprecated/interop-true-no-live-bindings/main.js b/test/function/samples/deprecated/interop-true-no-live-bindings/main.js deleted file mode 100644 index b32dcac1b99..00000000000 --- a/test/function/samples/deprecated/interop-true-no-live-bindings/main.js +++ /dev/null @@ -1,24 +0,0 @@ -import fooModule, { barModule } from 'external-module'; -import * as bazModule from 'external-module'; -import fooCjs, { barCjs } from 'external-cjs'; -import * as bazCjs from 'external-cjs'; -import fooDefault, { barDefault } from 'external-cjs-with-default'; -import * as bazDefault from 'external-cjs-with-default'; - -assert.strictEqual(fooModule, 'foo', 'module'); -assert.strictEqual(barModule, 'bar', 'module'); -assert.deepStrictEqual(bazModule, { barModule: 'bar', default: 'foo' }, 'module'); -assert.deepStrictEqual(fooCjs, { barCjs: 'bar' }, 'cjs'); -assert.strictEqual(barCjs, 'bar', 'cjs'); -assert.deepStrictEqual( - bazCjs, - { __proto__: null, barCjs: 'bar', default: { barCjs: 'bar' } }, - 'cjs' -); -assert.deepStrictEqual(fooDefault, 'foo', 'default'); -assert.strictEqual(barDefault, 'bar', 'default'); -assert.deepStrictEqual( - bazDefault, - { __proto__: null, barDefault: 'bar', default: { barDefault: 'bar', default: 'foo' } }, - 'default' -); diff --git a/test/function/samples/deprecations/interop-false-function/_config.js b/test/function/samples/deprecations/interop-false-function/_config.js deleted file mode 100644 index 4225a5582f2..00000000000 --- a/test/function/samples/deprecations/interop-false-function/_config.js +++ /dev/null @@ -1,17 +0,0 @@ -module.exports = { - description: - 'marks "false" for the "output.interop" option as deprecated when using the function form', - options: { - strictDeprecations: true, - external: 'external', - output: { - interop: () => false - } - }, - generateError: { - code: 'DEPRECATED_FEATURE', - message: - 'The boolean value "false" for the "output.interop" option is deprecated. Use "esModule", "default" or "defaultOnly" instead.', - url: 'https://rollupjs.org/guide/en/#outputinterop' - } -}; diff --git a/test/function/samples/deprecations/interop-false-function/main.js b/test/function/samples/deprecations/interop-false-function/main.js deleted file mode 100644 index 785cd9f1e41..00000000000 --- a/test/function/samples/deprecations/interop-false-function/main.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from 'external'; diff --git a/test/function/samples/deprecations/interop-false/_config.js b/test/function/samples/deprecations/interop-false/_config.js deleted file mode 100644 index 185d6c320c3..00000000000 --- a/test/function/samples/deprecations/interop-false/_config.js +++ /dev/null @@ -1,16 +0,0 @@ -module.exports = { - description: 'marks "false" for the "output.interop" option as deprecated', - options: { - strictDeprecations: true, - external: 'external', - output: { - interop: false - } - }, - generateError: { - code: 'DEPRECATED_FEATURE', - message: - 'The boolean value "false" for the "output.interop" option is deprecated. Use "esModule", "default" or "defaultOnly" instead.', - url: 'https://rollupjs.org/guide/en/#outputinterop' - } -}; diff --git a/test/function/samples/deprecations/interop-false/main.js b/test/function/samples/deprecations/interop-false/main.js deleted file mode 100644 index 785cd9f1e41..00000000000 --- a/test/function/samples/deprecations/interop-false/main.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from 'external'; diff --git a/test/function/samples/deprecations/interop-true-function/_config.js b/test/function/samples/deprecations/interop-true-function/_config.js deleted file mode 100644 index 83fff02bcb9..00000000000 --- a/test/function/samples/deprecations/interop-true-function/_config.js +++ /dev/null @@ -1,17 +0,0 @@ -module.exports = { - description: - 'marks "true" for the "output.interop" option as deprecated when using the function form', - options: { - strictDeprecations: true, - external: 'external', - output: { - interop: () => true - } - }, - generateError: { - code: 'DEPRECATED_FEATURE', - message: - 'The boolean value "true" for the "output.interop" option is deprecated. Use "auto" instead.', - url: 'https://rollupjs.org/guide/en/#outputinterop' - } -}; diff --git a/test/function/samples/deprecations/interop-true-function/main.js b/test/function/samples/deprecations/interop-true-function/main.js deleted file mode 100644 index 785cd9f1e41..00000000000 --- a/test/function/samples/deprecations/interop-true-function/main.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from 'external'; diff --git a/test/function/samples/deprecations/interop-true/_config.js b/test/function/samples/deprecations/interop-true/_config.js deleted file mode 100644 index 737206217d1..00000000000 --- a/test/function/samples/deprecations/interop-true/_config.js +++ /dev/null @@ -1,16 +0,0 @@ -module.exports = { - description: 'marks "true" for the "output.interop" option as deprecated', - options: { - strictDeprecations: true, - external: 'external', - output: { - interop: true - } - }, - generateError: { - code: 'DEPRECATED_FEATURE', - message: - 'The boolean value "true" for the "output.interop" option is deprecated. Use "auto" instead.', - url: 'https://rollupjs.org/guide/en/#outputinterop' - } -}; diff --git a/test/function/samples/deprecations/interop-true/main.js b/test/function/samples/deprecations/interop-true/main.js deleted file mode 100644 index 785cd9f1e41..00000000000 --- a/test/function/samples/deprecations/interop-true/main.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from 'external'; diff --git a/test/function/samples/external-dynamic-import-live-binding-compact/_config.js b/test/function/samples/external-dynamic-import-live-binding-compact/_config.js index c49679c2bee..0e470b8e402 100644 --- a/test/function/samples/external-dynamic-import-live-binding-compact/_config.js +++ b/test/function/samples/external-dynamic-import-live-binding-compact/_config.js @@ -7,7 +7,8 @@ module.exports = { return true; }, output: { - compact: true + compact: true, + interop: 'auto' } }, context: { diff --git a/test/function/samples/external-dynamic-import-live-binding/_config.js b/test/function/samples/external-dynamic-import-live-binding/_config.js index bf776180ab3..c1af09978c0 100644 --- a/test/function/samples/external-dynamic-import-live-binding/_config.js +++ b/test/function/samples/external-dynamic-import-live-binding/_config.js @@ -5,7 +5,8 @@ module.exports = { options: { external() { return true; - } + }, + output: { interop: 'auto' } }, context: { require(id) { diff --git a/test/function/samples/external-live-binding/_config.js b/test/function/samples/external-live-binding/_config.js index 55c033a38ed..ea3dfaede1d 100644 --- a/test/function/samples/external-live-binding/_config.js +++ b/test/function/samples/external-live-binding/_config.js @@ -7,7 +7,8 @@ let defaulted; module.exports = { description: 'handles external live-bindings', options: { - external: ['named', 'star', 'defaulted'] + external: ['named', 'star', 'defaulted'], + output: { interop: 'compat' } }, context: { require(id) { diff --git a/test/function/samples/interop-default-conflict/_config.js b/test/function/samples/interop-default-conflict/_config.js index aeaf1925ff6..7051b2b262c 100644 --- a/test/function/samples/interop-default-conflict/_config.js +++ b/test/function/samples/interop-default-conflict/_config.js @@ -7,7 +7,8 @@ module.exports = { description: 'handles conflicts with added interop default variables and supports default live bindings', options: { - external: 'external' + external: 'external', + output: { interop: 'compat' } }, context: { require() { diff --git a/test/function/samples/invalid-interop/_config.js b/test/function/samples/invalid-interop/_config.js index 37a858a3a72..b7b5b065616 100644 --- a/test/function/samples/invalid-interop/_config.js +++ b/test/function/samples/invalid-interop/_config.js @@ -9,7 +9,7 @@ module.exports = { generateError: { code: 'INVALID_OPTION', message: - 'Invalid value "true" for option "output.interop" - use one of "auto", "esModule", "default", "defaultOnly", true, false.', + 'Invalid value "true" for option "output.interop" - use one of "compat", "auto", "esModule", "default", "defaultOnly".', url: 'https://rollupjs.org/guide/en/#outputinterop' } }; diff --git a/test/function/samples/output-options-hook/_config.js b/test/function/samples/output-options-hook/_config.js index 6ab0dcbb703..2439d2ab222 100644 --- a/test/function/samples/output-options-hook/_config.js +++ b/test/function/samples/output-options-hook/_config.js @@ -25,7 +25,7 @@ module.exports = { chunkFileNames: '[name]-[hash].js', compact: false, entryFileNames: '[name].js', - esModule: true, + esModule: 'if-default-prop', exports: 'auto', extend: false, externalLiveBindings: true, diff --git a/test/misc/iife.js b/test/misc/iife.js index 3adf428a1f6..759a053132a 100644 --- a/test/misc/iife.js +++ b/test/misc/iife.js @@ -136,8 +136,6 @@ describe('The IIFE wrapper with an illegal name', () => { '\n' + '\texports.x = x;\n' + '\n' + - "\tObject.defineProperty(exports, '__esModule', { value: true });\n" + - '\n' + '})(this["my=name"] = this["my=name"] || {});\n' ) )); diff --git a/test/watch/index.js b/test/watch/index.js index 85f357c6483..e91af31ad16 100644 --- a/test/watch/index.js +++ b/test/watch/index.js @@ -38,7 +38,6 @@ describe('rollup.watch', () => { await new Promise((fulfil, reject) => { function go(event) { const next = events.shift(); - if (!next) { watcher.close(); fulfil();