Merge pull request #985 from nodejs/main

Create a new pull request by comparing changes across two branches

.eslintrc.js

@@ -58,6 +58,8 @@ module.exports = {
         'test/es-module/test-esm-example-loader.js',
         'test/es-module/test-esm-type-flag.js',
         'test/es-module/test-esm-type-flag-alias.js',
+        'test/es-module/test-require-module-detect-entry-point.js',
+        'test/es-module/test-require-module-detect-entry-point-aou.js',
       ],
       parserOptions: { sourceType: 'module' },
     },

.gitattributes

@@ -4,3 +4,4 @@ deps/npm/bin/npm text eol=lf
 deps/npm/bin/npx text eol=lf
 deps/corepack/shims/corepack text eol=lf
 tools/msvs/find_python.cmd text eol=crlf
+doc/**/*.md text eol=lf

.github/label-pr-config.yml

@@ -86,7 +86,7 @@ subSystemLabels:
   # Oddities first
   /^lib\/(?:punycode|\w+\/freelist|sys\.js)/: ''
   /^lib\/constants\.js$/: lib / src
-  /^lib\/internal/debugger$/: debugger
+  /^lib\/internal\/debugger$/: debugger
   /^lib\/internal\/linkedlist\.js$/: timers
   /^lib\/internal\/bootstrap/: lib / src
   /^lib\/internal\/v8_prof_/: tools

.github/workflows/tools.yml

@@ -16,7 +16,6 @@ on:
           - acorn
           - acorn-walk
           - ada
-          - base64
           - brotli
           - c-ares
           - cjs-module-lexer
@@ -81,14 +80,6 @@ jobs:
               cat temp-output
               tail -n1 temp-output | grep "NEW_VERSION=" >> "$GITHUB_ENV" || true
               rm temp-output
-          - id: base64
-            subsystem: deps
-            label: dependencies
-            run: |
-              ./tools/dep_updaters/update-base64.sh > temp-output
-              cat temp-output
-              tail -n1 temp-output | grep "NEW_VERSION=" >> "$GITHUB_ENV" || true
-              rm temp-output
           - id: brotli
             subsystem: deps
             label: dependencies

BUILDING.md

@@ -546,25 +546,32 @@ If you encounter any difficulties, consider disabling `mold` as a
 troubleshooting step.
 
 If you plan to frequently rebuild Node.js, especially if using several
-branches, installing `ccache` and `mold` can help to greatly reduce build
+branches, installing `ccache` can help to greatly reduce build
 times. Set up with:
 
 On GNU/Linux:
 
+Tips: `mold` can speed up the link process, which can't be cached, you may
+need to install the latest version but not the apt version.
+
 ```bash
 sudo apt install ccache mold   # for Debian/Ubuntu, included in most Linux distros
 export CC="ccache gcc"         # add to your .profile
 export CXX="ccache g++"        # add to your .profile
 export LDFLAGS="-fuse-ld=mold" # add to your .profile
 ```
 
+Refs:
+
+1. <https://ccache.dev/performance.html>
+2. <https://github.com/rui314/mold>
+
 On macOS:
 
 ```bash
-brew install ccache mold       # see https://brew.sh
+brew install ccache            # see https://brew.sh
 export CC="ccache cc"          # add to ~/.zshrc or other shell config file
 export CXX="ccache c++"        # add to ~/.zshrc or other shell config file
-export LDFLAGS="-fuse-ld=mold" # add to ~/.zshrc or other shell config file
 ```
 
 This will allow for near-instantaneous rebuilds when switching branches back
@@ -582,11 +589,6 @@ the specified directory. The JS debugger of Visual Studio Code supports this
 configuration since the November 2020 version and allows for setting
 breakpoints.
 
-Refs:
-
-1. <https://ccache.dev/performance.html>
-2. <https://github.com/rui314/mold>
-
 #### Troubleshooting Unix and macOS builds
 
 Stale builds can sometimes result in `file not found` errors while building.

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 Select a Node.js version below to view the changelog history:
 
+* [Node.js 22](doc/changelogs/CHANGELOG_V22.md) **Current**
 * [Node.js 21](doc/changelogs/CHANGELOG_V21.md) **Current**
 * [Node.js 20](doc/changelogs/CHANGELOG_V20.md) **Long Term Support**
 * [Node.js 19](doc/changelogs/CHANGELOG_V19.md) End-of-Life
@@ -30,12 +31,17 @@ release.
 
 <table>
 <tr>
+  <th title="Current"><a href="doc/changelogs/CHANGELOG_V22.md">22</a> (Current)</th>
   <th title="Current"><a href="doc/changelogs/CHANGELOG_V21.md">21</a> (Current)</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>
 <tr>
   <td valign="top">
+<b><a href="doc/changelogs/CHANGELOG_V22.md#22.1.0">22.1.0</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V22.md#22.0.0">22.0.0</a><br/>
+  </td>
+  <td valign="top">
 <b><a href="doc/changelogs/CHANGELOG_V21.md#21.7.3">21.7.3</a></b><br/>
 <a href="doc/changelogs/CHANGELOG_V21.md#21.7.2">21.7.2</a><br/>
 <a href="doc/changelogs/CHANGELOG_V21.md#21.7.1">21.7.1</a><br/>

LICENSE

@@ -136,7 +136,7 @@ The externally maintained libraries used by Node.js are:
 
     COPYRIGHT AND PERMISSION NOTICE
 
-    Copyright © 2016-2023 Unicode, Inc.
+    Copyright © 2016-2024 Unicode, Inc.
 
     NOTICE TO USER: Carefully read the following legal agreement. BY
     DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR
@@ -172,6 +172,8 @@ The externally maintained libraries used by Node.js are:
     dealings in these Data Files or Software without prior written
     authorization of the copyright holder.
 
+    SPDX-License-Identifier: Unicode-3.0
+
     ----------------------------------------------------------------------
 
     Third-Party Software Licenses
@@ -2376,35 +2378,3 @@ The externally maintained libraries used by Node.js are:
     OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
      ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
   """
-
-- base64, located at deps/base64/base64/, is licensed as follows:
-  """
-    Copyright (c) 2005-2007, Nick Galbreath
-    Copyright (c) 2015-2018, Wojciech Muła
-    Copyright (c) 2016-2017, Matthieu Darbois
-    Copyright (c) 2013-2022, Alfred Klomp
-    All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-
-    - Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    - Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-    IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-    TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-    PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-    HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-    TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-    PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  """

README.md

@@ -217,8 +217,6 @@ For information about the governance of the Node.js project, see
   **Danielle Adams** <<[email protected]>> (she/her)
 * [MylesBorins](https://github.com/MylesBorins) -
   **Myles Borins** <<[email protected]>> (he/him)
-* [TimothyGu](https://github.com/TimothyGu) -
-  **Tiancheng "Timothy" Gu** <<[email protected]>> (he/him)
 * [Trott](https://github.com/Trott) -
   **Rich Trott** <<[email protected]>> (he/him)
 
@@ -274,6 +272,8 @@ For information about the governance of the Node.js project, see
   **Shigeki Ohtsu** <<[email protected]>> (he/him)
 * [thefourtheye](https://github.com/thefourtheye) -
   **Sakthipriyan Vairamani** <<[email protected]>> (he/him)
+* [TimothyGu](https://github.com/TimothyGu) -
+  **Tiancheng "Timothy" Gu** <<[email protected]>> (he/him)
 * [trevnorris](https://github.com/trevnorris) -
   **Trevor Norris** <<[email protected]>>
 
@@ -435,8 +435,6 @@ For information about the governance of the Node.js project, see
   **Michaël Zasso** <<[email protected]>> (he/him)
 * [theanarkh](https://github.com/theanarkh) -
   **theanarkh** <<[email protected]>> (he/him)
-* [TimothyGu](https://github.com/TimothyGu) -
-  **Tiancheng "Timothy" Gu** <<[email protected]>> (he/him)
 * [tniessen](https://github.com/tniessen) -
   **Tobias Nießen** <<[email protected]>> (he/him)
 * [trivikr](https://github.com/trivikr) -
@@ -687,6 +685,8 @@ For information about the governance of the Node.js project, see
   **Sakthipriyan Vairamani** <<[email protected]>> (he/him)
 * [thlorenz](https://github.com/thlorenz) -
   **Thorsten Lorenz** <<[email protected]>>
+* [TimothyGu](https://github.com/TimothyGu) -
+  **Tiancheng "Timothy" Gu** <<[email protected]>> (he/him)
 * [trevnorris](https://github.com/trevnorris) -
   **Trevor Norris** <<[email protected]>>
 * [tunniclm](https://github.com/tunniclm) -

common.gypi

@@ -37,7 +37,7 @@
 
     # Reset this number to 0 on major V8 upgrades.
     # Increment by one for each non-official patch applied to deps/v8.
-    'v8_embedder_string': '-node.10',
+    'v8_embedder_string': '-node.11',
 
     ##### V8 defaults for Node.js #####
 
@@ -286,7 +286,10 @@
       'VCCLCompilerTool': {
         'AdditionalOptions': [
           '/Zc:__cplusplus',
-          '-std:c++17'
+          # The following option enables c++20 on Windows. This is needed for V8 v12.4+
+          '-std:c++20',
+          # The following option reduces the "error C1060: compiler is out of heap space"
+          '/Zm2000',
         ],
         'BufferSecurityCheck': 'true',
         'DebugInformationFormat': 1,          # /Z7 embed info in .obj files