review feedback

Author: mischnic

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

@@ -1061,7 +1061,7 @@ pub async fn get_server_chunking_context_with_client_assets(
         builder = builder.source_map_source_type(SourceMapSourceType::AbsoluteFileUri);
     } else {
         builder = builder
-            .source_map_source_type(SourceMapSourceType::RelativeFileUri)
+            .source_map_source_type(SourceMapSourceType::RelativeUri)
             .chunking_config(
                 Vc::<EcmascriptChunkType>::default().to_resolved().await?,
                 ChunkingConfig {
@@ -1143,7 +1143,7 @@ pub async fn get_server_chunking_context(
         builder = builder.source_map_source_type(SourceMapSourceType::AbsoluteFileUri);
     } else {
         builder = builder
-            .source_map_source_type(SourceMapSourceType::RelativeFileUri)
+            .source_map_source_type(SourceMapSourceType::RelativeUri)
             .chunking_config(
                 Vc::<EcmascriptChunkType>::default().to_resolved().await?,
                 ChunkingConfig {

examples/with-turbopack/next.config.mjs

@@ -137,7 +137,7 @@ pub struct ChunkingConfigs(FxHashMap<ResolvedVc<Box<dyn ChunkType>>, ChunkingCon
 #[derive(Debug, Clone, Copy, Hash, TaskInput, Default)]
 pub enum SourceMapSourceType {
     AbsoluteFileUri,
-    RelativeFileUri,
+    RelativeUri,
     #[default]
     TurbopackUriScheme,
 }
@@ -549,7 +549,6 @@ async fn relative_path_from_chunk_root_to_project_root(
     let output_root_to_chunk_root_path = chunking_context.output_root_to_root_path().await?;
 
     // Note we cannot use `normalize_path` here since it rejects paths that start with `../`
-    // So this path might
     Ok(Vc::cell(
         format!(
             "{}/{}",

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

@@ -229,6 +229,7 @@ fn unencoded_str_to_raw_value(unencoded: &str) -> Box<RawValue> {
 /// Helper function to transform turbopack:/// file references in a sourcemap.
 /// Handles parsing the sourcemap, resolving the filesystem, applying transformations, and
 /// serializing back.
+/// The transform function is given the source string as found in the sourcemap (i.e. a URI).
 async fn transform_relative_files<F>(
     map: Option<&Rope>,
     context_path: &FileSystemPath,
@@ -293,15 +294,16 @@ pub async fn relative_fileify_source_map(
     context_path: FileSystemPath,
     relative_path_to_output_root: RcStr,
 ) -> Result<Option<Rope>> {
+    let relative_path_to_output_root = relative_path_to_output_root
+        .split('/')
+        .map(|s| urlencoding::encode(s))
+        .collect::<Vec<_>>()
+        .join("/");
     transform_relative_files(map, &context_path, |_context_fs, src_rest| {
-        // Uri encode a source root relative path.
         // NOTE: we just include the relative path prefix here instead of using `sourceRoot`
         // since the spec on sourceRoot is broken.
-        Ok(format!("{relative_path_to_output_root}/{src_rest}")
-            .split('/')
-            .map(|s| urlencoding::encode(s))
-            .collect::<Vec<_>>()
-            .join("/"))
+        // src_rest is already uri encoded as it was part of a sourcemap
+        Ok(format!("{relative_path_to_output_root}/{src_rest}"))
     })
     .await
 }

turbopack/crates/turbopack-core/src/source_map/utils.rs

@@ -108,7 +108,7 @@ impl CssChunk {
                     )
                     .await?
                 }
-                SourceMapSourceType::RelativeFileUri => {
+                SourceMapSourceType::RelativeUri => {
                     relative_fileify_source_map(
                         content.source_map.as_ref(),
                         chunking_context.root_path().owned().await?,

turbopack/crates/turbopack-css/src/chunk/mod.rs

@@ -80,7 +80,7 @@ impl EcmascriptChunkItemContent {
                 SourceMapSourceType::AbsoluteFileUri => {
                     RewriteSourcePath::AbsoluteFilePath(chunking_context.root_path().owned().await?)
                 }
-                SourceMapSourceType::RelativeFileUri => RewriteSourcePath::RelativeFilePath(
+                SourceMapSourceType::RelativeUri => RewriteSourcePath::RelativeFilePath(
                     chunking_context.root_path().owned().await?,
                     chunking_context
                         .relative_path_from_chunk_root_to_project_root()

turbopack/crates/turbopack-ecmascript/src/chunk/item.rs

@@ -4,5 +4,5 @@
   "minifyType": "NoMinify",
   "environment": "NodeJs",
   "enableDebugIds": true,
-  "sourceMapSourceType": "RelativeFileUri"
+  "sourceMapSourceType": "RelativeUri"
 }