improve asset path (#5072)

### Description

* include basename in static path
* only use 8 chars for hash

This aligns with next.js, which seem to be a reasonable default.

Production mode can omit the basename and only include the hash.

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

@@ -33,7 +33,11 @@ pub trait ChunkingContext {
 
     fn can_be_in_same_chunk(&self, asset_a: AssetVc, asset_b: AssetVc) -> BoolVc;
 
-    fn asset_path(&self, content_hash: &str, extension: &str) -> FileSystemPathVc;
+    fn asset_path(
+        &self,
+        content_hash: &str,
+        original_asset_ident: AssetIdentVc,
+    ) -> FileSystemPathVc;
 
     fn is_hot_module_replacement_enabled(&self) -> BoolVc {
         BoolVc::cell(false)

crates/turbopack-dev/src/chunking_context.rs

@@ -332,9 +332,25 @@ impl ChunkingContext for DevChunkingContext {
     }
 
     #[turbo_tasks::function]
-    fn asset_path(&self, content_hash: &str, extension: &str) -> FileSystemPathVc {
-        self.asset_root_path
-            .join(&format!("{content_hash}.{extension}"))
+    async fn asset_path(
+        &self,
+        content_hash: &str,
+        original_asset_ident: AssetIdentVc,
+    ) -> Result<FileSystemPathVc> {
+        let source_path = original_asset_ident.path().await?;
+        let basename = source_path.file_name();
+        let asset_path = match source_path.extension() {
+            Some(ext) => format!(
+                "{basename}.{content_hash}.{ext}",
+                basename = &basename[..basename.len() - ext.len() - 1],
+                content_hash = &content_hash[..8]
+            ),
+            None => format!(
+                "{basename}.{content_hash}",
+                content_hash = &content_hash[..8]
+            ),
+        };
+        Ok(self.asset_root_path.join(&asset_path))
     }
 
     #[turbo_tasks::function]

crates/turbopack-static/src/lib.rs

@@ -138,7 +138,6 @@ struct StaticAsset {
 impl Asset for StaticAsset {
     #[turbo_tasks::function]
     async fn ident(&self) -> Result<AssetIdentVc> {
-        let source_path = self.source.ident().path();
         let content = self.source.content();
         let content_hash = if let AssetContent::File(file) = &*content.await? {
             if let FileContent::Content(file) = &*file.await? {
@@ -150,10 +149,9 @@ impl Asset for StaticAsset {
             return Err(anyhow!("StaticAsset::path: unsupported file content"));
         };
         let content_hash_b16 = turbo_tasks_hash::encode_hex(content_hash);
-        let asset_path = match source_path.await?.extension() {
-            Some(ext) => self.context.asset_path(&content_hash_b16, ext),
-            None => self.context.asset_path(&content_hash_b16, "bin"),
-        };
+        let asset_path = self
+            .context
+            .asset_path(&content_hash_b16, self.source.ident());
         Ok(AssetIdentVc::from_path(asset_path))
     }