From 01ceddaf00149a3abe683f30ad0c0b8766899db0 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: Tue, 9 Nov 2021 10:17:06 +0800 Subject: [PATCH] refactor(vite.config): centralized configs --- src/main/vite.config.ts => configs/vite.main.ts | 4 ++-- src/preload/vite.config.ts => configs/vite.preload.ts | 4 ++-- src/react-ts/vite.config.ts => configs/vite.vue-ts.ts | 6 +++--- scripts/build.mjs | 6 +++--- scripts/watch.mjs | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) rename src/main/vite.config.ts => configs/vite.main.ts (84%) rename src/preload/vite.config.ts => configs/vite.preload.ts (84%) rename src/react-ts/vite.config.ts => configs/vite.vue-ts.ts (72%) diff --git a/src/main/vite.config.ts b/configs/vite.main.ts similarity index 84% rename from src/main/vite.config.ts rename to configs/vite.main.ts index 5b7308c..3958629 100644 --- a/src/main/vite.config.ts +++ b/configs/vite.main.ts @@ -4,9 +4,9 @@ import { defineConfig } from 'vite' export default defineConfig({ mode: process.env.NODE_ENV, - root: __dirname, + root: join(__dirname, '../src/main'), build: { - outDir: join(process.cwd(), 'dist/main'), + outDir: join(__dirname, '../dist/main'), lib: { entry: 'index.ts', formats: ['cjs'], diff --git a/src/preload/vite.config.ts b/configs/vite.preload.ts similarity index 84% rename from src/preload/vite.config.ts rename to configs/vite.preload.ts index b7f552e..c9fcf04 100644 --- a/src/preload/vite.config.ts +++ b/configs/vite.preload.ts @@ -4,9 +4,9 @@ import { defineConfig } from 'vite' export default defineConfig({ mode: process.env.NODE_ENV, - root: __dirname, + root: join(__dirname, '../src/preload'), build: { - outDir: join(process.cwd(), 'dist/preload'), + outDir: join(__dirname, '../dist/preload'), lib: { entry: 'index.ts', formats: ['cjs'], diff --git a/src/react-ts/vite.config.ts b/configs/vite.vue-ts.ts similarity index 72% rename from src/react-ts/vite.config.ts rename to configs/vite.vue-ts.ts index 6dbad27..5a33cf2 100644 --- a/src/react-ts/vite.config.ts +++ b/configs/vite.vue-ts.ts @@ -1,17 +1,17 @@ import { join } from 'path' import { defineConfig } from 'vite' import react from '@vitejs/plugin-react' -import pkg from '../../package.json' +import pkg from '../package.json' // https://vitejs.dev/config/ export default defineConfig({ - root: __dirname, + root: join(__dirname, '../src/react-ts'), plugins: [react()], base: './', build: { emptyOutDir: true, minify: false, - outDir: join(process.cwd(), 'dist/react-ts'), + outDir: join(__dirname, '../dist/react-ts'), }, server: { host: pkg.env.HOST, diff --git a/scripts/build.mjs b/scripts/build.mjs index 38bfcdb..9aac853 100644 --- a/scripts/build.mjs +++ b/scripts/build.mjs @@ -8,9 +8,9 @@ import chalk from 'chalk' const TAG = chalk.bgBlue('[build.mjs]') const viteConfigs = { - main: 'src/main/vite.config.ts', - preload: 'src/preload/vite.config.ts', - reactTs: 'src/react-ts/vite.config.ts', + main: 'configs/vite.main.ts', + preload: 'configs/vite.preload.ts', + reactTs: 'configs/vite.vue-ts.ts', } async function buildElectron() { diff --git a/scripts/watch.mjs b/scripts/watch.mjs index 6273268..784075b 100644 --- a/scripts/watch.mjs +++ b/scripts/watch.mjs @@ -41,7 +41,7 @@ async function watchMain() { */ const watcher = await getWatcher({ name: 'electron-main-watcher', - configFile: 'src/main/vite.config.ts', + configFile: 'configs/vite.main.ts', writeBundle() { electronProcess && electronProcess.kill() electronProcess = spawn(electron, ['.'], { @@ -61,7 +61,7 @@ async function watchMain() { async function watchPreload(viteDevServer) { return getWatcher({ name: 'electron-preload-watcher', - configFile: 'src/preload/vite.config.ts', + configFile: 'configs/vite.preload.ts', writeBundle() { viteDevServer.ws.send({ type: 'full-reload', @@ -71,7 +71,7 @@ async function watchPreload(viteDevServer) { } ; (async () => { - const viteDevServer = await createServer({ configFile: 'src/react-ts/vite.config.ts' }) + const viteDevServer = await createServer({ configFile: 'configs/vite.vue-ts.ts' }) await viteDevServer.listen()