From 6f4788affc5c7dc484ea5aef165698bc62760653 Mon Sep 17 00:00:00 2001
From: master1lan <278457198@qq.com>
Date: Sun, 19 Feb 2023 16:58:27 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20fix(custom):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=8E=AF=E5=A2=83=E4=B8=8Bclarity=E6=9C=AA?=
 =?UTF-8?q?=E7=94=9F=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/vite.master.config.ts | 4 ++--
 package.json                 | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/vite.master.config.ts b/config/vite.master.config.ts
index a9fbbe8..a6c0d17 100644
--- a/config/vite.master.config.ts
+++ b/config/vite.master.config.ts
@@ -37,7 +37,6 @@ import vitedevConfig from "./vite.dev.config";
 // https://vitejs.dev/config/
 //@ts-ignore
 export default mergeConfig(
-  vitedevConfig,
   defineConfig({
     define: {
       isdev: false,
@@ -101,5 +100,6 @@ export default mergeConfig(
         },
       },
     },
-  })
+  }),
+  vitedevConfig
 );
diff --git a/package.json b/package.json
index 5788496..d71af44 100644
--- a/package.json
+++ b/package.json
@@ -5,10 +5,10 @@
   "scripts": {
     "dev": "vite --config ./config/vite.dev.config.ts",
     "build": "tsc && vite build --config ./config/vite.master.config.ts && node build.js",
-    "preview": "vite preview",
-    "commit": "cz",
     "build:release": "vite build --config ./config/vite.release.config.ts && node build.js",
-    "release:changelog": "standard-version --preset gitmoji-config"
+    "release:changelog": "standard-version --preset gitmoji-config",
+    "preview": "vite preview",
+    "commit": "cz"
   },
   "config": {
     "commitizen": {