From ed2a47f822f6212192d1cf14a9d1d9fcb682aba2 Mon Sep 17 00:00:00 2001 From: Greg Magolan Date: Tue, 14 Aug 2018 13:21:37 -0700 Subject: [PATCH] build(bazel): update to rules_typescript 0.16.0 & update to tagged rules_webtesting 0.2.1 (#25486) PR Close #25486 --- WORKSPACE | 12 ++++++------ integration/bazel/WORKSPACE | 12 ++++++------ packages/bazel/src/ng_setup_workspace.bzl | 22 +++++++++++++--------- 3 files changed, 25 insertions(+), 21 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index b55254b8ce..b8457970b0 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -20,16 +20,16 @@ http_archive( http_archive( name = "io_bazel_rules_webtesting", - url = "https://github.com/bazelbuild/rules_webtesting/archive/7ffe970bbf380891754487f66c3d680c087d67f2.zip", - strip_prefix = "rules_webtesting-7ffe970bbf380891754487f66c3d680c087d67f2", - sha256 = "4fb0dca8c9a90547891b7ef486592775a523330fc4555c88cd8f09270055c2ce", + url = "https://github.com/bazelbuild/rules_webtesting/archive/0.2.1.zip", + strip_prefix = "rules_webtesting-0.2.1", + sha256 = "7d490aadff9b5262e5251fa69427ab2ffd1548422467cb9f9e1d110e2c36f0fa", ) http_archive( name = "build_bazel_rules_typescript", - url = "https://github.com/bazelbuild/rules_typescript/archive/1d9a4b0087f307e31af91e2b221a6447288994c6.zip", - strip_prefix = "rules_typescript-1d9a4b0087f307e31af91e2b221a6447288994c6", - sha256 = "e17ac3f33d5d3cd2a0c385c4fd28b814d0ad46c6c67ccaef97160be99d7a24eb", + url = "https://github.com/bazelbuild/rules_typescript/archive/0.16.0.zip", + strip_prefix = "rules_typescript-0.16.0", + sha256 = "e65c5639a42e2f6d3f9d2bda62487d6b42734830dda45be1620c3e2b1115070c", ) http_archive( diff --git a/integration/bazel/WORKSPACE b/integration/bazel/WORKSPACE index 392896c092..3a6465f927 100644 --- a/integration/bazel/WORKSPACE +++ b/integration/bazel/WORKSPACE @@ -20,16 +20,16 @@ http_archive( http_archive( name = "io_bazel_rules_webtesting", - url = "https://github.com/bazelbuild/rules_webtesting/archive/8fd9ce0fd9254bde251da0bc373d6cd08e811434.zip", - strip_prefix = "rules_webtesting-8fd9ce0fd9254bde251da0bc373d6cd08e811434", - sha256 = "4baee95fcfadfbaf868707af8accfd1cb98c5d13f808908e0152468bfb47f0f7", + url = "https://github.com/bazelbuild/rules_webtesting/archive/0.2.1.zip", + strip_prefix = "rules_webtesting-0.2.1", + sha256 = "7d490aadff9b5262e5251fa69427ab2ffd1548422467cb9f9e1d110e2c36f0fa", ) http_archive( name = "build_bazel_rules_typescript", - url = "https://github.com/bazelbuild/rules_typescript/archive/1d9a4b0087f307e31af91e2b221a6447288994c6.zip", - strip_prefix = "rules_typescript-1d9a4b0087f307e31af91e2b221a6447288994c6", - sha256 = "e17ac3f33d5d3cd2a0c385c4fd28b814d0ad46c6c67ccaef97160be99d7a24eb", + url = "https://github.com/bazelbuild/rules_typescript/archive/0.16.0.zip", + strip_prefix = "rules_typescript-0.16.0", + sha256 = "e65c5639a42e2f6d3f9d2bda62487d6b42734830dda45be1620c3e2b1115070c", ) http_archive( diff --git a/packages/bazel/src/ng_setup_workspace.bzl b/packages/bazel/src/ng_setup_workspace.bzl index 95c83ee633..18b7e8c0d5 100644 --- a/packages/bazel/src/ng_setup_workspace.bzl +++ b/packages/bazel/src/ng_setup_workspace.bzl @@ -6,15 +6,19 @@ "Install toolchain dependencies" load("@build_bazel_rules_nodejs//:defs.bzl", "yarn_install") +load("@build_bazel_rules_typescript//:defs.bzl", "check_rules_typescript_version") def ng_setup_workspace(): - """This repository rule should be called from your WORKSPACE file. + """This repository rule should be called from your WORKSPACE file. - It creates some additional Bazel external repositories that are used internally - by the Angular rules. - """ - yarn_install( - name = "angular_packager_deps", - package_json = "@angular//packages/bazel/src/ng_package:package.json", - yarn_lock = "@angular//packages/bazel/src/ng_package:yarn.lock", - ) + It creates some additional Bazel external repositories that are used internally + by the Angular rules. + """ + yarn_install( + name = "angular_packager_deps", + package_json = "@angular//packages/bazel/src/ng_package:package.json", + yarn_lock = "@angular//packages/bazel/src/ng_package:yarn.lock", + ) + + # 0.16.0: minimal version required to work with ng_module + check_rules_typescript_version("0.16.0")