From 7bf66f0c52daed5d0ddce3d325d44555efd689a1 Mon Sep 17 00:00:00 2001 From: Joey Perrott Date: Mon, 14 Jul 2025 14:41:41 +0000 Subject: [PATCH] build: move all rule/macro loading into devtools/defaults.bzl (#62629) Move all of our loading into a local defaults.bzl file instead of mixed loading via tools/defaults and devtolls/defaults PR Close #62629 --- devtools/BUILD.bazel | 6 +- .../projects/demo-no-zone/src/BUILD.bazel | 5 +- .../projects/demo-no-zone/src/app/BUILD.bazel | 2 +- .../projects/demo-standalone/src/BUILD.bazel | 15 +++-- .../demo-standalone/src/app/BUILD.bazel | 2 +- .../src/app/demo-app/BUILD.bazel | 3 +- .../src/app/demo-app/todo/BUILD.bazel | 2 +- .../src/app/demo-app/todo/about/BUILD.bazel | 2 +- .../src/app/demo-app/todo/home/BUILD.bazel | 2 +- .../src/app/devtools-app/BUILD.bazel | 2 +- .../src/environments/BUILD.bazel | 2 +- .../projects/ng-devtools-backend/BUILD.bazel | 2 +- .../ng-devtools-backend/src/BUILD.bazel | 2 +- .../ng-devtools-backend/src/lib/BUILD.bazel | 3 +- .../src/lib/component-inspector/BUILD.bazel | 3 +- .../src/lib/component-tree/BUILD.bazel | 3 +- .../src/lib/directive-forest/BUILD.bazel | 3 +- .../src/lib/hooks/BUILD.bazel | 2 +- .../src/lib/hooks/profiler/BUILD.bazel | 2 +- .../src/lib/ng-debug-api/BUILD.bazel | 4 +- .../src/lib/state-serializer/BUILD.bazel | 4 +- devtools/projects/ng-devtools/BUILD.bazel | 2 +- devtools/projects/ng-devtools/src/BUILD.bazel | 2 +- .../projects/ng-devtools/src/lib/BUILD.bazel | 5 +- .../lib/application-environment/BUILD.bazel | 2 +- .../lib/application-operations/BUILD.bazel | 2 +- .../src/lib/application-providers/BUILD.bazel | 2 +- .../src/lib/application-services/BUILD.bazel | 4 +- .../src/lib/devtools-tabs/BUILD.bazel | 5 +- .../src/lib/devtools-tabs/diffing/BUILD.bazel | 2 +- .../directive-explorer/BUILD.bazel | 5 +- .../directive-forest/BUILD.bazel | 5 +- .../directive-forest/breadcrumbs/BUILD.bazel | 3 +- .../component-data-source/BUILD.bazel | 3 +- .../directive-forest/filter/BUILD.bazel | 5 +- .../directive-forest/index-forest/BUILD.bazel | 3 +- .../directive-forest/tree-node/BUILD.bazel | 5 +- .../property-resolver/BUILD.bazel | 4 +- .../property-tab/BUILD.bazel | 3 +- .../property-tab/defer-view/BUILD.bazel | 3 +- .../property-tab/property-view/BUILD.bazel | 3 +- .../property-view/resolution-path/BUILD.bazel | 5 +- .../signals-view/BUILD.bazel | 3 +- .../devtools-tabs/injector-tree/BUILD.bazel | 5 +- .../injector-providers/BUILD.bazel | 3 +- .../lib/devtools-tabs/profiler/BUILD.bazel | 3 +- .../profiler-import-dialog/BUILD.bazel | 3 +- .../profiler/recording-timeline/BUILD.bazel | 3 +- .../frame-selector/BUILD.bazel | 3 +- .../record-formatter/BUILD.bazel | 3 +- .../bargraph-formatter/BUILD.bazel | 2 +- .../flamegraph-formatter/BUILD.bazel | 4 +- .../tree-map-formatter/BUILD.bazel | 3 +- .../recording-modal/BUILD.bazel | 3 +- .../recording-dialog/BUILD.bazel | 3 +- .../recording-timeline-controls/BUILD.bazel | 3 +- .../recording-visualizer/BUILD.bazel | 4 +- .../bargraph-visualizer/BUILD.bazel | 3 +- .../bargraph-visualizer/bar-chart/BUILD.bazel | 3 +- .../execution-details/BUILD.bazel | 3 +- .../flamegraph-visualizer/BUILD.bazel | 3 +- .../profile-formatter/BUILD.bazel | 2 +- .../tree-map-visualizer/BUILD.bazel | 3 +- .../recording-timeline/shared/BUILD.bazel | 3 +- .../visualizer-controls/BUILD.bazel | 3 +- .../lib/devtools-tabs/router-tree/BUILD.bazel | 5 +- .../lib/devtools-tabs/tab-update/BUILD.bazel | 2 +- .../src/lib/shared/button/BUILD.bazel | 5 +- .../lib/shared/responsive-split/BUILD.bazel | 4 +- .../shared/tree-visualizer-host/BUILD.bazel | 3 +- .../src/lib/shared/utils/BUILD.bazel | 3 +- .../src/lib/vendor/angular-split/BUILD.bazel | 2 +- .../lib/vendor/angular-split/lib/BUILD.bazel | 2 +- .../angular-split/lib/component/BUILD.bazel | 3 +- .../ng-devtools/src/styles/BUILD.bazel | 2 +- devtools/projects/protocol/BUILD.bazel | 3 +- devtools/projects/shared-utils/BUILD.bazel | 3 +- .../projects/shell-browser/src/BUILD.bazel | 8 +-- .../shell-browser/src/app/BUILD.bazel | 6 +- .../src/environments/BUILD.bazel | 2 +- devtools/src/BUILD.bazel | 7 +- devtools/src/app/BUILD.bazel | 3 +- devtools/src/app/demo-app/BUILD.bazel | 3 +- devtools/src/app/demo-app/todo/BUILD.bazel | 3 +- .../src/app/demo-app/todo/about/BUILD.bazel | 2 +- .../src/app/demo-app/todo/home/BUILD.bazel | 3 +- .../src/app/demo-app/todo/routes/BUILD.bazel | 2 +- devtools/src/app/devtools-app/BUILD.bazel | 3 +- devtools/src/environments/BUILD.bazel | 2 +- .../tools/angular-optimization/BUILD.bazel | 3 +- devtools/tools/defaults.bzl | 65 ++++++++++++++++++- devtools/tools/esbuild/BUILD.bazel | 2 +- devtools/tools/ng_project.bzl | 16 ----- devtools/tools/typescript.bzl | 23 ------- tools/defaults2.bzl | 2 + 95 files changed, 167 insertions(+), 240 deletions(-) delete mode 100644 devtools/tools/ng_project.bzl delete mode 100644 devtools/tools/typescript.bzl diff --git a/devtools/BUILD.bazel b/devtools/BUILD.bazel index 7c7201f1319..207b4561c18 100644 --- a/devtools/BUILD.bazel +++ b/devtools/BUILD.bazel @@ -1,4 +1,4 @@ -load("@aspect_rules_ts//ts:defs.bzl", rules_js_tsconfig = "ts_config") +load("//devtools/tools:defaults.bzl", "ts_config") package(default_visibility = ["//visibility:public"]) @@ -7,12 +7,12 @@ exports_files([ "cypress.json", ]) -rules_js_tsconfig( +ts_config( name = "tsconfig_build", src = "tsconfig.json", ) -rules_js_tsconfig( +ts_config( name = "tsconfig_test", src = "tsconfig-test.json", deps = [ diff --git a/devtools/projects/demo-no-zone/src/BUILD.bazel b/devtools/projects/demo-no-zone/src/BUILD.bazel index 16d6d0245e2..b270121fea9 100644 --- a/devtools/projects/demo-no-zone/src/BUILD.bazel +++ b/devtools/projects/demo-no-zone/src/BUILD.bazel @@ -1,7 +1,4 @@ -load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild") -load("@build_bazel_rules_nodejs//:index.bzl", "pkg_web") -load("//devtools/tools:ng_project.bzl", "ng_project") -load("//tools:defaults.bzl", "http_server") +load("//devtools/tools:defaults.bzl", "esbuild", "http_server", "ng_project", "pkg_web") package(default_visibility = ["//:__subpackages__"]) diff --git a/devtools/projects/demo-no-zone/src/app/BUILD.bazel b/devtools/projects/demo-no-zone/src/app/BUILD.bazel index 79fd595ddb9..693f2cf0145 100644 --- a/devtools/projects/demo-no-zone/src/app/BUILD.bazel +++ b/devtools/projects/demo-no-zone/src/app/BUILD.bazel @@ -1,4 +1,4 @@ -load("//devtools/tools:ng_project.bzl", "ng_project") +load("//devtools/tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/projects/demo-standalone/src/BUILD.bazel b/devtools/projects/demo-standalone/src/BUILD.bazel index 82212d04f9a..345206f2acb 100644 --- a/devtools/projects/demo-standalone/src/BUILD.bazel +++ b/devtools/projects/demo-standalone/src/BUILD.bazel @@ -1,9 +1,12 @@ -load("@aspect_bazel_lib//lib:copy_to_directory.bzl", "copy_to_directory") -load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild") -load("@build_bazel_rules_nodejs//:index.bzl", "pkg_web") -load("//devtools/tools:ng_project.bzl", "ng_project") -load("//tools:defaults.bzl", "http_server") -load("//tools:defaults2.bzl", "sass_binary") +load( + "//devtools/tools:defaults.bzl", + "copy_to_directory", + "esbuild", + "http_server", + "ng_project", + "pkg_web", + "sass_binary", +) package(default_visibility = ["//visibility:public"]) diff --git a/devtools/projects/demo-standalone/src/app/BUILD.bazel b/devtools/projects/demo-standalone/src/app/BUILD.bazel index 3af1a197d05..460db80d26d 100644 --- a/devtools/projects/demo-standalone/src/app/BUILD.bazel +++ b/devtools/projects/demo-standalone/src/app/BUILD.bazel @@ -1,4 +1,4 @@ -load("//devtools/tools:ng_project.bzl", "ng_project") +load("//devtools/tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/projects/demo-standalone/src/app/demo-app/BUILD.bazel b/devtools/projects/demo-standalone/src/app/demo-app/BUILD.bazel index 0e0033bee13..be04ec06441 100644 --- a/devtools/projects/demo-standalone/src/app/demo-app/BUILD.bazel +++ b/devtools/projects/demo-standalone/src/app/demo-app/BUILD.bazel @@ -1,5 +1,4 @@ -load("//devtools/tools:ng_project.bzl", "ng_project") -load("//tools:defaults2.bzl", "npm_sass_library", "sass_binary") +load("//devtools/tools:defaults.bzl", "ng_project", "npm_sass_library", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/projects/demo-standalone/src/app/demo-app/todo/BUILD.bazel b/devtools/projects/demo-standalone/src/app/demo-app/todo/BUILD.bazel index 03aa102ae7c..16fca3a6814 100644 --- a/devtools/projects/demo-standalone/src/app/demo-app/todo/BUILD.bazel +++ b/devtools/projects/demo-standalone/src/app/demo-app/todo/BUILD.bazel @@ -1,4 +1,4 @@ -load("//devtools/tools:ng_project.bzl", "ng_project") +load("//devtools/tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/projects/demo-standalone/src/app/demo-app/todo/about/BUILD.bazel b/devtools/projects/demo-standalone/src/app/demo-app/todo/about/BUILD.bazel index edd3996530b..c08df67fcae 100644 --- a/devtools/projects/demo-standalone/src/app/demo-app/todo/about/BUILD.bazel +++ b/devtools/projects/demo-standalone/src/app/demo-app/todo/about/BUILD.bazel @@ -1,4 +1,4 @@ -load("//devtools/tools:ng_project.bzl", "ng_project") +load("//devtools/tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/projects/demo-standalone/src/app/demo-app/todo/home/BUILD.bazel b/devtools/projects/demo-standalone/src/app/demo-app/todo/home/BUILD.bazel index d99130b0373..723f91faec3 100644 --- a/devtools/projects/demo-standalone/src/app/demo-app/todo/home/BUILD.bazel +++ b/devtools/projects/demo-standalone/src/app/demo-app/todo/home/BUILD.bazel @@ -1,4 +1,4 @@ -load("//devtools/tools:ng_project.bzl", "ng_project") +load("//devtools/tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/projects/demo-standalone/src/app/devtools-app/BUILD.bazel b/devtools/projects/demo-standalone/src/app/devtools-app/BUILD.bazel index 9c2dd22210e..9998fcad997 100644 --- a/devtools/projects/demo-standalone/src/app/devtools-app/BUILD.bazel +++ b/devtools/projects/demo-standalone/src/app/devtools-app/BUILD.bazel @@ -1,4 +1,4 @@ -load("//devtools/tools:ng_project.bzl", "ng_project") +load("//devtools/tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/projects/demo-standalone/src/environments/BUILD.bazel b/devtools/projects/demo-standalone/src/environments/BUILD.bazel index bd5a5307f1c..c94017d0ee0 100644 --- a/devtools/projects/demo-standalone/src/environments/BUILD.bazel +++ b/devtools/projects/demo-standalone/src/environments/BUILD.bazel @@ -1,4 +1,4 @@ -load("//devtools/tools:typescript.bzl", "ts_project") +load("//devtools/tools:defaults.bzl", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/projects/ng-devtools-backend/BUILD.bazel b/devtools/projects/ng-devtools-backend/BUILD.bazel index e74f2a529de..f42cdc9f104 100644 --- a/devtools/projects/ng-devtools-backend/BUILD.bazel +++ b/devtools/projects/ng-devtools-backend/BUILD.bazel @@ -1,4 +1,4 @@ -load("//devtools/tools:typescript.bzl", "ts_project") +load("//devtools/tools:defaults.bzl", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/projects/ng-devtools-backend/src/BUILD.bazel b/devtools/projects/ng-devtools-backend/src/BUILD.bazel index eb8e03cf8a9..62ad578bf8f 100644 --- a/devtools/projects/ng-devtools-backend/src/BUILD.bazel +++ b/devtools/projects/ng-devtools-backend/src/BUILD.bazel @@ -1,4 +1,4 @@ -load("//devtools/tools:typescript.bzl", "ts_project") +load("//devtools/tools:defaults.bzl", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/projects/ng-devtools-backend/src/lib/BUILD.bazel b/devtools/projects/ng-devtools-backend/src/lib/BUILD.bazel index 877bfded5fa..0b7d058ed44 100644 --- a/devtools/projects/ng-devtools-backend/src/lib/BUILD.bazel +++ b/devtools/projects/ng-devtools-backend/src/lib/BUILD.bazel @@ -1,5 +1,4 @@ -load("//devtools/tools:defaults.bzl", "ng_web_test_suite") -load("//devtools/tools:typescript.bzl", "ts_project", "ts_test_library") +load("//devtools/tools:defaults.bzl", "ng_web_test_suite", "ts_project", "ts_test_library") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/projects/ng-devtools-backend/src/lib/component-inspector/BUILD.bazel b/devtools/projects/ng-devtools-backend/src/lib/component-inspector/BUILD.bazel index 48785b3e90c..818a6add7f1 100644 --- a/devtools/projects/ng-devtools-backend/src/lib/component-inspector/BUILD.bazel +++ b/devtools/projects/ng-devtools-backend/src/lib/component-inspector/BUILD.bazel @@ -1,5 +1,4 @@ -load("//devtools/tools:defaults.bzl", "ng_web_test_suite") -load("//devtools/tools:typescript.bzl", "ts_project", "ts_test_library") +load("//devtools/tools:defaults.bzl", "ng_web_test_suite", "ts_project", "ts_test_library") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/projects/ng-devtools-backend/src/lib/component-tree/BUILD.bazel b/devtools/projects/ng-devtools-backend/src/lib/component-tree/BUILD.bazel index bc419470eca..af5113c2e41 100644 --- a/devtools/projects/ng-devtools-backend/src/lib/component-tree/BUILD.bazel +++ b/devtools/projects/ng-devtools-backend/src/lib/component-tree/BUILD.bazel @@ -1,5 +1,4 @@ -load("//devtools/tools:defaults.bzl", "ng_web_test_suite") -load("//devtools/tools:typescript.bzl", "ts_project", "ts_test_library") +load("//devtools/tools:defaults.bzl", "ng_web_test_suite", "ts_project", "ts_test_library") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/projects/ng-devtools-backend/src/lib/directive-forest/BUILD.bazel b/devtools/projects/ng-devtools-backend/src/lib/directive-forest/BUILD.bazel index a879e0ec355..091dd8fc249 100644 --- a/devtools/projects/ng-devtools-backend/src/lib/directive-forest/BUILD.bazel +++ b/devtools/projects/ng-devtools-backend/src/lib/directive-forest/BUILD.bazel @@ -1,5 +1,4 @@ -load("//devtools/tools:defaults.bzl", "ng_web_test_suite") -load("//devtools/tools:typescript.bzl", "ts_project", "ts_test_library") +load("//devtools/tools:defaults.bzl", "ng_web_test_suite", "ts_project", "ts_test_library") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/projects/ng-devtools-backend/src/lib/hooks/BUILD.bazel b/devtools/projects/ng-devtools-backend/src/lib/hooks/BUILD.bazel index 9667c8cf48b..2ad91db5350 100644 --- a/devtools/projects/ng-devtools-backend/src/lib/hooks/BUILD.bazel +++ b/devtools/projects/ng-devtools-backend/src/lib/hooks/BUILD.bazel @@ -1,4 +1,4 @@ -load("//devtools/tools:typescript.bzl", "ts_project") +load("//devtools/tools:defaults.bzl", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/projects/ng-devtools-backend/src/lib/hooks/profiler/BUILD.bazel b/devtools/projects/ng-devtools-backend/src/lib/hooks/profiler/BUILD.bazel index 3955d3ed884..deb06420bbf 100644 --- a/devtools/projects/ng-devtools-backend/src/lib/hooks/profiler/BUILD.bazel +++ b/devtools/projects/ng-devtools-backend/src/lib/hooks/profiler/BUILD.bazel @@ -1,4 +1,4 @@ -load("//devtools/tools:typescript.bzl", "ts_project") +load("//devtools/tools:defaults.bzl", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/projects/ng-devtools-backend/src/lib/ng-debug-api/BUILD.bazel b/devtools/projects/ng-devtools-backend/src/lib/ng-debug-api/BUILD.bazel index cbc1a25fad5..f53382c58c5 100644 --- a/devtools/projects/ng-devtools-backend/src/lib/ng-debug-api/BUILD.bazel +++ b/devtools/projects/ng-devtools-backend/src/lib/ng-debug-api/BUILD.bazel @@ -1,6 +1,4 @@ -load("//devtools/tools:defaults.bzl", "ng_web_test_suite") -load("//devtools/tools:ng_project.bzl", "ng_project") -load("//devtools/tools:typescript.bzl", "ts_test_library") +load("//devtools/tools:defaults.bzl", "ng_project", "ng_web_test_suite", "ts_test_library") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/projects/ng-devtools-backend/src/lib/state-serializer/BUILD.bazel b/devtools/projects/ng-devtools-backend/src/lib/state-serializer/BUILD.bazel index 54f0421471a..6254b8041c5 100644 --- a/devtools/projects/ng-devtools-backend/src/lib/state-serializer/BUILD.bazel +++ b/devtools/projects/ng-devtools-backend/src/lib/state-serializer/BUILD.bazel @@ -1,6 +1,4 @@ -load("//devtools/tools:defaults.bzl", "ng_web_test_suite") -load("//devtools/tools:ng_project.bzl", "ng_project") -load("//devtools/tools:typescript.bzl", "ts_test_library") +load("//devtools/tools:defaults.bzl", "ng_project", "ng_web_test_suite", "ts_test_library") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/projects/ng-devtools/BUILD.bazel b/devtools/projects/ng-devtools/BUILD.bazel index eadd2fd4ce0..4ab02dfe6dd 100644 --- a/devtools/projects/ng-devtools/BUILD.bazel +++ b/devtools/projects/ng-devtools/BUILD.bazel @@ -1,4 +1,4 @@ -load("//devtools/tools:ng_project.bzl", "ng_project") +load("//devtools/tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/projects/ng-devtools/src/BUILD.bazel b/devtools/projects/ng-devtools/src/BUILD.bazel index 310353861f4..f88cecefa97 100644 --- a/devtools/projects/ng-devtools/src/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/BUILD.bazel @@ -1,4 +1,4 @@ -load("//devtools/tools:ng_project.bzl", "ng_project") +load("//devtools/tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/projects/ng-devtools/src/lib/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/BUILD.bazel index 63529b76539..3f0106587c8 100644 --- a/devtools/projects/ng-devtools/src/lib/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/BUILD.bazel @@ -1,7 +1,4 @@ -load("//devtools/tools:defaults.bzl", "ng_web_test_suite") -load("//devtools/tools:ng_project.bzl", "ng_project") -load("//devtools/tools:typescript.bzl", "ts_test_library") -load("//tools:defaults2.bzl", "sass_binary") +load("//devtools/tools:defaults.bzl", "ng_project", "ng_web_test_suite", "sass_binary", "ts_test_library") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/projects/ng-devtools/src/lib/application-environment/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/application-environment/BUILD.bazel index 171641180fa..833eb66c47e 100644 --- a/devtools/projects/ng-devtools/src/lib/application-environment/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/application-environment/BUILD.bazel @@ -1,4 +1,4 @@ -load("//devtools/tools:typescript.bzl", "ts_project") +load("//devtools/tools:defaults.bzl", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/projects/ng-devtools/src/lib/application-operations/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/application-operations/BUILD.bazel index 539ba01d3f0..a770446dad3 100644 --- a/devtools/projects/ng-devtools/src/lib/application-operations/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/application-operations/BUILD.bazel @@ -1,4 +1,4 @@ -load("//devtools/tools:typescript.bzl", "ts_project") +load("//devtools/tools:defaults.bzl", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/projects/ng-devtools/src/lib/application-providers/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/application-providers/BUILD.bazel index 3a9a480bd01..0e3b97860d5 100644 --- a/devtools/projects/ng-devtools/src/lib/application-providers/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/application-providers/BUILD.bazel @@ -1,4 +1,4 @@ -load("//devtools/tools:ng_project.bzl", "ng_project") +load("//devtools/tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/projects/ng-devtools/src/lib/application-services/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/application-services/BUILD.bazel index 0c38b34a536..40807729b8f 100644 --- a/devtools/projects/ng-devtools/src/lib/application-services/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/application-services/BUILD.bazel @@ -1,6 +1,4 @@ -load("//devtools/tools:defaults.bzl", "ng_web_test_suite") -load("//devtools/tools:ng_project.bzl", "ng_project") -load("//devtools/tools:typescript.bzl", "ts_test_library") +load("//devtools/tools:defaults.bzl", "ng_project", "ng_web_test_suite", "ts_test_library") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/BUILD.bazel index 2ab30b70a56..4f5d80d3fdb 100644 --- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/BUILD.bazel @@ -1,7 +1,4 @@ -load("//devtools/tools:defaults.bzl", "ng_web_test_suite") -load("//devtools/tools:ng_project.bzl", "ng_project") -load("//devtools/tools:typescript.bzl", "ts_test_library") -load("//tools:defaults2.bzl", "sass_binary") +load("//devtools/tools:defaults.bzl", "ng_project", "ng_web_test_suite", "sass_binary", "ts_test_library") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/diffing/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/diffing/BUILD.bazel index 7f707fe96f5..923ac2fe247 100644 --- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/diffing/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/diffing/BUILD.bazel @@ -1,4 +1,4 @@ -load("//devtools/tools:typescript.bzl", "ts_project") +load("//devtools/tools:defaults.bzl", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/BUILD.bazel index 77fdb2f95ae..45bf79009f7 100644 --- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/BUILD.bazel @@ -1,7 +1,4 @@ -load("//devtools/tools:defaults.bzl", "ng_web_test_suite") -load("//devtools/tools:ng_project.bzl", "ng_project") -load("//devtools/tools:typescript.bzl", "ts_test_library") -load("//tools:defaults2.bzl", "sass_binary") +load("//devtools/tools:defaults.bzl", "ng_project", "ng_web_test_suite", "sass_binary", "ts_test_library") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/BUILD.bazel index 7e371dc74a6..7d79ff570e6 100644 --- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/BUILD.bazel @@ -1,7 +1,4 @@ -load("//devtools/tools:defaults.bzl", "ng_web_test_suite") -load("//devtools/tools:ng_project.bzl", "ng_project") -load("//devtools/tools:typescript.bzl", "ts_project", "ts_test_library") -load("//tools:defaults2.bzl", "sass_binary") +load("//devtools/tools:defaults.bzl", "ng_project", "ng_web_test_suite", "sass_binary", "ts_project", "ts_test_library") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/breadcrumbs/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/breadcrumbs/BUILD.bazel index 1888fbf242c..2d2e509483e 100644 --- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/breadcrumbs/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/breadcrumbs/BUILD.bazel @@ -1,5 +1,4 @@ -load("//devtools/tools:ng_project.bzl", "ng_project") -load("//tools:defaults2.bzl", "sass_binary") +load("//devtools/tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/component-data-source/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/component-data-source/BUILD.bazel index 2eb4f9badd6..ded193bc639 100644 --- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/component-data-source/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/component-data-source/BUILD.bazel @@ -1,5 +1,4 @@ -load("//devtools/tools:defaults.bzl", "ng_web_test_suite") -load("//devtools/tools:typescript.bzl", "ts_project", "ts_test_library") +load("//devtools/tools:defaults.bzl", "ng_web_test_suite", "ts_project", "ts_test_library") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/filter/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/filter/BUILD.bazel index ba73233d82e..5164b82ce8c 100644 --- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/filter/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/filter/BUILD.bazel @@ -1,7 +1,4 @@ -load("//devtools/tools:defaults.bzl", "ng_web_test_suite") -load("//devtools/tools:ng_project.bzl", "ng_project") -load("//devtools/tools:typescript.bzl", "ts_project", "ts_test_library") -load("//tools:defaults2.bzl", "sass_binary") +load("//devtools/tools:defaults.bzl", "ng_project", "ng_web_test_suite", "sass_binary", "ts_project", "ts_test_library") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/index-forest/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/index-forest/BUILD.bazel index 42d046888bf..d16106b20f5 100644 --- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/index-forest/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/index-forest/BUILD.bazel @@ -1,5 +1,4 @@ -load("//devtools/tools:defaults.bzl", "ng_web_test_suite") -load("//devtools/tools:typescript.bzl", "ts_project", "ts_test_library") +load("//devtools/tools:defaults.bzl", "ng_web_test_suite", "ts_project", "ts_test_library") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/tree-node/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/tree-node/BUILD.bazel index 6a79439f83a..7875541a48c 100644 --- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/tree-node/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/tree-node/BUILD.bazel @@ -1,7 +1,4 @@ -load("//devtools/tools:defaults.bzl", "ng_web_test_suite") -load("//devtools/tools:ng_project.bzl", "ng_project") -load("//devtools/tools:typescript.bzl", "ts_test_library") -load("//tools:defaults2.bzl", "sass_binary") +load("//devtools/tools:defaults.bzl", "ng_project", "ng_web_test_suite", "sass_binary", "ts_test_library") package(default_visibility = ["//devtools:__subpackages__"]) diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-resolver/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-resolver/BUILD.bazel index 1203007ecdb..7843204ac01 100644 --- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-resolver/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-resolver/BUILD.bazel @@ -1,6 +1,4 @@ -load("//devtools/tools:defaults.bzl", "ng_web_test_suite") -load("//devtools/tools:ng_project.bzl", "ng_project") -load("//devtools/tools:typescript.bzl", "ts_test_library") +load("//devtools/tools:defaults.bzl", "ng_project", "ng_web_test_suite", "ts_test_library") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/BUILD.bazel index 7a2bdd6e751..7c0c1f52c89 100644 --- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/BUILD.bazel @@ -1,5 +1,4 @@ -load("//devtools/tools:ng_project.bzl", "ng_project") -load("//tools:defaults2.bzl", "sass_binary") +load("//devtools/tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/defer-view/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/defer-view/BUILD.bazel index 32e8ef16979..bc0f9927957 100644 --- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/defer-view/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/defer-view/BUILD.bazel @@ -1,5 +1,4 @@ -load("//devtools/tools:ng_project.bzl", "ng_project") -load("//tools:defaults2.bzl", "sass_binary") +load("//devtools/tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/property-view/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/property-view/BUILD.bazel index 093fd6b820d..a69746bbd14 100644 --- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/property-view/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/property-view/BUILD.bazel @@ -1,5 +1,4 @@ -load("//devtools/tools:ng_project.bzl", "ng_project") -load("//tools:defaults2.bzl", "sass_binary") +load("//devtools/tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/property-view/resolution-path/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/property-view/resolution-path/BUILD.bazel index 22a685b0d88..50ced9673d7 100644 --- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/property-view/resolution-path/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/property-view/resolution-path/BUILD.bazel @@ -1,7 +1,4 @@ -load("//devtools/tools:defaults.bzl", "ng_web_test_suite") -load("//devtools/tools:ng_project.bzl", "ng_project") -load("//devtools/tools:typescript.bzl", "ts_test_library") -load("//tools:defaults2.bzl", "sass_binary") +load("//devtools/tools:defaults.bzl", "ng_project", "ng_web_test_suite", "sass_binary", "ts_test_library") package(default_visibility = ["//devtools:__subpackages__"]) diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/signals-view/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/signals-view/BUILD.bazel index cc24fa172be..78cc19da21b 100644 --- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/signals-view/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/signals-view/BUILD.bazel @@ -1,5 +1,4 @@ -load("//devtools/tools:ng_project.bzl", "ng_project") -load("//tools:defaults2.bzl", "sass_binary") +load("//devtools/tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/injector-tree/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/injector-tree/BUILD.bazel index b23ccb395be..22a7724043a 100644 --- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/injector-tree/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/injector-tree/BUILD.bazel @@ -1,7 +1,4 @@ -load("//devtools/tools:defaults.bzl", "ng_web_test_suite") -load("//devtools/tools:ng_project.bzl", "ng_project") -load("//devtools/tools:typescript.bzl", "ts_project", "ts_test_library") -load("//tools:defaults2.bzl", "sass_binary") +load("//devtools/tools:defaults.bzl", "ng_project", "ng_web_test_suite", "sass_binary", "ts_project", "ts_test_library") package(default_visibility = ["//:__subpackages__"]) diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/injector-tree/injector-providers/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/injector-tree/injector-providers/BUILD.bazel index 34e8812279f..606f0b5c4d9 100644 --- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/injector-tree/injector-providers/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/injector-tree/injector-providers/BUILD.bazel @@ -1,5 +1,4 @@ -load("//devtools/tools:ng_project.bzl", "ng_project") -load("//tools:defaults2.bzl", "sass_binary") +load("//devtools/tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/BUILD.bazel index dcbbe592b8b..7097bb6a885 100644 --- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/BUILD.bazel @@ -1,5 +1,4 @@ -load("//devtools/tools:ng_project.bzl", "ng_project") -load("//tools:defaults2.bzl", "sass_binary") +load("//devtools/tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//devtools:__subpackages__"]) diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/profiler-import-dialog/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/profiler-import-dialog/BUILD.bazel index 43752746acf..9e321f68a88 100644 --- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/profiler-import-dialog/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/profiler-import-dialog/BUILD.bazel @@ -1,5 +1,4 @@ -load("//devtools/tools:ng_project.bzl", "ng_project") -load("//tools:defaults2.bzl", "sass_binary") +load("//devtools/tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//devtools:__subpackages__"]) diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/BUILD.bazel index 13c4f86314d..2d4f27f3c89 100644 --- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/BUILD.bazel @@ -1,5 +1,4 @@ -load("//devtools/tools:ng_project.bzl", "ng_project") -load("//tools:defaults2.bzl", "sass_binary") +load("//devtools/tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//devtools:__subpackages__"]) diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/frame-selector/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/frame-selector/BUILD.bazel index 77179c138e5..3830328a1e0 100644 --- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/frame-selector/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/frame-selector/BUILD.bazel @@ -1,5 +1,4 @@ -load("//devtools/tools:ng_project.bzl", "ng_project") -load("//tools:defaults2.bzl", "sass_binary") +load("//devtools/tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//devtools:__subpackages__"]) diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/record-formatter/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/record-formatter/BUILD.bazel index 59917fc9d47..4c7b933c1c8 100644 --- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/record-formatter/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/record-formatter/BUILD.bazel @@ -1,5 +1,4 @@ -load("//devtools/tools:defaults.bzl", "ng_web_test_suite") -load("//devtools/tools:typescript.bzl", "ts_project", "ts_test_library") +load("//devtools/tools:defaults.bzl", "ng_web_test_suite", "ts_project", "ts_test_library") package(default_visibility = ["//devtools:__subpackages__"]) diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/record-formatter/bargraph-formatter/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/record-formatter/bargraph-formatter/BUILD.bazel index 718be16404f..4995943a51f 100644 --- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/record-formatter/bargraph-formatter/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/record-formatter/bargraph-formatter/BUILD.bazel @@ -1,4 +1,4 @@ -load("//devtools/tools:typescript.bzl", "ts_project") +load("//devtools/tools:defaults.bzl", "ts_project") package(default_visibility = ["//devtools:__subpackages__"]) diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/record-formatter/flamegraph-formatter/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/record-formatter/flamegraph-formatter/BUILD.bazel index d029b15c505..17a1085970e 100644 --- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/record-formatter/flamegraph-formatter/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/record-formatter/flamegraph-formatter/BUILD.bazel @@ -1,6 +1,4 @@ -load("//devtools/tools:defaults.bzl", "ng_web_test_suite") -load("//devtools/tools:ng_project.bzl", "ng_project") -load("//devtools/tools:typescript.bzl", "ts_test_library") +load("//devtools/tools:defaults.bzl", "ng_project", "ng_web_test_suite", "ts_test_library") package(default_visibility = ["//devtools:__subpackages__"]) diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/record-formatter/tree-map-formatter/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/record-formatter/tree-map-formatter/BUILD.bazel index 910b2dee5cb..7c5c4b7e9bd 100644 --- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/record-formatter/tree-map-formatter/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/record-formatter/tree-map-formatter/BUILD.bazel @@ -1,5 +1,4 @@ -load("//devtools/tools:defaults.bzl", "ng_web_test_suite") -load("//devtools/tools:typescript.bzl", "ts_project", "ts_test_library") +load("//devtools/tools:defaults.bzl", "ng_web_test_suite", "ts_project", "ts_test_library") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/recording-modal/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/recording-modal/BUILD.bazel index 510d1211c4d..8bb8da151ce 100644 --- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/recording-modal/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/recording-modal/BUILD.bazel @@ -1,5 +1,4 @@ -load("//devtools/tools:ng_project.bzl", "ng_project") -load("//tools:defaults2.bzl", "sass_binary") +load("//devtools/tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//devtools:__subpackages__"]) diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/recording-modal/recording-dialog/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/recording-modal/recording-dialog/BUILD.bazel index d88e3c2a12d..988e2a65ad6 100644 --- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/recording-modal/recording-dialog/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/recording-modal/recording-dialog/BUILD.bazel @@ -1,5 +1,4 @@ -load("//devtools/tools:ng_project.bzl", "ng_project") -load("//tools:defaults2.bzl", "sass_binary") +load("//devtools/tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//devtools:__subpackages__"]) diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/recording-timeline-controls/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/recording-timeline-controls/BUILD.bazel index c3452e8c787..e438e987da6 100644 --- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/recording-timeline-controls/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/recording-timeline-controls/BUILD.bazel @@ -1,5 +1,4 @@ -load("//devtools/tools:ng_project.bzl", "ng_project") -load("//tools:defaults2.bzl", "sass_binary") +load("//devtools/tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//devtools:__subpackages__"]) diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/recording-visualizer/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/recording-visualizer/BUILD.bazel index 7c53a981360..c25415f9387 100644 --- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/recording-visualizer/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/recording-visualizer/BUILD.bazel @@ -1,6 +1,4 @@ -load("//devtools/tools:ng_project.bzl", "ng_project") -load("//devtools/tools:typescript.bzl", "ts_project") -load("//tools:defaults2.bzl", "sass_binary") +load("//devtools/tools:defaults.bzl", "ng_project", "sass_binary", "ts_project") package(default_visibility = ["//devtools:__subpackages__"]) diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/recording-visualizer/bargraph-visualizer/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/recording-visualizer/bargraph-visualizer/BUILD.bazel index 9f785d5ae19..3dea0d45301 100644 --- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/recording-visualizer/bargraph-visualizer/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/recording-visualizer/bargraph-visualizer/BUILD.bazel @@ -1,5 +1,4 @@ -load("//devtools/tools:ng_project.bzl", "ng_project") -load("//tools:defaults2.bzl", "sass_binary") +load("//devtools/tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//devtools:__subpackages__"]) diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/recording-visualizer/bargraph-visualizer/bar-chart/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/recording-visualizer/bargraph-visualizer/bar-chart/BUILD.bazel index 3382cf25ec5..46a505c1c6a 100644 --- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/recording-visualizer/bargraph-visualizer/bar-chart/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/recording-visualizer/bargraph-visualizer/bar-chart/BUILD.bazel @@ -1,5 +1,4 @@ -load("//devtools/tools:ng_project.bzl", "ng_project") -load("//tools:defaults2.bzl", "sass_binary") +load("//devtools/tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//devtools:__subpackages__"]) diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/recording-visualizer/execution-details/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/recording-visualizer/execution-details/BUILD.bazel index 3d67bf45ddc..08500eb0971 100644 --- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/recording-visualizer/execution-details/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/recording-visualizer/execution-details/BUILD.bazel @@ -1,5 +1,4 @@ -load("//devtools/tools:ng_project.bzl", "ng_project") -load("//tools:defaults2.bzl", "sass_binary") +load("//devtools/tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//devtools:__subpackages__"]) diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/recording-visualizer/flamegraph-visualizer/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/recording-visualizer/flamegraph-visualizer/BUILD.bazel index a5f2f0df5f4..cd67734e30c 100644 --- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/recording-visualizer/flamegraph-visualizer/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/recording-visualizer/flamegraph-visualizer/BUILD.bazel @@ -1,5 +1,4 @@ -load("//devtools/tools:ng_project.bzl", "ng_project") -load("//tools:defaults2.bzl", "sass_binary") +load("//devtools/tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//devtools:__subpackages__"]) diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/recording-visualizer/profile-formatter/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/recording-visualizer/profile-formatter/BUILD.bazel index ac211b5f455..e64d0cc0a90 100644 --- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/recording-visualizer/profile-formatter/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/recording-visualizer/profile-formatter/BUILD.bazel @@ -1,4 +1,4 @@ -load("//devtools/tools:typescript.bzl", "ts_project") +load("//devtools/tools:defaults.bzl", "ts_project") package(default_visibility = ["//devtools:__subpackages__"]) diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/recording-visualizer/tree-map-visualizer/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/recording-visualizer/tree-map-visualizer/BUILD.bazel index 5daaf7adf5b..994692858f5 100644 --- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/recording-visualizer/tree-map-visualizer/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/recording-visualizer/tree-map-visualizer/BUILD.bazel @@ -1,5 +1,4 @@ -load("//devtools/tools:ng_project.bzl", "ng_project") -load("//tools:defaults2.bzl", "sass_binary") +load("//devtools/tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//devtools:__subpackages__"]) diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/shared/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/shared/BUILD.bazel index 34c88e39a5a..52a676085d3 100644 --- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/shared/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/shared/BUILD.bazel @@ -1,5 +1,4 @@ -load("//devtools/tools:defaults.bzl", "ng_web_test_suite") -load("//devtools/tools:typescript.bzl", "ts_project", "ts_test_library") +load("//devtools/tools:defaults.bzl", "ng_web_test_suite", "ts_project", "ts_test_library") package(default_visibility = ["//devtools:__subpackages__"]) diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/visualizer-controls/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/visualizer-controls/BUILD.bazel index db9d5d4ade2..cbd5e48ec6d 100644 --- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/visualizer-controls/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/visualizer-controls/BUILD.bazel @@ -1,5 +1,4 @@ -load("//devtools/tools:ng_project.bzl", "ng_project") -load("//tools:defaults2.bzl", "sass_binary") +load("//devtools/tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//devtools:__subpackages__"]) diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/router-tree/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/router-tree/BUILD.bazel index 9643eeed055..6052e594f6a 100644 --- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/router-tree/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/router-tree/BUILD.bazel @@ -1,7 +1,4 @@ -load("//devtools/tools:defaults.bzl", "ng_web_test_suite") -load("//devtools/tools:ng_project.bzl", "ng_project") -load("//devtools/tools:typescript.bzl", "ts_test_library") -load("//tools:defaults2.bzl", "sass_binary") +load("//devtools/tools:defaults.bzl", "ng_project", "ng_web_test_suite", "sass_binary", "ts_test_library") package(default_visibility = ["//:__subpackages__"]) diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/tab-update/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/tab-update/BUILD.bazel index 47432903538..086985732f7 100644 --- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/tab-update/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/tab-update/BUILD.bazel @@ -1,4 +1,4 @@ -load("//devtools/tools:typescript.bzl", "ts_project") +load("//devtools/tools:defaults.bzl", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/projects/ng-devtools/src/lib/shared/button/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/shared/button/BUILD.bazel index f9255b79d75..7bf7479ed42 100644 --- a/devtools/projects/ng-devtools/src/lib/shared/button/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/shared/button/BUILD.bazel @@ -1,7 +1,4 @@ -load("//devtools/tools:defaults.bzl", "ng_web_test_suite") -load("//devtools/tools:ng_project.bzl", "ng_project") -load("//devtools/tools:typescript.bzl", "ts_test_library") -load("//tools:defaults2.bzl", "sass_binary") +load("//devtools/tools:defaults.bzl", "ng_project", "ng_web_test_suite", "sass_binary", "ts_test_library") package(default_visibility = ["//devtools:__subpackages__"]) diff --git a/devtools/projects/ng-devtools/src/lib/shared/responsive-split/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/shared/responsive-split/BUILD.bazel index 10769785617..f6a15f54ce7 100644 --- a/devtools/projects/ng-devtools/src/lib/shared/responsive-split/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/shared/responsive-split/BUILD.bazel @@ -1,6 +1,4 @@ -load("//devtools/tools:defaults.bzl", "ng_web_test_suite") -load("//devtools/tools:ng_project.bzl", "ng_project") -load("//devtools/tools:typescript.bzl", "ts_test_library") +load("//devtools/tools:defaults.bzl", "ng_project", "ng_web_test_suite", "ts_test_library") package(default_visibility = ["//devtools:__subpackages__"]) diff --git a/devtools/projects/ng-devtools/src/lib/shared/tree-visualizer-host/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/shared/tree-visualizer-host/BUILD.bazel index d69be5652a8..986179a7e0d 100644 --- a/devtools/projects/ng-devtools/src/lib/shared/tree-visualizer-host/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/shared/tree-visualizer-host/BUILD.bazel @@ -1,5 +1,4 @@ -load("//devtools/tools:ng_project.bzl", "ng_project") -load("//tools:defaults2.bzl", "sass_binary") +load("//devtools/tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//:__subpackages__"]) diff --git a/devtools/projects/ng-devtools/src/lib/shared/utils/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/shared/utils/BUILD.bazel index 5a8a6f653c4..19001cb0337 100644 --- a/devtools/projects/ng-devtools/src/lib/shared/utils/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/shared/utils/BUILD.bazel @@ -1,5 +1,4 @@ -load("//devtools/tools:defaults.bzl", "ng_web_test_suite") -load("//devtools/tools:typescript.bzl", "ts_project", "ts_test_library") +load("//devtools/tools:defaults.bzl", "ng_web_test_suite", "ts_project", "ts_test_library") package(default_visibility = ["//devtools:__subpackages__"]) diff --git a/devtools/projects/ng-devtools/src/lib/vendor/angular-split/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/vendor/angular-split/BUILD.bazel index c92c25a2471..9fc3c487c7a 100644 --- a/devtools/projects/ng-devtools/src/lib/vendor/angular-split/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/vendor/angular-split/BUILD.bazel @@ -1,4 +1,4 @@ -load("//devtools/tools:ng_project.bzl", "ng_project") +load("//devtools/tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/projects/ng-devtools/src/lib/vendor/angular-split/lib/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/vendor/angular-split/lib/BUILD.bazel index 873765c50de..9396a37cd6b 100644 --- a/devtools/projects/ng-devtools/src/lib/vendor/angular-split/lib/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/vendor/angular-split/lib/BUILD.bazel @@ -1,4 +1,4 @@ -load("//devtools/tools:ng_project.bzl", "ng_project") +load("//devtools/tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/projects/ng-devtools/src/lib/vendor/angular-split/lib/component/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/vendor/angular-split/lib/component/BUILD.bazel index a103226fde0..fa49e0afb9f 100644 --- a/devtools/projects/ng-devtools/src/lib/vendor/angular-split/lib/component/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/lib/vendor/angular-split/lib/component/BUILD.bazel @@ -1,5 +1,4 @@ -load("//devtools/tools:ng_project.bzl", "ng_project") -load("//tools:defaults2.bzl", "sass_binary") +load("//devtools/tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//:__subpackages__"]) diff --git a/devtools/projects/ng-devtools/src/styles/BUILD.bazel b/devtools/projects/ng-devtools/src/styles/BUILD.bazel index 5216d31431a..ac395e97cc1 100644 --- a/devtools/projects/ng-devtools/src/styles/BUILD.bazel +++ b/devtools/projects/ng-devtools/src/styles/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "npm_sass_library", "sass_binary", "sass_library") +load("//devtools/tools:defaults.bzl", "npm_sass_library", "sass_binary", "sass_library") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/projects/protocol/BUILD.bazel b/devtools/projects/protocol/BUILD.bazel index dd8a7daebbb..f4c361ec304 100644 --- a/devtools/projects/protocol/BUILD.bazel +++ b/devtools/projects/protocol/BUILD.bazel @@ -1,5 +1,4 @@ -load("//devtools/tools:defaults.bzl", "ng_web_test_suite") -load("//devtools/tools:typescript.bzl", "ts_project", "ts_test_library") +load("//devtools/tools:defaults.bzl", "ng_web_test_suite", "ts_project", "ts_test_library") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/projects/shared-utils/BUILD.bazel b/devtools/projects/shared-utils/BUILD.bazel index bd64826ce4c..742a1212d3a 100644 --- a/devtools/projects/shared-utils/BUILD.bazel +++ b/devtools/projects/shared-utils/BUILD.bazel @@ -1,5 +1,4 @@ -load("//devtools/tools:defaults.bzl", "ng_web_test_suite") -load("//devtools/tools:typescript.bzl", "ts_project", "ts_test_library") +load("//devtools/tools:defaults.bzl", "ng_web_test_suite", "ts_project", "ts_test_library") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/projects/shell-browser/src/BUILD.bazel b/devtools/projects/shell-browser/src/BUILD.bazel index 8cec9c197d3..774635d5038 100644 --- a/devtools/projects/shell-browser/src/BUILD.bazel +++ b/devtools/projects/shell-browser/src/BUILD.bazel @@ -1,10 +1,4 @@ -load("@aspect_bazel_lib//lib:copy_to_directory.bzl", "copy_to_directory") -load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild") -load("@bazel_skylib//rules:common_settings.bzl", "string_flag") -load("@build_bazel_rules_nodejs//:index.bzl", "pkg_web") -load("//devtools/tools:ng_project.bzl", "ng_project") -load("//devtools/tools:typescript.bzl", "ts_project") -load("//tools:defaults2.bzl", "sass_binary") +load("//devtools/tools:defaults.bzl", "copy_to_directory", "esbuild", "ng_project", "pkg_web", "sass_binary", "string_flag", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/projects/shell-browser/src/app/BUILD.bazel b/devtools/projects/shell-browser/src/app/BUILD.bazel index e13dc51a4a3..929523d60cc 100644 --- a/devtools/projects/shell-browser/src/app/BUILD.bazel +++ b/devtools/projects/shell-browser/src/app/BUILD.bazel @@ -1,8 +1,4 @@ -load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild") -load("//devtools/tools:defaults.bzl", "ng_web_test_suite") -load("//devtools/tools:ng_project.bzl", "ng_project") -load("//devtools/tools:typescript.bzl", "ts_project", "ts_test_library") -load("//tools:defaults2.bzl", "sass_binary") +load("//devtools/tools:defaults.bzl", "esbuild", "ng_project", "ng_web_test_suite", "sass_binary", "ts_project", "ts_test_library") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/projects/shell-browser/src/environments/BUILD.bazel b/devtools/projects/shell-browser/src/environments/BUILD.bazel index 034f7142f30..69438bccf52 100644 --- a/devtools/projects/shell-browser/src/environments/BUILD.bazel +++ b/devtools/projects/shell-browser/src/environments/BUILD.bazel @@ -1,4 +1,4 @@ -load("//devtools/tools:typescript.bzl", "ts_project") +load("//devtools/tools:defaults.bzl", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/src/BUILD.bazel b/devtools/src/BUILD.bazel index 074a3725b7b..faedcf5f076 100644 --- a/devtools/src/BUILD.bazel +++ b/devtools/src/BUILD.bazel @@ -1,9 +1,4 @@ -load("@aspect_bazel_lib//lib:copy_to_directory.bzl", "copy_to_directory") -load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild") -load("@build_bazel_rules_nodejs//:index.bzl", "pkg_web") -load("//devtools/tools:ng_project.bzl", "ng_project") -load("//tools:defaults.bzl", "http_server") -load("//tools:defaults2.bzl", "sass_binary") +load("//devtools/tools:defaults.bzl", "copy_to_directory", "esbuild", "http_server", "ng_project", "pkg_web", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/src/app/BUILD.bazel b/devtools/src/app/BUILD.bazel index 59c741f76f8..5245a440198 100644 --- a/devtools/src/app/BUILD.bazel +++ b/devtools/src/app/BUILD.bazel @@ -1,5 +1,4 @@ -load("//devtools/tools:ng_project.bzl", "ng_project") -load("//tools:defaults2.bzl", "sass_binary") +load("//devtools/tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/src/app/demo-app/BUILD.bazel b/devtools/src/app/demo-app/BUILD.bazel index b22ac33977f..61aed815a05 100644 --- a/devtools/src/app/demo-app/BUILD.bazel +++ b/devtools/src/app/demo-app/BUILD.bazel @@ -1,5 +1,4 @@ -load("//devtools/tools:ng_project.bzl", "ng_project") -load("//tools:defaults2.bzl", "npm_sass_library", "sass_binary") +load("//devtools/tools:defaults.bzl", "ng_project", "npm_sass_library", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/src/app/demo-app/todo/BUILD.bazel b/devtools/src/app/demo-app/todo/BUILD.bazel index 45944335ddc..b3d889c20be 100644 --- a/devtools/src/app/demo-app/todo/BUILD.bazel +++ b/devtools/src/app/demo-app/todo/BUILD.bazel @@ -1,5 +1,4 @@ -load("//devtools/tools:ng_project.bzl", "ng_project") -load("//tools:defaults2.bzl", "sass_binary") +load("//devtools/tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/src/app/demo-app/todo/about/BUILD.bazel b/devtools/src/app/demo-app/todo/about/BUILD.bazel index 73ae1921264..fe497a7ef8e 100644 --- a/devtools/src/app/demo-app/todo/about/BUILD.bazel +++ b/devtools/src/app/demo-app/todo/about/BUILD.bazel @@ -1,4 +1,4 @@ -load("//devtools/tools:ng_project.bzl", "ng_project") +load("//devtools/tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/src/app/demo-app/todo/home/BUILD.bazel b/devtools/src/app/demo-app/todo/home/BUILD.bazel index dd8ddb7795c..53278606786 100644 --- a/devtools/src/app/demo-app/todo/home/BUILD.bazel +++ b/devtools/src/app/demo-app/todo/home/BUILD.bazel @@ -1,5 +1,4 @@ -load("//devtools/tools:ng_project.bzl", "ng_project") -load("//tools:defaults2.bzl", "sass_binary") +load("//devtools/tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/src/app/demo-app/todo/routes/BUILD.bazel b/devtools/src/app/demo-app/todo/routes/BUILD.bazel index 1c2903a6266..12035f96287 100644 --- a/devtools/src/app/demo-app/todo/routes/BUILD.bazel +++ b/devtools/src/app/demo-app/todo/routes/BUILD.bazel @@ -1,4 +1,4 @@ -load("//devtools/tools:ng_project.bzl", "ng_project") +load("//devtools/tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/src/app/devtools-app/BUILD.bazel b/devtools/src/app/devtools-app/BUILD.bazel index 84e94c42223..e1b8d0471b6 100644 --- a/devtools/src/app/devtools-app/BUILD.bazel +++ b/devtools/src/app/devtools-app/BUILD.bazel @@ -1,5 +1,4 @@ -load("//devtools/tools:ng_project.bzl", "ng_project") -load("//tools:defaults2.bzl", "sass_binary") +load("//devtools/tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/src/environments/BUILD.bazel b/devtools/src/environments/BUILD.bazel index bd5a5307f1c..c94017d0ee0 100644 --- a/devtools/src/environments/BUILD.bazel +++ b/devtools/src/environments/BUILD.bazel @@ -1,4 +1,4 @@ -load("//devtools/tools:typescript.bzl", "ts_project") +load("//devtools/tools:defaults.bzl", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/tools/angular-optimization/BUILD.bazel b/devtools/tools/angular-optimization/BUILD.bazel index 11881ef87fa..242d2153eea 100644 --- a/devtools/tools/angular-optimization/BUILD.bazel +++ b/devtools/tools/angular-optimization/BUILD.bazel @@ -1,5 +1,4 @@ -load("@aspect_bazel_lib//lib:copy_to_bin.bzl", "copy_to_bin") -load("@aspect_rules_js//js:defs.bzl", "js_library") +load("//devtools/tools:defaults.bzl", "copy_to_bin", "js_library") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/tools/defaults.bzl b/devtools/tools/defaults.bzl index 8b963518e4b..9f110e01f23 100644 --- a/devtools/tools/defaults.bzl +++ b/devtools/tools/defaults.bzl @@ -1,6 +1,34 @@ # Re-export of Bazel rules with devtools-wide defaults -load("//tools:defaults2.bzl", _ng_web_test_suite = "ng_web_test_suite") +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_library = "js_library") +load("@aspect_rules_ts//ts:defs.bzl", _ts_config = "ts_config") +load("@bazel_skylib//rules:common_settings.bzl", _string_flag = "string_flag") +load("@build_bazel_rules_nodejs//:index.bzl", _pkg_web = "pkg_web") +load( + "//tools:defaults2.bzl", + _http_server = "http_server", + _ng_project = "ng_project", + _ng_web_test_suite = "ng_web_test_suite", + _npm_sass_library = "npm_sass_library", + _sass_binary = "sass_binary", + _sass_library = "sass_library", + _ts_project = "ts_project", +) + +sass_binary = _sass_binary +sass_library = _sass_library +npm_sass_library = _npm_sass_library +http_server = _http_server +js_library = _js_library +esbuild = _esbuild +copy_to_bin = _copy_to_bin +copy_to_directory = _copy_to_directory +string_flag = _string_flag +pkg_web = _pkg_web +ts_config = _ts_config def ng_web_test_suite(deps = [], **kwargs): # Provide required modules for the imports in //tools/testing/browser_tests.init.mts @@ -16,3 +44,38 @@ def ng_web_test_suite(deps = [], **kwargs): tsconfig = "//devtools:tsconfig_test", **kwargs ) + +def ng_project(name, srcs = [], angular_assets = [], **kwargs): + deps = kwargs.pop("deps", []) + [ + "//:node_modules/tslib", + ] + + _ng_project( + name = name, + enable_runtime_rnjs_interop = False, + tsconfig = "//devtools:tsconfig_build", + srcs = srcs, + assets = angular_assets, + deps = deps, + **kwargs + ) + +def ts_project(name, **kwargs): + _ts_project( + name = name, + enable_runtime_rnjs_interop = False, + tsconfig = "//devtools:tsconfig_build", + **kwargs + ) + +def ts_test_library(name, deps = [], **kwargs): + _ts_project( + name = name, + tsconfig = "//devtools:tsconfig_test", + enable_runtime_rnjs_interop = False, + testonly = 1, + deps = deps + [ + "//:node_modules/@types/jasmine", + ], + **kwargs + ) diff --git a/devtools/tools/esbuild/BUILD.bazel b/devtools/tools/esbuild/BUILD.bazel index 997d3af9128..9f3c058865d 100644 --- a/devtools/tools/esbuild/BUILD.bazel +++ b/devtools/tools/esbuild/BUILD.bazel @@ -1,4 +1,4 @@ -load("//devtools/tools:typescript.bzl", "ts_project") +load("//devtools/tools:defaults.bzl", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/devtools/tools/ng_project.bzl b/devtools/tools/ng_project.bzl deleted file mode 100644 index 7791d364862..00000000000 --- a/devtools/tools/ng_project.bzl +++ /dev/null @@ -1,16 +0,0 @@ -load("//tools:defaults2.bzl", _ng_project = "ng_project") - -def ng_project(name, srcs = [], angular_assets = [], **kwargs): - deps = kwargs.pop("deps", []) + [ - "//:node_modules/tslib", - ] - - _ng_project( - name = name, - enable_runtime_rnjs_interop = False, - tsconfig = "//devtools:tsconfig_build", - srcs = srcs, - assets = angular_assets, - deps = deps, - **kwargs - ) diff --git a/devtools/tools/typescript.bzl b/devtools/tools/typescript.bzl deleted file mode 100644 index f525069352e..00000000000 --- a/devtools/tools/typescript.bzl +++ /dev/null @@ -1,23 +0,0 @@ -"""Helper macros for compiling typescript with consistent config""" - -load("//tools:defaults2.bzl", _ts_project = "ts_project") - -def ts_project(name, **kwargs): - _ts_project( - name = name, - enable_runtime_rnjs_interop = False, - tsconfig = "//devtools:tsconfig_build", - **kwargs - ) - -def ts_test_library(name, deps = [], **kwargs): - _ts_project( - name = name, - tsconfig = "//devtools:tsconfig_test", - enable_runtime_rnjs_interop = False, - testonly = 1, - deps = deps + [ - "//:node_modules/@types/jasmine", - ], - **kwargs - ) diff --git a/tools/defaults2.bzl b/tools/defaults2.bzl index d03f35db6a4..d0e69a0ce92 100644 --- a/tools/defaults2.bzl +++ b/tools/defaults2.bzl @@ -1,5 +1,6 @@ load("@aspect_rules_js//npm:defs.bzl", _npm_package = "npm_package") load("@aspect_rules_ts//ts:defs.bzl", _ts_config = "ts_config") +load("@devinfra//bazel/http-server:index.bzl", _http_server = "http_server") load("@rules_angular//src/ng_project:index.bzl", _ng_project = "ng_project") load("@rules_sass//src:index.bzl", _npm_sass_library = "npm_sass_library", _sass_binary = "sass_binary", _sass_library = "sass_library") load("//tools/bazel:esbuild.bzl", _esbuild_checked_in = "esbuild_checked_in") @@ -23,6 +24,7 @@ sass_library = _sass_library npm_sass_library = _npm_sass_library protractor_web_test_suite = _protractor_web_test_suite esbuild_checked_in = _esbuild_checked_in +http_server = _http_server def _determine_tsconfig(testonly): if native.package_name().startswith("packages/compiler-cli"):