add bugfix plugin to preset-env

babel · Oct 13, 2021 · 2779bf1 · 2779bf1
1 parent 1996ef8
commit 2779bf1
Show file tree

Hide file tree

Showing 96 changed files with 243 additions and 135 deletions.
diff --git a/packages/babel-preset-env/package.json b/packages/babel-preset-env/package.json
@@ -20,6 +20,7 @@
     "@babel/helper-compilation-targets": "workspace:^7.15.4",
     "@babel/helper-plugin-utils": "workspace:^7.14.5",
     "@babel/helper-validator-option": "workspace:^7.14.5",
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "workspace:^0.0.0",
     "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "workspace:^7.15.4",
     "@babel/plugin-proposal-async-generator-functions": "workspace:^7.15.8",
     "@babel/plugin-proposal-class-properties": "workspace:^7.14.5",

diff --git a/packages/babel-preset-env/src/available-plugins.ts b/packages/babel-preset-env/src/available-plugins.ts
@@ -68,6 +68,7 @@ import bugfixEdgeFunctionName from "@babel/preset-modules/lib/plugins/transform-
 import bugfixTaggedTemplateCaching from "@babel/preset-modules/lib/plugins/transform-tagged-template-caching";
 import bugfixSafariBlockShadowing from "@babel/preset-modules/lib/plugins/transform-safari-block-shadowing";
 import bugfixSafariForShadowing from "@babel/preset-modules/lib/plugins/transform-safari-for-shadowing";
+import bugfixSafariIdDestructuringCollisionInFunctionExpression from "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression";
 import bugfixV8SpreadParametersInOptionalChaining from "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining";
 
 export default {
@@ -76,6 +77,8 @@ export default {
   "bugfix/transform-edge-function-name": () => bugfixEdgeFunctionName,
   "bugfix/transform-safari-block-shadowing": () => bugfixSafariBlockShadowing,
   "bugfix/transform-safari-for-shadowing": () => bugfixSafariForShadowing,
+  "bugfix/transform-safari-id-destructuring-collision-in-function-expression":
+    () => bugfixSafariIdDestructuringCollisionInFunctionExpression,
   "bugfix/transform-tagged-template-caching": () => bugfixTaggedTemplateCaching,
   "bugfix/transform-v8-spread-parameters-in-optional-chaining": () =>
     bugfixV8SpreadParametersInOptionalChaining,

diff --git a/packages/babel-preset-env/test/fixtures/bugfixes/_esmodules-no-bugfixes/stdout.txt b/packages/babel-preset-env/test/fixtures/bugfixes/_esmodules-no-bugfixes/stdout.txt
@@ -16,13 +16,13 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
-  proposal-private-property-in-object { android, chrome < 91, edge, firefox < 90, ios, node, opera, safari, samsung }
-  proposal-class-properties { android, chrome < 84, edge < 84, firefox < 90, ios, node < 14.6, opera < 70, safari < 15, samsung }
-  proposal-private-methods { android, chrome < 84, edge < 84, firefox < 90, ios, node < 14.6, opera < 70, safari < 15, samsung }
+  proposal-private-property-in-object { android, chrome < 91, edge, firefox < 90, ios < 15, node, opera, safari < 15, samsung }
+  proposal-class-properties { android, chrome < 84, edge < 84, firefox < 90, ios < 15, node < 14.6, opera < 70, safari < 15, samsung < 14 }
+  proposal-private-methods { android, chrome < 84, edge < 84, firefox < 90, ios < 15, node < 14.6, opera < 70, safari < 15, samsung < 14 }
   proposal-numeric-separator { android, chrome < 75, edge < 79, firefox < 70, ios < 13, opera < 62, safari < 13, samsung < 11 }
-  proposal-logical-assignment-operators { android, chrome < 85, edge < 85, firefox < 79, ios < 14, node < 15, opera < 71, safari < 14, samsung }
+  proposal-logical-assignment-operators { android, chrome < 85, edge < 85, firefox < 79, ios < 14, node < 15, opera < 71, safari < 14, samsung < 14 }
   proposal-nullish-coalescing-operator { android, chrome < 80, edge < 80, firefox < 72, ios < 13.4, node < 14, opera < 67, safari < 13.1, samsung < 13 }
-  proposal-optional-chaining { android, chrome, edge, firefox < 74, ios < 13.4, node, opera, safari < 13.1, samsung }
+  proposal-optional-chaining { android, chrome < 91, edge, firefox < 74, ios < 13.4, node, opera, safari < 13.1, samsung }
   proposal-json-strings { android, chrome < 66, edge < 79, firefox < 62, ios < 12, opera < 53, safari < 12, samsung < 9 }
   proposal-optional-catch-binding { android, chrome < 66, edge < 79, ios < 11.3, opera < 53, safari < 11.1, samsung < 9 }
   transform-parameters { edge < 18 }

diff --git a/packages/babel-preset-env/test/fixtures/bugfixes/_esmodules/stdout.txt b/packages/babel-preset-env/test/fixtures/bugfixes/_esmodules/stdout.txt
@@ -16,11 +16,11 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
-  proposal-private-property-in-object { android, chrome < 91, edge, firefox < 90, ios, node, opera, safari, samsung }
-  proposal-class-properties { android, chrome < 84, edge < 84, firefox < 90, ios, node < 14.6, opera < 70, safari < 15, samsung }
-  proposal-private-methods { android, chrome < 84, edge < 84, firefox < 90, ios, node < 14.6, opera < 70, safari < 15, samsung }
+  proposal-private-property-in-object { android, chrome < 91, edge, firefox < 90, ios < 15, node, opera, safari < 15, samsung }
+  proposal-class-properties { android, chrome < 84, edge < 84, firefox < 90, ios < 15, node < 14.6, opera < 70, safari < 15, samsung < 14 }
+  proposal-private-methods { android, chrome < 84, edge < 84, firefox < 90, ios < 15, node < 14.6, opera < 70, safari < 15, samsung < 14 }
   proposal-numeric-separator { android, chrome < 75, edge < 79, firefox < 70, ios < 13, opera < 62, safari < 13, samsung < 11 }
-  proposal-logical-assignment-operators { android, chrome < 85, edge < 85, firefox < 79, ios < 14, node < 15, opera < 71, safari < 14, samsung }
+  proposal-logical-assignment-operators { android, chrome < 85, edge < 85, firefox < 79, ios < 14, node < 15, opera < 71, safari < 14, samsung < 14 }
   proposal-nullish-coalescing-operator { android, chrome < 80, edge < 80, firefox < 72, ios < 13.4, node < 14, opera < 67, safari < 13.1, samsung < 13 }
   proposal-optional-chaining { android, chrome < 80, edge < 80, firefox < 74, ios < 13.4, node < 14, opera < 67, safari < 13.1, samsung < 13 }
   proposal-json-strings { android, chrome < 66, edge < 79, firefox < 62, ios < 12, opera < 53, safari < 12, samsung < 9 }

diff --git a/...l-preset-env/test/fixtures/bugfixes/safari-block-scoping-safari-10-no-bugfixes/stdout.txt b/...l-preset-env/test/fixtures/bugfixes/safari-block-scoping-safari-10-no-bugfixes/stdout.txt
@@ -8,7 +8,7 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
-  proposal-private-property-in-object { safari }
+  proposal-private-property-in-object { safari < 15 }
   proposal-class-properties { safari < 15 }
   proposal-private-methods { safari < 15 }
   proposal-numeric-separator { safari < 13 }

diff --git a/packages/babel-preset-env/test/fixtures/bugfixes/safari-block-scoping-safari-10/stdout.txt b/packages/babel-preset-env/test/fixtures/bugfixes/safari-block-scoping-safari-10/stdout.txt
@@ -8,7 +8,7 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
-  proposal-private-property-in-object { safari }
+  proposal-private-property-in-object { safari < 15 }
   proposal-class-properties { safari < 15 }
   proposal-private-methods { safari < 15 }
   proposal-numeric-separator { safari < 13 }

diff --git a/packages/babel-preset-env/test/fixtures/bugfixes/safari-block-scoping-safari-11/stdout.txt b/packages/babel-preset-env/test/fixtures/bugfixes/safari-block-scoping-safari-11/stdout.txt
@@ -8,7 +8,7 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
-  proposal-private-property-in-object { safari }
+  proposal-private-property-in-object { safari < 15 }
   proposal-class-properties { safari < 15 }
   proposal-private-methods { safari < 15 }
   proposal-numeric-separator { safari < 13 }

diff --git a/packages/babel-preset-env/test/fixtures/bugfixes/safari-block-scoping-safari-9/stdout.txt b/packages/babel-preset-env/test/fixtures/bugfixes/safari-block-scoping-safari-9/stdout.txt
@@ -8,7 +8,7 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
-  proposal-private-property-in-object { safari }
+  proposal-private-property-in-object { safari < 15 }
   proposal-class-properties { safari < 15 }
   proposal-private-methods { safari < 15 }
   proposal-numeric-separator { safari < 13 }

diff --git a/...s/safari-id-destructuring-collision-in-function-expression-safari-15-no-bugfixes/input.js b/...s/safari-id-destructuring-collision-in-function-expression-safari-15-no-bugfixes/input.js
@@ -0,0 +1,5 @@
+(function a(a) {});
+
+(function a([a]) {});
+
+(function a({a}) {});
diff --git a/...fari-id-destructuring-collision-in-function-expression-safari-15-no-bugfixes/options.json b/...fari-id-destructuring-collision-in-function-expression-safari-15-no-bugfixes/options.json
@@ -0,0 +1,15 @@
+{
+  "validateLogs": true,
+  "presets": [
+    [
+      "env",
+      {
+        "debug": true,
+        "bugfixes": true,
+        "targets": {
+          "safari": "15"
+        }
+      }
+    ]
+  ]
+}
diff --git a/.../safari-id-destructuring-collision-in-function-expression-safari-15-no-bugfixes/output.js b/.../safari-id-destructuring-collision-in-function-expression-safari-15-no-bugfixes/output.js
@@ -0,0 +1,7 @@
+(function a(a) {});
+
+(function a([_a]) {});
+
+(function a({
+  a: _a2
+}) {});
diff --git a/...safari-id-destructuring-collision-in-function-expression-safari-15-no-bugfixes/stdout.txt b/...safari-id-destructuring-collision-in-function-expression-safari-15-no-bugfixes/stdout.txt
@@ -0,0 +1,25 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "safari": "15"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  syntax-private-property-in-object
+  syntax-class-properties
+  syntax-numeric-separator
+  syntax-nullish-coalescing-operator
+  syntax-optional-chaining
+  syntax-json-strings
+  syntax-optional-catch-binding
+  syntax-async-generators
+  syntax-object-rest-spread
+  proposal-export-namespace-from { safari }
+  bugfix/transform-safari-id-destructuring-collision-in-function-expression { safari }
+  transform-modules-commonjs
+  proposal-dynamic-import
+
+Using polyfills: No polyfills were added, since the `useBuiltIns` option was not set.
diff --git a/...ures/bugfixes/safari-id-destructuring-collision-in-function-expression-safari-15/input.js b/...ures/bugfixes/safari-id-destructuring-collision-in-function-expression-safari-15/input.js
@@ -0,0 +1,5 @@
+(function a(a) {});
+
+(function a([a]) {});
+
+(function a({a}) {});
diff --git a/.../bugfixes/safari-id-destructuring-collision-in-function-expression-safari-15/options.json b/.../bugfixes/safari-id-destructuring-collision-in-function-expression-safari-15/options.json
@@ -0,0 +1,15 @@
+{
+  "validateLogs": true,
+  "presets": [
+    [
+      "env",
+      {
+        "debug": true,
+        "bugfixes": false,
+        "targets": {
+          "safari": "15"
+        }
+      }
+    ]
+  ]
+}
diff --git a/...res/bugfixes/safari-id-destructuring-collision-in-function-expression-safari-15/output.js b/...res/bugfixes/safari-id-destructuring-collision-in-function-expression-safari-15/output.js
@@ -0,0 +1,7 @@
+(function a(a) {});
+
+(function a([a]) {});
+
+(function a({
+  a
+}) {});
diff --git a/...es/bugfixes/safari-id-destructuring-collision-in-function-expression-safari-15/stdout.txt b/...es/bugfixes/safari-id-destructuring-collision-in-function-expression-safari-15/stdout.txt
@@ -0,0 +1,24 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "safari": "15"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  syntax-private-property-in-object
+  syntax-class-properties
+  syntax-numeric-separator
+  syntax-nullish-coalescing-operator
+  syntax-optional-chaining
+  syntax-json-strings
+  syntax-optional-catch-binding
+  syntax-async-generators
+  syntax-object-rest-spread
+  proposal-export-namespace-from { safari }
+  transform-modules-commonjs
+  proposal-dynamic-import
+
+Using polyfills: No polyfills were added, since the `useBuiltIns` option was not set.
diff --git a/...tures/bugfixes/v8-spread-parameters-in-optional-chaining-chrome-89-no-bugfixes/stdout.txt b/...tures/bugfixes/v8-spread-parameters-in-optional-chaining-chrome-89-no-bugfixes/stdout.txt
@@ -12,7 +12,7 @@ Using plugins:
   syntax-class-properties
   syntax-numeric-separator
   syntax-nullish-coalescing-operator
-  proposal-optional-chaining { chrome }
+  proposal-optional-chaining { chrome < 91 }
   syntax-json-strings
   syntax-optional-catch-binding
   syntax-async-generators

diff --git a/...env/test/fixtures/bugfixes/v8-spread-parameters-in-optional-chaining-chrome-89/stdout.txt b/...env/test/fixtures/bugfixes/v8-spread-parameters-in-optional-chaining-chrome-89/stdout.txt
@@ -17,7 +17,7 @@ Using plugins:
   syntax-optional-catch-binding
   syntax-async-generators
   syntax-object-rest-spread
-  bugfix/transform-v8-spread-parameters-in-optional-chaining { chrome }
+  bugfix/transform-v8-spread-parameters-in-optional-chaining { chrome < 91 }
   transform-modules-commonjs
   proposal-dynamic-import
   proposal-export-namespace-from { }

diff --git a/...abel-preset-env/test/fixtures/corejs2-babel-7/usage-browserslist-config-ignore/stdout.txt b/...abel-preset-env/test/fixtures/corejs2-babel-7/usage-browserslist-config-ignore/stdout.txt
@@ -16,13 +16,13 @@ Using targets:
 Using modules transform: false
 
 Using plugins:
-  proposal-private-property-in-object { android, chrome < 91, edge, firefox < 90, ios, node, opera, safari, samsung }
-  proposal-class-properties { android, chrome < 84, edge < 84, firefox < 90, ios, node < 14.6, opera < 70, safari < 15, samsung }
-  proposal-private-methods { android, chrome < 84, edge < 84, firefox < 90, ios, node < 14.6, opera < 70, safari < 15, samsung }
+  proposal-private-property-in-object { android, chrome < 91, edge, firefox < 90, ios < 15, node, opera, safari < 15, samsung }
+  proposal-class-properties { android, chrome < 84, edge < 84, firefox < 90, ios < 15, node < 14.6, opera < 70, safari < 15, samsung < 14 }
+  proposal-private-methods { android, chrome < 84, edge < 84, firefox < 90, ios < 15, node < 14.6, opera < 70, safari < 15, samsung < 14 }
   proposal-numeric-separator { android, chrome < 75, edge < 79, firefox < 70, ios < 13, opera < 62, safari < 13, samsung < 11 }
-  proposal-logical-assignment-operators { android, chrome < 85, edge < 85, firefox < 79, ios < 14, node < 15, opera < 71, safari < 14, samsung }
+  proposal-logical-assignment-operators { android, chrome < 85, edge < 85, firefox < 79, ios < 14, node < 15, opera < 71, safari < 14, samsung < 14 }
   proposal-nullish-coalescing-operator { android, chrome < 80, edge < 80, firefox < 72, ios < 13.4, node < 14, opera < 67, safari < 13.1, samsung < 13 }
-  proposal-optional-chaining { android, chrome, edge, firefox < 74, ios < 13.4, node, opera, safari < 13.1, samsung }
+  proposal-optional-chaining { android, chrome < 91, edge, firefox < 74, ios < 13.4, node, opera, safari < 13.1, samsung }
   proposal-json-strings { android, chrome < 66, edge < 79, firefox < 62, ios < 12, opera < 53, safari < 12, samsung < 9 }
   proposal-optional-catch-binding { android, chrome < 66, edge < 79, ios < 11.3, opera < 53, safari < 11.1, samsung < 9 }
   transform-parameters { edge < 18 }

diff --git a/...abel-preset-env/test/fixtures/corejs3-babel-7/usage-browserslist-config-ignore/stdout.txt b/...abel-preset-env/test/fixtures/corejs3-babel-7/usage-browserslist-config-ignore/stdout.txt
@@ -16,13 +16,13 @@ Using targets:
 Using modules transform: false
 
 Using plugins:
-  proposal-private-property-in-object { android, chrome < 91, edge, firefox < 90, ios, node, opera, safari, samsung }
-  proposal-class-properties { android, chrome < 84, edge < 84, firefox < 90, ios, node < 14.6, opera < 70, safari < 15, samsung }
-  proposal-private-methods { android, chrome < 84, edge < 84, firefox < 90, ios, node < 14.6, opera < 70, safari < 15, samsung }
+  proposal-private-property-in-object { android, chrome < 91, edge, firefox < 90, ios < 15, node, opera, safari < 15, samsung }
+  proposal-class-properties { android, chrome < 84, edge < 84, firefox < 90, ios < 15, node < 14.6, opera < 70, safari < 15, samsung < 14 }
+  proposal-private-methods { android, chrome < 84, edge < 84, firefox < 90, ios < 15, node < 14.6, opera < 70, safari < 15, samsung < 14 }
   proposal-numeric-separator { android, chrome < 75, edge < 79, firefox < 70, ios < 13, opera < 62, safari < 13, samsung < 11 }
-  proposal-logical-assignment-operators { android, chrome < 85, edge < 85, firefox < 79, ios < 14, node < 15, opera < 71, safari < 14, samsung }
+  proposal-logical-assignment-operators { android, chrome < 85, edge < 85, firefox < 79, ios < 14, node < 15, opera < 71, safari < 14, samsung < 14 }
   proposal-nullish-coalescing-operator { android, chrome < 80, edge < 80, firefox < 72, ios < 13.4, node < 14, opera < 67, safari < 13.1, samsung < 13 }
-  proposal-optional-chaining { android, chrome, edge, firefox < 74, ios < 13.4, node, opera, safari < 13.1, samsung }
+  proposal-optional-chaining { android, chrome < 91, edge, firefox < 74, ios < 13.4, node, opera, safari < 13.1, samsung }
   proposal-json-strings { android, chrome < 66, edge < 79, firefox < 62, ios < 12, opera < 53, safari < 12, samsung < 9 }
   proposal-optional-catch-binding { android, chrome < 66, edge < 79, ios < 11.3, opera < 53, safari < 11.1, samsung < 9 }
   transform-parameters { edge < 18 }

diff --git a/...ges/babel-preset-env/test/fixtures/debug-babel-7/browserslists-defaults-not-ie/stdout.txt b/...ges/babel-preset-env/test/fixtures/debug-babel-7/browserslists-defaults-not-ie/stdout.txt
@@ -15,13 +15,13 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
-  proposal-private-property-in-object { android, chrome < 91, edge, firefox < 90, ios, opera, safari, samsung }
-  proposal-class-properties { firefox < 90, ios, safari < 15, samsung }
-  proposal-private-methods { firefox < 90, ios, safari < 15, samsung }
+  proposal-private-property-in-object { android, chrome < 91, edge, firefox < 90, ios < 15, opera, safari < 15, samsung }
+  proposal-class-properties { firefox < 90, ios < 15, safari < 15, samsung < 14 }
+  proposal-private-methods { firefox < 90, ios < 15, safari < 15, samsung < 14 }
   syntax-numeric-separator
-  proposal-logical-assignment-operators { firefox < 79, ios < 14, samsung }
+  proposal-logical-assignment-operators { firefox < 79, ios < 14, samsung < 14 }
   syntax-nullish-coalescing-operator
-  proposal-optional-chaining { android, chrome, edge, opera, samsung }
+  proposal-optional-chaining { android, chrome < 91, edge, opera, samsung }
   syntax-json-strings
   syntax-optional-catch-binding
   syntax-async-generators

diff --git a/packages/babel-preset-env/test/fixtures/debug-babel-7/browserslists-defaults/stdout.txt b/packages/babel-preset-env/test/fixtures/debug-babel-7/browserslists-defaults/stdout.txt
@@ -16,13 +16,13 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
-  proposal-private-property-in-object { android, chrome < 91, edge, firefox < 90, ie, ios, opera, safari, samsung }
-  proposal-class-properties { firefox < 90, ie, ios, safari < 15, samsung }
-  proposal-private-methods { firefox < 90, ie, ios, safari < 15, samsung }
+  proposal-private-property-in-object { android, chrome < 91, edge, firefox < 90, ie, ios < 15, opera, safari < 15, samsung }
+  proposal-class-properties { firefox < 90, ie, ios < 15, safari < 15, samsung < 14 }
+  proposal-private-methods { firefox < 90, ie, ios < 15, safari < 15, samsung < 14 }
   proposal-numeric-separator { ie }
-  proposal-logical-assignment-operators { firefox < 79, ie, ios < 14, samsung }
+  proposal-logical-assignment-operators { firefox < 79, ie, ios < 14, samsung < 14 }
   proposal-nullish-coalescing-operator { ie }
-  proposal-optional-chaining { android, chrome, edge, ie, opera, samsung }
+  proposal-optional-chaining { android, chrome < 91, edge, ie, opera, samsung }
   proposal-json-strings { ie }
   proposal-optional-catch-binding { ie }
   transform-parameters { ie }

diff --git a/...el-preset-env/test/fixtures/debug-babel-7/browserslists-last-2-versions-not-ie/stdout.txt b/...el-preset-env/test/fixtures/debug-babel-7/browserslists-last-2-versions-not-ie/stdout.txt
@@ -15,13 +15,13 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
-  proposal-private-property-in-object { android, chrome < 91, edge, firefox < 90, ios, opera, safari, samsung }
-  proposal-class-properties { firefox < 90, ios, safari < 15, samsung }
-  proposal-private-methods { firefox < 90, ios, safari < 15, samsung }
+  proposal-private-property-in-object { android, chrome < 91, edge, firefox < 90, ios < 15, opera, safari < 15, samsung }
+  proposal-class-properties { firefox < 90, ios < 15, safari < 15, samsung < 14 }
+  proposal-private-methods { firefox < 90, ios < 15, safari < 15, samsung < 14 }
   syntax-numeric-separator
-  proposal-logical-assignment-operators { samsung }
+  proposal-logical-assignment-operators { samsung < 14 }
   syntax-nullish-coalescing-operator
-  proposal-optional-chaining { android, chrome, edge, opera, samsung }
+  proposal-optional-chaining { android, chrome < 91, edge, opera, samsung }
   syntax-json-strings
   syntax-optional-catch-binding
   syntax-async-generators

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
@@ -14,7 +14,7 @@ Using plugins:
   proposal-numeric-separator { electron < 6.0 }
   proposal-logical-assignment-operators { electron < 10.0 }
   proposal-nullish-coalescing-operator { electron < 8.0 }
-  proposal-optional-chaining { electron }
+  proposal-optional-chaining { electron < 13.0 }
   proposal-json-strings { electron < 3.0 }
   proposal-optional-catch-binding { electron < 3.0 }
   transform-parameters { electron < 0.37 }

diff --git a/...abel-preset-env/test/fixtures/debug-babel-7/entry-corejs2-force-all-transforms/stdout.txt b/...abel-preset-env/test/fixtures/debug-babel-7/entry-corejs2-force-all-transforms/stdout.txt
@@ -14,7 +14,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75 }
   proposal-logical-assignment-operators { chrome < 85 }
   proposal-nullish-coalescing-operator { chrome < 80 }
-  proposal-optional-chaining { chrome }
+  proposal-optional-chaining { chrome < 91 }
   proposal-json-strings { chrome < 66 }
   proposal-optional-catch-binding { chrome < 66 }
   transform-parameters { }

diff --git a/...babel-preset-env/test/fixtures/debug-babel-7/entry-corejs2-proposals-chrome-71/stdout.txt b/...babel-preset-env/test/fixtures/debug-babel-7/entry-corejs2-proposals-chrome-71/stdout.txt
@@ -14,7 +14,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75 }
   proposal-logical-assignment-operators { chrome < 85 }
   proposal-nullish-coalescing-operator { chrome < 80 }
-  proposal-optional-chaining { chrome }
+  proposal-optional-chaining { chrome < 91 }
   syntax-json-strings
   syntax-optional-catch-binding
   syntax-async-generators

diff --git a/...reset-env/test/fixtures/debug-babel-7/entry-corejs2-shippedProposals-chrome-71/stdout.txt b/...reset-env/test/fixtures/debug-babel-7/entry-corejs2-shippedProposals-chrome-71/stdout.txt
@@ -8,14 +8,14 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
-  proposal-class-static-block { chrome < 91 }
+  proposal-class-static-block { chrome < 94 }
   proposal-private-property-in-object { chrome < 91 }
   proposal-class-properties { chrome < 84 }
   proposal-private-methods { chrome < 84 }
   proposal-numeric-separator { chrome < 75 }
   proposal-logical-assignment-operators { chrome < 85 }
   proposal-nullish-coalescing-operator { chrome < 80 }
-  proposal-optional-chaining { chrome }
+  proposal-optional-chaining { chrome < 91 }
   syntax-json-strings
   syntax-optional-catch-binding
   syntax-async-generators

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
@@ -13,13 +13,13 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
-  proposal-private-property-in-object { chrome < 91, edge, firefox < 90, ie, ios, safari }
-  proposal-class-properties { chrome < 84, edge < 84, firefox < 90, ie, ios, safari < 15 }
-  proposal-private-methods { chrome < 84, edge < 84, firefox < 90, ie, ios, safari < 15 }
+  proposal-private-property-in-object { chrome < 91, edge, firefox < 90, ie, ios < 15, safari < 15 }
+  proposal-class-properties { chrome < 84, edge < 84, firefox < 90, ie, ios < 15, safari < 15 }
+  proposal-private-methods { chrome < 84, edge < 84, firefox < 90, ie, ios < 15, safari < 15 }
   proposal-numeric-separator { chrome < 75, edge < 79, firefox < 70, ie, ios < 13, safari < 13 }
   proposal-logical-assignment-operators { chrome < 85, edge < 85, firefox < 79, ie, ios < 14, safari < 14 }
   proposal-nullish-coalescing-operator { chrome < 80, edge < 80, firefox < 72, ie, ios < 13.4, safari < 13.1 }
-  proposal-optional-chaining { chrome, edge, firefox < 74, ie, ios < 13.4, safari < 13.1 }
+  proposal-optional-chaining { chrome < 91, edge, firefox < 74, ie, ios < 13.4, safari < 13.1 }
   proposal-json-strings { chrome < 66, edge < 79, firefox < 62, ie, ios < 12, safari < 12 }
   proposal-optional-catch-binding { chrome < 66, edge < 79, firefox < 58, ie, ios < 11.3, safari < 11.1 }
   transform-parameters { edge < 18, firefox < 53, ie, ios < 10, safari < 10 }