Enable class static blocks by default (#13713)

* Remove classStaticBlock plugin * Update tests * Remove class static blocks from proposalPlugins * Update tests * Remove classStaticBlock from mapping for test262 * chore: update babel-types Co-authored-by: Huáng Jùnliàng <jlhwung@gmail.com>
babel · Oct 28, 2021 · ddc45a5 · ddc45a5
1 parent 99a3fef
commit ddc45a5
Show file tree

Hide file tree

Showing 181 changed files with 179 additions and 114 deletions.
diff --git a/packages/babel-compat-data/scripts/data/plugin-features.js b/packages/babel-compat-data/scripts/data/plugin-features.js
@@ -163,12 +163,11 @@ const es2022 = {
     ],
   },
   "proposal-private-methods": "private class methods",
-};
-
-const shippedProposal = {
   "proposal-class-static-block": "Class static initialization blocks",
 };
 
+const shippedProposal = {};
+
 // Run plugins for modern features first
 module.exports = Object.assign(
   {},

diff --git a/packages/babel-generator/test/fixtures/minified/static-block/options.json b/packages/babel-generator/test/fixtures/minified/static-block/options.json
@@ -1,4 +1,3 @@
 {
-  "minified": true,
-  "plugins": ["classStaticBlock"]
+  "minified": true
 }
diff --git a/packages/babel-generator/test/fixtures/types/ClassBody-StaticBlock/options.json b/packages/babel-generator/test/fixtures/types/ClassBody-StaticBlock/options.json
diff --git a/packages/babel-parser/src/parser/statement.js b/packages/babel-parser/src/parser/statement.js
@@ -1619,7 +1619,6 @@ export default class StatementParser extends ExpressionParser {
     classBody: N.ClassBody,
     member: N.StaticBlock & { decorators?: Array<N.Decorator> },
   ) {
-    this.expectPlugin("classStaticBlock", member.start);
     // Start a new lexical scope
     this.scope.enter(SCOPE_CLASS | SCOPE_STATIC_BLOCK | SCOPE_SUPER);
     // Start a new scope with regard to loop labels

diff --git a/packages/babel-parser/test/fixtures/comments/basic/class-static-block/options.json b/packages/babel-parser/test/fixtures/comments/basic/class-static-block/options.json
diff --git a/packages/babel-parser/test/fixtures/experimental/_no-plugin/class-static-block/input.js b/packages/babel-parser/test/fixtures/experimental/_no-plugin/class-static-block/input.js
diff --git a/packages/babel-parser/test/fixtures/experimental/_no-plugin/class-static-block/options.json b/packages/babel-parser/test/fixtures/experimental/_no-plugin/class-static-block/options.json
diff --git a/...experimental/class-static-block/await-binding-in-initializer-in-static-block/options.json b/...experimental/class-static-block/await-binding-in-initializer-in-static-block/options.json
diff --git a/.../test/fixtures/experimental/class-static-block/await-binding-in-static-block/options.json b/.../test/fixtures/experimental/class-static-block/await-binding-in-static-block/options.json
diff --git a/...ges/babel-parser/test/fixtures/experimental/class-static-block/invalid-await/options.json b/...ges/babel-parser/test/fixtures/experimental/class-static-block/invalid-await/options.json
diff --git a/...abel-parser/test/fixtures/experimental/class-static-block/invalid-decorators/options.json b/...abel-parser/test/fixtures/experimental/class-static-block/invalid-decorators/options.json
@@ -1,6 +1,3 @@
 {
-  "plugins": [
-    "classStaticBlock",
-    ["decorators", { "decoratorsBeforeExport": true }]
-  ]
+  "plugins": [["decorators", { "decoratorsBeforeExport": true }]]
 }
diff --git a/...rser/test/fixtures/experimental/class-static-block/invalid-legacy-decorators/options.json b/...rser/test/fixtures/experimental/class-static-block/invalid-legacy-decorators/options.json
@@ -1,3 +1,3 @@
 {
-  "plugins": ["classStaticBlock", "decorators-legacy"]
+  "plugins": ["decorators-legacy"]
 }
diff --git a/...ges/babel-parser/test/fixtures/experimental/class-static-block/invalid-yield/options.json b/...ges/babel-parser/test/fixtures/experimental/class-static-block/invalid-yield/options.json
diff --git a/packages/babel-parser/test/fixtures/experimental/class-static-block/options.json b/packages/babel-parser/test/fixtures/experimental/class-static-block/options.json
diff --git a/.../typescript/static-blocks/invalid-static-block-with-accessibility-private-02/options.json b/.../typescript/static-blocks/invalid-static-block-with-accessibility-private-02/options.json
@@ -1,12 +1,5 @@
 {
-  "plugins": [
-    [
-      "classStaticBlock"
-    ],
-    [
-      "typescript"
-    ]
-  ],
+  "plugins": ["typescript"],
   "sourceType": "module",
   "throws": "Unexpected token (2:17)"
-}
+}
diff --git a/...ypescript/static-blocks/invalid-static-block-with-accessibility-protected-02/options.json b/...ypescript/static-blocks/invalid-static-block-with-accessibility-protected-02/options.json
@@ -1,12 +1,5 @@
 {
-  "plugins": [
-    [
-      "classStaticBlock"
-    ],
-    [
-      "typescript"
-    ]
-  ],
+  "plugins": ["typescript"],
   "sourceType": "module",
   "throws": "Unexpected token (2:19)"
-}
+}
diff --git a/...s/typescript/static-blocks/invalid-static-block-with-accessibility-public-02/options.json b/...s/typescript/static-blocks/invalid-static-block-with-accessibility-public-02/options.json
@@ -1,12 +1,5 @@
 {
-  "plugins": [
-    [
-      "classStaticBlock"
-    ],
-    [
-      "typescript"
-    ]
-  ],
+  "plugins": ["typescript"],
   "sourceType": "module",
   "throws": "Unexpected token (2:16)"
-}
+}
diff --git a/...ures/typescript/static-blocks/invalid-static-block-with-modifier-abstract-02/options.json b/...ures/typescript/static-blocks/invalid-static-block-with-modifier-abstract-02/options.json
@@ -1,12 +1,5 @@
 {
-  "plugins": [
-    [
-      "classStaticBlock"
-    ],
-    [
-      "typescript"
-    ]
-  ],
+  "plugins": ["typescript"],
   "sourceType": "module",
   "throws": "Unexpected token (2:18)"
-}
+}
diff --git a/...ures/typescript/static-blocks/invalid-static-block-with-modifier-override-02/options.json b/...ures/typescript/static-blocks/invalid-static-block-with-modifier-override-02/options.json
@@ -1,12 +1,5 @@
 {
-  "plugins": [
-    [
-      "classStaticBlock"
-    ],
-    [
-      "typescript"
-    ]
-  ],
+  "plugins": ["typescript"],
   "sourceType": "module",
   "throws": "Unexpected token (2:18)"
-}
+}
diff --git a/...tures/typescript/static-blocks/invalid-static-blocks-with-modifer-declare-02/options.json b/...tures/typescript/static-blocks/invalid-static-blocks-with-modifer-declare-02/options.json
@@ -1,12 +1,5 @@
 {
-  "plugins": [
-    [
-      "classStaticBlock"
-    ],
-    [
-      "typescript"
-    ]
-  ],
+  "plugins": ["typescript"],
   "sourceType": "module",
   "throws": "Unexpected token (2:17)"
-}
+}
diff --git a/...res/typescript/static-blocks/invalid-static-blocks-with-modifier-readonly-02/options.json b/...res/typescript/static-blocks/invalid-static-blocks-with-modifier-readonly-02/options.json
@@ -1,12 +1,5 @@
 {
-  "plugins": [
-    [
-      "classStaticBlock"
-    ],
-    [
-      "typescript"
-    ]
-  ],
+  "plugins": ["typescript"],
   "sourceType": "module",
   "throws": "Unexpected token (2:18)"
-}
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/static-blocks/options.json b/packages/babel-parser/test/fixtures/typescript/static-blocks/options.json
@@ -1,4 +1,4 @@
 {
-  "plugins": ["classStaticBlock", "typescript"],
+  "plugins": ["typescript"],
   "sourceType": "module"
 }
diff --git a/packages/babel-parser/typings/babel-parser.d.ts b/packages/babel-parser/typings/babel-parser.d.ts
@@ -125,7 +125,7 @@ export type ParserPlugin =
   | "classPrivateMethods"
   | "classPrivateProperties"
   | "classProperties"
-  | "classStaticBlock"
+  | "classStaticBlock" // Enabled by default
   | "decimal"
   | "decorators"
   | "decorators-legacy"

diff --git a/packages/babel-preset-env/data/shipped-proposals.js b/packages/babel-preset-env/data/shipped-proposals.js
@@ -2,9 +2,7 @@
 // These mappings represent the syntax proposals that have been
 // shipped by browsers, and are enabled by the `shippedProposals` option.
 
-const proposalPlugins = new Set([
-  "proposal-class-static-block",
-]);
+const proposalPlugins = new Set();
 
 // use intermediary object to enforce alphabetical key order
 const pluginSyntaxObject = {

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,6 +16,7 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
+  proposal-class-static-block { android, chrome < 94, edge, firefox < 93, ios, node, opera, safari, 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 }

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,6 +16,7 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
+  proposal-class-static-block { android, chrome < 94, edge, firefox < 93, ios, node, opera, safari, 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 }

diff --git a/packages/babel-preset-env/test/fixtures/bugfixes/edge-default-params-chrome-40/stdout.txt b/packages/babel-preset-env/test/fixtures/bugfixes/edge-default-params-chrome-40/stdout.txt
@@ -8,6 +8,7 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
+  proposal-class-static-block { chrome < 94 }
   proposal-private-property-in-object { chrome < 91 }
   proposal-class-properties { chrome < 84 }
   proposal-private-methods { chrome < 84 }

diff --git a/packages/babel-preset-env/test/fixtures/bugfixes/edge-default-params-chrome-70/stdout.txt b/packages/babel-preset-env/test/fixtures/bugfixes/edge-default-params-chrome-70/stdout.txt
@@ -8,6 +8,7 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
+  proposal-class-static-block { chrome < 94 }
   proposal-private-property-in-object { chrome < 91 }
   proposal-class-properties { chrome < 84 }
   proposal-private-methods { chrome < 84 }

diff --git a/packages/babel-preset-env/test/fixtures/bugfixes/edge-default-params-edge-14/stdout.txt b/packages/babel-preset-env/test/fixtures/bugfixes/edge-default-params-edge-14/stdout.txt
@@ -8,6 +8,7 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
+  proposal-class-static-block { edge }
   proposal-private-property-in-object { edge }
   proposal-class-properties { edge < 84 }
   proposal-private-methods { edge < 84 }

diff --git a/packages/babel-preset-env/test/fixtures/bugfixes/edge-default-params-edge-15/stdout.txt b/packages/babel-preset-env/test/fixtures/bugfixes/edge-default-params-edge-15/stdout.txt
@@ -8,6 +8,7 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
+  proposal-class-static-block { edge }
   proposal-private-property-in-object { edge }
   proposal-class-properties { edge < 84 }
   proposal-private-methods { edge < 84 }

diff --git a/...abel-preset-env/test/fixtures/bugfixes/edge-default-params-edge-17-no-bugfixes/stdout.txt b/...abel-preset-env/test/fixtures/bugfixes/edge-default-params-edge-17-no-bugfixes/stdout.txt
@@ -8,6 +8,7 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
+  proposal-class-static-block { edge }
   proposal-private-property-in-object { edge }
   proposal-class-properties { edge < 84 }
   proposal-private-methods { edge < 84 }

diff --git a/packages/babel-preset-env/test/fixtures/bugfixes/edge-default-params-edge-17/stdout.txt b/packages/babel-preset-env/test/fixtures/bugfixes/edge-default-params-edge-17/stdout.txt
@@ -8,6 +8,7 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
+  proposal-class-static-block { edge }
   proposal-private-property-in-object { edge }
   proposal-class-properties { edge < 84 }
   proposal-private-methods { edge < 84 }

diff --git a/packages/babel-preset-env/test/fixtures/bugfixes/edge-default-params-edge-18/stdout.txt b/packages/babel-preset-env/test/fixtures/bugfixes/edge-default-params-edge-18/stdout.txt
@@ -8,6 +8,7 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
+  proposal-class-static-block { edge }
   proposal-private-property-in-object { edge }
   proposal-class-properties { edge < 84 }
   proposal-private-methods { edge < 84 }

diff --git a/...babel-preset-env/test/fixtures/bugfixes/edge-function-name-edge-14-no-bugfixes/stdout.txt b/...babel-preset-env/test/fixtures/bugfixes/edge-function-name-edge-14-no-bugfixes/stdout.txt
@@ -8,6 +8,7 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
+  proposal-class-static-block { edge }
   proposal-private-property-in-object { edge }
   proposal-class-properties { edge < 84 }
   proposal-private-methods { edge < 84 }

diff --git a/packages/babel-preset-env/test/fixtures/bugfixes/edge-function-name-edge-14/stdout.txt b/packages/babel-preset-env/test/fixtures/bugfixes/edge-function-name-edge-14/stdout.txt
@@ -8,6 +8,7 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
+  proposal-class-static-block { edge }
   proposal-private-property-in-object { edge }
   proposal-class-properties { edge < 84 }
   proposal-private-methods { edge < 84 }

diff --git a/packages/babel-preset-env/test/fixtures/bugfixes/edge-function-name-edge-15/stdout.txt b/packages/babel-preset-env/test/fixtures/bugfixes/edge-function-name-edge-15/stdout.txt
@@ -8,6 +8,7 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
+  proposal-class-static-block { edge }
   proposal-private-property-in-object { edge }
   proposal-class-properties { edge < 84 }
   proposal-private-methods { edge < 84 }

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,6 +8,7 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
+  proposal-class-static-block { safari }
   proposal-private-property-in-object { safari < 15 }
   proposal-class-properties { safari < 15 }
   proposal-private-methods { safari < 15 }

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,6 +8,7 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
+  proposal-class-static-block { safari }
   proposal-private-property-in-object { safari < 15 }
   proposal-class-properties { safari < 15 }
   proposal-private-methods { safari < 15 }

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,6 +8,7 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
+  proposal-class-static-block { safari }
   proposal-private-property-in-object { safari < 15 }
   proposal-class-properties { safari < 15 }
   proposal-private-methods { safari < 15 }

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,6 +8,7 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
+  proposal-class-static-block { safari }
   proposal-private-property-in-object { safari < 15 }
   proposal-class-properties { safari < 15 }
   proposal-private-methods { safari < 15 }

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
@@ -8,6 +8,7 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
+  proposal-class-static-block { safari }
   syntax-private-property-in-object
   syntax-class-properties
   syntax-numeric-separator

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
@@ -8,6 +8,7 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
+  proposal-class-static-block { safari }
   syntax-private-property-in-object
   syntax-class-properties
   syntax-numeric-separator

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
@@ -8,6 +8,7 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
+  proposal-class-static-block { chrome < 94 }
   proposal-private-property-in-object { chrome < 91 }
   syntax-class-properties
   syntax-numeric-separator

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
@@ -8,6 +8,7 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
+  proposal-class-static-block { chrome < 94 }
   proposal-private-property-in-object { chrome < 91 }
   syntax-class-properties
   syntax-numeric-separator

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,6 +16,7 @@ Using targets:
 Using modules transform: false
 
 Using plugins:
+  proposal-class-static-block { android, chrome < 94, edge, firefox < 93, ios, node, opera, safari, 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 }

diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-browserslist-config-ignore/stdout.txt b/packages/babel-preset-env/test/fixtures/corejs2/usage-browserslist-config-ignore/stdout.txt
@@ -16,6 +16,7 @@ Using targets:
 Using modules transform: false
 
 Using plugins:
+  proposal-class-static-block { android, chrome < 94, edge, firefox < 93, ios, node, opera, safari, 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 }