From d3296cb96f510dec65ba3763e45f1d6b2ac7b079 Mon Sep 17 00:00:00 2001 From: tianma-if Date: Tue, 28 Jul 2026 18:25:41 +0800 Subject: [PATCH] fix: load desktop web assets from file URLs --- .github/workflows/desktop-build.yml | 2 ++ apps/desktop/package.json | 2 +- apps/web/vite.config.ts | 4 ++++ package.json | 4 ++-- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml index d46ec803..98daeef5 100644 --- a/.github/workflows/desktop-build.yml +++ b/.github/workflows/desktop-build.yml @@ -99,6 +99,8 @@ jobs: run: bun install --frozen-lockfile - name: Build Web renderer + env: + EDGE_EVER_DESKTOP_BUILD: "1" run: bun run build:web - name: Verify Web precache budget diff --git a/apps/desktop/package.json b/apps/desktop/package.json index 23fe4f86..29bb28c4 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -1,6 +1,6 @@ { "name": "@edgeever/desktop", - "version": "1.6.27", + "version": "1.6.28", "desktopName": "EdgeEver", "private": true, "description": "Native EdgeEver desktop client", diff --git a/apps/web/vite.config.ts b/apps/web/vite.config.ts index 79b9cd4b..3deefd35 100644 --- a/apps/web/vite.config.ts +++ b/apps/web/vite.config.ts @@ -70,9 +70,13 @@ const deploymentMethod = resolveDeploymentMethod( ? "github_actions" : undefined) ); +const isDesktopBuild = process.env.EDGE_EVER_DESKTOP_BUILD === "1"; export default defineConfig({ root: "apps/web", + // Packaged Electron apps load index.html via file://, so root-absolute + // asset URLs resolve to the filesystem root and leave a blank window. + base: isDesktopBuild ? "./" : "/", define: { __EDGEEVER_APP_VERSION__: JSON.stringify(appVersion), __EDGEEVER_BUILD_ID__: JSON.stringify(buildId), diff --git a/package.json b/package.json index 035efec4..07e60fac 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "edgeever", - "version": "1.6.27", + "version": "1.6.28", "private": true, "type": "module", "workspaces": [ @@ -31,7 +31,7 @@ "dev:extension": "vite --config apps/extension/vite.config.ts", "build:web": "vite build --config apps/web/vite.config.ts", "build:desktop:sidecar": "cargo build --manifest-path crates/desktop-sidecar/Cargo.toml --release", - "build:desktop": "bun run build:web && bun run build:desktop:sidecar && bun run --cwd apps/desktop dist", + "build:desktop": "EDGE_EVER_DESKTOP_BUILD=1 bun run build:web && bun run build:desktop:sidecar && bun run --cwd apps/desktop dist", "benchmark:desktop:sidecar": "bun scripts/benchmark-desktop-sidecar.mjs", "verify:web-performance": "bun scripts/verify-web-performance.mjs", "test:desktop:sidecar": "bun scripts/test-desktop-sidecar.mjs",