Skip to content

Commit ec75d55

Browse files
committed
Use vscode/test-cli
1 parent adb45a4 commit ec75d55

23 files changed

+455
-330
lines changed

.npmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
save-exact=true

.vscode-test.mjs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
import { defineConfig } from "@vscode/test-cli";
2+
3+
export default defineConfig({
4+
files: "out/test/suite/**/*.test.js",
5+
mocha: {
6+
ui: "bdd",
7+
timeout: 10000,
8+
},
9+
launchArgs: [
10+
"./test-fixtures/test.code-workspace",
11+
"--skip-welcome",
12+
"--disable-extensions",
13+
"--skip-release-notes",
14+
"--enable-proposed-api",
15+
],
16+
settings: {
17+
"editor.defaultFormatter": "prettier.prettier-vscode",
18+
"prettier.enableDebugLogs": true,
19+
"security.workspace.trust.enabled": false,
20+
},
21+
});

esbuild.mjs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ const browserAliasPlugin = {
5454
},
5555
};
5656

57-
5857
/**
5958
* Node extension configuration
6059
* @type {import('esbuild').BuildOptions}
@@ -100,7 +99,6 @@ const browserShimsPlugin = {
10099
},
101100
};
102101

103-
104102
/**
105103
* Browser/web extension configurationn
106104
* @type {import('esbuild').BuildOptions}

eslint.config.mjs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,15 @@ export default tseslint.config(
5757
},
5858
},
5959

60+
// Test files - relax rules for test code
61+
{
62+
files: ["src/test/**/*.ts"],
63+
rules: {
64+
"@typescript-eslint/no-floating-promises": "off",
65+
"no-console": "off",
66+
},
67+
},
68+
6069
// Script files (mjs)
6170
{
6271
files: ["*.mjs", "scripts/*.mjs"],

package.json

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
"prettier": "prettier --write .",
7979
"release": "node ./scripts/release.mjs",
8080
"test:web": "pnpm compile:test && node ./out/test/web/runTests.js",
81-
"test": "node ./out/test/runTests.js",
81+
"test": "vscode-test",
8282
"watch:esbuild": "node esbuild.mjs --watch",
8383
"watch:tsc": "tsc --noEmit --watch --project tsconfig.json",
8484
"watch": "pnpm run --parallel watch:esbuild watch:tsc"
@@ -91,9 +91,9 @@
9191
"@types/node": "^22",
9292
"@types/resolve": "^1.20.3",
9393
"@types/semver": "^7.5.8",
94-
"@types/sinon": "^17.0.3",
9594
"@types/tmp": "^0.2.6",
9695
"@types/vscode": "^1.101.0",
96+
"@vscode/test-cli": "0.0.12",
9797
"@vscode/test-electron": "^2.5.2",
9898
"@vscode/test-web": "^0.0.76",
9999
"@vscode/vsce": "^3.7.1",
@@ -106,18 +106,17 @@
106106
"mocha": "^10.7.3",
107107
"path-browserify": "^1.0.1",
108108
"process": "^0.11.10",
109-
"sinon": "^17.0.1",
110109
"tmp": "^0.2.3",
111110
"typescript": "^5.9.3",
112111
"typescript-eslint": "^8.33.0",
113112
"util": "^0.12.4"
114113
},
115114
"dependencies": {
116115
"find-up": "5.0.0",
117-
"prettier": "^3.4.2",
118-
"resolve": "^1.22.8",
119-
"semver": "^7.6.3",
120-
"vscode-nls": "^5.2.0"
116+
"prettier": "3.7.1",
117+
"resolve": "1.22.11",
118+
"semver": "7.7.3",
119+
"vscode-nls": "5.2.0"
121120
},
122121
"capabilities": {
123122
"virtualWorkspaces": true,

0 commit comments

Comments
 (0)