Skip to content

Commit ebac0d7

Browse files
committed
[optimize] merge Vercel actions of master & other branches
[optimize] upgrade to Node.js 22 & other latest Upstream packages/actions
1 parent 53ae5cb commit ebac0d7

File tree

4 files changed

+1657
-1586
lines changed

4 files changed

+1657
-1586
lines changed

.github/workflows/main.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: CI & CD
22
on:
33
push:
44
branches:
5-
- master
5+
- '*'
66
jobs:
77
Build-and-Deploy:
88
env:
@@ -11,22 +11,22 @@ jobs:
1111
VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }}
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515

16-
- uses: pnpm/action-setup@v2
16+
- uses: pnpm/action-setup@v4
1717
with:
1818
version: 9
19-
- uses: actions/setup-node@v3
19+
- uses: actions/setup-node@v4
2020
with:
21-
node-version: 18
21+
node-version: 22
2222
cache: pnpm
2323
- name: Install & Build
2424
run: |
2525
pnpm i --frozen-lockfile
2626
pnpm build
2727
2828
- name: Deploy to GitHub pages
29-
uses: peaceiris/actions-gh-pages@v3
29+
uses: peaceiris/actions-gh-pages@v4
3030
with:
3131
publish_dir: ./dist
3232
personal_token: ${{ secrets.GITHUB_TOKEN }}
@@ -41,4 +41,4 @@ jobs:
4141
vercel-org-id: ${{ secrets.VERCEL_ORG_ID }}
4242
vercel-project-id: ${{ secrets.VERCEL_PROJECT_ID }}
4343
working-directory: ./
44-
vercel-args: --prod
44+
vercel-args: ${{ github.ref == 'refs/heads/master' && ' --prod' || '' }}

.github/workflows/push.yml

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

package.json

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -19,46 +19,46 @@
1919
"url": "https://github.com/EasyWebApp/WebCell-dashboard/issues"
2020
},
2121
"dependencies": {
22-
"boot-cell": "^2.0.0-beta.29",
22+
"boot-cell": "^2.0.0-rc.0",
2323
"browser-unhandled-rejection": "^1.0.2",
2424
"cell-router": "^3.0.1",
2525
"classnames": "^2.5.1",
26-
"dom-renderer": "^2.6.0",
26+
"dom-renderer": "^2.6.1",
2727
"echarts-jsx": "^1.2.1",
28-
"koajax": "^3.0.3",
28+
"koajax": "^3.1.1",
2929
"mobx": "^6.13.5",
3030
"mobx-downloader": "^0.3.0",
31-
"mobx-restful": "2.0.0",
31+
"mobx-restful": "^2.1.0-rc.1",
3232
"web-cell": "^3.0.3",
3333
"web-utility": "^4.4.2"
3434
},
3535
"devDependencies": {
36-
"@eslint/compat": "^1.2.3",
37-
"@eslint/js": "^9.15.0",
38-
"@octokit/openapi-types": "^22.2.0",
39-
"@parcel/config-default": "~2.13.0",
40-
"@parcel/packager-raw-url": "~2.13.0",
41-
"@parcel/transformer-less": "~2.13.0",
42-
"@parcel/transformer-typescript-tsc": "~2.13.0",
43-
"@parcel/transformer-webmanifest": "~2.13.0",
44-
"@softonus/prettier-plugin-duplicate-remover": "^1.0.1",
36+
"@eslint/compat": "^1.2.5",
37+
"@eslint/js": "^9.18.0",
38+
"@octokit/openapi-types": "^23.0.1",
39+
"@parcel/config-default": "~2.13.3",
40+
"@parcel/packager-raw-url": "~2.13.3",
41+
"@parcel/transformer-less": "~2.13.3",
42+
"@parcel/transformer-typescript-tsc": "~2.13.3",
43+
"@parcel/transformer-webmanifest": "~2.13.3",
44+
"@softonus/prettier-plugin-duplicate-remover": "^1.1.2",
4545
"@types/chart.js": "^2.9.41",
4646
"@types/eslint-config-prettier": "^6.11.3",
47-
"@types/node": "^20.17.6",
47+
"@types/node": "^22.10.7",
4848
"buffer": "^6.0.3",
49-
"eslint": "^9.15.0",
50-
"eslint-config-prettier": "^9.1.0",
51-
"eslint-plugin-react": "^7.37.2",
49+
"eslint": "^9.18.0",
50+
"eslint-config-prettier": "^10.0.1",
51+
"eslint-plugin-react": "^7.37.4",
5252
"eslint-plugin-simple-import-sort": "^12.1.1",
53-
"globals": "^15.12.0",
53+
"globals": "^15.14.0",
5454
"husky": "^9.1.7",
55-
"lint-staged": "^15.2.10",
56-
"parcel": "~2.13.0",
57-
"postcss": "^8.4.49",
58-
"prettier": "^3.3.3",
55+
"lint-staged": "^15.4.1",
56+
"parcel": "~2.13.3",
57+
"postcss": "^8.5.1",
58+
"prettier": "^3.4.2",
5959
"prettier-plugin-css-order": "^2.1.2",
60-
"typescript": "~5.6.3",
61-
"typescript-eslint": "^8.15.0",
60+
"typescript": "~5.7.3",
61+
"typescript-eslint": "^8.20.0",
6262
"workbox-cli": "^7.3.0"
6363
},
6464
"prettier": {

0 commit comments

Comments
 (0)