Merge branch 'base' of github.com:rookie-luochao/unibest into base
This commit is contained in:
commit
0ba62d75d8
41
.github/workflows/auto-merge.yml
vendored
Normal file
41
.github/workflows/auto-merge.yml
vendored
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
name: Auto Merge Base to Other Branches
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- base
|
||||||
|
workflow_dispatch: # 手动触发
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
auto-merge:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout repository
|
||||||
|
uses: actions/checkout@v3
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
token: ${{ secrets.GH_TOKEN_AUTO_MERGE }}
|
||||||
|
|
||||||
|
- name: Merge base into main
|
||||||
|
run: |
|
||||||
|
git config user.name "GitHub Actions"
|
||||||
|
git config user.email "actions@github.com"
|
||||||
|
git checkout main
|
||||||
|
git merge base --no-ff -m "Auto merge base into main"
|
||||||
|
git push origin main
|
||||||
|
|
||||||
|
- name: Merge base into i18n
|
||||||
|
run: |
|
||||||
|
git config user.name "GitHub Actions"
|
||||||
|
git config user.email "actions@github.com"
|
||||||
|
git checkout i18n
|
||||||
|
git merge base --no-ff -m "Auto merge base into i18n"
|
||||||
|
git push origin i18n
|
||||||
|
|
||||||
|
- name: Merge base into tabbar
|
||||||
|
run: |
|
||||||
|
git config user.name "GitHub Actions"
|
||||||
|
git config user.email "actions@github.com"
|
||||||
|
git checkout tabbar
|
||||||
|
git merge base --no-ff -m "Auto merge base into tabbar"
|
||||||
|
git push origin tabbar
|
13
.vscode/settings.json
vendored
13
.vscode/settings.json
vendored
@ -52,16 +52,5 @@
|
|||||||
"WechatMiniprogram",
|
"WechatMiniprogram",
|
||||||
"Weixin"
|
"Weixin"
|
||||||
],
|
],
|
||||||
"typescript.tsdk": "node_modules\\typescript\\lib",
|
"typescript.tsdk": "node_modules\\typescript\\lib"
|
||||||
// 控制相关文件嵌套展示
|
|
||||||
"explorer.fileNesting.enabled": true,
|
|
||||||
"explorer.fileNesting.expand": false,
|
|
||||||
"explorer.fileNesting.patterns": {
|
|
||||||
"*.ts": "$(capture).test.ts, $(capture).test.tsx",
|
|
||||||
"*.tsx": "$(capture).test.ts, $(capture).test.tsx",
|
|
||||||
// "*.env": "$(capture).env.*",
|
|
||||||
"CHANGELOG.md": "CHANGELOG*",
|
|
||||||
"package.json": "pnpm-lock.yaml,pnpm-workspace.yaml,LICENSE,.gitattributes,.gitignore,.gitpod.yml,CNAME,.npmrc,.browserslistrc",
|
|
||||||
".eslintrc.cjs": ".eslintignore,.prettierignore,.stylelintignore,.commitlintrc.*,.prettierrc.*,.stylelintrc.*,.eslintrc-auto-import.json,.editorconfig,.commitlint.cjs"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
10
README.md
10
README.md
@ -45,6 +45,14 @@
|
|||||||
|
|
||||||
注意旧的地址 [codercup](https://github.com/codercup/unibest) 我进不去了,使用新的 [feige996](https://github.com/feige996/unibest)。PR和 issue 也请使用新地址,否则无法合并。
|
注意旧的地址 [codercup](https://github.com/codercup/unibest) 我进不去了,使用新的 [feige996](https://github.com/feige996/unibest)。PR和 issue 也请使用新地址,否则无法合并。
|
||||||
|
|
||||||
|
## 平台兼容性
|
||||||
|
|
||||||
|
| H5 | IOS | 安卓 | 微信小程序 | 字节小程序 | 快手小程序 | 支付宝小程序 | 钉钉小程序 | 百度小程序 |
|
||||||
|
| --- | --- | ---- | ---------- | ---------- | ---------- | ------------ | ---------- | ---------- |
|
||||||
|
| √ | √ | √ | √ | √ | √ | √ | √ | √ |
|
||||||
|
|
||||||
|
注意每种 `UI框架` 支持的平台有所不同,详情请看各 `UI框架` 的官网,也可以看 `unibest` 文档。
|
||||||
|
|
||||||
## ⚙️ 环境
|
## ⚙️ 环境
|
||||||
|
|
||||||
- node>=18
|
- node>=18
|
||||||
@ -76,7 +84,7 @@
|
|||||||
|
|
||||||
[MIT](https://opensource.org/license/mit/)
|
[MIT](https://opensource.org/license/mit/)
|
||||||
|
|
||||||
Copyright (c) 2024 菲鸽
|
Copyright (c) 2025 菲鸽
|
||||||
|
|
||||||
## 捐赠
|
## 捐赠
|
||||||
|
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
import { createSSRApp } from 'vue'
|
import '@/style/index.scss'
|
||||||
import { VueQueryPlugin } from '@tanstack/vue-query'
|
import { VueQueryPlugin } from '@tanstack/vue-query'
|
||||||
|
import 'virtual:uno.css'
|
||||||
|
import { createSSRApp } from 'vue'
|
||||||
|
|
||||||
import App from './App.vue'
|
import App from './App.vue'
|
||||||
|
import { prototypeInterceptor, requestInterceptor, routeInterceptor } from './interceptors'
|
||||||
import store from './store'
|
import store from './store'
|
||||||
import { routeInterceptor, requestInterceptor, prototypeInterceptor } from './interceptors'
|
|
||||||
import 'virtual:uno.css'
|
|
||||||
import '@/style/index.scss'
|
|
||||||
|
|
||||||
export function createApp() {
|
export function createApp() {
|
||||||
const app = createSSRApp(App)
|
const app = createSSRApp(App)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user