diff --git a/lib/optimize/ConcatenatedModule.js b/lib/optimize/ConcatenatedModule.js index f5ae70cd872..4a2973b913e 100644 --- a/lib/optimize/ConcatenatedModule.js +++ b/lib/optimize/ConcatenatedModule.js @@ -521,7 +521,7 @@ class ConcatenatedModule extends Module { dep instanceof HarmonyExportImportedSpecifierDependency ) { const exportName = dep.name; - const importName = dep.id; + const importName = dep._id; const importedModule = dep._module; if (exportName && importName) { if (!reexportMap.has(exportName)) { @@ -1390,12 +1390,12 @@ class HarmonyExportImportedSpecifierDependencyConcatenatedTemplate { getExports(dep) { const importModule = dep._module; - if (dep.id) { + if (dep._id) { // export { named } from "module" return [ { name: dep.name, - id: dep.id, + id: dep._id, module: importModule } ]; diff --git a/test/cases/scope-hoisting/side-effects-9159/index.js b/test/cases/scope-hoisting/side-effects-9159/index.js new file mode 100644 index 00000000000..d079635e771 --- /dev/null +++ b/test/cases/scope-hoisting/side-effects-9159/index.js @@ -0,0 +1,5 @@ +it("should reexport from side-effect-free scope-hoisted module", () => { + const m = require("./reexport"); + expect(m.value).toBe(42); + expect(m.ns.default).toBe(42); +}); diff --git a/test/cases/scope-hoisting/side-effects-9159/package/index.js b/test/cases/scope-hoisting/side-effects-9159/package/index.js new file mode 100644 index 00000000000..8f260e45d50 --- /dev/null +++ b/test/cases/scope-hoisting/side-effects-9159/package/index.js @@ -0,0 +1,4 @@ +export { default as value } from "./module"; + +import * as ns from "./module"; +export { ns }; diff --git a/test/cases/scope-hoisting/side-effects-9159/package/module.js b/test/cases/scope-hoisting/side-effects-9159/package/module.js new file mode 100644 index 00000000000..7a4e8a723a4 --- /dev/null +++ b/test/cases/scope-hoisting/side-effects-9159/package/module.js @@ -0,0 +1 @@ +export default 42; diff --git a/test/cases/scope-hoisting/side-effects-9159/package/package.json b/test/cases/scope-hoisting/side-effects-9159/package/package.json new file mode 100644 index 00000000000..2124100b0ef --- /dev/null +++ b/test/cases/scope-hoisting/side-effects-9159/package/package.json @@ -0,0 +1,3 @@ +{ + "sideEffects": false +} \ No newline at end of file diff --git a/test/cases/scope-hoisting/side-effects-9159/reexport.js b/test/cases/scope-hoisting/side-effects-9159/reexport.js new file mode 100644 index 00000000000..ae7bd1d070b --- /dev/null +++ b/test/cases/scope-hoisting/side-effects-9159/reexport.js @@ -0,0 +1 @@ +export { value, ns } from "./package";