Content-Length: 14036 | pFad | http://github.com/angular/angular/pull/61544.patch

thub.com From 58238a37375ca79b7875a25a0e6e60577389859a Mon Sep 17 00:00:00 2001 From: Joey Perrott Date: Tue, 20 May 2025 21:32:15 +0000 Subject: [PATCH] build: migrate router to use rules_js Use ts_project and ng_project for building router --- goldens/public-api/router/index.api.md | 3 +-- .../public-api/router/testing/index.api.md | 1 - packages/router/BUILD.bazel | 15 ++++++----- packages/router/test/BUILD.bazel | 25 +++++++++++-------- packages/router/test/bootstrap.spec.ts | 12 ++++++--- .../test/integration/lazy_loading.spec.ts | 2 +- .../test/integration/route_data.spec.ts | 2 +- .../integration/route_reuse_strategy.spec.ts | 2 +- .../integration/router_link_active.spec.ts | 2 +- .../test/integration/router_links.spec.ts | 2 +- packages/router/testing/BUILD.bazel | 17 +++++++------ packages/router/testing/test/BUILD.bazel | 23 +++++++++-------- packages/router/upgrade/BUILD.bazel | 15 ++++++----- packages/router/upgrade/test/BUILD.bazel | 21 +++++++++------- 14 files changed, 81 insertions(+), 61 deletions(-) diff --git a/goldens/public-api/router/index.api.md b/goldens/public-api/router/index.api.md index 58ee9ae0147d..dbd49f473fc9 100644 --- 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 index 0fcfb7d61275..7a08536ca435 100644 --- 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 index be243f501694..99b17c1c3319 100644 --- a/packages/router/BUILD.bazel +++ b/packages/router/BUILD.bazel @@ -1,8 +1,9 @@ -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( [ @@ -10,12 +11,14 @@ ng_module( "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 index 995e5b67be6a..9bc5c4e26ccc 100644 --- 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 index 02b447599335..085d1c65a347 100644 --- 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 index 2a3020aab396..2d7da199bbd1 100644 --- 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 index 7a38934b6056..730266c26521 100644 --- 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 index 14e2a725566a..d708051e6c17 100644 --- 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 index bd89df5b3c95..c1cd141fba8c 100644 --- 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 index d5ed3bb2157e..ffa5c315c0b7 100644 --- 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 index 37367fd29b78..51b286c0afbf 100644 --- 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 index 94c7a1e45d50..3e18a923b0a4 100644 --- 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 index 3b64c409088d..8dcc55ab0736 100644 --- a/packages/router/upgrade/BUILD.bazel +++ b/packages/router/upgrade/BUILD.bazel @@ -1,10 +1,11 @@ -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( [ @@ -12,11 +13,13 @@ ng_module( "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 index f0b6ab3f78be..ed027cf574db 100644 --- 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", ], )

pFad - (p)hone/(F)rame/(a)nonymizer/(d)eclutterfier! Saves Data!