Unverified Commit 81d5dadd authored by Will Binns-Smith's avatar Will Binns-Smith Committed by GitHub

Turbopack: Remove `EcmascriptChunkingContext` (#65716)

Depends on vercel/turbo#8133. See that PR for rationale.
parent f628aa65
This diff is collapsed.
...@@ -37,11 +37,11 @@ swc_core = { version = "0.90.33", features = [ ...@@ -37,11 +37,11 @@ swc_core = { version = "0.90.33", features = [
testing = { version = "0.35.22" } testing = { version = "0.35.22" }
# Turbo crates # Turbo crates
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240513.1" } turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240514.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-240513.1" } turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240514.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-240513.1" } turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240514.2" }
# General Deps # General Deps
......
...@@ -27,10 +27,7 @@ use turbopack_binding::{ ...@@ -27,10 +27,7 @@ use turbopack_binding::{
reference_type::EcmaScriptModulesReferenceSubType, reference_type::EcmaScriptModulesReferenceSubType,
resolve::{origin::PlainResolveOrigin, parse::Request, pattern::Pattern}, resolve::{origin::PlainResolveOrigin, parse::Request, pattern::Pattern},
}, },
ecmascript::{ ecmascript::{parse::ParseResult, resolve::esm_resolve, EcmascriptModuleAsset},
chunk::EcmascriptChunkingContext, parse::ParseResult, resolve::esm_resolve,
EcmascriptModuleAsset,
},
}, },
}; };
...@@ -91,7 +88,7 @@ pub(crate) async fn collect_chunk_group( ...@@ -91,7 +88,7 @@ pub(crate) async fn collect_chunk_group(
} }
pub(crate) async fn collect_evaluated_chunk_group( pub(crate) async fn collect_evaluated_chunk_group(
chunking_context: Vc<Box<dyn EcmascriptChunkingContext>>, chunking_context: Vc<Box<dyn ChunkingContext>>,
dynamic_import_entries: IndexMap<Vc<Box<dyn Module>>, DynamicImportedModules>, dynamic_import_entries: IndexMap<Vc<Box<dyn Module>>, DynamicImportedModules>,
) -> Result<Vc<DynamicImportedChunks>> { ) -> Result<Vc<DynamicImportedChunks>> {
collect_chunk_group_inner(dynamic_import_entries, |module| async move { collect_chunk_group_inner(dynamic_import_entries, |module| async move {
......
...@@ -34,7 +34,10 @@ use turbopack_binding::{ ...@@ -34,7 +34,10 @@ use turbopack_binding::{
turbopack::{ turbopack::{
core::{ core::{
asset::AssetContent, asset::AssetContent,
chunk::{availability_info::AvailabilityInfo, ChunkingContextExt, EvaluatableAssets}, chunk::{
availability_info::AvailabilityInfo, ChunkingContext, ChunkingContextExt,
EvaluatableAssets,
},
context::AssetContext, context::AssetContext,
file_source::FileSource, file_source::FileSource,
issue::IssueSeverity, issue::IssueSeverity,
...@@ -48,9 +51,7 @@ use turbopack_binding::{ ...@@ -48,9 +51,7 @@ use turbopack_binding::{
virtual_output::VirtualOutputAsset, virtual_output::VirtualOutputAsset,
}, },
ecmascript::{ ecmascript::{
chunk::{EcmascriptChunkPlaceable, EcmascriptChunkingContext}, chunk::EcmascriptChunkPlaceable, resolve::esm_resolve, EcmascriptModuleAsset,
resolve::esm_resolve,
EcmascriptModuleAsset,
}, },
nodejs::{EntryChunkGroupResult, NodeJsChunkingContext}, nodejs::{EntryChunkGroupResult, NodeJsChunkingContext},
turbopack::{ turbopack::{
...@@ -705,7 +706,7 @@ impl PageEndpoint { ...@@ -705,7 +706,7 @@ impl PageEndpoint {
module_context: Vc<ModuleAssetContext>, module_context: Vc<ModuleAssetContext>,
edge_module_context: Vc<ModuleAssetContext>, edge_module_context: Vc<ModuleAssetContext>,
chunking_context: Vc<NodeJsChunkingContext>, chunking_context: Vc<NodeJsChunkingContext>,
edge_chunking_context: Vc<Box<dyn EcmascriptChunkingContext>>, edge_chunking_context: Vc<Box<dyn ChunkingContext>>,
runtime_entries: Vc<EvaluatableAssets>, runtime_entries: Vc<EvaluatableAssets>,
edge_runtime_entries: Vc<EvaluatableAssets>, edge_runtime_entries: Vc<EvaluatableAssets>,
) -> Result<Vc<SsrChunk>> { ) -> Result<Vc<SsrChunk>> {
......
...@@ -38,6 +38,7 @@ use turbopack_binding::{ ...@@ -38,6 +38,7 @@ use turbopack_binding::{
browser::BrowserChunkingContext, browser::BrowserChunkingContext,
core::{ core::{
changed::content_changed, changed::content_changed,
chunk::ChunkingContext,
compile_time_info::CompileTimeInfo, compile_time_info::CompileTimeInfo,
context::AssetContext, context::AssetContext,
diagnostics::DiagnosticExt, diagnostics::DiagnosticExt,
...@@ -50,7 +51,6 @@ use turbopack_binding::{ ...@@ -50,7 +51,6 @@ use turbopack_binding::{
version::{Update, Version, VersionState, VersionedContent}, version::{Update, Version, VersionState, VersionedContent},
PROJECT_FILESYSTEM_NAME, PROJECT_FILESYSTEM_NAME,
}, },
ecmascript::chunk::EcmascriptChunkingContext,
node::execution_context::ExecutionContext, node::execution_context::ExecutionContext,
nodejs::NodeJsChunkingContext, nodejs::NodeJsChunkingContext,
turbopack::{evaluate_context::node_build_environment, ModuleAssetContext}, turbopack::{evaluate_context::node_build_environment, ModuleAssetContext},
...@@ -625,7 +625,7 @@ impl Project { ...@@ -625,7 +625,7 @@ impl Project {
#[turbo_tasks::function] #[turbo_tasks::function]
pub(super) async fn client_chunking_context( pub(super) async fn client_chunking_context(
self: Vc<Self>, self: Vc<Self>,
) -> Result<Vc<Box<dyn EcmascriptChunkingContext>>> { ) -> Result<Vc<Box<dyn ChunkingContext>>> {
Ok(get_client_chunking_context( Ok(get_client_chunking_context(
self.project_path(), self.project_path(),
self.client_relative_path(), self.client_relative_path(),
...@@ -663,7 +663,7 @@ impl Project { ...@@ -663,7 +663,7 @@ impl Project {
pub(super) fn edge_chunking_context( pub(super) fn edge_chunking_context(
self: Vc<Self>, self: Vc<Self>,
client_assets: bool, client_assets: bool,
) -> Vc<Box<dyn EcmascriptChunkingContext>> { ) -> Vc<Box<dyn ChunkingContext>> {
if client_assets { if client_assets {
get_edge_chunking_context_with_client_assets( get_edge_chunking_context_with_client_assets(
self.next_mode(), self.next_mode(),
......
...@@ -17,7 +17,7 @@ use turbopack_binding::{ ...@@ -17,7 +17,7 @@ use turbopack_binding::{
turbopack::{ turbopack::{
core::{ core::{
asset::{Asset, AssetContent}, asset::{Asset, AssetContent},
chunk::{ChunkItemExt, ChunkableModule, EvaluatableAsset}, chunk::{ChunkItemExt, ChunkableModule, ChunkingContext, EvaluatableAsset},
context::AssetContext, context::AssetContext,
module::Module, module::Module,
output::OutputAsset, output::OutputAsset,
...@@ -29,9 +29,8 @@ use turbopack_binding::{ ...@@ -29,9 +29,8 @@ use turbopack_binding::{
virtual_source::VirtualSource, virtual_source::VirtualSource,
}, },
ecmascript::{ ecmascript::{
chunk::{EcmascriptChunkPlaceable, EcmascriptChunkingContext}, chunk::EcmascriptChunkPlaceable, parse::ParseResult, EcmascriptModuleAsset,
parse::ParseResult, EcmascriptModuleAssetType,
EcmascriptModuleAsset, EcmascriptModuleAssetType,
}, },
}, },
}; };
...@@ -51,7 +50,7 @@ pub(crate) async fn create_server_actions_manifest( ...@@ -51,7 +50,7 @@ pub(crate) async fn create_server_actions_manifest(
page_name: &str, page_name: &str,
runtime: NextRuntime, runtime: NextRuntime,
asset_context: Vc<Box<dyn AssetContext>>, asset_context: Vc<Box<dyn AssetContext>>,
chunking_context: Vc<Box<dyn EcmascriptChunkingContext>>, chunking_context: Vc<Box<dyn ChunkingContext>>,
) -> Result<(Vc<Box<dyn EvaluatableAsset>>, Vc<Box<dyn OutputAsset>>)> { ) -> Result<(Vc<Box<dyn EvaluatableAsset>>, Vc<Box<dyn OutputAsset>>)> {
let actions = get_actions(rsc_entry, server_reference_modules, asset_context); let actions = get_actions(rsc_entry, server_reference_modules, asset_context);
let loader = let loader =
......
...@@ -2,13 +2,10 @@ use anyhow::Result; ...@@ -2,13 +2,10 @@ use anyhow::Result;
use indexmap::IndexMap; use indexmap::IndexMap;
use tracing::Instrument; use tracing::Instrument;
use turbo_tasks::{TryFlatJoinIterExt, TryJoinIterExt, Value, ValueToString, Vc}; use turbo_tasks::{TryFlatJoinIterExt, TryJoinIterExt, Value, ValueToString, Vc};
use turbopack_binding::turbopack::{ use turbopack_binding::turbopack::core::{
core::{ chunk::{availability_info::AvailabilityInfo, ChunkingContext, ChunkingContextExt},
chunk::{availability_info::AvailabilityInfo, ChunkingContext, ChunkingContextExt}, module::Module,
module::Module, output::OutputAssets,
output::OutputAssets,
},
ecmascript::chunk::EcmascriptChunkingContext,
}; };
use super::include_modules_module::IncludeModulesModule; use super::include_modules_module::IncludeModulesModule;
...@@ -44,9 +41,9 @@ pub struct ClientReferencesChunks { ...@@ -44,9 +41,9 @@ pub struct ClientReferencesChunks {
#[turbo_tasks::function] #[turbo_tasks::function]
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 ChunkingContext>>,
client_availability_info: Value<AvailabilityInfo>, client_availability_info: Value<AvailabilityInfo>,
ssr_chunking_context: Option<Vc<Box<dyn EcmascriptChunkingContext>>>, ssr_chunking_context: Option<Vc<Box<dyn ChunkingContext>>>,
) -> Result<Vc<ClientReferencesChunks>> { ) -> Result<Vc<ClientReferencesChunks>> {
async move { async move {
// TODO Reconsider this. Maybe it need to be true in production. // TODO Reconsider this. Maybe it need to be true in production.
......
use anyhow::Result; use anyhow::Result;
use turbo_tasks::{Value, Vc}; use turbo_tasks::{Value, Vc};
use turbopack_binding::turbopack::{ use turbopack_binding::turbopack::core::{
core::{ chunk::{
chunk::{ availability_info::AvailabilityInfo, ChunkGroupResult, ChunkingContext, EvaluatableAssets,
availability_info::AvailabilityInfo, ChunkGroupResult, ChunkingContext,
EvaluatableAssets,
},
ident::AssetIdent,
output::OutputAssets,
}, },
ecmascript::chunk::EcmascriptChunkingContext, ident::AssetIdent,
output::OutputAssets,
}; };
#[turbo_tasks::function] #[turbo_tasks::function]
pub async fn get_app_client_shared_chunk_group( 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 ChunkingContext>>,
) -> Result<Vc<ChunkGroupResult>> { ) -> Result<Vc<ChunkGroupResult>> {
if app_client_runtime_entries.await?.is_empty() { if app_client_runtime_entries.await?.is_empty() {
return Ok(ChunkGroupResult { return Ok(ChunkGroupResult {
......
use anyhow::{Context, Result}; use anyhow::Result;
use turbo_tasks::{TryJoinIterExt, ValueToString, Vc}; use turbo_tasks::{TryJoinIterExt, ValueToString, Vc};
use turbo_tasks_fs::glob::Glob; use turbo_tasks_fs::glob::Glob;
use turbopack_binding::turbopack::{ use turbopack_binding::turbopack::{
...@@ -12,7 +12,7 @@ use turbopack_binding::turbopack::{ ...@@ -12,7 +12,7 @@ use turbopack_binding::turbopack::{
}, },
ecmascript::chunk::{ ecmascript::chunk::{
EcmascriptChunkItem, EcmascriptChunkItemContent, EcmascriptChunkPlaceable, EcmascriptChunkItem, EcmascriptChunkItemContent, EcmascriptChunkPlaceable,
EcmascriptChunkType, EcmascriptChunkingContext, EcmascriptExports, EcmascriptChunkType, EcmascriptExports,
}, },
}; };
...@@ -81,13 +81,6 @@ impl ChunkableModule for IncludeModulesModule { ...@@ -81,13 +81,6 @@ impl ChunkableModule for IncludeModulesModule {
self: Vc<Self>, self: Vc<Self>,
chunking_context: Vc<Box<dyn ChunkingContext>>, chunking_context: Vc<Box<dyn ChunkingContext>>,
) -> Result<Vc<Box<dyn ChunkItem>>> { ) -> Result<Vc<Box<dyn ChunkItem>>> {
let chunking_context =
Vc::try_resolve_downcast::<Box<dyn EcmascriptChunkingContext>>(chunking_context)
.await?
.context(
"chunking context must impl EcmascriptChunkingContext to use \
EcmascriptClientReferenceProxyModule",
)?;
Ok(Vc::upcast( Ok(Vc::upcast(
IncludeModulesChunkItem { IncludeModulesChunkItem {
module: self, module: self,
...@@ -102,7 +95,7 @@ impl ChunkableModule for IncludeModulesModule { ...@@ -102,7 +95,7 @@ impl ChunkableModule for IncludeModulesModule {
#[turbo_tasks::value] #[turbo_tasks::value]
struct IncludeModulesChunkItem { struct IncludeModulesChunkItem {
module: Vc<IncludeModulesModule>, module: Vc<IncludeModulesModule>,
chunking_context: Vc<Box<dyn EcmascriptChunkingContext>>, chunking_context: Vc<Box<dyn ChunkingContext>>,
} }
#[turbo_tasks::value_impl] #[turbo_tasks::value_impl]
...@@ -135,7 +128,7 @@ impl ChunkItem for IncludeModulesChunkItem { ...@@ -135,7 +128,7 @@ impl ChunkItem for IncludeModulesChunkItem {
#[turbo_tasks::value_impl] #[turbo_tasks::value_impl]
impl EcmascriptChunkItem for IncludeModulesChunkItem { impl EcmascriptChunkItem for IncludeModulesChunkItem {
#[turbo_tasks::function] #[turbo_tasks::function]
fn chunking_context(&self) -> Vc<Box<dyn EcmascriptChunkingContext>> { fn chunking_context(&self) -> Vc<Box<dyn ChunkingContext>> {
self.chunking_context self.chunking_context
} }
......
...@@ -9,6 +9,7 @@ use turbopack_binding::{ ...@@ -9,6 +9,7 @@ use turbopack_binding::{
turbopack::{ turbopack::{
browser::{react_refresh::assert_can_resolve_react_refresh, BrowserChunkingContext}, browser::{react_refresh::assert_can_resolve_react_refresh, BrowserChunkingContext},
core::{ core::{
chunk::ChunkingContext,
compile_time_info::{ compile_time_info::{
CompileTimeDefineValue, CompileTimeDefines, CompileTimeInfo, FreeVarReference, CompileTimeDefineValue, CompileTimeDefines, CompileTimeInfo, FreeVarReference,
FreeVarReferences, FreeVarReferences,
...@@ -17,7 +18,7 @@ use turbopack_binding::{ ...@@ -17,7 +18,7 @@ use turbopack_binding::{
free_var_references, free_var_references,
resolve::{parse::Request, pattern::Pattern}, resolve::{parse::Request, pattern::Pattern},
}, },
ecmascript::{chunk::EcmascriptChunkingContext, TreeShakingMode}, ecmascript::TreeShakingMode,
node::{ node::{
execution_context::ExecutionContext, execution_context::ExecutionContext,
transforms::postcss::{PostCssConfigLocation, PostCssTransformOptions}, transforms::postcss::{PostCssConfigLocation, PostCssTransformOptions},
...@@ -324,7 +325,7 @@ pub async fn get_client_chunking_context( ...@@ -324,7 +325,7 @@ pub async fn get_client_chunking_context(
asset_prefix: Vc<Option<String>>, asset_prefix: Vc<Option<String>>,
environment: Vc<Environment>, environment: Vc<Environment>,
mode: Vc<NextMode>, mode: Vc<NextMode>,
) -> Result<Vc<Box<dyn EcmascriptChunkingContext>>> { ) -> Result<Vc<Box<dyn ChunkingContext>>> {
let next_mode = mode.await?; let next_mode = mode.await?;
let mut builder = BrowserChunkingContext::builder( let mut builder = BrowserChunkingContext::builder(
project_path, project_path,
......
...@@ -19,7 +19,7 @@ use turbopack_binding::turbopack::{ ...@@ -19,7 +19,7 @@ use turbopack_binding::turbopack::{
ecmascript::{ ecmascript::{
chunk::{ chunk::{
EcmascriptChunkItem, EcmascriptChunkItemContent, EcmascriptChunkPlaceable, EcmascriptChunkItem, EcmascriptChunkItemContent, EcmascriptChunkPlaceable,
EcmascriptChunkType, EcmascriptChunkingContext, EcmascriptExports, EcmascriptChunkType, EcmascriptExports,
}, },
utils::StringifyJs, utils::StringifyJs,
EcmascriptModuleAsset, EcmascriptModuleAsset,
...@@ -221,13 +221,6 @@ impl ChunkableModule for EcmascriptClientReferenceProxyModule { ...@@ -221,13 +221,6 @@ impl ChunkableModule for EcmascriptClientReferenceProxyModule {
let ecmascript_item = Vc::try_resolve_downcast::<Box<dyn EcmascriptChunkItem>>(item) let ecmascript_item = Vc::try_resolve_downcast::<Box<dyn EcmascriptChunkItem>>(item)
.await? .await?
.context("EcmascriptModuleAsset must implement EcmascriptChunkItem")?; .context("EcmascriptModuleAsset must implement EcmascriptChunkItem")?;
let chunking_context =
Vc::try_resolve_downcast::<Box<dyn EcmascriptChunkingContext>>(chunking_context)
.await?
.context(
"chunking context must impl EcmascriptChunkingContext to use \
EcmascriptClientReferenceProxyModule",
)?;
Ok(Vc::upcast( Ok(Vc::upcast(
ProxyModuleChunkItem { ProxyModuleChunkItem {
...@@ -256,7 +249,7 @@ impl EcmascriptChunkPlaceable for EcmascriptClientReferenceProxyModule { ...@@ -256,7 +249,7 @@ impl EcmascriptChunkPlaceable for EcmascriptClientReferenceProxyModule {
struct ProxyModuleChunkItem { struct ProxyModuleChunkItem {
client_proxy_asset: Vc<EcmascriptClientReferenceProxyModule>, client_proxy_asset: Vc<EcmascriptClientReferenceProxyModule>,
inner_proxy_module_chunk_item: Vc<Box<dyn EcmascriptChunkItem>>, inner_proxy_module_chunk_item: Vc<Box<dyn EcmascriptChunkItem>>,
chunking_context: Vc<Box<dyn EcmascriptChunkingContext>>, chunking_context: Vc<Box<dyn ChunkingContext>>,
} }
#[turbo_tasks::function] #[turbo_tasks::function]
...@@ -314,7 +307,7 @@ impl EcmascriptChunkItem for ProxyModuleChunkItem { ...@@ -314,7 +307,7 @@ impl EcmascriptChunkItem for ProxyModuleChunkItem {
} }
#[turbo_tasks::function] #[turbo_tasks::function]
fn chunking_context(&self) -> Vc<Box<dyn EcmascriptChunkingContext>> { fn chunking_context(&self) -> Vc<Box<dyn ChunkingContext>> {
EcmascriptChunkItem::chunking_context(self.inner_proxy_module_chunk_item) EcmascriptChunkItem::chunking_context(self.inner_proxy_module_chunk_item)
} }
} }
...@@ -6,6 +6,7 @@ use turbopack_binding::{ ...@@ -6,6 +6,7 @@ use turbopack_binding::{
turbopack::{ turbopack::{
browser::BrowserChunkingContext, browser::BrowserChunkingContext,
core::{ core::{
chunk::ChunkingContext,
compile_time_info::{ compile_time_info::{
CompileTimeDefineValue, CompileTimeDefines, CompileTimeInfo, FreeVarReference, CompileTimeDefineValue, CompileTimeDefines, CompileTimeInfo, FreeVarReference,
FreeVarReferences, FreeVarReferences,
...@@ -13,7 +14,6 @@ use turbopack_binding::{ ...@@ -13,7 +14,6 @@ use turbopack_binding::{
environment::{EdgeWorkerEnvironment, Environment, ExecutionEnvironment}, environment::{EdgeWorkerEnvironment, Environment, ExecutionEnvironment},
free_var_references, free_var_references,
}, },
ecmascript::chunk::EcmascriptChunkingContext,
node::execution_context::ExecutionContext, node::execution_context::ExecutionContext,
turbopack::resolve_options_context::ResolveOptionsContext, turbopack::resolve_options_context::ResolveOptionsContext,
}, },
...@@ -173,7 +173,7 @@ pub async fn get_edge_chunking_context_with_client_assets( ...@@ -173,7 +173,7 @@ pub async fn get_edge_chunking_context_with_client_assets(
client_root: Vc<FileSystemPath>, client_root: Vc<FileSystemPath>,
asset_prefix: Vc<Option<String>>, asset_prefix: Vc<Option<String>>,
environment: Vc<Environment>, environment: Vc<Environment>,
) -> Result<Vc<Box<dyn EcmascriptChunkingContext>>> { ) -> Result<Vc<Box<dyn ChunkingContext>>> {
let output_root = node_root.join("server/edge".to_string()); let output_root = node_root.join("server/edge".to_string());
let next_mode = mode.await?; let next_mode = mode.await?;
Ok(Vc::upcast( Ok(Vc::upcast(
...@@ -198,7 +198,7 @@ pub async fn get_edge_chunking_context( ...@@ -198,7 +198,7 @@ pub async fn get_edge_chunking_context(
project_path: Vc<FileSystemPath>, project_path: Vc<FileSystemPath>,
node_root: Vc<FileSystemPath>, node_root: Vc<FileSystemPath>,
environment: Vc<Environment>, environment: Vc<Environment>,
) -> Result<Vc<Box<dyn EcmascriptChunkingContext>>> { ) -> Result<Vc<Box<dyn ChunkingContext>>> {
let output_root = node_root.join("server/edge".to_string()); let output_root = node_root.join("server/edge".to_string());
let next_mode = mode.await?; let next_mode = mode.await?;
Ok(Vc::upcast( Ok(Vc::upcast(
......
...@@ -5,11 +5,11 @@ use turbo_tasks_fs::{File, FileSystemPath}; ...@@ -5,11 +5,11 @@ use turbo_tasks_fs::{File, FileSystemPath};
use turbopack_binding::turbopack::{ use turbopack_binding::turbopack::{
core::{ core::{
asset::AssetContent, asset::AssetContent,
chunk::{ChunkItemExt, ChunkableModule, ModuleId as TurbopackModuleId}, chunk::{ChunkItemExt, ChunkableModule, ChunkingContext, ModuleId as TurbopackModuleId},
output::OutputAsset, output::OutputAsset,
virtual_output::VirtualOutputAsset, virtual_output::VirtualOutputAsset,
}, },
ecmascript::{chunk::EcmascriptChunkingContext, utils::StringifyJs}, ecmascript::utils::StringifyJs,
}; };
use super::{ClientReferenceManifest, ManifestNode, ManifestNodeEntry, ModuleId}; use super::{ClientReferenceManifest, ManifestNode, ManifestNodeEntry, ModuleId};
...@@ -29,8 +29,8 @@ impl ClientReferenceManifest { ...@@ -29,8 +29,8 @@ impl ClientReferenceManifest {
entry_name: String, entry_name: String,
client_references: Vc<ClientReferenceGraphResult>, client_references: Vc<ClientReferenceGraphResult>,
client_references_chunks: Vc<ClientReferencesChunks>, client_references_chunks: Vc<ClientReferencesChunks>,
client_chunking_context: Vc<Box<dyn EcmascriptChunkingContext>>, client_chunking_context: Vc<Box<dyn ChunkingContext>>,
ssr_chunking_context: Option<Vc<Box<dyn EcmascriptChunkingContext>>>, ssr_chunking_context: Option<Vc<Box<dyn ChunkingContext>>>,
next_config: Vc<NextConfig>, next_config: Vc<NextConfig>,
runtime: NextRuntime, runtime: NextRuntime,
) -> Result<Vc<Box<dyn OutputAsset>>> { ) -> Result<Vc<Box<dyn OutputAsset>>> {
......
use std::collections::BTreeMap; use std::collections::BTreeMap;
use anyhow::{bail, Context, Result}; use anyhow::{bail, Result};
use indoc::formatdoc; use indoc::formatdoc;
use turbo_tasks::Vc; use turbo_tasks::Vc;
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
...@@ -19,7 +19,7 @@ use turbopack_binding::turbopack::{ ...@@ -19,7 +19,7 @@ use turbopack_binding::turbopack::{
turbopack::ecmascript::{ turbopack::ecmascript::{
chunk::{ chunk::{
EcmascriptChunkItem, EcmascriptChunkItemContent, EcmascriptChunkPlaceable, EcmascriptChunkItem, EcmascriptChunkItemContent, EcmascriptChunkPlaceable,
EcmascriptChunkingContext, EcmascriptExports, EcmascriptExports,
}, },
utils::StringifyJs, utils::StringifyJs,
}, },
...@@ -81,16 +81,9 @@ impl ChunkableModule for NextServerComponentModule { ...@@ -81,16 +81,9 @@ impl ChunkableModule for NextServerComponentModule {
self: Vc<Self>, self: Vc<Self>,
chunking_context: Vc<Box<dyn ChunkingContext>>, chunking_context: Vc<Box<dyn ChunkingContext>>,
) -> Result<Vc<Box<dyn turbopack_binding::turbopack::core::chunk::ChunkItem>>> { ) -> Result<Vc<Box<dyn turbopack_binding::turbopack::core::chunk::ChunkItem>>> {
let context =
Vc::try_resolve_downcast::<Box<dyn EcmascriptChunkingContext>>(chunking_context)
.await?
.context(
"chunking context must impl EcmascriptChunkingContext to use \
NextServerComponentModule",
)?;
Ok(Vc::upcast( Ok(Vc::upcast(
BuildServerComponentChunkItem { BuildServerComponentChunkItem {
context, chunking_context,
inner: self, inner: self,
} }
.cell(), .cell(),
...@@ -122,15 +115,15 @@ impl EcmascriptChunkPlaceable for NextServerComponentModule { ...@@ -122,15 +115,15 @@ impl EcmascriptChunkPlaceable for NextServerComponentModule {
#[turbo_tasks::value] #[turbo_tasks::value]
struct BuildServerComponentChunkItem { struct BuildServerComponentChunkItem {
context: Vc<Box<dyn EcmascriptChunkingContext>>, chunking_context: Vc<Box<dyn ChunkingContext>>,
inner: Vc<NextServerComponentModule>, inner: Vc<NextServerComponentModule>,
} }
#[turbo_tasks::value_impl] #[turbo_tasks::value_impl]
impl EcmascriptChunkItem for BuildServerComponentChunkItem { impl EcmascriptChunkItem for BuildServerComponentChunkItem {
#[turbo_tasks::function] #[turbo_tasks::function]
fn chunking_context(&self) -> Vc<Box<dyn EcmascriptChunkingContext>> { fn chunking_context(&self) -> Vc<Box<dyn ChunkingContext>> {
self.context self.chunking_context
} }
#[turbo_tasks::function] #[turbo_tasks::function]
...@@ -140,7 +133,7 @@ impl EcmascriptChunkItem for BuildServerComponentChunkItem { ...@@ -140,7 +133,7 @@ impl EcmascriptChunkItem for BuildServerComponentChunkItem {
let module_id = inner let module_id = inner
.module .module
.as_chunk_item(Vc::upcast(this.context)) .as_chunk_item(Vc::upcast(this.chunking_context))
.id() .id()
.await?; .await?;
Ok(EcmascriptChunkItemContent { Ok(EcmascriptChunkItemContent {
...@@ -173,7 +166,7 @@ impl ChunkItem for BuildServerComponentChunkItem { ...@@ -173,7 +166,7 @@ impl ChunkItem for BuildServerComponentChunkItem {
#[turbo_tasks::function] #[turbo_tasks::function]
async fn chunking_context(&self) -> Vc<Box<dyn ChunkingContext>> { async fn chunking_context(&self) -> Vc<Box<dyn ChunkingContext>> {
Vc::upcast(self.context) self.chunking_context
} }
#[turbo_tasks::function] #[turbo_tasks::function]
......
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