Merge branch 'main' into module.size

Author: SyMind

.github/workflows/ci.yml

@@ -147,7 +147,9 @@ jobs:
               - 'Cargo.lock'
       - name: Install cargo-deny
         if: steps.filter.outputs.src == 'true'
-        uses: taiki-e/install-action@cargo-deny
+        uses: taiki-e/install-action@v2
+        with:
+          tool: [email protected]
       - name: Check licenses
         if: steps.filter.outputs.src == 'true'
         run: cargo deny check license

README.md

@@ -46,15 +46,17 @@ Come chat with us on [Discord](https://discord.gg/79ZZ66GH9E)! Rspack team and R
 
 ## Links
 
-| Name                                                                                     | Description                                                                   |
-| ---------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------- |
-| [Rspack website](https://rspack.dev)                                                     | Official documentation for Rspack                                             |
-| [awesome-rspack](https://github.com/web-infra-dev/awesome-rspack)                        | A curated list of awesome things related to Rspack                            |
-| [rspack-examples](https://github.com/rspack-contrib/rspack-examples)                     | Rspack configuration examples                                                 |
-| [rspack-sources](https://github.com/web-infra-dev/rspack-sources)                        | Rust port of [webpack-sources](https://www.npmjs.com/package/webpack-sources) |
-| [rspack-migration-showcase](https://github.com/web-infra-dev/rspack-migration-showcase)  | Migration showcases for Rspack                                                |
-| [rspack-compat](https://github.com/web-infra-dev/rspack-compat)                          | Rspack compatible loaders and plugins examples                                |
-| [rsfamily-design-resources](https://github.com/rspack-contrib/rsfamily-design-resources) | Design resources for Rspack, Rsbuild, Rspress and Rsdoctor                    |
+| Name                                                                                 | Description                                                                   |
+| ------------------------------------------------------------------------------------ | ----------------------------------------------------------------------------- |
+| [Rspack website](https://rspack.dev)                                                 | Official documentation for Rspack                                             |
+| [Rsbuild](https://github.com/web-infra-dev/rsbuild)                                  | An Rspack-based build tool                                                    |
+| [Rspress](https://github.com/web-infra-dev/rspress)                                  | A fast static site generator based on Rsbuild                                 |
+| [Rsdoctor](https://github.com/web-infra-dev/rsdoctor)                                | A one-stop build analyzer for Rspack and webpack                              |
+| [Rslib](https://github.com/web-infra-dev/rslib)                                      | A library build tool powered by Rsbuild                                       |
+| [awesome-rspack](https://github.com/web-infra-dev/awesome-rspack)                    | A curated list of awesome things related to Rspack                            |
+| [rspack-examples](https://github.com/rspack-contrib/rspack-examples)                 | Lots of Rspack example projects                                               |
+| [rspack-sources](https://github.com/web-infra-dev/rspack-sources)                    | Rust port of [webpack-sources](https://www.npmjs.com/package/webpack-sources) |
+| [rstack-design-resources](https://github.com/rspack-contrib/rstack-design-resources) | Design resources for Rstack                                                   |
 
 ## Contributors
 

README.zh-CN.md

@@ -42,15 +42,17 @@ Rspack 是一个基于 Rust 编写的高性能 JavaScript 打包工具，它提
 
 ## 链接
 
-| 名称                                                                                     | 描述                                                                         |
-| ---------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------- |
-| [Rspack 文档](https://rspack.dev/zh/)                                                    | Rspack 官方文档                                                              |
-| [awesome-rspack](https://github.com/web-infra-dev/awesome-rspack)                        | 与 Rspack 相关的精彩内容列表                                                 |
-| [rspack-examples](https://github.com/rspack-contrib/rspack-examples)                     | Rspack 配置示例                                                              |
-| [rspack-sources](https://github.com/web-infra-dev/rspack-sources)                        | Rust 版本的 [webpack-sources](https://www.npmjs.com/package/webpack-sources) |
-| [rspack-migration-showcase](https://github.com/web-infra-dev/rspack-migration-showcase)  | 迁移到 Rspack 的示例项目                                                     |
-| [rspack-compat](https://github.com/web-infra-dev/rspack-compat)                          | 兼容 Rspack 的 webpack 插件 和 Loader 示例                                   |
-| [rsfamily-design-resources](https://github.com/rspack-contrib/rsfamily-design-resources) | Rspack、Rsbuild、Rspress 和 Rsdoctor 的设计资源                              |
+| 名称                                                                                 | 描述                                                                         |
+| ------------------------------------------------------------------------------------ | ---------------------------------------------------------------------------- |
+| [Rspack 文档](https://rspack.dev/zh/)                                                | Rspack 官方文档                                                              |
+| [Rsbuild](https://github.com/web-infra-dev/rsbuild)                                  | 基于 Rspack 的构建工具                                                       |
+| [Rspress](https://github.com/web-infra-dev/rspress)                                  | 基于 Rsbuild 的静态站点生成器                                                |
+| [Rsdoctor](https://github.com/web-infra-dev/rsdoctor)                                | 针对 Rspack 和 webpack 的一站式构建分析工具                                  |
+| [Rslib](https://github.com/web-infra-dev/rslib)                                      | 基于 Rsbuild 的 library 构建工具                                             |
+| [awesome-rspack](https://github.com/web-infra-dev/awesome-rspack)                    | 与 Rspack 相关的精彩内容列表                                                 |
+| [rspack-examples](https://github.com/rspack-contrib/rspack-examples)                 | 丰富的 Rspack 示例项目                                                       |
+| [rspack-sources](https://github.com/web-infra-dev/rspack-sources)                    | Rust 版本的 [webpack-sources](https://www.npmjs.com/package/webpack-sources) |
+| [rstack-design-resources](https://github.com/rspack-contrib/rstack-design-resources) | Rstack 的设计资源                                                            |
 
 ## 致谢
 

biome.jsonc

@@ -47,7 +47,6 @@
 				"noVoidTypeReturn": "off"
 			},
 			"style": {
-				"noParameterAssign": "off",
 				"noNonNullAssertion": "off"
 			},
 			"performance": {
@@ -88,4 +87,4 @@
 		"clientKind": "git",
 		"useIgnoreFile": true
 	}
-}
+}

crates/node_binding/binding.d.ts

@@ -1700,16 +1700,17 @@ export enum RegisterJsTapKind {
   CompilationChunkAsset = 20,
   CompilationProcessAssets = 21,
   CompilationAfterProcessAssets = 22,
-  CompilationAfterSeal = 23,
-  NormalModuleFactoryBeforeResolve = 24,
-  NormalModuleFactoryFactorize = 25,
-  NormalModuleFactoryResolve = 26,
-  NormalModuleFactoryAfterResolve = 27,
-  NormalModuleFactoryCreateModule = 28,
-  NormalModuleFactoryResolveForScheme = 29,
-  ContextModuleFactoryBeforeResolve = 30,
-  ContextModuleFactoryAfterResolve = 31,
-  JavascriptModulesChunkHash = 32
+  CompilationSeal = 23,
+  CompilationAfterSeal = 24,
+  NormalModuleFactoryBeforeResolve = 25,
+  NormalModuleFactoryFactorize = 26,
+  NormalModuleFactoryResolve = 27,
+  NormalModuleFactoryAfterResolve = 28,
+  NormalModuleFactoryCreateModule = 29,
+  NormalModuleFactoryResolveForScheme = 30,
+  ContextModuleFactoryBeforeResolve = 31,
+  ContextModuleFactoryAfterResolve = 32,
+  JavascriptModulesChunkHash = 33
 }
 
 export interface RegisterJsTaps {
@@ -1736,6 +1737,7 @@ export interface RegisterJsTaps {
   registerCompilationChunkAssetTaps: (stages: Array<number>) => Array<{ function: ((arg: JsChunkAssetArgs) => void); stage: number; }>
   registerCompilationProcessAssetsTaps: (stages: Array<number>) => Array<{ function: ((arg: JsCompilation) => Promise<void>); stage: number; }>
   registerCompilationAfterProcessAssetsTaps: (stages: Array<number>) => Array<{ function: ((arg: JsCompilation) => void); stage: number; }>
+  registerCompilationSealTaps: (stages: Array<number>) => Array<{ function: (() => void); stage: number; }>
   registerCompilationAfterSealTaps: (stages: Array<number>) => Array<{ function: (() => Promise<void>); stage: number; }>
   registerNormalModuleFactoryBeforeResolveTaps: (stages: Array<number>) => Array<{ function: ((arg: JsBeforeResolveArgs) => Promise<[boolean | undefined, JsBeforeResolveArgs]>); stage: number; }>
   registerNormalModuleFactoryFactorizeTaps: (stages: Array<number>) => Array<{ function: ((arg: JsFactorizeArgs) => Promise<JsFactorizeArgs>); stage: number; }>

crates/node_binding/src/plugins/interceptor.rs

@@ -36,19 +36,19 @@ use rspack_core::{
   CompilationOptimizeChunkModulesHook, CompilationOptimizeModules, CompilationOptimizeModulesHook,
   CompilationOptimizeTree, CompilationOptimizeTreeHook, CompilationParams,
   CompilationProcessAssets, CompilationProcessAssetsHook, CompilationRuntimeModule,
-  CompilationRuntimeModuleHook, CompilationStillValidModule, CompilationStillValidModuleHook,
-  CompilationSucceedModule, CompilationSucceedModuleHook, CompilerAfterEmit, CompilerAfterEmitHook,
-  CompilerAssetEmitted, CompilerAssetEmittedHook, CompilerCompilation, CompilerCompilationHook,
-  CompilerEmit, CompilerEmitHook, CompilerFinishMake, CompilerFinishMakeHook, CompilerMake,
-  CompilerMakeHook, CompilerShouldEmit, CompilerShouldEmitHook, CompilerThisCompilation,
-  CompilerThisCompilationHook, ContextModuleFactoryAfterResolve,
-  ContextModuleFactoryAfterResolveHook, ContextModuleFactoryBeforeResolve,
-  ContextModuleFactoryBeforeResolveHook, ExecuteModuleId, ModuleFactoryCreateData,
-  ModuleIdentifier, NormalModuleCreateData, NormalModuleFactoryAfterResolve,
-  NormalModuleFactoryAfterResolveHook, NormalModuleFactoryBeforeResolve,
-  NormalModuleFactoryBeforeResolveHook, NormalModuleFactoryCreateModule,
-  NormalModuleFactoryCreateModuleHook, NormalModuleFactoryFactorize,
-  NormalModuleFactoryFactorizeHook, NormalModuleFactoryResolve,
+  CompilationRuntimeModuleHook, CompilationSeal, CompilationSealHook, CompilationStillValidModule,
+  CompilationStillValidModuleHook, CompilationSucceedModule, CompilationSucceedModuleHook,
+  CompilerAfterEmit, CompilerAfterEmitHook, CompilerAssetEmitted, CompilerAssetEmittedHook,
+  CompilerCompilation, CompilerCompilationHook, CompilerEmit, CompilerEmitHook, CompilerFinishMake,
+  CompilerFinishMakeHook, CompilerMake, CompilerMakeHook, CompilerShouldEmit,
+  CompilerShouldEmitHook, CompilerThisCompilation, CompilerThisCompilationHook,
+  ContextModuleFactoryAfterResolve, ContextModuleFactoryAfterResolveHook,
+  ContextModuleFactoryBeforeResolve, ContextModuleFactoryBeforeResolveHook, ExecuteModuleId,
+  ModuleFactoryCreateData, ModuleIdentifier, NormalModuleCreateData,
+  NormalModuleFactoryAfterResolve, NormalModuleFactoryAfterResolveHook,
+  NormalModuleFactoryBeforeResolve, NormalModuleFactoryBeforeResolveHook,
+  NormalModuleFactoryCreateModule, NormalModuleFactoryCreateModuleHook,
+  NormalModuleFactoryFactorize, NormalModuleFactoryFactorizeHook, NormalModuleFactoryResolve,
   NormalModuleFactoryResolveForScheme, NormalModuleFactoryResolveForSchemeHook,
   NormalModuleFactoryResolveHook, NormalModuleFactoryResolveResult, ResourceData, RuntimeGlobals,
   Scheme,
@@ -317,6 +317,7 @@ pub enum RegisterJsTapKind {
   CompilationChunkAsset,
   CompilationProcessAssets,
   CompilationAfterProcessAssets,
+  CompilationSeal,
   CompilationAfterSeal,
   NormalModuleFactoryBeforeResolve,
   NormalModuleFactoryFactorize,
@@ -440,6 +441,8 @@ pub struct RegisterJsTaps {
     ts_type = "(stages: Array<number>) => Array<{ function: ((arg: JsCompilation) => void); stage: number; }>"
   )]
   pub register_compilation_after_process_assets_taps: RegisterFunction<JsCompilation, ()>,
+  #[napi(ts_type = "(stages: Array<number>) => Array<{ function: (() => void); stage: number; }>")]
+  pub register_compilation_seal_taps: RegisterFunction<(), ()>,
   #[napi(
     ts_type = "(stages: Array<number>) => Array<{ function: (() => Promise<void>); stage: number; }>"
   )]
@@ -681,6 +684,14 @@ define_register!(
   kind = RegisterJsTapKind::CompilationAfterProcessAssets,
   skip = true,
 );
+define_register!(
+  RegisterCompilationSealTaps,
+  tap = CompilationSealTap<(), ()> @ CompilationSealHook,
+  cache = false,
+  sync = false,
+  kind = RegisterJsTapKind::CompilationSeal,
+  skip = true,
+);
 define_register!(
   RegisterCompilationAfterSealTaps,
   tap = CompilationAfterSealTap<(), Promise<()>> @ CompilationAfterSealHook,
@@ -1169,6 +1180,17 @@ impl CompilationAfterProcessAssets for CompilationAfterProcessAssetsTap {
   }
 }
 
+#[async_trait]
+impl CompilationSeal for CompilationSealTap {
+  async fn run(&self, _compilation: &mut Compilation) -> rspack_error::Result<()> {
+    self.function.call_with_sync(()).await
+  }
+
+  fn stage(&self) -> i32 {
+    self.stage
+  }
+}
+
 #[async_trait]
 impl CompilationAfterSeal for CompilationAfterSealTap {
   async fn run(&self, _compilation: &mut Compilation) -> rspack_error::Result<()> {

crates/node_binding/src/plugins/mod.rs

@@ -44,6 +44,7 @@ pub struct JsHooksAdapterPlugin {
   register_compilation_chunk_asset_taps: RegisterCompilationChunkAssetTaps,
   register_compilation_process_assets_taps: RegisterCompilationProcessAssetsTaps,
   register_compilation_after_process_assets_taps: RegisterCompilationAfterProcessAssetsTaps,
+  register_compilation_seal_taps: RegisterCompilationSealTaps,
   register_compilation_after_seal_taps: RegisterCompilationAfterSealTaps,
   register_normal_module_factory_before_resolve_taps: RegisterNormalModuleFactoryBeforeResolveTaps,
   register_normal_module_factory_factorize_taps: RegisterNormalModuleFactoryFactorizeTaps,
@@ -203,6 +204,11 @@ impl rspack_core::Plugin for JsHooksAdapterPlugin {
       .compilation_hooks
       .after_process_assets
       .intercept(self.register_compilation_after_process_assets_taps.clone());
+    ctx
+      .context
+      .compilation_hooks
+      .seal
+      .intercept(self.register_compilation_seal_taps.clone());
     ctx
       .context
       .compilation_hooks
@@ -399,6 +405,10 @@ impl JsHooksAdapterPlugin {
             register_js_taps.register_compilation_after_process_assets_taps,
             non_skippable_registers.clone(),
           ),
+        register_compilation_seal_taps: RegisterCompilationSealTaps::new(
+          register_js_taps.register_compilation_seal_taps,
+          non_skippable_registers.clone(),
+        ),
         register_compilation_after_seal_taps: RegisterCompilationAfterSealTaps::new(
           register_js_taps.register_compilation_after_seal_taps,
           non_skippable_registers.clone(),

crates/rspack_core/src/compiler/compilation.rs

@@ -51,7 +51,7 @@ define_hook!(CompilationSucceedModule: AsyncSeries(module: &mut BoxModule));
 define_hook!(CompilationExecuteModule:
   SyncSeries(module: &ModuleIdentifier, runtime_modules: &IdentifierSet, codegen_results: &CodeGenerationResults, execute_module_id: &ExecuteModuleId));
 define_hook!(CompilationFinishModules: AsyncSeries(compilation: &mut Compilation));
-define_hook!(CompilationSeal: SyncSeries(compilation: &mut Compilation));
+define_hook!(CompilationSeal: AsyncSeries(compilation: &mut Compilation));
 define_hook!(CompilationOptimizeDependencies: SyncSeriesBail(compilation: &mut Compilation) -> bool);
 define_hook!(CompilationOptimizeModules: AsyncSeriesBail(compilation: &mut Compilation) -> bool);
 define_hook!(CompilationAfterOptimizeModules: AsyncSeries(compilation: &mut Compilation));
@@ -1049,7 +1049,7 @@ impl Compilation {
     let logger = self.get_logger("rspack.Compilation");
 
     // https://github.com/webpack/webpack/blob/main/lib/Compilation.js#L2809
-    plugin_driver.compilation_hooks.seal.call(self)?;
+    plugin_driver.compilation_hooks.seal.call(self).await?;
 
     let start = logger.time("optimize dependencies");
     // https://github.com/webpack/webpack/blob/d15c73469fd71cf98734685225250148b68ddc79/lib/Compilation.js#L2812-L2814

crates/rspack_core/src/options/module.rs

@@ -1,4 +1,5 @@
 use std::{
+  borrow::{Borrow, Cow},
   fmt::{self, Debug},
   sync::Arc,
 };
@@ -541,6 +542,12 @@ impl<'s> From<&'s str> for DataRef<'s> {
   }
 }
 
+impl<'s> From<&'s Cow<'_, str>> for DataRef<'s> {
+  fn from(value: &'s Cow<'_, str>) -> Self {
+    Self::Str(value.borrow())
+  }
+}
+
 impl<'s> From<&'s serde_json::Value> for DataRef<'s> {
   fn from(value: &'s serde_json::Value) -> Self {
     Self::Value(value)
@@ -565,11 +572,7 @@ impl DataRef<'_> {
 
 impl RuleSetCondition {
   #[async_recursion]
-  pub async fn try_match(
-    &self,
-    data: impl Into<DataRef<'async_recursion>> + Send + Sync + Copy + 'async_recursion,
-  ) -> Result<bool> {
-    let data: DataRef = data.into();
+  pub async fn try_match(&self, data: DataRef<'async_recursion>) -> Result<bool> {
     match self {
       Self::String(s) => Ok(
         data
@@ -594,10 +597,7 @@ pub struct RuleSetLogicalConditions {
 
 impl RuleSetLogicalConditions {
   #[async_recursion]
-  pub async fn try_match(
-    &self,
-    data: impl Into<DataRef<'async_recursion>> + Send + Sync + Copy + 'async_recursion,
-  ) -> Result<bool> {
+  pub async fn try_match(&self, data: DataRef<'async_recursion>) -> Result<bool> {
     if let Some(and) = &self.and
       && try_any(and, |i| async { i.try_match(data).await.map(|i| !i) }).await?
     {