From e5ae1ca0e8a65ed3ae1b804122d60bffd29a40e7 Mon Sep 17 00:00:00 2001
From: leejooy96 <leejooy96@gmail.com>
Date: Mon, 13 Nov 2023 09:52:45 +0900
Subject: [PATCH] pack: set vite env configuration instead of use `cross-env`
 package

---
 package-lock.json | 19 -------------------
 package.json      |  5 ++---
 vite.config.ts    | 14 ++++++++++++--
 3 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6b5d4d9..35b6723 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -22,7 +22,6 @@
         "@typescript-eslint/parser": "^6.10.0",
         "@vitejs/plugin-vue": "^4.4.1",
         "@vitejs/plugin-vue-jsx": "^3.0.2",
-        "cross-env": "^7.0.3",
         "dotenv": "^16.3.1",
         "electron": "^27.0.4",
         "electron-builder": "^24.6.4",
@@ -3213,24 +3212,6 @@
         "buffer": "^5.1.0"
       }
     },
-    "node_modules/cross-env": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz",
-      "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==",
-      "dev": true,
-      "dependencies": {
-        "cross-spawn": "^7.0.1"
-      },
-      "bin": {
-        "cross-env": "src/bin/cross-env.js",
-        "cross-env-shell": "src/bin/cross-env-shell.js"
-      },
-      "engines": {
-        "node": ">=10.14",
-        "npm": ">=6",
-        "yarn": ">=1"
-      }
-    },
     "node_modules/cross-spawn": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
diff --git a/package.json b/package.json
index 29910ab..fbc0685 100644
--- a/package.json
+++ b/package.json
@@ -15,11 +15,11 @@
     "url": "https://github.com/jooy2/vutron/issues"
   },
   "scripts": {
-    "dev": "cross-env ELECTRON_ENABLE_LOGGING=true vite",
+    "dev": "vite",
     "dev:debug": "vite -d",
     "dev:debug:force": "vite -d --force",
     "build": "npm run build:pre && electron-builder --config=buildAssets/builder/config.js",
-    "build:pre": "npm run format:fix && vue-tsc --noEmit && cross-env NODE_ENV=production vite build",
+    "build:pre": "npm run format:fix && vue-tsc --noEmit && vite build",
     "build:all": "npm run build:pre && electron-builder --config=buildAssets/builder/config.js -wml",
     "build:dir": "npm run build:pre && electron-builder --config=buildAssets/builder/config.js --dir",
     "build:mac": "npm run build:pre && CSC_IDENTITY_AUTO_DISCOVERY=false electron-builder --config=buildAssets/builder/config.js --mac",
@@ -48,7 +48,6 @@
     "@typescript-eslint/parser": "^6.10.0",
     "@vitejs/plugin-vue": "^4.4.1",
     "@vitejs/plugin-vue-jsx": "^3.0.2",
-    "cross-env": "^7.0.3",
     "dotenv": "^16.3.1",
     "electron": "^27.0.4",
     "electron-builder": "^24.6.4",
diff --git a/vite.config.ts b/vite.config.ts
index 4e038e5..8ba2575 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,5 +1,5 @@
 import { fileURLToPath } from 'url'
-import { defineConfig } from 'vite'
+import { defineConfig, loadEnv } from 'vite'
 import ElectronPlugin, { ElectronOptions } from 'vite-plugin-electron'
 import RendererPlugin from 'vite-plugin-electron-renderer'
 import EslintPlugin from 'vite-plugin-eslint'
@@ -12,7 +12,17 @@ import { builtinModules } from 'module'
 
 const isDevEnv = process.env.NODE_ENV === 'development'
 
-export default defineConfig(() => {
+export default defineConfig(({ mode }) => {
+  process.env = {
+    ...(isDevEnv
+      ? {
+          ELECTRON_ENABLE_LOGGING: 'true'
+        }
+      : {}),
+    ...process.env,
+    ...loadEnv(mode, process.cwd())
+  }
+
   rmSync('dist', { recursive: true, force: true })
 
   const electronPluginConfigs: ElectronOptions[] = [