docs(en): merging all conflicts

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/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):
 ```

website/data/tools/node/usage.md

@@ -6,6 +6,10 @@ require("@babel/core").transform("code", {
 
 <blockquote class="alert alert--info">
   <p>
+<<<<<<< HEAD
     关于 Babel 的完整 API 文档请查阅<a href="/docs/usage/api/">使用文档</a>。
+=======
+    Explore the <a href="/docs/babel-core">@babel/core documentation</a> for the full API.
+>>>>>>> 85c50ccf2bb460f155f0e51140af3c726285a67a
   </p>
 </blockquote>

website/sidebars.js

@@ -152,6 +152,7 @@ module.exports = {
               type: "category",
               label: "Bugfix",
               items: [
+                "babel-plugin-bugfix-firefox-class-in-computed-class-key",
                 "babel-plugin-bugfix-safari-id-destructuring-collision-in-function-expression",
                 "babel-plugin-bugfix-v8-spread-parameters-in-optional-chaining",
               ],