From e8c560312645a1179d0f574145e580e06ebc1fbc Mon Sep 17 00:00:00 2001 From: Joey Perrott Date: Mon, 14 Jul 2025 14:45:06 +0000 Subject: [PATCH] build: move all rule/macro loading into adev/defaults.bzl and fix intellisense loading (#62627) Move all of our loading into a local defaults.bzl file instead of mixed loading via tools/defaults and adev/defaults PR Close #62627 --- adev/shared-docs/BUILD.bazel | 30 ++----------------- .../components/breadcrumb/BUILD.bazel | 3 +- .../components/cookie-popup/BUILD.bazel | 3 +- adev/shared-docs/components/icon/BUILD.bazel | 3 +- .../components/navigation-list/BUILD.bazel | 3 +- .../components/search-dialog/BUILD.bazel | 3 +- .../components/search-history/BUILD.bazel | 3 +- .../shared-docs/components/select/BUILD.bazel | 3 +- .../components/slide-toggle/BUILD.bazel | 3 +- .../components/table-of-contents/BUILD.bazel | 3 +- .../components/text-field/BUILD.bazel | 3 +- .../components/top-level-banner/BUILD.bazel | 3 +- .../components/viewers/BUILD.bazel | 3 +- adev/shared-docs/defaults.bzl | 25 ++++++++++++++++ adev/shared-docs/pipeline/BUILD.bazel | 2 +- adev/shared-docs/pipeline/_guides.bzl | 2 +- .../pipeline/api-gen/extraction/BUILD.bazel | 3 +- .../api-gen/extraction/test/BUILD.bazel | 3 +- .../pipeline/api-gen/manifest/BUILD.bazel | 12 ++------ .../api-gen/manifest/test/BUILD.bazel | 3 +- .../pipeline/api-gen/rendering/BUILD.bazel | 4 +-- .../api-gen/rendering/test/BUILD.bazel | 3 +- adev/shared-docs/pipeline/esbuild.config.mjs | 1 - .../pipeline/examples/previews/BUILD.bazel | 7 ++--- .../pipeline/examples/stackblitz/BUILD.bazel | 7 ++--- .../pipeline/examples/zip/BUILD.bazel | 7 ++--- adev/shared-docs/pipeline/guides/BUILD.bazel | 3 +- .../guides/testing/docs-alert/BUILD.bazel | 3 +- .../guides/testing/docs-callout/BUILD.bazel | 3 +- .../testing/docs-card-container/BUILD.bazel | 3 +- .../guides/testing/docs-card/BUILD.bazel | 3 +- .../testing/docs-code-block/BUILD.bazel | 3 +- .../testing/docs-code-multifile/BUILD.bazel | 3 +- .../guides/testing/docs-code/BUILD.bazel | 3 +- .../docs-decorative-header/BUILD.bazel | 3 +- .../guides/testing/docs-pill-row/BUILD.bazel | 3 +- .../guides/testing/docs-pill/BUILD.bazel | 3 +- .../guides/testing/docs-step/BUILD.bazel | 3 +- .../guides/testing/docs-video/BUILD.bazel | 3 +- .../guides/testing/docs-workflow/BUILD.bazel | 3 +- .../guides/testing/heading/BUILD.bazel | 3 +- .../pipeline/guides/testing/image/BUILD.bazel | 3 +- .../pipeline/guides/testing/link/BUILD.bazel | 3 +- .../pipeline/guides/testing/list/BUILD.bazel | 3 +- .../guides/testing/mermaid/BUILD.bazel | 3 +- .../pipeline/guides/testing/table/BUILD.bazel | 3 +- .../pipeline/guides/testing/text/BUILD.bazel | 3 +- .../pipeline/navigation/BUILD.bazel | 7 ++--- .../pipeline/navigation/test/BUILD.bazel | 3 +- .../pipeline/tutorials/BUILD.bazel | 11 ++----- adev/shared-docs/styles/BUILD.bazel | 2 +- adev/shared-docs/tsconfig-test.json | 3 +- adev/shared-docs/tsconfig.json | 3 ++ 53 files changed, 88 insertions(+), 149 deletions(-) diff --git a/adev/shared-docs/BUILD.bazel b/adev/shared-docs/BUILD.bazel index 534361b66b1..965062ceb75 100644 --- a/adev/shared-docs/BUILD.bazel +++ b/adev/shared-docs/BUILD.bazel @@ -1,12 +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") +load("//adev/shared-docs:defaults.bzl", "ng_package", "ng_project", "ts_config") package(default_visibility = ["//visibility:public"]) -rules_js_tsconfig( +ts_config( name = "tsconfig_build", src = "tsconfig.json", visibility = [ @@ -14,7 +10,7 @@ rules_js_tsconfig( ], ) -rules_js_tsconfig( +ts_config( name = "tsconfig_test", src = "tsconfig-test.json", visibility = [ @@ -70,23 +66,3 @@ ng_package( ":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", - ], -) diff --git a/adev/shared-docs/components/breadcrumb/BUILD.bazel b/adev/shared-docs/components/breadcrumb/BUILD.bazel index ee4c0355fe0..0c3708bc736 100644 --- a/adev/shared-docs/components/breadcrumb/BUILD.bazel +++ b/adev/shared-docs/components/breadcrumb/BUILD.bazel @@ -1,5 +1,4 @@ -load("//adev/shared-docs:defaults.bzl", "ng_project", "ts_project", "zoneless_web_test_suite") -load("//tools:defaults2.bzl", "sass_binary") +load("//adev/shared-docs:defaults.bzl", "ng_project", "sass_binary", "ts_project", "zoneless_web_test_suite") package(default_visibility = ["//visibility:private"]) diff --git a/adev/shared-docs/components/cookie-popup/BUILD.bazel b/adev/shared-docs/components/cookie-popup/BUILD.bazel index 9f5f2577ab3..afee2634af7 100644 --- a/adev/shared-docs/components/cookie-popup/BUILD.bazel +++ b/adev/shared-docs/components/cookie-popup/BUILD.bazel @@ -1,5 +1,4 @@ -load("//adev/shared-docs:defaults.bzl", "ng_project", "ts_project", "zoneless_web_test_suite") -load("//tools:defaults2.bzl", "sass_binary") +load("//adev/shared-docs:defaults.bzl", "ng_project", "sass_binary", "ts_project", "zoneless_web_test_suite") package(default_visibility = ["//visibility:private"]) diff --git a/adev/shared-docs/components/icon/BUILD.bazel b/adev/shared-docs/components/icon/BUILD.bazel index 2e7346aa1e6..1595f9efb34 100644 --- a/adev/shared-docs/components/icon/BUILD.bazel +++ b/adev/shared-docs/components/icon/BUILD.bazel @@ -1,5 +1,4 @@ -load("//adev/shared-docs:defaults.bzl", "ng_project") -load("//tools:defaults2.bzl", "sass_binary") +load("//adev/shared-docs:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:private"]) diff --git a/adev/shared-docs/components/navigation-list/BUILD.bazel b/adev/shared-docs/components/navigation-list/BUILD.bazel index 7acac320df6..268d8f30c14 100644 --- a/adev/shared-docs/components/navigation-list/BUILD.bazel +++ b/adev/shared-docs/components/navigation-list/BUILD.bazel @@ -1,5 +1,4 @@ -load("//adev/shared-docs:defaults.bzl", "ng_project", "ts_project", "zoneless_web_test_suite") -load("//tools:defaults2.bzl", "sass_binary") +load("//adev/shared-docs:defaults.bzl", "ng_project", "sass_binary", "ts_project", "zoneless_web_test_suite") package(default_visibility = ["//visibility:private"]) diff --git a/adev/shared-docs/components/search-dialog/BUILD.bazel b/adev/shared-docs/components/search-dialog/BUILD.bazel index e088713d2f0..18b1b5fa1c5 100644 --- a/adev/shared-docs/components/search-dialog/BUILD.bazel +++ b/adev/shared-docs/components/search-dialog/BUILD.bazel @@ -1,5 +1,4 @@ -load("//adev/shared-docs:defaults.bzl", "ng_project", "ts_project", "zoneless_web_test_suite") -load("//tools:defaults2.bzl", "sass_binary") +load("//adev/shared-docs:defaults.bzl", "ng_project", "sass_binary", "ts_project", "zoneless_web_test_suite") package(default_visibility = ["//visibility:private"]) diff --git a/adev/shared-docs/components/search-history/BUILD.bazel b/adev/shared-docs/components/search-history/BUILD.bazel index 4f343ba01eb..3e67b834a02 100644 --- a/adev/shared-docs/components/search-history/BUILD.bazel +++ b/adev/shared-docs/components/search-history/BUILD.bazel @@ -1,5 +1,4 @@ -load("//adev/shared-docs:defaults.bzl", "ng_project", "ts_project", "zoneless_web_test_suite") -load("//tools:defaults2.bzl", "sass_binary") +load("//adev/shared-docs:defaults.bzl", "ng_project", "sass_binary", "ts_project", "zoneless_web_test_suite") package(default_visibility = ["//visibility:private"]) diff --git a/adev/shared-docs/components/select/BUILD.bazel b/adev/shared-docs/components/select/BUILD.bazel index cbc2b42fea8..baa04b2d0c8 100644 --- a/adev/shared-docs/components/select/BUILD.bazel +++ b/adev/shared-docs/components/select/BUILD.bazel @@ -1,5 +1,4 @@ -load("//adev/shared-docs:defaults.bzl", "ng_project", "ts_project", "zoneless_web_test_suite") -load("//tools:defaults2.bzl", "sass_binary") +load("//adev/shared-docs:defaults.bzl", "ng_project", "sass_binary", "ts_project", "zoneless_web_test_suite") package(default_visibility = ["//visibility:private"]) diff --git a/adev/shared-docs/components/slide-toggle/BUILD.bazel b/adev/shared-docs/components/slide-toggle/BUILD.bazel index 3e01ebd139b..2638fb866eb 100644 --- a/adev/shared-docs/components/slide-toggle/BUILD.bazel +++ b/adev/shared-docs/components/slide-toggle/BUILD.bazel @@ -1,5 +1,4 @@ -load("//adev/shared-docs:defaults.bzl", "ng_project", "ts_project", "zoneless_web_test_suite") -load("//tools:defaults2.bzl", "sass_binary") +load("//adev/shared-docs:defaults.bzl", "ng_project", "sass_binary", "ts_project", "zoneless_web_test_suite") package(default_visibility = ["//visibility:private"]) diff --git a/adev/shared-docs/components/table-of-contents/BUILD.bazel b/adev/shared-docs/components/table-of-contents/BUILD.bazel index e70e94743e3..fe2648abd17 100644 --- a/adev/shared-docs/components/table-of-contents/BUILD.bazel +++ b/adev/shared-docs/components/table-of-contents/BUILD.bazel @@ -1,5 +1,4 @@ -load("//adev/shared-docs:defaults.bzl", "ng_project", "ts_project", "zoneless_web_test_suite") -load("//tools:defaults2.bzl", "sass_binary") +load("//adev/shared-docs:defaults.bzl", "ng_project", "sass_binary", "ts_project", "zoneless_web_test_suite") package(default_visibility = ["//visibility:private"]) diff --git a/adev/shared-docs/components/text-field/BUILD.bazel b/adev/shared-docs/components/text-field/BUILD.bazel index 656026552f5..f9540eddd2a 100644 --- a/adev/shared-docs/components/text-field/BUILD.bazel +++ b/adev/shared-docs/components/text-field/BUILD.bazel @@ -1,5 +1,4 @@ -load("//adev/shared-docs:defaults.bzl", "ng_project", "ts_project", "zoneless_web_test_suite") -load("//tools:defaults2.bzl", "sass_binary") +load("//adev/shared-docs:defaults.bzl", "ng_project", "sass_binary", "ts_project", "zoneless_web_test_suite") package(default_visibility = ["//visibility:private"]) diff --git a/adev/shared-docs/components/top-level-banner/BUILD.bazel b/adev/shared-docs/components/top-level-banner/BUILD.bazel index f0c610a1f7e..2660e773cf7 100644 --- a/adev/shared-docs/components/top-level-banner/BUILD.bazel +++ b/adev/shared-docs/components/top-level-banner/BUILD.bazel @@ -1,5 +1,4 @@ -load("//adev/shared-docs:defaults.bzl", "ng_project", "ts_project", "zoneless_web_test_suite") -load("//tools:defaults2.bzl", "sass_binary") +load("//adev/shared-docs:defaults.bzl", "ng_project", "sass_binary", "ts_project", "zoneless_web_test_suite") package(default_visibility = ["//visibility:private"]) diff --git a/adev/shared-docs/components/viewers/BUILD.bazel b/adev/shared-docs/components/viewers/BUILD.bazel index 5e6f399bb7e..6cf097035ac 100644 --- a/adev/shared-docs/components/viewers/BUILD.bazel +++ b/adev/shared-docs/components/viewers/BUILD.bazel @@ -1,5 +1,4 @@ -load("//adev/shared-docs:defaults.bzl", "ng_project", "ts_project", "zoneless_web_test_suite") -load("//tools:defaults2.bzl", "sass_binary") +load("//adev/shared-docs:defaults.bzl", "ng_project", "sass_binary", "ts_project", "zoneless_web_test_suite") package(default_visibility = ["//visibility:private"]) diff --git a/adev/shared-docs/defaults.bzl b/adev/shared-docs/defaults.bzl index a652b144ec2..709743ddb6a 100644 --- a/adev/shared-docs/defaults.bzl +++ b/adev/shared-docs/defaults.bzl @@ -1,10 +1,35 @@ +load("@aspect_bazel_lib//lib:copy_to_bin.bzl", _copy_to_bin = "copy_to_bin") +load("@aspect_bazel_lib//lib:copy_to_directory.bzl", _copy_to_directory = "copy_to_directory") +load("@aspect_rules_esbuild//esbuild:defs.bzl", _esbuild = "esbuild") +load("@aspect_rules_js//js:defs.bzl", _js_binary = "js_binary", _js_library = "js_library", _js_run_binary = "js_run_binary") +load("@devinfra//bazel/private:path_relative_to_label.bzl", _path_relative_to_label = "path_relative_to_label") load( "//tools:defaults2.bzl", + _jasmine_test = "jasmine_test", + _ng_package = "ng_package", _ng_project = "ng_project", + _sass_binary = "sass_binary", + _sass_library = "sass_library", + _ts_config = "ts_config", _ts_project = "ts_project", + _zoneless_jasmine_test = "zoneless_jasmine_test", _zoneless_web_test_suite = "zoneless_web_test_suite", ) +ts_config = _ts_config +ng_package = _ng_package +jasmine_test = _jasmine_test +sass_binary = _sass_binary +sass_library = _sass_library +copy_to_bin = _copy_to_bin +copy_to_directory = _copy_to_directory +esbuild = _esbuild +js_binary = _js_binary +js_library = _js_library +js_run_binary = _js_run_binary +path_relative_to_label = _path_relative_to_label +zoneless_jasmine_test = _zoneless_jasmine_test + def ts_project(name, tsconfig = None, testonly = False, enable_runtime_rnjs_interop = False, **kwargs): if tsconfig == None: if native.package_name().startswith("adev/shared-docs"): diff --git a/adev/shared-docs/pipeline/BUILD.bazel b/adev/shared-docs/pipeline/BUILD.bazel index ea6dd8e3ed6..e5816cfa01e 100644 --- a/adev/shared-docs/pipeline/BUILD.bazel +++ b/adev/shared-docs/pipeline/BUILD.bazel @@ -1,4 +1,4 @@ -load("@aspect_rules_js//js:defs.bzl", "js_binary", "js_library") +load("//adev/shared-docs:defaults.bzl", "js_binary", "js_library") package(default_visibility = ["//adev/shared-docs/pipeline:__subpackages__"]) diff --git a/adev/shared-docs/pipeline/_guides.bzl b/adev/shared-docs/pipeline/_guides.bzl index b205469f5f4..63439395502 100644 --- a/adev/shared-docs/pipeline/_guides.bzl +++ b/adev/shared-docs/pipeline/_guides.bzl @@ -1,4 +1,4 @@ -load("@devinfra//bazel/private:path_relative_to_label.bzl", "path_relative_to_label") +load("//adev/shared-docs:defaults.bzl", "path_relative_to_label") def _generate_guides(ctx): """Implementation of the markdown rule""" diff --git a/adev/shared-docs/pipeline/api-gen/extraction/BUILD.bazel b/adev/shared-docs/pipeline/api-gen/extraction/BUILD.bazel index 03e48bab5bf..580f85e784c 100644 --- a/adev/shared-docs/pipeline/api-gen/extraction/BUILD.bazel +++ b/adev/shared-docs/pipeline/api-gen/extraction/BUILD.bazel @@ -1,5 +1,4 @@ -load("@aspect_rules_js//js:defs.bzl", "js_binary") -load("//adev/shared-docs:defaults.bzl", "ts_project") +load("//adev/shared-docs:defaults.bzl", "js_binary", "ts_project") package(default_visibility = ["//adev/shared-docs/pipeline/api-gen:__subpackages__"]) 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 e9f4adca760..33ff0cc1a48 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,5 @@ -load("//adev/shared-docs:defaults.bzl", "ts_project") +load("//adev/shared-docs:defaults.bzl", "ts_project", "zoneless_jasmine_test") load("//adev/shared-docs/pipeline/api-gen/extraction:extract_api_to_json.bzl", "extract_api_to_json") -load("//tools:defaults2.bzl", "zoneless_jasmine_test") package(default_visibility = ["//adev/shared-docs/pipeline/api-gen:__subpackages__"]) diff --git a/adev/shared-docs/pipeline/api-gen/manifest/BUILD.bazel b/adev/shared-docs/pipeline/api-gen/manifest/BUILD.bazel index b0cafa43335..8b0581524cd 100644 --- a/adev/shared-docs/pipeline/api-gen/manifest/BUILD.bazel +++ b/adev/shared-docs/pipeline/api-gen/manifest/BUILD.bazel @@ -1,6 +1,4 @@ -load("@angular//tools/esm-interop:index.bzl", "nodejs_binary") -load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild") -load("//adev/shared-docs:defaults.bzl", "ts_project") +load("//adev/shared-docs:defaults.bzl", "esbuild", "js_binary", "ts_project") package(default_visibility = ["//adev/shared-docs/pipeline/api-gen:__subpackages__"]) @@ -30,19 +28,13 @@ ts_project( ], ) -# Action binary for the api_gen bazel rule. -nodejs_binary( +js_binary( name = "generate_api_manifest", data = [ ":bin", "@angular//packages/compiler-cli", ], entry_point = "bin.mjs", - # Note: Using the linker here as we need it for ESM. The linker is not - # super reliably when running concurrently on Windows- but we have existing - # actions using the linker. An alternative would be to: - # - bundle the Angular compiler into a CommonJS bundle - # - use the patched resolution- but also patch the ESM imports (similar to how FW does it). visibility = ["//visibility:public"], ) 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 9c9c2f5c259..ccc03093388 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,6 @@ -load("//adev/shared-docs:defaults.bzl", "ts_project") +load("//adev/shared-docs:defaults.bzl", "ts_project", "zoneless_jasmine_test") 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:defaults2.bzl", "zoneless_jasmine_test") generate_api_manifest( name = "test", diff --git a/adev/shared-docs/pipeline/api-gen/rendering/BUILD.bazel b/adev/shared-docs/pipeline/api-gen/rendering/BUILD.bazel index 402277c2bf7..7779fb37e42 100644 --- a/adev/shared-docs/pipeline/api-gen/rendering/BUILD.bazel +++ b/adev/shared-docs/pipeline/api-gen/rendering/BUILD.bazel @@ -1,6 +1,4 @@ -load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild") -load("@aspect_rules_js//js:defs.bzl", "js_binary") -load("//adev/shared-docs:defaults.bzl", "ts_project") +load("//adev/shared-docs:defaults.bzl", "esbuild", "js_binary", "ts_project") package(default_visibility = ["//adev/shared-docs/pipeline/api-gen:__subpackages__"]) 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 789252288f3..6e784522b6d 100644 --- a/adev/shared-docs/pipeline/api-gen/rendering/test/BUILD.bazel +++ b/adev/shared-docs/pipeline/api-gen/rendering/test/BUILD.bazel @@ -1,6 +1,5 @@ -load("//adev/shared-docs:defaults.bzl", "ts_project") +load("//adev/shared-docs:defaults.bzl", "ts_project", "zoneless_jasmine_test") load("//adev/shared-docs/pipeline/api-gen/rendering:render_api_to_html.bzl", "render_api_to_html") -load("//tools:defaults2.bzl", "zoneless_jasmine_test") render_api_to_html( name = "test", diff --git a/adev/shared-docs/pipeline/esbuild.config.mjs b/adev/shared-docs/pipeline/esbuild.config.mjs index f73ece01a56..06234ed0ec6 100644 --- a/adev/shared-docs/pipeline/esbuild.config.mjs +++ b/adev/shared-docs/pipeline/esbuild.config.mjs @@ -13,6 +13,5 @@ export default { import {createRequire as __cjsCompatRequire} from 'module'; const require = __cjsCompatRequire(import.meta.url);`, }, - tsconfig: import.meta.dirname + '/../tsconfig.json', resolveExtensions: ['.js', '.mjs'], }; diff --git a/adev/shared-docs/pipeline/examples/previews/BUILD.bazel b/adev/shared-docs/pipeline/examples/previews/BUILD.bazel index 6c0bca8cb6c..0887253bbbd 100644 --- a/adev/shared-docs/pipeline/examples/previews/BUILD.bazel +++ b/adev/shared-docs/pipeline/examples/previews/BUILD.bazel @@ -1,5 +1,4 @@ -load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild") -load("//adev/shared-docs:defaults.bzl", "ts_project") +load("//adev/shared-docs:defaults.bzl", "esbuild", "ts_project") package(default_visibility = ["//visibility:public"]) @@ -31,9 +30,6 @@ filegroup( esbuild( name = "bundle", - srcs = [ - "//adev/shared-docs:tsconfig_build", - ], config = "//adev/shared-docs/pipeline:esbuild-config", entry_point = ":index.mts", external = [ @@ -44,6 +40,7 @@ esbuild( output = "previews.mjs", platform = "node", target = "es2022", + tsconfig = "//adev/shared-docs:tsconfig_build", visibility = ["//visibility:public"], deps = [ "//adev/shared-docs/pipeline/examples/previews:index_rjs", diff --git a/adev/shared-docs/pipeline/examples/stackblitz/BUILD.bazel b/adev/shared-docs/pipeline/examples/stackblitz/BUILD.bazel index d688037ab9c..17b39386caf 100644 --- a/adev/shared-docs/pipeline/examples/stackblitz/BUILD.bazel +++ b/adev/shared-docs/pipeline/examples/stackblitz/BUILD.bazel @@ -1,5 +1,4 @@ -load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild") -load("//adev/shared-docs:defaults.bzl", "ts_project") +load("//adev/shared-docs:defaults.bzl", "esbuild", "ts_project") package(default_visibility = ["//visibility:public"]) @@ -41,9 +40,6 @@ ts_project( esbuild( name = "bundle", - srcs = [ - "//adev/shared-docs:tsconfig_build", - ], config = "//adev/shared-docs/pipeline:esbuild-config", entry_point = ":index.mts", # JSDOM should not be bundled because it has workers and dynamic imports. @@ -52,6 +48,7 @@ esbuild( output = "stackblitz.mjs", platform = "node", target = "es2022", + tsconfig = "//adev/shared-docs:tsconfig_build", visibility = ["//visibility:public"], deps = [ ":index_rjs", diff --git a/adev/shared-docs/pipeline/examples/zip/BUILD.bazel b/adev/shared-docs/pipeline/examples/zip/BUILD.bazel index 828fb359ff6..7096bbea5f9 100644 --- a/adev/shared-docs/pipeline/examples/zip/BUILD.bazel +++ b/adev/shared-docs/pipeline/examples/zip/BUILD.bazel @@ -1,5 +1,4 @@ -load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild") -load("//adev/shared-docs:defaults.bzl", "ts_project") +load("//adev/shared-docs:defaults.bzl", "esbuild", "ts_project") package(default_visibility = ["//visibility:public"]) @@ -41,15 +40,13 @@ ts_project( esbuild( name = "bundle", - srcs = [ - "//adev/shared-docs:tsconfig_build", - ], config = "//adev/shared-docs/pipeline:esbuild-config", entry_point = ":index.mts", format = "esm", output = "zip.mjs", platform = "node", target = "es2022", + tsconfig = "//adev/shared-docs:tsconfig_build", visibility = ["//visibility:public"], deps = [ ":index_rjs", diff --git a/adev/shared-docs/pipeline/guides/BUILD.bazel b/adev/shared-docs/pipeline/guides/BUILD.bazel index abd550cb19e..d97d74915e8 100644 --- a/adev/shared-docs/pipeline/guides/BUILD.bazel +++ b/adev/shared-docs/pipeline/guides/BUILD.bazel @@ -1,5 +1,4 @@ -load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild") -load("//adev/shared-docs:defaults.bzl", "ts_project") +load("//adev/shared-docs:defaults.bzl", "esbuild", "ts_project") esbuild( name = "guides", diff --git a/adev/shared-docs/pipeline/guides/testing/docs-alert/BUILD.bazel b/adev/shared-docs/pipeline/guides/testing/docs-alert/BUILD.bazel index ded0c93013e..c20d91b29b2 100644 --- a/adev/shared-docs/pipeline/guides/testing/docs-alert/BUILD.bazel +++ b/adev/shared-docs/pipeline/guides/testing/docs-alert/BUILD.bazel @@ -1,5 +1,4 @@ -load("//adev/shared-docs:defaults.bzl", "ts_project") -load("//tools:defaults2.bzl", "zoneless_jasmine_test") +load("//adev/shared-docs:defaults.bzl", "ts_project", "zoneless_jasmine_test") ts_project( name = "docs-alert", diff --git a/adev/shared-docs/pipeline/guides/testing/docs-callout/BUILD.bazel b/adev/shared-docs/pipeline/guides/testing/docs-callout/BUILD.bazel index 4720961e674..87bb07f7584 100644 --- a/adev/shared-docs/pipeline/guides/testing/docs-callout/BUILD.bazel +++ b/adev/shared-docs/pipeline/guides/testing/docs-callout/BUILD.bazel @@ -1,5 +1,4 @@ -load("//adev/shared-docs:defaults.bzl", "ts_project") -load("//tools:defaults2.bzl", "zoneless_jasmine_test") +load("//adev/shared-docs:defaults.bzl", "ts_project", "zoneless_jasmine_test") ts_project( name = "docs-callout", diff --git a/adev/shared-docs/pipeline/guides/testing/docs-card-container/BUILD.bazel b/adev/shared-docs/pipeline/guides/testing/docs-card-container/BUILD.bazel index 0499e063ffa..f43455befa9 100644 --- a/adev/shared-docs/pipeline/guides/testing/docs-card-container/BUILD.bazel +++ b/adev/shared-docs/pipeline/guides/testing/docs-card-container/BUILD.bazel @@ -1,5 +1,4 @@ -load("//adev/shared-docs:defaults.bzl", "ts_project") -load("//tools:defaults2.bzl", "zoneless_jasmine_test") +load("//adev/shared-docs:defaults.bzl", "ts_project", "zoneless_jasmine_test") ts_project( name = "docs-card-container", diff --git a/adev/shared-docs/pipeline/guides/testing/docs-card/BUILD.bazel b/adev/shared-docs/pipeline/guides/testing/docs-card/BUILD.bazel index 93d1b7b1b30..655c495ea20 100644 --- a/adev/shared-docs/pipeline/guides/testing/docs-card/BUILD.bazel +++ b/adev/shared-docs/pipeline/guides/testing/docs-card/BUILD.bazel @@ -1,5 +1,4 @@ -load("//adev/shared-docs:defaults.bzl", "ts_project") -load("//tools:defaults2.bzl", "zoneless_jasmine_test") +load("//adev/shared-docs:defaults.bzl", "ts_project", "zoneless_jasmine_test") ts_project( name = "docs-card", diff --git a/adev/shared-docs/pipeline/guides/testing/docs-code-block/BUILD.bazel b/adev/shared-docs/pipeline/guides/testing/docs-code-block/BUILD.bazel index 2fef452370b..82a96654c9a 100644 --- a/adev/shared-docs/pipeline/guides/testing/docs-code-block/BUILD.bazel +++ b/adev/shared-docs/pipeline/guides/testing/docs-code-block/BUILD.bazel @@ -1,5 +1,4 @@ -load("//adev/shared-docs:defaults.bzl", "ts_project") -load("//tools:defaults2.bzl", "zoneless_jasmine_test") +load("//adev/shared-docs:defaults.bzl", "ts_project", "zoneless_jasmine_test") ts_project( name = "docs-code-block", diff --git a/adev/shared-docs/pipeline/guides/testing/docs-code-multifile/BUILD.bazel b/adev/shared-docs/pipeline/guides/testing/docs-code-multifile/BUILD.bazel index 9fb0e87490b..ee08386623d 100644 --- a/adev/shared-docs/pipeline/guides/testing/docs-code-multifile/BUILD.bazel +++ b/adev/shared-docs/pipeline/guides/testing/docs-code-multifile/BUILD.bazel @@ -1,5 +1,4 @@ -load("//adev/shared-docs:defaults.bzl", "ts_project") -load("//tools:defaults2.bzl", "zoneless_jasmine_test") +load("//adev/shared-docs:defaults.bzl", "ts_project", "zoneless_jasmine_test") ts_project( name = "docs-code-multifile", diff --git a/adev/shared-docs/pipeline/guides/testing/docs-code/BUILD.bazel b/adev/shared-docs/pipeline/guides/testing/docs-code/BUILD.bazel index bedf630c379..a55c9715ae9 100644 --- a/adev/shared-docs/pipeline/guides/testing/docs-code/BUILD.bazel +++ b/adev/shared-docs/pipeline/guides/testing/docs-code/BUILD.bazel @@ -1,5 +1,4 @@ -load("//adev/shared-docs:defaults.bzl", "ts_project") -load("//tools:defaults2.bzl", "zoneless_jasmine_test") +load("//adev/shared-docs:defaults.bzl", "ts_project", "zoneless_jasmine_test") ts_project( name = "docs-code", diff --git a/adev/shared-docs/pipeline/guides/testing/docs-decorative-header/BUILD.bazel b/adev/shared-docs/pipeline/guides/testing/docs-decorative-header/BUILD.bazel index 9be1a183682..39966b0e027 100644 --- a/adev/shared-docs/pipeline/guides/testing/docs-decorative-header/BUILD.bazel +++ b/adev/shared-docs/pipeline/guides/testing/docs-decorative-header/BUILD.bazel @@ -1,5 +1,4 @@ -load("//adev/shared-docs:defaults.bzl", "ts_project") -load("//tools:defaults2.bzl", "zoneless_jasmine_test") +load("//adev/shared-docs:defaults.bzl", "ts_project", "zoneless_jasmine_test") ts_project( name = "docs-decorative-header", diff --git a/adev/shared-docs/pipeline/guides/testing/docs-pill-row/BUILD.bazel b/adev/shared-docs/pipeline/guides/testing/docs-pill-row/BUILD.bazel index f2fbe46f62c..4cdaae9d506 100644 --- a/adev/shared-docs/pipeline/guides/testing/docs-pill-row/BUILD.bazel +++ b/adev/shared-docs/pipeline/guides/testing/docs-pill-row/BUILD.bazel @@ -1,5 +1,4 @@ -load("//adev/shared-docs:defaults.bzl", "ts_project") -load("//tools:defaults2.bzl", "zoneless_jasmine_test") +load("//adev/shared-docs:defaults.bzl", "ts_project", "zoneless_jasmine_test") ts_project( name = "docs-pill-row", diff --git a/adev/shared-docs/pipeline/guides/testing/docs-pill/BUILD.bazel b/adev/shared-docs/pipeline/guides/testing/docs-pill/BUILD.bazel index d8242c1246d..675f66239c6 100644 --- a/adev/shared-docs/pipeline/guides/testing/docs-pill/BUILD.bazel +++ b/adev/shared-docs/pipeline/guides/testing/docs-pill/BUILD.bazel @@ -1,5 +1,4 @@ -load("//adev/shared-docs:defaults.bzl", "ts_project") -load("//tools:defaults2.bzl", "zoneless_jasmine_test") +load("//adev/shared-docs:defaults.bzl", "ts_project", "zoneless_jasmine_test") ts_project( name = "docs-pill", diff --git a/adev/shared-docs/pipeline/guides/testing/docs-step/BUILD.bazel b/adev/shared-docs/pipeline/guides/testing/docs-step/BUILD.bazel index dcfe88392c1..30fb0632a4c 100644 --- a/adev/shared-docs/pipeline/guides/testing/docs-step/BUILD.bazel +++ b/adev/shared-docs/pipeline/guides/testing/docs-step/BUILD.bazel @@ -1,5 +1,4 @@ -load("//adev/shared-docs:defaults.bzl", "ts_project") -load("//tools:defaults2.bzl", "zoneless_jasmine_test") +load("//adev/shared-docs:defaults.bzl", "ts_project", "zoneless_jasmine_test") ts_project( name = "docs-step", diff --git a/adev/shared-docs/pipeline/guides/testing/docs-video/BUILD.bazel b/adev/shared-docs/pipeline/guides/testing/docs-video/BUILD.bazel index 7ced49f3fb3..decbd256604 100644 --- a/adev/shared-docs/pipeline/guides/testing/docs-video/BUILD.bazel +++ b/adev/shared-docs/pipeline/guides/testing/docs-video/BUILD.bazel @@ -1,5 +1,4 @@ -load("//adev/shared-docs:defaults.bzl", "ts_project") -load("//tools:defaults2.bzl", "zoneless_jasmine_test") +load("//adev/shared-docs:defaults.bzl", "ts_project", "zoneless_jasmine_test") ts_project( name = "docs-video", diff --git a/adev/shared-docs/pipeline/guides/testing/docs-workflow/BUILD.bazel b/adev/shared-docs/pipeline/guides/testing/docs-workflow/BUILD.bazel index 2fe3fce2529..0b67b18c132 100644 --- a/adev/shared-docs/pipeline/guides/testing/docs-workflow/BUILD.bazel +++ b/adev/shared-docs/pipeline/guides/testing/docs-workflow/BUILD.bazel @@ -1,5 +1,4 @@ -load("//adev/shared-docs:defaults.bzl", "ts_project") -load("//tools:defaults2.bzl", "zoneless_jasmine_test") +load("//adev/shared-docs:defaults.bzl", "ts_project", "zoneless_jasmine_test") ts_project( name = "docs-workflow", diff --git a/adev/shared-docs/pipeline/guides/testing/heading/BUILD.bazel b/adev/shared-docs/pipeline/guides/testing/heading/BUILD.bazel index 922f9ba8f8a..cf7e731ee9a 100644 --- a/adev/shared-docs/pipeline/guides/testing/heading/BUILD.bazel +++ b/adev/shared-docs/pipeline/guides/testing/heading/BUILD.bazel @@ -1,5 +1,4 @@ -load("//adev/shared-docs:defaults.bzl", "ts_project") -load("//tools:defaults2.bzl", "zoneless_jasmine_test") +load("//adev/shared-docs:defaults.bzl", "ts_project", "zoneless_jasmine_test") ts_project( name = "heading", diff --git a/adev/shared-docs/pipeline/guides/testing/image/BUILD.bazel b/adev/shared-docs/pipeline/guides/testing/image/BUILD.bazel index 2fd8d65fe77..6d78a330d57 100644 --- a/adev/shared-docs/pipeline/guides/testing/image/BUILD.bazel +++ b/adev/shared-docs/pipeline/guides/testing/image/BUILD.bazel @@ -1,5 +1,4 @@ -load("//adev/shared-docs:defaults.bzl", "ts_project") -load("//tools:defaults2.bzl", "zoneless_jasmine_test") +load("//adev/shared-docs:defaults.bzl", "ts_project", "zoneless_jasmine_test") ts_project( name = "image", diff --git a/adev/shared-docs/pipeline/guides/testing/link/BUILD.bazel b/adev/shared-docs/pipeline/guides/testing/link/BUILD.bazel index 1b77725691c..b9478c31647 100644 --- a/adev/shared-docs/pipeline/guides/testing/link/BUILD.bazel +++ b/adev/shared-docs/pipeline/guides/testing/link/BUILD.bazel @@ -1,5 +1,4 @@ -load("//adev/shared-docs:defaults.bzl", "ts_project") -load("//tools:defaults2.bzl", "zoneless_jasmine_test") +load("//adev/shared-docs:defaults.bzl", "ts_project", "zoneless_jasmine_test") ts_project( name = "link", diff --git a/adev/shared-docs/pipeline/guides/testing/list/BUILD.bazel b/adev/shared-docs/pipeline/guides/testing/list/BUILD.bazel index 64c29734582..92300e87a19 100644 --- a/adev/shared-docs/pipeline/guides/testing/list/BUILD.bazel +++ b/adev/shared-docs/pipeline/guides/testing/list/BUILD.bazel @@ -1,5 +1,4 @@ -load("//adev/shared-docs:defaults.bzl", "ts_project") -load("//tools:defaults2.bzl", "zoneless_jasmine_test") +load("//adev/shared-docs:defaults.bzl", "ts_project", "zoneless_jasmine_test") ts_project( name = "list", diff --git a/adev/shared-docs/pipeline/guides/testing/mermaid/BUILD.bazel b/adev/shared-docs/pipeline/guides/testing/mermaid/BUILD.bazel index 01f136c4a0a..9fda0923560 100644 --- a/adev/shared-docs/pipeline/guides/testing/mermaid/BUILD.bazel +++ b/adev/shared-docs/pipeline/guides/testing/mermaid/BUILD.bazel @@ -1,5 +1,4 @@ -load("//adev/shared-docs:defaults.bzl", "ts_project") -load("//tools:defaults2.bzl", "zoneless_jasmine_test") +load("//adev/shared-docs:defaults.bzl", "ts_project", "zoneless_jasmine_test") ts_project( name = "unit_test_lib", diff --git a/adev/shared-docs/pipeline/guides/testing/table/BUILD.bazel b/adev/shared-docs/pipeline/guides/testing/table/BUILD.bazel index db95d8693d2..d3b68f9fce8 100644 --- a/adev/shared-docs/pipeline/guides/testing/table/BUILD.bazel +++ b/adev/shared-docs/pipeline/guides/testing/table/BUILD.bazel @@ -1,5 +1,4 @@ -load("//adev/shared-docs:defaults.bzl", "ts_project") -load("//tools:defaults2.bzl", "zoneless_jasmine_test") +load("//adev/shared-docs:defaults.bzl", "ts_project", "zoneless_jasmine_test") ts_project( name = "table", diff --git a/adev/shared-docs/pipeline/guides/testing/text/BUILD.bazel b/adev/shared-docs/pipeline/guides/testing/text/BUILD.bazel index 2fca5f26595..c0c018fa953 100644 --- a/adev/shared-docs/pipeline/guides/testing/text/BUILD.bazel +++ b/adev/shared-docs/pipeline/guides/testing/text/BUILD.bazel @@ -1,5 +1,4 @@ -load("//adev/shared-docs:defaults.bzl", "ts_project") -load("//tools:defaults2.bzl", "zoneless_jasmine_test") +load("//adev/shared-docs:defaults.bzl", "ts_project", "zoneless_jasmine_test") ts_project( name = "text", diff --git a/adev/shared-docs/pipeline/navigation/BUILD.bazel b/adev/shared-docs/pipeline/navigation/BUILD.bazel index a973ebc5263..0d0dc804fe8 100644 --- a/adev/shared-docs/pipeline/navigation/BUILD.bazel +++ b/adev/shared-docs/pipeline/navigation/BUILD.bazel @@ -1,5 +1,4 @@ -load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild") -load("//adev/shared-docs:defaults.bzl", "ts_project") +load("//adev/shared-docs:defaults.bzl", "esbuild", "ts_project") package(default_visibility = ["//visibility:public"]) @@ -38,15 +37,13 @@ ts_project( esbuild( name = "bundle", - srcs = [ - "//adev/shared-docs:tsconfig_build", - ], config = "//adev/shared-docs/pipeline:esbuild-config", entry_point = ":index.mts", format = "esm", output = "navigation.mjs", platform = "node", target = "es2022", + tsconfig = "//adev/shared-docs:tsconfig_build", visibility = ["//visibility:public"], deps = [ ":navigation_rjs", diff --git a/adev/shared-docs/pipeline/navigation/test/BUILD.bazel b/adev/shared-docs/pipeline/navigation/test/BUILD.bazel index 38d5c7ff429..cec66748468 100644 --- a/adev/shared-docs/pipeline/navigation/test/BUILD.bazel +++ b/adev/shared-docs/pipeline/navigation/test/BUILD.bazel @@ -1,5 +1,4 @@ -load("//adev/shared-docs:defaults.bzl", "ts_project") -load("//tools:defaults2.bzl", "zoneless_jasmine_test") +load("//adev/shared-docs:defaults.bzl", "ts_project", "zoneless_jasmine_test") package(default_visibility = ["//adev/shared-docs/pipeline/navigation:__subpackages__"]) diff --git a/adev/shared-docs/pipeline/tutorials/BUILD.bazel b/adev/shared-docs/pipeline/tutorials/BUILD.bazel index 81a3d919934..c1845172e8e 100644 --- a/adev/shared-docs/pipeline/tutorials/BUILD.bazel +++ b/adev/shared-docs/pipeline/tutorials/BUILD.bazel @@ -1,5 +1,4 @@ -load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild") -load("//adev/shared-docs:defaults.bzl", "ts_project") +load("//adev/shared-docs:defaults.bzl", "esbuild", "ts_project") package(default_visibility = ["//visibility:public"]) @@ -56,15 +55,13 @@ ts_project( esbuild( name = "playground_bundle", - srcs = [ - "//adev/shared-docs:tsconfig_build", - ], config = "//adev/shared-docs/pipeline:esbuild-config", entry_point = ":playground_index.mts", format = "esm", output = "playground.mjs", platform = "node", target = "es2022", + tsconfig = "//adev/shared-docs:tsconfig_build", visibility = ["//visibility:public"], deps = [ ":playground_rjs", @@ -73,15 +70,13 @@ esbuild( esbuild( name = "tutorial_bundle", - srcs = [ - "//adev/shared-docs:tsconfig_build", - ], config = "//adev/shared-docs/pipeline:esbuild-config", entry_point = ":tutorial_index.mts", format = "esm", output = "tutorial.mjs", platform = "node", target = "es2022", + tsconfig = "//adev/shared-docs:tsconfig_build", visibility = ["//visibility:public"], deps = [ ":tutorial_rjs", diff --git a/adev/shared-docs/styles/BUILD.bazel b/adev/shared-docs/styles/BUILD.bazel index 14029b04629..3c79da66b8b 100644 --- a/adev/shared-docs/styles/BUILD.bazel +++ b/adev/shared-docs/styles/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "sass_library") +load("//adev/shared-docs:defaults.bzl", "sass_library") package(default_visibility = ["//visibility:private"]) diff --git a/adev/shared-docs/tsconfig-test.json b/adev/shared-docs/tsconfig-test.json index c18f2a41c29..7c8749197d8 100644 --- a/adev/shared-docs/tsconfig-test.json +++ b/adev/shared-docs/tsconfig-test.json @@ -1,6 +1,7 @@ { "extends": "./tsconfig.json", "compilerOptions": { - "types": ["jasmine", "node"] + "types": ["jasmine", "node"], + "paths": {} } } \ No newline at end of file diff --git a/adev/shared-docs/tsconfig.json b/adev/shared-docs/tsconfig.json index 6b978a36e46..e01848cc4bd 100644 --- a/adev/shared-docs/tsconfig.json +++ b/adev/shared-docs/tsconfig.json @@ -12,5 +12,8 @@ "jsxFactory": "h", "jsxFragmentFactory": "Fragment", "types": ["node"], + "paths": { + "@angular/*": ["../../packages/*/index"] + }, } }