Skip to content

Commit f76b323

Browse files
authored
Merge branch 'nodejs:main' into alsh/node_embedding_api
2 parents acf16cd + a822a1c commit f76b323

File tree

215 files changed

+5915
-5058
lines changed

Some content is hidden

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

215 files changed

+5915
-5058
lines changed

.github/codeql-config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ name: CodeQL config
33
paths-ignore:
44
- test
55
- deps/v8/test
6+
- deps/v8/tools

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
Select a Node.js version below to view the changelog history:
44

5+
* [Node.js 24](doc/changelogs/CHANGELOG_V24.md) **Current**
56
* [Node.js 23](doc/changelogs/CHANGELOG_V23.md) **Current**
67
* [Node.js 22](doc/changelogs/CHANGELOG_V22.md) **Long Term Support**
78
* [Node.js 21](doc/changelogs/CHANGELOG_V21.md) End-of-Life
@@ -32,12 +33,17 @@ release.
3233

3334
<table>
3435
<tr>
36+
<th title="Current"><a href="doc/changelogs/CHANGELOG_V24.md">24</a> (Current)</th>
3537
<th title="Current"><a href="doc/changelogs/CHANGELOG_V23.md">23</a> (Current)</th>
3638
<th title="LTS Until 2027-04"><a href="doc/changelogs/CHANGELOG_V22.md">22</a> (LTS)</th>
3739
<th title="LTS Until 2026-04"><a href="doc/changelogs/CHANGELOG_V20.md">20</a> (LTS)</th>
3840
</tr>
3941
<tr>
4042
<td valign="top">
43+
<b><a href="doc/changelogs/CHANGELOG_V24.md#24.0.1">24.0.1</a></b><br/>
44+
<a href="doc/changelogs/CHANGELOG_V24.md#24.0.0">24.0.0</a><br/>
45+
</td>
46+
<td valign="top">
4147
<b><a href="doc/changelogs/CHANGELOG_V23.md#23.11.0">23.11.0</a></b><br/>
4248
<a href="doc/changelogs/CHANGELOG_V23.md#23.10.0">23.10.0</a><br/>
4349
<a href="doc/changelogs/CHANGELOG_V23.md#23.9.0">23.9.0</a><br/>

Makefile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -509,16 +509,24 @@ SQLITE_BINDING_SOURCES := \
509509
$(wildcard test/sqlite/*/*.c)
510510

511511
# Implicitly depends on $(NODE_EXE), see the build-sqlite-tests rule for rationale.
512+
ifndef NOSQLITE
512513
test/sqlite/.buildstamp: $(ADDONS_PREREQS) \
513514
$(SQLITE_BINDING_GYPS) $(SQLITE_BINDING_SOURCES)
514515
@$(call run_build_addons,"$$PWD/test/sqlite",$@)
516+
else
517+
test/sqlite/.buildstamp:
518+
endif
515519

516520
.PHONY: build-sqlite-tests
521+
ifndef NOSQLITE
517522
# .buildstamp needs $(NODE_EXE) but cannot depend on it
518523
# directly because it calls make recursively. The parent make cannot know
519524
# if the subprocess touched anything so it pessimistically assumes that
520525
# .buildstamp is out of date and need a rebuild.
521526
build-sqlite-tests: | $(NODE_EXE) test/sqlite/.buildstamp ## Build SQLite tests.
527+
else
528+
build-sqlite-tests:
529+
endif
522530

523531
.PHONY: clear-stalled
524532
clear-stalled: ## Clear any stalled processes.

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -755,6 +755,8 @@ maintaining the Node.js project.
755755
**Gireesh Punathil** <<[email protected]>> (he/him)
756756
* [gurgunday](https://github.com/gurgunday) -
757757
**Gürgün Dayıoğlu** <<[email protected]>>
758+
* [HBSPS](https://github.com/HBSPS) -
759+
**Wiyeong Seo** <<[email protected]>>
758760
* [iam-frankqiu](https://github.com/iam-frankqiu) -
759761
**Frank Qiu** <<[email protected]>> (he/him)
760762
* [KevinEady](https://github.com/KevinEady) -

benchmark/es/error-stack.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const bench = common.createBenchmark(main, {
1010
'without-sourcemap',
1111
'sourcemap',
1212
'node-modules-without-sourcemap',
13-
'node-module-sourcemap'],
13+
'node-modules-sourcemap'],
1414
n: [1e5],
1515
});
1616

common.gypi

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
# Reset this number to 0 on major V8 upgrades.
4040
# Increment by one for each non-official patch applied to deps/v8.
41-
'v8_embedder_string': '-node.10',
41+
'v8_embedder_string': '-node.16',
4242

4343
##### V8 defaults for Node.js #####
4444

@@ -276,6 +276,9 @@
276276
# Defines these mostly for node-gyp to pickup.
277277
'defines': [
278278
'_GLIBCXX_USE_CXX11_ABI=1',
279+
# This help forks when building Node.js on a 32-bit arch as
280+
# libuv is always compiled with _FILE_OFFSET_BITS=64
281+
'_FILE_OFFSET_BITS=64'
279282
],
280283

281284
# Forcibly disable -Werror. We support a wide range of compilers, it's

configure.py

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -864,6 +864,12 @@
864864
default=None,
865865
help='build without NODE_OPTIONS support')
866866

867+
parser.add_argument('--without-sqlite',
868+
action='store_true',
869+
dest='without_sqlite',
870+
default=None,
871+
help='build without SQLite (disables SQLite and Web Stoage API)')
872+
867873
parser.add_argument('--ninja',
868874
action='store_true',
869875
dest='use_ninja',
@@ -1816,6 +1822,16 @@ def without_ssl_error(option):
18161822

18171823
configure_library('openssl', o)
18181824

1825+
def configure_sqlite(o):
1826+
o['variables']['node_use_sqlite'] = b(not options.without_sqlite)
1827+
if options.without_sqlite:
1828+
def without_sqlite_error(option):
1829+
error(f'--without-sqlite is incompatible with {option}')
1830+
if options.shared_sqlite:
1831+
without_sqlite_error('--shared-sqlite')
1832+
return
1833+
1834+
configure_library('sqlite', o, pkgname='sqlite3')
18191835

18201836
def configure_static(o):
18211837
if options.fully_static or options.partly_static:
@@ -2259,7 +2275,7 @@ def make_bin_override():
22592275
configure_library('nghttp2', output, pkgname='libnghttp2')
22602276
configure_library('nghttp3', output, pkgname='libnghttp3')
22612277
configure_library('ngtcp2', output, pkgname='libngtcp2')
2262-
configure_library('sqlite', output, pkgname='sqlite3')
2278+
configure_sqlite(output);
22632279
configure_library('uvwasi', output, pkgname='libuvwasi')
22642280
configure_library('zstd', output, pkgname='libzstd')
22652281
configure_v8(output, configurations)

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.11.21",
7+
"version": "1.11.24",
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.5.2",
3+
"version": "0.5.3",
44
"description": "Node.js TypeScript wrapper",
55
"license": "MIT",
66
"type": "commonjs",

0 commit comments

Comments
 (0)