From b40316a42af9921e27a37a64576bda09c524144a Mon Sep 17 00:00:00 2001 From: Dave Nicolson Date: Sun, 17 Aug 2025 23:12:29 +0200 Subject: [PATCH] Consolidate packages into typescript-eslint --- generators/app/dependencyVersions/package.json | 3 +-- generators/app/templates/ext-command-ts/eslint.config.mjs | 7 +++---- generators/app/templates/ext-command-ts/package.json | 3 +-- .../templates/ext-command-ts/vscode-esbuild/package.json | 3 +-- .../templates/ext-command-ts/vscode-webpack/package.json | 3 +-- .../app/templates/ext-command-web/esbuild-package.json | 3 +-- generators/app/templates/ext-command-web/eslint.config.mjs | 7 +++---- .../app/templates/ext-command-web/webpack-package.json | 3 +-- .../app/templates/ext-notebook-renderer/eslint.config.mjs | 7 +++---- .../app/templates/ext-notebook-renderer/package.json | 3 +-- 10 files changed, 16 insertions(+), 26 deletions(-) diff --git a/generators/app/dependencyVersions/package.json b/generators/app/dependencyVersions/package.json index 39e4fde9..d08d756e 100644 --- a/generators/app/dependencyVersions/package.json +++ b/generators/app/dependencyVersions/package.json @@ -7,8 +7,7 @@ "@types/mocha": "^10.0.10", "@types/node": "22.x", "@types/assert": "^1.5.11", - "@typescript-eslint/eslint-plugin": "^8.39.0", - "@typescript-eslint/parser": "^8.39.0", + "typescript-eslint": "^8.39.0", "eslint": "^9.32.0", "glob": "^11.0.3", "mocha": "^11.7.1", diff --git a/generators/app/templates/ext-command-ts/eslint.config.mjs b/generators/app/templates/ext-command-ts/eslint.config.mjs index d5c0b53a..7c51b0c0 100644 --- a/generators/app/templates/ext-command-ts/eslint.config.mjs +++ b/generators/app/templates/ext-command-ts/eslint.config.mjs @@ -1,15 +1,14 @@ -import typescriptEslint from "@typescript-eslint/eslint-plugin"; -import tsParser from "@typescript-eslint/parser"; +import typescriptEslint from "typescript-eslint"; export default [{ files: ["**/*.ts"], }, { plugins: { - "@typescript-eslint": typescriptEslint, + "@typescript-eslint": typescriptEslint.plugin, }, languageOptions: { - parser: tsParser, + parser: typescriptEslint.parser, ecmaVersion: 2022, sourceType: "module", }, diff --git a/generators/app/templates/ext-command-ts/package.json b/generators/app/templates/ext-command-ts/package.json index 61dcf059..5db09dc2 100644 --- a/generators/app/templates/ext-command-ts/package.json +++ b/generators/app/templates/ext-command-ts/package.json @@ -33,8 +33,7 @@ <%- dep("@types/vscode") %>, <%- dep("@types/mocha") %>, <%- dep("@types/node") %>, - <%- dep("@typescript-eslint/eslint-plugin") %>, - <%- dep("@typescript-eslint/parser") %>, + <%- dep("typescript-eslint") %>, <%- dep("eslint") %>, <%- dep("typescript") %>, <%- dep("@vscode/test-cli") %>, diff --git a/generators/app/templates/ext-command-ts/vscode-esbuild/package.json b/generators/app/templates/ext-command-ts/vscode-esbuild/package.json index 2e30628e..d121fd9b 100644 --- a/generators/app/templates/ext-command-ts/vscode-esbuild/package.json +++ b/generators/app/templates/ext-command-ts/vscode-esbuild/package.json @@ -39,8 +39,7 @@ <%- dep("@types/vscode") %>, <%- dep("@types/mocha") %>, <%- dep("@types/node") %>, - <%- dep("@typescript-eslint/eslint-plugin") %>, - <%- dep("@typescript-eslint/parser") %>, + <%- dep("typescript-eslint") %>, <%- dep("eslint") %>, <%- dep("esbuild") %>, <%- dep("npm-run-all") %>, diff --git a/generators/app/templates/ext-command-ts/vscode-webpack/package.json b/generators/app/templates/ext-command-ts/vscode-webpack/package.json index acd1af90..2b75d56e 100644 --- a/generators/app/templates/ext-command-ts/vscode-webpack/package.json +++ b/generators/app/templates/ext-command-ts/vscode-webpack/package.json @@ -36,8 +36,7 @@ <%- dep("@types/vscode") %>, <%- dep("@types/mocha") %>, <%- dep("@types/node") %>, - <%- dep("@typescript-eslint/eslint-plugin") %>, - <%- dep("@typescript-eslint/parser") %>, + <%- dep("typescript-eslint") %>, <%- dep("eslint") %>, <%- dep("typescript") %>, <%- dep("ts-loader") %>, diff --git a/generators/app/templates/ext-command-web/esbuild-package.json b/generators/app/templates/ext-command-web/esbuild-package.json index c3eb444c..f2f6097d 100644 --- a/generators/app/templates/ext-command-web/esbuild-package.json +++ b/generators/app/templates/ext-command-web/esbuild-package.json @@ -37,8 +37,7 @@ <%- dep("@types/mocha") %>, <%- dep("@types/assert") %>, <%- dep("eslint") %>, - <%- dep("@typescript-eslint/eslint-plugin") %>, - <%- dep("@typescript-eslint/parser") %>, + <%- dep("typescript-eslint") %>, <%- dep("mocha") %>, <%- dep("typescript") %>, <%- dep("@vscode/test-web") %>, diff --git a/generators/app/templates/ext-command-web/eslint.config.mjs b/generators/app/templates/ext-command-web/eslint.config.mjs index d5c0b53a..7c51b0c0 100644 --- a/generators/app/templates/ext-command-web/eslint.config.mjs +++ b/generators/app/templates/ext-command-web/eslint.config.mjs @@ -1,15 +1,14 @@ -import typescriptEslint from "@typescript-eslint/eslint-plugin"; -import tsParser from "@typescript-eslint/parser"; +import typescriptEslint from "typescript-eslint"; export default [{ files: ["**/*.ts"], }, { plugins: { - "@typescript-eslint": typescriptEslint, + "@typescript-eslint": typescriptEslint.plugin, }, languageOptions: { - parser: tsParser, + parser: typescriptEslint.parser, ecmaVersion: 2022, sourceType: "module", }, diff --git a/generators/app/templates/ext-command-web/webpack-package.json b/generators/app/templates/ext-command-web/webpack-package.json index d8606e2b..bbf3a20f 100644 --- a/generators/app/templates/ext-command-web/webpack-package.json +++ b/generators/app/templates/ext-command-web/webpack-package.json @@ -34,8 +34,7 @@ <%- dep("@types/mocha") %>, <%- dep("@types/assert") %>, <%- dep("eslint") %>, - <%- dep("@typescript-eslint/eslint-plugin") %>, - <%- dep("@typescript-eslint/parser") %>, + <%- dep("typescript-eslint") %>, <%- dep("mocha") %>, <%- dep("typescript") %>, <%- dep("@vscode/test-web") %>, diff --git a/generators/app/templates/ext-notebook-renderer/eslint.config.mjs b/generators/app/templates/ext-notebook-renderer/eslint.config.mjs index d5c0b53a..7c51b0c0 100644 --- a/generators/app/templates/ext-notebook-renderer/eslint.config.mjs +++ b/generators/app/templates/ext-notebook-renderer/eslint.config.mjs @@ -1,15 +1,14 @@ -import typescriptEslint from "@typescript-eslint/eslint-plugin"; -import tsParser from "@typescript-eslint/parser"; +import typescriptEslint from "typescript-eslint"; export default [{ files: ["**/*.ts"], }, { plugins: { - "@typescript-eslint": typescriptEslint, + "@typescript-eslint": typescriptEslint.plugin, }, languageOptions: { - parser: tsParser, + parser: typescriptEslint.parser, ecmaVersion: 2022, sourceType: "module", }, diff --git a/generators/app/templates/ext-notebook-renderer/package.json b/generators/app/templates/ext-notebook-renderer/package.json index e5aa44ba..599abd9d 100644 --- a/generators/app/templates/ext-notebook-renderer/package.json +++ b/generators/app/templates/ext-notebook-renderer/package.json @@ -37,8 +37,7 @@ <%- dep("@types/mocha") %>, <%- dep("@types/node") %>, <%- dep("@types/webpack-env") %>, - <%- dep("@typescript-eslint/eslint-plugin") %>, - <%- dep("@typescript-eslint/parser") %>, + <%- dep("typescript-eslint") %>, <%- dep("@types/vscode-notebook-renderer") %>, <%- dep("@types/vscode") %>, <%- dep("css-loader") %>,