提交 84e8c363 作者: 方治民

Merge branch '3.x' of https://gitlab.yiring.com/basic/basic-uniapp-v3 into examples

...@@ -82,8 +82,8 @@ ...@@ -82,8 +82,8 @@
"@dcloudio/uni-ui": "^1.4.28", "@dcloudio/uni-ui": "^1.4.28",
"@faker-js/faker": "^8.0.2", "@faker-js/faker": "^8.0.2",
"@vue/runtime-core": "~3.2.47", "@vue/runtime-core": "~3.2.47",
"@vueuse/core": "^10.2.0", "@vueuse/core": "^10.2.1",
"@yiring/fui": "^1.9.8", "@yiring/fui": "^1.9.9",
"axios": "^1.4.0", "axios": "^1.4.0",
"crypto-js": "^4.1.1", "crypto-js": "^4.1.1",
"dayjs": "^1.11.8", "dayjs": "^1.11.8",
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
"vue-types": "^5.1.0" "vue-types": "^5.1.0"
}, },
"devDependencies": { "devDependencies": {
"@antfu/eslint-config": "^0.39.5", "@antfu/eslint-config": "^0.39.6",
"@commitlint/cli": "^17.6.6", "@commitlint/cli": "^17.6.6",
"@commitlint/config-conventional": "^17.6.6", "@commitlint/config-conventional": "^17.6.6",
"@dcloudio/types": "^3.3.3", "@dcloudio/types": "^3.3.3",
......
import FuiConfig from '@yiring/fui/fui-config' import FuiConfig from '@yiring/fui/lib/fui-config'
export function setupUniConfig() { export function setupUniConfig() {
// 全局组件配置 // 全局组件配置
......
...@@ -2,7 +2,7 @@ import { createSSRApp } from 'vue' ...@@ -2,7 +2,7 @@ import { createSSRApp } from 'vue'
import * as Pinia from 'pinia' import * as Pinia from 'pinia'
import 'uno.css' 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 App from './App.vue'
import { setupAppConfig } from '@/config/app' import { setupAppConfig } from '@/config/app'
......
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
"autoscan": true, "autoscan": true,
"custom": { "custom": {
// https://doc.firstui.cn/docs/introduce.html // 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 // https://ext.dcloud.net.cn/plugin?id=55#detail
"^uni-(.*)": "@dcloudio/uni-ui/lib/uni-$1/uni-$1.vue" "^uni-(.*)": "@dcloudio/uni-ui/lib/uni-$1/uni-$1.vue"
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论