docs(en): merging all conflicts

docs/parser.md

@@ -118,7 +118,8 @@ It is based on [ESTree spec][] with the following deviations:
 - [Program][] and [BlockStatement][] contain additional `directives` field with [Directive][] and [DirectiveLiteral][]
 - [ClassMethod][], [ClassPrivateMethod][], [ObjectProperty][], and [ObjectMethod][] value property's properties in [FunctionExpression][] is coerced/brought into the main method node.
 - [ChainExpression][] is replaced with [OptionalMemberExpression][] and [OptionalCallExpression][]
-- [ImportExpression][] is replaced with a [CallExpression][] whose `callee` is an [Import] node.
+- [ImportExpression][] is replaced with a [CallExpression][] whose `callee` is an [Import] node. This change will be reversed in Babel 8.
+- [ExportAllDeclaration][] with `exported` field is replaced with an [ExportNamedDeclaration][] containing an [ExportNamespaceSpecifier][] node.
 
 :::tip
 There is now an `estree` plugin which reverts these deviations
@@ -134,6 +135,7 @@ AST for JSX code is based on [Facebook JSX AST][].
 [propertydefinition]: https://github.com/estree/estree/blob/master/es2022.md#propertydefinition
 [chainexpression]: https://github.com/estree/estree/blob/master/es2020.md#chainexpression
 [importexpression]: https://github.com/estree/estree/blob/master/es2020.md#importexpression
+[exportalldeclaration]: https://github.com/estree/estree/blob/master/es2020.md#exportalldeclaration
 [privateidentifier]: https://github.com/estree/estree/blob/master/es2022.md#privateidentifier
 [stringliteral]: https://github.com/babel/babel/tree/main/packages/babel-parser/ast/spec.md#stringliteral
 [numericliteral]: https://github.com/babel/babel/tree/main/packages/babel-parser/ast/spec.md#numericliteral
@@ -157,6 +159,8 @@ AST for JSX code is based on [Facebook JSX AST][].
 [optionalcallexpression]: https://github.com/babel/babel/blob/main/packages/babel-parser/ast/spec.md#optionalcallexpression
 [callexpression]: https://github.com/babel/babel/blob/main/packages/babel-parser/ast/spec.md#callexpression
 [import]: https://github.com/babel/babel/blob/main/packages/babel-parser/ast/spec.md#import
+[exportnameddeclaration]: https://github.com/babel/babel/blob/main/packages/babel-parser/ast/spec.md#exportnameddeclaration
+[exportnamespacespecifier]: https://github.com/babel/babel/blob/main/packages/babel-parser/ast/spec.md#exportnamespacespecifier
 [facebook jsx ast]: https://github.com/facebook/jsx/blob/master/AST.md
 
 ### Semver

docs/plugin-bugfix-firefox-class-in-computed-class-key.md

@@ -0,0 +1,45 @@
+---
+id: babel-plugin-bugfix-firefox-class-in-computed-class-key
+title: "@babel/plugin-bugfix-firefox-class-in-computed-class-key"
+sidebar_label: bugfix-firefox-class-in-computed-class-key
+---
+
+This bugfix plugin transforms classes inside computed keys of other classes to workaround a [SpiderMonkey bug](https://bugzilla.mozilla.org/show_bug.cgi?id=1887677) with private class elements.
+
+:::tip
+This plugin is included in `@babel/preset-env`, and Babel will automatically enable this plugin for you when your `targets` are affected by the browser bug.
+:::
+
+:::warning
+Terser versions older than 5.30.2 will undo the transform done by this plugin. Make sure to use at least version 5.30.2, or set the Terser's [`compress.inline`](https://terser.org/docs/options/#compress-options) option to `false`.
+:::
+
+## Installation
+
+```shell npm2yarn
+npm install --save-dev @babel/plugin-bugfix-firefox-class-in-computed-class-key
+```
+
+## Usage
+
+### With a configuration file (Recommended)
+
+```json title="babel.config.json"
+{
+  "plugins": ["@babel/plugin-bugfix-firefox-class-in-computed-class-key"]
+}
+```
+
+### Via CLI
+
+```sh title="Shell"
+babel --plugins @babel/plugin-bugfix-firefox-class-in-computed-class-key script.js
+```
+
+### Via Node API
+
+```js title="JavaScript"
+require("@babel/core").transformSync("code", {
+  plugins: ["@babel/plugin-bugfix-firefox-class-in-computed-class-key"],
+});
+```

docs/plugin-proposal-optional-chaining-assign.md

@@ -34,10 +34,12 @@ npm install --save-dev @babel/plugin-proposal-optional-chaining-assign
 ```json title="babel.config.json"
 {
   "plugins": [
-    "@babel/plugin-proposal-optional-chaining-assign",
-    {
-      "version": "2023-07"
-    }
+    [
+      "@babel/plugin-proposal-optional-chaining-assign",
+      {
+        "version": "2023-07"
+      }
+    ]
   ]
 }
 ```

docs/plugin-transform-runtime.md

@@ -5,10 +5,14 @@ title: "@babel/plugin-transform-runtime"
 
 A plugin that enables the re-use of Babel's injected helper code to save on codesize.
 
+::::babel7
+
 :::note
 Instance methods such as `"foobar".includes("foo")` will only work with `core-js@3`. If you need to polyfill them, you can directly import `"core-js"` or use `@babel/preset-env`'s `useBuiltIns` option.
 :::
 
+::::
+
 ## Installation
 
 Install it as development dependency.
@@ -35,10 +39,14 @@ Babel uses very small helpers for common functions such as `_extend`. By default
 
 This is where the `@babel/plugin-transform-runtime` plugin comes in: all of the helpers will reference the module `@babel/runtime` to avoid duplication across your compiled output. The runtime will be compiled into your build.
 
+::::babel7
+
 Another purpose of this transformer is to create a sandboxed environment for your code. If you directly import [core-js](https://github.com/zloirock/core-js) or [@babel/polyfill](polyfill.md) and the built-ins it provides such as `Promise`, `Set` and `Map`, those will pollute the global scope. While this might be ok for an app or a command line tool, it becomes a problem if your code is a library which you intend to publish for others to use or if you can't exactly control the environment in which your code will run.
 
 The transformer will alias these built-ins to `core-js` so you can use them seamlessly without having to require the polyfill.
 
+::::
+
 See the [technical details](#technical-details) section for more information on how this works and the types of transformations that occur.
 
 ## Usage
@@ -90,6 +98,21 @@ require("@babel/core").transformSync("code", {
 
 ## Options
 
+
+### `absoluteRuntime`
+
+`boolean` or `string`, defaults to `false`.
+
+This allows users to run `transform-runtime` broadly across a whole project. By default, `transform-runtime` imports from `@babel/runtime/foo` directly, but that only works if `@babel/runtime` is in the `node_modules` of the file that is being compiled. This can be problematic for nested `node_modules`, npm-linked modules, or CLIs that reside outside the user's project, among other cases. To avoid worrying about how the runtime module's location is resolved, this allows users to resolve the runtime once up front, and then insert absolute paths to the runtime into the output code.
+
+Using absolute paths is not desirable if files are compiled for use at a later time, but in contexts where a file is compiled and then immediately consumed, they can be quite helpful.
+
+:::tip
+You can read more about configuring plugin options [here](https://babeljs.io/docs/en/plugins#plugin-options)
+:::
+
+::::babel7
+
 ### `corejs`
 
 `false`, `2`, `3` or `{ version: 2 | 3, proposals: boolean }`, defaults to `false`.
@@ -118,6 +141,12 @@ This option requires changing the dependency used to provide the necessary runti
 | `2`             | `npm install --save @babel/runtime-corejs2` |
 | `3`             | `npm install --save @babel/runtime-corejs3` |
 
+:::caution
+
+The `corejs` option will be removed in Babel 8. To inject polyfills, you can use [`babel-plugin-polyfill-corejs3`](https://github.com/babel/babel-polyfills/blob/main/packages/babel-plugin-polyfill-corejs3/README.md) or [`babel-plugin-polyfill-corejs2`](https://github.com/babel/babel-polyfills/blob/main/packages/babel-plugin-polyfill-corejs2/README.md) directly.
+
+:::
+
 ### `helpers`
 
 `boolean`, defaults to `true`.
@@ -126,6 +155,14 @@ Toggles whether or not inlined Babel helpers (`classCallCheck`, `extends`, etc.)
 
 For more information, see [Helper aliasing](#helper-aliasing).
 
+:::caution
+
+The `helpers` option will be removed in Babel 8, as this plugin will only be used to inject helpers (including `regeneratorRuntime`, which will be handled as any other Babel helper).
+
+:::
+
+::::
+
 ### `moduleName`
 
 <details>
@@ -147,42 +184,22 @@ This option controls which package of helpers `@babel/plugin-transform-runtime`
 
 Note that specifying the [`corejs`](#corejs) option will internally enable the corresponding `babel-plugin-polyfill-corejs*` plugin, thus it has an effect on the final module name.
 
-### `polyfill`
-
-:::danger
-This option was removed in v7.
-:::
+::::babel7
 
 ### `regenerator`
 
 `boolean`, defaults to `true`.
 
-Toggles whether or not generator functions are transformed to use a regenerator runtime that does not pollute the global scope.
+In older Babel version, this option used to toggles whether or not generator functions were transformed to use a regenerator runtime that does not pollute the global scope.
 
 For more information, see [Regenerator aliasing](#regenerator-aliasing).
 
-### `useBuiltIns`
-
-:::danger
-This option was removed in v7.
+:::caution
+The `regenerator` option will be removed in Babel 8, as it will not be necessary anymore.
 :::
 
 ### `useESModules`
 
-::::babel8
-
-:::danger
-This option was removed in v8.
-:::
-
-::::
-
-::::babel7
-
-:::caution
-This option has been deprecated and will be removed in Babel 8: starting from version `7.13.0`, `@babel/runtime`'s `package.json` uses `"exports"` option to automatically choose between CJS and ESM helpers.
-:::
-
 `boolean`, defaults to `false`.
 
 <details>
@@ -219,46 +236,59 @@ export default function(instance, Constructor) {
 }
 ```
 
+:::caution
+The `useESModules` option has been deprecated and will be removed in Babel 8: starting from version `7.13.0`, `@babel/runtime`'s `package.json` uses `"exports"` option to automatically choose between CJS and ESM helpers.
+:::
+
 ::::
 
-### `absoluteRuntime`
+### `version`
 
-`boolean` or `string`, defaults to `false`.
+::::babel7
 
-This allows users to run `transform-runtime` broadly across a whole project. By default, `transform-runtime` imports from `@babel/runtime/foo` directly, but that only works if `@babel/runtime` is in the `node_modules` of the file that is being compiled. This can be problematic for nested `node_modules`, npm-linked modules, or CLIs that reside outside the user's project, among other cases. To avoid worrying about how the runtime module's location is resolved, this allows users to resolve the runtime once up front, and then insert absolute paths to the runtime into the output code.
+By default transform-runtime assumes that `@babel/[email protected]` is installed. If you have later versions of
+`@babel/runtime` (or their corejs counterparts e.g. `@babel/runtime-corejs3`) installed or listed as a dependency, transform-runtime can use more advanced features.
 
-Using absolute paths is not desirable if files are compiled for use at a later time, but in contexts where a file is compiled and then immediately consumed, they can be quite helpful.
+For example if you depend on `@babel/runtime@^7.24.0` you can transpile your code with
 
-:::tip
-You can read more about configuring plugin options [here](https://babeljs.io/docs/en/plugins#plugin-options)
-:::
+```json title="babel.config.json"
+{
+  "plugins": [
+    ["@babel/plugin-transform-runtime", {
+      "version": "^7.24.0"
+    }]
+  ]
+}
+```
 
-### `version`
+::::
 
-By default transform-runtime assumes that `@babel/[email protected]` is installed. If you have later versions of
+::::babel8
+
+By default transform-runtime assumes that `@babel/[email protected]` is installed. If you have later versions of
 `@babel/runtime` (or their corejs counterparts e.g. `@babel/runtime-corejs3`) installed or listed as a dependency, transform-runtime can use more advanced features.
 
-For example if you depend on `@babel/[email protected]` you can transpile your code with
+
+For example if you depend on `@babel/runtime@^8.1.0` you can transpile your code with
 
 ```json title="babel.config.json"
 {
   "plugins": [
-    [
-      "@babel/plugin-transform-runtime",
-      {
-        "absoluteRuntime": false,
-        "corejs": 2,
-        "version": "^7.7.4"
-      }
-    ]
+    ["@babel/plugin-transform-runtime", {
+      "version": "^8.1.0"
+    }]
   ]
 }
 ```
 
+::::
+
 which results in a smaller bundle size.
 
 ## Technical details
 
+::::babel7
+
 The `transform-runtime` transformer plugin does three things:
 
 - Automatically requires `@babel/runtime/regenerator` when you use generators/async functions (toggleable with the `regenerator` option).
@@ -381,6 +411,8 @@ without worrying about where they come from.
 
 ### Helper aliasing
 
+::::
+
 Usually Babel will place helpers at the top of your file to do common tasks to avoid
 duplicating the code around in the current file. Sometimes these helpers can get a
 little bulky and add unnecessary duplication across files. The `runtime`
@@ -425,3 +457,18 @@ var Person = function Person() {
   (0, _classCallCheck3.default)(this, Person);
 };
 ```
+
+## Removed options
+
+:::babel8
+
+The following options where removed in Babel 8.0.0:
+- `corejs`
+- `helpers`
+- `regenerator`
+
+:::
+
+The following options where removed in Babel 7.0.0:
+- `useBuiltIns`
+- `polyfill`

docs/plugin-transform-typescript.md

@@ -116,7 +116,7 @@ Forcibly enables `jsx` parsing. Otherwise angle brackets will be treated as Type
 
 ### `jsxPragma`
 
-`string`, defaults to `React`
+`string`, defaults to `React.createElement`
 
 Replace the function used when compiling JSX expressions. This is so that we know that the import is not a type import, and should not be removed.
 

docs/preset-typescript.md

@@ -205,7 +205,7 @@ Added in: `v7.23.0`
 
 When set to `true`, Babel will rewrite `.ts`/`.mts`/`.cts` extensions in import declarations to `.js`/`.mjs`/`.cjs`.
 
-This option, when used together with TypeScript's [`allowImportingTsExtension`](https://www.typescriptlang.org/tsconfig#allowImportingTsExtensions) option, allows to write complete relative specifiers in import declaratoinss while using the same extension used by the source files.
+This option, when used together with TypeScript's [`allowImportingTsExtension`](https://www.typescriptlang.org/tsconfig#allowImportingTsExtensions) option, allows to write complete relative specifiers in import declarations while using the same extension used by the source files.
 
 As an example, given this project structure (where `src` contains the source files, and `dist` the compiled files):
 ```

docs/types.md

@@ -290,7 +290,7 @@ See also `t.isCallExpression(node, opts)` and `t.assertCallExpression(node, opts
 
 AST Node `CallExpression` shape:
 - `callee`: `Expression | Super | V8IntrinsicIdentifier` (required)
-- `arguments`: `Array<Expression | SpreadElement | JSXNamespacedName | ArgumentPlaceholder>` (required)
+- `arguments`: `Array<Expression | SpreadElement | ArgumentPlaceholder>` (required)
 - `optional`: `true | false` (default: `null`, excluded from builder function)
 - `typeArguments`: `TypeParameterInstantiation` (default: `null`, excluded from builder function)
 - `typeParameters`: `TSTypeParameterInstantiation` (default: `null`, excluded from builder function)
@@ -1915,7 +1915,7 @@ See also `t.isNewExpression(node, opts)` and `t.assertNewExpression(node, opts)`
 
 AST Node `NewExpression` shape:
 - `callee`: `Expression | Super | V8IntrinsicIdentifier` (required)
-- `arguments`: `Array<Expression | SpreadElement | JSXNamespacedName | ArgumentPlaceholder>` (required)
+- `arguments`: `Array<Expression | SpreadElement | ArgumentPlaceholder>` (required)
 - `optional`: `true | false` (default: `null`, excluded from builder function)
 - `typeArguments`: `TypeParameterInstantiation` (default: `null`, excluded from builder function)
 - `typeParameters`: `TSTypeParameterInstantiation` (default: `null`, excluded from builder function)
@@ -2232,7 +2232,7 @@ See also `t.isOptionalCallExpression(node, opts)` and `t.assertOptionalCallExpre
 
 AST Node `OptionalCallExpression` shape:
 - `callee`: `Expression` (required)
-- `arguments`: `Array<Expression | SpreadElement | JSXNamespacedName | ArgumentPlaceholder>` (required)
+- `arguments`: `Array<Expression | SpreadElement | ArgumentPlaceholder>` (required)
 - `optional`: `boolean` (required)
 - `typeArguments`: `TypeParameterInstantiation` (default: `null`, excluded from builder function)
 - `typeParameters`: `TSTypeParameterInstantiation` (default: `null`, excluded from builder function)

docs/v8-migration-api.md

@@ -284,6 +284,10 @@ Check out the [v8-migration guide](v8-migration.md) for other user-level changes
 
   **Migration**: Adapt to the new token design. If you want to restore to the Babel 7 behaviour, manually transform them to the Babel 7 tokens ([example](https://github.com/babel/babel/blob/7e60a93897f9a134506251ea51269faf4d02a86c/packages/babel-parser/src/parser/statement.ts#L116-L188)).
 
+- Remove `extra.shorthand` from `ObjectProperty` nodes ([#16521](https://github.com/babel/babel/pull/16521))
+
+  **Migration**: Use `node.shorthand` rather than `node.extra.shorthand`.
+
 ### `@babel/traverse`
 
 ![low](https://img.shields.io/badge/risk%20of%20breakage%3F-low-yellowgreen.svg)