Skip to content

Commit ec080c0

Browse files
authored
Merge branch 'main' into seanmcm/devbox2-wsl/agent129/batch-native-debug-output
2 parents aff306a + 587b0bb commit ec080c0

6 files changed

Lines changed: 499 additions & 979 deletions

File tree

Extension/eslint.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ const js = require("@eslint/js");
22
const tseslint = require("@typescript-eslint/eslint-plugin");
33
const tsparser = require("@typescript-eslint/parser");
44
const jsdoc = require("eslint-plugin-jsdoc");
5-
const eslintImport = require("eslint-plugin-import");
5+
const { importX: eslintImport } = require("eslint-plugin-import-x");
66

77
module.exports = [
88
{

Extension/package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7195,6 +7195,7 @@
71957195
"build": "yarn prep:dts && echo [Building TypeScript code] && tsc --build tsconfig.json"
71967196
},
71977197
"devDependencies": {
7198+
"@eslint/js": "^10.0.1",
71987199
"@octokit/rest": "^21.1.1",
71997200
"@types/glob": "^7.2.0",
72007201
"@types/mocha": "^10.0.6",
@@ -7216,10 +7217,10 @@
72167217
"@vscode/vsce": "^3.9.2",
72177218
"async-child-process": "^1.1.1",
72187219
"await-notify": "^1.0.1",
7219-
"eslint": "^9.39.2",
7220+
"eslint": "^10.10.0",
72207221
"eslint-plugin-header": "^3.1.1",
7221-
"eslint-plugin-import": "^2.29.1",
7222-
"eslint-plugin-jsdoc": "^48.2.8",
7222+
"eslint-plugin-import-x": "^4.17.1",
7223+
"eslint-plugin-jsdoc": "^62.9.0",
72237224
"event-stream": "^4.0.1",
72247225
"fs-extra": "^11.2.0",
72257226
"gulp": "^5.0.0",

Extension/test.tsconfig.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
"ES2022",
88
"dom"
99
],
10+
"types": [
11+
"node",
12+
"mocha"
13+
],
1014
"sourceMap": true,
1115
"rootDir": ".",
1216
"removeComments": true,
@@ -23,7 +27,6 @@
2327
"src/**/*.ts"
2428
],
2529
"exclude": [
26-
"node_modules/@types/eslint-scope/node_modules/@types/eslint/index.d.ts",
2730
"node_modules/**"
2831
]
2932
}

Extension/tsconfig.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
"ES2022",
88
"dom"
99
],
10+
"types": [
11+
"node",
12+
"mocha"
13+
],
1014
"inlineSourceMap": true,
1115
"rootDir": ".",
1216
"removeComments": true,
@@ -23,7 +27,6 @@
2327
"src/**/*.ts"
2428
],
2529
"exclude": [
26-
"node_modules/@types/eslint-scope/node_modules/@types/eslint/index.d.ts",
2730
"node_modules/**"
2831
]
2932
}

Extension/ui.tsconfig.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
"ES2022",
88
"dom"
99
],
10+
"types": [
11+
"node"
12+
],
1013
"sourceMap": true,
1114
"rootDir": ".",
1215
"removeComments": true,
@@ -21,7 +24,6 @@
2124
"src/types/*.d.ts"
2225
],
2326
"exclude": [
24-
"node_modules/@types/eslint-scope/node_modules/@types/eslint/index.d.ts",
2527
"node_modules/**"
2628
]
2729
}

0 commit comments

Comments
 (0)