Skip to content

Commit 8e3c7dc

Browse files
author
Keen Yee Liau
committed
build: Update Bazel workspace
While doing a Bazel query using Bazel 0.21.0, Bazel complains that the http_archive must now be an explicit rule. This commit fixes that. In addition, versions for rules_typescript and angular have also been updated.
1 parent 36eba0c commit 8e3c7dc

File tree

4 files changed

+22
-28
lines changed

4 files changed

+22
-28
lines changed

WORKSPACE

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
workspace(name = "angular_cli")
22

3+
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
4+
35
# This is required by Angular Workspace
46
http_archive(
57
name = "bazel_skylib",
@@ -19,8 +21,9 @@ http_archive(
1921
# Load the TypeScript rules, its dependencies, and setup the workspace.
2022
http_archive(
2123
name = "build_bazel_rules_typescript",
22-
url = "https://github.com/bazelbuild/rules_typescript/archive/8ea1a55cf5cf8be84ddfeefc0940769b80da792f.zip",
23-
strip_prefix = "rules_typescript-8ea1a55cf5cf8be84ddfeefc0940769b80da792f",
24+
url = "https://github.com/bazelbuild/rules_typescript/archive/0.22.1.zip",
25+
strip_prefix = "rules_typescript-0.22.1",
26+
sha256 = "351abe89b291a3b3d6af38d9d04c6270f5d2ed8781e2fda25bc65fd12db25e66",
2427
)
2528

2629
load("@build_bazel_rules_typescript//:package.bzl", "rules_typescript_dependencies")
@@ -37,9 +40,9 @@ go_register_toolchains()
3740
# TS API Guardian resides in Angular
3841
http_archive(
3942
name = "angular",
40-
url = "https://github.com/angular/angular/archive/7.1.0-rc.0.zip",
41-
strip_prefix = "angular-7.1.0-rc.0",
42-
sha256 = "dbf3ae2d60b5384715bc002c695be0141f8c9219396ac1edbdc7023bd400c8a1",
43+
url = "https://github.com/angular/angular/archive/7.2.0.zip",
44+
strip_prefix = "angular-7.2.0",
45+
sha256 = "8a4915a524f3fed17424da4b77cd7a943fbbddba44275f06671493339713914b",
4346
)
4447

4548
load("@angular//:index.bzl", "ng_setup_workspace")

etc/api/angular_devkit/schematics/src/_golden-api.d.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,7 @@ export declare function template<T>(options: T): Rule;
566566

567567
export declare const TEMPLATE_FILENAME_RE: RegExp;
568568

569-
export declare const Tree: TreeConstructor;
569+
export declare type Tree = TreeInterface;
570570

571571
export interface TreeConstructor {
572572
branch(tree: TreeInterface): TreeInterface;

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@
7474
"devDependencies": {
7575
"@angular/compiler": "^7.2.0-rc.0",
7676
"@angular/compiler-cli": "^7.2.0-rc.0",
77-
"@bazel/karma": "^0.20.3",
78-
"@bazel/typescript": "0.20.3",
77+
"@bazel/karma": "^0.22.1",
78+
"@bazel/typescript": "0.22.1",
7979
"@ngtools/json-schema": "^1.1.0",
8080
"@types/copy-webpack-plugin": "^4.4.1",
8181
"@types/express": "^4.16.0",

yarn.lock

+11-20
Original file line numberDiff line numberDiff line change
@@ -195,10 +195,10 @@
195195
lodash "^4.17.10"
196196
to-fast-properties "^2.0.0"
197197

198-
"@bazel/karma@^0.20.3":
199-
version "0.20.3"
200-
resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.20.3.tgz#a63bb82b4887ae8c0d01f3028c6fa4764470851d"
201-
integrity sha512-IgWfTpK9XLEI977DS2kHIEO1QfFTEOBxeNDDjHtd1onmzyMCLROphTOBZ/g42ybUIWyJhS9DK4U3bLSMQE0Bng==
198+
"@bazel/karma@^0.22.1":
199+
version "0.22.1"
200+
resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.22.1.tgz#1bd7028b7939e19d67a94a95ea8e7afada679a16"
201+
integrity sha512-QPJbvCvxpQF4Wvcrl8efQY095+5OMh/uCPB7REGD728KmFKCPz0R/RhaU5dyNOoaZlR7yTGPkvVcN0nNUKqKKQ==
202202
dependencies:
203203
jasmine-core "2.8.0"
204204
karma alexeagle/karma#fa1a84ac881485b5657cb669e9b4e5da77b79f0a
@@ -209,16 +209,17 @@
209209
karma-sauce-launcher "1.2.0"
210210
karma-sourcemap-loader "0.3.7"
211211
requirejs "2.3.5"
212+
semver "5.6.0"
212213
tmp "0.0.33"
213214

214-
"@bazel/typescript@0.20.3":
215-
version "0.20.3"
216-
resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.20.3.tgz#51dcc369c2af0d7f2311d6e692d07776492060f4"
217-
integrity sha512-BZmfzaNkgS++53CGEUk5p9FXOG+k8FNWCDbxzYljoIGP60aIkw4UgRQ24ReBwhCMg6M6KW609yje7AvDZkA6bg==
215+
"@bazel/typescript@0.22.1":
216+
version "0.22.1"
217+
resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.22.1.tgz#b52c00e8560019e2f9d273d45c04785e0ec9d9bd"
218+
integrity sha512-88DaCCnNg8rPlKP0eAQEZuoiJkEPeiItpUS3oBR1sFQNBRJb56D25ahK8+N6LJk4qaH+ZQ1/AHOPDhfEEWvDzA==
218219
dependencies:
219220
protobufjs "5.0.3"
221+
semver "5.6.0"
220222
source-map-support "0.5.9"
221-
tsickle "0.28.0"
222223
tsutils "2.27.2"
223224

224225
"@ngtools/json-schema@^1.1.0":
@@ -5597,7 +5598,7 @@ [email protected]:
55975598
dependencies:
55985599
graceful-fs "^4.1.2"
55995600

5600-
karma@alexeagle/karma#fa1a84ac881485b5657cb669e9b4e5da77b79f0a:
5601+
"karma@github:alexeagle/karma#fa1a84ac881485b5657cb669e9b4e5da77b79f0a":
56015602
version "1.7.1"
56025603
resolved "https://codeload.github.com/alexeagle/karma/tar.gz/fa1a84ac881485b5657cb669e9b4e5da77b79f0a"
56035604
dependencies:
@@ -9954,16 +9955,6 @@ ts-node@^5.0.0:
99549955
source-map-support "^0.5.3"
99559956
yn "^2.0.0"
99569957

9957-
9958-
version "0.28.0"
9959-
resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.28.0.tgz#6cd6fa004766c6ad9261b599c83866ee97cc7875"
9960-
integrity sha512-cb/Z4NlKMPGiIIbgmklfBJIxDl4EQoYqC+0/BnPxZWzWcUvikeOHFkkkEmabJVqKh47jUqOwU/uMAu6UvhicZg==
9961-
dependencies:
9962-
minimist "^1.2.0"
9963-
mkdirp "^0.5.1"
9964-
source-map "^0.6.0"
9965-
source-map-support "^0.5.0"
9966-
99679958
tsickle@>=0.34.0:
99689959
version "0.34.0"
99699960
resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.34.0.tgz#10187fa6401a288a65efb93a60bf28b2ff95f90b"

0 commit comments

Comments
 (0)