Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@
},
"devDependencies": {
"@pnpm/meta-updater": "^2.0.6",
"@types/node": "^24.12.0",
"esbuild": "^0.27.4",
"@types/node": "^24.12.2",
"esbuild": "^0.28.0",
"eslint-plugin-mocha": "^11.2.0",
"oxfmt": "^0.42.0",
"oxlint": "^1.57.0",
"oxlint-tsgolint": "^0.18.1",
"oxfmt": "^0.44.0",
"oxlint": "^1.59.0",
"oxlint-tsgolint": "^0.20.0",
"stylelint": "^17.6.0",
"stylelint-config-standard": "^40.0.0",
"stylelint-config-standard-scss": "^17.0.0",
Expand Down
8 changes: 4 additions & 4 deletions packages/app-vscode/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -1329,12 +1329,12 @@
"@types/lodash-es": "^4.17.12",
"@types/mocha": "^10.0.10",
"@types/nearley": "^2.11.5",
"@types/node": "^24.12.0",
"@types/node": "^24.12.2",
"@types/semver": "^7.7.1",
"@types/sinon": "^21.0.0",
"@types/sinon": "^21.0.1",
"@types/vscode": "1.98.0",
"esbuild": "^0.27.4",
"fast-xml-parser": "^5.5.9",
"esbuild": "^0.28.0",
"fast-xml-parser": "^5.5.10",
"fs-extra": "^11.3.4",
"sinon": "^21.0.3",
"tsx": "^4.21.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/app-vscode/src/keyboard/KeyboardConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ export class KeyboardConfig {
}
>(section, (value) => ({
type: tokenType,
value: value,
value,
}));
}

Expand Down
24 changes: 12 additions & 12 deletions packages/app-web-docs/docusaurus.config.mts
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import { createRequire } from "node:module";
import { dirname, extname, relative, resolve } from "node:path";
import * as path from "node:path";
import { fileURLToPath } from "node:url";
import type { Config } from "@docusaurus/types";
import type { Root } from "mdast";
import { themes } from "prism-react-renderer";
import type { Transformer } from "unified";
import { visit } from "unist-util-visit";

// oxlint-disable-next-line unicorn/prefer-import-meta-properties
const __dirname = path.dirname(fileURLToPath(import.meta.url));
const require = createRequire(import.meta.url);

const docsRelative = "packages/app-web-docs/src/docs/";
Expand Down Expand Up @@ -42,16 +44,14 @@ function remarkPluginFixLinksToRepositoryArtifacts(): Transformer<Root> {
return;
}

const repoRoot = resolve(
dirname(fileURLToPath(import.meta.url)),
"../..",
);
const artifact = resolve(file.dirname!, url);
const artifactRelative = relative(repoRoot, artifact).replaceAll(
"\\",
"/",
);
const fileRelative = relative(repoRoot, file.path).replaceAll("\\", "/");
const repoRoot = path.resolve(__dirname, "../..");
const artifact = path.resolve(file.dirname!, url);
const artifactRelative = path
.relative(repoRoot, artifact)
.replaceAll("\\", "/");
const fileRelative = path
.relative(repoRoot, file.path)
.replaceAll("\\", "/");

// We host all files under docs. Will resolve as a relative link, but
// relative links pointing to a folder passing between user and
Expand All @@ -73,7 +73,7 @@ function remarkPluginFixLinksToRepositoryArtifacts(): Transformer<Root> {
}

function isFolder(url: string) {
return !extname(url);
return !path.extname(url);
}

function passingBetweenUserAndContributing(
Expand Down
6 changes: 3 additions & 3 deletions packages/app-web-docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"build": "docusaurus build --out-dir out"
},
"dependencies": {
"@algolia/client-search": "^5.50.0",
"@algolia/client-search": "^5.50.1",
"@cursorless/lib-common": "workspace:*",
"@docsearch/react": "^4.6.2",
"@docusaurus/core": "^3.9.2",
Expand All @@ -47,9 +47,9 @@
"@docusaurus/types": "^3.9.2",
"@types/mdast": "^4.0.4",
"@types/mocha": "^10.0.10",
"@types/node": "^24.12.0",
"@types/node": "^24.12.2",
"@types/react": "^19.2.14",
"sass": "^1.98.0",
"sass": "^1.99.0",
"typescript": "^6.0.2",
"unified": "^11.0.5"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ interface Props {

export function ScopeVisualizer({ languageId, scopeTypeType }: Props) {
const scopeTests = usePluginData("scope-tests-plugin") as ScopeTests;
// oxlint-disable-next-line react/hook-use-state
const [scopes] = useState(
getScopeFixtures(scopeTests, languageId, scopeTypeType),
);
Expand Down
5 changes: 3 additions & 2 deletions packages/app-web-docs/src/plugins/scope-tests-plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import type {
Target,
} from "../docs/components/types";

// oxlint-disable-next-line unicorn/prefer-import-meta-properties
const __dirname = path.dirname(fileURLToPath(import.meta.url));

export default function prepareAssetsPlugin(
Expand Down Expand Up @@ -179,8 +180,8 @@ function parseLine(line: string) {
const fullIndex = header.slice(1, spaceIndex);
const [scopeIndex, targetIndex] = fullIndex.split(".");
return {
scopeIndex: scopeIndex,
targetIndex: targetIndex,
scopeIndex,
targetIndex,
type: header.slice(spaceIndex + 1),
};
}
Expand Down
8 changes: 4 additions & 4 deletions packages/app-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
"@cursorless/lib-cheatsheet": "workspace:*",
"@cursorless/lib-common": "workspace:*",
"bootstrap": "^5.3.8",
"preact": "^10.29.0",
"preact": "^10.29.1",
"react-player": "^3.4.0",
"wouter-preact": "^3.9.0"
},
"devDependencies": {
"@types/node": "^24.12.0",
"@types/node": "^24.12.2",
"typescript": "^6.0.2",
"vite": "^8.0.5",
"vite": "^8.0.6",
"vite-plugin-purgecss": "^0.2.13",
"vite-plugin-svgr": "^5.0.0"
"vite-plugin-svgr": "^5.2.0"
}
}
6 changes: 3 additions & 3 deletions packages/lib-cheatsheet-local/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@
"@cursorless/lib-cheatsheet": "workspace:*",
"@cursorless/lib-common": "workspace:*",
"bootstrap": "^5.3.8",
"preact": "^10.29.0"
"preact": "^10.29.1"
},
"devDependencies": {
"@types/jest": "^30.0.0",
"@types/node": "^24.12.0",
"@types/node": "^24.12.2",
"jest": "^30.3.0",
"typescript": "^6.0.2",
"vite": "^8.0.5",
"vite": "^8.0.6",
"vite-plugin-purgecss": "^0.2.13",
"vite-plugin-singlefile": "^2.3.2"
}
Expand Down
4 changes: 2 additions & 2 deletions packages/lib-cheatsheet/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@
},
"dependencies": {
"@cursorless/lib-common": "workspace:*",
"preact": "^10.29.0",
"preact": "^10.29.1",
"react-bootstrap-icons": "^1.11.6"
},
"devDependencies": {
"@types/jest": "^30.0.0",
"jest": "^30.3.0",
"jest-environment-jsdom": "^30.3.0",
"ts-jest": "^29.4.6",
"ts-jest": "^29.4.9",
"typescript": "^6.0.2"
}
}
2 changes: 1 addition & 1 deletion packages/lib-common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@
"cross-spawn": "^7.0.6",
"fast-check": "^4.6.0",
"js-yaml": "^4.1.1",
"web-tree-sitter": "^0.26.7"
"web-tree-sitter": "^0.26.8"
}
}
6 changes: 2 additions & 4 deletions packages/lib-common/scripts/c-tsx.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
// This script runs a TypeScript file using tsx after setting repo-specific
// environment variables.

import { dirname, join } from "node:path";
import { fileURLToPath } from "node:url";
import { join } from "node:path";
import { spawn } from "cross-spawn";

/**
Expand Down Expand Up @@ -38,8 +37,7 @@ function main() {

const [fileToRun, ...childArgs] = args;

const scriptDirectory = dirname(fileURLToPath(import.meta.url));
const repoRoot = join(scriptDirectory, "..", "..", "..");
const repoRoot = join(import.meta.dirname, "..", "..", "..");

const nodeProcess = runCommand(
"tsx",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ export class InMemoryTextEditor implements EditableTextEditor {
this.selections = selections;
this.ide.emitDidChangeTextEditorSelection({
textEditor: this,
selections: selections,
selections,
});
}
return Promise.resolve();
Expand Down
2 changes: 1 addition & 1 deletion packages/lib-engine/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@
"@types/moo": "^0.5.10",
"@types/nearley": "^2.11.5",
"js-yaml": "^4.1.1",
"web-tree-sitter": "^0.26.7"
"web-tree-sitter": "^0.26.8"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export class PasteFromClipboardDirectly {
);

return thatTargetSelections.map((selection) => ({
editor: editor,
editor,
selection,
}));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ export class PasteFromClipboardUsingCommand {

return {
thatSelections: updatedTargetSelections.map((selection) => ({
editor: editor,
editor,
selection,
})),
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,21 @@ export function getSmartRemovalTarget(target: Target): Target {
return new ParagraphTarget({
editor,
isReversed,
contentRange: contentRange,
contentRange,
});
}

return new LineTarget({
editor,
isReversed,
contentRange: contentRange,
contentRange,
});
}

return new TokenTarget({
editor,
isReversed,
contentRange: contentRange,
contentRange,
});
}

Expand Down
4 changes: 2 additions & 2 deletions packages/lib-neovim-common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
"@cursorless/lib-common": "workspace:*",
"@cursorless/lib-neovim-registry": "workspace:*",
"@cursorless/lib-node-common": "workspace:*",
"lodash": "^4.18.1",
"lodash-es": "^4.18.1",
"neovim": "^5.4.0",
"uuid": "^13.0.0",
"vscode-uri": "^3.1.0"
},
"devDependencies": {
"@types/lodash": "^4.17.24",
"@types/lodash-es": "^4.17.12",
"@types/vscode": "1.98.0"
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { get } from "lodash";
import { get } from "lodash-es";
import type {
Configuration,
ConfigurationScope,
Expand Down
2 changes: 1 addition & 1 deletion packages/lib-neovim-common/src/ide/neovim/NeovimEdit.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export default async function neovimEdit(
}

getNeovimRegistry().emitEvent("onDidChangeTextDocument", {
document: document,
document,
contentChanges: changes,
});

Expand Down
8 changes: 4 additions & 4 deletions packages/lib-neovim-common/src/ide/neovim/NeovimEvents.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ export function fromNeovimContentChange(
const rangeOffset = document.offsetAt(range.start);
const rangeLength = document.offsetAt(range.end) - rangeOffset;
result.push({
range: range,
rangeOffset: rangeOffset,
rangeLength: rangeLength,
text: text,
range,
rangeOffset,
rangeLength,
text,
});
console.debug(`fromNeovimContentChange(): changes=${JSON.stringify(result)}`);
return result;
Expand Down
2 changes: 1 addition & 1 deletion packages/lib-neovim-common/src/ide/neovim/NeovimIDE.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as path from "node:path";
import { pull } from "lodash";
import { pull } from "lodash-es";
import type { Buffer, NeovimClient, Window } from "neovim";
import { v4 as uuid } from "uuid";
import { URI } from "vscode-uri";
Expand Down
4 changes: 2 additions & 2 deletions packages/lib-vscode-tutorial-webview/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
"dependencies": {
"@cursorless/lib-common": "workspace:*",
"bootstrap": "^5.3.8",
"preact": "^10.29.0"
"preact": "^10.29.1"
},
"devDependencies": {
"@types/vscode-webview": "^1.57.5",
"vite": "^8.0.5",
"vite": "^8.0.6",
"vite-plugin-purgecss": "^0.2.13"
}
}
2 changes: 1 addition & 1 deletion packages/test-neovim-e2e/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"devDependencies": {
"@types/js-yaml": "^4.0.9",
"@types/mocha": "^10.0.10",
"@types/sinon": "^21.0.0",
"@types/sinon": "^21.0.1",
"js-yaml": "^4.1.1",
"neovim": "^5.4.0",
"sinon": "^21.0.3"
Expand Down
2 changes: 1 addition & 1 deletion packages/test-runner/src/runners/extensionTestsNeovim.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export async function run(plugin: NvimPlugin): Promise<void> {
*/
const client = plugin.nvim as NeovimClient;
(globalThis as any).additionalParameters = {
client: client,
client,
};
let code = 0;
// NOTE: the parsing of the logs below is only done on CI in order to detect success/failure
Expand Down
2 changes: 1 addition & 1 deletion packages/test-talon-e2e/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@
},
"devDependencies": {
"@types/mocha": "^10.0.10",
"esbuild": "^0.27.4"
"esbuild": "^0.28.0"
}
}
2 changes: 1 addition & 1 deletion packages/test-vscode-e2e/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"@types/lodash-es": "^4.17.12",
"@types/mocha": "^10.0.10",
"@types/semver": "^7.7.1",
"@types/sinon": "^21.0.0",
"@types/sinon": "^21.0.1",
"@types/vscode": "1.98.0",
"semver": "^7.7.4",
"sinon": "^21.0.3"
Expand Down
Loading
Loading