Merge branch 'base' into tabbar

This commit is contained in:
Burt 2024-11-10 22:48:37 +08:00
commit 1bec786aaa
4 changed files with 41 additions and 17 deletions

View File

@ -1,4 +1,12 @@
#!/usr/bin/env sh #!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh" . "$(dirname -- "$0")/_/husky.sh"
# Load nvm
export NVM_DIR="$HOME/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
# Use the correct Node.js version
nvm use v20.15.1
# Run the commit-msg hook
npx --no-install commitlint --edit npx --no-install commitlint --edit

View File

@ -1,4 +1,12 @@
#!/usr/bin/env sh #!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh" . "$(dirname -- "$0")/_/husky.sh"
# Load nvm
export NVM_DIR="$HOME/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
# Use the correct Node.js version
nvm use v20.15.1
# Run the pre-commit hook
npx --no-install -- lint-staged npx --no-install -- lint-staged

View File

@ -1,23 +1,31 @@
<p align="center"> <p align="center">
<a href="https://github.com/codercup2/unibest"> <a href="https://github.com/feige996/unibest">
<img width="160" src="./src/static/logo.svg"> <img width="160" src="./src/static/logo.svg">
</a> </a>
</p> </p>
<h1 align="center"> <h1 align="center">
<a href="https://github.com/codercup2/unibest" target="_blank">unibest - 最好的 uniapp 开发框架</a> <a href="https://github.com/feige996/unibest" target="_blank">unibest - 最好的 uniapp 开发框架</a>
</h1> </h1>
<div align="center"> <div align="center">
旧仓库 codercup 进不去了star 也拿不回来,这里也展示一下那个地址的 star.
[![GitHub Repo stars](https://img.shields.io/github/stars/codercup/unibest?style=flat&logo=github)](https://github.com/codercup/unibest) [![GitHub Repo stars](https://img.shields.io/github/stars/codercup/unibest?style=flat&logo=github)](https://github.com/codercup/unibest)
[![GitHub forks](https://img.shields.io/github/forks/codercup/unibest?style=flat&logo=github)](https://github.com/codercup/unibest) [![GitHub forks](https://img.shields.io/github/forks/codercup/unibest?style=flat&logo=github)](https://github.com/codercup/unibest)
[![star](https://gitee.com/codercup/unibest/badge/star.svg?theme=dark)](https://gitee.com/codercup/unibest/stargazers)
[![fork](https://gitee.com/codercup/unibest/badge/fork.svg?theme=dark)](https://gitee.com/codercup/unibest/members) </div>
<div align="center">
[![GitHub Repo stars](https://img.shields.io/github/stars/feige996/unibest?style=flat&logo=github)](https://github.com/feige996/unibest)
[![GitHub forks](https://img.shields.io/github/forks/feige996/unibest?style=flat&logo=github)](https://github.com/feige996/unibest)
[![star](https://gitee.com/feige996/unibest/badge/star.svg?theme=dark)](https://gitee.com/feige996/unibest/stargazers)
[![fork](https://gitee.com/feige996/unibest/badge/fork.svg?theme=dark)](https://gitee.com/feige996/unibest/members)
![node version](https://img.shields.io/badge/node-%3E%3D18-green) ![node version](https://img.shields.io/badge/node-%3E%3D18-green)
![pnpm version](https://img.shields.io/badge/pnpm-%3E%3D7.30-green) ![pnpm version](https://img.shields.io/badge/pnpm-%3E%3D7.30-green)
![GitHub package.json version (subfolder of monorepo)](https://img.shields.io/github/package-json/v/codercup/unibest) ![GitHub package.json version (subfolder of monorepo)](https://img.shields.io/github/package-json/v/feige996/unibest)
![GitHub License](https://img.shields.io/github/license/codercup/unibest) ![GitHub License](https://img.shields.io/github/license/feige996/unibest)
</div> </div>
@ -28,14 +36,14 @@
![](https://raw.githubusercontent.com/andreasbm/readme/master/screenshots/lines/rainbow.png) ![](https://raw.githubusercontent.com/andreasbm/readme/master/screenshots/lines/rainbow.png)
<p align="center"> <p align="center">
<a href="https://codercup2.github.io/unibest-docs/" target="_blank">📖 文档地址</a> <a href="https://feige996.github.io/unibest-docs/" target="_blank">📖 文档地址</a>
<span style="margin:0 10px;">|</span> <span style="margin:0 10px;">|</span>
<a href="https://codercup2.github.io/hello-unibest/" target="_blank">📱 DEMO 地址</a> <a href="https://feige996.github.io/hello-unibest/" target="_blank">📱 DEMO 地址</a>
</p> </p>
--- ---
注意旧的地址 [codercup](https://github.com/codercup/unibest) 我进不去了,使用新的 [codercup2](https://github.com/codercup2/unibest)。PR和 issue 也请使用新地址,否则无法合并。 注意旧的地址 [feige996](https://github.com/feige996/unibest) 我进不去了,使用新的 [feige996](https://github.com/feige996/unibest)。PR和 issue 也请使用新地址,否则无法合并。
## ⚙️ 环境 ## ⚙️ 环境

View File

@ -4,19 +4,19 @@
"version": "2.4.3", "version": "2.4.3",
"description": "unibest - 最好的 uniapp 开发模板", "description": "unibest - 最好的 uniapp 开发模板",
"author": { "author": {
"name": "codercup", "name": "feige996",
"zhName": "菲鸽", "zhName": "菲鸽",
"email": "1020103647@qq.com", "email": "1020103647@qq.com",
"github": "https://github.com/codercup", "github": "https://github.com/feige996",
"gitee": "https://gitee.com/codercup" "gitee": "https://gitee.com/feige996"
}, },
"license": "MIT", "license": "MIT",
"repository": "https://github.com/codercup/unibest", "repository": "https://github.com/feige996/unibest",
"repository-gitee": "https://gitee.com/codercup/unibest", "repository-gitee": "https://gitee.com/feige996/unibest",
"bugs": { "bugs": {
"url": "https://github.com/codercup/unibest/issues" "url": "https://github.com/feige996/unibest/issues"
}, },
"homepage": "https://codercup.github.io/unibest/", "homepage": "https://feige996.github.io/unibest/",
"engines": { "engines": {
"node": ">=18", "node": ">=18",
"pnpm": ">=7.30" "pnpm": ">=7.30"