diff --git a/.vscode/launch.json b/.vscode/launch.json index 038b22e9cc..5def5e1998 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -2,7 +2,7 @@ "version": "0.2.0", "configurations": [ { - "name": "Run", + "name": "Run extension", "type": "extensionHost", "request": "launch", "env": { @@ -21,7 +21,7 @@ ] }, { - "name": "Test", + "name": "Extension tests", "type": "extensionHost", "request": "launch", "env": { @@ -42,7 +42,7 @@ ] }, { - "name": "Test (subset)", + "name": "Extension tests (subset)", "type": "extensionHost", "request": "launch", "env": { diff --git a/cursorless-talon-dev/src/cursorless_launch_configuration.talon-list b/cursorless-talon-dev/src/cursorless_launch_configuration.talon-list index 8bb92f4578..f0f6c595f2 100644 --- a/cursorless-talon-dev/src/cursorless_launch_configuration.talon-list +++ b/cursorless-talon-dev/src/cursorless_launch_configuration.talon-list @@ -3,18 +3,11 @@ app: vscode win.title: /cursorless/ - -extension: "VSCode: Run" -test: "VSCode: Test" -test subset: "VSCode: Test (subset)" -test talon: "Talon: Test" -test talon subset: "Talon: Test (subset)" -test unit: "Unit tests: Test" +extension: "Run extension" +test: "Extension tests" +test subset: "Extension tests (subset)" # Other launch config you may want to activate: -# update fixtures: "VSCode: Update test fixtures" -# update fixtures subset: "VSCode: Update test fixtures (subset)" -# update fixtures unit: "Unit tests: Update test fixtures" -# docs: "Docusaurus: Run" -# docs build: "Docusaurus: Build" -# docs client: "cursorless.org: Run client-side" +# update fixtures: "Update test fixtures" +# update fixtures subset: "Update test fixtures (subset)" diff --git a/packages/cursorless-org-docs/src/docs/contributing/CONTRIBUTING.mdx b/packages/cursorless-org-docs/src/docs/contributing/CONTRIBUTING.mdx index 3921adcf56..ffa02b00a9 100644 --- a/packages/cursorless-org-docs/src/docs/contributing/CONTRIBUTING.mdx +++ b/packages/cursorless-org-docs/src/docs/contributing/CONTRIBUTING.mdx @@ -121,7 +121,7 @@ locally, you need to run the extension in debug mode. To do so you need to do th 1. Open the Cursorless repository in VSCode (with your regular default profile, _**not**_ with the `cursorlessDevelopment` profile) 2. Say `"debug extension"` to run the extension. If you want to run the tests instead, say `"debug test"`. -If you don't have the `cursorless-talon-dev` files in your Talon user directory as described in step 6 above, then you instead need to run the `workbench.action.debug.selectandstart` command in VSCode and then select either "VSCode: Run" or "VSCode: Test". +If you don't have the `cursorless-talon-dev` files in your Talon user directory as described in step 6 above, then you instead need to run the `workbench.action.debug.selectandstart` command in VSCode and then select either "Run extension" or "Extension tests". ### Running a subset of tests @@ -129,7 +129,7 @@ The entire test suite takes a little while to run (1-2 mins), so you may want to To specify the set of tests to run, say `"debug generate subset"`, or if you haven't installed the cursorless-talon-dev files, run the VSCode task "Generate test subset file". To do this, choose "Tasks: Run Task" from the command palette. -To run the specified subset of tests, say `"debug test subset"` (or use the "Run test subset" launch config). +To run the specified subset of tests, say `"debug test subset"` (or use the "Extension tests (subset)" launch config). If you need to edit the subset of tests to run in the future, you can say `"debug edit subset"`. diff --git a/packages/meta-updater/src/updatePackageJson.ts b/packages/meta-updater/src/updatePackageJson.ts index cc57597def..75788e3aa7 100644 --- a/packages/meta-updater/src/updatePackageJson.ts +++ b/packages/meta-updater/src/updatePackageJson.ts @@ -5,7 +5,7 @@ import type { PackageJson } from "type-fest"; import type { Context } from "./Context"; import { getCursorlessVscodeFields } from "./getCursorlessVscodeFields"; -export const LIB_ENTRY_POINT = "src/index.ts"; +const LIB_ENTRY_POINT = "./src/index.ts"; /** * Given a package.json, update it to match our conventions. This function is @@ -51,7 +51,7 @@ export async function updatePackageJson( !Array.isArray(input.exports) ? input.exports : {}; - exports["."] = `./${LIB_ENTRY_POINT}`; + exports["."] = LIB_ENTRY_POINT; input.exports = exports; } else { delete input.types; diff --git a/packages/meta-updater/src/updateTSConfigBase.ts b/packages/meta-updater/src/updateTSConfigBase.ts index f7f0c153c7..8b60948c3c 100644 --- a/packages/meta-updater/src/updateTSConfigBase.ts +++ b/packages/meta-updater/src/updateTSConfigBase.ts @@ -2,7 +2,6 @@ import type { FormatPluginFnOptions } from "@pnpm/meta-updater"; import * as fs from "fs/promises"; import type { PackageJson, TsConfigJson } from "type-fest"; import type { Context } from "./Context"; -import { LIB_ENTRY_POINT } from "./updatePackageJson"; export async function updateTSConfigBase( { workspaceDir, pnpmLockfile }: Context, @@ -33,7 +32,7 @@ export async function updateTSConfigBase( ) as PackageJson; if (!packageJson.private) { - paths[packageName] = [`./${packagePath}/${LIB_ENTRY_POINT}`]; + paths[packageName] = [`./${packagePath}`]; } } diff --git a/tsconfig.base.json b/tsconfig.base.json index 06bdd7d517..6c3bd800ec 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -12,29 +12,19 @@ "isolatedModules": true, "strict": true, "paths": { - "@cursorless/cheatsheet": ["./packages/cheatsheet/src/index.ts"], - "@cursorless/common": ["./packages/common/src/index.ts"], - "@cursorless/cursorless-engine": [ - "./packages/cursorless-engine/src/index.ts" - ], + "@cursorless/cheatsheet": ["./packages/cheatsheet"], + "@cursorless/common": ["./packages/common"], + "@cursorless/cursorless-engine": ["./packages/cursorless-engine"], "@cursorless/cursorless-everywhere-talon-core": [ - "./packages/cursorless-everywhere-talon-core/src/index.ts" - ], - "@cursorless/cursorless-tutorial": [ - "./packages/cursorless-tutorial/src/index.ts" - ], - "@cursorless/neovim-common": ["./packages/neovim-common/src/index.ts"], - "@cursorless/neovim-registry": [ - "./packages/neovim-registry/src/index.ts" - ], - "@cursorless/node-common": ["./packages/node-common/src/index.ts"], - "@cursorless/sentence-parser": [ - "./packages/sentence-parser/src/index.ts" - ], - "@cursorless/test-case-recorder": [ - "./packages/test-case-recorder/src/index.ts" + "./packages/cursorless-everywhere-talon-core" ], - "@cursorless/vscode-common": ["./packages/vscode-common/src/index.ts"] + "@cursorless/cursorless-tutorial": ["./packages/cursorless-tutorial"], + "@cursorless/neovim-common": ["./packages/neovim-common"], + "@cursorless/neovim-registry": ["./packages/neovim-registry"], + "@cursorless/node-common": ["./packages/node-common"], + "@cursorless/sentence-parser": ["./packages/sentence-parser"], + "@cursorless/test-case-recorder": ["./packages/test-case-recorder"], + "@cursorless/vscode-common": ["./packages/vscode-common"] } } }