Turbopack: Use FromScriptSrc chunk suffix to avoid depending on deployment id

Author: sokra

crates/next-api/src/project.rs

@@ -1144,7 +1144,6 @@ impl Project {
             client_root: self.client_relative_path().owned().await?,
             client_root_to_root_path: rcstr!("/ROOT"),
             asset_prefix: self.next_config().computed_asset_prefix(),
-            chunk_suffix: self.next_config().chunk_suffix(),
             environment: self.client_compile_time_info().environment(),
             module_id_strategy: self.module_ids(),
             export_usage: self.export_usage(),

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

@@ -414,7 +414,6 @@ pub struct ClientChunkingContextOptions {
     pub client_root: FileSystemPath,
     pub client_root_to_root_path: RcStr,
     pub asset_prefix: Vc<RcStr>,
-    pub chunk_suffix: Vc<ChunkSuffix>,
     pub environment: Vc<Environment>,
     pub module_id_strategy: Vc<Box<dyn ModuleIdStrategy>>,
     pub export_usage: Vc<OptionExportUsageInfo>,
@@ -437,7 +436,6 @@ pub async fn get_client_chunking_context(
         client_root,
         client_root_to_root_path,
         asset_prefix,
-        chunk_suffix,
         environment,
         module_id_strategy,
         export_usage,
@@ -452,7 +450,6 @@ pub async fn get_client_chunking_context(
 
     let next_mode = mode.await?;
     let asset_prefix = asset_prefix.owned().await?;
-    let chunk_suffix = chunk_suffix.to_resolved().await?;
     let mut builder = BrowserChunkingContext::builder(
         root_path,
         client_root.clone(),
@@ -464,7 +461,7 @@ pub async fn get_client_chunking_context(
         next_mode.runtime_type(),
     )
     .chunk_base_path(Some(asset_prefix.clone()))
-    .chunk_suffix(chunk_suffix)
+    .chunk_suffix(ChunkSuffix::FromScriptSrc.resolved_cell())
     .minify_type(if *minify.await? {
         MinifyType::Minify {
             mangle: (!*no_mangling.await?).then_some(MangleType::OptimalSize),

crates/next-core/src/next_config.rs

@@ -16,7 +16,6 @@ use turbopack::module_options::{
     ConditionItem, ConditionPath, LoaderRuleItem, WebpackRules,
     module_options_context::MdxTransformOptions,
 };
-use turbopack_browser::ChunkSuffix;
 use turbopack_core::{
     chunk::SourceMapsType,
     issue::{Issue, IssueExt, IssueStage, OptionStyledString, StyledString},
@@ -1674,19 +1673,6 @@ impl NextConfig {
         }
     }
 
-    /// Returns the suffix to use for chunk loading.
-    #[turbo_tasks::function]
-    pub async fn chunk_suffix(self: Vc<Self>) -> Result<Vc<ChunkSuffix>> {
-        let this = self.await?;
-
-        match &this.deployment_id {
-            Some(deployment_id) => {
-                Ok(ChunkSuffix::Constant(format!("?dpl={deployment_id}").into()).cell())
-            }
-            None => Ok(ChunkSuffix::None.cell()),
-        }
-    }
-
     #[turbo_tasks::function]
     pub fn enable_taint(&self) -> Vc<bool> {
         Vc::cell(self.experimental.taint.unwrap_or(false))