Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
6 changes: 3 additions & 3 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"version": "0.2.0",
"configurations": [
{
"name": "Run",
"name": "Run extension",
Comment thread
AndreasArvidsson marked this conversation as resolved.
"type": "extensionHost",
"request": "launch",
"env": {
Expand All @@ -21,7 +21,7 @@
]
},
{
"name": "Test",
"name": "Extension tests",
"type": "extensionHost",
"request": "launch",
"env": {
Expand All @@ -42,7 +42,7 @@
]
},
{
"name": "Test (subset)",
"name": "Extension tests (subset)",
"type": "extensionHost",
"request": "launch",
"env": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,15 +121,15 @@ 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

The entire test suite takes a little while to run (1-2 mins), so you may want to run just a subset of the tests.

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"`.

Expand Down
4 changes: 2 additions & 2 deletions packages/meta-updater/src/updatePackageJson.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions packages/meta-updater/src/updateTSConfigBase.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -33,7 +32,7 @@ export async function updateTSConfigBase(
) as PackageJson;

if (!packageJson.private) {
paths[packageName] = [`./${packagePath}/${LIB_ENTRY_POINT}`];
paths[packageName] = [`./${packagePath}`];
Comment thread
AndreasArvidsson marked this conversation as resolved.
}
}

Expand Down
32 changes: 11 additions & 21 deletions tsconfig.base.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
}
}
}
Loading