From a51ee2c10fa7239984e428da7c1a598f94ed4468 Mon Sep 17 00:00:00 2001 From: xusd320 Date: Thu, 6 Jun 2024 16:14:56 +0800 Subject: [PATCH 1/4] fix: globalThis attributes visit --- crates/mako/src/resolve/mod.rs | 22 ++++++++++++---------- e2e/fixtures/config.externals/expect.js | 10 +++++----- packages/mako/binding.d.ts | 4 ---- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/crates/mako/src/resolve/mod.rs b/crates/mako/src/resolve/mod.rs index 0ef63d872..fcefe4a6b 100644 --- a/crates/mako/src/resolve/mod.rs +++ b/crates/mako/src/resolve/mod.rs @@ -89,7 +89,7 @@ fn get_external_target( } else if external.starts_with("commonjs ") { format!("require(\"{}\")", external.replace("commonjs ", "")) } else { - format!("{}.{}", global_obj, external) + format!("{}['{}']", global_obj, external) }, None, )), @@ -99,7 +99,7 @@ fn get_external_target( } else if config.module_type.as_ref().is_some_and(|t| t == "commonjs") { format!("require(\"{}\")", config.root) } else { - format!("{}.{}", global_obj, config.root) + format!("{}['{}']", global_obj, config.root) }, config.script.clone(), )), @@ -180,7 +180,7 @@ fn get_external_target( }; } Some(( - format!("{}.{}.{}", global_obj, advanced_config.root, replaced), + format!("{}['{}'].{}", global_obj, advanced_config.root, replaced), advanced_config.script.clone(), )) } @@ -511,7 +511,9 @@ mod tests { x, ( "react".to_string(), - Some("(typeof globalThis !== 'undefined' ? globalThis : self).react".to_string()), + Some( + "(typeof globalThis !== 'undefined' ? globalThis : self)['react']".to_string() + ), None, ) ); @@ -602,7 +604,7 @@ mod tests { ( "antd/es/version".to_string(), Some( - "(typeof globalThis !== 'undefined' ? globalThis : self).antd.version" + "(typeof globalThis !== 'undefined' ? globalThis : self)['antd'].version" .to_string() ), None, @@ -623,7 +625,7 @@ mod tests { ( "antd/es/date-picker".to_string(), Some( - "(typeof globalThis !== 'undefined' ? globalThis : self).antd.DatePicker" + "(typeof globalThis !== 'undefined' ? globalThis : self)['antd'].DatePicker" .to_string() ), None, @@ -634,7 +636,7 @@ mod tests { ( "antd/es/input/Group".to_string(), Some( - "(typeof globalThis !== 'undefined' ? globalThis : self).antd.Input.Group" + "(typeof globalThis !== 'undefined' ? globalThis : self)['antd'].Input.Group" .to_string() ), None, @@ -647,7 +649,7 @@ mod tests { ( "/path/to/node_modules/antd/es/button".to_string(), Some( - "(typeof globalThis !== 'undefined' ? globalThis : self).antd.Button" + "(typeof globalThis !== 'undefined' ? globalThis : self)['antd'].Button" .to_string() ), None, @@ -662,7 +664,7 @@ mod tests { ( "/path/to/node_modules/_antd@5.0.0@antd/es/button".to_string(), Some( - "(typeof globalThis !== 'undefined' ? globalThis : self).antd.Button" + "(typeof globalThis !== 'undefined' ? globalThis : self)['antd'].Button" .to_string() ), None, @@ -674,7 +676,7 @@ mod tests { ( "script".to_string(), Some( - "(typeof globalThis !== 'undefined' ? globalThis : self).ScriptType" + "(typeof globalThis !== 'undefined' ? globalThis : self)['ScriptType']" .to_string() ), Some("https://example.com/lib/script.js".to_string()), diff --git a/e2e/fixtures/config.externals/expect.js b/e2e/fixtures/config.externals/expect.js index ad7376eea..64c0cb97d 100644 --- a/e2e/fixtures/config.externals/expect.js +++ b/e2e/fixtures/config.externals/expect.js @@ -8,7 +8,7 @@ assert.match( content, moduleReg( "hoo", - "module.exports = \\(typeof globalThis !== 'undefined' \\? globalThis : self\\).hoo;" + "module.exports = \\(typeof globalThis !== 'undefined' \\? globalThis : self\\)\\['hoo'\\];" ), "should have external module: hoo" ); @@ -52,7 +52,7 @@ assert.match( content, moduleReg( "antd/es/version", - "module.exports = \\(typeof globalThis !== 'undefined' \\? globalThis : self\\).antd.version;" + "module.exports = \\(typeof globalThis !== 'undefined' \\? globalThis : self\\)\\['antd'\\].version;" ), "should external 1-level subpath" ); @@ -61,7 +61,7 @@ assert.match( content, moduleReg( "antd/es/date-picker", - "module.exports = \\(typeof globalThis !== 'undefined' \\? globalThis : self\\).antd.DatePicker;" + "module.exports = \\(typeof globalThis !== 'undefined' \\? globalThis : self\\)\\['antd'\\].DatePicker;" ), "should external 1-level subpath with PascalCase" ); @@ -70,7 +70,7 @@ assert.match( content, moduleReg( "antd/es/input/Group", - "module.exports = \\(typeof globalThis !== 'undefined' \\? globalThis : self\\).antd.Input.Group;" + "module.exports = \\(typeof globalThis !== 'undefined' \\? globalThis : self\\)\\['antd'\\].Input.Group;" ), "should external 2-level subpath with PascalCase" ); @@ -79,7 +79,7 @@ assert.match( content, moduleReg( "script", - "__mako_require__.loadScript\\('https://example.com/lib/script.js'[^]+\\(typeof globalThis !== 'undefined' \\? globalThis : self\\).ScriptType" + "__mako_require__.loadScript\\('https://example.com/lib/script.js'[^]+\\(typeof globalThis !== 'undefined' \\? globalThis : self\\)\\['ScriptType'\\]" ), "should external in script mode" ); diff --git a/packages/mako/binding.d.ts b/packages/mako/binding.d.ts index 5831ff6e6..396cc8a8f 100644 --- a/packages/mako/binding.d.ts +++ b/packages/mako/binding.d.ts @@ -3,10 +3,6 @@ /* auto-generated by NAPI-RS */ -export interface TransformOutput { - code: string; - map?: string; -} export interface JsHooks { name?: string; load?: ( From a23adb9a0b652b1998cd64ed476d5587f626bd1c Mon Sep 17 00:00:00 2001 From: xusd320 Date: Fri, 7 Jun 2024 09:55:53 +0800 Subject: [PATCH 2/4] chore: add comments and unit test --- crates/mako/src/resolve/mod.rs | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/crates/mako/src/resolve/mod.rs b/crates/mako/src/resolve/mod.rs index fcefe4a6b..f93d9d7c1 100644 --- a/crates/mako/src/resolve/mod.rs +++ b/crates/mako/src/resolve/mod.rs @@ -99,6 +99,10 @@ fn get_external_target( } else if config.module_type.as_ref().is_some_and(|t| t == "commonjs") { format!("require(\"{}\")", config.root) } else { + /* + * Can't use "globalThis.{xxx}" because "globalThis.@ant-design/icons" + * is syntax invalid + */ format!("{}['{}']", global_obj, config.root) }, config.script.clone(), @@ -498,6 +502,10 @@ mod tests { "react".to_string(), ExternalConfig::Basic("react".to_string()), ), + ( + "@ant-design/icons".to_string(), + ExternalConfig::Basic("@ant-design/icons".to_string()), + ), ("empty".to_string(), ExternalConfig::Basic("".to_string())), ]); let x = external_resolve( @@ -517,6 +525,24 @@ mod tests { None, ) ); + let x = external_resolve( + "test/resolve/normal", + None, + Some(&externals), + "index.ts", + "@ant-design/icons", + ); + assert_eq!( + x, + ( + "@ant-design/icons".to_string(), + Some( + "(typeof globalThis !== 'undefined' ? globalThis : self)['@ant-design/icons']" + .to_string() + ), + None, + ) + ); let x = external_resolve( "test/resolve/normal", None, From 514e963b57fc4885ba9406abebf0c767f0f888de Mon Sep 17 00:00:00 2001 From: xusd320 Date: Fri, 7 Jun 2024 10:05:20 +0800 Subject: [PATCH 3/4] chore: extract common fn get_external_target_from_global_obj --- crates/mako/src/resolve/mod.rs | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/crates/mako/src/resolve/mod.rs b/crates/mako/src/resolve/mod.rs index f93d9d7c1..9d2be17a0 100644 --- a/crates/mako/src/resolve/mod.rs +++ b/crates/mako/src/resolve/mod.rs @@ -89,7 +89,11 @@ fn get_external_target( } else if external.starts_with("commonjs ") { format!("require(\"{}\")", external.replace("commonjs ", "")) } else { - format!("{}['{}']", global_obj, external) + /* + * Can't use "globalThis.{xxx}" because "globalThis.@ant-design/icons" + * is syntax invalid + */ + get_external_target_from_global_obj(global_obj, external) }, None, )), @@ -103,7 +107,7 @@ fn get_external_target( * Can't use "globalThis.{xxx}" because "globalThis.@ant-design/icons" * is syntax invalid */ - format!("{}['{}']", global_obj, config.root) + get_external_target_from_global_obj(global_obj, &config.root) }, config.script.clone(), )), @@ -184,7 +188,11 @@ fn get_external_target( }; } Some(( - format!("{}['{}'].{}", global_obj, advanced_config.root, replaced), + format!( + "{}.{}", + get_external_target_from_global_obj(global_obj, &advanced_config.root), + replaced + ), advanced_config.script.clone(), )) } @@ -197,6 +205,14 @@ fn get_external_target( } } +/* + * Can't use "globalThis.{xxx}" because "globalThis.@ant-design/icons" + * is syntax invalid + */ +fn get_external_target_from_global_obj(global_obj_name: &str, external: &str) -> String { + format!("{}['{}']", global_obj_name, external) +} + // TODO: // - 支持物理缓存，让第二次更快 fn do_resolve( From fb2808ed213930dae5ba341b43d8b06901ee6c4b Mon Sep 17 00:00:00 2001 From: xusd320 Date: Fri, 7 Jun 2024 10:07:03 +0800 Subject: [PATCH 4/4] chore: remove duplicated comments --- crates/mako/src/resolve/mod.rs | 8 -------- 1 file changed, 8 deletions(-) diff --git a/crates/mako/src/resolve/mod.rs b/crates/mako/src/resolve/mod.rs index 9d2be17a0..d2eb6db95 100644 --- a/crates/mako/src/resolve/mod.rs +++ b/crates/mako/src/resolve/mod.rs @@ -89,10 +89,6 @@ fn get_external_target( } else if external.starts_with("commonjs ") { format!("require(\"{}\")", external.replace("commonjs ", "")) } else { - /* - * Can't use "globalThis.{xxx}" because "globalThis.@ant-design/icons" - * is syntax invalid - */ get_external_target_from_global_obj(global_obj, external) }, None, @@ -103,10 +99,6 @@ fn get_external_target( } else if config.module_type.as_ref().is_some_and(|t| t == "commonjs") { format!("require(\"{}\")", config.root) } else { - /* - * Can't use "globalThis.{xxx}" because "globalThis.@ant-design/icons" - * is syntax invalid - */ get_external_target_from_global_obj(global_obj, &config.root) }, config.script.clone(),