From e65a9672446b0f7bd425f4126b4b323f8f39b1bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E4=BA=9A=E6=98=95?= <1549469775@qq.com> Date: Fri, 13 Jun 2025 17:03:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E7=90=86=E5=BA=9F=E5=BC=83=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=B9=B6=E4=BC=98=E5=8C=96=E7=83=AD=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 删除废弃的 `electron.vite.config.1749712333417.mjs` 配置文件，该文件已被新版配置替代。 - 重构热更新模块 `packages/helper/updater/main/hot/index.ts`，移除事件发射机制，改为通过回调函数传递进度信息。 - 调整 `tsconfig.node.json` 排除规则，将 `packages/renderer/**/*` 修改为更精确的 `packages/**/renderer/**/*`。 - 更新 `tsconfig.web.json` 包含规则，新增 `packages/**/renderer/**/*` 路径以支持渲染进程代码编译。 --- electron.vite.config.1749712333417.mjs | 133 ------------------------------ packages/helper/updater/main/hot/index.ts | 5 +- tsconfig.node.json | 2 +- tsconfig.web.json | 1 + 4 files changed, 4 insertions(+), 137 deletions(-) delete mode 100644 electron.vite.config.1749712333417.mjs diff --git a/electron.vite.config.1749712333417.mjs b/electron.vite.config.1749712333417.mjs deleted file mode 100644 index dd4359d..0000000 --- a/electron.vite.config.1749712333417.mjs +++ /dev/null @@ -1,133 +0,0 @@ -// electron.vite.config.ts -import { resolve } from "path"; -import { defineConfig, externalizeDepsPlugin } from "electron-vite"; -import vue from "@vitejs/plugin-vue"; -import vueJsx from "@vitejs/plugin-vue-jsx"; -import UnoCSS from "unocss/vite"; -import AutoImport from "unplugin-auto-import/vite"; -import Components from "unplugin-vue-components/vite"; -import VueMacros from "unplugin-vue-macros/vite"; -import { VueRouterAutoImports } from "unplugin-vue-router"; -import VueRouter from "unplugin-vue-router/vite"; -import Layouts from "vite-plugin-vue-layouts"; -import VueI18nPlugin from "@intlify/unplugin-vue-i18n/vite"; -import monacoEditorPlugin from "vite-plugin-monaco-editor"; -import IconsResolver from "unplugin-icons/resolver"; -import Icons from "unplugin-icons/vite"; -var __electron_vite_injected_dirname = "D:\\@code\\xyx\\electron-app"; -var electron_vite_config_default = defineConfig({ - main: { - resolve: { - alias: { - config: resolve("config"), - main: resolve("src/main"), - common: resolve("src/common"), - "@res": resolve("resources") - } - }, - plugins: [externalizeDepsPlugin()] - }, - preload: { - build: { - lib: { - entry: { - index: resolve(__electron_vite_injected_dirname, "./src/preload/index.ts"), - plugin: resolve(__electron_vite_injected_dirname, "./src/preload/plugin.ts") - } - } - }, - plugins: [externalizeDepsPlugin()] - }, - renderer: { - root: resolve(__electron_vite_injected_dirname, "./src/renderer"), - resolve: { - alias: { - config: resolve("config"), - common: resolve("src/common"), - "@": resolve("src/renderer/src"), - "@res": resolve("resources") - } - }, - css: { - preprocessorOptions: { - scss: { - additionalData: `@use "@/assets/style/global" as *; -`, - api: "modern-compiler" - } - } - }, - build: { - rollupOptions: { - input: { - main: resolve(__electron_vite_injected_dirname, "./src/renderer/index.html"), - about: resolve(__electron_vite_injected_dirname, "./src/renderer/about.html") - } - } - }, - plugins: [ - UnoCSS(), - VueMacros({ - plugins: { - vue: vue(), - vueJsx: vueJsx(), - vueRouter: VueRouter({ - root: resolve(__electron_vite_injected_dirname, "src/renderer"), - // https://github.com/posva/unplugin-vue-router - extensions: [".vue", ".setup.tsx"], - exclude: ["**/_ui"] - }) - } - }), - VueI18nPlugin({ - compositionOnly: false, - include: resolve(__electron_vite_injected_dirname, "packages/locales/languages/**") - }), - Layouts({ - layoutsDirs: "src/layouts", - pagesDirs: "src/pages", - defaultLayout: "default", - extensions: ["vue", "setup.tsx"], - exclude: ["**/_ui"] - }), - // https://github.com/antfu/unplugin-auto-import - AutoImport({ - imports: [ - "vue", - "@vueuse/core", - VueRouterAutoImports, - { - // add any other imports you were relying on - "vue-router/auto": ["useLink"] - }, - "vue-i18n" - ], - dts: true, - dirs: ["src/composables"], - vueTemplate: true - }), - // https://github.com/antfu/vite-plugin-components - Components({ - dts: true, - dirs: ["src/components", "src/ui"], - resolvers: [ - IconsResolver({ - prefix: "icon" - }) - ] - }), - Icons(), - // https://wf0.github.io/example/plugins/Formatter.html - // @ts-ignore ... - monacoEditorPlugin.default({ - publicPath: "monacoeditorwork", - customDistPath() { - return resolve(__electron_vite_injected_dirname, "out/renderer/monacoeditorwork"); - } - }) - ] - } -}); -export { - electron_vite_config_default as default -}; diff --git a/packages/helper/updater/main/hot/index.ts b/packages/helper/updater/main/hot/index.ts index 4f8b9b3..6ea04ec 100644 --- a/packages/helper/updater/main/hot/index.ts +++ b/packages/helper/updater/main/hot/index.ts @@ -7,7 +7,6 @@ import download from "./download" import extract from "extract-zip" import _logger from "logger/main" -import { emit } from "../handler" const logger = _logger.createNamespace("hot-updater") @@ -73,7 +72,7 @@ app.once("will-quit", event => { }) // 下载热更新包 -export async function fetchHotUpdatePackage(updatePackageUrl: string) { +export async function fetchHotUpdatePackage(updatePackageUrl: string, onProgress?: (percent: number, now: number, all: number) => void) { if (isReadyUpdate) return // 清除临时目录 @@ -92,7 +91,7 @@ export async function fetchHotUpdatePackage(updatePackageUrl: string) { url: updatePackageUrl, onprocess(now, all) { logger.debug(`下载进度: ${((now / all) * 100).toFixed(2)}%`) - emit("update-progress", { percent: (now / all) * 100, now, all }) + onProgress && onProgress((now / all) * 100, now, all) }, }) fs.writeFileSync(downloadPath, Buffer.from(arrayBuffer)) diff --git a/tsconfig.node.json b/tsconfig.node.json index a0a1d48..83aa2dd 100644 --- a/tsconfig.node.json +++ b/tsconfig.node.json @@ -27,7 +27,7 @@ "src/common/**/common.ts" ], "exclude": [ - "packages/renderer/**/*", + "packages/**/renderer/**/*", ], "compilerOptions": { "composite": true, diff --git a/tsconfig.web.json b/tsconfig.web.json index 040310d..c038a16 100644 --- a/tsconfig.web.json +++ b/tsconfig.web.json @@ -15,6 +15,7 @@ "./typed-router.d.ts", "src/common/**/*", "packages/**/*", + "packages/**/renderer/**/*", ], "exclude": [ "packages/locales/main.ts",