Skip to content

Commit cb307e1

Browse files
AndreasArvidssonAndreasArvidsson
committed
Update tasks and launch configs
1 parent fc0a233 commit cb307e1

13 files changed

Lines changed: 91 additions & 151 deletions

File tree

‎.vscode/launch.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"args": [
3838
"--profile=cursorlessDevelopment",
3939
"--extensionDevelopmentPath=${workspaceFolder}/packages/cursorless-vscode/dist",
40-
"--extensionTestsPath=${workspaceFolder}/packages/test-harness/dist/extensionTestsVscode.cjs"
40+
"--extensionTestsPath=${workspaceFolder}/packages/test-harness/out/extensionTestsVscode.cjs"
4141
],
4242
"outFiles": ["${workspaceFolder}/**/out/**/*.js"],
4343
"preLaunchTask": "VSCode: Build extension and tests",
@@ -59,7 +59,7 @@
5959
"args": [
6060
"--profile=cursorlessDevelopment",
6161
"--extensionDevelopmentPath=${workspaceFolder}/packages/cursorless-vscode/dist",
62-
"--extensionTestsPath=${workspaceFolder}/packages/test-harness/dist/extensionTestsVscode.cjs"
62+
"--extensionTestsPath=${workspaceFolder}/packages/test-harness/out/extensionTestsVscode.cjs"
6363
],
6464
"outFiles": ["${workspaceFolder}/**/out/**/*.js"],
6565
"preLaunchTask": "VSCode: Prepare test subset",
@@ -80,7 +80,7 @@
8080
"args": [
8181
"--profile=cursorlessDevelopment",
8282
"--extensionDevelopmentPath=${workspaceFolder}/packages/cursorless-vscode/dist",
83-
"--extensionTestsPath=${workspaceFolder}/packages/test-harness/dist/extensionTestsVscode.cjs"
83+
"--extensionTestsPath=${workspaceFolder}/packages/test-harness/out/extensionTestsVscode.cjs"
8484
],
8585
"outFiles": ["${workspaceFolder}/**/out/**/*.js"],
8686
"preLaunchTask": "VSCode: Build extension and tests",
@@ -102,7 +102,7 @@
102102
"args": [
103103
"--profile=cursorlessDevelopment",
104104
"--extensionDevelopmentPath=${workspaceFolder}/packages/cursorless-vscode/dist",
105-
"--extensionTestsPath=${workspaceFolder}/packages/test-harness/dist/extensionTestsVscode.cjs"
105+
"--extensionTestsPath=${workspaceFolder}/packages/test-harness/out/extensionTestsVscode.cjs"
106106
],
107107
"outFiles": ["${workspaceFolder}/**/out/**/*.js"],
108108
"preLaunchTask": "VSCode: Build extension and tests",

‎.vscode/tasks.json‎

Lines changed: 30 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
"label": "Generate grammar",
1919
"type": "npm",
2020
"script": "generate-grammar",
21+
"group": "build",
2122
"presentation": {
2223
"reveal": "silent"
23-
},
24-
"group": "build"
24+
}
2525
},
2626

2727
// Generic test tasks
@@ -30,136 +30,76 @@
3030
"type": "npm",
3131
"script": "generate-test-subset-file-strict",
3232
"path": "packages/test-harness",
33+
"group": "test",
3334
"presentation": {
3435
"reveal": "silent"
35-
},
36-
"group": "test"
36+
}
3737
},
3838
{
3939
"label": "Generate test subset file",
4040
"type": "npm",
4141
"script": "generate-test-subset-file",
4242
"path": "packages/test-harness",
43+
"group": "none",
4344
"presentation": {
4445
"reveal": "silent"
45-
},
46-
"group": "none",
47-
"problemMatcher": []
46+
}
4847
},
4948

5049
// VSCode tasks
5150
{
5251
"label": "VSCode: Build extension",
53-
"dependsOn": ["VSCode: Populate dist", "VSCode: ESBuild"],
54-
"group": "build"
52+
"type": "npm",
53+
"script": "dev",
54+
"path": "packages/cursorless-vscode",
55+
"group": "build",
56+
"presentation": {
57+
"reveal": "silent"
58+
}
5559
},
5660
{
5761
"label": "VSCode: Build extension and tests",
58-
"dependsOn": ["VSCode: Build extension", "TSBuild", "Build test harness"],
62+
"dependsOn": ["VSCode: Build extension", "Build test harness"],
5963
"group": {
6064
"kind": "build",
6165
"isDefault": true
6266
}
6367
},
64-
{
65-
"label": "VSCode: ESBuild",
66-
"type": "npm",
67-
"script": "bundle:dev",
68-
"path": "packages/cursorless-vscode",
69-
"dependsOn": ["Generate grammar"],
70-
"presentation": {
71-
"reveal": "silent"
72-
},
73-
"group": "build"
74-
},
75-
{
76-
"label": "VSCode: Populate dist",
77-
"type": "npm",
78-
"script": "populate-dist",
79-
"path": "packages/cursorless-vscode",
80-
"dependsOn": ["VSCode: Build tutorial webview"],
81-
"presentation": {
82-
"reveal": "silent"
83-
},
84-
"group": "build"
85-
},
86-
{
87-
"label": "VSCode: Build tutorial webview",
88-
"type": "npm",
89-
"script": "bundle:dev",
90-
"path": "packages/cursorless-vscode-tutorial-webview",
91-
"presentation": {
92-
"reveal": "silent"
93-
},
94-
"group": "build"
95-
},
96-
{
97-
"label": "VSCode: Watch tutorial",
98-
"type": "npm",
99-
"script": "bundle:watch",
100-
"isBackground": true,
101-
"presentation": {
102-
"reveal": "never"
103-
},
104-
"path": "packages/cursorless-vscode-tutorial-webview",
105-
"group": "build"
106-
},
10768
{
10869
"label": "VSCode: Prepare test subset",
70+
"group": "test",
71+
"dependsOrder": "sequence",
10972
"dependsOn": [
11073
"Ensure test subset file exists",
11174
"VSCode: Build extension and tests"
112-
],
113-
"dependsOrder": "sequence",
114-
"group": "test"
75+
]
11576
},
11677

11778
// Neovim tasks
11879
{
11980
"label": "Neovim: Build extension",
120-
"dependsOn": [
121-
"Neovim: Launch neovim",
122-
"Neovim: ESBuild",
123-
"Neovim: Populate dist"
124-
],
125-
"group": "build"
81+
"group": "build",
82+
"dependsOn": ["Neovim: Launch neovim", "Neovim: ESBuild"]
12683
},
12784
{
12885
"label": "Neovim: Build extension and tests",
86+
"group": "build",
12987
"dependsOn": [
13088
"Neovim: Launch neovim (test)",
13189
"Neovim: ESBuild",
132-
"Neovim: Populate dist",
133-
"TSBuild",
13490
"Build test harness"
135-
],
136-
"group": "build"
91+
]
13792
},
13893
{
13994
"label": "Neovim: ESBuild",
14095
"type": "npm",
141-
"script": "bundle:dev",
96+
"script": "dev",
14297
"path": "packages/cursorless-neovim",
14398
"dependsOn": ["Generate grammar"],
99+
"group": "build",
144100
"presentation": {
145101
"reveal": "silent"
146-
},
147-
"group": "build"
148-
},
149-
{
150-
"label": "Neovim: Populate dist",
151-
"type": "npm",
152-
"script": "populate-dist",
153-
"path": "packages/cursorless-neovim",
154-
"presentation": {
155-
"reveal": "silent"
156-
},
157-
"options": {
158-
"env": {
159-
"CURSORLESS_REPO_ROOT": "${workspaceFolder}"
160-
}
161-
},
162-
"group": "build"
102+
}
163103
},
164104
{
165105
"label": "Neovim: Launch neovim",
@@ -263,32 +203,26 @@
263203
// cursorless.org
264204
{
265205
"label": "Serve cursorless.org",
266-
"type": "shell",
267-
"command": "nx serve cursorless-org",
268-
"options": {
269-
"cwd": "cursorless-nx"
270-
},
271-
"problemMatcher": []
206+
"type": "npm",
207+
"script": "dev",
208+
"path": "packages/cursorless-org"
272209
},
273210
{
274211
"label": "Install local",
275212
"type": "npm",
276-
"path": "packages/cursorless-vscode",
277213
"script": "install-local",
278-
"problemMatcher": []
214+
"path": "packages/cursorless-vscode"
279215
},
280216
{
281217
"label": "Uninstall local",
282218
"type": "npm",
283-
"path": "packages/cursorless-vscode",
284219
"script": "uninstall-local",
285-
"problemMatcher": []
220+
"path": "packages/cursorless-vscode"
286221
},
287222
{
288223
"label": "Run pre commit",
289224
"type": "shell",
290-
"command": "pre-commit run",
291-
"presentation": {}
225+
"command": "pre-commit run"
292226
}
293227
]
294228
}

‎packages/cheatsheet-local/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build",
1616
"test": "jest",
1717
"dev": "env NODE_OPTIONS=--import=tsx vite serve",
18-
"bundle": "env NODE_OPTIONS=--import=tsx vite build",
18+
"bundle:prod": "env NODE_OPTIONS=--import=tsx vite build",
1919
"bundle:dev": "env NODE_OPTIONS=--import=tsx vite build --mode development",
2020
"bundle:watch": "env NODE_OPTIONS=--import=tsx vite build --mode development --watch"
2121
},

‎packages/cursorless-everywhere-talon/package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
"scripts": {
1010
"typecheck": "tsc",
1111
"clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build",
12-
"dev": "pnpm run bundle:watch",
13-
"build": "pnpm run bundle",
14-
"bundle": "pnpm run bundle:base --minify src/mainProduction.ts",
15-
"bundle:dev": "pnpm run bundle:base src/mainDevelopment.ts",
16-
"bundle:watch": "pnpm run bundle:base --watch src/mainDevelopment.ts",
17-
"bundle:profile": "pnpm run bundle:base --metafile=meta.json src/mainDevelopment.ts",
18-
"bundle:base": "bash scripts/esbuild.sh"
12+
"dev": "pnpm run compile:watch",
13+
"build": "pnpm run compile:prod",
14+
"compile:prod": "pnpm run compile:base --minify src/mainProduction.ts",
15+
"compile:dev": "pnpm run compile:base src/mainDevelopment.ts",
16+
"compile:watch": "pnpm run compile:base --watch src/mainDevelopment.ts",
17+
"compile:profile": "pnpm run compile:base --metafile=meta.json src/mainDevelopment.ts",
18+
"compile:base": "bash scripts/esbuild.sh"
1919
},
2020
"dependencies": {
2121
"@cursorless/common": "workspace:*",

‎packages/cursorless-neovim/package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
"scripts": {
1313
"typecheck": "tsc",
1414
"clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build",
15-
"dev": "pnpm run bundle:dev && pnpm run populate-dist",
16-
"build": "pnpm -F @cursorless/test-harness bundle:runner:neovim && pnpm run bundle && pnpm run populate-dist",
17-
"bundle": "pnpm run bundle:base --minify",
18-
"bundle:dev": "pnpm run bundle:base --sourcemap",
19-
"bundle:watch": "pnpm run bundle:base --sourcemap --watch",
20-
"bundle:base": "bash ./scripts/compile-esbuild.sh",
15+
"dev": "pnpm run compile:dev && pnpm run populate-dist",
16+
"build": "pnpm run compile:prod && pnpm run populate-dist",
17+
"compile:prod": "pnpm run compile:base --minify",
18+
"compile:dev": "pnpm run compile:base --sourcemap",
19+
"compile:watch": "pnpm run compile:base --sourcemap --watch",
20+
"compile:base": "bash ./scripts/compile-esbuild.sh",
2121
"populate-dist": "bash ./scripts/populate-dist.sh"
2222
},
2323
"dependencies": {

‎packages/cursorless-neovim/scripts/populate-dist.sh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ if [[ "${CI:-x}" == "true" ]]; then
2828
test_harness_node_out_dir="$cursorless_nvim_dist_dir/node/test-harness"
2929
mkdir -p "$test_harness_node_out_dir/out"
3030
cp "$test_harness_node_in_dir/package.json" "$test_harness_node_out_dir"
31-
mkdir -p "$test_harness_node_out_dir/out/runners"
32-
cp "$test_harness_node_in_dir/out/runners/extensionTestsNeovim.cjs" "$test_harness_node_out_dir/out/runners"
31+
cp "$test_harness_node_in_dir/out/extensionTestsNeovim.cjs" "$test_harness_node_out_dir/out"
3332
else
3433
# Symlink so we inherit the .map files as well, but only if uname doesn't
3534
# start with "MINGW" (Windows Git Bash)

‎packages/cursorless-vscode-tutorial-webview/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"typecheck": "tsc",
1111
"clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build",
1212
"dev": "env NODE_OPTIONS=--import=tsx vite serve",
13-
"bundle": "env NODE_OPTIONS=--import=tsx vite build",
13+
"bundle:prod": "env NODE_OPTIONS=--import=tsx vite build",
1414
"bundle:dev": "env NODE_OPTIONS=--import=tsx vite build --mode development",
1515
"bundle:watch": "env NODE_OPTIONS=--import=tsx vite build --mode development --watch"
1616
},

‎packages/cursorless-vscode/package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1284,13 +1284,13 @@
12841284
"typecheck": "tsc",
12851285
"clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build",
12861286
"test": "pnpm ensure-grammar-up-to-date",
1287-
"dev": "pnpm generate-grammar && pnpm -F @cursorless/cursorless-vscode-tutorial-webview bundle:dev && pnpm run bundle:dev && pnpm run populate-dist",
1288-
"build": "pnpm generate-grammar && pnpm -F @cursorless/cheatsheet-local bundle && pnpm -F @cursorless/cursorless-vscode-tutorial-webview bundle && pnpm run bundle && pnpm run populate-dist",
1289-
"bundle": "pnpm run bundle:base --minify",
1290-
"bundle:dev": "pnpm run bundle:base --sourcemap",
1291-
"bundle:watch": "pnpm run bundle:base --sourcemap --watch",
1292-
"bundle:meta": "pnpm run bundle:base --metafile=meta.json",
1293-
"bundle:base": "bash ./scripts/compile-esbuild.sh",
1287+
"dev": "pnpm generate-grammar && pnpm run compile:dev && pnpm -F @cursorless/cursorless-vscode-tutorial-webview bundle:dev && pnpm run populate-dist",
1288+
"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",
1289+
"compile:prod": "pnpm run compile:base --minify",
1290+
"compile:dev": "pnpm run compile:base --sourcemap",
1291+
"compile:watch": "pnpm run compile:base --sourcemap --watch",
1292+
"compile:meta": "pnpm run compile:base --metafile=meta.json",
1293+
"compile:base": "bash ./scripts/compile-esbuild.sh",
12941294
"install-local": "bash ./scripts/install-local.sh",
12951295
"install-from-pr": "bash ./scripts/install-from-pr.sh",
12961296
"uninstall-local": "bash ./scripts/uninstall-local.sh",

‎packages/test-harness/package.json‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
"license": "MIT",
66
"private": true,
77
"type": "module",
8-
"main": "./out/runners/extensionTestsNeovim.cjs",
9-
"types": "./out/runners/extensionTestsNeovim.d.ts",
8+
"main": "./out/extensionTestsNeovim.cjs",
9+
"types": "./out/extensionTestsNeovim.d.ts",
1010
"exports": {
1111
".": {
12-
"default": "./out/runners/extensionTestsNeovim.cjs"
12+
"default": "./out/extensionTestsNeovim.cjs"
1313
}
1414
},
1515
"scripts": {
@@ -22,14 +22,10 @@
2222
"test:vscode": "c-tsx ./src/scripts/runVscodeTestsCI.ts",
2323
"test:neovim": "c-tsx ./src/scripts/runNeovimTestsCI.ts",
2424
"test:talonJs": "c-tsx ./src/scripts/runTalonJsTests.ts",
25-
"pretest:vscode": "pnpm run bundle:runner:vscode && pnpm run bundle:tests",
26-
"pretest:neovim": "pnpm run bundle:runner:neovim && pnpm run bundle:tests",
27-
"pretest:talonJs": "pnpm run bundle:tests",
28-
"bundle:base": "bash ./scripts/compile-esbuild.sh",
29-
"bundle": "pnpm run bundle:runner:vscode && pnpm run bundle:runner:neovim && pnpm run bundle:tests",
30-
"bundle:runner:vscode": "pnpm run bundle:base ./src/runners/extensionTestsVscode.ts --outfile=dist/extensionTestsVscode.cjs",
31-
"bundle:runner:neovim": "pnpm run bundle:base ./src/runners/extensionTestsNeovim.ts --outfile=out/runners/extensionTestsNeovim.cjs",
32-
"bundle:tests": "bash ./scripts/build-tests.sh",
25+
"pretest:vscode": "pnpm run bundle",
26+
"pretest:neovim": "pnpm run bundle",
27+
"pretest:talonJs": "pnpm run bundle",
28+
"bundle": "bash ./scripts/compile-esbuild.sh",
3329
"generate-test-subset-file": "c-tsx ./src/scripts/generateTestSubsetFile.ts --always-open",
3430
"generate-test-subset-file-strict": "c-tsx ./src/scripts/generateTestSubsetFile.ts --fail-if-not-exists"
3531
},

‎packages/test-harness/scripts/build-tests.sh‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)