Merge branch 'main' into perf-js-loader-runner

Author: SyMind

.github/actions/cache/restore/action.yml

@@ -32,7 +32,7 @@ runs:
     - name: Restore cache to local
       id: local-cache
       if: ${{ runner.environment == 'self-hosted' }}
-      uses: lynx-infra/cache/restore@558d7c999f9f97ac02ed7e711503bb81d82ff8ee # main
+      uses: lynx-infra/cache/restore@5c6160a6a4c7fca80a2f3057bb9dfc9513fcb732 # main
       with:
         key: ${{ inputs.key }}
         path: ${{ inputs.path }}

.github/actions/cache/save/action.yml

@@ -21,7 +21,7 @@ runs:
         path: ${{ inputs.path }}
     - name: Save cache to local
       if: ${{ runner.environment == 'self-hosted' }}
-      uses: lynx-infra/cache/save@558d7c999f9f97ac02ed7e711503bb81d82ff8ee # main
+      uses: lynx-infra/cache/save@5c6160a6a4c7fca80a2f3057bb9dfc9513fcb732 # main
       with:
         key: ${{ inputs.key }}
         path: ${{ inputs.path }}

.github/workflows/ci-rust.yaml

@@ -83,7 +83,7 @@ jobs:
           key: check
 
       - name: Install cargo-deny
-        uses: taiki-e/install-action@52039f232923165906a3c824622a332e84ca4560 # v2
+        uses: taiki-e/install-action@84c20235bedc3797c7e1ddf685c574a4a6c666da # v2
         with:
           tool: [email protected]
       - name: Check licenses

.github/workflows/reusable-build-bench.yml

@@ -42,7 +42,7 @@ jobs:
           key: build-bench-${{ inputs.target }}
 
       - name: Install cargo-codspeed binary
-        uses: taiki-e/install-action@52039f232923165906a3c824622a332e84ca4560 # v2
+        uses: taiki-e/install-action@84c20235bedc3797c7e1ddf685c574a4a6c666da # v2
         with:
           tool: [email protected]
 

Cargo.lock

@@ -178,6 +178,7 @@ rspack_plugin_real_content_hash        = { version = "0.2.0", path = "crates/rsp
 rspack_plugin_remove_duplicate_modules = { version = "0.2.0", path = "crates/rspack_plugin_remove_duplicate_modules" }
 rspack_plugin_remove_empty_chunks      = { version = "0.2.0", path = "crates/rspack_plugin_remove_empty_chunks" }
 rspack_plugin_rsdoctor                 = { version = "0.2.0", path = "crates/rspack_plugin_rsdoctor" }
+rspack_plugin_rstest                   = { version = "0.2.0", path = "crates/rspack_plugin_rstest" }
 rspack_plugin_runtime                  = { version = "0.2.0", path = "crates/rspack_plugin_runtime" }
 rspack_plugin_runtime_chunk            = { version = "0.2.0", path = "crates/rspack_plugin_runtime_chunk" }
 rspack_plugin_schemes                  = { version = "0.2.0", path = "crates/rspack_plugin_schemes" }

Cargo.toml

@@ -28,6 +28,7 @@ rspack_paths             = { workspace = true }
 rspack_plugin_html       = { workspace = true }
 rspack_plugin_javascript = { workspace = true }
 rspack_plugin_rsdoctor   = { workspace = true }
+rspack_plugin_rstest     = { workspace = true }
 rspack_plugin_runtime    = { workspace = true }
 rspack_util              = { workspace = true }
 
@@ -105,6 +106,7 @@ serde                                  = { workspace = true }
 serde_json                             = { workspace = true }
 swc_core                               = { workspace = true, default-features = false, features = ["ecma_transforms_react"] }
 tokio                                  = { workspace = true, features = ["rt", "rt-multi-thread", "macros", "test-util", "tracing"] }
+ustr                                   = { workspace = true }
 
 [target.'cfg(not(target_family = "wasm"))'.dependencies]
 tokio = { workspace = true, features = ["parking_lot"] }

crates/node_binding/Cargo.toml

@@ -274,7 +274,7 @@ export declare class JsCompilation {
    * Using async and mutable reference to `Compilation` at the same time would likely to cause data races.
    */
   rebuildModule(moduleIdentifiers: Array<string>, f: any): void
-  importModule(request: string, layer: string | undefined | null, publicPath: JsFilename | undefined | null, baseUri: string | undefined | null, originalModule: string | undefined | null, originalModuleContext: string | undefined | null, callback: any): void
+  importModule(request: string, layer: string | undefined | null, publicPath: JsFilename | undefined | null, baseUri: string | undefined | null, originalModule: string, originalModuleContext: string | undefined | null, callback: any): void
   get entries(): JsEntries
   addRuntimeModule(chunk: JsChunk, runtimeModule: JsAddingRuntimeModule): void
   get moduleGraph(): JsModuleGraph
@@ -493,6 +493,7 @@ export declare enum BuiltinPluginName {
   CssExtractRspackPlugin = 'CssExtractRspackPlugin',
   SubresourceIntegrityPlugin = 'SubresourceIntegrityPlugin',
   RsdoctorPlugin = 'RsdoctorPlugin',
+  RstestPlugin = 'RstestPlugin',
   CircularDependencyRspackPlugin = 'CircularDependencyRspackPlugin',
   JsLoaderRspackPlugin = 'JsLoaderRspackPlugin',
   LazyCompilationPlugin = 'LazyCompilationPlugin',
@@ -2431,6 +2432,10 @@ export interface RawRspackFuture {
 
 }
 
+export interface RawRstestPluginOptions {
+  injectModulePathName: boolean
+}
+
 export interface RawRuleSetCondition {
   type: RawRuleSetConditionType
   string?: string

crates/node_binding/binding.d.ts

@@ -1,6 +1,6 @@
 {
   "name": "@rspack/binding",
-  "version": "1.3.11",
+  "version": "1.3.12",
   "license": "MIT",
   "description": "Node binding for rspack",
   "main": "binding.js",
@@ -47,8 +47,7 @@
       "aarch64-unknown-linux-gnu",
       "aarch64-apple-darwin",
       "aarch64-unknown-linux-musl",
-      "aarch64-pc-windows-msvc",
-      "wasm32-wasip1-threads"
+      "aarch64-pc-windows-msvc"
     ],
     "wasm": {
       "initialMemory": 16384,
@@ -64,4 +63,4 @@
     "@rspack/binding-wasm32-wasi": "workspace:*",
     "@rspack/binding-win32-x64-msvc": "workspace:*"
   }
-}
+}

crates/node_binding/package.json

@@ -65,6 +65,29 @@ const { instance: __napiInstance, module: __wasiModule, napiModule: __napiModule
     worker.onmessage = ({ data }) => {
       __wasmCreateOnMessageForFsProxy(__nodeFs)(data)
     }
+
+    // The main thread of Node.js waits for all the active handles before exiting.
+    // But Rust threads are never waited without `thread::join`.
+    // So here we hack the code of Node.js to prevent the workers from being referenced (active).
+    // According to https://github.com/nodejs/node/blob/19e0d472728c79d418b74bddff588bea70a403d0/lib/internal/worker.js#L415,
+    // a worker is consist of two handles: kPublicPort and kHandle.
+    {
+      const kPublicPort = Object.getOwnPropertySymbols(worker).find(s =>
+        s.toString().includes("kPublicPort")
+      );
+      if (kPublicPort) {
+        worker[kPublicPort].ref = () => {};
+      }
+
+      const kHandle = Object.getOwnPropertySymbols(worker).find(s =>
+        s.toString().includes("kHandle")
+      );
+      if (kPublicPort) {
+        worker[kHandle].ref = () => {};
+      }
+
+      worker.unref();
+    }
     return worker
   },
   overwriteImports(importObject) {

crates/node_binding/rspack.wasi.cjs

@@ -1,4 +1,4 @@
-use std::{ptr::NonNull, sync::Arc};
+use std::ptr::NonNull;
 
 use napi::{Either, Result};
 use napi_derive::napi;
@@ -173,8 +173,8 @@ impl JsChunkGraph {
   ) -> napi::Result<Option<&str>> {
     let compilation = self.as_ref()?;
     let Some(runtime) = js_runtime.map(|js_runtime| match js_runtime {
-      Either::A(str) => std::iter::once(str).map(Arc::from).collect(),
-      Either::B(vec) => vec.into_iter().map(Arc::from).collect(),
+      Either::A(str) => std::iter::once(str).map(Into::into).collect(),
+      Either::B(vec) => vec.into_iter().map(Into::into).collect(),
     }) else {
       return Ok(None);
     };

crates/node_binding/src/chunk_graph.rs

@@ -1,5 +1,3 @@
-use std::sync::Arc;
-
 use napi::Either;
 use rspack_core::{Reflector, WeakBindingCell};
 use rustc_hash::FxHashMap;
@@ -112,8 +110,8 @@ impl CodeGenerationResults {
   pub fn get(&self, module: ModuleObjectRef, runtime: JsRuntimeSpec) -> napi::Result<Reflector> {
     self.with_ref(|code_generation_results| {
       let rt: Option<rspack_core::RuntimeSpec> = runtime.map(|val| match val {
-        Either::A(str) => std::iter::once(str).map(Arc::from).collect(),
-        Either::B(vec) => vec.into_iter().map(Arc::from).collect(),
+        Either::A(str) => std::iter::once(str).map(Into::into).collect(),
+        Either::B(vec) => vec.into_iter().map(Into::into).collect(),
       });
 
       let code_generation_result = code_generation_results.get(&module.identifier, rt.as_ref());

crates/node_binding/src/compilation/code_generation_results.rs

@@ -24,10 +24,10 @@ use rustc_hash::FxHashMap;
 
 use super::PathWithInfo;
 use crate::{
-  entry::JsEntryOptions, utils::callbackify, AssetInfo, EntryDependency, JsAddingRuntimeModule,
-  JsAsset, JsChunk, JsChunkGraph, JsChunkGroupWrapper, JsChunkWrapper, JsCompatSource, JsFilename,
-  JsModuleGraph, JsPathData, JsRspackDiagnostic, JsRspackError, JsStats,
-  JsStatsOptimizationBailout, ModuleObject, RspackResultToNapiResultExt, ToJsCompatSource,
+  entry::JsEntryOptions, utils::callbackify, AssetInfo, EntryDependency, ErrorCode,
+  JsAddingRuntimeModule, JsAsset, JsChunk, JsChunkGraph, JsChunkGroupWrapper, JsChunkWrapper,
+  JsCompatSource, JsFilename, JsModuleGraph, JsPathData, JsRspackDiagnostic, JsRspackError,
+  JsStats, JsStatsOptimizationBailout, ModuleObject, RspackResultToNapiResultExt, ToJsCompatSource,
   COMPILER_REFERENCES,
 };
 
@@ -569,8 +569,10 @@ impl JsCompilation {
     reference: Reference<JsCompilation>,
     module_identifiers: Vec<String>,
     f: Function<'static>,
-  ) -> Result<()> {
-    let compilation = self.as_mut()?;
+  ) -> Result<(), ErrorCode> {
+    let compilation = self
+      .as_mut()
+      .map_err(|err| napi::Error::new(err.status.into(), err.reason.clone()))?;
 
     callbackify(
       f,
@@ -605,11 +607,13 @@ impl JsCompilation {
     layer: Option<String>,
     public_path: Option<JsFilename>,
     base_uri: Option<String>,
-    original_module: Option<String>,
+    original_module: String,
     original_module_context: Option<String>,
     callback: Function<'static>,
-  ) -> Result<()> {
-    let compilation = self.as_ref()?;
+  ) -> Result<(), ErrorCode> {
+    let compilation = self
+      .as_ref()
+      .map_err(|err| napi::Error::new(err.status.into(), err.reason.clone()))?;
 
     callbackify(
       callback,
@@ -625,7 +629,7 @@ impl JsCompilation {
             public_path.map(|p| p.into()),
             base_uri,
             original_module_context.map(rspack_core::Context::from),
-            original_module.map(ModuleIdentifier::from),
+            ModuleIdentifier::from(original_module),
           )
           .await;
 
@@ -705,19 +709,23 @@ impl JsCompilation {
     reference: Reference<JsCompilation>,
     js_args: Vec<(String, &mut EntryDependency, Option<JsEntryOptions>)>,
     f: Function<'static>,
-  ) -> napi::Result<()> {
-    let compilation = self.as_mut()?;
+  ) -> napi::Result<(), ErrorCode> {
+    let compilation = self
+      .as_mut()
+      .map_err(|err| napi::Error::new(err.status.into(), err.reason.clone()))?;
 
     let Some(mut compiler_reference) = COMPILER_REFERENCES.with(|ref_cell| {
       let references = ref_cell.borrow_mut();
       references.get(&compilation.compiler_id()).cloned()
     }) else {
-      return Err(napi::Error::from_reason(
+      return Err(napi::Error::new(
+        napi::Status::GenericFailure.into(),
         "Unable to addEntry now. The Compiler has been garbage collected by JavaScript.",
       ));
     };
     let Some(js_compiler) = compiler_reference.get_mut() else {
-      return Err(napi::Error::from_reason(
+      return Err(napi::Error::new(
+        napi::Status::GenericFailure.into(),
         "Unable to addEntry now. The Compiler has been garbage collected by JavaScript.",
       ));
     };
@@ -752,7 +760,8 @@ impl JsCompilation {
         };
         Ok((dependency, options))
       })
-      .collect::<napi::Result<Vec<(BoxDependency, EntryOptions)>>>()?;
+      .collect::<napi::Result<Vec<(BoxDependency, EntryOptions)>>>()
+      .map_err(|err| napi::Error::new(err.status.into(), err.reason.clone()))?;
 
     callbackify(
       f,
@@ -802,19 +811,23 @@ impl JsCompilation {
     reference: Reference<JsCompilation>,
     js_args: Vec<(String, &mut EntryDependency, Option<JsEntryOptions>)>,
     f: Function<'static>,
-  ) -> napi::Result<()> {
-    let compilation = self.as_mut()?;
+  ) -> napi::Result<(), ErrorCode> {
+    let compilation = self
+      .as_mut()
+      .map_err(|err| napi::Error::new(err.status.into(), err.reason.clone()))?;
 
     let Some(mut compiler_reference) = COMPILER_REFERENCES.with(|ref_cell| {
       let references = ref_cell.borrow_mut();
       references.get(&compilation.compiler_id()).cloned()
     }) else {
-      return Err(napi::Error::from_reason(
+      return Err(napi::Error::new(
+        napi::Status::GenericFailure.into(),
         "Unable to addInclude now. The Compiler has been garbage collected by JavaScript.",
       ));
     };
     let Some(js_compiler) = compiler_reference.get_mut() else {
-      return Err(napi::Error::from_reason(
+      return Err(napi::Error::new(
+        napi::Status::GenericFailure.into(),
         "Unable to addInclude now. The Compiler has been garbage collected by JavaScript.",
       ));
     };
@@ -849,7 +862,8 @@ impl JsCompilation {
         };
         Ok((dependency, options))
       })
-      .collect::<napi::Result<Vec<(BoxDependency, EntryOptions)>>>()?;
+      .collect::<napi::Result<Vec<(BoxDependency, EntryOptions)>>>()
+      .map_err(|err| napi::Error::new(err.status.into(), err.reason.clone()))?;
 
     callbackify(
       f,

crates/node_binding/src/compilation/mod.rs

@@ -1,6 +1,26 @@
 use napi_derive::napi;
 use rspack_error::{miette, Diagnostic, Result, RspackSeverity};
 
+pub enum ErrorCode {
+  Napi(napi::Status),
+  Custom(String),
+}
+
+impl From<napi::Status> for ErrorCode {
+  fn from(value: napi::Status) -> Self {
+    Self::Napi(value)
+  }
+}
+
+impl AsRef<str> for ErrorCode {
+  fn as_ref(&self) -> &str {
+    match self {
+      ErrorCode::Napi(status) => status.as_ref(),
+      ErrorCode::Custom(code) => code.as_str(),
+    }
+  }
+}
+
 #[napi(object)]
 pub struct JsRspackDiagnostic {
   pub severity: JsRspackSeverity,
@@ -83,9 +103,9 @@ impl JsRspackError {
   }
 }
 
-pub trait RspackResultToNapiResultExt<T, E: ToString> {
-  fn to_napi_result(self) -> napi::Result<T>;
-  fn to_napi_result_with_message(self, f: impl FnOnce(E) -> String) -> napi::Result<T>;
+pub trait RspackResultToNapiResultExt<T, E: ToString, S: AsRef<str> = napi::Status> {
+  fn to_napi_result(self) -> napi::Result<T, S>;
+  fn to_napi_result_with_message(self, f: impl FnOnce(E) -> String) -> napi::Result<T, S>;
 }
 
 impl<T, E: ToString> RspackResultToNapiResultExt<T, E> for Result<T, E> {
@@ -96,3 +116,12 @@ impl<T, E: ToString> RspackResultToNapiResultExt<T, E> for Result<T, E> {
     self.map_err(|e| napi::Error::from_reason(f(e)))
   }
 }
+
+impl<T, E: ToString> RspackResultToNapiResultExt<T, E, ErrorCode> for Result<T, E> {
+  fn to_napi_result(self) -> napi::Result<T, ErrorCode> {
+    self.map_err(|e| napi::Error::new(napi::Status::GenericFailure.into(), e.to_string()))
+  }
+  fn to_napi_result_with_message(self, f: impl FnOnce(E) -> String) -> napi::Result<T, ErrorCode> {
+    self.map_err(|e| napi::Error::new(napi::Status::GenericFailure.into(), f(e)))
+  }
+}