Enable minification for Turbopack

Cargo.toml

@@ -37,11 +37,11 @@ swc_core = { version = "0.90.17", features = [
 testing = { version = "0.35.20" }
 
 # Turbo crates
-turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240307.1" }
+turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240307.3" }
 # [TODO]: need to refactor embed_directory! macro usages, as well as resolving turbo_tasks::function, macros..
-turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240307.1" }
+turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240307.3" }
 # [TODO]: need to refactor embed_directory! macro usage in next-core
-turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240307.1" }
+turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240307.3" }
 
 # General Deps
 

packages/next-swc/crates/next-api/Cargo.toml

@@ -28,9 +28,9 @@ turbopack-binding = { workspace = true, features = [
   "__turbo_tasks_env",
   "__turbo_tasks_fs",
   "__turbopack",
-  "__turbopack_build",
+  "__turbopack_nodejs",
   "__turbopack_core",
-  "__turbopack_dev",
+  "__turbopack_browser",
   "__turbopack_env",
   "__turbopack_cli_utils",
   "__turbopack_node",

packages/next-swc/crates/next-api/src/app.rs

@@ -41,7 +41,6 @@ use turbopack_binding::{
         tasks_fs::{rope::RopeBuilder, File, FileContent, FileSystemPath},
     },
     turbopack::{
-        build::EntryChunkGroupResult,
         core::{
             asset::{Asset, AssetContent},
             chunk::{availability_info::AvailabilityInfo, ChunkingContextExt, EvaluatableAssets},
@@ -50,6 +49,7 @@ use turbopack_binding::{
             output::{OutputAsset, OutputAssets},
             virtual_output::VirtualOutputAsset,
         },
+        nodejs::EntryChunkGroupResult,
         turbopack::{
             module_options::ModuleOptionsContext, resolve_options_context::ResolveOptionsContext,
             transition::ContextTransition, ModuleAssetContext,

packages/next-swc/crates/next-api/src/dynamic_imports.rs

@@ -12,7 +12,6 @@ use turbopack_binding::{
         visit::{Visit, VisitWith},
     },
     turbopack::{
-        build::BuildChunkingContext,
         core::{
             chunk::{
                 availability_info::AvailabilityInfo, ChunkableModule, ChunkingContextExt,
@@ -31,6 +30,7 @@ use turbopack_binding::{
             resolve::esm_resolve,
             EcmascriptModuleAsset,
         },
+        nodejs::NodeJsChunkingContext,
     },
 };
 
@@ -79,7 +79,7 @@ where
 }
 
 pub(crate) async fn collect_chunk_group(
-    chunking_context: Vc<BuildChunkingContext>,
+    chunking_context: Vc<NodeJsChunkingContext>,
     dynamic_import_entries: IndexMap<Vc<Box<dyn Module>>, DynamicImportedModules>,
     availability_info: Value<AvailabilityInfo>,
 ) -> Result<Vc<DynamicImportedChunks>> {

packages/next-swc/crates/next-api/src/instrumentation.rs

@@ -10,7 +10,6 @@ use turbo_tasks::{Completion, Value, Vc};
 use turbopack_binding::{
     turbo::tasks_fs::{File, FileContent},
     turbopack::{
-        build::EntryChunkGroupResult,
         core::{
             asset::AssetContent,
             chunk::{availability_info::AvailabilityInfo, ChunkingContextExt},
@@ -22,6 +21,7 @@ use turbopack_binding::{
             virtual_output::VirtualOutputAsset,
         },
         ecmascript::chunk::EcmascriptChunkPlaceable,
+        nodejs::EntryChunkGroupResult,
     },
 };
 

packages/next-swc/crates/next-api/src/lib.rs

@@ -19,6 +19,6 @@ shadow_rs::shadow!(build);
 
 pub fn register() {
     next_core::register();
-    turbopack_binding::turbopack::build::register();
+    turbopack_binding::turbopack::nodejs::register();
     include!(concat!(env!("OUT_DIR"), "/register.rs"));
 }

packages/next-swc/crates/next-api/src/pages.rs

@@ -36,7 +36,6 @@ use turbopack_binding::{
         File, FileContent, FileSystem, FileSystemPath, FileSystemPathOption, VirtualFileSystem,
     },
     turbopack::{
-        build::{BuildChunkingContext, EntryChunkGroupResult},
         core::{
             asset::AssetContent,
             chunk::{availability_info::AvailabilityInfo, ChunkingContextExt, EvaluatableAssets},
@@ -57,6 +56,7 @@ use turbopack_binding::{
             resolve::esm_resolve,
             EcmascriptModuleAsset,
         },
+        nodejs::{EntryChunkGroupResult, NodeJsChunkingContext},
         turbopack::{
             module_options::ModuleOptionsContext,
             resolve_options_context::ResolveOptionsContext,
@@ -658,7 +658,7 @@ impl PageEndpoint {
         project_root: Vc<FileSystemPath>,
         module_context: Vc<ModuleAssetContext>,
         edge_module_context: Vc<ModuleAssetContext>,
-        chunking_context: Vc<BuildChunkingContext>,
+        chunking_context: Vc<NodeJsChunkingContext>,
         edge_chunking_context: Vc<Box<dyn EcmascriptChunkingContext>>,
         runtime_entries: Vc<EvaluatableAssets>,
         edge_runtime_entries: Vc<EvaluatableAssets>,

packages/next-swc/crates/next-api/src/project.rs

@@ -33,7 +33,7 @@ use turbopack_binding::{
         tasks_fs::{DiskFileSystem, FileSystem, FileSystemPath, VirtualFileSystem},
     },
     turbopack::{
-        build::BuildChunkingContext,
+        browser::BrowserChunkingContext,
         core::{
             changed::content_changed,
             compile_time_info::CompileTimeInfo,
@@ -48,9 +48,9 @@ use turbopack_binding::{
             version::{Update, Version, VersionState, VersionedContent},
             PROJECT_FILESYSTEM_NAME,
         },
-        dev::DevChunkingContext,
         ecmascript::chunk::EcmascriptChunkingContext,
         node::execution_context::ExecutionContext,
+        nodejs::NodeJsChunkingContext,
         turbopack::{evaluate_context::node_build_environment, ModuleAssetContext},
     },
 };
@@ -497,7 +497,7 @@ impl Project {
         let node_root = self.node_root();
 
         let node_execution_chunking_context = Vc::upcast(
-            DevChunkingContext::builder(
+            BrowserChunkingContext::builder(
                 self.project_path(),
                 node_root,
                 node_root,
@@ -555,25 +555,31 @@ impl Project {
     }
 
     #[turbo_tasks::function]
-    pub(super) fn server_chunking_context(self: Vc<Self>) -> Vc<BuildChunkingContext> {
-        get_server_chunking_context(
+    pub(super) async fn server_chunking_context(
+        self: Vc<Self>,
+    ) -> Result<Vc<NodeJsChunkingContext>> {
+        Ok(get_server_chunking_context(
+            self.next_mode(),
             self.project_path(),
             self.node_root(),
             self.client_relative_path(),
             self.next_config().computed_asset_prefix(),
             self.server_compile_time_info().environment(),
-        )
+        ))
     }
 
     #[turbo_tasks::function]
-    pub(super) fn edge_chunking_context(self: Vc<Self>) -> Vc<Box<dyn EcmascriptChunkingContext>> {
-        get_edge_chunking_context(
+    pub(super) fn edge_chunking_context(
+        self: Vc<Self>,
+    ) -> Result<Vc<Box<dyn EcmascriptChunkingContext>>> {
+        Ok(get_edge_chunking_context(
+            self.next_mode(),
             self.project_path(),
             self.node_root(),
             self.client_relative_path(),
             self.next_config().computed_asset_prefix(),
             self.edge_compile_time_info().environment(),
-        )
+        ))
     }
 
     /// Emit a telemetry event corresponding to [webpack configuration telemetry](https://github.com/vercel/next.js/blob/9da305fe320b89ee2f8c3cfb7ecbf48856368913/packages/next/src/build/webpack-config.ts#L2516)

packages/next-swc/crates/next-build/Cargo.toml

@@ -27,9 +27,9 @@ turbopack-binding = { workspace = true, features = [
   "__turbo_tasks_fs",
   "__turbo_tasks_memory",
   "__turbopack",
-  "__turbopack_build",
+  "__turbopack_nodejs",
   "__turbopack_core",
-  "__turbopack_dev",
+  "__turbopack_browser",
   "__turbopack_ecmascript",
   "__turbopack_ecmascript_runtime",
   "__turbopack_env",

packages/next-swc/crates/next-build/src/lib.rs

@@ -11,8 +11,8 @@ pub fn register() {
     turbopack_binding::turbopack::turbopack::register();
     turbopack_binding::turbopack::core::register();
     turbopack_binding::turbopack::node::register();
-    turbopack_binding::turbopack::dev::register();
-    turbopack_binding::turbopack::build::register();
+    turbopack_binding::turbopack::browser::register();
+    turbopack_binding::turbopack::nodejs::register();
     next_core::register();
     include!(concat!(env!("OUT_DIR"), "/register.rs"));
 }

packages/next-swc/crates/next-core/Cargo.toml

@@ -44,9 +44,9 @@ turbopack-binding = { workspace = true, features = [
   "__turbo_tasks_fs",
   "__turbo_tasks_hash",
   "__turbopack",
-  "__turbopack_build",
+  "__turbopack_nodejs",
   "__turbopack_core",
-  "__turbopack_dev",
+  "__turbopack_browser",
   "__turbopack_ecmascript",
   "__turbopack_ecmascript_plugin",
   "__turbopack_ecmascript_runtime",
@@ -74,5 +74,5 @@ image-avif = ["turbopack-binding/__turbopack_image_avif"]
 # enable "HMR" for embedded assets
 dynamic_embed_contents = [
   "turbopack-binding/__turbo_tasks_fs_dynamic_embed_contents",
-  "turbopack-binding/__turbopack_dev_dynamic_embed_contents",
+  "turbopack-binding/__turbopack_browser_dynamic_embed_contents",
 ]

packages/next-swc/crates/next-core/src/lib.rs

@@ -57,7 +57,7 @@ pub fn register() {
     turbo::tasks_bytes::register();
     turbo::tasks_fs::register();
     turbo::tasks_fetch::register();
-    turbopack::dev::register();
+    turbopack::browser::register();
     turbopack::node::register();
     turbopack::turbopack::register();
     turbopack::image::register();

packages/next-swc/crates/next-core/src/mode.rs

@@ -40,4 +40,11 @@ impl NextMode {
             NextMode::Build => true,
         }
     }
+
+    pub fn should_minify(&self) -> bool {
+        match self {
+            NextMode::Development => false,
+            NextMode::Build => true,
+        }
+    }
 }

packages/next-swc/crates/next-core/src/next_client/context.rs

@@ -7,7 +7,9 @@ use turbo_tasks_fs::FileSystem;
 use turbopack_binding::{
     turbo::{tasks_env::EnvMap, tasks_fs::FileSystemPath},
     turbopack::{
+        browser::{react_refresh::assert_can_resolve_react_refresh, BrowserChunkingContext},
         core::{
+            chunk::MinifyType,
             compile_time_info::{
                 CompileTimeDefineValue, CompileTimeDefines, CompileTimeInfo, FreeVarReference,
                 FreeVarReferences,
@@ -16,7 +18,6 @@ use turbopack_binding::{
             free_var_references,
             resolve::{parse::Request, pattern::Pattern},
         },
-        dev::{react_refresh::assert_can_resolve_react_refresh, DevChunkingContext},
         ecmascript::{chunk::EcmascriptChunkingContext, TreeShakingMode},
         node::{
             execution_context::ExecutionContext,
@@ -336,7 +337,8 @@ pub async fn get_client_chunking_context(
     environment: Vc<Environment>,
     mode: Vc<NextMode>,
 ) -> Result<Vc<Box<dyn EcmascriptChunkingContext>>> {
-    let mut builder = DevChunkingContext::builder(
+    let next_mode = mode.await?;
+    let mut builder = BrowserChunkingContext::builder(
         project_path,
         client_root,
         client_root,
@@ -345,9 +347,14 @@ pub async fn get_client_chunking_context(
         environment,
     )
     .chunk_base_path(asset_prefix)
+    .minify_type(if next_mode.should_minify() {
+        MinifyType::Minify
+    } else {
+        MinifyType::NoMinify
+    })
     .asset_base_path(asset_prefix);
 
-    if mode.await?.is_development() {
+    if next_mode.is_development() {
         builder = builder.hot_module_replacement();
     }
 

packages/next-swc/crates/next-core/src/next_edge/context.rs

@@ -4,15 +4,16 @@ use turbo_tasks::{Value, Vc};
 use turbopack_binding::{
     turbo::{tasks_env::EnvMap, tasks_fs::FileSystemPath},
     turbopack::{
+        browser::BrowserChunkingContext,
         core::{
+            chunk::MinifyType,
             compile_time_info::{
                 CompileTimeDefineValue, CompileTimeDefines, CompileTimeInfo, FreeVarReference,
                 FreeVarReferences,
             },
             environment::{EdgeWorkerEnvironment, Environment, ExecutionEnvironment},
             free_var_references,
         },
-        dev::DevChunkingContext,
         ecmascript::chunk::EcmascriptChunkingContext,
         node::{debug::should_debug, execution_context::ExecutionContext},
         turbopack::resolve_options_context::ResolveOptionsContext,
@@ -148,16 +149,17 @@ pub async fn get_edge_resolve_options_context(
 }
 
 #[turbo_tasks::function]
-pub fn get_edge_chunking_context(
+pub async fn get_edge_chunking_context(
+    mode: Vc<NextMode>,
     project_path: Vc<FileSystemPath>,
     node_root: Vc<FileSystemPath>,
     client_root: Vc<FileSystemPath>,
     asset_prefix: Vc<Option<String>>,
     environment: Vc<Environment>,
-) -> Vc<Box<dyn EcmascriptChunkingContext>> {
+) -> Result<Vc<Box<dyn EcmascriptChunkingContext>>> {
     let output_root = node_root.join("server/edge".to_string());
-    Vc::upcast(
-        DevChunkingContext::builder(
+    Ok(Vc::upcast(
+        BrowserChunkingContext::builder(
             project_path,
             output_root,
             client_root,
@@ -167,6 +169,11 @@ pub fn get_edge_chunking_context(
         )
         .asset_base_path(asset_prefix)
         .reference_chunk_source_maps(should_debug("edge"))
+        .minify_type(if mode.await?.should_minify() {
+            MinifyType::Minify
+        } else {
+            MinifyType::NoMinify
+        })
         .build(),
-    )
+    ))
 }

packages/next-swc/crates/next-core/src/next_server/context.rs

@@ -8,8 +8,8 @@ use turbopack_binding::{
         tasks_fs::FileSystemPath,
     },
     turbopack::{
-        build::{BuildChunkingContext, MinifyType},
         core::{
+            chunk::MinifyType,
             compile_time_info::{
                 CompileTimeDefineValue, CompileTimeDefines, CompileTimeInfo, FreeVarReferences,
             },
@@ -22,6 +22,7 @@ use turbopack_binding::{
             execution_context::ExecutionContext,
             transforms::postcss::{PostCssConfigLocation, PostCssTransformOptions},
         },
+        nodejs::NodeJsChunkingContext,
         turbopack::{
             condition::ContextCondition,
             module_options::{
@@ -725,19 +726,20 @@ pub fn get_server_runtime_entries(
 }
 
 #[turbo_tasks::function]
-pub fn get_server_chunking_context(
+pub async fn get_server_chunking_context(
+    mode: Vc<NextMode>,
     project_path: Vc<FileSystemPath>,
     node_root: Vc<FileSystemPath>,
     // TODO(alexkirsz) Is this even necessary? Are assets not always on the client chunking context
     // anyway?
     client_root: Vc<FileSystemPath>,
     asset_prefix: Vc<Option<String>>,
     environment: Vc<Environment>,
-) -> Vc<BuildChunkingContext> {
+) -> Result<Vc<NodeJsChunkingContext>> {
     // TODO(alexkirsz) This should return a trait that can be implemented by the
     // different server chunking contexts. OR the build chunking context should
     // support both production and development modes.
-    BuildChunkingContext::builder(
+    Ok(NodeJsChunkingContext::builder(
         project_path,
         node_root,
         client_root,
@@ -746,6 +748,10 @@ pub fn get_server_chunking_context(
         environment,
     )
     .asset_prefix(asset_prefix)
-    .minify_type(MinifyType::NoMinify)
-    .build()
+    .minify_type(if mode.await?.should_minify() {
+        MinifyType::Minify
+    } else {
+        MinifyType::NoMinify
+    })
+    .build())
 }