Merge branch '3.x' of https://gitlab.yiring.com/basic/basic-vue-admin into electron

package.json

@@ -84,7 +84,7 @@
         "dayjs": "^1.11.7",
         "default-passive-events": "^2.0.0",
         "echarts": "^5.4.2",
-        "intro.js": "^6.0.0",
+        "intro.js": "^7.0.1",
         "js-file-download": "^0.4.12",
         "lodash-es": "^4.17.21",
         "mockjs": "^1.1.0",
@@ -110,12 +110,12 @@
         "xlsx": "^0.18.5"
     },
     "devDependencies": {
-        "@antfu/eslint-config": "^0.37.0",
+        "@antfu/eslint-config": "^0.38.2",
         "@commitlint/cli": "^17.5.1",
         "@commitlint/config-conventional": "^17.4.4",
         "@electron-toolkit/tsconfig": "^1.0.1",
         "@electron/notarize": "^1.2.3",
-        "@iconify/json": "^2.2.40",
+        "@iconify/json": "^2.2.42",
         "@types/codemirror": "^5.60.7",
         "@types/crypto-js": "^4.1.1",
         "@types/fs-extra": "^11.0.1",
@@ -124,7 +124,7 @@
         "@types/lodash": "^4.14.192",
         "@types/lodash-es": "^4.17.7",
         "@types/mockjs": "^1.0.7",
-        "@types/node": "^18.15.10",
+        "@types/node": "^18.15.11",
         "@types/nprogress": "^0.2.0",
         "@types/qrcode": "^1.5.0",
         "@types/qs": "^6.9.7",
@@ -151,7 +151,7 @@
         "electron": "^23.2.0",
         "electron-builder": "^23.6.0",
         "electron-vite": "^1.0.21",
-        "eslint": "^8.36.0",
+        "eslint": "^8.37.0",
         "eslint-config-prettier": "^8.8.0",
         "eslint-plugin-prettier": "^4.2.1",
         "eslint-plugin-vue": "^9.10.0",
@@ -181,21 +181,21 @@
         "stylelint-order": "^5.0.0",
         "terser": "^5.16.8",
         "ts-node": "^10.9.1",
-        "typescript": "^4.9.5",
-        "unplugin-auto-import": "^0.12.2",
+        "typescript": "^5.0.3",
+        "unplugin-auto-import": "^0.15.2",
         "vite": "^4.2.1",
         "vite-plugin-compression": "^0.5.1",
         "vite-plugin-html": "^3.2.0",
-        "vite-plugin-mkcert": "^1.13.4",
+        "vite-plugin-mkcert": "^1.14.0",
         "vite-plugin-mock": "^2.9.6",
         "vite-plugin-purge-icons": "^0.9.2",
-        "vite-plugin-pwa": "^0.14.6",
+        "vite-plugin-pwa": "^0.14.7",
         "vite-plugin-style-import": "^2.0.0",
         "vite-plugin-svg-icons": "^2.0.1",
         "vite-plugin-theme": "^0.8.6",
         "vite-plugin-vue-setup-extend": "^0.4.0",
         "vite-plugin-windicss": "^1.8.10",
-        "vue-eslint-parser": "^9.1.0",
+        "vue-eslint-parser": "^9.1.1",
         "vue-tsc": "^1.2.0"
     },
     "engines": {

src/main.ts

@@ -19,7 +19,7 @@ import { registerGlobComp } from '/@/components/registerGlobComp'
 import { isDevMode } from './utils/env'
 
 // fix: Added non-passive event listener to a scroll-blocking 'wheel' event
-import 'default-passive-events'
+// import 'default-passive-events'
 
 if (isDevMode()) {
     import('ant-design-vue/es/style')

vite.config.ts

@@ -26,7 +26,7 @@ export default ({ command, mode }: ConfigEnv): UserConfig => {
     // The boolean type read by loadEnv is a string. This function can be converted to boolean type
     const viteEnv = wrapperEnv(env)
 
-    const { VITE_PORT, VITE_PUBLIC_PATH, VITE_PROXY, VITE_DROP_CONSOLE } = viteEnv
+    const { VITE_PORT, VITE_PUBLIC_PATH, VITE_PROXY } = viteEnv
 
     const isBuild = command === 'build'
 
@@ -62,17 +62,6 @@ export default ({ command, mode }: ConfigEnv): UserConfig => {
         build: {
             target: 'es2015',
             cssTarget: 'chrome80',
-            minify: 'terser',
-            /**
-             * 当 minify=“minify:'terser'” 解开注释
-             * Uncomment when minify="minify:'terser'"
-             */
-            terserOptions: {
-                compress: {
-                    keep_infinity: true,
-                    drop_console: VITE_DROP_CONSOLE,
-                },
-            },
             // Turning off brotliSize display can slightly reduce packaging time
             reportCompressedSize: false,
             chunkSizeWarningLimit: 2000,