Unverified Commit 0aeda3ae authored by Tobias Koppers's avatar Tobias Koppers Committed by GitHub

Turbopack: ensure output assets reference only output assets (#52832)

### What?

refactoring see https://github.com/vercel/turbo/pull/5557

### Turbopack Changes

* https://github.com/vercel/turbo/pull/5506 <!-- Leah -
feat(turbopack-ecmascript): implement acyclic SCC graph for ESM imports
-->
* https://github.com/vercel/turbo/pull/5557 <!-- Tobias Koppers - Ensure
output assets reference only output assets -->
parent 87763d73
This diff is collapsed.
...@@ -44,11 +44,11 @@ swc_core = { version = "0.79.13" } ...@@ -44,11 +44,11 @@ swc_core = { version = "0.79.13" }
testing = { version = "0.33.20" } testing = { version = "0.33.20" }
# Turbo crates # Turbo crates
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230718.2" } turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230718.3" }
# [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-230718.2" } turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230718.3" }
# [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-230718.2" } turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230718.3" }
# General Deps # General Deps
......
...@@ -38,7 +38,6 @@ use turbopack_binding::{ ...@@ -38,7 +38,6 @@ use turbopack_binding::{
environment::ServerAddr, environment::ServerAddr,
issue::{IssueContextExt, IssueReporter, IssueSeverity}, issue::{IssueContextExt, IssueReporter, IssueSeverity},
output::{OutputAsset, OutputAssets}, output::{OutputAsset, OutputAssets},
reference::AssetReference,
virtual_fs::VirtualFileSystem, virtual_fs::VirtualFileSystem,
}, },
dev::DevChunkingContext, dev::DevChunkingContext,
...@@ -560,27 +559,13 @@ async fn all_assets_from_entries(entries: Vc<OutputAssets>) -> Result<Vc<OutputA ...@@ -560,27 +559,13 @@ async fn all_assets_from_entries(entries: Vc<OutputAssets>) -> Result<Vc<OutputA
async fn get_referenced_assets( async fn get_referenced_assets(
asset: Vc<Box<dyn OutputAsset>>, asset: Vc<Box<dyn OutputAsset>>,
) -> Result<impl Iterator<Item = Vc<Box<dyn OutputAsset>>> + Send> { ) -> Result<impl Iterator<Item = Vc<Box<dyn OutputAsset>>> + Send> {
Ok( Ok(asset
asset .references()
.references() .await?
.await? .iter()
.iter() .copied()
.map(|reference| async move { .collect::<Vec<_>>()
let primary_assets = reference.resolve_reference().primary_assets().await?; .into_iter())
Ok(primary_assets.clone_value())
})
.try_join()
.await?
.into_iter()
.flatten()
.map(|asset| async move {
Ok(Vc::try_resolve_downcast::<Box<dyn OutputAsset>>(asset).await?)
})
.try_join()
.await?
.into_iter()
.flatten(),
)
} }
/// Writes a manifest to disk. This consumes the manifest to ensure we don't /// Writes a manifest to disk. This consumes the manifest to ensure we don't
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
"check": "tsc --noEmit" "check": "tsc --noEmit"
}, },
"dependencies": { "dependencies": {
"@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230718.2", "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230718.3",
"@vercel/turbopack-node": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230718.2", "@vercel/turbopack-node": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230718.3",
"anser": "^2.1.1", "anser": "^2.1.1",
"css.escape": "^1.5.1", "css.escape": "^1.5.1",
"next": "*", "next": "*",
......
...@@ -7,7 +7,6 @@ use turbo_tasks_fs::{rebase, FileSystemPath}; ...@@ -7,7 +7,6 @@ use turbo_tasks_fs::{rebase, FileSystemPath};
use turbopack_binding::turbopack::core::{ use turbopack_binding::turbopack::core::{
asset::Asset, asset::Asset,
output::{OutputAsset, OutputAssets}, output::{OutputAsset, OutputAssets},
reference::AssetReference,
}; };
/// Emits all assets transitively reachable from the given chunks, that are /// Emits all assets transitively reachable from the given chunks, that are
...@@ -89,25 +88,11 @@ async fn all_assets_from_entries(entries: Vc<OutputAssets>) -> Result<Vc<OutputA ...@@ -89,25 +88,11 @@ async fn all_assets_from_entries(entries: Vc<OutputAssets>) -> Result<Vc<OutputA
async fn get_referenced_assets( async fn get_referenced_assets(
asset: Vc<Box<dyn OutputAsset>>, asset: Vc<Box<dyn OutputAsset>>,
) -> Result<impl Iterator<Item = Vc<Box<dyn OutputAsset>>> + Send> { ) -> Result<impl Iterator<Item = Vc<Box<dyn OutputAsset>>> + Send> {
Ok( Ok(asset
asset .references()
.references() .await?
.await? .iter()
.iter() .copied()
.map(|reference| async move { .collect::<Vec<_>>()
let primary_assets = reference.resolve_reference().primary_assets().await?; .into_iter())
Ok(primary_assets.clone_value())
})
.try_join()
.await?
.into_iter()
.flatten()
.map(|asset| async move {
Ok(Vc::try_resolve_sidecast::<Box<dyn OutputAsset>>(asset).await?)
})
.try_join()
.await?
.into_iter()
.flatten(),
)
} }
...@@ -18,7 +18,7 @@ use turbopack_binding::{ ...@@ -18,7 +18,7 @@ use turbopack_binding::{
ident::AssetIdent, ident::AssetIdent,
module::Module, module::Module,
output::OutputAssets, output::OutputAssets,
reference::AssetReferences, reference::{AssetReferences, SingleAssetReference},
}, },
ecmascript::{ ecmascript::{
chunk::{ chunk::{
...@@ -218,8 +218,14 @@ impl ChunkItem for WithChunksChunkItem { ...@@ -218,8 +218,14 @@ impl ChunkItem for WithChunksChunkItem {
async fn references(self: Vc<Self>) -> Result<Vc<AssetReferences>> { async fn references(self: Vc<Self>) -> Result<Vc<AssetReferences>> {
let mut references = self.await?.inner.references().await?.clone_value(); let mut references = self.await?.inner.references().await?.clone_value();
let chunk_data_key = Vc::cell("chunk data".to_string());
for chunk_data in &*self.chunks_data().await? { for chunk_data in &*self.chunks_data().await? {
references.extend(chunk_data.references().await?.iter().copied()); references.extend(chunk_data.references().await?.iter().map(|&output_asset| {
Vc::upcast(SingleAssetReference::new(
Vc::upcast(output_asset),
chunk_data_key,
))
}));
} }
Ok(Vc::cell(references)) Ok(Vc::cell(references))
......
...@@ -232,8 +232,14 @@ impl ChunkItem for WithClientChunksChunkItem { ...@@ -232,8 +232,14 @@ impl ChunkItem for WithClientChunksChunkItem {
client_chunk, client_chunk,
))); )));
} }
let chunk_data_key = Vc::cell("chunk data".to_string());
for chunk_data in &*self.chunks_data().await? { for chunk_data in &*self.chunks_data().await? {
references.extend(chunk_data.references().await?.iter().copied()); references.extend(chunk_data.references().await?.iter().map(|&output_asset| {
Vc::upcast(SingleAssetReference::new(
Vc::upcast(output_asset),
chunk_data_key,
))
}));
} }
Ok(Vc::cell(references)) Ok(Vc::cell(references))
} }
......
...@@ -16,7 +16,6 @@ use turbopack_binding::{ ...@@ -16,7 +16,6 @@ use turbopack_binding::{
ident::AssetIdent, ident::AssetIdent,
module::Module, module::Module,
output::{OutputAsset, OutputAssets}, output::{OutputAsset, OutputAssets},
reference::{AssetReferences, SingleAssetReference},
reference_type::{EntryReferenceSubType, ReferenceType}, reference_type::{EntryReferenceSubType, ReferenceType},
source::Source, source::Source,
virtual_source::VirtualSource, virtual_source::VirtualSource,
...@@ -146,15 +145,12 @@ impl OutputAsset for PageLoaderAsset { ...@@ -146,15 +145,12 @@ impl OutputAsset for PageLoaderAsset {
} }
#[turbo_tasks::function] #[turbo_tasks::function]
async fn references(self: Vc<Self>) -> Result<Vc<AssetReferences>> { async fn references(self: Vc<Self>) -> Result<Vc<OutputAssets>> {
let chunks = self.get_page_chunks().await?; let chunks = self.get_page_chunks().await?;
let mut references = Vec::with_capacity(chunks.len()); let mut references = Vec::with_capacity(chunks.len());
for &chunk in chunks.iter() { for &chunk in chunks.iter() {
references.push(Vc::upcast(SingleAssetReference::new( references.push(chunk);
Vc::upcast(chunk),
page_loader_chunk_reference_description(),
)));
} }
for chunk_data in &*self.chunks_data().await? { for chunk_data in &*self.chunks_data().await? {
......
...@@ -994,8 +994,8 @@ importers: ...@@ -994,8 +994,8 @@ importers:
'@types/react': 18.2.7 '@types/react': 18.2.7
'@types/react-dom': 18.2.4 '@types/react-dom': 18.2.4
'@vercel/ncc': ^0.36.0 '@vercel/ncc': ^0.36.0
'@vercel/turbopack-ecmascript-runtime': https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230718.2 '@vercel/turbopack-ecmascript-runtime': https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230718.3
'@vercel/turbopack-node': https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230718.2 '@vercel/turbopack-node': https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230718.3
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
...@@ -1007,8 +1007,8 @@ importers: ...@@ -1007,8 +1007,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-ecmascript-runtime': '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230718.2_react-refresh@0.12.0' '@vercel/turbopack-ecmascript-runtime': '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230718.3_react-refresh@0.12.0'
'@vercel/turbopack-node': '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230718.2' '@vercel/turbopack-node': '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230718.3'
anser: 2.1.1 anser: 2.1.1
css.escape: 1.5.1 css.escape: 1.5.1
next: link:../../../../next next: link:../../../../next
...@@ -6153,7 +6153,7 @@ packages: ...@@ -6153,7 +6153,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.86.0 webpack: 5.86.0_@swc+core@1.3.55
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
...@@ -6912,7 +6912,6 @@ packages: ...@@ -6912,7 +6912,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.55: /@swc/core-darwin-x64/1.3.55:
...@@ -6921,7 +6920,6 @@ packages: ...@@ -6921,7 +6920,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.55: /@swc/core-linux-arm-gnueabihf/1.3.55:
...@@ -6930,7 +6928,6 @@ packages: ...@@ -6930,7 +6928,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.55: /@swc/core-linux-arm64-gnu/1.3.55:
...@@ -6939,7 +6936,6 @@ packages: ...@@ -6939,7 +6936,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.55: /@swc/core-linux-arm64-musl/1.3.55:
...@@ -6948,7 +6944,6 @@ packages: ...@@ -6948,7 +6944,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.55: /@swc/core-linux-x64-gnu/1.3.55:
...@@ -6957,7 +6952,6 @@ packages: ...@@ -6957,7 +6952,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.55: /@swc/core-linux-x64-musl/1.3.55:
...@@ -6966,7 +6960,6 @@ packages: ...@@ -6966,7 +6960,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.55: /@swc/core-win32-arm64-msvc/1.3.55:
...@@ -6975,7 +6968,6 @@ packages: ...@@ -6975,7 +6968,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.55: /@swc/core-win32-ia32-msvc/1.3.55:
...@@ -6984,7 +6976,6 @@ packages: ...@@ -6984,7 +6976,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.55: /@swc/core-win32-x64-msvc/1.3.55:
...@@ -6993,7 +6984,6 @@ packages: ...@@ -6993,7 +6984,6 @@ packages:
cpu: [x64] cpu: [x64]
os: [win32] os: [win32]
requiresBuild: true requiresBuild: true
dev: true
optional: true optional: true
/@swc/core/1.3.55_@swc+helpers@0.5.1: /@swc/core/1.3.55_@swc+helpers@0.5.1:
...@@ -7018,7 +7008,6 @@ packages: ...@@ -7018,7 +7008,6 @@ packages:
'@swc/core-win32-arm64-msvc': 1.3.55 '@swc/core-win32-arm64-msvc': 1.3.55
'@swc/core-win32-ia32-msvc': 1.3.55 '@swc/core-win32-ia32-msvc': 1.3.55
'@swc/core-win32-x64-msvc': 1.3.55 '@swc/core-win32-x64-msvc': 1.3.55
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==}
...@@ -23917,7 +23906,6 @@ packages: ...@@ -23917,7 +23906,6 @@ packages:
serialize-javascript: 6.0.1 serialize-javascript: 6.0.1
terser: 5.17.7 terser: 5.17.7
webpack: 5.86.0_@swc+core@1.3.55 webpack: 5.86.0_@swc+core@1.3.55
dev: true
/terser/5.10.0: /terser/5.10.0:
resolution: {integrity: sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==} resolution: {integrity: sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==}
...@@ -25274,7 +25262,6 @@ packages: ...@@ -25274,7 +25262,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==}
...@@ -25683,9 +25670,9 @@ packages: ...@@ -25683,9 +25670,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-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230718.2_react-refresh@0.12.0': '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230718.3_react-refresh@0.12.0':
resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230718.2} resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230718.3}
id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230718.2' id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230718.3'
name: '@vercel/turbopack-ecmascript-runtime' name: '@vercel/turbopack-ecmascript-runtime'
version: 0.0.0 version: 0.0.0
dependencies: dependencies:
...@@ -25696,8 +25683,8 @@ packages: ...@@ -25696,8 +25683,8 @@ packages:
- webpack - webpack
dev: false dev: false
'@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230718.2': '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230718.3':
resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230718.2} resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230718.3}
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