Merge branch 'main' into refactor/css-loading

.github/workflows/ci.yml

@@ -159,7 +159,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: crate-ci/typos@v1.27.3
+      - uses: crate-ci/typos@v1.28.1
         with:
           files: .
 
@@ -288,7 +288,7 @@ jobs:
       - uses: ./.github/actions/rustup
         with:
           shared-key: check
-      - uses: cargo-bins/[email protected].13
+      - uses: cargo-bins/[email protected].14
       - run: cargo binstall --no-confirm cargo-shear
       - run: cargo shear
 

crates/node_binding/binding.d.ts

@@ -1335,6 +1335,7 @@ export interface RawEntryDynamicResult {
 export interface RawEnvironment {
   const?: boolean
   arrowFunction?: boolean
+  nodePrefixForCoreModules?: boolean
 }
 
 export interface RawEvalDevToolModulePluginOptions {
@@ -1722,6 +1723,7 @@ export interface RawOptions {
   experiments: RawExperiments
   node?: RawNodeOption
   profile: boolean
+  amd?: string
   bail: boolean
   __references: Record<string, any>
 }

crates/node_binding/package.json

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

crates/node_binding/src/lib.rs

@@ -13,7 +13,7 @@ use napi::bindgen_prelude::*;
 use rspack_binding_options::BuiltinPlugin;
 use rspack_core::{Compilation, PluginExt};
 use rspack_error::Diagnostic;
-use rspack_fs_node::{AsyncNodeWritableFileSystem, ThreadsafeNodeFS};
+use rspack_fs_node::{NodeFileSystem, ThreadsafeNodeFS};
 
 mod compiler;
 mod diagnostic;
@@ -70,10 +70,9 @@ impl Rspack {
       compiler_options,
       plugins,
       rspack_binding_options::buildtime_plugins::buildtime_plugins(),
-      Some(Box::new(
-        AsyncNodeWritableFileSystem::new(output_filesystem)
-          .map_err(|e| Error::from_reason(format!("Failed to create writable filesystem: {e}",)))?,
-      )),
+      Some(Box::new(NodeFileSystem::new(output_filesystem).map_err(
+        |e| Error::from_reason(format!("Failed to create writable filesystem: {e}",)),
+      )?)),
       None,
       Some(resolver_factory),
       Some(loader_resolver_factory),

crates/node_binding/src/resolver_factory.rs

@@ -2,7 +2,7 @@ use std::sync::Arc;
 
 use napi_derive::napi;
 use rspack_core::{Resolve, ResolverFactory};
-use rspack_fs::{NativeFileSystem, SyncReadableFileSystem};
+use rspack_fs::{FileSystem, NativeFileSystem};
 
 use crate::{
   raw_resolve::{
@@ -15,7 +15,7 @@ use crate::{
 pub struct JsResolverFactory {
   pub(crate) resolver_factory: Option<Arc<ResolverFactory>>,
   pub(crate) loader_resolver_factory: Option<Arc<ResolverFactory>>,
-  pub(crate) input_filesystem: Arc<dyn SyncReadableFileSystem>,
+  pub(crate) input_filesystem: Arc<dyn FileSystem>,
 }
 
 #[napi]

crates/rspack_binding_options/src/options/mod.rs

@@ -54,6 +54,7 @@ pub struct RawOptions {
   pub experiments: RawExperiments,
   pub node: Option<RawNodeOption>,
   pub profile: bool,
+  pub amd: Option<String>,
   pub bail: bool,
   #[napi(js_name = "__references", ts_type = "Record<string, any>")]
   pub __references: References,
@@ -93,6 +94,7 @@ impl TryFrom<RawOptions> for CompilerOptions {
       optimization,
       node,
       profile: value.profile,
+      amd: value.amd,
       bail: value.bail,
       __references: value.__references,
     })

crates/rspack_binding_options/src/options/raw_output.rs

@@ -47,13 +47,15 @@ impl From<RawCrossOriginLoading> for CrossOriginLoading {
 pub struct RawEnvironment {
   pub r#const: Option<bool>,
   pub arrow_function: Option<bool>,
+  pub node_prefix_for_core_modules: Option<bool>,
 }
 
 impl From<RawEnvironment> for Environment {
   fn from(value: RawEnvironment) -> Self {
     Self {
       r#const: value.r#const,
       arrow_function: value.arrow_function,
+      node_prefix_for_core_modules: value.node_prefix_for_core_modules,
     }
   }
 }

crates/rspack_binding_values/src/compilation/mod.rs

@@ -533,9 +533,10 @@ impl JsCompilation {
   ) -> napi::Result<PathWithInfo> {
     let compilation = self.as_ref()?;
 
-    let path_and_asset_info =
-      compilation.get_path_with_info(&filename.into(), data.to_path_data())?;
-    Ok(path_and_asset_info.into())
+    let mut asset_info = AssetInfo::default();
+    let path =
+      compilation.get_path_with_info(&filename.into(), data.to_path_data(), &mut asset_info)?;
+    Ok((path, asset_info).into())
   }
 
   #[napi]

crates/rspack_cacheable/src/context.rs

@@ -20,15 +20,15 @@ impl<'a> ContextGuard<'a> {
     Self { context }
   }
 
-  pub fn add_to_sharing<S: Sharing<SerializeError>>(
+  pub fn add_to_sharing<S: Sharing<SerializeError> + ?Sized>(
     &self,
     sharing: &mut S,
   ) -> Result<(), SerializeError> {
     sharing.start_sharing(CONTEXT_ADDR);
     sharing.finish_sharing(CONTEXT_ADDR, self as *const _ as usize)
   }
 
-  pub fn sharing_context<S: Sharing<SerializeError>>(
+  pub fn sharing_context<S: Sharing<SerializeError> + ?Sized>(
     sharing: &'a mut S,
   ) -> Result<&'a dyn Any, SerializeError> {
     match sharing.start_sharing(CONTEXT_ADDR) {
@@ -40,7 +40,7 @@ impl<'a> ContextGuard<'a> {
     }
   }
 
-  pub fn add_to_pooling<P: Pooling<DeserializeError>>(
+  pub fn add_to_pooling<P: Pooling<DeserializeError> + ?Sized>(
     &self,
     pooling: &mut P,
   ) -> Result<(), DeserializeError> {
@@ -51,7 +51,7 @@ impl<'a> ContextGuard<'a> {
     }
   }
 
-  pub fn pooling_context<P: Pooling<DeserializeError>>(
+  pub fn pooling_context<P: Pooling<DeserializeError> + ?Sized>(
     pooling: &'a mut P,
   ) -> Result<&'a dyn Any, DeserializeError> {
     match pooling.start_pooling(CONTEXT_ADDR) {

crates/rspack_cacheable/src/lib.rs

@@ -3,7 +3,6 @@ pub use rspack_macros::{cacheable, cacheable_dyn};
 #[cfg(feature = "noop")]
 pub use rspack_macros::{disable_cacheable as cacheable, disable_cacheable_dyn as cacheable_dyn};
 pub mod r#dyn;
-pub mod utils;
 pub mod with;
 
 mod context;

crates/rspack_cacheable/src/with/as.rs

@@ -43,7 +43,7 @@ where
 impl<T, A, S> SerializeWith<T, S> for As<A>
 where
   A: AsConverter<T> + Archive + Serialize<S>,
-  S: Fallible<Error = SerializeError> + Sharing,
+  S: Fallible<Error = SerializeError> + Sharing + ?Sized,
 {
   #[inline]
   fn serialize_with(field: &T, serializer: &mut S) -> Result<Self::Resolver, SerializeError> {
@@ -60,7 +60,7 @@ impl<T, A, D> DeserializeWith<Archived<A>, T, D> for As<A>
 where
   A: AsConverter<T> + Archive,
   A::Archived: Deserialize<A, D>,
-  D: Fallible<Error = DeserializeError> + Pooling,
+  D: Fallible<Error = DeserializeError> + Pooling + ?Sized,
 {
   #[inline]
   fn deserialize_with(field: &Archived<A>, de: &mut D) -> Result<T, DeserializeError> {

crates/rspack_cacheable/src/with/as_cacheable.rs

@@ -20,7 +20,7 @@ impl<T: Archive> ArchiveWith<T> for AsCacheable {
 impl<T, S> SerializeWith<T, S> for AsCacheable
 where
   T: Archive + Serialize<S>,
-  S: ?Sized + Fallible,
+  S: Fallible + ?Sized,
 {
   #[inline]
   fn serialize_with(field: &T, serializer: &mut S) -> Result<Self::Resolver, S::Error> {
@@ -32,7 +32,7 @@ impl<T, D> DeserializeWith<Archived<T>, T, D> for AsCacheable
 where
   T: Archive,
   T::Archived: Deserialize<T, D>,
-  D: ?Sized + Fallible,
+  D: Fallible + ?Sized,
 {
   #[inline]
   fn deserialize_with(field: &Archived<T>, de: &mut D) -> Result<T, D::Error> {

crates/rspack_cacheable/src/with/as_inner.rs

@@ -48,7 +48,7 @@ impl<T, A, O, D> DeserializeWith<A::Archived, T, D> for AsInner<A>
 where
   T: AsInnerConverter<Inner = O>,
   A: ArchiveWith<O> + DeserializeWith<A::Archived, O, D>,
-  D: ?Sized + Fallible,
+  D: Fallible + ?Sized,
 {
   fn deserialize_with(field: &A::Archived, d: &mut D) -> Result<T, D::Error> {
     Ok(T::from_inner(A::deserialize_with(field, d)?))

crates/rspack_cacheable/src/with/as_map.rs

@@ -57,10 +57,11 @@ where
   }
 }
 
-impl<WK, WV, K, V, S: Fallible + ?Sized> Serialize<S> for Entry<&'_ K, &'_ V, WK, WV>
+impl<WK, WV, K, V, S> Serialize<S> for Entry<&'_ K, &'_ V, WK, WV>
 where
   WK: SerializeWith<K, S>,
   WV: SerializeWith<V, S>,
+  S: Fallible + ?Sized,
 {
   #[inline]
   fn serialize(&self, serializer: &mut S) -> Result<Self::Resolver, S::Error> {
@@ -90,7 +91,7 @@ where
   T: AsMapConverter<Key = K, Value = V>,
   WK: ArchiveWith<K>,
   WV: ArchiveWith<V>,
-  S: Fallible + ?Sized + Allocator + Writer,
+  S: Fallible + Allocator + Writer + ?Sized,
   for<'a> Entry<&'a K, &'a V, WK, WV>: Serialize<S>,
 {
   fn serialize_with(field: &T, s: &mut S) -> Result<Self::Resolver, S::Error> {

crates/rspack_cacheable/src/with/as_preset/mod.rs

@@ -2,7 +2,7 @@ mod camino;
 mod json;
 mod lightningcss;
 mod rspack_resolver;
-mod rspack_source;
+mod rspack_sources;
 mod serde_json;
 mod swc;
 mod ustr;