use shared function

vercel · May 23, 2023 · 021b207 · 021b207
1 parent 891b9b5
commit 021b207
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/packages/next-swc/crates/next-core/src/app_source.rs b/packages/next-swc/crates/next-core/src/app_source.rs
@@ -674,6 +674,7 @@ async fn create_app_route_source_for_route(
             project_path,
             intermediate_output_path: intermediate_output_path_root,
             output_root: intermediate_output_path_root,
+            app_dir,
         }
         .cell()
         .into(),
@@ -1018,7 +1019,7 @@ import {}, {{ chunks as {} }} from "COMPONENT_{}";
             project_path,
             intermediate_output_path,
             intermediate_output_path.join("chunks"),
-            server_root.join("_next/static/media"),
+            get_client_assets_path(server_root, Value::new(ClientContextType::App { app_dir })),
             context.compile_time_info().environment(),
         )
         .layer("ssr")
@@ -1087,6 +1088,7 @@ struct AppRoute {
     project_path: FileSystemPathVc,
     server_root: FileSystemPathVc,
     output_root: FileSystemPathVc,
+    app_dir: FileSystemPathVc,
 }
 
 #[turbo_tasks::value_impl]
@@ -1099,7 +1101,12 @@ impl AppRouteVc {
             this.project_path,
             this.intermediate_output_path,
             this.intermediate_output_path.join("chunks"),
-            this.server_root.join("_next/static/media"),
+            get_client_assets_path(
+                this.server_root,
+                Value::new(ClientContextType::App {
+                    app_dir: this.app_dir,
+                }),
+            ),
             this.context.compile_time_info().environment(),
         )
         .layer("ssr")