From 355b12f1eb260e7b222c7db86d21f6ea05937271 Mon Sep 17 00:00:00 2001 From: Brandon Date: Fri, 11 May 2018 23:42:39 -0500 Subject: [PATCH] fix(build): Use default build for schematics (#1057) --- modules/effects/migrations/BUILD | 3 +-- modules/effects/schematics-core/BUILD | 3 +-- modules/entity/migrations/BUILD | 3 +-- modules/entity/schematics-core/BUILD | 3 +-- modules/router-store/migrations/BUILD | 3 +-- modules/router-store/schematics-core/BUILD | 3 +-- modules/schematics/BUILD | 3 +-- modules/schematics/migrations/BUILD | 3 +-- modules/schematics/schematics-core/BUILD | 3 +-- modules/store-devtools/migrations/BUILD | 3 +-- modules/store-devtools/schematics-core/BUILD | 3 +-- modules/store/migrations/BUILD | 3 +-- modules/store/schematics-core/BUILD | 3 +-- tools/defaults.bzl | 2 +- 14 files changed, 14 insertions(+), 27 deletions(-) diff --git a/modules/effects/migrations/BUILD b/modules/effects/migrations/BUILD index 5784a4c887..3381169898 100644 --- a/modules/effects/migrations/BUILD +++ b/modules/effects/migrations/BUILD @@ -1,7 +1,6 @@ package(default_visibility = ["//visibility:public"]) -load("//tools:defaults.bzl", "ts_library") -load("//tools:defaults.bzl", "npm_package") +load("//tools:defaults.bzl", "ts_library", "npm_package") ts_library( name = "migrations", diff --git a/modules/effects/schematics-core/BUILD b/modules/effects/schematics-core/BUILD index 14e42bfc19..eaf41750c9 100644 --- a/modules/effects/schematics-core/BUILD +++ b/modules/effects/schematics-core/BUILD @@ -1,7 +1,6 @@ package(default_visibility = ["//visibility:public"]) -load("//tools:defaults.bzl", "ts_library") -load("//tools:defaults.bzl", "npm_package") +load("//tools:defaults.bzl", "ts_library", "npm_package") ts_library( name = "schematics-core", diff --git a/modules/entity/migrations/BUILD b/modules/entity/migrations/BUILD index 9107840bbe..148b451d05 100644 --- a/modules/entity/migrations/BUILD +++ b/modules/entity/migrations/BUILD @@ -1,7 +1,6 @@ package(default_visibility = ["//visibility:public"]) -load("//tools:defaults.bzl", "ts_library") -load("//tools:defaults.bzl", "npm_package") +load("//tools:defaults.bzl", "ts_library", "npm_package") ts_library( name = "migrations", diff --git a/modules/entity/schematics-core/BUILD b/modules/entity/schematics-core/BUILD index 5b5879c822..7b7cb75405 100644 --- a/modules/entity/schematics-core/BUILD +++ b/modules/entity/schematics-core/BUILD @@ -1,7 +1,6 @@ package(default_visibility = ["//visibility:public"]) -load("//tools:defaults.bzl", "ts_library") -load("//tools:defaults.bzl", "npm_package") +load("//tools:defaults.bzl", "ts_library", "npm_package") ts_library( name = "schematics-core", diff --git a/modules/router-store/migrations/BUILD b/modules/router-store/migrations/BUILD index b6363b7ad0..0039da7cd2 100644 --- a/modules/router-store/migrations/BUILD +++ b/modules/router-store/migrations/BUILD @@ -1,7 +1,6 @@ package(default_visibility = ["//visibility:public"]) -load("//tools:defaults.bzl", "ts_library") -load("//tools:defaults.bzl", "npm_package") +load("//tools:defaults.bzl", "ts_library", "npm_package") ts_library( name = "migrations", diff --git a/modules/router-store/schematics-core/BUILD b/modules/router-store/schematics-core/BUILD index 6992b3e8c6..e073f814bd 100644 --- a/modules/router-store/schematics-core/BUILD +++ b/modules/router-store/schematics-core/BUILD @@ -1,7 +1,6 @@ package(default_visibility = ["//visibility:public"]) -load("//tools:defaults.bzl", "ts_library") -load("//tools:defaults.bzl", "npm_package") +load("//tools:defaults.bzl", "ts_library", "npm_package") ts_library( name = "schematics-core", diff --git a/modules/schematics/BUILD b/modules/schematics/BUILD index ff22b46cf8..5fc686de32 100644 --- a/modules/schematics/BUILD +++ b/modules/schematics/BUILD @@ -1,7 +1,6 @@ package(default_visibility = ["//visibility:public"]) -load("@build_bazel_rules_typescript//:defs.bzl", "ts_library") -load("@build_bazel_rules_nodejs//:defs.bzl", "npm_package") +load("//tools:defaults.bzl", "ts_library", "npm_package") ts_library( name = "schematics", diff --git a/modules/schematics/migrations/BUILD b/modules/schematics/migrations/BUILD index b1972513c1..0426917b90 100644 --- a/modules/schematics/migrations/BUILD +++ b/modules/schematics/migrations/BUILD @@ -1,7 +1,6 @@ package(default_visibility = ["//visibility:public"]) -load("//tools:defaults.bzl", "ts_library") -load("//tools:defaults.bzl", "npm_package") +load("//tools:defaults.bzl", "ts_library", "npm_package") ts_library( name = "migrations", diff --git a/modules/schematics/schematics-core/BUILD b/modules/schematics/schematics-core/BUILD index 37cc4c8db3..935f17d415 100644 --- a/modules/schematics/schematics-core/BUILD +++ b/modules/schematics/schematics-core/BUILD @@ -1,7 +1,6 @@ package(default_visibility = ["//visibility:public"]) -load("//tools:defaults.bzl", "ts_library") -load("//tools:defaults.bzl", "npm_package") +load("//tools:defaults.bzl", "ts_library", "npm_package") ts_library( name = "schematics-core", diff --git a/modules/store-devtools/migrations/BUILD b/modules/store-devtools/migrations/BUILD index be0d9e2ec0..f26aaedc0f 100644 --- a/modules/store-devtools/migrations/BUILD +++ b/modules/store-devtools/migrations/BUILD @@ -1,7 +1,6 @@ package(default_visibility = ["//visibility:public"]) -load("//tools:defaults.bzl", "ts_library") -load("//tools:defaults.bzl", "npm_package") +load("//tools:defaults.bzl", "ts_library", "npm_package") ts_library( name = "migrations", diff --git a/modules/store-devtools/schematics-core/BUILD b/modules/store-devtools/schematics-core/BUILD index a1328889fc..13806668aa 100644 --- a/modules/store-devtools/schematics-core/BUILD +++ b/modules/store-devtools/schematics-core/BUILD @@ -1,7 +1,6 @@ package(default_visibility = ["//visibility:public"]) -load("//tools:defaults.bzl", "ts_library") -load("//tools:defaults.bzl", "npm_package") +load("//tools:defaults.bzl", "ts_library", "npm_package") ts_library( name = "schematics-core", diff --git a/modules/store/migrations/BUILD b/modules/store/migrations/BUILD index ddda06b952..d7bcf4bd18 100644 --- a/modules/store/migrations/BUILD +++ b/modules/store/migrations/BUILD @@ -1,7 +1,6 @@ package(default_visibility = ["//visibility:public"]) -load("//tools:defaults.bzl", "ts_library") -load("//tools:defaults.bzl", "npm_package") +load("//tools:defaults.bzl", "ts_library", "npm_package") ts_library( name = "migrations", diff --git a/modules/store/schematics-core/BUILD b/modules/store/schematics-core/BUILD index 4fa2816de9..16c98de874 100644 --- a/modules/store/schematics-core/BUILD +++ b/modules/store/schematics-core/BUILD @@ -1,7 +1,6 @@ package(default_visibility = ["//visibility:public"]) -load("//tools:defaults.bzl", "ts_library") -load("//tools:defaults.bzl", "npm_package") +load("//tools:defaults.bzl", "ts_library", "npm_package") ts_library( name = "schematics-core", diff --git a/tools/defaults.bzl b/tools/defaults.bzl index fd41346751..21355ab0bb 100644 --- a/tools/defaults.bzl +++ b/tools/defaults.bzl @@ -11,11 +11,11 @@ NG_DEVKIT_VERSION = "^0.6.0" NG_UPDATE_MIGRATIONS = "./migrations/migration.json" NGRX_SCOPED_PACKAGES = ["@ngrx/%s" % p for p in [ + "store", "effects", "entity", "router-store", "schematics", - "store", "store-devtools", ]]