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

build: update to rules_nodejs 1.2.1 (#34961) 

Fixes issue with conflicting linker module mappings introduced in 1.2.0

PR Close #34961
This commit is contained in:
Greg Magolan 2020-01-29 23:20:08 -08:00 committed by Misko Hevery
parent 513c69169e
commit da604310c6
8 changed files with 68 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
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 = "591d2945b09ecc89fde53e56dd54cfac93322df3bc9d4747cb897ce67ba8cdbf",
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/1.2.0/rules_nodejs-1.2.0.tar.gz"],
sha256 = "ecaa54955b314b5e33948bd8f39e35c35ee89e905d8de1c03868100293510573",
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/1.2.1/rules_nodejs-1.2.1.tar.gz"],
)
# Check the bazel version and download npm dependencies
@ -26,10 +26,10 @@ Try running `yarn bazel` instead.
(If you did run that, check that you've got a fresh `yarn install`)
""",
minimum_bazel_version = "1.1.0",
minimum_bazel_version = "2.0.0",
)
check_rules_nodejs_version(minimum_version_string = "1.2.0")
check_rules_nodejs_version(minimum_version_string = "1.2.1")
# 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 = "591d2945b09ecc89fde53e56dd54cfac93322df3bc9d4747cb897ce67ba8cdbf",
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/1.2.0/rules_nodejs-1.2.0.tar.gz"],
sha256 = "ecaa54955b314b5e33948bd8f39e35c35ee89e905d8de1c03868100293510573",
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/1.2.1/rules_nodejs-1.2.1.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.0",
"@bazel/protractor": "1.2.0",
"@bazel/rollup": "1.2.0",
"@bazel/terser": "1.2.0",
"@bazel/typescript": "1.2.0",
"@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",
"@types/jasmine": "2.8.8",
"http-server": "0.12.0",
"karma": "4.4.1",

40
integration/bazel/yarn.lock
View File

@ -92,32 +92,32 @@
resolved "https://registry.yarnpkg.com/@bazel/hide-bazel-files/-/hide-bazel-files-0.38.3.tgz#e98231d3d360d51860d9c1a7c3345b40dab4cf81"
integrity sha512-o+dNkfDm3qxWQ8h/04cWuTcjR7qnjZi3pQGv4aklVb16oPWx2jF8BzbkwvWuIkdbOl9VnqYP0vaHzwQVJRRcIA==
"@bazel/karma@1.2.0":
version "1.2.0"
resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-1.2.0.tgz#ef06efa689494181040cc2c7af982675d02aad52"
integrity sha512-Afv2LGm5jgPWHAoPkZl5vSSN0hSQxahqk/jlL6KJ4JI5WNy47R2oRgxjQtsthjBGVzJKGGMgfy4CTBnc6UOS2w==
"@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==
dependencies:
tmp "0.1.0"
"@bazel/protractor@1.2.0":
version "1.2.0"
resolved "https://registry.yarnpkg.com/@bazel/protractor/-/protractor-1.2.0.tgz#db6848a72fd8e5a80279d451a54a7fd8cdecc523"
integrity sha512-X+ahKakCfHRQW/76YqGcGCRDNI38QcUKCJ49V21hvON984iluLnQ4m5kRU1KKdESbj3vQ6BJs2b/LFFKRQXrfA==
"@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/rollup@1.2.0":
version "1.2.0"
resolved "https://registry.yarnpkg.com/@bazel/rollup/-/rollup-1.2.0.tgz#8b9569ed6f1c00d2a833567901f8ee4600a389fb"
integrity sha512-yrXW+AAUoqc9qN/CweD5p8OEN9bNKFjXnXPBRE4w84LxpkmaJFx+yQJ++c1F57zWMoq2o9EV4CM7y+mK8zxwUg==
"@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/terser@1.2.0":
version "1.2.0"
resolved "https://registry.yarnpkg.com/@bazel/terser/-/terser-1.2.0.tgz#b750ef8b887ee6e47ceac3ed14b577c22597e110"
integrity sha512-zZvUvwURvYmcRvkV3KEMZp8+/Q73UMVwnmUUJvrw9MPEgTWnxHLdzvTkKzl8f/zza1moL3E9bX+shdU94aKdRg==
"@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/typescript@1.2.0":
version "1.2.0"
resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-1.2.0.tgz#ab2016e1d6eb7a86b44536e887f51eaf3d75f1a7"
integrity sha512-hPEG8K0psyEcs6HFRiqZNQwXL/dQ8sXKdrNFWv87+rh+YUNfd58uktoynhllympOPThcbUZcZicLWBEFQOc8nA==
"@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==
dependencies:
protobufjs "6.8.8"
semver "5.6.0"

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.0",
"@bazel/karma": "1.2.0",
"@bazel/protractor": "1.2.0",
"@bazel/rollup": "1.2.0",
"@bazel/terser": "1.2.0",
"@bazel/typescript": "1.2.0",
"@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",
"@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.0"
RULES_NODEJS_SHA256 = "591d2945b09ecc89fde53e56dd54cfac93322df3bc9d4747cb897ce67ba8cdbf"
RULES_NODEJS_VERSION = "1.2.1"
RULES_NODEJS_SHA256 = "ecaa54955b314b5e33948bd8f39e35c35ee89e905d8de1c03868100293510573"
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.0'],
['@bazel/protractor', '1.2.0'],
['@bazel/rollup', '1.2.0'],
['@bazel/terser', '1.2.0'],
['@bazel/typescript', '1.2.0'],
['@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'],
['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.0":
version "1.2.0"
resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-1.2.0.tgz#0225cba4d678fabc9da4f70dc48ba22b7f523dd1"
integrity sha512-o6OjPHOfnNSRPWsEslGmN9k5PqqsyY6FS7zhn/xQMy/oOqveOPlva0tx/aAKJRLpLIw2Rpp7WoY/GaVDbfUqVA==
"@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==
dependencies:
jasmine "~3.4.0"
jasmine-core "~3.4.0"
v8-coverage "1.0.9"
"@bazel/karma@1.2.0":
version "1.2.0"
resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-1.2.0.tgz#ef06efa689494181040cc2c7af982675d02aad52"
integrity sha512-Afv2LGm5jgPWHAoPkZl5vSSN0hSQxahqk/jlL6KJ4JI5WNy47R2oRgxjQtsthjBGVzJKGGMgfy4CTBnc6UOS2w==
"@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==
dependencies:
tmp "0.1.0"
"@bazel/protractor@1.2.0":
version "1.2.0"
resolved "https://registry.yarnpkg.com/@bazel/protractor/-/protractor-1.2.0.tgz#db6848a72fd8e5a80279d451a54a7fd8cdecc523"
integrity sha512-X+ahKakCfHRQW/76YqGcGCRDNI38QcUKCJ49V21hvON984iluLnQ4m5kRU1KKdESbj3vQ6BJs2b/LFFKRQXrfA==
"@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/rollup@1.2.0":
version "1.2.0"
resolved "https://registry.yarnpkg.com/@bazel/rollup/-/rollup-1.2.0.tgz#8b9569ed6f1c00d2a833567901f8ee4600a389fb"
integrity sha512-yrXW+AAUoqc9qN/CweD5p8OEN9bNKFjXnXPBRE4w84LxpkmaJFx+yQJ++c1F57zWMoq2o9EV4CM7y+mK8zxwUg==
"@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/terser@1.2.0":
version "1.2.0"
resolved "https://registry.yarnpkg.com/@bazel/terser/-/terser-1.2.0.tgz#b750ef8b887ee6e47ceac3ed14b577c22597e110"
integrity sha512-zZvUvwURvYmcRvkV3KEMZp8+/Q73UMVwnmUUJvrw9MPEgTWnxHLdzvTkKzl8f/zza1moL3E9bX+shdU94aKdRg==
"@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/typescript@1.2.0":
version "1.2.0"
resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-1.2.0.tgz#ab2016e1d6eb7a86b44536e887f51eaf3d75f1a7"
integrity sha512-hPEG8K0psyEcs6HFRiqZNQwXL/dQ8sXKdrNFWv87+rh+YUNfd58uktoynhllympOPThcbUZcZicLWBEFQOc8nA==
"@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==
dependencies:
protobufjs "6.8.8"
semver "5.6.0"