Merge pull request #1032 from JLHwung/fix-1028

nicolo-ribaudo · web-flow · commit 6d0227ef3cbd · 2022-05-06T19:47:13.000+02:00
diff --git a/package.json b/package.json
@@ -19,9 +19,9 @@
     "watch": "gulp watch"
   },
   "devDependencies": {
-    "@babel/core": "^7.9.0",
-    "@babel/plugin-transform-block-scoping": "^7.8.3",
-    "@babel/preset-env": "^7.9.0",
+    "@babel/core": "^7.17.0",
+    "@babel/plugin-transform-block-scoping": "^7.16.7",
+    "@babel/preset-env": "^7.17.10",
     "babel-jest": "^24.9.0",
     "butternut": "^0.4.6",
     "bytes": "^3.0.0",
diff --git a/packages/babel-plugin-minify-dead-code-elimination/__tests__/fixtures/fn-params/expected.js b/packages/babel-plugin-minify-dead-code-elimination/__tests__/fixtures/fn-params/expected.js
@@ -25,13 +25,10 @@ function foo() {
     set a(b) {}
 
   };
-
-  class A {
+  return new class {
     set c(d) {
       x.a = 5;
     }
 
-  }
-
-  return new A();
+  }();
 }
diff --git a/packages/babel-plugin-minify-dead-code-elimination/__tests__/fixtures/fn-this/actual.js b/packages/babel-plugin-minify-dead-code-elimination/__tests__/fixtures/fn-this/actual.js
@@ -0,0 +1,12 @@
+class Foo {
+  get all() {
+    return false;
+  }
+  constructor() {
+    var _this = this;
+    (function () {
+      return _this.all != null;
+    }).call(document);
+  }
+
+}
diff --git a/packages/babel-plugin-minify-dead-code-elimination/__tests__/fixtures/fn-this/expected.js b/packages/babel-plugin-minify-dead-code-elimination/__tests__/fixtures/fn-this/expected.js
@@ -0,0 +1,14 @@
+class Foo {
+  get all() {
+    return false;
+  }
+
+  constructor() {
+    var _this = this;
+
+    (function () {
+      return _this.all != null;
+    }).call(document);
+  }
+
+}
diff --git a/packages/babel-plugin-minify-dead-code-elimination/src/index.js b/packages/babel-plugin-minify-dead-code-elimination/src/index.js
@@ -371,22 +371,29 @@ module.exports = ({ types: t, traverse }) => {
                   refPath.scope.getBinding(replacement.name) === binding &&
                   binding.constantViolations.length === 0
                 );
+              } else if (replacementPath.isThisExpression()) {
+                bail = true;
               } else {
                 replacementPath.traverse({
                   Function(path) {
                     path.skip();
                   },
 
+                  ThisExpression(path) {
+                    bail = true;
+                    path.stop();
+                  },
+
                   ReferencedIdentifier({ node }) {
-                    if (bail) {
-                      return;
-                    }
                     const binding = scope.getBinding(node.name);
                     if (
                       binding &&
                       refPath.scope.getBinding(node.name) === binding
                     ) {
                       bail = binding.constantViolations.length > 0;
+                      if (bail) {
+                        path.stop();
+                      }
                     }
                   }
                 });
diff --git a/packages/babel-plugin-minify-mangle-names/__tests__/fixtures/constant-violations-2/expected.js b/packages/babel-plugin-minify-mangle-names/__tests__/fixtures/constant-violations-2/expected.js
@@ -1,10 +1,10 @@
 !function () {
-  var b = 1;
-  b--;
-  var b = 10;
-  a(b);
+  var a = 1;
+  a--;
+  var a = 10;
+  b(a);
 
-  function a() {
+  function b() {
     var a = 10;
     a++;
     var a = 20;
diff --git a/packages/babel-plugin-minify-mangle-names/__tests__/fixtures/issue-822/expected.js b/packages/babel-plugin-minify-mangle-names/__tests__/fixtures/issue-822/expected.js
@@ -1,35 +1,35 @@
 function d3_svg_line(a) {
-  var c = d3_geom_pointX,
-      d = d3_geom_pointY,
+  var b = d3_geom_pointX,
+      c = d3_geom_pointY,
       e = d3_true,
       f = d3_svg_lineLinear,
       g = f.key,
       h = 0.7;
 
-  function b(b) {
-    var j = [],
-        k = [],
-        l = -1,
-        m = b.length,
-        n,
-        o = d3_functor(c);
+  function i(c) {
+    var g = [],
+        j = [],
+        k = -1,
+        l = c.length,
+        m,
+        n = d3_functor(b);
 
-    function g() {
-      j.push("M", f(a(k), h));
+    function o() {
+      g.push("M", f(a(j), h));
     }
 
-    while (++l < m) {
-      if (e.call(this, n = b[l], l)) {
-        k.push([+o.call(this, n, l)]);
-      } else if (k.length) {
-        g();
-        k = [];
+    while (++k < l) {
+      if (e.call(this, m = c[k], k)) {
+        j.push([+n.call(this, m, k)]);
+      } else if (j.length) {
+        o();
+        j = [];
       }
     }
 
-    if (k.length) g();
-    return j.length ? j.join("") : null;
+    if (j.length) o();
+    return g.length ? g.join("") : null;
   }
 
-  return b;
+  return i;
 }
diff --git a/packages/babel-plugin-minify-mangle-names/__tests__/fixtures/keep-class-name/expected.js b/packages/babel-plugin-minify-mangle-names/__tests__/fixtures/keep-class-name/expected.js
@@ -1,12 +1,12 @@
 (function () {
   class Foo {}
 
-  const b = class Bar extends Foo {};
-  var c = class Baz {};
+  const a = class Bar extends Foo {};
+  var b = class Baz {};
 
-  function a() {
-    new c();
+  function c() {
+    new b();
   }
 
-  a();
+  c();
 })();
diff --git a/packages/babel-plugin-minify-mangle-names/__tests__/fixtures/reuse/expected.js b/packages/babel-plugin-minify-mangle-names/__tests__/fixtures/reuse/expected.js
@@ -1,20 +1,20 @@
 function Foo() {
-  var ba, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y;
+  var aa, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y;
   var z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y;
   var Z, $;
-  ba, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y;
+  aa, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y;
   z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y;
   Z, $;
 
-  function aa() {
-    var aa, a, b, c, d, e, f, g, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y;
+  function _() {
+    var h, a, b, c, d, e, f, g, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y;
     var z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y;
     var Z, $;
-    aa, a, b, c, d, e, f, g, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y;
+    h, a, b, c, d, e, f, g, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y;
     z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y;
     Z, $;
 
-    function h() {
+    function _() {
       var aa, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y;
       var z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y;
       var Z, $;
@@ -23,8 +23,8 @@ function Foo() {
       Z, $;
     }
 
-    h();
+    _();
   }
 
-  aa();
+  _();
 }
diff --git a/packages/babel-preset-minify/__tests__/minify-env-tests.js b/packages/babel-preset-minify/__tests__/minify-env-tests.js
@@ -50,14 +50,20 @@ describe("preset along with env", () => {
       }
     `,
     `
+      function _defineProperties(a, b) { for (var c, d = 0; d < b.length; d++) c = b[d], c.enumerable = c.enumerable || !1, c.configurable = !0, "value" in c && (c.writable = !0), Object.defineProperty(a, c.key, c); }
+
+      function _createClass(a, b, c) { return b && _defineProperties(a.prototype, b), c && _defineProperties(a, c), Object.defineProperty(a, "prototype", { writable: !1 }), a; }
+
       function _classCallCheck(a, b) { if (!(a instanceof b)) throw new TypeError("Cannot call a class as a function"); }
 
       function a() {
-        return function a() {
+        var a = /*#__PURE__*/_createClass(function a() {
           "use strict";
 
           _classCallCheck(this, a);
-        };
+        });
+
+        return a;
       }
     `
   );
@@ -237,16 +243,20 @@ describe("preset along with env", () => {
       }
     `,
     `
+      function _defineProperties(a, b) { for (var c, d = 0; d < b.length; d++) c = b[d], c.enumerable = c.enumerable || !1, c.configurable = !0, "value" in c && (c.writable = !0), Object.defineProperty(a, c.key, c); }
+
+      function _createClass(a, b, c) { return b && _defineProperties(a.prototype, b), c && _defineProperties(a, c), Object.defineProperty(a, "prototype", { writable: !1 }), a; }
+
       function _classCallCheck(a, b) { if (!(a instanceof b)) throw new TypeError("Cannot call a class as a function"); }
 
       function bar() {
         var c = console;
         return {
-          a: function b(a) {
+          a: /*#__PURE__*/_createClass(function d(b) {
             "use strict";
 
-            _classCallCheck(this, b), c.log(a);
-          }
+            _classCallCheck(this, d), c.log(b);
+          })
         };
       }
     `
@@ -261,13 +271,17 @@ describe("preset along with env", () => {
       exports.A = A;
     `,
     `
+      function _defineProperties(a, b) { for (var c, d = 0; d < b.length; d++) c = b[d], c.enumerable = c.enumerable || !1, c.configurable = !0, "value" in c && (c.writable = !0), Object.defineProperty(a, c.key, c); }
+
+      function _createClass(a, b, c) { return b && _defineProperties(a.prototype, b), c && _defineProperties(a, c), Object.defineProperty(a, "prototype", { writable: !1 }), a; }
+
       function _classCallCheck(a, b) { if (!(a instanceof b)) throw new TypeError("Cannot call a class as a function"); }
 
-      var A = function a() {
+      var A = /*#__PURE__*/_createClass(function a() {
         "use strict";
 
         _classCallCheck(this, a);
-      };
+      });
 
       A.B = {}, exports.A = A;
     `
diff --git a/utils/test-runner/src/index.js b/utils/test-runner/src/index.js
@@ -35,7 +35,7 @@ function testRunner(dir) {
     .filter(dir => fs.isDirectorySync(pathJoin(fixturesDir, dir)));
 
   const flags = parseArgs(process.argv);
-  const updateFixtures = Boolean(flags["update-fixtures"]);
+  const updateFixtures = !!process.env.OVERWRITE || Boolean(flags["update-fixtures"]);
 
   describe(pkgName, () => {
     for (const fixture of fixtures) {
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -25,13 +25,10 @@ function foo() {`
`25`	`25`	`set a(b) {}`
`26`	`26`
`27`	`27`	`};`
`28`		`-`
`29`		`- class A {`
	`28`	`+ return new class {`
`30`	`29`	`set c(d) {`
`31`	`30`	`x.a = 5;`
`32`	`31`	`}`
`33`	`32`
`34`		`- }`
`35`		`-`
`36`		`- return new A();`
	`33`	`+ }();`
`37`	`34`	`}`