diff --git a/Cargo.lock b/Cargo.lock index d48a5ec990c..209fada83c2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1805,13 +1805,12 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "string_wizard" -version = "0.0.12" +version = "0.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fc44d618f64c93bb662f81e29d07bf908106d6d55114f9c21b0c2c667acf285" +checksum = "ac05a8bbc67011670b5d1b3c2d40c1810af3dd66e28e917b43a767f1a6fc07d9" dependencies = [ "index_vec", "once_cell", - "regex", "rustc-hash", ] diff --git a/Cargo.toml b/Cargo.toml index 17b48de13a9..9d1939dfcda 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,7 +24,7 @@ serde_json = "1.0.87" insta = "1.21.0" testing_macros = "0.2.7" scoped-tls = "1.0.1" -string_wizard = { version = "0.0.12" } +string_wizard = { version = "0.0.14" } async-trait = "0.1.62" futures = "0.3.25" itertools = "0.10.5" diff --git a/crates/rolldown/src/bundler/renderer/mod.rs b/crates/rolldown/src/bundler/renderer/mod.rs index 10592a3fa2b..2f0bc698ee2 100644 --- a/crates/rolldown/src/bundler/renderer/mod.rs +++ b/crates/rolldown/src/bundler/renderer/mod.rs @@ -12,7 +12,7 @@ use oxc::{ use rolldown_common::{SymbolRef, WrapKind}; use rolldown_oxc::BindingIdentifierExt; use rustc_hash::FxHashMap; -use string_wizard::MagicString; +use string_wizard::{IndentOptions, MagicString}; use super::{ chunk_graph::ChunkGraph, @@ -109,16 +109,21 @@ impl<'r> AstRenderer<'r> { match &mut self.kind { RenderKind::WrappedEsm(info) => { + let mut exclude_indent = vec![]; info.hoisted_functions.iter().for_each(|f| { - // Improve: multiply functions should separate by "\n" self.ctx.source.relocate(f.start, f.end, 0); - self.ctx.source.append_right(0, "\n"); + self.ctx.source.append_left(f.end, "\n"); + exclude_indent.push([f.start, f.end]); + }); + self.ctx.source.indent_with(IndentOptions { + exclude: exclude_indent, + indentor: Some(&self.indentor.repeat(2)), }); if !info.hoisted_vars.is_empty() { self.ctx.source.append_right(0, format!("var {};\n", info.hoisted_vars.join(","))); } - if let Some(s) = self.ctx.generate_namespace_variable_declaration() { + if let Some(s) = self.generate_namespace_variable_declaration() { self.ctx.source.append_right(0, s); } @@ -127,15 +132,20 @@ impl<'r> AstRenderer<'r> { self.ctx.source.append_right( 0, format!( - "var {wrap_ref_name} = {esm_ref_name}({{\n'{}'() {{\n", + "var {wrap_ref_name} = {esm_ref_name}({{\n{}'{}'() {{\n", + self.indentor, self.ctx.module.resource_id.prettify(), ), ); - self.ctx.source.append("\n}\n});"); + self.ctx.source.append(format!("\n{}}}\n}});", self.indentor)); } RenderKind::Cjs => { let wrap_ref_name = self.ctx.wrap_symbol_name.unwrap(); let prettify_id = self.ctx.module.resource_id.prettify(); + self.ctx.source.indent_with(IndentOptions { + indentor: Some(&self.indentor.repeat(2)), + ..Default::default() + }); let commonjs_ref_name = self.ctx.canonical_name_for_runtime("__commonJS"); self.ctx.source.prepend(format!( "var {wrap_ref_name} = {commonjs_ref_name}({{\n{}'{prettify_id}'(exports, module) {{\n", @@ -145,7 +155,7 @@ impl<'r> AstRenderer<'r> { assert!(!self.ctx.module.is_namespace_referenced()); } RenderKind::Esm => { - if let Some(s) = self.ctx.generate_namespace_variable_declaration() { + if let Some(s) = self.generate_namespace_variable_declaration() { self.ctx.source.prepend(s); } } diff --git a/crates/rolldown/src/bundler/renderer/utils.rs b/crates/rolldown/src/bundler/renderer/utils.rs index e23e030bb82..5469c8e9575 100644 --- a/crates/rolldown/src/bundler/renderer/utils.rs +++ b/crates/rolldown/src/bundler/renderer/utils.rs @@ -47,32 +47,6 @@ impl<'r> AstRenderContext<'r> { self.source.append_left(start, content); } - pub fn generate_namespace_variable_declaration(&mut self) -> Option { - if self.module.is_namespace_referenced() { - let ns_name = self.canonical_name_for(self.module.namespace_symbol); - let exports: String = self - .linking_info - .sorted_exports() - .map(|(exported_name, resolved_export)| { - let canonical_ref = self.graph.symbols.par_canonical_ref_for(resolved_export.symbol_ref); - let symbol = self.graph.symbols.get(canonical_ref); - let return_expr = if let Some(ns_alias) = &symbol.namespace_alias { - let canonical_ns_name = &self.canonical_names[&ns_alias.namespace_ref]; - format!("{canonical_ns_name}.{exported_name}",) - } else { - let canonical_name = self.canonical_names.get(&canonical_ref).unwrap(); - format!("{canonical_name}",) - }; - format!(" get {exported_name}() {{ return {return_expr} }}",) - }) - .collect::>() - .join(",\n"); - Some(format!("var {ns_name} = {{\n{exports}\n}};\n",)) - } else { - None - } - } - pub fn generate_import_commonjs_module( &self, importee: &NormalModule, @@ -105,6 +79,34 @@ impl<'r> AstRenderer<'r> { ); } + pub fn generate_namespace_variable_declaration(&mut self) -> Option { + if self.ctx.module.is_namespace_referenced() { + let ns_name = self.ctx.canonical_name_for(self.ctx.module.namespace_symbol); + let exports: String = self + .ctx + .linking_info + .sorted_exports() + .map(|(exported_name, resolved_export)| { + let canonical_ref = + self.ctx.graph.symbols.par_canonical_ref_for(resolved_export.symbol_ref); + let symbol = self.ctx.graph.symbols.get(canonical_ref); + let return_expr = if let Some(ns_alias) = &symbol.namespace_alias { + let canonical_ns_name = &self.ctx.canonical_names[&ns_alias.namespace_ref]; + format!("{canonical_ns_name}.{exported_name}",) + } else { + let canonical_name = self.ctx.canonical_names.get(&canonical_ref).unwrap(); + format!("{canonical_name}",) + }; + format!("{}get {exported_name}() {{ return {return_expr} }}", self.indentor) + }) + .collect::>() + .join(",\n"); + Some(format!("var {ns_name} = {{\n{exports}\n}};\n",)) + } else { + None + } + } + pub fn remove_node(&mut self, span: Span) { self.ctx.source.remove(span.start, span.end); } diff --git a/crates/rolldown/tests/esbuild/default/common_js_from_es6/artifacts.snap b/crates/rolldown/tests/esbuild/default/common_js_from_es6/artifacts.snap index 7d4ade145ec..8818179e1da 100644 --- a/crates/rolldown/tests/esbuild/default/common_js_from_es6/artifacts.snap +++ b/crates/rolldown/tests/esbuild/default/common_js_from_es6/artifacts.snap @@ -15,24 +15,24 @@ function foo$1() { return 'foo' } var foo_ns = { - get foo() { return foo$1 } + get foo() { return foo$1 } }; var init_foo = __esm({ -'foo.js'() { + 'foo.js'() { -} + } }); // bar.js function bar$1() { return 'bar' } var bar_ns = { - get bar() { return bar$1 } + get bar() { return bar$1 } }; var init_bar = __esm({ -'bar.js'() { + 'bar.js'() { -} + } }); // entry.js const {foo} = (init_foo(), __toCommonJS(foo_ns)) diff --git a/crates/rolldown/tests/esbuild/default/empty_export_clause_bundle_as_common_js_issue910/artifacts.snap b/crates/rolldown/tests/esbuild/default/empty_export_clause_bundle_as_common_js_issue910/artifacts.snap index 43bc067073a..1aecc4423f4 100644 --- a/crates/rolldown/tests/esbuild/default/empty_export_clause_bundle_as_common_js_issue910/artifacts.snap +++ b/crates/rolldown/tests/esbuild/default/empty_export_clause_bundle_as_common_js_issue910/artifacts.snap @@ -15,9 +15,9 @@ var types_ns = { }; var init_types = __esm({ -'types.mjs'() { + 'types.mjs'() { -} + } }); // entry.js console.log((init_types(), __toCommonJS(types_ns))) diff --git a/crates/rolldown/tests/esbuild/default/es6_from_common_js/artifacts.snap b/crates/rolldown/tests/esbuild/default/es6_from_common_js/artifacts.snap index 16a126e1d6d..ce43f1e79eb 100644 --- a/crates/rolldown/tests/esbuild/default/es6_from_common_js/artifacts.snap +++ b/crates/rolldown/tests/esbuild/default/es6_from_common_js/artifacts.snap @@ -13,17 +13,17 @@ import { __commonJS, __toESM } from "./_rolldown_runtime.mjs"; // foo.js var require_foo = __commonJS({ 'foo.js'(exports, module) { -exports.foo = function() { - return 'foo' -} + exports.foo = function() { + return 'foo' + } } }); // bar.js var require_bar = __commonJS({ 'bar.js'(exports, module) { -exports.bar = function() { - return 'bar' -} + exports.bar = function() { + return 'bar' + } } }); // entry.js diff --git a/crates/rolldown/tests/esbuild/default/export_forms_common_js/artifacts.snap b/crates/rolldown/tests/esbuild/default/export_forms_common_js/artifacts.snap index 04ffb87b05d..7cd2893d2cc 100644 --- a/crates/rolldown/tests/esbuild/default/export_forms_common_js/artifacts.snap +++ b/crates/rolldown/tests/esbuild/default/export_forms_common_js/artifacts.snap @@ -13,111 +13,111 @@ import { __esm, __toCommonJS } from "./_rolldown_runtime.mjs"; // a.js var abc; var a_ns = { - get abc() { return abc } + get abc() { return abc } }; var init_a = __esm({ -'a.js'() { -abc = undefined -} + 'a.js'() { + abc = undefined + } }); // b.js var xyz; var b_ns = { - get xyz() { return xyz } + get xyz() { return xyz } }; var init_b = __esm({ -'b.js'() { -xyz = null -} + 'b.js'() { + xyz = null + } }); // commonjs.js function Fn() {} var commonjs_default,v,l,c,Class; var commonjs_ns = { - get Class() { return Class }, - get Fn() { return Fn }, - get abc() { return abc }, - get b() { return b_ns }, - get c() { return c }, - get default() { return commonjs_default }, - get l() { return l }, - get v() { return v } + get Class() { return Class }, + get Fn() { return Fn }, + get abc() { return abc }, + get b() { return b_ns }, + get c() { return c }, + get default() { return commonjs_default }, + get l() { return l }, + get v() { return v } }; var init_commonjs = __esm({ -'commonjs.js'() { -commonjs_default = 123 -v = 234 -l = 234 -c = 234 + 'commonjs.js'() { + commonjs_default = 123 + v = 234 + l = 234 + c = 234 -Class = class Class {} + Class = class Class {} -} + } }); // c.js var c_default; var c_ns = { - get default() { return c_default } + get default() { return c_default } }; var init_c = __esm({ -'c.js'() { -c_default = class {} + 'c.js'() { + c_default = class {} -} + } }); // d.js var Foo; var d_ns = { - get default() { return Foo } + get default() { return Foo } }; var init_d = __esm({ -'d.js'() { -Foo = class Foo {} + 'd.js'() { + Foo = class Foo {} Foo.prop = 123 -} + } }); // e.js function e_default() {} var e_ns = { - get default() { return e_default } + get default() { return e_default } }; var init_e = __esm({ -'e.js'() { + 'e.js'() { -} + } }); // f.js function foo$1() {} var f_ns = { - get default() { return foo$1 } + get default() { return foo$1 } }; var init_f = __esm({ -'f.js'() { - foo$1.prop = 123 -} + 'f.js'() { + foo$1.prop = 123 + } }); // g.js async function g_default() {} var g_ns = { - get default() { return g_default } + get default() { return g_default } }; var init_g = __esm({ -'g.js'() { + 'g.js'() { -} + } }); // h.js async function foo() {} var h_ns = { - get default() { return foo } + get default() { return foo } }; var init_h = __esm({ -'h.js'() { - foo.prop = 123 -} + 'h.js'() { + foo.prop = 123 + } }); // entry.js init_commonjs() diff --git a/crates/rolldown/tests/esbuild/default/export_forms_es6/artifacts.snap b/crates/rolldown/tests/esbuild/default/export_forms_es6/artifacts.snap index 39b80ba4c44..89d370e43be 100644 --- a/crates/rolldown/tests/esbuild/default/export_forms_es6/artifacts.snap +++ b/crates/rolldown/tests/esbuild/default/export_forms_es6/artifacts.snap @@ -12,7 +12,7 @@ input_file: crates/rolldown/tests/esbuild/default/export_forms_es6 const abc = undefined // b.js var b_ns = { - get xyz() { return xyz } + get xyz() { return xyz } }; const xyz = null // entry.js diff --git a/crates/rolldown/tests/esbuild/default/import_missing_common_js/artifacts.snap b/crates/rolldown/tests/esbuild/default/import_missing_common_js/artifacts.snap index 3287088a4b5..ea7eebca929 100644 --- a/crates/rolldown/tests/esbuild/default/import_missing_common_js/artifacts.snap +++ b/crates/rolldown/tests/esbuild/default/import_missing_common_js/artifacts.snap @@ -13,7 +13,7 @@ import { __commonJS, __toESM } from "./_rolldown_runtime.mjs"; // foo.js var require_foo = __commonJS({ 'foo.js'(exports, module) { -exports.x = 123 + exports.x = 123 } }); // entry.js diff --git a/crates/rolldown/tests/esbuild/default/nested_common_js/artifacts.snap b/crates/rolldown/tests/esbuild/default/nested_common_js/artifacts.snap index 792e9fb5ca1..78d7c18deca 100644 --- a/crates/rolldown/tests/esbuild/default/nested_common_js/artifacts.snap +++ b/crates/rolldown/tests/esbuild/default/nested_common_js/artifacts.snap @@ -13,9 +13,9 @@ import { __commonJS, __toESM } from "./_rolldown_runtime.mjs"; // foo.js var require_foo = __commonJS({ 'foo.js'(exports, module) { -module.exports = function() { - return 123 -} + module.exports = function() { + return 123 + } } }); // entry.js diff --git a/crates/rolldown/tests/esbuild/default/nested_es6_from_common_js/artifacts.snap b/crates/rolldown/tests/esbuild/default/nested_es6_from_common_js/artifacts.snap index 653ccc814bf..3effc5fa244 100644 --- a/crates/rolldown/tests/esbuild/default/nested_es6_from_common_js/artifacts.snap +++ b/crates/rolldown/tests/esbuild/default/nested_es6_from_common_js/artifacts.snap @@ -13,9 +13,9 @@ import { __commonJS, __toESM } from "./_rolldown_runtime.mjs"; // foo.js var require_foo = __commonJS({ 'foo.js'(exports, module) { -exports.fn = function() { - return 123 -} + exports.fn = function() { + return 123 + } } }); // entry.js diff --git a/crates/rolldown/tests/esbuild/default/new_expression_common_js/artifacts.snap b/crates/rolldown/tests/esbuild/default/new_expression_common_js/artifacts.snap index 07e32c32299..d2b0e06dd97 100644 --- a/crates/rolldown/tests/esbuild/default/new_expression_common_js/artifacts.snap +++ b/crates/rolldown/tests/esbuild/default/new_expression_common_js/artifacts.snap @@ -13,8 +13,8 @@ import { __commonJS, __toESM } from "./_rolldown_runtime.mjs"; // foo.js var require_foo = __commonJS({ 'foo.js'(exports, module) { -class Foo {} -module.exports = {Foo}; + class Foo {} + module.exports = {Foo}; } }); // entry.js diff --git a/crates/rolldown/tests/esbuild/default/re_export_common_js_as_es6/artifacts.snap b/crates/rolldown/tests/esbuild/default/re_export_common_js_as_es6/artifacts.snap index 9cb87091e8b..55b5a14069b 100644 --- a/crates/rolldown/tests/esbuild/default/re_export_common_js_as_es6/artifacts.snap +++ b/crates/rolldown/tests/esbuild/default/re_export_common_js_as_es6/artifacts.snap @@ -13,7 +13,7 @@ import { __commonJS, __toESM } from "./_rolldown_runtime.mjs"; // foo.js var require_foo = __commonJS({ 'foo.js'(exports, module) { -exports.bar = 123 + exports.bar = 123 } }); // entry.js diff --git a/crates/rolldown/tests/esbuild/default/require_child_dir_common_js/artifacts.snap b/crates/rolldown/tests/esbuild/default/require_child_dir_common_js/artifacts.snap index 3b816e2d02f..ba103e8f88b 100644 --- a/crates/rolldown/tests/esbuild/default/require_child_dir_common_js/artifacts.snap +++ b/crates/rolldown/tests/esbuild/default/require_child_dir_common_js/artifacts.snap @@ -13,7 +13,7 @@ import { __commonJS, __toESM } from "./_rolldown_runtime.mjs"; // dir/index.js var require_dir_index = __commonJS({ 'dir/index.js'(exports, module) { -module.exports = 123 + module.exports = 123 } }); // entry.js diff --git a/crates/rolldown/tests/esbuild/default/require_main_cache_common_js/artifacts.snap b/crates/rolldown/tests/esbuild/default/require_main_cache_common_js/artifacts.snap index 4d0444478e0..d6cf462936c 100644 --- a/crates/rolldown/tests/esbuild/default/require_main_cache_common_js/artifacts.snap +++ b/crates/rolldown/tests/esbuild/default/require_main_cache_common_js/artifacts.snap @@ -13,15 +13,15 @@ import { __commonJS } from "./_rolldown_runtime.mjs"; // is-main.js var require_is_main = __commonJS({ 'is-main.js'(exports, module) { -module.exports = require.main === module + module.exports = require.main === module } }); // entry.js var require_entry = __commonJS({ 'entry.js'(exports, module) { -console.log('is main:', require.main === module) -console.log(require_is_main()) -console.log('cache:', require.cache); + console.log('is main:', require.main === module) + console.log(require_is_main()) + console.log('cache:', require.cache); } }); ``` diff --git a/crates/rolldown/tests/esbuild/default/require_parent_dir_common_js/artifacts.snap b/crates/rolldown/tests/esbuild/default/require_parent_dir_common_js/artifacts.snap index c47ea8ea06c..9d2666d8b89 100644 --- a/crates/rolldown/tests/esbuild/default/require_parent_dir_common_js/artifacts.snap +++ b/crates/rolldown/tests/esbuild/default/require_parent_dir_common_js/artifacts.snap @@ -13,7 +13,7 @@ import { __commonJS, __toESM } from "./_rolldown_runtime.mjs"; // index.js var require_require_parent_dir_common_js_index = __commonJS({ 'index.js'(exports, module) { -module.exports = 123 + module.exports = 123 } }); // dir/entry.js diff --git a/crates/rolldown/tests/esbuild/default/require_with_call_inside_try/artifacts.snap b/crates/rolldown/tests/esbuild/default/require_with_call_inside_try/artifacts.snap index 1273df2dea4..346712a6b76 100644 --- a/crates/rolldown/tests/esbuild/default/require_with_call_inside_try/artifacts.snap +++ b/crates/rolldown/tests/esbuild/default/require_with_call_inside_try/artifacts.snap @@ -13,13 +13,13 @@ import { __commonJS } from "./_rolldown_runtime.mjs"; // entry.js var require_entry = __commonJS({ 'entry.js'(exports, module) { -try { - const supportsColor = require('supports-color'); - if (supportsColor && (supportsColor.stderr || supportsColor).level >= 2) { - exports.colors = []; - } -} catch (error) { -} + try { + const supportsColor = require('supports-color'); + if (supportsColor && (supportsColor.stderr || supportsColor).level >= 2) { + exports.colors = []; + } + } catch (error) { + } } }); ``` diff --git a/crates/rolldown/tests/esbuild/default/simple_common_js/artifacts.snap b/crates/rolldown/tests/esbuild/default/simple_common_js/artifacts.snap index 09b73b63dcb..3ea43fe2e35 100644 --- a/crates/rolldown/tests/esbuild/default/simple_common_js/artifacts.snap +++ b/crates/rolldown/tests/esbuild/default/simple_common_js/artifacts.snap @@ -13,9 +13,9 @@ import { __commonJS, __toESM } from "./_rolldown_runtime.mjs"; // foo.js var require_foo = __commonJS({ 'foo.js'(exports, module) { -module.exports = function() { - return 123 -} + module.exports = function() { + return 123 + } } }); // entry.js diff --git a/crates/rolldown/tests/esbuild/default/use_strict_directive_bundle_issue1837/artifacts.snap b/crates/rolldown/tests/esbuild/default/use_strict_directive_bundle_issue1837/artifacts.snap index 0dca876d30e..37d5b39fac6 100644 --- a/crates/rolldown/tests/esbuild/default/use_strict_directive_bundle_issue1837/artifacts.snap +++ b/crates/rolldown/tests/esbuild/default/use_strict_directive_bundle_issue1837/artifacts.snap @@ -13,8 +13,8 @@ import { __commonJS, __toESM } from "./_rolldown_runtime.mjs"; // cjs.js var require_cjs = __commonJS({ 'cjs.js'(exports, module) { -'use strict' -exports.foo = process + 'use strict' + exports.foo = process } }); // entry.js diff --git a/crates/rolldown/tests/esbuild/import_star/export_self_as_namespace_es6/artifacts.snap b/crates/rolldown/tests/esbuild/import_star/export_self_as_namespace_es6/artifacts.snap index 2bf9718dbe1..3521b46d240 100644 --- a/crates/rolldown/tests/esbuild/import_star/export_self_as_namespace_es6/artifacts.snap +++ b/crates/rolldown/tests/esbuild/import_star/export_self_as_namespace_es6/artifacts.snap @@ -10,8 +10,8 @@ input_file: crates/rolldown/tests/esbuild/import_star/export_self_as_namespace_e ```js // entry.js var entry_ns = { - get foo() { return foo }, - get ns() { return entry_ns } + get foo() { return foo }, + get ns() { return entry_ns } }; const foo = 123 diff --git a/crates/rolldown/tests/esbuild/import_star/import_export_self_as_namespace_es6/artifacts.snap b/crates/rolldown/tests/esbuild/import_star/import_export_self_as_namespace_es6/artifacts.snap index 18c9b4bf440..3a5027c6c9b 100644 --- a/crates/rolldown/tests/esbuild/import_star/import_export_self_as_namespace_es6/artifacts.snap +++ b/crates/rolldown/tests/esbuild/import_star/import_export_self_as_namespace_es6/artifacts.snap @@ -10,8 +10,8 @@ input_file: crates/rolldown/tests/esbuild/import_star/import_export_self_as_name ```js // entry.js var entry_ns = { - get foo() { return foo }, - get ns() { return entry_ns } + get foo() { return foo }, + get ns() { return entry_ns } }; const foo = 123 diff --git a/crates/rolldown/tests/esbuild/import_star/import_export_star_ambiguous_warning/artifacts.snap b/crates/rolldown/tests/esbuild/import_star/import_export_star_ambiguous_warning/artifacts.snap index 9b66fd92861..0906e5b12f7 100644 --- a/crates/rolldown/tests/esbuild/import_star/import_export_star_ambiguous_warning/artifacts.snap +++ b/crates/rolldown/tests/esbuild/import_star/import_export_star_ambiguous_warning/artifacts.snap @@ -16,8 +16,8 @@ const y = 3 const z = 4 // common.js var common_ns = { - get x() { return x }, - get z() { return z } + get x() { return x }, + get z() { return z } }; diff --git a/crates/rolldown/tests/esbuild/import_star/import_star_and_common_js/artifacts.snap b/crates/rolldown/tests/esbuild/import_star/import_star_and_common_js/artifacts.snap index 61d197946f8..d7e12b0a06b 100644 --- a/crates/rolldown/tests/esbuild/import_star/import_star_and_common_js/artifacts.snap +++ b/crates/rolldown/tests/esbuild/import_star/import_star_and_common_js/artifacts.snap @@ -13,12 +13,12 @@ import { __esm, __toCommonJS } from "./_rolldown_runtime.mjs"; // foo.js var foo; var foo_ns = { - get foo() { return foo } + get foo() { return foo } }; var init_foo = __esm({ -'foo.js'() { -foo = 123 -} + 'foo.js'() { + foo = 123 + } }); // entry.js init_foo(); diff --git a/crates/rolldown/tests/esbuild/import_star/import_star_capture/artifacts.snap b/crates/rolldown/tests/esbuild/import_star/import_star_capture/artifacts.snap index f19c78867eb..4c68b1349dc 100644 --- a/crates/rolldown/tests/esbuild/import_star/import_star_capture/artifacts.snap +++ b/crates/rolldown/tests/esbuild/import_star/import_star_capture/artifacts.snap @@ -10,7 +10,7 @@ input_file: crates/rolldown/tests/esbuild/import_star/import_star_capture ```js // foo.js var foo_ns = { - get foo() { return foo$1 } + get foo() { return foo$1 } }; const foo$1 = 123 // entry.js diff --git a/crates/rolldown/tests/esbuild/import_star/import_star_common_js_capture/artifacts.snap b/crates/rolldown/tests/esbuild/import_star/import_star_common_js_capture/artifacts.snap index 33e947deda6..983daa1acb4 100644 --- a/crates/rolldown/tests/esbuild/import_star/import_star_common_js_capture/artifacts.snap +++ b/crates/rolldown/tests/esbuild/import_star/import_star_common_js_capture/artifacts.snap @@ -13,7 +13,7 @@ import { __commonJS, __toESM } from "./_rolldown_runtime.mjs"; // foo.js var require_foo = __commonJS({ 'foo.js'(exports, module) { -exports.foo = 123 + exports.foo = 123 } }); // entry.js diff --git a/crates/rolldown/tests/esbuild/import_star/import_star_common_js_no_capture/artifacts.snap b/crates/rolldown/tests/esbuild/import_star/import_star_common_js_no_capture/artifacts.snap index 041290958e0..55ea6deccca 100644 --- a/crates/rolldown/tests/esbuild/import_star/import_star_common_js_no_capture/artifacts.snap +++ b/crates/rolldown/tests/esbuild/import_star/import_star_common_js_no_capture/artifacts.snap @@ -13,7 +13,7 @@ import { __commonJS, __toESM } from "./_rolldown_runtime.mjs"; // foo.js var require_foo = __commonJS({ 'foo.js'(exports, module) { -exports.foo = 123 + exports.foo = 123 } }); // entry.js diff --git a/crates/rolldown/tests/esbuild/import_star/import_star_common_js_unused/artifacts.snap b/crates/rolldown/tests/esbuild/import_star/import_star_common_js_unused/artifacts.snap index f51d5c9aea2..334a177f778 100644 --- a/crates/rolldown/tests/esbuild/import_star/import_star_common_js_unused/artifacts.snap +++ b/crates/rolldown/tests/esbuild/import_star/import_star_common_js_unused/artifacts.snap @@ -13,7 +13,7 @@ import { __commonJS, __toESM } from "./_rolldown_runtime.mjs"; // foo.js var require_foo = __commonJS({ 'foo.js'(exports, module) { -exports.foo = 123 + exports.foo = 123 } }); // entry.js diff --git a/crates/rolldown/tests/esbuild/import_star/import_star_export_import_star_capture/artifacts.snap b/crates/rolldown/tests/esbuild/import_star/import_star_export_import_star_capture/artifacts.snap index 679e12a3197..12ebfdbe266 100644 --- a/crates/rolldown/tests/esbuild/import_star/import_star_export_import_star_capture/artifacts.snap +++ b/crates/rolldown/tests/esbuild/import_star/import_star_export_import_star_capture/artifacts.snap @@ -10,7 +10,7 @@ input_file: crates/rolldown/tests/esbuild/import_star/import_star_export_import_ ```js // foo.js var foo_ns = { - get foo() { return foo$1 } + get foo() { return foo$1 } }; const foo$1 = 123 // bar.js diff --git a/crates/rolldown/tests/esbuild/import_star/import_star_export_import_star_no_capture/artifacts.snap b/crates/rolldown/tests/esbuild/import_star/import_star_export_import_star_no_capture/artifacts.snap index 7ee57f70d26..ce776025d20 100644 --- a/crates/rolldown/tests/esbuild/import_star/import_star_export_import_star_no_capture/artifacts.snap +++ b/crates/rolldown/tests/esbuild/import_star/import_star_export_import_star_no_capture/artifacts.snap @@ -10,7 +10,7 @@ input_file: crates/rolldown/tests/esbuild/import_star/import_star_export_import_ ```js // foo.js var foo_ns = { - get foo() { return foo$1 } + get foo() { return foo$1 } }; const foo$1 = 123 // bar.js diff --git a/crates/rolldown/tests/esbuild/import_star/import_star_export_import_star_unused/artifacts.snap b/crates/rolldown/tests/esbuild/import_star/import_star_export_import_star_unused/artifacts.snap index 0dcaf369a3a..03cbe37a768 100644 --- a/crates/rolldown/tests/esbuild/import_star/import_star_export_import_star_unused/artifacts.snap +++ b/crates/rolldown/tests/esbuild/import_star/import_star_export_import_star_unused/artifacts.snap @@ -10,7 +10,7 @@ input_file: crates/rolldown/tests/esbuild/import_star/import_star_export_import_ ```js // foo.js var foo_ns = { - get foo() { return foo$1 } + get foo() { return foo$1 } }; const foo$1 = 123 // bar.js diff --git a/crates/rolldown/tests/esbuild/import_star/import_star_export_star_as_capture/artifacts.snap b/crates/rolldown/tests/esbuild/import_star/import_star_export_star_as_capture/artifacts.snap index 6a4c60e8492..55695c1e94b 100644 --- a/crates/rolldown/tests/esbuild/import_star/import_star_export_star_as_capture/artifacts.snap +++ b/crates/rolldown/tests/esbuild/import_star/import_star_export_star_as_capture/artifacts.snap @@ -10,7 +10,7 @@ input_file: crates/rolldown/tests/esbuild/import_star/import_star_export_star_as ```js // foo.js var foo_ns = { - get foo() { return foo$1 } + get foo() { return foo$1 } }; const foo$1 = 123 // bar.js diff --git a/crates/rolldown/tests/esbuild/import_star/import_star_export_star_as_no_capture/artifacts.snap b/crates/rolldown/tests/esbuild/import_star/import_star_export_star_as_no_capture/artifacts.snap index 5f856fe28c0..f6ae9d59f25 100644 --- a/crates/rolldown/tests/esbuild/import_star/import_star_export_star_as_no_capture/artifacts.snap +++ b/crates/rolldown/tests/esbuild/import_star/import_star_export_star_as_no_capture/artifacts.snap @@ -10,7 +10,7 @@ input_file: crates/rolldown/tests/esbuild/import_star/import_star_export_star_as ```js // foo.js var foo_ns = { - get foo() { return foo$1 } + get foo() { return foo$1 } }; const foo$1 = 123 // bar.js diff --git a/crates/rolldown/tests/esbuild/import_star/import_star_export_star_as_unused/artifacts.snap b/crates/rolldown/tests/esbuild/import_star/import_star_export_star_as_unused/artifacts.snap index b3b839fdce2..cfba3827c34 100644 --- a/crates/rolldown/tests/esbuild/import_star/import_star_export_star_as_unused/artifacts.snap +++ b/crates/rolldown/tests/esbuild/import_star/import_star_export_star_as_unused/artifacts.snap @@ -10,7 +10,7 @@ input_file: crates/rolldown/tests/esbuild/import_star/import_star_export_star_as ```js // foo.js var foo_ns = { - get foo() { return foo$1 } + get foo() { return foo$1 } }; const foo$1 = 123 // bar.js diff --git a/crates/rolldown/tests/esbuild/import_star/import_star_export_star_capture/artifacts.snap b/crates/rolldown/tests/esbuild/import_star/import_star_export_star_capture/artifacts.snap index b2d4825c196..cef120153a2 100644 --- a/crates/rolldown/tests/esbuild/import_star/import_star_export_star_capture/artifacts.snap +++ b/crates/rolldown/tests/esbuild/import_star/import_star_export_star_capture/artifacts.snap @@ -12,7 +12,7 @@ input_file: crates/rolldown/tests/esbuild/import_star/import_star_export_star_ca const foo$1 = 123 // bar.js var bar_ns = { - get foo() { return foo$1 } + get foo() { return foo$1 } }; // entry.js diff --git a/crates/rolldown/tests/esbuild/import_star/import_star_export_star_no_capture/artifacts.snap b/crates/rolldown/tests/esbuild/import_star/import_star_export_star_no_capture/artifacts.snap index 90417318f7e..163a5fbbfdc 100644 --- a/crates/rolldown/tests/esbuild/import_star/import_star_export_star_no_capture/artifacts.snap +++ b/crates/rolldown/tests/esbuild/import_star/import_star_export_star_no_capture/artifacts.snap @@ -12,7 +12,7 @@ input_file: crates/rolldown/tests/esbuild/import_star/import_star_export_star_no const foo$1 = 123 // bar.js var bar_ns = { - get foo() { return foo$1 } + get foo() { return foo$1 } }; // entry.js diff --git a/crates/rolldown/tests/esbuild/import_star/import_star_export_star_omit_ambiguous/artifacts.snap b/crates/rolldown/tests/esbuild/import_star/import_star_export_star_omit_ambiguous/artifacts.snap index e82db25c036..798cbd56617 100644 --- a/crates/rolldown/tests/esbuild/import_star/import_star_export_star_omit_ambiguous/artifacts.snap +++ b/crates/rolldown/tests/esbuild/import_star/import_star_export_star_omit_ambiguous/artifacts.snap @@ -16,8 +16,8 @@ const y = 3 const z = 4 // common.js var common_ns = { - get x() { return x }, - get z() { return z } + get x() { return x }, + get z() { return z } }; diff --git a/crates/rolldown/tests/esbuild/import_star/import_star_export_star_unused/artifacts.snap b/crates/rolldown/tests/esbuild/import_star/import_star_export_star_unused/artifacts.snap index 055a489f595..41a75cc9865 100644 --- a/crates/rolldown/tests/esbuild/import_star/import_star_export_star_unused/artifacts.snap +++ b/crates/rolldown/tests/esbuild/import_star/import_star_export_star_unused/artifacts.snap @@ -12,7 +12,7 @@ input_file: crates/rolldown/tests/esbuild/import_star/import_star_export_star_un const foo$1 = 123 // bar.js var bar_ns = { - get foo() { return foo$1 } + get foo() { return foo$1 } }; // entry.js diff --git a/crates/rolldown/tests/esbuild/import_star/import_star_no_capture/artifacts.snap b/crates/rolldown/tests/esbuild/import_star/import_star_no_capture/artifacts.snap index 862d7627855..4b93b260212 100644 --- a/crates/rolldown/tests/esbuild/import_star/import_star_no_capture/artifacts.snap +++ b/crates/rolldown/tests/esbuild/import_star/import_star_no_capture/artifacts.snap @@ -10,7 +10,7 @@ input_file: crates/rolldown/tests/esbuild/import_star/import_star_no_capture ```js // foo.js var foo_ns = { - get foo() { return foo$1 } + get foo() { return foo$1 } }; const foo$1 = 123 // entry.js diff --git a/crates/rolldown/tests/esbuild/import_star/import_star_of_export_star_as/artifacts.snap b/crates/rolldown/tests/esbuild/import_star/import_star_of_export_star_as/artifacts.snap index 3116ea5b4f2..4f27d365936 100644 --- a/crates/rolldown/tests/esbuild/import_star/import_star_of_export_star_as/artifacts.snap +++ b/crates/rolldown/tests/esbuild/import_star/import_star_of_export_star_as/artifacts.snap @@ -10,12 +10,12 @@ input_file: crates/rolldown/tests/esbuild/import_star/import_star_of_export_star ```js // bar.js var bar_ns = { - get bar() { return bar } + get bar() { return bar } }; const bar = 123 // foo.js var foo_ns = { - get bar_ns() { return bar_ns } + get bar_ns() { return bar_ns } }; // entry.js diff --git a/crates/rolldown/tests/esbuild/import_star/import_star_unused/artifacts.snap b/crates/rolldown/tests/esbuild/import_star/import_star_unused/artifacts.snap index cc3da48cb36..ac4a9888ec4 100644 --- a/crates/rolldown/tests/esbuild/import_star/import_star_unused/artifacts.snap +++ b/crates/rolldown/tests/esbuild/import_star/import_star_unused/artifacts.snap @@ -10,7 +10,7 @@ input_file: crates/rolldown/tests/esbuild/import_star/import_star_unused ```js // foo.js var foo_ns = { - get foo() { return foo$1 } + get foo() { return foo$1 } }; const foo$1 = 123 // entry.js diff --git a/crates/rolldown/tests/esbuild/import_star/issue176/artifacts.snap b/crates/rolldown/tests/esbuild/import_star/issue176/artifacts.snap index ec4fe574be0..68ee0fe487c 100644 --- a/crates/rolldown/tests/esbuild/import_star/issue176/artifacts.snap +++ b/crates/rolldown/tests/esbuild/import_star/issue176/artifacts.snap @@ -14,7 +14,7 @@ const foo = () => 'hi there' // folders/index.js var folders_index_ns = { - get foo() { return foo } + get foo() { return foo } }; // entry.js diff --git a/crates/rolldown/tests/esbuild/import_star/namespace_import_missing_common_js/artifacts.snap b/crates/rolldown/tests/esbuild/import_star/namespace_import_missing_common_js/artifacts.snap index 123eb2bc027..0c7854ac9ae 100644 --- a/crates/rolldown/tests/esbuild/import_star/namespace_import_missing_common_js/artifacts.snap +++ b/crates/rolldown/tests/esbuild/import_star/namespace_import_missing_common_js/artifacts.snap @@ -13,7 +13,7 @@ import { __commonJS, __toESM } from "./_rolldown_runtime.mjs"; // foo.js var require_foo = __commonJS({ 'foo.js'(exports, module) { -exports.x = 123 + exports.x = 123 } }); // entry.js diff --git a/crates/rolldown/tests/esbuild/import_star/namespace_import_missing_es6/artifacts.snap b/crates/rolldown/tests/esbuild/import_star/namespace_import_missing_es6/artifacts.snap index 15c937af745..bfe979cc4f3 100644 --- a/crates/rolldown/tests/esbuild/import_star/namespace_import_missing_es6/artifacts.snap +++ b/crates/rolldown/tests/esbuild/import_star/namespace_import_missing_es6/artifacts.snap @@ -10,7 +10,7 @@ input_file: crates/rolldown/tests/esbuild/import_star/namespace_import_missing_e ```js // foo.js var foo_ns = { - get x() { return x } + get x() { return x } }; const x = 123 // entry.js diff --git a/crates/rolldown/tests/esbuild/import_star/namespace_import_re_export_star_missing_es6/artifacts.snap b/crates/rolldown/tests/esbuild/import_star/namespace_import_re_export_star_missing_es6/artifacts.snap index 7a09f241def..bea1f163c12 100644 --- a/crates/rolldown/tests/esbuild/import_star/namespace_import_re_export_star_missing_es6/artifacts.snap +++ b/crates/rolldown/tests/esbuild/import_star/namespace_import_re_export_star_missing_es6/artifacts.snap @@ -12,7 +12,7 @@ input_file: crates/rolldown/tests/esbuild/import_star/namespace_import_re_export const x = 123 // foo.js var foo_ns = { - get x() { return x } + get x() { return x } }; // entry.js diff --git a/crates/rolldown/tests/esbuild/import_star/namespace_import_re_export_star_unused_missing_es6/artifacts.snap b/crates/rolldown/tests/esbuild/import_star/namespace_import_re_export_star_unused_missing_es6/artifacts.snap index b7db58a9de7..4113a3c3cc9 100644 --- a/crates/rolldown/tests/esbuild/import_star/namespace_import_re_export_star_unused_missing_es6/artifacts.snap +++ b/crates/rolldown/tests/esbuild/import_star/namespace_import_re_export_star_unused_missing_es6/artifacts.snap @@ -12,7 +12,7 @@ input_file: crates/rolldown/tests/esbuild/import_star/namespace_import_re_export const x = 123 // foo.js var foo_ns = { - get x() { return x } + get x() { return x } }; // entry.js diff --git a/crates/rolldown/tests/esbuild/import_star/namespace_import_unused_missing_common_js/artifacts.snap b/crates/rolldown/tests/esbuild/import_star/namespace_import_unused_missing_common_js/artifacts.snap index 818b4c1647c..c04fa5bce42 100644 --- a/crates/rolldown/tests/esbuild/import_star/namespace_import_unused_missing_common_js/artifacts.snap +++ b/crates/rolldown/tests/esbuild/import_star/namespace_import_unused_missing_common_js/artifacts.snap @@ -13,7 +13,7 @@ import { __commonJS, __toESM } from "./_rolldown_runtime.mjs"; // foo.js var require_foo = __commonJS({ 'foo.js'(exports, module) { -exports.x = 123 + exports.x = 123 } }); // entry.js diff --git a/crates/rolldown/tests/esbuild/import_star/namespace_import_unused_missing_es6/artifacts.snap b/crates/rolldown/tests/esbuild/import_star/namespace_import_unused_missing_es6/artifacts.snap index 6ecd8a509af..aeb4d73fd29 100644 --- a/crates/rolldown/tests/esbuild/import_star/namespace_import_unused_missing_es6/artifacts.snap +++ b/crates/rolldown/tests/esbuild/import_star/namespace_import_unused_missing_es6/artifacts.snap @@ -10,7 +10,7 @@ input_file: crates/rolldown/tests/esbuild/import_star/namespace_import_unused_mi ```js // foo.js var foo_ns = { - get x() { return x } + get x() { return x } }; const x = 123 // entry.js diff --git a/crates/rolldown/tests/esbuild/import_star/other_file_export_self_as_namespace_unused_es6/artifacts.snap b/crates/rolldown/tests/esbuild/import_star/other_file_export_self_as_namespace_unused_es6/artifacts.snap index cd30f864571..7ca5a3dcde6 100644 --- a/crates/rolldown/tests/esbuild/import_star/other_file_export_self_as_namespace_unused_es6/artifacts.snap +++ b/crates/rolldown/tests/esbuild/import_star/other_file_export_self_as_namespace_unused_es6/artifacts.snap @@ -10,8 +10,8 @@ input_file: crates/rolldown/tests/esbuild/import_star/other_file_export_self_as_ ```js // foo.js var foo_ns = { - get foo() { return foo }, - get ns() { return foo_ns } + get foo() { return foo }, + get ns() { return foo_ns } }; const foo = 123 diff --git a/crates/rolldown/tests/esbuild/import_star/other_file_import_export_self_as_namespace_unused_es6/artifacts.snap b/crates/rolldown/tests/esbuild/import_star/other_file_import_export_self_as_namespace_unused_es6/artifacts.snap index 877ca673e12..6482fa77368 100644 --- a/crates/rolldown/tests/esbuild/import_star/other_file_import_export_self_as_namespace_unused_es6/artifacts.snap +++ b/crates/rolldown/tests/esbuild/import_star/other_file_import_export_self_as_namespace_unused_es6/artifacts.snap @@ -10,8 +10,8 @@ input_file: crates/rolldown/tests/esbuild/import_star/other_file_import_export_s ```js // foo.js var foo_ns = { - get foo() { return foo }, - get ns() { return foo_ns } + get foo() { return foo }, + get ns() { return foo_ns } }; const foo = 123 diff --git a/crates/rolldown/tests/esbuild/import_star/re_export_namespace_import_missing_es6/artifacts.snap b/crates/rolldown/tests/esbuild/import_star/re_export_namespace_import_missing_es6/artifacts.snap index 2f5d7e731ef..c3e7ebba7a4 100644 --- a/crates/rolldown/tests/esbuild/import_star/re_export_namespace_import_missing_es6/artifacts.snap +++ b/crates/rolldown/tests/esbuild/import_star/re_export_namespace_import_missing_es6/artifacts.snap @@ -10,7 +10,7 @@ input_file: crates/rolldown/tests/esbuild/import_star/re_export_namespace_import ```js // bar.js var bar_ns = { - get x() { return x } + get x() { return x } }; const x = 123 // foo.js diff --git a/crates/rolldown/tests/esbuild/import_star/re_export_namespace_import_unused_missing_es6/artifacts.snap b/crates/rolldown/tests/esbuild/import_star/re_export_namespace_import_unused_missing_es6/artifacts.snap index 368b02e2c1e..2dad6e8e9a2 100644 --- a/crates/rolldown/tests/esbuild/import_star/re_export_namespace_import_unused_missing_es6/artifacts.snap +++ b/crates/rolldown/tests/esbuild/import_star/re_export_namespace_import_unused_missing_es6/artifacts.snap @@ -10,7 +10,7 @@ input_file: crates/rolldown/tests/esbuild/import_star/re_export_namespace_import ```js // bar.js var bar_ns = { - get x() { return x } + get x() { return x } }; const x = 123 // foo.js diff --git a/crates/rolldown/tests/esbuild/import_star/re_export_other_file_export_self_as_namespace_es6/artifacts.snap b/crates/rolldown/tests/esbuild/import_star/re_export_other_file_export_self_as_namespace_es6/artifacts.snap index 26d53d13a92..f0bb197fbc7 100644 --- a/crates/rolldown/tests/esbuild/import_star/re_export_other_file_export_self_as_namespace_es6/artifacts.snap +++ b/crates/rolldown/tests/esbuild/import_star/re_export_other_file_export_self_as_namespace_es6/artifacts.snap @@ -10,8 +10,8 @@ input_file: crates/rolldown/tests/esbuild/import_star/re_export_other_file_expor ```js // foo.js var foo_ns = { - get foo() { return foo }, - get ns() { return foo_ns } + get foo() { return foo }, + get ns() { return foo_ns } }; const foo = 123 diff --git a/crates/rolldown/tests/esbuild/import_star/re_export_other_file_import_export_self_as_namespace_es6/artifacts.snap b/crates/rolldown/tests/esbuild/import_star/re_export_other_file_import_export_self_as_namespace_es6/artifacts.snap index 8a368da8823..bc705d5db7f 100644 --- a/crates/rolldown/tests/esbuild/import_star/re_export_other_file_import_export_self_as_namespace_es6/artifacts.snap +++ b/crates/rolldown/tests/esbuild/import_star/re_export_other_file_import_export_self_as_namespace_es6/artifacts.snap @@ -10,8 +10,8 @@ input_file: crates/rolldown/tests/esbuild/import_star/re_export_other_file_impor ```js // foo.js var foo_ns = { - get foo() { return foo }, - get ns() { return foo_ns } + get foo() { return foo }, + get ns() { return foo_ns } }; const foo = 123 diff --git a/crates/rolldown/tests/esbuild/splitting/shared-commonjs-into-es6/artifacts.snap b/crates/rolldown/tests/esbuild/splitting/shared-commonjs-into-es6/artifacts.snap index 6369795ab5d..071550c2ca1 100644 --- a/crates/rolldown/tests/esbuild/splitting/shared-commonjs-into-es6/artifacts.snap +++ b/crates/rolldown/tests/esbuild/splitting/shared-commonjs-into-es6/artifacts.snap @@ -13,7 +13,7 @@ import { __commonJS } from "./_rolldown_runtime.mjs"; // shared.js var require_shared = __commonJS({ 'shared.js'(exports, module) { -exports.foo = 123 + exports.foo = 123 } }); export { require_shared }; diff --git a/crates/rolldown/tests/fixtures/basic_commonjs/artifacts.snap b/crates/rolldown/tests/fixtures/basic_commonjs/artifacts.snap index 5f724710767..552ffa222df 100644 --- a/crates/rolldown/tests/fixtures/basic_commonjs/artifacts.snap +++ b/crates/rolldown/tests/fixtures/basic_commonjs/artifacts.snap @@ -11,29 +11,29 @@ input_file: crates/rolldown/tests/fixtures/basic_commonjs import { __commonJS, __esm, __toCommonJS, __toESM } from "./_rolldown_runtime.mjs"; // esm.js -function esm_default_fn() {}function esm_named_fn() {} - +function esm_default_fn() {} +function esm_named_fn() {} var esm_named_var,esm_named_class; var esm_ns = { - get default() { return esm_default_fn }, - get esm_named_class() { return esm_named_class }, - get esm_named_fn() { return esm_named_fn }, - get esm_named_var() { return esm_named_var } + get default() { return esm_default_fn }, + get esm_named_class() { return esm_named_class }, + get esm_named_fn() { return esm_named_fn }, + get esm_named_var() { return esm_named_var } }; var init_esm = __esm({ -'esm.js'() { + 'esm.js'() { -esm_named_var = 1; + esm_named_var = 1; -esm_named_class = class esm_named_class {} + esm_named_class = class esm_named_class {} -} + } }); // commonjs.js var require_commonjs$1 = __commonJS({ 'commonjs.js'(exports, module) { -var value = (init_esm(), __toCommonJS(esm_ns)); -module.exports = value; + var value = (init_esm(), __toCommonJS(esm_ns)); + module.exports = value; } }); // main.js diff --git a/crates/rolldown/tests/fixtures/import_reexport_between_esm_and_cjs/esm_import_cjs_import_star_as/artifacts.snap b/crates/rolldown/tests/fixtures/import_reexport_between_esm_and_cjs/esm_import_cjs_import_star_as/artifacts.snap index 1b5523bb61d..3777e71726a 100644 --- a/crates/rolldown/tests/fixtures/import_reexport_between_esm_and_cjs/esm_import_cjs_import_star_as/artifacts.snap +++ b/crates/rolldown/tests/fixtures/import_reexport_between_esm_and_cjs/esm_import_cjs_import_star_as/artifacts.snap @@ -13,7 +13,7 @@ import { __commonJS, __toESM } from "./_rolldown_runtime.mjs"; // commonjs.js var require_commonjs = __commonJS({ 'commonjs.js'(exports, module) { -exports.a = 1 + exports.a = 1 } }); // main.js diff --git a/crates/rolldown/tests/fixtures/import_reexport_between_esm_and_cjs/esm_import_cjs_named_import/artifacts.snap b/crates/rolldown/tests/fixtures/import_reexport_between_esm_and_cjs/esm_import_cjs_named_import/artifacts.snap index db984faf903..d4592fd937a 100644 --- a/crates/rolldown/tests/fixtures/import_reexport_between_esm_and_cjs/esm_import_cjs_named_import/artifacts.snap +++ b/crates/rolldown/tests/fixtures/import_reexport_between_esm_and_cjs/esm_import_cjs_named_import/artifacts.snap @@ -13,7 +13,7 @@ import { __commonJS, __toESM } from "./_rolldown_runtime.mjs"; // commonjs.js var require_commonjs = __commonJS({ 'commonjs.js'(exports, module) { -exports.a = 1 + exports.a = 1 } }); // main.js diff --git a/crates/rolldown/tests/fixtures/import_reexport_between_esm_and_cjs/esm_import_esm_which_export_all_from_cjs_named_import/artifacts.snap b/crates/rolldown/tests/fixtures/import_reexport_between_esm_and_cjs/esm_import_esm_which_export_all_from_cjs_named_import/artifacts.snap index ccfaaa82a25..70cc2e3becb 100644 --- a/crates/rolldown/tests/fixtures/import_reexport_between_esm_and_cjs/esm_import_esm_which_export_all_from_cjs_named_import/artifacts.snap +++ b/crates/rolldown/tests/fixtures/import_reexport_between_esm_and_cjs/esm_import_esm_which_export_all_from_cjs_named_import/artifacts.snap @@ -13,7 +13,7 @@ import { __commonJS, __reExport, __toESM } from "./_rolldown_runtime.mjs"; // commonjs.js var require_commonjs = __commonJS({ 'commonjs.js'(exports, module) { -exports.a = 1 + exports.a = 1 } }); // proxy.js diff --git a/crates/rolldown/tests/fixtures/import_reexport_between_esm_and_cjs/esm_import_esm_which_export_all_from_multiple_cjs_named_import/artifacts.snap b/crates/rolldown/tests/fixtures/import_reexport_between_esm_and_cjs/esm_import_esm_which_export_all_from_multiple_cjs_named_import/artifacts.snap index 90986060fa7..60b783d033e 100644 --- a/crates/rolldown/tests/fixtures/import_reexport_between_esm_and_cjs/esm_import_esm_which_export_all_from_multiple_cjs_named_import/artifacts.snap +++ b/crates/rolldown/tests/fixtures/import_reexport_between_esm_and_cjs/esm_import_esm_which_export_all_from_multiple_cjs_named_import/artifacts.snap @@ -13,13 +13,13 @@ import { __commonJS, __reExport, __toESM } from "./_rolldown_runtime.mjs"; // commonjs.js var require_commonjs = __commonJS({ 'commonjs.js'(exports, module) { -exports.a = 1 + exports.a = 1 } }); // commonjs2.js var require_commonjs2 = __commonJS({ 'commonjs2.js'(exports, module) { -exports.a = 2 + exports.a = 2 } }); // proxy.js diff --git a/crates/rolldown/tests/fixtures/import_reexport_between_esm_and_cjs/esm_reexport_cjs_named_reexport/artifacts.snap b/crates/rolldown/tests/fixtures/import_reexport_between_esm_and_cjs/esm_reexport_cjs_named_reexport/artifacts.snap index 6072b7b540c..f1926c646e9 100644 --- a/crates/rolldown/tests/fixtures/import_reexport_between_esm_and_cjs/esm_reexport_cjs_named_reexport/artifacts.snap +++ b/crates/rolldown/tests/fixtures/import_reexport_between_esm_and_cjs/esm_reexport_cjs_named_reexport/artifacts.snap @@ -13,7 +13,7 @@ import { __commonJS, __toESM } from "./_rolldown_runtime.mjs"; // commonjs.js var require_commonjs = __commonJS({ 'commonjs.js'(exports, module) { -exports.a = 1 + exports.a = 1 } }); // main.js diff --git a/crates/rolldown/tests/fixtures/mix-cjs-esm/artifacts.snap b/crates/rolldown/tests/fixtures/mix-cjs-esm/artifacts.snap index 5e8b94fbc2f..20b9ae3417f 100644 --- a/crates/rolldown/tests/fixtures/mix-cjs-esm/artifacts.snap +++ b/crates/rolldown/tests/fixtures/mix-cjs-esm/artifacts.snap @@ -18,9 +18,9 @@ var foo_ns = { }; var init_foo = __esm({ -'foo.js'() { + 'foo.js'() { -} + } }); // esm_export_cjs_require.js init_foo() @@ -28,15 +28,15 @@ const value = 1; // esm_import_cjs_export.js var require_esm_import_cjs_export = __commonJS({ 'esm_import_cjs_export.js'(exports, module) { -init_foo(); + init_foo(); -module.exports = 1 + module.exports = 1 } }); // cjs.js var require_cjs = __commonJS({ 'cjs.js'(exports, module) { -module.exports = 1; + module.exports = 1; } }); // esm_import_cjs_require.js diff --git a/crates/rolldown/tests/fixtures/reexport_commonjs/artifacts.snap b/crates/rolldown/tests/fixtures/reexport_commonjs/artifacts.snap index 095a5f8b50a..c70b2e6e89e 100644 --- a/crates/rolldown/tests/fixtures/reexport_commonjs/artifacts.snap +++ b/crates/rolldown/tests/fixtures/reexport_commonjs/artifacts.snap @@ -13,15 +13,15 @@ import { __commonJS, __reExport, __toESM } from "./_rolldown_runtime.mjs"; // commonjs.js var require_commonjs = __commonJS({ 'commonjs.js'(exports, module) { -module.exports = { bar: 1 }; + module.exports = { bar: 1 }; } }); // esm.js const value = 1 // foo.js var foo_ns = { - get bar() { return import_commonjs$1.bar }, - get value() { return value } + get bar() { return import_commonjs$1.bar }, + get value() { return value } }; __reExport(foo_ns, __toESM(require_commonjs())); var import_commonjs$1 = __toESM(require_commonjs()); diff --git a/crates/rolldown/tests/fixtures/reexport_star/artifacts.snap b/crates/rolldown/tests/fixtures/reexport_star/artifacts.snap index cc1b4b74b68..ea0ef87442f 100644 --- a/crates/rolldown/tests/fixtures/reexport_star/artifacts.snap +++ b/crates/rolldown/tests/fixtures/reexport_star/artifacts.snap @@ -10,7 +10,7 @@ input_file: crates/rolldown/tests/fixtures/reexport_star ```js // a.js var a_ns = { - get abc() { return abc } + get abc() { return abc } }; const abc = undefined