production chunking for node.js

vercel · Jan 17, 2025 · 71a13ba · 71a13ba
1 parent 0445406
commit 71a13ba
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/next-core/src/next_server/context.rs b/crates/next-core/src/next_server/context.rs
@@ -14,7 +14,7 @@ use turbopack::{
     transition::Transition,
 };
 use turbopack_core::{
-    chunk::{module_id_strategies::ModuleIdStrategy, MinifyType},
+    chunk::{module_id_strategies::ModuleIdStrategy, ChunkingConfig, MinifyType},
     compile_time_info::{
         CompileTimeDefineValue, CompileTimeDefines, CompileTimeInfo, DefineableNameSegment,
         FreeVarReferences,
@@ -1010,7 +1010,10 @@ pub async fn get_server_chunking_context_with_client_assets(
 
     if next_mode.is_development() {
         builder = builder.use_file_source_map_uris();
+    } else {
+        builder = builder.ecmascript_chunking_config(ChunkingConfig {})
     }
+
     Ok(builder.build())
 }
 
@@ -1048,6 +1051,8 @@ pub async fn get_server_chunking_context(
 
     if next_mode.is_development() {
         builder = builder.use_file_source_map_uris()
+    } else {
+        builder = builder.ecmascript_chunking_config(ChunkingConfig {})
     }
 
     Ok(builder.build())

diff --git a/turbopack/crates/turbopack-cli/src/build/mod.rs b/turbopack/crates/turbopack-cli/src/build/mod.rs
@@ -240,8 +240,8 @@ async fn build_internal(
 
             Vc::upcast(builder.build())
         }
-        Target::Node => Vc::upcast(
-            NodeJsChunkingContext::builder(
+        Target::Node => {
+            let mut builder = NodeJsChunkingContext::builder(
                 project_path,
                 build_output_root,
                 ResolvedVc::cell(build_output_root_to_root_path),
@@ -255,9 +255,17 @@ async fn build_internal(
                 .await?,
                 runtime_type,
             )
-            .minify_type(minify_type)
-            .build(),
-        ),
+            .minify_type(minify_type);
+
+            match *node_env.await? {
+                NodeEnv::Development => {}
+                NodeEnv::Production => {
+                    builder = builder.ecmascript_chunking_config(ChunkingConfig {})
+                }
+            }
+
+            Vc::upcast(builder.build())
+        }
     };
 
     let compile_time_info = get_client_compile_time_info(browserslist_query, node_env);

diff --git a/turbopack/crates/turbopack-nodejs/Cargo.toml b/turbopack/crates/turbopack-nodejs/Cargo.toml
@@ -22,6 +22,7 @@ workspace = true
 anyhow = { workspace = true }
 indexmap = { workspace = true }
 indoc = { workspace = true }
+rustc-hash = { workspace = true }
 serde = { workspace = true }
 tracing = { workspace = true }
 urlencoding = { workspace = true }

diff --git a/turbopack/crates/turbopack-nodejs/src/chunking_context.rs b/turbopack/crates/turbopack-nodejs/src/chunking_context.rs
@@ -1,6 +1,7 @@
 use std::iter::once;
 
 use anyhow::{bail, Context, Result};
+use rustc_hash::FxHashMap;
 use tracing::Instrument;
 use turbo_rcstr::RcStr;
 use turbo_tasks::{ResolvedVc, TryJoinIterExt, Value, ValueToString, Vc};
@@ -10,8 +11,9 @@ use turbopack_core::{
         availability_info::AvailabilityInfo,
         chunk_group::{make_chunk_group, MakeChunkGroupResult},
         module_id_strategies::{DevModuleIdStrategy, ModuleIdStrategy},
-        Chunk, ChunkGroupResult, ChunkItem, ChunkableModule, ChunkableModules, ChunkingContext,
-        EntryChunkGroupResult, EvaluatableAssets, MinifyType, ModuleId,
+        Chunk, ChunkGroupResult, ChunkItem, ChunkableModule, ChunkableModules, ChunkingConfig,
+        ChunkingConfigs, ChunkingContext, EntryChunkGroupResult, EvaluatableAssets, MinifyType,
+        ModuleId,
     },
     environment::Environment,
     ident::AssetIdent,
@@ -21,7 +23,7 @@ use turbopack_core::{
 };
 use turbopack_ecmascript::{
     async_chunk::module::AsyncLoaderModule,
-    chunk::EcmascriptChunk,
+    chunk::{EcmascriptChunk, EcmascriptChunkType},
     manifest::{chunk_asset::ManifestAsyncModule, loader_item::ManifestLoaderChunkItem},
 };
 use turbopack_ecmascript_runtime::RuntimeType;
@@ -74,6 +76,14 @@ impl NodeJsChunkingContextBuilder {
         self
     }
 
+    pub fn ecmascript_chunking_config(
+        mut self,
+        ecmascript_chunking_config: ChunkingConfig,
+    ) -> Self {
+        self.chunking_context.ecmascript_chunking_config = Some(ecmascript_chunking_config);
+        self
+    }
+
     /// Builds the chunking context.
     pub fn build(self) -> Vc<NodeJsChunkingContext> {
         NodeJsChunkingContext::new(Value::new(self.chunking_context))
@@ -112,6 +122,8 @@ pub struct NodeJsChunkingContext {
     module_id_strategy: ResolvedVc<Box<dyn ModuleIdStrategy>>,
     /// Whether to use file:// uris for source map sources
     should_use_file_source_map_uris: bool,
+    /// The chunking config for ecmascript
+    ecmascript_chunking_config: Option<ChunkingConfig>,
 }
 
 impl NodeJsChunkingContext {
@@ -142,6 +154,7 @@ impl NodeJsChunkingContext {
                 manifest_chunks: false,
                 should_use_file_source_map_uris: false,
                 module_id_strategy: ResolvedVc::upcast(DevModuleIdStrategy::new_resolved()),
+                ecmascript_chunking_config: None,
             },
         }
     }
@@ -270,6 +283,18 @@ impl ChunkingContext for NodeJsChunkingContext {
         Vc::cell(self.should_use_file_source_map_uris)
     }
 
+    #[turbo_tasks::function]
+    async fn chunking_configs(&self) -> Result<Vc<ChunkingConfigs>> {
+        let mut map = FxHashMap::default();
+        if let Some(ecmascript) = &self.ecmascript_chunking_config {
+            map.insert(
+                ResolvedVc::upcast(Vc::<EcmascriptChunkType>::default().to_resolved().await?),
+                ecmascript.clone(),
+            );
+        }
+        Ok(Vc::cell(map))
+    }
+
     #[turbo_tasks::function]
     async fn asset_path(
         &self,