Skip to content

Commit aeb0180

Browse files
josephperrottjelbourn
authored andcommitted
build: update to @angular/bazel 0.27.0
1 parent fe26614 commit aeb0180

File tree

11 files changed

+212
-180
lines changed

11 files changed

+212
-180
lines changed

.bazelrc

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,3 +101,33 @@ build:remote --remote_accept_cached=true
101101
# Load any settings which are specific to the current user. Needs to be *last* statement
102102
# in this config, as the user configuration should be able to overwrite flags from this file.
103103
try-import .bazelrc.user
104+
105+
106+
107+
# This option is changed to true in Bazel 0.27 and exposes a possible
108+
# regression in Bazel 0.27.0.
109+
# Error observed is in npm_package target `//packages/common/locales:package`:
110+
# ```
111+
# ERROR: /home/circleci/ng/packages/common/locales/BUILD.bazel:13:1: Assembling
112+
# npm package packages/common/locales/package failed: No usable spawn strategy found
113+
# for spawn with mnemonic SkylarkAction. Your --spawn_strategyor --strategy flags
114+
# are probably too strict. Visit https://github.com/bazelbuild/bazel/issues/7480 for
115+
# migration advises
116+
# ```
117+
# Suspect is https://github.com/bazelbuild/rules_nodejs/blob/master/internal/npm_package/npm_package.bzl#L75-L82:
118+
# ```
119+
# execution_requirements = {
120+
# # Never schedule this action remotely because it's not computationally expensive.
121+
# # It just copies files into a directory; it's not worth copying inputs and outputs to a remote worker.
122+
# # Also don't run it in a sandbox, because it resolves an absolute path to the bazel-out directory
123+
# # allowing the .pack and .publish runnables to work with no symlink_prefix
124+
# # See https://github.com/bazelbuild/rules_nodejs/issues/187
125+
# "local": "1",
126+
# },
127+
# ```
128+
build --incompatible_list_based_execution_strategy_selection=false
129+
test --incompatible_list_based_execution_strategy_selection=false
130+
run --incompatible_list_based_execution_strategy_selection=false
131+
build --incompatible_new_actions_api=false
132+
build --incompatible_depset_is_not_iterable=false
133+
build --incompatible_no_support_tools_in_action_inputs=false

WORKSPACE

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,22 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
55
# Add NodeJS rules (explicitly used for sass bundle rules)
66
http_archive(
77
name = "build_bazel_rules_nodejs",
8-
sha256 = "e04a82a72146bfbca2d0575947daa60fda1878c8d3a3afe868a8ec39a6b968bb",
9-
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.31.1/rules_nodejs-0.31.1.tar.gz"],
8+
sha256 = "6d4edbf28ff6720aedf5f97f9b9a7679401bf7fca9d14a0fff80f644a99992b4",
9+
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.32.2/rules_nodejs-0.32.2.tar.gz"],
1010
)
1111

1212
# Add sass rules
1313
http_archive(
1414
name = "io_bazel_rules_sass",
15-
sha256 = "f404a88872c5ffe9af7f5d54be35add624164b852c29c265843ba172bb0c7ac4",
16-
strip_prefix = "rules_sass-9a00e557c32ac0f26e5d3c66d1d17316874027b3",
17-
url = "https://github.com/bazelbuild/rules_sass/archive/9a00e557c32ac0f26e5d3c66d1d17316874027b3.zip",
15+
sha256 = "4f05239080175a3f4efa8982d2b7775892d656bb47e8cf56914d5f9441fb5ea6",
16+
strip_prefix = "rules_sass-86ca977cf2a8ed481859f83a286e164d07335116",
17+
url = "https://github.com/bazelbuild/rules_sass/archive/86ca977cf2a8ed481859f83a286e164d07335116.zip",
1818
)
1919

2020
load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories", "yarn_install")
2121

22-
# The minimum bazel version to use with this repo is 0.26.1
23-
check_bazel_version("0.26.1")
22+
# The minimum bazel version to use with this repo is 0.27.0
23+
check_bazel_version("0.27.0")
2424

2525
node_repositories(
2626
# For deterministic builds, specify explicit NodeJS and Yarn versions.

package.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,13 @@
6363
"@angular/platform-server": "^8.0.1",
6464
"@angular/router": "^8.0.1",
6565
"@angular/upgrade": "^8.0.1",
66-
"@bazel/bazel": "0.26.1",
66+
"@bazel/bazel": "^0.27.0",
67+
"@bazel/hide-bazel-files": "0.32.2",
6768
"@bazel/buildifier": "^0.25.1",
6869
"@bazel/ibazel": "^0.10.3",
69-
"@bazel/jasmine": "0.31.1",
70-
"@bazel/karma": "0.31.1",
71-
"@bazel/typescript": "0.31.1",
70+
"@bazel/jasmine": "0.32.2",
71+
"@bazel/karma": "0.32.2",
72+
"@bazel/typescript": "0.32.2",
7273
"@firebase/app-types": "^0.3.2",
7374
"@octokit/rest": "^15.9.4",
7475
"@schematics/angular": "^8.0.3",
@@ -132,7 +133,7 @@
132133
"moment": "^2.18.1",
133134
"node-sass": "^4.11.0",
134135
"parse5": "^5.0.0",
135-
"protractor": "^5.4.1",
136+
"protractor": "^5.4.2",
136137
"resolve-bin": "^0.4.0",
137138
"rollup": "^0.56.3",
138139
"rollup-plugin-alias": "^1.4.0",

packages.bzl

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -150,22 +150,22 @@ ROLLUP_GLOBALS.update({
150150

151151
# UMD bundles for Angular packages and subpackges we depend on for development and testing.
152152
ANGULAR_LIBRARY_UMDS = [
153-
"@npm//node_modules/@angular/animations:bundles/animations-browser.umd.js",
154-
"@npm//node_modules/@angular/animations:bundles/animations.umd.js",
155-
"@npm//node_modules/@angular/common:bundles/common-http-testing.umd.js",
156-
"@npm//node_modules/@angular/common:bundles/common-http.umd.js",
157-
"@npm//node_modules/@angular/common:bundles/common-testing.umd.js",
158-
"@npm//node_modules/@angular/common:bundles/common.umd.js",
159-
"@npm//node_modules/@angular/compiler:bundles/compiler-testing.umd.js",
160-
"@npm//node_modules/@angular/compiler:bundles/compiler.umd.js",
161-
"@npm//node_modules/@angular/core:bundles/core-testing.umd.js",
162-
"@npm//node_modules/@angular/core:bundles/core.umd.js",
163-
"@npm//node_modules/@angular/elements:bundles/elements.umd.js",
164-
"@npm//node_modules/@angular/forms:bundles/forms.umd.js",
165-
"@npm//node_modules/@angular/platform-browser-dynamic:bundles/platform-browser-dynamic-testing.umd.js",
166-
"@npm//node_modules/@angular/platform-browser-dynamic:bundles/platform-browser-dynamic.umd.js",
167-
"@npm//node_modules/@angular/platform-browser:bundles/platform-browser-animations.umd.js",
168-
"@npm//node_modules/@angular/platform-browser:bundles/platform-browser-testing.umd.js",
169-
"@npm//node_modules/@angular/platform-browser:bundles/platform-browser.umd.js",
170-
"@npm//node_modules/@angular/router:bundles/router.umd.js",
153+
"@npm//:node_modules/@angular/animations/bundles/animations-browser.umd.js",
154+
"@npm//:node_modules/@angular/animations/bundles/animations.umd.js",
155+
"@npm//:node_modules/@angular/common/bundles/common-http-testing.umd.js",
156+
"@npm//:node_modules/@angular/common/bundles/common-http.umd.js",
157+
"@npm//:node_modules/@angular/common/bundles/common-testing.umd.js",
158+
"@npm//:node_modules/@angular/common/bundles/common.umd.js",
159+
"@npm//:node_modules/@angular/compiler/bundles/compiler-testing.umd.js",
160+
"@npm//:node_modules/@angular/compiler/bundles/compiler.umd.js",
161+
"@npm//:node_modules/@angular/core/bundles/core-testing.umd.js",
162+
"@npm//:node_modules/@angular/core/bundles/core.umd.js",
163+
"@npm//:node_modules/@angular/elements/bundles/elements.umd.js",
164+
"@npm//:node_modules/@angular/forms/bundles/forms.umd.js",
165+
"@npm//:node_modules/@angular/platform-browser-dynamic/bundles/platform-browser-dynamic-testing.umd.js",
166+
"@npm//:node_modules/@angular/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.js",
167+
"@npm//:node_modules/@angular/platform-browser/bundles/platform-browser-animations.umd.js",
168+
"@npm//:node_modules/@angular/platform-browser/bundles/platform-browser-testing.umd.js",
169+
"@npm//:node_modules/@angular/platform-browser/bundles/platform-browser.umd.js",
170+
"@npm//:node_modules/@angular/router/bundles/router.umd.js",
171171
]

src/e2e-app/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ ts_devserver(
100100
scripts = [
101101
":devserver-configure.js",
102102
"//tools/rxjs:rxjs_umd_modules",
103-
"@npm//node_modules/tslib:tslib.js",
103+
"@npm//:node_modules/tslib/tslib.js",
104104
] + ANGULAR_LIBRARY_UMDS,
105105
# Serving path of the bundle that serves all files specified in "deps" and "scripts".
106106
serving_path = "/bundle.js",

src/material-experimental/mdc-checkbox/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ ng_test_library(
8282

8383
ng_web_test_suite(
8484
name = "unit_tests",
85-
static_files = ["@npm//node_modules/@material/checkbox:dist/mdc.checkbox.js"],
85+
static_files = ["@npm//:node_modules/@material/checkbox/dist/mdc.checkbox.js"],
8686
deps = [
8787
":checkbox_tests_lib",
8888
"//src/material-experimental:mdc_require_config.js",

0 commit comments

Comments
 (0)