Skip to content

Commit f10c63e

Browse files
jelbournmmalerba
authored andcommitted
chore: update build rules for rxjs supporting bazel (#8875)
1 parent f383b70 commit f10c63e

File tree

12 files changed

+104
-77
lines changed

12 files changed

+104
-77
lines changed

BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ filegroup(
1818
"typescript",
1919
"tslib",
2020
"zone.js",
21-
"rxjs",
2221
"@types",
2322
"tsickle",
2423
"hammerjs",
@@ -33,3 +32,4 @@ filegroup(
3332
"*.d.ts",
3433
]]),
3534
)
35+

WORKSPACE

+12-4
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ workspace(name = "angular_material_src")
44
git_repository(
55
name = "build_bazel_rules_nodejs",
66
remote = "https://github.com/bazelbuild/rules_nodejs.git",
7-
# TODO(jelbourn): use the correct tag here.
8-
commit = "31d36ff2acdf630d1e331f38006cf1a5d303d338",
7+
commit = "0.3.1",
98
)
109

1110
# NOTE: this rule installs nodejs, npm, and yarn, but does NOT install
@@ -24,13 +23,22 @@ load("@io_bazel_rules_sass//sass:sass.bzl", "sass_repositories")
2423
sass_repositories()
2524

2625
# Add TypeScript rules
27-
local_repository(
26+
git_repository(
2827
name = "build_bazel_rules_typescript",
29-
path = "node_modules/@bazel/typescript",
28+
remote = "https://github.com/bazelbuild/rules_typescript.git",
29+
tag = "0.6.0",
3030
)
3131

32+
load("@build_bazel_rules_typescript//:defs.bzl", "ts_repositories")
33+
ts_repositories()
34+
3235
# Add Angular rules
3336
local_repository(
3437
name = "angular",
3538
path = "node_modules/@angular/bazel",
3639
)
40+
41+
local_repository(
42+
name = "rxjs",
43+
path = "node_modules/rxjs/src",
44+
)

package-lock.json

+69-55
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+14-15
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626
"node": ">= 5.4.1"
2727
},
2828
"dependencies": {
29-
"@angular/animations": "^5.0.0",
30-
"@angular/common": "^5.0.0",
31-
"@angular/compiler": "^5.0.0",
32-
"@angular/core": "^5.0.0",
33-
"@angular/forms": "^5.0.0",
34-
"@angular/platform-browser": "^5.0.0",
29+
"@angular/animations": "~5.0.0",
30+
"@angular/common": "~5.0.0",
31+
"@angular/compiler": "~5.0.0",
32+
"@angular/core": "~5.0.0",
33+
"@angular/forms": "~5.0.0",
34+
"@angular/platform-browser": "~5.0.0",
3535
"core-js": "^2.4.1",
3636
"rxjs": "^5.5.5",
3737
"systemjs": "0.19.43",
@@ -40,15 +40,14 @@
4040
"zone.js": "^0.8.12"
4141
},
4242
"devDependencies": {
43-
"@angular/bazel": "^5.0.1",
44-
"@angular/compiler-cli": "^5.0.0",
45-
"@angular/http": "^5.0.0",
46-
"@angular/platform-browser-dynamic": "^5.0.0",
47-
"@angular/platform-server": "^5.0.0",
48-
"@angular/router": "^5.0.0",
43+
"@angular/bazel": "~5.0.0",
44+
"@angular/compiler-cli": "~5.0.0",
45+
"@angular/http": "~5.0.0",
46+
"@angular/platform-browser-dynamic": "~5.0.0",
47+
"@angular/platform-server": "~5.0.0",
48+
"@angular/router": "~5.0.0",
4949
"@angular/upgrade": "^5.0.1",
50-
"@bazel/ibazel": "0.0.1",
51-
"@bazel/typescript": "0.2.x",
50+
"@bazel/ibazel": "^0.1.1",
5251
"@google-cloud/storage": "^1.1.1",
5352
"@types/chalk": "^0.4.31",
5453
"@types/fs-extra": "^4.0.3",
@@ -123,7 +122,7 @@
123122
"tsconfig-paths": "^2.3.0",
124123
"tslint": "^5.8.0",
125124
"tsutils": "^2.6.0",
126-
"typescript": "~2.4.2",
125+
"typescript": "~2.5.2",
127126
"uglify-js": "^2.8.14",
128127
"web-animations-js": "^2.2.5"
129128
}

src/cdk/a11y/BUILD.bazel

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ ng_module(
99
"//src/cdk/coercion",
1010
"//src/cdk/keycodes",
1111
"//src/cdk/platform",
12+
"@rxjs",
1213
],
1314
tsconfig = ":tsconfig-build.json",
1415
)

src/cdk/collections/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ ng_module(
55
name = "collections",
66
srcs = glob(["**/*.ts"], exclude=["**/*.spec.ts"]),
77
module_name = "@angular/cdk/collections",
8-
deps = [],
8+
deps = ["@rxjs"],
99
tsconfig = ":tsconfig-build.json",
1010
)

src/cdk/layout/BUILD.bazel

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ ng_module(
88
deps = [
99
"//src/cdk/coercion",
1010
"//src/cdk/platform",
11+
"@rxjs",
1112
],
1213
tsconfig = ":tsconfig-build.json",
1314
)

src/cdk/observers/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ ng_module(
55
name = "observers",
66
srcs = glob(["**/*.ts"], exclude=["**/*.spec.ts"]),
77
module_name = "@angular/cdk/observers",
8-
deps = [],
8+
deps = ["@rxjs"],
99
tsconfig = ":tsconfig-build.json",
1010
)

src/cdk/overlay/BUILD.bazel

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ ng_module(
1212
"//src/cdk/platform",
1313
"//src/cdk/portal",
1414
"//src/cdk/scrolling",
15+
"@rxjs",
1516
],
1617
tsconfig = ":tsconfig-build.json",
1718
)

0 commit comments

Comments
 (0)