feat: magic comment chunk name

crates/mako/src/ast/js_ast.rs

@@ -174,7 +174,7 @@ impl JsAst {
     }
 
     pub fn analyze_deps(&self, context: Arc<Context>) -> Vec<Dependency> {
-        let mut visitor = DepAnalyzer::new(self.unresolved_mark);
+        let mut visitor = DepAnalyzer::new(self.unresolved_mark, context.clone());
         GLOBALS.set(&context.meta.script.globals, || {
             self.ast.visit_with(&mut visitor);
             visitor.dependencies

crates/mako/src/config/experimental.rs

@@ -7,6 +7,7 @@ use crate::create_deserialize_fn;
 pub struct ExperimentalConfig {
     pub webpack_syntax_validate: Vec<String>,
     pub require_context: bool,
+    pub magic_comment_chunk_name: bool,
     #[serde(deserialize_with = "deserialize_detect_loop")]
     pub detect_circular_dependence: Option<DetectCircularDependence>,
 }

crates/mako/src/config/mako.config.default.json

@@ -67,6 +67,7 @@
   "experimental": {
     "webpackSyntaxValidate": [],
     "requireContext": true,
+    "magicCommentChunkName": false,
     "detectCircularDependence": {
       "ignores": ["node_modules"],
       "graphviz": false

crates/mako/src/dev/update.rs

@@ -10,7 +10,7 @@ use tracing::debug;
 use crate::build::BuildError;
 use crate::compiler::Compiler;
 use crate::generate::transform::transform_modules;
-use crate::module::{Dependency, Module, ModuleId, ResolveTypeFlags};
+use crate::module::{Dependency, Module, ModuleId};
 use crate::module_graph::ModuleGraph;
 use crate::resolve::{self, clear_resolver_cache};
 
@@ -451,33 +451,16 @@ impl Diff {
             return true;
         }
 
-        let new_deps = new_dependencies
+        let new_deps: HashMap<&ModuleId, &Dependency> = new_dependencies
             .iter()
-            .fold(HashMap::new(), |mut map, (module_id, dep)| {
-                let flag: ResolveTypeFlags = (&dep.resolve_type).into();
-
-                map.entry(module_id.clone())
-                    .and_modify(|e: &mut ResolveTypeFlags| {
-                        e.insert(flag);
-                    })
-                    .or_insert(flag);
-                map
-            });
+            .map(|(module_id, dep)| (module_id, dep))
+            .collect();
 
-        let original = module_graph.get_dependencies(module_id).into_iter().fold(
-            HashMap::new(),
-            |mut map, (module_id, dep)| {
-                let flag: ResolveTypeFlags = (&dep.resolve_type).into();
-                map.entry(module_id.clone())
-                    .and_modify(|e: &mut ResolveTypeFlags| e.insert(flag))
-                    .or_insert(flag);
-                map
-            },
-        );
+        let original: HashMap<&ModuleId, &Dependency> = module_graph
+            .get_dependencies(module_id)
+            .into_iter()
+            .collect();
 
-        // there is an edge case we need to consider later
-        // if an edge ResolveTypeFlag(Sync + Async) changes to ResolveTypeFlag(Sync), is it
-        // changed nor not ?
         !new_deps.eq(&original)
     }
 }

crates/mako/src/generate/chunk.rs

@@ -10,6 +10,20 @@ use crate::module::ModuleId;
 use crate::module_graph::ModuleGraph;
 use crate::utils::url_safe_base64_encode;
 
+// TODO: Refact ChunkId
+/*
+* ChunkId and ModuleId is not a same thing. For example, like below codes:
+* import(/* webpackChunkName: "myChunk" */, './lazy');
+* the chunkId should be "myChunk", not be moduleId of "./lazy".
+* We need a struct to store more chunk info, it may be like:
+* struct {
+*   identifier: JsWord,
+*   root_module: ModuleId,
+*   import_options: import_options {
+*       chunk_name: Option<String>
+*   }
+* }
+* */
 pub type ChunkId = ModuleId;
 
 #[derive(Clone, PartialEq, Eq, Debug)]

crates/mako/src/generate/chunk_pot/ast_impl.rs

@@ -96,9 +96,7 @@ pub(crate) fn render_css_chunk(
                         && matches!(info.ast, crate::module::ModuleAst::Css(_))
                     {
                         let relative_source = diff_paths(&module_id.id, &context.root)
-                            .unwrap_or((&module_id.id).into())
-                            .to_string_lossy()
-                            .to_string();
+                            .map_or(module_id.id.clone(), |p| p.to_string_lossy().to_string());
 
                         chain_map.insert(
                             relative_source,