Skip to content

Commit ebffde7

Browse files
gregmagolanIgorMinar
gregmagolan
authored and
IgorMinar
committed
build: update to rules_typescript 0.25.1 (angular#28625)
Updated a spot in the compiler which assumed es5 downlevelling get ready for es2015 devmode in the future. PR Close angular#28625
1 parent 9ae14db commit ebffde7

File tree

90 files changed

+174
-1940
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+174
-1940
lines changed

‎BUILD.bazel

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ exports_files([
66
"tsconfig.json",
77
"LICENSE",
88
"protractor-perf.conf.js",
9-
# Copied into the @angular/bazel package
10-
"browser_repositories.bzl",
119
])
1210

1311
filegroup(

‎WORKSPACE

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
88
# path = "../rules_nodejs",
99
#)
1010
#local_repository(
11-
# name = "build_bazel_rules_typescript",
11+
# name = "npm_bazel_typescript",
1212
# path = "../rules_typescript",
1313
#)
1414

@@ -67,7 +67,7 @@ load("//packages/bazel:package.bzl", "rules_angular_dev_dependencies")
6767
rules_angular_dev_dependencies()
6868

6969
# Load karma dependencies
70-
load("@build_bazel_rules_karma//:package.bzl", "rules_karma_dependencies")
70+
load("@npm_bazel_karma//:package.bzl", "rules_karma_dependencies")
7171

7272
rules_karma_dependencies()
7373

@@ -78,12 +78,12 @@ web_test_repositories()
7878

7979
# Temporary work-around for https://github.com/angular/angular/issues/28681
8080
# TODO(gregmagolan): go back to @io_bazel_rules_webtesting browser_repositories
81-
load("@angular//:browser_repositories.bzl", "browser_repositories")
81+
load("@npm_bazel_karma//:browser_repositories.bzl", "browser_repositories")
8282

8383
browser_repositories()
8484

8585
# Setup the rules_typescript tooolchain
86-
load("@build_bazel_rules_typescript//:defs.bzl", "ts_setup_workspace")
86+
load("@npm_bazel_typescript//:defs.bzl", "ts_setup_workspace")
8787

8888
ts_setup_workspace()
8989

‎browser_repositories.bzl

Lines changed: 0 additions & 113 deletions
This file was deleted.

‎docs/BAZEL.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ You can access Bazel with the `yarn bazel` command
2222

2323
The `WORKSPACE` file indicates that our root directory is a
2424
Bazel project. It contains the version of the Bazel rules we
25-
use to execute build steps, from `build_bazel_rules_typescript`.
25+
use to execute build steps, from `npm_bazel_typescript`.
2626
The sources on [GitHub] are published from Google's internal
2727
repository (google3).
2828

‎integration/bazel/WORKSPACE

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ load("@npm//:install_bazel_dependencies.bzl", "install_bazel_dependencies")
5454
install_bazel_dependencies()
5555

5656
# Load karma dependencies
57-
load("@build_bazel_rules_karma//:package.bzl", "rules_karma_dependencies")
57+
load("@npm_bazel_karma//:package.bzl", "rules_karma_dependencies")
5858

5959
rules_karma_dependencies()
6060

@@ -65,12 +65,12 @@ web_test_repositories()
6565

6666
# Temporary work-around for https://github.com/angular/angular/issues/28681
6767
# TODO(gregmagolan): go back to @io_bazel_rules_webtesting browser_repositories
68-
load("@npm_angular_bazel//:browser_repositories.bzl", "browser_repositories")
68+
load("@npm_bazel_karma//:browser_repositories.bzl", "browser_repositories")
6969

7070
browser_repositories()
7171

7272
# Setup the rules_typescript tooolchain
73-
load("@build_bazel_rules_typescript//:defs.bzl", "ts_setup_workspace")
73+
load("@npm_bazel_typescript//:defs.bzl", "ts_setup_workspace")
7474

7575
ts_setup_workspace()
7676

‎integration/bazel/src/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package(default_visibility = ["//visibility:public"])
33
load("@npm_angular_bazel//:index.bzl", "ng_module")
44
load("@build_bazel_rules_nodejs//:defs.bzl", "http_server", "nodejs_binary", "rollup_bundle")
55
load("@build_bazel_rules_nodejs//internal/web_package:web_package.bzl", "web_package")
6-
load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
6+
load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
77

88
# Allow targets under sub-packages to reference the tsconfig.json file
99
exports_files(["tsconfig.json"])

‎integration/bazel/src/hello-world/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package(default_visibility = ["//visibility:public"])
22

3-
load("@build_bazel_rules_karma//:defs.bzl", "ts_web_test_suite")
4-
load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
3+
load("@npm_bazel_karma//:defs.bzl", "ts_web_test_suite")
4+
load("@npm_bazel_typescript//:defs.bzl", "ts_library")
55
load("@io_bazel_rules_sass//sass:sass.bzl", "sass_binary")
66
load("@npm_angular_bazel//:index.bzl", "ng_module", "ng_package")
77

‎integration/bazel/src/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
"@angular/bazel": "packages-dist:bazel",
1919
"@angular/compiler": "packages-dist:compiler",
2020
"@angular/compiler-cli": "packages-dist:compiler-cli",
21-
"@bazel/karma": "0.23.2",
22-
"@bazel/typescript": "0.23.2",
21+
"@bazel/karma": "0.25.1",
22+
"@bazel/typescript": "0.25.1",
2323
"@types/jasmine": "2.8.8",
2424
"@types/source-map": "0.5.1",
2525
"protractor": "5.1.2",
@@ -29,4 +29,4 @@
2929
"postinstall": "ngc -p ./angular-metadata.tsconfig.json",
3030
"//": "TODO(gregmagolan): figure out how to keep dependencies here up to date with the root package.json"
3131
}
32-
}
32+
}

‎integration/bazel/src/yarn.lock

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,21 @@
6565
tslib "^1.9.0"
6666

6767
"@angular/bazel@file:../angular/dist/packages-dist/bazel":
68+
<<<<<<< HEAD
6869
version "0.0.0"
6970
dependencies:
7071
"@angular-devkit/architect" "^0.10.6"
7172
"@angular-devkit/core" "^7.0.4"
7273
"@angular-devkit/schematics" "^7.0.4"
7374
"@bazel/typescript" "^0.21.0"
75+
=======
76+
version "8.0.0-beta.3"
77+
dependencies:
78+
"@angular-devkit/architect" "^0.10.6"
79+
"@angular-devkit/core" "^7.0.4"
80+
"@angular-devkit/schematics" "^7.3.0-rc.0"
81+
"@bazel/typescript" "^0.24.1"
82+
>>>>>>> b052dfada9... build: update to rules_typescript 0.24.1
7483
"@schematics/angular" "^7.0.4"
7584
"@types/node" "6.0.84"
7685
semver "^5.6.0"
@@ -83,7 +92,11 @@
8392
tslib "^1.9.0"
8493

8594
"@angular/compiler-cli@file:../angular/dist/packages-dist/compiler-cli":
95+
<<<<<<< HEAD
8696
version "0.0.0"
97+
=======
98+
version "8.0.0-beta.3"
99+
>>>>>>> b052dfada9... build: update to rules_typescript 0.24.1
87100
dependencies:
88101
canonical-path "1.0.0"
89102
chokidar "^1.4.2"
@@ -98,6 +111,7 @@
98111
yargs "9.0.1"
99112

100113
"@angular/compiler@file:../angular/dist/packages-dist/compiler":
114+
<<<<<<< HEAD
101115
version "0.0.0"
102116
dependencies:
103117
tslib "^1.9.0"
@@ -114,13 +128,16 @@
114128

115129
"@angular/platform-browser@file:../angular/dist/packages-dist/platform-browser":
116130
version "0.0.0"
131+
=======
132+
version "8.0.0-beta.3"
133+
>>>>>>> b052dfada9... build: update to rules_typescript 0.24.1
117134
dependencies:
118135
tslib "^1.9.0"
119136

120-
"@bazel/karma@0.23.2":
121-
version "0.23.2"
122-
resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.23.2.tgz#17421a61cbcc6c917902beaaef88d61f22471f11"
123-
integrity sha512-aNujXKusUjJIkc6CF03LS8AS7ULwNE0MKEL2TlYvnGCZviQ3nKrpRiEtWFmZlT+GrTOeu7AM4t3l4pSdQx/jnw==
137+
"@bazel/karma@0.24.1":
138+
version "0.24.1"
139+
resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.24.1.tgz#eeeec30e0f16cc70283f1b818c80fd8d473066de"
140+
integrity sha512-nBTLTUtRKoV1zM8TeJXHyRthC93Ug+iWc3VAI67WKzJaTzH2NmgTaGBesEPvPd/HJTZi1Zi6tKPIVpu0hOaZVA==
124141
dependencies:
125142
jasmine-core "2.8.0"
126143
karma "^4.0.0"
@@ -134,10 +151,17 @@
134151
semver "5.6.0"
135152
tmp "0.0.33"
136153

154+
<<<<<<< HEAD
137155
"@bazel/typescript@0.23.2":
138156
version "0.23.2"
139157
resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.23.2.tgz#a3ff199880855259d84216cb41644c1d9a0fad14"
140158
integrity sha512-GrTyDW6Fvp/rgnxZGYampB5/QmDWvxtLEtUyMCPa/QXFR1OVxaMWeHxxuFEcES2UKJegqBDKAA8IzX21x4UbEw==
159+
=======
160+
"@bazel/typescript@0.24.1", "@bazel/typescript@^0.24.1":
161+
version "0.24.1"
162+
resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.24.1.tgz#3efdc085c122939b2dd161b7ff589454c50edffc"
163+
integrity sha512-tvdgUlqA5EkSQmQ656G/Dc3LX4ZvqPucOGfQ/ls9fYnG4ZWIh1KgwZq99NbjMS5MAJ+47hQBH+gL6dcRfHOGUg==
164+
>>>>>>> b052dfada9... build: update to rules_typescript 0.24.1
141165
dependencies:
142166
jasmine-core "2.8.0"
143167
protobufjs "5.0.3"

‎integration/bazel/test/e2e/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
1+
load("@npm_bazel_typescript//:defs.bzl", "ts_library")
22
load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite")
33

44
ts_library(

‎modules/benchmarks/src/largeform/ng2/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
load("//tools:defaults.bzl", "ng_module")
2-
load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
2+
load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
33
load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
44

55
package(default_visibility = ["//modules/benchmarks:__subpackages__"])

‎modules/benchmarks/src/largetable/baseline/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
load("//tools:defaults.bzl", "ts_library")
2-
load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
2+
load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
33
load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
44

55
package(default_visibility = ["//modules/benchmarks:__subpackages__"])

‎modules/benchmarks/src/largetable/incremental_dom/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
load("//tools:defaults.bzl", "ts_library")
2-
load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
2+
load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
33
load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
44

55
package(default_visibility = ["//modules/benchmarks:__subpackages__"])

‎modules/benchmarks/src/largetable/iv/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
load("//tools:defaults.bzl", "ts_library")
2-
load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
2+
load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
33
load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
44

55
package(default_visibility = ["//modules/benchmarks:__subpackages__"])

‎modules/benchmarks/src/largetable/ng2/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
load("//tools:defaults.bzl", "ng_module")
2-
load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
2+
load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
33
load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
44

55
package(default_visibility = ["//modules/benchmarks:__subpackages__"])

‎modules/benchmarks/src/largetable/ng2_switch/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
load("//tools:defaults.bzl", "ng_module")
2-
load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
2+
load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
33
load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
44

55
package(default_visibility = ["//modules/benchmarks:__subpackages__"])

‎modules/benchmarks/src/largetable/render3/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package(default_visibility = ["//visibility:public"])
22

33
load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle")
4-
load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
4+
load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
55
load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
66

77
ng_module(

‎modules/benchmarks/src/tree/baseline/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
load("//tools:defaults.bzl", "ts_library")
2-
load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
2+
load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
33
load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
44

55
package(default_visibility = ["//modules/benchmarks:__subpackages__"])

‎modules/benchmarks/src/tree/incremental_dom/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
load("//tools:defaults.bzl", "ts_library")
2-
load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
2+
load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
33
load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
44

55
package(default_visibility = ["//modules/benchmarks:__subpackages__"])

‎modules/benchmarks/src/tree/iv/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
1+
load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
22
load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
33

44
package(default_visibility = ["//modules/benchmarks:__subpackages__"])

‎modules/benchmarks/src/tree/ng1/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
load("//tools:defaults.bzl", "ts_library")
2-
load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
2+
load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
33
load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
44

55
package(default_visibility = ["//modules/benchmarks:__subpackages__"])

‎modules/benchmarks/src/tree/ng2/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
load("//tools:defaults.bzl", "ng_module")
2-
load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
2+
load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
33
load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
44

55
package(default_visibility = ["//modules/benchmarks:__subpackages__"])

0 commit comments

Comments
 (0)