Merge branch 'main' into feat/manifest-builtin

Author: 2heal1

Cargo.lock

@@ -83,7 +83,7 @@ regex-syntax        = { version = "0.8.5", default-features = false, features =
 regress             = { version = "0.10.4", default-features = false, features = ["pattern"] }
 ropey               = { version = "1.6.1", default-features = false }
 rspack_resolver     = { features = ["package_json_raw_json_api", "yarn_pnp"], version = "0.6.4", default-features = false }
-rspack_sources      = { version = "=0.4.12", default-features = false }
+rspack_sources      = { version = "=0.4.13", default-features = false }
 rustc-hash          = { version = "2.1.0", default-features = false }
 ryu-js              = { version = "1.0.2", default-features = false }
 scopeguard          = { version = "1.2.0", default-features = false }

Cargo.toml

@@ -19,7 +19,10 @@ mod tests {
       assert!(errors.is_empty());
 
       let asset = &compiler.compilation.assets().get("main.js").unwrap();
-      assert_eq!(asset.source.as_ref().unwrap().source(), "console.log(123);");
+      assert_eq!(
+        asset.source.as_ref().unwrap().source().into_string_lossy(),
+        "console.log(123);"
+      );
     })
     .await;
   }
@@ -42,7 +45,7 @@ mod tests {
 
       let asset = &compiler.compilation.assets().get("main.js").unwrap();
       assert_eq!(
-        asset.source.as_ref().unwrap().source(),
+        asset.source.as_ref().unwrap().source().into_string_lossy(),
         "console.log(123);\n//# sourceMappingURL=main.js.map"
       );
       assert!(compiler.compilation.assets().get("main.js.map").is_some());

crates/rspack/tests/basic.rs

@@ -21,8 +21,13 @@ impl From<&CodeGenerationResult> for JsCodegenerationResult {
         .inner
         .as_ref()
         .iter()
-        .map(|(source_type, source)| (source_type.to_string(), source.source().to_string()))
-        .collect(),
+        .map(|(source_type, source)| {
+          (
+            source_type.to_string(),
+            source.source().into_string_lossy().into_owned(),
+          )
+        })
+        .collect::<HashMap<String, String>>(),
     }
   }
 }

crates/rspack_binding_api/src/codegen_result.rs

@@ -5,7 +5,7 @@ use napi::{
   bindgen_prelude::{Buffer, FnArgs, Promise},
 };
 use napi_derive::napi;
-use rspack_core::rspack_sources::RawSource;
+use rspack_core::rspack_sources::{RawBufferSource, RawStringSource, SourceExt};
 use rspack_napi::threadsafe_function::ThreadsafeFunction;
 use rspack_plugin_copy::{
   CopyGlobOptions, CopyPattern, CopyRspackPluginOptions, Info, Related, ToOption, ToType,
@@ -207,8 +207,8 @@ impl From<RawCopyPattern> for CopyPattern {
             f.call_with_promise((input.into(), absolute_filename.to_owned()).into())
               .await
               .map(|input| match input {
-                Either::A(s) => RawSource::from(s),
-                Either::B(b) => RawSource::from(Vec::<u8>::from(b)),
+                Either::A(s) => RawStringSource::from(s).boxed(),
+                Either::B(b) => RawBufferSource::from(Vec::<u8>::from(b)).boxed(),
               })
           })
         })

crates/rspack_binding_api/src/raw_options/raw_builtins/raw_copy.rs

@@ -2,8 +2,8 @@ use std::{hash::Hash, sync::Arc};
 
 use napi_derive::napi;
 use rspack_core::rspack_sources::{
-  BoxSource, CachedSource, ConcatSource, MapOptions, OriginalSource, RawBufferSource, RawSource,
-  RawStringSource, ReplaceSource, Source, SourceExt, SourceMap, SourceMapSource,
+  BoxSource, CachedSource, ConcatSource, MapOptions, OriginalSource, RawBufferSource,
+  RawStringSource, ReplaceSource, Source, SourceExt, SourceMap, SourceMapSource, SourceValue,
   WithoutOriginalOptions,
 };
 use rspack_napi::napi::bindgen_prelude::*;
@@ -66,20 +66,19 @@ impl TryFrom<&dyn Source> for JsSourceToJs {
   type Error = napi::Error;
 
   fn try_from(value: &dyn Source) -> Result<Self> {
-    if let Some(raw_buffer_source) = value.as_any().downcast_ref::<RawBufferSource>() {
-      let bytes = raw_buffer_source.buffer().to_vec();
-      return Ok(JsSourceToJs {
-        source: Either::B(Buffer::from(bytes)),
+    match value.source() {
+      SourceValue::String(string) => {
+        let map: Option<String> = to_webpack_map(value)?;
+        Ok(JsSourceToJs {
+          source: Either::A(string.into_owned()),
+          map,
+        })
+      }
+      SourceValue::Buffer(bytes) => Ok(JsSourceToJs {
+        source: Either::B(Buffer::from(bytes.to_vec())),
         map: None,
-      });
+      }),
     }
-
-    let string = value.source();
-    let map: Option<String> = to_webpack_map(value)?;
-    Ok(JsSourceToJs {
-      source: Either::A(string.into_owned()),
-      map,
-    })
   }
 }
 

crates/rspack_binding_api/src/source.rs

@@ -9,7 +9,7 @@ use napi_derive::napi;
 use rspack_collections::IdentifierMap;
 use rspack_core::{
   EntrypointsStatsOption, ExtendedStatsOptions, Stats, StatsChunk, StatsModule, StatsUsedExports,
-  rspack_sources::{RawBufferSource, RawSource, Source},
+  rspack_sources::{RawBufferSource, Source, SourceValue},
 };
 use rspack_error::Severity;
 use rspack_napi::napi::{
@@ -569,16 +569,9 @@ impl<'a> TryFrom<StatsModule<'a>> for JsStatsModule<'a> {
   type Error = napi::Error;
 
   fn try_from(stats: StatsModule<'a>) -> std::result::Result<Self, Self::Error> {
-    let source = stats.source.map(|source| {
-      if let Some(raw_source) = source.as_any().downcast_ref::<RawBufferSource>() {
-        return JsStatsModuleSource::B(Buffer::from(raw_source.buffer().to_vec()));
-      }
-      if let Some(raw_source) = source.as_any().downcast_ref::<RawSource>()
-        && raw_source.is_buffer()
-      {
-        return JsStatsModuleSource::B(Buffer::from(raw_source.buffer().to_vec()));
-      }
-      JsStatsModuleSource::A(CowStrWrapper::new(source.source()))
+    let source = stats.source.map(|source| match source.source() {
+      SourceValue::String(string) => JsStatsModuleSource::A(CowStrWrapper::new(string)),
+      SourceValue::Buffer(bytes) => JsStatsModuleSource::B(Buffer::from(bytes.to_vec())),
     });
 
     let mut sizes = stats

crates/rspack_binding_api/src/stats.rs

@@ -98,7 +98,7 @@ impl Task<TaskContext> for FactorizeTask {
         if let Some(s) = self.original_module_source {
           let has_source_code = e.src.is_some();
           if !has_source_code {
-            e.src = Some(s.source().to_string());
+            e.src = Some(s.source().into_string_lossy().into_owned());
           }
         }
         // Bail out if `options.bail` set to `true`,

crates/rspack_core/src/compilation/make/graph_updater/repair/factorize.rs

@@ -2242,7 +2242,7 @@ impl ConcatenatedModule {
           "{}",
           self.readable_identifier(&compilation.options.context),
         ))),
-        source_code.to_string(),
+        source_code.into_string_lossy().into_owned(),
       );
       let comments = SwcComments::default();
       let mut module_info = concatenation_scope.current_module;

crates/rspack_core/src/concatenated_module.rs

@@ -140,8 +140,9 @@ impl InitFragmentKey {
       | InitFragmentKey::ModuleExternal(_)
       | InitFragmentKey::ModuleDecorator(_)
       | InitFragmentKey::CommonJsExports(_)
+      | InitFragmentKey::ESMCompatibility
       | InitFragmentKey::Const(_) => first(fragments),
-      InitFragmentKey::ESMCompatibility | InitFragmentKey::Unique(_) => {
+      InitFragmentKey::Unique(_) => {
         debug_assert!(fragments.len() == 1, "fragment = {self:?}");
         first(fragments)
       }