Skip to content
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.

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

Fix SWC's auto_cjs handling #46448

Merged
merged 5 commits into from
Feb 27, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
33 changes: 29 additions & 4 deletions packages/next-swc/crates/core/src/auto_cjs/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@ impl Visit for CjsFinder {
fn visit_member_expr(&mut self, e: &MemberExpr) {
if let Expr::Ident(obj) = &*e.obj {
if let MemberProp::Ident(prop) = &e.prop {
if &*obj.sym == "module" && &*prop.sym == "exports" {
// Detect `module.exports` and `exports.__esModule`
if (&*obj.sym == "module" && &*prop.sym == "exports")
|| (&*obj.sym == "exports" && &*prop.sym == "__esModule")
{
self.found = true;
return;
}
Expand All @@ -31,9 +34,31 @@ impl Visit for CjsFinder {
e.prop.visit_with(self);
}

fn visit_str(&mut self, s: &Str) {
if s.value.contains("__esModule") {
self.found = true;
// Detect `Object.defineProperty(exports, "__esModule", ...)`
// Note that `Object.defineProperty(module.exports, ...)` will be handled by
// `visit_member_expr`.
fn visit_call_expr(&mut self, e: &CallExpr) {
if let Callee::Expr(expr) = &e.callee {
if let Expr::Member(member_expr) = &**expr {
if let (Expr::Ident(obj), MemberProp::Ident(prop)) =
(&*member_expr.obj, &member_expr.prop)
{
if &*obj.sym == "Object" && &*prop.sym == "defineProperty" {
if let Expr::Ident(arg1) = &*e.args[0].expr {
shuding marked this conversation as resolved.
Show resolved Hide resolved
if &*arg1.sym == "exports" {
if let Expr::Lit(Lit::Str(arg2)) = &*e.args[1].expr {
shuding marked this conversation as resolved.
Show resolved Hide resolved
if &*arg2.value == "__esModule" {
self.found = true;
return;
}
}
}
}
}
}
}
}

e.callee.visit_with(self);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export default 1
Object.defineProperty(exports, "__esModule", { value: true });
13 changes: 13 additions & 0 deletions packages/next-swc/crates/core/tests/full/auto-cjs/2/output.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
"use strict";
Object.defineProperty(exports, "__esModule", {
value: !0
}), Object.defineProperty(exports, "default", {
enumerable: !0,
get: function() {
return e;
}
});
var e = 1;
Object.defineProperty(exports, "__esModule", {
value: !0
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default 1
console.log("__esModule")
Object.defineProperty({}, '__esModule', { value: true })
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
export default 1;
console.log("__esModule"), Object.defineProperty({}, "__esModule", {
value: !0
});