fix: enable transform-block-scoping with generators feature (babel#12806

)
IlyaSemenov · May 2, 2023 · 0b87763 · 0b87763
1 parent 2942629
commit 0b87763
Show file tree

Hide file tree

Showing 37 changed files with 135 additions and 35 deletions.
diff --git a/packages/babel-compat-data/data/plugins.json b/packages/babel-compat-data/data/plugins.json
@@ -566,16 +566,16 @@
     "electron": "1.2"
   },
   "transform-block-scoping": {
-    "chrome": "49",
-    "opera": "36",
+    "chrome": "50",
+    "opera": "37",
     "edge": "14",
-    "firefox": "51",
+    "firefox": "53",
     "safari": "11",
     "node": "6",
     "deno": "1",
     "ios": "11",
     "samsung": "5",
-    "electron": "0.37"
+    "electron": "1.1"
   },
   "transform-typeof-symbol": {
     "chrome": "38",

diff --git a/packages/babel-compat-data/scripts/data/plugin-features.js b/packages/babel-compat-data/scripts/data/plugin-features.js
@@ -102,7 +102,7 @@ const es2015 = {
     features: ["destructuring, assignment", "destructuring, declarations"],
   },
   "transform-block-scoping": {
-    features: ["const", "let"],
+    features: ["const", "let", "generators"],
   },
   "transform-typeof-symbol": {
     features: ["Symbol / typeof support"],

diff --git a/packages/babel-preset-env/test/fixtures/debug-babel-7/entry-corejs2-electron/stdout.txt b/packages/babel-preset-env/test/fixtures/debug-babel-7/entry-corejs2-electron/stdout.txt
@@ -31,7 +31,7 @@ Using plugins:
   transform-sticky-regex { electron < 0.37 }
   transform-unicode-regex { electron < 1.1 }
   transform-destructuring { electron < 1.2 }
-  transform-block-scoping { electron < 0.37 }
+  transform-block-scoping { electron < 1.1 }
   transform-regenerator { electron < 1.1 }
   transform-export-namespace-from { electron < 5.0 }
   transform-modules-commonjs

diff --git a/...es/babel-preset-env/test/fixtures/debug-babel-7/entry-corejs2-specific-targets/stdout.txt b/...es/babel-preset-env/test/fixtures/debug-babel-7/entry-corejs2-specific-targets/stdout.txt
@@ -47,7 +47,7 @@ Using plugins:
   transform-unicode-regex { ie, ios < 12, safari < 12 }
   transform-spread { ie, ios < 10, safari < 10 }
   transform-destructuring { edge < 15, firefox < 53, ie, ios < 10, safari < 10 }
-  transform-block-scoping { edge < 14, firefox < 51, ie, ios < 11, safari < 11 }
+  transform-block-scoping { edge < 14, firefox < 53, ie, ios < 11, safari < 11 }
   transform-typeof-symbol { ie, safari < 9 }
   transform-new-target { edge < 14, ie, ios < 10, safari < 10 }
   transform-regenerator { firefox < 53, ie, ios < 10, safari < 10 }

diff --git a/...s/babel-preset-env/test/fixtures/debug-babel-7/entry-corejs2-versions-decimals/stdout.txt b/...s/babel-preset-env/test/fixtures/debug-babel-7/entry-corejs2-versions-decimals/stdout.txt
@@ -45,7 +45,7 @@ Using plugins:
   transform-unicode-regex { electron < 1.1, ie }
   transform-spread { ie }
   transform-destructuring { electron < 1.2, ie, node < 6.5 }
-  transform-block-scoping { electron < 0.37, ie }
+  transform-block-scoping { electron < 1.1, ie }
   transform-typeof-symbol { ie }
   transform-new-target { ie }
   transform-regenerator { electron < 1.1, ie }

diff --git a/packages/babel-preset-env/test/fixtures/debug-babel-7/entry-corejs3-electron/stdout.txt b/packages/babel-preset-env/test/fixtures/debug-babel-7/entry-corejs3-electron/stdout.txt
@@ -31,7 +31,7 @@ Using plugins:
   transform-sticky-regex { electron < 0.37 }
   transform-unicode-regex { electron < 1.1 }
   transform-destructuring { electron < 1.2 }
-  transform-block-scoping { electron < 0.37 }
+  transform-block-scoping { electron < 1.1 }
   transform-regenerator { electron < 1.1 }
   transform-export-namespace-from { electron < 5.0 }
   transform-modules-commonjs

diff --git a/...es/babel-preset-env/test/fixtures/debug-babel-7/entry-corejs3-specific-targets/stdout.txt b/...es/babel-preset-env/test/fixtures/debug-babel-7/entry-corejs3-specific-targets/stdout.txt
@@ -47,7 +47,7 @@ Using plugins:
   transform-unicode-regex { ie, ios < 12, safari < 12 }
   transform-spread { ie, ios < 10, safari < 10 }
   transform-destructuring { edge < 15, firefox < 53, ie, ios < 10, safari < 10 }
-  transform-block-scoping { edge < 14, firefox < 51, ie, ios < 11, safari < 11 }
+  transform-block-scoping { edge < 14, firefox < 53, ie, ios < 11, safari < 11 }
   transform-typeof-symbol { ie, safari < 9 }
   transform-new-target { edge < 14, ie, ios < 10, safari < 10 }
   transform-regenerator { firefox < 53, ie, ios < 10, safari < 10 }

diff --git a/...s/babel-preset-env/test/fixtures/debug-babel-7/entry-corejs3-versions-decimals/stdout.txt b/...s/babel-preset-env/test/fixtures/debug-babel-7/entry-corejs3-versions-decimals/stdout.txt
@@ -45,7 +45,7 @@ Using plugins:
   transform-unicode-regex { electron < 1.1, ie }
   transform-spread { ie }
   transform-destructuring { electron < 1.2, ie, node < 6.5 }
-  transform-block-scoping { electron < 0.37, ie }
+  transform-block-scoping { electron < 1.1, ie }
   transform-typeof-symbol { ie }
   transform-new-target { ie }
   transform-regenerator { electron < 1.1, ie }

diff --git a/packages/babel-preset-env/test/fixtures/debug-babel-7/plugins-only/stdout.txt b/packages/babel-preset-env/test/fixtures/debug-babel-7/plugins-only/stdout.txt
@@ -29,6 +29,7 @@ Using plugins:
   transform-for-of { firefox < 53 }
   transform-unicode-escapes { firefox < 53 }
   transform-destructuring { firefox < 53 }
+  transform-block-scoping { firefox < 53 }
   transform-export-namespace-from { firefox < 80, node < 13.2 }
   transform-modules-commonjs
   transform-dynamic-import

diff --git a/packages/babel-preset-env/test/fixtures/debug-babel-7/usage-corejs2-1/stdout.txt b/packages/babel-preset-env/test/fixtures/debug-babel-7/usage-corejs2-1/stdout.txt
@@ -43,7 +43,7 @@ Using plugins:
   transform-unicode-regex { ie }
   transform-spread { ie }
   transform-destructuring { firefox < 53, ie }
-  transform-block-scoping { firefox < 51, ie }
+  transform-block-scoping { firefox < 53, ie }
   transform-typeof-symbol { ie }
   transform-new-target { ie }
   transform-regenerator { firefox < 53, ie }

diff --git a/packages/babel-preset-env/test/fixtures/debug-babel-7/usage-corejs2-2/stdout.txt b/packages/babel-preset-env/test/fixtures/debug-babel-7/usage-corejs2-2/stdout.txt
@@ -43,7 +43,7 @@ Using plugins:
   transform-unicode-regex { ie }
   transform-spread { ie }
   transform-destructuring { firefox < 53, ie }
-  transform-block-scoping { firefox < 51, ie }
+  transform-block-scoping { firefox < 53, ie }
   transform-typeof-symbol { ie }
   transform-new-target { ie }
   transform-regenerator { firefox < 53, ie }

diff --git a/packages/babel-preset-env/test/fixtures/debug-babel-7/usage-corejs2-none-1/stdout.txt b/packages/babel-preset-env/test/fixtures/debug-babel-7/usage-corejs2-none-1/stdout.txt
@@ -43,7 +43,7 @@ Using plugins:
   transform-unicode-regex { ie }
   transform-spread { ie }
   transform-destructuring { firefox < 53, ie }
-  transform-block-scoping { firefox < 51, ie }
+  transform-block-scoping { firefox < 53, ie }
   transform-typeof-symbol { ie }
   transform-new-target { ie }
   transform-regenerator { firefox < 53, ie }

diff --git a/packages/babel-preset-env/test/fixtures/debug-babel-7/usage-corejs2-none-2/stdout.txt b/packages/babel-preset-env/test/fixtures/debug-babel-7/usage-corejs2-none-2/stdout.txt
@@ -43,7 +43,7 @@ Using plugins:
   transform-unicode-regex { ie }
   transform-spread { ie }
   transform-destructuring { firefox < 53, ie }
-  transform-block-scoping { firefox < 51, ie }
+  transform-block-scoping { firefox < 53, ie }
   transform-typeof-symbol { ie }
   transform-new-target { ie }
   transform-regenerator { firefox < 53, ie }

diff --git a/packages/babel-preset-env/test/fixtures/debug-babel-7/usage-corejs2-proposals-1/stdout.txt b/packages/babel-preset-env/test/fixtures/debug-babel-7/usage-corejs2-proposals-1/stdout.txt
@@ -43,7 +43,7 @@ Using plugins:
   transform-unicode-regex { ie }
   transform-spread { ie }
   transform-destructuring { firefox < 53, ie }
-  transform-block-scoping { firefox < 51, ie }
+  transform-block-scoping { firefox < 53, ie }
   transform-typeof-symbol { ie }
   transform-new-target { ie }
   transform-regenerator { firefox < 53, ie }

diff --git a/packages/babel-preset-env/test/fixtures/debug-babel-7/usage-corejs2-proposals-2/stdout.txt b/packages/babel-preset-env/test/fixtures/debug-babel-7/usage-corejs2-proposals-2/stdout.txt
@@ -43,7 +43,7 @@ Using plugins:
   transform-unicode-regex { ie }
   transform-spread { ie }
   transform-destructuring { firefox < 53, ie }
-  transform-block-scoping { firefox < 51, ie }
+  transform-block-scoping { firefox < 53, ie }
   transform-typeof-symbol { ie }
   transform-new-target { ie }
   transform-regenerator { firefox < 53, ie }

diff --git a/.../babel-preset-env/test/fixtures/debug-babel-7/usage-corejs2-shippedProposals-1/stdout.txt b/.../babel-preset-env/test/fixtures/debug-babel-7/usage-corejs2-shippedProposals-1/stdout.txt
@@ -43,7 +43,7 @@ Using plugins:
   transform-unicode-regex { ie }
   transform-spread { ie }
   transform-destructuring { firefox < 53, ie }
-  transform-block-scoping { firefox < 51, ie }
+  transform-block-scoping { firefox < 53, ie }
   transform-typeof-symbol { ie }
   transform-new-target { ie }
   transform-regenerator { firefox < 53, ie }

diff --git a/.../babel-preset-env/test/fixtures/debug-babel-7/usage-corejs2-shippedProposals-2/stdout.txt b/.../babel-preset-env/test/fixtures/debug-babel-7/usage-corejs2-shippedProposals-2/stdout.txt
@@ -43,7 +43,7 @@ Using plugins:
   transform-unicode-regex { ie }
   transform-spread { ie }
   transform-destructuring { firefox < 53, ie }
-  transform-block-scoping { firefox < 51, ie }
+  transform-block-scoping { firefox < 53, ie }
   transform-typeof-symbol { ie }
   transform-new-target { ie }
   transform-regenerator { firefox < 53, ie }

diff --git a/packages/babel-preset-env/test/fixtures/debug-babel-7/usage-corejs3-1/stdout.txt b/packages/babel-preset-env/test/fixtures/debug-babel-7/usage-corejs3-1/stdout.txt
@@ -43,7 +43,7 @@ Using plugins:
   transform-unicode-regex { ie }
   transform-spread { ie }
   transform-destructuring { firefox < 53, ie }
-  transform-block-scoping { firefox < 51, ie }
+  transform-block-scoping { firefox < 53, ie }
   transform-typeof-symbol { ie }
   transform-new-target { ie }
   transform-regenerator { firefox < 53, ie }

diff --git a/packages/babel-preset-env/test/fixtures/debug-babel-7/usage-corejs3-2/stdout.txt b/packages/babel-preset-env/test/fixtures/debug-babel-7/usage-corejs3-2/stdout.txt
@@ -43,7 +43,7 @@ Using plugins:
   transform-unicode-regex { ie }
   transform-spread { ie }
   transform-destructuring { firefox < 53, ie }
-  transform-block-scoping { firefox < 51, ie }
+  transform-block-scoping { firefox < 53, ie }
   transform-typeof-symbol { ie }
   transform-new-target { ie }
   transform-regenerator { firefox < 53, ie }

diff --git a/packages/babel-preset-env/test/fixtures/debug-babel-7/usage-corejs3-none-1/stdout.txt b/packages/babel-preset-env/test/fixtures/debug-babel-7/usage-corejs3-none-1/stdout.txt
@@ -43,7 +43,7 @@ Using plugins:
   transform-unicode-regex { ie }
   transform-spread { ie }
   transform-destructuring { firefox < 53, ie }
-  transform-block-scoping { firefox < 51, ie }
+  transform-block-scoping { firefox < 53, ie }
   transform-typeof-symbol { ie }
   transform-new-target { ie }
   transform-regenerator { firefox < 53, ie }

diff --git a/packages/babel-preset-env/test/fixtures/debug-babel-7/usage-corejs3-none-2/stdout.txt b/packages/babel-preset-env/test/fixtures/debug-babel-7/usage-corejs3-none-2/stdout.txt
@@ -43,7 +43,7 @@ Using plugins:
   transform-unicode-regex { ie }
   transform-spread { ie }
   transform-destructuring { firefox < 53, ie }
-  transform-block-scoping { firefox < 51, ie }
+  transform-block-scoping { firefox < 53, ie }
   transform-typeof-symbol { ie }
   transform-new-target { ie }
   transform-regenerator { firefox < 53, ie }

diff --git a/packages/babel-preset-env/test/fixtures/debug-babel-7/usage-corejs3-proposals-1/stdout.txt b/packages/babel-preset-env/test/fixtures/debug-babel-7/usage-corejs3-proposals-1/stdout.txt
@@ -43,7 +43,7 @@ Using plugins:
   transform-unicode-regex { ie }
   transform-spread { ie }
   transform-destructuring { firefox < 53, ie }
-  transform-block-scoping { firefox < 51, ie }
+  transform-block-scoping { firefox < 53, ie }
   transform-typeof-symbol { ie }
   transform-new-target { ie }
   transform-regenerator { firefox < 53, ie }

diff --git a/packages/babel-preset-env/test/fixtures/debug-babel-7/usage-corejs3-proposals-2/stdout.txt b/packages/babel-preset-env/test/fixtures/debug-babel-7/usage-corejs3-proposals-2/stdout.txt
@@ -43,7 +43,7 @@ Using plugins:
   transform-unicode-regex { ie }
   transform-spread { ie }
   transform-destructuring { firefox < 53, ie }
-  transform-block-scoping { firefox < 51, ie }
+  transform-block-scoping { firefox < 53, ie }
   transform-typeof-symbol { ie }
   transform-new-target { ie }
   transform-regenerator { firefox < 53, ie }

diff --git a/.../babel-preset-env/test/fixtures/debug-babel-7/usage-corejs3-shippedProposals-1/stdout.txt b/.../babel-preset-env/test/fixtures/debug-babel-7/usage-corejs3-shippedProposals-1/stdout.txt
@@ -43,7 +43,7 @@ Using plugins:
   transform-unicode-regex { ie }
   transform-spread { ie }
   transform-destructuring { firefox < 53, ie }
-  transform-block-scoping { firefox < 51, ie }
+  transform-block-scoping { firefox < 53, ie }
   transform-typeof-symbol { ie }
   transform-new-target { ie }
   transform-regenerator { firefox < 53, ie }

diff --git a/.../babel-preset-env/test/fixtures/debug-babel-7/usage-corejs3-shippedProposals-2/stdout.txt b/.../babel-preset-env/test/fixtures/debug-babel-7/usage-corejs3-shippedProposals-2/stdout.txt
@@ -43,7 +43,7 @@ Using plugins:
   transform-unicode-regex { ie }
   transform-spread { ie }
   transform-destructuring { firefox < 53, ie }
-  transform-block-scoping { firefox < 51, ie }
+  transform-block-scoping { firefox < 53, ie }
   transform-typeof-symbol { ie }
   transform-new-target { ie }
   transform-regenerator { firefox < 53, ie }

diff --git a/...set-env/test/fixtures/debug-babel-7/usage-corejs3-versions-strings-minor-3.0-1/stdout.txt b/...set-env/test/fixtures/debug-babel-7/usage-corejs3-versions-strings-minor-3.0-1/stdout.txt
@@ -43,7 +43,7 @@ Using plugins:
   transform-unicode-regex { ie }
   transform-spread { ie }
   transform-destructuring { firefox < 53, ie }
-  transform-block-scoping { firefox < 51, ie }
+  transform-block-scoping { firefox < 53, ie }
   transform-typeof-symbol { ie }
   transform-new-target { ie }
   transform-regenerator { firefox < 53, ie }

diff --git a/...set-env/test/fixtures/debug-babel-7/usage-corejs3-versions-strings-minor-3.0-2/stdout.txt b/...set-env/test/fixtures/debug-babel-7/usage-corejs3-versions-strings-minor-3.0-2/stdout.txt
@@ -43,7 +43,7 @@ Using plugins:
   transform-unicode-regex { ie }
   transform-spread { ie }
   transform-destructuring { firefox < 53, ie }
-  transform-block-scoping { firefox < 51, ie }
+  transform-block-scoping { firefox < 53, ie }
   transform-typeof-symbol { ie }
   transform-new-target { ie }
   transform-regenerator { firefox < 53, ie }

diff --git a/...set-env/test/fixtures/debug-babel-7/usage-corejs3-versions-strings-minor-3.1-1/stdout.txt b/...set-env/test/fixtures/debug-babel-7/usage-corejs3-versions-strings-minor-3.1-1/stdout.txt
@@ -43,7 +43,7 @@ Using plugins:
   transform-unicode-regex { ie }
   transform-spread { ie }
   transform-destructuring { firefox < 53, ie }
-  transform-block-scoping { firefox < 51, ie }
+  transform-block-scoping { firefox < 53, ie }
   transform-typeof-symbol { ie }
   transform-new-target { ie }
   transform-regenerator { firefox < 53, ie }

diff --git a/...set-env/test/fixtures/debug-babel-7/usage-corejs3-versions-strings-minor-3.1-2/stdout.txt b/...set-env/test/fixtures/debug-babel-7/usage-corejs3-versions-strings-minor-3.1-2/stdout.txt
@@ -43,7 +43,7 @@ Using plugins:
   transform-unicode-regex { ie }
   transform-spread { ie }
   transform-destructuring { firefox < 53, ie }
-  transform-block-scoping { firefox < 51, ie }
+  transform-block-scoping { firefox < 53, ie }
   transform-typeof-symbol { ie }
   transform-new-target { ie }
   transform-regenerator { firefox < 53, ie }

diff --git a/packages/babel-preset-env/test/fixtures/debug-babel-7/usage-no-corejs-1/stdout.txt b/packages/babel-preset-env/test/fixtures/debug-babel-7/usage-no-corejs-1/stdout.txt
@@ -43,7 +43,7 @@ Using plugins:
   transform-unicode-regex { ie }
   transform-spread { ie }
   transform-destructuring { firefox < 53, ie }
-  transform-block-scoping { firefox < 51, ie }
+  transform-block-scoping { firefox < 53, ie }
   transform-typeof-symbol { ie }
   transform-new-target { ie }
   transform-regenerator { firefox < 53, ie }

diff --git a/packages/babel-preset-env/test/fixtures/debug-babel-7/usage-no-corejs-2/stdout.txt b/packages/babel-preset-env/test/fixtures/debug-babel-7/usage-no-corejs-2/stdout.txt
@@ -43,7 +43,7 @@ Using plugins:
   transform-unicode-regex { ie }
   transform-spread { ie }
   transform-destructuring { firefox < 53, ie }
-  transform-block-scoping { firefox < 51, ie }
+  transform-block-scoping { firefox < 53, ie }
   transform-typeof-symbol { ie }
   transform-new-target { ie }
   transform-regenerator { firefox < 53, ie }

diff --git a/packages/babel-preset-env/test/fixtures/debug-babel-7/usage-no-corejs-none-1/stdout.txt b/packages/babel-preset-env/test/fixtures/debug-babel-7/usage-no-corejs-none-1/stdout.txt
@@ -43,7 +43,7 @@ Using plugins:
   transform-unicode-regex { ie }
   transform-spread { ie }
   transform-destructuring { firefox < 53, ie }
-  transform-block-scoping { firefox < 51, ie }
+  transform-block-scoping { firefox < 53, ie }
   transform-typeof-symbol { ie }
   transform-new-target { ie }
   transform-regenerator { firefox < 53, ie }

diff --git a/packages/babel-preset-env/test/fixtures/debug-babel-7/usage-no-corejs-none-2/stdout.txt b/packages/babel-preset-env/test/fixtures/debug-babel-7/usage-no-corejs-none-2/stdout.txt
@@ -43,7 +43,7 @@ Using plugins:
   transform-unicode-regex { ie }
   transform-spread { ie }
   transform-destructuring { firefox < 53, ie }
-  transform-block-scoping { firefox < 51, ie }
+  transform-block-scoping { firefox < 53, ie }
   transform-typeof-symbol { ie }
   transform-new-target { ie }
   transform-regenerator { firefox < 53, ie }

diff --git a/...abel-preset-env/test/fixtures/plugins-integration/block-scoping-inside-generator/input.js b/...abel-preset-env/test/fixtures/plugins-integration/block-scoping-inside-generator/input.js
@@ -0,0 +1,6 @@
+async function test() {
+  const obj = {};
+  for (const ch of ["good", "bad"]) {
+    obj[ch] = () => ch;
+  }
+}
diff --git a/...-preset-env/test/fixtures/plugins-integration/block-scoping-inside-generator/options.json b/...-preset-env/test/fixtures/plugins-integration/block-scoping-inside-generator/options.json
@@ -0,0 +1,12 @@
+{
+  "validateLogs": true,
+  "presets": [
+    [
+      "env",
+      {
+        "debug": true,
+        "targets": ["Chrome 49"]
+      }
+    ]
+  ]
+}
diff --git a/...bel-preset-env/test/fixtures/plugins-integration/block-scoping-inside-generator/output.js b/...bel-preset-env/test/fixtures/plugins-integration/block-scoping-inside-generator/output.js
@@ -0,0 +1,42 @@
+function test() {
+  return _test.apply(this, arguments);
+}
+function _test() {
+  _test = babelHelpers.asyncToGenerator( /*#__PURE__*/babelHelpers.regeneratorRuntime().mark(function _callee() {
+    var obj, _loop, _i, _arr;
+    return babelHelpers.regeneratorRuntime().wrap(function _callee$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          obj = {};
+          _loop = /*#__PURE__*/babelHelpers.regeneratorRuntime().mark(function _loop() {
+            var ch;
+            return babelHelpers.regeneratorRuntime().wrap(function _loop$(_context) {
+              while (1) switch (_context.prev = _context.next) {
+                case 0:
+                  ch = _arr[_i];
+                  obj[ch] = () => ch;
+                case 2:
+                case "end":
+                  return _context.stop();
+              }
+            }, _loop);
+          });
+          _i = 0, _arr = ["good", "bad"];
+        case 3:
+          if (!(_i < _arr.length)) {
+            _context2.next = 8;
+            break;
+          }
+          return _context2.delegateYield(_loop(), "t0", 5);
+        case 5:
+          _i++;
+          _context2.next = 3;
+          break;
+        case 8:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee);
+  }));
+  return _test.apply(this, arguments);
+}