Skip to content

Commit 1d7be37

Browse files
jandradejandrade
authored
Switch to pnpm catalogs (#2505)
## Summary: Switching to pnpm catalogs to pin dependency versions across packages. This is helpful for ensuring that all packages are using the same version of a dependency, and for making it easier to update dependencies across all packages. https://pnpm.io/catalogs Issue: "none" ## Test plan: Verify that the builds are still passing. Also verify that the components work as expected in Storybook. Author: jandrade Reviewers: jandrade, somewhatabstract, jeremywiebe Required Reviewers: Approved By: somewhatabstract Checks: ✅ 19 checks were successful, ⏭️ 3 checks have been skipped Pull Request URL: #2505
1 parent 999101f commit 1d7be37

File tree

34 files changed

+416
-306
lines changed

34 files changed

+416
-306
lines changed

‎.changeset/hot-wasps-hug.md

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
---
2+
"@khanacademy/wonder-blocks-progress-spinner": patch
3+
"@khanacademy/wonder-blocks-birthday-picker": patch
4+
"@khanacademy/wonder-blocks-labeled-field": patch
5+
"@khanacademy/wonder-blocks-search-field": patch
6+
"@khanacademy/wonder-blocks-testing-core": patch
7+
"@khanacademy/wonder-blocks-breadcrumbs": patch
8+
"@khanacademy/wonder-blocks-icon-button": patch
9+
"@khanacademy/wonder-blocks-typography": patch
10+
"@khanacademy/wonder-blocks-accordion": patch
11+
"@khanacademy/wonder-blocks-clickable": patch
12+
"@khanacademy/wonder-blocks-dropdown": patch
13+
"@khanacademy/wonder-blocks-popover": patch
14+
"@khanacademy/wonder-blocks-testing": patch
15+
"@khanacademy/wonder-blocks-theming": patch
16+
"@khanacademy/wonder-blocks-toolbar": patch
17+
"@khanacademy/wonder-blocks-tooltip": patch
18+
"@khanacademy/wonder-blocks-banner": patch
19+
"@khanacademy/wonder-blocks-button": patch
20+
"@khanacademy/wonder-blocks-layout": patch
21+
"@khanacademy/wonder-blocks-switch": patch
22+
"@khanacademy/wonder-blocks-timing": patch
23+
"@khanacademy/wonder-blocks-modal": patch
24+
"@khanacademy/wonder-blocks-cell": patch
25+
"@khanacademy/wonder-blocks-core": patch
26+
"@khanacademy/wonder-blocks-data": patch
27+
"@khanacademy/wonder-blocks-form": patch
28+
"@khanacademy/wonder-blocks-grid": patch
29+
"@khanacademy/wonder-blocks-icon": patch
30+
"@khanacademy/wonder-blocks-link": patch
31+
"@khanacademy/wonder-blocks-pill": patch
32+
---
33+
34+
Use pnpm catalog to pin dependency versions across packages

‎package.json

+14-16
Original file line numberDiff line numberDiff line change
@@ -129,25 +129,23 @@
129129
"vitest": "^3.0.4"
130130
},
131131
"dependencies": {
132-
"@babel/runtime": "^7.24.5",
133-
"@khanacademy/wonder-stuff-core": "^1.5.4",
134-
"@phosphor-icons/core": "^2.0.2",
135-
"@popperjs/core": "^2.11.8",
136-
"aphrodite": "^1.2.5",
137-
"moment": "2.29.4",
138-
"node-fetch": "^2.6.7",
139-
"react": "18.2.0",
140-
"react-dom": "18.2.0",
141-
"react-popper": "^2.3.0",
142-
"react-router": "5.3.4",
143-
"react-router-dom": "5.3.4",
144-
"react-window": "^1.8.11"
132+
"@babel/runtime": "catalog:",
133+
"@khanacademy/wonder-stuff-core": "catalog:",
134+
"@phosphor-icons/core": "catalog:",
135+
"@popperjs/core": "catalog:",
136+
"aphrodite": "catalog:",
137+
"moment": "catalog:",
138+
"node-fetch": "catalog:",
139+
"react": "catalog:",
140+
"react-dom": "catalog:",
141+
"react-popper": "catalog:",
142+
"react-router": "catalog:",
143+
"react-router-dom": "catalog:",
144+
"react-window": "catalog:"
145145
},
146146
"resolutions": {
147147
"@types/react": "18",
148-
"@types/react-dom": "18",
149-
"strip-ansi": "6.0.1",
150-
"strip-ansi-explanation": "There's an issue with strip-ansi v7 which causes conflicts with the Khan/changeset-per-package action"
148+
"@types/react-dom": "18"
151149
},
152150
"packageManager": "[email protected]+sha512.c89847b0667ddab50396bbbd008a2a43cf3b581efd59cf5d9aa8923ea1fb4b8106c041d540d08acb095037594d73ebc51e1ec89ee40c88b30b8a66c0fae0ac1b"
153151
}

‎packages/wonder-blocks-accordion/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@
1717
"access": "public"
1818
},
1919
"dependencies": {
20-
"@babel/runtime": "^7.24.5",
20+
"@babel/runtime": "catalog:",
2121
"@khanacademy/wonder-blocks-clickable": "workspace:*",
2222
"@khanacademy/wonder-blocks-core": "workspace:*",
2323
"@khanacademy/wonder-blocks-icon": "workspace:*",
2424
"@khanacademy/wonder-blocks-tokens": "workspace:*",
2525
"@khanacademy/wonder-blocks-typography": "workspace:*"
2626
},
2727
"peerDependencies": {
28-
"@phosphor-icons/core": "^2.0.2",
29-
"aphrodite": "^1.2.5",
30-
"react": "18.2.0"
28+
"@phosphor-icons/core": "catalog:",
29+
"aphrodite": "catalog:",
30+
"react": "catalog:"
3131
},
3232
"devDependencies": {
3333
"@khanacademy/wb-dev-build-settings": "workspace:*"

‎packages/wonder-blocks-banner/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"access": "public"
1717
},
1818
"dependencies": {
19-
"@babel/runtime": "^7.24.5",
19+
"@babel/runtime": "catalog:",
2020
"@khanacademy/wonder-blocks-button": "workspace:*",
2121
"@khanacademy/wonder-blocks-core": "workspace:*",
2222
"@khanacademy/wonder-blocks-icon": "workspace:*",
@@ -26,9 +26,9 @@
2626
"@khanacademy/wonder-blocks-typography": "workspace:*"
2727
},
2828
"peerDependencies": {
29-
"@phosphor-icons/core": "^2.0.2",
30-
"aphrodite": "^1.2.5",
31-
"react": "18.2.0"
29+
"@phosphor-icons/core": "catalog:",
30+
"aphrodite": "catalog:",
31+
"react": "catalog:"
3232
},
3333
"devDependencies": {
3434
"@khanacademy/wb-dev-build-settings": "workspace:*"

‎packages/wonder-blocks-birthday-picker/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"prepublishOnly": "../../utils/publish/package-pre-publish-check.sh"
1515
},
1616
"dependencies": {
17-
"@babel/runtime": "^7.24.5",
17+
"@babel/runtime": "catalog:",
1818
"@khanacademy/wonder-blocks-core": "workspace:*",
1919
"@khanacademy/wonder-blocks-dropdown": "workspace:*",
2020
"@khanacademy/wonder-blocks-icon": "workspace:*",
@@ -23,10 +23,10 @@
2323
"@khanacademy/wonder-blocks-typography": "workspace:*"
2424
},
2525
"peerDependencies": {
26-
"@phosphor-icons/core": "^2.0.2",
27-
"aphrodite": "^1.2.5",
28-
"moment": "^2.24.0",
29-
"react": "18.2.0"
26+
"@phosphor-icons/core": "catalog:",
27+
"aphrodite": "catalog:",
28+
"moment": "catalog:",
29+
"react": "catalog:"
3030
},
3131
"devDependencies": {
3232
"@khanacademy/wb-dev-build-settings": "workspace:*"

‎packages/wonder-blocks-breadcrumbs/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
"author": "",
1717
"license": "MIT",
1818
"dependencies": {
19-
"@babel/runtime": "^7.24.5",
19+
"@babel/runtime": "catalog:",
2020
"@khanacademy/wonder-blocks-core": "workspace:*",
2121
"@khanacademy/wonder-blocks-tokens": "workspace:*"
2222
},
2323
"peerDependencies": {
24-
"aphrodite": "^1.2.5",
25-
"react": "18.2.0"
24+
"aphrodite": "catalog:",
25+
"react": "catalog:"
2626
},
2727
"devDependencies": {
2828
"@khanacademy/wb-dev-build-settings": "workspace:*"

‎packages/wonder-blocks-button/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"author": "",
1717
"license": "MIT",
1818
"dependencies": {
19-
"@babel/runtime": "^7.24.5",
19+
"@babel/runtime": "catalog:",
2020
"@khanacademy/wonder-blocks-clickable": "workspace:*",
2121
"@khanacademy/wonder-blocks-core": "workspace:*",
2222
"@khanacademy/wonder-blocks-icon": "workspace:*",
@@ -26,10 +26,10 @@
2626
"@khanacademy/wonder-blocks-typography": "workspace:*"
2727
},
2828
"peerDependencies": {
29-
"aphrodite": "^1.2.5",
30-
"react": "18.2.0",
31-
"react-router": "5.3.4",
32-
"react-router-dom": "5.3.4"
29+
"aphrodite": "catalog:",
30+
"react": "catalog:",
31+
"react-router": "catalog:",
32+
"react-router-dom": "catalog:"
3333
},
3434
"devDependencies": {
3535
"@khanacademy/wb-dev-build-settings": "workspace:*"

‎packages/wonder-blocks-cell/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@
1414
"prepublishOnly": "../../utils/publish/package-pre-publish-check.sh"
1515
},
1616
"dependencies": {
17-
"@babel/runtime": "^7.24.5",
17+
"@babel/runtime": "catalog:",
1818
"@khanacademy/wonder-blocks-clickable": "workspace:*",
1919
"@khanacademy/wonder-blocks-core": "workspace:*",
2020
"@khanacademy/wonder-blocks-layout": "workspace:*",
2121
"@khanacademy/wonder-blocks-tokens": "workspace:*",
2222
"@khanacademy/wonder-blocks-typography": "workspace:*"
2323
},
2424
"peerDependencies": {
25-
"aphrodite": "^1.2.5",
26-
"react": "18.2.0"
25+
"aphrodite": "catalog:",
26+
"react": "catalog:"
2727
},
2828
"devDependencies": {
2929
"@khanacademy/wb-dev-build-settings": "workspace:*"

‎packages/wonder-blocks-clickable/package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@
1616
"access": "public"
1717
},
1818
"dependencies": {
19-
"@babel/runtime": "^7.24.5",
19+
"@babel/runtime": "catalog:",
2020
"@khanacademy/wonder-blocks-core": "workspace:*",
2121
"@khanacademy/wonder-blocks-tokens": "workspace:*"
2222
},
2323
"peerDependencies": {
24-
"aphrodite": "^1.2.5",
25-
"react": "18.2.0",
26-
"react-dom": "18.2.0",
27-
"react-router": "5.3.4",
28-
"react-router-dom": "5.3.4"
24+
"aphrodite": "catalog:",
25+
"react": "catalog:",
26+
"react-dom": "catalog:",
27+
"react-router": "catalog:",
28+
"react-router-dom": "catalog:"
2929
},
3030
"devDependencies": {
3131
"@khanacademy/wb-dev-build-settings": "workspace:*"

‎packages/wonder-blocks-core/package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
"prepublishOnly": "../../utils/publish/package-pre-publish-check.sh"
1515
},
1616
"dependencies": {
17-
"@babel/runtime": "^7.24.5"
17+
"@babel/runtime": "catalog:"
1818
},
1919
"peerDependencies": {
20-
"aphrodite": "^1.2.5",
21-
"react": "18.2.0",
22-
"react-dom": "18.2.0",
23-
"react-router": "5.3.4",
24-
"react-router-dom": "5.3.4"
20+
"aphrodite": "catalog:",
21+
"react": "catalog:",
22+
"react-dom": "catalog:",
23+
"react-router": "catalog:",
24+
"react-router-dom": "catalog:"
2525
},
2626
"devDependencies": {
2727
"@khanacademy/wb-dev-build-settings": "workspace:*",

‎packages/wonder-blocks-data/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
"prepublishOnly": "../../utils/publish/package-pre-publish-check.sh"
1515
},
1616
"dependencies": {
17-
"@babel/runtime": "^7.24.5",
17+
"@babel/runtime": "catalog:",
1818
"@khanacademy/wonder-blocks-core": "workspace:*"
1919
},
2020
"peerDependencies": {
21-
"@khanacademy/wonder-stuff-core": "^1.5.4",
22-
"react": "18.2.0"
21+
"@khanacademy/wonder-stuff-core": "catalog:",
22+
"react": "catalog:"
2323
},
2424
"devDependencies": {
2525
"@khanacademy/wb-dev-build-settings": "workspace:*",

‎packages/wonder-blocks-dropdown/package.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"access": "public"
1717
},
1818
"dependencies": {
19-
"@babel/runtime": "^7.24.5",
19+
"@babel/runtime": "catalog:",
2020
"@khanacademy/wonder-blocks-cell": "workspace:*",
2121
"@khanacademy/wonder-blocks-clickable": "workspace:*",
2222
"@khanacademy/wonder-blocks-core": "workspace:*",
@@ -30,15 +30,15 @@
3030
"@khanacademy/wonder-blocks-typography": "workspace:*"
3131
},
3232
"peerDependencies": {
33-
"@phosphor-icons/core": "^2.0.2",
34-
"@popperjs/core": "^2.10.1",
35-
"aphrodite": "^1.2.5",
36-
"react": "18.2.0",
37-
"react-dom": "18.2.0",
38-
"react-popper": "^2.0.0",
39-
"react-router": "5.3.4",
40-
"react-router-dom": "5.3.4",
41-
"react-window": "^1.8.11"
33+
"@phosphor-icons/core": "catalog:",
34+
"@popperjs/core": "catalog:",
35+
"aphrodite": "catalog:",
36+
"react": "catalog:",
37+
"react-dom": "catalog:",
38+
"react-popper": "catalog:",
39+
"react-router": "catalog:",
40+
"react-router-dom": "catalog:",
41+
"react-window": "catalog:"
4242
},
4343
"devDependencies": {
4444
"@khanacademy/wb-dev-build-settings": "workspace:*"

‎packages/wonder-blocks-form/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"access": "public"
1717
},
1818
"dependencies": {
19-
"@babel/runtime": "^7.24.5",
19+
"@babel/runtime": "catalog:",
2020
"@khanacademy/wonder-blocks-clickable": "workspace:*",
2121
"@khanacademy/wonder-blocks-core": "workspace:*",
2222
"@khanacademy/wonder-blocks-icon": "workspace:*",
@@ -25,9 +25,9 @@
2525
"@khanacademy/wonder-blocks-typography": "workspace:*"
2626
},
2727
"peerDependencies": {
28-
"@phosphor-icons/core": "^2.0.2",
29-
"aphrodite": "^1.2.5",
30-
"react": "18.2.0"
28+
"@phosphor-icons/core": "catalog:",
29+
"aphrodite": "catalog:",
30+
"react": "catalog:"
3131
},
3232
"devDependencies": {
3333
"@khanacademy/wb-dev-build-settings": "workspace:*"

‎packages/wonder-blocks-grid/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
"author": "",
1717
"license": "MIT",
1818
"dependencies": {
19-
"@babel/runtime": "^7.24.5",
19+
"@babel/runtime": "catalog:",
2020
"@khanacademy/wonder-blocks-core": "workspace:*",
2121
"@khanacademy/wonder-blocks-layout": "workspace:*",
2222
"@khanacademy/wonder-blocks-tokens": "workspace:*"
2323
},
2424
"peerDependencies": {
25-
"aphrodite": "^1.2.5",
26-
"react": "18.2.0"
25+
"aphrodite": "catalog:",
26+
"react": "catalog:"
2727
},
2828
"devDependencies": {
2929
"@khanacademy/wb-dev-build-settings": "workspace:*"

‎packages/wonder-blocks-icon-button/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@
1616
"author": "",
1717
"license": "MIT",
1818
"dependencies": {
19-
"@babel/runtime": "^7.24.5",
19+
"@babel/runtime": "catalog:",
2020
"@khanacademy/wonder-blocks-clickable": "workspace:*",
2121
"@khanacademy/wonder-blocks-core": "workspace:*",
2222
"@khanacademy/wonder-blocks-icon": "workspace:*",
2323
"@khanacademy/wonder-blocks-theming": "workspace:*",
2424
"@khanacademy/wonder-blocks-tokens": "workspace:*"
2525
},
2626
"peerDependencies": {
27-
"aphrodite": "^1.2.5",
28-
"react": "18.2.0",
29-
"react-router": "5.3.4",
30-
"react-router-dom": "5.3.4"
27+
"aphrodite": "catalog:",
28+
"react": "catalog:",
29+
"react-router": "catalog:",
30+
"react-router-dom": "catalog:"
3131
},
3232
"devDependencies": {
3333
"@khanacademy/wb-dev-build-settings": "workspace:*"

‎packages/wonder-blocks-icon/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
"author": "",
1717
"license": "MIT",
1818
"dependencies": {
19-
"@babel/runtime": "^7.24.5",
19+
"@babel/runtime": "catalog:",
2020
"@khanacademy/wonder-blocks-core": "workspace:*"
2121
},
2222
"devDependencies": {
2323
"@khanacademy/wb-dev-build-settings": "workspace:*"
2424
},
2525
"peerDependencies": {
26-
"@phosphor-icons/core": "^2.0.2",
27-
"aphrodite": "^1.2.5",
28-
"react": "18.2.0"
26+
"@phosphor-icons/core": "catalog:",
27+
"aphrodite": "catalog:",
28+
"react": "catalog:"
2929
}
3030
}

0 commit comments

Comments
 (0)