build: prepare for new ng_project rule and try in cdk/a11y

Sets up the new `ng_project` rule and uses it in `cdk/a11y`. Also sets
up this rule similar to our `ts_project` interop- reusing that code
completely, yay!

Author: devversion

.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx

@@ -2,8 +2,9 @@
 # Input hashes for repository rule npm_translate_lock(name = "npm2", pnpm_lock = "@//:pnpm-lock.yaml").
 # This file should be checked into version control along with the pnpm-lock.yaml file.
 .npmrc=-1406867100
-package.json=-1483367293
-pnpm-lock.yaml=-444375219
+package.json=2076577978
+patches/@angular__compiler-cli.patch=1066638894
+pnpm-lock.yaml=1573476040
 pnpm-workspace.yaml=14857322
 src/cdk/package.json=-908433069
 yarn.lock=-987404687

WORKSPACE

@@ -174,6 +174,7 @@ npm_translate_lock(
     },
     data = [
         "//:package.json",
+        "//:patches/@angular__compiler-cli.patch",
         "//:pnpm-workspace.yaml",
         "//src/cdk:package.json",
     ],
@@ -239,14 +240,21 @@ setup_dependencies_2()
 
 git_repository(
     name = "rules_angular",
-    commit = "bbf9493c73f4a2d715259e8febaa99c363ceaec3",
+    commit = "23ab534589c96d25e8ca32f3abffc109f8112167",
     remote = "https://github.com/devversion/rules_angular.git",
 )
 
-load("@rules_angular//setup:step_1.bzl", "step_1")
+load("@rules_angular//setup:step_1.bzl", "rules_angular_step1")
 
-step_1()
+rules_angular_step1()
 
-load("@rules_angular//setup:step_2.bzl", "step_2")
+load("@rules_angular//setup:step_2.bzl", "rules_angular_step2")
 
-step_2()
+rules_angular_step2()
+
+load("@rules_angular//setup:step_3.bzl", "rules_angular_step3")
+
+rules_angular_step3(
+    angular_compiler_cli = "//:node_modules/@angular/compiler-cli",
+    typescript = "//:node_modules/typescript",
+)

package.json

@@ -188,6 +188,9 @@
   },
   "pnpm": {
     "onlyBuiltDependencies": [],
+    "patchedDependencies": {
+      "@angular/[email protected]": "patches/@angular__compiler-cli.patch"
+    },
     "packageExtensions": {
       "@angular/animations": {
         "dependencies": {

patches/@angular__compiler-cli.patch

@@ -0,0 +1,13 @@
+diff --git a/bundles/chunk-BTNMUYEF.js b/bundles/chunk-BTNMUYEF.js
+index 71beb26d9587721f08ae568ed5dd64dfbcd0b09f..3efdc917a67c34202365a06e181e447b0c901079 100755
+--- a/bundles/chunk-BTNMUYEF.js
++++ b/bundles/chunk-BTNMUYEF.js
+@@ -4189,7 +4189,7 @@ var NgCompiler = class {
+     let aliasingHost = null;
+     if (this.adapter.unifiedModulesHost === null || !this.options["_useHostForImportGeneration"] && !this.options["_useHostForImportAndAliasGeneration"]) {
+       let localImportStrategy;
+-      if (this.options.rootDir !== void 0 || this.options.rootDirs !== void 0 && this.options.rootDirs.length > 0) {
++      if (this.options.rootDirs !== void 0 && this.options.rootDirs.length > 0) {
+         localImportStrategy = new LogicalProjectStrategy(reflector, new LogicalFileSystem([...this.adapter.rootDirs], this.adapter));
+       } else {
+         localImportStrategy = new RelativePathStrategy(reflector);

pnpm-lock.yaml

@@ -1,22 +1,21 @@
 load(
     "//tools:defaults.bzl",
     "markdown_to_html",
-    "ng_module",
     "ng_web_test_suite",
     "sass_binary",
     "sass_library",
 )
-load("//tools:defaults2.bzl", "ts_project")
+load("//tools:defaults2.bzl", "ng_project", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
 
-ng_module(
+ng_project(
     name = "a11y",
     srcs = glob(
         ["**/*.ts"],
         exclude = ["**/*.spec.ts"],
     ),
-    deps = [
+    interop_deps = [
         "//src:dev_mode_types",
         "//src/cdk/coercion",
         "//src/cdk/coercion/private",
@@ -25,8 +24,11 @@ ng_module(
         "//src/cdk/observers",
         "//src/cdk/platform",
         "//src/cdk/private",
-        "@npm//@angular/core",
-        "@npm//rxjs",
+    ],
+    deps = [
+        "//:node_modules/@angular/common",
+        "//:node_modules/@angular/core",
+        "//:node_modules/rxjs",
     ],
 )
 

src/cdk/a11y/BUILD.bazel

@@ -1,5 +1,5 @@
 load("@aspect_rules_js//js:providers.bzl", "JsInfo", "js_info")
-load("@aspect_rules_ts//ts:defs.bzl", _ts_project = "ts_project")
+load("@rules_angular//src/ts_project:index.bzl", _ts_project = "ts_project")
 load("@build_bazel_rules_nodejs//:providers.bzl", "DeclarationInfo", "JSEcmaScriptModuleInfo", "JSModuleInfo", "LinkablePackageInfo")
 load("@devinfra//bazel/ts_project:index.bzl", "strict_deps_test")
 
@@ -109,6 +109,7 @@ def ts_project(
         # TODO: Switch this flag as we no longer depend on `interop_deps`.
         ignore_strict_deps = True,
         enable_runtime_rnjs_interop = True,
+        rule_impl = _ts_project,
         **kwargs):
     # Pull in the `rules_nodejs` variants of dependencies we know are "hybrid". This
     # is necessary as we can't mix `npm/node_modules` from RNJS with the pnpm-style
@@ -133,17 +134,12 @@ def ts_project(
         testonly = testonly,
     )
 
-    _ts_project(
+    rule_impl(
         name = "%s_rjs" % name,
         testonly = testonly,
         declaration = True,
         tsconfig = tsconfig,
         visibility = visibility,
-        # Use the worker from our own Angular rules, as the default worker
-        # from `rules_ts` is incompatible with TS5+ and abandoned. We need
-        # worker for efficient and fast DX.
-        supports_workers = 1,
-        tsc_worker = "@rules_angular//worker:worker_vanilla_ts",
         deps = [":%s_interop_deps" % name] + deps,
         **kwargs
     )

tools/bazel/ts_project_interop.bzl

@@ -2,6 +2,7 @@ load("@aspect_rules_jasmine//jasmine:defs.bzl", _jasmine_test = "jasmine_test")
 load("//tools/bazel:ts_project_interop.bzl", _ts_project = "ts_project")
 load("//tools/bazel:module_name.bzl", "compute_module_name")
 load("@aspect_rules_js//npm:defs.bzl", _npm_package = "npm_package")
+load("@rules_angular//src/ng_project:index.bzl", _ng_project = "ng_project")
 
 def npm_package(**kwargs):
     _npm_package(**kwargs)
@@ -23,6 +24,24 @@ def ts_project(
     # if False and not testonly:
     #    _make_tsec_test(kwargs["name"])
 
+def ng_project(
+        name,
+        source_map = True,
+        testonly = False,
+        **kwargs):
+    _ts_project(
+        name,
+        source_map = source_map,
+        module_name = compute_module_name(testonly),
+        rule_impl = _ng_project,
+        testonly = testonly,
+        **kwargs
+    )
+
+    # TODO(devversion): Partner with ISE team to support `rules_js` here.
+    # if False and not testonly:
+    #    _make_tsec_test(kwargs["name"])
+
 def jasmine_test(data = [], args = [], **kwargs):
     # Create relative path to root, from current package dir. Necessary as
     # we change the `chdir` below to the package directory.