8000 [19.2.x] build: migrate adev to use ng_project by josephperrott · Pull Request #61344 · angular/angular · GitHub
[go: up one dir, main page]
Skip to content

[19.2.x] build: migrate adev to use ng_project #61344

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

[19.2.x] build: migrate adev to use ng_project #61344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
47ba91b
build: migrate adev to use ng_project
josephperrott May 12, 2025
a28e03b
build: move ts_project and ng_project for adev into a macro
josephperrott May 14, 2025
0d88090
docs(docs-infra): fix substitution regex
josephperrott May 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
# Input hashes for repository rule npm_translate_lock(name = "npm2", pnpm_lock = "@//:pnpm-lock.yaml").
# This file should be checked into version control along with the pnpm-lock.yaml file.
.npmrc=-203833057
package.json=244284406
package.json=-1374249541
packages/compiler-cli/package.json=-1396217149
packages/compiler/package.json=499550843
pnpm-lock.yaml=1213960201
pnpm-lock.yaml=-128291042
pnpm-workspace.yaml=353334404
tools/bazel/rules_angular_store/package.json=-239561259
yarn.lock=-1196495789
yarn.lock=1636150847
1 change: 1 addition & 0 deletions adev/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ APPLICATION_DEPS = [
"@npm//@angular/platform-server",
"@npm//@angular/router",
"@npm//@angular/ssr",
"@npm//fflate",
"@npm//marked",
"@npm//ngx-progressbar",
"@npm//rxjs",
Expand Down
57 changes: 42 additions & 15 deletions adev/shared-docs/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
load("@aspect_bazel_lib//lib:copy_to_directory.bzl", "copy_to_directory")
load("@aspect_rules_ts//ts:defs.bzl", rules_js_tsconfig = "ts_config")
load("//tools:defaults.bzl", "ng_module", "ng_package")
load("//adev/shared-docs:defaults.bzl", "ng_project")
load("//tools:defaults.bzl", "pkg_npm")
load("//tools:defaults2.bzl", "ng_package")

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

rules_js_tsconfig(
name = "tsconfig_build",
Expand All @@ -23,26 +26,25 @@ rules_js_tsconfig(
],
)

ng_module(
ng_project(
name = "docs",
srcs = [
"index.ts",
],
module_name = "@angular/docs",
deps = [
"//adev/shared-docs/components",
"//adev/shared-docs/directives",
"//adev/shared-docs/interfaces",
"//adev/shared-docs/pipes",
"//adev/shared-docs/providers",
"//adev/shared-docs/services",
"//adev/shared-docs/testing",
"//adev/shared-docs/utils",
"//adev/shared-docs/components:components_rjs",
"//adev/shared-docs/directives:directives_rjs",
"//adev/shared-docs/interfaces:interfaces_rjs",
"//adev/shared-docs/pipes:pipes_rjs",
"//adev/shared-docs/providers:providers_rjs",
"//adev/shared-docs/services:services_rjs",
"//adev/shared-docs/testing:testing_rjs",
"//adev/shared-docs/utils:utils_rjs",
],
)

ng_package(
name = "npm_package",
name = "pkg",
srcs = [
"package.json",
"//adev/shared-docs/icons",
Expand All @@ -60,10 +62,35 @@ ng_package(
"//adev/shared-docs/pipeline/tutorials/common:files",
"//adev/shared-docs/styles",
],
package = "@angular/docs",
visibility = [
"//adev:__pkg__",
"//adev/shared-docs:__pkg__",
],
deps = [
":docs",
":docs_rjs",
],
)

copy_to_directory(
name = "pkg_middle",
srcs = [
":pkg",
],
replace_prefixes = {
"pkg": "",
},
)

# Temporarily include this intermediate `pkg_npm` so that the rest of the adev tooling is able to
# properly performing linking using information from rules_nodejs toolchain providers.
pkg_npm(
name = "npm_package",
package_name = "@angular/docs",
nested_packages = [
":pkg_middle",
],
substitutions = {
# Force the "unstamped" versions to be later than current so they are considered up to date.
"0\\.0\\.0": "99.99.99",
},
)
3 changes: 1 addition & 2 deletions adev/shared-docs/components/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("//tools:defaults2.bzl", "ts_project")
load("//adev/shared-docs:defaults.bzl", "ts_project")

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

Expand All @@ -22,7 +22,6 @@ ts_project(
"//adev/shared-docs/components/top-level-banner",
"//adev/shared-docs/components/viewers",
],
tsconfig = "//adev/shared-docs:tsconfig_build",
visibility = [
"//adev/shared-docs:__pkg__",
],
Expand Down
10 changes: 5 additions & 5 deletions adev/shared-docs/components/algolia-icon/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
load("//tools:defaults.bzl", "ng_module")
load("//adev/shared-docs:defaults.bzl", "ng_project")

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

ng_module(
ng_project(
name = "algolia-icon",
srcs = [
"algolia-icon.component.ts",
],
assets = [
"algolia-icon.component.html",
],
interop_deps = [
"//packages/core",
],
visibility = [
"//adev/shared-docs/components:__pkg__",
"//adev/shared-docs/components/search-dialog:__pkg__",
],
deps = [
"//packages/core",
],
)
19 changes: 10 additions & 9 deletions adev/shared-docs/components/breadcrumb/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
load("@io_bazel_rules_sass//:defs.bzl", "sass_binary")
load("//tools:defaults.bzl", "karma_web_test_suite", "ng_module")
load("//tools:defaults2.bzl", "ts_project")
load("//adev/shared-docs:defaults.bzl", "ng_project", "ts_project")
load("//tools:defaults.bzl", "karma_web_test_suite")

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

ng_module(
ng_project(
name = "breadcrumb",
srcs = [
"breadcrumb.component.ts",
Expand All @@ -13,16 +13,18 @@ ng_module(
":breadcrumb.component.css",
"breadcrumb.component.html",
],
interop_deps = [
"//packages/common",
"//packages/core",
"//packages/router",
],
visibility = [
"//adev/shared-docs/components:__pkg__",
"//adev/shared-docs/components/viewers:__pkg__",
],
deps = [
"//adev/shared-docs/interfaces",
"//adev/shared-docs/services",
"//packages/common",
"//packages/core",
"//packages/router",
"//adev/shared-docs/interfaces:interfaces_rjs",
"//adev/shared-docs/services:services_rjs",
],
)

Expand All @@ -47,7 +49,6 @@ ts_project(
"//packages/router",
"//packages/router/testing",
],
tsconfig = "//adev/shared-docs:tsconfig_test",
)

karma_web_test_suite(
Expand Down
17 changes: 9 additions & 8 deletions adev/shared-docs/components/cookie-popup/BUILD.bazel
View file
Open in desktop
2851
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
load("@io_bazel_rules_sass//:defs.bzl", "sass_binary")
load("//tools:defaults.bzl", "karma_web_test_suite", "ng_module")
load("//tools:defaults2.bzl", "ts_project")
load("//adev/shared-docs:defaults.bzl", "ng_project", "ts_project")
load("//tools:defaults.bzl", "karma_web_test_suite")

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

ng_module(
ng_project(
name = "cookie-popup",
srcs = [
"cookie-popup.component.ts",
Expand All @@ -13,14 +13,16 @@ ng_module(
":cookie-popup.component.css",
"cookie-popup.component.html",
],
interop_deps = [
"//packages/common",
"//packages/core",
],
visibility = [
"//adev/shared-docs/components:__pkg__",
],
deps = [
"//adev/shared-docs/providers",
"//adev/shared-docs/utils",
"//packages/common",
"//packages/core",
"//adev/shared-docs/providers:providers_rjs",
"//adev/shared-docs/utils:utils_rjs",
],
)

Expand All @@ -42,7 +44,6 @@ ts_project(
"//packages/core",
"//packages/core/testing",
],
tsconfig = "//adev/shared-docs:tsconfig_test",
)

karma_web_test_suite(
Expand Down
17 changes: 9 additions & 8 deletions adev/shared-docs/components/copy-source-code-button/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,27 @@
load("//tools:defaults.bzl", "karma_web_test_suite", "ng_module")
load("//tools:defaults2.bzl", "ts_project")
load("//adev/shared-docs:defaults.bzl", "ng_project", "ts_project")
load("//tools:defaults.bzl", "karma_web_test_suite")

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

ng_module(
ng_project(
name = "copy-source-code-button",
srcs = [
"copy-source-code-button.component.ts",
],
assets = [
"copy-source-code-button.component.html",
],
interop_deps = [
"//packages/common",
"//packages/core",
],
visibility = [
"//adev/shared-docs/components:__pkg__",
"//adev/shared-docs/components/viewers:__pkg__",
],
deps = [
"//adev/shared-docs/components/icon",
"//packages/common",
"//packages/core",
"@npm//@angular/cdk",
"//:node_modules/@angular/cdk",
"//adev/shared-docs/components/icon:icon_rjs",
],
)

Expand All @@ -35,7 +37,6 @@ ts_project(
"//packages/core/testing",
"//packages/platform-browser",
],
tsconfig = "//adev/shared-docs:tsconfig_test",
deps = [
"//:node_modules/@angular/cdk",
],
Expand Down
12 changes: 6 additions & 6 deletions adev/shared-docs/components/icon/BUILD.bazel
View file
Open in desktop
10000
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
load("@io_bazel_rules_sass//:defs.bzl", "sass_binary")
load("//tools:defaults.bzl", "ng_module")
load("//adev/shared-docs:defaults.bzl", "ng_project")

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

ng_module(
ng_project(
name = "icon",
srcs = [
"icon.component.ts",
],
assets = [
":icon.component.css",
],
interop_deps = [
"//packages/common",
"//packages/core",
],
visibility = [
"//adev/shared-docs/components:__pkg__",
"//adev/shared-docs/components/copy-source-code-button:__pkg__",
Expand All @@ -20,10 +24,6 @@ ng_module(
"//adev/shared-docs/components/top-level-banner:__pkg__",
"//adev/shared-docs/components/viewers:__pkg__",
],
deps = [
"//packages/common",
"//packages/core",
],
)

sass_binary(
Expand Down
25 changes: 13 additions & 12 deletions adev/shared-docs/components/navigation-list/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
load("@io_bazel_rules_sass//:defs.bzl", "sass_binary")
load("//tools:defaults.bzl", "karma_web_test_suite", "ng_module")
load("//tools:defaults2.bzl", "ts_project")
load("//adev/shared-docs:defaults.bzl", "ng_project", "ts_project")
load("//tools:defaults.bzl", "karma_web_test_suite")

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

ng_module(
ng_project(
name = "navigation-list",
srcs = [
"navigation-list.component.ts",
Expand All @@ -13,18 +13,20 @@ ng_module(
":navigation-list.component.css",
"navigation-list.component.html",
],
interop_deps = [
"//packages/common",
"//packages/core",
"//packages/router",
],
visibility = [
"//adev/shared-docs/components:__pkg__",
],
deps = [
"//adev/shared-docs/components/icon",
"//adev/shared-docs/interfaces",
"//adev/shared-docs/pipes",
"//adev/shared-docs/services",
"//packages/common",
"//packages/core",
"//packages/router",
"@npm//@angular/material",
"//:node_modules/@angular/material",
"//adev/shared-docs/components/icon:icon_rjs",
"//adev/shared-docs/interfaces:interfaces_rjs",
"//adev/shared-docs/pipes:pipes_rjs",
"//adev/shared-docs/services:services_rjs",
],
)

Expand Down Expand Up @@ -52,7 +54,6 @@ ts_project(
"//packages/router",
"//packages/router/testing",
],
tsconfig = "//adev/shared-docs:tsconfig_test",
)

karma_web_test_suite(
Expand Down
14 changes: 7 additions & 7 deletions adev/shared-docs/components/navigation-list/navigation-list.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
} @else {
<a
[routerLink]="'/' + item.path"
[routerLinkActiveOptions]="{
queryParams: 'ignored',
fragment: 'ignored',
matrixParams: 'exact',
paths: 'exact',
exact: false
}"







routerLinkActive="docs-faceted-list-item-active"
(click)="emitClickOnLink()"
[matTooltip]="item.label"
Expand Down
Loading
Loading
0