From 106b85d843f2d1040e6909115678287256188c6a Mon Sep 17 00:00:00 2001 From: Alex Eagle Date: Tue, 20 Nov 2018 06:21:05 -0800 Subject: [PATCH] build: update yarn version (#27193) Some engineers were already on Yarn 0.10.x which was permitted by the range in our package.json#engines However this introduced 'integrity sha512' lines into the yarn.lock files. Then when engineers use yarn 0.9 (in particular, Bazel did this) then the lock files get tons of meaningless edits. We could force everyone back to yarn 0.9 but this commit chooses to instead advance everyone past 0.10 PR Close #27193 --- WORKSPACE | 2 +- aio/package.json | 2 +- aio/tools/examples/shared/package.json | 2 +- integration/bazel/WORKSPACE | 2 +- package.json | 2 +- packages/bazel/package.bzl | 4 ++-- scripts/ci/env.sh | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index c2c1ab1512..8bf76e6be8 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -53,7 +53,7 @@ node_repositories( node_version = "10.9.0", package_json = ["//:package.json"], preserve_symlinks = True, - yarn_version = "1.9.2", + yarn_version = "1.12.1", ) yarn_install( diff --git a/aio/package.json b/aio/package.json index 885efc4ecf..e7d935e570 100644 --- a/aio/package.json +++ b/aio/package.json @@ -71,7 +71,7 @@ }, "engines": { "node": ">=10.9.0 <11.0.0", - "yarn": ">=1.9.2 <2.0.0" + "yarn": ">=1.10.1 <1.13.0" }, "private": true, "dependencies": { diff --git a/aio/tools/examples/shared/package.json b/aio/tools/examples/shared/package.json index 1aced60284..15a129fd37 100644 --- a/aio/tools/examples/shared/package.json +++ b/aio/tools/examples/shared/package.json @@ -12,7 +12,7 @@ }, "engines": { "node": ">=10.9.0 <11.0.0", - "yarn": ">=1.9.2 <2.0.0" + "yarn": ">=1.10.1 <1.13.0" }, "keywords": [], "author": "", diff --git a/integration/bazel/WORKSPACE b/integration/bazel/WORKSPACE index 117eb8801a..064360de2b 100644 --- a/integration/bazel/WORKSPACE +++ b/integration/bazel/WORKSPACE @@ -36,7 +36,7 @@ load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_reposi check_bazel_version("0.17.0") node_repositories( node_version = "10.9.0", - yarn_version = "1.9.2", + yarn_version = "1.12.1", ) yarn_install( diff --git a/package.json b/package.json index eb75f773f1..0a5757b211 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "license": "MIT", "engines": { "node": ">=10.9.0 <11.0.0", - "yarn": ">=1.9.2 <2.0.0" + "yarn": ">=1.10.1 <1.13.0" }, "repository": { "type": "git", diff --git a/packages/bazel/package.bzl b/packages/bazel/package.bzl index 2541113801..7e6136b07e 100644 --- a/packages/bazel/package.bzl +++ b/packages/bazel/package.bzl @@ -25,8 +25,8 @@ def rules_angular_dependencies(): _maybe( http_archive, name = "build_bazel_rules_nodejs", - url = "https://github.com/bazelbuild/rules_nodejs/archive/0.15.3.zip", - strip_prefix = "rules_nodejs-0.15.3", + url = "https://github.com/bazelbuild/rules_nodejs/archive/0.16.2.zip", + strip_prefix = "rules_nodejs-0.16.2", ) _maybe( diff --git a/scripts/ci/env.sh b/scripts/ci/env.sh index ecd31c4f5e..662cc97634 100755 --- a/scripts/ci/env.sh +++ b/scripts/ci/env.sh @@ -35,7 +35,7 @@ fi ####################### setEnvVar NODE_VERSION 10.9.0 -setEnvVar YARN_VERSION 1.9.2 +setEnvVar YARN_VERSION 1.12.1 setEnvVar CHROMIUM_VERSION 561733 # Chrome 68 linux stable, see https://www.chromium.org/developers/calendar setEnvVar CHROMEDRIVER_VERSION_ARG "--versions.chrome 2.41" setEnvVar SAUCE_CONNECT_VERSION 4.4.9