Unverified Commit 6705c803 authored by Alex Kirszenberg's avatar Alex Kirszenberg Committed by GitHub

Turbopack: Add manifest generation to pages (#52793)

This PR adds pages and build manifest generation to page entries in
Nexturbo dev.
parent 56d85f25
...@@ -39,8 +39,7 @@ use turbopack_binding::{ ...@@ -39,8 +39,7 @@ use turbopack_binding::{
chunk::EvaluatableAssets, chunk::EvaluatableAssets,
file_source::FileSource, file_source::FileSource,
output::{OutputAsset, OutputAssets}, output::{OutputAsset, OutputAssets},
raw_output::RawOutput, virtual_output::VirtualOutputAsset,
virtual_source::VirtualSource,
}, },
turbopack::{ turbopack::{
module_options::ModuleOptionsContext, resolve_options_context::ResolveOptionsContext, module_options::ModuleOptionsContext, resolve_options_context::ResolveOptionsContext,
...@@ -536,12 +535,15 @@ impl AppEndpoint { ...@@ -536,12 +535,15 @@ impl AppEndpoint {
.into_iter() .into_iter()
.collect(), .collect(),
}; };
let app_build_manifest_output = Vc::upcast(RawOutput::new(Vc::upcast(VirtualSource::new( let app_build_manifest_output = Vc::upcast(VirtualOutputAsset::new(
node_root.join("server/app-build-manifest.json".to_string()), node_root.join(format!(
"server/app{original_name}/app-build-manifest.json",
original_name = app_entry.original_name
)),
AssetContent::file( AssetContent::file(
File::from(serde_json::to_string_pretty(&app_build_manifest)?).into(), File::from(serde_json::to_string_pretty(&app_build_manifest)?).into(),
), ),
)))); ));
output_assets.push(app_build_manifest_output); output_assets.push(app_build_manifest_output);
let app_paths_manifest = AppPathsManifest { let app_paths_manifest = AppPathsManifest {
...@@ -559,22 +561,28 @@ impl AppEndpoint { ...@@ -559,22 +561,28 @@ impl AppEndpoint {
}, },
..Default::default() ..Default::default()
}; };
let app_paths_manifest_output = Vc::upcast(RawOutput::new(Vc::upcast(VirtualSource::new( let app_paths_manifest_output = Vc::upcast(VirtualOutputAsset::new(
node_root.join("server/app-paths-manifest.json".to_string()), node_root.join(format!(
"server/app{original_name}/app-paths-manifest.json",
original_name = app_entry.original_name
)),
AssetContent::file( AssetContent::file(
File::from(serde_json::to_string_pretty(&app_paths_manifest)?).into(), File::from(serde_json::to_string_pretty(&app_paths_manifest)?).into(),
), ),
)))); ));
output_assets.push(app_paths_manifest_output); output_assets.push(app_paths_manifest_output);
let build_manifest = BuildManifest { let build_manifest = BuildManifest {
root_main_files: client_shared_chunks_paths, root_main_files: client_shared_chunks_paths,
..Default::default() ..Default::default()
}; };
let build_manifest_output = Vc::upcast(RawOutput::new(Vc::upcast(VirtualSource::new( let build_manifest_output = Vc::upcast(VirtualOutputAsset::new(
node_root.join("build-manifest.json".to_string()), 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()), AssetContent::file(File::from(serde_json::to_string_pretty(&build_manifest)?).into()),
)))); ));
output_assets.push(build_manifest_output); output_assets.push(build_manifest_output);
let entry_manifest = ClientReferenceManifest::build_output( let entry_manifest = ClientReferenceManifest::build_output(
......
...@@ -5,7 +5,7 @@ use turbo_tasks_fs::{File, FileSystemPath}; ...@@ -5,7 +5,7 @@ use turbo_tasks_fs::{File, FileSystemPath};
use turbopack_binding::turbopack::{ use turbopack_binding::turbopack::{
core::{ core::{
asset::AssetContent, chunk::ModuleId as TurbopackModuleId, output::OutputAsset, asset::AssetContent, chunk::ModuleId as TurbopackModuleId, output::OutputAsset,
raw_output::RawOutput, virtual_source::VirtualSource, virtual_output::VirtualOutputAsset,
}, },
ecmascript::{ ecmascript::{
chunk::{EcmascriptChunkItemExt, EcmascriptChunkPlaceable, EcmascriptChunkingContext}, chunk::{EcmascriptChunkItemExt, EcmascriptChunkPlaceable, EcmascriptChunkingContext},
...@@ -176,7 +176,7 @@ impl ClientReferenceManifest { ...@@ -176,7 +176,7 @@ impl ClientReferenceManifest {
let client_reference_manifest_json = serde_json::to_string(&entry_manifest).unwrap(); let client_reference_manifest_json = serde_json::to_string(&entry_manifest).unwrap();
Ok(Vc::upcast(RawOutput::new(Vc::upcast(VirtualSource::new( Ok(Vc::upcast(VirtualOutputAsset::new(
node_root.join(format!( node_root.join(format!(
"server/app/{entry_name}_client-reference-manifest.js", "server/app/{entry_name}_client-reference-manifest.js",
)), )),
...@@ -191,7 +191,7 @@ impl ClientReferenceManifest { ...@@ -191,7 +191,7 @@ impl ClientReferenceManifest {
}) })
.into(), .into(),
), ),
))))) )))
} }
} }
......
...@@ -265,12 +265,24 @@ const nextDev: CliCommand = async (argv) => { ...@@ -265,12 +265,24 @@ const nextDev: CliCommand = async (argv) => {
Log.info(written) Log.info(written)
break break
} }
case 'page-api': {
Log.info(`writing ${pathname} to disk`)
const written = await route.endpoint.writeToDisk()
Log.info(written)
break
}
case 'app-page': { case 'app-page': {
Log.info(`writing ${pathname} to disk`) Log.info(`writing ${pathname} to disk`)
const written = await route.rscEndpoint.writeToDisk() const written = await route.rscEndpoint.writeToDisk()
Log.info(written) Log.info(written)
break break
} }
case 'app-route': {
Log.info(`writing ${pathname} to disk`)
const written = await route.endpoint.writeToDisk()
Log.info(written)
break
}
default: default:
Log.info(`skipping ${pathname} (${route.type})`) Log.info(`skipping ${pathname} (${route.type})`)
break break
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment