Skip to content

Commit a27f83f

Browse files
Update more packages and stop auto-resolving peers (#1199)
## Summary: This gets things up-to-date and addreses an issue with how peer deps are handled by pnpm. - Latest TypeScript and @types/node added - Removed some unneeded type libraries - Updated jest and jest-when - Stop autoresolving peer deps so that all packages use the same versions - Updated various packages to address peer deps - Update to latest pnpm - Fix some docs generation warnings Issue: FEI-7273 ## Test plan: `pnpm clean:all && pnpm i && pnpm test && pnpm typecheck && pnpm build && pnpm build:types && pnpm build:docs` Author: somewhatabstract Reviewers: kevinb-khan, somewhatabstract Required Reviewers: Approved By: kevinb-khan Checks: ⌛ 1 check is pending, ✅ 6 checks were successful, ⏭️ 1 check has been skipped Pull Request URL: #1199
1 parent 72be8b7 commit a27f83f

File tree

25 files changed

+2802
-1549
lines changed

25 files changed

+2802
-1549
lines changed

.changeset/fuzzy-crabs-lie.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
"@khanacademy/wonder-stuff-logging": major
3+
"@khanacademy/wonder-stuff-testing": major
4+
"@khanacademy/wonder-stuff-sentry": major
5+
"@khanacademy/wonder-stuff-core": major
6+
"@khanacademy/wonder-stuff-ci": major
7+
"@khanacademy/ws-dev-build-settings": major
8+
---
9+
10+
Update to TypeScript 5.9.x and other dependency changes

build-settings/check-type-definitions.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,6 @@ for (const typeDefinitionFile of typeDefinitionFiles) {
5757

5858
if (foundErrors) {
5959
process.exit(1);
60+
} else {
61+
console.log("All type imports are correct.");
6062
}

package.json

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -19,30 +19,27 @@
1919
"@changesets/cli": "^2.26.2",
2020
"@google-cloud/logging-winston": "^4.2.4",
2121
"@jest/globals": "^29.7.0",
22-
"@rollup/plugin-babel": "^6.0.4",
22+
"@rollup/plugin-babel": "^6.1.0",
2323
"@rollup/plugin-node-resolve": "^15.2.3",
2424
"@rollup/plugin-replace": "^5.0.3",
2525
"@rollup/plugin-terser": "^0.4.4",
26-
"@swc-node/register": "^1.10.10",
27-
"@swc/core": "^1.3.93",
28-
"@types/express": "^4.17.21",
29-
"@types/express-winston": "^4.0.0",
30-
"@types/jest": "^29.5.14",
26+
"@swc-node/register": "^1.11.1",
27+
"@swc/core": "^1.15.0",
28+
"@types/jest": "^30.0.0",
3129
"@types/jest-when": "^3.5.5",
32-
"@types/jsdom": "^21.1.1",
33-
"@types/winston": "^2.4.4",
34-
"@typescript-eslint/eslint-plugin": "8.17.0",
35-
"@typescript-eslint/parser": "8.44.1",
36-
"@typescript-eslint/rule-tester": "^8.17.0",
30+
"@types/node": "^20.17.23",
31+
"@typescript-eslint/eslint-plugin": "8.46.3",
32+
"@typescript-eslint/parser": "8.46.3",
33+
"@typescript-eslint/rule-tester": "^8.46.3",
3734
"ancesdir": "^7.1.1",
38-
"babel-jest": "^29.7.0",
35+
"babel-jest": "^30.2.0",
3936
"babel-watch": "^7.8.1",
40-
"eslint": "^8.55.0",
37+
"eslint": "^8.57.1",
4138
"eslint-config-prettier": "^9.0.0",
42-
"eslint-import-resolver-typescript": "^3.7.0",
39+
"eslint-import-resolver-typescript": "^4.4.4",
4340
"eslint-plugin-disable": "^2.0.3",
4441
"eslint-plugin-eslint-comments": "^3.2.0",
45-
"eslint-plugin-import": "^2.28.1",
42+
"eslint-plugin-import": "^2.32.0",
4643
"eslint-plugin-jest": "28.9.0",
4744
"eslint-plugin-jsdoc": "^58.1.1",
4845
"eslint-plugin-jsx-a11y": "^6.10.2",
@@ -51,19 +48,18 @@
5148
"eslint-plugin-promise": "^6.1.1",
5249
"eslint-plugin-react": "^7.33.2",
5350
"fast-glob": "^3.3.0",
54-
"jest": "^29.7.0",
51+
"jest": "^30.2.0",
5552
"jest-extended": "^6.0.0",
56-
"jest-when": "^3.6.0",
57-
"jsdom": "^21.1.1",
53+
"jest-when": "^3.7.0",
5854
"npm-package-json-lint": "^8.0.0",
5955
"prettier": "^3.0.3",
6056
"rollup": "^4.50.2",
6157
"rollup-plugin-auto-external": "^2.0.0",
6258
"rollup-plugin-executable-output": "^1.3.0",
6359
"rollup-plugin-filesize": "^10.0.0",
6460
"rollup-plugin-preserve-shebangs": "^0.2.0",
65-
"typedoc": "^0.27.9",
66-
"typescript": "5.7.3",
61+
"typedoc": "^0.28.14",
62+
"typescript": "5.9.3",
6763
"winston": "^3.10.0"
6864
},
6965
"pnpm": {
@@ -98,5 +94,5 @@
9894
"typecheck": "tsc",
9995
"nochangeset": "pnpm changeset add --empty"
10096
},
101-
"packageManager": "pnpm@10.6.5"
102-
}
97+
"packageManager": "pnpm@10.20.0+sha512.cf9998222162dd85864d0a8102e7892e7ba4ceadebbf5a31f9c2fce48dfce317a9c53b9f6464d1ef9042cba2e02ae02a9f7c143a2b438cd93c91840f0192b9dd"
98+
}

packages/eslint-config-khan/package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@
1616
"license": "MIT",
1717
"peerDependencies": {
1818
"@khanacademy/eslint-plugin": "workspace:*",
19-
"@typescript-eslint/eslint-plugin": "8.17.0",
20-
"@typescript-eslint/parser": "8.17.0",
21-
"eslint": "^8.55.0",
22-
"eslint-config-prettier": "^8.3.0",
23-
"eslint-import-resolver-typescript": "^3.5.3",
24-
"eslint-plugin-import": "^2.23.4",
19+
"@typescript-eslint/eslint-plugin": "8.46.3",
20+
"@typescript-eslint/parser": "8.46.3",
21+
"eslint": "^8.57.1",
22+
"eslint-config-prettier": "^9.0.0",
23+
"eslint-import-resolver-typescript": "^4.4.4",
24+
"eslint-plugin-import": "^2.32.0",
2525
"eslint-plugin-jsx-a11y": "^6.10.2",
26-
"eslint-plugin-prettier": "^3.4.0",
27-
"eslint-plugin-react": "^7.24.0"
26+
"eslint-plugin-prettier": "^5.0.1",
27+
"eslint-plugin-react": "^7.33.2"
2828
},
2929
"devDependencies": {
30-
"@typescript-eslint/rule-tester": "^8.17.0"
30+
"@typescript-eslint/rule-tester": "^8.46.3"
3131
}
32-
}
32+
}

packages/eslint-plugin-khan/demo/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
},
1010
"devDependencies": {
1111
"@khanacademy/eslint-plugin": "workspace:*",
12-
"eslint": "^8.55.0",
13-
"typescript": "^5.0.4"
12+
"eslint": "^8.57.1",
13+
"typescript": "5.9.3"
1414
},
1515
"dependencies": {
1616
"@types/react": "^18.2.6",

packages/eslint-plugin-khan/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@
1616
"license": "MIT",
1717
"dependencies": {
1818
"@babel/types": "^7.23.0",
19-
"@typescript-eslint/utils": "8.17.0",
19+
"@typescript-eslint/utils": "8.46.3",
2020
"ancesdir": "^7.1.1",
2121
"checksync": "^10.0.2"
2222
},
2323
"devDependencies": {
2424
"@babel/eslint-parser": "^7.25.1",
2525
"@babel/preset-env": "^7.26.9",
2626
"@babel/preset-react": "^7.22.15",
27-
"@swc-node/register": "^1.10.10",
28-
"@swc/core": "^1.3.93",
29-
"@typescript-eslint/rule-tester": "^8.17.0",
30-
"eslint": "^8.55.0",
31-
"prettier": "^2.8.8"
27+
"@swc-node/register": "^1.11.1",
28+
"@swc/core": "^1.15.0",
29+
"@typescript-eslint/rule-tester": "^8.46.3",
30+
"eslint": "^8.57.1",
31+
"prettier": "^3.0.3"
3232
},
3333
"scripts": {
3434
"prettier": "prettier --write '{lib,test}/**/*.{js,ts}'"

packages/wonder-stuff-ci/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"@khanacademy/wonder-stuff-logging": "workspace:*"
3131
},
3232
"peerDependencies": {
33-
"@google-cloud/logging-winston": "^4.1.1",
34-
"winston": "^3.4.0"
33+
"@google-cloud/logging-winston": "^4.2.4",
34+
"winston": "^3.10.0"
3535
}
3636
}

packages/wonder-stuff-ci/src/extract-mobile-release-info-from-branch-name.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ import type {MobileReleaseBranchInfo} from "./types";
99
* version: "7.8.0"
1010
* }
1111
*
12-
* @param {string} The release branch of the form `[release/[unified|ios|android]]/[v]<num>.<num>.<num>[-extra]`.
12+
* @param {string} releaseBranch release branch of the form `[release/[unified|ios|android]]/[v]<num>.<num>.<num>[-extra]`.
1313
* @returns {MobileReleaseInfo} The release version and prefix, if found; otherwise, `null`.
1414
*/
1515
export const extractMobileReleaseInfoFromBranchName = (
16-
arg: string | null,
16+
releaseBranch: string | null,
1717
): MobileReleaseBranchInfo | null => {
18-
if (!arg) {
18+
if (!releaseBranch) {
1919
return null;
2020
}
2121

22-
const match = arg.match(
22+
const match = releaseBranch.match(
2323
/^(release\/(ios|android|unified)\/)?v?(\d+\.\d+\.\d+(-\w*)*)$/i,
2424
);
2525
return match && match.length >= 3 && match[3]

packages/wonder-stuff-core/src/__tests__/__snapshots__/build-caused-by-message.test.ts.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Jest Snapshot v1, https://goo.gl/fbAQLP
1+
// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
22

33
exports[`#buildCausedByMessage should default whitespace strings to (empty message) 1`] = `
44
"(empty message)

packages/wonder-stuff-core/src/__tests__/__snapshots__/errors-from-error.test.ts.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Jest Snapshot v1, https://goo.gl/fbAQLP
1+
// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
22

33
exports[`#errorsFromError should throw if the order is invalid 1`] = `"Invalid sequence order"`;
44

0 commit comments

Comments
 (0)