diff --git a/packages/cursorless-cheatsheet/package.json b/packages/cursorless-cheatsheet/package.json deleted file mode 100644 index 26f3f0810b..0000000000 --- a/packages/cursorless-cheatsheet/package.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "@cursorless/cursorless-cheatsheet", - "version": "0.1.0", - "description": "Cursorless cheatsheet implementation", - "license": "MIT", - "type": "module", - "exports": { - ".": "./src/index.ts" - }, - "scripts": { - "typecheck": "tsc", - "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build" - }, - "dependencies": { - "@cursorless/common": "workspace:*", - "@cursorless/node-common": "workspace:*", - "immer": "^11.1.4", - "lodash-es": "^4.17.23", - "node-html-parser": "^7.1.0" - }, - "devDependencies": { - "@types/lodash-es": "^4.17.12" - } -} diff --git a/packages/cursorless-cheatsheet/src/index.ts b/packages/cursorless-cheatsheet/src/index.ts deleted file mode 100644 index 1e3b5b4863..0000000000 --- a/packages/cursorless-cheatsheet/src/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from "./Cheatsheet"; diff --git a/packages/cursorless-cheatsheet/tsconfig.json b/packages/cursorless-cheatsheet/tsconfig.json deleted file mode 100644 index d4fbbd0828..0000000000 --- a/packages/cursorless-cheatsheet/tsconfig.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "include": ["src/**/*.ts", "src/**/*.json", "../../typings/**/*.d.ts"] -} diff --git a/packages/cursorless-vscode/package.json b/packages/cursorless-vscode/package.json index 01bc59a0e2..26dc4404e5 100644 --- a/packages/cursorless-vscode/package.json +++ b/packages/cursorless-vscode/package.json @@ -1284,12 +1284,13 @@ "typecheck": "tsc", "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build", "test": "pnpm ensure-grammar-up-to-date", - "dev": "pnpm generate-grammar && pnpm run compile:dev && pnpm -F @cursorless/cursorless-vscode-tutorial-webview bundle:dev && pnpm run populate-dist", - "build": "pnpm generate-grammar && pnpm run compile:prod && pnpm -F @cursorless/cursorless-vscode-tutorial-webview bundle:prod && pnpm -F @cursorless/cheatsheet-local bundle:prod && pnpm run populate-dist", + "dev": "pnpm generate-grammar && pnpm run compile:dev && pnpm run bundle:dev && pnpm run populate-dist", + "build": "pnpm generate-grammar && pnpm run compile:prod && pnpm run bundle:prod && pnpm run populate-dist", + "bundle:dev": "pnpm -F @cursorless/cursorless-vscode-tutorial-webview -F @cursorless/cheatsheet-local run bundle:dev", + "bundle:prod": "pnpm -F @cursorless/cursorless-vscode-tutorial-webview -F @cursorless/cheatsheet-local run bundle:prod", "compile:prod": "pnpm run compile:base --minify", "compile:dev": "pnpm run compile:base --sourcemap", "compile:watch": "pnpm run compile:base --sourcemap --watch", - "compile:meta": "pnpm run compile:base --metafile=meta.json", "compile:base": "bash ./scripts/compile-esbuild.sh", "install-local": "bash ./scripts/install-local.sh", "install-from-pr": "bash ./scripts/install-from-pr.sh", @@ -1309,7 +1310,6 @@ ], "dependencies": { "@cursorless/common": "workspace:*", - "@cursorless/cursorless-cheatsheet": "workspace:*", "@cursorless/cursorless-engine": "workspace:*", "@cursorless/cursorless-tutorial": "workspace:*", "@cursorless/node-common": "workspace:*", diff --git a/packages/cursorless-vscode/src/registerCommands.ts b/packages/cursorless-vscode/src/registerCommands.ts index ebd514f9a1..a1047f8013 100644 --- a/packages/cursorless-vscode/src/registerCommands.ts +++ b/packages/cursorless-vscode/src/registerCommands.ts @@ -4,15 +4,12 @@ import type { ScopeType, } from "@cursorless/common"; import { CURSORLESS_COMMAND_ID } from "@cursorless/common"; -import { - showCheatsheet, - updateDefaults, -} from "@cursorless/cursorless-cheatsheet"; import type { CommandApi, StoredTargetMap, } from "@cursorless/cursorless-engine"; import { analyzeCommandHistory } from "@cursorless/cursorless-engine"; +import { showCheatsheet, updateDefaults } from "@cursorless/node-common"; import type { ScopeTestRecorder, TestCaseRecorder, diff --git a/packages/node-common/package.json b/packages/node-common/package.json index 4c6e7d7ac8..b66ad6d6e6 100644 --- a/packages/node-common/package.json +++ b/packages/node-common/package.json @@ -14,7 +14,9 @@ "dependencies": { "@cursorless/common": "workspace:*", "glob": "^13.0.6", - "lodash-es": "^4.17.23" + "immer": "^11.1.4", + "lodash-es": "^4.17.23", + "node-html-parser": "^7.1.0" }, "devDependencies": { "@types/chai": "^5.2.3", diff --git a/packages/cursorless-cheatsheet/src/Cheatsheet.ts b/packages/node-common/src/Cheatsheet.ts similarity index 100% rename from packages/cursorless-cheatsheet/src/Cheatsheet.ts rename to packages/node-common/src/Cheatsheet.ts diff --git a/packages/node-common/src/index.ts b/packages/node-common/src/index.ts index 8e1a9b2193..32ab6cd321 100644 --- a/packages/node-common/src/index.ts +++ b/packages/node-common/src/index.ts @@ -1,3 +1,4 @@ +export * from "./Cheatsheet"; export * from "./FileSystemCommandHistoryStorage"; export * from "./FileSystemRawTreeSitterQueryProvider"; export * from "./FileSystemTalonSpokenForms"; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5877925960..59df4409a4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -192,28 +192,6 @@ importers: specifier: ^0.26.7 version: 0.26.7 - packages/cursorless-cheatsheet: - dependencies: - '@cursorless/common': - specifier: workspace:* - version: link:../common - '@cursorless/node-common': - specifier: workspace:* - version: link:../node-common - immer: - specifier: ^11.1.4 - version: 11.1.4 - lodash-es: - specifier: ^4.17.23 - version: 4.17.23 - node-html-parser: - specifier: ^7.1.0 - version: 7.1.0 - devDependencies: - '@types/lodash-es': - specifier: ^4.17.12 - version: 4.17.12 - packages/cursorless-engine: dependencies: '@cursorless/common': @@ -581,9 +559,6 @@ importers: '@cursorless/common': specifier: workspace:* version: link:../common - '@cursorless/cursorless-cheatsheet': - specifier: workspace:* - version: link:../cursorless-cheatsheet '@cursorless/cursorless-engine': specifier: workspace:* version: link:../cursorless-engine @@ -819,9 +794,15 @@ importers: glob: specifier: ^13.0.6 version: 13.0.6 + immer: + specifier: ^11.1.4 + version: 11.1.4 lodash-es: specifier: ^4.17.23 version: 4.17.23 + node-html-parser: + specifier: ^7.1.0 + version: 7.1.0 devDependencies: '@types/chai': specifier: ^5.2.3 diff --git a/tsconfig.base.json b/tsconfig.base.json index 1b3ce1c661..06bdd7d517 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -14,9 +14,6 @@ "paths": { "@cursorless/cheatsheet": ["./packages/cheatsheet/src/index.ts"], "@cursorless/common": ["./packages/common/src/index.ts"], - "@cursorless/cursorless-cheatsheet": [ - "./packages/cursorless-cheatsheet/src/index.ts" - ], "@cursorless/cursorless-engine": [ "./packages/cursorless-engine/src/index.ts" ], diff --git a/tsconfig.json b/tsconfig.json index 20ea84c510..ccbfd0f96d 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -11,9 +11,6 @@ { "path": "./packages/common" }, - { - "path": "./packages/cursorless-cheatsheet" - }, { "path": "./packages/cursorless-engine" },