Unverified Commit 9c6eb145 authored by Niklas Mischkulnig's avatar Niklas Mischkulnig Committed by GitHub

Turbopack: prevent duplicate NFT modules (#84369)

Previously, you could have duplicate NFT modules (and duplicate analysis):
- user code ESM imports external `twoslash` which loads `typescript`
- user code CJS imports external `ts-morph` which loads `typescript`

Both cases would get different asset contexts, due to `externals_tracing_module_context(ExternalType::CommonJS)`  vs `externals_tracing_module_context(ExternalType::Esm)` 

<img width="2560" height="856" alt="Bildschirmfoto 2025-09-30 um 11 00 18" src="https://github.com/user-attachments/assets/7604783b-6e16-4b34-9af3-d8aa65a0cff8" />
parent d2b8fb79
...@@ -18,7 +18,7 @@ use turbopack_core::{ ...@@ -18,7 +18,7 @@ use turbopack_core::{
file_source::FileSource, file_source::FileSource,
output::{OutputAsset, OutputAssets}, output::{OutputAsset, OutputAssets},
reference_type::{CommonJsReferenceSubType, ReferenceType}, reference_type::{CommonJsReferenceSubType, ReferenceType},
resolve::{ExternalType, origin::PlainResolveOrigin, parse::Request}, resolve::{origin::PlainResolveOrigin, parse::Request},
traced_asset::TracedAsset, traced_asset::TracedAsset,
}; };
use turbopack_ecmascript::resolve::cjs_resolve; use turbopack_ecmascript::resolve::cjs_resolve;
...@@ -169,7 +169,6 @@ impl ServerNftJsonAsset { ...@@ -169,7 +169,6 @@ impl ServerNftJsonAsset {
let is_standalone = *self.project.next_config().is_standalone().await?; let is_standalone = *self.project.next_config().is_standalone().await?;
let asset_context = Vc::upcast(externals_tracing_module_context( let asset_context = Vc::upcast(externals_tracing_module_context(
ExternalType::CommonJs,
get_tracing_compile_time_info(), get_tracing_compile_time_info(),
)); ));
......
...@@ -4,21 +4,22 @@ use anyhow::Result; ...@@ -4,21 +4,22 @@ use anyhow::Result;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_rcstr::{RcStr, rcstr}; use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{NonLocalValue, ResolvedVc, TaskInput, TryJoinIterExt, Vc, trace::TraceRawVcs}; use turbo_tasks::{NonLocalValue, ResolvedVc, TaskInput, TryJoinIterExt, Vc, trace::TraceRawVcs};
use turbo_tasks_fs::{ use turbo_tasks_fs::{FileContent, FileSystem, VirtualFileSystem, glob::Glob, rope::RopeBuilder};
FileContent, FileSystem, FileSystemPath, VirtualFileSystem, glob::Glob, rope::RopeBuilder,
};
use turbopack_core::{ use turbopack_core::{
asset::{Asset, AssetContent}, asset::{Asset, AssetContent},
chunk::{AsyncModuleInfo, ChunkItem, ChunkType, ChunkableModule, ChunkingContext}, chunk::{AsyncModuleInfo, ChunkItem, ChunkType, ChunkableModule, ChunkingContext},
context::AssetContext,
ident::{AssetIdent, Layer}, ident::{AssetIdent, Layer},
module::Module, module::Module,
module_graph::ModuleGraph, module_graph::ModuleGraph,
raw_module::RawModule, raw_module::RawModule,
reference::{ModuleReference, ModuleReferences, TracedModuleReference}, reference::{ModuleReference, ModuleReferences, TracedModuleReference},
reference_type::ReferenceType, reference_type::ReferenceType,
resolve::parse::Request, resolve::{
origin::{ResolveOrigin, ResolveOriginExt},
parse::Request,
},
}; };
use turbopack_resolve::ecmascript::{cjs_resolve, esm_resolve};
use crate::{ use crate::{
EcmascriptModuleContent, EcmascriptModuleContent,
...@@ -63,8 +64,7 @@ pub enum CachedExternalType { ...@@ -63,8 +64,7 @@ pub enum CachedExternalType {
pub enum CachedExternalTracingMode { pub enum CachedExternalTracingMode {
Untraced, Untraced,
Traced { Traced {
externals_context: ResolvedVc<Box<dyn AssetContext>>, origin: ResolvedVc<Box<dyn ResolveOrigin>>,
root_origin: FileSystemPath,
}, },
} }
...@@ -228,29 +228,41 @@ impl Module for CachedExternalModule { ...@@ -228,29 +228,41 @@ impl Module for CachedExternalModule {
async fn references(&self) -> Result<Vc<ModuleReferences>> { async fn references(&self) -> Result<Vc<ModuleReferences>> {
Ok(match &self.analyze_mode { Ok(match &self.analyze_mode {
CachedExternalTracingMode::Untraced => ModuleReferences::empty(), CachedExternalTracingMode::Untraced => ModuleReferences::empty(),
CachedExternalTracingMode::Traced { CachedExternalTracingMode::Traced { origin } => {
externals_context, let external_result = match self.external_type {
root_origin,
} => {
let reference_type = match self.external_type {
CachedExternalType::EcmaScriptViaImport => { CachedExternalType::EcmaScriptViaImport => {
ReferenceType::EcmaScriptModules(Default::default()) esm_resolve(
**origin,
Request::parse_string(self.request.clone()),
Default::default(),
false,
None,
)
.await?
.await?
} }
CachedExternalType::CommonJs | CachedExternalType::EcmaScriptViaRequire => { CachedExternalType::CommonJs | CachedExternalType::EcmaScriptViaRequire => {
ReferenceType::CommonJs(Default::default()) cjs_resolve(
**origin,
Request::parse_string(self.request.clone()),
Default::default(),
None,
false,
)
.await?
} }
_ => ReferenceType::Undefined, CachedExternalType::Global | CachedExternalType::Script => {
}; origin
let external_result = externals_context
.resolve_asset( .resolve_asset(
root_origin.clone(),
Request::parse_string(self.request.clone()), Request::parse_string(self.request.clone()),
externals_context origin.resolve_options(ReferenceType::Undefined).await?,
.resolve_options(root_origin.clone(), reference_type.clone()), ReferenceType::Undefined,
reference_type,
) )
.await?; .await?
.await?
}
};
let references = external_result let references = external_result
.affecting_sources .affecting_sources
.iter() .iter()
......
...@@ -713,7 +713,6 @@ async fn process_default_internal( ...@@ -713,7 +713,6 @@ async fn process_default_internal(
#[turbo_tasks::function] #[turbo_tasks::function]
pub async fn externals_tracing_module_context( pub async fn externals_tracing_module_context(
ty: ExternalType,
compile_time_info: Vc<CompileTimeInfo>, compile_time_info: Vc<CompileTimeInfo>,
) -> Result<Vc<ModuleAssetContext>> { ) -> Result<Vc<ModuleAssetContext>> {
let resolve_options = ResolveOptionsContext { let resolve_options = ResolveOptionsContext {
...@@ -721,11 +720,7 @@ pub async fn externals_tracing_module_context( ...@@ -721,11 +720,7 @@ pub async fn externals_tracing_module_context(
emulate_environment: Some(compile_time_info.await?.environment), emulate_environment: Some(compile_time_info.await?.environment),
loose_errors: true, loose_errors: true,
collect_affecting_sources: true, collect_affecting_sources: true,
custom_conditions: match ty { custom_conditions: vec![rcstr!("node")],
ExternalType::CommonJs => vec![rcstr!("require"), rcstr!("node")],
ExternalType::EcmaScriptModule => vec![rcstr!("import"), rcstr!("node")],
ExternalType::Url | ExternalType::Global | ExternalType::Script => vec![rcstr!("node")],
},
..Default::default() ..Default::default()
}; };
...@@ -869,16 +864,14 @@ impl AssetContext for ModuleAssetContext { ...@@ -869,16 +864,14 @@ impl AssetContext for ModuleAssetContext {
// anyway. // anyway.
let options = options.await?; let options = options.await?;
CachedExternalTracingMode::Traced { let origin = PlainResolveOrigin::new(
externals_context: ResolvedVc::upcast( Vc::upcast(externals_tracing_module_context(
externals_tracing_module_context(
ty,
*options.compile_time_info, *options.compile_time_info,
) )),
.to_resolved() options.tracing_root.join("_")?,
.await?, );
), CachedExternalTracingMode::Traced {
root_origin: options.tracing_root.join("_")?, origin: ResolvedVc::upcast(origin.to_resolved().await?),
} }
} else { } else {
CachedExternalTracingMode::Untraced CachedExternalTracingMode::Untraced
......
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