build: Update to latest bazel rules

alexeagle · hansl · commit 3eaa98863f9d · 2018-06-05T17:55:15.000-07:00
diff --git a/WORKSPACE b/WORKSPACE
@@ -1,25 +1,27 @@
 workspace(name = "angular_devkit")
 
-git_repository(
+http_archive(
     name = "build_bazel_rules_nodejs",
-    remote = "https://github.com/bazelbuild/rules_nodejs.git",
-    tag = "0.3.1",
+    url = "https://github.com/bazelbuild/rules_nodejs/archive/0.4.1.zip",
+    strip_prefix = "rules_nodejs-0.4.1",
+    sha256 = "e9bc013417272b17f302dc169ad597f05561bb277451f010043f4da493417607",
 )
 
 load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories")
 
 check_bazel_version("0.9.0")
 node_repositories(package_json = ["//:package.json"])
 
-git_repository(
+http_archive(
     name = "build_bazel_rules_typescript",
-    remote = "https://github.com/bazelbuild/rules_typescript.git",
-    tag = "0.7.1",
+    url = "https://github.com/bazelbuild/rules_typescript/archive/0.10.1.zip",
+    strip_prefix = "rules_typescript-0.10.1",
+    sha256 = "a2c81776a4a492ff9f878f9705639f5647bef345f7f3e1da09c9eeb8dec80485",
 )
 
-load("@build_bazel_rules_typescript//:setup.bzl", "ts_setup_workspace")
+load("@build_bazel_rules_typescript//:defs.bzl", "ts_setup_workspace")
 
-ts_setup_workspace(default_tsconfig = "@angular_devkit//:tsconfig.json")
+ts_setup_workspace()
 
 # We get tools like Buildifier from here
 git_repository(
diff --git a/packages/angular_devkit/build_optimizer/BUILD b/packages/angular_devkit/build_optimizer/BUILD
@@ -5,7 +5,7 @@
 
 licenses(["notice"])  # MIT
 
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("//tools:defaults.bzl", "ts_library")
 
 package(default_visibility = ["//visibility:public"])
 
diff --git a/packages/angular_devkit/core/BUILD b/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("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("//tools:defaults.bzl", "ts_library")
 
 licenses(["notice"])  # MIT License
 
diff --git a/packages/angular_devkit/schematics/BUILD b/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("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("//tools:defaults.bzl", "ts_library")
 
 licenses(["notice"])  # MIT License
 
diff --git a/packages/angular_devkit/schematics_cli/BUILD b/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("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("//tools:defaults.bzl", "ts_library")
 
 licenses(["notice"])  # MIT License
 
diff --git a/tools/BUILD b/tools/BUILD
@@ -0,0 +1 @@
+# Marker file indicating this directory is a Bazel package
diff --git a/tools/bazel.rc b/tools/bazel.rc
diff --git a/tools/defaults.bzl b/tools/defaults.bzl
@@ -0,0 +1,9 @@
+"""Re-export of some bazel rules with repository-wide defaults."""
+load("@build_bazel_rules_typescript//:defs.bzl", _ts_library = "ts_library")
+
+DEFAULT_TSCONFIG = "//:tsconfig.json"
+
+def ts_library(tsconfig = None, **kwargs):
+  if not tsconfig:
+    tsconfig = DEFAULT_TSCONFIG
+  _ts_library(tsconfig = tsconfig, **kwargs)
diff --git a/tsconfig.json b/tsconfig.json
@@ -46,6 +46,9 @@
       "@angular-devkit/build_optimizer": [ "./packages/angular_devkit/build_optimizer/src/index" ]
     }
   },
+  "bazelOptions": {
+    "suppressTsconfigOverrideWarnings": true
+  },
   "exclude": [
     "bazel-*/**/*",
     "dist/**/*",

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Marker file indicating this directory is a Bazel package`