[babel 8] Only support legacy and 2023-05 decorators (#15676)

* [babel 8] Only support legacy and 2023-05 decorators * Ohter fixtures * Comment * Other fixtures
babel · Jun 11, 2023 · d062d47 · d062d47
1 parent 968860b
commit d062d47
Show file tree

Hide file tree

Showing 78 changed files with 135 additions and 57 deletions.
diff --git a/packages/babel-plugin-proposal-decorators/src/transformer-2023-05.ts b/packages/babel-plugin-proposal-decorators/src/transformer-2023-05.ts
@@ -1120,74 +1120,82 @@ function createLocalsAssignment(
     elementDecorations,
     classDecorations,
   ];
-  // TODO(Babel 8): Only keep the else branch
-  if (
-    version === "2021-12" ||
-    (version === "2022-03" && !state.availableHelper("applyDecs2203R"))
-  ) {
-    lhs = t.arrayPattern([...elementLocals, ...classLocals]);
-    rhs = t.callExpression(
-      state.addHelper(version === "2021-12" ? "applyDecs" : "applyDecs2203"),
-      args,
-    );
-  } else {
-    // TODO(Babel 8): Only keep the if branch
-    if (version === "2023-05") {
-      if (maybePrivateBranName || classDecorationsFlag.value !== 0) {
-        args.push(classDecorationsFlag);
-      }
-      if (maybePrivateBranName) {
-        args.push(
-          template.expression.ast`
+
+  if (!process.env.BABEL_8_BREAKING) {
+    if (
+      version === "2021-12" ||
+      (version === "2022-03" && !state.availableHelper("applyDecs2203R"))
+    ) {
+      const lhs = t.arrayPattern([...elementLocals, ...classLocals]);
+      const rhs = t.callExpression(
+        state.addHelper(version === "2021-12" ? "applyDecs" : "applyDecs2203"),
+        args,
+      );
+      return t.assignmentExpression("=", lhs, rhs);
+    }
+  }
+
+  if (process.env.BABEL_8_BREAKING || version === "2023-05") {
+    if (maybePrivateBranName || classDecorationsFlag.value !== 0) {
+      args.push(classDecorationsFlag);
+    }
+    if (maybePrivateBranName) {
+      args.push(
+        template.expression.ast`
             _ => ${t.cloneNode(maybePrivateBranName)} in _
           ` as t.ArrowFunctionExpression,
-        );
-      }
-      rhs = t.callExpression(state.addHelper("applyDecs2305"), args);
-    } else if (version === "2023-01") {
-      if (maybePrivateBranName) {
-        args.push(
-          template.expression.ast`
+      );
+    }
+    rhs = t.callExpression(state.addHelper("applyDecs2305"), args);
+  } else if (version === "2023-01") {
+    if (maybePrivateBranName) {
+      args.push(
+        template.expression.ast`
             _ => ${t.cloneNode(maybePrivateBranName)} in _
           ` as t.ArrowFunctionExpression,
-        );
-      }
-      rhs = t.callExpression(state.addHelper("applyDecs2301"), args);
-    } else {
-      rhs = t.callExpression(state.addHelper("applyDecs2203R"), args);
+      );
     }
-    // optimize `{ c: [classLocals] } = applyapplyDecs2203R(...)` to
-    // `[classLocals] = applyapplyDecs2203R(...).c`
-    if (elementLocals.length > 0) {
-      if (classLocals.length > 0) {
-        lhs = t.objectPattern([
-          t.objectProperty(t.identifier("e"), t.arrayPattern(elementLocals)),
-          t.objectProperty(t.identifier("c"), t.arrayPattern(classLocals)),
-        ]);
-      } else {
-        lhs = t.arrayPattern(elementLocals);
-        rhs = t.memberExpression(rhs, t.identifier("e"), false, false);
-      }
+    rhs = t.callExpression(state.addHelper("applyDecs2301"), args);
+  } else {
+    rhs = t.callExpression(state.addHelper("applyDecs2203R"), args);
+  }
+  // optimize `{ c: [classLocals] } = applyapplyDecs2203R(...)` to
+  // `[classLocals] = applyapplyDecs2203R(...).c`
+  if (elementLocals.length > 0) {
+    if (classLocals.length > 0) {
+      lhs = t.objectPattern([
+        t.objectProperty(t.identifier("e"), t.arrayPattern(elementLocals)),
+        t.objectProperty(t.identifier("c"), t.arrayPattern(classLocals)),
+      ]);
     } else {
-      // invariant: classLocals.length > 0
-      lhs = t.arrayPattern(classLocals);
-      rhs = t.memberExpression(rhs, t.identifier("c"), false, false);
+      lhs = t.arrayPattern(elementLocals);
+      rhs = t.memberExpression(rhs, t.identifier("e"), false, false);
     }
+  } else {
+    // invariant: classLocals.length > 0
+    lhs = t.arrayPattern(classLocals);
+    rhs = t.memberExpression(rhs, t.identifier("c"), false, false);
   }
+
   return t.assignmentExpression("=", lhs, rhs);
 }
 
 export default function (
   { assertVersion, assumption }: PluginAPI,
   { loose }: Options,
+  // TODO(Babel 8): Only keep 2023-05
   version: "2023-05" | "2023-01" | "2022-03" | "2021-12",
 ): PluginObject {
-  if (version === "2023-05" || version === "2023-01") {
+  if (process.env.BABEL_8_BREAKING) {
     assertVersion("^7.21.0");
-  } else if (version === "2021-12") {
-    assertVersion("^7.16.0");
   } else {
-    assertVersion("^7.19.0");
+    if (version === "2023-05" || version === "2023-01") {
+      assertVersion("^7.21.0");
+    } else if (version === "2021-12") {
+      assertVersion("^7.16.0");
+    } else {
+      assertVersion("^7.19.0");
+    }
   }
 
   const VISITED = new WeakSet<NodePath>();

diff --git a/.../babel-plugin-proposal-decorators/test/fixtures/2021-12-accessors--to-es2015/options.json b/.../babel-plugin-proposal-decorators/test/fixtures/2021-12-accessors--to-es2015/options.json
@@ -1,4 +1,5 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": [
     ["proposal-decorators", { "version": "2021-12" }],
     "transform-class-properties",

diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/2021-12-accessors/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/2021-12-accessors/options.json
@@ -1,3 +1,4 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": [["proposal-decorators", { "version": "2021-12" }]]
 }
diff --git a/...el-plugin-proposal-decorators/test/fixtures/2021-12-assumption-constantSuper/options.json b/...el-plugin-proposal-decorators/test/fixtures/2021-12-assumption-constantSuper/options.json
@@ -1,4 +1,5 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": [["proposal-decorators", { "version": "2021-12" }]],
   "assumptions": {
     "constantSuper": true

diff --git a/...es/babel-plugin-proposal-decorators/test/fixtures/2021-12-classes--to-es2015/options.json b/...es/babel-plugin-proposal-decorators/test/fixtures/2021-12-classes--to-es2015/options.json
@@ -1,4 +1,5 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": [
     ["proposal-decorators", { "version": "2021-12" }],
     "transform-class-properties",

diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/2021-12-classes/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/2021-12-classes/options.json
@@ -1,3 +1,4 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": [["proposal-decorators", { "version": "2021-12" }]]
 }
diff --git a/...-plugin-proposal-decorators/test/fixtures/2021-12-duplicated-keys--to-es2015/options.json b/...-plugin-proposal-decorators/test/fixtures/2021-12-duplicated-keys--to-es2015/options.json
@@ -1,4 +1,5 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": [
     ["proposal-decorators", { "version": "2021-12" }],
     "transform-class-properties",

diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/2021-12-duplicated-keys/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/2021-12-duplicated-keys/options.json
@@ -1,3 +1,4 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": [["proposal-decorators", { "version": "2021-12" }]]
 }
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/2021-12-exported/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/2021-12-exported/options.json
@@ -1,3 +1,4 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": [["proposal-decorators", { "version": "2021-12" }]]
 }
diff --git a/...ges/babel-plugin-proposal-decorators/test/fixtures/2021-12-fields--to-es2015/options.json b/...ges/babel-plugin-proposal-decorators/test/fixtures/2021-12-fields--to-es2015/options.json
@@ -1,4 +1,5 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": [
     ["proposal-decorators", { "version": "2021-12" }],
     "transform-class-properties",

diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/2021-12-fields/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/2021-12-fields/options.json
@@ -1,3 +1,4 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": [["proposal-decorators", { "version": "2021-12" }]]
 }
diff --git a/...es/babel-plugin-proposal-decorators/test/fixtures/2021-12-getters--to-es2015/options.json b/...es/babel-plugin-proposal-decorators/test/fixtures/2021-12-getters--to-es2015/options.json
@@ -1,4 +1,5 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": [
     ["proposal-decorators", { "version": "2021-12" }],
     "transform-class-properties",

diff --git a/...gin-proposal-decorators/test/fixtures/2021-12-getters-and-setters--to-es2015/options.json b/...gin-proposal-decorators/test/fixtures/2021-12-getters-and-setters--to-es2015/options.json
@@ -1,4 +1,5 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": [
     ["proposal-decorators", { "version": "2021-12" }],
     "transform-class-properties",

diff --git a/...s/babel-plugin-proposal-decorators/test/fixtures/2021-12-getters-and-setters/options.json b/...s/babel-plugin-proposal-decorators/test/fixtures/2021-12-getters-and-setters/options.json
@@ -1,3 +1,4 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": [["proposal-decorators", { "version": "2021-12" }]]
 }
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/2021-12-getters/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/2021-12-getters/options.json
@@ -1,3 +1,4 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": [["proposal-decorators", { "version": "2021-12" }]]
 }
diff --git a/...s/babel-plugin-proposal-decorators/test/fixtures/2021-12-metadata--to-es2015/options.json b/...s/babel-plugin-proposal-decorators/test/fixtures/2021-12-metadata--to-es2015/options.json
@@ -1,4 +1,5 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": [
     ["proposal-decorators", { "version": "2021-12" }],
     "transform-class-properties",

diff --git a/...es/babel-plugin-proposal-decorators/test/fixtures/2021-12-methods--to-es2015/options.json b/...es/babel-plugin-proposal-decorators/test/fixtures/2021-12-methods--to-es2015/options.json
@@ -1,4 +1,5 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": [
     ["proposal-decorators", { "version": "2021-12" }],
     "transform-class-properties",

diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/2021-12-methods/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/2021-12-methods/options.json
@@ -1,3 +1,4 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": [["proposal-decorators", { "version": "2021-12" }]]
 }
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/2021-12-misc--to-es2015/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/2021-12-misc--to-es2015/options.json
@@ -1,4 +1,5 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": [
     ["proposal-decorators", { "version": "2021-12" }],
     "transform-class-properties",

diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/2021-12-misc/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/2021-12-misc/options.json
@@ -1,3 +1,4 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": [["proposal-decorators", { "version": "2021-12" }]]
 }
diff --git a/...s/babel-plugin-proposal-decorators/test/fixtures/2021-12-ordering--to-es2015/options.json b/...s/babel-plugin-proposal-decorators/test/fixtures/2021-12-ordering--to-es2015/options.json
@@ -1,4 +1,5 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": [
     ["proposal-decorators", { "version": "2021-12" }],
     "transform-class-properties",

diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/2021-12-ordering/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/2021-12-ordering/options.json
@@ -1,4 +1,5 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": [["proposal-decorators", { "version": "2021-12" }]],
   "minNodeVersion": "16.11.0"
 }
diff --git a/...l-plugin-proposal-decorators/test/fixtures/2021-12-runtime-errors--to-es2015/options.json b/...l-plugin-proposal-decorators/test/fixtures/2021-12-runtime-errors--to-es2015/options.json
@@ -1,4 +1,5 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": [
     ["proposal-decorators", { "version": "2021-12" }],
     "transform-class-properties",

diff --git a/...es/babel-plugin-proposal-decorators/test/fixtures/2021-12-setters--to-es2015/options.json b/...es/babel-plugin-proposal-decorators/test/fixtures/2021-12-setters--to-es2015/options.json
@@ -1,4 +1,5 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": [
     ["proposal-decorators", { "version": "2021-12" }],
     "transform-class-properties",

diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/2021-12-setters/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/2021-12-setters/options.json
@@ -1,3 +1,4 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": [["proposal-decorators", { "version": "2021-12" }]]
 }
diff --git a/.../babel-plugin-proposal-decorators/test/fixtures/2022-03-accessors--to-es2015/options.json b/.../babel-plugin-proposal-decorators/test/fixtures/2022-03-accessors--to-es2015/options.json
@@ -1,4 +1,5 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": [
     ["proposal-decorators", { "version": "2022-03" }],
     "transform-class-properties",

diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/2022-03-accessors/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/2022-03-accessors/options.json
@@ -1,3 +1,4 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": [["proposal-decorators", { "version": "2022-03" }]]
 }
diff --git a/...el-plugin-proposal-decorators/test/fixtures/2022-03-assumption-constantSuper/options.json b/...el-plugin-proposal-decorators/test/fixtures/2022-03-assumption-constantSuper/options.json
@@ -1,4 +1,5 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": [["proposal-decorators", { "version": "2022-03" }]],
   "assumptions": {
     "constantSuper": true

diff --git a/...es/babel-plugin-proposal-decorators/test/fixtures/2022-03-classes--to-es2015/options.json b/...es/babel-plugin-proposal-decorators/test/fixtures/2022-03-classes--to-es2015/options.json
@@ -1,4 +1,5 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": [
     ["proposal-decorators", { "version": "2022-03" }],
     "transform-class-properties",

diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/2022-03-classes/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/2022-03-classes/options.json
@@ -1,3 +1,4 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": [["proposal-decorators", { "version": "2022-03" }]]
 }
diff --git a/...-plugin-proposal-decorators/test/fixtures/2022-03-duplicated-keys--to-es2015/options.json b/...-plugin-proposal-decorators/test/fixtures/2022-03-duplicated-keys--to-es2015/options.json
@@ -1,4 +1,5 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": [
     ["proposal-decorators", { "version": "2022-03" }],
     "transform-class-properties",

diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/2022-03-duplicated-keys/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/2022-03-duplicated-keys/options.json
@@ -1,3 +1,4 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": [["proposal-decorators", { "version": "2022-03" }]]
 }
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/2022-03-exported/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/2022-03-exported/options.json
@@ -1,3 +1,4 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": [["proposal-decorators", { "version": "2022-03" }]]
 }
diff --git a/...ges/babel-plugin-proposal-decorators/test/fixtures/2022-03-fields--to-es2015/options.json b/...ges/babel-plugin-proposal-decorators/test/fixtures/2022-03-fields--to-es2015/options.json
@@ -1,4 +1,5 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": [
     ["proposal-decorators", { "version": "2022-03" }],
     "transform-class-properties",

diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/2022-03-fields/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/2022-03-fields/options.json
@@ -1,3 +1,4 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": [["proposal-decorators", { "version": "2022-03" }]]
 }
diff --git a/...es/babel-plugin-proposal-decorators/test/fixtures/2022-03-getters--to-es2015/options.json b/...es/babel-plugin-proposal-decorators/test/fixtures/2022-03-getters--to-es2015/options.json
@@ -1,4 +1,5 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": [
     ["proposal-decorators", { "version": "2022-03" }],
     "transform-class-properties",

diff --git a/...gin-proposal-decorators/test/fixtures/2022-03-getters-and-setters--to-es2015/options.json b/...gin-proposal-decorators/test/fixtures/2022-03-getters-and-setters--to-es2015/options.json
@@ -1,4 +1,5 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": [
     ["proposal-decorators", { "version": "2022-03" }],
     "transform-class-properties",

diff --git a/...s/babel-plugin-proposal-decorators/test/fixtures/2022-03-getters-and-setters/options.json b/...s/babel-plugin-proposal-decorators/test/fixtures/2022-03-getters-and-setters/options.json
@@ -1,3 +1,4 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": [["proposal-decorators", { "version": "2022-03" }]]
 }
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/2022-03-getters/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/2022-03-getters/options.json
@@ -1,3 +1,4 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": [["proposal-decorators", { "version": "2022-03" }]]
 }
diff --git a/...es/babel-plugin-proposal-decorators/test/fixtures/2022-03-methods--to-es2015/options.json b/...es/babel-plugin-proposal-decorators/test/fixtures/2022-03-methods--to-es2015/options.json
@@ -1,4 +1,5 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": [
     ["proposal-decorators", { "version": "2022-03" }],
     "transform-class-properties",

diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/2022-03-methods/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/2022-03-methods/options.json
@@ -1,3 +1,4 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": [["proposal-decorators", { "version": "2022-03" }]]
 }
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/2022-03-misc--to-es2015/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/2022-03-misc--to-es2015/options.json
@@ -1,4 +1,5 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": [
     ["proposal-decorators", { "version": "2022-03" }],
     "transform-class-properties",

diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/2022-03-misc/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/2022-03-misc/options.json
@@ -1,3 +1,4 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": [["proposal-decorators", { "version": "2022-03" }]]
 }
diff --git a/...s/babel-plugin-proposal-decorators/test/fixtures/2022-03-ordering--to-es2015/options.json b/...s/babel-plugin-proposal-decorators/test/fixtures/2022-03-ordering--to-es2015/options.json
@@ -1,4 +1,5 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": [
     ["proposal-decorators", { "version": "2022-03" }],
     "transform-class-properties",

diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/2022-03-ordering/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/2022-03-ordering/options.json
@@ -1,4 +1,5 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": [["proposal-decorators", { "version": "2022-03" }]],
   "minNodeVersion": "16.11.0"
 }
diff --git a/...l-plugin-proposal-decorators/test/fixtures/2022-03-runtime-errors--to-es2015/options.json b/...l-plugin-proposal-decorators/test/fixtures/2022-03-runtime-errors--to-es2015/options.json
@@ -1,4 +1,5 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": [
     ["proposal-decorators", { "version": "2022-03" }],
     "transform-class-properties",

diff --git a/...es/babel-plugin-proposal-decorators/test/fixtures/2022-03-setters--to-es2015/options.json b/...es/babel-plugin-proposal-decorators/test/fixtures/2022-03-setters--to-es2015/options.json
@@ -1,4 +1,5 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": [
     ["proposal-decorators", { "version": "2022-03" }],
     "transform-class-properties",

diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/2022-03-setters/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/2022-03-setters/options.json
@@ -1,3 +1,4 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": [["proposal-decorators", { "version": "2022-03" }]]
 }