Skip to content

Commit d1adba1

Browse files
committed
build: update build_bazel_rules_nodejs to 2.0.2
1 parent d462813 commit d1adba1

File tree

25 files changed

+155
-258
lines changed

25 files changed

+155
-258
lines changed

‎WORKSPACE

+9-23
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
88

99
http_archive(
1010
name = "build_bazel_rules_nodejs",
11-
sha256 = "84abf7ac4234a70924628baa9a73a5a5cbad944c4358cf9abdb4aab29c9a5b77",
12-
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/1.7.0/rules_nodejs-1.7.0.tar.gz"],
11+
sha256 = "6a67a8a1bf6fddc9113f73471029b819eef4575c3a936a4a01d57e411894d692",
12+
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/2.0.2/rules_nodejs-2.0.2.tar.gz"],
1313
)
1414

1515
# We use protocol buffers for the Build Event Protocol
@@ -37,7 +37,7 @@ Angular has a dependency on the @bazel/bazelisk package which supplies it.
3737
Try running `yarn bazel` instead.
3838
(If you did run that, check that you've got a fresh `yarn install`)
3939
""",
40-
minimum_bazel_version = "0.27.0",
40+
minimum_bazel_version = "3.0.0",
4141
)
4242

4343
# The NodeJS rules version must be at least the following version because:
@@ -52,7 +52,7 @@ Try running `yarn bazel` instead.
5252
# - 0.32.1 remove override of @bazel/tsetse & exclude typescript lib declarations in node_module_library transitive_declarations
5353
# - 0.32.2 resolves bug in @bazel/hide-bazel-files postinstall step
5454
# - 0.34.0 introduces protractor rule
55-
check_rules_nodejs_version(minimum_version_string = "1.5.0")
55+
check_rules_nodejs_version(minimum_version_string = "2.0.0")
5656

5757
# Setup the Node.js toolchain
5858
node_repositories(
@@ -80,36 +80,22 @@ yarn_install(
8080

8181
load("@npm//:install_bazel_dependencies.bzl", "install_bazel_dependencies")
8282

83-
install_bazel_dependencies()
84-
85-
load("@npm_bazel_typescript//:index.bzl", "ts_setup_workspace")
86-
87-
ts_setup_workspace()
88-
89-
# Load karma dependencies
90-
load("@npm_bazel_karma//:package.bzl", "npm_bazel_karma_dependencies")
91-
92-
npm_bazel_karma_dependencies()
83+
install_bazel_dependencies(suppress_warning = True)
9384

9485
# Load labs dependencies
95-
load("@npm_bazel_labs//:package.bzl", "npm_bazel_labs_dependencies")
86+
load("@npm//@bazel/labs:package.bzl", "npm_bazel_labs_dependencies")
9687

9788
npm_bazel_labs_dependencies()
9889

99-
# Setup the rules_webtesting toolchain
100-
load("@io_bazel_rules_webtesting//web:repositories.bzl", "web_test_repositories")
101-
102-
web_test_repositories()
103-
10490
##########################
10591
# Remote Execution Setup #
10692
##########################
10793
# Bring in bazel_toolchains for RBE setup configuration.
10894
http_archive(
10995
name = "bazel_toolchains",
110-
sha256 = "882fecfc88d3dc528f5c5681d95d730e213e39099abff2e637688a91a9619395",
111-
strip_prefix = "bazel-toolchains-3.4.0",
112-
url = "https://github.com/bazelbuild/bazel-toolchains/archive/3.4.0.tar.gz",
96+
sha256 = "7ebb200ed3ca3d1f7505659c7dfed01c4b5cb04c3a6f34140726fe22f5d35e86",
97+
strip_prefix = "bazel-toolchains-3.4.1",
98+
url = "https://github.com/bazelbuild/bazel-toolchains/archive/3.4.1.tar.gz",
11399
)
114100

115101
load("@bazel_toolchains//rules:environments.bzl", "clang_env")

‎package.json

+5-6
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,11 @@
8686
"@babel/preset-env": "7.11.0",
8787
"@babel/runtime": "7.11.2",
8888
"@babel/template": "7.10.4",
89-
"@bazel/bazelisk": "1.5.0",
90-
"@bazel/buildifier": "3.3.0",
91-
"@bazel/jasmine": "1.7.0",
92-
"@bazel/karma": "1.7.0",
93-
"@bazel/labs": "1.7.0",
94-
"@bazel/typescript": "1.7.0",
89+
"@bazel/bazelisk": "1.6.1",
90+
"@bazel/buildifier": "3.4.0",
91+
"@bazel/jasmine": "2.0.2",
92+
"@bazel/labs": "2.0.2",
93+
"@bazel/typescript": "2.0.2",
9594
"@jsdevtools/coverage-istanbul-loader": "3.0.3",
9695
"@types/babel__core": "7.1.9",
9796
"@types/babel__template": "7.0.2",

‎packages/angular/cli/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Use of this source code is governed by an MIT-style license that can be
44
# found in the LICENSE file at https://angular.io/license
55

6-
load("@npm_bazel_jasmine//:index.bzl", "jasmine_node_test")
6+
load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test")
77
load("//tools:ts_json_schema.bzl", "ts_json_schema")
88
load("//tools:defaults.bzl", "ts_library")
99

‎packages/angular/pwa/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Use of this source code is governed by an MIT-style license that can be
44
# found in the LICENSE file at https://angular.io/license
55

6-
load("@npm_bazel_jasmine//:index.bzl", "jasmine_node_test")
6+
load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test")
77
load("//tools:defaults.bzl", "ts_library")
88
load("//tools:ts_json_schema.bzl", "ts_json_schema")
99

‎packages/angular_devkit/architect/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Use of this source code is governed by an MIT-style license that can be
44
# found in the LICENSE file at https://angular.io/license
55

6-
load("@npm_bazel_jasmine//:index.bzl", "jasmine_node_test")
6+
load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test")
77
load("//tools:defaults.bzl", "ts_library")
88
load("//tools:ts_json_schema.bzl", "ts_json_schema")
99

‎packages/angular_devkit/benchmark/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Use of this source code is governed by an MIT-style license that can be
44
# found in the LICENSE file at https://angular.io/license
55

6-
load("@npm_bazel_jasmine//:index.bzl", "jasmine_node_test")
6+
load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test")
77
load("//tools:defaults.bzl", "ts_library")
88

99
# @external_begin

‎packages/angular_devkit/build_angular/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Use of this source code is governed by an MIT-style license that can be
44
# found in the LICENSE file at https://angular.io/license
55

6-
load("@npm_bazel_jasmine//:index.bzl", "jasmine_node_test")
6+
load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test")
77
load("//tools:defaults.bzl", "ts_library")
88
load("//tools:ts_json_schema.bzl", "ts_json_schema")
99

‎packages/angular_devkit/build_ng_packagr/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Use of this source code is governed by an MIT-style license that can be
44
# found in the LICENSE file at https://angular.io/license
55

6-
load("@npm_bazel_jasmine//:index.bzl", "jasmine_node_test")
6+
load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test")
77
load("//tools:defaults.bzl", "ts_library")
88
load("//tools:ts_json_schema.bzl", "ts_json_schema")
99

‎packages/angular_devkit/build_optimizer/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Use of this source code is governed by an MIT-style license that can be
44
# found in the LICENSE file at https://angular.io/license
55

6-
load("@npm_bazel_jasmine//:index.bzl", "jasmine_node_test")
6+
load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test")
77
load("//tools:defaults.bzl", "ts_library")
88

99
# @external_begin

‎packages/angular_devkit/build_webpack/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Use of this source code is governed by an MIT-style license that can be
44
# found in the LICENSE file at https://angular.io/license
55

6-
load("@npm_bazel_jasmine//:index.bzl", "jasmine_node_test")
6+
load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test")
77
load("//tools:defaults.bzl", "ts_library")
88
load("//tools:ts_json_schema.bzl", "ts_json_schema")
99

‎packages/angular_devkit/core/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@npm_bazel_jasmine//:index.bzl", "jasmine_node_test")
1+
load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test")
22
load("//tools:defaults.bzl", "ts_library")
33

44
# @external_begin

‎packages/angular_devkit/core/node/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Use of this source code is governed by an MIT-style license that can be
44
# found in the LICENSE file at https://angular.io/license
55

6-
load("@npm_bazel_jasmine//:index.bzl", "jasmine_node_test")
6+
load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test")
77
load("//tools:defaults.bzl", "ts_library")
88

99
licenses(["notice"]) # MIT License

‎packages/angular_devkit/schematics/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@npm_bazel_jasmine//:index.bzl", "jasmine_node_test")
1+
load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test")
22
load("//tools:defaults.bzl", "ts_library")
33

44
# @external_begin

‎packages/angular_devkit/schematics/tasks/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@npm_bazel_jasmine//:index.bzl", "jasmine_node_test")
1+
load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test")
22
load("//tools:defaults.bzl", "ts_library")
33

44
# Copyright Google Inc. All Rights Reserved.

‎packages/angular_devkit/schematics/tools/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@npm_bazel_jasmine//:index.bzl", "jasmine_node_test")
1+
load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test")
22
load("//tools:defaults.bzl", "ts_library")
33

44
# Copyright Google Inc. All Rights Reserved.

‎packages/angular_devkit/schematics_cli/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@npm_bazel_jasmine//:index.bzl", "jasmine_node_test")
1+
load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test")
22
load("//tools:defaults.bzl", "ts_library")
33

44
# Copyright Google Inc. All Rights Reserved.

‎packages/ngtools/webpack/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Use of this source code is governed by an MIT-style license that can be
44
# found in the LICENSE file at https://angular.io/license
55

6-
load("@npm_bazel_jasmine//:index.bzl", "jasmine_node_test")
6+
load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test")
77
load("//tools:defaults.bzl", "ts_library")
88

99
# @external_begin

‎packages/schematics/angular/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Use of this source code is governed by an MIT-style license that can be
44
# found in the LICENSE file at https://angular.io/license
55

6-
load("@npm_bazel_jasmine//:index.bzl", "jasmine_node_test")
6+
load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test")
77
load("//tools:defaults.bzl", "ts_library")
88
load("//tools:ts_json_schema.bzl", "ts_json_schema")
99

‎packages/schematics/update/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Use of this source code is governed by an MIT-style license that can be
44
# found in the LICENSE file at https://angular.io/license
55

6-
load("@npm_bazel_jasmine//:index.bzl", "jasmine_node_test")
6+
load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test")
77
load("//tools:defaults.bzl", "ts_library")
88
load("//tools:ts_json_schema.bzl", "ts_json_schema")
99

‎tests/angular_devkit/core/node/jobs/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@npm_bazel_typescript//:index.bzl", "ts_library")
1+
load("@npm//@bazel/typescript:index.bzl", "ts_library")
22

33
# Copyright Google Inc. All Rights Reserved.
44
#

‎tests/angular_devkit/schematics/tools/file-system-engine-host/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@npm_bazel_typescript//:index.bzl", "ts_library")
1+
load("@npm//@bazel/typescript:index.bzl", "ts_library")
22

33
# Copyright Google Inc. All Rights Reserved.
44
#

‎tools/BUILD.bazel

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ nodejs_binary(
1414
"@npm//quicktype-core",
1515
],
1616
entry_point = "quicktype_runner.js",
17-
install_source_map_support = False,
1817
)
1918

2019
platform(

‎tools/build_event_protocol/BUILD.bazel

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
#
33
# Use of this source code is governed by an MIT-style license that can be
44
# found in the LICENSE file at https://angular.io/license
5-
load("@npm_bazel_labs//:index.bzl", "ts_proto_library")
6-
load("@npm_bazel_typescript//:index.bzl", "ts_library")
5+
load("@npm//@bazel/labs//:index.bzl", "ts_proto_library")
6+
load("@npm//@bazel/typescript:index.bzl", "ts_library")
77
load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary")
88

99
ts_proto_library(

‎tools/defaults.bzl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""Re-export of some bazel rules with repository-wide defaults."""
22

3-
load("@npm_bazel_typescript//:index.bzl", _ts_library = "ts_library")
3+
load("@npm//@bazel/typescript:index.bzl", _ts_library = "ts_library")
44

55
_DEFAULT_TSCONFIG_TEST = "//:tsconfig-test.json"
66

0 commit comments

Comments
 (0)