Skip to content

Turbopack: normalize ref type for external tracing #78226

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mischnic merged 1 commit into from
Apr 16, 2025
Merged

Turbopack: normalize ref type for external tracing #78226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions turbopack/crates/turbopack-core/src/reference_type.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,10 @@ impl InnerAssets {
// behavior.

#[turbo_tasks::value(serialization = "auto_for_input")]
#[derive(Debug, Clone, Hash)]
#[derive(Debug, Default, Clone, Hash)]
pub enum CommonJsReferenceSubType {
Custom(u8),
#[default]
Undefined,
}

Expand Down Expand Up @@ -170,7 +171,7 @@ impl ImportContext {
}

#[turbo_tasks::value(serialization = "auto_for_input")]
#[derive(Debug, Clone, Hash)]
#[derive(Debug, Default, Clone, Hash)]
pub enum CssReferenceSubType {
AtImport(Option<ResolvedVc<ImportContext>>),
/// Reference from ModuleCssAsset to an imported ModuleCssAsset for retrieving the composed
Expand All @@ -181,15 +182,17 @@ pub enum CssReferenceSubType {
/// Used for generating the list of classes in a ModuleCssAsset
Analyze,
Custom(u8),
#[default]
Undefined,
}

#[turbo_tasks::value(serialization = "auto_for_input")]
#[derive(Debug, Clone, Hash)]
#[derive(Debug, Default, Clone, Hash)]
pub enum UrlReferenceSubType {
EcmaScriptNewUrl,
CssUrl,
Custom(u8),
#[default]
Undefined,
}

Expand Down Expand Up @@ -229,7 +232,7 @@ pub enum EntryReferenceSubType {
}

#[turbo_tasks::value(serialization = "auto_for_input")]
#[derive(Debug, Clone, Hash)]
#[derive(Debug, Default, Clone, Hash)]
pub enum ReferenceType {
CommonJs(CommonJsReferenceSubType),
EcmaScriptModules(EcmaScriptModulesReferenceSubType),
Expand All @@ -241,6 +244,7 @@ pub enum ReferenceType {
Runtime,
Internal(ResolvedVc<InnerAssets>),
Custom(u8),
#[default]
Undefined,
}

Expand Down
22 changes: 22 additions & 0 deletions turbopack/crates/turbopack/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -799,6 +799,27 @@ impl AssetContext for ModuleAssetContext {
let externals_context = externals_tracing_module_context(ty);
let root_origin = tracing_root.join("_".into());

// Normalize reference type, there is no such thing as a
// `ReferenceType::EcmaScriptModules(ImportPart(Evaluation))`
// for externals (and otherwise, this causes duplicate
// CachedExternalModules for both `ImportPart(Evaluation)` and
// `ImportPart(Export("CacheProvider"))`)
let reference_type = Value::new(match &*reference_type {
ReferenceType::EcmaScriptModules(_) => {
ReferenceType::EcmaScriptModules(Default::default())
}
ReferenceType::CommonJs(_) => {
ReferenceType::CommonJs(Default::default())
}
ReferenceType::Css(_) => {
ReferenceType::Css(Default::default())
}
ReferenceType::Url(_) => {
ReferenceType::Url(Default::default())
}
_ => ReferenceType::Undefined,
});

let external_result = externals_context
.resolve_asset(
root_origin,
Expand All @@ -822,6 +843,7 @@ impl AssetContext for ModuleAssetContext {
);

modules
.into_iter()
.map(|s| {
Vc::upcast::<Box<dyn ModuleReference>>(
TracedModuleReference::new(s),
Expand Down