diff --git a/packages/template/vite-typescript/tmpl/.eslintrc.json b/packages/template/vite-typescript/tmpl/.eslintrc.json index 2d7aa60744..4c3a215fe8 100644 --- a/packages/template/vite-typescript/tmpl/.eslintrc.json +++ b/packages/template/vite-typescript/tmpl/.eslintrc.json @@ -12,5 +12,11 @@ "plugin:import/electron", "plugin:import/typescript" ], - "parser": "@typescript-eslint/parser" + "parser": "@typescript-eslint/parser", + "settings": { + "import/resolver": { + "typescript": true, + "node": true + } + } } diff --git a/packages/template/vite-typescript/tmpl/package.json b/packages/template/vite-typescript/tmpl/package.json index e10cd33069..8a38e2ac97 100644 --- a/packages/template/vite-typescript/tmpl/package.json +++ b/packages/template/vite-typescript/tmpl/package.json @@ -2,11 +2,12 @@ "devDependencies": { "@electron-forge/plugin-vite": "ELECTRON_FORGE/VERSION", "@types/electron-squirrel-startup": "^1.0.2", - "@typescript-eslint/eslint-plugin": "^5.0.0", - "@typescript-eslint/parser": "^5.0.0", - "eslint": "^8.0.1", + "@typescript-eslint/eslint-plugin": "^8.0.0", + "@typescript-eslint/parser": "^8.0.0", + "eslint": "^8.56.0", "eslint-plugin-import": "^2.25.0", - "typescript": "~4.5.4", + "eslint-import-resolver-typescript": "^4.4.4", + "typescript": "^5.9.2", "vite": "^5.0.12" } } diff --git a/packages/template/webpack-typescript/tmpl/.eslintrc.json b/packages/template/webpack-typescript/tmpl/.eslintrc.json index 2d7aa60744..4c3a215fe8 100644 --- a/packages/template/webpack-typescript/tmpl/.eslintrc.json +++ b/packages/template/webpack-typescript/tmpl/.eslintrc.json @@ -12,5 +12,11 @@ "plugin:import/electron", "plugin:import/typescript" ], - "parser": "@typescript-eslint/parser" + "parser": "@typescript-eslint/parser", + "settings": { + "import/resolver": { + "typescript": true, + "node": true + } + } } diff --git a/packages/template/webpack-typescript/tmpl/index.ts b/packages/template/webpack-typescript/tmpl/index.ts index cc73fcb064..f04d800365 100644 --- a/packages/template/webpack-typescript/tmpl/index.ts +++ b/packages/template/webpack-typescript/tmpl/index.ts @@ -6,6 +6,7 @@ declare const MAIN_WINDOW_WEBPACK_ENTRY: string; declare const MAIN_WINDOW_PRELOAD_WEBPACK_ENTRY: string; // Handle creating/removing shortcuts on Windows when installing/uninstalling. +// eslint-disable-next-line @typescript-eslint/no-require-imports if (require('electron-squirrel-startup')) { app.quit(); } diff --git a/packages/template/webpack-typescript/tmpl/package.json b/packages/template/webpack-typescript/tmpl/package.json index 39cdd2b692..754556b3ee 100644 --- a/packages/template/webpack-typescript/tmpl/package.json +++ b/packages/template/webpack-typescript/tmpl/package.json @@ -1,16 +1,17 @@ { "devDependencies": { "@electron-forge/plugin-webpack": "ELECTRON_FORGE/VERSION", - "@typescript-eslint/eslint-plugin": "^5.0.0", - "@typescript-eslint/parser": "^5.0.0", + "@typescript-eslint/eslint-plugin": "^8.0.0", + "@typescript-eslint/parser": "^8.0.0", "@vercel/webpack-asset-relocator-loader": "1.7.3", "css-loader": "^6.0.0", - "eslint": "^8.0.1", + "eslint": "^8.56.0", "eslint-plugin-import": "^2.25.0", + "eslint-import-resolver-typescript": "^4.4.4", "fork-ts-checker-webpack-plugin": "^7.2.13", "node-loader": "^2.0.0", "style-loader": "^3.0.0", "ts-loader": "^9.2.2", - "typescript": "~4.5.4" + "typescript": "^5.9.2" } } diff --git a/packages/template/webpack-typescript/tmpl/webpack.plugins.ts b/packages/template/webpack-typescript/tmpl/webpack.plugins.ts index 846aa240ea..4836d490ff 100644 --- a/packages/template/webpack-typescript/tmpl/webpack.plugins.ts +++ b/packages/template/webpack-typescript/tmpl/webpack.plugins.ts @@ -1,6 +1,6 @@ import type IForkTsCheckerWebpackPlugin from 'fork-ts-checker-webpack-plugin'; -// eslint-disable-next-line @typescript-eslint/no-var-requires +// eslint-disable-next-line @typescript-eslint/no-require-imports const ForkTsCheckerWebpackPlugin: typeof IForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin'); export const plugins = [