Commit b747e08b authored by Donny/강동윤's avatar Donny/강동윤 Committed by Jiachi Liu

fix(next-swc): Detect `exports.foo` from `cjs_finder` (#61795)

### What?

Patch cjs finder to detect `exports.foo` (instead of module.exports)

### Why?

This causes an issue for `react.production.min.js`.

x-ref: https://vercel.slack.com/archives/C02HY34AKME/p1707343215879979

### How?

Closes PACK-2443
parent af47328c
...@@ -289,7 +289,9 @@ impl TransformOptions { ...@@ -289,7 +289,9 @@ impl TransformOptions {
self.swc.swcrc = false; self.swc.swcrc = false;
let should_enable_commonjs = self.swc.config.module.is_none() let should_enable_commonjs = self.swc.config.module.is_none()
&& (fm.src.contains("module.exports") || fm.src.contains("__esModule")) && (fm.src.contains("module.exports")
|| fm.src.contains("exports.")
|| fm.src.contains("__esModule"))
&& { && {
let syntax = self.swc.config.jsc.syntax.unwrap_or_default(); let syntax = self.swc.config.jsc.syntax.unwrap_or_default();
let target = self.swc.config.jsc.target.unwrap_or_else(EsVersion::latest); let target = self.swc.config.jsc.target.unwrap_or_else(EsVersion::latest);
......
...@@ -13,20 +13,25 @@ pub fn contains_cjs(m: &Module) -> bool { ...@@ -13,20 +13,25 @@ pub fn contains_cjs(m: &Module) -> bool {
struct CjsFinder { struct CjsFinder {
found: bool, found: bool,
is_esm: bool, is_esm: bool,
ignore_module: bool,
ignore_exports: bool,
} }
impl CjsFinder { impl CjsFinder {
/// If the given pattern contains `module` as a parameter, we don't need to /// If the given pattern contains `module` as a parameter, we don't need to
/// recurse into it because `module` is shadowed. /// recurse into it because `module` is shadowed.
fn contains_module_param<'a, I>(&self, mut iter: I) -> bool fn adjust_state<'a, I>(&mut self, iter: I)
where where
I: Iterator<Item = &'a Pat>, I: Iterator<Item = &'a Pat>,
{ {
iter.any(|p| { iter.for_each(|p| {
if let Pat::Ident(i) = p { if let Pat::Ident(i) = p {
&*i.id.sym == "module" if &*i.id.sym == "module" {
} else { self.ignore_module = true;
false }
if &*i.id.sym == "exports" {
self.ignore_exports = true;
}
} }
}) })
} }
...@@ -36,31 +41,39 @@ impl CjsFinder { ...@@ -36,31 +41,39 @@ impl CjsFinder {
/// does not support changing configuration based on content of the file. /// does not support changing configuration based on content of the file.
impl Visit for CjsFinder { impl Visit for CjsFinder {
fn visit_arrow_expr(&mut self, n: &ArrowExpr) { fn visit_arrow_expr(&mut self, n: &ArrowExpr) {
if self.contains_module_param(n.params.iter()) { let old_ignore_module = self.ignore_module;
return; let old_ignore_exports = self.ignore_exports;
}
self.adjust_state(n.params.iter());
n.visit_children_with(self); n.visit_children_with(self);
self.ignore_module = old_ignore_module;
self.ignore_exports = old_ignore_exports;
} }
// Detect `Object.defineProperty(exports, "__esModule", ...)` // Detect `Object.defineProperty(exports, "__esModule", ...)`
// Note that `Object.defineProperty(module.exports, ...)` will be handled by // Note that `Object.defineProperty(module.exports, ...)` will be handled by
// `visit_member_expr`. // `visit_member_expr`.
fn visit_call_expr(&mut self, e: &CallExpr) { fn visit_call_expr(&mut self, e: &CallExpr) {
if let Callee::Expr(expr) = &e.callee { if !self.ignore_exports {
if let Expr::Member(member_expr) = &**expr { if let Callee::Expr(expr) = &e.callee {
if let (Expr::Ident(obj), MemberProp::Ident(prop)) = if let Expr::Member(member_expr) = &**expr {
(&*member_expr.obj, &member_expr.prop) if let (Expr::Ident(obj), MemberProp::Ident(prop)) =
{ (&*member_expr.obj, &member_expr.prop)
if &*obj.sym == "Object" && &*prop.sym == "defineProperty" { {
if let Some(ExprOrSpread { expr: expr0, .. }) = e.args.first() { if &*obj.sym == "Object" && &*prop.sym == "defineProperty" {
if let Expr::Ident(arg0) = &**expr0 { if let Some(ExprOrSpread { expr: expr0, .. }) = e.args.first() {
if &*arg0.sym == "exports" { if let Expr::Ident(arg0) = &**expr0 {
if let Some(ExprOrSpread { expr: expr1, .. }) = e.args.get(1) { if &*arg0.sym == "exports" {
if let Expr::Lit(Lit::Str(arg1)) = &**expr1 { if let Some(ExprOrSpread { expr: expr1, .. }) =
if &*arg1.value == "__esModule" { e.args.get(1)
self.found = true; {
return; if let Expr::Lit(Lit::Str(arg1)) = &**expr1 {
if &*arg1.value == "__esModule" {
self.found = true;
return;
}
} }
} }
} }
...@@ -76,27 +89,35 @@ impl Visit for CjsFinder { ...@@ -76,27 +89,35 @@ impl Visit for CjsFinder {
} }
fn visit_class_method(&mut self, n: &ClassMethod) { fn visit_class_method(&mut self, n: &ClassMethod) {
if self.contains_module_param(n.function.params.iter().map(|v| &v.pat)) { let old_ignore_module = self.ignore_module;
return; let old_ignore_exports = self.ignore_exports;
}
self.adjust_state(n.function.params.iter().map(|v| &v.pat));
n.visit_children_with(self); n.visit_children_with(self);
self.ignore_module = old_ignore_module;
self.ignore_exports = old_ignore_exports;
} }
fn visit_function(&mut self, n: &Function) { fn visit_function(&mut self, n: &Function) {
if self.contains_module_param(n.params.iter().map(|v| &v.pat)) { let old_ignore_module = self.ignore_module;
return; let old_ignore_exports = self.ignore_exports;
}
self.adjust_state(n.params.iter().map(|v| &v.pat));
n.visit_children_with(self); n.visit_children_with(self);
self.ignore_module = old_ignore_module;
self.ignore_exports = old_ignore_exports;
} }
fn visit_member_expr(&mut self, e: &MemberExpr) { fn visit_member_expr(&mut self, e: &MemberExpr) {
if let Expr::Ident(obj) = &*e.obj { if let Expr::Ident(obj) = &*e.obj {
if let MemberProp::Ident(prop) = &e.prop { if let MemberProp::Ident(prop) = &e.prop {
// Detect `module.exports` and `exports.__esModule` // Detect `module.exports` and `exports.__esModule`
if (&*obj.sym == "module" && &*prop.sym == "exports") if (!self.ignore_module && &*obj.sym == "module" && &*prop.sym == "exports")
|| (&*obj.sym == "exports" && &*prop.sym == "__esModule") || (!self.ignore_exports && &*obj.sym == "exports")
{ {
self.found = true; self.found = true;
return; return;
...@@ -109,11 +130,15 @@ impl Visit for CjsFinder { ...@@ -109,11 +130,15 @@ impl Visit for CjsFinder {
} }
fn visit_method_prop(&mut self, n: &MethodProp) { fn visit_method_prop(&mut self, n: &MethodProp) {
if self.contains_module_param(n.function.params.iter().map(|v| &v.pat)) { let old_ignore_module = self.ignore_module;
return; let old_ignore_exports = self.ignore_exports;
}
self.adjust_state(n.function.params.iter().map(|v| &v.pat));
n.visit_children_with(self); n.visit_children_with(self);
self.ignore_module = old_ignore_module;
self.ignore_exports = old_ignore_exports;
} }
fn visit_module_decl(&mut self, n: &ModuleDecl) { fn visit_module_decl(&mut self, n: &ModuleDecl) {
......
...@@ -53,6 +53,7 @@ fn test(input: &Path, minify: bool) { ...@@ -53,6 +53,7 @@ fn test(input: &Path, minify: bool) {
tsx: true, tsx: true,
..Default::default() ..Default::default()
})), })),
external_helpers: true.into(),
..Default::default() ..Default::default()
}, },
..Default::default() ..Default::default()
......
function r(r, t) { import "@swc/helpers/_/_class_call_check";
(null == t || t > r.length) && (t = r.length); import { _ as e } from "@swc/helpers/_/_sliced_to_array";
for(var e = 0, n = Array(t); e < t; e++)n[e] = r[e]; import r from "other";
return n; e(r, 1)[0];
}
import t from "other";
((function(r) {
if (Array.isArray(r)) return r;
})(t) || function(r, t) {
var e, n, o = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
if (null != o) {
var a = [], l = !0, u = !1;
try {
for(o = o.call(r); !(l = (e = o.next()).done) && (a.push(e.value), !t || a.length !== t); l = !0);
} catch (r) {
u = !0, n = r;
} finally{
try {
l || null == o.return || o.return();
} finally{
if (u) throw n;
}
}
return a;
}
}(t, 1) || function(t, e) {
if (t) {
if ("string" == typeof t) return r(t, e);
var n = Object.prototype.toString.call(t).slice(8, -1);
if ("Object" === n && t.constructor && (n = t.constructor.name), "Map" === n || "Set" === n) return Array.from(n);
if ("Arguments" === n || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return r(t, e);
}
}(t, 1) || function() {
throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
}())[0];
export var __N_SSG = !0; export var __N_SSG = !0;
export default function e() { export default function t() {
return React.createElement("div", null); return React.createElement("div", null);
} }
...@@ -2,11 +2,7 @@ ...@@ -2,11 +2,7 @@
Object.defineProperty(exports, "__esModule", { Object.defineProperty(exports, "__esModule", {
value: true value: true
}); });
var _esm = /*#__PURE__*/ _interop_require_default(require("esm")); var _interop_require_default = require("@swc/helpers/_/_interop_require_default");
function _interop_require_default(obj) { var _esm = /*#__PURE__*/ _interop_require_default._(require("esm"));
return obj && obj.__esModule ? obj : {
default: obj
};
}
console.log(_esm.default.foo); console.log(_esm.default.foo);
module.exports = _esm.default; module.exports = _esm.default;
// This file should not import helpers using ESM syntax
const E = class Foo {}
exports.Component = E
// This file should not import helpers using ESM syntax
"use strict";
Object.defineProperty(exports, "__esModule", {
value: true
});
var _class_call_check = require("@swc/helpers/_/_class_call_check");
var E = function Foo() {
"use strict";
_class_call_check._(this, Foo);
};
exports.Component = E;
function _array_like_to_array(arr, len) { import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
if (len == null || len > arr.length) len = arr.length; import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
return arr2;
}
function _array_with_holes(arr) {
if (Array.isArray(arr)) return arr;
}
function _class_call_check(instance, Constructor) {
if (!(instance instanceof Constructor)) {
throw new TypeError("Cannot call a class as a function");
}
}
function _iterable_to_array_limit(arr, i) {
var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
if (_i == null) return;
var _arr = [];
var _n = true;
var _d = false;
var _s, _e;
try {
for(_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true){
_arr.push(_s.value);
if (i && _arr.length === i) break;
}
} catch (err) {
_d = true;
_e = err;
} finally{
try {
if (!_n && _i["return"] != null) _i["return"]();
} finally{
if (_d) throw _e;
}
}
return _arr;
}
function _non_iterable_rest() {
throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
}
function _sliced_to_array(arr, i) {
return _array_with_holes(arr) || _iterable_to_array_limit(arr, i) || _unsupported_iterable_to_array(arr, i) || _non_iterable_rest();
}
function _unsupported_iterable_to_array(o, minLen) {
if (!o) return;
if (typeof o === "string") return _array_like_to_array(o, minLen);
var n = Object.prototype.toString.call(o).slice(8, -1);
if (n === "Object" && o.constructor) n = o.constructor.name;
if (n === "Map" || n === "Set") return Array.from(n);
if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
}
import other from "other"; import other from "other";
var _other = _sliced_to_array(other, 1), foo = _other[0]; var _other = _sliced_to_array(other, 1), foo = _other[0];
var Foo = function Foo() { var Foo = function Foo() {
......
function _class_call_check(instance, Constructor) { import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
if (!(instance instanceof Constructor)) {
throw new TypeError("Cannot call a class as a function");
}
}
import { useEffect } from "react"; import { useEffect } from "react";
import { select, selectAll } from "d3-selection"; import { select, selectAll } from "d3-selection";
export default function Home() { export default function Home() {
......
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