Merge branch 'canary' into kdy1/srcmap

Author: kdy1

Cargo.lock

@@ -128,7 +128,7 @@ impl EcmascriptBrowserChunkContent {
         let mut code = code.build();
 
         if let MinifyType::Minify { mangle } = this.chunking_context.await?.minify_type() {
-            code = minify(code, source_maps, mangle).await?;
+            code = minify(&code, source_maps, mangle)?;
         }
 
         Ok(code.cell())

turbopack/crates/turbopack-browser/src/ecmascript/content.rs

@@ -194,7 +194,7 @@ impl EcmascriptBrowserEvaluateChunk {
         let mut code = code.build();
 
         if let MinifyType::Minify { mangle } = this.chunking_context.await?.minify_type() {
-            code = minify(code, source_maps, mangle).await?;
+            code = minify(&code, source_maps, mangle)?;
         }
 
         Ok(code.cell())

turbopack/crates/turbopack-browser/src/ecmascript/evaluate/chunk.rs

@@ -44,7 +44,6 @@ turbopack-resolve = { workspace = true }
 turbopack-swc-utils = { workspace = true }
 url = { workspace = true }
 urlencoding = { workspace = true }
-rayon = { workspace = true }
 
 swc_core = { workspace = true, features = [
   "ecma_ast",

turbopack/crates/turbopack-ecmascript/Cargo.toml

@@ -31,18 +31,7 @@ use turbopack_core::{
 use crate::parse::generate_js_source_map;
 
 #[instrument(level = Level::INFO, skip_all)]
-pub async fn minify(code: Code, source_maps: bool, mangle: Option<MangleType>) -> Result<Code> {
-    let (tx, rx) = tokio::sync::oneshot::channel();
-
-    rayon::spawn(move || {
-        let result = minify_inner(code, source_maps, mangle);
-        tx.send(result).unwrap();
-    });
-
-    rx.await.unwrap()
-}
-
-fn minify_inner(code: Code, source_maps: bool, mangle: Option<MangleType>) -> Result<Code> {
+pub fn minify(code: &Code, source_maps: bool, mangle: Option<MangleType>) -> Result<Code> {
     let source_maps = source_maps
         .then(|| code.generate_source_map_ref())
         .transpose()?;
@@ -150,8 +139,8 @@ fn minify_inner(code: Code, source_maps: bool, mangle: Option<MangleType>) -> Re
                 src_map_buf,
                 Some(original_map),
                 // We do not inline source contents.
-                // We provide a synthesized value to `cm.new_source_file` above, so it cannot
-                // be the value user expect anyway.
+                // We provide a synthesized value to `cm.new_source_file` above, so it cannot be
+                // the value user expect anyway.
                 false,
             )?),
         );

turbopack/crates/turbopack-ecmascript/src/minify.rs

@@ -78,7 +78,7 @@ impl EcmascriptBuildNodeChunkContent {
         let mut code = code.build();
 
         if let MinifyType::Minify { mangle } = this.chunking_context.await?.minify_type() {
-            code = minify(code, source_maps, mangle).await?;
+            code = minify(&code, source_maps, mangle)?;
         }
 
         Ok(code.cell())