Skip to content

Commit 2c8534e

Browse files
AmemomeAmemome
authored
Merge branch 'nodejs:main' into lib/implement-events-passive-listener-spec
2 parents c8dff37 + 4a9a022 commit 2c8534e

File tree

314 files changed

+134978
-1323
lines changed

Some content is hidden

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

314 files changed

+134978
-1323
lines changed

‎.github/dependabot.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ updates:
66
directory: /
77
schedule:
88
interval: monthly
9+
cooldown:
10+
- semver-major-days: 5
11+
- semver-minor-days: 5
12+
- semver-patch-days: 5
13+
914
commit-message:
1015
prefix: meta
1116
open-pull-requests-limit: ${{secrets.OPEN_PR_LIMIT}}
@@ -14,6 +19,10 @@ updates:
1419
directory: /tools/eslint
1520
schedule:
1621
interval: monthly
22+
cooldown:
23+
- semver-major-days: 5
24+
- semver-minor-days: 5
25+
- semver-patch-days: 5
1726
commit-message:
1827
prefix: tools
1928
open-pull-requests-limit: ${{secrets.OPEN_PR_LIMIT}}
@@ -27,6 +36,10 @@ updates:
2736
directory: /tools/lint-md
2837
schedule:
2938
interval: monthly
39+
cooldown:
40+
- semver-major-days: 5
41+
- semver-minor-days: 5
42+
- semver-patch-days: 5
3043
commit-message:
3144
prefix: tools
3245
open-pull-requests-limit: ${{secrets.OPEN_PR_LIMIT}}
@@ -35,3 +48,20 @@ updates:
3548
applies-to: version-updates
3649
patterns:
3750
- '*'
51+
52+
- package-ecosystem: npm
53+
directory: /tools/doc
54+
schedule:
55+
interval: weekly
56+
cooldown:
57+
- semver-major-days: 5
58+
- semver-minor-days: 5
59+
- semver-patch-days: 5
60+
commit-message:
61+
prefix: tools
62+
open-pull-requests-limit: ${{secrets.OPEN_PR_LIMIT}}
63+
groups:
64+
doc:
65+
applies-to: version-updates
66+
patterns:
67+
- '*'

‎.github/workflows/tools.yml‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ on:
2121
- c-ares
2222
- cjs-module-lexer
2323
- corepack
24-
- doc
2524
- googletest
2625
- gyp-next
2726
- histogram
@@ -118,22 +117,6 @@ jobs:
118117
run: |
119118
make corepack-update
120119
echo "NEW_VERSION=$(node deps/corepack/dist/corepack.js --version)" >> $GITHUB_ENV
121-
- id: doc
122-
subsystem: tools
123-
label: tools
124-
run: |
125-
cd tools/doc
126-
npm ci
127-
NEW_VERSION=$(npm outdated --parseable | cut -d: -f4 | xargs)
128-
if [ "$NEW_VERSION" != "" ]; then
129-
echo "NEW_VERSION=new version" >> $GITHUB_ENV
130-
rm -rf package-lock.json node_modules
131-
# Include $NEW_VERSION to explicitly update the package.json
132-
# entry for the dependency and also so that semver-major updates
133-
# are not skipped.
134-
npm install --ignore-scripts $NEW_VERSION
135-
npm install --ignore-scripts
136-
fi
137120
- id: googletest
138121
subsystem: deps
139122
label: dependencies, test

‎deps/amaro/dist/index.js‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎deps/amaro/dist/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"강동윤 <[email protected]>"
55
],
66
"description": "wasm module for swc",
7-
"version": "1.13.5",
7+
"version": "1.13.20",
88
"license": "Apache-2.0",
99
"repository": {
1010
"type": "git",

‎deps/amaro/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "amaro",
3-
"version": "1.1.2",
3+
"version": "1.1.4",
44
"description": "Node.js TypeScript wrapper",
55
"license": "MIT",
66
"type": "commonjs",

‎deps/nghttp2/nghttp2.gyp‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,17 @@
6767
'sources': [
6868
'<@(nghttp2_sources)',
6969
]
70+
},
71+
{
72+
'target_name': 'sfparse',
73+
'type': 'static_library',
74+
'include_dirs': ['lib'],
75+
'sources': [
76+
'lib/sfparse.c',
77+
],
78+
'direct_dependent_settings': {
79+
'include_dirs': [ 'lib/includes' ]
80+
}
7081
}
7182
]
7283
}

‎deps/ngtcp2/ngtcp2.gyp‎

Lines changed: 146 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,36 @@
8787
'nghttp3/lib/nghttp3_unreachable.c',
8888
'nghttp3/lib/nghttp3_vec.c',
8989
'nghttp3/lib/nghttp3_version.c',
90+
],
91+
'ngtcp2_test_server_sources': [
92+
'ngtcp2/examples/tls_server_session_ossl.cc',
93+
'ngtcp2/examples/tls_server_context_ossl.cc',
94+
'ngtcp2/examples/tls_session_base_ossl.cc',
95+
'ngtcp2/examples/util_openssl.cc',
96+
'ngtcp2/examples/http.cc',
97+
'ngtcp2/examples/server_base.cc',
98+
'ngtcp2/examples/shared.cc',
99+
'ngtcp2/examples/server.cc',
100+
'ngtcp2/examples/util.cc',
101+
'ngtcp2/examples/debug.cc',
102+
'ngtcp2/examples/siphash.cc',
103+
'ngtcp2/third-party/urlparse/urlparse.c',
104+
'ngtcp2/third-party/libev/ev.c',
105+
],
106+
'ngtcp2_test_client_sources': [
107+
'ngtcp2/examples/tls_client_session_ossl.cc',
108+
'ngtcp2/examples/tls_client_context_ossl.cc',
109+
'ngtcp2/examples/tls_session_base_ossl.cc',
110+
'ngtcp2/examples/util_openssl.cc',
111+
'ngtcp2/examples/http.cc',
112+
'ngtcp2/examples/client_base.cc',
113+
'ngtcp2/examples/shared.cc',
114+
'ngtcp2/examples/client.cc',
115+
'ngtcp2/examples/util.cc',
116+
'ngtcp2/examples/debug.cc',
117+
'ngtcp2/examples/siphash.cc',
118+
'ngtcp2/third-party/urlparse/urlparse.c',
119+
'ngtcp2/third-party/libev/ev.c',
90120
]
91121
},
92122
'targets': [
@@ -131,19 +161,6 @@
131161
'HAVE_NETINET_IN_H',
132162
],
133163
}],
134-
# TODO: Support OpenSSL 3.5 shared library builds.
135-
# The complexity here is that we need to use the ngtcp2 ossl
136-
# adapter, which does not include any conditional checks to
137-
# see if the version of OpenSSL used has the necessary QUIC
138-
# APIs, so we need to ensure that we conditionally enable use
139-
# of the adapter only when we know that the OpenSSL version we
140-
# are compiling against has the necessary APIs. We can do that
141-
# by checkig the OpenSSL version number but, currently, the
142-
# code that does so checks only the VERSION.dat file that is
143-
# bundled with the openssl dependency. We'll need to update
144-
# that to support the shared library case, where the version
145-
# of the shared library needs to be determined.
146-
#
147164
# TODO: Support Boringssl here also. ngtcp2 provides an adapter
148165
# for Boringssl. If we can detect that boringssl is being used
149166
# here then we can use that adapter and also set the
@@ -225,6 +242,122 @@
225242
'sources': [
226243
'<@(nghttp3_sources)'
227244
]
245+
},
246+
{
247+
'target_name': 'ngtcp2_test_server',
248+
'type': 'executable',
249+
'cflags': [ '-Wno-everything' ],
250+
'include_dirs': [
251+
'',
252+
'ngtcp2/examples/',
253+
'ngtcp2/lib/includes/',
254+
'ngtcp2/crypto/includes/',
255+
'ngtcp2/third-party/urlparse/',
256+
'ngtcp2/third-party/libev/',
257+
'../../nghttp2/lib',
258+
],
259+
'dependencies': [
260+
'ngtcp2',
261+
'nghttp3',
262+
'../openssl/openssl.gyp:openssl',
263+
'../nghttp2/nghttp2.gyp:sfparse',
264+
],
265+
'defines': [
266+
'HAVE_CONFIG_H',
267+
'WITH_EXAMPLE_OSSL',
268+
'EV_STANDALONE=1',
269+
'HAVE_UNISTD_H',
270+
'HAVE_ARPA_INET_H',
271+
'HAVE_NETINET_IN_H',
272+
'HAVE_NETINET_IP_H',
273+
],
274+
'conditions': [
275+
['OS=="aix" or OS=="win"', {
276+
# AIX does not support some of the networking features used in
277+
# the test server. Windows also lacks the Unix-specific headers
278+
# and system calls required by the ngtcp2 examples.
279+
'type': 'none', # Disable as executable on AIX and Windows
280+
}],
281+
['OS=="mac"', {
282+
'defines': [
283+
'__APPLE_USE_RFC_3542',
284+
]
285+
}],
286+
['OS=="solaris"', {
287+
'defines': [
288+
'IPTOS_ECN_MASK=0x03',
289+
],
290+
'link_settings': {
291+
'libraries': [ '-lsocket', '-lnsl' ],
292+
},
293+
}],
294+
[ 'OS=="linux" or OS=="openharmony"', {
295+
'link_settings': {
296+
'libraries': [ '-ldl', '-lrt' ],
297+
},
298+
}],
299+
],
300+
'sources': [
301+
'<@(ngtcp2_test_server_sources)'
302+
]
303+
},
304+
{
305+
'target_name': 'ngtcp2_test_client',
306+
'type': 'executable',
307+
'cflags': [ '-Wno-everything' ],
308+
'include_dirs': [
309+
'',
310+
'ngtcp2/examples/',
311+
'ngtcp2/lib/includes/',
312+
'ngtcp2/crypto/includes/',
313+
'ngtcp2/third-party/urlparse/',
314+
'ngtcp2/third-party/libev/',
315+
'../../nghttp2/lib',
316+
],
317+
'dependencies': [
318+
'ngtcp2',
319+
'nghttp3',
320+
'../openssl/openssl.gyp:openssl',
321+
'../nghttp2/nghttp2.gyp:sfparse',
322+
],
323+
'defines': [
324+
'HAVE_CONFIG_H',
325+
'WITH_EXAMPLE_OSSL',
326+
'EV_STANDALONE=1',
327+
'HAVE_UNISTD_H',
328+
'HAVE_ARPA_INET_H',
329+
'HAVE_NETINET_IN_H',
330+
'HAVE_NETINET_IP_H',
331+
],
332+
'conditions': [
333+
['OS=="aix" or OS=="win"', {
334+
# AIX does not support some of the networking features used in
335+
# the test client. Windows also lacks the Unix-specific headers
336+
# and system calls required by the ngtcp2 examples.
337+
'type': 'none', # Disable as executable on AIX and Windows
338+
}],
339+
['OS=="mac"', {
340+
'defines': [
341+
'__APPLE_USE_RFC_3542',
342+
]
343+
}],
344+
['OS=="solaris"', {
345+
'defines': [
346+
'IPTOS_ECN_MASK=0x03',
347+
],
348+
'link_settings': {
349+
'libraries': [ '-lsocket', '-lnsl' ],
350+
},
351+
}],
352+
[ 'OS=="linux" or OS=="openharmony"', {
353+
'link_settings': {
354+
'libraries': [ '-ldl', '-lrt' ],
355+
},
356+
}],
357+
],
358+
'sources': [
359+
'<@(ngtcp2_test_client_sources)'
360+
]
228361
}
229362
]
230363
}

0 commit comments

Comments
 (0)