Merge branch 'main' into feat/manifest-builtin

Author: 2heal1

Cargo.lock

@@ -64,7 +64,7 @@ micromegas-perfetto = { version = "0.9.0", default-features = false }
 miette              = { version = "7.5.0", default-features = false }
 mimalloc            = { version = "0.2.4", package = "mimalloc-rspack", default-features = false }
 mime_guess          = { version = "2.0.5", default-features = false, features = ["rev-mappings"] }
-notify              = { version = "8.1.0", default-features = false }
+notify              = { version = "8.2.0", default-features = false }
 num-bigint          = { version = "0.4.6", default-features = false }
 once_cell           = { version = "1.20.2", default-features = false }
 oneshot             = { version = "0.1.8", default-features = false, features = ["std", "async"] }
@@ -78,7 +78,7 @@ proc-macro2         = { version = "1.0.92", default-features = false }
 prost               = { version = "0.13", default-features = false }
 quote               = { version = "1.0.38", default-features = false }
 rayon               = { version = "1.10.0", default-features = false }
-regex               = { version = "1.11.1", default-features = false }
+regex               = { version = "1.12.2", default-features = false }
 regex-syntax        = { version = "0.8.5", default-features = false, features = ["std"] }
 regress             = { version = "0.10.4", default-features = false, features = ["pattern"] }
 ropey               = { version = "1.6.1", default-features = false }
@@ -100,7 +100,7 @@ syn                 = { version = "2.0.95", default-features = false }
 termcolor           = { version = "1.4.1", default-features = false }
 textwrap            = { version = "0.16.1", default-features = false }
 thread_local        = { version = "1.1.9", default-features = false }
-tokio               = { version = "1.42.0", default-features = false, features = ["rt", "rt-multi-thread"] }
+tokio               = { version = "1.48.0", default-features = false, features = ["rt", "rt-multi-thread"] }
 toml                = { version = "0.8.19", default-features = false, features = ["parse", "display"] }
 tracing             = { version = "0.1.41", default-features = false, features = ["max_level_trace", "release_max_level_trace"] }
 tracing-subscriber  = { version = "0.3.19", default-features = false, features = ["fmt", "registry"] }

Cargo.toml

@@ -40,6 +40,14 @@ impl Task<ExecutorTaskContext> for EntryTask {
       executed_entry_deps,
     } = context;
 
+    if tracker.is_module_building(&meta.origin_module_identifier) {
+      execute_task.finish_with_error(rspack_error::error!(
+        "Nested calls to importModule are not supported. MetaInfo: {:?}",
+        meta
+      ));
+      return Ok(vec![]);
+    }
+
     let mut res = vec![];
     let (dep_id, is_new) = match entries.entry(meta.clone()) {
       Entry::Vacant(v) => {
@@ -90,7 +98,7 @@ impl Task<ExecutorTaskContext> for EntryTask {
     // mark as executed
     executed_entry_deps.insert(dep_id);
 
-    if tracker.is_running(&dep_id) {
+    if tracker.is_entry_running(&dep_id) {
       let mg = origin_context.artifact.get_module_graph();
       // the module in module executor need to check.
       if mg

crates/rspack_core/src/compilation/make/module_executor/entry.rs

@@ -197,8 +197,16 @@ impl ModuleTracker {
     }
   }
 
-  /// Check if a dep_id is running
-  pub fn is_running(&self, dep_id: &DependencyId) -> bool {
+  /// Check if a entry dep_id is running
+  pub fn is_entry_running(&self, dep_id: &DependencyId) -> bool {
     self.entry_finish_tasks.contains_key(dep_id)
   }
+
+  /// Check if a module is building
+  pub fn is_module_building(&self, mid: &ModuleIdentifier) -> bool {
+    let Some(child) = self.unfinished_module.get(mid) else {
+      return false;
+    };
+    child == &usize::MAX
+  }
 }

crates/rspack_core/src/compilation/make/module_executor/module_tracker.rs

@@ -402,6 +402,7 @@ impl JavascriptParserPlugin for CommonJsExportsParserPlugin {
     &self,
     parser: &mut JavascriptParser,
     expr: &swc_core::ecma::ast::ThisExpr,
+    _for_name: &str,
   ) -> Option<bool> {
     if self.should_skip_handler(parser) {
       return None;

crates/rspack_plugin_javascript/src/parser_plugin/common_js_exports_parse_plugin.rs

@@ -454,9 +454,10 @@ impl JavascriptParserPlugin for JavaScriptParserPluginDrive {
     &self,
     parser: &mut JavascriptParser,
     expr: &swc_core::ecma::ast::ThisExpr,
+    for_name: &str,
   ) -> Option<bool> {
     for plugin in &self.plugins {
-      let res = plugin.this(parser, expr);
+      let res = plugin.this(parser, expr, for_name);
       // `SyncBailHook`
       if res.is_some() {
         return res;

crates/rspack_plugin_javascript/src/parser_plugin/drive.rs

@@ -10,6 +10,7 @@ impl JavascriptParserPlugin for ESMTopLevelThisParserPlugin {
     &self,
     parser: &mut JavascriptParser,
     expr: &swc_core::ecma::ast::ThisExpr,
+    _for_name: &str,
   ) -> Option<bool> {
     (parser.is_esm && parser.is_top_level_this()).then(|| {
       parser.add_presentational_dependency(Box::new(ConstDependency::new(

crates/rspack_plugin_javascript/src/parser_plugin/esm_top_level_this_plugin.rs

@@ -20,7 +20,8 @@ use crate::{
     is_pure_class, is_pure_class_member, is_pure_expression, is_pure_function,
   },
   visitors::{
-    JavascriptParser, Statement, TagInfoData, VariableDeclaration, scope_info::VariableInfoFlags,
+    ExportedVariableInfo, JavascriptParser, Statement, TagInfoData, VariableDeclaration,
+    scope_info::VariableInfoFlags,
   },
 };
 
@@ -639,19 +640,42 @@ impl JavascriptParserPlugin for InnerGraphPlugin {
   fn class_body_element(
     &self,
     parser: &mut JavascriptParser,
-    _element: &swc_core::ecma::ast::ClassMember,
+    element: &ClassMember,
     class_decl_or_expr: crate::visitors::ClassDeclOrExpr,
   ) -> Option<bool> {
     if !parser.inner_graph.is_enabled() || !parser.is_top_level_scope() {
       return None;
     }
-
-    if parser
+    if let Some(top_level_symbol) = parser
       .inner_graph
       .class_with_top_level_symbol
-      .contains_key(&class_decl_or_expr.span())
+      .get(&class_decl_or_expr.span())
     {
+      let top_level_symbol_variable_name = top_level_symbol.name.clone();
       parser.inner_graph.set_top_level_symbol(None);
+      /*
+       * ```js
+       * var A = class B {
+       *   static {
+       *     this;
+       *     B;
+       *   }
+       * }
+       * ```
+       * Alias `this` and `B` (class ident) to top level symbol `A` here, so `A` is used if `this` or `B`
+       * is used in static block (`add_usage` in identifier hook and this hook), even `A` is not used in
+       * any other place.
+       */
+      if let ClassMember::StaticBlock(_) = element {
+        let class_var = parser
+          .get_variable_info(&top_level_symbol_variable_name)
+          .map(|info| ExportedVariableInfo::VariableInfo(info.id()))
+          .unwrap_or(ExportedVariableInfo::Name(top_level_symbol_variable_name));
+        if let Some(class_ident) = class_decl_or_expr.ident() {
+          parser.set_variable(class_ident.sym.clone(), class_var.clone());
+        }
+        parser.set_variable("this".into(), class_var);
+      }
     }
 
     None
@@ -804,4 +828,14 @@ impl JavascriptParserPlugin for InnerGraphPlugin {
     Self::for_each_expression(parser, for_name);
     None
   }
+
+  fn this(
+    &self,
+    parser: &mut JavascriptParser,
+    _expr: &swc_core::ecma::ast::ThisExpr,
+    for_name: &str,
+  ) -> Option<bool> {
+    Self::for_each_expression(parser, for_name);
+    None
+  }
 }

crates/rspack_plugin_javascript/src/parser_plugin/inner_graph/plugin.rs

@@ -454,8 +454,8 @@ pub fn is_pure_class(
       }
       ClassMember::TsIndexSignature(_) => unreachable!(),
       ClassMember::Empty(_) => true,
-      ClassMember::StaticBlock(_) => true,
-      ClassMember::AutoAccessor(_) => true,
+      ClassMember::StaticBlock(_) => false, // TODO: support is pure analyze for statements
+      ClassMember::AutoAccessor(_) => false,
     }
   })
 }

crates/rspack_plugin_javascript/src/parser_plugin/side_effects_parser_plugin.rs

@@ -302,7 +302,12 @@ pub trait JavascriptParserPlugin {
     None
   }
 
-  fn this(&self, _parser: &mut JavascriptParser, _expr: &ThisExpr) -> Option<bool> {
+  fn this(
+    &self,
+    _parser: &mut JavascriptParser,
+    _expr: &ThisExpr,
+    _for_name: &str,
+  ) -> Option<bool> {
     None
   }