Support Buffer results from Webpack loaders

vercel · Aug 2, 2024 · 9388834 · 9388834
1 parent 514fad5
commit 9388834
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/turbopack/crates/turbopack-node/Cargo.toml b/turbopack/crates/turbopack-node/Cargo.toml
@@ -21,6 +21,7 @@ anyhow = { workspace = true }
 async-stream = "0.3.4"
 async-trait = { workspace = true }
 const_format = "0.2.30"
+either = { workspace = true, features = ["serde"] }
 futures = { workspace = true }
 futures-retry = { workspace = true }
 indexmap = { workspace = true, features = ["serde"] }

diff --git a/turbopack/crates/turbopack-node/js/src/transforms/webpack-loaders.ts b/turbopack/crates/turbopack-node/js/src/transforms/webpack-loaders.ts
@@ -468,7 +468,7 @@ const transform = (
         if (!result.result) return reject(new Error("No result from loaders"));
         const [source, map] = result.result;
         resolve({
-          source: Buffer.isBuffer(source) ? source.toString("utf8") : source,
+          source: Buffer.isBuffer(source) ? [...source] : source,
           map:
             typeof map === "string"
               ? map

diff --git a/turbopack/crates/turbopack-node/src/transforms/webpack.rs b/turbopack/crates/turbopack-node/src/transforms/webpack.rs
@@ -2,6 +2,7 @@ use std::mem::take;
 
 use anyhow::{bail, Context, Result};
 use async_trait::async_trait;
+use either::Either;
 use serde::{Deserialize, Serialize};
 use serde_json::{json, Value as JsonValue};
 use turbo_tasks::{
@@ -56,7 +57,9 @@ use crate::{
 #[serde(rename_all = "camelCase")]
 #[turbo_tasks::value(serialization = "custom")]
 struct WebpackLoadersProcessingResult {
-    source: RcStr,
+    #[serde(with = "either::serde_untagged")]
+    #[turbo_tasks(trace_ignore)]
+    source: Either<RcStr, Vec<u8>>,
     map: Option<RcStr>,
     #[turbo_tasks(trace_ignore)]
     assets: Option<Vec<EmittedAsset>>,
@@ -250,7 +253,7 @@ impl WebpackLoadersProcessedAsset {
         } else {
             None
         };
-        let file = File::from(processed.source);
+        let file = either::for_both!(processed.source, source => File::from(source));
         let assets = emitted_assets_to_virtual_sources(processed.assets);
         let content = AssetContent::File(FileContent::Content(file).cell()).cell();
         Ok(ProcessWebpackLoadersResult {