Skip to content

Commit b9709f9

Browse files
authored
Upgrade all dependencies (#2273)
This PR upgrades all of our dependencies to the latest versions, including a few major dependency version bumps. Figured it was good housekeeping to do once in a while I pinned node and vscode, but otherwise everything is upgraded ## Checklist - [-] I have added [tests](https://www.cursorless.org/docs/contributing/test-case-recorder/) - [-] I have updated the [docs](https://github.com/cursorless-dev/cursorless/tree/main/docs) and [cheatsheet](https://github.com/cursorless-dev/cursorless/tree/main/cursorless-talon/src/cheatsheet) - [x] I have not broken the cheatsheet
1 parent de37ebf commit b9709f9

File tree

34 files changed

+3745
-3298
lines changed

34 files changed

+3745
-3298
lines changed

package.json

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -28,25 +28,25 @@
2828
"license": "MIT",
2929
"devDependencies": {
3030
"@pnpm/meta-updater": "1.0.0",
31-
"@types/node": "^18.18.2",
32-
"@typescript-eslint/eslint-plugin": "^6.10.0",
33-
"@typescript-eslint/parser": "^6.10.0",
34-
"esbuild": "^0.17.11",
35-
"eslint": "^8.53.0",
36-
"eslint-config-prettier": "^8.8.0",
37-
"eslint-import-resolver-typescript": "3.5.5",
38-
"eslint-plugin-import": "2.28.1",
39-
"eslint-plugin-mocha": "10.2.0",
40-
"eslint-plugin-unicorn": "49.0.0",
41-
"eslint-plugin-unused-imports": "^3.0.0",
42-
"prettier": "3.0.3",
43-
"prettier-plugin-tailwindcss": "0.5.11",
44-
"syncpack": "9.8.4",
45-
"typescript": "^5.2.2"
31+
"@types/node": "18.18.2",
32+
"@typescript-eslint/eslint-plugin": "^7.4.0",
33+
"@typescript-eslint/parser": "^7.4.0",
34+
"esbuild": "^0.20.2",
35+
"eslint": "^8.57.0",
36+
"eslint-config-prettier": "^9.1.0",
37+
"eslint-import-resolver-typescript": "3.6.1",
38+
"eslint-plugin-import": "2.29.1",
39+
"eslint-plugin-mocha": "10.4.1",
40+
"eslint-plugin-unicorn": "51.0.1",
41+
"eslint-plugin-unused-imports": "^3.1.0",
42+
"prettier": "3.2.5",
43+
"prettier-plugin-tailwindcss": "0.5.12",
44+
"syncpack": "12.3.0",
45+
"typescript": "^5.4.3"
4646
},
4747
"pnpm": {
4848
"patchedDependencies": {
49-
"@docusaurus/[email protected].0": "patches/@[email protected]",
49+
"@docusaurus/[email protected].1": "patches/@[email protected]",
5050
"@types/[email protected]": "patches/@[email protected]",
5151
5252
},
@@ -63,6 +63,6 @@
6363
"engines": {
6464
"node": ">=18.18.2"
6565
},
66-
"packageManager": "[email protected].3",
66+
"packageManager": "[email protected].5",
6767
"type": "module"
6868
}

packages/cheatsheet-local/package.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -30,27 +30,27 @@
3030
},
3131
"devDependencies": {
3232
"@effortlessmotion/html-webpack-inline-source-plugin": "1.0.3",
33-
"@testing-library/react": "14.0.0",
34-
"@types/jest": "29.4.0",
35-
"@types/node": "^18.18.2",
36-
"@types/react": "18.0.28",
37-
"@types/react-dom": "18.0.11",
38-
"@types/webpack": "5.28.0",
33+
"@testing-library/react": "14.2.2",
34+
"@types/jest": "29.5.12",
35+
"@types/node": "18.18.2",
36+
"@types/react": "18.2.71",
37+
"@types/react-dom": "18.2.22",
38+
"@types/webpack": "5.28.5",
3939
"@webpack-cli/generators": "3.0.7",
40-
"autoprefixer": "10.4.13",
41-
"css-loader": "6.7.3",
42-
"html-webpack-plugin": "5.5.0",
40+
"autoprefixer": "10.4.19",
41+
"css-loader": "6.10.0",
42+
"html-webpack-plugin": "5.6.0",
4343
"jest": "29.7.0",
44-
"postcss": "8.4.31",
45-
"postcss-loader": "7.0.2",
46-
"style-loader": "3.3.1",
47-
"tailwindcss": "3.3.5",
48-
"ts-loader": "9.4.2",
49-
"ts-node": "10.9.1",
50-
"typescript": "^5.2.2",
51-
"webpack": "5.89.0",
44+
"postcss": "8.4.38",
45+
"postcss-loader": "8.1.1",
46+
"style-loader": "3.3.4",
47+
"tailwindcss": "3.4.1",
48+
"ts-loader": "9.5.1",
49+
"ts-node": "10.9.2",
50+
"typescript": "^5.4.3",
51+
"webpack": "5.91.0",
5252
"webpack-cli": "5.1.4",
53-
"webpack-dev-server": "4.11.1"
53+
"webpack-dev-server": "5.0.4"
5454
},
5555
"postcss": {
5656
"plugins": {

packages/cheatsheet/package.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,24 +27,24 @@
2727
"*.css"
2828
],
2929
"dependencies": {
30-
"@fortawesome/fontawesome-svg-core": "6.3.0",
31-
"@fortawesome/free-solid-svg-icons": "6.3.0",
30+
"@fortawesome/fontawesome-svg-core": "6.5.1",
31+
"@fortawesome/free-solid-svg-icons": "6.5.1",
3232
"@fortawesome/react-fontawesome": "0.2.0",
3333
"react": "^18.2.0",
3434
"react-dom": "^18.2.0",
35-
"react-string-replace": "1.1.0",
36-
"react-use": "17.4.0"
35+
"react-string-replace": "1.1.1",
36+
"react-use": "17.5.0"
3737
},
3838
"devDependencies": {
39-
"@testing-library/react": "14.0.0",
40-
"@types/jest": "29.4.0",
41-
"@types/react": "18.0.28",
42-
"@types/react-dom": "18.0.11",
43-
"@types/react-helmet": "6.1.6",
39+
"@testing-library/react": "14.2.2",
40+
"@types/jest": "29.5.12",
41+
"@types/react": "18.2.71",
42+
"@types/react-dom": "18.2.22",
43+
"@types/react-helmet": "6.1.11",
4444
"jest": "29.7.0",
45-
"jest-environment-jsdom": "29.6.2",
46-
"ts-jest": "29.1.1",
47-
"typescript": "^5.2.2"
45+
"jest-environment-jsdom": "29.7.0",
46+
"ts-jest": "29.1.2",
47+
"typescript": "^5.4.3"
4848
},
4949
"type": "module"
5050
}

packages/common/package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@
1717
"license": "MIT",
1818
"dependencies": {
1919
"lodash": "^4.17.21",
20-
"vscode-uri": "^3.0.6"
20+
"vscode-uri": "^3.0.8"
2121
},
2222
"devDependencies": {
23-
"@types/js-yaml": "^4.0.2",
24-
"@types/lodash": "4.14.181",
25-
"@types/mocha": "^10.0.3",
26-
"@types/sinon": "^10.0.2",
23+
"@types/js-yaml": "^4.0.9",
24+
"@types/lodash": "4.17.0",
25+
"@types/mocha": "^10.0.6",
26+
"@types/sinon": "^17.0.3",
2727
"cross-spawn": "7.0.3",
28-
"fast-check": "3.12.0",
28+
"fast-check": "3.17.0",
2929
"js-yaml": "^4.1.0",
30-
"mocha": "^10.2.0",
31-
"sinon": "^11.1.1"
30+
"mocha": "^10.3.0",
31+
"sinon": "^17.0.1"
3232
},
3333
"types": "./out/index.d.ts",
3434
"exports": {

packages/common/src/ide/fake/FakeConfiguration.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,15 @@ export default class FakeConfiguration implements Configuration {
3232
if (scope != null) {
3333
for (const { scope: candidateScope, values } of this.scopes) {
3434
if (scopeMatches(candidateScope, scope)) {
35-
return get(values, path) ?? get(this.mocks, path);
35+
return (get(values, path) ?? get(this.mocks, path)) as GetFieldType<
36+
CursorlessConfiguration,
37+
Path
38+
>;
3639
}
3740
}
3841
}
3942

40-
return get(this.mocks, path);
43+
return get(this.mocks, path) as GetFieldType<CursorlessConfiguration, Path>;
4144
}
4245

4346
onDidChangeConfiguration = this.notifier.registerListener;

packages/common/src/ide/types/Paths.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ type Join<
1212
? `${L}.${R}`
1313
: L
1414
: R extends string | number
15-
? R
16-
: undefined;
15+
? R
16+
: undefined;
1717

1818
type Union<
1919
L extends unknown | undefined,
@@ -23,8 +23,8 @@ type Union<
2323
? undefined
2424
: R
2525
: R extends undefined
26-
? L
27-
: L | R;
26+
? L
27+
: L | R;
2828

2929
/**
3030
* Get all the possible paths of an object
@@ -55,8 +55,8 @@ export type GetFieldType<
5555
[K in Path]: K extends keyof T
5656
? T[K]
5757
: K extends `${infer P}.${infer S}`
58-
? T[P] extends GenericObject
59-
? GetFieldType<T[P], S>
60-
: never
61-
: never;
58+
? T[P] extends GenericObject
59+
? GetFieldType<T[P], S>
60+
: never
61+
: never;
6262
}[Path];

packages/cursorless-engine/package.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,27 +17,27 @@
1717
"license": "MIT",
1818
"dependencies": {
1919
"@cursorless/common": "workspace:*",
20-
"glob": "^7.1.7",
21-
"immer": "^9.0.15",
20+
"glob": "^10.3.10",
21+
"immer": "^10.0.4",
2222
"immutability-helper": "^3.1.1",
23-
"itertools": "^2.1.1",
23+
"itertools": "^2.2.5",
2424
"lodash": "^4.17.21",
25-
"node-html-parser": "^6.1.11",
25+
"node-html-parser": "^6.1.12",
2626
"sbd": "^1.0.19",
27-
"uuid": "^9.0.0",
28-
"zod": "3.22.3"
27+
"uuid": "^9.0.1",
28+
"zod": "3.22.4"
2929
},
3030
"devDependencies": {
31-
"@types/glob": "^7.1.3",
32-
"@types/js-yaml": "^4.0.2",
33-
"@types/lodash": "4.14.181",
34-
"@types/mocha": "^10.0.3",
35-
"@types/sbd": "^1.0.3",
36-
"@types/sinon": "^10.0.2",
37-
"@types/uuid": "^8.3.4",
31+
"@types/glob": "^8.1.0",
32+
"@types/js-yaml": "^4.0.9",
33+
"@types/lodash": "4.17.0",
34+
"@types/mocha": "^10.0.6",
35+
"@types/sbd": "^1.0.5",
36+
"@types/sinon": "^17.0.3",
37+
"@types/uuid": "^9.0.8",
3838
"js-yaml": "^4.1.0",
39-
"mocha": "^10.2.0",
40-
"sinon": "^11.1.1"
39+
"mocha": "^10.3.0",
40+
"sinon": "^17.0.1"
4141
},
4242
"types": "./out/index.d.ts",
4343
"exports": {

packages/cursorless-engine/src/CommandHistory.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import type {
1111
CommandRunner,
1212
CommandRunnerDecorator,
1313
} from "@cursorless/cursorless-engine";
14-
import produce from "immer";
14+
import { produce } from "immer";
1515
import * as fs from "node:fs/promises";
1616
import * as path from "node:path";
1717
import { v4 as uuid } from "uuid";

packages/cursorless-engine/src/core/Cheatsheet.ts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { readFile, writeFile } from "fs/promises";
22
import { parse } from "node-html-parser";
3-
import produce from "immer";
43
import { sortBy } from "lodash";
54
import { ide } from "../singletons/ide.singleton";
65
import path from "path";
76
import { getCursorlessRepoRoot } from "@cursorless/common";
7+
import { produce } from "immer";
88

99
/**
1010
* The argument expected by the cheatsheet command.
@@ -42,11 +42,8 @@ export async function showCheatsheet({
4242

4343
const root = parse(cheatsheetContent);
4444

45-
root.getElementById(
46-
"cheatsheet-data",
47-
).textContent = `document.cheatsheetInfo = ${JSON.stringify(
48-
spokenFormInfo,
49-
)};`;
45+
root.getElementById("cheatsheet-data")!.textContent =
46+
`document.cheatsheetInfo = ${JSON.stringify(spokenFormInfo)};`;
5047

5148
await writeFile(outputPath, root.toString());
5249
}

packages/cursorless-engine/src/core/commandVersionUpgrades/canonicalizeAndValidateCommand.ts

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import { upgradeV2ToV3 } from "./upgradeV2ToV3";
1919
import { upgradeV3ToV4 } from "./upgradeV3ToV4";
2020
import { upgradeV4ToV5 } from "./upgradeV4ToV5/upgradeV4ToV5";
2121
import { upgradeV5ToV6 } from "./upgradeV5ToV6";
22-
import produce from "immer";
2322
import { upgradeV6ToV7 } from "./upgradeV6ToV7";
23+
import { produce } from "immer";
2424

2525
/**
2626
* Given a command argument which comes from the client, normalize it so that it
@@ -108,12 +108,11 @@ function usesScopeType(
108108
scopeTypeType: SimpleScopeTypeType,
109109
partialTargets: PartialTargetDescriptor[],
110110
) {
111-
return getPartialPrimitiveTargets(partialTargets).some(
112-
(partialTarget) =>
113-
partialTarget.modifiers?.find(
114-
(mod: Modifier) =>
115-
(mod.type === "containingScope" || mod.type === "everyScope") &&
116-
mod.scopeType.type === scopeTypeType,
117-
),
111+
return getPartialPrimitiveTargets(partialTargets).some((partialTarget) =>
112+
partialTarget.modifiers?.find(
113+
(mod: Modifier) =>
114+
(mod.type === "containingScope" || mod.type === "everyScope") &&
115+
mod.scopeType.type === scopeTypeType,
116+
),
118117
);
119118
}

0 commit comments

Comments
 (0)