Unverified Commit 07df7fa0 authored by Niklas Mischkulnig's avatar Niklas Mischkulnig Committed by GitHub

Turbopack: pass reference type to CustomModuleType (#90814)

No reason to restrict it to `ReferenceType::EcmaScriptModules(EcmaScriptModulesReferenceSubType::ImportPart(part))`
parent d08f4dc0
...@@ -4,8 +4,7 @@ use turbo_rcstr::rcstr; ...@@ -4,8 +4,7 @@ use turbo_rcstr::rcstr;
use turbo_tasks::{NonLocalValue, ResolvedVc, TaskInput, Vc, fxindexmap, trace::TraceRawVcs}; use turbo_tasks::{NonLocalValue, ResolvedVc, TaskInput, Vc, fxindexmap, trace::TraceRawVcs};
use turbopack::{ModuleAssetContext, module_options::CustomModuleType}; use turbopack::{ModuleAssetContext, module_options::CustomModuleType};
use turbopack_core::{ use turbopack_core::{
context::AssetContext, module::Module, reference_type::ReferenceType, resolve::ModulePart, context::AssetContext, module::Module, reference_type::ReferenceType, source::Source,
source::Source,
}; };
use turbopack_ecmascript::EcmascriptInputTransforms; use turbopack_ecmascript::EcmascriptInputTransforms;
use turbopack_static::ecma::StaticUrlJsModule; use turbopack_static::ecma::StaticUrlJsModule;
...@@ -90,7 +89,7 @@ impl CustomModuleType for StructuredImageModuleType { ...@@ -90,7 +89,7 @@ impl CustomModuleType for StructuredImageModuleType {
&self, &self,
source: Vc<Box<dyn Source>>, source: Vc<Box<dyn Source>>,
module_asset_context: Vc<ModuleAssetContext>, module_asset_context: Vc<ModuleAssetContext>,
_part: Option<ModulePart>, _reference_type: ReferenceType,
) -> Vc<Box<dyn Module>> { ) -> Vc<Box<dyn Module>> {
StructuredImageModuleType::create_module( StructuredImageModuleType::create_module(
source, source,
......
...@@ -21,7 +21,7 @@ use turbopack_core::{ ...@@ -21,7 +21,7 @@ use turbopack_core::{
ident::AssetIdent, ident::AssetIdent,
module::{Module, ModuleSideEffects}, module::{Module, ModuleSideEffects},
module_graph::ModuleGraph, module_graph::ModuleGraph,
resolve::ModulePart, reference_type::ReferenceType,
source::{OptionSource, Source}, source::{OptionSource, Source},
source_map::GenerateSourceMap, source_map::GenerateSourceMap,
}; };
...@@ -45,7 +45,7 @@ impl CustomModuleType for RawEcmascriptModuleType { ...@@ -45,7 +45,7 @@ impl CustomModuleType for RawEcmascriptModuleType {
&self, &self,
source: Vc<Box<dyn Source>>, source: Vc<Box<dyn Source>>,
module_asset_context: Vc<ModuleAssetContext>, module_asset_context: Vc<ModuleAssetContext>,
_part: Option<ModulePart>, _reference_type: ReferenceType,
) -> Vc<Box<dyn Module>> { ) -> Vc<Box<dyn Module>> {
Vc::upcast(RawEcmascriptModule::new( Vc::upcast(RawEcmascriptModule::new(
source, source,
......
...@@ -33,8 +33,7 @@ use turbopack_core::{ ...@@ -33,8 +33,7 @@ use turbopack_core::{
output::{ExpandedOutputAssets, OutputAsset}, output::{ExpandedOutputAssets, OutputAsset},
raw_module::RawModule, raw_module::RawModule,
reference_type::{ reference_type::{
CssReferenceSubType, EcmaScriptModulesReferenceSubType, ImportContext, InnerAssets, CssReferenceSubType, EcmaScriptModulesReferenceSubType, InnerAssets, ReferenceType,
ReferenceType,
}, },
resolve::{ resolve::{
ExternalTraced, ExternalType, ModulePart, ModuleResolveResult, ModuleResolveResultItem, ExternalTraced, ExternalType, ModulePart, ModuleResolveResult, ModuleResolveResultItem,
...@@ -81,15 +80,23 @@ async fn apply_module_type( ...@@ -81,15 +80,23 @@ async fn apply_module_type(
source: ResolvedVc<Box<dyn Source>>, source: ResolvedVc<Box<dyn Source>>,
module_asset_context: Vc<ModuleAssetContext>, module_asset_context: Vc<ModuleAssetContext>,
module_type: Vc<ModuleType>, module_type: Vc<ModuleType>,
part: Option<ModulePart>, reference_type: ReferenceType,
inner_assets: Option<ResolvedVc<InnerAssets>>, inner_assets: Option<ResolvedVc<InnerAssets>>,
css_import_context: Option<ResolvedVc<ImportContext>>,
runtime_code: bool,
) -> Result<Vc<ProcessResult>> { ) -> Result<Vc<ProcessResult>> {
let tree_shaking_mode = module_asset_context let tree_shaking_mode = module_asset_context
.module_options_context() .module_options_context()
.await? .await?
.tree_shaking_mode; .tree_shaking_mode;
let part = match &reference_type {
ReferenceType::EcmaScriptModules(EcmaScriptModulesReferenceSubType::ImportPart(part)) => {
Some(part)
}
_ => None,
};
let css_import_context = match reference_type {
ReferenceType::Css(CssReferenceSubType::AtImport(import)) => import,
_ => None,
};
let is_evaluation = matches!(&part, Some(ModulePart::Evaluation)); let is_evaluation = matches!(&part, Some(ModulePart::Evaluation));
let module_type = &*module_type.await?; let module_type = &*module_type.await?;
...@@ -176,7 +183,7 @@ async fn apply_module_type( ...@@ -176,7 +183,7 @@ async fn apply_module_type(
} }
let module = builder.build().to_resolved().await?; let module = builder.build().to_resolved().await?;
if runtime_code { if matches!(reference_type, ReferenceType::Runtime) {
ResolvedVc::upcast(module) ResolvedVc::upcast(module)
} else { } else {
// Check side effect free on the intermediate module before following reexports // Check side effect free on the intermediate module before following reexports
...@@ -195,7 +202,7 @@ async fn apply_module_type( ...@@ -195,7 +202,7 @@ async fn apply_module_type(
Some(TreeShakingMode::ModuleFragments) => { Some(TreeShakingMode::ModuleFragments) => {
Vc::upcast(EcmascriptModulePartAsset::select_part( Vc::upcast(EcmascriptModulePartAsset::select_part(
*module, *module,
part.unwrap_or(ModulePart::facade()), part.cloned().unwrap_or(ModulePart::facade()),
)) ))
} }
Some(TreeShakingMode::ReexportsOnly) => { Some(TreeShakingMode::ReexportsOnly) => {
...@@ -214,7 +221,7 @@ async fn apply_module_type( ...@@ -214,7 +221,7 @@ async fn apply_module_type(
.resolve() .resolve()
.await?, .await?,
), ),
part, part.clone(),
) )
.await? .await?
} }
...@@ -278,7 +285,7 @@ async fn apply_module_type( ...@@ -278,7 +285,7 @@ async fn apply_module_type(
), ),
ModuleType::Custom(custom) => { ModuleType::Custom(custom) => {
custom custom
.create_module(*source, module_asset_context, part) .create_module(*source, module_asset_context, reference_type)
.to_resolved() .to_resolved()
.await? .await?
} }
...@@ -649,12 +656,6 @@ async fn process_default_internal( ...@@ -649,12 +656,6 @@ async fn process_default_internal(
module_asset_context.resolve_options_context(), module_asset_context.resolve_options_context(),
); );
let part: Option<ModulePart> = match &reference_type {
ReferenceType::EcmaScriptModules(EcmaScriptModulesReferenceSubType::ImportPart(part)) => {
Some(part.clone())
}
_ => None,
};
let inner_assets = match &reference_type { let inner_assets = match &reference_type {
ReferenceType::Internal(inner_assets) => Some(*inner_assets), ReferenceType::Internal(inner_assets) => Some(*inner_assets),
_ => None, _ => None,
...@@ -760,10 +761,8 @@ async fn process_default_internal( ...@@ -760,10 +761,8 @@ async fn process_default_internal(
current_source, current_source,
module_asset_context, module_asset_context,
module_type.cell(), module_type.cell(),
part, reference_type,
inner_assets, inner_assets,
None,
false,
) )
.await; .await;
} }
...@@ -893,14 +892,8 @@ async fn process_default_internal( ...@@ -893,14 +892,8 @@ async fn process_default_internal(
current_source, current_source,
module_asset_context, module_asset_context,
module_type.cell(), module_type.cell(),
part, reference_type,
inner_assets, inner_assets,
if let ReferenceType::Css(CssReferenceSubType::AtImport(import)) = reference_type {
import
} else {
None
},
matches!(reference_type, ReferenceType::Runtime),
) )
.await?; .await?;
......
use turbo_tasks::Vc; use turbo_tasks::Vc;
use turbopack_core::{module::Module, resolve::ModulePart, source::Source}; use turbopack_core::{module::Module, reference_type::ReferenceType, source::Source};
use turbopack_ecmascript::EcmascriptInputTransforms; use turbopack_ecmascript::EcmascriptInputTransforms;
use crate::ModuleAssetContext; use crate::ModuleAssetContext;
...@@ -11,7 +11,7 @@ pub trait CustomModuleType { ...@@ -11,7 +11,7 @@ pub trait CustomModuleType {
self: Vc<Self>, self: Vc<Self>,
source: Vc<Box<dyn Source>>, source: Vc<Box<dyn Source>>,
module_asset_context: Vc<ModuleAssetContext>, module_asset_context: Vc<ModuleAssetContext>,
part: Option<ModulePart>, reference_type: ReferenceType,
) -> Vc<Box<dyn Module>>; ) -> Vc<Box<dyn Module>>;
#[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