fix: only pull out __export() when it's needed

rolldown · Feb 21, 2024 · 670dbb6 · 670dbb6
1 parent 9e517e5
commit 670dbb6
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/crates/rolldown/src/bundler/stages/link_stage/mod.rs b/crates/rolldown/src/bundler/stages/link_stage/mod.rs
@@ -84,16 +84,17 @@ impl<'a> LinkStage<'a> {
 
       if matches!(module.exports_kind, ExportsKind::Esm) {
         let linking_info = &self.linking_infos[module.id];
-
+        let mut referenced_symbols = vec![];
+        if !linking_info.exclude_ambiguous_sorted_resolved_exports.is_empty() {
+          referenced_symbols
+            .extend(linking_info.sorted_exports().map(|(_, export)| export.symbol_ref));
+          referenced_symbols.push(self.runtime.resolve_symbol("__export"));
+        }
         // Create a StmtInfo for the namespace statement
         let namespace_stmt_info = StmtInfo {
           stmt_idx: None,
           declared_symbols: vec![module.namespace_symbol],
-          referenced_symbols: linking_info
-            .sorted_exports()
-            .map(|(_, export)| export.symbol_ref)
-            .chain([self.runtime.resolve_symbol("__export")])
-            .collect(),
+          referenced_symbols,
           side_effect: false,
           is_included: false,
           import_records: Vec::new(),

diff --git a/...own/tests/esbuild/default/empty_export_clause_bundle_as_common_js_issue910/artifacts.snap b/...own/tests/esbuild/default/empty_export_clause_bundle_as_common_js_issue910/artifacts.snap
@@ -8,7 +8,7 @@ input_file: crates/rolldown/tests/esbuild/default/empty_export_clause_bundle_as_
 ## entry_js.mjs
 
 ```js
-import { __esmMin, __export, __toCommonJS } from "./$runtime$.mjs";
+import { __esmMin, __toCommonJS } from "./$runtime$.mjs";
 
 // types.mjs
 var types_ns;

diff --git a/..._between_esm_and_cjs/esm_import_esm_which_export_all_from_cjs_named_import/artifacts.snap b/..._between_esm_and_cjs/esm_import_esm_which_export_all_from_cjs_named_import/artifacts.snap
@@ -8,7 +8,7 @@ input_file: crates/rolldown/tests/fixtures/import_reexport_between_esm_and_cjs/e
 ## main.mjs
 
 ```js
-import { __commonJSMin, __export, __reExport, __toESM } from "./$runtime$.mjs";
+import { __commonJSMin, __reExport, __toESM } from "./$runtime$.mjs";
 
 // commonjs.js
 var require_commonjs = __commonJSMin((exports, module) => {

diff --git a/...esm_and_cjs/esm_import_esm_which_export_all_from_multiple_cjs_named_import/artifacts.snap b/...esm_and_cjs/esm_import_esm_which_export_all_from_multiple_cjs_named_import/artifacts.snap
@@ -8,7 +8,7 @@ input_file: crates/rolldown/tests/fixtures/import_reexport_between_esm_and_cjs/e
 ## main.mjs
 
 ```js
-import { __commonJSMin, __export, __reExport, __toESM } from "./$runtime$.mjs";
+import { __commonJSMin, __reExport, __toESM } from "./$runtime$.mjs";
 
 // commonjs.js
 var require_commonjs = __commonJSMin((exports, module) => {

diff --git a/crates/rolldown/tests/fixtures/require/require_esm/artifacts.snap b/crates/rolldown/tests/fixtures/require/require_esm/artifacts.snap
@@ -8,7 +8,7 @@ input_file: crates/rolldown/tests/fixtures/require/require_esm
 ## main.mjs
 
 ```js
-import { __esmMin, __export, __toCommonJS } from "./$runtime$.mjs";
+import { __esmMin, __toCommonJS } from "./$runtime$.mjs";
 
 // esm.js
 var esm_ns;