From 144ca6447d9d48c93353ebbe7d79a5ce3de0a57b Mon Sep 17 00:00:00 2001 From: Joey Perrott Date: Mon, 12 May 2025 15:30:21 +0000 Subject: [PATCH 1/2] build: migrate adev to use ng_project Move all of adev to use ng_project instead of ng_module --- .../npm_translate_lock_MzA5NzUwNzMx | 6 +- adev/BUILD.bazel | 1 + adev/shared-docs/BUILD.bazel | 57 ++++++++++++++----- .../components/algolia-icon/BUILD.bazel | 11 ++-- .../components/breadcrumb/BUILD.bazel | 19 ++++--- .../components/cookie-popup/BUILD.bazel | 17 +++--- .../copy-source-code-button/BUILD.bazel | 17 +++--- adev/shared-docs/components/icon/BUILD.bazel | 13 +++-- .../components/navigation-list/BUILD.bazel | 25 ++++---- .../navigation-list.component.html | 14 ++--- .../components/search-dialog/BUILD.bazel | 31 +++++----- .../shared-docs/components/select/BUILD.bazel | 15 ++--- .../components/slide-toggle/BUILD.bazel | 15 ++--- .../components/table-of-contents/BUILD.bazel | 21 ++++--- .../components/text-field/BUILD.bazel | 17 +++--- .../components/top-level-banner/BUILD.bazel | 19 ++++--- .../components/viewers/BUILD.bazel | 30 +++++----- .../directives/click-outside/BUILD.bazel | 15 ++--- .../directives/external-link/BUILD.bazel | 19 ++++--- .../directives/search-item/BUILD.bazel | 13 +++-- adev/shared-docs/pipes/BUILD.bazel | 14 +++-- adev/shared-docs/providers/BUILD.bazel | 12 ++-- adev/shared-docs/services/BUILD.bazel | 22 ++++--- adev/shared-docs/services/search.service.ts | 3 +- package.json | 1 + .../src/ng_module/partial_compilation.bzl | 10 +++- pnpm-lock.yaml | 21 ++++++- tools/defaults2.bzl | 14 +++++ yarn.lock | 25 +++++--- 29 files changed, 309 insertions(+), 188 deletions(-) diff --git a/.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx b/.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx index fc1de833c53f..acbb05b43a6c 100755 --- a/.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx +++ b/.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx @@ -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=-1406867100 -package.json=1896628490 +package.json=-1028970955 packages/compiler-cli/package.json=571832290 packages/compiler/package.json=-426903429 -pnpm-lock.yaml=-1057376033 +pnpm-lock.yaml=1903599576 pnpm-workspace.yaml=353334404 tools/bazel/rules_angular_store/package.json=-239561259 -yarn.lock=-914509027 +yarn.lock=567045571 diff --git a/adev/BUILD.bazel b/adev/BUILD.bazel index 845857885c37..56b8fb5aaddb 100644 --- a/adev/BUILD.bazel +++ b/adev/BUILD.bazel @@ -62,6 +62,7 @@ APPLICATION_DEPS = [ "@npm//@angular/router", "@npm//@angular/ssr", "@npm//@types/dom-navigation", + "@npm//fflate", "@npm//marked", "@npm//ngx-progressbar", "@npm//rxjs", diff --git a/adev/shared-docs/BUILD.bazel b/adev/shared-docs/BUILD.bazel index c6f88d3bc7a1..028457bb2560 100644 --- a/adev/shared-docs/BUILD.bazel +++ b/adev/shared-docs/BUILD.bazel @@ -1,7 +1,9 @@ +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("//tools:defaults.bzl", "pkg_npm") +load("//tools:defaults2.bzl", "ng_package", "ng_project") -package(default_visibility = ["//visibility:private"]) +package(default_visibility = ["//visibility:public"]) rules_js_tsconfig( name = "tsconfig_build", @@ -23,26 +25,26 @@ rules_js_tsconfig( ], ) -ng_module( +ng_project( name = "docs", srcs = [ "index.ts", ], - module_name = "@angular/docs", + tsconfig = "//adev/shared-docs:tsconfig_build", 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", @@ -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", + }, ) diff --git a/adev/shared-docs/components/algolia-icon/BUILD.bazel b/adev/shared-docs/components/algolia-icon/BUILD.bazel index 4f7585f5d9f4..df8ec5ba2ca0 100644 --- a/adev/shared-docs/components/algolia-icon/BUILD.bazel +++ b/adev/shared-docs/components/algolia-icon/BUILD.bazel @@ -1,8 +1,8 @@ -load("//tools:defaults.bzl", "ng_module") +load("//tools:defaults2.bzl", "ng_project") package(default_visibility = ["//visibility:private"]) -ng_module( +ng_project( name = "algolia-icon", srcs = [ "algolia-icon.component.ts", @@ -10,11 +10,12 @@ ng_module( assets = [ "algolia-icon.component.html", ], + interop_deps = [ + "//packages/core", + ], + tsconfig = "//adev/shared-docs:tsconfig_build", visibility = [ "//adev/shared-docs/components:__pkg__", "//adev/shared-docs/components/search-dialog:__pkg__", ], - deps = [ - "//packages/core", - ], ) diff --git a/adev/shared-docs/components/breadcrumb/BUILD.bazel b/adev/shared-docs/components/breadcrumb/BUILD.bazel index 06b02b93b348..5f613c462aca 100644 --- a/adev/shared-docs/components/breadcrumb/BUILD.bazel +++ b/adev/shared-docs/components/breadcrumb/BUILD.bazel @@ -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("//tools:defaults.bzl", "karma_web_test_suite") +load("//tools:defaults2.bzl", "ng_project", "ts_project") package(default_visibility = ["//visibility:private"]) -ng_module( +ng_project( name = "breadcrumb", srcs = [ "breadcrumb.component.ts", @@ -13,16 +13,19 @@ ng_module( ":breadcrumb.component.css", "breadcrumb.component.html", ], + interop_deps = [ + "//packages/common", + "//packages/core", + "//packages/router", + ], + tsconfig = "//adev/shared-docs:tsconfig_build", 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", ], ) diff --git a/adev/shared-docs/components/cookie-popup/BUILD.bazel b/adev/shared-docs/components/cookie-popup/BUILD.bazel index 1c0e72485309..cf89ee409efc 100644 --- a/adev/shared-docs/components/cookie-popup/BUILD.bazel +++ b/adev/shared-docs/components/cookie-popup/BUILD.bazel @@ -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("//tools:defaults.bzl", "karma_web_test_suite") +load("//tools:defaults2.bzl", "ng_project", "ts_project") package(default_visibility = ["//visibility:private"]) -ng_module( +ng_project( name = "cookie-popup", srcs = [ "cookie-popup.component.ts", @@ -13,14 +13,17 @@ ng_module( ":cookie-popup.component.css", "cookie-popup.component.html", ], + interop_deps = [ + "//packages/common", + "//packages/core", + ], + tsconfig = "//adev/shared-docs:tsconfig_build", 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", ], ) diff --git a/adev/shared-docs/components/copy-source-code-button/BUILD.bazel b/adev/shared-docs/components/copy-source-code-button/BUILD.bazel index e5c7bb1b393d..856b34ef8f03 100644 --- a/adev/shared-docs/components/copy-source-code-button/BUILD.bazel +++ b/adev/shared-docs/components/copy-source-code-button/BUILD.bazel @@ -1,9 +1,9 @@ -load("//tools:defaults.bzl", "karma_web_test_suite", "ng_module") -load("//tools:defaults2.bzl", "ts_project") +load("//tools:defaults.bzl", "karma_web_test_suite") +load("//tools:defaults2.bzl", "ng_project", "ts_project") package(default_visibility = ["//visibility:private"]) -ng_module( +ng_project( name = "copy-source-code-button", srcs = [ "copy-source-code-button.component.ts", @@ -11,15 +11,18 @@ ng_module( assets = [ "copy-source-code-button.component.html", ], + interop_deps = [ + "//packages/common", + "//packages/core", + ], + tsconfig = "//adev/shared-docs:tsconfig_build", 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", ], ) diff --git a/adev/shared-docs/components/icon/BUILD.bazel b/adev/shared-docs/components/icon/BUILD.bazel index 027993987bd7..858e83bae5e8 100644 --- a/adev/shared-docs/components/icon/BUILD.bazel +++ b/adev/shared-docs/components/icon/BUILD.bazel @@ -1,9 +1,9 @@ load("@io_bazel_rules_sass//:defs.bzl", "sass_binary") -load("//tools:defaults.bzl", "ng_module") +load("//tools:defaults2.bzl", "ng_project") package(default_visibility = ["//visibility:private"]) -ng_module( +ng_project( name = "icon", srcs = [ "icon.component.ts", @@ -11,6 +11,11 @@ ng_module( assets = [ ":icon.component.css", ], + interop_deps = [ + "//packages/common", + "//packages/core", + ], + tsconfig = "//adev/shared-docs:tsconfig_build", visibility = [ "//adev/shared-docs/components:__pkg__", "//adev/shared-docs/components/copy-source-code-button:__pkg__", @@ -20,10 +25,6 @@ ng_module( "//adev/shared-docs/components/top-level-banner:__pkg__", "//adev/shared-docs/components/viewers:__pkg__", ], - deps = [ - "//packages/common", - "//packages/core", - ], ) sass_binary( diff --git a/adev/shared-docs/components/navigation-list/BUILD.bazel b/adev/shared-docs/components/navigation-list/BUILD.bazel index 0aba956c1aca..76662f790c0a 100644 --- a/adev/shared-docs/components/navigation-list/BUILD.bazel +++ b/adev/shared-docs/components/navigation-list/BUILD.bazel @@ -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("//tools:defaults.bzl", "karma_web_test_suite") +load("//tools:defaults2.bzl", "ng_project", "ts_project") package(default_visibility = ["//visibility:private"]) -ng_module( +ng_project( name = "navigation-list", srcs = [ "navigation-list.component.ts", @@ -13,18 +13,21 @@ ng_module( ":navigation-list.component.css", "navigation-list.component.html", ], + interop_deps = [ + "//packages/common", + "//packages/core", + "//packages/router", + ], + tsconfig = "//adev/shared-docs:tsconfig_build", 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", ], ) diff --git a/adev/shared-docs/components/navigation-list/navigation-list.component.html b/adev/shared-docs/components/navigation-list/navigation-list.component.html index fde9bdbb738e..d9302e66b0f0 100644 --- a/adev/shared-docs/components/navigation-list/navigation-list.component.html +++ b/adev/shared-docs/components/navigation-list/navigation-list.component.html @@ -23,13 +23,13 @@ } @else { >( +export const ALGOLIA_CLIENT: InjectionToken = new InjectionToken( 'Search service', ); diff --git a/package.json b/package.json index a3f30f6d5e2e..03f97a141cdf 100644 --- a/package.json +++ b/package.json @@ -220,6 +220,7 @@ "preact": "^10.17.1", "preact-render-to-string": "^6.2.1", "prettier": "^3.0.0", + "rollup-plugin-sourcemaps2": "^0.5.1", "semver": "^7.3.5", "shiki": "^3.0.0", "tmp": "^0.2.3", diff --git a/packages/bazel/src/ng_module/partial_compilation.bzl b/packages/bazel/src/ng_module/partial_compilation.bzl index 51d278e96d3e..afa92fa74516 100644 --- a/packages/bazel/src/ng_module/partial_compilation.bzl +++ b/packages/bazel/src/ng_module/partial_compilation.bzl @@ -16,10 +16,16 @@ ng_partial_compilation_flag = rule( ) def _partial_compilation_transition_impl(_settings, _attr): - return {"//packages/bazel/src:partial_compilation": True} + return { + "@rules_angular//src/ng_project/config:partial_compilation": True, + "//packages/bazel/src:partial_compilation": True, + } partial_compilation_transition = transition( implementation = _partial_compilation_transition_impl, inputs = [], - outputs = ["//packages/bazel/src:partial_compilation"], + outputs = [ + "//packages/bazel/src:partial_compilation", + "@rules_angular//src/ng_project/config:partial_compilation", + ], ) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 16022e36a557..687c22ca5034 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -519,6 +519,9 @@ importers: prettier: specifier: ^3.0.0 version: 3.5.3 + rollup-plugin-sourcemaps2: + specifier: ^0.5.1 + version: 0.5.1(@types/node@18.19.101)(rollup@4.41.0) semver: specifier: ^7.3.5 version: 7.7.2 @@ -2677,7 +2680,6 @@ packages: /@bazel/typescript@5.8.1(typescript@5.7.3): resolution: {integrity: sha512-NAJ8WQHZL1WE1YmRoCrq/1hhG15Mvy/viWh6TkvFnBeEhNUiQUsA5GYyhU1ztnBIYW03nATO3vwhAEfO7Q0U5g==, tarball: https://registry.npmjs.org/@bazel/typescript/-/typescript-5.8.1.tgz} - deprecated: No longer maintained, https://github.com/aspect-build/rules_ts is the recommended replacement hasBin: true peerDependencies: typescript: '>=3.0.0' @@ -4892,7 +4894,6 @@ packages: estree-walker: 2.0.2 picomatch: 4.0.2 rollup: 4.41.0 - dev: false /@rollup/rollup-android-arm-eabi@4.30.1: resolution: {integrity: sha512-pSWY+EVt3rJ9fQ3IqlrEUtXh3cGqGtPDH1FQlNZehO2yYxCHEX1SPsz1M//NXwYfbTlcKr9WObLnJX9FsS9K1Q==, tarball: https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.30.1.tgz} @@ -9720,7 +9721,6 @@ packages: /estree-walker@2.0.2: resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==, tarball: https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz} - dev: false /esutils@1.1.6: resolution: {integrity: sha512-RG1ZkUT7iFJG9LSHr7KDuuMSlujfeTtMNIcInURxKAxhMtwQhI3NrQhz26gZQYlsYZQKzsnwtpKrFKj9K9Qu1A==, tarball: https://registry.npmjs.org/esutils/-/esutils-1.1.6.tgz} @@ -15621,6 +15621,21 @@ packages: magic-string: 0.25.9 dev: false + /rollup-plugin-sourcemaps2@0.5.1(@types/node@18.19.101)(rollup@4.41.0): + resolution: {integrity: sha512-y8yq66AM3gD2636cb6+mqGvrTnYJrCQt7lhzXxFShKxOA52PGtfsQdooOYtZWtXYc5bWsNXpD7CEs1m36CGZmw==, tarball: https://registry.npmjs.org/rollup-plugin-sourcemaps2/-/rollup-plugin-sourcemaps2-0.5.1.tgz} + engines: {node: '>=18.0.0'} + peerDependencies: + '@types/node': '>=18.0.0' + rollup: '>=4' + peerDependenciesMeta: + '@types/node': + optional: true + dependencies: + '@rollup/pluginutils': 5.1.4(rollup@4.41.0) + '@types/node': 18.19.101 + rollup: 4.41.0 + dev: true + /rollup-plugin-sourcemaps@0.6.3(@types/node@18.19.101)(rollup@4.41.0): resolution: {integrity: sha512-paFu+nT1xvuO1tPFYXGe+XnQvg4Hjqv/eIhG8i5EspfYYPBKL57X7iVbfv55aNVASg3dzWvES9dmWsL2KhfByw==, tarball: https://registry.npmjs.org/rollup-plugin-sourcemaps/-/rollup-plugin-sourcemaps-0.6.3.tgz} engines: {node: '>=10.0.0'} diff --git a/tools/defaults2.bzl b/tools/defaults2.bzl index 7b795f69eb3c..e1f75f13cd33 100644 --- a/tools/defaults2.bzl +++ b/tools/defaults2.bzl @@ -1,6 +1,7 @@ load("@aspect_rules_jasmine//jasmine:defs.bzl", _jasmine_test = "jasmine_test") load("@aspect_rules_js//npm:defs.bzl", _npm_package = "npm_package") load("@aspect_rules_ts//ts:defs.bzl", _ts_config = "ts_config") +load("@rules_angular//src/ng_package:index.bzl", _ng_package = "ng_package") load("@rules_angular//src/ng_project:index.bzl", _ng_project = "ng_project") load("//tools/bazel:module_name.bzl", "compute_module_name") load("//tools/bazel:ts_project_interop.bzl", _ts_project = "ts_project") @@ -87,3 +88,16 @@ def jasmine_test(name, data = [], args = [], **kwargs): ], **kwargs ) + +def ng_package(deps = [], **kwargs): + _ng_package( + deps = deps, + rollup_runtime_deps = [ + "//:node_modules/@rollup/plugin-commonjs", + "//:node_modules/@rollup/plugin-node-resolve", + "//:node_modules/magic-string", + "//:node_modules/rollup-plugin-dts", + "//:node_modules/rollup-plugin-sourcemaps2", + ], + **kwargs + ) diff --git a/yarn.lock b/yarn.lock index a8cf1d7011a8..b0ede8c1b91f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3342,6 +3342,15 @@ is-module "^1.0.0" resolve "^1.22.1" +"@rollup/pluginutils@5.1.4", "@rollup/pluginutils@^5.0.1": + version "5.1.4" + resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-5.1.4.tgz#bb94f1f9eaaac944da237767cdfee6c5b2262d4a" + integrity sha512-USm05zrsFxYLPdWWq+K3STlWiT/3ELn3RcV5hJMghpeAIhxfsUIg6mt12CBJBInWMV4VneoV7SfGv8xIwo2qNQ== + dependencies: + "@types/estree" "^1.0.0" + estree-walker "^2.0.2" + picomatch "^4.0.2" + "@rollup/pluginutils@^3.0.9": version "3.1.0" resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-3.1.0.tgz#706b4524ee6dc8b103b3c995533e5ad680c02b9b" @@ -3351,15 +3360,6 @@ estree-walker "^1.0.1" picomatch "^2.2.2" -"@rollup/pluginutils@^5.0.1": - version "5.1.4" - resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-5.1.4.tgz#bb94f1f9eaaac944da237767cdfee6c5b2262d4a" - integrity sha512-USm05zrsFxYLPdWWq+K3STlWiT/3ELn3RcV5hJMghpeAIhxfsUIg6mt12CBJBInWMV4VneoV7SfGv8xIwo2qNQ== - dependencies: - "@types/estree" "^1.0.0" - estree-walker "^2.0.2" - picomatch "^4.0.2" - "@rollup/rollup-android-arm-eabi@4.30.1": version "4.30.1" resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.30.1.tgz#14c737dc19603a096568044eadaa60395eefb809" @@ -14600,6 +14600,13 @@ rollup-plugin-preserve-shebang@^1.0.1: dependencies: magic-string "^0.25.7" +rollup-plugin-sourcemaps2@^0.5.1: + version "0.5.1" + resolved "https://registry.yarnpkg.com/rollup-plugin-sourcemaps2/-/rollup-plugin-sourcemaps2-0.5.1.tgz#a8d31f039b129587b72b14039c03edd83e88b50a" + integrity sha512-y8yq66AM3gD2636cb6+mqGvrTnYJrCQt7lhzXxFShKxOA52PGtfsQdooOYtZWtXYc5bWsNXpD7CEs1m36CGZmw== + dependencies: + "@rollup/pluginutils" "5.1.4" + rollup-plugin-sourcemaps@^0.6.3: version "0.6.3" resolved "https://registry.yarnpkg.com/rollup-plugin-sourcemaps/-/rollup-plugin-sourcemaps-0.6.3.tgz#bf93913ffe056e414419607f1d02780d7ece84ed" From 3d28913833b57fead39a78aff3df226729acb6fa Mon Sep 17 00:00:00 2001 From: Joey Perrott Date: Wed, 14 May 2025 15:43:30 +0000 Subject: [PATCH 2/2] build: move ts_project and ng_project for adev into a macro Move ts_project and ng_project into a macro for adev/ instead of providing a custom tsconfig on every target --- adev/shared-docs/BUILD.bazel | 4 +-- adev/shared-docs/components/BUILD.bazel | 3 +-- .../components/algolia-icon/BUILD.bazel | 3 +-- .../components/breadcrumb/BUILD.bazel | 4 +-- .../components/cookie-popup/BUILD.bazel | 4 +-- .../copy-source-code-button/BUILD.bazel | 4 +-- adev/shared-docs/components/icon/BUILD.bazel | 3 +-- .../components/navigation-list/BUILD.bazel | 4 +-- .../components/search-dialog/BUILD.bazel | 4 +-- .../shared-docs/components/select/BUILD.bazel | 4 +-- .../components/slide-toggle/BUILD.bazel | 4 +-- .../components/table-of-contents/BUILD.bazel | 4 +-- .../components/text-field/BUILD.bazel | 4 +-- .../components/top-level-banner/BUILD.bazel | 4 +-- .../components/viewers/BUILD.bazel | 4 +-- adev/shared-docs/defaults.bzl | 25 +++++++++++++++++++ adev/shared-docs/directives/BUILD.bazel | 3 +-- .../directives/click-outside/BUILD.bazel | 4 +-- .../directives/external-link/BUILD.bazel | 4 +-- .../directives/search-item/BUILD.bazel | 3 +-- adev/shared-docs/interfaces/BUILD.bazel | 4 +-- .../pipeline/api-gen/extraction/BUILD.bazel | 3 +-- .../api-gen/extraction/test/BUILD.bazel | 3 +-- .../pipeline/api-gen/manifest/BUILD.bazel | 3 +-- .../api-gen/manifest/test/BUILD.bazel | 3 +-- .../pipeline/api-gen/rendering/BUILD.bazel | 4 +-- .../api-gen/rendering/test/BUILD.bazel | 4 +-- .../pipeline/examples/previews/BUILD.bazel | 3 +-- .../pipeline/examples/shared/BUILD.bazel | 3 +-- .../pipeline/examples/stackblitz/BUILD.bazel | 4 +-- .../pipeline/examples/zip/BUILD.bazel | 4 +-- adev/shared-docs/pipeline/guides/BUILD.bazel | 4 +-- .../pipeline/guides/testing/BUILD.bazel | 4 +-- .../guides/testing/mermaid/BUILD.bazel | 4 +-- .../pipeline/navigation/BUILD.bazel | 4 +-- .../pipeline/navigation/test/BUILD.bazel | 3 +-- .../pipeline/tutorials/BUILD.bazel | 5 +--- adev/shared-docs/pipes/BUILD.bazel | 4 +-- adev/shared-docs/providers/BUILD.bazel | 4 +-- adev/shared-docs/services/BUILD.bazel | 6 +---- adev/shared-docs/testing/BUILD.bazel | 4 +-- adev/shared-docs/utils/BUILD.bazel | 3 +-- 42 files changed, 68 insertions(+), 111 deletions(-) create mode 100644 adev/shared-docs/defaults.bzl diff --git a/adev/shared-docs/BUILD.bazel b/adev/shared-docs/BUILD.bazel index 028457bb2560..96f9a379340f 100644 --- a/adev/shared-docs/BUILD.bazel +++ b/adev/shared-docs/BUILD.bazel @@ -1,7 +1,8 @@ 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("//adev/shared-docs:defaults.bzl", "ng_project") load("//tools:defaults.bzl", "pkg_npm") -load("//tools:defaults2.bzl", "ng_package", "ng_project") +load("//tools:defaults2.bzl", "ng_package") package(default_visibility = ["//visibility:public"]) @@ -30,7 +31,6 @@ ng_project( srcs = [ "index.ts", ], - tsconfig = "//adev/shared-docs:tsconfig_build", deps = [ "//adev/shared-docs/components:components_rjs", "//adev/shared-docs/directives:directives_rjs", diff --git a/adev/shared-docs/components/BUILD.bazel b/adev/shared-docs/components/BUILD.bazel index d0a64b960599..5c4adc5551d0 100644 --- a/adev/shared-docs/components/BUILD.bazel +++ b/adev/shared-docs/components/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ts_project") +load("//adev/shared-docs:defaults.bzl", "ts_project") package(default_visibility = ["//visibility:private"]) @@ -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__", ], diff --git a/adev/shared-docs/components/algolia-icon/BUILD.bazel b/adev/shared-docs/components/algolia-icon/BUILD.bazel index df8ec5ba2ca0..fade3fa4d25c 100644 --- a/adev/shared-docs/components/algolia-icon/BUILD.bazel +++ b/adev/shared-docs/components/algolia-icon/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ng_project") +load("//adev/shared-docs:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:private"]) @@ -13,7 +13,6 @@ ng_project( interop_deps = [ "//packages/core", ], - tsconfig = "//adev/shared-docs:tsconfig_build", visibility = [ "//adev/shared-docs/components:__pkg__", "//adev/shared-docs/components/search-dialog:__pkg__", diff --git a/adev/shared-docs/components/breadcrumb/BUILD.bazel b/adev/shared-docs/components/breadcrumb/BUILD.bazel index 5f613c462aca..845950bd55f6 100644 --- a/adev/shared-docs/components/breadcrumb/BUILD.bazel +++ b/adev/shared-docs/components/breadcrumb/BUILD.bazel @@ -1,6 +1,6 @@ load("@io_bazel_rules_sass//:defs.bzl", "sass_binary") +load("//adev/shared-docs:defaults.bzl", "ng_project", "ts_project") load("//tools:defaults.bzl", "karma_web_test_suite") -load("//tools:defaults2.bzl", "ng_project", "ts_project") package(default_visibility = ["//visibility:private"]) @@ -18,7 +18,6 @@ ng_project( "//packages/core", "//packages/router", ], - tsconfig = "//adev/shared-docs:tsconfig_build", visibility = [ "//adev/shared-docs/components:__pkg__", "//adev/shared-docs/components/viewers:__pkg__", @@ -50,7 +49,6 @@ ts_project( "//packages/router", "//packages/router/testing", ], - tsconfig = "//adev/shared-docs:tsconfig_test", ) karma_web_test_suite( diff --git a/adev/shared-docs/components/cookie-popup/BUILD.bazel b/adev/shared-docs/components/cookie-popup/BUILD.bazel index cf89ee409efc..7158e4024db0 100644 --- a/adev/shared-docs/components/cookie-popup/BUILD.bazel +++ b/adev/shared-docs/components/cookie-popup/BUILD.bazel @@ -1,6 +1,6 @@ load("@io_bazel_rules_sass//:defs.bzl", "sass_binary") +load("//adev/shared-docs:defaults.bzl", "ng_project", "ts_project") load("//tools:defaults.bzl", "karma_web_test_suite") -load("//tools:defaults2.bzl", "ng_project", "ts_project") package(default_visibility = ["//visibility:private"]) @@ -17,7 +17,6 @@ ng_project( "//packages/common", "//packages/core", ], - tsconfig = "//adev/shared-docs:tsconfig_build", visibility = [ "//adev/shared-docs/components:__pkg__", ], @@ -45,7 +44,6 @@ ts_project( "//packages/core", "//packages/core/testing", ], - tsconfig = "//adev/shared-docs:tsconfig_test", ) karma_web_test_suite( diff --git a/adev/shared-docs/components/copy-source-code-button/BUILD.bazel b/adev/shared-docs/components/copy-source-code-button/BUILD.bazel index 856b34ef8f03..659b674919e7 100644 --- a/adev/shared-docs/components/copy-source-code-button/BUILD.bazel +++ b/adev/shared-docs/components/copy-source-code-button/BUILD.bazel @@ -1,5 +1,5 @@ +load("//adev/shared-docs:defaults.bzl", "ng_project", "ts_project") load("//tools:defaults.bzl", "karma_web_test_suite") -load("//tools:defaults2.bzl", "ng_project", "ts_project") package(default_visibility = ["//visibility:private"]) @@ -15,7 +15,6 @@ ng_project( "//packages/common", "//packages/core", ], - tsconfig = "//adev/shared-docs:tsconfig_build", visibility = [ "//adev/shared-docs/components:__pkg__", "//adev/shared-docs/components/viewers:__pkg__", @@ -38,7 +37,6 @@ ts_project( "//packages/core/testing", "//packages/platform-browser", ], - tsconfig = "//adev/shared-docs:tsconfig_test", deps = [ "//:node_modules/@angular/cdk", ], diff --git a/adev/shared-docs/components/icon/BUILD.bazel b/adev/shared-docs/components/icon/BUILD.bazel index 858e83bae5e8..a6842a33a5c8 100644 --- a/adev/shared-docs/components/icon/BUILD.bazel +++ b/adev/shared-docs/components/icon/BUILD.bazel @@ -1,5 +1,5 @@ load("@io_bazel_rules_sass//:defs.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//adev/shared-docs:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:private"]) @@ -15,7 +15,6 @@ ng_project( "//packages/common", "//packages/core", ], - tsconfig = "//adev/shared-docs:tsconfig_build", visibility = [ "//adev/shared-docs/components:__pkg__", "//adev/shared-docs/components/copy-source-code-button:__pkg__", diff --git a/adev/shared-docs/components/navigation-list/BUILD.bazel b/adev/shared-docs/components/navigation-list/BUILD.bazel index 76662f790c0a..77d8d0041b40 100644 --- a/adev/shared-docs/components/navigation-list/BUILD.bazel +++ b/adev/shared-docs/components/navigation-list/BUILD.bazel @@ -1,6 +1,6 @@ load("@io_bazel_rules_sass//:defs.bzl", "sass_binary") +load("//adev/shared-docs:defaults.bzl", "ng_project", "ts_project") load("//tools:defaults.bzl", "karma_web_test_suite") -load("//tools:defaults2.bzl", "ng_project", "ts_project") package(default_visibility = ["//visibility:private"]) @@ -18,7 +18,6 @@ ng_project( "//packages/core", "//packages/router", ], - tsconfig = "//adev/shared-docs:tsconfig_build", visibility = [ "//adev/shared-docs/components:__pkg__", ], @@ -55,7 +54,6 @@ ts_project( "//packages/router", "//packages/router/testing", ], - tsconfig = "//adev/shared-docs:tsconfig_test", ) karma_web_test_suite( diff --git a/adev/shared-docs/components/search-dialog/BUILD.bazel b/adev/shared-docs/components/search-dialog/BUILD.bazel index 0f852171a7a0..399de4829ec9 100644 --- a/adev/shared-docs/components/search-dialog/BUILD.bazel +++ b/adev/shared-docs/components/search-dialog/BUILD.bazel @@ -1,6 +1,6 @@ load("@io_bazel_rules_sass//:defs.bzl", "sass_binary") +load("//adev/shared-docs:defaults.bzl", "ng_project", "ts_project") load("//tools:defaults.bzl", "karma_web_test_suite") -load("//tools:defaults2.bzl", "ng_project", "ts_project") package(default_visibility = ["//visibility:private"]) @@ -19,7 +19,6 @@ ng_project( "//packages/forms", "//packages/router", ], - tsconfig = "//adev/shared-docs:tsconfig_build", visibility = [ "//adev/shared-docs/components:__pkg__", ], @@ -59,7 +58,6 @@ ts_project( "//packages/router", "//packages/router/testing", ], - tsconfig = "//adev/shared-docs:tsconfig_test", ) karma_web_test_suite( diff --git a/adev/shared-docs/components/select/BUILD.bazel b/adev/shared-docs/components/select/BUILD.bazel index e543ffa90c2e..a3b14d2e9404 100644 --- a/adev/shared-docs/components/select/BUILD.bazel +++ b/adev/shared-docs/components/select/BUILD.bazel @@ -1,6 +1,6 @@ load("@io_bazel_rules_sass//:defs.bzl", "sass_binary") +load("//adev/shared-docs:defaults.bzl", "ng_project", "ts_project") load("//tools:defaults.bzl", "karma_web_test_suite") -load("//tools:defaults2.bzl", "ng_project", "ts_project") package(default_visibility = ["//visibility:private"]) @@ -18,7 +18,6 @@ ng_project( "//packages/core", "//packages/forms", ], - tsconfig = "//adev/shared-docs:tsconfig_build", visibility = [ "//adev/shared-docs/components:__pkg__", ], @@ -40,7 +39,6 @@ ts_project( "//packages/core", "//packages/core/testing", ], - tsconfig = "//adev/shared-docs:tsconfig_test", ) karma_web_test_suite( diff --git a/adev/shared-docs/components/slide-toggle/BUILD.bazel b/adev/shared-docs/components/slide-toggle/BUILD.bazel index 67bc50290f59..66951376f270 100644 --- a/adev/shared-docs/components/slide-toggle/BUILD.bazel +++ b/adev/shared-docs/components/slide-toggle/BUILD.bazel @@ -1,6 +1,6 @@ load("@io_bazel_rules_sass//:defs.bzl", "sass_binary") +load("//adev/shared-docs:defaults.bzl", "ng_project", "ts_project") load("//tools:defaults.bzl", "karma_web_test_suite") -load("//tools:defaults2.bzl", "ng_project", "ts_project") package(default_visibility = ["//visibility:private"]) @@ -18,7 +18,6 @@ ng_project( "//packages/core", "//packages/forms", ], - tsconfig = "//adev/shared-docs:tsconfig_build", visibility = [ "//adev/shared-docs/components:__pkg__", ], @@ -40,7 +39,6 @@ ts_project( "//packages/core", "//packages/core/testing", ], - tsconfig = "//adev/shared-docs:tsconfig_test", ) karma_web_test_suite( diff --git a/adev/shared-docs/components/table-of-contents/BUILD.bazel b/adev/shared-docs/components/table-of-contents/BUILD.bazel index a950c9a4c970..b7348d81c154 100644 --- a/adev/shared-docs/components/table-of-contents/BUILD.bazel +++ b/adev/shared-docs/components/table-of-contents/BUILD.bazel @@ -1,6 +1,6 @@ load("@io_bazel_rules_sass//:defs.bzl", "sass_binary") +load("//adev/shared-docs:defaults.bzl", "ng_project", "ts_project") load("//tools:defaults.bzl", "karma_web_test_suite") -load("//tools:defaults2.bzl", "ng_project", "ts_project") package(default_visibility = ["//visibility:private"]) @@ -18,7 +18,6 @@ ng_project( "//packages/core", "//packages/router", ], - tsconfig = "//adev/shared-docs:tsconfig_build", visibility = [ "//adev/shared-docs/components:__pkg__", "//adev/shared-docs/components/viewers:__pkg__", @@ -51,7 +50,6 @@ ts_project( "//packages/router", "//packages/router/testing", ], - tsconfig = "//adev/shared-docs:tsconfig_test", ) karma_web_test_suite( diff --git a/adev/shared-docs/components/text-field/BUILD.bazel b/adev/shared-docs/components/text-field/BUILD.bazel index b8599da0ac29..803d65ab8a15 100644 --- a/adev/shared-docs/components/text-field/BUILD.bazel +++ b/adev/shared-docs/components/text-field/BUILD.bazel @@ -1,6 +1,6 @@ load("@io_bazel_rules_sass//:defs.bzl", "sass_binary") +load("//adev/shared-docs:defaults.bzl", "ng_project", "ts_project") load("//tools:defaults.bzl", "karma_web_test_suite") -load("//tools:defaults2.bzl", "ng_project", "ts_project") package(default_visibility = ["//visibility:private"]) @@ -18,7 +18,6 @@ ng_project( "//packages/core", "//packages/forms", ], - tsconfig = "//adev/shared-docs:tsconfig_build", visibility = [ "//adev/shared-docs/components:__pkg__", "//adev/shared-docs/components/search-dialog:__pkg__", @@ -44,7 +43,6 @@ ts_project( "//packages/core", "//packages/core/testing", ], - tsconfig = "//adev/shared-docs:tsconfig_test", ) karma_web_test_suite( diff --git a/adev/shared-docs/components/top-level-banner/BUILD.bazel b/adev/shared-docs/components/top-level-banner/BUILD.bazel index 8233b5270b84..17fce68258fd 100644 --- a/adev/shared-docs/components/top-level-banner/BUILD.bazel +++ b/adev/shared-docs/components/top-level-banner/BUILD.bazel @@ -1,6 +1,6 @@ load("@io_bazel_rules_sass//:defs.bzl", "sass_binary") +load("//adev/shared-docs:defaults.bzl", "ng_project", "ts_project") load("//tools:defaults.bzl", "karma_web_test_suite") -load("//tools:defaults2.bzl", "ng_project", "ts_project") package(default_visibility = ["//visibility:private"]) @@ -17,7 +17,6 @@ ng_project( "//packages/common", "//packages/core", ], - tsconfig = "//adev/shared-docs:tsconfig_build", visibility = [ "//adev/shared-docs/components:__pkg__", ], @@ -45,7 +44,6 @@ ts_project( "//packages/core", "//packages/core/testing", ], - tsconfig = "//adev/shared-docs:tsconfig_test", ) karma_web_test_suite( diff --git a/adev/shared-docs/components/viewers/BUILD.bazel b/adev/shared-docs/components/viewers/BUILD.bazel index 6565d288e6ae..890c197a7a95 100644 --- a/adev/shared-docs/components/viewers/BUILD.bazel +++ b/adev/shared-docs/components/viewers/BUILD.bazel @@ -1,6 +1,6 @@ load("@io_bazel_rules_sass//:defs.bzl", "sass_binary") +load("//adev/shared-docs:defaults.bzl", "ng_project", "ts_project") load("//tools:defaults.bzl", "karma_web_test_suite") -load("//tools:defaults2.bzl", "ng_project", "ts_project") package(default_visibility = ["//visibility:private"]) @@ -20,7 +20,6 @@ ng_project( "//packages/core", "//packages/router", ], - tsconfig = "//adev/shared-docs:tsconfig_build", visibility = [ "//adev/shared-docs/components:__pkg__", ], @@ -71,7 +70,6 @@ ts_project( "//packages/router", "//packages/router/testing", ], - tsconfig = "//adev/shared-docs:tsconfig_test", deps = [ "//:node_modules/@angular/cdk", "//:node_modules/@angular/material", diff --git a/adev/shared-docs/defaults.bzl b/adev/shared-docs/defaults.bzl new file mode 100644 index 000000000000..be51cbd6e000 --- /dev/null +++ b/adev/shared-docs/defaults.bzl @@ -0,0 +1,25 @@ +load("//tools:defaults2.bzl", _ng_project = "ng_project", _ts_project = "ts_project") + +def ts_project(name, tsconfig = None, testonly = False, **kwargs): + if tsconfig == None: + if native.package_name().startswith("adev/shared-docs"): + tsconfig = "//adev/shared-docs:tsconfig_test" if testonly else "//adev/shared-docs:tsconfig_build" + + _ts_project( + name = name, + tsconfig = tsconfig, + testonly = testonly, + **kwargs + ) + +def ng_project(name, tsconfig = None, testonly = False, **kwargs): + if tsconfig == None: + if native.package_name().startswith("adev/shared-docs"): + tsconfig = "//adev/shared-docs:tsconfig_test" if testonly else "//adev/shared-docs:tsconfig_build" + + _ng_project( + name = name, + tsconfig = tsconfig, + testonly = testonly, + **kwargs + ) diff --git a/adev/shared-docs/directives/BUILD.bazel b/adev/shared-docs/directives/BUILD.bazel index 9c861488bd3e..b7fdb9849e46 100644 --- a/adev/shared-docs/directives/BUILD.bazel +++ b/adev/shared-docs/directives/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ts_project") +load("//adev/shared-docs:defaults.bzl", "ts_project") package(default_visibility = ["//visibility:private"]) @@ -12,7 +12,6 @@ ts_project( "//adev/shared-docs/directives/external-link", "//adev/shared-docs/directives/search-item", ], - tsconfig = "//adev/shared-docs:tsconfig_test", visibility = [ "//adev/shared-docs:__subpackages__", ], diff --git a/adev/shared-docs/directives/click-outside/BUILD.bazel b/adev/shared-docs/directives/click-outside/BUILD.bazel index a280c1686924..b296e737fef9 100644 --- a/adev/shared-docs/directives/click-outside/BUILD.bazel +++ b/adev/shared-docs/directives/click-outside/BUILD.bazel @@ -1,5 +1,5 @@ +load("//adev/shared-docs:defaults.bzl", "ng_project", "ts_project") load("//tools:defaults.bzl", "karma_web_test_suite") -load("//tools:defaults2.bzl", "ng_project", "ts_project") package(default_visibility = ["//visibility:private"]) @@ -12,7 +12,6 @@ ng_project( "//packages/common", "//packages/core", ], - tsconfig = "//adev/shared-docs:tsconfig_build", visibility = [ "//adev/shared-docs/directives:__pkg__", ], @@ -32,7 +31,6 @@ ts_project( "//packages/router", "//packages/router/testing", ], - tsconfig = "//adev/shared-docs:tsconfig_test", ) karma_web_test_suite( diff --git a/adev/shared-docs/directives/external-link/BUILD.bazel b/adev/shared-docs/directives/external-link/BUILD.bazel index 94f39eaf437a..b3808519519b 100644 --- a/adev/shared-docs/directives/external-link/BUILD.bazel +++ b/adev/shared-docs/directives/external-link/BUILD.bazel @@ -1,5 +1,5 @@ +load("//adev/shared-docs:defaults.bzl", "ng_project", "ts_project") load("//tools:defaults.bzl", "karma_web_test_suite") -load("//tools:defaults2.bzl", "ng_project", "ts_project") package(default_visibility = ["//visibility:private"]) @@ -13,7 +13,6 @@ ng_project( "//packages/core", "//packages/router", ], - tsconfig = "//adev/shared-docs:tsconfig_build", visibility = [ "//adev/shared-docs/directives:__pkg__", ], @@ -38,7 +37,6 @@ ts_project( "//packages/router", "//packages/router/testing", ], - tsconfig = "//adev/shared-docs:tsconfig_test", ) karma_web_test_suite( diff --git a/adev/shared-docs/directives/search-item/BUILD.bazel b/adev/shared-docs/directives/search-item/BUILD.bazel index dc029c4a95dd..1a95050b42b2 100644 --- a/adev/shared-docs/directives/search-item/BUILD.bazel +++ b/adev/shared-docs/directives/search-item/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ng_project") +load("//adev/shared-docs:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:private"]) @@ -10,7 +10,6 @@ ng_project( interop_deps = [ "//packages/core", ], - tsconfig = "//adev/shared-docs:tsconfig_build", visibility = [ "//adev/shared-docs/directives:__pkg__", ], diff --git a/adev/shared-docs/interfaces/BUILD.bazel b/adev/shared-docs/interfaces/BUILD.bazel index e1a5c55e0966..a3a9d7bfb132 100644 --- a/adev/shared-docs/interfaces/BUILD.bazel +++ b/adev/shared-docs/interfaces/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ts_project") +load("//adev/shared-docs:defaults.bzl", "ts_project") package(default_visibility = ["//visibility:private"]) @@ -7,7 +7,6 @@ ts_project( srcs = [ "index.ts", ], - tsconfig = "//adev/shared-docs:tsconfig_build", visibility = ["//adev/shared-docs:__subpackages__"], deps = [ ":lib_rjs", @@ -29,7 +28,6 @@ ts_project( "//packages/core", "//packages/router", ], - tsconfig = "//adev/shared-docs:tsconfig_build", deps = [ "//:node_modules/@types/node", "//:node_modules/@webcontainer/api", diff --git a/adev/shared-docs/pipeline/api-gen/extraction/BUILD.bazel b/adev/shared-docs/pipeline/api-gen/extraction/BUILD.bazel index fab88e937500..9bfc2a7ee770 100644 --- a/adev/shared-docs/pipeline/api-gen/extraction/BUILD.bazel +++ b/adev/shared-docs/pipeline/api-gen/extraction/BUILD.bazel @@ -1,6 +1,6 @@ load("@angular//tools/esm-interop:index.bzl", "nodejs_binary") load("@npm//@angular/build-tooling/bazel/esbuild:index.bzl", "esbuild_esm_bundle") -load("//tools:defaults2.bzl", "ts_project") +load("//adev/shared-docs:defaults.bzl", "ts_project") package(default_visibility = ["//adev/shared-docs/pipeline/api-gen:__subpackages__"]) @@ -31,7 +31,6 @@ ts_project( "@angular//packages/compiler", "@angular//packages/compiler-cli", ], - tsconfig = "//adev/shared-docs:tsconfig_build", deps = [ "//:node_modules/@bazel/runfiles", "//:node_modules/@types/node", diff --git a/adev/shared-docs/pipeline/api-gen/extraction/test/BUILD.bazel b/adev/shared-docs/pipeline/api-gen/extraction/test/BUILD.bazel index fb1c11aae620..71faab503a62 100644 --- a/adev/shared-docs/pipeline/api-gen/extraction/test/BUILD.bazel +++ b/adev/shared-docs/pipeline/api-gen/extraction/test/BUILD.bazel @@ -1,6 +1,6 @@ +load("//adev/shared-docs:defaults.bzl", "ts_project") load("//adev/shared-docs/pipeline/api-gen/extraction:extract_api_to_json.bzl", "extract_api_to_json") load("//tools:defaults.bzl", "jasmine_node_test") -load("//tools:defaults2.bzl", "ts_project") package(default_visibility = ["//adev/shared-docs/pipeline/api-gen:__subpackages__"]) @@ -54,7 +54,6 @@ ts_project( interop_deps = [ "@angular//packages/compiler-cli", ], - tsconfig = "//adev/shared-docs:tsconfig_test", deps = [ "//:node_modules/@types/node", "//adev/shared-docs/pipeline/api-gen/extraction:extract_api_to_json_lib_rjs", diff --git a/adev/shared-docs/pipeline/api-gen/manifest/BUILD.bazel b/adev/shared-docs/pipeline/api-gen/manifest/BUILD.bazel index 596075d05330..d6f9c62837d8 100644 --- a/adev/shared-docs/pipeline/api-gen/manifest/BUILD.bazel +++ b/adev/shared-docs/pipeline/api-gen/manifest/BUILD.bazel @@ -1,6 +1,6 @@ load("@angular//tools/esm-interop:index.bzl", "nodejs_binary") load("@npm//@angular/build-tooling/bazel/esbuild:index.bzl", "esbuild_esm_bundle") -load("//tools:defaults2.bzl", "ts_project") +load("//adev/shared-docs:defaults.bzl", "ts_project") package(default_visibility = ["//adev/shared-docs/pipeline/api-gen:__subpackages__"]) @@ -25,7 +25,6 @@ ts_project( interop_deps = [ "@angular//packages/compiler-cli", ], - tsconfig = "//adev/shared-docs:tsconfig_build", deps = [ "//:node_modules/@bazel/runfiles", "//:node_modules/@types/node", diff --git a/adev/shared-docs/pipeline/api-gen/manifest/test/BUILD.bazel b/adev/shared-docs/pipeline/api-gen/manifest/test/BUILD.bazel index d558578db341..6cdd74068589 100644 --- a/adev/shared-docs/pipeline/api-gen/manifest/test/BUILD.bazel +++ b/adev/shared-docs/pipeline/api-gen/manifest/test/BUILD.bazel @@ -1,7 +1,7 @@ +load("//adev/shared-docs:defaults.bzl", "ts_project") load("//adev/shared-docs/pipeline/api-gen/extraction:extract_api_to_json.bzl", "extract_api_to_json") load("//adev/shared-docs/pipeline/api-gen/manifest:generate_api_manifest.bzl", "generate_api_manifest") load("//tools:defaults.bzl", "jasmine_node_test") -load("//tools:defaults2.bzl", "ts_project") generate_api_manifest( name = "test", @@ -30,7 +30,6 @@ ts_project( interop_deps = [ "//packages/compiler-cli", ], - tsconfig = "//adev/shared-docs:tsconfig_test", deps = [ "//adev/shared-docs/pipeline/api-gen/manifest:generate_api_manifest_lib_rjs", ], diff --git a/adev/shared-docs/pipeline/api-gen/rendering/BUILD.bazel b/adev/shared-docs/pipeline/api-gen/rendering/BUILD.bazel index 7789138e0e14..a587f4e86000 100644 --- a/adev/shared-docs/pipeline/api-gen/rendering/BUILD.bazel +++ b/adev/shared-docs/pipeline/api-gen/rendering/BUILD.bazel @@ -1,6 +1,6 @@ load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary") load("@npm//@angular/build-tooling/bazel/esbuild:index.bzl", "esbuild_esm_bundle") -load("//tools:defaults2.bzl", "ts_project") +load("//adev/shared-docs:defaults.bzl", "ts_project") package(default_visibility = ["//adev/shared-docs/pipeline/api-gen:__subpackages__"]) @@ -27,7 +27,6 @@ ts_project( "entities.mts", ], ), - tsconfig = "//adev/shared-docs:tsconfig_build", deps = [ ":entities_rjs", "//:node_modules/@bazel/runfiles", @@ -45,7 +44,6 @@ ts_project( srcs = [ "entities.mts", ], - tsconfig = "//adev/shared-docs:tsconfig_build", visibility = [ "//adev/shared-docs/pipeline/api-gen/rendering:__pkg__", "//docs/pipeline/guides:__pkg__", diff --git a/adev/shared-docs/pipeline/api-gen/rendering/test/BUILD.bazel b/adev/shared-docs/pipeline/api-gen/rendering/test/BUILD.bazel index 124de29eaabd..7047b55775ed 100644 --- a/adev/shared-docs/pipeline/api-gen/rendering/test/BUILD.bazel +++ b/adev/shared-docs/pipeline/api-gen/rendering/test/BUILD.bazel @@ -1,5 +1,6 @@ +load("//adev/shared-docs:defaults.bzl", "ts_project") load("//adev/shared-docs/pipeline/api-gen/rendering:render_api_to_html.bzl", "render_api_to_html") -load("//tools:defaults2.bzl", "jasmine_test", "ts_project") +load("//tools:defaults2.bzl", "jasmine_test") render_api_to_html( name = "test", @@ -17,7 +18,6 @@ ts_project( "**/*.spec.mts", ], ), - tsconfig = "//adev/shared-docs:tsconfig_test", deps = [ "//:node_modules/@bazel/runfiles", "//:node_modules/@types/jsdom", diff --git a/adev/shared-docs/pipeline/examples/previews/BUILD.bazel b/adev/shared-docs/pipeline/examples/previews/BUILD.bazel index 5e2509225456..fae6576bed68 100644 --- a/adev/shared-docs/pipeline/examples/previews/BUILD.bazel +++ b/adev/shared-docs/pipeline/examples/previews/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ts_project") +load("//adev/shared-docs:defaults.bzl", "ts_project") package(default_visibility = ["//visibility:public"]) @@ -7,7 +7,6 @@ ts_project( srcs = [ "index.mts", ], - tsconfig = "//adev/shared-docs:tsconfig_build", visibility = [ "//adev/shared-docs:__subpackages__", ], diff --git a/adev/shared-docs/pipeline/examples/shared/BUILD.bazel b/adev/shared-docs/pipeline/examples/shared/BUILD.bazel index 7d28df862c25..7987b9581a75 100644 --- a/adev/shared-docs/pipeline/examples/shared/BUILD.bazel +++ b/adev/shared-docs/pipeline/examples/shared/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ts_project") +load("//adev/shared-docs:defaults.bzl", "ts_project") package(default_visibility = ["//visibility:public"]) @@ -9,7 +9,6 @@ ts_project( "*.mts", ], ), - tsconfig = "//adev/shared-docs:tsconfig_build", deps = [ "//:node_modules/@types/node", ], diff --git a/adev/shared-docs/pipeline/examples/stackblitz/BUILD.bazel b/adev/shared-docs/pipeline/examples/stackblitz/BUILD.bazel index b7b03c5ef869..bc6f3cacdc5f 100644 --- a/adev/shared-docs/pipeline/examples/stackblitz/BUILD.bazel +++ b/adev/shared-docs/pipeline/examples/stackblitz/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ts_project") +load("//adev/shared-docs:defaults.bzl", "ts_project") package(default_visibility = ["//visibility:public"]) @@ -12,7 +12,6 @@ ts_project( "index.mts", ], ), - tsconfig = "//adev/shared-docs:tsconfig_build", deps = [ "//:node_modules/@types/jsdom", "//:node_modules/@types/node", @@ -28,7 +27,6 @@ ts_project( srcs = [ "index.mts", ], - tsconfig = "//adev/shared-docs:tsconfig_build", visibility = [ "//adev/shared-docs:__subpackages__", ], diff --git a/adev/shared-docs/pipeline/examples/zip/BUILD.bazel b/adev/shared-docs/pipeline/examples/zip/BUILD.bazel index 4124c79b7a72..a2a18b2d3b49 100644 --- a/adev/shared-docs/pipeline/examples/zip/BUILD.bazel +++ b/adev/shared-docs/pipeline/examples/zip/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ts_project") +load("//adev/shared-docs:defaults.bzl", "ts_project") package(default_visibility = ["//visibility:public"]) @@ -12,7 +12,6 @@ ts_project( "index.mts", ], ), - tsconfig = "//adev/shared-docs:tsconfig_build", deps = [ "//:node_modules/@types/node", "//:node_modules/fflate", @@ -28,7 +27,6 @@ ts_project( srcs = [ "index.mts", ], - tsconfig = "//adev/shared-docs:tsconfig_build", visibility = [ "//adev/shared-docs:__subpackages__", ], diff --git a/adev/shared-docs/pipeline/guides/BUILD.bazel b/adev/shared-docs/pipeline/guides/BUILD.bazel index cab45392ace8..f8af55e0a9bb 100644 --- a/adev/shared-docs/pipeline/guides/BUILD.bazel +++ b/adev/shared-docs/pipeline/guides/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ts_project") +load("//adev/shared-docs:defaults.bzl", "ts_project") ts_project( name = "guides", @@ -9,7 +9,6 @@ ts_project( ], exclude = ["index.mts"], ), - tsconfig = "//adev/shared-docs:tsconfig_build", visibility = [ "//adev/shared-docs:__subpackages__", ], @@ -33,7 +32,6 @@ ts_project( srcs = [ "index.mts", ], - tsconfig = "//adev/shared-docs:tsconfig_build", visibility = [ "//adev/shared-docs:__subpackages__", ], diff --git a/adev/shared-docs/pipeline/guides/testing/BUILD.bazel b/adev/shared-docs/pipeline/guides/testing/BUILD.bazel index 46f22de05231..1e4e4e6eb0c9 100644 --- a/adev/shared-docs/pipeline/guides/testing/BUILD.bazel +++ b/adev/shared-docs/pipeline/guides/testing/BUILD.bazel @@ -1,5 +1,5 @@ +load("//adev/shared-docs:defaults.bzl", "ts_project") load("//tools:defaults.bzl", "jasmine_node_test") -load("//tools:defaults2.bzl", "ts_project") ts_project( name = "unit_test_lib", @@ -7,7 +7,6 @@ ts_project( srcs = glob([ "**/*.spec.mts", ]), - tsconfig = "//adev/shared-docs:tsconfig_test", deps = [ "//:node_modules/@bazel/runfiles", "//:node_modules/@types/jsdom", @@ -22,7 +21,6 @@ ts_project( srcs = [ "bootstrap.init.mts", ], - tsconfig = "//adev/shared-docs:tsconfig_test", ) jasmine_node_test( diff --git a/adev/shared-docs/pipeline/guides/testing/mermaid/BUILD.bazel b/adev/shared-docs/pipeline/guides/testing/mermaid/BUILD.bazel index a80a4c10d10f..18328e5dad50 100644 --- a/adev/shared-docs/pipeline/guides/testing/mermaid/BUILD.bazel +++ b/adev/shared-docs/pipeline/guides/testing/mermaid/BUILD.bazel @@ -1,5 +1,5 @@ +load("//adev/shared-docs:defaults.bzl", "ts_project") load("//tools:defaults.bzl", "esbuild_jasmine_node_test") -load("//tools:defaults2.bzl", "ts_project") ts_project( name = "unit_test_lib", @@ -7,7 +7,6 @@ ts_project( srcs = glob([ "*.spec.mts", ]), - tsconfig = "//adev/shared-docs:tsconfig_test", deps = [ "//:node_modules/@types/jsdom", "//:node_modules/jsdom", @@ -22,7 +21,6 @@ ts_project( srcs = [ "bootstrap.init.mts", ], - tsconfig = "//adev/shared-docs:tsconfig_test", deps = [ "//:node_modules/@types/node", ], diff --git a/adev/shared-docs/pipeline/navigation/BUILD.bazel b/adev/shared-docs/pipeline/navigation/BUILD.bazel index 05592b6b2312..5a814fbd41ab 100644 --- a/adev/shared-docs/pipeline/navigation/BUILD.bazel +++ b/adev/shared-docs/pipeline/navigation/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ts_project") +load("//adev/shared-docs:defaults.bzl", "ts_project") package(default_visibility = ["//visibility:public"]) @@ -12,7 +12,6 @@ ts_project( "index.mts", ], ), - tsconfig = "//adev/shared-docs:tsconfig_build", deps = [ "//:node_modules/@types/node", "//:node_modules/@webcontainer/api", @@ -26,7 +25,6 @@ ts_project( srcs = [ "index.mts", ], - tsconfig = "//adev/shared-docs:tsconfig_build", visibility = [ "//adev/shared-docs:__subpackages__", ], diff --git a/adev/shared-docs/pipeline/navigation/test/BUILD.bazel b/adev/shared-docs/pipeline/navigation/test/BUILD.bazel index a2ee28bf4bec..1bb293f5f6ce 100644 --- a/adev/shared-docs/pipeline/navigation/test/BUILD.bazel +++ b/adev/shared-docs/pipeline/navigation/test/BUILD.bazel @@ -1,5 +1,5 @@ +load("//adev/shared-docs:defaults.bzl", "ts_project") load("//tools:defaults.bzl", "jasmine_node_test") -load("//tools:defaults2.bzl", "ts_project") package(default_visibility = ["//adev/shared-docs/pipeline/navigation:__subpackages__"]) @@ -7,7 +7,6 @@ ts_project( name = "unit_test_lib", testonly = True, srcs = glob(["*.spec.mts"]), - tsconfig = "//adev/shared-docs:tsconfig_test", deps = [ "//:node_modules/@types/node", "//adev/shared-docs/pipeline/navigation:lib_rjs", diff --git a/adev/shared-docs/pipeline/tutorials/BUILD.bazel b/adev/shared-docs/pipeline/tutorials/BUILD.bazel index 8698b9292163..ff39c20fc28c 100644 --- a/adev/shared-docs/pipeline/tutorials/BUILD.bazel +++ b/adev/shared-docs/pipeline/tutorials/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ts_project") +load("//adev/shared-docs:defaults.bzl", "ts_project") package(default_visibility = ["//visibility:public"]) @@ -13,7 +13,6 @@ ts_project( "tutorial.mts", ], ), - tsconfig = "//adev/shared-docs:tsconfig_build", deps = [ "//:node_modules/@types/node", "//:node_modules/@webcontainer/api", @@ -27,7 +26,6 @@ ts_project( srcs = [ "playground.mts", ], - tsconfig = "//adev/shared-docs:tsconfig_build", visibility = [ "//adev/shared-docs:__subpackages__", ], @@ -43,7 +41,6 @@ ts_project( srcs = [ "tutorial.mts", ], - tsconfig = "//adev/shared-docs:tsconfig_build", visibility = [ "//adev/shared-docs:__subpackages__", ], diff --git a/adev/shared-docs/pipes/BUILD.bazel b/adev/shared-docs/pipes/BUILD.bazel index c6341a45eca7..fd8779fdee2a 100644 --- a/adev/shared-docs/pipes/BUILD.bazel +++ b/adev/shared-docs/pipes/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ng_project", "ts_project") +load("//adev/shared-docs:defaults.bzl", "ng_project", "ts_project") package(default_visibility = ["//visibility:private"]) @@ -10,7 +10,6 @@ ts_project( interop_deps = [ ":lib", ], - tsconfig = "//adev/shared-docs:tsconfig_test", visibility = ["//adev/shared-docs:__subpackages__"], ) @@ -28,7 +27,6 @@ ng_project( interop_deps = [ "//packages/core", ], - tsconfig = "//adev/shared-docs:tsconfig_build", deps = [ "//adev/shared-docs/interfaces:interfaces_rjs", "//adev/shared-docs/utils:utils_rjs", diff --git a/adev/shared-docs/providers/BUILD.bazel b/adev/shared-docs/providers/BUILD.bazel index 1c7bf4871275..26b37038e015 100644 --- a/adev/shared-docs/providers/BUILD.bazel +++ b/adev/shared-docs/providers/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ng_project", "ts_project") +load("//adev/shared-docs:defaults.bzl", "ng_project", "ts_project") package(default_visibility = ["//visibility:private"]) @@ -10,7 +10,6 @@ ts_project( interop_deps = [ ":lib", ], - tsconfig = "//adev/shared-docs:tsconfig_test", visibility = ["//adev/shared-docs:__subpackages__"], ) @@ -30,7 +29,6 @@ ng_project( "//packages/core", "//packages/router", ], - tsconfig = "//adev/shared-docs:tsconfig_build", deps = [ "//adev/shared-docs/interfaces:interfaces_rjs", ], diff --git a/adev/shared-docs/services/BUILD.bazel b/adev/shared-docs/services/BUILD.bazel index 7b5b1442a8ee..65ff53804375 100644 --- a/adev/shared-docs/services/BUILD.bazel +++ b/adev/shared-docs/services/BUILD.bazel @@ -1,5 +1,5 @@ +load("//adev/shared-docs:defaults.bzl", "ng_project", "ts_project") load("//tools:defaults.bzl", "karma_web_test_suite") -load("//tools:defaults2.bzl", "ng_project", "ts_project") package(default_visibility = ["//visibility:private"]) @@ -11,7 +11,6 @@ ts_project( interop_deps = [ ":lib", ], - tsconfig = "//adev/shared-docs:tsconfig_test", visibility = ["//adev/shared-docs:__subpackages__"], ) @@ -32,9 +31,7 @@ ng_project( "//packages/core/rxjs-interop", "//packages/router", ], - tsconfig = "//adev/shared-docs:tsconfig_build", deps = [ - "//:node_modules/@algolia/client-common", "//:node_modules/algoliasearch", "//:node_modules/rxjs", "//adev/shared-docs/interfaces:interfaces_rjs", @@ -57,7 +54,6 @@ ts_project( "//packages/core", "//packages/core/testing", ], - tsconfig = "//adev/shared-docs:tsconfig_test", ) karma_web_test_suite( diff --git a/adev/shared-docs/testing/BUILD.bazel b/adev/shared-docs/testing/BUILD.bazel index c9ea22519945..073e1dfb1daf 100644 --- a/adev/shared-docs/testing/BUILD.bazel +++ b/adev/shared-docs/testing/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ts_project") +load("//adev/shared-docs:defaults.bzl", "ts_project") package(default_visibility = ["//visibility:private"]) @@ -10,7 +10,6 @@ ts_project( interop_deps = [ ":lib", ], - tsconfig = "//adev/shared-docs:tsconfig_build", visibility = ["//adev/shared-docs:__subpackages__"], ) @@ -25,7 +24,6 @@ ts_project( interop_deps = [ "//packages/core", ], - tsconfig = "//adev/shared-docs:tsconfig_build", deps = [ "//:node_modules/@webcontainer/api", ], diff --git a/adev/shared-docs/utils/BUILD.bazel b/adev/shared-docs/utils/BUILD.bazel index cc5c0e2bfd98..6205ffbd666c 100644 --- a/adev/shared-docs/utils/BUILD.bazel +++ b/adev/shared-docs/utils/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ts_project") +load("//adev/shared-docs:defaults.bzl", "ts_project") package(default_visibility = ["//visibility:private"]) @@ -18,7 +18,6 @@ ts_project( "//packages/core", "//packages/router", ], - tsconfig = "//adev/shared-docs:tsconfig_test", visibility = ["//adev/shared-docs:__subpackages__"], deps = [ "//:node_modules/fflate",