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

build/config/themeConfig.ts

@@ -30,12 +30,7 @@ export function getThemeColors(color?: string) {
     return [...lightColors, ...modeColors]
 }
 
-export function generateColors({
-    color = primaryColor,
-    mixLighten,
-    mixDarken,
-    tinycolor,
-}: GenerateColorsParams) {
+export function generateColors({ color = primaryColor, mixLighten, mixDarken, tinycolor }: GenerateColorsParams) {
     const arr = new Array(19).fill(0)
     const lightens = arr.map((_t, i) => {
         return mixLighten(color, i / 5)

package.json

@@ -29,6 +29,9 @@
         "dev:app": "electron-vite dev",
         "preview:app": "electron-vite preview",
         "build:app": "electron-vite build",
+        "build:win": "npm run build:app && electron-builder --win --config",
+        "build:mac": "npm run build:app && electron-builder --mac --config",
+        "build:linux": "npm run build:app && electron-builder --linux --config",
         "build": "vite build",
         "build:test": "vite build --mode test",
         "build:preview": "vite build --mode preview",
@@ -51,10 +54,7 @@
         "reinstall": "rimraf pnpm-lock.yaml && rimraf package.lock.json && rimraf node_modules && npm run bootstrap",
         "prepare": "husky install",
         "gen:icon": "esno ./build/generate/icon/index.ts",
-        "postinstall": "electron-builder install-app-deps",
-        "build:win": "npm run build:app && electron-builder --win --config",
-        "build:mac": "npm run build:app && electron-builder --mac --config",
-        "build:linux": "npm run build:app && electron-builder --linux --config"
+        "postinstall": "electron-builder install-app-deps"
     },
     "config": {
         "commitizen": {

pont-template.ts

 // import * as Pont from 'pont-engine'
-import { Interface, BaseClass, Property, CodeGenerator } from 'pont-engine'
+import type { BaseClass, Interface } from 'pont-engine'
+import { CodeGenerator, Property } from 'pont-engine'
 
 // 接口 API 前缀
 // 通常与项目的 env 配置中的 VITE_GLOB_API_URL_PREFIX 相同
@@ -38,7 +39,7 @@ export default class BasicGenerator extends CodeGenerator {
         return `${requestParams.replace(
             'options?: any',
             `config?: http.RequestConfig<${
-                bodyTypeDef ? bodyTypeDef : `Params${requestParams.includes('form') ? ' | FormData' : ''}`
+                bodyTypeDef || `Params${requestParams.includes('form') ? ' | FormData' : ''}`
             }>`,
         )}, options?: http.RequestOptions`
     }

pont-transform.ts

-import { StandardDataSource } from 'pont-engine'
+import type { StandardDataSource } from 'pont-engine'
 
 export default function transform(dataSource: StandardDataSource): StandardDataSource {
     console.log(dataSource)

vite.config.ts

 import { resolve } from 'node:path'
 import type { ConfigEnv, UserConfig } from 'vite'
-import { loadEnv } from 'vite'
 import dayjs from 'dayjs'
+import { loadEnv } from 'vite'
 import pkg from './package.json'
 import { generateModifyVars } from './build/generate/generateModifyVars'
 import { createProxy } from './build/vite/proxy'
@@ -59,23 +59,20 @@ export default ({ command, mode }: ConfigEnv): UserConfig => {
             // Load proxy configuration from .env
             proxy: createProxy(VITE_PROXY),
         },
-        esbuild: {
-            pure: VITE_DROP_CONSOLE ? ['console.log', 'debugger'] : [],
-        },
         build: {
             target: 'es2015',
             cssTarget: 'chrome80',
-            // minify: 'terser',
+            minify: 'terser',
             /**
              * 当 minify=“minify:'terser'” 解开注释
              * Uncomment when minify="minify:'terser'"
              */
-            // terserOptions: {
-            //   compress: {
-            //     keep_infinity: true,
-            //     drop_console: VITE_DROP_CONSOLE,
-            //   },
-            // },
+            terserOptions: {
+                compress: {
+                    keep_infinity: true,
+                    drop_console: VITE_DROP_CONSOLE,
+                },
+            },
             // Turning off brotliSize display can slightly reduce packaging time
             reportCompressedSize: false,
             chunkSizeWarningLimit: 2000,