Skip to content

Commit bbce2ad

Browse files
gregmagolanmhevery
authored andcommitted
build: update to nodejs rules 0.42.1 (angular#34073)
* This brings in a fix to the `@npm//foo:foo_files` targets for angular#33927 so the a rules_nodejs patch can be removed. * It also brings a protractor_web_test fix that resolves the need for a work-around in /modules/playground/e2e_test/sourcemap/BUILD.bazel. PR Close angular#34073
1 parent 2cc954d commit bbce2ad

File tree

4 files changed

+37
-50
lines changed

4 files changed

+37
-50
lines changed

WORKSPACE

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
88
# Fetch rules_nodejs so we can install our npm dependencies
99
http_archive(
1010
name = "build_bazel_rules_nodejs",
11-
sha256 = "8dc1466f8563f3aa4ac7ab7aa3c96651eb7764108219f40b2d1c918e1a81c601",
12-
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.41.0/rules_nodejs-0.41.0.tar.gz"],
11+
sha256 = "c612d6b76eaa17540e8b8c806e02701ed38891460f9ba3303f4424615437887a",
12+
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.42.1/rules_nodejs-0.42.1.tar.gz"],
1313
)
1414

1515
# Check the bazel version and download npm dependencies
@@ -29,7 +29,7 @@ Try running `yarn bazel` instead.
2929
minimum_bazel_version = "1.1.0",
3030
)
3131

32-
check_rules_nodejs_version(minimum_version_string = "0.41.0")
32+
check_rules_nodejs_version(minimum_version_string = "0.42.1")
3333

3434
# Setup the Node.js toolchain
3535
node_repositories(
Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,11 @@
11
load("//modules/playground/e2e_test:example_test.bzl", "example_test")
22

3-
filegroup(
4-
name = "protractor_web_test_data_workaroud",
5-
srcs = ["//modules/playground/src/sourcemap:index.ts"],
6-
)
7-
# Work-around for protractor_web_test data not allowing files.
8-
# TODO(gregmagolan): remove this work-around once this is fixed in rules_nodejs
9-
# ```
10-
# ERROR: /Users/greg/google/angular-2/modules/playground/e2e_test/sourcemap/BUILD.bazel:8:1:
11-
# in data attribute of _protractor_web_test rule //modules/playground/e2e_test/sourcemap:protractor_tests_wrapped_test:
12-
# source file '//modules/playground/src/sourcemap:index.ts' is misplaced here (expected no files). Since this rule was
13-
# created by the macro 'example_test', the error might have been caused by the macro implementation
14-
# ```
15-
163
example_test(
174
name = "sourcemap",
185
srcs = glob(["**/*.ts"]),
196
data = [
20-
":protractor_web_test_data_workaroud",
217
"//modules/playground/src/sourcemap",
8+
"//modules/playground/src/sourcemap:index.ts",
229
],
2310
server = "//modules/playground/src/sourcemap:devserver",
2411
)

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@
4141
"@angular-devkit/schematics": "^9.0.0-rc.3",
4242
"@angular/bazel": "file:./tools/npm/@angular_bazel",
4343
"@babel/core": "^7.6.4",
44-
"@bazel/jasmine": "0.41.0",
45-
"@bazel/karma": "0.41.0",
46-
"@bazel/protractor": "0.41.0",
47-
"@bazel/rollup": "0.41.0",
48-
"@bazel/terser": "0.41.0",
49-
"@bazel/typescript": "0.41.0",
44+
"@bazel/jasmine": "0.42.1",
45+
"@bazel/karma": "0.42.1",
46+
"@bazel/protractor": "0.42.1",
47+
"@bazel/rollup": "0.42.1",
48+
"@bazel/terser": "0.42.1",
49+
"@bazel/typescript": "0.42.1",
5050
"@microsoft/api-extractor": "^7.3.9",
5151
"@schematics/angular": "^9.0.0-rc.3",
5252
"@types/angular": "^1.6.47",

yarn.lock

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -981,41 +981,41 @@
981981
resolved "https://registry.yarnpkg.com/@bazel/ibazel/-/ibazel-0.10.3.tgz#2e2b8a1d3e885946eac41db2b1aa6801fb319887"
982982
integrity sha512-v1nXbMTHVlMM4z4uWp6XiRoHAyUlYggF1SOboLLWRp0+D22kWixqArWqnozLw2mOtnxr97BdLjluWiho6A8Hjg==
983983

984-
"@bazel/jasmine@0.41.0":
985-
version "0.41.0"
986-
resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-0.41.0.tgz#4e9c1622b6ceacdcf12740098d8c99fc3cff6bfb"
987-
integrity sha512-vbZaTx05Ab5ZbJ1TDHjwWvtrDYBh4miXVJBdFeSZtquLQ0FQb9iNdMTuDHkEF9aq6nqG+rnjUoQjjmDLC/uRkg==
984+
"@bazel/jasmine@0.42.1":
985+
version "0.42.1"
986+
resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-0.42.1.tgz#d26b4aee19e064805d45865e8a65798cbfa4b4e7"
987+
integrity sha512-cXIUe1AOwY/2Q+C4JO1F24V4rfmYt/h4WDC52T/ZMD13F6ZUsuLrQqL5TKgzYaRP3fWNfphAt00+9QVsIkrs/g==
988988
dependencies:
989989
jasmine "~3.4.0"
990990
jasmine-core "~3.4.0"
991991
v8-coverage "1.0.9"
992992

993-
"@bazel/karma@0.41.0":
994-
version "0.41.0"
995-
resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.41.0.tgz#1ad3b48d8b5cf1e08ed266872c18344c8bd63e94"
996-
integrity sha512-L23VC9EUFmrMCYJAT9qPnyezM5IErCJ8URpmXfRo/7IUJ04/l4vQeiyi4iNY7+zw9lbGf2I8seGaPFJrFtxdoQ==
993+
"@bazel/karma@0.42.1":
994+
version "0.42.1"
995+
resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.42.1.tgz#f255e3181341592064cd2d0c70d72a3f3ea0ae5f"
996+
integrity sha512-VRu/MXc5eqqVKILJeirR3EqJFGnrFkmG1XlcuhbGL1+eo+7pY3BUhdFXdihagXZG8QPDXlHbkY7GNOghAdl6DA==
997997
dependencies:
998998
tmp "0.1.0"
999999

1000-
"@bazel/protractor@0.41.0":
1001-
version "0.41.0"
1002-
resolved "https://registry.yarnpkg.com/@bazel/protractor/-/protractor-0.41.0.tgz#56075a657f236602bd762e712dd42c514baede0c"
1003-
integrity sha512-sQtAYheBOEcX32BWNyRj5VssCrMbPzEun4x9QPWnoxtBebkxeuZplRjbaoc+PFdVYys+ixwAqTkS49qlV4Ng1w==
1004-
1005-
"@bazel/rollup@0.41.0":
1006-
version "0.41.0"
1007-
resolved "https://registry.yarnpkg.com/@bazel/rollup/-/rollup-0.41.0.tgz#8dfaccc239f3efbae1c816b0ce2aeb6069d23582"
1008-
integrity sha512-M+ybGfcxTXnAS1QiaijLEfUznNYLA0cqeGXnYHSRrOhq2U7yesfavxbBtfLSKtg32ktmlHts5te8Zg82BS4DPQ==
1009-
1010-
"@bazel/terser@0.41.0":
1011-
version "0.41.0"
1012-
resolved "https://registry.yarnpkg.com/@bazel/terser/-/terser-0.41.0.tgz#2a0db8985ef2a4d015c3fda16d07c6813b29062a"
1013-
integrity sha512-NNC3o4yLlVoJgPAG1/6cir+aX3lYSn5ggVzQIDQKZHbePevr8E0PA5SMjthnKp/pQVs5URfZNADdXZnROTeu0w==
1014-
1015-
"@bazel/typescript@0.41.0":
1016-
version "0.41.0"
1017-
resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.41.0.tgz#b767c4972cc42fd76c118f21e83e98860afdc249"
1018-
integrity sha512-i+PXf5BR7aUEA49V+D8OatHonNCDm2MhtjFwEJ7yKKLTPEm4riHWSDASNuOi4iAAe+EB8eKe1Fxh8iSjh/hm4A==
1000+
"@bazel/protractor@0.42.1":
1001+
version "0.42.1"
1002+
resolved "https://registry.yarnpkg.com/@bazel/protractor/-/protractor-0.42.1.tgz#9dd2ce7181a87af298f955f29d5b6615f1c0fc7a"
1003+
integrity sha512-/8jHqqCi+1EcyZKyzduCSzWaXUjfQ5WTl464yFkYzQCDEDPcQcje5nJh9qewoxuCoFFwVY++cnGPwBu6k2yShg==
1004+
1005+
"@bazel/rollup@0.42.1":
1006+
version "0.42.1"
1007+
resolved "https://registry.yarnpkg.com/@bazel/rollup/-/rollup-0.42.1.tgz#13974423001417251d14dffb9b7e4c5fb3c65779"
1008+
integrity sha512-BxXCtZ/x9ZBr1zUTa1D4bUfb7Xq2iDZjw6iBLTafFnhIRgyiVz0YaIXDoXEXMmpqn9tsOnd5ivVWFTSDvOjV/w==
1009+
1010+
"@bazel/terser@0.42.1":
1011+
version "0.42.1"
1012+
resolved "https://registry.yarnpkg.com/@bazel/terser/-/terser-0.42.1.tgz#ff74f718cad0595dd7e486cdec57efd539d7ec21"
1013+
integrity sha512-r6SZELGucqCT/OjYrCTeyxw6CVL3ex3kb4yGv4QAzJ4501N6BHHRdu7dziu6byYEDfpizjw4ccn743sLn9PqhQ==
1014+
1015+
"@bazel/typescript@0.42.1":
1016+
version "0.42.1"
1017+
resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.42.1.tgz#afa4c2e3de7ef60777fd7cd1828d1af57d09afb0"
1018+
integrity sha512-fObLUXlI3E9ZdGjCIGzXX6VkEo3x417PZvpIUBrVI3YONhbMoqAERB2yD4Mp8waoFKKu7ePnKCmoCWEa7PSTtA==
10191019
dependencies:
10201020
protobufjs "6.8.8"
10211021
semver "5.6.0"

0 commit comments

Comments
 (0)