Merge pull request #1033 from nodejs/main

Create a new pull request by comparing changes across two branches

CHANGELOG.md

@@ -3,11 +3,11 @@
 Select a Node.js version below to view the changelog history:
 
 * [Node.js 23](doc/changelogs/CHANGELOG_V23.md) **Current**
-* [Node.js 22](doc/changelogs/CHANGELOG_V22.md) **Current**
+* [Node.js 22](doc/changelogs/CHANGELOG_V22.md) **Long Term Support**
 * [Node.js 21](doc/changelogs/CHANGELOG_V21.md) End-of-Life
-* [Node.js 20](doc/changelogs/CHANGELOG_V20.md) **Long Term Support**
+* [Node.js 20](doc/changelogs/CHANGELOG_V20.md) Long Term Support
 * [Node.js 19](doc/changelogs/CHANGELOG_V19.md) End-of-Life
-* [Node.js 18](doc/changelogs/CHANGELOG_V18.md) **Long Term Support**
+* [Node.js 18](doc/changelogs/CHANGELOG_V18.md) Long Term Support
 * [Node.js 17](doc/changelogs/CHANGELOG_V17.md) End-of-Life
 * [Node.js 16](doc/changelogs/CHANGELOG_V16.md) End-of-Life
 * [Node.js 15](doc/changelogs/CHANGELOG_V15.md) End-of-Life
@@ -33,7 +33,7 @@ release.
 <table>
 <tr>
   <th title="Current"><a href="doc/changelogs/CHANGELOG_V23.md">23</a> (Current)</th>
-  <th title="Current"><a href="doc/changelogs/CHANGELOG_V22.md">22</a> (Current)</th>
+  <th title="LTS Until 2027-04"><a href="doc/changelogs/CHANGELOG_V22.md">22</a> (LTS)</th>
   <th title="LTS Until 2026-04"><a href="doc/changelogs/CHANGELOG_V20.md">20</a> (LTS)</th>
   <th title="LTS Until 2025-04"><a href="doc/changelogs/CHANGELOG_V18.md">18</a> (LTS)</th>
 </tr>
@@ -42,7 +42,8 @@ release.
 <a href="doc/changelogs/CHANGELOG_V23.md#23.0.0">23.0.0</a><br/>
   </td>
   <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V22.md#22.10.0">22.10.0</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V22.md#22.11.0">22.11.0</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V22.md#22.10.0">22.10.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V22.md#22.9.0">22.9.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V22.md#22.8.0">22.8.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V22.md#22.7.0">22.7.0</a><br/>

README.md

@@ -357,6 +357,8 @@ For information about the governance of the Node.js project, see
   **Jacob Smith** <<jacob@frende.me>> (he/him)
 * [jasnell](https://github.com/jasnell) -
   **James M Snell** <<jasnell@gmail.com>> (he/him)
+* [jazelly](https://github.com/jazelly) -
+  **Jason Zhang** <<xzha4350@gmail.com>> (he/him)
 * [jkrems](https://github.com/jkrems) -
   **Jan Krems** <<jan.krems@gmail.com>> (he/him)
 * [joyeecheung](https://github.com/joyeecheung) -

configure.py

@@ -1879,7 +1879,7 @@ def icu_download(path):
   elif with_intl == 'system-icu':
     # ICU from pkg-config.
     o['variables']['v8_enable_i18n_support'] = 1
-    pkgicu = pkg_config('icu-i18n')
+    pkgicu = pkg_config(['icu-i18n', 'icu-uc'])
     if not pkgicu[0]:
       error('''Could not load pkg-config data for "icu-i18n".
        See above errors or the README.md.''')

deps/acorn/acorn/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 8.13.0 (2024-10-16)
+
+### New features
+
+Upgrade to Unicode 16.0.
+
 ## 8.12.1 (2024-07-03)
 
 ### Bug fixes

deps/acorn/acorn/package.json

@@ -16,7 +16,7 @@
     ],
     "./package.json": "./package.json"
   },
-  "version": "8.12.1",
+  "version": "8.13.0",
   "engines": {
     "node": ">=0.4.0"
   },

deps/nghttp2/lib/Makefile.in

@@ -327,6 +327,7 @@ EXTRABPFCFLAGS = @EXTRABPFCFLAGS@
 EXTRACFLAG = @EXTRACFLAG@
 EXTRA_DEFS = @EXTRA_DEFS@
 FGREP = @FGREP@
+FILECMD = @FILECMD@
 GREP = @GREP@
 HAVE_CXX20 = @HAVE_CXX20@
 INSTALL = @INSTALL@

deps/nghttp2/lib/includes/Makefile.in

@@ -232,6 +232,7 @@ EXTRABPFCFLAGS = @EXTRABPFCFLAGS@
 EXTRACFLAG = @EXTRACFLAG@
 EXTRA_DEFS = @EXTRA_DEFS@
 FGREP = @FGREP@
+FILECMD = @FILECMD@
 GREP = @GREP@
 HAVE_CXX20 = @HAVE_CXX20@
 INSTALL = @INSTALL@