Skip to content

Commit 3acc2a5

Browse files
josephperrottthePunderWoman
authored andcommitted
build: migrate router to use rules_js (angular#61542)
Use ts_project and ng_project for building router PR Close angular#61542
1 parent 7651d37 commit 3acc2a5

12 files changed

Lines changed: 79 additions & 57 deletions

File tree

packages/router/BUILD.bazel

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
1-
load("//tools:defaults.bzl", "api_golden_test", "api_golden_test_npm_package", "generate_api_docs", "ng_module", "ng_package")
1+
load("//tools:defaults.bzl", "api_golden_test", "api_golden_test_npm_package", "generate_api_docs", "ng_package")
2+
load("//tools:defaults2.bzl", "ng_project")
23

34
package(default_visibility = ["//visibility:public"])
45

5-
ng_module(
6+
ng_project(
67
name = "router",
78
srcs = glob(
89
[
910
"*.ts",
1011
"src/**/*.ts",
1112
],
1213
),
13-
deps = [
14+
interop_deps = [
1415
"//packages/common",
15-
"//packages/core",
1616
"//packages/platform-browser",
17-
"@npm//rxjs",
17+
],
18+
deps = [
19+
"//:node_modules/rxjs",
20+
"//packages/core:core_rjs",
1821
],
1922
)
2023

packages/router/test/BUILD.bazel

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,27 @@
1-
load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite", "ts_library")
1+
load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite")
2+
load("//tools:defaults2.bzl", "ts_project")
23

3-
ts_library(
4+
ts_project(
45
name = "test_lib",
56
testonly = True,
67
srcs = glob(["**/*.ts"]),
7-
# Visible to //:saucelabs_unit_tests_poc target
8-
visibility = ["//:__pkg__"],
9-
deps = [
8+
interop_deps = [
109
"//packages/common",
1110
"//packages/common/testing",
12-
"//packages/core",
13-
"//packages/core/rxjs-interop",
14-
"//packages/core/testing",
1511
"//packages/platform-browser",
1612
"//packages/platform-browser-dynamic",
1713
"//packages/platform-browser/testing",
1814
"//packages/private/testing",
19-
"//packages/router",
20-
"//packages/router/testing",
21-
"@npm//rxjs",
15+
],
16+
# Visible to //:saucelabs_unit_tests_poc target
17+
visibility = ["//:__pkg__"],
18+
deps = [
19+
"//:node_modules/rxjs",
20+
"//packages/core:core_rjs",
21+
"//packages/core/rxjs-interop:rxjs-interop_rjs",
22+
"//packages/core/testing:testing_rjs",
23+
"//packages/router:router_rjs",
24+
"//packages/router/testing:testing_rjs",
2225
],
2326
)
2427

packages/router/test/bootstrap.spec.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,14 @@
66
* found in the LICENSE file at https://angular.dev/license
77
*/
88

9-
import {DOCUMENT, PlatformLocation, ɵgetDOM as getDOM} from '@angular/common';
10-
import {BrowserPlatformLocation} from '@angular/common/src/location/platform_location';
11-
import {NullViewportScroller, ViewportScroller} from '@angular/common/src/viewport_scroller';
9+
import {
10+
DOCUMENT,
11+
PlatformLocation,
12+
ɵgetDOM as getDOM,
13+
BrowserPlatformLocation,
14+
ɵNullViewportScroller as NullViewportScroller,
15+
ViewportScroller,
16+
} from '@angular/common';
1217
import {MockPlatformLocation} from '@angular/common/testing';
1318
import {
1419
ApplicationRef,
@@ -26,7 +31,6 @@ import {isNode} from '@angular/private/testing';
2631
import {BrowserModule} from '@angular/platform-browser';
2732
import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
2833
import {
29-
Event,
3034
NavigationEnd,
3135
provideRouter,
3236
Router,

packages/router/test/integration/lazy_loading.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Use of this source code is governed by an MIT-style license that can be
66
* found in the LICENSE file at https://angular.dev/license
77
*/
8-
import {By} from '@angular/platform-browser/src/dom/debug/by';
8+
import {By} from '@angular/platform-browser';
99
import {LocationStrategy, HashLocationStrategy, Location} from '@angular/common';
1010
import {
1111
inject,

packages/router/test/integration/route_data.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import {
2727
} from '../../src';
2828
import {map} from 'rxjs/operators';
2929
import {EMPTY, Observer, Observable, of} from 'rxjs';
30-
import {By} from '@angular/platform-browser/src/dom/debug/by';
30+
import {By} from '@angular/platform-browser';
3131
import {
3232
RootCmp,
3333
BlankCmp,

packages/router/test/integration/route_reuse_strategy.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import {
2020
} from '../../src';
2121
import {Subscription} from 'rxjs';
2222
import {filter} from 'rxjs/operators';
23-
import {By} from '@angular/platform-browser/src/dom/debug/by';
23+
import {By} from '@angular/platform-browser';
2424
import {
2525
BlankCmp,
2626
RootCmp,

packages/router/test/integration/router_link_active.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {Component, NgZone} from '@angular/core';
99
import {Location} from '@angular/common';
1010
import {TestBed} from '@angular/core/testing';
1111
import {Router, provideRouter} from '../../src';
12-
import {By} from '@angular/platform-browser/src/dom/debug/by';
12+
import {By} from '@angular/platform-browser';
1313
import {
1414
RootCmp,
1515
BlankCmp,

packages/router/test/integration/router_links.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import {Component} from '@angular/core';
99
import {Location} from '@angular/common';
1010
import {TestBed, ComponentFixture} from '@angular/core/testing';
11-
import {By} from '@angular/platform-browser/src/dom/debug/by';
11+
import {By} from '@angular/platform-browser';
1212
import {Router} from '../../src';
1313
import {expect} from '@angular/private/testing/matchers';
1414
import {

packages/router/testing/BUILD.bazel

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
1-
load("//tools:defaults.bzl", "generate_api_docs", "ng_module")
1+
load("//tools:defaults.bzl", "generate_api_docs")
2+
load("//tools:defaults2.bzl", "ng_project")
23

34
package(default_visibility = ["//visibility:public"])
45

56
exports_files(["package.json"])
67

7-
ng_module(
8+
ng_project(
89
name = "testing",
910
srcs = glob(["**/*.ts"]),
10-
deps = [
11+
interop_deps = [
1112
"//packages/common",
1213
"//packages/common/testing",
13-
"//packages/core",
14-
"//packages/core/testing",
15-
"//packages/router",
16-
"@npm//rxjs",
14+
],
15+
deps = [
16+
"//:node_modules/rxjs",
17+
"//packages/core:core_rjs",
18+
"//packages/core/testing:testing_rjs",
19+
"//packages/router:router_rjs",
1720
],
1821
)
1922

packages/router/testing/test/BUILD.bazel

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,26 @@
1-
load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite", "ts_library")
1+
load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite")
2+
load("//tools:defaults2.bzl", "ts_project")
23

3-
ts_library(
4+
ts_project(
45
name = "test_lib",
56
testonly = True,
67
srcs = glob(["**/*.ts"]),
7-
# Visible to //:saucelabs_unit_tests_poc target
8-
visibility = ["//:__pkg__"],
9-
deps = [
8+
interop_deps = [
109
"//packages/common",
1110
"//packages/common/testing",
12-
"//packages/core",
13-
"//packages/core/testing",
1411
"//packages/platform-browser",
1512
"//packages/platform-browser-dynamic",
1613
"//packages/platform-browser/testing",
1714
"//packages/private/testing",
18-
"//packages/router",
19-
"//packages/router/testing",
20-
"@npm//rxjs",
15+
],
16+
# Visible to //:saucelabs_unit_tests_poc target
17+
visibility = ["//:__pkg__"],
18+
deps = [
19+
"//:node_modules/rxjs",
20+
"//packages/core:core_rjs",
21+
"//packages/core/testing:testing_rjs",
22+
"//packages/router:router_rjs",
23+
"//packages/router/testing:testing_rjs",
2124
],
2225
)
2326

0 commit comments

Comments
 (0)