Skip to content

Commit a549cc0

Browse files
Merge pull request #1050 from nodejs/main
Create a new pull request by comparing changes across two branches
2 parents f7e72a4 + abfad12 commit a549cc0

File tree

301 files changed

+20967
-12402
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

301 files changed

+20967
-12402
lines changed

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
test/fixtures/* -text
22
vcbuild.bat text eol=crlf
3+
# disable eol conversion in vendored files.
4+
deps/crates/vendor/**/* -text
35
deps/npm/bin/npm text eol=lf
46
deps/npm/bin/npx text eol=lf
57
deps/corepack/shims/corepack text eol=lf

.github/label-pr-config.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,13 @@ subSystemLabels:
100100
/^lib\/.*http2/: http2
101101
/^lib\/worker_threads.js$/: worker
102102
/^lib\/test.js$/: test_runner
103+
/^lib\/v8.js$/: v8 module
103104
/^lib\/internal\/url\.js$/: whatwg-url
104105
/^lib\/internal\/modules\/esm/: esm
105106
/^lib\/internal\/modules/: module
106107
/^lib\/internal\/webstreams/: web streams
107108
/^lib\/internal\/test_runner/: test_runner
109+
/^lib\/internal\/v8\//: v8 module
108110

109111
# All other lib/ files map directly
110112
/^lib\/_(\w+)_\w+\.js?$/: $1 # e.g. _(stream)_wrap

.github/workflows/test-shared.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ on:
2323
- deps/icu-small/**
2424
- deps/icu-tmp/**
2525
- deps/llhttp/**
26+
- deps/nbytes/**
2627
- deps/nghttp2/**
2728
- deps/ngtcp2/**
2829
- deps/openssl/*/**
@@ -71,6 +72,7 @@ on:
7172
- deps/icu-small/**
7273
- deps/icu-tmp/**
7374
- deps/llhttp/**
75+
- deps/nbytes/**
7476
- deps/nghttp2/**
7577
- deps/ngtcp2/**
7678
- deps/openssl/*/**

CHANGELOG.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,15 @@ release.
4141
</tr>
4242
<tr>
4343
<td valign="top">
44-
<b><a href="doc/changelogs/CHANGELOG_V25.md#25.2.1">25.2.1</a></b><br/>
44+
<b><a href="doc/changelogs/CHANGELOG_V25.md#25.3.0">25.3.0</a></b><br/>
45+
<a href="doc/changelogs/CHANGELOG_V25.md#25.2.1">25.2.1</a><br/>
4546
<a href="doc/changelogs/CHANGELOG_V25.md#25.2.0">25.2.0</a><br/>
4647
<a href="doc/changelogs/CHANGELOG_V25.md#25.1.0">25.1.0</a><br/>
4748
<a href="doc/changelogs/CHANGELOG_V25.md#25.0.0">25.0.0</a><br/>
4849
</td>
4950
<td valign="top">
50-
<b><a href="doc/changelogs/CHANGELOG_V24.md#24.12.0">24.12.0</a></b><br/>
51+
<b><a href="doc/changelogs/CHANGELOG_V24.md#24.13.0">24.13.0</a></b><br/>
52+
<a href="doc/changelogs/CHANGELOG_V24.md#24.12.0">24.12.0</a><br/>
5153
<a href="doc/changelogs/CHANGELOG_V24.md#24.11.1">24.11.1</a><br/>
5254
<a href="doc/changelogs/CHANGELOG_V24.md#24.11.0">24.11.0</a><br/>
5355
<a href="doc/changelogs/CHANGELOG_V24.md#24.10.0">24.10.0</a><br/>
@@ -66,7 +68,8 @@ release.
6668
<a href="doc/changelogs/CHANGELOG_V24.md#24.0.0">24.0.0</a><br/>
6769
</td>
6870
<td valign="top">
69-
<b><a href="doc/changelogs/CHANGELOG_V22.md#22.21.1">22.21.1</a></b><br/>
71+
<b><a href="doc/changelogs/CHANGELOG_V22.md#22.22.0">22.22.0</a></b><br/>
72+
<a href="doc/changelogs/CHANGELOG_V22.md#22.21.1">22.21.1</a><br/>
7073
<a href="doc/changelogs/CHANGELOG_V22.md#22.21.0">22.21.0</a><br/>
7174
<a href="doc/changelogs/CHANGELOG_V22.md#22.20.0">22.20.0</a><br/>
7275
<a href="doc/changelogs/CHANGELOG_V22.md#22.19.0">22.19.0</a><br/>
@@ -96,7 +99,8 @@ release.
9699
<a href="doc/changelogs/CHANGELOG_V22.md#22.0.0">22.0.0</a><br/>
97100
</td>
98101
<td valign="top">
99-
<b><a href="doc/changelogs/CHANGELOG_V20.md#20.19.6">20.19.6</a></b><br/>
102+
<b><a href="doc/changelogs/CHANGELOG_V20.md#20.20.0">20.20.0</a></b><br/>
103+
<a href="doc/changelogs/CHANGELOG_V20.md#20.19.6">20.19.6</a><br/>
100104
<a href="doc/changelogs/CHANGELOG_V20.md#20.19.5">20.19.5</a><br/>
101105
<a href="doc/changelogs/CHANGELOG_V20.md#20.19.4">20.19.4</a><br/>
102106
<a href="doc/changelogs/CHANGELOG_V20.md#20.19.3">20.19.3</a><br/>

LICENSE

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -899,6 +899,32 @@ The externally maintained libraries used by Node.js are:
899899
written prior permission. M.I.T. makes no representations about the
900900
suitability of this software for any purpose. It is provided "as is"
901901
without express or implied warranty.
902+
903+
----------------------------------------------------------------------
904+
905+
File: sorttable.js (only for ICU4J)
906+
907+
The MIT Licence, for code from kryogenix.org
908+
909+
Code downloaded from the Browser Experiments section of kryogenix.org is
910+
licenced under the so-called MIT licence. The licence is below.
911+
912+
Copyright (c) 1997-date Stuart Langridge
913+
914+
Permission is hereby granted, free of charge, to any person obtaining a
915+
copy of this software and associated documentation files (the "Software"),
916+
to deal in the Software without restriction, including without limitation
917+
the rights to use, copy, modify, merge, publish, distribute, sublicense,
918+
and/or sell copies of the Software, and to permit persons to whom the
919+
Software is furnished to do so, subject to the following conditions:
920+
921+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
922+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
923+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
924+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
925+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
926+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
927+
SOFTWARE.
902928
"""
903929

904930
- libuv, located at deps/uv, is licensed as follows:

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1242,6 +1242,7 @@ ifeq ($(SKIP_SHARED_DEPS), 1)
12421242
$(RM) -r $(TARNAME)/deps/icu-small
12431243
$(RM) -r $(TARNAME)/deps/icu-tmp
12441244
$(RM) -r $(TARNAME)/deps/llhttp
1245+
$(RM) -r $(TARNAME)/deps/nbytes
12451246
$(RM) -r $(TARNAME)/deps/nghttp2
12461247
$(RM) -r $(TARNAME)/deps/ngtcp2
12471248
find $(TARNAME)/deps/openssl -maxdepth 1 -type f ! -name 'nodejs-openssl.cnf' -exec $(RM) {} +

configure.py

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,28 @@
357357
dest='shared_libuv_libpath',
358358
help='a directory to search for the shared libuv DLL')
359359

360+
shared_optgroup.add_argument('--shared-nbytes',
361+
action='store_true',
362+
dest='shared_nbytes',
363+
default=None,
364+
help='link to a shared nbytes DLL instead of static linking')
365+
366+
shared_optgroup.add_argument('--shared-nbytes-includes',
367+
action='store',
368+
dest='shared_nbytes_includes',
369+
help='directory containing nbytes header files')
370+
371+
shared_optgroup.add_argument('--shared-nbytes-libname',
372+
action='store',
373+
dest='shared_nbytes_libname',
374+
default='nbytes',
375+
help='alternative lib name to link to [default: %(default)s]')
376+
377+
shared_optgroup.add_argument('--shared-nbytes-libpath',
378+
action='store',
379+
dest='shared_nbytes_libpath',
380+
help='a directory to search for the shared nbytes DLL')
381+
360382
shared_optgroup.add_argument('--shared-nghttp2',
361383
action='store_true',
362384
dest='shared_nghttp2',
@@ -2455,6 +2477,7 @@ def make_bin_override():
24552477
configure_library('cares', output, pkgname='libcares')
24562478
configure_library('gtest', output)
24572479
configure_library('hdr_histogram', output)
2480+
configure_library('nbytes', output)
24582481
configure_library('nghttp2', output, pkgname='libnghttp2')
24592482
configure_library('nghttp3', output, pkgname='libnghttp3')
24602483
configure_library('ngtcp2', output, pkgname='libngtcp2')

0 commit comments

Comments
 (0)