put app code into a separate layer

vercel · Oct 13, 2023 · 8daf3af · 8daf3af
1 parent a40a350
commit 8daf3af
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/packages/next-swc/crates/next-api/src/app.rs b/packages/next-swc/crates/next-api/src/app.rs
@@ -516,7 +516,7 @@ impl AppEndpoint {
                 .ident()
                 .with_modifier(Vc::cell("client_shared_chunks".to_string())),
             this.app_project.client_runtime_entries(),
-            this.app_project.project().client_chunking_context(),
+            this.app_project.project().app_client_chunking_context(),
         );
 
         let mut client_shared_chunks_paths = vec![];
@@ -570,8 +570,8 @@ impl AppEndpoint {
         if ssr_and_client {
             let client_references_chunks = get_app_client_references_chunks(
                 client_reference_types,
-                this.app_project.project().client_chunking_context(),
-                this.app_project.project().ssr_chunking_context(),
+                this.app_project.project().app_client_chunking_context(),
+                this.app_project.project().app_ssr_chunking_context(),
             );
             let client_references_chunks_ref = client_references_chunks.await?;
 
@@ -642,8 +642,8 @@ impl AppEndpoint {
                 app_entry.original_name.clone(),
                 client_references,
                 client_references_chunks,
-                this.app_project.project().client_chunking_context(),
-                Vc::upcast(this.app_project.project().ssr_chunking_context()),
+                this.app_project.project().app_client_chunking_context(),
+                Vc::upcast(this.app_project.project().app_ssr_chunking_context()),
                 this.app_project
                     .project()
                     .next_config()

diff --git a/packages/next-swc/crates/next-api/src/project.rs b/packages/next-swc/crates/next-api/src/project.rs
@@ -505,6 +505,13 @@ impl Project {
         ))
     }
 
+    #[turbo_tasks::function]
+    pub(super) fn app_client_chunking_context(
+        self: Vc<Self>,
+    ) -> Vc<Box<dyn EcmascriptChunkingContext>> {
+        self.client_chunking_context().with_layer("app".to_string())
+    }
+
     #[turbo_tasks::function]
     fn server_chunking_context(self: Vc<Self>) -> Vc<BuildChunkingContext> {
         get_server_chunking_context(
@@ -609,6 +616,12 @@ impl Project {
         self.server_chunking_context().with_layer("ssr".to_string())
     }
 
+    #[turbo_tasks::function]
+    pub(super) fn app_ssr_chunking_context(self: Vc<Self>) -> Vc<BuildChunkingContext> {
+        self.server_chunking_context()
+            .with_layer("app ssr".to_string())
+    }
+
     #[turbo_tasks::function]
     pub(super) fn edge_ssr_chunking_context(
         self: Vc<Self>,