Unverified Commit 7fdcb172 authored by Alex Kirszenberg's avatar Alex Kirszenberg Committed by GitHub

Lazy DevHtmlAsset chunk generation (#48768)

This fixes a perf regression introduced in the chunking refactor, where
we would be eagerly generating all assets from the web entry and
fallback sources.

See https://github.com/vercel/turbo/pull/4679

This also brings the following updates from vercel/turbo:

* https://github.com/vercel/turbo/pull/4669 <!-- Tobias Koppers - make
the invalidation reason easier to read -->
* https://github.com/vercel/turbo/pull/4670 <!-- Tobias Koppers -
dev-server content might change any time, we can't cache them -->
* https://github.com/vercel/turbo/pull/4653 <!-- OJ Kwon -
fix(ecmascript): displayname for styled_components -->
* https://github.com/vercel/turbo/pull/4679 <!-- Alex Kirszenberg - Lazy
DevHtmlAsset chunk generation --> (this change)
parent 1e9d53eb
This diff is collapsed.
...@@ -42,11 +42,11 @@ swc_relay = { version = "0.2.5" } ...@@ -42,11 +42,11 @@ swc_relay = { version = "0.2.5" }
testing = { version = "0.33.4" } testing = { version = "0.33.4" }
# Turbo crates # Turbo crates
turbo-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230420.2" } turbo-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230424.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-230420.2" } turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230424.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-230420.2" } turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230424.2" }
# General Deps # General Deps
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
"check": "tsc --noEmit" "check": "tsc --noEmit"
}, },
"dependencies": { "dependencies": {
"@vercel/turbopack-dev": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230420.2", "@vercel/turbopack-dev": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230424.2",
"@vercel/turbopack-node": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230420.2", "@vercel/turbopack-node": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230424.2",
"anser": "^2.1.1", "anser": "^2.1.1",
"css.escape": "^1.5.1", "css.escape": "^1.5.1",
"next": "*", "next": "*",
......
...@@ -5,7 +5,6 @@ use turbo_binding::{ ...@@ -5,7 +5,6 @@ use turbo_binding::{
turbo::{tasks_env::ProcessEnvVc, tasks_fs::FileSystemPathVc}, turbo::{tasks_env::ProcessEnvVc, tasks_fs::FileSystemPathVc},
turbopack::{ turbopack::{
core::{ core::{
chunk::{ChunkableAsset, ChunkingContext},
compile_time_info::CompileTimeInfoVc, compile_time_info::CompileTimeInfoVc,
context::AssetContextVc, context::AssetContextVc,
resolve::{options::ImportMap, origin::PlainResolveOriginVc}, resolve::{options::ImportMap, origin::PlainResolveOriginVc},
...@@ -85,9 +84,10 @@ pub async fn get_fallback_page( ...@@ -85,9 +84,10 @@ pub async fn get_fallback_page(
Ok(DevHtmlAssetVc::new( Ok(DevHtmlAssetVc::new(
dev_server_root.join("fallback.html"), dev_server_root.join("fallback.html"),
vec![chunking_context.evaluated_chunk_group( vec![(
module.as_root_chunk(chunking_context), module.into(),
runtime_entries.with_entry(module.into()), chunking_context,
Some(runtime_entries.with_entry(module.into())),
)], )],
)) ))
} }
...@@ -6,7 +6,7 @@ use turbo_binding::{ ...@@ -6,7 +6,7 @@ use turbo_binding::{
}, },
turbopack::{ turbopack::{
core::{ core::{
chunk::{ChunkableAsset, ChunkableAssetVc, ChunkingContext}, chunk::ChunkableAssetVc,
compile_time_defines, compile_time_defines,
compile_time_info::{ compile_time_info::{
CompileTimeDefines, CompileTimeDefinesVc, CompileTimeInfo, CompileTimeInfoVc, CompileTimeDefines, CompileTimeDefinesVc, CompileTimeInfo, CompileTimeInfoVc,
...@@ -156,20 +156,20 @@ pub async fn create_web_entry_source( ...@@ -156,20 +156,20 @@ pub async fn create_web_entry_source(
.try_join() .try_join()
.await?; .await?;
let chunk_groups: Vec<_> = entries let entries: Vec<_> = entries
.into_iter() .into_iter()
.flatten() .flatten()
.map(|module| async move { .map(|module| async move {
if let Some(ecmascript) = EcmascriptModuleAssetVc::resolve_from(module).await? { if let Some(ecmascript) = EcmascriptModuleAssetVc::resolve_from(module).await? {
let chunk_group = chunking_context.evaluated_chunk_group( Ok((
ecmascript.as_root_chunk(chunking_context), ecmascript.into(),
runtime_entries.with_entry(ecmascript.into()), chunking_context,
); Some(runtime_entries.with_entry(ecmascript.into())),
Ok(chunk_group) ))
} else if let Some(chunkable) = ChunkableAssetVc::resolve_from(module).await? { } else if let Some(chunkable) = ChunkableAssetVc::resolve_from(module).await? {
// TODO this is missing runtime code, so it's probably broken and we should also // TODO this is missing runtime code, so it's probably broken and we should also
// add an ecmascript chunk with the runtime code // add an ecmascript chunk with the runtime code
Ok(chunking_context.chunk_group(chunkable.as_root_chunk(chunking_context))) Ok((chunkable, chunking_context, None))
} else { } else {
// TODO convert into a serve-able asset // TODO convert into a serve-able asset
Err(anyhow!( Err(anyhow!(
...@@ -181,7 +181,7 @@ pub async fn create_web_entry_source( ...@@ -181,7 +181,7 @@ pub async fn create_web_entry_source(
.try_join() .try_join()
.await?; .await?;
let entry_asset = DevHtmlAssetVc::new(server_root.join("index.html"), chunk_groups).into(); let entry_asset = DevHtmlAssetVc::new(server_root.join("index.html"), entries).into();
let graph = if eager_compile { let graph = if eager_compile {
AssetGraphContentSourceVc::new_eager(server_root, entry_asset) AssetGraphContentSourceVc::new_eager(server_root, entry_asset)
......
...@@ -1010,8 +1010,8 @@ importers: ...@@ -1010,8 +1010,8 @@ importers:
'@types/react': 18.0.37 '@types/react': 18.0.37
'@types/react-dom': 18.0.11 '@types/react-dom': 18.0.11
'@vercel/ncc': ^0.36.0 '@vercel/ncc': ^0.36.0
'@vercel/turbopack-dev': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230420.2 '@vercel/turbopack-dev': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230424.2
'@vercel/turbopack-node': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230420.2 '@vercel/turbopack-node': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230424.2
anser: ^2.1.1 anser: ^2.1.1
css.escape: ^1.5.1 css.escape: ^1.5.1
find-up: ^6.3.0 find-up: ^6.3.0
...@@ -1023,8 +1023,8 @@ importers: ...@@ -1023,8 +1023,8 @@ importers:
stacktrace-parser: ^0.1.10 stacktrace-parser: ^0.1.10
strip-ansi: ^7.0.1 strip-ansi: ^7.0.1
dependencies: dependencies:
'@vercel/turbopack-dev': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230420.2_react-refresh@0.12.0' '@vercel/turbopack-dev': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230424.2_react-refresh@0.12.0'
'@vercel/turbopack-node': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230420.2' '@vercel/turbopack-node': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230424.2'
anser: 2.1.1 anser: 2.1.1
css.escape: 1.5.1 css.escape: 1.5.1
next: link:../../../../next next: link:../../../../next
...@@ -6006,7 +6006,7 @@ packages: ...@@ -6006,7 +6006,7 @@ packages:
dependencies: dependencies:
'@mdx-js/mdx': 2.2.1 '@mdx-js/mdx': 2.2.1
source-map: 0.7.3 source-map: 0.7.3
webpack: 5.74.0 webpack: 5.74.0_@swc+core@1.3.51
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
...@@ -6676,7 +6676,6 @@ packages: ...@@ -6676,7 +6676,6 @@ packages:
cpu: [arm64] cpu: [arm64]
os: [darwin] os: [darwin]
requiresBuild: true requiresBuild: true
dev: true
optional: true optional: true
/@swc/core-darwin-x64/1.3.51: /@swc/core-darwin-x64/1.3.51:
...@@ -6685,7 +6684,6 @@ packages: ...@@ -6685,7 +6684,6 @@ packages:
cpu: [x64] cpu: [x64]
os: [darwin] os: [darwin]
requiresBuild: true requiresBuild: true
dev: true
optional: true optional: true
/@swc/core-linux-arm-gnueabihf/1.3.51: /@swc/core-linux-arm-gnueabihf/1.3.51:
...@@ -6694,7 +6692,6 @@ packages: ...@@ -6694,7 +6692,6 @@ packages:
cpu: [arm] cpu: [arm]
os: [linux] os: [linux]
requiresBuild: true requiresBuild: true
dev: true
optional: true optional: true
/@swc/core-linux-arm64-gnu/1.3.51: /@swc/core-linux-arm64-gnu/1.3.51:
...@@ -6703,7 +6700,6 @@ packages: ...@@ -6703,7 +6700,6 @@ packages:
cpu: [arm64] cpu: [arm64]
os: [linux] os: [linux]
requiresBuild: true requiresBuild: true
dev: true
optional: true optional: true
/@swc/core-linux-arm64-musl/1.3.51: /@swc/core-linux-arm64-musl/1.3.51:
...@@ -6712,7 +6708,6 @@ packages: ...@@ -6712,7 +6708,6 @@ packages:
cpu: [arm64] cpu: [arm64]
os: [linux] os: [linux]
requiresBuild: true requiresBuild: true
dev: true
optional: true optional: true
/@swc/core-linux-x64-gnu/1.3.51: /@swc/core-linux-x64-gnu/1.3.51:
...@@ -6721,7 +6716,6 @@ packages: ...@@ -6721,7 +6716,6 @@ packages:
cpu: [x64] cpu: [x64]
os: [linux] os: [linux]
requiresBuild: true requiresBuild: true
dev: true
optional: true optional: true
/@swc/core-linux-x64-musl/1.3.51: /@swc/core-linux-x64-musl/1.3.51:
...@@ -6730,7 +6724,6 @@ packages: ...@@ -6730,7 +6724,6 @@ packages:
cpu: [x64] cpu: [x64]
os: [linux] os: [linux]
requiresBuild: true requiresBuild: true
dev: true
optional: true optional: true
/@swc/core-win32-arm64-msvc/1.3.51: /@swc/core-win32-arm64-msvc/1.3.51:
...@@ -6739,7 +6732,6 @@ packages: ...@@ -6739,7 +6732,6 @@ packages:
cpu: [arm64] cpu: [arm64]
os: [win32] os: [win32]
requiresBuild: true requiresBuild: true
dev: true
optional: true optional: true
/@swc/core-win32-ia32-msvc/1.3.51: /@swc/core-win32-ia32-msvc/1.3.51:
...@@ -6748,7 +6740,6 @@ packages: ...@@ -6748,7 +6740,6 @@ packages:
cpu: [ia32] cpu: [ia32]
os: [win32] os: [win32]
requiresBuild: true requiresBuild: true
dev: true
optional: true optional: true
/@swc/core-win32-x64-msvc/1.3.51: /@swc/core-win32-x64-msvc/1.3.51:
...@@ -6757,7 +6748,6 @@ packages: ...@@ -6757,7 +6748,6 @@ packages:
cpu: [x64] cpu: [x64]
os: [win32] os: [win32]
requiresBuild: true requiresBuild: true
dev: true
optional: true optional: true
/@swc/core/1.3.51_@swc+helpers@0.5.0: /@swc/core/1.3.51_@swc+helpers@0.5.0:
...@@ -6782,7 +6772,6 @@ packages: ...@@ -6782,7 +6772,6 @@ packages:
'@swc/core-win32-arm64-msvc': 1.3.51 '@swc/core-win32-arm64-msvc': 1.3.51
'@swc/core-win32-ia32-msvc': 1.3.51 '@swc/core-win32-ia32-msvc': 1.3.51
'@swc/core-win32-x64-msvc': 1.3.51 '@swc/core-win32-x64-msvc': 1.3.51
dev: true
/@swc/helpers/0.4.14: /@swc/helpers/0.4.14:
resolution: {integrity: sha512-4C7nX/dvpzB7za4Ql9K81xK3HPxCpHMgwTZVyf+9JQ6VUbn9jjZVN7/Nkdz/Ugzs2CSjqnL/UPXroiVBVHUWUw==} resolution: {integrity: sha512-4C7nX/dvpzB7za4Ql9K81xK3HPxCpHMgwTZVyf+9JQ6VUbn9jjZVN7/Nkdz/Ugzs2CSjqnL/UPXroiVBVHUWUw==}
...@@ -23756,7 +23745,6 @@ packages: ...@@ -23756,7 +23745,6 @@ packages:
source-map: 0.6.1 source-map: 0.6.1
terser: 5.14.1 terser: 5.14.1
webpack: 5.74.0_@swc+core@1.3.51 webpack: 5.74.0_@swc+core@1.3.51
dev: true
/terser-webpack-plugin/5.2.4_webpack@5.74.0: /terser-webpack-plugin/5.2.4_webpack@5.74.0:
resolution: {integrity: sha512-E2CkNMN+1cho04YpdANyRrn8CyN4yMy+WdFKZIySFZrGXZxJwJP6PMNGGc/Mcr6qygQHUUqRxnAPmi0M9f00XA==} resolution: {integrity: sha512-E2CkNMN+1cho04YpdANyRrn8CyN4yMy+WdFKZIySFZrGXZxJwJP6PMNGGc/Mcr6qygQHUUqRxnAPmi0M9f00XA==}
...@@ -25162,7 +25150,6 @@ packages: ...@@ -25162,7 +25150,6 @@ packages:
- '@swc/core' - '@swc/core'
- esbuild - esbuild
- uglify-js - uglify-js
dev: true
/websocket-driver/0.7.3: /websocket-driver/0.7.3:
resolution: {integrity: sha512-bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg==} resolution: {integrity: sha512-bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg==}
...@@ -25568,9 +25555,9 @@ packages: ...@@ -25568,9 +25555,9 @@ 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.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230420.2_react-refresh@0.12.0': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230424.2_react-refresh@0.12.0':
resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230420.2} resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230424.2}
id: '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230420.2' id: '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230424.2'
name: '@vercel/turbopack-dev' name: '@vercel/turbopack-dev'
version: 0.0.0 version: 0.0.0
dependencies: dependencies:
...@@ -25580,8 +25567,8 @@ packages: ...@@ -25580,8 +25567,8 @@ packages:
- webpack - webpack
dev: false dev: false
'@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230420.2': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230424.2':
resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230420.2} resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230424.2}
name: '@vercel/turbopack-node' name: '@vercel/turbopack-node'
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