babel · nicolo-ribaudo · Aug 12, 2024 · Jun 12, 2024 · Jun 12, 2024 · Jun 12, 2024
diff --git a/Gulpfile.mjs b/Gulpfile.mjs
@@ -603,6 +603,13 @@ function buildRollupDts(packages) {
     const bundle = await rollup({
       input,
       plugins: [
+        {
+          transform: code =>
+            code.replace(
+              /type BABEL_8_BREAKING\s*=\s*boolean/g,
+              `type BABEL_8_BREAKING = ${bool(process.env.BABEL_8_BREAKING) ?? false}`
+            ),
+        },
         bool(process.env.BABEL_8_BREAKING) ? rollupDts() : rollupDts5(),
       ],
       external,
@@ -641,7 +648,9 @@ function buildRollupDts(packages) {
     build(
       "packages/babel-parser/typings/babel-parser.source.d.ts",
       "packages/babel-parser/typings/babel-parser.d.ts",
-      "// This file is auto-generated! Do not modify it directly.\n/* eslint-disable @typescript-eslint/consistent-type-imports, prettier/prettier */",
+      "// This file is auto-generated! Do not modify it directly.\n" +
+        // @typescript-eslint/no-redundant-type-constituents can be removed once we drop the IF_BABEL_7 type
+        "/* eslint-disable @typescript-eslint/consistent-type-imports, @typescript-eslint/no-redundant-type-constituents, prettier/prettier */",
       "packages/babel-parser"
     )
   );

diff --git a/eslint/babel-eslint-parser/test/index.js b/eslint/babel-eslint-parser/test/index.js
@@ -482,11 +482,7 @@ describe("Babel and Espree", () => {
       babelOptions: {
         filename: "test.js",
         parserOpts: {
-          plugins: [
-            ["estree", { classFeatures: true }],
-            "classPrivateProperties",
-            "classProperties",
-          ],
+          plugins: [["estree", { classFeatures: true }]],
         },
       },
     }).ast;

diff --git a/packages/babel-generator/test/fixtures/edgecase/async-generator/options.json b/packages/babel-generator/test/fixtures/edgecase/async-generator/options.json
diff --git a/packages/babel-generator/test/fixtures/flow/declare-field/options.json b/packages/babel-generator/test/fixtures/flow/declare-field/options.json
@@ -1,3 +1,3 @@
 {
-  "plugins": ["flow", "classProperties"]
+  "plugins": ["flow"]
 }
diff --git a/packages/babel-generator/test/fixtures/flow/def-site-variance/options.json b/packages/babel-generator/test/fixtures/flow/def-site-variance/options.json
@@ -1 +1 @@
-{ "plugins": ["classProperties", "flow"] }
+{ "plugins": ["flow"] }
diff --git a/packages/babel-generator/test/fixtures/flow/type-annotations/options.json b/packages/babel-generator/test/fixtures/flow/type-annotations/options.json
@@ -1 +1 @@
-{ "plugins": ["classPrivateProperties", "flow"] }
+{ "plugins": ["flow"] }
diff --git a/packages/babel-generator/test/fixtures/flow/typeapp-call/options.json b/packages/babel-generator/test/fixtures/flow/typeapp-call/options.json
@@ -1 +1 @@
-{ "plugins": ["jsx", "optionalChaining", "flow"] }
+{ "plugins": ["jsx", "flow"] }
diff --git a/packages/babel-generator/test/fixtures/types/ClassBody-ClassProperty/options.json b/packages/babel-generator/test/fixtures/types/ClassBody-ClassProperty/options.json
diff --git a/packages/babel-generator/test/fixtures/types/ClassBody-MethodDefinition/options.json b/packages/babel-generator/test/fixtures/types/ClassBody-MethodDefinition/options.json
diff --git a/packages/babel-generator/test/fixtures/types/Optional-CallExpression/options.json b/packages/babel-generator/test/fixtures/types/Optional-CallExpression/options.json
diff --git a/packages/babel-generator/test/fixtures/types/Optional-MemberExpression/options.json b/packages/babel-generator/test/fixtures/types/Optional-MemberExpression/options.json
diff --git a/packages/babel-generator/test/fixtures/typescript/class-constructor/options.json b/packages/babel-generator/test/fixtures/typescript/class-constructor/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "plugins": ["typescript", "classProperties"]
+  "plugins": ["typescript"]
 }
diff --git a/packages/babel-generator/test/fixtures/typescript/class-declare/options.json b/packages/babel-generator/test/fixtures/typescript/class-declare/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "plugins": ["typescript", "classProperties"]
+  "plugins": ["typescript"]
 }
diff --git a/...babel-generator/test/fixtures/typescript/class-expression-extends-implements/options.json b/...babel-generator/test/fixtures/typescript/class-expression-extends-implements/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "plugins": ["typescript", "classProperties"]
+  "plugins": ["typescript"]
 }
diff --git a/packages/babel-generator/test/fixtures/typescript/class-expression-extends/options.json b/packages/babel-generator/test/fixtures/typescript/class-expression-extends/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "plugins": ["typescript", "classProperties"]
+  "plugins": ["typescript"]
 }
diff --git a/packages/babel-generator/test/fixtures/typescript/class-expression-generic/options.json b/packages/babel-generator/test/fixtures/typescript/class-expression-generic/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "plugins": ["typescript", "classProperties"]
+  "plugins": ["typescript"]
 }
diff --git a/packages/babel-generator/test/fixtures/typescript/class-expression-implements/options.json b/packages/babel-generator/test/fixtures/typescript/class-expression-implements/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "plugins": ["typescript", "classProperties"]
+  "plugins": ["typescript"]
 }
diff --git a/packages/babel-generator/test/fixtures/typescript/class-extends-implements/options.json b/packages/babel-generator/test/fixtures/typescript/class-extends-implements/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "plugins": ["typescript", "classProperties"]
+  "plugins": ["typescript"]
 }
diff --git a/packages/babel-generator/test/fixtures/typescript/class-extends/options.json b/packages/babel-generator/test/fixtures/typescript/class-extends/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "plugins": ["typescript", "classProperties"]
+  "plugins": ["typescript"]
 }
diff --git a/packages/babel-generator/test/fixtures/typescript/class-field-declare/options.json b/packages/babel-generator/test/fixtures/typescript/class-field-declare/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "plugins": ["typescript", "classProperties"]
+  "plugins": ["typescript"]
 }
diff --git a/packages/babel-generator/test/fixtures/typescript/class-generic/options.json b/packages/babel-generator/test/fixtures/typescript/class-generic/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "plugins": ["typescript", "classProperties"]
+  "plugins": ["typescript"]
 }
diff --git a/packages/babel-generator/test/fixtures/typescript/class-get-generic/options.json b/packages/babel-generator/test/fixtures/typescript/class-get-generic/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "plugins": ["typescript", "classProperties"]
+  "plugins": ["typescript"]
 }
diff --git a/packages/babel-generator/test/fixtures/typescript/class-implements/options.json b/packages/babel-generator/test/fixtures/typescript/class-implements/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "plugins": ["typescript", "classProperties"]
+  "plugins": ["typescript"]
 }
diff --git a/packages/babel-generator/test/fixtures/typescript/class-index-signature/options.json b/packages/babel-generator/test/fixtures/typescript/class-index-signature/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "plugins": ["typescript", "classProperties"]
+  "plugins": ["typescript"]
 }
diff --git a/...s/babel-generator/test/fixtures/typescript/class-members-with-modifier-names/options.json b/...s/babel-generator/test/fixtures/typescript/class-members-with-modifier-names/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "plugins": ["typescript", "classProperties"]
+  "plugins": ["typescript"]
 }
diff --git a/...s/babel-generator/test/fixtures/typescript/class-members-with-reserved-names/options.json b/...s/babel-generator/test/fixtures/typescript/class-members-with-reserved-names/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "plugins": ["typescript", "classProperties"]
+  "plugins": ["typescript"]
 }
diff --git a/packages/babel-generator/test/fixtures/typescript/class-method-computed/options.json b/packages/babel-generator/test/fixtures/typescript/class-method-computed/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "plugins": ["typescript", "classProperties"]
+  "plugins": ["typescript"]
 }
diff --git a/packages/babel-generator/test/fixtures/typescript/class-method-generic/options.json b/packages/babel-generator/test/fixtures/typescript/class-method-generic/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "plugins": ["typescript", "classProperties"]
+  "plugins": ["typescript"]
 }
diff --git a/packages/babel-generator/test/fixtures/typescript/class-method-no-body/options.json b/packages/babel-generator/test/fixtures/typescript/class-method-no-body/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "plugins": ["typescript", "classProperties"]
+  "plugins": ["typescript"]
 }
diff --git a/packages/babel-generator/test/fixtures/typescript/class-method-optional/options.json b/packages/babel-generator/test/fixtures/typescript/class-method-optional/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "plugins": ["typescript", "classProperties"]
+  "plugins": ["typescript"]
 }
diff --git a/packages/babel-generator/test/fixtures/typescript/class-method-return-type/options.json b/packages/babel-generator/test/fixtures/typescript/class-method-return-type/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "plugins": ["typescript", "classProperties"]
+  "plugins": ["typescript"]
 }
diff --git a/...babel-generator/test/fixtures/typescript/class-method-with-newline-with-body/options.json b/...babel-generator/test/fixtures/typescript/class-method-with-newline-with-body/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "plugins": ["typescript", "classProperties"]
+  "plugins": ["typescript"]
 }
diff --git a/...el-generator/test/fixtures/typescript/class-method-with-newline-without-body/options.json b/...el-generator/test/fixtures/typescript/class-method-with-newline-without-body/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "plugins": ["typescript", "classProperties"]
+  "plugins": ["typescript"]
 }
diff --git a/packages/babel-generator/test/fixtures/typescript/class-modifier-override/options.json b/packages/babel-generator/test/fixtures/typescript/class-modifier-override/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "plugins": ["typescript", "classProperties"]
+  "plugins": ["typescript"]
 }
diff --git a/packages/babel-generator/test/fixtures/typescript/class-modifiers-accessors/options.json b/packages/babel-generator/test/fixtures/typescript/class-modifiers-accessors/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "plugins": ["typescript", "classProperties"]
+  "plugins": ["typescript"]
 }
diff --git a/packages/babel-generator/test/fixtures/typescript/class-modifiers-methods-async/options.json b/packages/babel-generator/test/fixtures/typescript/class-modifiers-methods-async/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "plugins": ["typescript", "classProperties"]
+  "plugins": ["typescript"]
 }
diff --git a/packages/babel-generator/test/fixtures/typescript/class-modifiers-properties/options.json b/packages/babel-generator/test/fixtures/typescript/class-modifiers-properties/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "plugins": ["typescript", "classProperties"]
+  "plugins": ["typescript"]
 }
diff --git a/packages/babel-generator/test/fixtures/typescript/class-parameter-properties/options.json b/packages/babel-generator/test/fixtures/typescript/class-parameter-properties/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "plugins": ["typescript", "classProperties"]
+  "plugins": ["typescript"]
 }
diff --git a/packages/babel-generator/test/fixtures/typescript/class-properties/options.json b/packages/babel-generator/test/fixtures/typescript/class-properties/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "plugins": ["typescript", "classProperties"]
+  "plugins": ["typescript"]
 }
diff --git a/packages/babel-generator/test/fixtures/typescript/class-property-computed/options.json b/packages/babel-generator/test/fixtures/typescript/class-property-computed/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "plugins": ["typescript", "classProperties"]
+  "plugins": ["typescript"]
 }
diff --git a/packages/babel-generator/test/fixtures/typescript/class-static/options.json b/packages/babel-generator/test/fixtures/typescript/class-static/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "plugins": ["typescript", "classProperties"]
+  "plugins": ["typescript"]
 }
diff --git a/packages/babel-parser/data/schema.json b/packages/babel-parser/data/schema.json
@@ -170,24 +170,16 @@
           {
             "enum": [
               "asyncDoExpressions",
-              "asyncGenerators",
-              "bigInt",
-              "classPrivateMethods",
-              "classPrivateProperties",
-              "classProperties",
-              "classStaticBlock",
               "decimal",
               "decorators",
               "decorators-legacy",
               "decoratorAutoAccessors",
               "deferredImportEvaluation",
               "destructuringPrivate",
               "doExpressions",
-              "dynamicImport",
               "estree",
               "explicitResourceManagement",
               "exportDefaultFrom",
-              "exportNamespaceFrom",
               "flow",
               "flowComments",
               "functionBind",
@@ -197,22 +189,12 @@
               "importMeta",
               "importReflection",
               "jsx",
-              "logicalAssignment",
               "moduleBlocks",
-              "moduleStringNames",
-              "nullishCoalescingOperator",
-              "numericSeparator",
-              "objectRestSpread",
-              "optionalCatchBinding",
-              "optionalChaining",
               "partialApplication",
               "pipelineOperator",
               "placeholders",
-              "privateIn",
-              "regexpUnicodeSets",
               "sourcePhaseImports",
               "throwExpressions",
-              "topLevelAwait",
               "typescript",
               "v8intrinsic"
             ],

diff --git a/packages/babel-parser/src/typings.d.ts b/packages/babel-parser/src/typings.d.ts
@@ -1,54 +1,56 @@
+type BABEL_8_BREAKING = boolean;
+type IF_BABEL_7<V> = false extends BABEL_8_BREAKING ? V : never;
+
 export type Plugin =
   | "asyncDoExpressions"
-  | "asyncGenerators"
-  | "bigInt"
-  | "classPrivateMethods"
-  | "classPrivateProperties"
-  | "classProperties"
-  | "classStaticBlock" // Enabled by default
+  | IF_BABEL_7<"asyncGenerators">
+  | IF_BABEL_7<"bigInt">
+  | IF_BABEL_7<"classPrivateMethods">
+  | IF_BABEL_7<"classPrivateProperties">
+  | IF_BABEL_7<"classProperties">
+  | IF_BABEL_7<"classStaticBlock">
   | "decimal"
   | "decorators-legacy"
   | "deferredImportEvaluation"
   | "decoratorAutoAccessors"
   | "destructuringPrivate"
   | "doExpressions"
-  | "dynamicImport"
+  | IF_BABEL_7<"dynamicImport">
   | "explicitResourceManagement"
   | "exportDefaultFrom"
-  | "exportNamespaceFrom" // deprecated
+  | IF_BABEL_7<"exportNamespaceFrom">
   | "flow"
   | "flowComments"
   | "functionBind"
   | "functionSent"
   | "importMeta"
   | "jsx"
-  | "logicalAssignment"
+  | IF_BABEL_7<"logicalAssignment">
   | "importAssertions" // deprecated
   | "importAttributes"
   | "importReflection"
   | "moduleBlocks"
-  | "moduleStringNames"
-  | "nullishCoalescingOperator"
-  | "numericSeparator"
-  | "objectRestSpread"
-  | "optionalCatchBinding"
-  | "optionalChaining"
+  | IF_BABEL_7<"moduleStringNames">
+  | IF_BABEL_7<"nullishCoalescingOperator">
+  | IF_BABEL_7<"numericSeparator">
+  | IF_BABEL_7<"objectRestSpread">
+  | IF_BABEL_7<"optionalCatchBinding">
+  | IF_BABEL_7<"optionalChaining">
   | "partialApplication"
   | "placeholders"
-  | "privateIn" // Enabled by default
-  | "regexpUnicodeSets" // Enabled by default
+  | IF_BABEL_7<"privateIn">
+  | IF_BABEL_7<"regexpUnicodeSets">
   | "sourcePhaseImports"
   | "throwExpressions"
-  | "topLevelAwait"
+  | IF_BABEL_7<"topLevelAwait">
   | "v8intrinsic"
   | ParserPluginWithOptions[0];
 
 export type ParserPluginWithOptions =
   | ["decorators", DecoratorsPluginOptions]
   | ["estree", { classFeatures?: boolean }]
   | ["importAttributes", { deprecatedAssertSyntax: boolean }]
-  // @deprecated
-  | ["moduleAttributes", { version: "may-2020" }]
+  | IF_BABEL_7<["moduleAttributes", { version: "may-2020" }]>
   | ["optionalChainingAssign", { version: "2023-07" }]
   | ["pipelineOperator", PipelineOperatorPluginOptions]
   | ["recordAndTuple", RecordAndTuplePluginOptions]

diff --git a/...pipeline-operator/hack-caret-proposal-class-expression-with-private-property/options.json b/...pipeline-operator/hack-caret-proposal-class-expression-with-private-property/options.json
@@ -1,7 +1,3 @@
 {
-  "plugins": [
-    ["pipelineOperator", { "proposal": "hack", "topicToken": "^" }],
-    "classPrivateProperties",
-    "classPrivateMethods"
-  ]
+  "plugins": [["pipelineOperator", { "proposal": "hack", "topicToken": "^" }]]
 }
diff --git a/...ret-proposal-do-transform-for-await-of-loop-transform-and-topic-in-loop-body/options.json b/...ret-proposal-do-transform-for-await-of-loop-transform-and-topic-in-loop-body/options.json
@@ -1,7 +1,6 @@
 {
   "plugins": [
     ["pipelineOperator", { "proposal": "hack", "topicToken": "^" }],
-    "doExpressions",
-    "asyncGenerators"
+    "doExpressions"
   ]
 }
diff --git a/...ret-proposal-do-transform-for-await-of-loop-transform-and-topic-in-loop-head/options.json b/...ret-proposal-do-transform-for-await-of-loop-transform-and-topic-in-loop-head/options.json
@@ -1,7 +1,6 @@
 {
   "plugins": [
     ["pipelineOperator", { "proposal": "hack", "topicToken": "^" }],
-    "doExpressions",
-    "asyncGenerators"
+    "doExpressions"
   ]
 }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{ "plugins": ["classProperties", "flow"] }
		{ "plugins": ["flow"] }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{ "plugins": ["classPrivateProperties", "flow"] }
		{ "plugins": ["flow"] }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{ "plugins": ["jsx", "optionalChaining", "flow"] }
		{ "plugins": ["jsx", "flow"] }