Unverified Commit 72d88c15 authored by Tobias Koppers's avatar Tobias Koppers Committed by GitHub

app layouts/pages depend on shared main files (#63042)

### What?

avoid duplication of next.js internals in app dir

For the example/hello-world:

Before:

```
Route (app)                                          Size     First Load JS
┌ ○ /                                                15 kB           184 kB
└ ○ /_not-found                                      15 kB           184 kB
+ First Load JS shared by all                        169 kB
  ├ chunks/[project]__929616._.js                    85.2 kB
  ├ chunks/[project]_packages_next_dist_0f911b._.js  83.2 kB
  └ other shared chunks (total)                      230 B
```

After:

```
Route (app)                                          Size     First Load JS
┌ ○ /                                                15 kB           104 kB
└ ○ /_not-found                                      15 kB           104 kB
+ First Load JS shared by all                        88.9 kB
  ├ chunks/[project]_packages_next_dist_0f911b._.js  83.2 kB
  └ other shared chunks (total)                      5.7 kB
```


Closes PACK-2695

### Turbopack changes

* https://github.com/vercel/turbo/pull/7617 <!-- OJ Kwon -
feat(turbopack): add missing webpack context property -->
* https://github.com/vercel/turbo/pull/7676 <!-- Tim Neutkens -
Implement minify for Turbopack runtime file -->
* https://github.com/vercel/turbo/pull/7677 <!-- Tobias Koppers - add
FullContextTransition -->
parent c07f8721
This diff is collapsed.
...@@ -37,11 +37,11 @@ swc_core = { version = "0.90.17", features = [ ...@@ -37,11 +37,11 @@ swc_core = { version = "0.90.17", features = [
testing = { version = "0.35.20" } testing = { version = "0.35.20" }
# Turbo crates # Turbo crates
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240307.3" } turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240308.2" }
# [TODO]: need to refactor embed_directory! macro usages, as well as resolving turbo_tasks::function, macros.. # [TODO]: need to refactor embed_directory! macro usages, as well as resolving turbo_tasks::function, macros..
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240307.3" } turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240308.2" }
# [TODO]: need to refactor embed_directory! macro usage in next-core # [TODO]: need to refactor embed_directory! macro usage in next-core
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240307.3" } turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240308.2" }
# General Deps # General Deps
......
...@@ -11,7 +11,7 @@ use next_core::{ ...@@ -11,7 +11,7 @@ use next_core::{
get_edge_resolve_options_context, get_edge_resolve_options_context,
next_app::{ next_app::{
app_client_references_chunks::get_app_server_reference_modules, app_client_references_chunks::get_app_server_reference_modules,
get_app_client_references_chunks, get_app_client_shared_chunks, get_app_page_entry, get_app_client_references_chunks, get_app_client_shared_chunk_group, get_app_page_entry,
get_app_route_entry, metadata::route::get_app_metadata_route_entry, AppEntry, AppPage, get_app_route_entry, metadata::route::get_app_metadata_route_entry, AppEntry, AppPage,
}, },
next_client::{ next_client::{
...@@ -51,8 +51,10 @@ use turbopack_binding::{ ...@@ -51,8 +51,10 @@ use turbopack_binding::{
}, },
nodejs::EntryChunkGroupResult, nodejs::EntryChunkGroupResult,
turbopack::{ turbopack::{
module_options::ModuleOptionsContext, resolve_options_context::ResolveOptionsContext, module_options::ModuleOptionsContext,
transition::ContextTransition, ModuleAssetContext, resolve_options_context::ResolveOptionsContext,
transition::{ContextTransition, FullContextTransition},
ModuleAssetContext,
}, },
}, },
}; };
...@@ -156,13 +158,9 @@ impl AppProject { ...@@ -156,13 +158,9 @@ impl AppProject {
} }
#[turbo_tasks::function] #[turbo_tasks::function]
fn client_transition(self: Vc<Self>) -> Vc<ContextTransition> { async fn client_transition(self: Vc<Self>) -> Result<Vc<FullContextTransition>> {
ContextTransition::new( let module_context = self.client_module_context();
self.project().client_compile_time_info(), Ok(FullContextTransition::new(module_context))
self.client_module_options_context(),
self.client_resolve_options_context(),
Vc::cell("app-client".to_string()),
)
} }
#[turbo_tasks::function] #[turbo_tasks::function]
...@@ -204,13 +202,15 @@ impl AppProject { ...@@ -204,13 +202,15 @@ impl AppProject {
( (
ECMASCRIPT_CLIENT_TRANSITION_NAME.to_string(), ECMASCRIPT_CLIENT_TRANSITION_NAME.to_string(),
Vc::upcast(NextEcmascriptClientReferenceTransition::new( Vc::upcast(NextEcmascriptClientReferenceTransition::new(
self.client_transition(), Vc::upcast(self.client_transition()),
self.ssr_transition(), self.ssr_transition(),
)), )),
), ),
( (
"next-dynamic".to_string(), "next-dynamic".to_string(),
Vc::upcast(NextDynamicTransition::new(self.client_transition())), Vc::upcast(NextDynamicTransition::new(Vc::upcast(
self.client_transition(),
))),
), ),
("next-ssr".to_string(), Vc::upcast(self.ssr_transition())), ("next-ssr".to_string(), Vc::upcast(self.ssr_transition())),
] ]
...@@ -231,13 +231,15 @@ impl AppProject { ...@@ -231,13 +231,15 @@ impl AppProject {
( (
ECMASCRIPT_CLIENT_TRANSITION_NAME.to_string(), ECMASCRIPT_CLIENT_TRANSITION_NAME.to_string(),
Vc::upcast(NextEcmascriptClientReferenceTransition::new( Vc::upcast(NextEcmascriptClientReferenceTransition::new(
self.client_transition(), Vc::upcast(self.client_transition()),
self.edge_ssr_transition(), self.edge_ssr_transition(),
)), )),
), ),
( (
"next-dynamic".to_string(), "next-dynamic".to_string(),
Vc::upcast(NextDynamicTransition::new(self.client_transition())), Vc::upcast(NextDynamicTransition::new(Vc::upcast(
self.client_transition(),
))),
), ),
( (
"next-ssr".to_string(), "next-ssr".to_string(),
...@@ -579,17 +581,18 @@ impl AppEndpoint { ...@@ -579,17 +581,18 @@ impl AppEndpoint {
// .await?; // .await?;
let app_server_reference_modules = if process_client { let app_server_reference_modules = if process_client {
let client_shared_chunks = get_app_client_shared_chunks( let client_shared_chunk_group = get_app_client_shared_chunk_group(
app_entry app_entry
.rsc_entry .rsc_entry
.ident() .ident()
.with_modifier(Vc::cell("client_shared_chunks".to_string())), .with_modifier(Vc::cell("client_shared_chunks".to_string())),
this.app_project.client_runtime_entries(), this.app_project.client_runtime_entries(),
this.app_project.project().client_chunking_context(), this.app_project.project().client_chunking_context(),
); )
.await?;
let mut client_shared_chunks_paths = vec![]; let mut client_shared_chunks_paths = vec![];
for chunk in client_shared_chunks.await?.iter().copied() { for chunk in client_shared_chunk_group.assets.await?.iter().copied() {
client_assets.push(chunk); client_assets.push(chunk);
let chunk_path = chunk.ident().path().await?; let chunk_path = chunk.ident().path().await?;
...@@ -599,6 +602,7 @@ impl AppEndpoint { ...@@ -599,6 +602,7 @@ impl AppEndpoint {
} }
} }
} }
let client_shared_availability_info = client_shared_chunk_group.availability_info;
let client_reference_graph = ClientReferenceGraph::new(Vc::cell(vec![rsc_entry_asset])); let client_reference_graph = ClientReferenceGraph::new(Vc::cell(vec![rsc_entry_asset]));
let client_reference_types = client_reference_graph.types(); let client_reference_types = client_reference_graph.types();
...@@ -618,6 +622,7 @@ impl AppEndpoint { ...@@ -618,6 +622,7 @@ impl AppEndpoint {
let client_references_chunks = get_app_client_references_chunks( let client_references_chunks = get_app_client_references_chunks(
client_references, client_references,
this.app_project.project().client_chunking_context(), this.app_project.project().client_chunking_context(),
Value::new(client_shared_availability_info),
ssr_chunking_context, ssr_chunking_context,
); );
let client_references_chunks_ref = client_references_chunks.await?; let client_references_chunks_ref = client_references_chunks.await?;
......
...@@ -265,7 +265,9 @@ impl PagesProject { ...@@ -265,7 +265,9 @@ impl PagesProject {
Vc::cell( Vc::cell(
[( [(
"next-dynamic".to_string(), "next-dynamic".to_string(),
Vc::upcast(NextDynamicTransition::new(self.client_transition())), Vc::upcast(NextDynamicTransition::new(Vc::upcast(
self.client_transition(),
))),
)] )]
.into_iter() .into_iter()
.collect(), .collect(),
......
...@@ -45,6 +45,7 @@ pub struct ClientReferencesChunks { ...@@ -45,6 +45,7 @@ pub struct ClientReferencesChunks {
pub async fn get_app_client_references_chunks( pub async fn get_app_client_references_chunks(
app_client_references: Vc<ClientReferenceGraphResult>, app_client_references: Vc<ClientReferenceGraphResult>,
client_chunking_context: Vc<Box<dyn EcmascriptChunkingContext>>, client_chunking_context: Vc<Box<dyn EcmascriptChunkingContext>>,
client_availability_info: Value<AvailabilityInfo>,
ssr_chunking_context: Option<Vc<Box<dyn EcmascriptChunkingContext>>>, ssr_chunking_context: Option<Vc<Box<dyn EcmascriptChunkingContext>>>,
) -> Result<Vc<ClientReferencesChunks>> { ) -> Result<Vc<ClientReferencesChunks>> {
async move { async move {
...@@ -130,7 +131,7 @@ pub async fn get_app_client_references_chunks( ...@@ -130,7 +131,7 @@ pub async fn get_app_client_references_chunks(
list.extend(framework_reference_types); list.extend(framework_reference_types);
} }
let mut current_client_availability_info = AvailabilityInfo::Root; let mut current_client_availability_info = client_availability_info.into_value();
let mut current_client_chunks = OutputAssets::empty(); let mut current_client_chunks = OutputAssets::empty();
let mut current_ssr_availability_info = AvailabilityInfo::Root; let mut current_ssr_availability_info = AvailabilityInfo::Root;
let mut current_ssr_chunks = OutputAssets::empty(); let mut current_ssr_chunks = OutputAssets::empty();
......
...@@ -2,7 +2,10 @@ use anyhow::Result; ...@@ -2,7 +2,10 @@ use anyhow::Result;
use turbo_tasks::{Value, Vc}; use turbo_tasks::{Value, Vc};
use turbopack_binding::turbopack::{ use turbopack_binding::turbopack::{
core::{ core::{
chunk::{availability_info::AvailabilityInfo, ChunkingContextExt, EvaluatableAssets}, chunk::{
availability_info::AvailabilityInfo, ChunkGroupResult, ChunkingContext,
EvaluatableAssets,
},
ident::AssetIdent, ident::AssetIdent,
output::OutputAssets, output::OutputAssets,
}, },
...@@ -10,20 +13,24 @@ use turbopack_binding::turbopack::{ ...@@ -10,20 +13,24 @@ use turbopack_binding::turbopack::{
}; };
#[turbo_tasks::function] #[turbo_tasks::function]
pub async fn get_app_client_shared_chunks( pub async fn get_app_client_shared_chunk_group(
ident: Vc<AssetIdent>, ident: Vc<AssetIdent>,
app_client_runtime_entries: Vc<EvaluatableAssets>, app_client_runtime_entries: Vc<EvaluatableAssets>,
client_chunking_context: Vc<Box<dyn EcmascriptChunkingContext>>, client_chunking_context: Vc<Box<dyn EcmascriptChunkingContext>>,
) -> Result<Vc<OutputAssets>> { ) -> Result<Vc<ChunkGroupResult>> {
if app_client_runtime_entries.await?.is_empty() { if app_client_runtime_entries.await?.is_empty() {
return Ok(OutputAssets::empty()); return Ok(ChunkGroupResult {
assets: OutputAssets::empty(),
availability_info: AvailabilityInfo::Root,
}
.cell());
} }
let app_client_shared_chunks = client_chunking_context.evaluated_chunk_group_assets( let app_client_shared_chunk_grou = client_chunking_context.evaluated_chunk_group(
ident, ident,
app_client_runtime_entries, app_client_runtime_entries,
Value::new(AvailabilityInfo::Root), Value::new(AvailabilityInfo::Root),
); );
Ok(app_client_shared_chunks) Ok(app_client_shared_chunk_grou)
} }
...@@ -18,7 +18,7 @@ use turbo_tasks::{trace::TraceRawVcs, TaskInput}; ...@@ -18,7 +18,7 @@ use turbo_tasks::{trace::TraceRawVcs, TaskInput};
pub use crate::next_app::{ pub use crate::next_app::{
app_client_references_chunks::{get_app_client_references_chunks, ClientReferencesChunks}, app_client_references_chunks::{get_app_client_references_chunks, ClientReferencesChunks},
app_client_shared_chunks::get_app_client_shared_chunks, app_client_shared_chunks::get_app_client_shared_chunk_group,
app_entry::AppEntry, app_entry::AppEntry,
app_page_entry::get_app_page_entry, app_page_entry::get_app_page_entry,
app_route_entry::get_app_route_entry, app_route_entry::get_app_route_entry,
......
...@@ -18,7 +18,7 @@ use super::ecmascript_client_reference_proxy_module::EcmascriptClientReferencePr ...@@ -18,7 +18,7 @@ use super::ecmascript_client_reference_proxy_module::EcmascriptClientReferencePr
#[turbo_tasks::value(shared)] #[turbo_tasks::value(shared)]
pub struct NextEcmascriptClientReferenceTransition { pub struct NextEcmascriptClientReferenceTransition {
client_transition: Vc<ContextTransition>, client_transition: Vc<Box<dyn Transition>>,
ssr_transition: Vc<ContextTransition>, ssr_transition: Vc<ContextTransition>,
} }
...@@ -26,7 +26,7 @@ pub struct NextEcmascriptClientReferenceTransition { ...@@ -26,7 +26,7 @@ pub struct NextEcmascriptClientReferenceTransition {
impl NextEcmascriptClientReferenceTransition { impl NextEcmascriptClientReferenceTransition {
#[turbo_tasks::function] #[turbo_tasks::function]
pub fn new( pub fn new(
client_transition: Vc<ContextTransition>, client_transition: Vc<Box<dyn Transition>>,
ssr_transition: Vc<ContextTransition>, ssr_transition: Vc<ContextTransition>,
) -> Vc<Self> { ) -> Vc<Self> {
NextEcmascriptClientReferenceTransition { NextEcmascriptClientReferenceTransition {
......
...@@ -2,10 +2,7 @@ use anyhow::Result; ...@@ -2,10 +2,7 @@ use anyhow::Result;
use turbo_tasks::{Value, Vc}; use turbo_tasks::{Value, Vc};
use turbopack_binding::turbopack::{ use turbopack_binding::turbopack::{
core::{context::ProcessResult, reference_type::ReferenceType, source::Source}, core::{context::ProcessResult, reference_type::ReferenceType, source::Source},
turbopack::{ turbopack::{transition::Transition, ModuleAssetContext},
transition::{ContextTransition, Transition},
ModuleAssetContext,
},
}; };
use super::NextDynamicEntryModule; use super::NextDynamicEntryModule;
...@@ -15,13 +12,13 @@ use super::NextDynamicEntryModule; ...@@ -15,13 +12,13 @@ use super::NextDynamicEntryModule;
/// create the dynamic entry, and the dynamic manifest entry. /// create the dynamic entry, and the dynamic manifest entry.
#[turbo_tasks::value] #[turbo_tasks::value]
pub struct NextDynamicTransition { pub struct NextDynamicTransition {
client_transition: Vc<ContextTransition>, client_transition: Vc<Box<dyn Transition>>,
} }
#[turbo_tasks::value_impl] #[turbo_tasks::value_impl]
impl NextDynamicTransition { impl NextDynamicTransition {
#[turbo_tasks::function] #[turbo_tasks::function]
pub fn new(client_transition: Vc<ContextTransition>) -> Vc<Self> { pub fn new(client_transition: Vc<Box<dyn Transition>>) -> Vc<Self> {
NextDynamicTransition { client_transition }.cell() NextDynamicTransition { client_transition }.cell()
} }
} }
......
...@@ -192,7 +192,7 @@ ...@@ -192,7 +192,7 @@
"@types/ws": "8.2.0", "@types/ws": "8.2.0",
"@vercel/ncc": "0.34.0", "@vercel/ncc": "0.34.0",
"@vercel/nft": "0.26.4", "@vercel/nft": "0.26.4",
"@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240307.3", "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240308.2",
"acorn": "8.5.0", "acorn": "8.5.0",
"amphtml-validator": "1.0.35", "amphtml-validator": "1.0.35",
"anser": "1.4.9", "anser": "1.4.9",
......
...@@ -1071,8 +1071,8 @@ importers: ...@@ -1071,8 +1071,8 @@ importers:
specifier: 0.26.4 specifier: 0.26.4
version: 0.26.4 version: 0.26.4
'@vercel/turbopack-ecmascript-runtime': '@vercel/turbopack-ecmascript-runtime':
specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240307.3 specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240308.2
version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240307.3' version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240308.2'
acorn: acorn:
specifier: 8.5.0 specifier: 8.5.0
version: 8.5.0 version: 8.5.0
...@@ -25492,8 +25492,8 @@ packages: ...@@ -25492,8 +25492,8 @@ packages:
/zwitch@2.0.4: /zwitch@2.0.4:
resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==} resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}
'@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240307.3': '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240308.2':
resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240307.3} resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240308.2}
name: '@vercel/turbopack-ecmascript-runtime' name: '@vercel/turbopack-ecmascript-runtime'
version: 0.0.0 version: 0.0.0
dependencies: dependencies:
......
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