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

Turbopack: really fix export collection (#80240)

- For `export default class Foo`, we don't insert a `var __TURBOPACK__default__export__ = Foo` variable because it should be a live binding. So put the correct name/syntax context into `ImportMap.exports`
- The `__TURBOPACK__default__export__` generated by module fragment tree shaking should use the same syntax context as the one generated by `module_item.rs` (which is `SyntaxContext(0)`).
parent aa4d90c7
...@@ -643,13 +643,30 @@ impl Visit for Analyzer<'_> { ...@@ -643,13 +643,30 @@ impl Visit for Analyzer<'_> {
self.data.exports.insert( self.data.exports.insert(
rcstr!("default"), rcstr!("default"),
// Mirror what `EsmModuleItem::code_generation` does, these are live bindings if the
// class/function has an identifier.
match &n.decl {
DefaultDecl::Class(ClassExpr { ident, .. })
| DefaultDecl::Fn(FnExpr { ident, .. }) => ident.as_ref().map_or_else(
|| {
( (
// `EsmModuleItem::code_generation` inserts this variable.
magic_identifier::mangle("default export").into(), magic_identifier::mangle("default export").into(),
SyntaxContext::empty(), SyntaxContext::empty(),
)
},
|ident| (ident.to_id()),
), ),
DefaultDecl::TsInterfaceDecl(_) => {
// not matching, might happen due to eventual consistency
(
magic_identifier::mangle("default export").into(),
SyntaxContext::empty(),
)
}
},
); );
} }
fn visit_export_default_expr(&mut self, n: &ExportDefaultExpr) { fn visit_export_default_expr(&mut self, n: &ExportDefaultExpr) {
self.data.has_exports = true; self.data.has_exports = true;
......
...@@ -20,7 +20,7 @@ use swc_core::{ ...@@ -20,7 +20,7 @@ use swc_core::{
PropName, PropOrSpread, Stmt, Str, VarDecl, VarDeclKind, VarDeclarator, op, PropName, PropOrSpread, Stmt, Str, VarDecl, VarDeclKind, VarDeclarator, op,
}, },
atoms::Atom, atoms::Atom,
utils::{ExprCtx, ExprExt, find_pat_ids, private_ident, quote_ident}, utils::{ExprCtx, ExprExt, find_pat_ids, quote_ident},
}, },
}; };
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
...@@ -1007,8 +1007,14 @@ impl DepGraph { ...@@ -1007,8 +1007,14 @@ impl DepGraph {
DefaultDecl::TsInterfaceDecl(_) => unreachable!(), DefaultDecl::TsInterfaceDecl(_) => unreachable!(),
}; };
// Mirror what `EsmModuleItem::code_generation` does, these are live
// bindings if the class/function has an identifier.
let default_var = id.unwrap_or_else(|| { let default_var = id.unwrap_or_else(|| {
private_ident!(magic_identifier::mangle("default export")) Ident::new(
magic_identifier::mangle("default export").into(),
DUMMY_SP,
Default::default(),
)
}); });
{ {
...@@ -1073,8 +1079,13 @@ impl DepGraph { ...@@ -1073,8 +1079,13 @@ impl DepGraph {
exports.push((default_var.to_id(), "default".into())); exports.push((default_var.to_id(), "default".into()));
} }
ModuleDecl::ExportDefaultExpr(export) => { ModuleDecl::ExportDefaultExpr(export) => {
let default_var = // Mirror what `EsmModuleItem::code_generation` does, these are live
private_ident!(magic_identifier::mangle("default export")); // bindings if the class/function has an identifier.
let default_var = Ident::new(
magic_identifier::mangle("default export").into(),
DUMMY_SP,
Default::default(),
);
{ {
// For // For
......
...@@ -277,7 +277,7 @@ graph TD ...@@ -277,7 +277,7 @@ graph TD
N7["Items: [ItemId(1, ImportBinding(2))]"]; N7["Items: [ItemId(1, ImportBinding(2))]"];
N8["Items: [ItemId(1, ImportBinding(3))]"]; N8["Items: [ItemId(1, ImportBinding(3))]"];
N9["Items: [ItemId(1, ImportBinding(4))]"]; N9["Items: [ItemId(1, ImportBinding(4))]"];
N10["Items: [ItemId(2, Normal), ItemId(3, Normal), ItemId(Export((&quot;__TURBOPACK__default__export__&quot;, #5), &quot;default&quot;))]"]; N10["Items: [ItemId(2, Normal), ItemId(3, Normal), ItemId(Export((&quot;__TURBOPACK__default__export__&quot;, #0), &quot;default&quot;))]"];
N4 --> N0; N4 --> N0;
N9 --> N4; N9 --> N4;
N1 --> N0; N1 --> N0;
......
...@@ -917,7 +917,7 @@ graph TD ...@@ -917,7 +917,7 @@ graph TD
N26["Items: [ItemId(20, VarDeclarator(0))]"]; N26["Items: [ItemId(20, VarDeclarator(0))]"];
N27["Items: [ItemId(21, VarDeclarator(0))]"]; N27["Items: [ItemId(21, VarDeclarator(0))]"];
N28["Items: [ItemId(22, VarDeclarator(0)), ItemId(Export((&quot;gridArea&quot;, #2), &quot;gridArea&quot;))]"]; N28["Items: [ItemId(22, VarDeclarator(0)), ItemId(Export((&quot;gridArea&quot;, #2), &quot;gridArea&quot;))]"];
N29["Items: [ItemId(23, VarDeclarator(0)), ItemId(24, Normal), ItemId(Export((&quot;__TURBOPACK__default__export__&quot;, #12), &quot;default&quot;))]"]; N29["Items: [ItemId(23, VarDeclarator(0)), ItemId(24, Normal), ItemId(Export((&quot;__TURBOPACK__default__export__&quot;, #0), &quot;default&quot;))]"];
N30["Items: [ItemId(Export((&quot;gridAutoColumns&quot;, #2), &quot;gridAutoColumns&quot;))]"]; N30["Items: [ItemId(Export((&quot;gridAutoColumns&quot;, #2), &quot;gridAutoColumns&quot;))]"];
N31["Items: [ItemId(Export((&quot;gridAutoFlow&quot;, #2), &quot;gridAutoFlow&quot;))]"]; N31["Items: [ItemId(Export((&quot;gridAutoFlow&quot;, #2), &quot;gridAutoFlow&quot;))]"];
N32["Items: [ItemId(Export((&quot;gridAutoRows&quot;, #2), &quot;gridAutoRows&quot;))]"]; N32["Items: [ItemId(Export((&quot;gridAutoRows&quot;, #2), &quot;gridAutoRows&quot;))]"];
......
...@@ -121,7 +121,7 @@ graph TD ...@@ -121,7 +121,7 @@ graph TD
graph TD graph TD
N0["Items: [ItemId(0, ImportOfModule)]"]; N0["Items: [ItemId(0, ImportOfModule)]"];
N1["Items: [ItemId(0, ImportBinding(0))]"]; N1["Items: [ItemId(0, ImportBinding(0))]"];
N2["Items: [ItemId(1, VarDeclarator(0)), ItemId(2, Normal), ItemId(3, Normal), ItemId(Export((&quot;__TURBOPACK__default__export__&quot;, #4), &quot;default&quot;))]"]; N2["Items: [ItemId(1, VarDeclarator(0)), ItemId(2, Normal), ItemId(3, Normal), ItemId(Export((&quot;__TURBOPACK__default__export__&quot;, #0), &quot;default&quot;))]"];
N1 --> N0; N1 --> N0;
``` ```
# Entrypoints # Entrypoints
......
...@@ -687,7 +687,7 @@ graph TD ...@@ -687,7 +687,7 @@ graph TD
N21["Items: [ItemId(15, VarDeclarator(0))]"]; N21["Items: [ItemId(15, VarDeclarator(0))]"];
N22["Items: [ItemId(16, VarDeclarator(0))]"]; N22["Items: [ItemId(16, VarDeclarator(0))]"];
N23["Items: [ItemId(17, VarDeclarator(0)), ItemId(Export((&quot;routeModule&quot;, #2), &quot;routeModule&quot;))]"]; N23["Items: [ItemId(17, VarDeclarator(0)), ItemId(Export((&quot;routeModule&quot;, #2), &quot;routeModule&quot;))]"];
N24["Items: [ItemId(Export((&quot;__TURBOPACK__default__export__&quot;, #3), &quot;default&quot;))]"]; N24["Items: [ItemId(Export((&quot;__TURBOPACK__default__export__&quot;, #0), &quot;default&quot;))]"];
N25["Items: [ItemId(Export((&quot;config&quot;, #2), &quot;config&quot;))]"]; N25["Items: [ItemId(Export((&quot;config&quot;, #2), &quot;config&quot;))]"];
N26["Items: [ItemId(Export((&quot;getServerSideProps&quot;, #2), &quot;getServerSideProps&quot;))]"]; N26["Items: [ItemId(Export((&quot;getServerSideProps&quot;, #2), &quot;getServerSideProps&quot;))]"];
N27["Items: [ItemId(Export((&quot;getStaticPaths&quot;, #2), &quot;getStaticPaths&quot;))]"]; N27["Items: [ItemId(Export((&quot;getStaticPaths&quot;, #2), &quot;getStaticPaths&quot;))]"];
......
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