feat: update to Angular 9-rc.13 (#2345)

ngrx · Feb 4, 2020 · d7fdf7f · d7fdf7f
1 parent 93b4081
commit d7fdf7f
Show file tree

Hide file tree

Showing 42 changed files with 1,819 additions and 757 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -10,7 +10,7 @@ version: 2
 # See https://blog.daemonl.com/2016/02/yaml.html
 # To validate changes, use an online parser, eg.
 # https://yaml-online-parser.appspot.com/
-var_1: &cache_key yarn-cache-{{ checksum "yarn.lock" }}-0.12.2
+var_1: &cache_key yarn-cache-{{ checksum "yarn.lock" }}-0.12.3
 var_2: &run_in_node
   docker:
     - image: circleci/node:12.9.1

diff --git a/WORKSPACE b/WORKSPACE
@@ -12,8 +12,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 # Rules for NodeJS
 http_archive(
     name = "build_bazel_rules_nodejs",
-    sha256 = "16fc00ab0d1e538e88f084272316c0693a2e9007d64f45529b82f6230aedb073",
-    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.42.2/rules_nodejs-0.42.2.tar.gz"],
+    sha256 = "6bcef105e75cac3c5f8212e0d0431b6ec1aaa1963e093b0091474ab98ecf29d2",
+    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/1.2.2/rules_nodejs-1.2.2.tar.gz"],
 )
 
 # Rules for web testing
@@ -28,11 +28,12 @@ http_archive(
 # Rules for compiling sass
 http_archive(
     name = "io_bazel_rules_sass",
-    sha256 = "ad08e8c82aa1f48b72dc295cb83bba33f514cdf24cc7b0e21e9353f20f0dc147",
-    strip_prefix = "rules_sass-5d1b26f8cd12c5d75dd359f9291090b341e8fd52",
-    # We need to use a version that includes SHA 5d1b26f8cd12c5d75dd359f9291090b341e8fd52 of
-    # the "rules_sass" repository as it adds support for workers.
-    url = "https://github.com/bazelbuild/rules_sass/archive/5d1b26f8cd12c5d75dd359f9291090b341e8fd52.zip",
+    sha256 = "77e241148f26d5dbb98f96fe0029d8f221c6cb75edbb83e781e08ac7f5322c5f",
+    strip_prefix = "rules_sass-1.24.0",
+    urls = [
+        "https://github.com/bazelbuild/rules_sass/archive/1.24.0.zip",
+        "https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/1.24.0.zip",
+    ],
 )
 
 ####################################

diff --git a/modules/component/BUILD b/modules/component/BUILD
@@ -24,7 +24,7 @@ ng_package(
         "package.json",
     ],
     entry_point = "modules/component/index.js",
-    packages = [
+    nested_packages = [
         # TODO: @ngrx/component - add schematic
         # "//modules/component/schematics-core:npm_package",
     ],

diff --git a/modules/component/spec/BUILD b/modules/component/spec/BUILD
@@ -20,7 +20,6 @@ jasmine_node_test(
     name = "test",
     deps = [
         ":test_lib",
-        "//modules/component",
         # TODO: @ngrx/component - add ngrx deps
         # "//modules/store",
     ],

diff --git a/modules/data/BUILD b/modules/data/BUILD
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("//tools:defaults.bzl", "ng_module", "ng_package")
+load("//tools:defaults.bzl", "ng_module", "pkg_npm")
 
 ng_module(
     name = "data",
@@ -19,13 +19,12 @@ ng_module(
     ],
 )
 
-ng_package(
+pkg_npm(
     name = "npm_package",
     srcs = glob(["**/*.externs.js"]) + [
         "package.json",
     ],
-    entry_point = "modules/data/index.js",
-    packages = [
+    nested_packages = [
         "//modules/data/migrations:npm_package",
         "//modules/data/schematics:npm_package",
         "//modules/data/schematics-core:npm_package",

diff --git a/modules/data/migrations/BUILD b/modules/data/migrations/BUILD
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("//tools:defaults.bzl", "npm_package", "ts_library")
+load("//tools:defaults.bzl", "pkg_npm", "ts_library")
 
 ts_library(
     name = "migrations",
@@ -20,7 +20,7 @@ ts_library(
     ],
 )
 
-npm_package(
+pkg_npm(
     name = "npm_package",
     srcs = [
         ":migration.json",

diff --git a/modules/data/schematics-core/BUILD b/modules/data/schematics-core/BUILD
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("//tools:defaults.bzl", "npm_package", "ts_library")
+load("//tools:defaults.bzl", "pkg_npm", "ts_library")
 
 ts_library(
     name = "schematics-core",
@@ -22,7 +22,7 @@ ts_library(
     ],
 )
 
-npm_package(
+pkg_npm(
     name = "npm_package",
     srcs = [],
     deps = [

diff --git a/modules/data/schematics/BUILD b/modules/data/schematics/BUILD
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("//tools:defaults.bzl", "npm_package", "ts_library")
+load("//tools:defaults.bzl", "pkg_npm", "ts_library")
 
 ts_library(
     name = "schematics",
@@ -22,7 +22,7 @@ ts_library(
     ],
 )
 
-npm_package(
+pkg_npm(
     name = "npm_package",
     srcs = [
         ":collection.json",

diff --git a/modules/data/spec/BUILD b/modules/data/spec/BUILD
@@ -22,9 +22,5 @@ jasmine_node_test(
     name = "test",
     deps = [
         ":test_lib",
-        "//modules/data",
-        "//modules/effects",
-        "//modules/entity",
-        "//modules/store",
     ],
 )
diff --git a/modules/effects/BUILD b/modules/effects/BUILD
@@ -23,7 +23,7 @@ ng_package(
         "//modules/effects/testing:package.json",
     ],
     entry_point = "modules/effects/index.js",
-    packages = [
+    nested_packages = [
         "//modules/effects/migrations:npm_package",
         "//modules/effects/schematics:npm_package",
         "//modules/effects/schematics-core:npm_package",

diff --git a/modules/effects/migrations/BUILD b/modules/effects/migrations/BUILD
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("//tools:defaults.bzl", "npm_package", "ts_library")
+load("//tools:defaults.bzl", "pkg_npm", "ts_library")
 
 ts_library(
     name = "migrations",
@@ -21,7 +21,7 @@ ts_library(
     ],
 )
 
-npm_package(
+pkg_npm(
     name = "npm_package",
     srcs = [
         ":migration.json",

diff --git a/modules/effects/schematics-core/BUILD b/modules/effects/schematics-core/BUILD
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("//tools:defaults.bzl", "npm_package", "ts_library")
+load("//tools:defaults.bzl", "pkg_npm", "ts_library")
 
 ts_library(
     name = "schematics-core",
@@ -22,7 +22,7 @@ ts_library(
     ],
 )
 
-npm_package(
+pkg_npm(
     name = "npm_package",
     srcs = [],
     deps = [

diff --git a/modules/effects/schematics/BUILD b/modules/effects/schematics/BUILD
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("//tools:defaults.bzl", "npm_package", "ts_library")
+load("//tools:defaults.bzl", "pkg_npm", "ts_library")
 
 ts_library(
     name = "schematics",
@@ -22,7 +22,7 @@ ts_library(
     ],
 )
 
-npm_package(
+pkg_npm(
     name = "npm_package",
     srcs = [
         ":collection.json",

diff --git a/modules/effects/spec/BUILD b/modules/effects/spec/BUILD
@@ -21,7 +21,5 @@ jasmine_node_test(
     name = "test",
     deps = [
         ":test_lib",
-        "//modules/effects",
-        "//modules/store",
     ],
 )
diff --git a/modules/effects/spec/types/of_type.spec.ts b/modules/effects/spec/types/of_type.spec.ts
@@ -55,7 +55,7 @@ describe('ofType()', () => {
         const effect = actions$.pipe(ofType(actionA, actionB, actionC, actionD, actionE, actionF, actionG))
       `).toInfer(
         'effect',
-        'Observable<TypedAction<"Action A"> | TypedAction<"Action B"> | TypedAction<"Action C"> | TypedAction<"Action D"> | TypedAction<"Action E"> | TypedAction<"Action F"> | TypedAction<"Action G">>'
+        'Observable<TypedAction<"Action A"> | TypedAction<"Action B"> | TypedAction<"Action C"> | TypedAction<"Action D"> | TypedAction<"Action E"> | TypedAction<...> | TypedAction<...>>'
       );
     });
   });

diff --git a/modules/entity/BUILD b/modules/entity/BUILD
@@ -22,7 +22,7 @@ ng_package(
         "package.json",
     ],
     entry_point = "modules/entity/index.js",
-    packages = [
+    nested_packages = [
         "//modules/entity/migrations:npm_package",
         "//modules/entity/schematics:npm_package",
         "//modules/entity/schematics-core:npm_package",

diff --git a/modules/entity/migrations/BUILD b/modules/entity/migrations/BUILD
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("//tools:defaults.bzl", "npm_package", "ts_library")
+load("//tools:defaults.bzl", "pkg_npm", "ts_library")
 
 ts_library(
     name = "migrations",
@@ -20,7 +20,7 @@ ts_library(
     ],
 )
 
-npm_package(
+pkg_npm(
     name = "npm_package",
     srcs = [
         ":migration.json",

diff --git a/modules/entity/schematics-core/BUILD b/modules/entity/schematics-core/BUILD
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("//tools:defaults.bzl", "npm_package", "ts_library")
+load("//tools:defaults.bzl", "pkg_npm", "ts_library")
 
 ts_library(
     name = "schematics-core",
@@ -22,7 +22,7 @@ ts_library(
     ],
 )
 
-npm_package(
+pkg_npm(
     name = "npm_package",
     srcs = [],
     deps = [

diff --git a/modules/entity/schematics/BUILD b/modules/entity/schematics/BUILD
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("//tools:defaults.bzl", "npm_package", "ts_library")
+load("//tools:defaults.bzl", "pkg_npm", "ts_library")
 
 ts_library(
     name = "schematics",
@@ -22,7 +22,7 @@ ts_library(
     ],
 )
 
-npm_package(
+pkg_npm(
     name = "npm_package",
     srcs = [
         ":collection.json",

diff --git a/modules/router-store/BUILD b/modules/router-store/BUILD
@@ -22,7 +22,7 @@ ng_package(
         "package.json",
     ],
     entry_point = "modules/router-store/index.js",
-    packages = [
+    nested_packages = [
         "//modules/router-store/migrations:npm_package",
         "//modules/router-store/schematics:npm_package",
         "//modules/router-store/schematics-core:npm_package",

diff --git a/modules/router-store/migrations/BUILD b/modules/router-store/migrations/BUILD
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("//tools:defaults.bzl", "npm_package", "ts_library")
+load("//tools:defaults.bzl", "pkg_npm", "ts_library")
 
 ts_library(
     name = "migrations",
@@ -21,7 +21,7 @@ ts_library(
     ],
 )
 
-npm_package(
+pkg_npm(
     name = "npm_package",
     srcs = [
         ":migration.json",

diff --git a/modules/router-store/schematics-core/BUILD b/modules/router-store/schematics-core/BUILD
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("//tools:defaults.bzl", "npm_package", "ts_library")
+load("//tools:defaults.bzl", "pkg_npm", "ts_library")
 
 ts_library(
     name = "schematics-core",
@@ -22,7 +22,7 @@ ts_library(
     ],
 )
 
-npm_package(
+pkg_npm(
     name = "npm_package",
     srcs = [],
     deps = [

diff --git a/modules/router-store/schematics/BUILD b/modules/router-store/schematics/BUILD
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("//tools:defaults.bzl", "npm_package", "ts_library")
+load("//tools:defaults.bzl", "pkg_npm", "ts_library")
 
 ts_library(
     name = "schematics",
@@ -22,7 +22,7 @@ ts_library(
     ],
 )
 
-npm_package(
+pkg_npm(
     name = "npm_package",
     srcs = [
         ":collection.json",

diff --git a/modules/router-store/spec/BUILD b/modules/router-store/spec/BUILD
@@ -19,7 +19,5 @@ jasmine_node_test(
     name = "test",
     deps = [
         ":test_lib",
-        "//modules/router-store",
-        "//modules/store",
     ],
 )
diff --git a/modules/schematics/BUILD b/modules/schematics/BUILD
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("//tools:defaults.bzl", "jasmine_node_test", "npm_package", "ts_library", "ts_test_library")
+load("//tools:defaults.bzl", "jasmine_node_test", "pkg_npm", "ts_library", "ts_test_library")
 
 ts_library(
     name = "schematics",
@@ -23,7 +23,7 @@ ts_library(
     ],
 )
 
-npm_package(
+pkg_npm(
     name = "npm_package",
     srcs = [
         ":collection.json",
@@ -37,7 +37,7 @@ npm_package(
         "**/schema.json",
         "**/migration.json",
     ]),
-    packages = [
+    nested_packages = [
         "//modules/schematics/migrations:npm_package",
         "//modules/schematics/schematics-core:npm_package",
     ],

diff --git a/modules/schematics/migrations/BUILD b/modules/schematics/migrations/BUILD
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("//tools:defaults.bzl", "npm_package", "ts_library")
+load("//tools:defaults.bzl", "pkg_npm", "ts_library")
 
 ts_library(
     name = "migrations",
@@ -20,7 +20,7 @@ ts_library(
     ],
 )
 
-npm_package(
+pkg_npm(
     name = "npm_package",
     srcs = [
         ":migration.json",