Merge branch 'main' into changeset-release/main

.github/renovate.json5

@@ -1,7 +1,9 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "timezone": "Asia/Shanghai",
-  "extends": [":dependencyDashboard"],
+  "extends": [
+    ":dependencyDashboard"
+  ],
   "schedule": [
     "before 8am on wednesday"
   ],
@@ -120,10 +122,14 @@
       ],
       "excludePackageNames": [
         "typescript",
-        "pnpm"
+        "pnpm",
+        "@playwright/test"
       ],
       // bump major in a separate PR
-      "matchUpdateTypes": ["patch", "minor"]
+      "matchUpdateTypes": [
+        "patch",
+        "minor"
+      ]
     },
     {
       "groupName": "npm dependencies",
@@ -134,7 +140,10 @@
         "dependencies"
       ],
       // bump major in a separate PR
-      "matchUpdateTypes": ["patch", "minor"]
+      "matchUpdateTypes": [
+        "patch",
+        "minor"
+      ]
     },
     {
       "groupName": "webpack",
@@ -145,6 +154,15 @@
         "webpack"
       ],
       "enabled": false
+    },
+    {
+      "groupName": "playwright",
+      "matchManagers": [
+        "npm"
+      ],
+      "matchPackagePrefixes": [
+        "@playwright/test"
+      ]
     }
   ]
-}
+}

.github/workflows/ci.yml

@@ -159,7 +159,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: crate-ci/typos@v1.25.0
+      - uses: crate-ci/typos@v1.26.0
         with:
           files: .
 

.github/workflows/reusable-build.yml

@@ -242,7 +242,7 @@ jobs:
       - name: Run e2e
         uses: ./.github/actions/docker-run
         with:
-          image: mcr.microsoft.com/playwright:v1.35.0-jammy
+          image: mcr.microsoft.com/playwright:v1.47.0-jammy
           # .cache is required by download artifact, and mount in ./.github/actions/docker-run
           # .tool_cache is required by pnpm
           options: -v ${{ runner.tool_cache }}:$HOME/.tool_cache

crates/node_binding/binding.d.ts

@@ -1429,6 +1429,26 @@ export interface RawJavascriptParserOptions {
   worker?: Array<string>
   overrideStrict?: string
   importMeta?: boolean
+  /**
+   * This option is experimental in Rspack only and subject to change or be removed anytime.
+   * @experimental
+   */
+  requireAsExpression?: boolean
+  /**
+   * This option is experimental in Rspack only and subject to change or be removed anytime.
+   * @experimental
+   */
+  requireDynamic?: boolean
+  /**
+   * This option is experimental in Rspack only and subject to change or be removed anytime.
+   * @experimental
+   */
+  requireResolve?: boolean
+  /**
+   * This option is experimental in Rspack only and subject to change or be removed anytime.
+   * @experimental
+   */
+  importDynamic?: boolean
 }
 
 export interface RawLazyCompilationOption {

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

@@ -272,6 +272,18 @@ pub struct RawJavascriptParserOptions {
   pub worker: Option<Vec<String>>,
   pub override_strict: Option<String>,
   pub import_meta: Option<bool>,
+  /// This option is experimental in Rspack only and subject to change or be removed anytime.
+  /// @experimental
+  pub require_as_expression: Option<bool>,
+  /// This option is experimental in Rspack only and subject to change or be removed anytime.
+  /// @experimental
+  pub require_dynamic: Option<bool>,
+  /// This option is experimental in Rspack only and subject to change or be removed anytime.
+  /// @experimental
+  pub require_resolve: Option<bool>,
+  /// This option is experimental in Rspack only and subject to change or be removed anytime.
+  /// @experimental
+  pub import_dynamic: Option<bool>,
 }
 
 impl From<RawJavascriptParserOptions> for JavascriptParserOptions {
@@ -307,6 +319,10 @@ impl From<RawJavascriptParserOptions> for JavascriptParserOptions {
         .override_strict
         .map(|e| OverrideStrict::from(e.as_str())),
       import_meta: value.import_meta,
+      require_as_expression: value.require_as_expression,
+      require_dynamic: value.require_dynamic,
+      require_resolve: value.require_resolve,
+      import_dynamic: value.import_dynamic,
     }
   }
 }

crates/rspack_binding_values/Cargo.toml

@@ -14,6 +14,7 @@ napi-derive           = { workspace = true }
 rspack_collections    = { version = "0.1.0", path = "../rspack_collections" }
 rspack_core           = { version = "0.1.0", path = "../rspack_core" }
 rspack_error          = { version = "0.1.0", path = "../rspack_error" }
+rspack_hash           = { version = "0.1.0", path = "../rspack_hash" }
 rspack_napi           = { version = "0.1.0", path = "../rspack_napi" }
 rspack_plugin_html    = { version = "0.1.0", path = "../rspack_plugin_html" }
 rspack_plugin_runtime = { version = "0.1.0", path = "../rspack_plugin_runtime" }

crates/rspack_binding_values/src/compilation/mod.rs

@@ -387,9 +387,10 @@ impl JsCompilation {
     filename: LocalJsFilename,
     data: JsPathData,
   ) -> napi::Result<String> {
+    let chunk = data.chunk.as_ref().map(|c| c.to_chunk(self.0));
     self
       .0
-      .get_asset_path(&filename.into(), data.as_core_path_data())
+      .get_asset_path(&filename.into(), data.as_core_path_data(chunk.as_ref()))
   }
 
   #[napi]
@@ -398,15 +399,19 @@ impl JsCompilation {
     filename: LocalJsFilename,
     data: JsPathData,
   ) -> napi::Result<PathWithInfo> {
+    let chunk = data.chunk.as_ref().map(|c| c.to_chunk(self.0));
     let path_and_asset_info = self
       .0
-      .get_asset_path_with_info(&filename.into(), data.as_core_path_data())?;
+      .get_asset_path_with_info(&filename.into(), data.as_core_path_data(chunk.as_ref()))?;
     Ok(path_and_asset_info.into())
   }
 
   #[napi]
   pub fn get_path(&self, filename: LocalJsFilename, data: JsPathData) -> napi::Result<String> {
-    self.0.get_path(&filename.into(), data.as_core_path_data())
+    let chunk = data.chunk.as_ref().map(|c| c.to_chunk(self.0));
+    self
+      .0
+      .get_path(&filename.into(), data.as_core_path_data(chunk.as_ref()))
   }
 
   #[napi]
@@ -415,9 +420,10 @@ impl JsCompilation {
     filename: LocalJsFilename,
     data: JsPathData,
   ) -> napi::Result<PathWithInfo> {
+    let chunk = data.chunk.as_ref().map(|c| c.to_chunk(self.0));
     let path_and_asset_info = self
       .0
-      .get_path_with_info(&filename.into(), data.as_core_path_data())?;
+      .get_path_with_info(&filename.into(), data.as_core_path_data(chunk.as_ref()))?;
     Ok(path_and_asset_info.into())
   }
 

crates/rspack_binding_values/src/path_data.rs

@@ -2,6 +2,8 @@ use std::collections::HashMap;
 
 use napi::Either;
 use napi_derive::napi;
+use rspack_core::{Chunk, Compilation, SourceType};
+use rspack_hash::RspackHashDigest;
 
 use super::JsAssetInfo;
 
@@ -35,9 +37,48 @@ pub struct JsChunkPathData {
   pub id: Option<String>,
   pub name: Option<String>,
   pub hash: Option<String>,
+  // TODO: support custom content hash type
   pub content_hash: Option<Either<String, HashMap<String, String>>>,
 }
 
+impl JsChunkPathData {
+  pub fn to_chunk(&self, compilation: &Compilation) -> Chunk {
+    let mut chunk = rspack_core::Chunk::new(self.name.clone(), rspack_core::ChunkKind::Normal);
+    chunk.id = self.id.clone();
+    chunk.hash = self
+      .hash
+      .clone()
+      .map(|s| RspackHashDigest::new(s.into(), &compilation.options.output.hash_digest));
+
+    chunk.rendered_hash = self.hash.as_ref().map(|d| {
+      if d.len() < compilation.options.output.hash_digest_length {
+        d.as_str().into()
+      } else {
+        d[..compilation.options.output.hash_digest_length].into()
+      }
+    });
+    if let Some(hash) = self.content_hash.as_ref() {
+      match hash {
+        Either::A(hash) => {
+          chunk.content_hash.insert(
+            SourceType::Unknown,
+            RspackHashDigest::new(hash.clone().into(), &compilation.options.output.hash_digest),
+          );
+        }
+        Either::B(map) => {
+          for (key, hash) in map {
+            chunk.content_hash.insert(
+              SourceType::from(key.as_str()),
+              RspackHashDigest::new(hash.clone().into(), &compilation.options.output.hash_digest),
+            );
+          }
+        }
+      }
+    }
+    chunk
+  }
+}
+
 impl<'a> From<&'a rspack_core::Chunk> for JsChunkPathData {
   fn from(chunk: &'a rspack_core::Chunk) -> Self {
     Self {
@@ -56,10 +97,14 @@ impl<'a> From<&'a rspack_core::Chunk> for JsChunkPathData {
 }
 
 impl JsPathData {
-  pub fn as_core_path_data(&self) -> rspack_core::PathData {
+  pub fn as_core_path_data<'a>(
+    &'a self,
+    chunk: Option<&'a rspack_core::Chunk>,
+  ) -> rspack_core::PathData<'a> {
     rspack_core::PathData {
       filename: self.filename.as_deref(),
-      chunk: None,
+      chunk,
+      // TODO: support custom module
       module: None,
       hash: self.hash.as_deref(),
       content_hash: self.content_hash.as_deref(),

crates/rspack_core/src/concatenated_module.rs

@@ -1295,6 +1295,11 @@ impl Module for ConcatenatedModule {
           exports_final_names_map,
         ));
     }
+    code_generation_result.set_hash(
+      &compilation.options.output.hash_function,
+      &compilation.options.output.hash_digest,
+      &compilation.options.output.hash_salt,
+    );
     Ok(code_generation_result)
   }
 

crates/rspack_core/src/dependency/runtime_template.rs

@@ -537,7 +537,7 @@ pub fn block_promise(
         message: Some(message),
       },
     );
-    return format!("Promise.resolve({comment})");
+    return format!("Promise.resolve({})", comment.trim());
   };
   let chunk_group = compilation
     .chunk_graph
@@ -551,7 +551,7 @@ pub fn block_promise(
         message: Some(message),
       },
     );
-    return format!("Promise.resolve({comment})");
+    return format!("Promise.resolve({})", comment.trim());
   };
   if chunk_group.chunks.is_empty() {
     let comment = comment(
@@ -562,7 +562,7 @@ pub fn block_promise(
         message: Some(message),
       },
     );
-    return format!("Promise.resolve({comment})");
+    return format!("Promise.resolve({})", comment.trim());
   }
   let mg = compilation.get_module_graph();
   let block = mg.block_by_id_expect(block);
@@ -631,7 +631,7 @@ pub fn block_promise(
         .join(", ")
     )
   } else {
-    format!("Promise.resolve({comment})")
+    format!("Promise.resolve({})", comment.trim())
   }
 }