Skip to content

Commit 177c88c

Browse files
dnicolsonaeschli
andauthored
Consolidate packages into typescript-eslint (#532)
Co-authored-by: Martin Aeschlimann <martinae@microsoft.com>
1 parent 88958d8 commit 177c88c

10 files changed

Lines changed: 17 additions & 27 deletions

File tree

generators/app/dependencyVersions/package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@
77
"@types/mocha": "^10.0.10",
88
"@types/node": "22.x",
99
"@types/assert": "^1.5.11",
10-
"@typescript-eslint/eslint-plugin": "^8.45.0",
11-
"@typescript-eslint/parser": "^8.45.0",
12-
"eslint": "^9.36.0",
10+
"typescript-eslint": "^8.46.3",
11+
"eslint": "^9.39.1",
1312
"glob": "^11.0.3",
1413
"mocha": "^11.7.4",
1514
"typescript": "^5.9.3",

generators/app/templates/ext-command-ts/eslint.config.mjs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
import typescriptEslint from "@typescript-eslint/eslint-plugin";
2-
import tsParser from "@typescript-eslint/parser";
1+
import typescriptEslint from "typescript-eslint";
32

43
export default [{
54
files: ["**/*.ts"],
65
}, {
76
plugins: {
8-
"@typescript-eslint": typescriptEslint,
7+
"@typescript-eslint": typescriptEslint.plugin,
98
},
109

1110
languageOptions: {
12-
parser: tsParser,
11+
parser: typescriptEslint.parser,
1312
ecmaVersion: 2022,
1413
sourceType: "module",
1514
},

generators/app/templates/ext-command-ts/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@
3333
<%- dep("@types/vscode") %>,
3434
<%- dep("@types/mocha") %>,
3535
<%- dep("@types/node") %>,
36-
<%- dep("@typescript-eslint/eslint-plugin") %>,
37-
<%- dep("@typescript-eslint/parser") %>,
36+
<%- dep("typescript-eslint") %>,
3837
<%- dep("eslint") %>,
3938
<%- dep("typescript") %>,
4039
<%- dep("@vscode/test-cli") %>,

generators/app/templates/ext-command-ts/vscode-esbuild/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@
3939
<%- dep("@types/vscode") %>,
4040
<%- dep("@types/mocha") %>,
4141
<%- dep("@types/node") %>,
42-
<%- dep("@typescript-eslint/eslint-plugin") %>,
43-
<%- dep("@typescript-eslint/parser") %>,
42+
<%- dep("typescript-eslint") %>,
4443
<%- dep("eslint") %>,
4544
<%- dep("esbuild") %>,
4645
<%- dep("npm-run-all") %>,

generators/app/templates/ext-command-ts/vscode-webpack/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@
3636
<%- dep("@types/vscode") %>,
3737
<%- dep("@types/mocha") %>,
3838
<%- dep("@types/node") %>,
39-
<%- dep("@typescript-eslint/eslint-plugin") %>,
40-
<%- dep("@typescript-eslint/parser") %>,
39+
<%- dep("typescript-eslint") %>,
4140
<%- dep("eslint") %>,
4241
<%- dep("typescript") %>,
4342
<%- dep("ts-loader") %>,

generators/app/templates/ext-command-web/esbuild-package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@
3737
<%- dep("@types/mocha") %>,
3838
<%- dep("@types/assert") %>,
3939
<%- dep("eslint") %>,
40-
<%- dep("@typescript-eslint/eslint-plugin") %>,
41-
<%- dep("@typescript-eslint/parser") %>,
40+
<%- dep("typescript-eslint") %>,
4241
<%- dep("mocha") %>,
4342
<%- dep("typescript") %>,
4443
<%- dep("@vscode/test-web") %>,

generators/app/templates/ext-command-web/eslint.config.mjs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
import typescriptEslint from "@typescript-eslint/eslint-plugin";
2-
import tsParser from "@typescript-eslint/parser";
1+
import typescriptEslint from "typescript-eslint";
32

43
export default [{
54
files: ["**/*.ts"],
65
}, {
76
plugins: {
8-
"@typescript-eslint": typescriptEslint,
7+
"@typescript-eslint": typescriptEslint.plugin,
98
},
109

1110
languageOptions: {
12-
parser: tsParser,
11+
parser: typescriptEslint.parser,
1312
ecmaVersion: 2022,
1413
sourceType: "module",
1514
},

generators/app/templates/ext-command-web/webpack-package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@
3434
<%- dep("@types/mocha") %>,
3535
<%- dep("@types/assert") %>,
3636
<%- dep("eslint") %>,
37-
<%- dep("@typescript-eslint/eslint-plugin") %>,
38-
<%- dep("@typescript-eslint/parser") %>,
37+
<%- dep("typescript-eslint") %>,
3938
<%- dep("mocha") %>,
4039
<%- dep("typescript") %>,
4140
<%- dep("@vscode/test-web") %>,

generators/app/templates/ext-notebook-renderer/eslint.config.mjs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
import typescriptEslint from "@typescript-eslint/eslint-plugin";
2-
import tsParser from "@typescript-eslint/parser";
1+
import typescriptEslint from "typescript-eslint";
32

43
export default [{
54
files: ["**/*.ts"],
65
}, {
76
plugins: {
8-
"@typescript-eslint": typescriptEslint,
7+
"@typescript-eslint": typescriptEslint.plugin,
98
},
109

1110
languageOptions: {
12-
parser: tsParser,
11+
parser: typescriptEslint.parser,
1312
ecmaVersion: 2022,
1413
sourceType: "module",
1514
},

generators/app/templates/ext-notebook-renderer/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@
3737
<%- dep("@types/mocha") %>,
3838
<%- dep("@types/node") %>,
3939
<%- dep("@types/webpack-env") %>,
40-
<%- dep("@typescript-eslint/eslint-plugin") %>,
41-
<%- dep("@typescript-eslint/parser") %>,
40+
<%- dep("typescript-eslint") %>,
4241
<%- dep("@types/vscode-notebook-renderer") %>,
4342
<%- dep("@types/vscode") %>,
4443
<%- dep("css-loader") %>,

0 commit comments

Comments
 (0)