合并开源代码

Merge pull request !25 from h_mo/dev

build/proxy.ts

@@ -1,3 +1,5 @@
+import type { ProxyOptions } from 'vite';
+
 /**
  * Configure according to the proxy list
  * @param proxyList

build/vitePlugins.ts

@@ -4,6 +4,7 @@ import autoImport from 'unplugin-auto-import/vite';
 import viteRestart from 'vite-plugin-restart';
 import { visualizer } from 'rollup-plugin-visualizer';
 import Unocss from 'unocss/vite';
+import { nodeResolve } from '@rollup/plugin-node-resolve';
 import { appProvider, createComponents } from '../vite/plugins/index';
 import { isH5 } from './platform';
 
@@ -16,6 +17,7 @@ export function createVitePlugins({ isProd }: VitePluginConfig): PluginOption[]
   return [
     // @ts-expect-error TODO uni() 会报错：uni is not a function,暂时使用此方式解决
     uni?.default(),
+    nodeResolve(),
     appProvider(),
     createComponents(),
     Unocss(),

package.json

@@ -42,41 +42,43 @@
     "version:major": "commit-and-tag-version --release-as major"
   },
   "dependencies": {
-    "@alova/adapter-uniapp": "^2.0.4",
-    "@alova/mock": "^2.0.4",
+    "@alova/adapter-uniapp": "^2.0.6",
+    "@alova/mock": "^2.0.6",
     "@alova/shared": "^1.0.5",
-    "@dcloudio/uni-app": "3.0.0-alpha-4020620240822002",
-    "@dcloudio/uni-app-plus": "3.0.0-alpha-4020620240822002",
-    "@dcloudio/uni-components": "3.0.0-alpha-4020620240822002",
-    "@dcloudio/uni-h5": "3.0.0-alpha-4020620240822002",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-4020620240822002",
-    "@dcloudio/uni-mp-alipay": "3.0.0-alpha-4020620240822002",
-    "@dcloudio/uni-mp-baidu": "3.0.0-alpha-4020620240822002",
-    "@dcloudio/uni-mp-kuaishou": "3.0.0-alpha-4020620240822002",
-    "@dcloudio/uni-mp-lark": "3.0.0-alpha-4020620240822002",
-    "@dcloudio/uni-mp-qq": "3.0.0-alpha-4020620240822002",
-    "@dcloudio/uni-mp-toutiao": "3.0.0-alpha-4020620240822002",
-    "@dcloudio/uni-mp-weixin": "3.0.0-alpha-4020620240822002",
-    "@dcloudio/uni-quickapp-webview": "3.0.0-alpha-4020620240822002",
+    "@dcloudio/uni-app": "3.0.0-alpha-4020720240905001",
+    "@dcloudio/uni-app-plus": "3.0.0-alpha-4020720240905001",
+    "@dcloudio/uni-components": "3.0.0-alpha-4020720240905001",
+    "@dcloudio/uni-h5": "3.0.0-alpha-4020720240905001",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-4020720240905001",
+    "@dcloudio/uni-mp-alipay": "3.0.0-alpha-4020720240905001",
+    "@dcloudio/uni-mp-baidu": "3.0.0-alpha-4020720240905001",
+    "@dcloudio/uni-mp-kuaishou": "3.0.0-alpha-4020720240905001",
+    "@dcloudio/uni-mp-lark": "3.0.0-alpha-4020720240905001",
+    "@dcloudio/uni-mp-qq": "3.0.0-alpha-4020720240905001",
+    "@dcloudio/uni-mp-toutiao": "3.0.0-alpha-4020720240905001",
+    "@dcloudio/uni-mp-weixin": "3.0.0-alpha-4020720240905001",
+    "@dcloudio/uni-quickapp-webview": "3.0.0-alpha-4020720240905001",
     "@multiavatar/multiavatar": "^1.0.7",
     "@ontos/material-design-3-theme-builder": "workspace:*",
-    "alova": "^3.0.11",
+    "alova": "^3.0.16",
     "crypto-js": "^4.2.0",
     "lodash-es": "^4.17.21",
     "normalize-path": "^3.0.0",
     "pinia": "^2.2.2",
     "pinia-plugin-persistedstate": "^3.2.1",
     "unplugin-vue-components": "^0.27.0",
-    "vue": "^3.4.38"
+    "vue": "^3.5.3"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^2.27.1",
+    "@antfu/eslint-config": "^2.27.3",
     "@dcloudio/types": "^3.4.12",
-    "@dcloudio/uni-automator": "3.0.0-alpha-4020620240822002",
-    "@dcloudio/uni-cli-shared": "3.0.0-alpha-4020620240822002",
-    "@dcloudio/uni-stacktracey": "3.0.0-alpha-4020620240822002",
-    "@dcloudio/vite-plugin-uni": "3.0.0-alpha-4020620240822002",
+    "@dcloudio/uni-automator": "3.0.0-alpha-4020720240905001",
+    "@dcloudio/uni-cli-shared": "3.0.0-alpha-4020720240905001",
+    "@dcloudio/uni-stacktracey": "3.0.0-alpha-4020720240905001",
+    "@dcloudio/vite-plugin-uni": "3.0.0-alpha-4020720240905001",
+    "@egoist/tailwindcss-icons": "^1.8.1",
     "@iconify/json": "^2.2.245",
+    "@rollup/plugin-node-resolve": "^15.2.3",
     "@types/crypto-js": "^4.2.2",
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^20.16.1",
@@ -89,16 +91,16 @@
     "@vitejs/plugin-vue": "^5.1.2",
     "@vue/runtime-core": "^3.4.38",
     "autoprefixer": "^10.4.20",
-    "commit-and-tag-version": "^12.4.1",
-    "eslint": "^9.9.0",
+    "commit-and-tag-version": "^12.4.2",
+    "eslint": "^9.10.0",
     "eslint-plugin-format": "^0.1.2",
     "globals": "^15.9.0",
     "lint-staged": "^15.2.9",
     "picocolors": "^1.0.1",
     "rollup-plugin-visualizer": "^5.12.0",
-    "sass": "^1.77.8",
+    "sass": "^1.78.0",
     "simple-git-hooks": "^2.11.1",
-    "tsx": "^4.17.0",
+    "tsx": "^4.19.0",
     "typescript": "^5.5.4",
     "uni-mini-router": "^0.1.6",
     "uni-read-pages-vite": "^0.0.6",

vite.config.ts

@@ -45,7 +45,7 @@ export default defineConfig(async ({ mode }) => {
       // host: true,
       open: true,
       port: Number.parseInt(VITE_PORT!, 10),
-      proxy: resolveProxy([[VITE_PROXY_PREFIX as string, VITE_BASE_URL as string], [VITE_UPLOAD_PROXY_PREFIX as string, VITE_UPLOAD_URL as string]]),
+      proxy: resolveProxy([[VITE_PROXY_PREFIX! as string, VITE_BASE_URL! as string], [VITE_UPLOAD_PROXY_PREFIX! as string, VITE_UPLOAD_URL! as string]]),
     },
     // 构建配置
     build: {