From 6f739cc70e534a8235094ac4cd4d14c75c61dfa0 Mon Sep 17 00:00:00 2001 From: jdkfx Date: Mon, 16 Dec 2024 17:49:01 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E7=9B=B8=E5=AF=BEimport=E9=83=A8=E5=88=86?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .eslintrc.js | 11 ++++++++++- package-lock.json | 8 ++++++++ package.json | 1 + src/backend/electron/manager/engineInfoManager.ts | 2 +- src/backend/electron/manager/engineProcessManager.ts | 6 +++--- src/components/Dialog/EngineManageDialog.vue | 4 ++-- .../Dialog/ExportSongAudioDialog/Container.vue | 2 +- src/components/Menu/ContextMenu/Presentation.vue | 4 ++-- src/components/Menu/MenuBar/MenuBar.vue | 4 ++-- src/components/Sing/ToolBar/ToolBar.vue | 2 +- 10 files changed, 31 insertions(+), 13 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index b88e880766..de2dba4ef6 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -44,7 +44,7 @@ module.exports = { "plugin:@voicevox/all", "plugin:storybook/recommended", ], - plugins: ["import"], + plugins: ["import", "no-relative-import-paths"], parser: vueEslintParser, parserOptions: vueEslintParserOptions, ignorePatterns: ["dist/**/*", "dist_*/**/*", "node_modules/**/*"], @@ -92,6 +92,15 @@ module.exports = { }, ], "import/order": "error", + // "import/no-relative-packages": ["off"], + "no-relative-import-paths/no-relative-import-paths": [ + "error", + { + allowSameFolder: true, + rootDir: "src", + prefix: "@", + }, + ], }, overrides: [ { diff --git a/package-lock.json b/package-lock.json index 6e17b62596..1f8947e4bf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -81,6 +81,7 @@ "eslint": "8.57.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-import": "2.29.1", + "eslint-plugin-no-relative-import-paths": "1.5.5", "eslint-plugin-prettier": "5.1.3", "eslint-plugin-storybook": "0.8.0", "eslint-plugin-vue": "9.26.0", @@ -7562,6 +7563,13 @@ "semver": "bin/semver.js" } }, + "node_modules/eslint-plugin-no-relative-import-paths": { + "version": "1.5.5", + "resolved": "https://registry.npmjs.org/eslint-plugin-no-relative-import-paths/-/eslint-plugin-no-relative-import-paths-1.5.5.tgz", + "integrity": "sha512-UjudFFdBbv93v0CsVdEKcMLbBzRIjeK2PubTctX57tgnHxZcMj1Jm8lDBWoETnPxk0S5g5QLSltEM+511yL4+w==", + "dev": true, + "license": "ISC" + }, "node_modules/eslint-plugin-prettier": { "version": "5.1.3", "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.1.3.tgz", diff --git a/package.json b/package.json index 114b642d4b..72258faaef 100644 --- a/package.json +++ b/package.json @@ -118,6 +118,7 @@ "eslint": "8.57.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-import": "2.29.1", + "eslint-plugin-no-relative-import-paths": "1.5.5", "eslint-plugin-prettier": "5.1.3", "eslint-plugin-storybook": "0.8.0", "eslint-plugin-vue": "9.26.0", diff --git a/src/backend/electron/manager/engineInfoManager.ts b/src/backend/electron/manager/engineInfoManager.ts index e44ce248ef..7564f4e75a 100644 --- a/src/backend/electron/manager/engineInfoManager.ts +++ b/src/backend/electron/manager/engineInfoManager.ts @@ -6,7 +6,7 @@ import { dialog } from "electron"; // FIXME: ここでelectronをimportするの import log from "electron-log/main"; -import { getConfigManager } from "../electronConfig"; +import { getConfigManager } from "@/backend/electron/electronConfig"; import { EngineInfo, EngineDirValidationResult, diff --git a/src/backend/electron/manager/engineProcessManager.ts b/src/backend/electron/manager/engineProcessManager.ts index 2387b68da5..300fb76263 100644 --- a/src/backend/electron/manager/engineProcessManager.ts +++ b/src/backend/electron/manager/engineProcessManager.ts @@ -5,16 +5,16 @@ import treeKill from "tree-kill"; import { app, dialog } from "electron"; // FIXME: ここでelectronをimportするのは良くない import log from "electron-log/main"; +import { getEngineInfoManager } from "./engineInfoManager"; import { findAltPort, getPidFromPort, getProcessNameFromPid, type HostInfo, isAssignablePort, -} from "../portHelper"; +} from "@/backend/electron/portHelper"; -import { getConfigManager } from "../electronConfig"; -import { getEngineInfoManager } from "./engineInfoManager"; +import { getConfigManager } from "@/backend/electron/electronConfig"; import { EngineId, EngineInfo } from "@/type/preload"; type EngineProcessContainer = { diff --git a/src/components/Dialog/EngineManageDialog.vue b/src/components/Dialog/EngineManageDialog.vue index 4805899a1f..ef06a73b2d 100644 --- a/src/components/Dialog/EngineManageDialog.vue +++ b/src/components/Dialog/EngineManageDialog.vue @@ -267,8 +267,8 @@