Skip to content

Commit 42c165f

Browse files
Merge pull request #1019 from nodejs/main
Create a new pull request by comparing changes across two branches
2 parents 434e4c4 + 628469c commit 42c165f

Some content is hidden

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

73 files changed

+2021
-522
lines changed

.github/workflows/tools.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,23 +85,23 @@ jobs:
8585
rm temp-output
8686
- id: amaro
8787
subsystem: deps
88-
label: dependencies
88+
label: dependencies, strip-types
8989
run: |
9090
./tools/dep_updaters/update-amaro.sh > temp-output
9191
cat temp-output
9292
tail -n1 temp-output | grep "NEW_VERSION=" >> "$GITHUB_ENV" || true
9393
rm temp-output
9494
- id: brotli
9595
subsystem: deps
96-
label: dependencies
96+
label: dependencies, zlib
9797
run: |
9898
./tools/dep_updaters/update-brotli.sh > temp-output
9999
cat temp-output
100100
tail -n1 temp-output | grep "NEW_VERSION=" >> "$GITHUB_ENV" || true
101101
rm temp-output
102102
- id: c-ares
103103
subsystem: deps
104-
label: dependencies
104+
label: dependencies, cares
105105
run: |
106106
./tools/dep_updaters/update-c-ares.sh > temp-output
107107
cat temp-output
@@ -163,7 +163,7 @@ jobs:
163163
rm temp-output
164164
- id: gyp-next
165165
subsystem: tools
166-
label: tools
166+
label: tools, gyp
167167
run: |
168168
./tools/dep_updaters/update-gyp-next.sh > temp-output
169169
cat temp-output
@@ -179,7 +179,7 @@ jobs:
179179
rm temp-output
180180
- id: icu
181181
subsystem: deps
182-
label: dependencies, test
182+
label: dependencies, test, icu
183183
run: |
184184
./tools/dep_updaters/update-icu.sh > temp-output
185185
cat temp-output
@@ -293,7 +293,7 @@ jobs:
293293
rm temp-output
294294
- id: sqlite
295295
subsystem: deps
296-
label: dependencies
296+
label: dependencies, sqlite
297297
run: |
298298
./tools/dep_updaters/update-sqlite.sh > temp-output
299299
cat temp-output
@@ -317,7 +317,7 @@ jobs:
317317
rm temp-output
318318
- id: zlib
319319
subsystem: deps
320-
label: dependencies
320+
label: dependencies, zlib
321321
run: |
322322
./tools/dep_updaters/update-zlib.sh > temp-output
323323
cat temp-output

.github/workflows/update-openssl.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
body: This is an automated update of OpenSSL to ${{ env.NEW_VERSION }}.
3737
branch: actions/tools-update-openssl # Custom branch *just* for this Action.
3838
commit-message: 'deps: upgrade openssl sources to quictls/openssl-${{ env.NEW_VERSION }}'
39-
labels: dependencies
39+
labels: dependencies, openssl
4040
title: 'deps: update OpenSSL to ${{ env.NEW_VERSION }}'
4141
path: deps/openssl
4242
update-pull-request-title-and-body: true

.github/workflows/update-v8.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,4 @@ jobs:
5454
delete-branch: true
5555
title: 'deps: patch V8 to ${{ env.NEW_VERSION }}'
5656
body: This is an automated patch update of V8 to ${{ env.NEW_VERSION }}.
57-
labels: v8 engine
57+
labels: dependencies, v8 engine

CHANGELOG.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ release.
3838
</tr>
3939
<tr>
4040
<td valign="top">
41-
<b><a href="doc/changelogs/CHANGELOG_V22.md#22.6.0">22.6.0</a></b><br/>
41+
<b><a href="doc/changelogs/CHANGELOG_V22.md#22.7.0">22.7.0</a></b><br/>
42+
<a href="doc/changelogs/CHANGELOG_V22.md#22.6.0">22.6.0</a><br/>
4243
<a href="doc/changelogs/CHANGELOG_V22.md#22.5.1">22.5.1</a><br/>
4344
<a href="doc/changelogs/CHANGELOG_V22.md#22.5.0">22.5.0</a><br/>
4445
<a href="doc/changelogs/CHANGELOG_V22.md#22.4.1">22.4.1</a><br/>
@@ -64,7 +65,8 @@ release.
6465
<a href="doc/changelogs/CHANGELOG_V21.md#21.0.0">21.0.0</a><br/>
6566
</td>
6667
<td valign="top">
67-
<b><a href="doc/changelogs/CHANGELOG_V20.md#20.16.0">20.16.0</a></b><br/>
68+
<b><a href="doc/changelogs/CHANGELOG_V20.md#20.17.0">20.17.0</a></b><br/>
69+
<a href="doc/changelogs/CHANGELOG_V20.md#20.16.0">20.16.0</a><br/>
6870
<a href="doc/changelogs/CHANGELOG_V20.md#20.15.1">20.15.1</a><br/>
6971
<a href="doc/changelogs/CHANGELOG_V20.md#20.15.0">20.15.0</a><br/>
7072
<a href="doc/changelogs/CHANGELOG_V20.md#20.14.0">20.14.0</a><br/>

LICENSE

Lines changed: 205 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,211 @@ The externally maintained libraries used by Node.js are:
155155
SOFTWARE.
156156
"""
157157

158+
- swc, located at deps/amaro, is licensed as follows:
159+
"""
160+
Apache License
161+
Version 2.0, January 2004
162+
http://www.apache.org/licenses/
163+
164+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
165+
166+
1. Definitions.
167+
168+
"License" shall mean the terms and conditions for use, reproduction,
169+
and distribution as defined by Sections 1 through 9 of this document.
170+
171+
"Licensor" shall mean the copyright owner or entity authorized by
172+
the copyright owner that is granting the License.
173+
174+
"Legal Entity" shall mean the union of the acting entity and all
175+
other entities that control, are controlled by, or are under common
176+
control with that entity. For the purposes of this definition,
177+
"control" means (i) the power, direct or indirect, to cause the
178+
direction or management of such entity, whether by contract or
179+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
180+
outstanding shares, or (iii) beneficial ownership of such entity.
181+
182+
"You" (or "Your") shall mean an individual or Legal Entity
183+
exercising permissions granted by this License.
184+
185+
"Source" form shall mean the preferred form for making modifications,
186+
including but not limited to software source code, documentation
187+
source, and configuration files.
188+
189+
"Object" form shall mean any form resulting from mechanical
190+
transformation or translation of a Source form, including but
191+
not limited to compiled object code, generated documentation,
192+
and conversions to other media types.
193+
194+
"Work" shall mean the work of authorship, whether in Source or
195+
Object form, made available under the License, as indicated by a
196+
copyright notice that is included in or attached to the work
197+
(an example is provided in the Appendix below).
198+
199+
"Derivative Works" shall mean any work, whether in Source or Object
200+
form, that is based on (or derived from) the Work and for which the
201+
editorial revisions, annotations, elaborations, or other modifications
202+
represent, as a whole, an original work of authorship. For the purposes
203+
of this License, Derivative Works shall not include works that remain
204+
separable from, or merely link (or bind by name) to the interfaces of,
205+
the Work and Derivative Works thereof.
206+
207+
"Contribution" shall mean any work of authorship, including
208+
the original version of the Work and any modifications or additions
209+
to that Work or Derivative Works thereof, that is intentionally
210+
submitted to Licensor for inclusion in the Work by the copyright owner
211+
or by an individual or Legal Entity authorized to submit on behalf of
212+
the copyright owner. For the purposes of this definition, "submitted"
213+
means any form of electronic, verbal, or written communication sent
214+
to the Licensor or its representatives, including but not limited to
215+
communication on electronic mailing lists, source code control systems,
216+
and issue tracking systems that are managed by, or on behalf of, the
217+
Licensor for the purpose of discussing and improving the Work, but
218+
excluding communication that is conspicuously marked or otherwise
219+
designated in writing by the copyright owner as "Not a Contribution."
220+
221+
"Contributor" shall mean Licensor and any individual or Legal Entity
222+
on behalf of whom a Contribution has been received by Licensor and
223+
subsequently incorporated within the Work.
224+
225+
2. Grant of Copyright License. Subject to the terms and conditions of
226+
this License, each Contributor hereby grants to You a perpetual,
227+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
228+
copyright license to reproduce, prepare Derivative Works of,
229+
publicly display, publicly perform, sublicense, and distribute the
230+
Work and such Derivative Works in Source or Object form.
231+
232+
3. Grant of Patent License. Subject to the terms and conditions of
233+
this License, each Contributor hereby grants to You a perpetual,
234+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
235+
(except as stated in this section) patent license to make, have made,
236+
use, offer to sell, sell, import, and otherwise transfer the Work,
237+
where such license applies only to those patent claims licensable
238+
by such Contributor that are necessarily infringed by their
239+
Contribution(s) alone or by combination of their Contribution(s)
240+
with the Work to which such Contribution(s) was submitted. If You
241+
institute patent litigation against any entity (including a
242+
cross-claim or counterclaim in a lawsuit) alleging that the Work
243+
or a Contribution incorporated within the Work constitutes direct
244+
or contributory patent infringement, then any patent licenses
245+
granted to You under this License for that Work shall terminate
246+
as of the date such litigation is filed.
247+
248+
4. Redistribution. You may reproduce and distribute copies of the
249+
Work or Derivative Works thereof in any medium, with or without
250+
modifications, and in Source or Object form, provided that You
251+
meet the following conditions:
252+
253+
(a) You must give any other recipients of the Work or
254+
Derivative Works a copy of this License; and
255+
256+
(b) You must cause any modified files to carry prominent notices
257+
stating that You changed the files; and
258+
259+
(c) You must retain, in the Source form of any Derivative Works
260+
that You distribute, all copyright, patent, trademark, and
261+
attribution notices from the Source form of the Work,
262+
excluding those notices that do not pertain to any part of
263+
the Derivative Works; and
264+
265+
(d) If the Work includes a "NOTICE" text file as part of its
266+
distribution, then any Derivative Works that You distribute must
267+
include a readable copy of the attribution notices contained
268+
within such NOTICE file, excluding those notices that do not
269+
pertain to any part of the Derivative Works, in at least one
270+
of the following places: within a NOTICE text file distributed
271+
as part of the Derivative Works; within the Source form or
272+
documentation, if provided along with the Derivative Works; or,
273+
within a display generated by the Derivative Works, if and
274+
wherever such third-party notices normally appear. The contents
275+
of the NOTICE file are for informational purposes only and
276+
do not modify the License. You may add Your own attribution
277+
notices within Derivative Works that You distribute, alongside
278+
or as an addendum to the NOTICE text from the Work, provided
279+
that such additional attribution notices cannot be construed
280+
as modifying the License.
281+
282+
You may add Your own copyright statement to Your modifications and
283+
may provide additional or different license terms and conditions
284+
for use, reproduction, or distribution of Your modifications, or
285+
for any such Derivative Works as a whole, provided Your use,
286+
reproduction, and distribution of the Work otherwise complies with
287+
the conditions stated in this License.
288+
289+
5. Submission of Contributions. Unless You explicitly state otherwise,
290+
any Contribution intentionally submitted for inclusion in the Work
291+
by You to the Licensor shall be under the terms and conditions of
292+
this License, without any additional terms or conditions.
293+
Notwithstanding the above, nothing herein shall supersede or modify
294+
the terms of any separate license agreement you may have executed
295+
with Licensor regarding such Contributions.
296+
297+
6. Trademarks. This License does not grant permission to use the trade
298+
names, trademarks, service marks, or product names of the Licensor,
299+
except as required for reasonable and customary use in describing the
300+
origin of the Work and reproducing the content of the NOTICE file.
301+
302+
7. Disclaimer of Warranty. Unless required by applicable law or
303+
agreed to in writing, Licensor provides the Work (and each
304+
Contributor provides its Contributions) on an "AS IS" BASIS,
305+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
306+
implied, including, without limitation, any warranties or conditions
307+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
308+
PARTICULAR PURPOSE. You are solely responsible for determining the
309+
appropriateness of using or redistributing the Work and assume any
310+
risks associated with Your exercise of permissions under this License.
311+
312+
8. Limitation of Liability. In no event and under no legal theory,
313+
whether in tort (including negligence), contract, or otherwise,
314+
unless required by applicable law (such as deliberate and grossly
315+
negligent acts) or agreed to in writing, shall any Contributor be
316+
liable to You for damages, including any direct, indirect, special,
317+
incidental, or consequential damages of any character arising as a
318+
result of this License or out of the use or inability to use the
319+
Work (including but not limited to damages for loss of goodwill,
320+
work stoppage, computer failure or malfunction, or any and all
321+
other commercial damages or losses), even if such Contributor
322+
has been advised of the possibility of such damages.
323+
324+
9. Accepting Warranty or Additional Liability. While redistributing
325+
the Work or Derivative Works thereof, You may choose to offer,
326+
and charge a fee for, acceptance of support, warranty, indemnity,
327+
or other liability obligations and/or rights consistent with this
328+
License. However, in accepting such obligations, You may act only
329+
on Your own behalf and on Your sole responsibility, not on behalf
330+
of any other Contributor, and only if You agree to indemnify,
331+
defend, and hold each Contributor harmless for any liability
332+
incurred by, or claims asserted against, such Contributor by reason
333+
of your accepting any such warranty or additional liability.
334+
335+
END OF TERMS AND CONDITIONS
336+
337+
APPENDIX: How to apply the Apache License to your work.
338+
339+
To apply the Apache License to your work, attach the following
340+
boilerplate notice, with the fields enclosed by brackets "[]"
341+
replaced with your own identifying information. (Don't include
342+
the brackets!) The text should be enclosed in the appropriate
343+
comment syntax for the file format. We also recommend that a
344+
file or class name and description of purpose be included on the
345+
same "printed page" as the copyright notice for easier
346+
identification within third-party archives.
347+
348+
Copyright 2024 SWC contributors.
349+
350+
Licensed under the Apache License, Version 2.0 (the "License");
351+
you may not use this file except in compliance with the License.
352+
You may obtain a copy of the License at
353+
354+
http://www.apache.org/licenses/LICENSE-2.0
355+
356+
Unless required by applicable law or agreed to in writing, software
357+
distributed under the License is distributed on an "AS IS" BASIS,
358+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
359+
See the License for the specific language governing permissions and
360+
limitations under the License.
361+
"""
362+
158363
- ICU, located at deps/icu-small, is licensed as follows:
159364
"""
160365
UNICODE LICENSE V3

deps/amaro/dist/index.js

Lines changed: 2 additions & 2 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.7.11",
7+
"version": "1.7.14",
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": "0.1.6",
3+
"version": "0.1.7",
44
"description": "Node.js TypeScript wrapper",
55
"license": "MIT",
66
"type": "commonjs",

0 commit comments

Comments
 (0)