Skip to content

Commit 29a9ee6

Browse files
committed
Revert "build: migrate all cross-package targets to use first-party links"
This reverts commit bca1ac9.
1 parent 9a30a0a commit 29a9ee6

File tree

239 files changed

+1269
-660
lines changed

Some content is hidden

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

239 files changed

+1269
-660
lines changed

.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
integration/package.json=-620011313
66
package.json=-635422980
77
patches/@angular__compiler-cli.patch=-65319555
8-
pnpm-lock.yaml=-1708159829
8+
pnpm-lock.yaml=-1494189058
99
pnpm-workspace.yaml=334858811
10-
src/cdk-experimental/package.json=237487315
10+
src/cdk-experimental/package.json=2063150503
1111
src/cdk/package.json=-908433069
12-
src/components-examples/package.json=-2087309525
12+
src/components-examples/package.json=560048349
1313
src/dev-app/package.json=624475908
1414
src/e2e-app/package.json=-1971485006
1515
src/google-maps/package.json=-886415500
1616
src/material-date-fns-adapter/package.json=-332076964
17-
src/material-experimental/package.json=-1707816737
17+
src/material-experimental/package.json=592784609
1818
src/material-luxon-adapter/package.json=-199007660
1919
src/material-moment-adapter/package.json=-1407689629
2020
src/material/package.json=-1237533685

pnpm-lock.yaml

-36
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/cdk-experimental/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ load("//src/cdk-experimental:config.bzl", "CDK_EXPERIMENTAL_TARGETS")
22
load("//tools:defaults.bzl", "ng_package")
33
load("//tools:defaults2.bzl", "ts_project")
44
load("//tools/bazel:legacy_target.bzl", "get_legacy_label")
5-
load("@npm2//:defs.bzl", "npm_link_all_packages")
5+
load("@npm2//defs:bzl", "npm_link_all_packages")
66

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

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

+6-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,12 @@ ng_project(
1212
"//:node_modules/@angular/common",
1313
"//:node_modules/@angular/core",
1414
"//:node_modules/rxjs",
15-
"//src/cdk-experimental:node_modules/@angular/cdk",
1615
"//src/cdk-experimental/popover-edit",
16+
"//src/cdk/bidi",
17+
"//src/cdk/coercion",
18+
"//src/cdk/keycodes",
19+
"//src/cdk/overlay",
20+
"//src/cdk/portal",
21+
"//src/cdk/table",
1722
],
1823
)

src/cdk-experimental/combobox/BUILD.bazel

+6-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@ ng_project(
1313
"//:node_modules/@angular/common",
1414
"//:node_modules/@angular/core",
1515
"//src:dev_mode_types",
16-
"//src/cdk-experimental:node_modules/@angular/cdk",
16+
"//src/cdk/a11y",
17+
"//src/cdk/bidi",
18+
"//src/cdk/collections",
19+
"//src/cdk/overlay",
1720
],
1821
)
1922

@@ -28,7 +31,8 @@ ts_project(
2831
":combobox",
2932
"//:node_modules/@angular/core",
3033
"//:node_modules/@angular/platform-browser",
31-
"//src/cdk-experimental:node_modules/@angular/cdk",
34+
"//src/cdk/keycodes",
35+
"//src/cdk/testing/private",
3236
],
3337
)
3438

src/cdk-experimental/listbox/BUILD.bazel

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ ng_project(
1010
),
1111
deps = [
1212
"//:node_modules/@angular/core",
13-
"//src/cdk-experimental:node_modules/@angular/cdk",
1413
"//src/cdk-experimental/ui-patterns",
14+
"//src/cdk/a11y",
15+
"//src/cdk/bidi",
1516
],
1617
)

src/cdk-experimental/package.json

-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
"@angular/cdk": "0.0.0-PLACEHOLDER",
1616
"@angular/core": "0.0.0-NG"
1717
},
18-
"devDependencies": {
19-
"@angular/cdk": "workspace:*"
20-
},
2118
"dependencies": {
2219
"tslib": "^2.3.0"
2320
},

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

+12-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,12 @@ ng_project(
1414
"//:node_modules/@angular/core",
1515
"//:node_modules/@angular/forms",
1616
"//:node_modules/rxjs",
17-
"//src/cdk-experimental:node_modules/@angular/cdk",
17+
"//src/cdk/a11y",
18+
"//src/cdk/bidi",
19+
"//src/cdk/keycodes",
20+
"//src/cdk/overlay",
21+
"//src/cdk/portal",
22+
"//src/cdk/scrolling",
1823
],
1924
)
2025

@@ -31,7 +36,12 @@ ts_project(
3136
"//:node_modules/@angular/core",
3237
"//:node_modules/@angular/forms",
3338
"//:node_modules/rxjs",
34-
"//src/cdk-experimental:node_modules/@angular/cdk",
39+
"//src/cdk/bidi",
40+
"//src/cdk/collections",
41+
"//src/cdk/keycodes",
42+
"//src/cdk/overlay",
43+
"//src/cdk/table",
44+
"//src/cdk/testing/private",
3545
],
3646
)
3747

src/cdk-experimental/scrolling/BUILD.bazel

+4-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ ng_project(
1414
"//:node_modules/@angular/core",
1515
"//:node_modules/rxjs",
1616
"//src:dev_mode_types",
17-
"//src/cdk-experimental:node_modules/@angular/cdk",
17+
"//src/cdk/coercion",
18+
"//src/cdk/collections",
19+
"//src/cdk/scrolling",
1820
],
1921
)
2022

@@ -28,7 +30,7 @@ ts_project(
2830
deps = [
2931
":scrolling",
3032
"//:node_modules/@angular/core",
31-
"//src/cdk-experimental:node_modules/@angular/cdk",
33+
"//src/cdk/scrolling",
3234
],
3335
)
3436

src/cdk-experimental/selection/BUILD.bazel

+4-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ ng_project(
1515
"//:node_modules/@angular/forms",
1616
"//:node_modules/rxjs",
1717
"//src:dev_mode_types",
18-
"//src/cdk-experimental:node_modules/@angular/cdk",
18+
"//src/cdk/coercion",
19+
"//src/cdk/collections",
20+
"//src/cdk/table",
1921
],
2022
)
2123

@@ -30,7 +32,7 @@ ts_project(
3032
":selection",
3133
"//:node_modules/@angular/common",
3234
"//:node_modules/@angular/core",
33-
"//src/cdk-experimental:node_modules/@angular/cdk",
35+
"//src/cdk/table",
3436
"//src/cdk/testing/private",
3537
],
3638
)

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

+7-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ ng_project(
1616
"//:node_modules/@angular/common",
1717
"//:node_modules/@angular/core",
1818
"//:node_modules/rxjs",
19-
"//src/cdk-experimental:node_modules/@angular/cdk",
19+
"//src/cdk/a11y",
20+
"//src/cdk/bidi",
21+
"//src/cdk/platform",
22+
"//src/cdk/table",
2023
],
2124
)
2225

@@ -31,7 +34,9 @@ ts_project(
3134
":table-scroll-container",
3235
"//:node_modules/@angular/core",
3336
"//:node_modules/rxjs",
34-
"//src/cdk-experimental:node_modules/@angular/cdk",
37+
"//src/cdk/collections",
38+
"//src/cdk/platform",
39+
"//src/cdk/table",
3540
],
3641
)
3742

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ ts_project(
2727
deps = [
2828
":listbox",
2929
"//:node_modules/@angular/core",
30-
"//src/cdk-experimental:node_modules/@angular/cdk",
30+
"//src/cdk/keycodes",
31+
"//src/cdk/testing/private",
3132
],
3233
)
3334

src/cdk/config.bzl

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ CDK_ENTRYPOINTS = [
2424
"text-field",
2525
"tree",
2626
"testing",
27-
"testing/private",
2827
"testing/testbed",
2928
"testing/selenium-webdriver",
3029
"private",

src/cdk/schematics/BUILD.bazel

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
load("@build_bazel_rules_nodejs//:index.bzl", "copy_to_bin")
2-
load("//tools:defaults2.bzl", "jasmine_test", "npm_package", "ts_project")
2+
load("//tools:defaults.bzl", "jasmine_node_test")
3+
load("//tools:defaults2.bzl", "npm_package", "ts_project")
34
load("@aspect_rules_ts//ts:defs.bzl", rules_js_tsconfig = "ts_config")
45

56
package(default_visibility = ["//visibility:public"])
@@ -90,10 +91,10 @@ ts_project(
9091
],
9192
)
9293

93-
jasmine_test(
94+
jasmine_node_test(
9495
name = "unit_tests",
96+
srcs = [":unit_test_sources_legacy"],
9597
data = [
9698
":schematics_assets",
97-
":unit_test_sources",
9899
],
99100
)

src/cdk/testing/private/BUILD.bazel

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ package(default_visibility = ["//visibility:public"])
44

55
ts_project(
66
name = "private",
7+
testonly = True,
78
srcs = glob(
89
["**/*.ts"],
910
exclude = ["**/*.spec.ts"],
@@ -14,8 +15,3 @@ ts_project(
1415
"//src/cdk/testing/testbed",
1516
],
1617
)
17-
18-
filegroup(
19-
name = "source-files",
20-
srcs = glob(["**/*.ts"]),
21-
)

src/components-examples/BUILD.bazel

+1-9
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,9 @@ load("//tools/package-docs-content:index.bzl", "package_docs_content")
44
load(":config.bzl", "ALL_EXAMPLES")
55
load("//tools:defaults2.bzl", "ng_project")
66
load("//tools/bazel:legacy_target.bzl", "get_legacy_label")
7-
load("@npm2//:defs.bzl", "npm_link_all_packages")
87

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

11-
npm_link_all_packages()
12-
1310
ng_project(
1411
name = "components-examples",
1512
srcs = glob(
@@ -18,7 +15,6 @@ ng_project(
1815
) + [":example-module.ts"],
1916
deps = [
2017
"//:node_modules/@angular/core",
21-
"//src/components-examples:node_modules/@angular/cdk",
2218
] + ALL_EXAMPLES,
2319
)
2420

@@ -63,16 +59,12 @@ package_docs_content(
6359

6460
ng_package(
6561
name = "npm_package",
66-
package_name = "@angular/components-examples",
6762
srcs = ["package.json"],
6863
# this is a workaround to store a tree artifact in the ng_package.
6964
# ng_package does not properly handle tree artifacts currently so we escalate to nested_packages
7065
nested_packages = [":docs-content"],
7166
tags = ["docs-package"],
72-
deps = [
73-
":components-examples_legacy",
74-
"//src/components-examples/private:private_legacy",
75-
] + [get_legacy_label(t) for t in ALL_EXAMPLES],
67+
deps = [":components-examples_legacy"] + [get_legacy_label(t) for t in ALL_EXAMPLES],
7668
)
7769

7870
genrule(

src/components-examples/cdk-experimental/listbox/BUILD.bazel

+4-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ ng_project(
1212
deps = [
1313
"//:node_modules/@angular/core",
1414
"//:node_modules/@angular/forms",
15-
"//src/components-examples:node_modules/@angular/cdk",
16-
"//src/components-examples:node_modules/@angular/cdk-experimental",
17-
"//src/components-examples:node_modules/@angular/material",
15+
"//src/cdk-experimental/listbox",
16+
"//src/material/checkbox",
17+
"//src/material/form-field",
18+
"//src/material/select",
1819
],
1920
)
2021

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ ng_project(
1313
"//:node_modules/@angular/core",
1414
"//:node_modules/@angular/forms",
1515
"//:node_modules/rxjs",
16-
"//src/components-examples:node_modules/@angular/cdk",
17-
"//src/components-examples:node_modules/@angular/cdk-experimental",
16+
"//src/cdk-experimental/popover-edit",
17+
"//src/cdk/collections",
18+
"//src/cdk/table",
1819
],
1920
)
2021

src/components-examples/cdk-experimental/selection/BUILD.bazel

+4-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@ ng_project(
1313
"//:node_modules/@angular/common",
1414
"//:node_modules/@angular/core",
1515
"//:node_modules/@angular/forms",
16-
"//src/components-examples:node_modules/@angular/cdk",
17-
"//src/components-examples:node_modules/@angular/cdk-experimental",
18-
"//src/components-examples:node_modules/@angular/material",
16+
"//src/cdk-experimental/selection",
17+
"//src/cdk/collections",
18+
"//src/cdk/table",
19+
"//src/material/checkbox",
1920
],
2021
)
2122

src/components-examples/cdk/a11y/BUILD.bazel

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ ng_project(
1212
deps = [
1313
"//:node_modules/@angular/core",
1414
"//:node_modules/rxjs",
15-
"//src/components-examples:node_modules/@angular/cdk",
16-
"//src/components-examples:node_modules/@angular/material",
15+
"//src/cdk/a11y",
16+
"//src/material/select",
1717
],
1818
)
1919

src/components-examples/cdk/accordion/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ng_project(
1111
]),
1212
deps = [
1313
"//:node_modules/@angular/core",
14-
"//src/components-examples:node_modules/@angular/cdk",
14+
"//src/cdk/accordion",
1515
],
1616
)
1717

src/components-examples/cdk/clipboard/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ng_project(
1212
deps = [
1313
"//:node_modules/@angular/core",
1414
"//:node_modules/@angular/forms",
15-
"//src/components-examples:node_modules/@angular/cdk",
15+
"//src/cdk/clipboard",
1616
],
1717
)
1818

0 commit comments

Comments
 (0)