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
1 change: 1 addition & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
{
"argsIgnorePattern": "^_",
"varsIgnorePattern": "^_",
"caughtErrorsIgnorePattern": "^_",
"ignoreRestSiblings": true
}
],
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v20.12.1
v20.18.0
34 changes: 17 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,26 +28,26 @@
"author": "",
"license": "MIT",
"devDependencies": {
"@pnpm/meta-updater": "1.0.0",
"@types/node": "18.18.2",
"@typescript-eslint/eslint-plugin": "^7.4.0",
"@typescript-eslint/parser": "^7.18.0",
"esbuild": "^0.20.2",
"eslint": "^8.57.0",
"@pnpm/meta-updater": "2.0.3",
"@types/node": "20.16.0",
"@typescript-eslint/eslint-plugin": "^8.9.0",
"@typescript-eslint/parser": "^8.9.0",
"esbuild": "^0.24.0",
"eslint": "^8.57.1",
"eslint-config-prettier": "^9.1.0",
"eslint-import-resolver-typescript": "3.6.1",
"eslint-plugin-import": "2.29.1",
"eslint-plugin-mocha": "10.4.1",
"eslint-plugin-unicorn": "51.0.1",
"eslint-plugin-unused-imports": "^3.1.0",
"prettier": "3.2.5",
"prettier-plugin-tailwindcss": "0.5.12",
"syncpack": "12.3.0",
"typescript": "^5.5.3"
"eslint-import-resolver-typescript": "3.6.3",
"eslint-plugin-import": "2.31.0",
"eslint-plugin-mocha": "10.5.0",
"eslint-plugin-unicorn": "56.0.0",
"eslint-plugin-unused-imports": "^4.1.4",
"prettier": "3.3.3",
"prettier-plugin-tailwindcss": "0.6.8",
"syncpack": "13.0.0",
"typescript": "^5.6.3"
},
"pnpm": {
"patchedDependencies": {
"@docusaurus/theme-search-algolia@3.1.1": "patches/@[email protected]",
"@docusaurus/theme-search-algolia": "patches/@[email protected]",
"@types/[email protected]": "patches/@[email protected]",
"[email protected]": "patches/[email protected]"
},
Expand All @@ -62,7 +62,7 @@
}
},
"engines": {
"node": ">=18.18.2"
"node": ">=20.16.0"
},
"packageManager": "[email protected]",
"type": "module"
Expand Down
29 changes: 15 additions & 14 deletions packages/cheatsheet-local/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,32 +25,33 @@
},
"dependencies": {
"@cursorless/cheatsheet": "workspace:*",
"react": "^18.2.0",
"react-dom": "^18.2.0"
"react": "^18.3.1",
"react-dom": "^18.3.1"
},
"devDependencies": {
"@effortlessmotion/html-webpack-inline-source-plugin": "1.0.3",
"@testing-library/react": "14.2.2",
"@types/jest": "29.5.12",
"@types/node": "18.18.2",
"@types/react": "18.2.71",
"@types/react-dom": "18.2.22",
"@testing-library/dom": "10.4.0",
"@testing-library/react": "16.0.1",
"@types/jest": "29.5.13",
"@types/node": "20.16.0",
"@types/react": "18.3.11",
"@types/react-dom": "18.3.1",
"@types/webpack": "5.28.5",
"@webpack-cli/generators": "3.0.7",
"autoprefixer": "10.4.19",
"css-loader": "6.10.0",
"autoprefixer": "10.4.20",
"css-loader": "7.1.2",
"html-webpack-plugin": "5.6.0",
"jest": "29.7.0",
"postcss": "8.4.38",
"postcss": "8.4.47",
"postcss-loader": "8.1.1",
"style-loader": "3.3.4",
"tailwindcss": "3.4.1",
"style-loader": "4.0.0",
"tailwindcss": "3.4.14",
"ts-loader": "9.5.1",
"ts-node": "10.9.2",
"typescript": "^5.5.3",
"typescript": "^5.6.3",
"webpack": "5.95.0",
"webpack-cli": "5.1.4",
"webpack-dev-server": "5.0.4"
"webpack-dev-server": "5.1.0"
},
"postcss": {
"plugins": {
Expand Down
25 changes: 13 additions & 12 deletions packages/cheatsheet/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,24 +27,25 @@
"*.css"
],
"dependencies": {
"@fortawesome/fontawesome-svg-core": "6.5.1",
"@fortawesome/free-solid-svg-icons": "6.5.1",
"@fortawesome/react-fontawesome": "0.2.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"@fortawesome/fontawesome-svg-core": "6.6.0",
"@fortawesome/free-solid-svg-icons": "6.6.0",
"@fortawesome/react-fontawesome": "0.2.2",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-string-replace": "1.1.1",
"react-use": "17.5.0"
"react-use": "17.5.1"
},
"devDependencies": {
"@testing-library/react": "14.2.2",
"@types/jest": "29.5.12",
"@types/react": "18.2.71",
"@types/react-dom": "18.2.22",
"@testing-library/dom": "10.4.0",
"@testing-library/react": "16.0.1",
"@types/jest": "29.5.13",
"@types/react": "18.3.11",
"@types/react-dom": "18.3.1",
"@types/react-helmet": "6.1.11",
"jest": "29.7.0",
"jest-environment-jsdom": "29.7.0",
"ts-jest": "29.1.2",
"typescript": "^5.5.3"
"ts-jest": "29.2.5",
"typescript": "^5.6.3"
},
"type": "module"
}
2 changes: 1 addition & 1 deletion packages/cheatsheet/src/lib/cheatsheet.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ type CheatsheetSectionProps = {
};

const CheatsheetSection: React.FC<CheatsheetSectionProps> = ({ children }) => (
<section className=" mb-5 break-inside-avoid last:mb-0 md:mb-3 xl:mb-4">
<section className="mb-5 break-inside-avoid last:mb-0 md:mb-3 xl:mb-4">
{children}
</section>
);
8 changes: 4 additions & 4 deletions packages/common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@
},
"devDependencies": {
"@types/js-yaml": "^4.0.9",
"@types/lodash-es": "4.17.0",
"@types/mocha": "^10.0.6",
"@types/lodash-es": "4.17.12",
"@types/mocha": "^10.0.9",
"cross-spawn": "7.0.3",
"fast-check": "3.17.0",
"fast-check": "3.22.0",
"js-yaml": "^4.1.0",
"mocha": "^10.3.0"
"mocha": "^10.7.3"
},
"types": "./out/index.d.ts",
"exports": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -173,25 +173,6 @@ export const scopeSupportFacets = [
// collectionItem
] as const;

const textualScopeSupportFacets = [
"character",
"word",
"token",
"identifier",
"line",
"sentence",
"paragraph",
"boundedParagraph",
"boundedParagraph.iteration",
"document",
"nonWhitespaceSequence",
"boundedNonWhitespaceSequence",
"boundedNonWhitespaceSequence.iteration",
"url",
"surroundingPair",
"surroundingPair.iteration",
] as const;

export interface ScopeSupportFacetInfo {
readonly description: string;
readonly scopeType: SimpleScopeTypeType | ScopeType;
Expand All @@ -208,7 +189,22 @@ export enum ScopeSupportFacetLevel {
export type ScopeSupportFacet = (typeof scopeSupportFacets)[number];

export type TextualScopeSupportFacet =
(typeof textualScopeSupportFacets)[number];
| "character"
| "word"
| "token"
| "identifier"
| "line"
| "sentence"
| "paragraph"
| "boundedParagraph"
| "boundedParagraph.iteration"
| "document"
| "nonWhitespaceSequence"
| "boundedNonWhitespaceSequence"
| "boundedNonWhitespaceSequence.iteration"
| "url"
| "surroundingPair"
| "surroundingPair.iteration";

export type LanguageScopeSupportFacetMap = Partial<
Record<ScopeSupportFacet, ScopeSupportFacetLevel>
Expand Down
111 changes: 54 additions & 57 deletions packages/common/src/types/command/legacy/ActionCommandV5.ts
Original file line number Diff line number Diff line change
@@ -1,60 +1,57 @@
const actionNames = [
"callAsFunction",
"clearAndSetSelection",
"copyToClipboard",
"cutToClipboard",
"deselect",
"editNew",
"editNewLineAfter",
"editNewLineBefore",
"executeCommand",
"extractVariable",
"findInWorkspace",
"foldRegion",
"followLink",
"generateSnippet",
"getText",
"highlight",
"indentLine",
"insertCopyAfter",
"insertCopyBefore",
"insertEmptyLineAfter",
"insertEmptyLineBefore",
"insertEmptyLinesAround",
"insertSnippet",
"moveToTarget",
"outdentLine",
"pasteFromClipboard",
"randomizeTargets",
"remove",
"rename",
"replace",
"replaceWithTarget",
"revealDefinition",
"revealTypeDefinition",
"reverseTargets",
"rewrapWithPairedDelimiter",
"experimental.setInstanceReference",
"scrollToBottom",
"scrollToCenter",
"scrollToTop",
"setSelection",
"setSelectionAfter",
"setSelectionBefore",
"showDebugHover",
"showHover",
"showQuickFix",
"showReferences",
"sortTargets",
"swapTargets",
"toggleLineBreakpoint",
"toggleLineComment",
"unfoldRegion",
"wrapWithPairedDelimiter",
"wrapWithSnippet",
] as const;

export type ActionTypeV5 = (typeof actionNames)[number];
export type ActionTypeV5 =
| "callAsFunction"
| "clearAndSetSelection"
| "copyToClipboard"
| "cutToClipboard"
| "deselect"
| "editNew"
| "editNewLineAfter"
| "editNewLineBefore"
| "executeCommand"
| "extractVariable"
| "findInWorkspace"
| "foldRegion"
| "followLink"
| "generateSnippet"
| "getText"
| "highlight"
| "indentLine"
| "insertCopyAfter"
| "insertCopyBefore"
| "insertEmptyLineAfter"
| "insertEmptyLineBefore"
| "insertEmptyLinesAround"
| "insertSnippet"
| "moveToTarget"
| "outdentLine"
| "pasteFromClipboard"
| "randomizeTargets"
| "remove"
| "rename"
| "replace"
| "replaceWithTarget"
| "revealDefinition"
| "revealTypeDefinition"
| "reverseTargets"
| "rewrapWithPairedDelimiter"
| "experimental.setInstanceReference"
| "scrollToBottom"
| "scrollToCenter"
| "scrollToTop"
| "setSelection"
| "setSelectionAfter"
| "setSelectionBefore"
| "showDebugHover"
| "showHover"
| "showQuickFix"
| "showReferences"
| "sortTargets"
| "swapTargets"
| "toggleLineBreakpoint"
| "toggleLineComment"
| "unfoldRegion"
| "wrapWithPairedDelimiter"
| "wrapWithSnippet";

export interface ActionCommandV5 {
/**
Expand Down
46 changes: 20 additions & 26 deletions packages/common/src/types/command/legacy/CommandV0V1.types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -112,32 +112,26 @@ interface DecoratedSymbol {
character: string;
}

const HAT_COLORS = [
"default",
"blue",
"green",
"red",
"pink",
"yellow",
"userColor1",
"userColor2",
] as const;

const HAT_NON_DEFAULT_SHAPES = [
"ex",
"fox",
"wing",
"hole",
"frame",
"curve",
"eye",
"play",
"bolt",
"crosshairs",
] as const;

type HatColor = (typeof HAT_COLORS)[number];
type HatNonDefaultShape = (typeof HAT_NON_DEFAULT_SHAPES)[number];
type HatColor =
| "default"
| "blue"
| "green"
| "red"
| "pink"
| "yellow"
| "userColor1"
| "userColor2";
type HatNonDefaultShape =
| "ex"
| "fox"
| "wing"
| "hole"
| "frame"
| "curve"
| "eye"
| "play"
| "bolt"
| "crosshairs";
type HatStyleName = HatColor | `${HatColor}-${HatNonDefaultShape}`;

type LineNumberType = "absolute" | "relative" | "modulo100";
Expand Down
Loading
Loading