pack: set vite env configuration instead of use cross-env package

This commit is contained in:
leejooy96 committed 2023-11-13 09:52:45 +09:00
1 parent 7da4d76ad8
commit e5ae1ca0e8
3 files changed
+14 -24

No files matched your search

-19
View File
@@ -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",
+2 -3
View File
@@ -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",
+12 -2
View File
@@ -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[] = [