Unverified Commit 1717d1e9 authored by Tobias Koppers's avatar Tobias Koppers Committed by GitHub

Turbopack: Refactoring module references (#52930)

### What?

see https://github.com/vercel/turbo/pull/5572

### Why?

### How?
parent 84820c90
This diff is collapsed.
...@@ -44,11 +44,11 @@ swc_core = { version = "0.79.22" } ...@@ -44,11 +44,11 @@ swc_core = { version = "0.79.22" }
testing = { version = "0.33.21" } testing = { version = "0.33.21" }
# Turbo crates # Turbo crates
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230721.3" } turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230721.4" }
# [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-230721.3" } turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230721.4" }
# [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-230721.3" } turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230721.4" }
# General Deps # General Deps
......
...@@ -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-230721.3", "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230721.4",
"@vercel/turbopack-node": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230721.3", "@vercel/turbopack-node": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230721.4",
"anser": "^2.1.1", "anser": "^2.1.1",
"css.escape": "^1.5.1", "css.escape": "^1.5.1",
"next": "*", "next": "*",
......
...@@ -210,17 +210,17 @@ impl Issue for NextSegmentConfigParsingIssue { ...@@ -210,17 +210,17 @@ impl Issue for NextSegmentConfigParsingIssue {
#[turbo_tasks::function] #[turbo_tasks::function]
pub async fn parse_segment_config_from_source( pub async fn parse_segment_config_from_source(
module_asset: Vc<Box<dyn Module>>, module: Vc<Box<dyn Module>>,
source: Vc<Box<dyn Source>>, source: Vc<Box<dyn Source>>,
) -> Result<Vc<NextSegmentConfig>> { ) -> Result<Vc<NextSegmentConfig>> {
let Some(ecmascript_asset) = let Some(ecmascript_asset) =
Vc::try_resolve_downcast_type::<EcmascriptModuleAsset>(module_asset).await? Vc::try_resolve_downcast_type::<EcmascriptModuleAsset>(module).await?
else { else {
return Ok(Default::default()); return Ok(Default::default());
}; };
let ParseResult::Ok { let ParseResult::Ok {
program: Program::Module(module), program: Program::Module(module_ast),
eval_context, eval_context,
.. ..
} = &*ecmascript_asset.parse().await? } = &*ecmascript_asset.parse().await?
...@@ -230,7 +230,7 @@ pub async fn parse_segment_config_from_source( ...@@ -230,7 +230,7 @@ pub async fn parse_segment_config_from_source(
let mut config = NextSegmentConfig::default(); let mut config = NextSegmentConfig::default();
for item in &module.body { for item in &module_ast.body {
let Some(decl) = item let Some(decl) = item
.as_module_decl() .as_module_decl()
.and_then(|mod_decl| mod_decl.as_export_decl()) .and_then(|mod_decl| mod_decl.as_export_decl())
...@@ -245,7 +245,7 @@ pub async fn parse_segment_config_from_source( ...@@ -245,7 +245,7 @@ pub async fn parse_segment_config_from_source(
}; };
if let Some(init) = decl.init.as_ref() { if let Some(init) = decl.init.as_ref() {
parse_config_value(module_asset, source, &mut config, ident, init, eval_context); parse_config_value(module, source, &mut config, ident, init, eval_context);
} }
} }
} }
......
...@@ -135,7 +135,7 @@ pub async fn is_babel_loader_available(project_path: Vc<FileSystemPath>) -> Resu ...@@ -135,7 +135,7 @@ pub async fn is_babel_loader_available(project_path: Vc<FileSystemPath>) -> Resu
.cell(), .cell(),
), ),
); );
let assets = result.primary_assets().await?; let assets = result.primary_sources().await?;
Ok(Vc::cell(!assets.is_empty())) Ok(Vc::cell(!assets.is_empty()))
} }
......
...@@ -8,7 +8,7 @@ use turbopack_binding::turbopack::{ ...@@ -8,7 +8,7 @@ use turbopack_binding::turbopack::{
chunk::EvaluatableAsset, chunk::EvaluatableAsset,
context::AssetContext, context::AssetContext,
issue::{IssueSeverity, OptionIssueSource}, issue::{IssueSeverity, OptionIssueSource},
module::{convert_asset_to_module, Module}, module::Module,
reference_type::{EcmaScriptModulesReferenceSubType, InnerAssets, ReferenceType}, reference_type::{EcmaScriptModulesReferenceSubType, InnerAssets, ReferenceType},
resolve::parse::Request, resolve::parse::Request,
source::Source, source::Source,
...@@ -35,7 +35,7 @@ pub async fn route_bootstrap( ...@@ -35,7 +35,7 @@ pub async fn route_bootstrap(
// TODO: this is where you'd switch the route kind to the one you need // TODO: this is where you'd switch the route kind to the one you need
let route_module_kind = "app-route"; let route_module_kind = "app-route";
let resolved_route_module_asset = esm_resolve( let resolved_route_module = esm_resolve(
resolve_origin, resolve_origin,
Request::parse_string(format!( Request::parse_string(format!(
"next/dist/server/future/route-modules/{}/module", "next/dist/server/future/route-modules/{}/module",
...@@ -45,8 +45,8 @@ pub async fn route_bootstrap( ...@@ -45,8 +45,8 @@ pub async fn route_bootstrap(
OptionIssueSource::none(), OptionIssueSource::none(),
IssueSeverity::Error.cell(), IssueSeverity::Error.cell(),
); );
let route_module_asset = match *resolved_route_module_asset.first_asset().await? { let route_module = match *resolved_route_module.first_module().await? {
Some(a) => convert_asset_to_module(a), Some(module) => module,
None => bail!("could not find app asset"), None => bail!("could not find app asset"),
}; };
...@@ -56,7 +56,7 @@ pub async fn route_bootstrap( ...@@ -56,7 +56,7 @@ pub async fn route_bootstrap(
base_path, base_path,
bootstrap_asset, bootstrap_asset,
Vc::cell(indexmap! { Vc::cell(indexmap! {
"ROUTE_MODULE".to_string() => route_module_asset, "ROUTE_MODULE".to_string() => route_module,
}), }),
config, config,
)) ))
......
...@@ -7,7 +7,7 @@ use turbopack_binding::{ ...@@ -7,7 +7,7 @@ use turbopack_binding::{
chunk::{EvaluatableAsset, EvaluatableAssetExt, EvaluatableAssets}, chunk::{EvaluatableAsset, EvaluatableAssetExt, EvaluatableAssets},
context::AssetContext, context::AssetContext,
issue::{IssueSeverity, OptionIssueSource}, issue::{IssueSeverity, OptionIssueSource},
module::{convert_asset_to_module, Module}, module::Module,
resolve::{origin::PlainResolveOrigin, parse::Request}, resolve::{origin::PlainResolveOrigin, parse::Request},
source::Source, source::Source,
}, },
...@@ -37,26 +37,25 @@ impl RuntimeEntry { ...@@ -37,26 +37,25 @@ impl RuntimeEntry {
RuntimeEntry::Request(r, path) => (r, path), RuntimeEntry::Request(r, path) => (r, path),
}; };
let assets = cjs_resolve( let modules = cjs_resolve(
Vc::upcast(PlainResolveOrigin::new(context, path)), Vc::upcast(PlainResolveOrigin::new(context, path)),
request, request,
OptionIssueSource::none(), OptionIssueSource::none(),
IssueSeverity::Error.cell(), IssueSeverity::Error.cell(),
) )
.primary_assets() .primary_modules()
.await?; .await?;
let mut runtime_entries = Vec::with_capacity(assets.len()); let mut runtime_entries = Vec::with_capacity(modules.len());
for &asset in &assets { for &module in &modules {
if let Some(entry) = if let Some(entry) =
Vc::try_resolve_downcast::<Box<dyn EvaluatableAsset>>(asset).await? Vc::try_resolve_downcast::<Box<dyn EvaluatableAsset>>(module).await?
{ {
runtime_entries.push(entry); runtime_entries.push(entry);
} else { } else {
let asset = convert_asset_to_module(asset);
bail!( bail!(
"runtime reference resolved to an asset ({}) that cannot be evaluated", "runtime reference resolved to an asset ({}) that cannot be evaluated",
asset.ident().to_string().await? module.ident().to_string().await?
); );
} }
} }
......
...@@ -6,7 +6,7 @@ use turbopack_binding::turbopack::{ ...@@ -6,7 +6,7 @@ use turbopack_binding::turbopack::{
chunk::{availability_info::AvailabilityInfo, Chunk, ChunkableModule, ChunkingContext}, chunk::{availability_info::AvailabilityInfo, Chunk, ChunkableModule, ChunkingContext},
ident::AssetIdent, ident::AssetIdent,
module::Module, module::Module,
reference::AssetReferences, reference::ModuleReferences,
}, },
ecmascript::chunk::EcmascriptChunkingContext, ecmascript::chunk::EcmascriptChunkingContext,
turbopack::ecmascript::chunk::{ turbopack::ecmascript::chunk::{
...@@ -33,7 +33,7 @@ impl Module for InChunkingContextAsset { ...@@ -33,7 +33,7 @@ impl Module for InChunkingContextAsset {
} }
#[turbo_tasks::function] #[turbo_tasks::function]
fn references(&self) -> Vc<AssetReferences> { fn references(&self) -> Vc<ModuleReferences> {
self.asset.references() self.asset.references()
} }
} }
......
...@@ -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, SingleAssetReference}, reference::{ModuleReferences, SingleOutputAssetReference},
}, },
ecmascript::{ ecmascript::{
chunk::{ chunk::{
...@@ -82,7 +82,7 @@ impl Module for WithChunksAsset { ...@@ -82,7 +82,7 @@ impl Module for WithChunksAsset {
} }
#[turbo_tasks::function] #[turbo_tasks::function]
async fn references(self: Vc<Self>) -> Result<Vc<AssetReferences>> { async fn references(self: Vc<Self>) -> Result<Vc<ModuleReferences>> {
let this = self.await?; let this = self.await?;
let entry_chunk = self.entry_chunk(); let entry_chunk = self.entry_chunk();
...@@ -215,14 +215,14 @@ impl ChunkItem for WithChunksChunkItem { ...@@ -215,14 +215,14 @@ impl ChunkItem for WithChunksChunkItem {
} }
#[turbo_tasks::function] #[turbo_tasks::function]
async fn references(self: Vc<Self>) -> Result<Vc<AssetReferences>> { async fn references(self: Vc<Self>) -> Result<Vc<ModuleReferences>> {
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()); 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().map(|&output_asset| { references.extend(chunk_data.references().await?.iter().map(|&output_asset| {
Vc::upcast(SingleAssetReference::new( Vc::upcast(SingleOutputAssetReference::new(
Vc::upcast(output_asset), output_asset,
chunk_data_key, chunk_data_key,
)) ))
})); }));
......
...@@ -6,7 +6,7 @@ use turbopack_binding::turbopack::{ ...@@ -6,7 +6,7 @@ use turbopack_binding::turbopack::{
chunk::{availability_info::AvailabilityInfo, Chunk, ChunkableModule, ChunkingContext}, chunk::{availability_info::AvailabilityInfo, Chunk, ChunkableModule, ChunkingContext},
ident::AssetIdent, ident::AssetIdent,
module::Module, module::Module,
reference::AssetReferences, reference::ModuleReferences,
}, },
ecmascript::chunk::EcmascriptChunkingContext, ecmascript::chunk::EcmascriptChunkingContext,
turbopack::ecmascript::chunk::{ turbopack::ecmascript::chunk::{
...@@ -33,7 +33,7 @@ impl Module for WithChunkingContextScopeAsset { ...@@ -33,7 +33,7 @@ impl Module for WithChunkingContextScopeAsset {
} }
#[turbo_tasks::function] #[turbo_tasks::function]
fn references(&self) -> Vc<AssetReferences> { fn references(&self) -> Vc<ModuleReferences> {
self.asset.references() self.asset.references()
} }
} }
......
...@@ -15,8 +15,8 @@ use turbopack_binding::{ ...@@ -15,8 +15,8 @@ use turbopack_binding::{
module::Module, module::Module,
output::{OutputAsset, OutputAssets}, output::{OutputAsset, OutputAssets},
proxied_asset::ProxiedAsset, proxied_asset::ProxiedAsset,
reference::{AssetReference, AssetReferences, SingleAssetReference}, reference::{ModuleReference, ModuleReferences, SingleOutputAssetReference},
resolve::ResolveResult, resolve::ModuleResolveResult,
}, },
ecmascript::chunk::{EcmascriptChunkData, EcmascriptChunkItemExt}, ecmascript::chunk::{EcmascriptChunkData, EcmascriptChunkItemExt},
turbopack::ecmascript::{ turbopack::ecmascript::{
...@@ -48,7 +48,7 @@ impl Module for WithClientChunksAsset { ...@@ -48,7 +48,7 @@ impl Module for WithClientChunksAsset {
} }
#[turbo_tasks::function] #[turbo_tasks::function]
fn references(&self) -> Vc<AssetReferences> { fn references(&self) -> Vc<ModuleReferences> {
Vc::cell(vec![Vc::upcast( Vc::cell(vec![Vc::upcast(
WithClientChunksAssetReference { WithClientChunksAssetReference {
asset: Vc::upcast(self.asset), asset: Vc::upcast(self.asset),
...@@ -213,7 +213,7 @@ impl ChunkItem for WithClientChunksChunkItem { ...@@ -213,7 +213,7 @@ impl ChunkItem for WithClientChunksChunkItem {
} }
#[turbo_tasks::function] #[turbo_tasks::function]
async fn references(self: Vc<Self>) -> Result<Vc<AssetReferences>> { async fn references(self: Vc<Self>) -> Result<Vc<ModuleReferences>> {
let this = self.await?; let this = self.await?;
let inner = this.inner.await?; let inner = this.inner.await?;
let mut references = Vec::new(); let mut references = Vec::new();
...@@ -227,16 +227,16 @@ impl ChunkItem for WithClientChunksChunkItem { ...@@ -227,16 +227,16 @@ impl ChunkItem for WithClientChunksChunkItem {
let client_chunks = client_chunks.await?; let client_chunks = client_chunks.await?;
let client_chunk = Vc::cell("client chunk".to_string()); let client_chunk = Vc::cell("client chunk".to_string());
for &chunk in client_chunks.iter() { for &chunk in client_chunks.iter() {
references.push(Vc::upcast(SingleAssetReference::new( references.push(Vc::upcast(SingleOutputAssetReference::new(
Vc::upcast(chunk), chunk,
client_chunk, client_chunk,
))); )));
} }
let chunk_data_key = Vc::cell("chunk data".to_string()); 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().map(|&output_asset| { references.extend(chunk_data.references().await?.iter().map(|&output_asset| {
Vc::upcast(SingleAssetReference::new( Vc::upcast(SingleOutputAssetReference::new(
Vc::upcast(output_asset), output_asset,
chunk_data_key, chunk_data_key,
)) ))
})); }));
...@@ -262,10 +262,10 @@ impl ValueToString for WithClientChunksAssetReference { ...@@ -262,10 +262,10 @@ impl ValueToString for WithClientChunksAssetReference {
} }
#[turbo_tasks::value_impl] #[turbo_tasks::value_impl]
impl AssetReference for WithClientChunksAssetReference { impl ModuleReference for WithClientChunksAssetReference {
#[turbo_tasks::function] #[turbo_tasks::function]
fn resolve_reference(&self) -> Vc<ResolveResult> { fn resolve_reference(&self) -> Vc<ModuleResolveResult> {
ResolveResult::asset(Vc::upcast(self.asset)).cell() ModuleResolveResult::module(self.asset).cell()
} }
} }
......
...@@ -5,7 +5,6 @@ use turbopack_binding::turbopack::{ ...@@ -5,7 +5,6 @@ use turbopack_binding::turbopack::{
asset::{Asset, AssetContent}, asset::{Asset, AssetContent},
ident::AssetIdent, ident::AssetIdent,
module::Module, module::Module,
reference::AssetReferences,
}, },
turbopack::css::{chunk::CssChunkPlaceable, ParseCss, ParseCssResult}, turbopack::css::{chunk::CssChunkPlaceable, ParseCss, ParseCssResult},
}; };
...@@ -40,11 +39,6 @@ impl Module for CssClientReferenceModule { ...@@ -40,11 +39,6 @@ impl Module for CssClientReferenceModule {
.ident() .ident()
.with_modifier(css_client_reference_modifier()) .with_modifier(css_client_reference_modifier())
} }
#[turbo_tasks::function]
fn references(self: Vc<Self>) -> Vc<AssetReferences> {
AssetReferences::empty()
}
} }
#[turbo_tasks::value_impl] #[turbo_tasks::value_impl]
......
...@@ -5,7 +5,6 @@ use turbopack_binding::turbopack::{ ...@@ -5,7 +5,6 @@ use turbopack_binding::turbopack::{
asset::{Asset, AssetContent}, asset::{Asset, AssetContent},
ident::AssetIdent, ident::AssetIdent,
module::Module, module::Module,
reference::AssetReferences,
}, },
ecmascript::chunk::EcmascriptChunkPlaceable, ecmascript::chunk::EcmascriptChunkPlaceable,
}; };
...@@ -57,11 +56,6 @@ impl Module for EcmascriptClientReferenceModule { ...@@ -57,11 +56,6 @@ impl Module for EcmascriptClientReferenceModule {
self.server_ident self.server_ident
.with_modifier(ecmascript_client_reference_modifier()) .with_modifier(ecmascript_client_reference_modifier())
} }
#[turbo_tasks::function]
fn references(self: Vc<Self>) -> Vc<AssetReferences> {
AssetReferences::empty()
}
} }
#[turbo_tasks::value_impl] #[turbo_tasks::value_impl]
......
...@@ -14,7 +14,7 @@ use turbopack_binding::turbopack::{ ...@@ -14,7 +14,7 @@ use turbopack_binding::turbopack::{
context::AssetContext, context::AssetContext,
ident::AssetIdent, ident::AssetIdent,
module::Module, module::Module,
reference::{AssetReferences, SingleAssetReference}, reference::{ModuleReferences, SingleModuleReference},
reference_type::ReferenceType, reference_type::ReferenceType,
virtual_source::VirtualSource, virtual_source::VirtualSource,
}, },
...@@ -67,7 +67,7 @@ impl EcmascriptClientReferenceProxyModule { ...@@ -67,7 +67,7 @@ impl EcmascriptClientReferenceProxyModule {
} }
#[turbo_tasks::function] #[turbo_tasks::function]
async fn proxy_module_asset(self: Vc<Self>) -> Result<Vc<EcmascriptModuleAsset>> { async fn proxy_module(self: Vc<Self>) -> Result<Vc<EcmascriptModuleAsset>> {
let this = self.await?; let this = self.await?;
let mut code = CodeBuilder::default(); let mut code = CodeBuilder::default();
...@@ -93,12 +93,12 @@ impl EcmascriptClientReferenceProxyModule { ...@@ -93,12 +93,12 @@ impl EcmascriptClientReferenceProxyModule {
)?; )?;
let code = code.build(); let code = code.build();
let proxy_module_asset_content = let proxy_module_content =
AssetContent::file(File::from(code.source_code().clone()).into()); AssetContent::file(File::from(code.source_code().clone()).into());
let proxy_source = VirtualSource::new( let proxy_source = VirtualSource::new(
this.server_module_ident.path().join("proxy.ts".to_string()), this.server_module_ident.path().join("proxy.ts".to_string()),
proxy_module_asset_content, proxy_module_content,
); );
let proxy_module = this.server_asset_context.process( let proxy_module = this.server_asset_context.process(
...@@ -125,7 +125,7 @@ impl Module for EcmascriptClientReferenceProxyModule { ...@@ -125,7 +125,7 @@ impl Module for EcmascriptClientReferenceProxyModule {
} }
#[turbo_tasks::function] #[turbo_tasks::function]
async fn references(self: Vc<Self>) -> Result<Vc<AssetReferences>> { async fn references(self: Vc<Self>) -> Result<Vc<ModuleReferences>> {
let EcmascriptClientReferenceProxyModule { let EcmascriptClientReferenceProxyModule {
server_module_ident, server_module_ident,
server_asset_context: _, server_asset_context: _,
...@@ -134,12 +134,12 @@ impl Module for EcmascriptClientReferenceProxyModule { ...@@ -134,12 +134,12 @@ impl Module for EcmascriptClientReferenceProxyModule {
} = &*self.await?; } = &*self.await?;
let references: Vec<_> = self let references: Vec<_> = self
.proxy_module_asset() .proxy_module()
.references() .references()
.await? .await?
.iter() .iter()
.copied() .copied()
.chain(once(Vc::upcast(SingleAssetReference::new( .chain(once(Vc::upcast(SingleModuleReference::new(
Vc::upcast(EcmascriptClientReferenceModule::new( Vc::upcast(EcmascriptClientReferenceModule::new(
*server_module_ident, *server_module_ident,
*client_module, *client_module,
...@@ -187,9 +187,7 @@ impl EcmascriptChunkPlaceable for EcmascriptClientReferenceProxyModule { ...@@ -187,9 +187,7 @@ impl EcmascriptChunkPlaceable for EcmascriptClientReferenceProxyModule {
Vc::upcast( Vc::upcast(
ProxyModuleChunkItem { ProxyModuleChunkItem {
client_proxy_asset: self, client_proxy_asset: self,
inner_proxy_module_chunk_item: self inner_proxy_module_chunk_item: self.proxy_module().as_chunk_item(chunking_context),
.proxy_module_asset()
.as_chunk_item(chunking_context),
chunking_context, chunking_context,
} }
.cell(), .cell(),
...@@ -198,7 +196,7 @@ impl EcmascriptChunkPlaceable for EcmascriptClientReferenceProxyModule { ...@@ -198,7 +196,7 @@ impl EcmascriptChunkPlaceable for EcmascriptClientReferenceProxyModule {
#[turbo_tasks::function] #[turbo_tasks::function]
fn get_exports(self: Vc<Self>) -> Vc<EcmascriptExports> { fn get_exports(self: Vc<Self>) -> Vc<EcmascriptExports> {
self.proxy_module_asset().get_exports() self.proxy_module().get_exports()
} }
} }
...@@ -231,7 +229,7 @@ impl ChunkItem for ProxyModuleChunkItem { ...@@ -231,7 +229,7 @@ impl ChunkItem for ProxyModuleChunkItem {
} }
#[turbo_tasks::function] #[turbo_tasks::function]
fn references(&self) -> Vc<AssetReferences> { fn references(&self) -> Vc<ModuleReferences> {
self.client_proxy_asset.references() self.client_proxy_asset.references()
} }
} }
......
...@@ -10,8 +10,8 @@ use turbo_tasks::{ ...@@ -10,8 +10,8 @@ use turbo_tasks::{
TryJoinIterExt, Vc, TryJoinIterExt, Vc,
}; };
use turbopack_binding::turbopack::core::{ use turbopack_binding::turbopack::core::{
module::{convert_asset_to_module, Module, Modules}, module::{Module, Modules},
reference::AssetReference, reference::ModuleReference,
}; };
use super::{ use super::{
...@@ -175,12 +175,8 @@ impl Visit<VisitClientReferenceNode> for VisitClientReference { ...@@ -175,12 +175,8 @@ impl Visit<VisitClientReferenceNode> for VisitClientReference {
.copied() .copied()
.map(|reference| async move { .map(|reference| async move {
let resolve_result = reference.resolve_reference(); let resolve_result = reference.resolve_reference();
let assets = resolve_result.primary_assets().await?; let assets = resolve_result.primary_modules().await?;
Ok(assets Ok(assets.clone_value())
.iter()
.copied()
.map(convert_asset_to_module)
.collect::<Vec<_>>())
}) })
.try_join() .try_join()
.await?; .await?;
......
...@@ -6,7 +6,7 @@ use turbopack_binding::turbopack::core::{ ...@@ -6,7 +6,7 @@ use turbopack_binding::turbopack::core::{
ident::AssetIdent, ident::AssetIdent,
module::Module, module::Module,
output::OutputAssets, output::OutputAssets,
reference::AssetReferences, reference::ModuleReferences,
}; };
/// A [`NextDynamicEntryModule`] is a marker asset used to indicate which /// A [`NextDynamicEntryModule`] is a marker asset used to indicate which
...@@ -61,8 +61,8 @@ impl Module for NextDynamicEntryModule { ...@@ -61,8 +61,8 @@ impl Module for NextDynamicEntryModule {
} }
#[turbo_tasks::function] #[turbo_tasks::function]
fn references(self: Vc<Self>) -> Vc<AssetReferences> { fn references(self: Vc<Self>) -> Vc<ModuleReferences> {
AssetReferences::empty() ModuleReferences::empty()
} }
} }
......
...@@ -6,8 +6,8 @@ use turbo_tasks::{ ...@@ -6,8 +6,8 @@ use turbo_tasks::{
TryJoinIterExt, Vc, TryJoinIterExt, Vc,
}; };
use turbopack_binding::turbopack::core::{ use turbopack_binding::turbopack::core::{
module::{convert_asset_to_module, Module, Modules}, module::{Module, Modules},
reference::AssetReference, reference::ModuleReference,
}; };
use super::NextDynamicEntryModule; use super::NextDynamicEntryModule;
...@@ -88,12 +88,8 @@ impl Visit<VisitDynamicNode> for VisitDynamic { ...@@ -88,12 +88,8 @@ impl Visit<VisitDynamicNode> for VisitDynamic {
.copied() .copied()
.map(|reference| async move { .map(|reference| async move {
let resolve_result = reference.resolve_reference(); let resolve_result = reference.resolve_reference();
let assets = resolve_result.primary_assets().await?; let assets = resolve_result.primary_modules().await?;
Ok(assets Ok(assets.clone_value())
.iter()
.copied()
.map(convert_asset_to_module)
.collect::<Vec<_>>())
}) })
.try_join() .try_join()
.await?; .await?;
......
...@@ -154,7 +154,7 @@ impl ImportMappingReplacement for NextFontGoogleReplacer { ...@@ -154,7 +154,7 @@ impl ImportMappingReplacement for NextFontGoogleReplacer {
.into()), .into()),
); );
Ok(ImportMapResult::Result(ResolveResult::asset(Vc::upcast(js_asset)).into()).into()) Ok(ImportMapResult::Result(ResolveResult::source(Vc::upcast(js_asset)).into()).into())
} }
} }
...@@ -260,7 +260,7 @@ impl ImportMappingReplacement for NextFontGoogleCssModuleReplacer { ...@@ -260,7 +260,7 @@ impl ImportMappingReplacement for NextFontGoogleCssModuleReplacer {
), ),
); );
Ok(ImportMapResult::Result(ResolveResult::asset(Vc::upcast(css_asset)).into()).into()) Ok(ImportMapResult::Result(ResolveResult::source(Vc::upcast(css_asset)).into()).into())
} }
} }
......
...@@ -120,7 +120,7 @@ impl ImportMappingReplacement for NextFontLocalReplacer { ...@@ -120,7 +120,7 @@ impl ImportMappingReplacement for NextFontLocalReplacer {
AssetContent::file(FileContent::Content(file_content.into()).into()), AssetContent::file(FileContent::Content(file_content.into()).into()),
); );
Ok(ImportMapResult::Result(ResolveResult::asset(Vc::upcast(js_asset)).into()).into()) Ok(ImportMapResult::Result(ResolveResult::source(Vc::upcast(js_asset)).into()).into())
} }
} }
...@@ -185,7 +185,7 @@ impl ImportMappingReplacement for NextFontLocalCssModuleReplacer { ...@@ -185,7 +185,7 @@ impl ImportMappingReplacement for NextFontLocalCssModuleReplacer {
AssetContent::file(FileContent::Content(stylesheet.into()).into()), AssetContent::file(FileContent::Content(stylesheet.into()).into()),
); );
Ok(ImportMapResult::Result(ResolveResult::asset(Vc::upcast(css_asset)).into()).into()) Ok(ImportMapResult::Result(ResolveResult::source(Vc::upcast(css_asset)).into()).into())
} }
} }
......
...@@ -12,7 +12,7 @@ use turbopack_binding::{ ...@@ -12,7 +12,7 @@ use turbopack_binding::{
pattern::Pattern, pattern::Pattern,
resolve, AliasPattern, ResolveAliasMap, SubpathValue, resolve, AliasPattern, ResolveAliasMap, SubpathValue,
}, },
source::{asset_to_source, Source}, source::Source,
}, },
node::execution_context::ExecutionContext, node::execution_context::ExecutionContext,
turbopack::{resolve_options, resolve_options_context::ResolveOptionsContext}, turbopack::{resolve_options, resolve_options_context::ResolveOptionsContext},
...@@ -628,9 +628,8 @@ pub async fn get_next_package(project_path: Vc<FileSystemPath>) -> Result<Vc<Fil ...@@ -628,9 +628,8 @@ pub async fn get_next_package(project_path: Vc<FileSystemPath>) -> Result<Vc<Fil
))), ))),
package_lookup_resolve_options(project_path), package_lookup_resolve_options(project_path),
); );
let assets = result.primary_assets().await?; let assets = result.primary_sources().await?;
let asset = *assets.first().context("Next.js package not found")?; let asset = *assets.first().context("Next.js package not found")?;
let asset = asset_to_source(asset);
Ok(asset.ident().path().parent()) Ok(asset.ident().path().parent())
} }
......
...@@ -11,10 +11,9 @@ use turbopack_binding::{ ...@@ -11,10 +11,9 @@ use turbopack_binding::{
package_json, package_json,
parse::Request, parse::Request,
plugin::{ResolvePlugin, ResolvePluginCondition}, plugin::{ResolvePlugin, ResolvePluginCondition},
resolve, FindContextFileResult, PrimaryResolveResult, ResolveResult, resolve, FindContextFileResult, ResolveResult, ResolveResultItem, ResolveResultOption,
ResolveResultOption,
}, },
source::{asset_to_source, Source}, source::Source,
}, },
}; };
...@@ -53,12 +52,11 @@ async fn is_node_resolveable( ...@@ -53,12 +52,11 @@ async fn is_node_resolveable(
expected: Vc<FileSystemPath>, expected: Vc<FileSystemPath>,
) -> Result<Vc<bool>> { ) -> Result<Vc<bool>> {
let node_resolve_result = resolve(context, request, node_cjs_resolve_options(context.root())); let node_resolve_result = resolve(context, request, node_cjs_resolve_options(context.root()));
let primary_node_assets = node_resolve_result.primary_assets().await?; let primary_node_assets = node_resolve_result.primary_sources().await?;
let Some(&node_asset) = primary_node_assets.first() else { let Some(&node_asset) = primary_node_assets.first() else {
// can't resolve request with node.js options // can't resolve request with node.js options
return Ok(Vc::cell(false)); return Ok(Vc::cell(false));
}; };
let node_asset = asset_to_source(node_asset);
if node_asset.ident().path().resolve().await? != expected.resolve().await? { if node_asset.ident().path().resolve().await? != expected.resolve().await? {
// node.js resolves to a different file // node.js resolves to a different file
...@@ -146,7 +144,7 @@ impl ResolvePlugin for ExternalCjsModulesResolvePlugin { ...@@ -146,7 +144,7 @@ impl ResolvePlugin for ExternalCjsModulesResolvePlugin {
if *is_node_resolveable(self.root.root(), request, fs_path).await? { if *is_node_resolveable(self.root.root(), request, fs_path).await? {
// mark as external // mark as external
return Ok(ResolveResultOption::some( return Ok(ResolveResultOption::some(
ResolveResult::primary(PrimaryResolveResult::OriginalReferenceExternal).cell(), ResolveResult::primary(ResolveResultItem::OriginalReferenceExternal).cell(),
)); ));
} }
...@@ -163,11 +161,9 @@ impl ResolvePlugin for ExternalCjsModulesResolvePlugin { ...@@ -163,11 +161,9 @@ impl ResolvePlugin for ExternalCjsModulesResolvePlugin {
if *is_node_resolveable(context, request, fs_path).await? { if *is_node_resolveable(context, request, fs_path).await? {
// mark as external // mark as external
return Ok(ResolveResultOption::some( return Ok(ResolveResultOption::some(
ResolveResult::primary( ResolveResult::primary(ResolveResultItem::OriginalReferenceTypeExternal(
PrimaryResolveResult::OriginalReferenceTypeExternal( import_path.as_str().to_string(),
import_path.as_str().to_string(), ))
),
)
.cell(), .cell(),
)); ));
} }
......
...@@ -10,7 +10,7 @@ use turbopack_binding::turbopack::{ ...@@ -10,7 +10,7 @@ use turbopack_binding::turbopack::{
}, },
ident::AssetIdent, ident::AssetIdent,
module::Module, module::Module,
reference::{AssetReference, AssetReferences}, reference::ModuleReferences,
}, },
ecmascript::chunk::EcmascriptChunkItemExt, ecmascript::chunk::EcmascriptChunkItemExt,
turbopack::ecmascript::{ turbopack::ecmascript::{
...@@ -56,11 +56,10 @@ impl Module for NextServerComponentModule { ...@@ -56,11 +56,10 @@ impl Module for NextServerComponentModule {
} }
#[turbo_tasks::function] #[turbo_tasks::function]
fn references(&self) -> Vc<AssetReferences> { fn references(&self) -> Vc<ModuleReferences> {
let references: Vec<Vc<Box<dyn AssetReference>>> = vec![Vc::upcast( Vc::cell(vec![Vc::upcast(NextServerComponentModuleReference::new(
NextServerComponentModuleReference::new(Vc::upcast(self.module)), Vc::upcast(self.module),
)]; ))])
Vc::cell(references)
} }
} }
...@@ -154,7 +153,7 @@ impl ChunkItem for BuildServerComponentChunkItem { ...@@ -154,7 +153,7 @@ impl ChunkItem for BuildServerComponentChunkItem {
} }
#[turbo_tasks::function] #[turbo_tasks::function]
fn references(&self) -> Vc<AssetReferences> { fn references(&self) -> Vc<ModuleReferences> {
self.inner.references() self.inner.references()
} }
} }
...@@ -3,8 +3,8 @@ use turbo_tasks::{ValueToString, Vc}; ...@@ -3,8 +3,8 @@ use turbo_tasks::{ValueToString, Vc};
use turbopack_binding::turbopack::core::{ use turbopack_binding::turbopack::core::{
chunk::{ChunkableModuleReference, ChunkingType, ChunkingTypeOption}, chunk::{ChunkableModuleReference, ChunkingType, ChunkingTypeOption},
module::Module, module::Module,
reference::AssetReference, reference::ModuleReference,
resolve::ResolveResult, resolve::ModuleResolveResult,
}; };
#[turbo_tasks::value] #[turbo_tasks::value]
...@@ -32,10 +32,10 @@ impl ValueToString for NextServerComponentModuleReference { ...@@ -32,10 +32,10 @@ impl ValueToString for NextServerComponentModuleReference {
} }
#[turbo_tasks::value_impl] #[turbo_tasks::value_impl]
impl AssetReference for NextServerComponentModuleReference { impl ModuleReference for NextServerComponentModuleReference {
#[turbo_tasks::function] #[turbo_tasks::function]
fn resolve_reference(&self) -> Vc<ResolveResult> { fn resolve_reference(&self) -> Vc<ModuleResolveResult> {
ResolveResult::asset(Vc::upcast(self.asset)).cell() ModuleResolveResult::module(self.asset).cell()
} }
} }
......
...@@ -43,7 +43,7 @@ pub async fn get_swc_ecma_transform_plugin_impl( ...@@ -43,7 +43,7 @@ pub async fn get_swc_ecma_transform_plugin_impl(
reference_type::ReferenceType, reference_type::ReferenceType,
resolve::{ resolve::{
handle_resolve_error, parse::Request, pattern::Pattern, resolve, handle_resolve_error, parse::Request, pattern::Pattern, resolve,
PrimaryResolveResult, ModuleResolveResultItem,
}, },
}, },
ecmascript_plugin::transform::swc_ecma_transform_plugins::{ ecmascript_plugin::transform::swc_ecma_transform_plugins::{
...@@ -71,7 +71,7 @@ pub async fn get_swc_ecma_transform_plugin_impl( ...@@ -71,7 +71,7 @@ pub async fn get_swc_ecma_transform_plugin_impl(
); );
let plugin_wasm_module_resolve_result = handle_resolve_error( let plugin_wasm_module_resolve_result = handle_resolve_error(
resolve(project_path, request, resolve_options), resolve(project_path, request, resolve_options).as_raw_module_result(),
Value::new(ReferenceType::Undefined), Value::new(ReferenceType::Undefined),
project_path, project_path,
request, request,
...@@ -80,18 +80,11 @@ pub async fn get_swc_ecma_transform_plugin_impl( ...@@ -80,18 +80,11 @@ pub async fn get_swc_ecma_transform_plugin_impl(
IssueSeverity::Error.cell(), IssueSeverity::Error.cell(),
) )
.await?; .await?;
let plugin_wasm_module_resolve_result = &*plugin_wasm_module_resolve_result.await?; let Some(plugin_module) = *plugin_wasm_module_resolve_result.first_module().await? else {
bail!("Expected to find module");
let primary = plugin_wasm_module_resolve_result
.primary
.first()
.context("Unable to resolve primary context")?;
let PrimaryResolveResult::Asset(plugin_module_asset) = primary else {
bail!("Expected to find asset");
}; };
let content = &*plugin_module_asset.content().file_content().await?; let content = &*plugin_module.content().file_content().await?;
let FileContent::Content(file) = content else { let FileContent::Content(file) = content else {
bail!("Expected file content for plugin module"); bail!("Expected file content for plugin module");
......
...@@ -24,7 +24,7 @@ pub async fn resolve_runtime_request( ...@@ -24,7 +24,7 @@ pub async fn resolve_runtime_request(
OptionIssueSource::none(), OptionIssueSource::none(),
IssueSeverity::Error.cell(), IssueSeverity::Error.cell(),
) )
.first_asset() .first_module()
.await? .await?
{ {
if let Some(placeable) = if let Some(placeable) =
......
use anyhow::{bail, Context, Result}; use anyhow::{bail, Result};
use serde::{de::DeserializeOwned, Deserialize, Serialize}; use serde::{de::DeserializeOwned, Deserialize, Serialize};
use serde_json::Value as JsonValue; use serde_json::Value as JsonValue;
use swc_core::ecma::ast::Program; use swc_core::ecma::ast::Program;
...@@ -13,12 +13,7 @@ use turbopack_binding::{ ...@@ -13,12 +13,7 @@ use turbopack_binding::{
issue::{Issue, IssueExt, IssueSeverity, OptionIssueSource}, issue::{Issue, IssueExt, IssueSeverity, OptionIssueSource},
module::Module, module::Module,
reference_type::{EcmaScriptModulesReferenceSubType, ReferenceType}, reference_type::{EcmaScriptModulesReferenceSubType, ReferenceType},
resolve::{ resolve::{self, handle_resolve_error, node::node_cjs_resolve_options, parse::Request},
handle_resolve_error,
node::node_cjs_resolve_options,
parse::Request,
PrimaryResolveResult, {self},
},
}, },
ecmascript::{ ecmascript::{
analyzer::{JsValue, ObjectPart}, analyzer::{JsValue, ObjectPart},
...@@ -228,15 +223,12 @@ pub async fn parse_config_from_source(module: Vc<Box<dyn Module>>) -> Result<Vc< ...@@ -228,15 +223,12 @@ pub async fn parse_config_from_source(module: Vc<Box<dyn Module>>) -> Result<Vc<
Ok(Default::default()) Ok(Default::default())
} }
fn parse_config_from_js_value( fn parse_config_from_js_value(module: Vc<Box<dyn Module>>, value: &JsValue) -> NextSourceConfig {
module_asset: Vc<Box<dyn Module>>,
value: &JsValue,
) -> NextSourceConfig {
let mut config = NextSourceConfig::default(); let mut config = NextSourceConfig::default();
let invalid_config = |detail: &str, value: &JsValue| { let invalid_config = |detail: &str, value: &JsValue| {
let (explainer, hints) = value.explain(2, 0); let (explainer, hints) = value.explain(2, 0);
NextSourceConfigParsingIssue { NextSourceConfigParsingIssue {
ident: module_asset.ident(), ident: module.ident(),
detail: Vc::cell(format!("{detail} Got {explainer}.{hints}")), detail: Vc::cell(format!("{detail} Got {explainer}.{hints}")),
} }
.cell() .cell()
...@@ -342,7 +334,7 @@ pub async fn load_next_json<T: DeserializeOwned>( ...@@ -342,7 +334,7 @@ pub async fn load_next_json<T: DeserializeOwned>(
let resolve_options = node_cjs_resolve_options(context.root()); let resolve_options = node_cjs_resolve_options(context.root());
let resolve_result = handle_resolve_error( let resolve_result = handle_resolve_error(
resolve::resolve(context, request, resolve_options), resolve::resolve(context, request, resolve_options).as_raw_module_result(),
Value::new(ReferenceType::EcmaScriptModules( Value::new(ReferenceType::EcmaScriptModules(
EcmaScriptModulesReferenceSubType::Undefined, EcmaScriptModulesReferenceSubType::Undefined,
)), )),
...@@ -353,15 +345,8 @@ pub async fn load_next_json<T: DeserializeOwned>( ...@@ -353,15 +345,8 @@ pub async fn load_next_json<T: DeserializeOwned>(
IssueSeverity::Error.cell(), IssueSeverity::Error.cell(),
) )
.await?; .await?;
let resolve_result = &*resolve_result.await?; let Some(metrics_asset) = *resolve_result.first_module().await? else {
bail!("Expected to find module");
let primary = resolve_result
.primary
.first()
.context("Unable to resolve primary asset")?;
let PrimaryResolveResult::Asset(metrics_asset) = primary else {
bail!("Expected to find asset");
}; };
let content = &*metrics_asset.content().file_content().await?; let content = &*metrics_asset.content().file_content().await?;
......
...@@ -201,7 +201,7 @@ pub async fn create_web_entry_source( ...@@ -201,7 +201,7 @@ pub async fn create_web_entry_source(
let ty = Value::new(ReferenceType::Entry(EntryReferenceSubType::Web)); let ty = Value::new(ReferenceType::Entry(EntryReferenceSubType::Web));
Ok(origin Ok(origin
.resolve_asset(request, origin.resolve_options(ty.clone()), ty) .resolve_asset(request, origin.resolve_options(ty.clone()), ty)
.primary_assets() .primary_modules()
.await? .await?
.first() .first()
.copied()) .copied())
......
...@@ -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-230721.3 '@vercel/turbopack-ecmascript-runtime': https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230721.4
'@vercel/turbopack-node': https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230721.3 '@vercel/turbopack-node': https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230721.4
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-230721.3_react-refresh@0.12.0' '@vercel/turbopack-ecmascript-runtime': '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230721.4_react-refresh@0.12.0'
'@vercel/turbopack-node': '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230721.3' '@vercel/turbopack-node': '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230721.4'
anser: 2.1.1 anser: 2.1.1
css.escape: 1.5.1 css.escape: 1.5.1
next: link:../../../../next next: link:../../../../next
...@@ -25518,9 +25518,9 @@ packages: ...@@ -25518,9 +25518,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-230721.3_react-refresh@0.12.0': '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230721.4_react-refresh@0.12.0':
resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230721.3} resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230721.4}
id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230721.3' id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230721.4'
name: '@vercel/turbopack-ecmascript-runtime' name: '@vercel/turbopack-ecmascript-runtime'
version: 0.0.0 version: 0.0.0
dependencies: dependencies:
...@@ -25531,8 +25531,8 @@ packages: ...@@ -25531,8 +25531,8 @@ packages:
- webpack - webpack
dev: false dev: false
'@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230721.3': '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230721.4':
resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230721.3} resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230721.4}
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