build: merge the default.bzl and default2.bzl files

integration/module-tests/BUILD.bazel

@@ -1,4 +1,4 @@
-load("//tools:defaults2.bzl", "ts_project")
+load("//tools:defaults.bzl", "ts_project")
 load("//integration/module-tests:index.bzl", "module_test")
 
 ts_project(

src/BUILD.bazel

@@ -3,7 +3,7 @@ load("@aspect_bazel_lib//lib:copy_to_bin.bzl", "copy_to_bin")
 load("//src/cdk:config.bzl", "CDK_ENTRYPOINTS")
 load("//src/material:config.bzl", "MATERIAL_ENTRYPOINTS", "MATERIAL_TESTING_ENTRYPOINTS")
 load("//tools/dgeni:index.bzl", "dgeni_api_docs")
-load("//tools:defaults2.bzl", "ts_project")
+load("//tools:defaults.bzl", "ts_project")
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 
 package(default_visibility = ["//visibility:public"])

src/cdk-experimental/BUILD.bazel

@@ -1,6 +1,5 @@
 load("//src/cdk-experimental:config.bzl", "CDK_EXPERIMENTAL_TARGETS")
-load("//tools:defaults.bzl", "ng_package")
-load("//tools:defaults2.bzl", "ts_project")
+load("//tools:defaults.bzl", "ng_package", "ts_project")
 load("@npm//:defs.bzl", "npm_link_all_packages")
 
 package(default_visibility = ["//visibility:public"])

src/cdk-experimental/column-resize/BUILD.bazel

@@ -1,4 +1,4 @@
-load("//tools:defaults2.bzl", "ng_project")
+load("//tools:defaults.bzl", "ng_project")
 
 package(default_visibility = ["//visibility:public"])
 

src/cdk-experimental/combobox/BUILD.bazel

@@ -1,5 +1,4 @@
-load("//tools:defaults.bzl", "ng_web_test_suite")
-load("//tools:defaults2.bzl", "ng_project", "ts_project")
+load("//tools:defaults.bzl", "ng_project", "ng_web_test_suite", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
 

src/cdk-experimental/deferred-content/BUILD.bazel

@@ -1,5 +1,4 @@
-load("//tools:defaults.bzl", "ng_web_test_suite")
-load("//tools:defaults2.bzl", "ng_project", "ts_project")
+load("//tools:defaults.bzl", "ng_project", "ng_web_test_suite", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
 

src/cdk-experimental/listbox/BUILD.bazel

@@ -1,4 +1,4 @@
-load("//tools:defaults2.bzl", "ng_project")
+load("//tools:defaults.bzl", "ng_project")
 
 package(default_visibility = ["//visibility:public"])
 

src/cdk-experimental/popover-edit/BUILD.bazel

@@ -1,5 +1,4 @@
-load("//tools:defaults.bzl", "ng_web_test_suite")
-load("//tools:defaults2.bzl", "ng_project", "ts_project")
+load("//tools:defaults.bzl", "ng_project", "ng_web_test_suite", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
 

src/cdk-experimental/scrolling/BUILD.bazel

@@ -1,6 +1,5 @@
 load("//src/e2e-app:test_suite.bzl", "e2e_test_suite")
-load("//tools:defaults.bzl", "ng_web_test_suite")
-load("//tools:defaults2.bzl", "ng_project", "ts_project")
+load("//tools:defaults.bzl", "ng_project", "ng_web_test_suite", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
 

src/cdk-experimental/selection/BUILD.bazel

@@ -1,5 +1,4 @@
-load("//tools:defaults.bzl", "ng_web_test_suite")
-load("//tools:defaults2.bzl", "ng_project", "ts_project")
+load("//tools:defaults.bzl", "ng_project", "ng_web_test_suite", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
 

src/cdk-experimental/table-scroll-container/BUILD.bazel

@@ -1,8 +1,9 @@
 load(
     "//tools:defaults.bzl",
+    "ng_project",
     "ng_web_test_suite",
+    "ts_project",
 )
-load("//tools:defaults2.bzl", "ng_project", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
 

src/cdk-experimental/tabs/BUILD.bazel

@@ -1,4 +1,4 @@
-load("//tools:defaults2.bzl", "ng_project")
+load("//tools:defaults.bzl", "ng_project")
 
 package(default_visibility = ["//visibility:public"])
 

src/cdk-experimental/ui-patterns/BUILD.bazel

@@ -1,4 +1,4 @@
-load("//tools:defaults2.bzl", "ts_project")
+load("//tools:defaults.bzl", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
 

src/cdk-experimental/ui-patterns/behaviors/event-manager/BUILD.bazel

@@ -1,4 +1,4 @@
-load("//tools:defaults2.bzl", "ts_project")
+load("//tools:defaults.bzl", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
 

src/cdk-experimental/ui-patterns/behaviors/list-focus/BUILD.bazel

@@ -1,5 +1,4 @@
-load("//tools:defaults.bzl", "ng_web_test_suite")
-load("//tools:defaults2.bzl", "ts_project")
+load("//tools:defaults.bzl", "ng_web_test_suite", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
 

src/cdk-experimental/ui-patterns/behaviors/list-navigation/BUILD.bazel

@@ -1,5 +1,4 @@
-load("//tools:defaults.bzl", "ng_web_test_suite")
-load("//tools:defaults2.bzl", "ts_project")
+load("//tools:defaults.bzl", "ng_web_test_suite", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
 

src/cdk-experimental/ui-patterns/behaviors/list-selection/BUILD.bazel

@@ -1,5 +1,4 @@
-load("//tools:defaults.bzl", "ng_web_test_suite")
-load("//tools:defaults2.bzl", "ts_project")
+load("//tools:defaults.bzl", "ng_web_test_suite", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
 

src/cdk-experimental/ui-patterns/behaviors/list-typeahead/BUILD.bazel

@@ -1,5 +1,4 @@
-load("//tools:defaults.bzl", "ng_web_test_suite")
-load("//tools:defaults2.bzl", "ts_project")
+load("//tools:defaults.bzl", "ng_web_test_suite", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
 

src/cdk-experimental/ui-patterns/behaviors/signal-like/BUILD.bazel

@@ -1,4 +1,4 @@
-load("//tools:defaults2.bzl", "ts_project")
+load("//tools:defaults.bzl", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
 

src/cdk-experimental/ui-patterns/listbox/BUILD.bazel

@@ -1,5 +1,4 @@
-load("//tools:defaults.bzl", "ng_web_test_suite")
-load("//tools:defaults2.bzl", "ts_project")
+load("//tools:defaults.bzl", "ng_web_test_suite", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
 

src/cdk-experimental/ui-patterns/tabs/BUILD.bazel

@@ -1,4 +1,4 @@
-load("//tools:defaults2.bzl", "ts_project")
+load("//tools:defaults.bzl", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
 

src/cdk/BUILD.bazel

@@ -1,6 +1,5 @@
 load("//src/cdk:config.bzl", "CDK_ENTRYPOINTS", "CDK_ENTRYPOINTS_WITH_STYLES", "CDK_SCSS_LIBS", "CDK_TARGETS")
-load("//tools:defaults.bzl", "ng_package", "sass_library")
-load("//tools:defaults2.bzl", "ts_project")
+load("//tools:defaults.bzl", "ng_package", "sass_library", "ts_project")
 load("@npm//:defs.bzl", "npm_link_all_packages")
 
 package(default_visibility = ["//visibility:public"])

src/cdk/a11y/BUILD.bazel

@@ -1,11 +1,12 @@
 load(
     "//tools:defaults.bzl",
     "markdown_to_html",
+    "ng_project",
     "ng_web_test_suite",
     "sass_binary",
     "sass_library",
+    "ts_project",
 )
-load("//tools:defaults2.bzl", "ng_project", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
 

src/cdk/accordion/BUILD.bazel

@@ -1,9 +1,10 @@
 load(
     "//tools:defaults.bzl",
     "markdown_to_html",
+    "ng_project",
     "ng_web_test_suite",
+    "ts_project",
 )
-load("//tools:defaults2.bzl", "ng_project", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
 

src/cdk/bidi/BUILD.bazel

@@ -1,9 +1,10 @@
 load(
     "//tools:defaults.bzl",
     "markdown_to_html",
+    "ng_project",
     "ng_web_test_suite",
+    "ts_project",
 )
-load("//tools:defaults2.bzl", "ng_project", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
 

src/cdk/clipboard/BUILD.bazel

@@ -1,5 +1,4 @@
-load("//tools:defaults.bzl", "markdown_to_html", "ng_web_test_suite")
-load("//tools:defaults2.bzl", "ng_project", "ts_project")
+load("//tools:defaults.bzl", "markdown_to_html", "ng_project", "ng_web_test_suite", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
 

src/cdk/coercion/BUILD.bazel

@@ -1,5 +1,4 @@
-load("//tools:defaults.bzl", "markdown_to_html")
-load("//tools:defaults2.bzl", "ng_web_test_suite", "ts_project")
+load("//tools:defaults.bzl", "markdown_to_html", "ng_web_test_suite", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
 

src/cdk/coercion/private/BUILD.bazel

@@ -1,8 +1,9 @@
 load(
     "//tools:defaults.bzl",
+    "ng_project",
     "ng_web_test_suite",
+    "ts_project",
 )
-load("//tools:defaults2.bzl", "ng_project", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
 

src/cdk/collections/BUILD.bazel

@@ -1,10 +1,10 @@
 load(
     "//tools:defaults.bzl",
     "markdown_to_html",
+    "ng_project",
     "ng_web_test_suite",
+    "ts_project",
 )
-load("//tools:defaults2.bzl", "ts_project")
-load("//tools:defaults2.bzl", "ng_project")
 
 package(default_visibility = ["//visibility:public"])
 

src/cdk/dialog/BUILD.bazel

@@ -1,10 +1,11 @@
 load(
     "//tools:defaults.bzl",
     "markdown_to_html",
+    "ng_project",
     "ng_web_test_suite",
     "sass_binary",
+    "ts_project",
 )
-load("//tools:defaults2.bzl", "ng_project", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
 

src/cdk/drag-drop/BUILD.bazel

@@ -1,10 +1,11 @@
 load(
     "//tools:defaults.bzl",
     "markdown_to_html",
+    "ng_project",
     "ng_web_test_suite",
     "sass_binary",
+    "ts_project",
 )
-load("//tools:defaults2.bzl", "ng_project", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
 

src/cdk/keycodes/BUILD.bazel

@@ -1,5 +1,4 @@
-load("//tools:defaults.bzl", "markdown_to_html")
-load("//tools:defaults2.bzl", "ng_project", "ng_web_test_suite", "ts_project")
+load("//tools:defaults.bzl", "markdown_to_html", "ng_project", "ng_web_test_suite", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
 

src/cdk/layout/BUILD.bazel

@@ -1,9 +1,10 @@
 load(
     "//tools:defaults.bzl",
     "markdown_to_html",
+    "ng_project",
     "ng_web_test_suite",
+    "ts_project",
 )
-load("//tools:defaults2.bzl", "ng_project", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
 

src/cdk/listbox/BUILD.bazel

@@ -1,5 +1,4 @@
-load("//tools:defaults.bzl", "markdown_to_html", "ng_web_test_suite")
-load("//tools:defaults2.bzl", "ng_project", "ts_project")
+load("//tools:defaults.bzl", "markdown_to_html", "ng_project", "ng_web_test_suite", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
 

src/cdk/menu/BUILD.bazel

@@ -1,9 +1,10 @@
 load(
     "//tools:defaults.bzl",
     "markdown_to_html",
+    "ng_project",
     "ng_web_test_suite",
+    "ts_project",
 )
-load("//tools:defaults2.bzl", "ng_project", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
 

src/cdk/observers/BUILD.bazel

@@ -1,9 +1,10 @@
 load(
     "//tools:defaults.bzl",
     "markdown_to_html",
+    "ng_project",
     "ng_web_test_suite",
+    "ts_project",
 )
-load("//tools:defaults2.bzl", "ng_project", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
 

src/cdk/observers/private/BUILD.bazel

@@ -1,8 +1,9 @@
 load(
     "//tools:defaults.bzl",
+    "ng_project",
     "ng_web_test_suite",
+    "ts_project",
 )
-load("//tools:defaults2.bzl", "ng_project", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
 

src/cdk/overlay/BUILD.bazel

@@ -2,11 +2,12 @@ load("//src/e2e-app:test_suite.bzl", "e2e_test_suite")
 load(
     "//tools:defaults.bzl",
     "markdown_to_html",
+    "ng_project",
     "ng_web_test_suite",
     "sass_binary",
     "sass_library",
+    "ts_project",
 )
-load("//tools:defaults2.bzl", "ng_project", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
 

src/cdk/platform/BUILD.bazel

@@ -1,5 +1,4 @@
-load("//tools:defaults.bzl", "markdown_to_html")
-load("//tools:defaults2.bzl", "ng_project")
+load("//tools:defaults.bzl", "markdown_to_html", "ng_project")
 
 package(default_visibility = ["//visibility:public"])
 

src/cdk/portal/BUILD.bazel

@@ -1,10 +1,10 @@
 load(
     "//tools:defaults.bzl",
     "markdown_to_html",
+    "ng_project",
     "ng_web_test_suite",
+    "ts_project",
 )
-load("//tools:defaults2.bzl", "ts_project")
-load("//tools:defaults2.bzl", "ng_project")
 
 package(default_visibility = ["//visibility:public"])
 

src/cdk/private/BUILD.bazel

@@ -1,5 +1,4 @@
-load("//tools:defaults.bzl", "markdown_to_html", "sass_binary")
-load("//tools:defaults2.bzl", "ng_project")
+load("//tools:defaults.bzl", "markdown_to_html", "ng_project", "sass_binary")
 
 package(default_visibility = ["//visibility:public"])
 

src/cdk/schematics/BUILD.bazel

@@ -1,5 +1,5 @@
 load("@aspect_bazel_lib//lib:copy_to_bin.bzl", "copy_to_bin")
-load("//tools:defaults2.bzl", "jasmine_test", "npm_package", "ts_project")
+load("//tools:defaults.bzl", "jasmine_test", "npm_package", "ts_project")
 load("@aspect_rules_ts//ts:defs.bzl", rules_js_tsconfig = "ts_config")
 
 package(default_visibility = [":__subpackages__"])

src/cdk/schematics/testing/BUILD.bazel

@@ -1,4 +1,4 @@
-load("//tools:defaults2.bzl", "ts_project")
+load("//tools:defaults.bzl", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
 

src/cdk/schematics/update-tool/BUILD.bazel

@@ -1,4 +1,4 @@
-load("//tools:defaults2.bzl", "ts_project")
+load("//tools:defaults.bzl", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
 

src/cdk/scrolling/BUILD.bazel

@@ -1,10 +1,11 @@
 load(
     "//tools:defaults.bzl",
     "markdown_to_html",
+    "ng_project",
     "ng_web_test_suite",
     "sass_binary",
+    "ts_project",
 )
-load("//tools:defaults2.bzl", "ng_project", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
 

src/cdk/stepper/BUILD.bazel

@@ -1,5 +1,4 @@
-load("//tools:defaults.bzl", "markdown_to_html")
-load("//tools:defaults2.bzl", "ng_project")
+load("//tools:defaults.bzl", "markdown_to_html", "ng_project")
 
 package(default_visibility = ["//visibility:public"])