Merge 1c5f409 into 26a50ca

crates/turbopack-build/src/chunking_context.rs

@@ -1,4 +1,4 @@
-use anyhow::{bail, Result};
+use anyhow::{bail, Context, Result};
 use indexmap::IndexSet;
 use serde::{Deserialize, Serialize};
 use turbo_tasks::{
@@ -51,6 +51,11 @@ pub struct BuildChunkingContextBuilder {
 }
 
 impl BuildChunkingContextBuilder {
+    pub fn asset_prefix(mut self, asset_prefix: Vc<Option<String>>) -> Self {
+        self.chunking_context.asset_prefix = asset_prefix;
+        self
+    }
+
     pub fn minify_type(mut self, minify_type: MinifyType) -> Self {
         self.chunking_context.minify_type = minify_type;
         self
@@ -81,10 +86,14 @@ pub struct BuildChunkingContext {
     context_path: Vc<FileSystemPath>,
     /// This path is used to compute the url to request chunks or assets from
     output_root: Vc<FileSystemPath>,
+    /// This path is used to compute the url to request chunks or assets from
+    client_root: Vc<FileSystemPath>,
     /// Chunks are placed at this path
     chunk_root_path: Vc<FileSystemPath>,
     /// Static assets are placed at this path
     asset_root_path: Vc<FileSystemPath>,
+    /// Static assets requested from this url base
+    asset_prefix: Vc<Option<String>>,
     /// Layer name within this context
     layer: Option<String>,
     /// The environment chunks will be evaluated in.
@@ -100,6 +109,7 @@ impl BuildChunkingContext {
     pub fn builder(
         context_path: Vc<FileSystemPath>,
         output_root: Vc<FileSystemPath>,
+        client_root: Vc<FileSystemPath>,
         chunk_root_path: Vc<FileSystemPath>,
         asset_root_path: Vc<FileSystemPath>,
         environment: Vc<Environment>,
@@ -108,8 +118,10 @@ impl BuildChunkingContext {
             chunking_context: BuildChunkingContext {
                 context_path,
                 output_root,
+                client_root,
                 chunk_root_path,
                 asset_root_path,
+                asset_prefix: Default::default(),
                 layer: None,
                 environment,
                 runtime_type: Default::default(),
@@ -243,6 +255,25 @@ impl ChunkingContext for BuildChunkingContext {
         self.environment
     }
 
+    #[turbo_tasks::function]
+    async fn asset_url(self: Vc<Self>, ident: Vc<AssetIdent>) -> Result<Vc<String>> {
+        let this = self.await?;
+        let asset_path = ident.path().await?.to_string();
+        let asset_path = asset_path
+            .strip_prefix(&format!("{}/", this.client_root.await?.path))
+            .context("expected client root to contain asset path")?;
+
+        Ok(Vc::cell(format!(
+            "{}{}",
+            this.asset_prefix
+                .await?
+                .as_ref()
+                .map(|s| s.to_owned())
+                .unwrap_or_else(|| "/".to_owned()),
+            asset_path
+        )))
+    }
+
     #[turbo_tasks::function]
     async fn chunk_path(
         &self,

crates/turbopack-cli/src/build/mod.rs

@@ -184,6 +184,7 @@ async fn build_internal(
             build_output_root,
             build_output_root,
             build_output_root,
+            build_output_root,
             env,
         )
         .minify_type(minify_type)

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

@@ -1,3 +1,4 @@
+use anyhow::Result;
 use turbo_tasks::Vc;
 use turbo_tasks_fs::FileSystemPath;
 
@@ -35,6 +36,10 @@ pub trait ChunkingContext {
         asset_b: Vc<Box<dyn Module>>,
     ) -> Vc<bool>;
 
+    /// Returns a URL (relative or absolute, depending on the asset prefix) to
+    /// the static asset based on its `ident`.
+    fn asset_url(self: Vc<Self>, ident: Vc<AssetIdent>) -> Result<Vc<String>>;
+
     fn asset_path(
         self: Vc<Self>,
         content_hash: String,

crates/turbopack-dev/src/chunking_context.rs

@@ -1,4 +1,4 @@
-use anyhow::{bail, Result};
+use anyhow::{bail, Context, Result};
 use indexmap::IndexSet;
 use turbo_tasks::{
     graph::{AdjacencyMap, GraphTraversal},
@@ -36,6 +36,11 @@ impl DevChunkingContextBuilder {
         self
     }
 
+    pub fn asset_prefix(mut self, asset_prefix: Vc<Option<String>>) -> Self {
+        self.chunking_context.asset_prefix = asset_prefix;
+        self
+    }
+
     pub fn chunk_base_path(mut self, chunk_base_path: Vc<Option<String>>) -> Self {
         self.chunking_context.chunk_base_path = chunk_base_path;
         self
@@ -90,6 +95,9 @@ pub struct DevChunkingContext {
     /// Base path that will be prepended to all chunk URLs when loading them.
     /// This path will not appear in chunk paths or chunk data.
     chunk_base_path: Vc<Option<String>>,
+    /// URL prefix that will be prepended to all static asset URLs when loading
+    /// them.
+    asset_prefix: Vc<Option<String>>,
     /// Layer name within this context
     layer: Option<String>,
     /// Enable HMR for this chunking
@@ -116,6 +124,7 @@ impl DevChunkingContext {
                 reference_chunk_source_maps: true,
                 reference_css_chunk_source_maps: true,
                 asset_root_path,
+                asset_prefix: Default::default(),
                 chunk_base_path: Default::default(),
                 layer: None,
                 enable_hot_module_replacement: false,
@@ -234,6 +243,21 @@ impl ChunkingContext for DevChunkingContext {
         Ok(root_path.join(name.clone_value()))
     }
 
+    #[turbo_tasks::function]
+    async fn asset_url(self: Vc<Self>, ident: Vc<AssetIdent>) -> Result<Vc<String>> {
+        let this = self.await?;
+        let asset_path = ident.path().await?.to_string();
+        let asset_path = asset_path
+            .strip_prefix(&format!("{}/", this.output_root.await?.path))
+            .context("expected output_root to contain asset path")?;
+
+        Ok(Vc::cell(format!(
+            "{}{}",
+            this.asset_prefix.await?.as_ref().unwrap_or(&"/".to_owned()),
+            asset_path
+        )))
+    }
+
     #[turbo_tasks::function]
     async fn reference_chunk_source_maps(
         &self,

crates/turbopack-ecmascript-runtime/js/src/dev/runtime/dom/runtime-backend-dom.ts

@@ -28,9 +28,7 @@ function commonJsRequireContext(
 }
 
 function fetchWebAssembly(wasmChunkPath: ChunkPath) {
-  const chunkUrl = `/${getChunkRelativeUrl(wasmChunkPath)}`;
-
-  return fetch(chunkUrl);
+  return fetch(getChunkRelativeUrl(wasmChunkPath));
 }
 
 async function loadWebAssembly(
@@ -124,7 +122,7 @@ async function loadWebAssemblyModule(
           .map((p) => encodeURIComponent(p))
           .join("/");
 
-        const chunkUrl = `/${getChunkRelativeUrl(encodedChunkPath)}`;
+        const chunkUrl = getChunkRelativeUrl(encodedChunkPath);
 
         const previousLinks = document.querySelectorAll(
           `link[rel=stylesheet][href^="${chunkUrl}"]`
@@ -224,7 +222,7 @@ async function loadWebAssemblyModule(
       return resolver.promise;
     }
 
-    const chunkUrl = `/${getChunkRelativeUrl(chunkPath)}`;
+    const chunkUrl = getChunkRelativeUrl(chunkPath);
 
     if (chunkPath.endsWith(".css")) {
       const link = document.createElement("link");

crates/turbopack-static/src/lib.rs

@@ -211,10 +211,12 @@ impl EcmascriptChunkItem for ModuleChunkItem {
         Ok(EcmascriptChunkItemContent {
             inner_code: format!(
                 "__turbopack_export_value__({path});",
-                path = StringifyJs(&format_args!(
-                    "/{}",
-                    &*self.static_asset.ident().path().await?
-                ))
+                path = StringifyJs(
+                    &self
+                        .chunking_context
+                        .asset_url(self.static_asset.ident())
+                        .await?
+                )
             )
             .into(),
             ..Default::default()

crates/turbopack-tests/tests/snapshot.rs

@@ -298,6 +298,7 @@ async fn run_test(resource: String) -> Result<Vc<FileSystemPath>> {
             BuildChunkingContext::builder(
                 project_root,
                 path,
+                path,
                 chunk_root_path,
                 static_root_path,
                 env,