From 70011205184c2aee2222c233c65e29e751a7a803 Mon Sep 17 00:00:00 2001 From: Moritz Kiefer Date: Mon, 17 Jan 2022 09:58:38 +0100 Subject: [PATCH] Upgrade to NodeJS 14 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit NodeJS 12 is eol in April and there are already packages (e.g. vsce) that dropped support. We probably should upgrade even further but for now I’m going with the most conservative approach. changelog_begin changelog_end --- .dadew | 2 +- WORKSPACE | 2 +- compatibility/WORKSPACE | 2 +- .../manifests/{nodejs-12.17.0.json => nodejs.json} | 14 +++++++------- nix/nixpkgs.nix | 2 +- release/RELEASE.md | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) rename dev-env/windows/manifests/{nodejs-12.17.0.json => nodejs.json} (73%) diff --git a/.dadew b/.dadew index 2470625ea454..ab1dd883f35c 100644 --- a/.dadew +++ b/.dadew @@ -9,7 +9,7 @@ "ojdkbuild11", "maven-3.6.1", "msys2", - "nodejs-12.17.0", + "nodejs", "nsis-3.04", "python-3.8.2", "stack", diff --git a/WORKSPACE b/WORKSPACE index 45095dd51fe8..f5ac0ff97500 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -712,7 +712,7 @@ dev_env_tool( ".", ], win_paths = [], - win_tool = "nodejs-12.17.0", + win_tool = "nodejs", ) # Setup the Node.js toolchain diff --git a/compatibility/WORKSPACE b/compatibility/WORKSPACE index 925644238450..9d2a03b541f3 100644 --- a/compatibility/WORKSPACE +++ b/compatibility/WORKSPACE @@ -236,7 +236,7 @@ dev_env_tool( ".", ], win_paths = [], - win_tool = "nodejs-12.17.0", + win_tool = "nodejs", ) node_repositories( diff --git a/dev-env/windows/manifests/nodejs-12.17.0.json b/dev-env/windows/manifests/nodejs.json similarity index 73% rename from dev-env/windows/manifests/nodejs-12.17.0.json rename to dev-env/windows/manifests/nodejs.json index aaa426d49af5..cb56b089c980 100644 --- a/dev-env/windows/manifests/nodejs-12.17.0.json +++ b/dev-env/windows/manifests/nodejs.json @@ -1,18 +1,18 @@ { "homepage": "https://nodejs.org", "description": "As an asynchronous event driven JavaScript runtime, Node is designed to build scalable network applications. (Long Term Support)", - "version": "12.17.0", + "version": "14.18.3", "license": "MIT", "architecture": { "64bit": { - "url": "https://nodejs.org/dist/v12.17.0/node-v12.17.0-win-x64.7z", - "hash": "1749c9dcfceb29ad0c6ffa447f86d96efec8f97823b3b5e17940de9043113ca3", - "extract_dir": "node-v12.17.0-win-x64" + "url": "https://nodejs.org/dist/v14.18.3/node-v14.18.3-win-x64.7z", + "hash": "456f3d26f900dbf0221b311884e81926b4aea96d75e57b30ab6cb142d05e10d9", + "extract_dir": "node-v14.18.3-win-x64" }, "32bit": { - "url": "https://nodejs.org/dist/v12.17.0/node-v12.17.0-win-x86.7z", - "hash": "d79026437e764fa090b562ca504dd6596601105b14fc564d54da4e23a1f52c06", - "extract_dir": "node-v12.17.0-win-x86" + "url": "https://nodejs.org/dist/v14.18.3/node-v14.18.3-win-x86.7z", + "hash": "a7ec2f7d8a5973869eebae31f24d859bfb363bb9df8ad19404ff28b84784c0e1", + "extract_dir": "node-v14.18.3-win-x86" } }, "persist": [ diff --git a/nix/nixpkgs.nix b/nix/nixpkgs.nix index 6f1017ae81e3..8a29bf7bdc14 100644 --- a/nix/nixpkgs.nix +++ b/nix/nixpkgs.nix @@ -8,7 +8,7 @@ let # package overrides overrides = _: pkgs: rec { - nodejs = pkgs.nodejs-12_x; + nodejs = pkgs.nodejs-14_x; ephemeralpg = pkgs.ephemeralpg.overrideAttrs(oldAttrs: { installPhase = '' mkdir -p $out diff --git a/release/RELEASE.md b/release/RELEASE.md index 4f1b071916ea..54654fb52cff 100644 --- a/release/RELEASE.md +++ b/release/RELEASE.md @@ -109,7 +109,7 @@ patches we backport to the 1.0 release branch). - Just the bare install; no need to build C dependencies. - `create-daml-app` doesn't work with the latest version 17.x of node.js. If you have `nix` installed, you can use a suitable version of nodejs by - running `nix-shell -p nodejs-12_x` before running the `npm` commands below. + running `nix-shell -p nodejs-14_x` before running the `npm` commands below. 1. Run `daml version --assistant=yes` and verify that the new version is selected as the assistant version and the default version for new projects.