Replace Jest with Mocha for running tests, update ts to v7

package.json

@@ -47,7 +47,7 @@
     "stylelint-config-standard-scss": "^17.0.0",
     "syncpack": "^15.3.3",
     "tsx": "^4.23.13",
-    "typescript": "^6.0.3"
+    "typescript": "^7.0.2"
   },
   "pnpm": {
     "patchedDependencies": {

packages/app-web-docs/package.json

@@ -52,7 +52,7 @@
     "@types/node": "^24.13.4",
     "@types/react": "^19.3.0",
     "sass": "^1.104.0",
-    "typescript": "^6.0.3",
+    "typescript": "^7.0.2",
     "unified": "^11.0.5"
   }
 }

packages/app-web/package.json

@@ -21,8 +21,8 @@
   },
   "devDependencies": {
     "@types/node": "^24.13.4",
-    "typescript": "^6.0.3",
-    "vite": "^8.2.2",
+    "typescript": "^7.0.2",
+    "vite": "^8.3.0",
     "vite-plugin-purgecss": "^0.2.13",
     "vite-plugin-svgr": "^5.2.0"
   }

packages/lib-cheatsheet-local/package.json

@@ -6,9 +6,8 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "typecheck": "tsc",
+    "typecheck": "tsc && tsc -p ./test/tsconfig.json",
     "clean": "rm -rf ./out ./dist ./tsconfig.tsbuildinfo",
-    "test": "jest",
     "dev": "env NODE_OPTIONS=--import=tsx vite serve",
     "bundle:prod": "env NODE_OPTIONS=--import=tsx vite build",
     "bundle:dev": "env NODE_OPTIONS=--import=tsx vite build --mode development",
@@ -21,11 +20,11 @@
     "preact": "^10.29.8"
   },
   "devDependencies": {
-    "@jest/globals": "^30.5.1",
+    "@types/mocha": "^10.0.10",
     "@types/node": "^24.13.4",
-    "jest": "^30.5.1",
-    "typescript": "^6.0.3",
-    "vite": "^8.2.2",
+    "mocha": "^12.0.0",
+    "typescript": "^7.0.2",
+    "vite": "^8.3.0",
     "vite-plugin-purgecss": "^0.2.13",
     "vite-plugin-singlefile": "^2.3.3"
   }

packages/lib-cheatsheet-local/src/test/app.spec.tsx → packages/lib-cheatsheet-local/test/app.test.tsx

@@ -1,37 +1,40 @@
-import { afterEach, beforeEach, describe, expect, it } from "@jest/globals";
+import assert from "node:assert/strict";
 import { render } from "preact";
 import { act } from "preact/test-utils";
 import { fakeCheatsheetInfo } from "@cursorless/lib-cheatsheet";
-import { App } from "../app";
+import { App } from "../src/app";
 
-describe("App", () => {
-  beforeEach(() => {
+suite("App", () => {
+  setup(() => {
     document.cheatsheetInfo = fakeCheatsheetInfo;
   });
 
-  afterEach(() => {
+  teardown(() => {
+    for (const container of document.body.children) {
+      render(null, container);
+    }
     document.body.innerHTML = "";
   });
 
-  it("should render successfully", async () => {
+  test("should render successfully", async () => {
     const container = document.createElement("div");
     document.body.append(container);
 
     await act(() => {
       render(<App />, container);
     });
 
-    expect(container).toBeTruthy();
+    assert.ok(container.childElementCount > 0);
   });
 
-  it("should have a greeting as the title", async () => {
+  test("should have a greeting as the title", async () => {
     const container = document.createElement("div");
     document.body.append(container);
 
     await act(() => {
       render(<App />, container);
     });
 
-    expect(container.textContent).toMatch(/Cursorless Cheatsheet/giu);
+    assert.match(container.textContent, /Cursorless Cheatsheet/giu);
   });
 });

packages/lib-cheatsheet-local/test/tsconfig.json

@@ -0,0 +1,7 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "types": ["node", "mocha"]
+  },
+  "include": ["**/*.ts", "**/*.tsx", "../../../resources/typings/**/*.d.ts"]
+}

packages/lib-cheatsheet-local/tsconfig.json

@@ -8,6 +8,5 @@
     "src/**/*.tsx",
     "src/**/*.json",
     "../../resources/typings/**/*.d.ts"
-  ],
-  "exclude": ["src/test"]
+  ]
 }

packages/lib-cheatsheet/package.json

@@ -11,21 +11,19 @@
     "*.css"
   ],
   "scripts": {
-    "typecheck": "tsc",
-    "clean": "rm -rf ./out ./dist ./tsconfig.tsbuildinfo",
-    "test": "jest"
+    "typecheck": "tsc && tsc -p ./test/tsconfig.json",
+    "clean": "rm -rf ./out ./dist ./tsconfig.tsbuildinfo"
   },
   "dependencies": {
     "@cursorless/lib-common": "workspace:*",
     "preact": "^10.29.8",
     "react-bootstrap-icons": "^1.11.6"
   },
   "devDependencies": {
-    "@jest/globals": "^30.5.1",
+    "@types/mocha": "^10.0.10",
     "@types/node": "^24.13.4",
-    "jest": "^30.5.1",
-    "jest-environment-jsdom": "^30.5.1",
-    "ts-jest": "^29.4.12",
-    "typescript": "^6.0.3"
+    "@types/react": "^19.3.0",
+    "mocha": "^12.0.0",
+    "typescript": "^7.0.2"
   }
 }

packages/lib-cheatsheet/test/cheatsheet.test.tsx

@@ -0,0 +1,25 @@
+import assert from "node:assert/strict";
+import { render } from "preact";
+import { act } from "preact/test-utils";
+import { Cheatsheet } from "../src/lib/Cheatsheet";
+import { fakeCheatsheetInfo } from "../src/lib/utils/fakeCheatsheetInfo";
+
+suite("Cheatsheet", () => {
+  teardown(() => {
+    for (const container of document.body.children) {
+      render(null, container);
+    }
+    document.body.innerHTML = "";
+  });
+
+  test("should render successfully", async () => {
+    const container = document.createElement("div");
+    document.body.append(container);
+
+    await act(() => {
+      render(<Cheatsheet cheatsheetInfo={fakeCheatsheetInfo} />, container);
+    });
+
+    assert.ok(container.childElementCount > 0);
+  });
+});

packages/lib-cheatsheet/test/formatCaptures.test.tsx

@@ -0,0 +1,38 @@
+import assert from "node:assert/strict";
+import { render } from "preact";
+import { act } from "preact/test-utils";
+import { formatCaptures } from "../src/lib/utils/formatCaptures";
+
+suite("formatCaptures", () => {
+  teardown(() => {
+    for (const container of document.body.children) {
+      render(null, container);
+    }
+    document.body.innerHTML = "";
+  });
+
+  test("formats capture placeholders", async () => {
+    const container = document.createElement("div");
+    document.body.append(container);
+
+    await act(() => {
+      render(<div>{formatCaptures("hello <target> world")}</div>, container);
+    });
+
+    assert.equal(container.textContent, "hello [target] world");
+    assert.notEqual(container.querySelector('a[href="#legend"]'), null);
+  });
+
+  test("leaves malformed captures as plain text", async () => {
+    const container = document.createElement("div");
+    document.body.append(container);
+    const input = "<<=<=<=";
+
+    await act(() => {
+      render(<div>{formatCaptures(input)}</div>, container);
+    });
+
+    assert.equal(container.textContent, input);
+    assert.equal(container.querySelector('a[href="#legend"]'), null);
+  });
+});