bump typescript => 5.2.2 (#1979)

## 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 - [x] Check source maps are working for extension - [x] Check source maps are working in test files - [x] Don't depend on esbuild in all packages? - [x] Try running vsix from CI locally - [-] Use two .. for update recorded tests script --------- Co-authored-by: Andreas Arvidsson <[email protected]>
cursorless-dev · Nov 13, 2023 · 7efcbfd · 7efcbfd
1 parent d981813
commit 7efcbfd
Show file tree

Hide file tree

Showing 64 changed files with 3,529 additions and 2,886 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -11,7 +11,7 @@
     "ecmaVersion": 6,
     "sourceType": "module"
   },
-  "plugins": ["@typescript-eslint", "unused-imports", "import"],
+  "plugins": ["@typescript-eslint", "unused-imports", "import", "unicorn"],
   "rules": {
     "import/no-relative-packages": "error",
     "@typescript-eslint/consistent-type-assertions": [
@@ -52,7 +52,8 @@
       "MemberExpression[object.property.name='constructor'][property.name='name']"
     ],
     "no-throw-literal": "warn",
-    "semi": "off"
+    "semi": "off",
+    "unicorn/prefer-module": "error"
   },
   "overrides": [
     {

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -20,7 +20,7 @@ jobs:
       - uses: pnpm/action-setup@v2
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version-file: package.json
           cache: pnpm
       - run: pnpm --color install
       - run: pnpm --color compile

diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
@@ -21,7 +21,7 @@ jobs:
       - uses: pnpm/action-setup@v2
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version-file: package.json
           cache: pnpm
       - run: pnpm --color install
       - uses: pre-commit/[email protected]

diff --git a/.github/workflows/test-docs.yml b/.github/workflows/test-docs.yml
@@ -16,6 +16,6 @@ jobs:
       - uses: pnpm/action-setup@v2
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version-file: package.json
           cache: pnpm
       - run: bash -x scripts/build-and-assemble-website.sh
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -31,7 +31,7 @@ jobs:
       - uses: pnpm/action-setup@v2
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version-file: package.json
           cache: pnpm
       - run: mkdir -p "${{ env.VSCODE_CRASH_DIR }}" "${{ env.VSCODE_LOGS_DIR }}"
         shell: bash

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -63,14 +63,14 @@ repos:
         name: format-recorded-tests
         files: ^packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/.*/[^/]*\.yml$
         language: system
-        entry: pnpm exec tsx --conditions=cursorless:bundler packages/cursorless-engine/src/scripts/transformRecordedTests/index.ts
+        entry: pnpm exec ./packages/common/scripts/my-ts-node.js packages/cursorless-engine/src/scripts/transformRecordedTests/index.ts
   - repo: local
     hooks:
       - id: check-recorded-test-marks
         name: check-recorded-test-marks
         files: ^packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/.*/[^/]*\.yml$
         language: system
-        entry: pnpm exec tsx --conditions=cursorless:bundler packages/cursorless-engine/src/scripts/transformRecordedTests/index.ts --check-marks
+        entry: pnpm exec ./packages/common/scripts/my-ts-node.js packages/cursorless-engine/src/scripts/transformRecordedTests/index.ts --check-marks
   - repo: https://github.com/ikamensh/flynt/
     rev: "0.78"
     hooks:

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -34,7 +34,7 @@
       "args": [
         "--profile=cursorlessDevelopment",
         "--extensionDevelopmentPath=${workspaceFolder}/packages/cursorless-vscode/dist",
-        "--extensionTestsPath=${workspaceFolder}/packages/test-harness/out/runners/extensionTests"
+        "--extensionTestsPath=${workspaceFolder}/packages/test-harness/dist/extensionTests.cjs"
       ],
       "outFiles": ["${workspaceFolder}/**/out/**/*.js"],
       "preLaunchTask": "${defaultBuildTask}",
@@ -55,7 +55,7 @@
       "args": [
         "--profile=cursorlessDevelopment",
         "--extensionDevelopmentPath=${workspaceFolder}/packages/cursorless-vscode/dist",
-        "--extensionTestsPath=${workspaceFolder}/packages/test-harness/out/runners/extensionTests"
+        "--extensionTestsPath=${workspaceFolder}/packages/test-harness/dist/extensionTests.cjs"
       ],
       "outFiles": ["${workspaceFolder}/**/out/**/*.js"],
       "preLaunchTask": "Prepare test subset",
@@ -68,7 +68,7 @@
       "name": "Talon tests",
       "type": "node",
       "request": "launch",
-      "program": "${workspaceFolder}/packages/test-harness/out/scripts/runTalonTests",
+      "program": "${workspaceFolder}/packages/test-harness/dist/runTalonTests.cjs",
       "env": {
         "CURSORLESS_TEST": "true",
         "CURSORLESS_REPO_ROOT": "${workspaceFolder}"
@@ -84,7 +84,7 @@
       "name": "Talon tests subset",
       "type": "node",
       "request": "launch",
-      "program": "${workspaceFolder}/packages/test-harness/out/scripts/runTalonTests",
+      "program": "${workspaceFolder}/packages/test-harness/dist/runTalonTests.cjs",
       "env": {
         "CURSORLESS_TEST": "true",
         "CURSORLESS_RUN_TEST_SUBSET": "true",
@@ -101,7 +101,7 @@
       "name": "Unit tests only",
       "type": "node",
       "request": "launch",
-      "program": "${workspaceFolder}/packages/test-harness/out/scripts/runUnitTestsOnly",
+      "program": "${workspaceFolder}/packages/test-harness/dist/runUnitTestsOnly.cjs",
       "env": {
         "CURSORLESS_TEST": "true",
         "CURSORLESS_REPO_ROOT": "${workspaceFolder}"
@@ -125,7 +125,7 @@
       "args": [
         "--profile=cursorlessDevelopment",
         "--extensionDevelopmentPath=${workspaceFolder}/packages/cursorless-vscode/dist",
-        "--extensionTestsPath=${workspaceFolder}/packages/test-harness/out/runners/extensionTests"
+        "--extensionTestsPath=${workspaceFolder}/packages/test-harness/dist/extensionTests.cjs"
       ],
       "outFiles": ["${workspaceFolder}/**/out/**/*.js"],
       "preLaunchTask": "${defaultBuildTask}",
@@ -147,7 +147,7 @@
       "args": [
         "--profile=cursorlessDevelopment",
         "--extensionDevelopmentPath=${workspaceFolder}/packages/cursorless-vscode/dist",
-        "--extensionTestsPath=${workspaceFolder}/packages/test-harness/out/runners/extensionTests"
+        "--extensionTestsPath=${workspaceFolder}/packages/test-harness/dist/extensionTests.cjs"
       ],
       "outFiles": ["${workspaceFolder}/**/out/**/*.js"],
       "preLaunchTask": "${defaultBuildTask}",
@@ -160,7 +160,7 @@
       "name": "Update fixtures, unit tests only",
       "type": "node",
       "request": "launch",
-      "program": "${workspaceFolder}/packages/test-harness/out/scripts/runUnitTestsOnly",
+      "program": "${workspaceFolder}/packages/test-harness/dist/runUnitTestsOnly.cjs",
       "env": {
         "CURSORLESS_TEST": "true",
         "CURSORLESS_TEST_UPDATE_FIXTURES": "true",

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -24,5 +24,6 @@
   ],
   "files.eol": "\n",
   "typescript.enablePromptUseWorkspaceTsdk": true,
-  "typescript.tsdk": "node_modules/typescript/lib"
+  "typescript.tsdk": "node_modules/typescript/lib",
+  "eslint.workingDirectories": [{ "pattern": "packages/*/" }]
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -5,7 +5,12 @@
   "tasks": [
     {
       "label": "Build",
-      "dependsOn": ["Populate dist", "ESBuild", "TSBuild"],
+      "dependsOn": [
+        "Populate dist",
+        "ESBuild",
+        "TSBuild",
+        "Build test harness"
+      ],
       "group": {
         "kind": "build",
         "isDefault": true
@@ -22,7 +27,17 @@
       "script": "esbuild",
       "path": "packages/cursorless-vscode",
       "presentation": {
-        "reveal": "never"
+        "reveal": "silent"
+      },
+      "group": "build"
+    },
+    {
+      "label": "Build test harness",
+      "type": "npm",
+      "script": "build",
+      "path": "packages/test-harness",
+      "presentation": {
+        "reveal": "silent"
       },
       "group": "build"
     },
@@ -32,7 +47,7 @@
       "script": "compile",
       "problemMatcher": "$tsc",
       "presentation": {
-        "reveal": "never"
+        "reveal": "silent"
       },
       "group": "build"
     },
@@ -42,7 +57,7 @@
       "script": "populate-dist",
       "path": "packages/cursorless-vscode",
       "presentation": {
-        "reveal": "never"
+        "reveal": "silent"
       },
       "group": "build"
     },
@@ -73,9 +88,25 @@
       "dependsOrder": "sequence",
       "group": "test"
     },
+    {
+      "label": "watch",
+      "dependsOn": ["Watch esbuild", "Watch typescript"],
+      "group": "build"
+    },
+    {
+      "type": "npm",
+      "script": "watch:esbuild",
+      "label": "Watch esbuild",
+      "isBackground": true,
+      "presentation": {
+        "reveal": "never"
+      },
+      "group": "build"
+    },
     {
       "type": "npm",
-      "script": "watch",
+      "script": "watch:tsc",
+      "label": "Watch typescript",
       "problemMatcher": "$tsc-watch",
       "isBackground": true,
       "presentation": {

diff --git a/docs/user/installation.md b/docs/user/installation.md
@@ -15,7 +15,7 @@
 
 Clone repo into `~/.talon/user`
 
-```insert code:
+```bash
 cd ~/.talon/user
 git clone https://github.com/cursorless-dev/cursorless-talon.git cursorless-talon
 ```
@@ -24,7 +24,7 @@ Alternatively, access the directory by right clicking the Talon icon in taskbar,
 
 The folder structure should look something like the below:
 
-```insert code:
+```
 ~/.talon/user/community
 ~/.talon/user/community/apps
 ~/.talon/user/community/code
@@ -40,7 +40,7 @@ Now, restart Talon.
 
 Clone repo into `%AppData%\Talon\user`
 
-```insert code:
+```bash
 cd %AppData%\Talon\user
 git clone https://github.com/cursorless-dev/cursorless-talon.git cursorless-talon
 ```
@@ -49,7 +49,7 @@ Alternatively, access the directory by right clicking the Talon icon in taskbar,
 
 The folder structure should look something like the below:
 
-```insert code:
+```
 %AppData%\Talon\user\community
 %AppData%\Talon\user\community\apps
 %AppData%\Talon\user\community\code

diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
   "scripts": {
     "build": "pnpm -r build",
     "clean": "pnpm -r clean",
-    "compile": "tsc --build",
+    "compile": "tsc --build && pnpm -r --if-present compile:esbuild",
     "fix:eslint": "pnpm lint:ts --fix",
     "fix:meta": "pnpm run meta-updater:base && pnpm -r exec prettier --write tsconfig.json package.json",
     "fix:syncpack": "pnpm syncpack fix-mismatches",
@@ -18,30 +18,33 @@
     "preinstall": "npx only-allow pnpm",
     "test-compile": "tsc --build",
     "test": "pnpm compile && pnpm lint && pnpm -F '!test-harness' test && pnpm -F test-harness test",
-    "transform-recorded-tests": "tsx --conditions=cursorless:bundler packages/cursorless-engine/src/scripts/transformRecordedTests/index.ts",
-    "watch": "tsc --build --watch"
+    "transform-recorded-tests": "./packages/common/scripts/my-ts-node.js packages/cursorless-engine/src/scripts/transformRecordedTests/index.ts",
+    "watch": "pnpm run -w --parallel '/^watch:.*/'",
+    "watch:esbuild": "pnpm run -r --parallel --if-present watch:esbuild",
+    "watch:tsc": "tsc --build --watch"
   },
   "keywords": [],
   "author": "",
   "license": "MIT",
   "devDependencies": {
     "@pnpm/meta-updater": "1.0.0",
-    "@types/node": "^16.11.3",
+    "@types/node": "^18.18.2",
     "@typescript-eslint/eslint-plugin": "^6.9.0",
     "@typescript-eslint/parser": "^6.9.0",
-    "eslint": "^8.38.0",
+    "esbuild": "^0.17.11",
+    "eslint": "^8.53.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-import-resolver-typescript": "3.5.5",
     "eslint-plugin-import": "2.28.1",
+    "eslint-plugin-unicorn": "49.0.0",
     "eslint-plugin-unused-imports": "^3.0.0",
     "prettier": "3.0.3",
     "syncpack": "9.8.4",
-    "tsx": "3.12.3",
-    "typescript": "^5.1.6"
+    "typescript": "^5.2.2"
   },
   "pnpm": {
     "patchedDependencies": {
-      "@docusaurus/[email protected]-alpha.0": "patches/@[email protected]"
+      "@docusaurus/[email protected]": "patches/@[email protected]"
     },
     "peerDependencyRules": {
       "ignoreMissing": [
@@ -53,5 +56,9 @@
       }
     }
   },
-  "packageManager": "[email protected]"
+  "engines": {
+    "node": ">=18.18.2"
+  },
+  "packageManager": "[email protected]",
+  "type": "module"
 }
diff --git a/packages/cheatsheet-local/package.json b/packages/cheatsheet-local/package.json
@@ -7,11 +7,11 @@
   "scripts": {
     "compile": "tsc --build",
     "watch": "tsc --build --watch",
-    "webpack": "pnpm compile && webpack --config ./src/webpack.config.ts",
+    "webpack": "pnpm -w compile && env NODE_OPTIONS=--loader=ts-node/esm webpack --config ./src/webpack.config.ts",
     "build": "pnpm build:prod",
     "build:dev": "pnpm webpack --mode=development",
     "build:prod": "pnpm webpack --mode=production --node-env=production",
-    "clean": "rm -rf ./out tsconfig.tsbuildinfo"
+    "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build"
   },
   "keywords": [],
   "author": "",
@@ -32,7 +32,7 @@
     "@effortlessmotion/html-webpack-inline-source-plugin": "1.0.3",
     "@testing-library/react": "14.0.0",
     "@types/jest": "29.4.0",
-    "@types/node": "^16.11.3",
+    "@types/node": "^18.18.2",
     "@types/react": "18.0.28",
     "@types/react-dom": "18.0.11",
     "@types/webpack": "5.28.0",
@@ -44,12 +44,19 @@
     "postcss": "8.4.31",
     "postcss-loader": "7.0.2",
     "style-loader": "3.3.1",
-    "tailwindcss": "3.2.7",
+    "tailwindcss": "3.3.5",
     "ts-loader": "9.4.2",
     "ts-node": "10.9.1",
-    "typescript": "^5.1.6",
-    "webpack": "5.88.2",
+    "typescript": "^5.2.2",
+    "webpack": "5.89.0",
     "webpack-cli": "5.1.4",
     "webpack-dev-server": "4.11.1"
-  }
+  },
+  "postcss": {
+    "plugins": {
+      "tailwindcss": {},
+      "autoprefixer": {}
+    }
+  },
+  "type": "module"
 }
diff --git a/packages/cheatsheet-local/postcss.config.js b/packages/cheatsheet-local/postcss.config.js
diff --git a/packages/cheatsheet-local/src/webpack.config.ts b/packages/cheatsheet-local/src/webpack.config.ts
@@ -38,6 +38,12 @@ const config: Configuration = {
         test: /\.(ts|tsx)$/i,
         loader: "ts-loader",
         exclude: ["/node_modules/"],
+        options: {
+          compilerOptions: {
+            noEmit: false,
+            emitDeclarationOnly: false,
+          },
+        },
       },
       {
         test: /\.css$/i,
@@ -54,4 +60,4 @@ const config: Configuration = {
   },
 };
 
-module.exports = () => config;
+export default () => config;