build: create a ts_library and ng_module macro

This prevents us repeating the tsconfig attribute everywhere, and possibly having different tsconfig for different targets
angular · Jan 9, 2018 · c8133e4 · c8133e4
1 parent fa03ae1
commit c8133e4
Show file tree

Hide file tree

Showing 36 changed files with 52 additions and 75 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -16,11 +16,10 @@ node_repositories(package_json = ["//:package.json"])
 git_repository(
     name = "build_bazel_rules_typescript",
     remote = "https://github.com/bazelbuild/rules_typescript.git",
-#    tag = "0.7.1+",
-    commit = "89d2c75066bea3d9c942f29dd1d2ea543c58d6d5"
+    commit = "985c1c8b7c598f9afa276511c0484485f6a64098",
 )
 
-load("@build_bazel_rules_typescript//:setup.bzl", "ts_setup_workspace")
+load("@build_bazel_rules_typescript//:defs.bzl", "ts_setup_workspace")
 
 ts_setup_workspace()
 

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("//tools:defaults.bzl", "ts_library")
 
 ts_library(
     name = "types",
     srcs = glob(["*.ts"]),
-    tsconfig = ":tsconfig",
 )
diff --git a/packages/animations/BUILD.bazel b/packages/animations/BUILD.bazel
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("//tools:defaults.bzl", "ts_library")
 
 ts_library(
     name = "animations",
@@ -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
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("//tools:defaults.bzl", "ts_library")
 
 ts_library(
     name = "browser",
@@ -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
@@ -1,10 +1,9 @@
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("//tools:defaults.bzl", "ts_library")
 
 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
@@ -1,13 +1,12 @@
 package(default_visibility = ["//visibility:public"])
 
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("//tools:defaults.bzl", "ts_library")
 
 ts_library(
     name = "testing",
     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
@@ -1,10 +1,9 @@
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("//tools:defaults.bzl", "ts_library")
 
 ts_library(
     name = "test",
     testonly = 1,
     srcs = glob(["test/**/*.ts"]),
-    tsconfig = "//packages:tsconfig",
     deps = [
         "//packages:types",
         "//packages/animations",

diff --git a/packages/bazel/test/ngc-wrapped/BUILD.bazel b/packages/bazel/test/ngc-wrapped/BUILD.bazel
@@ -1,5 +1,5 @@
 load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("//tools:defaults.bzl", "ts_library")
 
 ts_library(
     name = "ngc_test_lib",

diff --git a/packages/common/BUILD.bazel b/packages/common/BUILD.bazel
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("//tools:defaults.bzl", "ts_library")
 
 ts_library(
     name = "common",
@@ -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
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("//tools:defaults.bzl", "ts_library")
 
 ts_library(
     name = "http",
@@ -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
@@ -1,13 +1,12 @@
 package(default_visibility = ["//visibility:public"])
 
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("//tools:defaults.bzl", "ts_library")
 
 ts_library(
     name = "testing",
     testonly = 1,
     srcs = glob(["**/*.ts"]),
     module_name = "@angular/common/http/testing",
-    tsconfig = "//packages:tsconfig",
     deps = [
         "//packages/common/http",
         "//packages/core",

diff --git a/packages/common/testing/BUILD.bazel b/packages/common/testing/BUILD.bazel
@@ -1,13 +1,12 @@
 package(default_visibility = ["//visibility:public"])
 
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("//tools:defaults.bzl", "ts_library")
 
 ts_library(
     name = "testing",
     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
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("//tools:defaults.bzl", "ts_library")
 
 ts_library(
     name = "compiler",
@@ -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
@@ -1,5 +1,6 @@
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library", "ts_web_test")
+load("@build_bazel_rules_typescript//:defs.bzl", "ts_web_test")
 load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
+load("//tools:defaults.bzl", "ts_library")
 
 ts_library(
     name = "test_lib",
@@ -8,7 +9,6 @@ ts_library(
         ["**/*.ts"],
         exclude = ["**/*_node_only_spec.ts"],
     ),
-    tsconfig = "//packages:tsconfig",
     deps = [
         "//packages:types",
         "//packages/common",

diff --git a/packages/compiler/testing/BUILD.bazel b/packages/compiler/testing/BUILD.bazel
@@ -1,13 +1,12 @@
 package(default_visibility = ["//visibility:public"])
 
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("//tools:defaults.bzl", "ts_library")
 
 ts_library(
     name = "testing",
     testonly = 1,
     srcs = glob(["**/*.ts"]),
     module_name = "@angular/compiler/testing",
-    tsconfig = "//packages:tsconfig",
     deps = [
         "//packages:types",
         "//packages/compiler",

diff --git a/packages/core/BUILD.bazel b/packages/core/BUILD.bazel
@@ -1,7 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("@angular//:index.bzl", "ng_module")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("//tools:defaults.bzl", "ng_module", "ts_library")
 
 ng_module(
     name = "core",
@@ -12,7 +11,6 @@ ng_module(
         ],
     ),
     module_name = "@angular/core",
-    tsconfig = "//packages:tsconfig",
     deps = [
         "//packages:types",
         "@rxjs",

diff --git a/packages/core/test/BUILD.bazel b/packages/core/test/BUILD.bazel
@@ -1,6 +1,7 @@
 package(default_visibility = ["//visibility:public"])
 
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library", "ts_web_test")
+load("@build_bazel_rules_typescript//:defs.bzl", "ts_web_test")
+load("//tools:defaults.bzl", "ts_library")
 load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
 
 ts_library(
@@ -13,7 +14,6 @@ ts_library(
             "render3/**/*.ts",
         ],
     ),
-    tsconfig = "//packages:tsconfig",
     deps = [
         "//packages/animations",
         "//packages/animations/browser",
@@ -37,7 +37,6 @@ ts_library(
     name = "test_node_only_lib",
     testonly = 1,
     srcs = glob(["**/*_node_only_spec.ts"]),
-    tsconfig = "//packages:tsconfig",
     deps = [
         ":test_lib",
         "//packages/compiler",

diff --git a/packages/core/testing/BUILD.bazel b/packages/core/testing/BUILD.bazel
@@ -1,13 +1,12 @@
 package(default_visibility = ["//visibility:public"])
 
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("//tools:defaults.bzl", "ts_library")
 
 ts_library(
     name = "testing",
     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
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("//tools:defaults.bzl", "ts_library")
 
 ts_library(
     name = "http",
@@ -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
@@ -1,13 +1,12 @@
 package(default_visibility = ["//visibility:public"])
 
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("//tools:defaults.bzl", "ts_library")
 
 ts_library(
     name = "testing",
     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
@@ -1,7 +1,7 @@
 package(default_visibility = ["//visibility:public"])
 
 load("@angular//:index.bzl", "ng_module")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("//tools:defaults.bzl", "ts_library")
 
 ts_library(
     name = "platform-browser-dynamic",
@@ -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
@@ -1,13 +1,12 @@
 package(default_visibility = ["//visibility:public"])
 
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("//tools:defaults.bzl", "ts_library")
 
 ts_library(
     name = "testing",
     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
@@ -1,7 +1,7 @@
 package(default_visibility = ["//visibility:public"])
 
 load("@angular//:index.bzl", "ng_module")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("//tools:defaults.bzl", "ts_library")
 
 ts_library(
     name = "platform-browser",
@@ -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
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("//tools:defaults.bzl", "ts_library")
 
 ts_library(
     name = "animations",
@@ -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
@@ -1,13 +1,12 @@
 package(default_visibility = ["//visibility:public"])
 
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("//tools:defaults.bzl", "ts_library")
 
 ts_library(
     name = "testing",
     testonly = 1,
     srcs = glob(["**/*.ts"]),
     module_name = "@angular/platform-browser/testing",
-    tsconfig = "//packages:tsconfig",
     deps = [
         "//packages/core",
         "//packages/platform-browser",