From 61ecc1ed423a1cf57df46e7ff4115aa5ac1e6388 Mon Sep 17 00:00:00 2001 From: neil Date: Tue, 7 Feb 2023 19:29:19 +0800 Subject: [PATCH] #186 fix vite build for electron main --- README.md | 1 + modules/desktop/electron/libs/auth.ts | 7 ++++++- .../desktop/electron/{vite.config.ts => vite.config.js} | 0 modules/desktop/package.json | 4 ++-- 4 files changed, 9 insertions(+), 3 deletions(-) rename modules/desktop/electron/{vite.config.ts => vite.config.js} (100%) diff --git a/README.md b/README.md index 3913356..5f110c9 100644 --- a/README.md +++ b/README.md @@ -39,6 +39,7 @@ pnpm dev ### dist ```sh pnpm install +pnpm add -g vite pnpm --filter desktop exec pnpm dist ``` diff --git a/modules/desktop/electron/libs/auth.ts b/modules/desktop/electron/libs/auth.ts index 55a9fed..f7dabab 100644 --- a/modules/desktop/electron/libs/auth.ts +++ b/modules/desktop/electron/libs/auth.ts @@ -2,12 +2,17 @@ import { mkdirp } from 'mkdirp'; import path from 'path'; import fs from 'fs'; import { getTeaPath } from './teaDir'; -import type { Session } from '../../src/libs/types'; import * as v1Client from './v1Client'; const sessionFilePath = path.join(getTeaPath(), 'tea.xyz/gui/tmp.dat'); const sessionFolder = path.join(getTeaPath(), 'tea.xyz/gui'); +interface Session { + device_id?: string; + key?: string; + user?: any; +} + export async function initSessionData() { fs.readFileSync(sessionFilePath); diff --git a/modules/desktop/electron/vite.config.ts b/modules/desktop/electron/vite.config.js similarity index 100% rename from modules/desktop/electron/vite.config.ts rename to modules/desktop/electron/vite.config.js diff --git a/modules/desktop/package.json b/modules/desktop/package.json index bd7e9d2..fbb6afb 100644 --- a/modules/desktop/package.json +++ b/modules/desktop/package.json @@ -10,8 +10,8 @@ "dev:all": "concurrently -n=svelte,electron -c='#ff3e00',blue \"pnpm dev:main\" \"pnpm dev:svelte\" \"pnpm dev:electron\"", "dev:svelte": "vite dev", "dev:electron": "electron electron/dist/electron.cjs", - "dev:main": "cd ./electron && pnpm vite build --watch", - "build:main": "cd ./electron && pnpm vite build", + "dev:main": "cd ./electron && vite build --config ./vite.config.js --watch", + "build:main": "cd ./electron && vite --config ./vite.config.js build --base .", "pack": "electron-builder --dir --config electron-builder.config.cjs", "dist": "pnpm build && electron-builder --config electron-builder.config.cjs", "package": "pnpm build && electron-builder --config electron-builder.config.cjs",