Unverified Commit 3b020d4b authored by Niklas Mischkulnig's avatar Niklas Mischkulnig Committed by GitHub

Turbopack: normalize ref type for external tracing (#78226)

Fixes duplicate `CachedExternalModule`s, due to different result depending on the reference type:

As opposed to adding the whole reference type to the external's `AssetIdent`, normalize the reference type, tracing an external with `EcmaScriptModules(ImportPart(Evaluation))` (which returns nothing for side-effect-free packages) is strange anyway.

```
request: "@emotion/react"
reference_type: EcmaScriptModules(ImportPart(Evaluation))
tracing_resolve_result: [] 
tracing_resolve_affecting: ["[project]/node_modules/.pnpm/@emotion+react@11.11.1_@types+react@19.1.1_react@19.2.0-canary-1d6c8168-20250411/node_modules/@emotion/react/package.json", "[project]/node_modules/@emotion/react"]
```

```
request: "@emotion/react"
reference_type: EcmaScriptModules(ImportPart(Export("CacheProvider")))
tracing_resolve_result: ["[project]/node_modules/.pnpm/@emotion+react@11.11.1_@types+react@19.1.1_react@19.2.0-canary-1d6c8168-20250411/node_modules/@emotion/react/dist/emotion-react.cjs.mjs [externals-tracing] (ecmascript)"]
tracing_resolve_affecting: ["[project]/node_modules/.pnpm/@emotion+react@11.11.1_@types+react@19.1.1_react@19.2.0-canary-1d6c8168-20250411/node_modules/@emotion/react/package.json", "[project]/node_modules/@emotion/react"]
```
parent 511a7760
...@@ -28,9 +28,10 @@ impl InnerAssets { ...@@ -28,9 +28,10 @@ impl InnerAssets {
// behavior. // behavior.
#[turbo_tasks::value(serialization = "auto_for_input")] #[turbo_tasks::value(serialization = "auto_for_input")]
#[derive(Debug, Clone, Hash)] #[derive(Debug, Default, Clone, Hash)]
pub enum CommonJsReferenceSubType { pub enum CommonJsReferenceSubType {
Custom(u8), Custom(u8),
#[default]
Undefined, Undefined,
} }
...@@ -170,7 +171,7 @@ impl ImportContext { ...@@ -170,7 +171,7 @@ impl ImportContext {
} }
#[turbo_tasks::value(serialization = "auto_for_input")] #[turbo_tasks::value(serialization = "auto_for_input")]
#[derive(Debug, Clone, Hash)] #[derive(Debug, Default, Clone, Hash)]
pub enum CssReferenceSubType { pub enum CssReferenceSubType {
AtImport(Option<ResolvedVc<ImportContext>>), AtImport(Option<ResolvedVc<ImportContext>>),
/// Reference from ModuleCssAsset to an imported ModuleCssAsset for retrieving the composed /// Reference from ModuleCssAsset to an imported ModuleCssAsset for retrieving the composed
...@@ -181,15 +182,17 @@ pub enum CssReferenceSubType { ...@@ -181,15 +182,17 @@ pub enum CssReferenceSubType {
/// Used for generating the list of classes in a ModuleCssAsset /// Used for generating the list of classes in a ModuleCssAsset
Analyze, Analyze,
Custom(u8), Custom(u8),
#[default]
Undefined, Undefined,
} }
#[turbo_tasks::value(serialization = "auto_for_input")] #[turbo_tasks::value(serialization = "auto_for_input")]
#[derive(Debug, Clone, Hash)] #[derive(Debug, Default, Clone, Hash)]
pub enum UrlReferenceSubType { pub enum UrlReferenceSubType {
EcmaScriptNewUrl, EcmaScriptNewUrl,
CssUrl, CssUrl,
Custom(u8), Custom(u8),
#[default]
Undefined, Undefined,
} }
...@@ -229,7 +232,7 @@ pub enum EntryReferenceSubType { ...@@ -229,7 +232,7 @@ pub enum EntryReferenceSubType {
} }
#[turbo_tasks::value(serialization = "auto_for_input")] #[turbo_tasks::value(serialization = "auto_for_input")]
#[derive(Debug, Clone, Hash)] #[derive(Debug, Default, Clone, Hash)]
pub enum ReferenceType { pub enum ReferenceType {
CommonJs(CommonJsReferenceSubType), CommonJs(CommonJsReferenceSubType),
EcmaScriptModules(EcmaScriptModulesReferenceSubType), EcmaScriptModules(EcmaScriptModulesReferenceSubType),
...@@ -241,6 +244,7 @@ pub enum ReferenceType { ...@@ -241,6 +244,7 @@ pub enum ReferenceType {
Runtime, Runtime,
Internal(ResolvedVc<InnerAssets>), Internal(ResolvedVc<InnerAssets>),
Custom(u8), Custom(u8),
#[default]
Undefined, Undefined,
} }
......
...@@ -799,6 +799,27 @@ impl AssetContext for ModuleAssetContext { ...@@ -799,6 +799,27 @@ impl AssetContext for ModuleAssetContext {
let externals_context = externals_tracing_module_context(ty); let externals_context = externals_tracing_module_context(ty);
let root_origin = tracing_root.join("_".into()); 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 let external_result = externals_context
.resolve_asset( .resolve_asset(
root_origin, root_origin,
...@@ -822,6 +843,7 @@ impl AssetContext for ModuleAssetContext { ...@@ -822,6 +843,7 @@ impl AssetContext for ModuleAssetContext {
); );
modules modules
.into_iter()
.map(|s| { .map(|s| {
Vc::upcast::<Box<dyn ModuleReference>>( Vc::upcast::<Box<dyn ModuleReference>>(
TracedModuleReference::new(s), TracedModuleReference::new(s),
......
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