Merge branch 'main' into codex/fix-privileged-deploy-workflow-vulnerability

AndreasArvidsson · web-flow · commit e48954a06e57 · 2026-05-30T09:46:26.000+02:00
diff --git a/package.json b/package.json
@@ -37,15 +37,15 @@
     "@pnpm/meta-updater": "^2.0.6",
     "@types/node": "^24.12.4",
     "esbuild": "^0.28.0",
-    "eslint-plugin-mocha": "^11.2.0",
-    "oxfmt": "^0.49.0",
-    "oxlint": "^1.64.0",
-    "oxlint-tsgolint": "^0.22.1",
-    "stylelint": "^17.11.0",
+    "eslint-plugin-mocha": "^11.3.0",
+    "oxfmt": "^0.51.0",
+    "oxlint": "^1.66.0",
+    "oxlint-tsgolint": "^0.23.0",
+    "stylelint": "^17.12.0",
     "stylelint-config-standard": "^40.0.0",
     "stylelint-config-standard-scss": "^17.0.0",
-    "syncpack": "^15.1.2",
-    "tsx": "^4.21.0",
+    "syncpack": "^15.3.1",
+    "tsx": "^4.22.3",
     "typescript": "^6.0.3"
   },
   "pnpm": {
diff --git a/packages/app-vscode/package.json b/packages/app-vscode/package.json
@@ -1316,10 +1316,10 @@
     "@cursorless/lib-tutorial": "workspace:*",
     "@cursorless/lib-vscode-common": "workspace:*",
     "fast-glob": "^3.3.3",
-    "itertools": "^2.6.0",
+    "itertools": "^2.7.1",
     "lodash-es": "^4.18.1",
     "nearley": "^2.20.1",
-    "semver": "^7.8.0",
+    "semver": "^7.8.1",
     "trie-search": "^2.2.1",
     "uuid": "^14.0.0",
     "vscode-uri": "^3.1.0"
@@ -1337,6 +1337,6 @@
     "fast-xml-parser": "^5.8.0",
     "fs-extra": "^11.3.5",
     "sinon": "^22.0.0",
-    "tsx": "^4.21.0"
+    "tsx": "^4.22.3"
   }
 }
diff --git a/packages/app-vscode/resources/installationDependencies.js b/packages/app-vscode/resources/installationDependencies.js
@@ -23,6 +23,7 @@ window.addEventListener("message", (event) => {
   inputDontShow.checked = dontShow;
 });
 
+// oxlint-disable-next-line no-implicit-globals
 function hide(element, doHide) {
   element.className = doHide ? "hide" : "";
 }
diff --git a/packages/app-web-docs/package.json b/packages/app-web-docs/package.json
@@ -38,7 +38,7 @@
     "prism-react-renderer": "^2.4.1",
     "react": "^19.2.6",
     "react-dom": "^19.2.6",
-    "shiki": "^4.0.2",
+    "shiki": "^4.1.0",
     "unist-util-visit": "^5.1.0"
   },
   "devDependencies": {
@@ -48,8 +48,8 @@
     "@types/mdast": "^4.0.4",
     "@types/mocha": "^10.0.10",
     "@types/node": "^24.12.4",
-    "@types/react": "^19.2.14",
-    "sass": "^1.99.0",
+    "@types/react": "^19.2.15",
+    "sass": "^1.100.0",
     "typescript": "^6.0.3",
     "unified": "^11.0.5"
   }
diff --git a/packages/app-web-docs/src/docs/contributing/architecture/_category_.json b/packages/app-web-docs/src/docs/contributing/architecture/_category_.json
@@ -0,0 +1,3 @@
+{
+  "label": "Architecture"
+}
diff --git a/packages/app-web-docs/src/docs/user/experimental/keyboard/_category_.json b/packages/app-web-docs/src/docs/user/experimental/keyboard/_category_.json
@@ -0,0 +1,3 @@
+{
+  "label": "Keyboard"
+}
diff --git a/packages/app-web-docs/src/docs/user/reference/_category_.json b/packages/app-web-docs/src/docs/user/reference/_category_.json
@@ -0,0 +1,3 @@
+{
+  "label": "Reference"
+}
diff --git a/packages/app-web/package.json b/packages/app-web/package.json
@@ -15,14 +15,14 @@
     "@cursorless/lib-cheatsheet": "workspace:*",
     "@cursorless/lib-common": "workspace:*",
     "bootstrap": "^5.3.8",
-    "preact": "^10.29.1",
+    "preact": "^10.29.2",
     "react-player": "^3.4.0",
-    "wouter-preact": "^3.9.0"
+    "wouter-preact": "^3.10.0"
   },
   "devDependencies": {
     "@types/node": "^24.12.4",
     "typescript": "^6.0.3",
-    "vite": "^8.0.12",
+    "vite": "^8.0.14",
     "vite-plugin-purgecss": "^0.2.13",
     "vite-plugin-svgr": "^5.2.0"
   }
diff --git a/packages/lib-cheatsheet-local/package.json b/packages/lib-cheatsheet-local/package.json
@@ -18,14 +18,14 @@
     "@cursorless/lib-cheatsheet": "workspace:*",
     "@cursorless/lib-common": "workspace:*",
     "bootstrap": "^5.3.8",
-    "preact": "^10.29.1"
+    "preact": "^10.29.2"
   },
   "devDependencies": {
     "@types/jest": "^30.0.0",
     "@types/node": "^24.12.4",
     "jest": "^30.4.2",
     "typescript": "^6.0.3",
-    "vite": "^8.0.12",
+    "vite": "^8.0.14",
     "vite-plugin-purgecss": "^0.2.13",
     "vite-plugin-singlefile": "^2.3.3"
   }
diff --git a/packages/lib-cheatsheet/package.json b/packages/lib-cheatsheet/package.json
@@ -18,14 +18,14 @@
   },
   "dependencies": {
     "@cursorless/lib-common": "workspace:*",
-    "preact": "^10.29.1",
+    "preact": "^10.29.2",
     "react-bootstrap-icons": "^1.11.6"
   },
   "devDependencies": {
     "@types/jest": "^30.0.0",
     "jest": "^30.4.2",
     "jest-environment-jsdom": "^30.4.1",
-    "ts-jest": "^29.4.9",
+    "ts-jest": "^29.4.11",
     "typescript": "^6.0.3"
   }
 }
diff --git a/packages/lib-common/package.json b/packages/lib-common/package.json
@@ -17,7 +17,7 @@
     "clean": "rm -rf ./out ./dist ./tsconfig.tsbuildinfo"
   },
   "dependencies": {
-    "itertools": "^2.6.0",
+    "itertools": "^2.7.1",
     "lodash-es": "^4.18.1",
     "tinycolor2": "^1.6.0",
     "vscode-uri": "^3.1.0"
@@ -30,6 +30,6 @@
     "cross-spawn": "^7.0.6",
     "fast-check": "^4.8.0",
     "js-yaml": "^4.1.1",
-    "web-tree-sitter": "^0.26.8"
+    "web-tree-sitter": "^0.26.9"
   }
 }
diff --git a/packages/lib-common/src/scopeSupportFacets/javascript.ts b/packages/lib-common/src/scopeSupportFacets/javascript.ts
@@ -261,7 +261,6 @@ export const javascriptCoreScopeSupport: LanguageScopeSupportFacetMap = {
   "branch.loop.iteration": notApplicable,
 
   // Miscellaneous
-  "statement.misc": notApplicable,
   environment: notApplicable,
   selector: notApplicable,
   unit: notApplicable,
@@ -352,5 +351,6 @@ export const javascriptScopeSupport: LanguageScopeSupportFacetMap = {
   "argument.actual.enum.iteration": notApplicable,
 
   // Miscellaneous
+  "statement.misc": notApplicable,
   "statement.package": notApplicable,
 };
diff --git a/packages/lib-common/src/scopeSupportFacets/typescript.ts b/packages/lib-common/src/scopeSupportFacets/typescript.ts
@@ -54,6 +54,7 @@ export const typescriptScopeSupport: LanguageScopeSupportFacetMap = {
   "statement.iteration.interface": supported,
   "statement.typeAlias": supported,
   "statement.method.interface": supported,
+  "statement.misc": supported,
 
   "value.typeAlias": supported,
   "value.field.enum": supported,
diff --git a/packages/lib-engine/package.json b/packages/lib-engine/package.json
@@ -23,7 +23,7 @@
     "@cursorless/talon-tools": "^0.11.0",
     "immer": "^11.1.8",
     "immutability-helper": "^3.1.1",
-    "itertools": "^2.6.0",
+    "itertools": "^2.7.1",
     "lodash-es": "^4.18.1",
     "moo": "^0.5.3",
     "nearley": "^2.20.1",
@@ -37,6 +37,6 @@
     "@types/moo": "^0.5.10",
     "@types/nearley": "^2.11.5",
     "js-yaml": "^4.1.1",
-    "web-tree-sitter": "^0.26.8"
+    "web-tree-sitter": "^0.26.9"
   }
 }
diff --git a/packages/lib-engine/src/snippets/snippetParser.test.ts b/packages/lib-engine/src/snippets/snippetParser.test.ts
@@ -7,12 +7,6 @@ import { SnippetParser } from "./vendor/vscodeSnippet/snippetParser";
 
 suite("SnippetParser", () => {
   test("Marker, toTextmateString()", () => {
-    function assertTextsnippetString(input: string, expected: string): void {
-      const snippet = new SnippetParser().parse(input);
-      const actual = snippet.toTextmateString();
-      assert.equal(actual, expected);
-    }
-
     assertTextsnippetString(
       // oxlint-disable-next-line no-template-curly-in-string
       "${1|cho\\,ices,wi\\|th,esc\\\\aping,chall\\\\\\,enges|}",
@@ -21,3 +15,9 @@ suite("SnippetParser", () => {
     );
   });
 });
+
+function assertTextsnippetString(input: string, expected: string): void {
+  const snippet = new SnippetParser().parse(input);
+  const actual = snippet.toTextmateString();
+  assert.equal(actual, expected);
+}
diff --git a/packages/lib-neovim-common/src/neovimApi.ts b/packages/lib-neovim-common/src/neovimApi.ts
@@ -164,6 +164,6 @@ export async function showErrorMessage(
   client: NeovimClient,
   message: string,
 ): Promise<void> {
-  const luaCode = `vim.notify("${message}")`;
-  await client.executeLua(luaCode, []);
+  const luaCode = "vim.notify(...)";
+  await client.executeLua(luaCode, [message]);
 }
diff --git a/packages/lib-node-common/src/walkSync.ts b/packages/lib-node-common/src/walkSync.ts
@@ -28,18 +28,19 @@ export const walkFilesSync = (dir: string): string[] => {
  * @returns
  */
 export const walkDirsSync = (dir: string): string[] => {
-  // Inner function returns absolute paths
-  const walkDirsSyncInner = (dir: string): string[] => {
-    let dirlist: string[] = [];
-    for (const dirent of readdirSync(dir, { withFileTypes: true })) {
-      if (dirent.isDirectory()) {
-        const dirPath = path.join(dir, dirent.name);
-        dirlist.push(dirPath);
-        dirlist = dirlist.concat(walkDirsSyncInner(dirPath));
-      }
-    }
-    return dirlist;
-  };
   // Convert to relative paths
   return walkDirsSyncInner(dir).map((absPath) => path.relative(dir, absPath));
 };
+
+// Inner function returns absolute paths
+const walkDirsSyncInner = (dir: string): string[] => {
+  let dirlist: string[] = [];
+  for (const dirent of readdirSync(dir, { withFileTypes: true })) {
+    if (dirent.isDirectory()) {
+      const dirPath = path.join(dir, dirent.name);
+      dirlist.push(dirPath);
+      dirlist = dirlist.concat(walkDirsSyncInner(dirPath));
+    }
+  }
+  return dirlist;
+};
diff --git a/packages/lib-vscode-common/src/testUtil/closeUiElements.ts b/packages/lib-vscode-common/src/testUtil/closeUiElements.ts
@@ -1,6 +1,8 @@
 import { commands } from "vscode";
 
 export async function closeUiElements() {
+  // If we're in a snippet, leave it. This is needed or some snippet tests will fail.
+  await commands.executeCommand("leaveSnippet");
   // Many times running these tests opens the sidebar, which slows performance. Close it.
   await commands.executeCommand("workbench.action.closeSidebar");
   // Close the find widget as well, since it can also be open and cause performance issues.
diff --git a/packages/lib-vscode-tutorial-webview/package.json b/packages/lib-vscode-tutorial-webview/package.json
@@ -16,11 +16,11 @@
   "dependencies": {
     "@cursorless/lib-common": "workspace:*",
     "bootstrap": "^5.3.8",
-    "preact": "^10.29.1"
+    "preact": "^10.29.2"
   },
   "devDependencies": {
     "@types/vscode-webview": "^1.57.5",
-    "vite": "^8.0.12",
+    "vite": "^8.0.14",
     "vite-plugin-purgecss": "^0.2.13"
   }
 }
diff --git a/packages/test-runner/package.json b/packages/test-runner/package.json
@@ -35,7 +35,7 @@
     "@types/tail": "^2.2.3",
     "@vscode/test-electron": "^2.5.2",
     "cross-spawn": "^7.0.6",
-    "mocha": "^11.7.5",
-    "tsx": "^4.21.0"
+    "mocha": "^11.7.6",
+    "tsx": "^4.22.3"
   }
 }
diff --git a/packages/test-vscode-e2e/package.json b/packages/test-vscode-e2e/package.json
@@ -22,7 +22,7 @@
     "@types/semver": "^7.7.1",
     "@types/sinon": "^21.0.1",
     "@types/vscode": "1.98.0",
-    "semver": "^7.8.0",
+    "semver": "^7.8.1",
     "sinon": "^22.0.0"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/resources/fixtures/scopes/typescript.core/statement/statement.misc.scope b/resources/fixtures/scopes/typescript.core/statement/statement.misc.scope
diff --git a/resources/queries/javascript.core.scm b/resources/queries/javascript.core.scm
diff --git a/resources/queries/typescript.core.scm b/resources/queries/typescript.core.scm

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ window.addEventListener("message", (event) => {`
`23`	`23`	`inputDontShow.checked = dontShow;`
`24`	`24`	`});`
`25`	`25`
	`26`	`+// oxlint-disable-next-line no-implicit-globals`
`26`	`27`	`function hide(element, doHide) {`
`27`	`28`	`element.className = doHide ? "hide" : "";`
`28`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "label": "Architecture"`
	`3`	`+}`