Skip to content

Commit e8af6be

Browse files
committed
build: setup pnpm workspace for first-party packages
Sets up the pnpm workspace for first party packages, so that we can use those for cross-package references; or real integration testing.
1 parent 2c0a0d9 commit e8af6be

File tree

18 files changed

+2321
-2057
lines changed

18 files changed

+2321
-2057
lines changed

.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,23 @@
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-
package.json=-883436028
5+
integration/package.json=122088
6+
package.json=1450829053
67
patches/@angular__compiler-cli.patch=-11405367
78
patches/@angular__core.patch=213102054
8-
pnpm-lock.yaml=912973730
9-
pnpm-workspace.yaml=14857322
9+
pnpm-lock.yaml=-475681958
10+
pnpm-workspace.yaml=334858811
11+
src/cdk-experimental/package.json=2063150503
1012
src/cdk/package.json=-908433069
13+
src/components-examples/package.json=560048349
14+
src/dev-app/package.json=624475908
15+
src/e2e-app/package.json=-1971485006
16+
src/google-maps/package.json=-886415500
17+
src/material-date-fns-adapter/package.json=-332076964
18+
src/material-experimental/package.json=592784609
19+
src/material-luxon-adapter/package.json=-199007660
20+
src/material-moment-adapter/package.json=-1407689629
21+
src/material/package.json=-1237533685
22+
src/universal-app/package.json=346715231
23+
src/youtube-player/package.json=68300461
1124
yarn.lock=-542661817

.bazelignore

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,17 @@ integration/yarn-pnp-compat/.yarn/unplugged
1818
integration/yarn-pnp-compat/.yarn/install-state.gz
1919
integration/yarn-pnp-compat/node_modules
2020

21+
integration/node_modules
22+
src/cdk-experimental/node_modules
2123
src/cdk/node_modules
24+
src/components-examples/node_modules
25+
src/dev-app/node_modules
26+
src/e2e-app/node_modules
27+
src/google-maps/node_modules
28+
src/material-date-fns-adapter/node_modules
29+
src/material-experimental/node_modules
30+
src/material-luxon-adapter/node_modules
31+
src/material-moment-adapter/node_modules
32+
src/material/node_modules
33+
src/universal-app/node_modules
34+
src/youtube-player/node_modules

WORKSPACE

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ yarn_install(
115115
"//:tools/postinstall/patches/@angular+bazel+20.0.0-next.3.patch",
116116
"//:tools/postinstall/patches/@angular+build-tooling+0.0.0-335a273d3eb2a73c51efb97930fc1e0cd72e0d32.patch",
117117
"//:tools/postinstall/patches/tsec+0.2.2.patch",
118-
"//src/cdk:package.json",
119118
],
120119
# Currently disabled due to:
121120
# 1. Missing Windows support currently.
@@ -177,7 +176,20 @@ npm_translate_lock(
177176
"//:patches/@angular__compiler-cli.patch",
178177
"//:patches/@angular__core.patch",
179178
"//:pnpm-workspace.yaml",
179+
"//integration:package.json",
180180
"//src/cdk:package.json",
181+
"//src/cdk-experimental:package.json",
182+
"//src/components-examples:package.json",
183+
"//src/dev-app:package.json",
184+
"//src/e2e-app:package.json",
185+
"//src/google-maps:package.json",
186+
"//src/material:package.json",
187+
"//src/material-date-fns-adapter:package.json",
188+
"//src/material-experimental:package.json",
189+
"//src/material-luxon-adapter:package.json",
190+
"//src/material-moment-adapter:package.json",
191+
"//src/universal-app:package.json",
192+
"//src/youtube-player:package.json",
181193
],
182194
npmrc = "//:.npmrc",
183195
pnpm_lock = "//:pnpm-lock.yaml",
@@ -259,3 +271,21 @@ rules_angular_step3(
259271
angular_compiler_cli = "//:node_modules/@angular/compiler-cli",
260272
typescript = "//:node_modules/typescript",
261273
)
274+
275+
http_archive(
276+
name = "aspect_rules_esbuild",
277+
sha256 = "550e33ddeb86a564b22b2c5d3f84748c6639b1b2b71fae66bf362c33392cbed8",
278+
strip_prefix = "rules_esbuild-0.21.0",
279+
url = "https://github.com/aspect-build/rules_esbuild/releases/download/v0.21.0/rules_esbuild-v0.21.0.tar.gz",
280+
)
281+
282+
load("@aspect_rules_esbuild//esbuild:dependencies.bzl", "rules_esbuild_dependencies")
283+
284+
rules_esbuild_dependencies()
285+
286+
load("@aspect_rules_esbuild//esbuild:repositories.bzl", "LATEST_ESBUILD_VERSION", "esbuild_register_toolchains")
287+
288+
esbuild_register_toolchains(
289+
name = "esbuild",
290+
esbuild_version = LATEST_ESBUILD_VERSION,
291+
)

integration/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{}

package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,11 @@
6262
"@angular/platform-browser": "^19.2.0",
6363
"@types/google.maps": "^3.54.10",
6464
"@types/youtube": "^0.1.0",
65-
"rxjs": "^6.6.7",
65+
"date-fns": "^4.1.0",
66+
"luxon": "^3.0.0",
67+
"moment": "^2.29.1",
6668
"rxjs-tslint-rules": "^4.34.8",
69+
"rxjs": "^6.6.7",
6770
"tslib": "^2.3.1",
6871
"zone.js": "~0.15.0"
6972
},
@@ -120,7 +123,6 @@
120123
"browser-sync": "2.26.13",
121124
"chalk": "^4.1.0",
122125
"cross-env": "^7.0.3",
123-
"date-fns": "^4.1.0",
124126
"dgeni": "^0.4.14",
125127
"dgeni-packages": "^0.29.5",
126128
"esbuild": "^0.17.5",
@@ -143,10 +145,8 @@
143145
"karma-parallel": "^0.3.1",
144146
"karma-requirejs": "^1.1.0",
145147
"karma-sourcemap-loader": "^0.3.8",
146-
"luxon": "^3.0.0",
147148
"marked": "^2.0.0",
148149
"minimatch": "^3.0.4",
149-
"moment": "^2.29.1",
150150
"node-fetch": "^2.6.0",
151151
"parse5": "^7.1.2",
152152
"patch-package": "^6.5.1",
@@ -198,32 +198,32 @@
198198
},
199199
"@angular/animations": {
200200
"dependencies": {
201-
"@nginfra/angular-linking": "1.0.2"
201+
"@nginfra/angular-linking": "1.0.6"
202202
}
203203
},
204204
"@angular/common": {
205205
"dependencies": {
206-
"@nginfra/angular-linking": "1.0.2"
206+
"@nginfra/angular-linking": "1.0.6"
207207
}
208208
},
209209
"@angular/forms": {
210210
"dependencies": {
211-
"@nginfra/angular-linking": "1.0.2"
211+
"@nginfra/angular-linking": "1.0.6"
212212
}
213213
},
214214
"@angular/platform-browser": {
215215
"dependencies": {
216-
"@nginfra/angular-linking": "1.0.2"
216+
"@nginfra/angular-linking": "1.0.6"
217217
}
218218
},
219219
"@angular/router": {
220220
"dependencies": {
221-
"@nginfra/angular-linking": "1.0.2"
221+
"@nginfra/angular-linking": "1.0.6"
222222
}
223223
},
224224
"@angular/localize": {
225225
"dependencies": {
226-
"@nginfra/angular-linking": "1.0.2"
226+
"@nginfra/angular-linking": "1.0.6"
227227
}
228228
}
229229
}

0 commit comments

Comments
 (0)