Skip to content

Commit 731c952

Browse files
committed
build: migrate all cross-package targets to use first-party links
Instead of e.g. depending on `src/cdk/testing`, we should use the first-party linked package so that npm-module imports like `@angular/cdk` still work. This is the new approach for `rules_js`. It's notably slower, but with the simplicity gained, it's an acceptable trade-off we are taking.
1 parent b102193 commit 731c952

File tree

238 files changed

+699
-1303
lines changed

Some content is hidden

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

238 files changed

+699
-1303
lines changed

.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@
22
# Input hashes for repository rule npm_translate_lock(name = "npm2", pnpm_lock = "@//:pnpm-lock.yaml").
33
# This file should be checked into version control along with the pnpm-lock.yaml file.
44
.npmrc=-1406867100
5-
integration/package.json=122088
5+
integration/package.json=-620011313
66
package.json=1450829053
77
patches/@angular__compiler-cli.patch=-11405367
88
patches/@angular__core.patch=213102054
9-
pnpm-lock.yaml=-475681958
9+
pnpm-lock.yaml=1097062160
1010
pnpm-workspace.yaml=334858811
11-
src/cdk-experimental/package.json=2063150503
11+
src/cdk-experimental/package.json=237487315
1212
src/cdk/package.json=-908433069
13-
src/components-examples/package.json=560048349
13+
src/components-examples/package.json=-2087309525
1414
src/dev-app/package.json=624475908
1515
src/e2e-app/package.json=-1971485006
1616
src/google-maps/package.json=-886415500
1717
src/material-date-fns-adapter/package.json=-332076964
18-
src/material-experimental/package.json=592784609
18+
src/material-experimental/package.json=-1707816737
1919
src/material-luxon-adapter/package.json=-199007660
2020
src/material-moment-adapter/package.json=-1407689629
2121
src/material/package.json=-1237533685

pnpm-lock.yaml

Lines changed: 56 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/cdk-experimental/BUILD.bazel

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,7 @@ ng_project(
1212
"//:node_modules/@angular/common",
1313
"//:node_modules/@angular/core",
1414
"//:node_modules/rxjs",
15+
"//src/cdk-experimental:node_modules/@angular/cdk",
1516
"//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",
2217
],
2318
)

src/cdk-experimental/combobox/BUILD.bazel

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@ ng_project(
1313
"//:node_modules/@angular/common",
1414
"//:node_modules/@angular/core",
1515
"//src:dev_mode_types",
16-
"//src/cdk/a11y",
17-
"//src/cdk/bidi",
18-
"//src/cdk/collections",
19-
"//src/cdk/overlay",
16+
"//src/cdk-experimental:node_modules/@angular/cdk",
2017
],
2118
)
2219

@@ -31,8 +28,7 @@ ts_project(
3128
":combobox",
3229
"//:node_modules/@angular/core",
3330
"//:node_modules/@angular/platform-browser",
34-
"//src/cdk/keycodes",
35-
"//src/cdk/testing/private",
31+
"//src/cdk-experimental:node_modules/@angular/cdk",
3632
],
3733
)
3834

src/cdk-experimental/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
"@angular/cdk": "0.0.0-PLACEHOLDER",
1616
"@angular/core": "0.0.0-NG"
1717
},
18+
"devDependencies": {
19+
"@angular/cdk": "workspace:*"
20+
},
1821
"dependencies": {
1922
"tslib": "^2.3.0"
2023
},

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

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,7 @@ ng_project(
1414
"//:node_modules/@angular/core",
1515
"//:node_modules/@angular/forms",
1616
"//:node_modules/rxjs",
17-
"//src/cdk/a11y",
18-
"//src/cdk/bidi",
19-
"//src/cdk/keycodes",
20-
"//src/cdk/overlay",
21-
"//src/cdk/portal",
22-
"//src/cdk/scrolling",
17+
"//src/cdk-experimental:node_modules/@angular/cdk",
2318
],
2419
)
2520

@@ -36,12 +31,7 @@ ts_project(
3631
"//:node_modules/@angular/core",
3732
"//:node_modules/@angular/forms",
3833
"//:node_modules/rxjs",
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",
34+
"//src/cdk-experimental:node_modules/@angular/cdk",
4535
],
4636
)
4737

src/cdk-experimental/scrolling/BUILD.bazel

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ ng_project(
1414
"//:node_modules/@angular/core",
1515
"//:node_modules/rxjs",
1616
"//src:dev_mode_types",
17-
"//src/cdk/coercion",
18-
"//src/cdk/collections",
19-
"//src/cdk/scrolling",
17+
"//src/cdk-experimental:node_modules/@angular/cdk",
2018
],
2119
)
2220

@@ -30,7 +28,7 @@ ts_project(
3028
deps = [
3129
":scrolling",
3230
"//:node_modules/@angular/core",
33-
"//src/cdk/scrolling",
31+
"//src/cdk-experimental:node_modules/@angular/cdk",
3432
],
3533
)
3634

src/cdk-experimental/selection/BUILD.bazel

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@ ng_project(
1515
"//:node_modules/@angular/forms",
1616
"//:node_modules/rxjs",
1717
"//src:dev_mode_types",
18-
"//src/cdk/coercion",
19-
"//src/cdk/collections",
20-
"//src/cdk/table",
18+
"//src/cdk-experimental:node_modules/@angular/cdk",
2119
],
2220
)
2321

@@ -32,7 +30,7 @@ ts_project(
3230
":selection",
3331
"//:node_modules/@angular/common",
3432
"//:node_modules/@angular/core",
35-
"//src/cdk/table",
33+
"//src/cdk-experimental:node_modules/@angular/cdk",
3634
"//src/cdk/testing/private",
3735
],
3836
)

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

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@ ng_project(
1616
"//:node_modules/@angular/common",
1717
"//:node_modules/@angular/core",
1818
"//:node_modules/rxjs",
19-
"//src/cdk/a11y",
20-
"//src/cdk/bidi",
21-
"//src/cdk/platform",
22-
"//src/cdk/table",
19+
"//src/cdk-experimental:node_modules/@angular/cdk",
2320
],
2421
)
2522

@@ -34,9 +31,7 @@ ts_project(
3431
":table-scroll-container",
3532
"//:node_modules/@angular/core",
3633
"//:node_modules/rxjs",
37-
"//src/cdk/collections",
38-
"//src/cdk/platform",
39-
"//src/cdk/table",
34+
"//src/cdk-experimental:node_modules/@angular/cdk",
4035
],
4136
)
4237

0 commit comments

Comments
 (0)