diff --git a/integration/module-tests/BUILD.bazel b/integration/module-tests/BUILD.bazel index 5479627f2dc0..7f054902ae2c 100644 --- a/integration/module-tests/BUILD.bazel +++ b/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( diff --git a/src/BUILD.bazel b/src/BUILD.bazel index c62be019d07d..28d44fe4c07b 100644 --- a/src/BUILD.bazel +++ b/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"]) diff --git a/src/cdk-experimental/BUILD.bazel b/src/cdk-experimental/BUILD.bazel index 2b3f3fa2818c..d437cba9ccf3 100644 --- a/src/cdk-experimental/BUILD.bazel +++ b/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"]) diff --git a/src/cdk-experimental/column-resize/BUILD.bazel b/src/cdk-experimental/column-resize/BUILD.bazel index 6b2929181fa8..2cb1c2c81b9f 100644 --- a/src/cdk-experimental/column-resize/BUILD.bazel +++ b/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"]) diff --git a/src/cdk-experimental/combobox/BUILD.bazel b/src/cdk-experimental/combobox/BUILD.bazel index 58003e8ac469..63430d6332ec 100644 --- a/src/cdk-experimental/combobox/BUILD.bazel +++ b/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"]) diff --git a/src/cdk-experimental/deferred-content/BUILD.bazel b/src/cdk-experimental/deferred-content/BUILD.bazel index 344e62508b66..cd0e0901bab7 100644 --- a/src/cdk-experimental/deferred-content/BUILD.bazel +++ b/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"]) diff --git a/src/cdk-experimental/listbox/BUILD.bazel b/src/cdk-experimental/listbox/BUILD.bazel index 26e8be39840d..221f787c4316 100644 --- a/src/cdk-experimental/listbox/BUILD.bazel +++ b/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"]) diff --git a/src/cdk-experimental/popover-edit/BUILD.bazel b/src/cdk-experimental/popover-edit/BUILD.bazel index ce7b1e60c047..9bdac70c91d6 100644 --- a/src/cdk-experimental/popover-edit/BUILD.bazel +++ b/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"]) diff --git a/src/cdk-experimental/scrolling/BUILD.bazel b/src/cdk-experimental/scrolling/BUILD.bazel index 66b929939536..807edc3a576f 100644 --- a/src/cdk-experimental/scrolling/BUILD.bazel +++ b/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"]) diff --git a/src/cdk-experimental/selection/BUILD.bazel b/src/cdk-experimental/selection/BUILD.bazel index 662a63ff0e74..9fcf80caac3f 100644 --- a/src/cdk-experimental/selection/BUILD.bazel +++ b/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"]) diff --git a/src/cdk-experimental/table-scroll-container/BUILD.bazel b/src/cdk-experimental/table-scroll-container/BUILD.bazel index 9320dc4caf91..16b8791bc26c 100644 --- a/src/cdk-experimental/table-scroll-container/BUILD.bazel +++ b/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"]) diff --git a/src/cdk-experimental/tabs/BUILD.bazel b/src/cdk-experimental/tabs/BUILD.bazel index 1da2a457c61e..d9993da6e049 100644 --- a/src/cdk-experimental/tabs/BUILD.bazel +++ b/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"]) diff --git a/src/cdk-experimental/ui-patterns/BUILD.bazel b/src/cdk-experimental/ui-patterns/BUILD.bazel index 90b8d27573f3..fee524d85d42 100644 --- a/src/cdk-experimental/ui-patterns/BUILD.bazel +++ b/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"]) diff --git a/src/cdk-experimental/ui-patterns/behaviors/event-manager/BUILD.bazel b/src/cdk-experimental/ui-patterns/behaviors/event-manager/BUILD.bazel index 82fb99236733..363e0a0d3554 100644 --- a/src/cdk-experimental/ui-patterns/behaviors/event-manager/BUILD.bazel +++ b/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"]) diff --git a/src/cdk-experimental/ui-patterns/behaviors/list-focus/BUILD.bazel b/src/cdk-experimental/ui-patterns/behaviors/list-focus/BUILD.bazel index ccfd64500c97..e6db91f0798a 100644 --- a/src/cdk-experimental/ui-patterns/behaviors/list-focus/BUILD.bazel +++ b/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"]) diff --git a/src/cdk-experimental/ui-patterns/behaviors/list-navigation/BUILD.bazel b/src/cdk-experimental/ui-patterns/behaviors/list-navigation/BUILD.bazel index deb61ca4f912..68440a1655c6 100644 --- a/src/cdk-experimental/ui-patterns/behaviors/list-navigation/BUILD.bazel +++ b/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"]) diff --git a/src/cdk-experimental/ui-patterns/behaviors/list-selection/BUILD.bazel b/src/cdk-experimental/ui-patterns/behaviors/list-selection/BUILD.bazel index 1b163af1b9eb..6ad349761c2a 100644 --- a/src/cdk-experimental/ui-patterns/behaviors/list-selection/BUILD.bazel +++ b/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"]) diff --git a/src/cdk-experimental/ui-patterns/behaviors/list-typeahead/BUILD.bazel b/src/cdk-experimental/ui-patterns/behaviors/list-typeahead/BUILD.bazel index 288b6cf0752c..049cec743f45 100644 --- a/src/cdk-experimental/ui-patterns/behaviors/list-typeahead/BUILD.bazel +++ b/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"]) diff --git a/src/cdk-experimental/ui-patterns/behaviors/signal-like/BUILD.bazel b/src/cdk-experimental/ui-patterns/behaviors/signal-like/BUILD.bazel index e64b0007568b..d8dda4c30030 100644 --- a/src/cdk-experimental/ui-patterns/behaviors/signal-like/BUILD.bazel +++ b/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"]) diff --git a/src/cdk-experimental/ui-patterns/listbox/BUILD.bazel b/src/cdk-experimental/ui-patterns/listbox/BUILD.bazel index bd856fecdf4a..1f29a905a79c 100644 --- a/src/cdk-experimental/ui-patterns/listbox/BUILD.bazel +++ b/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"]) diff --git a/src/cdk-experimental/ui-patterns/tabs/BUILD.bazel b/src/cdk-experimental/ui-patterns/tabs/BUILD.bazel index c20038751c5c..299e39ee2545 100644 --- a/src/cdk-experimental/ui-patterns/tabs/BUILD.bazel +++ b/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"]) diff --git a/src/cdk/BUILD.bazel b/src/cdk/BUILD.bazel index c89938667301..7f96065e4039 100644 --- a/src/cdk/BUILD.bazel +++ b/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"]) diff --git a/src/cdk/a11y/BUILD.bazel b/src/cdk/a11y/BUILD.bazel index a745c895bf76..9cf2331d8d4a 100644 --- a/src/cdk/a11y/BUILD.bazel +++ b/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"]) diff --git a/src/cdk/accordion/BUILD.bazel b/src/cdk/accordion/BUILD.bazel index 6a86d9916471..7c8efa6850bf 100644 --- a/src/cdk/accordion/BUILD.bazel +++ b/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"]) diff --git a/src/cdk/bidi/BUILD.bazel b/src/cdk/bidi/BUILD.bazel index b0fc936d51f9..4cc3e1a9f4d6 100644 --- a/src/cdk/bidi/BUILD.bazel +++ b/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"]) diff --git a/src/cdk/clipboard/BUILD.bazel b/src/cdk/clipboard/BUILD.bazel index 41f41672fde0..a36a71188db2 100644 --- a/src/cdk/clipboard/BUILD.bazel +++ b/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"]) diff --git a/src/cdk/coercion/BUILD.bazel b/src/cdk/coercion/BUILD.bazel index af96c507b219..06960b29a36e 100644 --- a/src/cdk/coercion/BUILD.bazel +++ b/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"]) diff --git a/src/cdk/coercion/private/BUILD.bazel b/src/cdk/coercion/private/BUILD.bazel index 81679755f563..2448cf624fff 100644 --- a/src/cdk/coercion/private/BUILD.bazel +++ b/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"]) diff --git a/src/cdk/collections/BUILD.bazel b/src/cdk/collections/BUILD.bazel index e5ee987664a7..d83914e59aad 100644 --- a/src/cdk/collections/BUILD.bazel +++ b/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"]) diff --git a/src/cdk/dialog/BUILD.bazel b/src/cdk/dialog/BUILD.bazel index 6dbabf3a1955..252e8c6b2ee7 100644 --- a/src/cdk/dialog/BUILD.bazel +++ b/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"]) diff --git a/src/cdk/drag-drop/BUILD.bazel b/src/cdk/drag-drop/BUILD.bazel index bbc9c43756ec..9b0680d0e269 100644 --- a/src/cdk/drag-drop/BUILD.bazel +++ b/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"]) diff --git a/src/cdk/keycodes/BUILD.bazel b/src/cdk/keycodes/BUILD.bazel index 14d9ee796e3c..5688a30a6542 100644 --- a/src/cdk/keycodes/BUILD.bazel +++ b/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"]) diff --git a/src/cdk/layout/BUILD.bazel b/src/cdk/layout/BUILD.bazel index 05dc04f5917a..adb0c9c0e4ae 100644 --- a/src/cdk/layout/BUILD.bazel +++ b/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"]) diff --git a/src/cdk/listbox/BUILD.bazel b/src/cdk/listbox/BUILD.bazel index 68965a0bda88..8f560dd56437 100644 --- a/src/cdk/listbox/BUILD.bazel +++ b/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"]) diff --git a/src/cdk/menu/BUILD.bazel b/src/cdk/menu/BUILD.bazel index b2fcc7539e8c..fa76e43ec940 100644 --- a/src/cdk/menu/BUILD.bazel +++ b/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"]) diff --git a/src/cdk/observers/BUILD.bazel b/src/cdk/observers/BUILD.bazel index 03ceab1ef5dd..aefff76b9bc0 100644 --- a/src/cdk/observers/BUILD.bazel +++ b/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"]) diff --git a/src/cdk/observers/private/BUILD.bazel b/src/cdk/observers/private/BUILD.bazel index 5e2206655d4b..55048581ab97 100644 --- a/src/cdk/observers/private/BUILD.bazel +++ b/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"]) diff --git a/src/cdk/overlay/BUILD.bazel b/src/cdk/overlay/BUILD.bazel index f493641335e7..4c5f74971043 100644 --- a/src/cdk/overlay/BUILD.bazel +++ b/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"]) diff --git a/src/cdk/platform/BUILD.bazel b/src/cdk/platform/BUILD.bazel index f04ad6f44a29..3ab1e8612782 100644 --- a/src/cdk/platform/BUILD.bazel +++ b/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"]) diff --git a/src/cdk/portal/BUILD.bazel b/src/cdk/portal/BUILD.bazel index 64d4c5e4231e..ca44b0a0b955 100644 --- a/src/cdk/portal/BUILD.bazel +++ b/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"]) diff --git a/src/cdk/private/BUILD.bazel b/src/cdk/private/BUILD.bazel index a13ae468bd5f..47ab5a1a5b2f 100644 --- a/src/cdk/private/BUILD.bazel +++ b/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"]) diff --git a/src/cdk/schematics/BUILD.bazel b/src/cdk/schematics/BUILD.bazel index c5b7130e926a..2499dea4b11e 100644 --- a/src/cdk/schematics/BUILD.bazel +++ b/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__"]) diff --git a/src/cdk/schematics/testing/BUILD.bazel b/src/cdk/schematics/testing/BUILD.bazel index cd573fd516ad..b018fffc8680 100644 --- a/src/cdk/schematics/testing/BUILD.bazel +++ b/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"]) diff --git a/src/cdk/schematics/update-tool/BUILD.bazel b/src/cdk/schematics/update-tool/BUILD.bazel index 1ce5a0914d01..892c6e76710e 100644 --- a/src/cdk/schematics/update-tool/BUILD.bazel +++ b/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"]) diff --git a/src/cdk/scrolling/BUILD.bazel b/src/cdk/scrolling/BUILD.bazel index afe056d6e717..504255fd04c7 100644 --- a/src/cdk/scrolling/BUILD.bazel +++ b/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"]) diff --git a/src/cdk/stepper/BUILD.bazel b/src/cdk/stepper/BUILD.bazel index 921ac099cb19..7290b8a2728d 100644 --- a/src/cdk/stepper/BUILD.bazel +++ b/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"]) diff --git a/src/cdk/table/BUILD.bazel b/src/cdk/table/BUILD.bazel index 818a24085c6b..8eabfd1a5821 100644 --- a/src/cdk/table/BUILD.bazel +++ b/src/cdk/table/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"]) diff --git a/src/cdk/testing/BUILD.bazel b/src/cdk/testing/BUILD.bazel index 63312ed538aa..ee78a4837991 100644 --- a/src/cdk/testing/BUILD.bazel +++ b/src/cdk/testing/BUILD.bazel @@ -1,7 +1,6 @@ load("//src/e2e-app:test_suite.bzl", "e2e_test_suite") -load("//tools:defaults.bzl", "markdown_to_html", "ng_web_test_suite") +load("//tools:defaults.bzl", "markdown_to_html", "ng_web_test_suite", "ts_project") load("//src/cdk/testing/tests:webdriver-test.bzl", "webdriver_test") -load("//tools:defaults2.bzl", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/cdk/testing/private/BUILD.bazel b/src/cdk/testing/private/BUILD.bazel index 4b8106275296..b6f2bc75385a 100644 --- a/src/cdk/testing/private/BUILD.bazel +++ b/src/cdk/testing/private/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ts_project") +load("//tools:defaults.bzl", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/cdk/testing/protractor/BUILD.bazel b/src/cdk/testing/protractor/BUILD.bazel index ed928bbb068f..94c1d441ee83 100644 --- a/src/cdk/testing/protractor/BUILD.bazel +++ b/src/cdk/testing/protractor/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ts_project") +load("//tools:defaults.bzl", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/cdk/testing/selenium-webdriver/BUILD.bazel b/src/cdk/testing/selenium-webdriver/BUILD.bazel index 1d9fa385e902..72145766a41b 100644 --- a/src/cdk/testing/selenium-webdriver/BUILD.bazel +++ b/src/cdk/testing/selenium-webdriver/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ts_project") +load("//tools:defaults.bzl", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/cdk/testing/testbed/BUILD.bazel b/src/cdk/testing/testbed/BUILD.bazel index 6d85e744230d..eafb34509394 100644 --- a/src/cdk/testing/testbed/BUILD.bazel +++ b/src/cdk/testing/testbed/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults2.bzl", "ts_project") -load("//tools:defaults.bzl", "ng_web_test_suite") +load("//tools:defaults.bzl", "ng_web_test_suite", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/cdk/testing/tests/BUILD.bazel b/src/cdk/testing/tests/BUILD.bazel index d5f29ce9a59f..a1dd7f35a7dd 100644 --- a/src/cdk/testing/tests/BUILD.bazel +++ b/src/cdk/testing/tests/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ng_project", "ts_project") +load("//tools:defaults.bzl", "ng_project", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/cdk/testing/tests/webdriver-test.bzl b/src/cdk/testing/tests/webdriver-test.bzl index bc6adb56f8dd..42bdc2def61a 100644 --- a/src/cdk/testing/tests/webdriver-test.bzl +++ b/src/cdk/testing/tests/webdriver-test.bzl @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "jasmine_test", "spec_bundle") +load("//tools:defaults.bzl", "jasmine_test", "spec_bundle") load("@rules_browsers//src/server_test:index.bzl", "server_test") def webdriver_test(name, deps, tags = [], **kwargs): diff --git a/src/cdk/text-field/BUILD.bazel b/src/cdk/text-field/BUILD.bazel index 5febc5e11910..cb260e86306b 100644 --- a/src/cdk/text-field/BUILD.bazel +++ b/src/cdk/text-field/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"]) diff --git a/src/cdk/tree/BUILD.bazel b/src/cdk/tree/BUILD.bazel index bcb26df524ea..7f8e06db6fec 100644 --- a/src/cdk/tree/BUILD.bazel +++ b/src/cdk/tree/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"]) diff --git a/src/components-examples/BUILD.bazel b/src/components-examples/BUILD.bazel index fe579ed8df2d..6920798c3ea7 100644 --- a/src/components-examples/BUILD.bazel +++ b/src/components-examples/BUILD.bazel @@ -1,8 +1,7 @@ -load("//tools:defaults.bzl", "ng_package") +load("//tools:defaults.bzl", "ng_package", "ng_project") load("//tools/highlight-files:index.bzl", "highlight_files") load("//tools/package-docs-content:index.bzl", "package_docs_content") load(":config.bzl", "ALL_EXAMPLES") -load("//tools:defaults2.bzl", "ng_project") load("@npm//:defs.bzl", "npm_link_all_packages") package(default_visibility = ["//visibility:public"]) diff --git a/src/components-examples/cdk-experimental/listbox/BUILD.bazel b/src/components-examples/cdk-experimental/listbox/BUILD.bazel index 809529b6c4b0..243a699a62e8 100644 --- a/src/components-examples/cdk-experimental/listbox/BUILD.bazel +++ b/src/components-examples/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"]) diff --git a/src/components-examples/cdk-experimental/popover-edit/BUILD.bazel b/src/components-examples/cdk-experimental/popover-edit/BUILD.bazel index cc665c3ea131..d586839d8e39 100644 --- a/src/components-examples/cdk-experimental/popover-edit/BUILD.bazel +++ b/src/components-examples/cdk-experimental/popover-edit/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/components-examples/cdk-experimental/selection/BUILD.bazel b/src/components-examples/cdk-experimental/selection/BUILD.bazel index 08e8580b0c53..57c09af1a2b3 100644 --- a/src/components-examples/cdk-experimental/selection/BUILD.bazel +++ b/src/components-examples/cdk-experimental/selection/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/components-examples/cdk-experimental/tabs/BUILD.bazel b/src/components-examples/cdk-experimental/tabs/BUILD.bazel index b35f7d0b74da..de7662fa9a27 100644 --- a/src/components-examples/cdk-experimental/tabs/BUILD.bazel +++ b/src/components-examples/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"]) diff --git a/src/components-examples/cdk/a11y/BUILD.bazel b/src/components-examples/cdk/a11y/BUILD.bazel index e70ccdede978..de84ef0e2298 100644 --- a/src/components-examples/cdk/a11y/BUILD.bazel +++ b/src/components-examples/cdk/a11y/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/components-examples/cdk/accordion/BUILD.bazel b/src/components-examples/cdk/accordion/BUILD.bazel index 4b207f807877..f8b30e0eeef4 100644 --- a/src/components-examples/cdk/accordion/BUILD.bazel +++ b/src/components-examples/cdk/accordion/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/components-examples/cdk/clipboard/BUILD.bazel b/src/components-examples/cdk/clipboard/BUILD.bazel index 669d990ee5af..9d09fcc9cca1 100644 --- a/src/components-examples/cdk/clipboard/BUILD.bazel +++ b/src/components-examples/cdk/clipboard/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/components-examples/cdk/dialog/BUILD.bazel b/src/components-examples/cdk/dialog/BUILD.bazel index 64f3a850f1da..7ae823354d5b 100644 --- a/src/components-examples/cdk/dialog/BUILD.bazel +++ b/src/components-examples/cdk/dialog/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/components-examples/cdk/drag-drop/BUILD.bazel b/src/components-examples/cdk/drag-drop/BUILD.bazel index 8f2515484e66..aa9bd195dec6 100644 --- a/src/components-examples/cdk/drag-drop/BUILD.bazel +++ b/src/components-examples/cdk/drag-drop/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/components-examples/cdk/layout/BUILD.bazel b/src/components-examples/cdk/layout/BUILD.bazel index d5d623364ffe..a6d1e0c3895d 100644 --- a/src/components-examples/cdk/layout/BUILD.bazel +++ b/src/components-examples/cdk/layout/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/components-examples/cdk/listbox/BUILD.bazel b/src/components-examples/cdk/listbox/BUILD.bazel index 2b83a957e5b2..60757654bf0a 100644 --- a/src/components-examples/cdk/listbox/BUILD.bazel +++ b/src/components-examples/cdk/listbox/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/components-examples/cdk/menu/BUILD.bazel b/src/components-examples/cdk/menu/BUILD.bazel index 24f361340bac..e47eae560a51 100644 --- a/src/components-examples/cdk/menu/BUILD.bazel +++ b/src/components-examples/cdk/menu/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/components-examples/cdk/overlay/BUILD.bazel b/src/components-examples/cdk/overlay/BUILD.bazel index 505cefb485b9..4fab16826344 100644 --- a/src/components-examples/cdk/overlay/BUILD.bazel +++ b/src/components-examples/cdk/overlay/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/components-examples/cdk/platform/BUILD.bazel b/src/components-examples/cdk/platform/BUILD.bazel index 2c57e90a8612..64aad3c0275e 100644 --- a/src/components-examples/cdk/platform/BUILD.bazel +++ b/src/components-examples/cdk/platform/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/components-examples/cdk/portal/BUILD.bazel b/src/components-examples/cdk/portal/BUILD.bazel index d4185a79fba1..824c70aa65ef 100644 --- a/src/components-examples/cdk/portal/BUILD.bazel +++ b/src/components-examples/cdk/portal/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/components-examples/cdk/scrolling/BUILD.bazel b/src/components-examples/cdk/scrolling/BUILD.bazel index 58c10a3a02cb..168abf525762 100644 --- a/src/components-examples/cdk/scrolling/BUILD.bazel +++ b/src/components-examples/cdk/scrolling/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/components-examples/cdk/stepper/BUILD.bazel b/src/components-examples/cdk/stepper/BUILD.bazel index 791c2d417829..ee0903a06904 100644 --- a/src/components-examples/cdk/stepper/BUILD.bazel +++ b/src/components-examples/cdk/stepper/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/components-examples/cdk/table/BUILD.bazel b/src/components-examples/cdk/table/BUILD.bazel index 0c7444fc3cc2..9db86a6da7a7 100644 --- a/src/components-examples/cdk/table/BUILD.bazel +++ b/src/components-examples/cdk/table/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/components-examples/cdk/text-field/BUILD.bazel b/src/components-examples/cdk/text-field/BUILD.bazel index eec7c8fe0049..d765d13cf12f 100644 --- a/src/components-examples/cdk/text-field/BUILD.bazel +++ b/src/components-examples/cdk/text-field/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/components-examples/cdk/tree/BUILD.bazel b/src/components-examples/cdk/tree/BUILD.bazel index b722372ef9e1..a589dd8f48a0 100644 --- a/src/components-examples/cdk/tree/BUILD.bazel +++ b/src/components-examples/cdk/tree/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/components-examples/material-experimental/column-resize/BUILD.bazel b/src/components-examples/material-experimental/column-resize/BUILD.bazel index 2a64a4f586a2..b09099e83b58 100644 --- a/src/components-examples/material-experimental/column-resize/BUILD.bazel +++ b/src/components-examples/material-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"]) diff --git a/src/components-examples/material-experimental/popover-edit/BUILD.bazel b/src/components-examples/material-experimental/popover-edit/BUILD.bazel index bd9062ec41a6..80bf33ed492f 100644 --- a/src/components-examples/material-experimental/popover-edit/BUILD.bazel +++ b/src/components-examples/material-experimental/popover-edit/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/components-examples/material-experimental/selection/BUILD.bazel b/src/components-examples/material-experimental/selection/BUILD.bazel index 0333469fac1f..f5e6b578515a 100644 --- a/src/components-examples/material-experimental/selection/BUILD.bazel +++ b/src/components-examples/material-experimental/selection/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/components-examples/material/autocomplete/BUILD.bazel b/src/components-examples/material/autocomplete/BUILD.bazel index a01b615f15ae..78291f06d18e 100644 --- a/src/components-examples/material/autocomplete/BUILD.bazel +++ b/src/components-examples/material/autocomplete/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"]) diff --git a/src/components-examples/material/badge/BUILD.bazel b/src/components-examples/material/badge/BUILD.bazel index 32a52c775b87..b251b23b0a01 100644 --- a/src/components-examples/material/badge/BUILD.bazel +++ b/src/components-examples/material/badge/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"]) diff --git a/src/components-examples/material/bottom-sheet/BUILD.bazel b/src/components-examples/material/bottom-sheet/BUILD.bazel index aefca6c244a8..81f01105b0ae 100644 --- a/src/components-examples/material/bottom-sheet/BUILD.bazel +++ b/src/components-examples/material/bottom-sheet/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"]) diff --git a/src/components-examples/material/button-toggle/BUILD.bazel b/src/components-examples/material/button-toggle/BUILD.bazel index 7965a51850fc..0af78b168276 100644 --- a/src/components-examples/material/button-toggle/BUILD.bazel +++ b/src/components-examples/material/button-toggle/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"]) diff --git a/src/components-examples/material/button/BUILD.bazel b/src/components-examples/material/button/BUILD.bazel index 950d74ddc379..28d7c076d670 100644 --- a/src/components-examples/material/button/BUILD.bazel +++ b/src/components-examples/material/button/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"]) diff --git a/src/components-examples/material/card/BUILD.bazel b/src/components-examples/material/card/BUILD.bazel index eada092bd3b7..9a404d28b188 100644 --- a/src/components-examples/material/card/BUILD.bazel +++ b/src/components-examples/material/card/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"]) diff --git a/src/components-examples/material/checkbox/BUILD.bazel b/src/components-examples/material/checkbox/BUILD.bazel index 8109e64cdcb0..8be031692712 100644 --- a/src/components-examples/material/checkbox/BUILD.bazel +++ b/src/components-examples/material/checkbox/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"]) diff --git a/src/components-examples/material/chips/BUILD.bazel b/src/components-examples/material/chips/BUILD.bazel index 54ac55d38b8b..55a5c3f0acd0 100644 --- a/src/components-examples/material/chips/BUILD.bazel +++ b/src/components-examples/material/chips/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"]) diff --git a/src/components-examples/material/core/BUILD.bazel b/src/components-examples/material/core/BUILD.bazel index dbd0faa281ce..365ed02d29ed 100644 --- a/src/components-examples/material/core/BUILD.bazel +++ b/src/components-examples/material/core/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/components-examples/material/datepicker/BUILD.bazel b/src/components-examples/material/datepicker/BUILD.bazel index b735d2431a85..635ebe799735 100644 --- a/src/components-examples/material/datepicker/BUILD.bazel +++ b/src/components-examples/material/datepicker/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"]) diff --git a/src/components-examples/material/dialog/BUILD.bazel b/src/components-examples/material/dialog/BUILD.bazel index 5cd82af5e05e..d275664f63c0 100644 --- a/src/components-examples/material/dialog/BUILD.bazel +++ b/src/components-examples/material/dialog/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"]) diff --git a/src/components-examples/material/divider/BUILD.bazel b/src/components-examples/material/divider/BUILD.bazel index f2ab783ba2a5..c52fde9d9647 100644 --- a/src/components-examples/material/divider/BUILD.bazel +++ b/src/components-examples/material/divider/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"]) diff --git a/src/components-examples/material/expansion/BUILD.bazel b/src/components-examples/material/expansion/BUILD.bazel index 66a51d9a8c65..4cad6c913db5 100644 --- a/src/components-examples/material/expansion/BUILD.bazel +++ b/src/components-examples/material/expansion/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"]) diff --git a/src/components-examples/material/form-field/BUILD.bazel b/src/components-examples/material/form-field/BUILD.bazel index e2aad0b99071..e23e44e56f6b 100644 --- a/src/components-examples/material/form-field/BUILD.bazel +++ b/src/components-examples/material/form-field/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"]) diff --git a/src/components-examples/material/grid-list/BUILD.bazel b/src/components-examples/material/grid-list/BUILD.bazel index 2194f083b654..44d7df284a12 100644 --- a/src/components-examples/material/grid-list/BUILD.bazel +++ b/src/components-examples/material/grid-list/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"]) diff --git a/src/components-examples/material/icon/BUILD.bazel b/src/components-examples/material/icon/BUILD.bazel index c50fb16c0ca1..83808cf83747 100644 --- a/src/components-examples/material/icon/BUILD.bazel +++ b/src/components-examples/material/icon/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"]) diff --git a/src/components-examples/material/input/BUILD.bazel b/src/components-examples/material/input/BUILD.bazel index dba4677c9f2c..9c8522d144ba 100644 --- a/src/components-examples/material/input/BUILD.bazel +++ b/src/components-examples/material/input/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"]) diff --git a/src/components-examples/material/list/BUILD.bazel b/src/components-examples/material/list/BUILD.bazel index 0e166a2f5420..566d3debaef5 100644 --- a/src/components-examples/material/list/BUILD.bazel +++ b/src/components-examples/material/list/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"]) diff --git a/src/components-examples/material/menu/BUILD.bazel b/src/components-examples/material/menu/BUILD.bazel index 4e4e90559298..1fdd24c4320d 100644 --- a/src/components-examples/material/menu/BUILD.bazel +++ b/src/components-examples/material/menu/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"]) diff --git a/src/components-examples/material/paginator/BUILD.bazel b/src/components-examples/material/paginator/BUILD.bazel index 5a69f9926436..2501a2f6ad97 100644 --- a/src/components-examples/material/paginator/BUILD.bazel +++ b/src/components-examples/material/paginator/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"]) diff --git a/src/components-examples/material/progress-bar/BUILD.bazel b/src/components-examples/material/progress-bar/BUILD.bazel index b18198ca5ad6..89f535187974 100644 --- a/src/components-examples/material/progress-bar/BUILD.bazel +++ b/src/components-examples/material/progress-bar/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"]) diff --git a/src/components-examples/material/progress-spinner/BUILD.bazel b/src/components-examples/material/progress-spinner/BUILD.bazel index 742a1974d065..808638ce0078 100644 --- a/src/components-examples/material/progress-spinner/BUILD.bazel +++ b/src/components-examples/material/progress-spinner/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"]) diff --git a/src/components-examples/material/radio/BUILD.bazel b/src/components-examples/material/radio/BUILD.bazel index 470c73cb7a69..35beff9296aa 100644 --- a/src/components-examples/material/radio/BUILD.bazel +++ b/src/components-examples/material/radio/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"]) diff --git a/src/components-examples/material/select/BUILD.bazel b/src/components-examples/material/select/BUILD.bazel index e26a874442ea..c92fa43e71fe 100644 --- a/src/components-examples/material/select/BUILD.bazel +++ b/src/components-examples/material/select/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"]) diff --git a/src/components-examples/material/sidenav/BUILD.bazel b/src/components-examples/material/sidenav/BUILD.bazel index d482e99642b6..0a24c6c2aa99 100644 --- a/src/components-examples/material/sidenav/BUILD.bazel +++ b/src/components-examples/material/sidenav/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"]) diff --git a/src/components-examples/material/slide-toggle/BUILD.bazel b/src/components-examples/material/slide-toggle/BUILD.bazel index 70e1d6bf36df..6bfdfc85cd0f 100644 --- a/src/components-examples/material/slide-toggle/BUILD.bazel +++ b/src/components-examples/material/slide-toggle/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"]) diff --git a/src/components-examples/material/slider/BUILD.bazel b/src/components-examples/material/slider/BUILD.bazel index 9fbb6527c102..bbc3ccce9c4f 100644 --- a/src/components-examples/material/slider/BUILD.bazel +++ b/src/components-examples/material/slider/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"]) diff --git a/src/components-examples/material/snack-bar/BUILD.bazel b/src/components-examples/material/snack-bar/BUILD.bazel index 6f83775e3c1f..f189fdd2210a 100644 --- a/src/components-examples/material/snack-bar/BUILD.bazel +++ b/src/components-examples/material/snack-bar/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"]) diff --git a/src/components-examples/material/sort/BUILD.bazel b/src/components-examples/material/sort/BUILD.bazel index 8cd6e6a77b9f..16188ac27ade 100644 --- a/src/components-examples/material/sort/BUILD.bazel +++ b/src/components-examples/material/sort/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"]) diff --git a/src/components-examples/material/stepper/BUILD.bazel b/src/components-examples/material/stepper/BUILD.bazel index a33304af37f5..baef41b7bca4 100644 --- a/src/components-examples/material/stepper/BUILD.bazel +++ b/src/components-examples/material/stepper/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"]) diff --git a/src/components-examples/material/table/BUILD.bazel b/src/components-examples/material/table/BUILD.bazel index 634be32cf528..662f8c8746d3 100644 --- a/src/components-examples/material/table/BUILD.bazel +++ b/src/components-examples/material/table/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"]) diff --git a/src/components-examples/material/tabs/BUILD.bazel b/src/components-examples/material/tabs/BUILD.bazel index 61e2ce34363b..b180f9039ba6 100644 --- a/src/components-examples/material/tabs/BUILD.bazel +++ b/src/components-examples/material/tabs/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"]) diff --git a/src/components-examples/material/timepicker/BUILD.bazel b/src/components-examples/material/timepicker/BUILD.bazel index a3775e7f45ef..ae0279c7b06a 100644 --- a/src/components-examples/material/timepicker/BUILD.bazel +++ b/src/components-examples/material/timepicker/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"]) diff --git a/src/components-examples/material/toolbar/BUILD.bazel b/src/components-examples/material/toolbar/BUILD.bazel index 9c3ace9534a0..b30ca000876b 100644 --- a/src/components-examples/material/toolbar/BUILD.bazel +++ b/src/components-examples/material/toolbar/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"]) diff --git a/src/components-examples/material/tooltip/BUILD.bazel b/src/components-examples/material/tooltip/BUILD.bazel index 8a0b3555f0fa..959b2ce41646 100644 --- a/src/components-examples/material/tooltip/BUILD.bazel +++ b/src/components-examples/material/tooltip/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"]) diff --git a/src/components-examples/material/tree/BUILD.bazel b/src/components-examples/material/tree/BUILD.bazel index 0aed77982e89..d5c55498fa69 100644 --- a/src/components-examples/material/tree/BUILD.bazel +++ b/src/components-examples/material/tree/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"]) diff --git a/src/components-examples/private/BUILD.bazel b/src/components-examples/private/BUILD.bazel index 91cd2c01e235..4ed949f6424f 100644 --- a/src/components-examples/private/BUILD.bazel +++ b/src/components-examples/private/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ts_project") +load("//tools:defaults.bzl", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/BUILD.bazel b/src/dev-app/BUILD.bazel index 9d8be7f22338..c864a7131321 100644 --- a/src/dev-app/BUILD.bazel +++ b/src/dev-app/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "http_server", "ng_project") +load("//tools:defaults.bzl", "http_server", "ng_project", "sass_binary") load("@npm//:defs.bzl", "npm_link_all_packages") load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild") load("@aspect_rules_js//npm:defs.bzl", "npm_package") diff --git a/src/dev-app/autocomplete/BUILD.bazel b/src/dev-app/autocomplete/BUILD.bazel index 02f7bc2ccecf..8ed724206443 100644 --- a/src/dev-app/autocomplete/BUILD.bazel +++ b/src/dev-app/autocomplete/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/badge/BUILD.bazel b/src/dev-app/badge/BUILD.bazel index e786f7656714..750bce703c79 100644 --- a/src/dev-app/badge/BUILD.bazel +++ b/src/dev-app/badge/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/baseline/BUILD.bazel b/src/dev-app/baseline/BUILD.bazel index e50d1e3734a8..d5dab485c9fd 100644 --- a/src/dev-app/baseline/BUILD.bazel +++ b/src/dev-app/baseline/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/bottom-sheet/BUILD.bazel b/src/dev-app/bottom-sheet/BUILD.bazel index 760a07527962..f2e809516902 100644 --- a/src/dev-app/bottom-sheet/BUILD.bazel +++ b/src/dev-app/bottom-sheet/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/button-toggle/BUILD.bazel b/src/dev-app/button-toggle/BUILD.bazel index 4f12ef8415e7..4fba164af33a 100644 --- a/src/dev-app/button-toggle/BUILD.bazel +++ b/src/dev-app/button-toggle/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/button/BUILD.bazel b/src/dev-app/button/BUILD.bazel index e0272d587854..c94c68c9b705 100644 --- a/src/dev-app/button/BUILD.bazel +++ b/src/dev-app/button/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/card/BUILD.bazel b/src/dev-app/card/BUILD.bazel index 5d420cda0d55..4352227e8dd6 100644 --- a/src/dev-app/card/BUILD.bazel +++ b/src/dev-app/card/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/cdk-dialog/BUILD.bazel b/src/dev-app/cdk-dialog/BUILD.bazel index d637334ec443..b9bb39126370 100644 --- a/src/dev-app/cdk-dialog/BUILD.bazel +++ b/src/dev-app/cdk-dialog/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/cdk-experimental-combobox/BUILD.bazel b/src/dev-app/cdk-experimental-combobox/BUILD.bazel index c06f00e10eab..7599efce5d7b 100644 --- a/src/dev-app/cdk-experimental-combobox/BUILD.bazel +++ b/src/dev-app/cdk-experimental-combobox/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/cdk-experimental-listbox/BUILD.bazel b/src/dev-app/cdk-experimental-listbox/BUILD.bazel index 90c97d9a2433..20e2e352c5ae 100644 --- a/src/dev-app/cdk-experimental-listbox/BUILD.bazel +++ b/src/dev-app/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"]) diff --git a/src/dev-app/cdk-experimental-tabs/BUILD.bazel b/src/dev-app/cdk-experimental-tabs/BUILD.bazel index fedb006d613a..fdb482cdf87e 100644 --- a/src/dev-app/cdk-experimental-tabs/BUILD.bazel +++ b/src/dev-app/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"]) diff --git a/src/dev-app/cdk-listbox/BUILD.bazel b/src/dev-app/cdk-listbox/BUILD.bazel index 76ea8ab813ed..210e34e3b500 100644 --- a/src/dev-app/cdk-listbox/BUILD.bazel +++ b/src/dev-app/cdk-listbox/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/cdk-menu/BUILD.bazel b/src/dev-app/cdk-menu/BUILD.bazel index ce551a5caa10..6c42e0a67e11 100644 --- a/src/dev-app/cdk-menu/BUILD.bazel +++ b/src/dev-app/cdk-menu/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/checkbox/BUILD.bazel b/src/dev-app/checkbox/BUILD.bazel index 9c02cd846897..bbb7fec0930d 100644 --- a/src/dev-app/checkbox/BUILD.bazel +++ b/src/dev-app/checkbox/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/chips/BUILD.bazel b/src/dev-app/chips/BUILD.bazel index 0d36286a33f3..46217854af28 100644 --- a/src/dev-app/chips/BUILD.bazel +++ b/src/dev-app/chips/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/clipboard/BUILD.bazel b/src/dev-app/clipboard/BUILD.bazel index b0cb1f85bf12..d4823539a8eb 100644 --- a/src/dev-app/clipboard/BUILD.bazel +++ b/src/dev-app/clipboard/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/column-resize/BUILD.bazel b/src/dev-app/column-resize/BUILD.bazel index 43f911b00d28..6a3d98a1d4b9 100644 --- a/src/dev-app/column-resize/BUILD.bazel +++ b/src/dev-app/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"]) diff --git a/src/dev-app/connected-overlay/BUILD.bazel b/src/dev-app/connected-overlay/BUILD.bazel index 1bad51b1fe34..74a06400aa9f 100644 --- a/src/dev-app/connected-overlay/BUILD.bazel +++ b/src/dev-app/connected-overlay/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/datepicker/BUILD.bazel b/src/dev-app/datepicker/BUILD.bazel index 0a8abc72f7f5..9684308d948c 100644 --- a/src/dev-app/datepicker/BUILD.bazel +++ b/src/dev-app/datepicker/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/dev-app/BUILD.bazel b/src/dev-app/dev-app/BUILD.bazel index b556a79b7dce..1c95ce661a27 100644 --- a/src/dev-app/dev-app/BUILD.bazel +++ b/src/dev-app/dev-app/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/dialog/BUILD.bazel b/src/dev-app/dialog/BUILD.bazel index d0308d99bdf1..958c9ebc1e98 100644 --- a/src/dev-app/dialog/BUILD.bazel +++ b/src/dev-app/dialog/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/drag-drop/BUILD.bazel b/src/dev-app/drag-drop/BUILD.bazel index 0caf424a24d9..0e5312b17d66 100644 --- a/src/dev-app/drag-drop/BUILD.bazel +++ b/src/dev-app/drag-drop/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/drawer/BUILD.bazel b/src/dev-app/drawer/BUILD.bazel index e6ef1d0de946..17d68797ccfc 100644 --- a/src/dev-app/drawer/BUILD.bazel +++ b/src/dev-app/drawer/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/example/BUILD.bazel b/src/dev-app/example/BUILD.bazel index a6b4102651ec..8da08f6557a5 100644 --- a/src/dev-app/example/BUILD.bazel +++ b/src/dev-app/example/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/examples-page/BUILD.bazel b/src/dev-app/examples-page/BUILD.bazel index ccdc97725b70..f16f75325803 100644 --- a/src/dev-app/examples-page/BUILD.bazel +++ b/src/dev-app/examples-page/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/expansion/BUILD.bazel b/src/dev-app/expansion/BUILD.bazel index 33da223a2d4d..ffb360114034 100644 --- a/src/dev-app/expansion/BUILD.bazel +++ b/src/dev-app/expansion/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/focus-origin/BUILD.bazel b/src/dev-app/focus-origin/BUILD.bazel index ba957573bdeb..adc0014307fc 100644 --- a/src/dev-app/focus-origin/BUILD.bazel +++ b/src/dev-app/focus-origin/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/focus-trap/BUILD.bazel b/src/dev-app/focus-trap/BUILD.bazel index a1f22c8cce21..ddcdba23c116 100644 --- a/src/dev-app/focus-trap/BUILD.bazel +++ b/src/dev-app/focus-trap/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/google-map/BUILD.bazel b/src/dev-app/google-map/BUILD.bazel index 18b31d30aa52..96cc61c7d942 100644 --- a/src/dev-app/google-map/BUILD.bazel +++ b/src/dev-app/google-map/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/grid-list/BUILD.bazel b/src/dev-app/grid-list/BUILD.bazel index 22ae1d2e8323..c31b6e96f15e 100644 --- a/src/dev-app/grid-list/BUILD.bazel +++ b/src/dev-app/grid-list/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/icon/BUILD.bazel b/src/dev-app/icon/BUILD.bazel index 069f9050de0d..52387f45a330 100644 --- a/src/dev-app/icon/BUILD.bazel +++ b/src/dev-app/icon/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/input-modality/BUILD.bazel b/src/dev-app/input-modality/BUILD.bazel index 4393180d9654..74705a77bc21 100644 --- a/src/dev-app/input-modality/BUILD.bazel +++ b/src/dev-app/input-modality/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/input/BUILD.bazel b/src/dev-app/input/BUILD.bazel index 2a8a01cd68f8..ea6f6867f888 100644 --- a/src/dev-app/input/BUILD.bazel +++ b/src/dev-app/input/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/layout/BUILD.bazel b/src/dev-app/layout/BUILD.bazel index 2af0f4fe34ce..648294dbcaae 100644 --- a/src/dev-app/layout/BUILD.bazel +++ b/src/dev-app/layout/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/list/BUILD.bazel b/src/dev-app/list/BUILD.bazel index da6b561e8a91..43c46fa803e9 100644 --- a/src/dev-app/list/BUILD.bazel +++ b/src/dev-app/list/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/live-announcer/BUILD.bazel b/src/dev-app/live-announcer/BUILD.bazel index 7f877ad7d12e..58e65a89157f 100644 --- a/src/dev-app/live-announcer/BUILD.bazel +++ b/src/dev-app/live-announcer/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/menu/BUILD.bazel b/src/dev-app/menu/BUILD.bazel index d49f90285623..7f7ae4f3e604 100644 --- a/src/dev-app/menu/BUILD.bazel +++ b/src/dev-app/menu/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/menubar/BUILD.bazel b/src/dev-app/menubar/BUILD.bazel index a8354a566d8d..9bde5b72272c 100644 --- a/src/dev-app/menubar/BUILD.bazel +++ b/src/dev-app/menubar/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/paginator/BUILD.bazel b/src/dev-app/paginator/BUILD.bazel index 76b4b7b87774..9f82c4d49004 100644 --- a/src/dev-app/paginator/BUILD.bazel +++ b/src/dev-app/paginator/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/performance/BUILD.bazel b/src/dev-app/performance/BUILD.bazel index 2f07fb0c9409..c137e9f5bba5 100644 --- a/src/dev-app/performance/BUILD.bazel +++ b/src/dev-app/performance/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/platform/BUILD.bazel b/src/dev-app/platform/BUILD.bazel index 1504a7d42b71..42aa21df4cba 100644 --- a/src/dev-app/platform/BUILD.bazel +++ b/src/dev-app/platform/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/popover-edit/BUILD.bazel b/src/dev-app/popover-edit/BUILD.bazel index 04cd5541893e..6c00e3960a35 100644 --- a/src/dev-app/popover-edit/BUILD.bazel +++ b/src/dev-app/popover-edit/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/portal/BUILD.bazel b/src/dev-app/portal/BUILD.bazel index ff754b0701c9..ccefecf0189b 100644 --- a/src/dev-app/portal/BUILD.bazel +++ b/src/dev-app/portal/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/progress-bar/BUILD.bazel b/src/dev-app/progress-bar/BUILD.bazel index e2c88dfd08ff..e4d339e44ca3 100644 --- a/src/dev-app/progress-bar/BUILD.bazel +++ b/src/dev-app/progress-bar/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/progress-spinner/BUILD.bazel b/src/dev-app/progress-spinner/BUILD.bazel index 82e0a4b4a873..63a776729330 100644 --- a/src/dev-app/progress-spinner/BUILD.bazel +++ b/src/dev-app/progress-spinner/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/radio/BUILD.bazel b/src/dev-app/radio/BUILD.bazel index 16bd5b6a96ac..22c32ee41c10 100644 --- a/src/dev-app/radio/BUILD.bazel +++ b/src/dev-app/radio/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/ripple/BUILD.bazel b/src/dev-app/ripple/BUILD.bazel index 0ea17d5ba16e..34821a712e82 100644 --- a/src/dev-app/ripple/BUILD.bazel +++ b/src/dev-app/ripple/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/screen-type/BUILD.bazel b/src/dev-app/screen-type/BUILD.bazel index 4e389198dc14..decb6061462f 100644 --- a/src/dev-app/screen-type/BUILD.bazel +++ b/src/dev-app/screen-type/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/select/BUILD.bazel b/src/dev-app/select/BUILD.bazel index c357fc8ef107..1e83f5f21ce4 100644 --- a/src/dev-app/select/BUILD.bazel +++ b/src/dev-app/select/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/selection/BUILD.bazel b/src/dev-app/selection/BUILD.bazel index d348c4d78603..ea25a027cdf3 100644 --- a/src/dev-app/selection/BUILD.bazel +++ b/src/dev-app/selection/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/sidenav/BUILD.bazel b/src/dev-app/sidenav/BUILD.bazel index 1b31f92c6d7b..b0822b1ffa89 100644 --- a/src/dev-app/sidenav/BUILD.bazel +++ b/src/dev-app/sidenav/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/slide-toggle/BUILD.bazel b/src/dev-app/slide-toggle/BUILD.bazel index d775d9f30e9c..dc184702b6bb 100644 --- a/src/dev-app/slide-toggle/BUILD.bazel +++ b/src/dev-app/slide-toggle/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/slider/BUILD.bazel b/src/dev-app/slider/BUILD.bazel index 0d69d1ec7865..2192664705e0 100644 --- a/src/dev-app/slider/BUILD.bazel +++ b/src/dev-app/slider/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/snack-bar/BUILD.bazel b/src/dev-app/snack-bar/BUILD.bazel index 339da5f375f2..c1422d0acaa0 100644 --- a/src/dev-app/snack-bar/BUILD.bazel +++ b/src/dev-app/snack-bar/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/stepper/BUILD.bazel b/src/dev-app/stepper/BUILD.bazel index 412bc3d7c24c..8592efd35425 100644 --- a/src/dev-app/stepper/BUILD.bazel +++ b/src/dev-app/stepper/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/table-scroll-container/BUILD.bazel b/src/dev-app/table-scroll-container/BUILD.bazel index 7ba16774f85b..bde069e902ad 100644 --- a/src/dev-app/table-scroll-container/BUILD.bazel +++ b/src/dev-app/table-scroll-container/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/table/BUILD.bazel b/src/dev-app/table/BUILD.bazel index 9331821cc831..6783fe66ce1f 100644 --- a/src/dev-app/table/BUILD.bazel +++ b/src/dev-app/table/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/tabs/BUILD.bazel b/src/dev-app/tabs/BUILD.bazel index a0fd2474552e..443f803ac799 100644 --- a/src/dev-app/tabs/BUILD.bazel +++ b/src/dev-app/tabs/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/theme/BUILD.bazel b/src/dev-app/theme/BUILD.bazel index 22d83499e0e9..c4d82bebf664 100644 --- a/src/dev-app/theme/BUILD.bazel +++ b/src/dev-app/theme/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/timepicker/BUILD.bazel b/src/dev-app/timepicker/BUILD.bazel index 04162ea264c6..8e91f3decb5e 100644 --- a/src/dev-app/timepicker/BUILD.bazel +++ b/src/dev-app/timepicker/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/toolbar/BUILD.bazel b/src/dev-app/toolbar/BUILD.bazel index 0618b2e07a1c..92b30b371351 100644 --- a/src/dev-app/toolbar/BUILD.bazel +++ b/src/dev-app/toolbar/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/tooltip/BUILD.bazel b/src/dev-app/tooltip/BUILD.bazel index 2d6f603bb9ec..b4c84a62ced6 100644 --- a/src/dev-app/tooltip/BUILD.bazel +++ b/src/dev-app/tooltip/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/tree/BUILD.bazel b/src/dev-app/tree/BUILD.bazel index 42e83fa28a95..51651d4297d8 100644 --- a/src/dev-app/tree/BUILD.bazel +++ b/src/dev-app/tree/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/typography/BUILD.bazel b/src/dev-app/typography/BUILD.bazel index b1a5f5b8fdbc..00fe07546d2f 100644 --- a/src/dev-app/typography/BUILD.bazel +++ b/src/dev-app/typography/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/virtual-scroll/BUILD.bazel b/src/dev-app/virtual-scroll/BUILD.bazel index 6be4c82703c6..d43b818fde4b 100644 --- a/src/dev-app/virtual-scroll/BUILD.bazel +++ b/src/dev-app/virtual-scroll/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/dev-app/youtube-player/BUILD.bazel b/src/dev-app/youtube-player/BUILD.bazel index bc4120ca5616..6621f5f4aa3b 100644 --- a/src/dev-app/youtube-player/BUILD.bazel +++ b/src/dev-app/youtube-player/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/e2e-app/BUILD.bazel b/src/e2e-app/BUILD.bazel index 73157dc326e1..659b2c473d52 100644 --- a/src/e2e-app/BUILD.bazel +++ b/src/e2e-app/BUILD.bazel @@ -1,7 +1,6 @@ load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild") load("@npm//:defs.bzl", "npm_link_all_packages") -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "http_server", "ng_project") +load("//tools:defaults.bzl", "http_server", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/e2e-app/test_suite.bzl b/src/e2e-app/test_suite.bzl index d95e59c8d984..f0a9a9dee8c1 100644 --- a/src/e2e-app/test_suite.bzl +++ b/src/e2e-app/test_suite.bzl @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "protractor_web_test_suite") +load("//tools:defaults.bzl", "protractor_web_test_suite") def e2e_test_suite(name, tags = ["e2e"], deps = []): protractor_web_test_suite( diff --git a/src/google-maps/BUILD.bazel b/src/google-maps/BUILD.bazel index abb9dc8aeb32..71f46106e101 100644 --- a/src/google-maps/BUILD.bazel +++ b/src/google-maps/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "ng_package", "ng_web_test_suite") -load("//tools:defaults2.bzl", "ng_project", "ts_project") +load("//tools:defaults.bzl", "ng_package", "ng_project", "ng_web_test_suite", "ts_project") load("@aspect_rules_ts//ts:defs.bzl", rules_js_tsconfig = "ts_config") package(default_visibility = ["//visibility:public"]) diff --git a/src/google-maps/schematics/BUILD.bazel b/src/google-maps/schematics/BUILD.bazel index 0587cd67bae9..cbf773d41063 100644 --- a/src/google-maps/schematics/BUILD.bazel +++ b/src/google-maps/schematics/BUILD.bazel @@ -1,5 +1,5 @@ load("@aspect_bazel_lib//lib:copy_to_bin.bzl", "copy_to_bin") -load("//tools:defaults2.bzl", "npm_package", "ts_project") +load("//tools:defaults.bzl", "npm_package", "ts_project") load("@aspect_rules_ts//ts:defs.bzl", rules_js_tsconfig = "ts_config") package(default_visibility = ["//visibility:public"]) diff --git a/src/google-maps/schematics/ng-update/BUILD.bazel b/src/google-maps/schematics/ng-update/BUILD.bazel index 2ba08b29cd45..70c1cd774c17 100644 --- a/src/google-maps/schematics/ng-update/BUILD.bazel +++ b/src/google-maps/schematics/ng-update/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ts_project") +load("//tools:defaults.bzl", "ts_project") ts_project( name = "ng-update", diff --git a/src/google-maps/testing/BUILD.bazel b/src/google-maps/testing/BUILD.bazel index 42ddb4e8ce18..e8809cadb377 100644 --- a/src/google-maps/testing/BUILD.bazel +++ b/src/google-maps/testing/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ts_project") +load("//tools:defaults.bzl", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/material-date-fns-adapter/BUILD.bazel b/src/material-date-fns-adapter/BUILD.bazel index e1692f333278..935ebfc84958 100644 --- a/src/material-date-fns-adapter/BUILD.bazel +++ b/src/material-date-fns-adapter/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "ng_package", "ng_web_test_suite") -load("//tools:defaults2.bzl", "ng_project", "ts_project") +load("//tools:defaults.bzl", "ng_package", "ng_project", "ng_web_test_suite", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/material-date-fns-adapter/schematics/BUILD.bazel b/src/material-date-fns-adapter/schematics/BUILD.bazel index 3b54af999800..ef216aefaae4 100644 --- a/src/material-date-fns-adapter/schematics/BUILD.bazel +++ b/src/material-date-fns-adapter/schematics/BUILD.bazel @@ -1,5 +1,5 @@ load("@aspect_bazel_lib//lib:copy_to_bin.bzl", "copy_to_bin") -load("//tools:defaults2.bzl", "npm_package", "ts_project") +load("//tools:defaults.bzl", "npm_package", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/material-experimental/BUILD.bazel b/src/material-experimental/BUILD.bazel index 7382aa69660c..4e3f9f8b86e5 100644 --- a/src/material-experimental/BUILD.bazel +++ b/src/material-experimental/BUILD.bazel @@ -4,8 +4,7 @@ load( "MATERIAL_EXPERIMENTAL_TARGETS", "MATERIAL_EXPERIMENTAL_TESTING_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"]) diff --git a/src/material-experimental/column-resize/BUILD.bazel b/src/material-experimental/column-resize/BUILD.bazel index 0c7affa8e1e9..c542d186ed38 100644 --- a/src/material-experimental/column-resize/BUILD.bazel +++ b/src/material-experimental/column-resize/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "ng_web_test_suite", "sass_library") -load("//tools:defaults2.bzl", "ng_project", "ts_project") +load("//tools:defaults.bzl", "ng_project", "ng_web_test_suite", "sass_library", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/material-experimental/menubar/BUILD.bazel b/src/material-experimental/menubar/BUILD.bazel index f839f7caf25c..2ec3620b2ed5 100644 --- a/src/material-experimental/menubar/BUILD.bazel +++ b/src/material-experimental/menubar/BUILD.bazel @@ -1,10 +1,11 @@ load( "//tools:defaults.bzl", + "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"]) diff --git a/src/material-experimental/popover-edit/BUILD.bazel b/src/material-experimental/popover-edit/BUILD.bazel index 59de3c89cc5e..5402743e4d0e 100644 --- a/src/material-experimental/popover-edit/BUILD.bazel +++ b/src/material-experimental/popover-edit/BUILD.bazel @@ -1,9 +1,10 @@ load( "//tools:defaults.bzl", + "ng_project", "ng_web_test_suite", "sass_library", + "ts_project", ) -load("//tools:defaults2.bzl", "ng_project", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/material-experimental/selection/BUILD.bazel b/src/material-experimental/selection/BUILD.bazel index 7d632b0a47d3..2cc414f9276d 100644 --- a/src/material-experimental/selection/BUILD.bazel +++ b/src/material-experimental/selection/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary", "sass_library") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary", "sass_library") package(default_visibility = ["//visibility:public"]) diff --git a/src/material-luxon-adapter/BUILD.bazel b/src/material-luxon-adapter/BUILD.bazel index 2c6c4d4cfcb5..9c7c3768d419 100644 --- a/src/material-luxon-adapter/BUILD.bazel +++ b/src/material-luxon-adapter/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "ng_package", "ng_web_test_suite") -load("//tools:defaults2.bzl", "ng_project", "ts_project") +load("//tools:defaults.bzl", "ng_package", "ng_project", "ng_web_test_suite", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/material-luxon-adapter/schematics/BUILD.bazel b/src/material-luxon-adapter/schematics/BUILD.bazel index 1108227a1730..fe2f6bf496e0 100644 --- a/src/material-luxon-adapter/schematics/BUILD.bazel +++ b/src/material-luxon-adapter/schematics/BUILD.bazel @@ -1,5 +1,5 @@ load("@aspect_bazel_lib//lib:copy_to_bin.bzl", "copy_to_bin") -load("//tools:defaults2.bzl", "npm_package", "ts_project") +load("//tools:defaults.bzl", "npm_package", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/material-moment-adapter/BUILD.bazel b/src/material-moment-adapter/BUILD.bazel index eb3a40af61e0..5b05c4ad9eae 100644 --- a/src/material-moment-adapter/BUILD.bazel +++ b/src/material-moment-adapter/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "ng_package", "ng_web_test_suite") -load("//tools:defaults2.bzl", "ng_project", "ts_project") +load("//tools:defaults.bzl", "ng_package", "ng_project", "ng_web_test_suite", "ts_project") load("@npm//:defs.bzl", "npm_link_all_packages") package(default_visibility = ["//visibility:public"]) diff --git a/src/material-moment-adapter/schematics/BUILD.bazel b/src/material-moment-adapter/schematics/BUILD.bazel index 7f32aed7601b..08b55d8dcca8 100644 --- a/src/material-moment-adapter/schematics/BUILD.bazel +++ b/src/material-moment-adapter/schematics/BUILD.bazel @@ -1,5 +1,5 @@ load("@aspect_bazel_lib//lib:copy_to_bin.bzl", "copy_to_bin") -load("//tools:defaults2.bzl", "npm_package", "ts_project") +load("//tools:defaults.bzl", "npm_package", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/material/BUILD.bazel b/src/material/BUILD.bazel index 91d3439ea650..aae5b5bf91be 100644 --- a/src/material/BUILD.bazel +++ b/src/material/BUILD.bazel @@ -5,8 +5,7 @@ load( "MATERIAL_TARGETS", "MATERIAL_TESTING_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") package(default_visibility = ["//visibility:public"]) diff --git a/src/material/autocomplete/BUILD.bazel b/src/material/autocomplete/BUILD.bazel index 60af1b9e64c2..daae0aa320bf 100644 --- a/src/material/autocomplete/BUILD.bazel +++ b/src/material/autocomplete/BUILD.bazel @@ -2,11 +2,12 @@ load( "//tools:defaults.bzl", "extract_tokens", "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"]) diff --git a/src/material/autocomplete/testing/BUILD.bazel b/src/material/autocomplete/testing/BUILD.bazel index be334138e378..e64ded586935 100644 --- a/src/material/autocomplete/testing/BUILD.bazel +++ b/src/material/autocomplete/testing/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"]) diff --git a/src/material/badge/BUILD.bazel b/src/material/badge/BUILD.bazel index d572870325eb..b44cb37fab25 100644 --- a/src/material/badge/BUILD.bazel +++ b/src/material/badge/BUILD.bazel @@ -2,11 +2,12 @@ load( "//tools:defaults.bzl", "extract_tokens", "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"]) diff --git a/src/material/badge/testing/BUILD.bazel b/src/material/badge/testing/BUILD.bazel index 7b749e898b92..b159f93e0132 100644 --- a/src/material/badge/testing/BUILD.bazel +++ b/src/material/badge/testing/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"]) diff --git a/src/material/bottom-sheet/BUILD.bazel b/src/material/bottom-sheet/BUILD.bazel index a7df249eb617..5adb1678c5c9 100644 --- a/src/material/bottom-sheet/BUILD.bazel +++ b/src/material/bottom-sheet/BUILD.bazel @@ -2,11 +2,12 @@ load( "//tools:defaults.bzl", "extract_tokens", "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"]) diff --git a/src/material/bottom-sheet/testing/BUILD.bazel b/src/material/bottom-sheet/testing/BUILD.bazel index b805c132fdf4..2e2dbbb514ac 100644 --- a/src/material/bottom-sheet/testing/BUILD.bazel +++ b/src/material/bottom-sheet/testing/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"]) diff --git a/src/material/button-toggle/BUILD.bazel b/src/material/button-toggle/BUILD.bazel index 505c59b4a24b..2808294ee67b 100644 --- a/src/material/button-toggle/BUILD.bazel +++ b/src/material/button-toggle/BUILD.bazel @@ -2,11 +2,12 @@ load( "//tools:defaults.bzl", "extract_tokens", "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"]) diff --git a/src/material/button-toggle/testing/BUILD.bazel b/src/material/button-toggle/testing/BUILD.bazel index 4a1a400b94f2..afbf985058ef 100644 --- a/src/material/button-toggle/testing/BUILD.bazel +++ b/src/material/button-toggle/testing/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"]) diff --git a/src/material/button/BUILD.bazel b/src/material/button/BUILD.bazel index 02983779025e..036bf223f458 100644 --- a/src/material/button/BUILD.bazel +++ b/src/material/button/BUILD.bazel @@ -2,11 +2,12 @@ load( "//tools:defaults.bzl", "extract_tokens", "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"]) diff --git a/src/material/button/testing/BUILD.bazel b/src/material/button/testing/BUILD.bazel index f97e846bd7c5..2490bd856547 100644 --- a/src/material/button/testing/BUILD.bazel +++ b/src/material/button/testing/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"]) diff --git a/src/material/card/BUILD.bazel b/src/material/card/BUILD.bazel index 1301cd68e52e..1511613d56b5 100644 --- a/src/material/card/BUILD.bazel +++ b/src/material/card/BUILD.bazel @@ -2,11 +2,12 @@ load( "//tools:defaults.bzl", "extract_tokens", "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"]) diff --git a/src/material/card/testing/BUILD.bazel b/src/material/card/testing/BUILD.bazel index c29b59c83fe3..24227e040edf 100644 --- a/src/material/card/testing/BUILD.bazel +++ b/src/material/card/testing/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"]) diff --git a/src/material/checkbox/BUILD.bazel b/src/material/checkbox/BUILD.bazel index 161acdbbd782..443e706556eb 100644 --- a/src/material/checkbox/BUILD.bazel +++ b/src/material/checkbox/BUILD.bazel @@ -2,11 +2,12 @@ load( "//tools:defaults.bzl", "extract_tokens", "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"]) diff --git a/src/material/checkbox/testing/BUILD.bazel b/src/material/checkbox/testing/BUILD.bazel index 1865cbde4684..7ebceee7ad6d 100644 --- a/src/material/checkbox/testing/BUILD.bazel +++ b/src/material/checkbox/testing/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"]) diff --git a/src/material/chips/BUILD.bazel b/src/material/chips/BUILD.bazel index ef8496d1bda8..9b5d385a2155 100644 --- a/src/material/chips/BUILD.bazel +++ b/src/material/chips/BUILD.bazel @@ -2,11 +2,12 @@ load( "//tools:defaults.bzl", "extract_tokens", "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"]) diff --git a/src/material/chips/testing/BUILD.bazel b/src/material/chips/testing/BUILD.bazel index 9346e16f3a19..aa384ffabdbe 100644 --- a/src/material/chips/testing/BUILD.bazel +++ b/src/material/chips/testing/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"]) diff --git a/src/material/core/BUILD.bazel b/src/material/core/BUILD.bazel index 81fa7ffa1ae2..464cf8261e5e 100644 --- a/src/material/core/BUILD.bazel +++ b/src/material/core/BUILD.bazel @@ -2,11 +2,12 @@ load( "//tools:defaults.bzl", "extract_tokens", "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"]) diff --git a/src/material/core/animation/BUILD.bazel b/src/material/core/animation/BUILD.bazel index dbb79b2e7030..832994055274 100644 --- a/src/material/core/animation/BUILD.bazel +++ b/src/material/core/animation/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/material/core/common-behaviors/BUILD.bazel b/src/material/core/common-behaviors/BUILD.bazel index 0ad4cdcdbf1d..556fde453e1c 100644 --- a/src/material/core/common-behaviors/BUILD.bazel +++ b/src/material/core/common-behaviors/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/material/core/datetime/BUILD.bazel b/src/material/core/datetime/BUILD.bazel index 571f52f441e4..2017ce59eea8 100644 --- a/src/material/core/datetime/BUILD.bazel +++ b/src/material/core/datetime/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/material/core/error/BUILD.bazel b/src/material/core/error/BUILD.bazel index 0ae787f1ed67..137c0b3c655a 100644 --- a/src/material/core/error/BUILD.bazel +++ b/src/material/core/error/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/material/core/focus-indicators/BUILD.bazel b/src/material/core/focus-indicators/BUILD.bazel index 1958970228c3..17495d4bbdaf 100644 --- a/src/material/core/focus-indicators/BUILD.bazel +++ b/src/material/core/focus-indicators/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary", "sass_library") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary", "sass_library") package(default_visibility = ["//visibility:public"]) diff --git a/src/material/core/internal-form-field/BUILD.bazel b/src/material/core/internal-form-field/BUILD.bazel index 80e9369e71e9..032b2f748a53 100644 --- a/src/material/core/internal-form-field/BUILD.bazel +++ b/src/material/core/internal-form-field/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary") package(default_visibility = ["//visibility:public"]) diff --git a/src/material/core/option/BUILD.bazel b/src/material/core/option/BUILD.bazel index b268e24bfe9c..7313d8ef22c7 100644 --- a/src/material/core/option/BUILD.bazel +++ b/src/material/core/option/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary", "sass_library") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary", "sass_library") package(default_visibility = ["//visibility:public"]) diff --git a/src/material/core/private/BUILD.bazel b/src/material/core/private/BUILD.bazel index ccce2eb7b86a..e315c676436b 100644 --- a/src/material/core/private/BUILD.bazel +++ b/src/material/core/private/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/material/core/selection/BUILD.bazel b/src/material/core/selection/BUILD.bazel index 206305ac0bd1..925ba5ad6cac 100644 --- a/src/material/core/selection/BUILD.bazel +++ b/src/material/core/selection/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/material/core/selection/pseudo-checkbox/BUILD.bazel b/src/material/core/selection/pseudo-checkbox/BUILD.bazel index 45ae49fa39d9..7fa6756d4d92 100644 --- a/src/material/core/selection/pseudo-checkbox/BUILD.bazel +++ b/src/material/core/selection/pseudo-checkbox/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "sass_binary", "sass_library") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project", "sass_binary", "sass_library") package(default_visibility = ["//visibility:public"]) diff --git a/src/material/core/testing/BUILD.bazel b/src/material/core/testing/BUILD.bazel index 4d74cd5b44f1..fc22908d52e8 100644 --- a/src/material/core/testing/BUILD.bazel +++ b/src/material/core/testing/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"]) diff --git a/src/material/core/theming/tests/BUILD.bazel b/src/material/core/theming/tests/BUILD.bazel index 3466ef95ea48..70e2742092a8 100644 --- a/src/material/core/theming/tests/BUILD.bazel +++ b/src/material/core/theming/tests/BUILD.bazel @@ -1,6 +1,5 @@ load("@bazel_skylib//rules:build_test.bzl", "build_test") -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "jasmine_test", "ts_project") +load("//tools:defaults.bzl", "jasmine_test", "sass_binary", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/material/datepicker/BUILD.bazel b/src/material/datepicker/BUILD.bazel index 509149cd0253..b5865c4b58a4 100644 --- a/src/material/datepicker/BUILD.bazel +++ b/src/material/datepicker/BUILD.bazel @@ -2,11 +2,12 @@ load( "//tools:defaults.bzl", "extract_tokens", "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"]) diff --git a/src/material/datepicker/testing/BUILD.bazel b/src/material/datepicker/testing/BUILD.bazel index a1c678231b5e..ffd3a6c6db22 100644 --- a/src/material/datepicker/testing/BUILD.bazel +++ b/src/material/datepicker/testing/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"]) diff --git a/src/material/dialog/BUILD.bazel b/src/material/dialog/BUILD.bazel index 109ff6cf9e0f..90c49aca6b56 100644 --- a/src/material/dialog/BUILD.bazel +++ b/src/material/dialog/BUILD.bazel @@ -2,11 +2,12 @@ load( "//tools:defaults.bzl", "extract_tokens", "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"]) diff --git a/src/material/dialog/testing/BUILD.bazel b/src/material/dialog/testing/BUILD.bazel index 7b13c71f4218..2b1cd6f68684 100644 --- a/src/material/dialog/testing/BUILD.bazel +++ b/src/material/dialog/testing/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"]) diff --git a/src/material/divider/BUILD.bazel b/src/material/divider/BUILD.bazel index 99a2173aca14..8abebc2803f9 100644 --- a/src/material/divider/BUILD.bazel +++ b/src/material/divider/BUILD.bazel @@ -2,11 +2,12 @@ load( "//tools:defaults.bzl", "extract_tokens", "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"]) diff --git a/src/material/divider/testing/BUILD.bazel b/src/material/divider/testing/BUILD.bazel index d5d712d6cb82..3379032c9103 100644 --- a/src/material/divider/testing/BUILD.bazel +++ b/src/material/divider/testing/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"]) diff --git a/src/material/expansion/BUILD.bazel b/src/material/expansion/BUILD.bazel index 687a1ce1b42d..d0255088ea16 100644 --- a/src/material/expansion/BUILD.bazel +++ b/src/material/expansion/BUILD.bazel @@ -2,11 +2,12 @@ load( "//tools:defaults.bzl", "extract_tokens", "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"]) diff --git a/src/material/expansion/testing/BUILD.bazel b/src/material/expansion/testing/BUILD.bazel index e1bbeb936728..756e8a65e3b1 100644 --- a/src/material/expansion/testing/BUILD.bazel +++ b/src/material/expansion/testing/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"]) diff --git a/src/material/form-field/BUILD.bazel b/src/material/form-field/BUILD.bazel index 4872ca371c53..ccfdbc352d11 100644 --- a/src/material/form-field/BUILD.bazel +++ b/src/material/form-field/BUILD.bazel @@ -2,10 +2,10 @@ load( "//tools:defaults.bzl", "extract_tokens", "markdown_to_html", + "ng_project", "sass_binary", "sass_library", ) -load("//tools:defaults2.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/material/form-field/directives/BUILD.bazel b/src/material/form-field/directives/BUILD.bazel index ff583dd5d324..424473332c17 100644 --- a/src/material/form-field/directives/BUILD.bazel +++ b/src/material/form-field/directives/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/material/form-field/testing/BUILD.bazel b/src/material/form-field/testing/BUILD.bazel index c1df8f7fdbd7..f78aa99b205d 100644 --- a/src/material/form-field/testing/BUILD.bazel +++ b/src/material/form-field/testing/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"]) diff --git a/src/material/form-field/testing/control/BUILD.bazel b/src/material/form-field/testing/control/BUILD.bazel index 6865929b828c..dbe086fe6d21 100644 --- a/src/material/form-field/testing/control/BUILD.bazel +++ b/src/material/form-field/testing/control/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ts_project") +load("//tools:defaults.bzl", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/material/grid-list/BUILD.bazel b/src/material/grid-list/BUILD.bazel index 418681ba121b..b1155f61a9ae 100644 --- a/src/material/grid-list/BUILD.bazel +++ b/src/material/grid-list/BUILD.bazel @@ -2,11 +2,12 @@ load( "//tools:defaults.bzl", "extract_tokens", "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"]) diff --git a/src/material/grid-list/testing/BUILD.bazel b/src/material/grid-list/testing/BUILD.bazel index 6a5267e48a5b..14074ebca648 100644 --- a/src/material/grid-list/testing/BUILD.bazel +++ b/src/material/grid-list/testing/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"]) diff --git a/src/material/icon/BUILD.bazel b/src/material/icon/BUILD.bazel index d1d45141023d..0803279984e6 100644 --- a/src/material/icon/BUILD.bazel +++ b/src/material/icon/BUILD.bazel @@ -2,11 +2,12 @@ load( "//tools:defaults.bzl", "extract_tokens", "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"]) diff --git a/src/material/icon/testing/BUILD.bazel b/src/material/icon/testing/BUILD.bazel index 7a330f074440..e4f1fb185f21 100644 --- a/src/material/icon/testing/BUILD.bazel +++ b/src/material/icon/testing/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"]) diff --git a/src/material/input/BUILD.bazel b/src/material/input/BUILD.bazel index 77c24df09277..d107cf248744 100644 --- a/src/material/input/BUILD.bazel +++ b/src/material/input/BUILD.bazel @@ -2,10 +2,11 @@ load( "//tools:defaults.bzl", "extract_tokens", "markdown_to_html", + "ng_project", "ng_web_test_suite", "sass_library", + "ts_project", ) -load("//tools:defaults2.bzl", "ng_project", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/material/input/testing/BUILD.bazel b/src/material/input/testing/BUILD.bazel index 9dca428dcfde..68e07f70ed1c 100644 --- a/src/material/input/testing/BUILD.bazel +++ b/src/material/input/testing/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"]) diff --git a/src/material/list/BUILD.bazel b/src/material/list/BUILD.bazel index 2545b01e5987..ac1f11f3beeb 100644 --- a/src/material/list/BUILD.bazel +++ b/src/material/list/BUILD.bazel @@ -2,11 +2,12 @@ load( "//tools:defaults.bzl", "extract_tokens", "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"]) diff --git a/src/material/list/testing/BUILD.bazel b/src/material/list/testing/BUILD.bazel index 626ba114d663..200d8bca5b56 100644 --- a/src/material/list/testing/BUILD.bazel +++ b/src/material/list/testing/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"]) diff --git a/src/material/menu/BUILD.bazel b/src/material/menu/BUILD.bazel index bba1651cdbe3..2b2fea4110f3 100644 --- a/src/material/menu/BUILD.bazel +++ b/src/material/menu/BUILD.bazel @@ -2,11 +2,12 @@ load( "//tools:defaults.bzl", "extract_tokens", "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"]) diff --git a/src/material/menu/testing/BUILD.bazel b/src/material/menu/testing/BUILD.bazel index f05c13f0cc8f..a81121dd37ee 100644 --- a/src/material/menu/testing/BUILD.bazel +++ b/src/material/menu/testing/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"]) diff --git a/src/material/paginator/BUILD.bazel b/src/material/paginator/BUILD.bazel index ebb43ba2f612..91168f945372 100644 --- a/src/material/paginator/BUILD.bazel +++ b/src/material/paginator/BUILD.bazel @@ -2,11 +2,12 @@ load( "//tools:defaults.bzl", "extract_tokens", "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"]) diff --git a/src/material/paginator/testing/BUILD.bazel b/src/material/paginator/testing/BUILD.bazel index cc95dad2caa4..f0f67d55ec8a 100644 --- a/src/material/paginator/testing/BUILD.bazel +++ b/src/material/paginator/testing/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"]) diff --git a/src/material/progress-bar/BUILD.bazel b/src/material/progress-bar/BUILD.bazel index 10d90d2e436e..5c63b0ab21de 100644 --- a/src/material/progress-bar/BUILD.bazel +++ b/src/material/progress-bar/BUILD.bazel @@ -2,11 +2,12 @@ load( "//tools:defaults.bzl", "extract_tokens", "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"]) diff --git a/src/material/progress-bar/testing/BUILD.bazel b/src/material/progress-bar/testing/BUILD.bazel index 352ad6a033b7..b5baad321ebf 100644 --- a/src/material/progress-bar/testing/BUILD.bazel +++ b/src/material/progress-bar/testing/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"]) diff --git a/src/material/progress-spinner/BUILD.bazel b/src/material/progress-spinner/BUILD.bazel index 45cf1ebfc8ff..01b39d7354a9 100644 --- a/src/material/progress-spinner/BUILD.bazel +++ b/src/material/progress-spinner/BUILD.bazel @@ -2,11 +2,12 @@ load( "//tools:defaults.bzl", "extract_tokens", "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"]) diff --git a/src/material/progress-spinner/testing/BUILD.bazel b/src/material/progress-spinner/testing/BUILD.bazel index 151dee4f01bf..6dc3e0439cb4 100644 --- a/src/material/progress-spinner/testing/BUILD.bazel +++ b/src/material/progress-spinner/testing/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"]) diff --git a/src/material/radio/BUILD.bazel b/src/material/radio/BUILD.bazel index 4d83d2a0eae3..63b3aa9b60dc 100644 --- a/src/material/radio/BUILD.bazel +++ b/src/material/radio/BUILD.bazel @@ -2,11 +2,12 @@ load( "//tools:defaults.bzl", "extract_tokens", "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"]) diff --git a/src/material/radio/testing/BUILD.bazel b/src/material/radio/testing/BUILD.bazel index 99266e820cdb..1191b213aa20 100644 --- a/src/material/radio/testing/BUILD.bazel +++ b/src/material/radio/testing/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"]) diff --git a/src/material/schematics/BUILD.bazel b/src/material/schematics/BUILD.bazel index 91c6a1617c52..8bafb4f8140f 100644 --- a/src/material/schematics/BUILD.bazel +++ b/src/material/schematics/BUILD.bazel @@ -1,6 +1,6 @@ load("@aspect_bazel_lib//lib:copy_to_bin.bzl", "copy_to_bin") load("@aspect_rules_ts//ts:defs.bzl", rules_js_tsconfig = "ts_config") -load("//tools:defaults2.bzl", "jasmine_test", "npm_package", "ts_project") +load("//tools:defaults.bzl", "jasmine_test", "npm_package", "ts_project") load("@aspect_rules_js//npm:defs.bzl", "npm_link_package") package(default_visibility = ["//visibility:public"]) diff --git a/src/material/schematics/migration-utilities/BUILD.bazel b/src/material/schematics/migration-utilities/BUILD.bazel index f881da5b21c8..36ddf07c8749 100644 --- a/src/material/schematics/migration-utilities/BUILD.bazel +++ b/src/material/schematics/migration-utilities/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "jasmine_test", "ts_project") +load("//tools:defaults.bzl", "jasmine_test", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/material/schematics/ng-generate/theme-color/BUILD.bazel b/src/material/schematics/ng-generate/theme-color/BUILD.bazel index 20c91718f4db..2c09bc59d954 100644 --- a/src/material/schematics/ng-generate/theme-color/BUILD.bazel +++ b/src/material/schematics/ng-generate/theme-color/BUILD.bazel @@ -1,6 +1,6 @@ load("@aspect_bazel_lib//lib:copy_to_bin.bzl", "copy_to_bin") load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild") -load("//tools:defaults2.bzl", "jasmine_test", "ts_project") +load("//tools:defaults.bzl", "jasmine_test", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/material/schematics/ng-update/BUILD.bazel b/src/material/schematics/ng-update/BUILD.bazel index f3245ae312ef..5457154fa98d 100644 --- a/src/material/schematics/ng-update/BUILD.bazel +++ b/src/material/schematics/ng-update/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "jasmine_test", "ts_project") +load("//tools:defaults.bzl", "jasmine_test", "ts_project") load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild") ts_project( diff --git a/src/material/select/BUILD.bazel b/src/material/select/BUILD.bazel index 03ec9950f6da..7e56561a211a 100644 --- a/src/material/select/BUILD.bazel +++ b/src/material/select/BUILD.bazel @@ -2,11 +2,12 @@ load( "//tools:defaults.bzl", "extract_tokens", "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"]) diff --git a/src/material/select/testing/BUILD.bazel b/src/material/select/testing/BUILD.bazel index bcb23ba82e9d..25ae1399dcb5 100644 --- a/src/material/select/testing/BUILD.bazel +++ b/src/material/select/testing/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"]) diff --git a/src/material/sidenav/BUILD.bazel b/src/material/sidenav/BUILD.bazel index b991fd8b60c3..cae8abb4a504 100644 --- a/src/material/sidenav/BUILD.bazel +++ b/src/material/sidenav/BUILD.bazel @@ -2,11 +2,12 @@ load( "//tools:defaults.bzl", "extract_tokens", "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"]) diff --git a/src/material/sidenav/testing/BUILD.bazel b/src/material/sidenav/testing/BUILD.bazel index 27ee4f03781e..a79e0c850578 100644 --- a/src/material/sidenav/testing/BUILD.bazel +++ b/src/material/sidenav/testing/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"]) diff --git a/src/material/slide-toggle/BUILD.bazel b/src/material/slide-toggle/BUILD.bazel index d44b1d3ed0f1..6481aa1e20d9 100644 --- a/src/material/slide-toggle/BUILD.bazel +++ b/src/material/slide-toggle/BUILD.bazel @@ -2,11 +2,12 @@ load( "//tools:defaults.bzl", "extract_tokens", "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"]) diff --git a/src/material/slide-toggle/testing/BUILD.bazel b/src/material/slide-toggle/testing/BUILD.bazel index 38263c705b7d..76cff32b200b 100644 --- a/src/material/slide-toggle/testing/BUILD.bazel +++ b/src/material/slide-toggle/testing/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"]) diff --git a/src/material/slider/BUILD.bazel b/src/material/slider/BUILD.bazel index 93e3d802f53e..2f6ceaaa8017 100644 --- a/src/material/slider/BUILD.bazel +++ b/src/material/slider/BUILD.bazel @@ -3,11 +3,12 @@ load( "//tools:defaults.bzl", "extract_tokens", "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"]) diff --git a/src/material/slider/testing/BUILD.bazel b/src/material/slider/testing/BUILD.bazel index c69b310bcd62..c0a8b9f38b15 100644 --- a/src/material/slider/testing/BUILD.bazel +++ b/src/material/slider/testing/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"]) diff --git a/src/material/snack-bar/BUILD.bazel b/src/material/snack-bar/BUILD.bazel index 104746e4a4e6..853efdcd831b 100644 --- a/src/material/snack-bar/BUILD.bazel +++ b/src/material/snack-bar/BUILD.bazel @@ -2,11 +2,12 @@ load( "//tools:defaults.bzl", "extract_tokens", "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"]) diff --git a/src/material/snack-bar/testing/BUILD.bazel b/src/material/snack-bar/testing/BUILD.bazel index e12a68fb1c3d..7cafc2180c65 100644 --- a/src/material/snack-bar/testing/BUILD.bazel +++ b/src/material/snack-bar/testing/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"]) diff --git a/src/material/sort/BUILD.bazel b/src/material/sort/BUILD.bazel index e25d59c38f48..7a4d034b9a61 100644 --- a/src/material/sort/BUILD.bazel +++ b/src/material/sort/BUILD.bazel @@ -2,11 +2,12 @@ load( "//tools:defaults.bzl", "extract_tokens", "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"]) diff --git a/src/material/sort/testing/BUILD.bazel b/src/material/sort/testing/BUILD.bazel index e0fc57f2cdaa..6dfb9212887d 100644 --- a/src/material/sort/testing/BUILD.bazel +++ b/src/material/sort/testing/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"]) diff --git a/src/material/stepper/BUILD.bazel b/src/material/stepper/BUILD.bazel index e6d7ceae7ea1..72f91b46923d 100644 --- a/src/material/stepper/BUILD.bazel +++ b/src/material/stepper/BUILD.bazel @@ -2,11 +2,12 @@ load( "//tools:defaults.bzl", "extract_tokens", "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"]) diff --git a/src/material/stepper/testing/BUILD.bazel b/src/material/stepper/testing/BUILD.bazel index 9eeed8565d9c..f4d441589b61 100644 --- a/src/material/stepper/testing/BUILD.bazel +++ b/src/material/stepper/testing/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"]) diff --git a/src/material/table/BUILD.bazel b/src/material/table/BUILD.bazel index e5b1e40ebd39..9ff31c27ac8d 100644 --- a/src/material/table/BUILD.bazel +++ b/src/material/table/BUILD.bazel @@ -2,11 +2,12 @@ load( "//tools:defaults.bzl", "extract_tokens", "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"]) diff --git a/src/material/table/testing/BUILD.bazel b/src/material/table/testing/BUILD.bazel index 3a4c756a9029..d3b84765d266 100644 --- a/src/material/table/testing/BUILD.bazel +++ b/src/material/table/testing/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults2.bzl", "ts_project") -load("//tools:defaults.bzl", "ng_web_test_suite") +load("//tools:defaults.bzl", "ng_web_test_suite", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/material/tabs/BUILD.bazel b/src/material/tabs/BUILD.bazel index 6d860b1c1b58..e1125c36b23b 100644 --- a/src/material/tabs/BUILD.bazel +++ b/src/material/tabs/BUILD.bazel @@ -2,11 +2,12 @@ load( "//tools:defaults.bzl", "extract_tokens", "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"]) diff --git a/src/material/tabs/testing/BUILD.bazel b/src/material/tabs/testing/BUILD.bazel index 7ef396f67780..9cb094bb884d 100644 --- a/src/material/tabs/testing/BUILD.bazel +++ b/src/material/tabs/testing/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"]) diff --git a/src/material/testing/BUILD.bazel b/src/material/testing/BUILD.bazel index 011419393213..f977ff3cdfc4 100644 --- a/src/material/testing/BUILD.bazel +++ b/src/material/testing/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults.bzl", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/src/material/timepicker/BUILD.bazel b/src/material/timepicker/BUILD.bazel index a63f790102f0..b63ca8f54fab 100644 --- a/src/material/timepicker/BUILD.bazel +++ b/src/material/timepicker/BUILD.bazel @@ -2,11 +2,12 @@ load( "//tools:defaults.bzl", "extract_tokens", "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"]) diff --git a/src/material/timepicker/testing/BUILD.bazel b/src/material/timepicker/testing/BUILD.bazel index 0cf18d970d6f..867daa21824b 100644 --- a/src/material/timepicker/testing/BUILD.bazel +++ b/src/material/timepicker/testing/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"]) diff --git a/src/material/toolbar/BUILD.bazel b/src/material/toolbar/BUILD.bazel index 45d7910ef7ae..bc4860caab2c 100644 --- a/src/material/toolbar/BUILD.bazel +++ b/src/material/toolbar/BUILD.bazel @@ -2,11 +2,12 @@ load( "//tools:defaults.bzl", "extract_tokens", "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"]) diff --git a/src/material/toolbar/testing/BUILD.bazel b/src/material/toolbar/testing/BUILD.bazel index 9aa33752a5c8..506b7153720b 100644 --- a/src/material/toolbar/testing/BUILD.bazel +++ b/src/material/toolbar/testing/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"]) diff --git a/src/material/tooltip/BUILD.bazel b/src/material/tooltip/BUILD.bazel index a7703950320d..9d6e696bdc55 100644 --- a/src/material/tooltip/BUILD.bazel +++ b/src/material/tooltip/BUILD.bazel @@ -2,11 +2,12 @@ load( "//tools:defaults.bzl", "extract_tokens", "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"]) diff --git a/src/material/tooltip/testing/BUILD.bazel b/src/material/tooltip/testing/BUILD.bazel index f2b4e5443a18..a75aa2d42a0f 100644 --- a/src/material/tooltip/testing/BUILD.bazel +++ b/src/material/tooltip/testing/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"]) diff --git a/src/material/tree/BUILD.bazel b/src/material/tree/BUILD.bazel index 0d398c5775e6..cb4ea6a507aa 100644 --- a/src/material/tree/BUILD.bazel +++ b/src/material/tree/BUILD.bazel @@ -2,11 +2,12 @@ load( "//tools:defaults.bzl", "extract_tokens", "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"]) diff --git a/src/material/tree/testing/BUILD.bazel b/src/material/tree/testing/BUILD.bazel index fe526bf693ee..c30831be175d 100644 --- a/src/material/tree/testing/BUILD.bazel +++ b/src/material/tree/testing/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"]) diff --git a/src/universal-app/BUILD.bazel b/src/universal-app/BUILD.bazel index 4eecc7db6647..e5d73c154a5b 100644 --- a/src/universal-app/BUILD.bazel +++ b/src/universal-app/BUILD.bazel @@ -1,7 +1,6 @@ load("@bazel_skylib//rules:build_test.bzl", "build_test") load("@aspect_rules_js//js:defs.bzl", "js_binary", "js_run_binary") -load("//tools:defaults.bzl", "sass_binary") -load("//tools:defaults2.bzl", "http_server", "ng_project", "protractor_web_test_suite", "ts_project") +load("//tools:defaults.bzl", "http_server", "ng_project", "protractor_web_test_suite", "sass_binary", "ts_project") load("@aspect_rules_ts//ts:defs.bzl", rules_js_tsconfig = "ts_config") load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild") load("//src/cdk:config.bzl", "CDK_TARGETS") diff --git a/src/youtube-player/BUILD.bazel b/src/youtube-player/BUILD.bazel index 94f25134b713..7d720e16dbc8 100644 --- a/src/youtube-player/BUILD.bazel +++ b/src/youtube-player/BUILD.bazel @@ -1,10 +1,11 @@ load( "//tools:defaults.bzl", "ng_package", + "ng_project", "ng_web_test_suite", "sass_binary", + "ts_project", ) -load("//tools:defaults2.bzl", "ng_project", "ts_project") load("@aspect_rules_ts//ts:defs.bzl", rules_js_tsconfig = "ts_config") package(default_visibility = ["//visibility:public"]) diff --git a/src/youtube-player/schematics/BUILD.bazel b/src/youtube-player/schematics/BUILD.bazel index 8c9174af2254..038d26a7d73e 100644 --- a/src/youtube-player/schematics/BUILD.bazel +++ b/src/youtube-player/schematics/BUILD.bazel @@ -1,5 +1,5 @@ load("@aspect_bazel_lib//lib:copy_to_bin.bzl", "copy_to_bin") -load("//tools:defaults2.bzl", "npm_package", "ts_project") +load("//tools:defaults.bzl", "npm_package", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/test/BUILD.bazel b/test/BUILD.bazel index d7f3caf8dff0..fcf31a1ec9e7 100644 --- a/test/BUILD.bazel +++ b/test/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ts_project") +load("//tools:defaults.bzl", "ts_project") load("@aspect_rules_ts//ts:defs.bzl", rules_js_tsconfig = "ts_config") package(default_visibility = ["//visibility:public"]) diff --git a/tools/defaults.bzl b/tools/defaults.bzl index cf62b27e7f4f..94536aa7e108 100644 --- a/tools/defaults.bzl +++ b/tools/defaults.bzl @@ -8,17 +8,23 @@ load("//:pkg-externals.bzl", "PKG_EXTERNALS") load("//tools/markdown-to-html:index.bzl", _markdown_to_html = "markdown_to_html") load("//tools/extract-tokens:index.bzl", _extract_tokens = "extract_tokens") load("//tools/bazel:ng_package_interop.bzl", "ng_package_interop") -load("//tools:defaults2.bzl", _ng_web_test_suite = "ng_web_test_suite") - -npmPackageSubstitutions = select({ - "//tools:stamp": NPM_PACKAGE_SUBSTITUTIONS, - "//conditions:default": NO_STAMP_NPM_PACKAGE_SUBSTITUTIONS, -}) +load("@devinfra//bazel/http-server:index.bzl", _http_server = "http_server") +load("@devinfra//bazel/spec-bundling:index_rjs.bzl", _spec_bundle = "spec_bundle") +load("//tools/bazel:web_test_suite.bzl", _ng_web_test_suite = "ng_web_test_suite") +load("@aspect_rules_js//npm:defs.bzl", _npm_package = "npm_package") +load("@rules_angular//src/ng_package/text_replace:index.bzl", _text_replace = "text_replace") +load("@rules_angular//src/ng_project:index.bzl", _ng_project = "ng_project") +load("@rules_angular//src/ts_project:index.bzl", _ts_project = "ts_project") +load("@devinfra//bazel/ts_project:index.bzl", "strict_deps_test") +load("@aspect_rules_jasmine//jasmine:defs.bzl", _jasmine_test = "jasmine_test") +load("@rules_browsers//src/protractor_test:index.bzl", "protractor_test") # Re-exports to simplify build file load statements markdown_to_html = _markdown_to_html extract_tokens = _extract_tokens ng_web_test_suite = _ng_web_test_suite +spec_bundle = _spec_bundle +http_server = _http_server def sass_binary(sourcemap = False, include_paths = [], **kwargs): _sass_binary( @@ -66,7 +72,10 @@ def ng_package( deps = deps, package = package_name, readme_md = readme_md, - substitutions = npmPackageSubstitutions, + substitutions = select({ + "//tools:stamp": NPM_PACKAGE_SUBSTITUTIONS, + "//conditions:default": NO_STAMP_NPM_PACKAGE_SUBSTITUTIONS, + }), visibility = visibility, rollup_runtime_deps = [ "//:node_modules/@rollup/plugin-commonjs", @@ -96,3 +105,143 @@ def ng_package( interop_deps = deps + package_deps, package_name = package_name, ) + +def npm_package(name, srcs = [], **kwargs): + _text_replace( + name = "%s_substituted" % name, + srcs = srcs, + substitutions = select({ + "//tools:stamp": NPM_PACKAGE_SUBSTITUTIONS, + "//conditions:default": NO_STAMP_NPM_PACKAGE_SUBSTITUTIONS, + }), + ) + _npm_package( + name = name, + srcs = srcs + [ + "%s_substituted" % name, + ], + replace_prefixes = { + "%s_substituted" % name: "/", + }, + allow_overwrites = True, + **kwargs + ) + +def ts_project( + name, + deps = [], + source_map = True, + testonly = False, + tsconfig = None, + visibility = None, + # TODO: Switch this flag as we no longer depend on `interop_deps`. + ignore_strict_deps = True, + **kwargs): + if tsconfig == None and native.package_name().startswith("src"): + tsconfig = "//src:test-tsconfig" if testonly else "//src:build-tsconfig" + + _ts_project( + name = name, + source_map = source_map, + testonly = testonly, + declaration = True, + tsconfig = tsconfig, + visibility = visibility, + deps = deps, + **kwargs + ) + + if not ignore_strict_deps: + strict_deps_test( + name = "%s_strict_deps_test" % name, + srcs = kwargs.get("srcs", []), + deps = deps, + ) + + # TODO(devversion): Partner with ISE team to support `rules_js` here. + # if False and not testonly: + # _make_tsec_test(kwargs["name"]) + +def ng_project( + name, + deps = [], + source_map = True, + testonly = False, + tsconfig = None, + visibility = None, + # TODO: Switch this flag as we no longer depend on `interop_deps`. + ignore_strict_deps = True, + **kwargs): + if tsconfig == None and native.package_name().startswith("src"): + tsconfig = "//src:test-tsconfig" if testonly else "//src:build-tsconfig" + + _ng_project( + name = name, + source_map = source_map, + testonly = testonly, + declaration = True, + tsconfig = tsconfig, + visibility = visibility, + deps = deps, + **kwargs + ) + + if not ignore_strict_deps: + strict_deps_test( + name = "%s_strict_deps_test" % name, + srcs = kwargs.get("srcs", []), + deps = deps, + ) + + # TODO(devversion): Partner with ISE team to support `rules_js` here. + # if False and not testonly: + # _make_tsec_test(kwargs["name"]) + +def jasmine_test(name, data = [], args = [], **kwargs): + # Create relative path to root, from current package dir. Necessary as + # we change the `chdir` below to the package directory. + relative_to_root = "/".join([".."] * len(native.package_name().split("/"))) + + _jasmine_test( + name = name, + node_modules = "//:node_modules", + chdir = native.package_name(), + fixed_args = [ + "--require=%s/node_modules/source-map-support/register.js" % relative_to_root, + "**/*spec.js", + "**/*spec.mjs", + "**/*spec.cjs", + ] + args, + data = data + [ + "//:node_modules/source-map-support", + ], + **kwargs + ) + +def protractor_web_test_suite(name, deps, **kwargs): + spec_bundle( + name = "%s_bundle" % name, + deps = deps, + external = ["protractor", "selenium-webdriver"], + ) + + protractor_test( + name = name, + deps = [":%s_bundle" % name], + extra_config = { + "useAllAngular2AppRoots": True, + "allScriptsTimeout": 120000, + "getPageTimeout": 120000, + "jasmineNodeOpts": { + "defaultTimeoutInterval": 120000, + }, + # Since we want to use async/await we don't want to mix up with selenium's promise + # manager. In order to enforce this, we disable the promise manager. + "SELENIUM_PROMISE_MANAGER": False, + }, + data = [ + "//:node_modules/protractor", + "//:node_modules/selenium-webdriver", + ], + **kwargs + ) diff --git a/tools/defaults2.bzl b/tools/defaults2.bzl deleted file mode 100644 index a726b5c62674..000000000000 --- a/tools/defaults2.bzl +++ /dev/null @@ -1,155 +0,0 @@ -load("@aspect_rules_jasmine//jasmine:defs.bzl", _jasmine_test = "jasmine_test") -load("@aspect_rules_js//npm:defs.bzl", _npm_package = "npm_package") -load("@devinfra//bazel/http-server:index.bzl", _http_server = "http_server") -load("@devinfra//bazel/spec-bundling:index_rjs.bzl", _spec_bundle = "spec_bundle") -load("@rules_angular//src/ng_project:index.bzl", _ng_project = "ng_project") -load("@rules_angular//src/ts_project:index.bzl", _ts_project = "ts_project") -load("@devinfra//bazel/ts_project:index.bzl", "strict_deps_test") -load("@rules_angular//src/ng_package/text_replace:index.bzl", _text_replace = "text_replace") -load("@rules_browsers//src/protractor_test:index.bzl", "protractor_test") -load("//tools/bazel:web_test_suite.bzl", _ng_web_test_suite = "ng_web_test_suite") -load("//:packages.bzl", "NO_STAMP_NPM_PACKAGE_SUBSTITUTIONS", "NPM_PACKAGE_SUBSTITUTIONS") - -spec_bundle = _spec_bundle -http_server = _http_server -ng_web_test_suite = _ng_web_test_suite - -def npm_package(name, srcs = [], **kwargs): - _text_replace( - name = "%s_substituted" % name, - srcs = srcs, - substitutions = select({ - "//tools:stamp": NPM_PACKAGE_SUBSTITUTIONS, - "//conditions:default": NO_STAMP_NPM_PACKAGE_SUBSTITUTIONS, - }), - ) - _npm_package( - name = name, - srcs = srcs + [ - "%s_substituted" % name, - ], - replace_prefixes = { - "%s_substituted" % name: "/", - }, - allow_overwrites = True, - **kwargs - ) - -def ts_project( - name, - deps = [], - source_map = True, - testonly = False, - tsconfig = None, - visibility = None, - # TODO: Switch this flag as we no longer depend on `interop_deps`. - ignore_strict_deps = True, - **kwargs): - if tsconfig == None and native.package_name().startswith("src"): - tsconfig = "//src:test-tsconfig" if testonly else "//src:build-tsconfig" - - _ts_project( - name = name, - source_map = source_map, - testonly = testonly, - declaration = True, - tsconfig = tsconfig, - visibility = visibility, - deps = deps, - **kwargs - ) - - if not ignore_strict_deps: - strict_deps_test( - name = "%s_strict_deps_test" % name, - srcs = kwargs.get("srcs", []), - deps = deps, - ) - - # TODO(devversion): Partner with ISE team to support `rules_js` here. - # if False and not testonly: - # _make_tsec_test(kwargs["name"]) - -def ng_project( - name, - deps = [], - source_map = True, - testonly = False, - tsconfig = None, - visibility = None, - # TODO: Switch this flag as we no longer depend on `interop_deps`. - ignore_strict_deps = True, - **kwargs): - if tsconfig == None and native.package_name().startswith("src"): - tsconfig = "//src:test-tsconfig" if testonly else "//src:build-tsconfig" - - _ng_project( - name = name, - source_map = source_map, - testonly = testonly, - declaration = True, - tsconfig = tsconfig, - visibility = visibility, - deps = deps, - **kwargs - ) - - if not ignore_strict_deps: - strict_deps_test( - name = "%s_strict_deps_test" % name, - srcs = kwargs.get("srcs", []), - deps = deps, - ) - - # TODO(devversion): Partner with ISE team to support `rules_js` here. - # if False and not testonly: - # _make_tsec_test(kwargs["name"]) - -def jasmine_test(name, data = [], args = [], **kwargs): - # Create relative path to root, from current package dir. Necessary as - # we change the `chdir` below to the package directory. - relative_to_root = "/".join([".."] * len(native.package_name().split("/"))) - - _jasmine_test( - name = name, - node_modules = "//:node_modules", - chdir = native.package_name(), - fixed_args = [ - "--require=%s/node_modules/source-map-support/register.js" % relative_to_root, - "**/*spec.js", - "**/*spec.mjs", - "**/*spec.cjs", - ] + args, - data = data + [ - "//:node_modules/source-map-support", - ], - **kwargs - ) - -def protractor_web_test_suite(name, deps, **kwargs): - spec_bundle( - name = "%s_bundle" % name, - deps = deps, - external = ["protractor", "selenium-webdriver"], - ) - - protractor_test( - name = name, - deps = [":%s_bundle" % name], - extra_config = { - "useAllAngular2AppRoots": True, - "allScriptsTimeout": 120000, - "getPageTimeout": 120000, - "jasmineNodeOpts": { - "defaultTimeoutInterval": 120000, - }, - # Since we want to use async/await we don't want to mix up with selenium's promise - # manager. In order to enforce this, we disable the promise manager. - "SELENIUM_PROMISE_MANAGER": False, - }, - data = [ - "//:node_modules/protractor", - "//:node_modules/selenium-webdriver", - ], - **kwargs - ) diff --git a/tools/dgeni/BUILD.bazel b/tools/dgeni/BUILD.bazel index 5627a7a08417..4290621514c2 100644 --- a/tools/dgeni/BUILD.bazel +++ b/tools/dgeni/BUILD.bazel @@ -1,5 +1,5 @@ load("@aspect_rules_js//js:defs.bzl", "js_binary") -load("//tools:defaults2.bzl", "ts_project") +load("//tools:defaults.bzl", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/tools/example-module/BUILD.bazel b/tools/example-module/BUILD.bazel index d92c4da1c841..aca7320c0b85 100644 --- a/tools/example-module/BUILD.bazel +++ b/tools/example-module/BUILD.bazel @@ -1,5 +1,5 @@ load("@aspect_rules_js//js:defs.bzl", "js_binary") -load("//tools:defaults2.bzl", "ts_project") +load("//tools:defaults.bzl", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/tools/extract-tokens/BUILD.bazel b/tools/extract-tokens/BUILD.bazel index f315fcf60aee..8f4763b38ccd 100644 --- a/tools/extract-tokens/BUILD.bazel +++ b/tools/extract-tokens/BUILD.bazel @@ -1,5 +1,5 @@ load("@aspect_rules_js//js:defs.bzl", "js_binary") -load("//tools:defaults2.bzl", "ts_project") +load("//tools:defaults.bzl", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/tools/highlight-files/BUILD.bazel b/tools/highlight-files/BUILD.bazel index 68b4973cc228..c59808a8dd5a 100644 --- a/tools/highlight-files/BUILD.bazel +++ b/tools/highlight-files/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ts_project") +load("//tools:defaults.bzl", "ts_project") load("@aspect_rules_js//js:defs.bzl", "js_binary") package(default_visibility = ["//visibility:public"]) diff --git a/tools/markdown-to-html/BUILD.bazel b/tools/markdown-to-html/BUILD.bazel index 755ed473aa58..0a0a08a74051 100644 --- a/tools/markdown-to-html/BUILD.bazel +++ b/tools/markdown-to-html/BUILD.bazel @@ -1,5 +1,5 @@ load("@aspect_rules_js//js:defs.bzl", "js_binary") -load("//tools:defaults2.bzl", "jasmine_test", "ts_project") +load("//tools:defaults.bzl", "jasmine_test", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/tools/package-docs-content/BUILD.bazel b/tools/package-docs-content/BUILD.bazel index 59e86b74096e..df0c28117dbb 100644 --- a/tools/package-docs-content/BUILD.bazel +++ b/tools/package-docs-content/BUILD.bazel @@ -1,5 +1,5 @@ load("@aspect_rules_js//js:defs.bzl", "js_binary") -load("//tools:defaults2.bzl", "ts_project") +load("//tools:defaults.bzl", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/tools/postcss/BUILD.bazel b/tools/postcss/BUILD.bazel index 6e679581ed43..cc1419e24e88 100644 --- a/tools/postcss/BUILD.bazel +++ b/tools/postcss/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ts_project") +load("//tools:defaults.bzl", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/tools/region-parser/BUILD.bazel b/tools/region-parser/BUILD.bazel index 75db002c01f2..5af8f96805c5 100644 --- a/tools/region-parser/BUILD.bazel +++ b/tools/region-parser/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ts_project") +load("//tools:defaults.bzl", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/tools/sass/BUILD.bazel b/tools/sass/BUILD.bazel index b1da3e20bf0f..b82b32a5ed1c 100644 --- a/tools/sass/BUILD.bazel +++ b/tools/sass/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults2.bzl", "ts_project") +load("//tools:defaults.bzl", "ts_project") package(default_visibility = ["//visibility:public"])