Unverified Commit a7bd5531 authored by Hendrik Liebau's avatar Hendrik Liebau Committed by GitHub

Revert "[turbopack] Follow re-exports for side-effect free async modules" (#97009)

Reverts vercel/next.js#95993

This causes `ModuleId not found for ident` errors with `next/dynamic`.
parent 17f6f135
...@@ -11,12 +11,11 @@ use turbo_tasks::{ ...@@ -11,12 +11,11 @@ use turbo_tasks::{
use turbopack_core::{ use turbopack_core::{
chunk::{ChunkingContext, ChunkingType}, chunk::{ChunkingContext, ChunkingType},
issue::IssueSource, issue::IssueSource,
module::{Module, ModuleSideEffects}, module::Module,
reference::ModuleReference, reference::ModuleReference,
reference_type::EcmaScriptModulesReferenceSubType, reference_type::EcmaScriptModulesReferenceSubType,
resolve::{ resolve::{
BindingUsage, ExportUsage, ModulePart, ModuleResolveResult, ModuleResolveResultItem, BindingUsage, ExportUsage, ModuleResolveResult, ResolveErrorMode,
ResolveErrorMode,
origin::{ResolveOrigin, ResolveOriginExt}, origin::{ResolveOrigin, ResolveOriginExt},
parse::Request, parse::Request,
}, },
...@@ -25,11 +24,10 @@ use turbopack_resolve::ecmascript::esm_resolve; ...@@ -25,11 +24,10 @@ use turbopack_resolve::ecmascript::esm_resolve;
use crate::{ use crate::{
analyzer::imports::ImportAnnotations, analyzer::imports::ImportAnnotations,
chunk::EcmascriptChunkPlaceable,
code_gen::{CodeGen, CodeGeneration, IntoCodeGenReference}, code_gen::{CodeGen, CodeGeneration, IntoCodeGenReference},
create_visitor, create_visitor,
references::{ references::{
AstPath, apply_reexport_tree_shaking, AstPath,
pattern_mapping::{PatternMapping, ResolveType}, pattern_mapping::{PatternMapping, ResolveType},
}, },
}; };
...@@ -48,7 +46,6 @@ pub struct EsmAsyncAssetReference { ...@@ -48,7 +46,6 @@ pub struct EsmAsyncAssetReference {
/// callback destructuring, or webpackExports/turbopackExports comments. /// callback destructuring, or webpackExports/turbopackExports comments.
pub export_usage: ExportUsage, pub export_usage: ExportUsage,
pub resolve_override: Option<ResolvedVc<Box<dyn Module>>>, pub resolve_override: Option<ResolvedVc<Box<dyn Module>>>,
pub follow_reexports: bool,
} }
impl EsmAsyncAssetReference { impl EsmAsyncAssetReference {
...@@ -62,7 +59,6 @@ impl EsmAsyncAssetReference { ...@@ -62,7 +59,6 @@ impl EsmAsyncAssetReference {
import_externals: bool, import_externals: bool,
export_usage: ExportUsage, export_usage: ExportUsage,
resolve_override: Option<ResolvedVc<Box<dyn Module>>>, resolve_override: Option<ResolvedVc<Box<dyn Module>>>,
follow_reexports: bool,
) -> Result<Self> { ) -> Result<Self> {
// Apply any annotation-driven transition eagerly so the stored origin is final and the // Apply any annotation-driven transition eagerly so the stored origin is final and the
// `annotations` don't need to be retained on the reference. // `annotations` don't need to be retained on the reference.
...@@ -83,7 +79,6 @@ impl EsmAsyncAssetReference { ...@@ -83,7 +79,6 @@ impl EsmAsyncAssetReference {
import_externals, import_externals,
export_usage, export_usage,
resolve_override, resolve_override,
follow_reexports,
}) })
} }
} }
...@@ -96,56 +91,14 @@ impl ModuleReference for EsmAsyncAssetReference { ...@@ -96,56 +91,14 @@ impl ModuleReference for EsmAsyncAssetReference {
return Ok(*ModuleResolveResult::module(*resolved)); return Ok(*ModuleResolveResult::module(*resolved));
} }
let result = esm_resolve( esm_resolve(
*self.origin, *self.origin,
*self.request, *self.request,
EcmaScriptModulesReferenceSubType::DynamicImport, EcmaScriptModulesReferenceSubType::DynamicImport,
self.error_mode, self.error_mode,
Some(self.issue_source), Some(self.issue_source),
) )
.await?; .await
// `const { x } = await import(...)`: follow the potential re-export to its origin.
// only follow the re-export if there's a single member to avoid splitting and introducing
// new dynamic entrypoints
if self.follow_reexports
&& let ExportUsage::PartialNamespaceObject(names) = &self.export_usage
&& let [name] = &names[..]
{
let result_ref = result.await?;
let mut primary = Vec::with_capacity(result_ref.primary.len());
for (key, item) in result_ref.primary.iter() {
let new_item = 'rewrite: {
let ModuleResolveResultItem::Module(module) = item else {
break 'rewrite item.clone();
};
let Some(module) =
ResolvedVc::try_downcast::<Box<dyn EcmascriptChunkPlaceable>>(*module)
else {
break 'rewrite item.clone();
};
// Modules with side effects must be imported as a whole because we
// don't create an async seperate evaluation module.
if *module.side_effects().await? == ModuleSideEffects::SideEffectful {
break 'rewrite item.clone();
}
let followed =
apply_reexport_tree_shaking(*module, ModulePart::export(name.clone()))
.await?
.to_resolved()
.await?;
ModuleResolveResultItem::Module(followed)
};
primary.push((key.clone(), new_item));
}
return Ok(ModuleResolveResult {
primary: primary.into_boxed_slice(),
affecting_sources: result_ref.affecting_sources.clone(),
}
.cell());
}
Ok(result)
} }
fn chunking_type(&self) -> Option<ChunkingType> { fn chunking_type(&self) -> Option<ChunkingType> {
......
...@@ -34,7 +34,6 @@ use crate::{ ...@@ -34,7 +34,6 @@ use crate::{
magic_identifier::MAGIC_IDENTIFIER_DEFAULT_EXPORT_ATOM, magic_identifier::MAGIC_IDENTIFIER_DEFAULT_EXPORT_ATOM,
module_fragments::part::module::EcmascriptModulePartAsset, module_fragments::part::module::EcmascriptModulePartAsset,
references::esm::base::ReferencedAsset, references::esm::base::ReferencedAsset,
rename::module::EcmascriptModuleRenameModule,
runtime_functions::{TURBOPACK_DYNAMIC, TURBOPACK_ESM}, runtime_functions::{TURBOPACK_DYNAMIC, TURBOPACK_ESM},
utils::module_id_to_lit, utils::module_id_to_lit,
}; };
...@@ -249,36 +248,6 @@ pub async fn follow_reexports( ...@@ -249,36 +248,6 @@ pub async fn follow_reexports(
} }
} }
pub async fn apply_reexport_tree_shaking(
module: Vc<Box<dyn EcmascriptChunkPlaceable>>,
part: ModulePart,
) -> Result<Vc<Box<dyn Module>>> {
if let ModulePart::Export(export) = &part {
let FollowExportsResult {
module: final_module,
export_name: new_export,
..
} = &*follow_reexports(module, export.clone(), true).await?;
let module = if let Some(new_export) = new_export {
if *new_export == *export {
Vc::upcast(**final_module)
} else {
Vc::upcast(EcmascriptModuleRenameModule::new(
**final_module,
ModulePart::renamed_export(new_export.clone(), export.clone()),
))
}
} else {
Vc::upcast(EcmascriptModuleRenameModule::new(
**final_module,
ModulePart::renamed_namespace(export.clone()),
))
};
return Ok(module);
}
Ok(Vc::upcast(module))
}
async fn handle_declared_export( async fn handle_declared_export(
module: ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>, module: ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>,
export_name: RcStr, export_name: RcStr,
......
...@@ -95,9 +95,7 @@ use turbopack_swc_utils::emitter::IssueEmitter; ...@@ -95,9 +95,7 @@ use turbopack_swc_utils::emitter::IssueEmitter;
use unreachable::Unreachable; use unreachable::Unreachable;
use worker::{WorkerAssetReference, WorkerGlobalPlaceholder, WorkerGlobalsReplacementCodeGen}; use worker::{WorkerAssetReference, WorkerGlobalPlaceholder, WorkerGlobalsReplacementCodeGen};
pub use crate::references::esm::export::{ pub use crate::references::esm::export::{FollowExportsResult, follow_reexports};
FollowExportsResult, apply_reexport_tree_shaking, follow_reexports,
};
use crate::{ use crate::{
AnalyzeMode, EcmascriptModuleAsset, EcmascriptModuleAssetType, EcmascriptParsable, AnalyzeMode, EcmascriptModuleAsset, EcmascriptModuleAssetType, EcmascriptParsable,
ModuleTypeResult, TypeofWindow, ModuleTypeResult, TypeofWindow,
...@@ -461,7 +459,6 @@ struct AnalysisState<'a> { ...@@ -461,7 +459,6 @@ struct AnalysisState<'a> {
// the object allocation. // the object allocation.
first_webpack_exports_info: bool, first_webpack_exports_info: bool,
module_fragments_enabled: bool, module_fragments_enabled: bool,
follow_reexports: bool,
cjs_tree_shaking: bool, cjs_tree_shaking: bool,
import_externals: bool, import_externals: bool,
ignore_dynamic_requests: bool, ignore_dynamic_requests: bool,
...@@ -863,7 +860,6 @@ async fn analyze_ecmascript_module_internal( ...@@ -863,7 +860,6 @@ async fn analyze_ecmascript_module_internal(
first_import_meta: true, first_import_meta: true,
first_webpack_exports_info: true, first_webpack_exports_info: true,
module_fragments_enabled: options.module_fragments_enabled, module_fragments_enabled: options.module_fragments_enabled,
follow_reexports: options.follow_reexports,
cjs_tree_shaking: options.cjs_tree_shaking, cjs_tree_shaking: options.cjs_tree_shaking,
import_externals: options.import_externals, import_externals: options.import_externals,
ignore_dynamic_requests: options.ignore_dynamic_requests, ignore_dynamic_requests: options.ignore_dynamic_requests,
...@@ -1701,8 +1697,6 @@ async fn handle_dynamic_import<'a, G: Fn(BumpVec<'a, Effect<'a>>) + Send + Sync> ...@@ -1701,8 +1697,6 @@ async fn handle_dynamic_import<'a, G: Fn(BumpVec<'a, Effect<'a>>) + Send + Sync>
origin, origin,
source, source,
ignore_dynamic_requests, ignore_dynamic_requests,
follow_reexports,
module_fragments_enabled,
.. ..
} = state; } = state;
...@@ -1749,7 +1743,6 @@ async fn handle_dynamic_import<'a, G: Fn(BumpVec<'a, Effect<'a>>) + Send + Sync> ...@@ -1749,7 +1743,6 @@ async fn handle_dynamic_import<'a, G: Fn(BumpVec<'a, Effect<'a>>) + Send + Sync>
error_mode, error_mode,
state.import_externals, state.import_externals,
export_usage, export_usage,
follow_reexports && !module_fragments_enabled,
) )
.await .await
} }
...@@ -1767,7 +1760,6 @@ async fn handle_dynamic_import_with_linked_args( ...@@ -1767,7 +1760,6 @@ async fn handle_dynamic_import_with_linked_args(
error_mode: ResolveErrorMode, error_mode: ResolveErrorMode,
import_externals: bool, import_externals: bool,
export_usage: ExportUsage, export_usage: ExportUsage,
follow_reexports: bool,
) -> Result<()> { ) -> Result<()> {
if linked_args.len() == 1 || linked_args.len() == 2 { if linked_args.len() == 1 || linked_args.len() == 2 {
let pat = js_value_to_pattern(&linked_args[0]); let pat = js_value_to_pattern(&linked_args[0]);
...@@ -1826,7 +1818,6 @@ async fn handle_dynamic_import_with_linked_args( ...@@ -1826,7 +1818,6 @@ async fn handle_dynamic_import_with_linked_args(
import_externals, import_externals,
export_usage, export_usage,
resolve_override, resolve_override,
follow_reexports,
) )
.await?, .await?,
ast_path.to_vec().into(), ast_path.to_vec().into(),
...@@ -2132,7 +2123,6 @@ where ...@@ -2132,7 +2123,6 @@ where
error_mode, error_mode,
state.import_externals, state.import_externals,
export_usage, export_usage,
state.follow_reexports && !state.module_fragments_enabled,
) )
.await?; .await?;
} }
......
async function load() {
const { a } = await import('./barrel.js')
console.log(a)
}
load()
{
"removeUnusedImports": true,
"removeUnusedExports": true,
"followReexports": true,
"scopeHoisting": true
}
(globalThis["TURBOPACK"] || (globalThis["TURBOPACK"] = [])).push(["output/0_9x_turbopack-tests_tests_snapshot_reexport-drop_pure-dynamic_input_a_0n-4eus.js",
"[project]/turbopack/crates/turbopack-tests/tests/snapshot/reexport-drop/pure-dynamic/input/a.js [test] (ecmascript, async loader)", ((__turbopack_context__) => {
__turbopack_context__.v((parentImport) => {
return Promise.all([
"output/0_9x_turbopack-tests_tests_snapshot_reexport-drop_pure-dynamic_input_a_1gjnbph.js"
].map((chunk) => __turbopack_context__.l(chunk))).then(() => {
return parentImport("[project]/turbopack/crates/turbopack-tests/tests/snapshot/reexport-drop/pure-dynamic/input/a.js [test] (ecmascript)");
});
});
}),
]);
\ No newline at end of file
(globalThis["TURBOPACK"] || (globalThis["TURBOPACK"] = [])).push(["output/0_9x_turbopack-tests_tests_snapshot_reexport-drop_pure-dynamic_input_a_1gjnbph.js",
"[project]/turbopack/crates/turbopack-tests/tests/snapshot/reexport-drop/pure-dynamic/input/a.js [test] (ecmascript)", ((__turbopack_context__) => {
"use strict";
const a = 'A';
__turbopack_context__.s([
"a",
0,
a
]);
}),
]);
//# sourceMappingURL=0_9x_turbopack-tests_tests_snapshot_reexport-drop_pure-dynamic_input_a_1gjnbph.js.map
\ No newline at end of file
{
"version": 3,
"sources": [],
"sections": [
{"offset": {"line": 4, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/turbopack/crates/turbopack-tests/tests/snapshot/reexport-drop/pure-dynamic/input/a.js"],"sourcesContent":["export const a = 'A'\n"],"names":["a"],"mappings":"AAAO,MAAMA,IAAI"}}]
}
\ No newline at end of file
(globalThis["TURBOPACK"] || (globalThis["TURBOPACK"] = [])).push(["output/0_9x_turbopack-tests_tests_snapshot_reexport-drop_pure-dynamic_input_index_1duu_qq.js",
"[project]/turbopack/crates/turbopack-tests/tests/snapshot/reexport-drop/pure-dynamic/input/index.js [test] (ecmascript)", ((__turbopack_context__, module, exports) => {
async function load() {
const { a } = await __turbopack_context__.A("[project]/turbopack/crates/turbopack-tests/tests/snapshot/reexport-drop/pure-dynamic/input/a.js [test] (ecmascript, async loader)");
console.log(a);
}
load();
}),
]);
//# sourceMappingURL=0_9x_turbopack-tests_tests_snapshot_reexport-drop_pure-dynamic_input_index_1duu_qq.js.map
\ No newline at end of file
{
"version": 3,
"sources": [],
"sections": [
{"offset": {"line": 3, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/turbopack/crates/turbopack-tests/tests/snapshot/reexport-drop/pure-dynamic/input/index.js"],"sourcesContent":["async function load() {\n const { a } = await import('./barrel.js')\n console.log(a)\n}\n\nload()\n"],"names":["load","a","console","log"],"mappings":"AAAA,eAAeA;IACb,MAAM,EAAEC,CAAC,EAAE,GAAG;IACdC,QAAQC,GAAG,CAACF;AACd;AAEAD"}}]
}
\ No newline at end of file
(globalThis["TURBOPACK"] || (globalThis["TURBOPACK"] = [])).push([
"output/0rv8_turbopack-tests_tests_snapshot_reexport-drop_pure-dynamic_input_index_1t46w1n.js",
{"otherChunks":["output/0_9x_turbopack-tests_tests_snapshot_reexport-drop_pure-dynamic_input_a_0n-4eus.js","output/0_9x_turbopack-tests_tests_snapshot_reexport-drop_pure-dynamic_input_index_1duu_qq.js"],"runtimeModuleIds":["[project]/turbopack/crates/turbopack-tests/tests/snapshot/reexport-drop/pure-dynamic/input/index.js [test] (ecmascript)"]}
]);
// Dummy runtime
\ No newline at end of file
...@@ -52,9 +52,11 @@ use turbopack_ecmascript::{ ...@@ -52,9 +52,11 @@ use turbopack_ecmascript::{
chunk::EcmascriptChunkPlaceable, chunk::EcmascriptChunkPlaceable,
module_fragments::part::module::EcmascriptModulePartAsset, module_fragments::part::module::EcmascriptModulePartAsset,
references::{ references::{
apply_reexport_tree_shaking, FollowExportsResult,
external_module::{CachedExternalModule, CachedExternalTracingMode, CachedExternalType}, external_module::{CachedExternalModule, CachedExternalTracingMode, CachedExternalType},
follow_reexports,
}, },
rename::module::EcmascriptModuleRenameModule,
side_effect_optimization::{ side_effect_optimization::{
facade::module::EcmascriptModuleFacadeModule, locals::module::EcmascriptModuleLocalsModule, facade::module::EcmascriptModuleFacadeModule, locals::module::EcmascriptModuleLocalsModule,
}, },
...@@ -302,6 +304,36 @@ async fn apply_module_type( ...@@ -302,6 +304,36 @@ async fn apply_module_type(
Ok(ProcessResult::Module(module).cell()) Ok(ProcessResult::Module(module).cell())
} }
async fn apply_reexport_tree_shaking(
module: Vc<Box<dyn EcmascriptChunkPlaceable>>,
part: ModulePart,
) -> Result<Vc<Box<dyn Module>>> {
if let ModulePart::Export(export) = &part {
let FollowExportsResult {
module: final_module,
export_name: new_export,
..
} = &*follow_reexports(module, export.clone(), true).await?;
let module = if let Some(new_export) = new_export {
if *new_export == *export {
Vc::upcast(**final_module)
} else {
Vc::upcast(EcmascriptModuleRenameModule::new(
**final_module,
ModulePart::renamed_export(new_export.clone(), export.clone()),
))
}
} else {
Vc::upcast(EcmascriptModuleRenameModule::new(
**final_module,
ModulePart::renamed_namespace(export.clone()),
))
};
return Ok(module);
}
Ok(Vc::upcast(module))
}
#[turbo_tasks::value] #[turbo_tasks::value]
#[derive(Debug)] #[derive(Debug)]
pub struct ModuleAssetContext { pub struct ModuleAssetContext {
......
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