Skip to content
This repository was archived by the owner on Apr 4, 2025. It is now read-only.

Commit d426ac3

Browse files
committed
Update to latest version of angular with idiomatic install of @angular/bazel
1 parent 09eab9c commit d426ac3

File tree

4 files changed

+73
-39
lines changed

4 files changed

+73
-39
lines changed

WORKSPACE

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ http_archive(
2323
# The @angular repo contains rule for building Angular applications
2424
http_archive(
2525
name = "angular",
26-
url = "https://github.com/angular/angular/archive/08e4489cf5a93a352954f1639da5e92112993753.zip",
27-
strip_prefix = "angular-08e4489cf5a93a352954f1639da5e92112993753",
26+
url = "https://github.com/angular/angular/archive/100c7eff255b43b96753c51875681d1883d8ca61.zip",
27+
strip_prefix = "angular-100c7eff255b43b96753c51875681d1883d8ca61",
2828
)
2929

3030
# The @rxjs repo contains targets for building rxjs with bazel
@@ -35,6 +35,14 @@ http_archive(
3535
sha256 = "72b0b4e517f43358f554c125e40e39f67688cd2738a8998b4a266981ed32f403",
3636
)
3737

38+
# Rules for compiling sass
39+
http_archive(
40+
name = "io_bazel_rules_sass",
41+
sha256 = "dbe9fb97d5a7833b2a733eebc78c9c1e3880f676ac8af16e58ccf2139cbcad03",
42+
strip_prefix = "rules_sass-1.11.0",
43+
url = "https://github.com/bazelbuild/rules_sass/archive/1.11.0.zip",
44+
)
45+
3846
# This local_repository rule is needed to prevent `bazel build ...` from
3947
# drilling down into the @rxjs workspace BUILD files in node_modules/rxjs/src.
4048
# In the future this will no longer be needed.

e2e/BUILD.bazel

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ protractor_web_test_suite(
1717
name = "prodserver_test",
1818
data = [
1919
"@angular//packages/bazel/src/protractor/utils",
20+
"@npm//@angular/bazel",
2021
"@npm//protractor",
2122
"@npm//zone.js",
2223
],
@@ -29,6 +30,7 @@ protractor_web_test_suite(
2930
name = "devserver_test",
3031
data = [
3132
"@angular//packages/bazel/src/protractor/utils",
33+
"@npm//@angular/bazel",
3234
"@npm//protractor",
3335
"@npm//zone.js",
3436
],

package.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@
1111
"zone.js": "0.8.26"
1212
},
1313
"devDependencies": {
14-
"@angular/compiler": "github:angular/compiler-builds#bazel",
15-
"@angular/compiler-cli": "github:angular/compiler-cli-builds#bazel",
16-
"@angular/core": "github:angular/core-builds#bazel",
14+
"@angular/bazel": "github:angular/bazel-builds#7.0.0-rc.1+100c7ef",
15+
"@angular/compiler": "github:angular/compiler-builds#7.0.0-rc.1+100c7ef",
16+
"@angular/compiler-cli": "github:angular/compiler-cli-builds#7.0.0-rc.1+100c7ef",
17+
"@angular/core": "github:angular/core-builds#7.0.0-rc.1+100c7ef",
1718
"@bazel/benchmark-runner": "0.1.0",
1819
"@bazel/ibazel": "0.5.0",
19-
"@bazel/karma": "0.20.2",
20-
"@bazel/typescript": "0.20.2",
20+
"@bazel/karma": "0.20.3",
21+
"@bazel/typescript": "0.20.3",
2122
"@types/jasmine": "2.8.8",
2223
"@types/node": "6.0.117",
2324
"clang-format": "1.2.4",

yarn.lock

Lines changed: 55 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,18 @@
22
# yarn lockfile v1
33

44

5-
"@angular/compiler-cli@github:angular/compiler-cli-builds#bazel":
6-
version "7.0.0-rc.0"
7-
resolved "https://codeload.github.com/angular/compiler-cli-builds/tar.gz/6ca25a638bce38f0e58183a715f082bc5efe8039"
5+
"@angular/bazel@github:angular/bazel-builds#7.0.0-rc.1+100c7ef":
6+
version "7.0.0-rc.1"
7+
resolved "https://codeload.github.com/angular/bazel-builds/tar.gz/234b109d7305c8d672f1114ce0a11b22366a2cc1"
8+
dependencies:
9+
"@bazel/typescript" "^0.20.3"
10+
"@types/node" "6.0.84"
11+
shelljs "0.8.2"
12+
tsickle "0.32.1"
13+
14+
"@angular/compiler-cli@github:angular/compiler-cli-builds#7.0.0-rc.1+100c7ef":
15+
version "7.0.0-rc.1"
16+
resolved "https://codeload.github.com/angular/compiler-cli-builds/tar.gz/714002104664c61544333e6bd143b658f995faf5"
817
dependencies:
918
canonical-path "0.0.2"
1019
chokidar "^1.4.2"
@@ -17,15 +26,15 @@
1726
source-map "^0.6.1"
1827
yargs "9.0.1"
1928

20-
"@angular/compiler@github:angular/compiler-builds#bazel":
21-
version "7.0.0-rc.0"
22-
resolved "https://codeload.github.com/angular/compiler-builds/tar.gz/0cb74f349e1b3e367772d8dad390f62026050849"
29+
"@angular/compiler@github:angular/compiler-builds#7.0.0-rc.1+100c7ef":
30+
version "7.0.0-rc.1"
31+
resolved "https://codeload.github.com/angular/compiler-builds/tar.gz/5aa081ac3bdb22055b838ce8888a27aed7441f64"
2332
dependencies:
2433
tslib "^1.9.0"
2534

26-
"@angular/core@github:angular/core-builds#bazel":
27-
version "7.0.0-rc.0"
28-
resolved "https://codeload.github.com/angular/core-builds/tar.gz/4805bfbc6498412791d1e9fdb2cac435cbe63b5c"
35+
"@angular/core@github:angular/core-builds#7.0.0-rc.1+100c7ef":
36+
version "7.0.0-rc.1"
37+
resolved "https://codeload.github.com/angular/core-builds/tar.gz/ea998d8798572e972e76ad3b58cf37a4fe338f94"
2938
dependencies:
3039
tslib "^1.9.0"
3140

@@ -46,9 +55,9 @@
4655
version "0.5.0"
4756
resolved "https://registry.yarnpkg.com/@bazel/ibazel/-/ibazel-0.5.0.tgz#76f269bd60d866e2aa9e86b25c456d18fee2ef54"
4857

49-
"@bazel/[email protected].2":
50-
version "0.20.2"
51-
resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.20.2.tgz#69b440e320eadce2b4c7de922f87c5fc539b6586"
58+
"@bazel/[email protected].3":
59+
version "0.20.3"
60+
resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.20.3.tgz#a63bb82b4887ae8c0d01f3028c6fa4764470851d"
5261
dependencies:
5362
jasmine-core "2.8.0"
5463
karma alexeagle/karma#fa1a84ac881485b5657cb669e9b4e5da77b79f0a
@@ -61,11 +70,11 @@
6170
requirejs "2.3.5"
6271
tmp "0.0.33"
6372

64-
"@bazel/[email protected].2":
65-
version "0.20.2"
66-
resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.20.2.tgz#7e31e2fe23458536e4917bf5ee130d55704c54f5"
73+
"@bazel/[email protected].3", "@bazel/typescript@^0.20.3":
74+
version "0.20.3"
75+
resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.20.3.tgz#51dcc369c2af0d7f2311d6e692d07776492060f4"
6776
dependencies:
68-
protobufjs "5.0.0"
77+
protobufjs "5.0.3"
6978
source-map-support "0.5.9"
7079
tsickle "0.28.0"
7180
tsutils "2.27.2"
@@ -82,6 +91,10 @@
8291
version "6.0.117"
8392
resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.117.tgz#ccfc2506001404708528d657aad9c1b931111646"
8493

94+
95+
version "6.0.84"
96+
resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.84.tgz#193ffe5a9f42864d425ffd9739d95b753c6a1eab"
97+
8598
"@types/node@^6.0.46":
8699
version "6.0.118"
87100
resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.118.tgz#8014a9b1dee0b72b4d7cd142563f1af21241c3a2"
@@ -925,6 +938,10 @@ di@^0.0.1:
925938
version "0.0.1"
926939
resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c"
927940

941+
diff@^3.2.0:
942+
version "3.5.0"
943+
resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
944+
928945
dom-serialize@^2.2.0:
929946
version "2.2.1"
930947
resolved "https://registry.yarnpkg.com/dom-serialize/-/dom-serialize-2.2.1.tgz#562ae8999f44be5ea3076f5419dcd59eb43ac95b"
@@ -1377,16 +1394,6 @@ glob-parent@^2.0.0:
13771394
dependencies:
13781395
is-glob "^2.0.0"
13791396

1380-
glob@^5.0.10:
1381-
version "5.0.15"
1382-
resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
1383-
dependencies:
1384-
inflight "^1.0.4"
1385-
inherits "2"
1386-
minimatch "2 || 3"
1387-
once "^1.3.0"
1388-
path-is-absolute "^1.0.0"
1389-
13901397
glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1:
13911398
version "7.1.3"
13921399
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
@@ -1889,6 +1896,12 @@ [email protected], jasmine-core@~2.8.0:
18891896
version "2.8.0"
18901897
resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e"
18911898

1899+
jasmine-diff@^0.1.3:
1900+
version "0.1.3"
1901+
resolved "https://registry.yarnpkg.com/jasmine-diff/-/jasmine-diff-0.1.3.tgz#93ccc2dcc41028c5ddd4606558074839f2deeaa8"
1902+
dependencies:
1903+
diff "^3.2.0"
1904+
18921905
18931906
version "2.8.0"
18941907
resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-2.8.0.tgz#6b089c0a11576b1f16df11b80146d91d4e8b8a3e"
@@ -2234,7 +2247,7 @@ mimic-fn@^1.0.0:
22342247
version "1.2.0"
22352248
resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
22362249

2237-
"minimatch@2 || 3", minimatch@^3.0.2, minimatch@^3.0.4:
2250+
minimatch@^3.0.2, minimatch@^3.0.4:
22382251
version "3.0.4"
22392252
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
22402253
dependencies:
@@ -2729,13 +2742,13 @@ promisify-call@^2.0.2:
27292742
dependencies:
27302743
with-callback "^1.0.2"
27312744

2732-
2733-
version "5.0.0"
2734-
resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-5.0.0.tgz#4223063233ea96ac063ca2b554035204db524fa1"
2745+
2746+
version "5.0.3"
2747+
resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-5.0.3.tgz#e4dfe9fb67c90b2630d15868249bcc4961467a17"
27352748
dependencies:
27362749
ascli "~1"
27372750
bytebuffer "~5"
2738-
glob "^5.0.10"
2751+
glob "^7.0.5"
27392752
yargs "^3.10.0"
27402753

27412754
@@ -3173,7 +3186,7 @@ shebang-regex@^1.0.0:
31733186
version "1.0.0"
31743187
resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
31753188

3176-
shelljs@^0.8.1:
3189+
shelljs@0.8.2, shelljs@^0.8.1:
31773190
version "0.8.2"
31783191
resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.2.tgz#345b7df7763f4c2340d584abb532c5f752ca9e35"
31793192
dependencies:
@@ -3589,6 +3602,16 @@ [email protected]:
35893602
source-map "^0.6.0"
35903603
source-map-support "^0.5.0"
35913604

3605+
3606+
version "0.32.1"
3607+
resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.32.1.tgz#f16e94ba80b32fc9ebe320dc94fbc2ca7f3521a5"
3608+
dependencies:
3609+
jasmine-diff "^0.1.3"
3610+
minimist "^1.2.0"
3611+
mkdirp "^0.5.1"
3612+
source-map "^0.6.0"
3613+
source-map-support "^0.5.0"
3614+
35923615
[email protected], tslib@^1.8.1, tslib@^1.9.0:
35933616
version "1.9.3"
35943617
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"

0 commit comments

Comments
 (0)