Merge remote-tracking branch 'origin/master' into feat/replace__expor…

…ts_with_runtime_func

CHANGELOG.md

@@ -1,13 +1,37 @@
+## 0.2.1
+
+`2024-01-04`
+
+> @alipay/bigfish@4.1.14
+
+* 修复模块中对相同模块同时使用 import 和 require 时，skipModules 优化时误删依赖模块的问题 by [@stormslowly](https://github.com/stormslowly) in [#842](https://github.com/umijs/mako/pull/842)
+
+## 0.2.0
+
+`2024-01-04`
+
+> @alipay/bigfish@4.1.14
+
+* BREAK CHANGE：调整和合并配置项 by [@PeachScript](https://github.com/PeachScript) in [#837](https://github.com/umijs/mako/pull/837)
+* 优化 optimizePackageImports 功能，支持缓存、export * 和深度桶文件 by [@sorrycc](https://github.com/sorrycc) in [#810](https://github.com/umijs/mako/pull/810)
+* 优化 tree shaking，实现 skip modules 以进一步减少产物尺寸 by [@stormslowly](https://github.com/stormslowly) in [#807](https://github.com/umijs/mako/pull/807)
+* 优化 stats，添加 entry 信息 by [@PeachScript](https://github.com/PeachScript) in [#823](https://github.com/umijs/mako/pull/823) #829
+* 修复 runtime 里一处 es5 不兼容的代码 in [#830](https://github.com/umijs/mako/pull/830)
+* 修复 cjs 模块被插入 esm helpers 导致变成 esm 模块的问题 by [@stormslowly](https://github.com/stormslowly) in [#831](https://github.com/umijs/mako/pull/831)
+* 修复 optimizePackageImports default export 的处理 by [@zhangpanweb](https://github.com/zhangpanweb) in [#832](https://github.com/umijs/mako/pull/832)
+* 优化 skip modules 的性能问题 by [@stormslowly](https://github.com/stormslowly) in [#826](https://github.com/umijs/mako/pull/826)
+* 优化一处细节性能问题 by [@stormslowly](https://github.com/stormslowly) in [#835](https://github.com/umijs/mako/pull/835)
+
 ## 0.1.15
 
 `2023-12-18`
 
 > @alipay/bigfish@4.1.12
 
-* 新增 支持显示 less 代码 sourcemap by [@jiesia](https://github.com/jiesia) in [755](https://github.com/umijs/mako/pull/775)
-* 修复 require context 不支持后缀 require 的问题 by [@PeachScript](https://github.com/PeachScript) in [806](https://github.com/umijs/mako/pull/806)
-* 修复 entry chunk 和 vendor chunk 中模块重复的问题 by [@PeachScript](https://github.com/PeachScript) in [809](https://github.com/umijs/mako/pull/809)
-* 修复 dynamicImportToRequire 开启后遗漏动态引用模块的问题 by [@stormslowly](https://github.com/stormslowly)  in [811](https://github.com/umijs/mako/pull/811)
+* 新增 支持显示 less 代码 sourcemap by [@jiesia](https://github.com/jiesia) in [#755](https://github.com/umijs/mako/pull/775)
+* 修复 require context 不支持后缀 require 的问题 by [@PeachScript](https://github.com/PeachScript) in [#806](https://github.com/umijs/mako/pull/806)
+* 修复 entry chunk 和 vendor chunk 中模块重复的问题 by [@PeachScript](https://github.com/PeachScript) in [#809](https://github.com/umijs/mako/pull/809)
+* 修复 dynamicImportToRequire 开启后遗漏动态引用模块的问题 by [@stormslowly](https://github.com/stormslowly)  in [#811](https://github.com/umijs/mako/pull/811)
 
 ## 0.1.14
 

crates/mako/src/ast.rs

@@ -205,21 +205,21 @@ pub fn js_ast_to_code(
     }
 
     let sourcemap = match context.config.devtool {
-        DevtoolConfig::SourceMap | DevtoolConfig::InlineSourceMap => {
+        Some(DevtoolConfig::SourceMap | DevtoolConfig::InlineSourceMap) => {
             let src_buf = build_source_map(&source_map_buf, cm);
             String::from_utf8(src_buf).unwrap()
         }
-        DevtoolConfig::None => "".to_string(),
+        None => "".to_string(),
     };
 
-    if matches!(context.config.devtool, DevtoolConfig::SourceMap) {
+    if matches!(context.config.devtool, Some(DevtoolConfig::SourceMap)) {
         // separate sourcemap file
         buf.append(
             &mut format!("\n//# sourceMappingURL={filename}.map")
                 .as_bytes()
                 .to_vec(),
         );
-    } else if matches!(context.config.devtool, DevtoolConfig::InlineSourceMap) {
+    } else if matches!(context.config.devtool, Some(DevtoolConfig::InlineSourceMap)) {
         // inline sourcemap
         buf.append(
             &mut format!(
@@ -257,10 +257,10 @@ pub fn css_ast_to_code(
     let src_buf = build_source_map(&source_map, &context.meta.css.cm);
     let sourcemap = String::from_utf8(src_buf).unwrap();
 
-    if matches!(context.config.devtool, DevtoolConfig::SourceMap) {
+    if matches!(context.config.devtool, Some(DevtoolConfig::SourceMap)) {
         // separate sourcemap file
         css_code.push_str(format!("\n/*# sourceMappingURL={filename}.map*/").as_str());
-    } else if matches!(context.config.devtool, DevtoolConfig::InlineSourceMap) {
+    } else if matches!(context.config.devtool, Some(DevtoolConfig::InlineSourceMap)) {
         // inline sourcemap
         css_code.push_str(
             format!(
@@ -316,7 +316,6 @@ mod tests {
     use crate::assert_debug_snapshot;
     use crate::ast::js_ast_to_code;
     use crate::compiler::Context;
-    use crate::config::DevtoolConfig;
     use crate::test_helper::create_mock_module;
 
     #[tokio::test(flavor = "multi_thread")]
@@ -331,7 +330,7 @@ export const bar = {
 "#,
         );
         let mut context = Context::default();
-        context.config.devtool = DevtoolConfig::None;
+        context.config.devtool = None;
         let (code, _) = js_ast_to_code(
             module.info.unwrap().ast.as_script_mut(),
             &Arc::new(context),

crates/mako/src/build.rs

@@ -23,7 +23,7 @@ use crate::analyze_deps::analyze_deps;
 use crate::ast::{build_js_ast, generate_code_frame};
 use crate::chunk_pot::util::{hash_hashmap, hash_vec};
 use crate::compiler::{Compiler, Context};
-use crate::config::{DevtoolConfig, Mode};
+use crate::config::Mode;
 use crate::load::{ext_name, load, Content};
 use crate::module::{
     Dependency, ExportInfo, ExportSpecifierInfo, ImportInfo, ImportSpecifierInfo, Module,
@@ -58,7 +58,7 @@ impl Compiler {
             .iter()
             .map(|entry| {
                 let mut entry = entry.to_str().unwrap().to_string();
-                if self.context.config.hmr
+                if self.context.config.hmr.is_some()
                     && self.context.config.mode == Mode::Development
                     && self.context.args.watch
                 {
@@ -594,9 +594,7 @@ lazy_static! {
 }
 
 fn load_source_map(context: &Arc<Context>, content: &Content) -> Option<Vec<u8>> {
-    if matches!(context.config.devtool, DevtoolConfig::None) {
-        return None;
-    }
+    context.config.devtool.as_ref()?;
 
     // TODO support load js source map
     if !matches!(content, Content::Css(_)) {

crates/mako/src/chunk_pot/ast_impl.rs

@@ -20,7 +20,7 @@ use crate::chunk::{Chunk, ChunkType};
 use crate::chunk_pot::util::{pot_to_chunk_module, pot_to_module_object, runtime_code};
 use crate::chunk_pot::{get_css_chunk_filename, util, ChunkPot};
 use crate::compiler::Context;
-use crate::config::{DevtoolConfig, Mode};
+use crate::config::Mode;
 use crate::generate_chunks::{ChunkFile, ChunkFileType};
 use crate::load::file_content_hash;
 use crate::minify::{minify_css, minify_js};
@@ -79,7 +79,7 @@ pub(crate) fn render_css_chunk(
 
     let cm = &context.meta.css.cm;
     let source_map = match context.config.devtool {
-        DevtoolConfig::None => None,
+        None => None,
         _ => {
             mako_profile_scope!("build_source_map");
             // source map chain

crates/mako/src/chunk_pot/util.rs

@@ -18,7 +18,7 @@ use mako_core::twox_hash::XxHash64;
 
 use crate::chunk_pot::ChunkPot;
 use crate::compiler::Context;
-use crate::config::{DevtoolConfig, Mode};
+use crate::config::Mode;
 use crate::load::file_content_hash;
 use crate::module::{Module, ModuleAst};
 use crate::runtime::AppRuntimeTemplate;
@@ -52,7 +52,7 @@ pub(crate) fn render_module_js(
     let source_map = {
         mako_core::mako_profile_scope!("build_source_map");
         match context.config.devtool {
-            DevtoolConfig::None => None,
+            None => None,
             _ => Some(build_source_map(&source_map_buf, cm)),
         }
     };
@@ -92,11 +92,7 @@ pub(crate) fn empty_module_fn_expr() -> FnExpr {
     create = "{ SizedCache::with_size(5) }"
 )]
 pub(crate) fn runtime_code(context: &Arc<Context>) -> Result<String> {
-    let umd = if context.config.umd != "none" {
-        Some(context.config.umd.clone())
-    } else {
-        None
-    };
+    let umd = context.config.umd.clone();
     let chunk_graph = context.chunk_graph.read().unwrap();
     let has_dynamic_chunks = chunk_graph.get_all_chunks().len() > 1;
     let has_hmr = context.args.watch;