angular · josephperrott · May 20, 2025
diff --git a/goldens/public-api/router/index.api.md b/goldens/public-api/router/index.api.md
@@ -5,7 +5,6 @@
 ```ts
 
 import { AfterContentInit } from '@angular/core';
-import * as _angular_router from '@angular/router';
 import { ChangeDetectorRef } from '@angular/core';
 import { ComponentRef } from '@angular/core';
 import { ElementRef } from '@angular/core';
@@ -723,7 +722,7 @@ export class Router {
     resetConfig(config: Routes): void;
     // @deprecated
     routeReuseStrategy: RouteReuseStrategy;
-    get routerState(): _angular_router.RouterState;
+    get routerState(): RouterState;
     serializeUrl(url: UrlTree): string;
     setUpLocationChangeListener(): void;
     get url(): string;

diff --git a/goldens/public-api/router/testing/index.api.md b/goldens/public-api/router/testing/index.api.md
@@ -5,7 +5,6 @@
 ```ts
 
 import { AfterContentInit } from '@angular/core';
-import * as _angular_router from '@angular/router';
 import { ChangeDetectorRef } from '@angular/core';
 import { ComponentFixture } from '@angular/core/testing';
 import { ComponentRef } from '@angular/core';

diff --git a/packages/router/BUILD.bazel b/packages/router/BUILD.bazel
@@ -1,21 +1,24 @@
-load("//tools:defaults.bzl", "api_golden_test", "api_golden_test_npm_package", "generate_api_docs", "ng_module", "ng_package")
+load("//tools:defaults.bzl", "api_golden_test", "api_golden_test_npm_package", "generate_api_docs", "ng_package")
+load("//tools:defaults2.bzl", "ng_project")
 
 package(default_visibility = ["//visibility:public"])
 
-ng_module(
+ng_project(
     name = "router",
     srcs = glob(
         [
             "*.ts",
             "src/**/*.ts",
         ],
     ),
-    deps = [
+    interop_deps = [
         "//packages/common",
-        "//packages/core",
         "//packages/platform-browser",
-        "@npm//@types/dom-view-transitions",
-        "@npm//rxjs",
+    ],
+    deps = [
+        "//:node_modules/@types/dom-view-transitions",
+        "//:node_modules/rxjs",
+        "//packages/core:core_rjs",
     ],
 )
 

diff --git a/packages/router/test/BUILD.bazel b/packages/router/test/BUILD.bazel
@@ -1,24 +1,27 @@
-load("//tools:defaults.bzl", "karma_web_test_suite", "ts_library", "zone_compatible_jasmine_node_test")
+load("//tools:defaults.bzl", "karma_web_test_suite", "zone_compatible_jasmine_node_test")
+load("//tools:defaults2.bzl", "ts_project")
 
-ts_library(
+ts_project(
     name = "test_lib",
     testonly = True,
     srcs = glob(["**/*.ts"]),
-    # Visible to //:saucelabs_unit_tests_poc target
-    visibility = ["//:__pkg__"],
-    deps = [
+    interop_deps = [
         "//packages/common",
         "//packages/common/testing",
-        "//packages/core",
-        "//packages/core/rxjs-interop",
-        "//packages/core/testing",
         "//packages/platform-browser",
         "//packages/platform-browser-dynamic",
         "//packages/platform-browser/testing",
         "//packages/private/testing",
-        "//packages/router",
-        "//packages/router/testing",
-        "@npm//rxjs",
+    ],
+    # Visible to //:saucelabs_unit_tests_poc target
+    visibility = ["//:__pkg__"],
+    deps = [
+        "//:node_modules/rxjs",
+        "//packages/core:core_rjs",
+        "//packages/core/rxjs-interop:rxjs-interop_rjs",
+        "//packages/core/testing:testing_rjs",
+        "//packages/router:router_rjs",
+        "//packages/router/testing:testing_rjs",
     ],
 )
 

diff --git a/packages/router/test/bootstrap.spec.ts b/packages/router/test/bootstrap.spec.ts
@@ -6,9 +6,14 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {DOCUMENT, PlatformLocation, ɵgetDOM as getDOM} from '@angular/common';
-import {BrowserPlatformLocation} from '@angular/common/src/location/platform_location';
-import {NullViewportScroller, ViewportScroller} from '@angular/common/src/viewport_scroller';
+import {
+  DOCUMENT,
+  PlatformLocation,
+  ɵgetDOM as getDOM,
+  BrowserPlatformLocation,
+  ɵNullViewportScroller as NullViewportScroller,
+  ViewportScroller,
+} from '@angular/common';
 import {MockPlatformLocation} from '@angular/common/testing';
 import {
   ApplicationRef,
@@ -24,7 +29,6 @@ import {TestBed} from '@angular/core/testing';
 import {BrowserModule} from '@angular/platform-browser';
 import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
 import {
-  Event,
   NavigationEnd,
   provideRouter,
   Router,

diff --git a/packages/router/test/integration/lazy_loading.spec.ts b/packages/router/test/integration/lazy_loading.spec.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.dev/license
  */
-import {By} from '@angular/platform-browser/src/dom/debug/by';
+import {By} from '@angular/platform-browser';
 import {LocationStrategy, HashLocationStrategy, Location} from '@angular/common';
 import {
   inject as coreInject,

diff --git a/packages/router/test/integration/route_data.spec.ts b/packages/router/test/integration/route_data.spec.ts
@@ -27,7 +27,7 @@ import {
 } from '../../src';
 import {map} from 'rxjs/operators';
 import {EMPTY, Observer, Observable, of} from 'rxjs';
-import {By} from '@angular/platform-browser/src/dom/debug/by';
+import {By} from '@angular/platform-browser';
 import {
   createRoot,
   RootCmp,

diff --git a/packages/router/test/integration/route_reuse_strategy.spec.ts b/packages/router/test/integration/route_reuse_strategy.spec.ts
@@ -20,7 +20,7 @@ import {
 } from '../../src';
 import {Subscription} from 'rxjs';
 import {filter} from 'rxjs/operators';
-import {By} from '@angular/platform-browser/src/dom/debug/by';
+import {By} from '@angular/platform-browser';
 import {
   createRoot,
   BlankCmp,

diff --git a/packages/router/test/integration/router_link_active.spec.ts b/packages/router/test/integration/router_link_active.spec.ts
@@ -9,7 +9,7 @@ import {Component, NgZone} from '@angular/core';
 import {Location} from '@angular/common';
 import {fakeAsync, TestBed, inject} from '@angular/core/testing';
 import {Router, provideRouter} from '../../src';
-import {By} from '@angular/platform-browser/src/dom/debug/by';
+import {By} from '@angular/platform-browser';
 import {
   createRoot,
   RootCmp,

diff --git a/packages/router/test/integration/router_links.spec.ts b/packages/router/test/integration/router_links.spec.ts
@@ -8,7 +8,7 @@
 import {Component} from '@angular/core';
 import {Location} from '@angular/common';
 import {fakeAsync, TestBed, inject, ComponentFixture} from '@angular/core/testing';
-import {By} from '@angular/platform-browser/src/dom/debug/by';
+import {By} from '@angular/platform-browser';
 import {Router} from '../../src';
 import {expect} from '@angular/platform-browser/testing/src/matchers';
 import {

diff --git a/packages/router/testing/BUILD.bazel b/packages/router/testing/BUILD.bazel
@@ -1,19 +1,22 @@
-load("//tools:defaults.bzl", "generate_api_docs", "ng_module")
+load("//tools:defaults.bzl", "generate_api_docs")
+load("//tools:defaults2.bzl", "ng_project")
 
 package(default_visibility = ["//visibility:public"])
 
 exports_files(["package.json"])
 
-ng_module(
+ng_project(
     name = "testing",
     srcs = glob(["**/*.ts"]),
-    deps = [
+    interop_deps = [
         "//packages/common",
         "//packages/common/testing",
-        "//packages/core",
-        "//packages/core/testing",
-        "//packages/router",
-        "@npm//rxjs",
+    ],
+    deps = [
+        "//:node_modules/rxjs",
+        "//packages/core:core_rjs",
+        "//packages/core/testing:testing_rjs",
+        "//packages/router:router_rjs",
     ],
 )
 

diff --git a/packages/router/testing/test/BUILD.bazel b/packages/router/testing/test/BUILD.bazel
@@ -1,23 +1,26 @@
-load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite", "ts_library")
+load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite")
+load("//tools:defaults2.bzl", "ts_project")
 
-ts_library(
+ts_project(
     name = "test_lib",
     testonly = True,
     srcs = glob(["**/*.ts"]),
-    # Visible to //:saucelabs_unit_tests_poc target
-    visibility = ["//:__pkg__"],
-    deps = [
+    interop_deps = [
         "//packages/common",
         "//packages/common/testing",
-        "//packages/core",
-        "//packages/core/testing",
         "//packages/platform-browser",
         "//packages/platform-browser-dynamic",
         "//packages/platform-browser/testing",
         "//packages/private/testing",
-        "//packages/router",
-        "//packages/router/testing",
-        "@npm//rxjs",
+    ],
+    # Visible to //:saucelabs_unit_tests_poc target
+    visibility = ["//:__pkg__"],
+    deps = [
+        "//:node_modules/rxjs",
+        "//packages/core:core_rjs",
+        "//packages/core/testing:testing_rjs",
+        "//packages/router:router_rjs",
+        "//packages/router/testing:testing_rjs",
     ],
 )
 

diff --git a/packages/router/upgrade/BUILD.bazel b/packages/router/upgrade/BUILD.bazel
@@ -1,22 +1,25 @@
-load("//tools:defaults.bzl", "generate_api_docs", "ng_module")
+load("//tools:defaults.bzl", "generate_api_docs")
+load("//tools:defaults2.bzl", "ng_project")
 
 package(default_visibility = ["//visibility:public"])
 
 exports_files(["package.json"])
 
-ng_module(
+ng_project(
     name = "upgrade",
     srcs = glob(
         [
             "*.ts",
             "src/**/*.ts",
         ],
     ),
-    deps = [
+    interop_deps = [
         "//packages/common",
-        "//packages/core",
-        "//packages/router",
-        "//packages/upgrade/static",
+    ],
+    deps = [
+        "//packages/core:core_rjs",
+        "//packages/router:router_rjs",
+        "//packages/upgrade/static:static_rjs",
     ],
 )
 

diff --git a/packages/router/upgrade/test/BUILD.bazel b/packages/router/upgrade/test/BUILD.bazel
@@ -1,20 +1,23 @@
-load("//tools:defaults.bzl", "karma_web_test_suite", "ts_library")
+load("//tools:defaults.bzl", "karma_web_test_suite")
+load("//tools:defaults2.bzl", "ts_project")
 
-ts_library(
+ts_project(
     name = "test_lib",
     testonly = True,
     srcs = glob(["**/*.ts"]),
-    deps = [
+    interop_deps = [
         "//packages/common",
         "//packages/common/testing",
         "//packages/common/upgrade",
-        "//packages/core",
-        "//packages/core/testing",
         "//packages/private/testing",
-        "//packages/router",
-        "//packages/router/testing",
-        "//packages/router/upgrade",
-        "//packages/upgrade/static",
+    ],
+    deps = [
+        "//packages/core:core_rjs",
+        "//packages/core/testing:testing_rjs",
+        "//packages/router:router_rjs",
+        "//packages/router/testing:testing_rjs",
+        "//packages/router/upgrade:upgrade_rjs",
+        "//packages/upgrade/static:static_rjs",
     ],
 )