Skip to content

Commit ee615e0

Browse files
josephperrottzarend
josephperrott
authored and
zarend
committed
build: upgrade to node 14 (angular#41544)
Upgrade local development environment for the angular repo to use node 14 dropping node 10 from supported for development within the angular repo. PR Close angular#41544
1 parent 0bc539a commit ee615e0

File tree

9 files changed

+15
-17
lines changed

9 files changed

+15
-17
lines changed

‎.circleci/config.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ version: 2.1
2222
# **NOTE 1 **: If you change the cache key prefix, also sync the cache_key_fallback to match.
2323
# **NOTE 2 **: Keep the static part of the cache key as prefix to enable correct fallbacks.
2424
# See https://circleci.com/docs/2.0/caching/#restoring-cache for how prefixes work in CircleCI.
25-
var_3: &cache_key v4-angular-node-12-{{ checksum ".bazelversion" }}-{{ checksum "yarn.lock" }}-{{ checksum "WORKSPACE" }}-{{ checksum "packages/bazel/package.bzl" }}-{{ checksum "aio/yarn.lock" }}
25+
var_3: &cache_key v4-angular-node-14-{{ checksum ".bazelversion" }}-{{ checksum "yarn.lock" }}-{{ checksum "WORKSPACE" }}-{{ checksum "packages/bazel/package.bzl" }}-{{ checksum "aio/yarn.lock" }}
2626
# We invalidate the cache if the Bazel version changes because otherwise the `bazelisk` cache
2727
# folder will contain all previously used versions and ultimately cause the cache restoring to
2828
# be slower due to its growing size.
29-
var_4: &cache_key_fallback v4-angular-node-12-{{ checksum ".bazelversion" }}
29+
var_4: &cache_key_fallback v4-angular-node-14-{{ checksum ".bazelversion" }}
3030

3131
# Windows needs its own cache key because binaries in node_modules are different.
32-
var_3_win: &cache_key_win v4-angular-win-node-12-{{ checksum ".bazelversion" }}-{{ checksum "yarn.lock" }}-{{ checksum "WORKSPACE" }}-{{ checksum "packages/bazel/package.bzl" }}-{{ checksum "aio/yarn.lock" }}
33-
var_4_win: &cache_key_win_fallback v4-angular-win-node-12-{{ checksum ".bazelversion" }}
32+
var_3_win: &cache_key_win v4-angular-win-node-14-{{ checksum ".bazelversion" }}-{{ checksum "yarn.lock" }}-{{ checksum "WORKSPACE" }}-{{ checksum "packages/bazel/package.bzl" }}-{{ checksum "aio/yarn.lock" }}
33+
var_4_win: &cache_key_win_fallback v4-angular-win-node-14-{{ checksum ".bazelversion" }}
3434

3535
# Cache key for the `components-repo-unit-tests` job. **Note** when updating the SHA in the
3636
# cache keys also update the SHA for the "COMPONENTS_REPO_COMMIT" environment variable.
@@ -77,7 +77,7 @@ executors:
7777
type: string
7878
default: medium
7979
docker:
80-
- image: circleci/node:12.14.1@sha256:f9de24fc0017059cc42ef7d07db060008af65a98b1f0cdd1ef3339213226bf6d
80+
- image: circleci/node:14.16.1@sha256:951e12268fe692615bfd155c327bd910e10c99db98404badd03879f984c32b31
8181
resource_class: << parameters.resource_class >>
8282
working_directory: ~/ng
8383

@@ -95,7 +95,7 @@ executors:
9595
machine:
9696
# Windows preview image that includes the following:
9797
# - Visual Studio 2019 build tools
98-
# - Node 12
98+
# - Node 14
9999
# - yarn 1.17
100100
# - Python 3 3.7.4
101101
image: windows-server-2019-vs2019:201908-02

‎.circleci/windows-env.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ copy .circleci\bazel.windows.rc ${Env:USERPROFILE}\.bazelrc
4141
####################################################################################################
4242
# Install specific version of node.
4343
####################################################################################################
44-
nvm install 12.14.1
45-
nvm use 12.14.1
44+
nvm install 14.16.1
45+
nvm use 14.16.1
4646

4747
# These Bazel prereqs aren't needed because the CircleCI image already includes them.
4848
# choco install yarn --version 1.16.0 --no-progress

‎.devcontainer/recommended-Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Image metadata and config.
22
# Ideally, the Node.js version should match what we use on CI.
33
# See `executors > default-executor` in `.circleci/config.yml`.
4-
FROM circleci/node:12-browsers
4+
FROM circleci/node:14-browsers
55

66

77
LABEL name="Angular dev environment" \

‎.nvmrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
12.14.1
1+
14.16.1

‎WORKSPACE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ check_rules_nodejs_version(minimum_version_string = "2.2.0")
2121

2222
# Setup the Node.js toolchain
2323
node_repositories(
24-
node_version = "12.14.1",
24+
node_version = "14.16.1",
2525
package_json = ["//:package.json"],
2626
)
2727

‎aio/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
},
8585
"//engines-comment": "Keep this in sync with /package.json and /aio/tools/examples/shared/package.json",
8686
"engines": {
87-
"node": ">=10.19.0 <16.0.0",
87+
"node": ">=12.14.1 <16.0.0",
8888
"yarn": ">=1.22.4 <2",
8989
"npm": "Please use yarn instead of NPM to install dependencies"
9090
},

‎aio/tools/examples/shared/package.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,9 @@
1212
},
1313
"//engines-comment": "Keep this in sync with /package.json and /aio/package.json",
1414
"engines": {
15-
"node": ">=10.19.0 <16.0.0",
15+
"node": ">=12.14.1 <16.0.0",
1616
"yarn": ">=1.21.1 <2",
1717
"npm": "Please use yarn instead of NPM to install dependencies"
18-
1918
},
2019
"keywords": [],
2120
"author": "",

‎integration/bazel/WORKSPACE‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ load("@build_bazel_rules_nodejs//:index.bzl", "node_repositories", "yarn_install
2626
# Setup the Node.js toolchain
2727
node_repositories(
2828
# Use same node version as root angular WORKSPACE since
29-
# we share node_module packages and some require node >= 10.15.0
30-
node_version = "12.14.1",
29+
node_version = "14.16.1",
3130
yarn_version = "1.12.1",
3231
)
3332

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"license": "MIT",
99
"//engines-comment": "Keep this in sync with /aio/package.json and /aio/tools/examples/shared/package.json",
1010
"engines": {
11-
"node": ">=10.19.0 <16.0.0",
11+
"node": ">=12.14.1 <16.0.0",
1212
"yarn": ">=1.22.4 <2",
1313
"npm": "Please use yarn instead of NPM to install dependencies"
1414
},

0 commit comments

Comments
 (0)