Skip to content

Commit 8caf617

Browse files
authored
Merge branch 'main' into sqlite-prepare-options
2 parents 9418cab + 637bda0 commit 8caf617

File tree

216 files changed

+5608
-1607
lines changed

Some content is hidden

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

216 files changed

+5608
-1607
lines changed

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ contact_links:
55
about: Please file an issue in our help repo.
66
- name: 📦 Have an issue with npm?
77
url: https://github.com/npm/cli/issues
8-
about: npm has a seperate issue tracker.
8+
about: npm has a separate issue tracker.
99
- name: 📡 Have an issue with undici? (`WebSocket`, `fetch`, etc.)
1010
url: https://github.com/nodejs/undici/issues
11-
about: Undici has a seperate issue tracker.
11+
about: Undici has a separate issue tracker.
1212
- name: 🌐 Found a problem with nodejs.org beyond the API reference docs?
1313
url: https://github.com/nodejs/nodejs.org/issues/new/choose
1414
about: Please file an issue in the Node.js website repo.

Makefile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,6 @@ coverage-report-js: ## Report JavaScript coverage results.
301301

302302
cctest: all ## Run the C++ tests using the built `cctest` executable.
303303
@out/$(BUILDTYPE)/$@ --gtest_filter=$(GTEST_FILTER)
304-
'$(OUT_NODE)' ./test/embedding/test-embedding.js
305304

306305
.PHONY: list-gtests
307306
list-gtests: ## List all available C++ gtests.
@@ -571,7 +570,7 @@ test-all-suites: | clear-stalled test-build bench-addons-build doc-only ## Run a
571570
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) test/*
572571

573572
JS_SUITES ?= default
574-
NATIVE_SUITES ?= addons js-native-api node-api
573+
NATIVE_SUITES ?= addons js-native-api node-api embedding
575574
# CI_* variables should be kept synchronized with the ones in vcbuild.bat
576575
CI_NATIVE_SUITES ?= $(NATIVE_SUITES) benchmark
577576
CI_JS_SUITES ?= $(JS_SUITES) pummel
@@ -613,7 +612,6 @@ test-ci: | clear-stalled bench-addons-build build-addons build-js-native-api-tes
613612
$(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \
614613
--mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \
615614
$(TEST_CI_ARGS) $(CI_JS_SUITES) $(CI_NATIVE_SUITES) $(CI_DOC)
616-
'$(OUT_NODE)' ./test/embedding/test-embedding.js
617615
$(info Clean up any leftover processes, error if found.)
618616
ps awwx | grep Release/node | grep -v grep | cat
619617
@PS_OUT=`ps awwx | grep Release/node | grep -v grep | awk '{print $$1}'`; \

android-configure

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ command -v python3.13 >/dev/null && exec python3.13 "$0" "$@"
99
command -v python3.12 >/dev/null && exec python3.12 "$0" "$@"
1010
command -v python3.11 >/dev/null && exec python3.11 "$0" "$@"
1111
command -v python3.10 >/dev/null && exec python3.10 "$0" "$@"
12-
command -v python3.9 >/dev/null && exec python3.9 "$0" "$@"
1312
command -v python3 >/dev/null && exec python3 "$0" "$@"
1413
exec python "$0" "$@"
1514
''' "$0" "$@"
@@ -23,7 +22,7 @@ except ImportError:
2322
from distutils.spawn import find_executable as which
2423

2524
print('Node.js android configure: Found Python {}.{}.{}...'.format(*sys.version_info))
26-
acceptable_pythons = ((3, 14), (3, 13), (3, 12), (3, 11), (3, 10), (3, 9))
25+
acceptable_pythons = ((3, 14), (3, 13), (3, 12), (3, 11), (3, 10))
2726
if sys.version_info[:2] in acceptable_pythons:
2827
import android_configure
2928
else:

benchmark/napi/function_args/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Show the difference between calling a V8 binding C++ function
2-
// relative to a comparable N-API C++ function,
2+
// relative to a comparable Node-API C++ function,
33
// in various types/numbers of arguments.
44
// Reports n of calls per second.
55
'use strict';
@@ -19,7 +19,7 @@ try {
1919
try {
2020
napi = require(`./build/${common.buildType}/napi_binding`);
2121
} catch {
22-
console.error(`${__filename}: NAPI-Binding failed to load`);
22+
console.error(`${__filename}: Node-API binding failed to load`);
2323
process.exit(0);
2424
}
2525

benchmark/napi/function_call/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ let napi_binding;
2424
try {
2525
napi_binding = require(`./build/${common.buildType}/napi_binding`);
2626
} catch {
27-
console.error('misc/function_call/index.js NAPI-Binding failed to load');
27+
console.error('misc/function_call/index.js Node-API binding failed to load');
2828
process.exit(0);
2929
}
3030
const napi = napi_binding.hello;

configure

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ command -v python3.13 >/dev/null && exec python3.13 "$0" "$@"
99
command -v python3.12 >/dev/null && exec python3.12 "$0" "$@"
1010
command -v python3.11 >/dev/null && exec python3.11 "$0" "$@"
1111
command -v python3.10 >/dev/null && exec python3.10 "$0" "$@"
12-
command -v python3.9 >/dev/null && exec python3.9 "$0" "$@"
1312
command -v python3 >/dev/null && exec python3 "$0" "$@"
1413
exec python "$0" "$@"
1514
''' "$0" "$@"
@@ -23,7 +22,7 @@ except ImportError:
2322
from distutils.spawn import find_executable as which
2423

2524
print('Node.js configure: Found Python {}.{}.{}...'.format(*sys.version_info))
26-
acceptable_pythons = ((3, 14), (3, 13), (3, 12), (3, 11), (3, 10), (3, 9))
25+
acceptable_pythons = ((3, 14), (3, 13), (3, 12), (3, 11), (3, 10))
2726
if sys.version_info[:2] in acceptable_pythons:
2827
import configure
2928
else:

configure.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2409,7 +2409,7 @@ def make_bin_override():
24092409
if sys.platform == 'win32':
24102410
raise Exception('make_bin_override should not be called on win32.')
24112411
# If the system python is not the python we are running (which should be
2412-
# python 3.9+), then create a directory with a symlink called `python` to our
2412+
# python 3.10+), then create a directory with a symlink called `python` to our
24132413
# sys.executable. This directory will be prefixed to the PATH, so that
24142414
# other tools that shell out to `python` will use the appropriate python
24152415

deps/sqlite/sqlite.gyp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
'SQLITE_ENABLE_FTS5',
2222
'SQLITE_ENABLE_GEOPOLY',
2323
'SQLITE_ENABLE_MATH_FUNCTIONS',
24+
'SQLITE_ENABLE_PERCENTILE',
2425
'SQLITE_ENABLE_PREUPDATE_HOOK',
2526
'SQLITE_ENABLE_RBU',
2627
'SQLITE_ENABLE_RTREE',

0 commit comments

Comments
 (0)