From ca9a92cfc2f2bd8c724020ee5e46094633eb80a5 Mon Sep 17 00:00:00 2001
From: 黄何裕 <1053952480@qq.com>
Date: 星期五, 12 七月 2024 17:39:45 +0800
Subject: [PATCH] 处理冲突
---
package.json | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/package.json b/package.json
index 2af6aae..a4ee116 100644
--- a/package.json
+++ b/package.json
@@ -4,10 +4,10 @@
"version": "0.0.0",
"main": "./src/background.js",
"scripts": {
- "dev": "chcp 65001 && vite",
+ "dev": "vite",
"build": "vite build",
"preview": "vite preview",
- "electron:dev": "vite && electron"
+ "electron:dev": "chcp 65001 && vite --config vite.config.electron.js"
},
"dependencies": {
"@jitsi/electron-sdk": "^6.0.40",
@@ -17,8 +17,11 @@
"lodash": "^4.17.21",
"mockjs": "^1.1.0",
"pinia": "^2.1.7",
+ "pinia-plugin-persistedstate": "^3.2.1",
"vue": "^3.4.21",
- "vue-router": "^4.3.2"
+ "vue-router": "^4.3.2",
+ "vue-ueditor-wrap": "^3.0.8",
+ "xgplayer": "^3.0.18"
},
"devDependencies": {
"@vitejs/plugin-vue": "^5.0.4",
--
Gitblit v1.8.0