Skip to content

Commit 8b1f579

Browse files
ci(pie-monorepo): DSW-2400 refactor generate:component-statuses script (#1838)
* ci(pie-monorepo): DSW-2400 add turbo caching for generate:component-statuses script * ci(pie-monorepo): DSW-2400 refactor generate:component-statuses script * Increase verbosity * Use arrow functions in docs site shortcode exports * Update whitespace in docs site snapshot test * Undo docs linting changes to move to another PR * Exclude dev packages from component status cache * Remove unneeded turbo token from copy job
1 parent a5fa3c0 commit 8b1f579

File tree

8 files changed

+65
-37
lines changed

8 files changed

+65
-37
lines changed

.changeset/ninety-monkeys-run.md

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
"pie-storybook": patch
3+
"pie-docs": patch
4+
"pie-monorepo": patch
5+
---
6+
7+
[Changed] - Add caching for `generate:component-statuses` build.
8+
[Added] - New `copy:component-statuses` script for `pie-docs` and `pie-storybook` which copies the status file from the root.

apps/pie-docs/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"build:dev": "DEPLOYMENT_ENVIRONMENT='development' eleventy",
1313
"clean": "run -T rimraf dist",
1414
"dev": "npx @11ty/eleventy --serve --port=8080",
15-
"generate:component-statuses": "npx generate-component-statuses",
15+
"copy:component-statuses": "cp -v ../../component-statuses.json .",
1616
"lint:scripts": "run -T eslint .",
1717
"lint:scripts:fix": "run -T eslint . --fix",
1818
"lint:style": "run -T stylelint ./src/**/*.{css,scss}",

apps/pie-docs/turbo.json

+8-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"dependsOn": [
1414
"^build",
1515
"clean",
16-
"generate:component-statuses"
16+
"copy:component-statuses"
1717
],
1818
"outputs": [
1919
"dist/**"
@@ -23,7 +23,7 @@
2323
"cache": true,
2424
"dependsOn": [
2525
"^build",
26-
"generate:component-statuses"
26+
"copy:component-statuses"
2727
]
2828
},
2929
"dev": {
@@ -32,6 +32,12 @@
3232
"build:dev"
3333
]
3434
},
35+
"copy:component-statuses": {
36+
"dependsOn": [
37+
"//#generate:component-statuses"
38+
],
39+
"cache": false
40+
},
3541
"test:generate-routes": {
3642
"cache": true,
3743
"dependsOn": [

apps/pie-storybook/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"build": "storybook build --output-dir dist && cp -R ./static ./dist",
99
"lint:scripts": "run -T eslint .",
1010
"lint:scripts:fix": "run -T eslint . --fix",
11-
"generate:component-statuses": "npx generate-component-statuses"
11+
"copy:component-statuses": "cp -v ../../component-statuses.json ."
1212
},
1313
"author": "Just Eat Takeaway.com - Design System Team",
1414
"license": "Apache-2.0",

apps/pie-storybook/turbo.json

+8-2
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,21 @@
88
"cache": false,
99
"dependsOn": [
1010
"^build",
11-
"generate:component-statuses"
11+
"copy:component-statuses"
1212
]
1313
},
1414
"build": {
1515
"cache": true,
1616
"dependsOn": [
1717
"^build",
18-
"generate:component-statuses"
18+
"copy:component-statuses"
1919
]
20+
},
21+
"copy:component-statuses": {
22+
"dependsOn": [
23+
"//#generate:component-statuses"
24+
],
25+
"cache": false
2026
}
2127
}
2228
}

package.json

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
"clean": "turbo run clean --filter=!pie-monorepo",
3535
"cz": "./packages/tools/pie-git-hooks-scripts/check-branch-name.js $(git symbolic-ref --short HEAD) && ./node_modules/cz-customizable/standalone.js",
3636
"dev": "turbo run dev --filter=!pie-monorepo",
37+
"copy:component-statuses": "cross-env-shell turbo run copy:component-statuses --filter=!pie-monorepo",
3738
"generate:component-statuses": "npx generate-component-statuses",
3839
"generate:examples": "cross-env-shell turbo run generate:examples --filter=!pie-monorepo --token=${TURBO_TOKEN}",
3940
"lint:config:fix": "eslint --fix turbo.json (packages|apps)/**/turbo.json",

turbo.json

+12-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"dependsOn": [
77
"^build",
88
"build:react-wrapper",
9-
"generate:component-statuses"
9+
"//#generate:component-statuses"
1010
],
1111
"outputs": [
1212
"dist/**"
@@ -55,12 +55,19 @@
5555
".output/**"
5656
]
5757
},
58-
"generate:component-statuses": {
59-
"cache": false,
58+
"//#generate:component-statuses": {
59+
"cache": true,
60+
"inputs": [
61+
"packages/components/**/package.json",
62+
"!packages/components/pie-webc",
63+
"!packages/components/pie-webc-core",
64+
"!packages/components/pie-webc-testing"
65+
],
6066
"outputs": [
61-
"**/component-statuses.json"
67+
"component-statuses.json"
6268
]
6369
},
70+
"copy:component-statuses": {},
6471
"watch": {
6572
"cache": true,
6673
"dependsOn": []
@@ -167,7 +174,7 @@
167174
"cache": false,
168175
"dependsOn": [
169176
"^build",
170-
"generate:component-statuses"
177+
"//#generate:component-statuses"
171178
]
172179
}
173180
}

yarn.lock

+26-26
Original file line numberDiff line numberDiff line change
@@ -5453,7 +5453,7 @@ __metadata:
54535453
languageName: unknown
54545454
linkType: soft
54555455

5456-
"@justeattakeaway/[email protected].0, @justeattakeaway/generator-pie-component@workspace:packages/tools/generator-pie-component":
5456+
"@justeattakeaway/[email protected].1, @justeattakeaway/generator-pie-component@workspace:packages/tools/generator-pie-component":
54575457
version: 0.0.0-use.local
54585458
resolution: "@justeattakeaway/generator-pie-component@workspace:packages/tools/generator-pie-component"
54595459
dependencies:
@@ -5493,7 +5493,7 @@ __metadata:
54935493
languageName: unknown
54945494
linkType: soft
54955495

5496-
"@justeattakeaway/[email protected].0, @justeattakeaway/pie-card@workspace:packages/components/pie-card":
5496+
"@justeattakeaway/[email protected].1, @justeattakeaway/pie-card@workspace:packages/components/pie-card":
54975497
version: 0.0.0-use.local
54985498
resolution: "@justeattakeaway/pie-card@workspace:packages/components/pie-card"
54995499
dependencies:
@@ -5532,7 +5532,7 @@ __metadata:
55325532
languageName: unknown
55335533
linkType: soft
55345534

5535-
"@justeattakeaway/[email protected].2, @justeattakeaway/pie-chip@workspace:packages/components/pie-chip":
5535+
"@justeattakeaway/[email protected].3, @justeattakeaway/pie-chip@workspace:packages/components/pie-chip":
55365536
version: 0.0.0-use.local
55375537
resolution: "@justeattakeaway/pie-chip@workspace:packages/components/pie-chip"
55385538
dependencies:
@@ -5736,7 +5736,7 @@ __metadata:
57365736
languageName: unknown
57375737
linkType: soft
57385738

5739-
"@justeattakeaway/[email protected].1, @justeattakeaway/pie-lottie-player@workspace:packages/components/pie-lottie-player":
5739+
"@justeattakeaway/[email protected].2, @justeattakeaway/pie-lottie-player@workspace:packages/components/pie-lottie-player":
57405740
version: 0.0.0-use.local
57415741
resolution: "@justeattakeaway/pie-lottie-player@workspace:packages/components/pie-lottie-player"
57425742
dependencies:
@@ -5770,7 +5770,7 @@ __metadata:
57705770
languageName: unknown
57715771
linkType: soft
57725772

5773-
"@justeattakeaway/pie-notification@0.10.2, @justeattakeaway/pie-notification@workspace:packages/components/pie-notification":
5773+
"@justeattakeaway/pie-notification@0.11.0, @justeattakeaway/pie-notification@workspace:packages/components/pie-notification":
57745774
version: 0.0.0-use.local
57755775
resolution: "@justeattakeaway/pie-notification@workspace:packages/components/pie-notification"
57765776
dependencies:
@@ -5785,7 +5785,7 @@ __metadata:
57855785
languageName: unknown
57865786
linkType: soft
57875787

5788-
"@justeattakeaway/pie-radio-group@0.0.0, @justeattakeaway/pie-radio-group@workspace:packages/components/pie-radio-group":
5788+
"@justeattakeaway/pie-radio-group@0.1.0, @justeattakeaway/pie-radio-group@workspace:packages/components/pie-radio-group":
57895789
version: 0.0.0-use.local
57905790
resolution: "@justeattakeaway/pie-radio-group@workspace:packages/components/pie-radio-group"
57915791
dependencies:
@@ -5917,27 +5917,27 @@ __metadata:
59175917
languageName: unknown
59185918
linkType: soft
59195919

5920-
"@justeattakeaway/[email protected].31, @justeattakeaway/pie-webc@workspace:packages/components/pie-webc":
5920+
"@justeattakeaway/[email protected].33, @justeattakeaway/pie-webc@workspace:packages/components/pie-webc":
59215921
version: 0.0.0-use.local
59225922
resolution: "@justeattakeaway/pie-webc@workspace:packages/components/pie-webc"
59235923
dependencies:
59245924
"@justeattakeaway/pie-assistive-text": 0.7.1
59255925
"@justeattakeaway/pie-button": 0.49.1
5926-
"@justeattakeaway/pie-card": 0.20.0
5926+
"@justeattakeaway/pie-card": 0.20.1
59275927
"@justeattakeaway/pie-checkbox": 0.12.3
59285928
"@justeattakeaway/pie-checkbox-group": 0.7.0
5929-
"@justeattakeaway/pie-chip": 0.8.2
5929+
"@justeattakeaway/pie-chip": 0.8.3
59305930
"@justeattakeaway/pie-components-config": 0.18.0
59315931
"@justeattakeaway/pie-cookie-banner": 0.26.4
59325932
"@justeattakeaway/pie-divider": 0.14.0
59335933
"@justeattakeaway/pie-form-label": 0.14.1
59345934
"@justeattakeaway/pie-icon-button": 0.28.12
59355935
"@justeattakeaway/pie-link": 0.18.0
5936-
"@justeattakeaway/pie-lottie-player": 0.0.1
5936+
"@justeattakeaway/pie-lottie-player": 0.0.2
59375937
"@justeattakeaway/pie-modal": 0.46.2
5938-
"@justeattakeaway/pie-notification": 0.10.2
5938+
"@justeattakeaway/pie-notification": 0.11.0
59395939
"@justeattakeaway/pie-radio": 0.0.0
5940-
"@justeattakeaway/pie-radio-group": 0.0.0
5940+
"@justeattakeaway/pie-radio-group": 0.1.0
59415941
"@justeattakeaway/pie-spinner": 0.7.0
59425942
"@justeattakeaway/pie-switch": 0.30.1
59435943
"@justeattakeaway/pie-tag": 0.10.0
@@ -26174,7 +26174,7 @@ __metadata:
2617426174
"@commitlint/config-conventional": 17.4.4
2617526175
"@justeat/pie-design-tokens": 6.4.0
2617626176
"@justeattakeaway/browserslist-config-pie": 0.2.0
26177-
"@justeattakeaway/generator-pie-component": 0.22.0
26177+
"@justeattakeaway/generator-pie-component": 0.22.1
2617826178
"@justeattakeaway/pie-icons": 4.19.1
2617926179
"@justeattakeaway/pie-webc-testing": 0.13.3
2618026180
"@justeattakeaway/pie-wrapper-react": 0.14.1
@@ -26236,10 +26236,10 @@ __metadata:
2623626236
"@justeat/pie-design-tokens": 6.3.1
2623726237
"@justeattakeaway/pie-assistive-text": 0.7.1
2623826238
"@justeattakeaway/pie-button": 0.49.1
26239-
"@justeattakeaway/pie-card": 0.20.0
26239+
"@justeattakeaway/pie-card": 0.20.1
2624026240
"@justeattakeaway/pie-checkbox": 0.12.3
2624126241
"@justeattakeaway/pie-checkbox-group": 0.7.0
26242-
"@justeattakeaway/pie-chip": 0.8.2
26242+
"@justeattakeaway/pie-chip": 0.8.3
2624326243
"@justeattakeaway/pie-cookie-banner": 0.26.4
2624426244
"@justeattakeaway/pie-css": 0.12.1
2624526245
"@justeattakeaway/pie-divider": 0.14.0
@@ -26249,9 +26249,9 @@ __metadata:
2624926249
"@justeattakeaway/pie-icons-webc": 0.25.1
2625026250
"@justeattakeaway/pie-link": 0.18.0
2625126251
"@justeattakeaway/pie-modal": 0.46.2
26252-
"@justeattakeaway/pie-notification": 0.10.2
26252+
"@justeattakeaway/pie-notification": 0.11.0
2625326253
"@justeattakeaway/pie-radio": 0.0.0
26254-
"@justeattakeaway/pie-radio-group": 0.0.0
26254+
"@justeattakeaway/pie-radio-group": 0.1.0
2625526255
"@justeattakeaway/pie-spinner": 0.7.0
2625626256
"@justeattakeaway/pie-switch": 0.30.1
2625726257
"@justeattakeaway/pie-tag": 0.10.0
@@ -34188,7 +34188,7 @@ __metadata:
3418834188
"@angular/platform-browser-dynamic": 15.2.0
3418934189
"@angular/router": 15.2.0
3419034190
"@justeattakeaway/pie-css": 0.12.1
34191-
"@justeattakeaway/pie-webc": 0.5.31
34191+
"@justeattakeaway/pie-webc": 0.5.33
3419234192
rxjs: 7.8.0
3419334193
tslib: 2.3.0
3419434194
typescript: 4.9.4
@@ -34205,7 +34205,7 @@ __metadata:
3420534205
"@babel/preset-env": 7.24.5
3420634206
"@babel/preset-react": 7.24.1
3420734207
"@justeattakeaway/pie-css": 0.12.1
34208-
"@justeattakeaway/pie-webc": 0.5.31
34208+
"@justeattakeaway/pie-webc": 0.5.33
3420934209
"@lit/react": 1.0.2
3421034210
babel-loader: 8
3421134211
eslint: 8.37.0
@@ -34222,7 +34222,7 @@ __metadata:
3422234222
resolution: "wc-next13@workspace:apps/examples/wc-next13"
3422334223
dependencies:
3422434224
"@justeattakeaway/pie-css": 0.12.1
34225-
"@justeattakeaway/pie-webc": 0.5.31
34225+
"@justeattakeaway/pie-webc": 0.5.33
3422634226
"@lit-labs/nextjs": 0.2.0
3422734227
"@lit/react": 1.0.5
3422834228
"@types/react": 18.3.3
@@ -34245,7 +34245,7 @@ __metadata:
3424534245
dependencies:
3424634246
"@babel/preset-env": 7.24.5
3424734247
"@justeattakeaway/pie-css": 0.12.1
34248-
"@justeattakeaway/pie-webc": 0.5.31
34248+
"@justeattakeaway/pie-webc": 0.5.33
3424934249
babel-loader: 8
3425034250
core-js: 3.30.0
3425134251
nuxt: 2.17.0
@@ -34260,7 +34260,7 @@ __metadata:
3426034260
resolution: "wc-nuxt3@workspace:apps/examples/wc-nuxt3"
3426134261
dependencies:
3426234262
"@justeattakeaway/pie-css": 0.12.1
34263-
"@justeattakeaway/pie-webc": 0.5.31
34263+
"@justeattakeaway/pie-webc": 0.5.33
3426434264
"@types/node": 18
3426534265
nuxt: 3.4.3
3426634266
nuxt-ssr-lit: 1.6.5
@@ -34272,7 +34272,7 @@ __metadata:
3427234272
resolution: "wc-react17@workspace:apps/examples/wc-react17"
3427334273
dependencies:
3427434274
"@justeattakeaway/pie-css": 0.12.1
34275-
"@justeattakeaway/pie-webc": 0.5.31
34275+
"@justeattakeaway/pie-webc": 0.5.33
3427634276
"@lit/react": 1.0.5
3427734277
"@types/react": ^17.0.2
3427834278
"@types/react-dom": ^17.0.2
@@ -34292,7 +34292,7 @@ __metadata:
3429234292
resolution: "wc-react18@workspace:apps/examples/wc-react18"
3429334293
dependencies:
3429434294
"@justeattakeaway/pie-css": 0.12.1
34295-
"@justeattakeaway/pie-webc": 0.5.31
34295+
"@justeattakeaway/pie-webc": 0.5.33
3429634296
"@lit/react": 1.0.5
3429734297
"@types/react": 18.3.3
3429834298
"@types/react-dom": 18.3.0
@@ -34314,7 +34314,7 @@ __metadata:
3431434314
"@justeat/pie-design-tokens": 6.3.1
3431534315
"@justeattakeaway/pie-css": 0.12.1
3431634316
"@justeattakeaway/pie-icons-webc": 0.25.1
34317-
"@justeattakeaway/pie-webc": 0.5.31
34317+
"@justeattakeaway/pie-webc": 0.5.33
3431834318
vite: 4.5.3
3431934319
languageName: unknown
3432034320
linkType: soft
@@ -34324,7 +34324,7 @@ __metadata:
3432434324
resolution: "wc-vue3@workspace:apps/examples/wc-vue3"
3432534325
dependencies:
3432634326
"@justeattakeaway/pie-css": 0.12.1
34327-
"@justeattakeaway/pie-webc": 0.5.31
34327+
"@justeattakeaway/pie-webc": 0.5.33
3432834328
"@types/node": 18.15.11
3432934329
"@vitejs/plugin-vue": 4.0.0
3433034330
"@vue/tsconfig": 0.1.3

0 commit comments

Comments
 (0)