From 976d20f9f5f6f6a1618ef04adf26768e3ed051c3 Mon Sep 17 00:00:00 2001 From: Hiroshi Ogawa Date: Sun, 8 Dec 2024 16:39:20 +0900 Subject: [PATCH] wip: define only module factories --- crates/rolldown/src/ecmascript/format/app.rs | 4 ++-- crates/rolldown/src/rebuild/mod.rs | 4 ++-- .../format/app/export-all/artifacts.snap | 3 +-- .../app/export-default-class/artifacts.snap | 3 +-- .../app/export-default-expr/artifacts.snap | 3 +-- .../app/export-default-fn/artifacts.snap | 3 +-- .../app/export-named-from/artifacts.snap | 3 +-- .../format/app/export-named/artifacts.snap | 3 +-- .../function/format/app/import/artifacts.snap | 3 +-- .../app/multiple_entry_modules/artifacts.snap | 9 +++----- .../format/app/require/artifacts.snap | 3 +-- .../rolldown/rebuild/basic/artifacts.snap | 2 +- ...egration_rolldown__filename_with_hash.snap | 22 +++++++++---------- 13 files changed, 27 insertions(+), 38 deletions(-) diff --git a/crates/rolldown/src/ecmascript/format/app.rs b/crates/rolldown/src/ecmascript/format/app.rs index 8107182f4fa7..46abb2801091 100644 --- a/crates/rolldown/src/ecmascript/format/app.rs +++ b/crates/rolldown/src/ecmascript/format/app.rs @@ -25,7 +25,7 @@ pub fn render_app<'code>( } // chunk content - source_joiner.append_source("\n__rolldown_runtime.modules({\n"); + source_joiner.append_source("var __rolldown_modules = {\n"); module_sources.iter().for_each(|(_, module_id, module_render_output)| { source_joiner.append_source(format!( "{}: function(__rolldown_runtime) {{", @@ -39,7 +39,7 @@ pub fn render_app<'code>( } source_joiner.append_source("},\n"); }); - source_joiner.append_source("});\n"); + source_joiner.append_source("};\n"); if let Some(outro) = outro { source_joiner.append_source(outro); diff --git a/crates/rolldown/src/rebuild/mod.rs b/crates/rolldown/src/rebuild/mod.rs index 1a63c8f2ade7..d1848f85e243 100644 --- a/crates/rolldown/src/rebuild/mod.rs +++ b/crates/rolldown/src/rebuild/mod.rs @@ -70,7 +70,7 @@ impl RebuildManager { if !changed_modules.is_empty() { // create hmr chunk let mut source_joiner = SourceJoiner::default(); - source_joiner.append_source("\n__rolldown_runtime.modules({\n"); + source_joiner.append_source("\nvar __rolldown_modules = {\n"); for (module_id, module) in &changed_modules { source_joiner.append_source(format!( "{}: function(__rolldown_runtime) {{", @@ -81,7 +81,7 @@ impl RebuildManager { } source_joiner.append_source("},\n"); } - source_joiner.append_source("});\n"); + source_joiner.append_source("};\n"); let (content, mut map) = source_joiner.join(); let file_dir = options.cwd.as_path().join(&options.dir); if let Some(map) = map.as_mut() { diff --git a/crates/rolldown/tests/rolldown/function/format/app/export-all/artifacts.snap b/crates/rolldown/tests/rolldown/function/format/app/export-all/artifacts.snap index ca6b10deaff5..a25ee87fd29d 100644 --- a/crates/rolldown/tests/rolldown/function/format/app/export-all/artifacts.snap +++ b/crates/rolldown/tests/rolldown/function/format/app/export-all/artifacts.snap @@ -7,8 +7,7 @@ snapshot_kind: text ## main.js ```js - -__rolldown_runtime.modules({ +var __rolldown_modules = { "main.js": function(__rolldown_runtime) { //#region main.js diff --git a/crates/rolldown/tests/rolldown/function/format/app/export-default-class/artifacts.snap b/crates/rolldown/tests/rolldown/function/format/app/export-default-class/artifacts.snap index 36c7a4e828bd..45cf98288cfa 100644 --- a/crates/rolldown/tests/rolldown/function/format/app/export-default-class/artifacts.snap +++ b/crates/rolldown/tests/rolldown/function/format/app/export-default-class/artifacts.snap @@ -7,8 +7,7 @@ snapshot_kind: text ## main.js ```js - -__rolldown_runtime.modules({ +var __rolldown_modules = { "foo.js": function(__rolldown_runtime) { //#region foo.js diff --git a/crates/rolldown/tests/rolldown/function/format/app/export-default-expr/artifacts.snap b/crates/rolldown/tests/rolldown/function/format/app/export-default-expr/artifacts.snap index 2f8a13817ce9..031fb7c6b21a 100644 --- a/crates/rolldown/tests/rolldown/function/format/app/export-default-expr/artifacts.snap +++ b/crates/rolldown/tests/rolldown/function/format/app/export-default-expr/artifacts.snap @@ -7,8 +7,7 @@ snapshot_kind: text ## main.js ```js - -__rolldown_runtime.modules({ +var __rolldown_modules = { "main.js": function(__rolldown_runtime) { //#region main.js diff --git a/crates/rolldown/tests/rolldown/function/format/app/export-default-fn/artifacts.snap b/crates/rolldown/tests/rolldown/function/format/app/export-default-fn/artifacts.snap index 6c174ddbf2f3..9902621f4d6e 100644 --- a/crates/rolldown/tests/rolldown/function/format/app/export-default-fn/artifacts.snap +++ b/crates/rolldown/tests/rolldown/function/format/app/export-default-fn/artifacts.snap @@ -7,8 +7,7 @@ snapshot_kind: text ## main.js ```js - -__rolldown_runtime.modules({ +var __rolldown_modules = { "foo.js": function(__rolldown_runtime) { //#region foo.js diff --git a/crates/rolldown/tests/rolldown/function/format/app/export-named-from/artifacts.snap b/crates/rolldown/tests/rolldown/function/format/app/export-named-from/artifacts.snap index 7ce341c9e16e..199553a882b2 100644 --- a/crates/rolldown/tests/rolldown/function/format/app/export-named-from/artifacts.snap +++ b/crates/rolldown/tests/rolldown/function/format/app/export-named-from/artifacts.snap @@ -7,8 +7,7 @@ snapshot_kind: text ## main.js ```js - -__rolldown_runtime.modules({ +var __rolldown_modules = { "main.js": function(__rolldown_runtime) { //#region main.js diff --git a/crates/rolldown/tests/rolldown/function/format/app/export-named/artifacts.snap b/crates/rolldown/tests/rolldown/function/format/app/export-named/artifacts.snap index 65d9e92ed80a..545a95863467 100644 --- a/crates/rolldown/tests/rolldown/function/format/app/export-named/artifacts.snap +++ b/crates/rolldown/tests/rolldown/function/format/app/export-named/artifacts.snap @@ -7,8 +7,7 @@ snapshot_kind: text ## main.js ```js - -__rolldown_runtime.modules({ +var __rolldown_modules = { "main.js": function(__rolldown_runtime) { //#region main.js diff --git a/crates/rolldown/tests/rolldown/function/format/app/import/artifacts.snap b/crates/rolldown/tests/rolldown/function/format/app/import/artifacts.snap index a4dcd1578f6c..a0a1b7f2b75a 100644 --- a/crates/rolldown/tests/rolldown/function/format/app/import/artifacts.snap +++ b/crates/rolldown/tests/rolldown/function/format/app/import/artifacts.snap @@ -7,8 +7,7 @@ snapshot_kind: text ## main.js ```js - -__rolldown_runtime.modules({ +var __rolldown_modules = { "rolldown:runtime": function(__rolldown_runtime) { diff --git a/crates/rolldown/tests/rolldown/function/format/app/multiple_entry_modules/artifacts.snap b/crates/rolldown/tests/rolldown/function/format/app/multiple_entry_modules/artifacts.snap index 84df9f2d7397..c70cd9681b86 100644 --- a/crates/rolldown/tests/rolldown/function/format/app/multiple_entry_modules/artifacts.snap +++ b/crates/rolldown/tests/rolldown/function/format/app/multiple_entry_modules/artifacts.snap @@ -7,8 +7,7 @@ snapshot_kind: text ## cube.js ```js - -__rolldown_runtime.modules({ +var __rolldown_modules = { "square.js": function(__rolldown_runtime) { //#region square.js @@ -39,8 +38,7 @@ function cube(x) { ## main.js ```js - -__rolldown_runtime.modules({ +var __rolldown_modules = { "hyper-cube.js": function(__rolldown_runtime) { //#region hyper-cube.js @@ -69,8 +67,7 @@ console.log(hyper_cube_exports.default(5)); ## other-entry.js ```js - -__rolldown_runtime.modules({ +var __rolldown_modules = { "other-entry.js": function(__rolldown_runtime) { //#region other-entry.js diff --git a/crates/rolldown/tests/rolldown/function/format/app/require/artifacts.snap b/crates/rolldown/tests/rolldown/function/format/app/require/artifacts.snap index 1313b989c04a..f3dcc919e69c 100644 --- a/crates/rolldown/tests/rolldown/function/format/app/require/artifacts.snap +++ b/crates/rolldown/tests/rolldown/function/format/app/require/artifacts.snap @@ -7,8 +7,7 @@ snapshot_kind: text ## main.js ```js - -__rolldown_runtime.modules({ +var __rolldown_modules = { "rolldown:runtime": function(__rolldown_runtime) { diff --git a/crates/rolldown/tests/rolldown/rebuild/basic/artifacts.snap b/crates/rolldown/tests/rolldown/rebuild/basic/artifacts.snap index 4eba48d0f7b2..0b0cb2241dd2 100644 --- a/crates/rolldown/tests/rolldown/rebuild/basic/artifacts.snap +++ b/crates/rolldown/tests/rolldown/rebuild/basic/artifacts.snap @@ -38,7 +38,7 @@ console.log(dep); ```js -__rolldown_runtime.modules({ +var __rolldown_modules = { "dep.js": function(__rolldown_runtime) { //#region dep.js diff --git a/crates/rolldown/tests/snapshots/integration_rolldown__filename_with_hash.snap b/crates/rolldown/tests/snapshots/integration_rolldown__filename_with_hash.snap index 616661d73912..5af21fd0cd79 100644 --- a/crates/rolldown/tests/snapshots/integration_rolldown__filename_with_hash.snap +++ b/crates/rolldown/tests/snapshots/integration_rolldown__filename_with_hash.snap @@ -4127,41 +4127,41 @@ snapshot_kind: text # tests/rolldown/function/format/app/export-all -- main-!~{000}~.js => main-C8JyO0Pq.js +- main-!~{000}~.js => main-C2fhg46c.js # tests/rolldown/function/format/app/export-default-class -- main-!~{000}~.js => main-B7y_NdJ7.js +- main-!~{000}~.js => main-XV6nvXr2.js # tests/rolldown/function/format/app/export-default-expr -- main-!~{000}~.js => main-DxPlJBbf.js +- main-!~{000}~.js => main-Bi9MTw2b.js # tests/rolldown/function/format/app/export-default-fn -- main-!~{000}~.js => main-CpWZgeg3.js +- main-!~{000}~.js => main-DyhDAcZw.js # tests/rolldown/function/format/app/export-named -- main-!~{000}~.js => main-DtsEkgbw.js +- main-!~{000}~.js => main-DOoEzyUq.js # tests/rolldown/function/format/app/export-named-from -- main-!~{000}~.js => main-DHIOi3Lr.js +- main-!~{000}~.js => main-BA7Qc7Uu.js # tests/rolldown/function/format/app/import -- main-!~{000}~.js => main-DKZyN37s.js +- main-!~{000}~.js => main-BLlCw-xy.js # tests/rolldown/function/format/app/multiple_entry_modules -- main-!~{000}~.js => main-AkAKQngF.js -- other-entry-!~{001}~.js => other-entry-Cnlk6n3p.js -- cube-!~{002}~.js => cube-Beuobi3z.js +- main-!~{000}~.js => main-DAXIiw9l.js +- other-entry-!~{001}~.js => other-entry-D3MxylU_.js +- cube-!~{002}~.js => cube-CmpNDwx8.js # tests/rolldown/function/format/app/require -- main-!~{000}~.js => main-BFFsZQki.js +- main-!~{000}~.js => main-8xgU3A1-.js # tests/rolldown/function/format/cjs/conflict_exports_key