Skip to content

Commit 461a224

Browse files
committed
[migrate] upgrade to React 19, React Router 7, Ant Design 6, KoAJAX 3, MobX-React-helper 0.5, MobX-RESTful 2, MobX-GitHub 0.6, MobX-i18n 0.7, Node.js 22, PNPM 10, Lint-Staged 16 & other latest Upstream packages/actions
[refactor] merge GitHub actions for all branches
1 parent 63ad8bc commit 461a224

File tree

9 files changed

+4062
-4379
lines changed

9 files changed

+4062
-4379
lines changed

.github/workflows/main.yml

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,34 @@ name: CI & CD
22
on:
33
push:
44
branches:
5-
- master
5+
- '**'
66
jobs:
77
Build-and-Deploy:
88
runs-on: ubuntu-latest
9+
permissions:
10+
contents: write
911
env:
1012
VERCEL_TOKEN: ${{ secrets.VERCEL_TOKEN }}
1113
VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
1214
VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }}
1315
steps:
14-
- uses: actions/checkout@v3
16+
- uses: actions/checkout@v4
1517

16-
- uses: pnpm/action-setup@v2
18+
- uses: pnpm/action-setup@v4
1719
with:
18-
version: 9
19-
- uses: actions/setup-node@v3
20-
if: ${{ !env.VERCEL_TOKEN || !env.VERCEL_ORG_ID || !env.VERCEL_PROJECT_ID }}
20+
version: 10
21+
- uses: actions/setup-node@v4
2122
with:
22-
node-version: 18
23+
node-version: 22
2324
cache: pnpm
24-
- name: Install Dependencies
25-
if: ${{ !env.VERCEL_TOKEN || !env.VERCEL_ORG_ID || !env.VERCEL_PROJECT_ID }}
26-
run: pnpm i --frozen-lockfile
25+
- name: Install & Build
26+
run: |
27+
pnpm i --frozen-lockfile
28+
pnpm build
2729
28-
- name: Build Production
29-
if: ${{ !env.VERCEL_TOKEN || !env.VERCEL_ORG_ID || !env.VERCEL_PROJECT_ID }}
30-
run: pnpm build
31-
32-
- name: Deploy Production
33-
uses: peaceiris/actions-gh-pages@v3
34-
if: ${{ !env.VERCEL_TOKEN || !env.VERCEL_ORG_ID || !env.VERCEL_PROJECT_ID }}
30+
- name: Deploy to GitHub pages
31+
uses: peaceiris/actions-gh-pages@v4
32+
if: github.ref == 'refs/heads/master'
3533
with:
3634
publish_dir: ./dist
3735
personal_token: ${{ secrets.GITHUB_TOKEN }}
@@ -45,5 +43,5 @@ jobs:
4543
github-token: ${{ secrets.GITHUB_TOKEN }}
4644
vercel-org-id: ${{ secrets.VERCEL_ORG_ID }}
4745
vercel-project-id: ${{ secrets.VERCEL_PROJECT_ID }}
48-
working-directory: ./
49-
vercel-args: --prod
46+
working-directory: ./dist
47+
vercel-args: ${{ github.ref == 'refs/heads/master' && '--prod' || '' }}

.github/workflows/pull-request.yml

Lines changed: 0 additions & 27 deletions
This file was deleted.

README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ which is inspired by [WebCell scaffold][5].
1111
## Technology stack
1212

1313
- Language: [TypeScript v5][2]
14-
- Component engine: [React v18][1]
14+
- Component engine: [React v19][1]
1515
- State management: [MobX v6][3]
16-
- Component suite: [Ant Design v5][4] + [Bootstrap v5][9] (CSS utilities)
17-
- HTTP Client: [KoAJAX v1][10]
16+
- Component suite: [Ant Design v6][4] + [Bootstrap v5][9] (CSS utilities)
17+
- HTTP Client: [KoAJAX v3][10]
1818
- PWA framework: [Workbox v7][11]
1919
- Package bundler: [Parcel v2][12]
2020
- CI / CD: GitHub [Actions][13] + [Pages][14]
@@ -31,7 +31,6 @@ which is inspired by [WebCell scaffold][5].
3131
## Best practice
3232

3333
1. Install GitHub apps in your organization or account:
34-
3534
1. [Probot settings][15]: set up Issue labels & Pull Request rules
3635
2. [PR badge][16]: set up Online [VS Code][17] editor entries in Pull Request description
3736

package.json

Lines changed: 42 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -11,42 +11,53 @@
1111
"url": "https://github.com/idea2app/React-MobX-Ant-Design-ts/issues"
1212
},
1313
"dependencies": {
14-
"@ant-design/cssinjs": "^1.21.0",
15-
"@ant-design/icons": "^5.3.7",
16-
"antd": "^5.18.3",
14+
"@ant-design/cssinjs": "^2.0.1",
15+
"@ant-design/icons": "^6.1.0",
16+
"antd": "^6.0.1",
1717
"browser-unhandled-rejection": "^1.0.2",
18-
"koajax": "^1.1.2",
18+
"koajax": "^3.1.2",
1919
"lodash": "^4.17.21",
20-
"mobx": "^6.12.4",
21-
"mobx-github": "^0.3.2",
22-
"mobx-i18n": "^0.5.0",
23-
"mobx-react": "^9.1.1",
24-
"mobx-react-helper": "^0.3.1",
25-
"mobx-restful": "^1.0.0",
26-
"mobx-restful-table": "^2.0.0-rc.1",
27-
"react": "^18.3.1",
28-
"react-dom": "^18.3.1",
29-
"react-router": "^6.24.0",
30-
"react-router-class-tools": "^0.1.3",
31-
"react-router-dom": "^6.24.0",
32-
"web-utility": "^4.4.0"
20+
"mobx": "^6.15.0",
21+
"mobx-github": "^0.6.2",
22+
"mobx-i18n": "^0.7.2",
23+
"mobx-react": "^9.2.1",
24+
"mobx-react-helper": "^0.5.1",
25+
"mobx-restful": "^2.1.4",
26+
"mobx-restful-table": "^2.6.2",
27+
"react": "^19.2.0",
28+
"react-dom": "^19.2.0",
29+
"react-router": "^7.10.0",
30+
"react-router-class-tools": "^0.2.1",
31+
"react-router-dom": "^7.10.0",
32+
"web-utility": "^4.6.4"
3333
},
3434
"devDependencies": {
35-
"@parcel/config-default": "~2.12.0",
36-
"@parcel/packager-raw-url": "~2.12.0",
37-
"@parcel/transformer-typescript-tsc": "~2.12.0",
38-
"@parcel/transformer-webmanifest": "~2.12.0",
39-
"@types/lodash": "^4.17.5",
40-
"@types/node": "^18.19.39",
41-
"@types/react": "^18.3.3",
42-
"@types/react-dom": "^18.3.0",
43-
"husky": "^9.0.11",
44-
"lint-staged": "^15.2.7",
45-
"parcel": "~2.12.0",
46-
"prettier": "^3.3.2",
35+
"@parcel/config-default": "~2.16.1",
36+
"@parcel/packager-raw-url": "~2.16.1",
37+
"@parcel/transformer-typescript-tsc": "~2.16.1",
38+
"@parcel/transformer-webmanifest": "~2.16.1",
39+
"@types/lodash": "^4.17.21",
40+
"@types/node": "^22.19.1",
41+
"@types/react": "^19.2.7",
42+
"@types/react-dom": "^19.2.3",
43+
"husky": "^9.1.7",
44+
"lint-staged": "^16.2.7",
45+
"parcel": "~2.16.1",
46+
"prettier": "^3.7.3",
4747
"process": "^0.11.10",
48-
"typescript": "~5.5.2",
49-
"workbox-cli": "^7.1.0"
48+
"typescript": "~5.9.3",
49+
"workbox-cli": "^7.4.0"
50+
},
51+
"pnpm": {
52+
"onlyBuiltDependencies": [
53+
"@parcel/watcher",
54+
"@swc/core",
55+
"lmdb",
56+
"msgpackr-extract"
57+
]
58+
},
59+
"@parcel/resolver-default": {
60+
"packageExports": true
5061
},
5162
"prettier": {
5263
"singleQuote": true,

0 commit comments

Comments
 (0)