Skip to content

Commit 34ec924

Browse files
alexeagleIgorMinar
authored andcommitted
build: update to Node 10 (angular#25822)
PR Close angular#25822
1 parent 268e977 commit 34ec924

File tree

15 files changed

+43
-41
lines changed

15 files changed

+43
-41
lines changed

.circleci/config.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
## IMPORTANT
1313
# If you change the `docker_image` version, also change the `cache_key` suffix and the version of
1414
# `com_github_bazelbuild_buildtools` in the `/WORKSPACE` file.
15-
var_1: &docker_image angular/ngcontainer:0.4.0
16-
var_2: &cache_key v2-angular-{{ .Branch }}-{{ checksum "yarn.lock" }}-bust1-0.4.0
15+
var_1: &docker_image angular/ngcontainer:0.5.0
16+
var_2: &cache_key v2-angular-{{ .Branch }}-{{ checksum "yarn.lock" }}-0.5.0
1717

1818
# Define common ENV vars
1919
var_3: &define_env_vars

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ language: node_js
22
sudo: false
33
dist: trusty
44
node_js:
5-
- '8.9.1'
5+
- '10.9.0'
66

77
addons:
88
# firefox: "38.0"

WORKSPACE

+10
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,16 @@ See https://blog.bazel.build/2018/08/22/bazel-homebrew.html
114114
node_repositories(
115115
package_json = ["//:package.json"],
116116
preserve_symlinks = True,
117+
node_version = "10.9.0",
118+
yarn_version = "1.9.2",
119+
node_repositories = {
120+
"10.9.0-darwin_amd64": ("node-v10.9.0-darwin-x64.tar.gz", "node-v10.9.0-darwin-x64", "3c4fe75dacfcc495a432a7ba2dec9045cff359af2a5d7d0429c84a424ef686fc"),
121+
"10.9.0-linux_amd64": ("node-v10.9.0-linux-x64.tar.xz", "node-v10.9.0-linux-x64", "c5acb8b7055ee0b6ac653dc4e458c5db45348cecc564b388f4ed1def84a329ff"),
122+
"10.9.0-windows_amd64": ("node-v10.9.0-win-x64.zip", "node-v10.9.0-win-x64", "6a75cdbb69d62ed242d6cbf0238a470bcbf628567ee339d4d098a5efcda2401e"),
123+
},
124+
yarn_repositories = {
125+
"1.9.2": ("yarn-v1.9.2.tar.gz", "yarn-v1.9.2", "3ad69cc7f68159a562c676e21998eb21b44138cae7e8fe0749a7d620cf940204"),
126+
},
117127
)
118128

119129
load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_toolchains")

aio/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@
6363
"post~~build": "yarn build-404-page"
6464
},
6565
"engines": {
66-
"node": ">=8.9.1 <9.0.0",
67-
"yarn": ">=1.3.2 <2.0.0"
66+
"node": ">=10.9.0 <11.0.0",
67+
"yarn": ">=1.9.2 <2.0.0"
6868
},
6969
"private": true,
7070
"dependencies": {

aio/tools/examples/shared/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"postinstall": "yarn webdriver:update"
1212
},
1313
"engines": {
14-
"node": ">=8.9.1 <9.0.0",
15-
"yarn": ">=1.3.2 <2.0.0"
14+
"node": ">=10.9.0 <11.0.0",
15+
"yarn": ">=1.9.2 <2.0.0"
1616
},
1717
"keywords": [],
1818
"author": "",

aio/tools/examples/shared/yarn.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -8485,8 +8485,8 @@ untildify@^3.0.2:
84858485
resolved "https://registry.yarnpkg.com/untildify/-/untildify-3.0.2.tgz#7f1f302055b3fea0f3e81dc78eb36766cb65e3f1"
84868486

84878487
upath@^1.0.0:
8488-
version "1.0.4"
8489-
resolved "https://registry.yarnpkg.com/upath/-/upath-1.0.4.tgz#ee2321ba0a786c50973db043a50b7bcba822361d"
8488+
version "1.1.0"
8489+
resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
84908490

84918491
upper-case@^1.1.1:
84928492
version "1.1.3"

aio/yarn.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -10590,8 +10590,8 @@ unzip-response@^2.0.1:
1059010590
resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
1059110591

1059210592
upath@^1.0.0:
10593-
version "1.0.4"
10594-
resolved "https://registry.yarnpkg.com/upath/-/upath-1.0.4.tgz#ee2321ba0a786c50973db043a50b7bcba822361d"
10593+
version "1.1.0"
10594+
resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
1059510595

1059610596
update-notifier@^0.5.0:
1059710597
version "0.5.0"

integration/bazel/WORKSPACE

+13-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ workspace(name = "bazel_integration_test")
33
#
44
# Download Bazel toolchain dependencies as needed by build actions
55
#
6-
76
local_repository(
87
name = "build_bazel_rules_typescript",
98
path = "node_modules/@bazel/typescript",
@@ -39,7 +38,19 @@ local_repository(
3938
load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories")
4039

4140
check_bazel_version("0.16.0")
42-
node_repositories(package_json = ["//:package.json"])
41+
node_repositories(
42+
package_json = ["//:package.json"],
43+
node_version = "10.9.0",
44+
yarn_version = "1.9.2",
45+
node_repositories = {
46+
"10.9.0-darwin_amd64": ("node-v10.9.0-darwin-x64.tar.gz", "node-v10.9.0-darwin-x64", "3c4fe75dacfcc495a432a7ba2dec9045cff359af2a5d7d0429c84a424ef686fc"),
47+
"10.9.0-linux_amd64": ("node-v10.9.0-linux-x64.tar.xz", "node-v10.9.0-linux-x64", "c5acb8b7055ee0b6ac653dc4e458c5db45348cecc564b388f4ed1def84a329ff"),
48+
"10.9.0-windows_amd64": ("node-v10.9.0-win-x64.zip", "node-v10.9.0-win-x64", "6a75cdbb69d62ed242d6cbf0238a470bcbf628567ee339d4d098a5efcda2401e"),
49+
},
50+
yarn_repositories = {
51+
"1.9.2": ("yarn-v1.9.2.tar.gz", "yarn-v1.9.2", "3ad69cc7f68159a562c676e21998eb21b44138cae7e8fe0749a7d620cf940204"),
52+
},
53+
)
4354

4455
load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_toolchains")
4556

integration/cli-hello-world/yarn.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -6711,8 +6711,8 @@ unset-value@^1.0.0:
67116711
isobject "^3.0.0"
67126712

67136713
upath@^1.0.0:
6714-
version "1.0.4"
6715-
resolved "https://registry.yarnpkg.com/upath/-/upath-1.0.4.tgz#ee2321ba0a786c50973db043a50b7bcba822361d"
6714+
version "1.1.0"
6715+
resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
67166716

67176717
upper-case@^1.1.1:
67186718
version "1.1.3"

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"bugs": "https://github.com/angular/angular/issues",
99
"license": "MIT",
1010
"engines": {
11-
"node": ">=8.9.1 <9.0.0",
12-
"yarn": ">=1.3.2 <2.0.0"
11+
"node": ">=10.9.0 <11.0.0",
12+
"yarn": ">=1.9.2 <2.0.0"
1313
},
1414
"repository": {
1515
"type": "git",

packages/compiler-cli/test/ngc_spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ describe('ngc transformer command-line', () => {
172172
const exitCode = main(['-p', 'not-exist'], errorSpy);
173173
expect(errorSpy).toHaveBeenCalledTimes(1);
174174
expect(errorSpy.calls.mostRecent().args[0]).toContain('no such file or directory');
175-
expect(errorSpy.calls.mostRecent().args[0]).toContain('at Object.fs.lstatSync');
175+
expect(errorSpy.calls.mostRecent().args[0]).toMatch(/at Object\.(fs\.)?lstatSync/);
176176
expect(exitCode).toEqual(2);
177177
});
178178

scripts/ci/env.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ fi
3434
# CUSTOM GLOBALS #
3535
#######################
3636

37-
setEnvVar NODE_VERSION 8.9.1
38-
setEnvVar YARN_VERSION 1.3.2
37+
setEnvVar NODE_VERSION 10.9.0
38+
setEnvVar YARN_VERSION 1.9.2
3939
# Pin to a Chromium version that does not cause the aio e2e tests to flake. (See https://github.com/angular/angular/pull/20403.)
4040
# Revision 494239 (which was part of Chrome 62.0.3186.0) is the last version that does not cause flakes. (Latest revision checked: 508578)
4141
setEnvVar CHROMIUM_VERSION 561733 # Chrome 68 linux stable, see https://www.chromium.org/developers/calendar

tools/check-environment.js

-5
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@ var checkNodeModules;
2222
var semver;
2323
var issues = [];
2424

25-
// coarse Node version check
26-
if (+process.version[1] < 5) {
27-
issues.push('Angular build currently requires Node 5+. Use nvm to update your node version.');
28-
}
29-
3025
try {
3126
semver = require('semver');
3227
} catch (e) {

tools/ngcontainer/Dockerfile

+1-15
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,10 @@ FROM circleci/node:10.9.0-browsers
22

33
USER root
44

5-
###
6-
# Java install
7-
# See https://github.com/docker-library/openjdk/blob/415b0cc42d91ef5d70597d8a24d942967728242b/8-jdk/Dockerfile
8-
# see https://bugs.debian.org/775775
9-
# and https://github.com/docker-library/java/issues/19#issuecomment-70546872
10-
RUN JAVA_DEBIAN_VERSION="8u131-b11-1~bpo8+1" \
11-
&& CA_CERTIFICATES_JAVA_VERSION="20161107~bpo8+1" \
12-
&& echo 'deb http://deb.debian.org/debian jessie-backports main' > /etc/apt/sources.list.d/jessie-backports.list \
13-
&& apt-get update \
14-
&& apt-get install -y \
15-
openjdk-8-jre-headless="$JAVA_DEBIAN_VERSION" \
16-
ca-certificates-java="$CA_CERTIFICATES_JAVA_VERSION" \
17-
&& rm -rf /var/lib/apt/lists/*
18-
195
###
206
# Bazel install
217
# See https://bazel.build/versions/master/docs/install-ubuntu.html#using-bazel-custom-apt-repository-recommended
22-
RUN BAZEL_VERSION="0.16.0" \
8+
RUN BAZEL_VERSION="0.16.1" \
239
&& wget -q -O - https://bazel.build/bazel-release.pub.gpg | apt-key add - \
2410
&& echo "deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8" > /etc/apt/sources.list.d/bazel.list \
2511
&& apt-get update \

tools/ngcontainer/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This docker container provides everything needed to build and test Angular appli
66
- npm 6.2.0
77
- yarn 1.9.2
88
- Java 8 (for Closure Compiler and Bazel)
9-
- Bazel build tool v0.16.0 - http://bazel.build
9+
- Bazel build tool v0.16.1 - http://bazel.build
1010
- Google Chrome 69.0.3497.81
1111
- Mozilla Firefox 47.0.1
1212
- xvfb (virtual framebuffer) for headless testing

0 commit comments

Comments
 (0)