honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: update to rules_nodejs 1.2.2 (#34961) 

Fixes issue with yarn_install not following yarn-path in .yarnrc when bazel run from yarn with `yarn bazel ...` (rules_nodejs: fix: unset YARN_IGNORE_PATH in yarn_install before calling yarn #1588)

PR Close #34961
This commit is contained in:
Greg Magolan 2020-01-30 22:08:10 -08:00 committed by Misko Hevery
parent da604310c6
commit 60018d265f
8 changed files with 88 additions and 950 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
WORKSPACE
View File

@ -8,8 +8,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
# Fetch rules_nodejs so we can install our npm dependencies
http_archive(
name = "build_bazel_rules_nodejs",
sha256 = "ecaa54955b314b5e33948bd8f39e35c35ee89e905d8de1c03868100293510573",
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/1.2.1/rules_nodejs-1.2.1.tar.gz"],
sha256 = "6bcef105e75cac3c5f8212e0d0431b6ec1aaa1963e093b0091474ab98ecf29d2",
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/1.2.2/rules_nodejs-1.2.2.tar.gz"],
)
# Check the bazel version and download npm dependencies
@ -29,7 +29,7 @@ Try running `yarn bazel` instead.
minimum_bazel_version = "2.0.0",
)
check_rules_nodejs_version(minimum_version_string = "1.2.1")
check_rules_nodejs_version(minimum_version_string = "1.2.2")
# Setup the Node.js toolchain
node_repositories(

4
integration/bazel/WORKSPACE
View File

@ -8,8 +8,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
# Fetch rules_nodejs so we can install our npm dependencies
http_archive(
name = "build_bazel_rules_nodejs",
sha256 = "ecaa54955b314b5e33948bd8f39e35c35ee89e905d8de1c03868100293510573",
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/1.2.1/rules_nodejs-1.2.1.tar.gz"],
sha256 = "6bcef105e75cac3c5f8212e0d0431b6ec1aaa1963e093b0091474ab98ecf29d2",
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/1.2.2/rules_nodejs-1.2.2.tar.gz"],
)
# Fetch sass rules for compiling sass files

10
integration/bazel/package.json
View File

@ -23,11 +23,11 @@
"@angular/compiler": "file:../../dist/packages-dist/compiler",
"@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
"@bazel/bazel": "file:../../node_modules/@bazel/bazel",
"@bazel/karma": "1.2.1",
"@bazel/protractor": "1.2.1",
"@bazel/rollup": "1.2.1",
"@bazel/terser": "1.2.1",
"@bazel/typescript": "1.2.1",
"@bazel/karma": "1.2.2",
"@bazel/protractor": "1.2.2",
"@bazel/rollup": "1.2.2",
"@bazel/terser": "1.2.2",
"@bazel/typescript": "1.2.2",
"@types/jasmine": "2.8.8",
"http-server": "0.12.0",
"karma": "4.4.1",

944
integration/bazel/yarn.lock
View File

File diff suppressed because it is too large Load Diff

12
package.json
View File

@ -42,12 +42,12 @@
"@angular/bazel": "file:./tools/npm/@angular_bazel",
"@babel/core": "7.8.3",
"@babel/generator": "7.8.3",
"@bazel/jasmine": "1.2.1",
"@bazel/karma": "1.2.1",
"@bazel/protractor": "1.2.1",
"@bazel/rollup": "1.2.1",
"@bazel/terser": "1.2.1",
"@bazel/typescript": "1.2.1",
"@bazel/jasmine": "1.2.2",
"@bazel/karma": "1.2.2",
"@bazel/protractor": "1.2.2",
"@bazel/rollup": "1.2.2",
"@bazel/terser": "1.2.2",
"@bazel/typescript": "1.2.2",
"@microsoft/api-extractor": "^7.3.9",
"@schematics/angular": "9.0.0-rc.8",
"@types/angular": "^1.6.47",

4
packages/bazel/src/builders/files/WORKSPACE.template
View File

@ -15,8 +15,8 @@ workspace(
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
RULES_NODEJS_VERSION = "1.2.1"
RULES_NODEJS_SHA256 = "ecaa54955b314b5e33948bd8f39e35c35ee89e905d8de1c03868100293510573"
RULES_NODEJS_VERSION = "1.2.2"
RULES_NODEJS_SHA256 = "6bcef105e75cac3c5f8212e0d0431b6ec1aaa1963e093b0091474ab98ecf29d2"
http_archive(
name = "build_bazel_rules_nodejs",
sha256 = RULES_NODEJS_SHA256,

10
packages/bazel/src/schematics/ng-add/index.ts
View File

@ -40,11 +40,11 @@ function addDevDependenciesToPackageJson(options: Schema) {
['@angular/bazel', angularCore.version],
['@bazel/bazel', '2.0.0'],
['@bazel/ibazel', '0.10.3'],
['@bazel/karma', '1.2.1'],
['@bazel/protractor', '1.2.1'],
['@bazel/rollup', '1.2.1'],
['@bazel/terser', '1.2.1'],
['@bazel/typescript', '1.2.1'],
['@bazel/karma', '1.2.2'],
['@bazel/protractor', '1.2.2'],
['@bazel/rollup', '1.2.2'],
['@bazel/terser', '1.2.2'],
['@bazel/typescript', '1.2.2'],
['history-server', '1.3.1'],
['html-insert-assets', '0.2.0'],
['karma', '4.4.1'],

48
yarn.lock
View File

@ -1110,41 +1110,41 @@
resolved "https://registry.yarnpkg.com/@bazel/ibazel/-/ibazel-0.11.1.tgz#c07ceaded388f1e39d6aa732953e0dd04f3dbdf0"
integrity sha512-qAdEquFAudYyN+CYfLzvuRWNubdsh6C8+o5CiViUEfchq1HQM5Rs8xAOE3fzGsTZ1EUsvgca/PY0kn0VIxckBA==
"@bazel/jasmine@1.2.1":
version "1.2.1"
resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-1.2.1.tgz#1da301b68f74387fbf92f568018d74d6a6df12a5"
integrity sha512-5XFOwbzHeRJWLRgxmUDUYtoR9ro88hsRRMbR5+QyHUpEDz9JepJPf0YEtztqCMgWhdC+CxWb83KURHsunD/79w==
"@bazel/jasmine@1.2.2":
version "1.2.2"
resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-1.2.2.tgz#0fc9b0084b38311cf59c825a7dda8c6421351379"
integrity sha512-fFTWtxj8KWBPC1Gcl+uD641dEQwkVCclGCtpqIhogq+cZQDJk3/pc3qfVDGXjLKIRr7BId+Tnu5Y2sc+zdKeSg==
dependencies:
jasmine "~3.4.0"
jasmine-core "~3.4.0"
v8-coverage "1.0.9"
"@bazel/karma@1.2.1":
version "1.2.1"
resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-1.2.1.tgz#e8327ed5810023cfab5adf436fe401b2ad1b8d0b"
integrity sha512-2PRvX0u3T+rZMYZmwyeNdSq1b6QAfNgbqzJZvm1brGRs1q1BgZLRhUjy7DD0+6+3HKrXuQVqa7JZVi8N2Ks5ew==
"@bazel/karma@1.2.2":
version "1.2.2"
resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-1.2.2.tgz#545c0f86f921229879511a9a0b2edba1329a1fb8"
integrity sha512-jUTv6DKoLkU3VUIFHCTnRU94qbOBPRZYbg7//2AnzHAS77SQyIAEUG5xU/W26+kle+sj7nBMavlMOxLjsrpMFA==
dependencies:
tmp "0.1.0"
"@bazel/protractor@1.2.1":
version "1.2.1"
resolved "https://registry.yarnpkg.com/@bazel/protractor/-/protractor-1.2.1.tgz#bc08b82e3eca726c733972a247f3f266b631daf6"
integrity sha512-mN0u+OV5ANcvr0ntVDdzjqYv3vQcNjFA8cRcYiDf9Uke8ku8OFJIu5dz77mONksV34zE9LKGkxvYjGIgKFMDYg==
"@bazel/protractor@1.2.2":
version "1.2.2"
resolved "https://registry.yarnpkg.com/@bazel/protractor/-/protractor-1.2.2.tgz#33bd58dfbfa33f1ec4b037ef5d4edc5de130aa2b"
integrity sha512-PgE/VAwgvtlFPKdCR1o2ofZyc4khLeEu+nztzuohZ1MqD5Yn5tx6QGhOAhLDLNCim1DRqRXct7LerAy1VNm5iA==
"@bazel/rollup@1.2.1":
version "1.2.1"
resolved "https://registry.yarnpkg.com/@bazel/rollup/-/rollup-1.2.1.tgz#c871fc5ea9d84f4ecdff8a088f33dd62285d2d37"
integrity sha512-RmkI04MfPSB7Z626R7jPoO5//C9Lpm54JYzDZG9hB99UoiFPOmwZonI/uMMf1s9U967AF18QNq5lO9SPpnOvpg==
"@bazel/rollup@1.2.2":
version "1.2.2"
resolved "https://registry.yarnpkg.com/@bazel/rollup/-/rollup-1.2.2.tgz#f5522ac308c41c6e11cbbdf3f0300a1db885410d"
integrity sha512-TGdL06eO8ARHEGVYdwA4MXoVM/V8EeFhi2DAMK+VrN609B7/CvtukdlT9KnuAONo5W7mttPzyuCgsvkaADrNOA==
"@bazel/terser@1.2.1":
version "1.2.1"
resolved "https://registry.yarnpkg.com/@bazel/terser/-/terser-1.2.1.tgz#3f1e6a259c5a8005c6a7c10b1ae9b7e98a4d1171"
integrity sha512-k7ZWatfXO1bu6D1f9JN1cpXpWpBOHaUlG9s0hRpUqIdwM+JO4bUyiZEFvyX6oKgtZQjAhdKQjA/3NlF/1+voKw==
"@bazel/terser@1.2.2":
version "1.2.2"
resolved "https://registry.yarnpkg.com/@bazel/terser/-/terser-1.2.2.tgz#a245e345028fd0e15b76b67da1a60c0d9635c76f"
integrity sha512-IsHxbSjbNesSjIQDRpm1tDPwiHadTQIIIOUgtQQN1hDlzmDufTNvqGpB+34MeSLNzn2KVHObqYbYs6LVpW1a8A==
"@bazel/typescript@1.2.1":
version "1.2.1"
resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-1.2.1.tgz#a83ecebe48f32c2443879a85f0766dab386ff9d3"
integrity sha512-RKgOWos1Ya7XoSUZOV/A8+LS4ZmCvIXv363w4xNdObKjwKFqSdOfsS+uYaVr8g5e0T24jl52QnbdS7i0eUJBqA==
"@bazel/typescript@1.2.2":
version "1.2.2"
resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-1.2.2.tgz#9acb8e07d1bd2b5d9c7afd01b434687b277f9dcb"
integrity sha512-qEkkkLOsKvcTvyToiMLVTU67iEHTOzVUIJGDo3+7g8vRL4OqG9EWk0ooNzVLWZ129Caz9TyVyleh1RhuReJWOw==
dependencies:
protobufjs "6.8.8"
semver "5.6.0"