From c0966ab9738bc36a0b3acfd72ef9e5a5e617a8f9 Mon Sep 17 00:00:00 2001 From: Andreas Arvidsson Date: Thu, 27 Nov 2025 16:20:51 +0100 Subject: [PATCH 1/4] Update esversion targets in tsconfig.json files --- eslint.config.mts | 2 +- packages/cheatsheet-local/tsconfig.json | 4 ++-- packages/cursorless-engine/tsconfig.json | 2 +- packages/cursorless-everywhere-talon-core/tsconfig.json | 2 +- packages/cursorless-everywhere-talon-e2e/tsconfig.json | 2 +- packages/cursorless-everywhere-talon/tsconfig.json | 3 +-- packages/cursorless-org-docs/tsconfig.json | 7 +++---- packages/cursorless-org/tsconfig.json | 7 +++---- packages/meta-updater/tsconfig.json | 4 ++-- packages/vscode-common/tsconfig.json | 2 +- 10 files changed, 16 insertions(+), 19 deletions(-) diff --git a/eslint.config.mts b/eslint.config.mts index eb3aee4b2b..ab99178a28 100644 --- a/eslint.config.mts +++ b/eslint.config.mts @@ -38,7 +38,7 @@ const rootConfig: ConfigWithExtends = { languageOptions: { parser: tsEslint.parser, - ecmaVersion: 6, + ecmaVersion: "latest", sourceType: "module", parserOptions: { projectService: true, diff --git a/packages/cheatsheet-local/tsconfig.json b/packages/cheatsheet-local/tsconfig.json index 34703aa242..ede3da7299 100644 --- a/packages/cheatsheet-local/tsconfig.json +++ b/packages/cheatsheet-local/tsconfig.json @@ -1,12 +1,12 @@ { "extends": "../../tsconfig.base.json", "compilerOptions": { + "target": "es2020", + "lib": ["dom", "es2020"], "jsx": "react-jsx", - "lib": ["es5", "es6", "dom"], "allowSyntheticDefaultImports": true, "skipLibCheck": true, "esModuleInterop": true, - "target": "es5", "allowJs": true }, "ts-node": { diff --git a/packages/cursorless-engine/tsconfig.json b/packages/cursorless-engine/tsconfig.json index 82daced7ae..a6f6103eac 100644 --- a/packages/cursorless-engine/tsconfig.json +++ b/packages/cursorless-engine/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../../tsconfig.base.json", "compilerOptions": { - "target": "es2020" + "target": "esnext" }, "include": ["src/**/*.ts", "src/**/*.json", "../../typings/**/*.d.ts"], "references": [ diff --git a/packages/cursorless-everywhere-talon-core/tsconfig.json b/packages/cursorless-everywhere-talon-core/tsconfig.json index c2fb02395a..d6861b419e 100644 --- a/packages/cursorless-everywhere-talon-core/tsconfig.json +++ b/packages/cursorless-everywhere-talon-core/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../../tsconfig.base.json", "compilerOptions": { - "target": "ES2022", + "target": "esnext", "typeRoots": ["src/types", "node_modules/@types"] }, "references": [ diff --git a/packages/cursorless-everywhere-talon-e2e/tsconfig.json b/packages/cursorless-everywhere-talon-e2e/tsconfig.json index 919f526c7d..682d03c9b0 100644 --- a/packages/cursorless-everywhere-talon-e2e/tsconfig.json +++ b/packages/cursorless-everywhere-talon-e2e/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../../tsconfig.base.json", "compilerOptions": { - "target": "ES2022" + "target": "esnext" }, "include": ["src/**/*.ts", "src/**/*.json", "../../typings/**/*.d.ts"], "references": [ diff --git a/packages/cursorless-everywhere-talon/tsconfig.json b/packages/cursorless-everywhere-talon/tsconfig.json index 85bb0cf555..cc1e235b37 100644 --- a/packages/cursorless-everywhere-talon/tsconfig.json +++ b/packages/cursorless-everywhere-talon/tsconfig.json @@ -1,9 +1,8 @@ { "extends": "../../tsconfig.base.json", "compilerOptions": { - "target": "ES2022", + "target": "esnext", "noEmit": true, - "emitDeclarationOnly": false, "typeRoots": ["src/types", "node_modules/@types"] }, "references": [ diff --git a/packages/cursorless-org-docs/tsconfig.json b/packages/cursorless-org-docs/tsconfig.json index 322ef16b42..561c8d4a1b 100644 --- a/packages/cursorless-org-docs/tsconfig.json +++ b/packages/cursorless-org-docs/tsconfig.json @@ -1,13 +1,12 @@ { "extends": ["@tsconfig/docusaurus/tsconfig.json", "../../tsconfig.base.json"], "compilerOptions": { - "target": "es5", + "target": "es2022", "lib": ["dom", "es2022"], "moduleResolution": "nodenext", "module": "nodenext", - "esModuleInterop": true, - "emitDeclarationOnly": false, - "jsx": "react" + "jsx": "react", + "esModuleInterop": true }, "include": [ "src/**/*.ts", diff --git a/packages/cursorless-org/tsconfig.json b/packages/cursorless-org/tsconfig.json index 569aece321..6a6bf5cab7 100644 --- a/packages/cursorless-org/tsconfig.json +++ b/packages/cursorless-org/tsconfig.json @@ -1,16 +1,15 @@ { "extends": "../../tsconfig.base.json", "compilerOptions": { - "target": "es5", - "lib": ["dom", "dom.iterable", "esnext"], + "target": "es2022", + "lib": ["dom", "es2022"], + "jsx": "preserve", "allowJs": true, "skipLibCheck": true, "noEmit": true, - "emitDeclarationOnly": false, "esModuleInterop": true, "resolveJsonModule": true, "isolatedModules": true, - "jsx": "preserve", "incremental": true }, "include": [ diff --git a/packages/meta-updater/tsconfig.json b/packages/meta-updater/tsconfig.json index 4bd3b640a8..6e644b4083 100644 --- a/packages/meta-updater/tsconfig.json +++ b/packages/meta-updater/tsconfig.json @@ -1,8 +1,8 @@ { "extends": "../../tsconfig.base.json", "compilerOptions": { - "target": "es2020", - "module": "ES2020", + "target": "esnext", + "module": "esnext", "moduleResolution": "node", "moduleDetection": "force", "esModuleInterop": true diff --git a/packages/vscode-common/tsconfig.json b/packages/vscode-common/tsconfig.json index 457f525704..26c61c860c 100644 --- a/packages/vscode-common/tsconfig.json +++ b/packages/vscode-common/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../../tsconfig.base.json", "compilerOptions": { - "target": "es2020" + "target": "esnext" }, "include": ["src/**/*.ts", "src/**/*.json", "../../typings/**/*.d.ts"], "references": [ From a6c87856811ef70d317d921cace5c332e1a9ae2d Mon Sep 17 00:00:00 2001 From: Andreas Arvidsson Date: Sat, 29 Nov 2025 09:37:20 +0100 Subject: [PATCH 2/4] Use es2022 as the target version in all tsconfig.json files. --- packages/cheatsheet-local/tsconfig.json | 4 ++-- packages/cursorless-engine/tsconfig.json | 3 --- packages/cursorless-everywhere-talon-core/tsconfig.json | 1 - packages/cursorless-everywhere-talon-e2e/tsconfig.json | 3 --- packages/cursorless-everywhere-talon/tsconfig.json | 1 - packages/cursorless-vscode/tsconfig.json | 3 --- packages/meta-updater/tsconfig.json | 2 -- packages/vscode-common/tsconfig.json | 3 --- tsconfig.base.json | 2 +- 9 files changed, 3 insertions(+), 19 deletions(-) diff --git a/packages/cheatsheet-local/tsconfig.json b/packages/cheatsheet-local/tsconfig.json index ede3da7299..41c92a2327 100644 --- a/packages/cheatsheet-local/tsconfig.json +++ b/packages/cheatsheet-local/tsconfig.json @@ -1,8 +1,8 @@ { "extends": "../../tsconfig.base.json", "compilerOptions": { - "target": "es2020", - "lib": ["dom", "es2020"], + "target": "es2022", + "lib": ["dom", "es2022"], "jsx": "react-jsx", "allowSyntheticDefaultImports": true, "skipLibCheck": true, diff --git a/packages/cursorless-engine/tsconfig.json b/packages/cursorless-engine/tsconfig.json index a6f6103eac..abf496b58c 100644 --- a/packages/cursorless-engine/tsconfig.json +++ b/packages/cursorless-engine/tsconfig.json @@ -1,8 +1,5 @@ { "extends": "../../tsconfig.base.json", - "compilerOptions": { - "target": "esnext" - }, "include": ["src/**/*.ts", "src/**/*.json", "../../typings/**/*.d.ts"], "references": [ { diff --git a/packages/cursorless-everywhere-talon-core/tsconfig.json b/packages/cursorless-everywhere-talon-core/tsconfig.json index d6861b419e..fe0f62e62c 100644 --- a/packages/cursorless-everywhere-talon-core/tsconfig.json +++ b/packages/cursorless-everywhere-talon-core/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "../../tsconfig.base.json", "compilerOptions": { - "target": "esnext", "typeRoots": ["src/types", "node_modules/@types"] }, "references": [ diff --git a/packages/cursorless-everywhere-talon-e2e/tsconfig.json b/packages/cursorless-everywhere-talon-e2e/tsconfig.json index 682d03c9b0..a6b67fbd55 100644 --- a/packages/cursorless-everywhere-talon-e2e/tsconfig.json +++ b/packages/cursorless-everywhere-talon-e2e/tsconfig.json @@ -1,8 +1,5 @@ { "extends": "../../tsconfig.base.json", - "compilerOptions": { - "target": "esnext" - }, "include": ["src/**/*.ts", "src/**/*.json", "../../typings/**/*.d.ts"], "references": [ { diff --git a/packages/cursorless-everywhere-talon/tsconfig.json b/packages/cursorless-everywhere-talon/tsconfig.json index cc1e235b37..e60cb3c225 100644 --- a/packages/cursorless-everywhere-talon/tsconfig.json +++ b/packages/cursorless-everywhere-talon/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "../../tsconfig.base.json", "compilerOptions": { - "target": "esnext", "noEmit": true, "typeRoots": ["src/types", "node_modules/@types"] }, diff --git a/packages/cursorless-vscode/tsconfig.json b/packages/cursorless-vscode/tsconfig.json index 26248d4733..8a62c77d93 100644 --- a/packages/cursorless-vscode/tsconfig.json +++ b/packages/cursorless-vscode/tsconfig.json @@ -1,8 +1,5 @@ { "extends": "../../tsconfig.base.json", - "compilerOptions": { - "target": "es2020" - }, "include": ["src/**/*.ts", "src/**/*.json", "../../typings/**/*.d.ts"], "references": [ { diff --git a/packages/meta-updater/tsconfig.json b/packages/meta-updater/tsconfig.json index 6e644b4083..992d5cca5a 100644 --- a/packages/meta-updater/tsconfig.json +++ b/packages/meta-updater/tsconfig.json @@ -1,8 +1,6 @@ { "extends": "../../tsconfig.base.json", "compilerOptions": { - "target": "esnext", - "module": "esnext", "moduleResolution": "node", "moduleDetection": "force", "esModuleInterop": true diff --git a/packages/vscode-common/tsconfig.json b/packages/vscode-common/tsconfig.json index 26c61c860c..0f90f239b4 100644 --- a/packages/vscode-common/tsconfig.json +++ b/packages/vscode-common/tsconfig.json @@ -1,8 +1,5 @@ { "extends": "../../tsconfig.base.json", - "compilerOptions": { - "target": "esnext" - }, "include": ["src/**/*.ts", "src/**/*.json", "../../typings/**/*.d.ts"], "references": [ { diff --git a/tsconfig.base.json b/tsconfig.base.json index e5fedcda52..c4c433f627 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -3,7 +3,7 @@ "module": "ESNext", "moduleResolution": "Bundler", "moduleDetection": "force", - "target": "es6", + "target": "es2022", "lib": ["es2022"], "emitDeclarationOnly": true, "declarationMap": true, From 0187f213e885bf23b6d4baa1363fe226d2c0195e Mon Sep 17 00:00:00 2001 From: Andreas Arvidsson Date: Sat, 29 Nov 2025 09:39:35 +0100 Subject: [PATCH 3/4] update lint ecmaVersion --- eslint.config.mts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eslint.config.mts b/eslint.config.mts index ab99178a28..46b5692b59 100644 --- a/eslint.config.mts +++ b/eslint.config.mts @@ -38,7 +38,7 @@ const rootConfig: ConfigWithExtends = { languageOptions: { parser: tsEslint.parser, - ecmaVersion: "latest", + ecmaVersion: 2022, sourceType: "module", parserOptions: { projectService: true, From a034e7baa6f9c3ce00703c9a84a9dbea22f970a0 Mon Sep 17 00:00:00 2001 From: Andreas Arvidsson Date: Sat, 29 Nov 2025 09:48:33 +0100 Subject: [PATCH 4/4] More clean up --- packages/cheatsheet/tsconfig.json | 5 +++-- packages/cursorless-vscode-tutorial-webview/tsconfig.json | 4 ++-- packages/meta-updater/tsconfig.json | 1 - 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/cheatsheet/tsconfig.json b/packages/cheatsheet/tsconfig.json index e73c1b1ccc..c01e663801 100644 --- a/packages/cheatsheet/tsconfig.json +++ b/packages/cheatsheet/tsconfig.json @@ -1,10 +1,11 @@ { "extends": "../../tsconfig.base.json", "compilerOptions": { + "target": "es2022", + "lib": ["dom", "es2022"], "jsx": "react-jsx", "esModuleInterop": true, - "skipLibCheck": true, - "lib": ["es5", "es6", "dom"] + "skipLibCheck": true }, "references": [], "include": [ diff --git a/packages/cursorless-vscode-tutorial-webview/tsconfig.json b/packages/cursorless-vscode-tutorial-webview/tsconfig.json index f7a1049892..d2209687b1 100644 --- a/packages/cursorless-vscode-tutorial-webview/tsconfig.json +++ b/packages/cursorless-vscode-tutorial-webview/tsconfig.json @@ -1,8 +1,8 @@ { "extends": "../../tsconfig.base.json", "compilerOptions": { - "jsx": "react-jsx", - "lib": ["es2022", "dom"] + "lib": ["dom", "es2022"], + "jsx": "react-jsx" }, "references": [ { diff --git a/packages/meta-updater/tsconfig.json b/packages/meta-updater/tsconfig.json index 992d5cca5a..525f87033c 100644 --- a/packages/meta-updater/tsconfig.json +++ b/packages/meta-updater/tsconfig.json @@ -2,7 +2,6 @@ "extends": "../../tsconfig.base.json", "compilerOptions": { "moduleResolution": "node", - "moduleDetection": "force", "esModuleInterop": true }, "include": ["src/**/*.ts", "src/**/*.json", "../../typings/**/*.d.ts"],