Skip to content

Commit 2fafdb3

Browse files
committed
Merge branch 'main' into git-pages
2 parents 03cf06e + 5f2a7d5 commit 2fafdb3

File tree

52 files changed

+184
-366
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+184
-366
lines changed

.github/workflows/auto-merge.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ jobs:
3838

3939
- name: Merge main into git-pages
4040
run: |
41-
git merge main --no-ff -m "feat: ✨ Auto-merge main into git-pages"
42-
41+
git merge main --no-ff -m "feat: ✨ Auto-merge main into git-pages"
42+
4343
- name: Push changes to git-pages
4444
run: git push origin git-pages
4545

.github/workflows/git-pages.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Automatic deployment to GitHub Pages
22

3-
on:
3+
on:
44
push:
55
branches:
66
- git-pages
@@ -16,7 +16,7 @@ jobs:
1616
with:
1717
ref: ${{ github.event_name == 'push' && github.ref || 'git-pages' }}
1818
fetch-depth: 0
19-
19+
2020
- name: Setup pnpm
2121
uses: pnpm/action-setup@v4
2222

@@ -28,7 +28,7 @@ jobs:
2828

2929
- name: Setup Pages
3030
uses: actions/configure-pages@v5
31-
31+
3232
- name: Install dependencies
3333
run: pnpm install
3434

@@ -39,7 +39,7 @@ jobs:
3939
uses: actions/upload-pages-artifact@v3
4040
with:
4141
path: ./dist
42-
42+
4343
deploy:
4444
environment:
4545
name: github-pages

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ jobs:
2626

2727
- run: npx changelogithub # or changelogithub@0.12 if ensure the stable result
2828
env:
29-
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
29+
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

CHANGELOG.md

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1+
## <small>0.0.2 (2025-07-20)</small>
2+
3+
- style: 💄 lint ([98c4ad0](https://github.com/jsxiaosi/react-xs-admin/commit/98c4ad0))
4+
- feat: ✨ 更新依赖 ([76ea7e6](https://github.com/jsxiaosi/react-xs-admin/commit/76ea7e6))
5+
16
## <small>0.0.1 (2024-12-25)</small>
27

3-
- ci: 🛠 pr 模版 ([05a1d02](https://github.com/jsxiaosi/react-xs-admin/commit/05a1d02))
4-
- feat: ✨ 权限路由 ([7c98cb5](https://github.com/jsxiaosi/react-xs-admin/commit/7c98cb5))
5-
- feat: ✨ 添加夜间主题切换 ([06aa81c](https://github.com/jsxiaosi/react-xs-admin/commit/06aa81c))
6-
- feat: ✨ 跳转登录页 ([0521d53](https://github.com/jsxiaosi/react-xs-admin/commit/0521d53))
7-
- feat: ✨ 修改 请求报错提示 ([92a9d24](https://github.com/jsxiaosi/react-xs-admin/commit/92a9d24))
8-
- feat: ✨ 修改主题颜色 ([72e242c](https://github.com/jsxiaosi/react-xs-admin/commit/72e242c))
98
- feat: ✨ add @jsxiaosi/eslint-config-react ([13db953](https://github.com/jsxiaosi/react-xs-admin/commit/13db953))
109
- feat: ✨ add ant less ([f487d99](https://github.com/jsxiaosi/react-xs-admin/commit/f487d99))
1110
- feat: ✨ add ant redux ([af754fb](https://github.com/jsxiaosi/react-xs-admin/commit/af754fb))
@@ -16,21 +15,28 @@
1615
- feat: ✨ gitHub Actions ([08ac9c8](https://github.com/jsxiaosi/react-xs-admin/commit/08ac9c8))
1716
- feat: ✨ package ([8246238](https://github.com/jsxiaosi/react-xs-admin/commit/8246238))
1817
- feat: ✨ pwa ([5f8b604](https://github.com/jsxiaosi/react-xs-admin/commit/5f8b604))
18+
- feat: ✨ v0.0.1 changelog ([e162ee5](https://github.com/jsxiaosi/react-xs-admin/commit/e162ee5))
19+
- feat: ✨ 修改 请求报错提示 ([92a9d24](https://github.com/jsxiaosi/react-xs-admin/commit/92a9d24))
20+
- feat: ✨ 修改主题颜色 ([72e242c](https://github.com/jsxiaosi/react-xs-admin/commit/72e242c))
21+
- feat: ✨ 权限路由 ([7c98cb5](https://github.com/jsxiaosi/react-xs-admin/commit/7c98cb5))
22+
- feat: ✨ 添加夜间主题切换 ([06aa81c](https://github.com/jsxiaosi/react-xs-admin/commit/06aa81c))
23+
- feat: ✨ 跳转登录页 ([0521d53](https://github.com/jsxiaosi/react-xs-admin/commit/0521d53))
1924
- feat(app.tsx): ✨ [App] add 标签页 ([7cb8661](https://github.com/jsxiaosi/react-xs-admin/commit/7cb8661))
2025
- feat(hooks): ✨ 升级react@19 ([2a582a6](https://github.com/jsxiaosi/react-xs-admin/commit/2a582a6))
2126
- feat(layout): ✨ [layout] add 侧边栏设置 ([0585f2a](https://github.com/jsxiaosi/react-xs-admin/commit/0585f2a))
22-
- feat(layout): ✨ add 色弱 灰色 redux-persist ([2b2ec65](https://github.com/jsxiaosi/react-xs-admin/commit/2b2ec65))
2327
- feat(layout): ✨ add emotions css-in-js ([3ee69e5](https://github.com/jsxiaosi/react-xs-admin/commit/3ee69e5))
28+
- feat(layout): ✨ add 色弱 灰色 redux-persist ([2b2ec65](https://github.com/jsxiaosi/react-xs-admin/commit/2b2ec65))
2429
- feat(layout): ✨ appAccount ([ca63cf0](https://github.com/jsxiaosi/react-xs-admin/commit/ca63cf0))
2530
- feat(layout): ✨ sidebar ([4edf8a2](https://github.com/jsxiaosi/react-xs-admin/commit/4edf8a2))
2631
- feat(layout): ✨ tabs ([f706c2a](https://github.com/jsxiaosi/react-xs-admin/commit/f706c2a))
2732
- feat(locales): ✨ [locales] 监听路由报错 ([1df5ca4](https://github.com/jsxiaosi/react-xs-admin/commit/1df5ca4))
2833
- feat(package): ✨ eslint ([e9ce525](https://github.com/jsxiaosi/react-xs-admin/commit/e9ce525))
2934
- feat(package): ✨ prettier ([9918450](https://github.com/jsxiaosi/react-xs-admin/commit/9918450))
3035
- feat(views): ✨ [Pages] add 权限切换 ([b345524](https://github.com/jsxiaosi/react-xs-admin/commit/b345524))
31-
- feat(views): ✨ 详情页 ([d3585e8](https://github.com/jsxiaosi/react-xs-admin/commit/d3585e8))
3236
- feat(views): ✨ add login axios ([7c713d8](https://github.com/jsxiaosi/react-xs-admin/commit/7c713d8))
3337
- feat(views): ✨ permissions ([da8262f](https://github.com/jsxiaosi/react-xs-admin/commit/da8262f))
38+
- feat(views): ✨ 详情页 ([d3585e8](https://github.com/jsxiaosi/react-xs-admin/commit/d3585e8))
39+
- ci: 🛠 pr 模版 ([05a1d02](https://github.com/jsxiaosi/react-xs-admin/commit/05a1d02))
3440
- chore: 🔨 删除 VITE_KEY_ALIVE 环境变量 ([148a2fb](https://github.com/jsxiaosi/react-xs-admin/commit/148a2fb))
3541
- refactor: ♻️ store 调用 ([166ba51](https://github.com/jsxiaosi/react-xs-admin/commit/166ba51))
3642
- refactor(layout): ♻️ keepAllve 重构 keepalive-for-react 插件 ([a56f7cb](https://github.com/jsxiaosi/react-xs-admin/commit/a56f7cb))
@@ -46,12 +52,12 @@
4652
- build: 📦️ vite4 ([19ef4d4](https://github.com/jsxiaosi/react-xs-admin/commit/19ef4d4))
4753
- build(package): 📦️ 升级依赖 ([d2b14cb](https://github.com/jsxiaosi/react-xs-admin/commit/d2b14cb))
4854
- build(router): 📦️ eslint ([828850c](https://github.com/jsxiaosi/react-xs-admin/commit/828850c))
49-
- fix: 🐛 修改mock请求时间 ([721bd47](https://github.com/jsxiaosi/react-xs-admin/commit/721bd47))
5055
- fix: 🐛 cN md ([f39e433](https://github.com/jsxiaosi/react-xs-admin/commit/f39e433))
5156
- fix: 🐛 eslint ([97a884b](https://github.com/jsxiaosi/react-xs-admin/commit/97a884b))
5257
- fix: 🐛 html loading ([e077c79](https://github.com/jsxiaosi/react-xs-admin/commit/e077c79))
5358
- fix: 🐛 lint-staged 查找不到文件 ([fcdeb32](https://github.com/jsxiaosi/react-xs-admin/commit/fcdeb32))
5459
- fix: 🐛 mork ([0d211a1](https://github.com/jsxiaosi/react-xs-admin/commit/0d211a1))
60+
- fix: 🐛 修改mock请求时间 ([721bd47](https://github.com/jsxiaosi/react-xs-admin/commit/721bd47))
5561
- fix: emotion WebkitLineClamp ([6ecee07](https://github.com/jsxiaosi/react-xs-admin/commit/6ecee07))
5662
- fix(layout): 🐛 [layout] tabs size="small" ([7517410](https://github.com/jsxiaosi/react-xs-admin/commit/7517410))
5763
- fix(layout): 🐛 keepalive Authority judgment ([a4e9aee](https://github.com/jsxiaosi/react-xs-admin/commit/a4e9aee))
@@ -72,8 +78,8 @@
7278
- fix(router,views): 🐛 permissions ([43f167d](https://github.com/jsxiaosi/react-xs-admin/commit/43f167d))
7379
- perf(hooks,router): ⚡️ 路由参数优化 ([8e37a65](https://github.com/jsxiaosi/react-xs-admin/commit/8e37a65))
7480
- perf: ⚡️ html、README.md ([19a0ebe](https://github.com/jsxiaosi/react-xs-admin/commit/19a0ebe))
75-
- perf(layout): ⚡️ 优化layout ([94f21f9](https://github.com/jsxiaosi/react-xs-admin/commit/94f21f9))
7681
- perf(layout): ⚡️ sitebar,route ([7251e3d](https://github.com/jsxiaosi/react-xs-admin/commit/7251e3d))
82+
- perf(layout): ⚡️ 优化layout ([94f21f9](https://github.com/jsxiaosi/react-xs-admin/commit/94f21f9))
7783
- docs: 📝 add README LICENSE ([44d526f](https://github.com/jsxiaosi/react-xs-admin/commit/44d526f))
7884
- docs: 📝 img ([5122396](https://github.com/jsxiaosi/react-xs-admin/commit/5122396))
7985
- docs: 📝 main English ([3dfcaaf](https://github.com/jsxiaosi/react-xs-admin/commit/3dfcaaf))

README.CN.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ npm run build
104104
## Git 贡献提交规范
105105

106106
- 参考 [vue](https://github.com/vuejs/vue/blob/dev/.github/COMMIT_CONVENTION.md) 规范
107-
108107
- `feat` 新增功能
109108
- `fix` 修复缺陷
110109
- `docs` 文档变更

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ npm run build
102102
## Git Contribution submission specification
103103

104104
- Refer to [Vue](https://github.com/vuejs/vue/blob/dev/.github/COMMIT_CONVENTION.md) specification
105-
106105
- `feat` New Features
107106
- `fix` Repair defects
108107
- `docs` Document change

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"name": "react-xs-admin",
33
"type": "module",
4-
"version": "0.0.1",
4+
"version": "0.0.2",
55
"private": true,
66
"packageManager": "pnpm@9.0.0",
77
"license": "MIT",
88
"engines": {
9-
"node": ">=18",
9+
"node": ">=20",
1010
"pnpm": ">=9"
1111
},
1212
"scripts": {
@@ -55,23 +55,23 @@
5555
"@emotion/babel-plugin": "^11.13.5",
5656
"@emotion/eslint-plugin": "^11.12.0",
5757
"@eslint-react/eslint-plugin": "^1.52.3",
58-
"@jsxiaosi/commitlint-config": "^1.0.11",
59-
"@jsxiaosi/eslint-config": "^1.0.11",
60-
"@jsxiaosi/eslint-config-prettier": "^1.0.11",
58+
"@jsxiaosi/commitlint-config": "^1.0.12",
59+
"@jsxiaosi/eslint-config": "^1.0.12",
60+
"@jsxiaosi/eslint-config-prettier": "^1.0.12",
6161
"@tailwindcss/postcss": "^4.1.11",
6262
"@types/crypto-js": "^4.2.2",
6363
"@types/lodash-es": "^4.17.12",
6464
"@types/react": "^19.1.8",
6565
"@types/react-dom": "^19.1.6",
66-
"@vitejs/plugin-react": "^4.6.0",
67-
"@vitejs/plugin-react-swc": "^3.10.2",
66+
"@vitejs/plugin-react": "^4.7.0",
67+
"@vitejs/plugin-react-swc": "^3.11.0",
6868
"autoprefixer": "^10.4.21",
6969
"commitlint": "^19.8.1",
7070
"conventional-changelog-cli": "^5.0.0",
7171
"crypto-js": "^4.2.0",
7272
"czg": "^1.12.0",
7373
"eslint": "^9.31.0",
74-
"eslint-plugin-prettier": "^5.5.1",
74+
"eslint-plugin-prettier": "^5.5.3",
7575
"eslint-plugin-react": "^7.37.5",
7676
"eslint-plugin-react-hooks": "^5.2.0",
7777
"eslint-plugin-react-refresh": "^0.4.20",

0 commit comments

Comments
 (0)