Use default_tsconfig on ts_repositories

This prevents us repeating the tsconfig attribute everywhere, and possibly having different tsconfig for different targets
angular · Dec 13, 2017 · 120962f · 120962f
1 parent add3589
commit 120962f
Show file tree

Hide file tree

Showing 33 changed files with 12 additions and 42 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -16,12 +16,14 @@ node_repositories(package_json = ["//:package.json"])
 git_repository(
     name = "build_bazel_rules_typescript",
     remote = "https://github.com/bazelbuild/rules_typescript.git",
-    tag = "0.6.0",
+    commit = "d734cc534c4a7a631862c422386eec4ca4a00e71",
 )
 
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_repositories")
+load("@build_bazel_rules_typescript//:setup.bzl", "ts_setup_workspace")
 
-ts_repositories()
+ts_setup_workspace(
+    default_tsconfig = "@angular_src//packages:tsconfig-build.json"
+)
 
 local_repository(
     name = "angular",

diff --git a/packages/BUILD.bazel b/packages/BUILD.bazel
@@ -5,16 +5,9 @@ exports_files([
     "tsconfig.json",
 ])
 
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_config", "ts_library")
-
-ts_config(
-    name = "tsconfig",
-    src = ":tsconfig-build.json",
-    deps = [],
-)
+load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
 
 ts_library(
     name = "types",
     srcs = glob(["*.ts"]),
-    tsconfig = ":tsconfig",
 )
diff --git a/packages/animations/BUILD.bazel b/packages/animations/BUILD.bazel
@@ -11,7 +11,6 @@ ts_library(
         ],
     ),
     module_name = "@angular/animations",
-    tsconfig = "//packages:tsconfig",
     deps = [
         "//packages/core",
     ],

diff --git a/packages/animations/browser/BUILD.bazel b/packages/animations/browser/BUILD.bazel
@@ -11,7 +11,6 @@ ts_library(
         ],
     ),
     module_name = "@angular/animations/browser",
-    tsconfig = "//packages:tsconfig",
     deps = [
         "//packages/animations",
     ],

diff --git a/packages/animations/browser/test/BUILD.bazel b/packages/animations/browser/test/BUILD.bazel
@@ -6,7 +6,6 @@ ts_library(
     name = "test",
     testonly = 1,
     srcs = glob(["**/*.ts"]),
-    tsconfig = "//packages:tsconfig",
     deps = [
         "//packages:types",
         "//packages/animations",

diff --git a/packages/animations/browser/testing/BUILD.bazel b/packages/animations/browser/testing/BUILD.bazel
@@ -7,7 +7,6 @@ ts_library(
     testonly = 1,
     srcs = glob(["**/*.ts"]),
     module_name = "@angular/animations/browser/testing",
-    tsconfig = "//packages:tsconfig",
     deps = [
         "//packages/animations",
         "//packages/animations/browser",

diff --git a/packages/animations/test/BUILD.bazel b/packages/animations/test/BUILD.bazel
@@ -6,7 +6,6 @@ ts_library(
     name = "test",
     testonly = 1,
     srcs = glob(["test/**/*.ts"]),
-    tsconfig = "//packages:tsconfig",
     deps = [
         "//packages:types",
         "//packages/animations",

diff --git a/packages/bazel/src/ng_module.bzl b/packages/bazel/src/ng_module.bzl
@@ -238,10 +238,15 @@ NG_MODULE_ATTRIBUTES = {
     "_supports_workers": attr.bool(default = True),
 }
 
+# This is created by the ts_repositories() repository rule
+load("@build_bazel_rules_typescript_install//:tsconfig.bzl", "get_default_tsconfig")
+
 ng_module = rule(
     implementation = _ng_module_impl,
     attrs = COMMON_ATTRIBUTES + NG_MODULE_ATTRIBUTES + {
-        "tsconfig": attr.label(allow_files = True, single_file = True),
+        "tsconfig": attr.label(
+          default = get_default_tsconfig(),
+          allow_files = True, single_file = True),
 
         # @// is special syntax for the "main" repository
         # The default assumes the user specified a target "node_modules" in their

diff --git a/packages/common/BUILD.bazel b/packages/common/BUILD.bazel
@@ -11,7 +11,6 @@ ts_library(
         ],
     ),
     module_name = "@angular/common",
-    tsconfig = "//packages:tsconfig",
     deps = [
         "//packages/core",
         "@rxjs",

diff --git a/packages/common/http/BUILD.bazel b/packages/common/http/BUILD.bazel
@@ -11,7 +11,6 @@ ts_library(
         ],
     ),
     module_name = "@angular/common/http",
-    tsconfig = "//packages:tsconfig",
     deps = [
         "//packages/common",
         "//packages/core",

diff --git a/packages/common/http/testing/BUILD.bazel b/packages/common/http/testing/BUILD.bazel
@@ -7,7 +7,6 @@ ts_library(
     testonly = 1,
     srcs = glob(["testing/**/*.ts"]),
     module_name = "@angular/common/http/testing",
-    tsconfig = "//packages:tsconfig",
     deps = [
         "//packages/common/http",
     ],

diff --git a/packages/common/testing/BUILD.bazel b/packages/common/testing/BUILD.bazel
@@ -7,7 +7,6 @@ ts_library(
     testonly = 1,
     srcs = glob(["**/*.ts"]),
     module_name = "@angular/common/testing",
-    tsconfig = "//packages:tsconfig",
     deps = [
         "//packages/common",
         "//packages/core",

diff --git a/packages/compiler/BUILD.bazel b/packages/compiler/BUILD.bazel
@@ -11,5 +11,4 @@ ts_library(
         ],
     ),
     module_name = "@angular/compiler",
-    tsconfig = "//packages:tsconfig",
 )
diff --git a/packages/compiler/test/BUILD.bazel b/packages/compiler/test/BUILD.bazel
@@ -6,7 +6,6 @@ ts_library(
     name = "test",
     testonly = 1,
     srcs = glob(["**/*.ts"]),
-    tsconfig = "//packages:tsconfig",
     deps = [
         "//packages:types",
         "//packages/common",

diff --git a/packages/compiler/testing/BUILD.bazel b/packages/compiler/testing/BUILD.bazel
@@ -7,6 +7,5 @@ ts_library(
     testonly = 1,
     srcs = glob(["**/*.ts"]),
     module_name = "@angular/compiler/testing",
-    tsconfig = "//packages:tsconfig",
     deps = ["//packages/compiler"],
 )
diff --git a/packages/core/BUILD.bazel b/packages/core/BUILD.bazel
@@ -12,7 +12,6 @@ ng_module(
         ],
     ),
     module_name = "@angular/core",
-    tsconfig = "//packages:tsconfig",
     deps = [
         "@rxjs",
     ],

diff --git a/packages/core/test/BUILD.bazel b/packages/core/test/BUILD.bazel
@@ -7,7 +7,6 @@ ts_library(
     name = "test_lib",
     testonly = 1,
     srcs = glob(["**/*.ts"]),
-    tsconfig = "//packages:tsconfig",
     deps = [
         "//packages/animations",
         "//packages/animations/browser",

diff --git a/packages/core/testing/BUILD.bazel b/packages/core/testing/BUILD.bazel
@@ -7,7 +7,6 @@ ts_library(
     testonly = 1,
     srcs = glob(["**/*.ts"]),
     module_name = "@angular/core/testing",
-    tsconfig = "//packages:tsconfig",
     deps = [
         "//packages:types",
         "//packages/core",

diff --git a/packages/http/BUILD.bazel b/packages/http/BUILD.bazel
@@ -11,7 +11,6 @@ ts_library(
         ],
     ),
     module_name = "@angular/http",
-    tsconfig = "//packages:tsconfig",
     deps = [
         "//packages/core",
         "//packages/platform-browser",

diff --git a/packages/http/testing/BUILD.bazel b/packages/http/testing/BUILD.bazel
@@ -7,7 +7,6 @@ ts_library(
     testonly = 1,
     srcs = glob(["**/*.ts"]),
     module_name = "@angular/http/testing",
-    tsconfig = "//packages:tsconfig",
     deps = [
         "//packages/core",
         "//packages/http",

diff --git a/packages/platform-browser-dynamic/BUILD.bazel b/packages/platform-browser-dynamic/BUILD.bazel
@@ -12,7 +12,6 @@ ts_library(
         ],
     ),
     module_name = "@angular/platform-browser-dynamic",
-    tsconfig = "//packages:tsconfig",
     deps = [
         "//packages:types",
         "//packages/common",

diff --git a/packages/platform-browser-dynamic/testing/BUILD.bazel b/packages/platform-browser-dynamic/testing/BUILD.bazel
@@ -7,7 +7,6 @@ ts_library(
     testonly = 1,
     srcs = glob(["**/*.ts"]),
     module_name = "@angular/platform-browser-dynamic/testing",
-    tsconfig = "//packages:tsconfig",
     deps = [
         "//packages/compiler",
         "//packages/compiler/testing",

diff --git a/packages/platform-browser/BUILD.bazel b/packages/platform-browser/BUILD.bazel
@@ -12,7 +12,6 @@ ts_library(
         ],
     ),
     module_name = "@angular/platform-browser",
-    tsconfig = "//packages:tsconfig",
     deps = [
         "//packages:types",
         "//packages/common",

diff --git a/packages/platform-browser/animations/BUILD.bazel b/packages/platform-browser/animations/BUILD.bazel
@@ -11,7 +11,6 @@ ts_library(
         ],
     ),
     module_name = "@angular/platform-browser/animations",
-    tsconfig = "//packages:tsconfig",
     deps = [
         "//packages/animations",
         "//packages/animations/browser",

diff --git a/packages/platform-browser/testing/BUILD.bazel b/packages/platform-browser/testing/BUILD.bazel
@@ -7,7 +7,6 @@ ts_library(
     testonly = 1,
     srcs = glob(["**/*.ts"]),
     module_name = "@angular/platform-browser/testing",
-    tsconfig = "//packages:tsconfig",
     deps = [
         "//packages/core",
         "//packages/platform-browser",

diff --git a/packages/platform-server/BUILD.bazel b/packages/platform-server/BUILD.bazel
@@ -11,7 +11,6 @@ ts_library(
         ],
     ),
     module_name = "@angular/platform-server",
-    tsconfig = "//packages:tsconfig",
     deps = [
         "//packages/animations/browser",
         "//packages/common",

diff --git a/packages/platform-server/testing/BUILD.bazel b/packages/platform-server/testing/BUILD.bazel
@@ -7,7 +7,6 @@ ts_library(
     testonly = 1,
     srcs = glob(["**/*.ts"]),
     module_name = "@angular/platform-server/testing",
-    tsconfig = "//packages:tsconfig",
     deps = [
         "//packages/core",
         "//packages/platform-browser-dynamic/testing",

diff --git a/packages/router/BUILD.bazel b/packages/router/BUILD.bazel
@@ -11,7 +11,6 @@ ts_library(
         ],
     ),
     module_name = "@angular/router",
-    tsconfig = "//packages:tsconfig",
     deps = [
         "//packages/common",
         "//packages/core",

diff --git a/packages/router/testing/BUILD.bazel b/packages/router/testing/BUILD.bazel
@@ -7,7 +7,6 @@ ts_library(
     testonly = 1,
     srcs = glob(["**/*.ts"]),
     module_name = "@angular/router/testing",
-    tsconfig = "//packages:tsconfig",
     deps = [
         "//packages/common",
         "//packages/common/testing",

diff --git a/packages/service-worker/BUILD.bazel b/packages/service-worker/BUILD.bazel
@@ -11,7 +11,6 @@ ts_library(
         ],
     ),
     module_name = "@angular/service-worker",
-    tsconfig = "//packages:tsconfig",
     deps = [
         "//packages/common",
         "//packages/core",

diff --git a/packages/service-worker/worker/test/BUILD.bazel b/packages/service-worker/worker/test/BUILD.bazel
@@ -9,7 +9,6 @@ ts_library(
     srcs = glob(
         ["**/*.ts"],
     ),
-    tsconfig = "//packages:tsconfig",
     deps = [
         "//packages:types",
         "//packages/service-worker/worker",

diff --git a/packages/service-worker/worker/testing/BUILD.bazel b/packages/service-worker/worker/testing/BUILD.bazel
@@ -6,7 +6,6 @@ ts_library(
     name = "testing",
     testonly = 1,
     srcs = glob(["**/*.ts"]),
-    tsconfig = "//packages:tsconfig",
     deps = [
         "//packages:types",
         "//packages/service-worker/worker",

diff --git a/packages/upgrade/static/BUILD.bazel b/packages/upgrade/static/BUILD.bazel
@@ -6,7 +6,6 @@ ts_library(
     name = "static",
     srcs = glob(["**/*.ts"]),
     module_name = "@angular/upgrade/static",
-    tsconfig = "//packages:tsconfig",
     deps = [
         "//packages/core",
         "//packages/platform-browser",