Turbopack: Add manifest generation to pages (#52793)

This PR adds pages and build manifest generation to page entries in Nexturbo dev.
vercel · Jul 18, 2023 · 6705c80 · 6705c80
1 parent 56d85f2
commit 6705c80
Show file tree

Hide file tree

Showing 4 changed files with 209 additions and 177 deletions.
diff --git a/packages/next-swc/crates/next-api/src/app.rs b/packages/next-swc/crates/next-api/src/app.rs
@@ -39,8 +39,7 @@ use turbopack_binding::{
             chunk::EvaluatableAssets,
             file_source::FileSource,
             output::{OutputAsset, OutputAssets},
-            raw_output::RawOutput,
-            virtual_source::VirtualSource,
+            virtual_output::VirtualOutputAsset,
         },
         turbopack::{
             module_options::ModuleOptionsContext, resolve_options_context::ResolveOptionsContext,
@@ -536,12 +535,15 @@ impl AppEndpoint {
                 .into_iter()
                 .collect(),
         };
-        let app_build_manifest_output = Vc::upcast(RawOutput::new(Vc::upcast(VirtualSource::new(
-            node_root.join("server/app-build-manifest.json".to_string()),
+        let app_build_manifest_output = Vc::upcast(VirtualOutputAsset::new(
+            node_root.join(format!(
+                "server/app{original_name}/app-build-manifest.json",
+                original_name = app_entry.original_name
+            )),
             AssetContent::file(
                 File::from(serde_json::to_string_pretty(&app_build_manifest)?).into(),
             ),
-        ))));
+        ));
         output_assets.push(app_build_manifest_output);
 
         let app_paths_manifest = AppPathsManifest {
@@ -559,22 +561,28 @@ impl AppEndpoint {
             },
             ..Default::default()
         };
-        let app_paths_manifest_output = Vc::upcast(RawOutput::new(Vc::upcast(VirtualSource::new(
-            node_root.join("server/app-paths-manifest.json".to_string()),
+        let app_paths_manifest_output = Vc::upcast(VirtualOutputAsset::new(
+            node_root.join(format!(
+                "server/app{original_name}/app-paths-manifest.json",
+                original_name = app_entry.original_name
+            )),
             AssetContent::file(
                 File::from(serde_json::to_string_pretty(&app_paths_manifest)?).into(),
             ),
-        ))));
+        ));
         output_assets.push(app_paths_manifest_output);
 
         let build_manifest = BuildManifest {
             root_main_files: client_shared_chunks_paths,
             ..Default::default()
         };
-        let build_manifest_output = Vc::upcast(RawOutput::new(Vc::upcast(VirtualSource::new(
-            node_root.join("build-manifest.json".to_string()),
+        let build_manifest_output = Vc::upcast(VirtualOutputAsset::new(
+            node_root.join(format!(
+                "app{original_name}/build-manifest.json",
+                original_name = app_entry.original_name
+            )),
             AssetContent::file(File::from(serde_json::to_string_pretty(&build_manifest)?).into()),
-        ))));
+        ));
         output_assets.push(build_manifest_output);
 
         let entry_manifest = ClientReferenceManifest::build_output(