diff --git a/electron/configs/gnirehtet/index.js b/electron/configs/gnirehtet/index.js index 1a99716..e74b71c 100644 --- a/electron/configs/gnirehtet/index.js +++ b/electron/configs/gnirehtet/index.js @@ -1,5 +1,5 @@ -import which from 'which' import { extraResolve } from '$electron/helpers/index.js' +import which from 'which' export const getGnirehtetPath = () => { switch (process.platform) { diff --git a/electron/configs/index.js b/electron/configs/index.js index 16e371f..b867766 100644 --- a/electron/configs/index.js +++ b/electron/configs/index.js @@ -4,9 +4,9 @@ import { buildResolve, extraResolve } from '$electron/helpers/index.js' export { adbPath } from './android-platform-tools/index.js' -export { scrcpyPath } from './scrcpy/index.js' +export { gnirehtetApkPath, gnirehtetPath } from './gnirehtet/index.js' -export { gnirehtetPath, gnirehtetApkPath } from './gnirehtet/index.js' +export { scrcpyPath } from './scrcpy/index.js' export const desktopPath = process.env.DESKTOP_PATH diff --git a/electron/configs/scrcpy/index.js b/electron/configs/scrcpy/index.js index 0416d57..788aa65 100644 --- a/electron/configs/scrcpy/index.js +++ b/electron/configs/scrcpy/index.js @@ -1,5 +1,5 @@ -import which from 'which' import { extraResolve } from '$electron/helpers/index.js' +import which from 'which' export const getScrcpyPath = () => { switch (process.platform) { diff --git a/electron/events/handles/index.js b/electron/events/handles/index.js index 7c89d5a..51c7c91 100644 --- a/electron/events/handles/index.js +++ b/electron/events/handles/index.js @@ -1,5 +1,5 @@ -import fs from 'fs-extra' import { dialog, ipcMain, shell } from 'electron' +import fs from 'fs-extra' export default (mainWindow) => { ipcMain.handle( diff --git a/electron/events/index.js b/electron/events/index.js index 3783c16..faa2399 100644 --- a/electron/events/index.js +++ b/electron/events/index.js @@ -1,10 +1,10 @@ import { app, ipcMain } from 'electron' -import shortcuts from './shortcuts/index.js' -import updater from './updater/index.js' import handles from './handles/index.js' -import tray from './tray/index.js' +import shortcuts from './shortcuts/index.js' import theme from './theme/index.js' +import tray from './tray/index.js' +import updater from './updater/index.js' export default (mainWindow) => { ipcMain.on('restart-app', () => { diff --git a/electron/events/tray/index.js b/electron/events/tray/index.js index 68aea58..ec7de56 100644 --- a/electron/events/tray/index.js +++ b/electron/events/tray/index.js @@ -1,7 +1,7 @@ -import { Menu, Tray, app, dialog } from 'electron' import { trayPath } from '$electron/configs/index.js' -import appStore from '$electron/helpers/store.js' import { executeI18n } from '$electron/helpers/index.js' +import appStore from '$electron/helpers/store.js' +import { app, dialog, Menu, Tray } from 'electron' export default (mainWindow) => { const t = value => executeI18n(mainWindow, value) diff --git a/electron/events/updater/index.js b/electron/events/updater/index.js index 5398ade..b3d6cf5 100644 --- a/electron/events/updater/index.js +++ b/electron/events/updater/index.js @@ -1,7 +1,7 @@ -import { app, ipcMain } from 'electron' -import { is } from '@electron-toolkit/utils' -import electronUpdater from 'electron-updater' import { devPublishPath } from '$electron/configs/index.js' +import { is } from '@electron-toolkit/utils' +import { app, ipcMain } from 'electron' +import electronUpdater from 'electron-updater' const { autoUpdater } = electronUpdater diff --git a/electron/exposes/adbkit/index.js b/electron/exposes/adbkit/index.js index 0dc6bc6..5e590f7 100644 --- a/electron/exposes/adbkit/index.js +++ b/electron/exposes/adbkit/index.js @@ -1,13 +1,13 @@ -import util from 'node:util' import { exec as _exec, spawn } from 'node:child_process' -import path from 'node:path' import fs from 'node:fs' -import dayjs from 'dayjs' -import { Adb } from '@devicefarmer/adbkit' -import { uniq } from 'lodash-es' -import appStore from '$electron/helpers/store.js' +import path from 'node:path' +import util from 'node:util' import { adbPath } from '$electron/configs/index.js' +import appStore from '$electron/helpers/store.js' import { formatFileSize } from '$renderer/utils/index' +import { Adb } from '@devicefarmer/adbkit' +import dayjs from 'dayjs' +import { uniq } from 'lodash-es' const exec = util.promisify(_exec) diff --git a/electron/exposes/gnirehtet/index.js b/electron/exposes/gnirehtet/index.js index 465ead0..14c51aa 100644 --- a/electron/exposes/gnirehtet/index.js +++ b/electron/exposes/gnirehtet/index.js @@ -1,10 +1,10 @@ import { spawn } from 'node:child_process' -import appStore from '$electron/helpers/store.js' import { adbPath, gnirehtetApkPath, gnirehtetPath, } from '$electron/configs/index.js' +import appStore from '$electron/helpers/store.js' const appDebug = appStore.get('common.debug') || false diff --git a/electron/exposes/index.js b/electron/exposes/index.js index a971be4..8161c43 100644 --- a/electron/exposes/index.js +++ b/electron/exposes/index.js @@ -1,14 +1,14 @@ import path from 'node:path' -import '$electron/helpers/console.js' -import electron from './electron/index.js' -import adbkit from './adbkit/index.js' -import scrcpy from './scrcpy/index.js' -import gnirehtet from './gnirehtet/index.js' -import search from './search/index.js' import * as configs from '$electron/configs/index.js' -import store from '$electron/helpers/store.js' import appLog from '$electron/helpers/log.js' +import store from '$electron/helpers/store.js' +import adbkit from './adbkit/index.js' +import electron from './electron/index.js' +import gnirehtet from './gnirehtet/index.js' +import scrcpy from './scrcpy/index.js' +import search from './search/index.js' +import '$electron/helpers/console.js' export default { init(expose) { diff --git a/electron/exposes/log/index.js b/electron/exposes/log/index.js index 7662aa6..941bf4e 100644 --- a/electron/exposes/log/index.js +++ b/electron/exposes/log/index.js @@ -1,5 +1,5 @@ -import log from 'electron-log/main.js' import { createProxy } from '$electron/helpers/index' +import log from 'electron-log/main.js' const levels = Object.keys(log.functions) diff --git a/electron/exposes/scrcpy/index.js b/electron/exposes/scrcpy/index.js index 43c2015..e8a4775 100644 --- a/electron/exposes/scrcpy/index.js +++ b/electron/exposes/scrcpy/index.js @@ -1,8 +1,8 @@ -import util from 'node:util' import { exec as _exec, spawn } from 'node:child_process' -import { replaceIP, sleep } from '$renderer/utils/index.js' -import appStore from '$electron/helpers/store.js' +import util from 'node:util' import { adbPath, scrcpyPath } from '$electron/configs/index.js' +import appStore from '$electron/helpers/store.js' +import { replaceIP, sleep } from '$renderer/utils/index.js' let adbkit diff --git a/electron/exposes/search/index.js b/electron/exposes/search/index.js index ee0a0b9..ac5ade1 100644 --- a/electron/exposes/search/index.js +++ b/electron/exposes/search/index.js @@ -1,6 +1,6 @@ +import { primaryColor } from '$renderer/configs/index.js' import remote from '@electron/remote' import { FindInPage } from 'electron-find-in-page' -import { primaryColor } from '$renderer/configs/index.js' export default () => { const theme = { diff --git a/electron/helpers/console.js b/electron/helpers/console.js index 6c74840..02ca63f 100644 --- a/electron/helpers/console.js +++ b/electron/helpers/console.js @@ -1,6 +1,6 @@ -import appStore from './store.js' -import { createProxy } from './index.js' import log from '$electron/helpers/log.js' +import { createProxy } from './index.js' +import appStore from './store.js' const debug = appStore.get('common.debug') || false diff --git a/electron/helpers/log.js b/electron/helpers/log.js index 409d7df..e2d679e 100644 --- a/electron/helpers/log.js +++ b/electron/helpers/log.js @@ -1,6 +1,6 @@ +import { createProxy } from '$electron/helpers/index' import { shell } from 'electron' import log from 'electron-log/main.js' -import { createProxy } from '$electron/helpers/index' log.transports.console.level = false diff --git a/electron/helpers/process.js b/electron/helpers/process.js index bddb7db..77b0048 100644 --- a/electron/helpers/process.js +++ b/electron/helpers/process.js @@ -1,9 +1,9 @@ /** 在主进程中获取关键信息存储到环境变量中,从而在预加载脚本中及渲染进程中使用 */ +import { app } from 'electron' + /** 注意: app.isPackaged 可能被被某些方法改变所以请将该文件放到 main.js 必须位于非依赖项的顶部 */ import fixPath from 'fix-path' -import { app } from 'electron' - if (process.platform === 'darwin') { fixPath() } diff --git a/electron/main.js b/electron/main.js index 9c1c74d..4442a73 100644 --- a/electron/main.js +++ b/electron/main.js @@ -1,23 +1,23 @@ -import path from 'node:path' import { createRequire } from 'node:module' +import path from 'node:path' import { fileURLToPath } from 'node:url' -import { BrowserWindow, app, nativeTheme, shell } from 'electron' -import { electronApp, optimizer } from '@electron-toolkit/utils' -import contextMenu from 'electron-context-menu' import remote from '@electron/remote/main' +import { electronApp, optimizer } from '@electron-toolkit/utils' +import { app, BrowserWindow, shell } from 'electron' +import contextMenu from 'electron-context-menu' + +import { icnsLogoPath, icoLogoPath, logoPath } from './configs/index.js' +import events from './events/index.js' + +import log from './helpers/log.js' +import appStore from './helpers/store.js' // process.js 必须位于非依赖项的顶部 import './helpers/process.js' -import appStore from './helpers/store.js' -import log from './helpers/log.js' import './helpers/console.js' -import { icnsLogoPath, icoLogoPath, logoPath } from './configs/index.js' - -import events from './events/index.js' - const require = createRequire(import.meta.url) const __dirname = path.dirname(fileURLToPath(import.meta.url)) diff --git a/eslint.config.js b/eslint.config.js index 8be5071..594baee 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -56,6 +56,10 @@ export default antfu( 'vue/custom-event-name-casing': 'off', 'vue/no-use-v-if-with-v-for': 'off', 'vue/component-tags-order': 'off', + + 'unicorn/consistent-function-scoping': 'off', + 'regexp/no-unused-capturing-group': 'off', + 'regexp/no-dupe-disjunctions': 'off', }, }, ) diff --git a/package.json b/package.json index 64920a5..74847fc 100644 --- a/package.json +++ b/package.json @@ -22,50 +22,50 @@ "prepare": "husky install" }, "dependencies": { - "electron-in-page-search": "^1.3.2", - "nanoid": "^5.0.7", - "pinia-plugin-persistedstate": "^3.2.1", - "vue": "^3.4.26" + "electron-in-page-search": "1.3.2", + "nanoid": "5.0.7", + "pinia-plugin-persistedstate": "3.2.1", + "vue": "3.4.26" }, "devDependencies": { - "@antfu/eslint-config": "2.16.1", - "@devicefarmer/adbkit": "^3.2.6", - "@electron-toolkit/preload": "^3.0.1", - "@electron-toolkit/utils": "^3.0.0", - "@electron/remote": "^2.1.2", - "@intlify/unplugin-vue-i18n": "^4.0.0", - "@unocss/reset": "^0.59.4", - "@unocss/transformer-directives": "^0.59.4", - "@viarotel-org/unocss-preset-shades": "^0.8.2", - "@vitejs/plugin-vue": "^5.0.4", - "@vueuse/core": "^10.9.0", - "dayjs": "^1.11.11", - "electron": "^30.0.3", - "electron-builder": "^24.13.3", - "electron-context-menu": "^4.0.0", - "electron-find-in-page": "^1.0.8", - "electron-log": "^5.1.2", - "electron-store": "^9.0.0", - "electron-updater": "^6.1.8", - "element-plus": "^2.8.1", - "eslint": "^8.57.0", - "fix-path": "^4.0.0", - "fs-extra": "^11.2.0", - "husky": "^9.0.11", - "lodash-es": "^4.17.21", - "pinia": "^2.1.7", - "postcss": "^8.4.38", - "postcss-nested": "^6.0.1", - "postcss-scss": "^4.0.9", - "unocss": "^0.59.4", - "unplugin-auto-import": "^0.17.5", - "unplugin-vue-components": "^0.27.0", - "vite": "^5.2.11", - "vite-plugin-electron": "^0.28.7", - "vite-plugin-electron-renderer": "^0.14.5", - "vite-svg-loader": "^5.1.0", - "vue-command": "^35.2.1", - "vue-i18n": "^9.13.1", - "which": "^4.0.0" + "@antfu/eslint-config": "3.3.2", + "@devicefarmer/adbkit": "3.2.6", + "@electron-toolkit/preload": "3.0.1", + "@electron-toolkit/utils": "3.0.0", + "@electron/remote": "2.1.2", + "@intlify/unplugin-vue-i18n": "4.0.0", + "@unocss/reset": "0.59.4", + "@unocss/transformer-directives": "0.59.4", + "@viarotel-org/unocss-preset-shades": "0.8.2", + "@vitejs/plugin-vue": "5.0.4", + "@vueuse/core": "10.9.0", + "dayjs": "1.11.11", + "electron": "30.0.3", + "electron-builder": "24.13.3", + "electron-context-menu": "4.0.0", + "electron-find-in-page": "1.0.8", + "electron-log": "5.1.2", + "electron-store": "9.0.0", + "electron-updater": "6.1.8", + "element-plus": "2.8.2", + "eslint": "9.10.0", + "fix-path": "4.0.0", + "fs-extra": "11.2.0", + "husky": "9.0.11", + "lodash-es": "4.17.21", + "pinia": "2.1.7", + "postcss": "8.4.38", + "postcss-nested": "6.0.1", + "postcss-scss": "4.0.9", + "unocss": "0.59.4", + "unplugin-auto-import": "0.17.5", + "unplugin-vue-components": "0.27.0", + "vite": "5.2.11", + "vite-plugin-electron": "0.28.7", + "vite-plugin-electron-renderer": "0.14.5", + "vite-svg-loader": "5.1.0", + "vue-command": "35.2.1", + "vue-i18n": "9.13.1", + "which": "4.0.0" } } diff --git a/src/App.vue b/src/App.vue index 378e899..6b942cd 100644 --- a/src/App.vue +++ b/src/App.vue @@ -37,19 +37,19 @@