合并分支 '3.x' 到 'main'

3.x

查看合并请求 !45

package.json

@@ -82,8 +82,8 @@
         "@dcloudio/uni-ui": "^1.4.28",
         "@faker-js/faker": "^8.0.2",
         "@vue/runtime-core": "~3.2.47",
-        "@vueuse/core": "^10.2.0",
-        "@yiring/fui": "^1.9.8",
+        "@vueuse/core": "^10.2.1",
+        "@yiring/fui": "^1.9.9",
         "axios": "^1.4.0",
         "crypto-js": "^4.1.1",
         "dayjs": "^1.11.8",
@@ -99,7 +99,7 @@
         "vue-types": "^5.1.0"
     },
     "devDependencies": {
-        "@antfu/eslint-config": "^0.39.5",
+        "@antfu/eslint-config": "^0.39.6",
         "@commitlint/cli": "^17.6.6",
         "@commitlint/config-conventional": "^17.6.6",
         "@dcloudio/types": "^3.3.3",
@@ -108,7 +108,7 @@
         "@dcloudio/uni-helper-json": "^1.0.13",
         "@dcloudio/uni-stacktracey": "3.0.0-3080420230531001",
         "@dcloudio/vite-plugin-uni": "3.0.0-3080420230531001",
-        "@iconify/json": "^2.2.83",
+        "@iconify/json": "^2.2.84",
         "@types/crypto-js": "^4.1.1",
         "@types/lodash-es": "^4.17.7",
         "@types/node": "^18.16.18",
@@ -133,7 +133,7 @@
         "jest": "27.0.4",
         "jest-environment-node": "27.5.1",
         "less": "^4.1.3",
-        "lint-staged": "^13.2.2",
+        "lint-staged": "^13.2.3",
         "npm-run-all": "^4.1.5",
         "picocolors": "^1.0.0",
         "pont-engine": "^1.5.11",

src/config/uni.ts

-import FuiConfig from '@yiring/fui/fui-config'
+import FuiConfig from '@yiring/fui/lib/fui-config'
 
 export function setupUniConfig() {
     // 全局组件配置

src/main.ts

@@ -2,7 +2,7 @@ import { createSSRApp } from 'vue'
 import * as Pinia from 'pinia'
 
 import 'uno.css'
-import '@yiring/fui/fui-theme/fui-theme.css'
+import '@yiring/fui/lib/fui-theme/fui-theme.css'
 
 import App from './App.vue'
 import { setupAppConfig } from '@/config/app'

src/pages.json

@@ -55,7 +55,7 @@
         "autoscan": true,
         "custom": {
             // https://doc.firstui.cn/docs/introduce.html
-            "^fui-(.*)": "@yiring/fui/fui-$1/fui-$1.vue",
+            "^fui-(.*)": "@yiring/fui/lib/fui-$1/fui-$1.vue",
             // https://ext.dcloud.net.cn/plugin?id=55#detail
             "^uni-(.*)": "@dcloudio/uni-ui/lib/uni-$1/uni-$1.vue"
         }