build: update karma rules and interop to work with rules_js

Introduces a new spec-bundle Karma variant that works with `rules_js`,
and updates the interop to work with `rules_js` node modules.

Author: devversion

tools/bazel/ts_project_interop.bzl

@@ -44,27 +44,17 @@ def _ts_project_module_impl(ctx):
     runfiles = ctx.attr.dep[DefaultInfo].default_runfiles
     info = ctx.attr.dep[JsInfo]
 
-    # Filter runfiles to not include `node_modules` from Aspect as this interop
-    # target is supposed to be used downstream by `rules_nodejs` consumers,
-    # and mixing pnpm-style node modules with linker node modules is incompatible.
-    filtered_runfiles = []
-    for f in runfiles.files.to_list():
-        if f.short_path.startswith("node_modules/"):
-            continue
-        filtered_runfiles.append(f)
-    runfiles = ctx.runfiles(files = filtered_runfiles)
-
     providers = [
         DefaultInfo(
             runfiles = runfiles,
         ),
         JSModuleInfo(
             direct_sources = info.sources,
-            sources = depset(transitive = [info.transitive_sources]),
+            sources = depset(transitive = [info.transitive_sources, info.npm_sources]),
         ),
         JSEcmaScriptModuleInfo(
             direct_sources = info.sources,
-            sources = depset(transitive = [info.transitive_sources]),
+            sources = depset(transitive = [info.transitive_sources, info.npm_sources]),
         ),
         DeclarationInfo(
             declarations = _filter_types_depset(info.types),
@@ -155,7 +145,7 @@ def ts_project(
         dep = name,
         # Forwarded dependencies for linker module mapping aspect.
         # RJS deps can also transitively pull in module mappings from their `interop_deps`.
-        deps = [":%s_interop_deps" % name] + deps,
+        deps = deps,
         module_name = module_name,
     )
 

tools/defaults.bzl

@@ -5,7 +5,6 @@ load("@build_bazel_rules_nodejs//:index.bzl", _pkg_npm = "pkg_npm")
 load("@io_bazel_rules_sass//:defs.bzl", _npm_sass_library = "npm_sass_library", _sass_binary = "sass_binary", _sass_library = "sass_library")
 load("@npm//@angular/bazel:index.bzl", _ng_package = "ng_package")
 load("@npm//@angular/build-tooling/bazel/integration:index.bzl", _integration_test = "integration_test")
-load("@npm//@angular/build-tooling/bazel/karma:index.bzl", _karma_web_test_suite = "karma_web_test_suite")
 load("@npm//@angular/build-tooling/bazel/esbuild:index.bzl", _esbuild = "esbuild", _esbuild_config = "esbuild_config")
 load("@npm//@angular/build-tooling/bazel/spec-bundling:index.bzl", _spec_bundle = "spec_bundle")
 load("@npm//@angular/build-tooling/bazel/http-server:index.bzl", _http_server = "http_server")
@@ -18,6 +17,7 @@ load("//tools/markdown-to-html:index.bzl", _markdown_to_html = "markdown_to_html
 load("//tools/extract-tokens:index.bzl", _extract_tokens = "extract_tokens")
 load("//tools/angular:index.bzl", "LINKER_PROCESSED_FW_PACKAGES")
 load("//tools/bazel:ng_package_interop.bzl", "ng_package_interop")
+load("//tools:defaults2.bzl", _karma_web_test_suite = "karma_web_test_suite")
 
 npmPackageSubstitutions = select({
     "//tools:stamp": NPM_PACKAGE_SUBSTITUTIONS,
@@ -31,6 +31,7 @@ extract_tokens = _extract_tokens
 esbuild = _esbuild
 esbuild_config = _esbuild_config
 http_server = _http_server
+karma_web_test_suite = _karma_web_test_suite
 
 def sass_binary(sourcemap = False, include_paths = [], **kwargs):
     _sass_binary(
@@ -145,35 +146,6 @@ def jasmine_node_test(**kwargs):
     kwargs["templated_args"] = ["--bazel_patch_module_resolver"] + kwargs.get("templated_args", [])
     _jasmine_node_test(**kwargs)
 
-def karma_web_test_suite(name, **kwargs):
-    test_deps = kwargs.get("deps", [])
-
-    kwargs["tags"] = ["partial-compilation-integration"] + kwargs.get("tags", [])
-    kwargs["deps"] = ["%s_bundle" % name]
-
-    spec_bundle(
-        name = "%s_bundle" % name,
-        deps = test_deps,
-        platform = "browser",
-    )
-
-    # Set up default browsers if no explicit `browsers` have been specified.
-    if not hasattr(kwargs, "browsers"):
-        kwargs["tags"] = ["native"] + kwargs.get("tags", [])
-        kwargs["browsers"] = [
-            # Note: when changing the browser names here, also update the "yarn test"
-            # script to reflect the new browser names.
-            "@npm//@angular/build-tooling/bazel/browsers/chromium:chromium",
-            "@npm//@angular/build-tooling/bazel/browsers/firefox:firefox",
-        ]
-
-    # Default test suite with all configured browsers, and the debug target being
-    # setup from `angular/dev-infra`.
-    _karma_web_test_suite(
-        name = name,
-        **kwargs
-    )
-
 def protractor_web_test_suite(name, deps, **kwargs):
     spec_bundle(
         name = "%s_bundle" % name,

tools/defaults2.bzl

@@ -3,6 +3,8 @@ 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")
+load("@devinfra//bazel/spec-bundling:index_rjs.bzl", "spec_bundle_amd")
+load("@devinfra//bazel/karma:index.bzl", _karma_web_test_suite = "karma_web_test_suite")
 
 def npm_package(**kwargs):
     _npm_package(**kwargs)
@@ -73,3 +75,30 @@ def jasmine_test(data = [], args = [], **kwargs):
         ],
         **kwargs
     )
+
+def karma_web_test_suite(name, tags = [], deps = [], browsers = None, **kwargs):
+    spec_bundle_amd(
+        name = "%s_bundle" % name,
+        workspace_name = "angular_material",
+        deps = deps,
+    )
+
+    test_tags = ["partial-compilation-integration"] + tags
+
+    # Set up default browsers if no explicit `browsers` have been specified.
+    if browsers == None:
+        test_tags.append("native")
+        browsers = [
+            # Note: when changing the browser names here, also update the "yarn test"
+            # script to reflect the new browser names.
+            "@npm//@angular/build-tooling/bazel/browsers/chromium:chromium",
+            "@npm//@angular/build-tooling/bazel/browsers/firefox:firefox",
+        ]
+
+    _karma_web_test_suite(
+        name = name,
+        tags = test_tags,
+        deps = [":%s_bundle" % name],
+        browsers = browsers,
+        **kwargs
+    )