[turbopack] Add inline_chunk_group_bootstrap to BrowserChunkingContext and chunk_group_bootstrap_params to ChunkGroupResult

Author: sampoder

crates/next-core/src/next_app/app_client_references_chunks.rs

@@ -168,6 +168,7 @@ pub async fn get_app_client_references_chunks(
                 referenced_assets: ResolvedVc::cell(vec![]),
                 references: ResolvedVc::cell(vec![]),
                 availability_info: client_availability_info,
+                chunk_group_bootstrap_params: None,
             }
             .resolved_cell();
             let mut current_ssr_chunk_group = ChunkGroupResult::empty_resolved();

turbopack/crates/turbopack-browser/src/chunking_context.rs

@@ -154,6 +154,11 @@ impl BrowserChunkingContextBuilder {
         self
     }
 
+    pub fn inline_chunk_group_bootstrap(mut self, inline_chunk_group_bootstrap: bool) -> Self {
+        self.chunking_context.inline_chunk_group_bootstrap = inline_chunk_group_bootstrap;
+        self
+    }
+
     pub fn should_use_absolute_url_references(
         mut self,
         should_use_absolute_url_references: bool,
@@ -301,6 +306,9 @@ pub struct BrowserChunkingContext {
     enable_dynamic_chunk_content_loading: bool,
     /// Enable debug IDs for chunks and source maps.
     debug_ids: bool,
+    /// Inline each entrypoint's chunk group bootstrap into the HTML (as the
+    /// `ChunkGroupResult.chunk_group_bootstrap_params`).
+    inline_chunk_group_bootstrap: bool,
     /// The environment chunks will be evaluated in.
     environment: ResolvedVc<Environment>,
     /// The kind of runtime to include in the output.
@@ -373,6 +381,7 @@ impl BrowserChunkingContext {
                 enable_module_merging: false,
                 enable_dynamic_chunk_content_loading: false,
                 debug_ids: false,
+                inline_chunk_group_bootstrap: false,
                 environment,
                 runtime_type,
                 minify_type: MinifyType::NoMinify,
@@ -786,6 +795,7 @@ impl ChunkingContext for BrowserChunkingContext {
                 referenced_assets: OutputAssets::empty_resolved(),
                 references: ResolvedVc::cell(references),
                 availability_info,
+                chunk_group_bootstrap_params: None,
             }
             .cell())
         }
@@ -894,11 +904,29 @@ impl ChunkingContext for BrowserChunkingContext {
                 );
             }
 
-            assets.push(ResolvedVc::upcast(
-                self.generate_evaluate_chunk(ident, other_assets, entries)
-                    .to_resolved()
-                    .await?,
-            ));
+            // The evaluate chunk registers this entry's chunks/modules onto the
+            // `globalThis[TURBOPACK]` queue. When `inline_chunk_group_bootstrap` is enabled we
+            // return that chunk group's bootstrap params for Next to inline into the HTML and
+            // skip emitting the per-route evaluate chunk file.
+            //
+            // Only `ChunkGroup::Entry` groups (the page/app client entries Next renders into
+            // HTML) can be inlined. Other groups — notably `Isolated` web workers, which
+            // bootstrap via `importScripts` with no HTML to inline into — must keep their
+            // evaluate chunk so the entry still registers.
+            let evaluate_chunk = self.generate_evaluate_chunk(ident, other_assets, entries);
+            let chunk_group_bootstrap_params = if this.inline_chunk_group_bootstrap
+                && matches!(chunk_group, ChunkGroup::Entry(_))
+            {
+                Some(
+                    evaluate_chunk
+                        .chunk_group_bootstrap_params()
+                        .owned()
+                        .await?,
+                )
+            } else {
+                assets.push(ResolvedVc::upcast(evaluate_chunk.to_resolved().await?));
+                None
+            };
 
             // The shared runtime chunk must be the LAST asset of the group. It drains
             // the registration queue set up by the chunks above, so it has to load
@@ -918,6 +946,7 @@ impl ChunkingContext for BrowserChunkingContext {
                 referenced_assets: OutputAssets::empty_resolved(),
                 references: ResolvedVc::cell(references),
                 availability_info,
+                chunk_group_bootstrap_params,
             }
             .cell())
         }

turbopack/crates/turbopack-core/src/chunk/chunking_context.rs

@@ -129,6 +129,7 @@ pub struct ChunkGroupResult {
     pub referenced_assets: ResolvedVc<OutputAssets>,
     pub references: ResolvedVc<OutputAssetsReferences>,
     pub availability_info: AvailabilityInfo,
+    pub chunk_group_bootstrap_params: Option<RcStr>,
 }
 
 impl ChunkGroupResult {
@@ -138,6 +139,7 @@ impl ChunkGroupResult {
             referenced_assets: ResolvedVc::cell(vec![]),
             references: ResolvedVc::cell(vec![]),
             availability_info: AvailabilityInfo::root(),
+            chunk_group_bootstrap_params: None,
         }
         .cell()
     }
@@ -148,6 +150,7 @@ impl ChunkGroupResult {
             referenced_assets: ResolvedVc::cell(vec![]),
             references: ResolvedVc::cell(vec![]),
             availability_info: AvailabilityInfo::root(),
+            chunk_group_bootstrap_params: None,
         }
         .resolved_cell()
     }
@@ -181,6 +184,7 @@ impl ChunkGroupResult {
                 .to_resolved()
                 .await?,
             availability_info: next.availability_info,
+            chunk_group_bootstrap_params: next.chunk_group_bootstrap_params.clone(),
         }
         .cell())
     }

turbopack/crates/turbopack-nodejs/src/chunking_context.rs

@@ -545,6 +545,7 @@ impl ChunkingContext for NodeJsChunkingContext {
                 referenced_assets: OutputAssets::empty_resolved(),
                 references: ResolvedVc::cell(references),
                 availability_info,
+                chunk_group_bootstrap_params: None,
             }
             .cell())
         }