Skip to content

Commit e500a8e

Browse files
josephperrottjosephperrott
authored
build: merge the default.bzl and default2.bzl files (#30953)
1 parent 764a1cc commit e500a8e

File tree

307 files changed

+517
-628
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

307 files changed

+517
-628
lines changed

‎integration/module-tests/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("//tools:defaults2.bzl", "ts_project")
1+
load("//tools:defaults.bzl", "ts_project")
22
load("//integration/module-tests:index.bzl", "module_test")
33

44
ts_project(

‎src/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ load("@aspect_bazel_lib//lib:copy_to_bin.bzl", "copy_to_bin")
33
load("//src/cdk:config.bzl", "CDK_ENTRYPOINTS")
44
load("//src/material:config.bzl", "MATERIAL_ENTRYPOINTS", "MATERIAL_TESTING_ENTRYPOINTS")
55
load("//tools/dgeni:index.bzl", "dgeni_api_docs")
6-
load("//tools:defaults2.bzl", "ts_project")
6+
load("//tools:defaults.bzl", "ts_project")
77
load("@aspect_rules_js//js:defs.bzl", "js_library")
88

99
package(default_visibility = ["//visibility:public"])

‎src/cdk-experimental/BUILD.bazel

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
load("//src/cdk-experimental:config.bzl", "CDK_EXPERIMENTAL_TARGETS")
2-
load("//tools:defaults.bzl", "ng_package")
3-
load("//tools:defaults2.bzl", "ts_project")
2+
load("//tools:defaults.bzl", "ng_package", "ts_project")
43
load("@npm//:defs.bzl", "npm_link_all_packages")
54

65
package(default_visibility = ["//visibility:public"])

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("//tools:defaults2.bzl", "ng_project")
1+
load("//tools:defaults.bzl", "ng_project")
22

33
package(default_visibility = ["//visibility:public"])
44

‎src/cdk-experimental/combobox/BUILD.bazel

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
load("//tools:defaults.bzl", "ng_web_test_suite")
2-
load("//tools:defaults2.bzl", "ng_project", "ts_project")
1+
load("//tools:defaults.bzl", "ng_project", "ng_web_test_suite", "ts_project")
32

43
package(default_visibility = ["//visibility:public"])
54

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
load("//tools:defaults.bzl", "ng_web_test_suite")
2-
load("//tools:defaults2.bzl", "ng_project", "ts_project")
1+
load("//tools:defaults.bzl", "ng_project", "ng_web_test_suite", "ts_project")
32

43
package(default_visibility = ["//visibility:public"])
54

‎src/cdk-experimental/listbox/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("//tools:defaults2.bzl", "ng_project")
1+
load("//tools:defaults.bzl", "ng_project")
22

33
package(default_visibility = ["//visibility:public"])
44

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
load("//tools:defaults.bzl", "ng_web_test_suite")
2-
load("//tools:defaults2.bzl", "ng_project", "ts_project")
1+
load("//tools:defaults.bzl", "ng_project", "ng_web_test_suite", "ts_project")
32

43
package(default_visibility = ["//visibility:public"])
54

‎src/cdk-experimental/scrolling/BUILD.bazel

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
load("//src/e2e-app:test_suite.bzl", "e2e_test_suite")
2-
load("//tools:defaults.bzl", "ng_web_test_suite")
3-
load("//tools:defaults2.bzl", "ng_project", "ts_project")
2+
load("//tools:defaults.bzl", "ng_project", "ng_web_test_suite", "ts_project")
43

54
package(default_visibility = ["//visibility:public"])
65

‎src/cdk-experimental/selection/BUILD.bazel

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
load("//tools:defaults.bzl", "ng_web_test_suite")
2-
load("//tools:defaults2.bzl", "ng_project", "ts_project")
1+
load("//tools:defaults.bzl", "ng_project", "ng_web_test_suite", "ts_project")
32

43
package(default_visibility = ["//visibility:public"])
54

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
load(
22
"//tools:defaults.bzl",
3+
"ng_project",
34
"ng_web_test_suite",
5+
"ts_project",
46
)
5-
load("//tools:defaults2.bzl", "ng_project", "ts_project")
67

78
package(default_visibility = ["//visibility:public"])
89

‎src/cdk-experimental/tabs/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("//tools:defaults2.bzl", "ng_project")
1+
load("//tools:defaults.bzl", "ng_project")
22

33
package(default_visibility = ["//visibility:public"])
44

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("//tools:defaults2.bzl", "ts_project")
1+
load("//tools:defaults.bzl", "ts_project")
22

33
package(default_visibility = ["//visibility:public"])
44

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("//tools:defaults2.bzl", "ts_project")
1+
load("//tools:defaults.bzl", "ts_project")
22

33
package(default_visibility = ["//visibility:public"])
44

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
load("//tools:defaults.bzl", "ng_web_test_suite")
2-
load("//tools:defaults2.bzl", "ts_project")
1+
load("//tools:defaults.bzl", "ng_web_test_suite", "ts_project")
32

43
package(default_visibility = ["//visibility:public"])
54

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
load("//tools:defaults.bzl", "ng_web_test_suite")
2-
load("//tools:defaults2.bzl", "ts_project")
1+
load("//tools:defaults.bzl", "ng_web_test_suite", "ts_project")
32

43
package(default_visibility = ["//visibility:public"])
54

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
load("//tools:defaults.bzl", "ng_web_test_suite")
2-
load("//tools:defaults2.bzl", "ts_project")
1+
load("//tools:defaults.bzl", "ng_web_test_suite", "ts_project")
32

43
package(default_visibility = ["//visibility:public"])
54

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
load("//tools:defaults.bzl", "ng_web_test_suite")
2-
load("//tools:defaults2.bzl", "ts_project")
1+
load("//tools:defaults.bzl", "ng_web_test_suite", "ts_project")
32

43
package(default_visibility = ["//visibility:public"])
54

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("//tools:defaults2.bzl", "ts_project")
1+
load("//tools:defaults.bzl", "ts_project")
22

33
package(default_visibility = ["//visibility:public"])
44

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
load("//tools:defaults.bzl", "ng_web_test_suite")
2-
load("//tools:defaults2.bzl", "ts_project")
1+
load("//tools:defaults.bzl", "ng_web_test_suite", "ts_project")
32

43
package(default_visibility = ["//visibility:public"])
54

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("//tools:defaults2.bzl", "ts_project")
1+
load("//tools:defaults.bzl", "ts_project")
22

33
package(default_visibility = ["//visibility:public"])
44

‎src/cdk/BUILD.bazel

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
load("//src/cdk:config.bzl", "CDK_ENTRYPOINTS", "CDK_ENTRYPOINTS_WITH_STYLES", "CDK_SCSS_LIBS", "CDK_TARGETS")
2-
load("//tools:defaults.bzl", "ng_package", "sass_library")
3-
load("//tools:defaults2.bzl", "ts_project")
2+
load("//tools:defaults.bzl", "ng_package", "sass_library", "ts_project")
43
load("@npm//:defs.bzl", "npm_link_all_packages")
54

65
package(default_visibility = ["//visibility:public"])

‎src/cdk/a11y/BUILD.bazel

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
load(
22
"//tools:defaults.bzl",
33
"markdown_to_html",
4+
"ng_project",
45
"ng_web_test_suite",
56
"sass_binary",
67
"sass_library",
8+
"ts_project",
79
)
8-
load("//tools:defaults2.bzl", "ng_project", "ts_project")
910

1011
package(default_visibility = ["//visibility:public"])
1112

‎src/cdk/accordion/BUILD.bazel

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
load(
22
"//tools:defaults.bzl",
33
"markdown_to_html",
4+
"ng_project",
45
"ng_web_test_suite",
6+
"ts_project",
57
)
6-
load("//tools:defaults2.bzl", "ng_project", "ts_project")
78

89
package(default_visibility = ["//visibility:public"])
910

‎src/cdk/bidi/BUILD.bazel

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
load(
22
"//tools:defaults.bzl",
33
"markdown_to_html",
4+
"ng_project",
45
"ng_web_test_suite",
6+
"ts_project",
57
)
6-
load("//tools:defaults2.bzl", "ng_project", "ts_project")
78

89
package(default_visibility = ["//visibility:public"])
910

‎src/cdk/clipboard/BUILD.bazel

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
load("//tools:defaults.bzl", "markdown_to_html", "ng_web_test_suite")
2-
load("//tools:defaults2.bzl", "ng_project", "ts_project")
1+
load("//tools:defaults.bzl", "markdown_to_html", "ng_project", "ng_web_test_suite", "ts_project")
32

43
package(default_visibility = ["//visibility:public"])
54

‎src/cdk/coercion/BUILD.bazel

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
load("//tools:defaults.bzl", "markdown_to_html")
2-
load("//tools:defaults2.bzl", "ng_web_test_suite", "ts_project")
1+
load("//tools:defaults.bzl", "markdown_to_html", "ng_web_test_suite", "ts_project")
32

43
package(default_visibility = ["//visibility:public"])
54

‎src/cdk/coercion/private/BUILD.bazel

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
load(
22
"//tools:defaults.bzl",
3+
"ng_project",
34
"ng_web_test_suite",
5+
"ts_project",
46
)
5-
load("//tools:defaults2.bzl", "ng_project", "ts_project")
67

78
package(default_visibility = ["//visibility:public"])
89

‎src/cdk/collections/BUILD.bazel

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
load(
22
"//tools:defaults.bzl",
33
"markdown_to_html",
4+
"ng_project",
45
"ng_web_test_suite",
6+
"ts_project",
57
)
6-
load("//tools:defaults2.bzl", "ts_project")
7-
load("//tools:defaults2.bzl", "ng_project")
88

99
package(default_visibility = ["//visibility:public"])
1010

‎src/cdk/dialog/BUILD.bazel

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
load(
22
"//tools:defaults.bzl",
33
"markdown_to_html",
4+
"ng_project",
45
"ng_web_test_suite",
56
"sass_binary",
7+
"ts_project",
68
)
7-
load("//tools:defaults2.bzl", "ng_project", "ts_project")
89

910
package(default_visibility = ["//visibility:public"])
1011

‎src/cdk/drag-drop/BUILD.bazel

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
load(
22
"//tools:defaults.bzl",
33
"markdown_to_html",
4+
"ng_project",
45
"ng_web_test_suite",
56
"sass_binary",
7+
"ts_project",
68
)
7-
load("//tools:defaults2.bzl", "ng_project", "ts_project")
89

910
package(default_visibility = ["//visibility:public"])
1011

‎src/cdk/keycodes/BUILD.bazel

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
load("//tools:defaults.bzl", "markdown_to_html")
2-
load("//tools:defaults2.bzl", "ng_project", "ng_web_test_suite", "ts_project")
1+
load("//tools:defaults.bzl", "markdown_to_html", "ng_project", "ng_web_test_suite", "ts_project")
32

43
package(default_visibility = ["//visibility:public"])
54

‎src/cdk/layout/BUILD.bazel

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
load(
22
"//tools:defaults.bzl",
33
"markdown_to_html",
4+
"ng_project",
45
"ng_web_test_suite",
6+
"ts_project",
57
)
6-
load("//tools:defaults2.bzl", "ng_project", "ts_project")
78

89
package(default_visibility = ["//visibility:public"])
910

‎src/cdk/listbox/BUILD.bazel

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
load("//tools:defaults.bzl", "markdown_to_html", "ng_web_test_suite")
2-
load("//tools:defaults2.bzl", "ng_project", "ts_project")
1+
load("//tools:defaults.bzl", "markdown_to_html", "ng_project", "ng_web_test_suite", "ts_project")
32

43
package(default_visibility = ["//visibility:public"])
54

‎src/cdk/menu/BUILD.bazel

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
load(
22
"//tools:defaults.bzl",
33
"markdown_to_html",
4+
"ng_project",
45
"ng_web_test_suite",
6+
"ts_project",
57
)
6-
load("//tools:defaults2.bzl", "ng_project", "ts_project")
78

89
package(default_visibility = ["//visibility:public"])
910

‎src/cdk/observers/BUILD.bazel

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
load(
22
"//tools:defaults.bzl",
33
"markdown_to_html",
4+
"ng_project",
45
"ng_web_test_suite",
6+
"ts_project",
57
)
6-
load("//tools:defaults2.bzl", "ng_project", "ts_project")
78

89
package(default_visibility = ["//visibility:public"])
910

‎src/cdk/observers/private/BUILD.bazel

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
load(
22
"//tools:defaults.bzl",
3+
"ng_project",
34
"ng_web_test_suite",
5+
"ts_project",
46
)
5-
load("//tools:defaults2.bzl", "ng_project", "ts_project")
67

78
package(default_visibility = ["//visibility:public"])
89

‎src/cdk/overlay/BUILD.bazel

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@ load("//src/e2e-app:test_suite.bzl", "e2e_test_suite")
22
load(
33
"//tools:defaults.bzl",
44
"markdown_to_html",
5+
"ng_project",
56
"ng_web_test_suite",
67
"sass_binary",
78
"sass_library",
9+
"ts_project",
810
)
9-
load("//tools:defaults2.bzl", "ng_project", "ts_project")
1011

1112
package(default_visibility = ["//visibility:public"])
1213

‎src/cdk/platform/BUILD.bazel

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
load("//tools:defaults.bzl", "markdown_to_html")
2-
load("//tools:defaults2.bzl", "ng_project")
1+
load("//tools:defaults.bzl", "markdown_to_html", "ng_project")
32

43
package(default_visibility = ["//visibility:public"])
54

‎src/cdk/portal/BUILD.bazel

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
load(
22
"//tools:defaults.bzl",
33
"markdown_to_html",
4+
"ng_project",
45
"ng_web_test_suite",
6+
"ts_project",
57
)
6-
load("//tools:defaults2.bzl", "ts_project")
7-
load("//tools:defaults2.bzl", "ng_project")
88

99
package(default_visibility = ["//visibility:public"])
1010

‎src/cdk/private/BUILD.bazel

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
load("//tools:defaults.bzl", "markdown_to_html", "sass_binary")
2-
load("//tools:defaults2.bzl", "ng_project")
1+
load("//tools:defaults.bzl", "markdown_to_html", "ng_project", "sass_binary")
32

43
package(default_visibility = ["//visibility:public"])
54

‎src/cdk/schematics/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
load("@aspect_bazel_lib//lib:copy_to_bin.bzl", "copy_to_bin")
2-
load("//tools:defaults2.bzl", "jasmine_test", "npm_package", "ts_project")
2+
load("//tools:defaults.bzl", "jasmine_test", "npm_package", "ts_project")
33
load("@aspect_rules_ts//ts:defs.bzl", rules_js_tsconfig = "ts_config")
44

55
package(default_visibility = [":__subpackages__"])

‎src/cdk/schematics/testing/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("//tools:defaults2.bzl", "ts_project")
1+
load("//tools:defaults.bzl", "ts_project")
22

33
package(default_visibility = ["//visibility:public"])
44

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("//tools:defaults2.bzl", "ts_project")
1+
load("//tools:defaults.bzl", "ts_project")
22

33
package(default_visibility = ["//visibility:public"])
44

‎src/cdk/scrolling/BUILD.bazel

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
load(
22
"//tools:defaults.bzl",
33
"markdown_to_html",
4+
"ng_project",
45
"ng_web_test_suite",
56
"sass_binary",
7+
"ts_project",
68
)
7-
load("//tools:defaults2.bzl", "ng_project", "ts_project")
89

910
package(default_visibility = ["//visibility:public"])
1011

‎src/cdk/stepper/BUILD.bazel

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
load("//tools:defaults.bzl", "markdown_to_html")
2-
load("//tools:defaults2.bzl", "ng_project")
1+
load("//tools:defaults.bzl", "markdown_to_html", "ng_project")
32

43
package(default_visibility = ["//visibility:public"])
54

0 commit comments

Comments
 (0)