Skip to content

Commit a66e71d

Browse files
josephperrottthePunderWoman
josephperrott
authored and
thePunderWoman
committed
build: migrate adev to use ng_project (angular#61345)
Move all of adev to use ng_project instead of ng_module PR Close angular#61345
1 parent 650bac5 commit a66e71d

File tree

28 files changed

+301
-186
lines changed

28 files changed

+301
-186
lines changed

‎.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
# Input hashes for repository rule npm_translate_lock(name = "npm2", pnpm_lock = "@//:pnpm-lock.yaml").
33
# This file should be checked into version control along with the pnpm-lock.yaml file.
44
.npmrc=-1406867100
5-
package.json=1896628490
5+
package.json=-1028970955
66
packages/compiler-cli/package.json=571832290
77
packages/compiler/package.json=-426903429
8-
pnpm-lock.yaml=-1057376033
8+
pnpm-lock.yaml=1903599576
99
pnpm-workspace.yaml=353334404
1010
tools/bazel/rules_angular_store/package.json=-239561259
11-
yarn.lock=-914509027
11+
yarn.lock=567045571

‎adev/BUILD.bazel‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ APPLICATION_DEPS = [
6262
"@npm//@angular/router",
6363
"@npm//@angular/ssr",
6464
"@npm//@types/dom-navigation",
65+
"@npm//fflate",
6566
"@npm//marked",
6667
"@npm//ngx-progressbar",
6768
"@npm//rxjs",

‎adev/shared-docs/BUILD.bazel‎

Lines changed: 42 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
load("@aspect_bazel_lib//lib:copy_to_directory.bzl", "copy_to_directory")
12
load("@aspect_rules_ts//ts:defs.bzl", rules_js_tsconfig = "ts_config")
2-
load("//tools:defaults.bzl", "ng_module", "ng_package")
3+
load("//tools:defaults.bzl", "pkg_npm")
4+
load("//tools:defaults2.bzl", "ng_package", "ng_project")
35

4-
package(default_visibility = ["//visibility:private"])
6+
package(default_visibility = ["//visibility:public"])
57

68
rules_js_tsconfig(
79
name = "tsconfig_build",
@@ -23,26 +25,26 @@ rules_js_tsconfig(
2325
],
2426
)
2527

26-
ng_module(
28+
ng_project(
2729
name = "docs",
2830
srcs = [
2931
"index.ts",
3032
],
31-
module_name = "@angular/docs",
33+
tsconfig = "//adev/shared-docs:tsconfig_build",
3234
deps = [
33-
"//adev/shared-docs/components",
34-
"//adev/shared-docs/directives",
35-
"//adev/shared-docs/interfaces",
36-
"//adev/shared-docs/pipes",
37-
"//adev/shared-docs/providers",
38-
"//adev/shared-docs/services",
39-
"//adev/shared-docs/testing",
40-
"//adev/shared-docs/utils",
35+
"//adev/shared-docs/components:components_rjs",
36+
"//adev/shared-docs/directives:directives_rjs",
37+
"//adev/shared-docs/interfaces:interfaces_rjs",
38+
"//adev/shared-docs/pipes:pipes_rjs",
39+
"//adev/shared-docs/providers:providers_rjs",
40+
"//adev/shared-docs/services:services_rjs",
41+
"//adev/shared-docs/testing:testing_rjs",
42+
"//adev/shared-docs/utils:utils_rjs",
4143
],
4244
)
4345

4446
ng_package(
45-
name = "npm_package",
47+
name = "pkg",
4648
srcs = [
4749
"package.json",
4850
"//adev/shared-docs/icons",
@@ -60,10 +62,35 @@ ng_package(
6062
"//adev/shared-docs/pipeline/tutorials/common:files",
6163
"//adev/shared-docs/styles",
6264
],
65+
package = "@angular/docs",
6366
visibility = [
64-
"//adev:__pkg__",
67+
"//adev/shared-docs:__pkg__",
6568
],
6669
deps = [
67-
":docs",
70+
":docs_rjs",
71+
],
72+
)
73+
74+
copy_to_directory(
75+
name = "pkg_middle",
76+
srcs = [
77+
":pkg",
78+
],
79+
replace_prefixes = {
80+
"pkg": "",
81+
},
82+
)
83+
84+
# Temporarily include this intermediate `pkg_npm` so that the rest of the adev tooling is able to
85+
# properly performing linking using information from rules_nodejs toolchain providers.
86+
pkg_npm(
87+
name = "npm_package",
88+
package_name = "@angular/docs",
89+
nested_packages = [
90+
":pkg_middle",
6891
],
92+
substitutions = {
93+
# Force the "unstamped" versions to be later than current so they are considered up to date.
94+
"0.0.0": "99.99.99",
95+
},
6996
)

‎adev/shared-docs/components/algolia-icon/BUILD.bazel‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
1-
load("//tools:defaults.bzl", "ng_module")
1+
load("//tools:defaults2.bzl", "ng_project")
22

33
package(default_visibility = ["//visibility:private"])
44

5-
ng_module(
5+
ng_project(
66
name = "algolia-icon",
77
srcs = [
88
"algolia-icon.component.ts",
99
],
1010
assets = [
1111
"algolia-icon.component.html",
1212
],
13+
interop_deps = [
14+
"//packages/core",
15+
],
16+
tsconfig = "//adev/shared-docs:tsconfig_build",
1317
visibility = [
1418
"//adev/shared-docs/components:__pkg__",
1519
"//adev/shared-docs/components/search-dialog:__pkg__",
1620
],
17-
deps = [
18-
"//packages/core",
19-
],
2021
)

‎adev/shared-docs/components/breadcrumb/BUILD.bazel‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
load("@io_bazel_rules_sass//:defs.bzl", "sass_binary")
2-
load("//tools:defaults.bzl", "karma_web_test_suite", "ng_module")
3-
load("//tools:defaults2.bzl", "ts_project")
2+
load("//tools:defaults.bzl", "karma_web_test_suite")
3+
load("//tools:defaults2.bzl", "ng_project", "ts_project")
44

55
package(default_visibility = ["//visibility:private"])
66

7-
ng_module(
7+
ng_project(
88
name = "breadcrumb",
99
srcs = [
1010
"breadcrumb.component.ts",
@@ -13,16 +13,19 @@ ng_module(
1313
":breadcrumb.component.css",
1414
"breadcrumb.component.html",
1515
],
16+
interop_deps = [
17+
"//packages/common",
18+
"//packages/core",
19+
"//packages/router",
20+
],
21+
tsconfig = "//adev/shared-docs:tsconfig_build",
1622
visibility = [
1723
"//adev/shared-docs/components:__pkg__",
1824
"//adev/shared-docs/components/viewers:__pkg__",
1925
],
2026
deps = [
21-
"//adev/shared-docs/interfaces",
22-
"//adev/shared-docs/services",
23-
"//packages/common",
24-
"//packages/core",
25-
"//packages/router",
27+
"//adev/shared-docs/interfaces:interfaces_rjs",
28+
"//adev/shared-docs/services:services_rjs",
2629
],
2730
)
2831

‎adev/shared-docs/components/cookie-popup/BUILD.bazel‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
load("@io_bazel_rules_sass//:defs.bzl", "sass_binary")
2-
load("//tools:defaults.bzl", "karma_web_test_suite", "ng_module")
3-
load("//tools:defaults2.bzl", "ts_project")
2+
load("//tools:defaults.bzl", "karma_web_test_suite")
3+
load("//tools:defaults2.bzl", "ng_project", "ts_project")
44

55
package(default_visibility = ["//visibility:private"])
66

7-
ng_module(
7+
ng_project(
88
name = "cookie-popup",
99
srcs = [
1010
"cookie-popup.component.ts",
@@ -13,14 +13,17 @@ ng_module(
1313
":cookie-popup.component.css",
1414
"cookie-popup.component.html",
1515
],
16+
interop_deps = [
17+
"//packages/common",
18+
"//packages/core",
19+
],
20+
tsconfig = "//adev/shared-docs:tsconfig_build",
1621
visibility = [
1722
"//adev/shared-docs/components:__pkg__",
1823
],
1924
deps = [
20-
"//adev/shared-docs/providers",
21-
"//adev/shared-docs/utils",
22-
"//packages/common",
23-
"//packages/core",
25+
"//adev/shared-docs/providers:providers_rjs",
26+
"//adev/shared-docs/utils:utils_rjs",
2427
],
2528
)
2629

‎adev/shared-docs/components/copy-source-code-button/BUILD.bazel‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,28 @@
1-
load("//tools:defaults.bzl", "karma_web_test_suite", "ng_module")
2-
load("//tools:defaults2.bzl", "ts_project")
1+
load("//tools:defaults.bzl", "karma_web_test_suite")
2+
load("//tools:defaults2.bzl", "ng_project", "ts_project")
33

44
package(default_visibility = ["//visibility:private"])
55

6-
ng_module(
6+
ng_project(
77
name = "copy-source-code-button",
88
srcs = [
99
"copy-source-code-button.component.ts",
1010
],
1111
assets = [
1212
"copy-source-code-button.component.html",
1313
],
14+
interop_deps = [
15+
"//packages/common",
16+
"//packages/core",
17+
],
18+
tsconfig = "//adev/shared-docs:tsconfig_build",
1419
visibility = [
1520
"//adev/shared-docs/components:__pkg__",
1621
"//adev/shared-docs/components/viewers:__pkg__",
1722
],
1823
deps = [
19-
"//adev/shared-docs/components/icon",
20-
"//packages/common",
21-
"//packages/core",
22-
"@npm//@angular/cdk",
24+
"//:node_modules/@angular/cdk",
25+
"//adev/shared-docs/components/icon:icon_rjs",
2326
],
2427
)
2528

‎adev/shared-docs/components/icon/BUILD.bazel‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
11
load("@io_bazel_rules_sass//:defs.bzl", "sass_binary")
2-
load("//tools:defaults.bzl", "ng_module")
2+
load("//tools:defaults2.bzl", "ng_project")
33

44
package(default_visibility = ["//visibility:private"])
55

6-
ng_module(
6+
ng_project(
77
name = "icon",
88
srcs = [
99
"icon.component.ts",
1010
],
1111
assets = [
1212
":icon.component.css",
1313
],
14+
interop_deps = [
15+
"//packages/common",
16+
"//packages/core",
17+
],
18+
tsconfig = "//adev/shared-docs:tsconfig_build",
1419
visibility = [
1520
"//adev/shared-docs/components:__pkg__",
1621
"//adev/shared-docs/components/copy-source-code-button:__pkg__",
@@ -20,10 +25,6 @@ ng_module(
2025
"//adev/shared-docs/components/top-level-banner:__pkg__",
2126
"//adev/shared-docs/components/viewers:__pkg__",
2227
],
23-
deps = [
24-
"//packages/common",
25-
"//packages/core",
26-
],
2728
)
2829

2930
sass_binary(

‎adev/shared-docs/components/navigation-list/BUILD.bazel‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
load("@io_bazel_rules_sass//:defs.bzl", "sass_binary")
2-
load("//tools:defaults.bzl", "karma_web_test_suite", "ng_module")
3-
load("//tools:defaults2.bzl", "ts_project")
2+
load("//tools:defaults.bzl", "karma_web_test_suite")
3+
load("//tools:defaults2.bzl", "ng_project", "ts_project")
44

55
package(default_visibility = ["//visibility:private"])
66

7-
ng_module(
7+
ng_project(
88
name = "navigation-list",
99
srcs = [
1010
"navigation-list.component.ts",
@@ -13,18 +13,21 @@ ng_module(
1313
":navigation-list.component.css",
1414
"navigation-list.component.html",
1515
],
16+
interop_deps = [
17+
"//packages/common",
18+
"//packages/core",
19+
"//packages/router",
20+
],
21+
tsconfig = "//adev/shared-docs:tsconfig_build",
1622
visibility = [
1723
"//adev/shared-docs/components:__pkg__",
1824
],
1925
deps = [
20-
"//adev/shared-docs/components/icon",
21-
"//adev/shared-docs/interfaces",
22-
"//adev/shared-docs/pipes",
23-
"//adev/shared-docs/services",
24-
"//packages/common",
25-
"//packages/core",
26-
"//packages/router",
27-
"@npm//@angular/material",
26+
"//:node_modules/@angular/material",
27+
"//adev/shared-docs/components/icon:icon_rjs",
28+
"//adev/shared-docs/interfaces:interfaces_rjs",
29+
"//adev/shared-docs/pipes:pipes_rjs",
30+
"//adev/shared-docs/services:services_rjs",
2831
],
2932
)
3033

‎adev/shared-docs/components/navigation-list/navigation-list.component.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
} @else {
2424
<a
2525
[routerLink]="'/' + item.path"
26-
[routerLinkActiveOptions]="{
27-
queryParams: 'ignored',
28-
fragment: 'ignored',
29-
matrixParams: 'exact',
30-
paths: 'exact',
31-
exact: false
32-
}"
26+
27+
28+
29+
30+
31+
32+
3333
routerLinkActive="docs-faceted-list-item-active"
3434
(click)="emitClickOnLink()"
3535
[matTooltip]="item.label"

0 commit comments

Comments
 (0)