Merge pull request #1013 from nodejs/main

Create a new pull request by comparing changes across two branches

Author: GulajavaMinistudio

.github/label-pr-config.yml

@@ -99,6 +99,7 @@ subSystemLabels:
   /^lib\/test.js$/: test_runner
   /^lib\/internal\/url\.js$/: whatwg-url
   /^lib\/internal\/modules\/esm/: esm
+  /^lib\/internal\/modules/: module
   /^lib\/internal\/webstreams/: web streams
   /^lib\/internal\/test_runner/: test_runner
 

.github/workflows/linters.yml

@@ -185,4 +185,21 @@ jobs:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332  # v4.1.7
         with:
           persist-credentials: false
-      - run: tools/lint-readme-lists.mjs
+      - name: Get team members if possible
+        id: team_members
+        run: |
+          get_list_members() {
+            TEAM="$1"
+            QUOTE='"'
+            gh api "/orgs/nodejs/teams/$TEAM/members" -X GET -f per_page=100 --jq "map(.login) | ${QUOTE}${TEAM}=\(tojson)${QUOTE}"
+          }
+          [ -z "$GITHUB_TOKEN" ] || (
+            get_list_members "collaborators"
+            get_list_members "issue-triage"
+            get_list_members "tsc"
+          ) >> "$GITHUB_OUTPUT"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_USER_TOKEN }}
+      - run: tools/lint-readme-lists.mjs "$TEAMS"
+        env:
+          TEAMS: ${{ tojson(steps.team_members.outputs) }}

CHANGELOG.md

@@ -38,7 +38,8 @@ release.
 </tr>
 <tr>
   <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V22.md#22.5.1">22.5.1</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V22.md#22.6.0">22.6.0</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V22.md#22.5.1">22.5.1</a><br/>
 <a href="doc/changelogs/CHANGELOG_V22.md#22.5.0">22.5.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V22.md#22.4.1">22.4.1</a><br/>
 <a href="doc/changelogs/CHANGELOG_V22.md#22.4.0">22.4.0</a><br/>

README.md

@@ -738,6 +738,8 @@ maintaining the Node.js project.
   **Gireesh Punathil** <<[email protected]>> (he/him)
 * [iam-frankqiu](https://github.com/iam-frankqiu) -
   **Frank Qiu** <<[email protected]>> (he/him)
+* [KevinEady](https://github.com/KevinEady) -
+  **Kevin Eady** <<[email protected]>> (he/him)
 * [kvakil](https://github.com/kvakil) -
   **Keyhan Vakil** <<[email protected]>>
 * [marsonya](https://github.com/marsonya) -

benchmark/_cli.js

@@ -33,6 +33,7 @@ function CLI(usage, settings) {
   let mode = 'both'; // Possible states are: [both, option, item]
 
   for (const arg of process.argv.slice(2)) {
+    if (arg === '--help') this.abort(usage);
     if (arg === '--') {
       // Only items can follow --
       mode = 'item';

benchmark/fs/bench-cpSync.js

@@ -12,7 +12,7 @@ const bench = common.createBenchmark(main, {
 
 function main({ n }) {
   tmpdir.refresh();
-  const options = { force: true, recursive: true };
+  const options = { recursive: true };
   const src = path.join(__dirname, '../../test/fixtures/copy');
   const dest = tmpdir.resolve(`${process.pid}/subdir/cp-bench-${process.pid}`);
   bench.start();

benchmark/path/relative-win32.js

@@ -9,6 +9,7 @@ const bench = common.createBenchmark(main, {
     ['C:\\foo\\bar\\baz', 'C:\\foo\\bar\\baz'].join('|'),
     ['C:\\foo\\BAR\\BAZ', 'C:\\foo\\bar\\baz'].join('|'),
     ['C:\\foo\\bar\\baz\\quux', 'C:\\'].join('|'),
+    ['c:\\İ\\a\\İ', 'c:\\İ\\b\\İ\\test.txt', '..\\..\\b\\İ\\test.txt'].join('|'),
   ],
   n: [1e5],
 });

deps/acorn/acorn/CHANGELOG.md

@@ -1,3 +1,33 @@
+## 8.12.1 (2024-07-03)
+
+### Bug fixes
+
+Fix a regression that caused Acorn to no longer run on Node versions <8.10.
+
+## 8.12.0 (2024-06-14)
+
+### New features
+
+Support ES2025 duplicate capture group names in regular expressions.
+
+### Bug fixes
+
+Include `VariableDeclarator` in the `AnyNode` type so that walker objects can refer to it without getting a type error.
+
+Properly raise a parse error for invalid `for`/`of` statements using `async` as binding name.
+
+Properly recognize \"use strict\" when preceded by a string with an escaped newline.
+
+Mark the `Parser` constructor as protected, not private, so plugins can extend it without type errors.
+
+Fix a bug where some invalid `delete` expressions were let through when the operand was parenthesized and `preserveParens` was enabled.
+
+Properly normalize line endings in raw strings of invalid template tokens.
+
+Properly track line numbers for escaped newlines in strings.
+
+Fix a bug that broke line number accounting after a template literal with invalid escape sequences.
+
 ## 8.11.3 (2023-12-29)
 
 ### Bug fixes

deps/acorn/acorn/README.md

@@ -50,12 +50,11 @@ Options are provided by in a second argument, which should be an
 object containing any of these fields (only `ecmaVersion` is
 required):
 
-- **ecmaVersion**: Indicates the ECMAScript version to parse. Must be
-  either 3, 5, 6 (or 2015), 7 (2016), 8 (2017), 9 (2018), 10 (2019),
-  11 (2020), 12 (2021), 13 (2022), 14 (2023), or `"latest"` (the
-  latest the library supports). This influences support for strict
-  mode, the set of reserved words, and support for new syntax
-  features.
+- **ecmaVersion**: Indicates the ECMAScript version to parse. Can be a
+  number, either in year (`2022`) or plain version number (`6`) form,
+  or `"latest"` (the latest the library supports). This influences
+  support for strict mode, the set of reserved words, and support for
+  new syntax features.
 
   **NOTE**: Only 'stage 4' (finalized) ECMAScript features are being
   implemented by Acorn. Other proposed new features must be

deps/acorn/acorn/dist/acorn.d.mts

@@ -562,7 +562,7 @@ export type ModuleDeclaration =
 | ExportDefaultDeclaration
 | ExportAllDeclaration
 
-export type AnyNode = Statement | Expression | Declaration | ModuleDeclaration | Literal | Program | SwitchCase | CatchClause | Property | Super | SpreadElement | TemplateElement | AssignmentProperty | ObjectPattern | ArrayPattern | RestElement | AssignmentPattern | ClassBody | MethodDefinition | MetaProperty | ImportSpecifier | ImportDefaultSpecifier | ImportNamespaceSpecifier | ExportSpecifier | AnonymousFunctionDeclaration | AnonymousClassDeclaration | PropertyDefinition | PrivateIdentifier | StaticBlock
+export type AnyNode = Statement | Expression | Declaration | ModuleDeclaration | Literal | Program | SwitchCase | CatchClause | Property | Super | SpreadElement | TemplateElement | AssignmentProperty | ObjectPattern | ArrayPattern | RestElement | AssignmentPattern | ClassBody | MethodDefinition | MetaProperty | ImportSpecifier | ImportDefaultSpecifier | ImportNamespaceSpecifier | ExportSpecifier | AnonymousFunctionDeclaration | AnonymousClassDeclaration | PropertyDefinition | PrivateIdentifier | StaticBlock | VariableDeclarator
 
 export function parse(input: string, options: Options): Program
 
@@ -573,16 +573,15 @@ export function tokenizer(input: string, options: Options): {
   [Symbol.iterator](): Iterator<Token>
 }
 
-export type ecmaVersion = 3 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 2015 | 2016 | 2017 | 2018 | 2019 | 2020 | 2021 | 2022 | 2023 | 2024 | "latest"
+export type ecmaVersion = 3 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 2015 | 2016 | 2017 | 2018 | 2019 | 2020 | 2021 | 2022 | 2023 | 2024 | 2025 | "latest"
 
 export interface Options {
   /**
-   * `ecmaVersion` indicates the ECMAScript version to parse. Must be
-   * either 3, 5, 6 (or 2015), 7 (2016), 8 (2017), 9 (2018), 10
-   * (2019), 11 (2020), 12 (2021), 13 (2022), 14 (2023), or `"latest"`
-   * (the latest version the library supports). This influences
-   * support for strict mode, the set of reserved words, and support
-   * for new syntax features.
+   * `ecmaVersion` indicates the ECMAScript version to parse. Can be a
+   * number, either in year (`2022`) or plain version number (`6`) form,
+   * or `"latest"` (the latest the library supports). This influences
+   * support for strict mode, the set of reserved words, and support for
+   * new syntax features.
    */
   ecmaVersion: ecmaVersion
 
@@ -733,7 +732,7 @@ export class Parser {
   options: Options
   input: string
 
-  private constructor(options: Options, input: string, startPos?: number)
+  protected constructor(options: Options, input: string, startPos?: number)
   parse(): Program
 
   static parse(input: string, options: Options): Program