build: simplify bazel dependencies

Author: filipesilva

WORKSPACE

@@ -1,73 +1,55 @@
 workspace(name = "angular_devkit")
 
-BAZEL_SKYLIB_VERSION = "0.3.1"
+# We get Buildifier from here.
 http_archive(
-    name = "bazel_skylib",
-    url = "https://github.com/bazelbuild/bazel-skylib/archive/%s.zip" % BAZEL_SKYLIB_VERSION,
-    strip_prefix = "bazel-skylib-%s" % BAZEL_SKYLIB_VERSION,
-    sha256 = "95518adafc9a2b656667bbf517a952e54ce7f350779d0dd95133db4eb5c27fb1",
-)
-
-RULES_NODEJS_VERSION = "caae26b8cfc29838969e0614ebcb551a0e39ba26"
-http_archive(
-    name = "build_bazel_rules_nodejs",
-    url = "https://github.com/bazelbuild/rules_nodejs/archive/%s.zip" % RULES_NODEJS_VERSION,
-    strip_prefix = "rules_nodejs-%s" % RULES_NODEJS_VERSION,
-    sha256 = "8b6978d03f58e9ce8e3c0034afd879d621f9387f693f5a8e1888241b0538a61f",
+    name = "com_github_bazelbuild_buildtools",
+    url = "https://github.com/bazelbuild/buildtools/archive/0.15.0.zip",
+    strip_prefix = "buildtools-0.15.0",
+    sha256 = "76d1837a86fa6ef5b4a07438f8489f00bfa1b841e5643b618e01232ba884b1fe",
 )
 
-load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories")
-
-check_bazel_version("0.15.0")
-
-node_repositories(package_json = ["//:package.json"])
-
-local_repository(
-    name = "rxjs",
-    path = "node_modules/rxjs/src",
-)
+load("@com_github_bazelbuild_buildtools//buildifier:deps.bzl", "buildifier_dependencies")
+buildifier_dependencies()
 
-RULES_WEBTESTING_VERSION = "0.2.1"
+# The Go toolchain is used for Buildifier.
+# rules_typescript_dependencies() also tries to load it but we add it explicitely so we
+# don't have hidden dependencies. 
+# This also means we need to load it before rules_typescript_dependencies().
 http_archive(
-    name = "io_bazel_rules_webtesting",
-    url = "https://github.com/bazelbuild/rules_webtesting/archive/%s.zip" % RULES_WEBTESTING_VERSION,
-    strip_prefix = "rules_webtesting-%s" % RULES_WEBTESTING_VERSION,
-    sha256 = "7d490aadff9b5262e5251fa69427ab2ffd1548422467cb9f9e1d110e2c36f0fa",
+    name = "io_bazel_rules_go",
+    url = "https://github.com/bazelbuild/rules_go/archive/0.14.0.zip",
+    strip_prefix = "rules_go-0.14.0",
+    sha256 = "9bd7c2743f014e4e112b671098ba1da6aec036fe07093b10ca39a9f81ec5cc33",
 )
 
-RULES_TYPESCRIPT_VERSION = "0.15.3"
+load("@io_bazel_rules_go//go:def.bzl", "go_register_toolchains", "go_rules_dependencies")
+go_rules_dependencies()
+go_register_toolchains()
+
+# Load the TypeScript rules, its dependencies, and setup the workspace.
 http_archive(
     name = "build_bazel_rules_typescript",
-    url = "https://github.com/bazelbuild/rules_typescript/archive/%s.zip" % RULES_TYPESCRIPT_VERSION,
-    strip_prefix = "rules_typescript-%s" % RULES_TYPESCRIPT_VERSION,
-    sha256 = "a2b26ac3fc13036011196063db1bf7f1eae81334449201dc28087ebfa3708c99",
+    url = "https://github.com/bazelbuild/rules_typescript/archive/0.16.1.zip",
+    strip_prefix = "rules_typescript-0.16.1",
+    sha256 = "5b2b0bc63cfcffe7bf97cad2dad3b26a73362f806de66207051f66c87956a995",
 )
 
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_setup_workspace")
+load("@build_bazel_rules_typescript//:package.bzl", "rules_typescript_dependencies")
+# build_bazel_rules_nodejs is loaded transitively through rules_typescript_dependencies.
+rules_typescript_dependencies()
 
+load("@build_bazel_rules_typescript//:defs.bzl", "ts_setup_workspace")
 ts_setup_workspace()
 
-# We get tools like Buildifier from here
-BAZEL_BUILDTOOLS_VERSION = "0.15.0"
-http_archive(
-    name = "com_github_bazelbuild_buildtools",
-    url = "https://github.com/bazelbuild/buildtools/archive/%s.zip" % BAZEL_BUILDTOOLS_VERSION,
-    strip_prefix = "buildtools-%s" % BAZEL_BUILDTOOLS_VERSION,
-    sha256 = "76d1837a86fa6ef5b4a07438f8489f00bfa1b841e5643b618e01232ba884b1fe",
-)
+# Load the nodejs dependencies, check minimum Bazel version, and define the local node_modules.
+load("@build_bazel_rules_nodejs//:package.bzl", "rules_nodejs_dependencies")
+rules_nodejs_dependencies()
 
-# The Go toolchain is used for Buildifier and some TypeScript tooling.
-# We need to use this commit to include Windows path fixes.
-RULES_GO_VERSION = "0.14.0"
-http_archive(
-    name = "io_bazel_rules_go",
-    url = "https://github.com/bazelbuild/rules_go/archive/%s.zip" % RULES_GO_VERSION,
-    strip_prefix = "rules_go-%s" % RULES_GO_VERSION,
-    sha256 = "9bd7c2743f014e4e112b671098ba1da6aec036fe07093b10ca39a9f81ec5cc33",
-)
-
-load("@io_bazel_rules_go//go:def.bzl", "go_register_toolchains", "go_rules_dependencies")
-
-go_rules_dependencies()
+load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories")
+check_bazel_version("0.15.0")
+node_repositories(package_json = ["//:package.json"])
 
-go_register_toolchains()
+local_repository(
+    name = "rxjs",
+    path = "node_modules/rxjs/src",
+)

package.json

@@ -64,6 +64,7 @@
     "typescript": "~2.9.2"
   },
   "devDependencies": {
+    "@bazel/typescript": "0.16.1",
     "@ngtools/json-schema": "^1.1.0",
     "@types/copy-webpack-plugin": "^4.4.1",
     "@types/express": "^4.16.0",

packages/angular/cli/BUILD

@@ -5,7 +5,7 @@
 
 licenses(["notice"])  # MIT
 
-load("//tools:defaults.bzl", "ts_library")
+load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
 
 package(default_visibility = ["//visibility:public"])
 

packages/angular/pwa/BUILD

@@ -5,7 +5,7 @@
 
 licenses(["notice"])  # MIT
 
-load("//tools:defaults.bzl", "ts_library")
+load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -27,7 +27,6 @@ ts_library(
     # Borrow the compile-time deps of the typescript compiler
     # Just to avoid an extra npm install action.
     node_modules = "@build_bazel_rules_typescript_tsc_wrapped_deps//:node_modules",
-    tsconfig = "//:tsconfig.json",
     deps = [
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/schematics",

packages/angular_devkit/architect/BUILD

@@ -5,7 +5,7 @@
 
 licenses(["notice"])  # MIT
 
-load("//tools:defaults.bzl", "ts_library")
+load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
 
 package(default_visibility = ["//visibility:public"])
 

packages/angular_devkit/architect_cli/BUILD

@@ -4,7 +4,7 @@
 # found in the LICENSE file at https://angular.io/license
 package(default_visibility = ["//visibility:public"])
 
-load("//tools:defaults.bzl", "ts_library")
+load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
 
 licenses(["notice"])  # MIT
 

packages/angular_devkit/build_optimizer/BUILD

@@ -5,7 +5,7 @@
 
 licenses(["notice"])  # MIT
 
-load("//tools:defaults.bzl", "ts_library")
+load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
 load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
 
 package(default_visibility = ["//visibility:public"])

packages/angular_devkit/core/BUILD

@@ -4,7 +4,7 @@
 # found in the LICENSE file at https://angular.io/license
 package(default_visibility = ["//visibility:public"])
 
-load("//tools:defaults.bzl", "ts_library")
+load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
 load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
 
 licenses(["notice"])  # MIT License

packages/angular_devkit/schematics/BUILD

@@ -4,7 +4,7 @@
 # found in the LICENSE file at https://angular.io/license
 package(default_visibility = ["//visibility:public"])
 
-load("//tools:defaults.bzl", "ts_library")
+load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
 load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
 
 licenses(["notice"])  # MIT License

packages/angular_devkit/schematics_cli/BUILD

@@ -4,7 +4,7 @@
 # found in the LICENSE file at https://angular.io/license
 package(default_visibility = ["//visibility:public"])
 
-load("//tools:defaults.bzl", "ts_library")
+load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
 
 licenses(["notice"])  # MIT License
 
@@ -23,7 +23,6 @@ ts_library(
     ),
     module_name = "@angular-devkit/schematics-cli",
     module_root = "bin",
-    tsconfig = "//:tsconfig.json",
     deps = [
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/core:node",