From 5ed7e06c32d757b1de5f465ca40fadf24eb8fca9 Mon Sep 17 00:00:00 2001 From: TrickyPi <530257315@qq.com> Date: Sun, 18 Dec 2022 21:20:41 +0800 Subject: [PATCH 1/7] fix: deduplicate reexports and renderedExports --- src/Chunk.ts | 36 ++++++++++++++++++++++++++++++++---- src/finalisers/system.ts | 2 +- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/src/Chunk.ts b/src/Chunk.ts index da273cd3189..ccad23a7f46 100644 --- a/src/Chunk.ts +++ b/src/Chunk.ts @@ -603,13 +603,17 @@ export default class Chunk { const renderedExports = exportMode === 'none' ? [] : this.getChunkExportDeclarations(format); let hasExports = renderedExports.length > 0; let hasDefaultExport = false; - for (const { reexports } of renderedDependencies) { + for (const renderedDependence of renderedDependencies) { + const { reexports } = renderedDependence; if (reexports?.length) { hasExports = true; - if (reexports.some(reexport => reexport.reexported === 'default')) { + if (!hasDefaultExport && reexports.some(reexport => reexport.reexported === 'default')) { hasDefaultExport = true; - break; } + renderedDependence.reexports = reexports.filter( + // eslint-disable-next-line unicorn/prefer-array-some + ({ reexported }) => !renderedExports.find(({ exported }) => exported === reexported) + ); } } if (!hasDefaultExport) { @@ -769,7 +773,31 @@ export default class Chunk { const variable = this.exportsByName.get(exportName)!; if (!(variable instanceof SyntheticNamedExportVariable)) { const module = variable.module; - if (module && this.chunkByModule.get(module as Module) !== this) continue; + if (module) { + const chunk = this.chunkByModule.get(module as Module); + if (!chunk) { + continue; + } + if (chunk !== this) { + if (!this.renderedDependencies) { + continue; + } + const chunkDep = this.renderedDependencies.get(chunk); + if (!chunkDep) { + continue; + } + const { imports, reexports } = chunkDep; + const importedByreexported = reexports?.find( + ({ reexported }) => reexported === exportName + ); + const isImported = imports?.find( + ({ imported }) => imported === importedByreexported?.imported + ); + if (!isImported) { + continue; + } + } + } } let expression = null; let hoisted = false; diff --git a/src/finalisers/system.ts b/src/finalisers/system.ts index 49f07bd4d18..0691276bebf 100644 --- a/src/finalisers/system.ts +++ b/src/finalisers/system.ts @@ -151,7 +151,7 @@ function analyzeDependencies( } else { setter.push(`exports(${exportMapping});`); } - } else { + } else if (reexportedNames.length === 1) { const [key, value] = reexportedNames[0]; setter.push(`exports('${key}',${_}${value});`); } From 0913df981bebb4f7793edf94fbfbef654a1b6590 Mon Sep 17 00:00:00 2001 From: TrickyPi <530257315@qq.com> Date: Sun, 18 Dec 2022 22:27:12 +0800 Subject: [PATCH 2/7] test: regression es test --- .../preserve-modules-auto-export-mode/_expected/es/main.js | 3 ++- .../preserve-modules-commonjs/_expected/es/other.js | 3 ++- .../preserve-modules-named-export-mode/_expected/es/main.js | 3 ++- .../preserve-modules-non-entry-imports/_expected/es/main.js | 5 ++++- .../_expected/es/generated-dynamic2.js | 3 ++- .../_expected/es/generated-dynamic2.js | 3 ++- .../_expected/es/generated-dynamic.js | 4 ++-- .../_expected/es/main1.js | 4 ++-- .../_expected/es/main2.js | 3 ++- .../_expected/es/generated-dynamic.js | 4 ++-- .../multi-entry-different-dependencies/_expected/es/main1.js | 4 ++-- .../multi-entry-different-dependencies/_expected/es/main2.js | 3 ++- .../_expected/es/generated-dynamic1.js | 3 ++- .../_expected/es/generated-dynamic2.js | 3 ++- .../_expected/es/main1.js | 3 +-- .../_expected/es/main2.js | 3 ++- .../_expected/es/generated-dynamic.js | 3 ++- .../single-dynamic/_expected/es/generated-dynamic.js | 3 ++- .../preserve-modules-auto-export-mode/_expected/es/main.js | 3 ++- .../samples/preserve-modules-commonjs/_expected/es/other.js | 3 ++- .../_expected/es/main.js | 3 ++- .../preserve-modules-named-export-mode/_expected/es/main.js | 3 ++- .../preserve-modules-non-entry-imports/_expected/es/main.js | 5 ++++- .../es/custom_modules/@my-scope/my-base-pkg/index.js | 3 ++- .../samples/reexport-shortpaths/_expected/es/main1.js | 5 ++++- .../_expected/es/main1.js | 3 +-- 26 files changed, 56 insertions(+), 32 deletions(-) diff --git a/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_expected/es/main.js b/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_expected/es/main.js index 1db891a835f..4aad85561da 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_expected/es/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_expected/es/main.js @@ -1,8 +1,9 @@ import foo from './default.js'; -export { default } from './default.js'; import { value } from './named.js'; console.log(foo, value); import('./default.js').then(result => console.log(result.default)); import('./named.js').then(result => console.log(result.value)); + +export { foo as default }; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/es/other.js b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/es/other.js index 5f0ad225f2e..005a4febb68 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/es/other.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/es/other.js @@ -1,4 +1,5 @@ import { __exports as other } from './_virtual/other.js'; -export { __exports as default } from './_virtual/other.js'; other.value = 43; + +export { other as default }; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/es/main.js b/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/es/main.js index 1db891a835f..4aad85561da 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/es/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/es/main.js @@ -1,8 +1,9 @@ import foo from './default.js'; -export { default } from './default.js'; import { value } from './named.js'; console.log(foo, value); import('./default.js').then(result => console.log(result.default)); import('./named.js').then(result => console.log(result.value)); + +export { foo as default }; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-non-entry-imports/_expected/es/main.js b/test/chunking-form/samples/deprecated/preserve-modules-non-entry-imports/_expected/es/main.js index 845c1582956..46cbf60f18d 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-non-entry-imports/_expected/es/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-non-entry-imports/_expected/es/main.js @@ -1,2 +1,5 @@ import foo from './dep2.js'; -export { default } from './dep2.js'; + + + +export { foo as default }; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/es/generated-dynamic2.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/es/generated-dynamic2.js index a092412cc30..982e0f809e7 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/es/generated-dynamic2.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/es/generated-dynamic2.js @@ -1,4 +1,5 @@ import { value } from './main.js'; -export { value } from './main.js'; console.log('dynamic2', value); + +export { value }; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/es/generated-dynamic2.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/es/generated-dynamic2.js index 83da591c684..9e77312b6b4 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/es/generated-dynamic2.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/es/generated-dynamic2.js @@ -1,4 +1,5 @@ import { value } from './generated-dynamic1.js'; -export { value } from './generated-dynamic1.js'; console.log('dynamic2', value); + +export { value }; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/es/generated-dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/es/generated-dynamic.js index 27e2a2c6636..6380c9bf25f 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/es/generated-dynamic.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/es/generated-dynamic.js @@ -1,6 +1,6 @@ import { v as value1 } from './generated-from-main-1-and-dynamic.js'; -export { v as value1 } from './generated-from-main-1-and-dynamic.js'; import { v as value2 } from './generated-from-main-1-and-2.js'; -export { v as value2 } from './generated-from-main-1-and-2.js'; console.log('dynamic1', value1, value2); + +export { value1, value2 }; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/es/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/es/main1.js index 8762e90e0e4..3b3b3151a91 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/es/main1.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/es/main1.js @@ -1,7 +1,7 @@ import { v as value1 } from './generated-from-main-1-and-dynamic.js'; -export { v as value1 } from './generated-from-main-1-and-dynamic.js'; import { v as value2, a as value3 } from './generated-from-main-1-and-2.js'; -export { v as value2, a as value3 } from './generated-from-main-1-and-2.js'; console.log('main1', value1, value2, value3); import('./generated-dynamic.js'); + +export { value1, value2, value3 }; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/es/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/es/main2.js index 0967a06d772..69ec00b4439 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/es/main2.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/es/main2.js @@ -1,5 +1,6 @@ import { v as value2, a as value3 } from './generated-from-main-1-and-2.js'; -export { v as value2, a as value3 } from './generated-from-main-1-and-2.js'; console.log('main2', value2, value3); import('./generated-dynamic.js'); + +export { value2, value3 }; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/es/generated-dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/es/generated-dynamic.js index f4548c7c3ac..048134a8fb1 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/es/generated-dynamic.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/es/generated-dynamic.js @@ -1,6 +1,6 @@ import { v as value1 } from './generated-dep1.js'; -export { v as value1 } from './generated-dep1.js'; import { v as value2 } from './generated-dep2.js'; -export { v as value2 } from './generated-dep2.js'; console.log('dynamic1', value1, value2); + +export { value1, value2 }; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/es/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/es/main1.js index fa5963a970a..a6e38954434 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/es/main1.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/es/main1.js @@ -1,9 +1,9 @@ import { v as value1 } from './generated-dep1.js'; -export { v as value1 } from './generated-dep1.js'; import { v as value2 } from './generated-dep2.js'; -export { v as value2 } from './generated-dep2.js'; const something = 'something'; console.log('main1', value1, value2, something); import('./generated-dynamic.js'); + +export { value1, value2 }; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/es/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/es/main2.js index eac967da533..9c7e4462b03 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/es/main2.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/es/main2.js @@ -1,5 +1,6 @@ import { v as value2 } from './generated-dep2.js'; -export { v as value2 } from './generated-dep2.js'; console.log('main2', value2); import('./generated-dynamic.js'); + +export { value2 }; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/es/generated-dynamic1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/es/generated-dynamic1.js index eec2d5323f1..76961847004 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/es/generated-dynamic1.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/es/generated-dynamic1.js @@ -1,5 +1,6 @@ import { value1 } from './main1.js'; -export { value1 } from './main1.js'; import './generated-dep2.js'; console.log('dynamic1', value1); + +export { value1 }; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/es/generated-dynamic2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/es/generated-dynamic2.js index ce16c9af379..027cb6f031e 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/es/generated-dynamic2.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/es/generated-dynamic2.js @@ -1,4 +1,5 @@ import { v as value2 } from './generated-dep2.js'; -export { v as value2 } from './generated-dep2.js'; console.log('dynamic2', value2); + +export { value2 }; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/es/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/es/main1.js index 090f16af526..d32767617a2 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/es/main1.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/es/main1.js @@ -1,9 +1,8 @@ import { v as value2 } from './generated-dep2.js'; -export { v as value2 } from './generated-dep2.js'; const value1 = 'shared1'; console.log('main1', value1, value2); import('./generated-dynamic1.js'); -export { value1 }; +export { value1, value2 }; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/es/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/es/main2.js index 7837ea7eca3..4217394441d 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/es/main2.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/es/main2.js @@ -1,5 +1,6 @@ import { v as value2 } from './generated-dep2.js'; -export { v as value2 } from './generated-dep2.js'; console.log('main2', value2); import('./generated-dynamic2.js'); + +export { value2 }; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/es/generated-dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/es/generated-dynamic.js index 5726f3b9c9f..dc895901989 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/es/generated-dynamic.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/es/generated-dynamic.js @@ -1,4 +1,5 @@ import { value } from './main.js'; -export { value } from './main.js'; console.log('dynamic', value); + +export { value }; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/es/generated-dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/es/generated-dynamic.js index 5726f3b9c9f..dc895901989 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/es/generated-dynamic.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/es/generated-dynamic.js @@ -1,4 +1,5 @@ import { value } from './main.js'; -export { value } from './main.js'; console.log('dynamic', value); + +export { value }; diff --git a/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/es/main.js b/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/es/main.js index 1db891a835f..4aad85561da 100644 --- a/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/es/main.js +++ b/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/es/main.js @@ -1,8 +1,9 @@ import foo from './default.js'; -export { default } from './default.js'; import { value } from './named.js'; console.log(foo, value); import('./default.js').then(result => console.log(result.default)); import('./named.js').then(result => console.log(result.value)); + +export { foo as default }; diff --git a/test/chunking-form/samples/preserve-modules-commonjs/_expected/es/other.js b/test/chunking-form/samples/preserve-modules-commonjs/_expected/es/other.js index 5f0ad225f2e..005a4febb68 100644 --- a/test/chunking-form/samples/preserve-modules-commonjs/_expected/es/other.js +++ b/test/chunking-form/samples/preserve-modules-commonjs/_expected/es/other.js @@ -1,4 +1,5 @@ import { __exports as other } from './_virtual/other.js'; -export { __exports as default } from './_virtual/other.js'; other.value = 43; + +export { other as default }; diff --git a/test/chunking-form/samples/preserve-modules-default-mode-namespace/_expected/es/main.js b/test/chunking-form/samples/preserve-modules-default-mode-namespace/_expected/es/main.js index 17433b486bb..e4f825b8bb8 100644 --- a/test/chunking-form/samples/preserve-modules-default-mode-namespace/_expected/es/main.js +++ b/test/chunking-form/samples/preserve-modules-default-mode-namespace/_expected/es/main.js @@ -1,5 +1,6 @@ import * as lib from './lib.js'; -export { lib }; console.log(lib); import('./lib.js').then(console.log); + +export { lib }; diff --git a/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/es/main.js b/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/es/main.js index 1db891a835f..4aad85561da 100644 --- a/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/es/main.js +++ b/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/es/main.js @@ -1,8 +1,9 @@ import foo from './default.js'; -export { default } from './default.js'; import { value } from './named.js'; console.log(foo, value); import('./default.js').then(result => console.log(result.default)); import('./named.js').then(result => console.log(result.value)); + +export { foo as default }; diff --git a/test/chunking-form/samples/preserve-modules-non-entry-imports/_expected/es/main.js b/test/chunking-form/samples/preserve-modules-non-entry-imports/_expected/es/main.js index 845c1582956..46cbf60f18d 100644 --- a/test/chunking-form/samples/preserve-modules-non-entry-imports/_expected/es/main.js +++ b/test/chunking-form/samples/preserve-modules-non-entry-imports/_expected/es/main.js @@ -1,2 +1,5 @@ import foo from './dep2.js'; -export { default } from './dep2.js'; + + + +export { foo as default }; diff --git a/test/chunking-form/samples/preserve-modules-root/_expected/es/custom_modules/@my-scope/my-base-pkg/index.js b/test/chunking-form/samples/preserve-modules-root/_expected/es/custom_modules/@my-scope/my-base-pkg/index.js index 1a37c8356d7..6f15b713d5e 100644 --- a/test/chunking-form/samples/preserve-modules-root/_expected/es/custom_modules/@my-scope/my-base-pkg/index.js +++ b/test/chunking-form/samples/preserve-modules-root/_expected/es/custom_modules/@my-scope/my-base-pkg/index.js @@ -1,8 +1,9 @@ import { __exports as myBasePkg } from '../../../_virtual/index.js'; -export { __exports as default } from '../../../_virtual/index.js'; Object.defineProperty(myBasePkg, '__esModule', { value: true }); var hello = 'world'; myBasePkg.hello = hello; + +export { myBasePkg as default }; diff --git a/test/chunking-form/samples/reexport-shortpaths/_expected/es/main1.js b/test/chunking-form/samples/reexport-shortpaths/_expected/es/main1.js index 017843b99a5..b79be341f29 100644 --- a/test/chunking-form/samples/reexport-shortpaths/_expected/es/main1.js +++ b/test/chunking-form/samples/reexport-shortpaths/_expected/es/main1.js @@ -1,2 +1,5 @@ import { f as foo } from './generated-dep2.js'; -export { f as default } from './generated-dep2.js'; + + + +export { foo as default }; diff --git a/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/es/main1.js b/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/es/main1.js index fd5fab10b7a..797c479bb91 100644 --- a/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/es/main1.js +++ b/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/es/main1.js @@ -1,7 +1,6 @@ import { l as lib } from './generated-lib.js'; -export { l as lib } from './generated-lib.js'; var foo = lib.foo; -export { foo }; +export { foo, lib }; From 5c3ae7a6c6af8c8c7feeb6181195d67c10581f59 Mon Sep 17 00:00:00 2001 From: TrickyPi <530257315@qq.com> Date: Sun, 18 Dec 2022 22:28:03 +0800 Subject: [PATCH 3/7] test: regression amd and cjs test --- .../_expected/amd/main1.js | 2 +- .../_expected/cjs/main1.js | 2 +- .../_expected/amd/main1.js | 2 +- .../_expected/cjs/main1.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 cb1d05e77eb..95aad45c031 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 @@ -5,7 +5,7 @@ define(['require', 'exports', './generated-dep2'], (function (require, exports, console.log('main1', value1, dep2.value2); new Promise(function (resolve, reject) { require(['./generated-dynamic1'], resolve, reject); }); - exports.value2 = dep2.value2; exports.value1 = value1; + exports.value2 = dep2.value2; })); 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 204a4307432..249f6717c0b 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 @@ -7,5 +7,5 @@ const value1 = 'shared1'; console.log('main1', value1, dep2.value2); Promise.resolve().then(function () { return require('./generated-dynamic1.js'); }); -exports.value2 = dep2.value2; exports.value1 = value1; +exports.value2 = dep2.value2; 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 07a94775028..5698e69c489 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 @@ -2,7 +2,7 @@ define(['exports', './generated-lib'], (function (exports, lib) { 'use strict'; - exports.lib = lib.lib; exports.foo = lib.lib.foo; + exports.lib = lib.lib; })); 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 4f7923b2b8c..9c42765097b 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 @@ -4,5 +4,5 @@ var lib = require('./generated-lib.js'); -exports.lib = lib.lib; exports.foo = lib.lib.foo; +exports.lib = lib.lib; From 9159eb4c84746eb09a2ce7d81bd61b1ef5319c35 Mon Sep 17 00:00:00 2001 From: TrickyPi <530257315@qq.com> Date: Sun, 18 Dec 2022 22:28:27 +0800 Subject: [PATCH 4/7] test: regression system test --- .../preserve-modules-auto-export-mode/_expected/system/main.js | 1 - .../preserve-modules-commonjs/_expected/system/other.js | 1 - .../_expected/system/main.js | 1 - .../_expected/system/main.js | 3 ++- .../_expected/system/generated-dynamic2.js | 1 - .../_expected/system/generated-dynamic2.js | 1 - .../_expected/system/generated-dynamic.js | 2 -- .../_expected/system/main1.js | 2 -- .../_expected/system/main2.js | 1 - .../_expected/system/generated-dynamic.js | 2 -- .../_expected/system/main1.js | 2 -- .../_expected/system/main2.js | 1 - .../_expected/system/generated-dynamic1.js | 1 - .../_expected/system/generated-dynamic2.js | 1 - .../_expected/system/main1.js | 1 - .../_expected/system/main2.js | 1 - .../_expected/system/generated-dynamic.js | 1 - .../single-dynamic/_expected/system/generated-dynamic.js | 1 - .../preserve-modules-auto-export-mode/_expected/system/main.js | 1 - .../preserve-modules-commonjs/_expected/system/other.js | 1 - .../_expected/system/main.js | 1 - .../_expected/system/main.js | 1 - .../_expected/system/main.js | 3 ++- .../system/custom_modules/@my-scope/my-base-pkg/index.js | 1 - .../samples/reexport-shortpaths/_expected/system/main1.js | 3 ++- .../_expected/system/main1.js | 1 - 26 files changed, 6 insertions(+), 30 deletions(-) diff --git a/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_expected/system/main.js b/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_expected/system/main.js index 16b732c1652..d92e13e0553 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_expected/system/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_expected/system/main.js @@ -4,7 +4,6 @@ System.register(['./default.js', './named.js'], (function (exports, module) { return { setters: [function (module) { foo = module.default; - exports('default', module.default); }, function (module) { value = module.value; }], diff --git a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/other.js b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/other.js index 1f428fbcf18..cf790ac4a92 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/other.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/other.js @@ -4,7 +4,6 @@ System.register(['./_virtual/other.js'], (function (exports) { return { setters: [function (module) { other = module.__exports; - exports('default', module.__exports); }], execute: (function () { diff --git a/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/system/main.js b/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/system/main.js index 16b732c1652..d92e13e0553 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/system/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/system/main.js @@ -4,7 +4,6 @@ System.register(['./default.js', './named.js'], (function (exports, module) { return { setters: [function (module) { foo = module.default; - exports('default', module.default); }, function (module) { value = module.value; }], diff --git a/test/chunking-form/samples/deprecated/preserve-modules-non-entry-imports/_expected/system/main.js b/test/chunking-form/samples/deprecated/preserve-modules-non-entry-imports/_expected/system/main.js index 5efe40310f9..b86cce2cbe3 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-non-entry-imports/_expected/system/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-non-entry-imports/_expected/system/main.js @@ -4,10 +4,11 @@ System.register(['./dep2.js'], (function (exports) { return { setters: [function (module) { foo = module.default; - exports('default', module.default); }], execute: (function () { + exports('default', foo); + }) diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/system/generated-dynamic2.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/system/generated-dynamic2.js index 7d4687f325d..30664d445f6 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/system/generated-dynamic2.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/system/generated-dynamic2.js @@ -4,7 +4,6 @@ System.register(['./main.js'], (function (exports) { return { setters: [function (module) { value = module.value; - exports('value', module.value); }], execute: (function () { diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/system/generated-dynamic2.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/system/generated-dynamic2.js index 225fc02ed2d..d2f9c97fbfd 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/system/generated-dynamic2.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/system/generated-dynamic2.js @@ -4,7 +4,6 @@ System.register(['./generated-dynamic1.js'], (function (exports) { return { setters: [function (module) { value = module.value; - exports('value', module.value); }], execute: (function () { diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/generated-dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/generated-dynamic.js index 45a4caf0bd6..1299a10ac82 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/generated-dynamic.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/generated-dynamic.js @@ -4,10 +4,8 @@ System.register(['./generated-from-main-1-and-dynamic.js', './generated-from-mai return { setters: [function (module) { value1 = module.v; - exports('value1', module.v); }, function (module) { value2 = module.v; - exports('value2', module.v); }], execute: (function () { diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/main1.js index 6eb53c1569f..3086d46193b 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/main1.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/main1.js @@ -4,11 +4,9 @@ System.register(['./generated-from-main-1-and-dynamic.js', './generated-from-mai return { setters: [function (module) { value1 = module.v; - exports('value1', module.v); }, function (module) { value2 = module.v; value3 = module.a; - exports({ value2: module.v, value3: module.a }); }], execute: (function () { diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/main2.js index a899ec2add7..901702526db 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/main2.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/main2.js @@ -5,7 +5,6 @@ System.register(['./generated-from-main-1-and-2.js'], (function (exports, module setters: [function (module) { value2 = module.v; value3 = module.a; - exports({ value2: module.v, value3: module.a }); }], execute: (function () { diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/generated-dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/generated-dynamic.js index fbd6441c933..a584ad19071 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/generated-dynamic.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/generated-dynamic.js @@ -4,10 +4,8 @@ System.register(['./generated-dep1.js', './generated-dep2.js'], (function (expor return { setters: [function (module) { value1 = module.v; - exports('value1', module.v); }, function (module) { value2 = module.v; - exports('value2', module.v); }], execute: (function () { diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/main1.js index 5b5005ed520..1299e3df8f8 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/main1.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/main1.js @@ -4,10 +4,8 @@ System.register(['./generated-dep1.js', './generated-dep2.js'], (function (expor return { setters: [function (module) { value1 = module.v; - exports('value1', module.v); }, function (module) { value2 = module.v; - exports('value2', module.v); }], execute: (function () { diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/main2.js index 29e0858ad56..a5f4d2670b7 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/main2.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/main2.js @@ -4,7 +4,6 @@ System.register(['./generated-dep2.js'], (function (exports, module) { return { setters: [function (module) { value2 = module.v; - exports('value2', module.v); }], execute: (function () { diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/generated-dynamic1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/generated-dynamic1.js index 35ddafe0ec4..4a09d76306b 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/generated-dynamic1.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/generated-dynamic1.js @@ -4,7 +4,6 @@ System.register(['./main1.js', './generated-dep2.js'], (function (exports) { return { setters: [function (module) { value1 = module.value1; - exports('value1', module.value1); }, null], execute: (function () { diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/generated-dynamic2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/generated-dynamic2.js index 54cbe03b301..5f24c7af957 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/generated-dynamic2.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/generated-dynamic2.js @@ -4,7 +4,6 @@ System.register(['./generated-dep2.js'], (function (exports) { return { setters: [function (module) { value2 = module.v; - exports('value2', module.v); }], execute: (function () { diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/main1.js index 38539f063a3..c68046b3369 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/main1.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/main1.js @@ -4,7 +4,6 @@ System.register(['./generated-dep2.js'], (function (exports, module) { return { setters: [function (module) { value2 = module.v; - exports('value2', module.v); }], execute: (function () { diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/main2.js index 0ea4b3cd7ca..b2fbfa7eb56 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/main2.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/main2.js @@ -4,7 +4,6 @@ System.register(['./generated-dep2.js'], (function (exports, module) { return { setters: [function (module) { value2 = module.v; - exports('value2', module.v); }], execute: (function () { diff --git a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/system/generated-dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/system/generated-dynamic.js index 0a561be362c..e85fe6eb506 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/system/generated-dynamic.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/system/generated-dynamic.js @@ -4,7 +4,6 @@ System.register(['./main.js'], (function (exports) { return { setters: [function (module) { value = module.value; - exports('value', module.value); }], execute: (function () { diff --git a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/system/generated-dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/system/generated-dynamic.js index 0a561be362c..e85fe6eb506 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/system/generated-dynamic.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/system/generated-dynamic.js @@ -4,7 +4,6 @@ System.register(['./main.js'], (function (exports) { return { setters: [function (module) { value = module.value; - exports('value', module.value); }], execute: (function () { diff --git a/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/system/main.js b/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/system/main.js index 16b732c1652..d92e13e0553 100644 --- a/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/system/main.js +++ b/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/system/main.js @@ -4,7 +4,6 @@ System.register(['./default.js', './named.js'], (function (exports, module) { return { setters: [function (module) { foo = module.default; - exports('default', module.default); }, function (module) { value = module.value; }], diff --git a/test/chunking-form/samples/preserve-modules-commonjs/_expected/system/other.js b/test/chunking-form/samples/preserve-modules-commonjs/_expected/system/other.js index 1f428fbcf18..cf790ac4a92 100644 --- a/test/chunking-form/samples/preserve-modules-commonjs/_expected/system/other.js +++ b/test/chunking-form/samples/preserve-modules-commonjs/_expected/system/other.js @@ -4,7 +4,6 @@ System.register(['./_virtual/other.js'], (function (exports) { return { setters: [function (module) { other = module.__exports; - exports('default', module.__exports); }], execute: (function () { diff --git a/test/chunking-form/samples/preserve-modules-default-mode-namespace/_expected/system/main.js b/test/chunking-form/samples/preserve-modules-default-mode-namespace/_expected/system/main.js index d53e79fcbc4..53033cf9a00 100644 --- a/test/chunking-form/samples/preserve-modules-default-mode-namespace/_expected/system/main.js +++ b/test/chunking-form/samples/preserve-modules-default-mode-namespace/_expected/system/main.js @@ -4,7 +4,6 @@ System.register(['./lib.js'], (function (exports, module) { return { setters: [function (module) { lib = module; - exports('lib', module); }], execute: (function () { diff --git a/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/system/main.js b/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/system/main.js index 16b732c1652..d92e13e0553 100644 --- a/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/system/main.js +++ b/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/system/main.js @@ -4,7 +4,6 @@ System.register(['./default.js', './named.js'], (function (exports, module) { return { setters: [function (module) { foo = module.default; - exports('default', module.default); }, function (module) { value = module.value; }], diff --git a/test/chunking-form/samples/preserve-modules-non-entry-imports/_expected/system/main.js b/test/chunking-form/samples/preserve-modules-non-entry-imports/_expected/system/main.js index 5efe40310f9..b86cce2cbe3 100644 --- a/test/chunking-form/samples/preserve-modules-non-entry-imports/_expected/system/main.js +++ b/test/chunking-form/samples/preserve-modules-non-entry-imports/_expected/system/main.js @@ -4,10 +4,11 @@ System.register(['./dep2.js'], (function (exports) { return { setters: [function (module) { foo = module.default; - exports('default', module.default); }], execute: (function () { + exports('default', foo); + }) diff --git a/test/chunking-form/samples/preserve-modules-root/_expected/system/custom_modules/@my-scope/my-base-pkg/index.js b/test/chunking-form/samples/preserve-modules-root/_expected/system/custom_modules/@my-scope/my-base-pkg/index.js index 8e5d7eb8288..4a581a4f0a0 100644 --- a/test/chunking-form/samples/preserve-modules-root/_expected/system/custom_modules/@my-scope/my-base-pkg/index.js +++ b/test/chunking-form/samples/preserve-modules-root/_expected/system/custom_modules/@my-scope/my-base-pkg/index.js @@ -4,7 +4,6 @@ System.register(['../../../_virtual/index.js'], (function (exports) { return { setters: [function (module) { myBasePkg = module.__exports; - exports('default', module.__exports); }], execute: (function () { diff --git a/test/chunking-form/samples/reexport-shortpaths/_expected/system/main1.js b/test/chunking-form/samples/reexport-shortpaths/_expected/system/main1.js index ef67c7ff36d..d8aff5f6dd7 100644 --- a/test/chunking-form/samples/reexport-shortpaths/_expected/system/main1.js +++ b/test/chunking-form/samples/reexport-shortpaths/_expected/system/main1.js @@ -4,10 +4,11 @@ System.register(['./generated-dep2.js'], (function (exports) { return { setters: [function (module) { foo = module.f; - exports('default', module.f); }], execute: (function () { + exports('default', foo); + }) diff --git a/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/system/main1.js b/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/system/main1.js index 0cb68053ea6..e90653e7345 100644 --- a/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/system/main1.js +++ b/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/system/main1.js @@ -4,7 +4,6 @@ System.register(['./generated-lib.js'], (function (exports) { return { setters: [function (module) { lib = module.l; - exports('lib', module.l); }], execute: (function () { From e2e9b0ea1f19422787952829ac605af580d2d7d7 Mon Sep 17 00:00:00 2001 From: TrickyPi <530257315@qq.com> Date: Tue, 20 Dec 2022 20:55:45 +0800 Subject: [PATCH 5/7] Revert "test: regression amd and cjs test" This reverts commit 5c3ae7a6c6af8c8c7feeb6181195d67c10581f59. --- .../_expected/amd/main1.js | 2 +- .../_expected/cjs/main1.js | 2 +- .../_expected/amd/main1.js | 2 +- .../_expected/cjs/main1.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 95aad45c031..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 @@ -5,7 +5,7 @@ define(['require', 'exports', './generated-dep2'], (function (require, exports, console.log('main1', value1, dep2.value2); new Promise(function (resolve, reject) { require(['./generated-dynamic1'], resolve, reject); }); - exports.value1 = value1; exports.value2 = dep2.value2; + exports.value1 = value1; })); 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 249f6717c0b..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 @@ -7,5 +7,5 @@ const value1 = 'shared1'; console.log('main1', value1, dep2.value2); Promise.resolve().then(function () { return require('./generated-dynamic1.js'); }); -exports.value1 = value1; exports.value2 = dep2.value2; +exports.value1 = value1; 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 5698e69c489..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 @@ -2,7 +2,7 @@ define(['exports', './generated-lib'], (function (exports, lib) { 'use strict'; - exports.foo = lib.lib.foo; exports.lib = lib.lib; + exports.foo = lib.lib.foo; })); 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 9c42765097b..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 @@ -4,5 +4,5 @@ var lib = require('./generated-lib.js'); -exports.foo = lib.lib.foo; exports.lib = lib.lib; +exports.foo = lib.lib.foo; From 908de252566c5374b4782c0b3fb69df03b606f33 Mon Sep 17 00:00:00 2001 From: TrickyPi <530257315@qq.com> Date: Tue, 20 Dec 2022 20:56:00 +0800 Subject: [PATCH 6/7] Revert "test: regression system test" This reverts commit 9159eb4c84746eb09a2ce7d81bd61b1ef5319c35. --- .../preserve-modules-auto-export-mode/_expected/system/main.js | 1 + .../preserve-modules-commonjs/_expected/system/other.js | 1 + .../_expected/system/main.js | 1 + .../_expected/system/main.js | 3 +-- .../_expected/system/generated-dynamic2.js | 1 + .../_expected/system/generated-dynamic2.js | 1 + .../_expected/system/generated-dynamic.js | 2 ++ .../_expected/system/main1.js | 2 ++ .../_expected/system/main2.js | 1 + .../_expected/system/generated-dynamic.js | 2 ++ .../_expected/system/main1.js | 2 ++ .../_expected/system/main2.js | 1 + .../_expected/system/generated-dynamic1.js | 1 + .../_expected/system/generated-dynamic2.js | 1 + .../_expected/system/main1.js | 1 + .../_expected/system/main2.js | 1 + .../_expected/system/generated-dynamic.js | 1 + .../single-dynamic/_expected/system/generated-dynamic.js | 1 + .../preserve-modules-auto-export-mode/_expected/system/main.js | 1 + .../preserve-modules-commonjs/_expected/system/other.js | 1 + .../_expected/system/main.js | 1 + .../_expected/system/main.js | 1 + .../_expected/system/main.js | 3 +-- .../system/custom_modules/@my-scope/my-base-pkg/index.js | 1 + .../samples/reexport-shortpaths/_expected/system/main1.js | 3 +-- .../_expected/system/main1.js | 1 + 26 files changed, 30 insertions(+), 6 deletions(-) diff --git a/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_expected/system/main.js b/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_expected/system/main.js index d92e13e0553..16b732c1652 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_expected/system/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_expected/system/main.js @@ -4,6 +4,7 @@ System.register(['./default.js', './named.js'], (function (exports, module) { return { setters: [function (module) { foo = module.default; + exports('default', module.default); }, function (module) { value = module.value; }], diff --git a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/other.js b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/other.js index cf790ac4a92..1f428fbcf18 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/other.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/other.js @@ -4,6 +4,7 @@ System.register(['./_virtual/other.js'], (function (exports) { return { setters: [function (module) { other = module.__exports; + exports('default', module.__exports); }], execute: (function () { diff --git a/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/system/main.js b/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/system/main.js index d92e13e0553..16b732c1652 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/system/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/system/main.js @@ -4,6 +4,7 @@ System.register(['./default.js', './named.js'], (function (exports, module) { return { setters: [function (module) { foo = module.default; + exports('default', module.default); }, function (module) { value = module.value; }], diff --git a/test/chunking-form/samples/deprecated/preserve-modules-non-entry-imports/_expected/system/main.js b/test/chunking-form/samples/deprecated/preserve-modules-non-entry-imports/_expected/system/main.js index b86cce2cbe3..5efe40310f9 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-non-entry-imports/_expected/system/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-non-entry-imports/_expected/system/main.js @@ -4,11 +4,10 @@ System.register(['./dep2.js'], (function (exports) { return { setters: [function (module) { foo = module.default; + exports('default', module.default); }], execute: (function () { - exports('default', foo); - }) diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/system/generated-dynamic2.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/system/generated-dynamic2.js index 30664d445f6..7d4687f325d 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/system/generated-dynamic2.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/system/generated-dynamic2.js @@ -4,6 +4,7 @@ System.register(['./main.js'], (function (exports) { return { setters: [function (module) { value = module.value; + exports('value', module.value); }], execute: (function () { diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/system/generated-dynamic2.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/system/generated-dynamic2.js index d2f9c97fbfd..225fc02ed2d 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/system/generated-dynamic2.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/system/generated-dynamic2.js @@ -4,6 +4,7 @@ System.register(['./generated-dynamic1.js'], (function (exports) { return { setters: [function (module) { value = module.value; + exports('value', module.value); }], execute: (function () { diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/generated-dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/generated-dynamic.js index 1299a10ac82..45a4caf0bd6 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/generated-dynamic.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/generated-dynamic.js @@ -4,8 +4,10 @@ System.register(['./generated-from-main-1-and-dynamic.js', './generated-from-mai return { setters: [function (module) { value1 = module.v; + exports('value1', module.v); }, function (module) { value2 = module.v; + exports('value2', module.v); }], execute: (function () { diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/main1.js index 3086d46193b..6eb53c1569f 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/main1.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/main1.js @@ -4,9 +4,11 @@ System.register(['./generated-from-main-1-and-dynamic.js', './generated-from-mai return { setters: [function (module) { value1 = module.v; + exports('value1', module.v); }, function (module) { value2 = module.v; value3 = module.a; + exports({ value2: module.v, value3: module.a }); }], execute: (function () { diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/main2.js index 901702526db..a899ec2add7 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/main2.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/main2.js @@ -5,6 +5,7 @@ System.register(['./generated-from-main-1-and-2.js'], (function (exports, module setters: [function (module) { value2 = module.v; value3 = module.a; + exports({ value2: module.v, value3: module.a }); }], execute: (function () { diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/generated-dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/generated-dynamic.js index a584ad19071..fbd6441c933 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/generated-dynamic.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/generated-dynamic.js @@ -4,8 +4,10 @@ System.register(['./generated-dep1.js', './generated-dep2.js'], (function (expor return { setters: [function (module) { value1 = module.v; + exports('value1', module.v); }, function (module) { value2 = module.v; + exports('value2', module.v); }], execute: (function () { diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/main1.js index 1299e3df8f8..5b5005ed520 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/main1.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/main1.js @@ -4,8 +4,10 @@ System.register(['./generated-dep1.js', './generated-dep2.js'], (function (expor return { setters: [function (module) { value1 = module.v; + exports('value1', module.v); }, function (module) { value2 = module.v; + exports('value2', module.v); }], execute: (function () { diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/main2.js index a5f4d2670b7..29e0858ad56 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/main2.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/main2.js @@ -4,6 +4,7 @@ System.register(['./generated-dep2.js'], (function (exports, module) { return { setters: [function (module) { value2 = module.v; + exports('value2', module.v); }], execute: (function () { diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/generated-dynamic1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/generated-dynamic1.js index 4a09d76306b..35ddafe0ec4 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/generated-dynamic1.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/generated-dynamic1.js @@ -4,6 +4,7 @@ System.register(['./main1.js', './generated-dep2.js'], (function (exports) { return { setters: [function (module) { value1 = module.value1; + exports('value1', module.value1); }, null], execute: (function () { diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/generated-dynamic2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/generated-dynamic2.js index 5f24c7af957..54cbe03b301 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/generated-dynamic2.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/generated-dynamic2.js @@ -4,6 +4,7 @@ System.register(['./generated-dep2.js'], (function (exports) { return { setters: [function (module) { value2 = module.v; + exports('value2', module.v); }], execute: (function () { diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/main1.js index c68046b3369..38539f063a3 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/main1.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/main1.js @@ -4,6 +4,7 @@ System.register(['./generated-dep2.js'], (function (exports, module) { return { setters: [function (module) { value2 = module.v; + exports('value2', module.v); }], execute: (function () { diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/main2.js index b2fbfa7eb56..0ea4b3cd7ca 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/main2.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/main2.js @@ -4,6 +4,7 @@ System.register(['./generated-dep2.js'], (function (exports, module) { return { setters: [function (module) { value2 = module.v; + exports('value2', module.v); }], execute: (function () { diff --git a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/system/generated-dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/system/generated-dynamic.js index e85fe6eb506..0a561be362c 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/system/generated-dynamic.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/system/generated-dynamic.js @@ -4,6 +4,7 @@ System.register(['./main.js'], (function (exports) { return { setters: [function (module) { value = module.value; + exports('value', module.value); }], execute: (function () { diff --git a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/system/generated-dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/system/generated-dynamic.js index e85fe6eb506..0a561be362c 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/system/generated-dynamic.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/system/generated-dynamic.js @@ -4,6 +4,7 @@ System.register(['./main.js'], (function (exports) { return { setters: [function (module) { value = module.value; + exports('value', module.value); }], execute: (function () { diff --git a/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/system/main.js b/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/system/main.js index d92e13e0553..16b732c1652 100644 --- a/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/system/main.js +++ b/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/system/main.js @@ -4,6 +4,7 @@ System.register(['./default.js', './named.js'], (function (exports, module) { return { setters: [function (module) { foo = module.default; + exports('default', module.default); }, function (module) { value = module.value; }], diff --git a/test/chunking-form/samples/preserve-modules-commonjs/_expected/system/other.js b/test/chunking-form/samples/preserve-modules-commonjs/_expected/system/other.js index cf790ac4a92..1f428fbcf18 100644 --- a/test/chunking-form/samples/preserve-modules-commonjs/_expected/system/other.js +++ b/test/chunking-form/samples/preserve-modules-commonjs/_expected/system/other.js @@ -4,6 +4,7 @@ System.register(['./_virtual/other.js'], (function (exports) { return { setters: [function (module) { other = module.__exports; + exports('default', module.__exports); }], execute: (function () { diff --git a/test/chunking-form/samples/preserve-modules-default-mode-namespace/_expected/system/main.js b/test/chunking-form/samples/preserve-modules-default-mode-namespace/_expected/system/main.js index 53033cf9a00..d53e79fcbc4 100644 --- a/test/chunking-form/samples/preserve-modules-default-mode-namespace/_expected/system/main.js +++ b/test/chunking-form/samples/preserve-modules-default-mode-namespace/_expected/system/main.js @@ -4,6 +4,7 @@ System.register(['./lib.js'], (function (exports, module) { return { setters: [function (module) { lib = module; + exports('lib', module); }], execute: (function () { diff --git a/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/system/main.js b/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/system/main.js index d92e13e0553..16b732c1652 100644 --- a/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/system/main.js +++ b/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/system/main.js @@ -4,6 +4,7 @@ System.register(['./default.js', './named.js'], (function (exports, module) { return { setters: [function (module) { foo = module.default; + exports('default', module.default); }, function (module) { value = module.value; }], diff --git a/test/chunking-form/samples/preserve-modules-non-entry-imports/_expected/system/main.js b/test/chunking-form/samples/preserve-modules-non-entry-imports/_expected/system/main.js index b86cce2cbe3..5efe40310f9 100644 --- a/test/chunking-form/samples/preserve-modules-non-entry-imports/_expected/system/main.js +++ b/test/chunking-form/samples/preserve-modules-non-entry-imports/_expected/system/main.js @@ -4,11 +4,10 @@ System.register(['./dep2.js'], (function (exports) { return { setters: [function (module) { foo = module.default; + exports('default', module.default); }], execute: (function () { - exports('default', foo); - }) diff --git a/test/chunking-form/samples/preserve-modules-root/_expected/system/custom_modules/@my-scope/my-base-pkg/index.js b/test/chunking-form/samples/preserve-modules-root/_expected/system/custom_modules/@my-scope/my-base-pkg/index.js index 4a581a4f0a0..8e5d7eb8288 100644 --- a/test/chunking-form/samples/preserve-modules-root/_expected/system/custom_modules/@my-scope/my-base-pkg/index.js +++ b/test/chunking-form/samples/preserve-modules-root/_expected/system/custom_modules/@my-scope/my-base-pkg/index.js @@ -4,6 +4,7 @@ System.register(['../../../_virtual/index.js'], (function (exports) { return { setters: [function (module) { myBasePkg = module.__exports; + exports('default', module.__exports); }], execute: (function () { diff --git a/test/chunking-form/samples/reexport-shortpaths/_expected/system/main1.js b/test/chunking-form/samples/reexport-shortpaths/_expected/system/main1.js index d8aff5f6dd7..ef67c7ff36d 100644 --- a/test/chunking-form/samples/reexport-shortpaths/_expected/system/main1.js +++ b/test/chunking-form/samples/reexport-shortpaths/_expected/system/main1.js @@ -4,11 +4,10 @@ System.register(['./generated-dep2.js'], (function (exports) { return { setters: [function (module) { foo = module.f; + exports('default', module.f); }], execute: (function () { - exports('default', foo); - }) diff --git a/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/system/main1.js b/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/system/main1.js index e90653e7345..0cb68053ea6 100644 --- a/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/system/main1.js +++ b/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/system/main1.js @@ -4,6 +4,7 @@ System.register(['./generated-lib.js'], (function (exports) { return { setters: [function (module) { lib = module.l; + exports('lib', module.l); }], execute: (function () { From 283145204160a3e048dd085e987c19282c3d54b0 Mon Sep 17 00:00:00 2001 From: TrickyPi <530257315@qq.com> Date: Tue, 20 Dec 2022 20:56:56 +0800 Subject: [PATCH 7/7] fix: only for es format --- src/Chunk.ts | 24 ++++++++++-------------- src/finalisers/system.ts | 2 +- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/src/Chunk.ts b/src/Chunk.ts index ccad23a7f46..e7b31b5680a 100644 --- a/src/Chunk.ts +++ b/src/Chunk.ts @@ -610,10 +610,12 @@ export default class Chunk { if (!hasDefaultExport && reexports.some(reexport => reexport.reexported === 'default')) { hasDefaultExport = true; } - renderedDependence.reexports = reexports.filter( - // eslint-disable-next-line unicorn/prefer-array-some - ({ reexported }) => !renderedExports.find(({ exported }) => exported === reexported) - ); + if (format === 'es') { + renderedDependence.reexports = reexports.filter( + // eslint-disable-next-line unicorn/prefer-array-some + ({ reexported }) => !renderedExports.find(({ exported }) => exported === reexported) + ); + } } } if (!hasDefaultExport) { @@ -775,23 +777,17 @@ export default class Chunk { const module = variable.module; if (module) { const chunk = this.chunkByModule.get(module as Module); - if (!chunk) { - continue; - } if (chunk !== this) { - if (!this.renderedDependencies) { - continue; - } - const chunkDep = this.renderedDependencies.get(chunk); - if (!chunkDep) { + if (!chunk || format !== 'es') { continue; } + const chunkDep = this.renderedDependencies!.get(chunk)!; const { imports, reexports } = chunkDep; - const importedByreexported = reexports?.find( + const importedByReexported = reexports?.find( ({ reexported }) => reexported === exportName ); const isImported = imports?.find( - ({ imported }) => imported === importedByreexported?.imported + ({ imported }) => imported === importedByReexported?.imported ); if (!isImported) { continue; diff --git a/src/finalisers/system.ts b/src/finalisers/system.ts index 0691276bebf..49f07bd4d18 100644 --- a/src/finalisers/system.ts +++ b/src/finalisers/system.ts @@ -151,7 +151,7 @@ function analyzeDependencies( } else { setter.push(`exports(${exportMapping});`); } - } else if (reexportedNames.length === 1) { + } else { const [key, value] = reexportedNames[0]; setter.push(`exports('${key}',${_}${value});`); }