Skip to content

Commit 27b3050

Browse files
authored
Bump min node version to 18.20.3 (#22010)
See emscripten-core/emsdk#1387 See emscripten-core/emsdk#1173
1 parent 182c4d8 commit 27b3050

13 files changed

+25
-22
lines changed

.circleci/config.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ orbs:
66
executors:
77
linux-node:
88
docker:
9-
- image: circleci/node:stretch
9+
- image: cimg/node:18.20.3
1010
linux-python:
1111
docker:
1212
- image: cimg/python:3.10.7
1313
bionic:
1414
docker:
15-
- image: emscripten/emscripten-ci
15+
- image: emscripten/emscripten-ci:focal
1616
environment:
1717
LANG: "C.UTF-8"
1818
EMCC_CORES: "4"
@@ -41,7 +41,7 @@ commands:
4141
name: download chrome
4242
command: |
4343
# TODO: Make these part of the base image
44-
apt-get install libu2f-udev libvulkan1
44+
apt-get install -q -y libu2f-udev libvulkan1 xdg-utils
4545
# wget -O ~/chrome.deb https://dl.google.com/linux/direct/google-chrome-beta_current_amd64.deb
4646
# If that download link breaks, temporarily use this URL instead:
4747
# wget -O ~/chrome.deb https://storage.googleapis.com/webassembly/chrome/google-chrome-stable_current_amd64.deb
@@ -170,7 +170,7 @@ commands:
170170
command: |
171171
./emcc --clear-cache
172172
- pip-install
173-
- run: apt-get install ninja-build
173+
- run: apt-get install -q -y ninja-build
174174
- run:
175175
name: embuilder build ALL
176176
command: |
@@ -791,7 +791,7 @@ jobs:
791791
environment:
792792
EMTEST_SKIP_NODE_CANARY: "1"
793793
steps:
794-
- run: apt-get install ninja-build scons
794+
- run: apt-get install -q -y ninja-build scons
795795
- run-tests-linux:
796796
# some native-dependent tests fail because of the lack of native
797797
# headers on emsdk-bundled clang

requirements-dev.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ sphinxcontrib-htmlhelp<=2.0.0
2525
sphinxcontrib-serializinghtml<=1.1.5
2626
sphinxcontrib-qthelp<=1.0.3
2727
alabaster<=0.7.12
28+
pygments==2.17.2
2829
# See https://github.com/readthedocs/readthedocs.org/issues/9038
2930
jinja2<3.1
3031

site/source/docs/tools_reference/settings_reference.rst

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2933,11 +2933,12 @@ MIN_NODE_VERSION
29332933

29342934
Specifies minimum node version to target for the generated code. This is
29352935
distinct from the minimum version required run the emscripten compiler.
2936-
This version aligns with the current Ubuuntu TLS 20.04 (Focal).
2937-
Version is encoded in MMmmVV, e.g. 181401 denotes Node 18.14.01.
2936+
This version aligns with the current Node LTS release, and the version
2937+
of node that is included with emsdk.
2938+
Version is encoded in MMmmVV, e.g. 181401 denotes Node 18.14.1.
29382939
Minimum supported value is 101900, which was released 2020-02-05.
29392940

2940-
Default value: 160000
2941+
Default value: 182003
29412942

29422943
.. _support_errno:
29432944

src/parseTools.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1059,8 +1059,8 @@ function getEntryFunction() {
10591059
}
10601060

10611061
function formattedMinNodeVersion() {
1062-
var major = MIN_NODE_VERSION / 10000;
1063-
var minor = (MIN_NODE_VERSION / 100) % 100;
1062+
var major = (MIN_NODE_VERSION / 10000) | 0;
1063+
var minor = ((MIN_NODE_VERSION / 100) | 0) % 100;
10641064
var rev = MIN_NODE_VERSION % 100;
10651065
return `v${major}.${minor}.${rev}`;
10661066
}

src/settings.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1905,10 +1905,11 @@ var MIN_CHROME_VERSION = 85;
19051905

19061906
// Specifies minimum node version to target for the generated code. This is
19071907
// distinct from the minimum version required run the emscripten compiler.
1908-
// This version aligns with the current Ubuuntu TLS 20.04 (Focal).
1909-
// Version is encoded in MMmmVV, e.g. 181401 denotes Node 18.14.01.
1908+
// This version aligns with the current Node LTS release, and the version
1909+
// of node that is included with emsdk.
1910+
// Version is encoded in MMmmVV, e.g. 181401 denotes Node 18.14.1.
19101911
// Minimum supported value is 101900, which was released 2020-02-05.
1911-
var MIN_NODE_VERSION = 160000;
1912+
var MIN_NODE_VERSION = 182003;
19121913

19131914
// Whether we support setting errno from JS library code.
19141915
// In MINIMAL_RUNTIME builds, this option defaults to 0.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8137
1+
8140
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
22013
1+
22014
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6721
1+
6725
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
18121
1+
18122
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
55520
1+
55521
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
54383
1+
54384

test/test_sanity.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,8 +284,8 @@ def test_node(self):
284284
for version, succeed in [('v0.8.0', False),
285285
('v4.1.0', False),
286286
('v10.18.0', False),
287-
('v16.20.0', True),
288-
('v16.20.1-pre', True),
287+
('v19.20.3', True),
288+
('v19.20.4-pre', True),
289289
('cheez', False)]:
290290
print(version, succeed)
291291
delete_file(SANITY_FILE)

tools/shared.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
# (settings.MIN_NODE_VERSION).
5959
# This version currently matches the node version that we ship with emsdk
6060
# which means that we can say for sure that this version is well supported.
61-
MINIMUM_NODE_VERSION = (16, 20, 0)
61+
MINIMUM_NODE_VERSION = (18, 20, 3)
6262
EXPECTED_LLVM_VERSION = 19
6363

6464
# These get set by setup_temp_dirs

0 commit comments

Comments
 (0)