Skip to content

Commit fa73902

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 26ca25e commit fa73902

File tree

18 files changed

+2272
-2008
lines changed

18 files changed

+2272
-2008
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,9 +2,22 @@
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=-1190325024
5+
integration/package.json=122088
6+
package.json=1314863161
67
patches/@angular__compiler-cli.patch=-65319555
7-
pnpm-lock.yaml=-1893050781
8-
pnpm-workspace.yaml=14857322
8+
pnpm-lock.yaml=-577830100
9+
pnpm-workspace.yaml=334858811
10+
src/cdk-experimental/package.json=2063150503
911
src/cdk/package.json=-908433069
12+
src/components-examples/package.json=560048349
13+
src/dev-app/package.json=624475908
14+
src/e2e-app/package.json=-1971485006
15+
src/google-maps/package.json=-886415500
16+
src/material-date-fns-adapter/package.json=-332076964
17+
src/material-experimental/package.json=592784609
18+
src/material-luxon-adapter/package.json=-199007660
19+
src/material-moment-adapter/package.json=-1407689629
20+
src/material/package.json=-1237533685
21+
src/universal-app/package.json=346715231
22+
src/youtube-player/package.json=68300461
1023
yarn.lock=230420156

.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-1ebf18a3a60b182a3dbad12e9a149fd93af5c29b.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.
@@ -176,7 +175,20 @@ npm_translate_lock(
176175
"//:package.json",
177176
"//:patches/@angular__compiler-cli.patch",
178177
"//:pnpm-workspace.yaml",
178+
"//integration:package.json",
179179
"//src/cdk:package.json",
180+
"//src/cdk-experimental:package.json",
181+
"//src/components-examples:package.json",
182+
"//src/dev-app:package.json",
183+
"//src/e2e-app:package.json",
184+
"//src/google-maps:package.json",
185+
"//src/material:package.json",
186+
"//src/material-date-fns-adapter:package.json",
187+
"//src/material-experimental:package.json",
188+
"//src/material-luxon-adapter:package.json",
189+
"//src/material-moment-adapter:package.json",
190+
"//src/universal-app:package.json",
191+
"//src/youtube-player:package.json",
180192
],
181193
npmrc = "//:.npmrc",
182194
pnpm_lock = "//:pnpm-lock.yaml",
@@ -258,3 +270,21 @@ rules_angular_step3(
258270
angular_compiler_cli = "//:node_modules/@angular/compiler-cli",
259271
typescript = "//:node_modules/typescript",
260272
)
273+
274+
http_archive(
275+
name = "aspect_rules_esbuild",
276+
sha256 = "550e33ddeb86a564b22b2c5d3f84748c6639b1b2b71fae66bf362c33392cbed8",
277+
strip_prefix = "rules_esbuild-0.21.0",
278+
url = "https://github.com/aspect-build/rules_esbuild/releases/download/v0.21.0/rules_esbuild-v0.21.0.tar.gz",
279+
)
280+
281+
load("@aspect_rules_esbuild//esbuild:dependencies.bzl", "rules_esbuild_dependencies")
282+
283+
rules_esbuild_dependencies()
284+
285+
load("@aspect_rules_esbuild//esbuild:repositories.bzl", "LATEST_ESBUILD_VERSION", "esbuild_register_toolchains")
286+
287+
esbuild_register_toolchains(
288+
name = "esbuild",
289+
esbuild_version = LATEST_ESBUILD_VERSION,
290+
)

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": "^20.0.0-next.4",
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
},
@@ -119,7 +122,6 @@
119122
"browser-sync": "2.26.13",
120123
"chalk": "^4.1.0",
121124
"cross-env": "^7.0.3",
122-
"date-fns": "^4.1.0",
123125
"dgeni": "^0.4.14",
124126
"dgeni-packages": "^0.29.5",
125127
"esbuild": "^0.17.5",
@@ -142,10 +144,8 @@
142144
"karma-parallel": "^0.3.1",
143145
"karma-requirejs": "^1.1.0",
144146
"karma-sourcemap-loader": "^0.3.8",
145-
"luxon": "^3.0.0",
146147
"marked": "^2.0.0",
147148
"minimatch": "^3.0.4",
148-
"moment": "^2.29.1",
149149
"node-fetch": "^2.6.0",
150150
"parse5": "^7.1.2",
151151
"patch-package": "^6.5.1",
@@ -196,32 +196,32 @@
196196
},
197197
"@angular/animations": {
198198
"dependencies": {
199-
"@nginfra/angular-linking": "1.0.2"
199+
"@nginfra/angular-linking": "1.0.6"
200200
}
201201
},
202202
"@angular/common": {
203203
"dependencies": {
204-
"@nginfra/angular-linking": "1.0.2"
204+
"@nginfra/angular-linking": "1.0.6"
205205
}
206206
},
207207
"@angular/forms": {
208208
"dependencies": {
209-
"@nginfra/angular-linking": "1.0.2"
209+
"@nginfra/angular-linking": "1.0.6"
210210
}
211211
},
212212
"@angular/platform-browser": {
213213
"dependencies": {
214-
"@nginfra/angular-linking": "1.0.2"
214+
"@nginfra/angular-linking": "1.0.6"
215215
}
216216
},
217217
"@angular/router": {
218218
"dependencies": {
219-
"@nginfra/angular-linking": "1.0.2"
219+
"@nginfra/angular-linking": "1.0.6"
220220
}
221221
},
222222
"@angular/localize": {
223223
"dependencies": {
224-
"@nginfra/angular-linking": "1.0.2"
224+
"@nginfra/angular-linking": "1.0.6"
225225
}
226226
}
227227
}

0 commit comments

Comments
 (0)