refact(es/minifier): Respect TopLevel and Module

swc-project · Jul 18, 2023 · 2b3f15d · 2b3f15d
1 parent 6c18125
commit 2b3f15d
Show file tree

Hide file tree

Showing 39 changed files with 271 additions and 338 deletions.
diff --git a/crates/swc/src/config/mod.rs b/crates/swc/src/config/mod.rs
@@ -410,6 +410,13 @@ impl Options {
                             c.toplevel = Some(TerserTopLevelOptions::Bool(true));
                         }
 
+                        if matches!(
+                            cfg.module,
+                            None | Some(ModuleConfig::Es6 | ModuleConfig::NodeNext)
+                        ) {
+                            c.module = true;
+                        }
+
                         c
                     })
                     .map(BoolOrDataConfig::from_obj)

diff --git a/crates/swc/tests/fixture/issues-2xxx/2011/reduced/output/index.js b/crates/swc/tests/fixture/issues-2xxx/2011/reduced/output/index.js
@@ -1,8 +1,7 @@
-var t;
-module.exports = ((t = function() {
-    "use strict";
-    function t() {}
-    return t.prototype.it = function() {
-        this.bb = new t.MyA();
-    }, t;
-}()).MyA = function() {}, t);
+var n;
+module.exports = ((n = function() {
+    function n() {}
+    return n.prototype.it = function() {
+        this.bb = new n.MyA();
+    }, n;
+}()).MyA = function() {}, n);
diff --git a/crates/swc/tests/fixture/sourcemap/004/output/index.js b/crates/swc/tests/fixture/sourcemap/004/output/index.js
@@ -3,29 +3,28 @@
         158
     ],
     {
-        2943: function(n, t, u) {
-            "use strict";
+        2943: function(n, u, t) {
             var r = function(n) {
-                var t = n.data;
+                var u = n.data;
                 return (0, _.jsx)("div", {
-                    children: t.foo
+                    children: u.foo
                 });
             };
-            u.r(t), u.d(t, {
+            t.r(u), t.d(u, {
                 __N_SSG: function() {
                     return i;
                 },
                 default: function() {
                     return r;
                 }
             });
-            var _ = u(4512), i = !0;
+            var _ = t(4512), i = !0;
         },
-        7139: function(n, t, u) {
+        7139: function(n, u, t) {
             (window.__NEXT_P = window.__NEXT_P || []).push([
                 "/static",
                 function() {
-                    return u(2943);
+                    return t(2943);
                 }
             ]);
         }

diff --git a/crates/swc/tests/fixture/sourcemap/004/output/index.map b/crates/swc/tests/fixture/sourcemap/004/output/index.map
@@ -1,5 +1,5 @@
 {
-  "mappings": "AAACA,CAAAA,KAAKC,gBAAmB,GAAGD,KAAKC,gBAAmB,IAAI,EAAE,AAAF,EAAIC,IAAI,CAAC;IAC7D;QACI;KACH;IACD;QACU,MAAY,SAAUC,CAAuB,EAAEC,CAAmB,EAAEC,CAAmB;YACzF;YACA,IAAIC,IAAa,SAAoBC,CAAI;gBACrC,IAAIC,IAAOD,EAAKC,IAAI;gBACpB,OAAqB,AAAC,CAAA,GAAGC,EAA+CC,GAAG,AAAHA,EAAK,OAAO;oBAChFC,UAAUH,EAAKI,GAAG;gBACtB;YACJ;YACAP,EAAoBQ,CAAC,CAACT,IACDC,EAAoBS,CAAC,CAACV,GAAqB;gBACvCW,SAAS;oBAC1B,OAAqBA;gBACzB;gBACqBC,SAAS;oBAC1B,OAAqBV;gBACzB;YACJ;YACqB,IAAIG,IAAiDJ,EAAoB,OAC1FU,IAAU,CAAA;QAE1B;QACc,MAAY,SAAUZ,CAAuB,EAAEc,CAAwB,EAAEZ,CAAmB;YAC7Fa,CAAAA,OAAOC,QAAQ,GAAGD,OAAOC,QAAQ,IAAI,EAAE,AAAF,EAAIjB,IAAI,CAAC;gBAC3C;gBACA;oBACI,OAAOG,EAAoB;gBAC/B;aACH;QAGb;IACI;IACS,SAAUA,CAAmB;QAKzBA,EAAoBe,CAAC,CAAC,GAAG;YAC9B;YACA;YACA;SACH,EAAE;YACC,OAPOf,EAAoBA,EAAoBgB,CAAC,GAOxB;QAC5B,IAESC,OAD0BjB,EAAoBe,CAAC;IAGhE;CACC",
+  "mappings": "AAACA,CAAAA,KAAKC,gBAAmB,GAAGD,KAAKC,gBAAmB,IAAI,EAAE,AAAF,EAAIC,IAAI,CAAC;IAC7D;QACI;KACH;IACD;QACU,MAAY,SAAUC,CAAuB,EAAEC,CAAmB,EAAEC,CAAmB;YAEzF,IAAIC,IAAa,SAAoBC,CAAI;gBACrC,IAAIC,IAAOD,EAAKC,IAAI;gBACpB,OAAqB,AAAC,CAAA,GAAGC,EAA+CC,GAAG,AAAHA,EAAK,OAAO;oBAChFC,UAAUH,EAAKI,GAAG;gBACtB;YACJ;YACAP,EAAoBQ,CAAC,CAACT,IACDC,EAAoBS,CAAC,CAACV,GAAqB;gBACvCW,SAAS;oBAC1B,OAAqBA;gBACzB;gBACqBC,SAAS;oBAC1B,OAAqBV;gBACzB;YACJ;YACqB,IAAIG,IAAiDJ,EAAoB,OAC1FU,IAAU,CAAA;QAE1B;QACc,MAAY,SAAUZ,CAAuB,EAAEc,CAAwB,EAAEZ,CAAmB;YAC7Fa,CAAAA,OAAOC,QAAQ,GAAGD,OAAOC,QAAQ,IAAI,EAAE,AAAF,EAAIjB,IAAI,CAAC;gBAC3C;gBACA;oBACI,OAAOG,EAAoB;gBAC/B;aACH;QAGb;IACI;IACS,SAAUA,CAAmB;QAKzBA,EAAoBe,CAAC,CAAC,GAAG;YAC9B;YACA;YACA;SACH,EAAE;YACC,OAPOf,EAAoBA,EAAoBgB,CAAC,GAOxB;QAC5B,IAESC,OAD0BjB,EAAoBe,CAAC;IAGhE;CACC",
   "names": [
     "self",
     "webpackChunk_N_E",

diff --git a/crates/swc/tests/vercel/full-compact/d3-color/1/output/index.js b/crates/swc/tests/vercel/full-compact/d3-color/1/output/index.js
diff --git a/crates/swc/tests/vercel/full-compact/react-autosuggest/1/output/index.js b/crates/swc/tests/vercel/full-compact/react-autosuggest/1/output/index.js
diff --git a/crates/swc/tests/vercel/full/firebase/dist/1/output/index.js b/crates/swc/tests/vercel/full/firebase/dist/1/output/index.js
@@ -1,4 +1,3 @@
-"use strict";
 var e, t = require("@firebase/util"), n = require("tslib"), r = require("@firebase/component"), i = require("@firebase/app"), a = require("@firebase/logger"), o = function(e) {
     if (e && e.__esModule) return e;
     var t = Object.create(null);