Merge branch 'main' into fix/remove-lightningCssMinimizerRspackPlugin…

…-options-exclude-default-value

.github/actions/clean/action.yml

@@ -0,0 +1,52 @@
+name: Clean Repository
+
+inputs:
+  target:
+    required: true
+    type: string
+
+runs:
+  using: composite
+  steps:
+    - name: Git Clean
+      shell: bash
+      run: |
+        git config --system core.longpaths true
+        rm -rf node_modules
+        git clean -ffdx -e target
+        git reset --hard HEAD
+
+    - name: Clean Large Directories by Size
+      if: ${{ !contains(inputs.target, 'windows') }}
+      shell: bash
+      run: |
+        if [ -d "target" ]; then
+          TARGET_SIZE=$(du -s target | awk '{print $1}')
+          MAX_SIZE=$((50 * 1024 * 1024))
+
+          echo "MAX_SIZE = $MAX_SIZE"
+          if [ "$TARGET_SIZE" -gt "$MAX_SIZE" ]; then
+            echo "`target` directory size is greater than 50GB, deleting..."
+            rm -rf target
+          else
+            echo "`target` directory size is within limits."
+          fi
+        fi
+
+    - name: Clean Large Directories by Time
+      if: ${{ contains(inputs.target, 'windows') }}
+      shell: bash
+      run: |
+        if [ -d "target" ]; then
+          TARGET_CREATION_TIME=$(powershell -Command "(Get-Item 'target').CreationTime")
+          TWO_WEEKS_AGO=$(date -d '2 weeks ago' +%s)
+
+          echo "TARGET_CREATION_TIME = $TARGET_CREATION_TIME"
+
+          if [ "$TARGET_CREATION_TIME" -lt "$TWO_WEEKS_AGO" ]; then
+            echo "'target' directory is older than 2 weeks, deleting..."
+            rm -rf target
+          else
+            echo "'target' directory is within 2 weeks."
+          fi
+        fi

.github/workflows/release-pull-request.yml

@@ -33,7 +33,8 @@ jobs:
         uses: ./.github/actions/pnpm-cache
 
       - name: Create Release Pull Request
-        uses: hardfist/rspack-action@rspack
+        # https://github.com/rspack-contrib/rspack-action
+        uses: rspack-contrib/rspack-action@rspack
         with:
           version: node ./x version ${{inputs.version || 'patch'}}
           createGithubReleases: false

.github/workflows/reusable-build.yml

@@ -71,16 +71,11 @@ jobs:
           ref: ${{ inputs.ref }}
           clean: ${{ startsWith(runner.name, 'GitHub Actions') }}
 
-      - name: Git Clean
+      - name: Clean
         if: ${{ !inputs.skipable && !startsWith(runner.name, 'GitHub Actions') }}
-        shell: bash
-        run: |
-          git config --system core.longpaths true
-          echo "rm -rf node_modules"
-          rm -rf node_modules
-          echo "git clean -ffdx -e target"
-          git clean -ffdx -e target
-          git reset --hard HEAD
+        uses: ./.github/actions/clean
+        with:
+          target: ${{ inputs.target }}
 
       - name: Setup tmate session
         uses: mxschmitt/action-tmate@v3
@@ -225,16 +220,11 @@ jobs:
           ref: ${{ inputs.ref }}
           clean: ${{ startsWith(runner.name, 'GitHub Actions') }}
 
-      - name: Git Clean
+      - name: Clean
         if: ${{ !startsWith(runner.name, 'GitHub Actions') }}
-        shell: bash
-        run: |
-          git config --system core.longpaths true
-          echo "rm -rf node_modules"
-          rm -rf node_modules
-          echo "git clean -ffdx -e target"
-          git clean -ffdx -e target
-          git reset --hard HEAD
+        uses: ./.github/actions/clean
+        with:
+          target: ${{ inputs.target }}
 
       - name: Download bindings
         uses: ./.github/actions/download-artifact
@@ -282,16 +272,11 @@ jobs:
           ref: ${{ inputs.ref }}
           clean: ${{ startsWith(runner.name, 'GitHub Actions') }}
 
-      - name: Git Clean
+      - name: Clean
         if: ${{ !inputs.skipable && !startsWith(runner.name, 'GitHub Actions') }}
-        shell: bash
-        run: |
-          git config --system core.longpaths true
-          echo "rm -rf node_modules"
-          rm -rf node_modules
-          echo "git clean -ffdx -e target"
-          git clean -ffdx -e target
-          git reset --hard HEAD
+        uses: ./.github/actions/clean
+        with:
+          target: ${{ inputs.target }}
 
       - name: Download bindings
         if: ${{ !inputs.skipable }}

.vscode/settings.json

@@ -42,5 +42,6 @@
     "tokio",
     "ukey",
     "Ukey"
-  ]
+  ],
+  "rust-analyzer.checkOnSave": false
 }

biome.jsonc

@@ -52,9 +52,7 @@
 				"noFallthroughSwitchClause": "off",
 				"noConfusingVoidType": "off",
 				"noPrototypeBuiltins": "off",
-				"noImplicitAnyLet": "off",
 				"noAssignInExpressions": "off",
-				"noArrayIndexKey": "off",
 				"noControlCharactersInRegex": "off",
 				"noExplicitAny": "off"
 			}
@@ -68,6 +66,7 @@
 			// --- ignore runtime code in browser
 			"packages/rspack/hot",
 			"packages/rspack-dev-server/client",
+			"packages/rspack-dev-server/tests",
 			"packages/rspack/src/container/default.runtime.js"
 		]
 	},
@@ -77,4 +76,4 @@
 		"clientKind": "git",
 		"useIgnoreFile": true
 	}
-}
+}

crates/node_binding/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspack/binding",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "license": "MIT",
   "description": "Node binding for rspack",
   "main": "binding.js",

crates/node_binding/src/compiler.rs

@@ -7,9 +7,7 @@ use std::{
   },
 };
 
-use rspack_fs_node::AsyncNodeWritableFileSystem;
-
-type CompilerInner = rspack_core::Compiler<AsyncNodeWritableFileSystem>;
+type CompilerInner = rspack_core::Compiler;
 
 /// `Compiler` struct that is `!Unpin`.
 pub(crate) struct Compiler(CompilerInner, PhantomPinned);

crates/node_binding/src/lib.rs

@@ -67,8 +67,10 @@ impl Rspack {
     let rspack = rspack_core::Compiler::new(
       compiler_options,
       plugins,
-      AsyncNodeWritableFileSystem::new(output_filesystem)
-        .map_err(|e| Error::from_reason(format!("Failed to create writable filesystem: {e}",)))?,
+      Box::new(
+        AsyncNodeWritableFileSystem::new(output_filesystem)
+          .map_err(|e| Error::from_reason(format!("Failed to create writable filesystem: {e}",)))?,
+      ),
       Some(resolver_factory),
       Some(loader_resolver_factory),
     );

crates/rspack_binding_options/src/options/raw_module/mod.rs

@@ -12,11 +12,11 @@ use rspack_core::{
   AssetParserDataUrlOptions, AssetParserOptions, AssetResourceGeneratorOptions,
   CssAutoGeneratorOptions, CssAutoParserOptions, CssGeneratorOptions, CssModuleGeneratorOptions,
   CssModuleParserOptions, CssParserOptions, DescriptionData, DynamicImportFetchPriority,
-  DynamicImportMode, ExportPresenceMode, FuncUseCtx, GeneratorOptions,
-  GeneratorOptionsByModuleType, JavascriptParserOptions, JavascriptParserOrder,
-  JavascriptParserUrl, ModuleNoParseRule, ModuleNoParseRules, ModuleNoParseTestFn, ModuleOptions,
-  ModuleRule, ModuleRuleEffect, ModuleRuleEnforce, ModuleRuleUse, ModuleRuleUseLoader, ModuleType,
-  OverrideStrict, ParserOptions, ParserOptionsByModuleType,
+  DynamicImportMode, ExportPresenceMode, FuncUseCtx, GeneratorOptions, GeneratorOptionsMap,
+  JavascriptParserOptions, JavascriptParserOrder, JavascriptParserUrl, ModuleNoParseRule,
+  ModuleNoParseRules, ModuleNoParseTestFn, ModuleOptions, ModuleRule, ModuleRuleEffect,
+  ModuleRuleEnforce, ModuleRuleUse, ModuleRuleUseLoader, OverrideStrict, ParserOptions,
+  ParserOptionsMap,
 };
 use rspack_error::error;
 use rspack_napi::regexp::{JsRegExp, JsRegExpExt};
@@ -203,14 +203,32 @@ impl From<RawParserOptions> for ParserOptions {
           .expect("should have an \"asset\" when RawParserOptions.type is \"asset\"")
           .into(),
       ),
-      "javascript" | "javascript/auto" | "javascript/dynamic" | "javascript/esm" => {
-        Self::Javascript(
-          value
-            .javascript
-            .expect("should have an \"javascript\" when RawParserOptions.type is \"javascript\"")
-            .into(),
-        )
-      }
+      "javascript" => Self::Javascript(
+        value
+          .javascript
+          .expect("should have an \"javascript\" when RawParserOptions.type is \"javascript\"")
+          .into(),
+      ),
+      "javascript/auto" => Self::JavascriptAuto(
+        value
+          .javascript
+          .expect("should have an \"javascript\" when RawParserOptions.type is \"javascript/auto\"")
+          .into(),
+      ),
+      "javascript/dynamic" => Self::JavascriptDynamic(
+        value
+          .javascript
+          .expect(
+            "should have an \"javascript\" when RawParserOptions.type is \"javascript/dynamic\"",
+          )
+          .into(),
+      ),
+      "javascript/esm" => Self::JavascriptEsm(
+        value
+          .javascript
+          .expect("should have an \"javascript\" when RawParserOptions.type is \"javascript/esm\"")
+          .into(),
+      ),
       "css" => Self::Css(
         value
           .css
@@ -805,16 +823,16 @@ impl TryFrom<RawModuleOptions> for ModuleOptions {
         .parser
         .map(|x| {
           x.into_iter()
-            .map(|(k, v)| Ok((ModuleType::from(k.as_str()), v.into())))
-            .collect::<std::result::Result<ParserOptionsByModuleType, rspack_error::Error>>()
+            .map(|(k, v)| Ok((k, v.into())))
+            .collect::<std::result::Result<ParserOptionsMap, rspack_error::Error>>()
         })
         .transpose()?,
       generator: value
         .generator
         .map(|x| {
           x.into_iter()
-            .map(|(k, v)| Ok((ModuleType::from(k.as_str()), v.into())))
-            .collect::<std::result::Result<GeneratorOptionsByModuleType, rspack_error::Error>>()
+            .map(|(k, v)| Ok((k, v.into())))
+            .collect::<std::result::Result<GeneratorOptionsMap, rspack_error::Error>>()
         })
         .transpose()?,
       no_parse: value

crates/rspack_binding_options/src/plugins/css_extract_additional_data.rs

@@ -31,36 +31,43 @@ impl Debug for CssExtractRspackAdditionalDataPlugin {
 }
 
 #[plugin_hook(NormalModuleAdditionalData for CssExtractRspackAdditionalDataPlugin)]
-async fn additional_data(&self, additional_data: &mut AdditionalData) -> Result<()> {
-  if !additional_data.contains::<ThreadsafeJsValueRef<Unknown>>() {
+async fn additional_data(&self, additional_data: &mut Option<&mut AdditionalData>) -> Result<()> {
+  if !additional_data
+    .as_ref()
+    .is_some_and(|data| data.contains::<ThreadsafeJsValueRef<Unknown>>())
+  {
     return Ok(());
   }
-  let (tx, rx) = oneshot::channel::<AdditionalData>();
-  let mut old_data = std::mem::take(additional_data);
-  self.js_callback.call(Box::new(move |env| {
-    if let Some(data) = old_data.get::<ThreadsafeJsValueRef<Unknown>>()
-      && let Ok(data) = data.get(env)
-      && let Ok(data) = data.coerce_to_object()
-      && let Ok(Some(data)) = data.get::<_, String>("css-extract-rspack-plugin")
-    {
-      let data_list: Vec<rspack_plugin_extract_css::CssExtractJsonData> = data
-        .split("__RSPACK_CSS_EXTRACT_SEP__")
-        .map(|info| {
-          serde_json::from_str(info)
-            .unwrap_or_else(|e| panic!("failed to parse CssExtractJsonData: {}", e))
-        })
-        .collect();
+  if let Some(mut old_data) = additional_data.as_mut().map(|data| std::mem::take(*data)) {
+    let (tx, rx) = oneshot::channel::<AdditionalData>();
+    self.js_callback.call(Box::new(move |env| {
+      if let Some(data) = old_data
+        .get::<ThreadsafeJsValueRef<Unknown>>()
+        .and_then(|data| data.get(env).ok())
+        .and_then(|data| data.coerce_to_object().ok())
+        .and_then(|data| data.get::<_, String>("css-extract-rspack-plugin").ok())
+        .flatten()
+      {
+        let data_list: Vec<rspack_plugin_extract_css::CssExtractJsonData> = data
+          .split("__RSPACK_CSS_EXTRACT_SEP__")
+          .map(|info| {
+            serde_json::from_str(info)
+              .unwrap_or_else(|e| panic!("failed to parse CssExtractJsonData: {}", e))
+          })
+          .collect();
 
-      old_data.insert(CssExtractJsonDataList(data_list));
-    };
-    tx.send(old_data)
-      .expect("should send `additional_data` for `CssExtractRspackAdditionalDataPlugin`");
-  }));
-  let new_data = rx
-    .await
-    .expect("should receive `additional_data` for `CssExtractRspackAdditionalDataPlugin`");
-  // ignore the default value here
-  let _ = std::mem::replace(additional_data, new_data);
+        old_data.insert(CssExtractJsonDataList(data_list));
+      };
+      tx.send(old_data)
+        .expect("should send `additional_data` for `CssExtractRspackAdditionalDataPlugin`");
+    }));
+    let new_data = rx
+      .await
+      .expect("should receive `additional_data` for `CssExtractRspackAdditionalDataPlugin`");
+    if let Some(data) = additional_data.as_mut() {
+      let _ = std::mem::replace(*data, new_data);
+    }
+  }
   Ok(())
 }
 

crates/rspack_binding_options/src/plugins/js_loader/context.rs

@@ -94,17 +94,17 @@ impl TryFrom<&mut LoaderContext<RunnerContext>> for JsLoaderContext {
         .to_js_module()
         .expect("CompilerModuleContext::to_js_module should not fail."),
       hot: cx.hot,
-      content: match &cx.content {
+      content: match cx.content() {
         Some(c) => Either::B(c.to_owned().into_bytes().into()),
         None => Either::A(Null),
       },
       additional_data: cx
-        .additional_data
-        .get::<ThreadsafeJsValueRef<Unknown>>()
+        .additional_data()
+        .and_then(|data| data.get::<ThreadsafeJsValueRef<Unknown>>())
         .cloned(),
       source_map: cx
-        .source_map
-        .clone()
+        .source_map()
+        .cloned()
         .map(|v| v.to_json())
         .transpose()
         .map_err(|e| error!(e.to_string()))?