fix(turbopack): fix browser chunk_path

Author: xusd320

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

@@ -431,7 +431,8 @@ impl ChunkingContext for BrowserChunkingContext {
 
         let chunk_root = self.chunk_root_path;
 
-        let import_name = ident_to_output_filename(ident, *self.root_path, extension.clone())
+        let output_name = ident
+            .output_name(*self.root_path, extension.clone())
             .owned()
             .await?;
 
@@ -440,7 +441,7 @@ impl ChunkingContext for BrowserChunkingContext {
                 let ident = ident.await?;
                 let query = QString::from(ident.query.await?.as_str());
 
-                let name = query.get("name").unwrap_or(import_name.as_str());
+                let name = query.get("name").unwrap_or(output_name.as_str());
 
                 let evaluate = stream::iter(&ident.modifiers)
                     .any(async |m| m.await.is_ok_and(|m| m.contains("evaluate")))
@@ -481,7 +482,7 @@ impl ChunkingContext for BrowserChunkingContext {
                     None => name.to_string(),
                 }
             }
-            None => import_name.to_string(),
+            None => output_name.to_string(),
         };
 
         if !filename.ends_with(extension.as_str()) {
@@ -767,26 +768,6 @@ impl ChunkingContext for BrowserChunkingContext {
     }
 }
 
-#[turbo_tasks::function]
-pub async fn ident_to_output_filename(
-    ident: Vc<AssetIdent>,
-    context_path: Vc<FileSystemPath>,
-    expected_extension: RcStr,
-) -> Result<Vc<RcStr>> {
-    let ident = &*ident.await?;
-    let path = &*ident.path.await?;
-    let mut name = if let Some(inner) = context_path.await?.get_path_to(path) {
-        clean_separators(inner)
-    } else {
-        clean_separators(&ident.path.to_string().await?)
-    };
-    let removed_extension = name.ends_with(&*expected_extension);
-    if removed_extension {
-        name.truncate(name.len() - expected_extension.len());
-    }
-    Ok(Vc::cell(name.into()))
-}
-
 pub fn clean_separators(s: &str) -> String {
     static SEPARATOR_REGEX: LazyLock<Regex> = LazyLock::new(|| Regex::new(r".*[/#?]").unwrap());
     SEPARATOR_REGEX.replace_all(s, "").to_string()

turbopack/crates/turbopack-core/src/ident.rs

@@ -358,10 +358,10 @@ impl AssetIdent {
         // We need to make sure that `.json` and `.json.js` doesn't end up with the same
         // name. So when we add an extra extension when want to mark that with a "._"
         // suffix.
-        if !removed_extension {
-            name += "._";
-        }
-        name += &expected_extension;
+        // if !removed_extension {
+        //     name += "._";
+        // }
+        // name += &expected_extension;
         Ok(Vc::cell(name.into()))
     }
 }
@@ -372,5 +372,5 @@ fn clean_separators(s: &str) -> String {
 }
 
 fn clean_additional_extensions(s: &str) -> String {
-    s.replace('.', "_")
+    s.replace('.', "_").replace("[root-of-the-server]", "")
 }