docs(en): merge website/main into babeljs.cn/cn-v7 @ 1abc6447

.yarnrc.yml

@@ -4,4 +4,4 @@ enableGlobalCache: true
 
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-4.0.1.cjs
+yarnPath: .yarn/releases/yarn-4.6.0.cjs

README.md

@@ -6,13 +6,16 @@
 
 ### 设置
 
+<<<<<<< HEAD
 Node: 检查 Node 是否安装了 10.19.0 及以上版本。你可以通过 node -v 检查。
+=======
+Node: Check that Node is installed with version 20.5.0 and up. You can check this with `node -v`.
+>>>>>>> 1abc64479431900a894d069bbac82a2abb2571b2
 
 Yarn: 确保已经安装 Yarn 1 并且版本号 >= 1.19.0。
 
 ```shell title="Shell"
 $ git clone [email protected]:babel/website.git
-$ cd website
 $ yarn && yarn bootstrap
 ```
 

_redirects

@@ -64,22 +64,30 @@ https://babel.netlify.com/* https://babeljs.io/:splat 301!
 /docs/plugins/minify-*              /docs/babel-plugin-minify-:splat
 /docs/plugins/external-helpers/     /docs/babel-plugin-external-helpers
 
+# Removed packages
+/docs/babel-highlight /docs/babel-code-frame#migrating-from-babelhighlight
+
 # Plugins renamed from -proposal- to -transform-
-/docs/babel-plugin-proposal-class-static-block                  /docs/babel-plugin-transform-class-static-block
-/docs/babel-plugin-proposal-private-property-in-object          /docs/babel-plugin-transform-private-property-in-object
-/docs/babel-plugin-proposal-class-properties                    /docs/babel-plugin-transform-class-properties
-/docs/babel-plugin-proposal-private-methods                     /docs/babel-plugin-transform-private-methods
-/docs/babel-plugin-proposal-numeric-separator                   /docs/babel-plugin-transform-numeric-separator
-/docs/babel-plugin-proposal-logical-assignment-operators        /docs/babel-plugin-transform-logical-assignment-operators
-/docs/babel-plugin-proposal-nullish-coalescing-operator         /docs/babel-plugin-transform-nullish-coalescing-operator
-/docs/babel-plugin-proposal-optional-chaining                   /docs/babel-plugin-transform-optional-chaining
-/docs/babel-plugin-proposal-json-strings                        /docs/babel-plugin-transform-json-strings
-/docs/babel-plugin-proposal-optional-catch-binding              /docs/babel-plugin-transform-optional-catch-binding
-/docs/babel-plugin-proposal-async-generator-functions           /docs/babel-plugin-transform-async-generator-functions
-/docs/babel-plugin-proposal-object-rest-spread                  /docs/babel-plugin-transform-object-rest-spread
-/docs/babel-plugin-proposal-unicode-property-regex              /docs/babel-plugin-transform-unicode-property-regex
-/docs/babel-plugin-proposal-unicode-sets-regex                  /docs/babel-plugin-transform-unicode-sets-regex
-/docs/babel-plugin-proposal-export-namespace-from               /docs/babel-plugin-transform-export-namespace-from
+/docs/babel-plugin-proposal-class-static-block                      /docs/babel-plugin-transform-class-static-block
+/docs/babel-plugin-proposal-private-property-in-object              /docs/babel-plugin-transform-private-property-in-object
+/docs/babel-plugin-proposal-class-properties                        /docs/babel-plugin-transform-class-properties
+/docs/babel-plugin-proposal-private-methods                         /docs/babel-plugin-transform-private-methods
+/docs/babel-plugin-proposal-numeric-separator                       /docs/babel-plugin-transform-numeric-separator
+/docs/babel-plugin-proposal-dynamic-import                          /docs/babel-plugin-transform-dynamic-import
+/docs/babel-plugin-proposal-logical-assignment-operators            /docs/babel-plugin-transform-logical-assignment-operators
+/docs/babel-plugin-proposal-nullish-coalescing-operator             /docs/babel-plugin-transform-nullish-coalescing-operator
+/docs/babel-plugin-proposal-optional-chaining                       /docs/babel-plugin-transform-optional-chaining
+/docs/babel-plugin-proposal-json-strings                            /docs/babel-plugin-transform-json-strings
+/docs/babel-plugin-proposal-optional-catch-binding                  /docs/babel-plugin-transform-optional-catch-binding
+/docs/babel-plugin-proposal-async-generator-functions               /docs/babel-plugin-transform-async-generator-functions
+/docs/babel-plugin-proposal-object-rest-spread                      /docs/babel-plugin-transform-object-rest-spread
+/docs/babel-plugin-proposal-unicode-property-regex                  /docs/babel-plugin-transform-unicode-property-regex
+/docs/babel-plugin-proposal-unicode-sets-regex                      /docs/babel-plugin-transform-unicode-sets-regex
+/docs/babel-plugin-proposal-export-namespace-from                   /docs/babel-plugin-transform-export-namespace-from
+/docs/babel-plugin-proposal-duplicate-named-capturing-groups-regex  /docs/babel-plugin-transform-duplicate-named-capturing-groups-regex
+/docs/babel-plugin-proposal-regexp-modifiers                        /docs/babel-plugin-transform-regexp-modifiers
+/docs/babel-plugin-proposal-json-modules                            /docs/babel-plugin-transform-json-modules
+/docs/babel-plugin-proposal-explicit-resource-management            /docs/babel-plugin-transform-explicit-resource-management
 
 # Legacy redirects
 /docs/en/babel-plugin-transform-decorators                      /docs/babel-plugin-proposal-decorators
@@ -92,8 +100,11 @@ https://babel.netlify.com/* https://babeljs.io/:splat 301!
 /docs/en/next/tools/*               /setup
 
 # Blog rewrites
+/7.27.0 /blog/2025/03/24/7.27.0
+/7.26.0 /blog/2024/10/25/7.26.0
+/7.25.0 /blog/2024/07/26/7.25.0
 /7.24.0 /blog/2024/02/28/7.24.0
-/7.23.0 /blog/2023/09/25/7.22.0
+/7.23.0 /blog/2023/09/25/7.23.0
 /7.22.0 /blog/2023/05/26/7.22.0
 /7.21.0 /blog/2023/02/20/7.21.0
 /7.20.0 /blog/2022/10/27/7.20.0
@@ -139,3 +150,6 @@ https://babel.netlify.com/* https://babeljs.io/:splat 301!
 # Docusaurus v1 compat
 
 /docs/en/* /docs/:splat
+
+# CircleCI CORS
+/circleci/api/* https://circleci.com/api/v1.1/project/github/babel/babel/:splat 200

docs/assumptions.md

@@ -434,8 +434,6 @@ class Child extends Parent {
     "mutableTemplateObject": true,
     "noClassCalls": true,
     "noDocumentAll": true,
-    "noObjectSuper": true,
-    "noUndeclaredVariablesCheck": true,
     "objectRestNoSymbols": true,
     "privateFieldsAsProperties": true,
     "pureGetters": true,

docs/code-frame.md

@@ -11,6 +11,12 @@ npm install --save-dev @babel/code-frame
 
 ## Usage
 
+### `codeFrameColumns`
+
+The `codeFrameColumns` function allows you to decorate a code snipped with line numbers and with a marker pointing to a specific location.
+
+It will also optionally highlight your code, defaulting to what is supported by the output terminal.
+
 ```js title="JavaScript"
 import { codeFrameColumns } from "@babel/code-frame";
 
@@ -68,33 +74,33 @@ console.log(result);
   5 | };
 ```
 
-## Options
+#### Options
 
-### `highlightCode`
+##### `highlightCode`
 
 `boolean`, defaults to `false`.
 
 Toggles syntax highlighting the code as JavaScript for terminals.
 
-### `linesAbove`
+##### `linesAbove`
 
 `number`, defaults to `2`.
 
 Adjust the number of lines to show above the error.
 
-### `linesBelow`
+##### `linesBelow`
 
 `number`, defaults to `3`.
 
 Adjust the number of lines to show below the error.
 
-### `forceColor`
+##### `forceColor`
 
 `boolean`, defaults to `false`.
 
 Enable this to forcibly syntax highlight the code as JavaScript (for non-terminals); overrides `highlightCode`.
 
-### `message`
+##### `message`
 
 `string`, otherwise nothing
 
@@ -109,6 +115,76 @@ the code frame.
 3 | };
 ```
 
+### `highlight`
+
+The `highlight` function adds syntax highlighting to a code snipped, to be displayed in a terminal.
+
+```js title="JavaScript"
+import { highlight } from "@babel/code-frame";
+
+const code = `class Foo {
+  constructor()
+}`;
+
+const result = highlight(code);
+
+console.log(result);
+```
+
+```js title="JavaScript"
+class Foo {
+  constructor()
+}
+```
+
+## Migrating from `@babel/highlight`
+
+The `highlight` functionality was originally split in its own package, `@babel/highlight`.
+
+You can migrate as follows:
+<table>
+<thead>
+<tr>
+<th>Using <code>@babel/highlight</code></th>
+<th>Using <code>@babel/code-frame</code></th>
+</tr>
+</thead>
+<tbody><tr><td>
+
+```js title="JavaScript"
+import highlight from "@babel/highlight";
+
+highlight(text, { forceColor: true });
+```
+
+</td><td>
+
+```js title="JavaScript"
+import { highlight } from "@babel/code-frame";
+
+highlight(text);
+```
+
+</td></tr><tr><td>
+
+```js title="JavaScript"
+import highlight from "@babel/highlight";
+
+highlight(text);
+```
+
+</td><td>
+
+```js title="JavaScript"
+import { highlight } from "@babel/code-frame";
+
+process.stdout.hasColors() ? highlight(text) : text;
+```
+
+</td></tr></tbody></table>
+
+:::babel7
+
 ## Upgrading from prior versions
 
 Prior to version 7, the only API exposed by this module was for a single line and optional column pointer. The old API will now log a deprecation warning.
@@ -151,3 +227,5 @@ const result = codeFrameColumns(rawLines, location, {
 
 console.log(result);
 ```
+
+:::