From 656607b64024e9001baa061632f950ac9709da5b Mon Sep 17 00:00:00 2001 From: Greg Magolan Date: Wed, 4 Dec 2019 22:19:02 -0800 Subject: [PATCH] build: update integration/bazel & @angular/bazel schematics to rules_nodejs 0.42.1 (#34112) This release brings a bug fix that https://github.com/angular/angular/pull/34243 is waiting on in order to remove rules_nodejs patches: fix(builtin): additional_root_paths in pkg_web should also include paths in genfiles and bin dirs (bazelbuild/rules_nodejs#1402) PR Close #34112 --- integration/bazel/WORKSPACE | 4 +- integration/bazel/package.json | 10 ++--- integration/bazel/yarn.lock | 40 +++++++++---------- .../src/builders/files/WORKSPACE.template | 4 +- packages/bazel/src/schematics/ng-add/index.ts | 10 ++--- 5 files changed, 34 insertions(+), 34 deletions(-) diff --git a/integration/bazel/WORKSPACE b/integration/bazel/WORKSPACE index bd3b982536..8b14713d38 100644 --- a/integration/bazel/WORKSPACE +++ b/integration/bazel/WORKSPACE @@ -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 = "c612d6b76eaa17540e8b8c806e02701ed38891460f9ba3303f4424615437887a", - urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.42.1/rules_nodejs-0.42.1.tar.gz"], + sha256 = "16fc00ab0d1e538e88f084272316c0693a2e9007d64f45529b82f6230aedb073", + urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.42.2/rules_nodejs-0.42.2.tar.gz"], ) # Fetch sass rules for compiling sass files diff --git a/integration/bazel/package.json b/integration/bazel/package.json index af8854f90a..ec69fc303f 100644 --- a/integration/bazel/package.json +++ b/integration/bazel/package.json @@ -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": "0.42.1", - "@bazel/protractor": "0.42.1", - "@bazel/rollup": "0.42.1", - "@bazel/terser": "0.42.1", - "@bazel/typescript": "0.42.1", + "@bazel/karma": "0.42.2", + "@bazel/protractor": "0.42.2", + "@bazel/rollup": "0.42.2", + "@bazel/terser": "0.42.2", + "@bazel/typescript": "0.42.2", "@types/jasmine": "2.8.8", "http-server": "0.12.0", "karma": "4.4.1", diff --git a/integration/bazel/yarn.lock b/integration/bazel/yarn.lock index 934210ef65..175513e264 100644 --- a/integration/bazel/yarn.lock +++ b/integration/bazel/yarn.lock @@ -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@0.42.1": - version "0.42.1" - resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.42.1.tgz#f255e3181341592064cd2d0c70d72a3f3ea0ae5f" - integrity sha512-VRu/MXc5eqqVKILJeirR3EqJFGnrFkmG1XlcuhbGL1+eo+7pY3BUhdFXdihagXZG8QPDXlHbkY7GNOghAdl6DA== +"@bazel/karma@0.42.2": + version "0.42.2" + resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.42.2.tgz#24e2cf150a5da1fbdeb9382822b0ba7e662455a1" + integrity sha512-fNrZ8fIHTFwr7DGKtZLFLZxV/7+txZfiHH6bDN73qOId91RY7rr82BHgZx/iDQqnaKCW0+o9i2gPqu7lutVc8g== dependencies: tmp "0.1.0" -"@bazel/protractor@0.42.1": - version "0.42.1" - resolved "https://registry.yarnpkg.com/@bazel/protractor/-/protractor-0.42.1.tgz#9dd2ce7181a87af298f955f29d5b6615f1c0fc7a" - integrity sha512-/8jHqqCi+1EcyZKyzduCSzWaXUjfQ5WTl464yFkYzQCDEDPcQcje5nJh9qewoxuCoFFwVY++cnGPwBu6k2yShg== +"@bazel/protractor@0.42.2": + version "0.42.2" + resolved "https://registry.yarnpkg.com/@bazel/protractor/-/protractor-0.42.2.tgz#f20acd64e9456434cdc56903186fa31144a462a6" + integrity sha512-0LpRnaeL6/QHnNTK561aKFxAh4nECUNxrouC15XGWb57emj1q4a/IScAGwPrnb5dBQl1ZlgDXzyz/bqG928L1g== -"@bazel/rollup@0.42.1": - version "0.42.1" - resolved "https://registry.yarnpkg.com/@bazel/rollup/-/rollup-0.42.1.tgz#13974423001417251d14dffb9b7e4c5fb3c65779" - integrity sha512-BxXCtZ/x9ZBr1zUTa1D4bUfb7Xq2iDZjw6iBLTafFnhIRgyiVz0YaIXDoXEXMmpqn9tsOnd5ivVWFTSDvOjV/w== +"@bazel/rollup@0.42.2": + version "0.42.2" + resolved "https://registry.yarnpkg.com/@bazel/rollup/-/rollup-0.42.2.tgz#b7a6495e1c506e3684448140395be80c45420271" + integrity sha512-SiXxuydxC3+jZIfS8oib3YyXBXeoA816bYdnIdVJX0WNgIMStdvGm7a/UU20KlbOWBx7qKB+mCSjSQa6C2FBnQ== -"@bazel/terser@0.42.1": - version "0.42.1" - resolved "https://registry.yarnpkg.com/@bazel/terser/-/terser-0.42.1.tgz#ff74f718cad0595dd7e486cdec57efd539d7ec21" - integrity sha512-r6SZELGucqCT/OjYrCTeyxw6CVL3ex3kb4yGv4QAzJ4501N6BHHRdu7dziu6byYEDfpizjw4ccn743sLn9PqhQ== +"@bazel/terser@0.42.2": + version "0.42.2" + resolved "https://registry.yarnpkg.com/@bazel/terser/-/terser-0.42.2.tgz#392e150af530d1eaf56ba388161e6f7f107e6be3" + integrity sha512-DlsmZyTWQFKiQbCKK/CDcRism1xrV1f7fLU166cXUIokXfkCaVCbN2ViaB5fDFcRpBQaNKowdM37Y5O7282Low== -"@bazel/typescript@0.42.1": - version "0.42.1" - resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.42.1.tgz#afa4c2e3de7ef60777fd7cd1828d1af57d09afb0" - integrity sha512-fObLUXlI3E9ZdGjCIGzXX6VkEo3x417PZvpIUBrVI3YONhbMoqAERB2yD4Mp8waoFKKu7ePnKCmoCWEa7PSTtA== +"@bazel/typescript@0.42.2": + version "0.42.2" + resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.42.2.tgz#6c8e2187e9f7f937650c8b4e2350dc7d46284cb1" + integrity sha512-9HS8W6Wv74zhjvyP2rwym05TwzB8/c3Pxxi4gfjwjwxaDAIZCQfC8UGSRxeCm5t0JNz485W1/0WScoACjcASCQ== dependencies: protobufjs "6.8.8" semver "5.6.0" diff --git a/packages/bazel/src/builders/files/WORKSPACE.template b/packages/bazel/src/builders/files/WORKSPACE.template index 84a6498cee..1ab39b2d2f 100644 --- a/packages/bazel/src/builders/files/WORKSPACE.template +++ b/packages/bazel/src/builders/files/WORKSPACE.template @@ -15,8 +15,8 @@ workspace( load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") -RULES_NODEJS_VERSION = "0.42.1" -RULES_NODEJS_SHA256 = "c612d6b76eaa17540e8b8c806e02701ed38891460f9ba3303f4424615437887a" +RULES_NODEJS_VERSION = "0.42.2" +RULES_NODEJS_SHA256 = "16fc00ab0d1e538e88f084272316c0693a2e9007d64f45529b82f6230aedb073" http_archive( name = "build_bazel_rules_nodejs", sha256 = RULES_NODEJS_SHA256, diff --git a/packages/bazel/src/schematics/ng-add/index.ts b/packages/bazel/src/schematics/ng-add/index.ts index a0123733b7..03c1c7ef7d 100644 --- a/packages/bazel/src/schematics/ng-add/index.ts +++ b/packages/bazel/src/schematics/ng-add/index.ts @@ -40,11 +40,11 @@ function addDevDependenciesToPackageJson(options: Schema) { ['@angular/bazel', angularCore.version], ['@bazel/bazel', '1.1.0'], ['@bazel/ibazel', '0.10.3'], - ['@bazel/karma', '0.42.1'], - ['@bazel/protractor', '0.42.1'], - ['@bazel/rollup', '0.42.1'], - ['@bazel/terser', '0.42.1'], - ['@bazel/typescript', '0.42.1'], + ['@bazel/karma', '0.42.2'], + ['@bazel/protractor', '0.42.2'], + ['@bazel/rollup', '0.42.2'], + ['@bazel/terser', '0.42.2'], + ['@bazel/typescript', '0.42.2'], ['history-server', '1.3.1'], ['html-insert-assets', '0.2.0'], ['karma', '4.4.1'],