Skip to content

Commit 2d480a1

Browse files
authored
Update Node.js to LTS 22.16.0. (#1563)
This matches the minimum OS requirements set of macOS 11.0 and Windows 10: https://github.com/nodejs/node/blob/v22.x/BUILDING.md#platform-list
1 parent cfe7ccf commit 2d480a1

File tree

4 files changed

+63
-13
lines changed

4 files changed

+63
-13
lines changed

docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ COPY --from=stage_build /emsdk /emsdk
6363
# using `--entrypoint /bin/bash` in CLI).
6464
# This corresponds to the env variables set during: `source ./emsdk_env.sh`
6565
ENV EMSDK=/emsdk \
66-
PATH="/emsdk:/emsdk/upstream/emscripten:/emsdk/node/20.18.0_64bit/bin:${PATH}"
66+
PATH="/emsdk:/emsdk/upstream/emscripten:/emsdk/node/22.16.0_64bit/bin:${PATH}"
6767

6868
# ------------------------------------------------------------------------------
6969
# Create a 'standard` 1000:1000 user

emsdk_manifest.json

Lines changed: 57 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,56 @@
156156
},
157157

158158

159+
{
160+
"id": "node",
161+
"version": "22.16.0",
162+
"bitness": 32,
163+
"arch": "x86",
164+
"windows_url": "node-v22.16.0-win-x86.zip",
165+
"activated_path": "%installation_dir%/bin",
166+
"activated_path_skip": "node",
167+
"activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'",
168+
"activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%"
169+
},
170+
{
171+
"id": "node",
172+
"version": "22.16.0",
173+
"arch": "arm",
174+
"bitness": 32,
175+
"linux_url": "node-v22.16.0-linux-armv7l.tar.xz",
176+
"activated_path": "%installation_dir%/bin",
177+
"activated_path_skip": "node",
178+
"activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'",
179+
"activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%"
180+
},
181+
{
182+
"id": "node",
183+
"version": "22.16.0",
184+
"bitness": 64,
185+
"arch": "x86_64",
186+
"windows_url": "node-v22.16.0-win-x64.zip",
187+
"macos_url": "node-v22.16.0-darwin-x64.tar.gz",
188+
"linux_url": "node-v22.16.0-linux-x64.tar.xz",
189+
"activated_path": "%installation_dir%/bin",
190+
"activated_path_skip": "node",
191+
"activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'",
192+
"activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%"
193+
},
194+
{
195+
"id": "node",
196+
"version": "22.16.0",
197+
"arch": "arm64",
198+
"bitness": 64,
199+
"windows_url": "node-v22.16.0-win-arm64.zip",
200+
"macos_url": "node-v22.16.0-darwin-arm64.tar.gz",
201+
"linux_url": "node-v22.16.0-linux-arm64.tar.xz",
202+
"activated_path": "%installation_dir%/bin",
203+
"activated_path_skip": "node",
204+
"activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'",
205+
"activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%"
206+
},
207+
208+
159209
{
160210
"id": "python",
161211
"version": "3.9.2-nuget",
@@ -388,19 +438,19 @@
388438
{
389439
"version": "main",
390440
"bitness": 64,
391-
"uses": ["python-3.13.3-64bit", "llvm-git-main-64bit", "node-20.18.0-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
441+
"uses": ["python-3.13.3-64bit", "llvm-git-main-64bit", "node-22.16.0-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
392442
"os": "win"
393443
},
394444
{
395445
"version": "main",
396446
"bitness": 64,
397-
"uses": ["python-3.13.3-64bit", "llvm-git-main-64bit", "node-20.18.0-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
447+
"uses": ["python-3.13.3-64bit", "llvm-git-main-64bit", "node-22.16.0-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
398448
"os": "macos"
399449
},
400450
{
401451
"version": "main",
402452
"bitness": 64,
403-
"uses": ["llvm-git-main-64bit", "node-20.18.0-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
453+
"uses": ["llvm-git-main-64bit", "node-22.16.0-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
404454
"os": "linux"
405455
},
406456
{
@@ -412,30 +462,30 @@
412462
{
413463
"version": "releases-%releases-tag%",
414464
"bitness": 64,
415-
"uses": ["node-20.18.0-64bit", "releases-%releases-tag%-64bit"],
465+
"uses": ["node-22.16.0-64bit", "releases-%releases-tag%-64bit"],
416466
"os": "linux",
417467
"custom_install_script": "emscripten_npm_install"
418468
},
419469
{
420470
"version": "releases-%releases-tag%",
421471
"bitness": 64,
422-
"uses": ["node-20.18.0-64bit", "python-3.13.3-64bit", "releases-%releases-tag%-64bit"],
472+
"uses": ["node-22.16.0-64bit", "python-3.13.3-64bit", "releases-%releases-tag%-64bit"],
423473
"os": "macos",
424474
"arch": "x86_64",
425475
"custom_install_script": "emscripten_npm_install"
426476
},
427477
{
428478
"version": "releases-%releases-tag%",
429479
"bitness": 64,
430-
"uses": ["node-20.18.0-64bit", "python-3.13.3-64bit", "releases-%releases-tag%-64bit"],
480+
"uses": ["node-22.16.0-64bit", "python-3.13.3-64bit", "releases-%releases-tag%-64bit"],
431481
"os": "macos",
432482
"arch": "arm64",
433483
"custom_install_script": "emscripten_npm_install"
434484
},
435485
{
436486
"version": "releases-%releases-tag%",
437487
"bitness": 64,
438-
"uses": ["node-20.18.0-64bit", "python-3.13.3-64bit", "releases-%releases-tag%-64bit"],
488+
"uses": ["node-22.16.0-64bit", "python-3.13.3-64bit", "releases-%releases-tag%-64bit"],
439489
"os": "win",
440490
"custom_install_script": "emscripten_npm_install"
441491
}

scripts/update_node.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
import shutil
1919
from zip import unzip_cmd, zip_cmd
2020

21-
version = '20.18.0'
22-
base = 'https://nodejs.org/dist/v20.18.0/'
21+
version = '22.16.0'
22+
base = f'https://nodejs.org/dist/v{version}/'
2323
upload_base = 'gs://webassembly/emscripten-releases-builds/deps/'
2424

2525
suffixes = [

test/test.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,9 +176,9 @@ def test_redownload(self):
176176

177177
# Test the normal tools like node don't re-download on re-install
178178
print('another install must re-download')
179-
checked_call_with_output(emsdk + ' uninstall node-20.18.0-64bit')
180-
checked_call_with_output(emsdk + ' install node-20.18.0-64bit', expected='Downloading:', unexpected='already installed')
181-
checked_call_with_output(emsdk + ' install node-20.18.0-64bit', unexpected='Downloading:', expected='already installed')
179+
checked_call_with_output(emsdk + ' uninstall node-22.16.0-64bit')
180+
checked_call_with_output(emsdk + ' install node-22.16.0-64bit', expected='Downloading:', unexpected='already installed')
181+
checked_call_with_output(emsdk + ' install node-22.16.0-64bit', unexpected='Downloading:', expected='already installed')
182182

183183
def test_tot_upstream(self):
184184
print('test update-tags')

0 commit comments

Comments
 (0)