From 9b5a3a9c619a4c525cbebb0f6a8150e61acc71ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8D=89=E9=9E=8B=E6=B2=A1=E5=8F=B7?= <308487730@qq.com> Date: Thu, 25 Aug 2022 08:20:26 +0800 Subject: [PATCH] reactor: better `debug.env` --- .vscode/.debug.script.mjs | 2 +- electron/main/index.ts | 3 +-- package.json | 10 ++++++---- vite.config.ts | 11 ++++------- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/.vscode/.debug.script.mjs b/.vscode/.debug.script.mjs index d649530..ade3e79 100644 --- a/.vscode/.debug.script.mjs +++ b/.vscode/.debug.script.mjs @@ -9,7 +9,7 @@ const require = createRequire(import.meta.url) const pkg = require('../package.json') // write .debug.env -const envContent = Object.entries(pkg.env).map(([key, val]) => `${key}=${val}`) +const envContent = Object.entries(pkg.debug.env).map(([key, val]) => `${key}=${val}`) fs.writeFileSync(path.join(__dirname, '.debug.env'), envContent.join('\n')) // bootstrap diff --git a/electron/main/index.ts b/electron/main/index.ts index aff59d8..0ed9415 100644 --- a/electron/main/index.ts +++ b/electron/main/index.ts @@ -25,8 +25,7 @@ export const ROOT_PATH = { let win: BrowserWindow | null = null // Here, you can also use other preload const preload = join(__dirname, '../preload/index.js') -// 🚧 Use ['ENV_NAME'] avoid vite:define plugin -const url = process.env.VITE_DEV_SERVER_URL as string; +const url = process.env.VITE_DEV_SERVER_URL const indexHtml = join(ROOT_PATH.dist, 'index.html') async function createWindow() { diff --git a/package.json b/package.json index 9e8e4cc..2bf945e 100644 --- a/package.json +++ b/package.json @@ -28,9 +28,11 @@ "vite": "^3.0.7", "vite-plugin-electron": "^0.9.1" }, - "env": { - "VITE_DEV_SERVER_HOST": "127.0.0.1", - "VITE_DEV_SERVER_PORT": 7777, - "VITE_DEV_SERVER_URL": "http://127.0.0.1:7777" + "debug": { + "env": { + "VITE_DEV_SERVER_HOST": "127.0.0.1", + "VITE_DEV_SERVER_PORT": 7777, + "VITE_DEV_SERVER_URL": "http://127.0.0.1:7777" + } } } diff --git a/vite.config.ts b/vite.config.ts index 866ffac..adf158c 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -48,11 +48,8 @@ export default defineConfig({ renderer: {}, }), ], - server: { - host: pkg.env.VITE_DEV_SERVER_HOST, - port: pkg.env.VITE_DEV_SERVER_PORT, - }, - build: { - minify: false - } + server: process.env.VSCODE_DEBUG ? { + host: pkg.debug.env.VITE_DEV_SERVER_HOST, + port: pkg.debug.env.VITE_DEV_SERVER_PORT, + } : undefined, })