Add support for debug_ids

Author: lukesandberg

Cargo.lock

@@ -414,7 +414,7 @@ ringmap = "0.1.3"
 roaring = "0.10.10"
 rstest = "0.16.0"
 rustc-hash = "2.1.1"
-twox-hash = { version = "2.0.1", features = ["xxhash64"] }
+twox-hash = { version = "2.1.0", features = ["xxhash64", "xxhash3_128"] }
 semver = "1.0.16"
 serde = { version = "1.0.217", features = ["derive"] }
 serde_json = "1.0.138"
@@ -443,6 +443,7 @@ triomphe = { git = "https://github.com/sokra/triomphe", branch = "sokra/unstable
 unsize = "1.1.0"
 url = "2.2.2"
 urlencoding = "2.1.2"
+uuid = "1.18.1"
 vergen = { version = "9.0.6", features = ["cargo"] }
 vergen-gitcl = { version = "1.0.8", features = ["cargo"] }
 webbrowser = "0.8.7"

Cargo.toml

@@ -1048,6 +1048,7 @@ impl Project {
             source_maps: self.next_config().client_source_maps(self.next_mode()),
             no_mangling: self.no_mangling(),
             scope_hoisting: self.next_config().turbo_scope_hoisting(self.next_mode()),
+            debug_ids: self.next_config().turbopack_debug_ids(),
         }))
     }
 

crates/next-api/src/project.rs

@@ -421,6 +421,7 @@ pub struct ClientChunkingContextOptions {
     pub source_maps: Vc<bool>,
     pub no_mangling: Vc<bool>,
     pub scope_hoisting: Vc<bool>,
+    pub debug_ids: Vc<bool>,
 }
 
 #[turbo_tasks::function]
@@ -441,6 +442,7 @@ pub async fn get_client_chunking_context(
         source_maps,
         no_mangling,
         scope_hoisting,
+        debug_ids,
     } = options;
 
     let next_mode = mode.await?;
@@ -473,7 +475,8 @@ pub async fn get_client_chunking_context(
     .asset_base_path(asset_prefix)
     .current_chunk_method(CurrentChunkMethod::DocumentCurrentScript)
     .export_usage(*export_usage.await?)
-    .module_id_strategy(module_id_strategy.to_resolved().await?);
+    .module_id_strategy(module_id_strategy.to_resolved().await?)
+    .debug_ids(*debug_ids.await?);
 
     if next_mode.is_development() {
         builder = builder

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

@@ -561,6 +561,7 @@ pub struct TurbopackConfig {
     pub rules: Option<FxIndexMap<RcStr, RuleConfigCollection>>,
     pub resolve_alias: Option<FxIndexMap<RcStr, JsonValue>>,
     pub resolve_extensions: Option<Vec<RcStr>>,
+    pub debug_ids: Option<bool>,
 }
 
 #[derive(
@@ -1855,6 +1856,16 @@ impl NextConfig {
         Ok(Vc::cell(source_maps.unwrap_or(true)))
     }
 
+    #[turbo_tasks::function]
+    pub fn turbopack_debug_ids(&self) -> Vc<bool> {
+        Vc::cell(
+            self.turbopack
+                .as_ref()
+                .and_then(|turbopack| turbopack.debug_ids)
+                .unwrap_or(false),
+        )
+    }
+
     #[turbo_tasks::function]
     pub fn typescript_tsconfig_path(&self) -> Result<Vc<Option<RcStr>>> {
         Ok(Vc::cell(

crates/next-core/src/next_config.rs

@@ -271,7 +271,7 @@ impl EcmascriptChunkItem for RawEcmascriptChunkItem {
 
             let code = code.build();
             let source_map = if code.has_source_map() {
-                let source_map = code.generate_source_map_ref()?;
+                let source_map = code.generate_source_map_ref(None);
 
                 static SECTIONS_REGEX: Lazy<Regex> =
                     Lazy::new(|| Regex::new(r#"sections"[\s\n]*:"#).unwrap());

crates/next-core/src/raw_ecmascript_module.rs

@@ -159,6 +159,7 @@ const zTurbopackConfig: zod.ZodType<TurbopackOptions> = z.strictObject({
     .optional(),
   resolveExtensions: z.array(z.string()).optional(),
   root: z.string().optional(),
+  debugIds: z.boolean().optional(),
 })
 
 export const configSchema: zod.ZodType<NextConfig> = z.lazy(() =>

packages/next/src/server/config-schema.ts

@@ -172,6 +172,14 @@ export interface TurbopackOptions {
    * directory can be resolved by turbopack.
    */
   root?: string
+
+  /**
+   * Enables generation of debug IDs in JavaScript bundles and source maps.
+   * These debug IDs help with debugging and error tracking by providing stable identifiers.
+   *
+   * @see https://github.com/tc39/ecma426/blob/main/proposals/debug-id.md TC39 Debug ID Proposal
+   */
+  debugIds?: boolean
 }
 
 export interface WebpackConfigContext {

packages/next/src/server/config-shared.ts

@@ -760,6 +760,7 @@ impl AsyncRead for RopeReader {
 }
 
 impl BufRead for RopeReader {
+    /// Never returns an error.
     fn fill_buf(&mut self) -> IoResult<&[u8]> {
         // Returns the full buffer without coping any data. The same bytes will
         // continue to be returned until [consume] is called.

turbopack/crates/turbo-tasks-fs/src/rope.rs

@@ -168,6 +168,11 @@ impl BrowserChunkingContextBuilder {
         self
     }
 
+    pub fn debug_ids(mut self, debug_ids: bool) -> Self {
+        self.chunking_context.debug_ids = debug_ids;
+        self
+    }
+
     pub fn chunking_config<T>(mut self, ty: ResolvedVc<T>, chunking_config: ChunkingConfig) -> Self
     where
         T: Upcast<Box<dyn ChunkType>>,
@@ -229,6 +234,8 @@ pub struct BrowserChunkingContext {
     enable_module_merging: bool,
     /// Enable dynamic chunk content loading.
     enable_dynamic_chunk_content_loading: bool,
+    /// Enable debug IDs for chunks and source maps.
+    debug_ids: bool,
     /// The environment chunks will be evaluated in.
     environment: ResolvedVc<Environment>,
     /// The kind of runtime to include in the output.
@@ -279,6 +286,7 @@ impl BrowserChunkingContext {
                 enable_tracing: false,
                 enable_module_merging: false,
                 enable_dynamic_chunk_content_loading: false,
+                debug_ids: false,
                 environment,
                 runtime_type,
                 minify_type: MinifyType::NoMinify,
@@ -780,4 +788,9 @@ impl ChunkingContext for BrowserChunkingContext {
             Ok(ModuleExportUsage::all())
         }
     }
+
+    #[turbo_tasks::function]
+    async fn debug_ids_enabled(self: Vc<Self>) -> Result<Vc<bool>> {
+        Ok(Vc::cell(self.await?.debug_ids))
+    }
 }