Skip to content

Commit 98a3095

Browse files
committed
[optimize] merge GitHub actions for deploying different branches
[migrate] upgrade to Cell Router 4, Node.js 22, PNPM 10, PostCSS modules 6 [migrate] replace Fake Public CDN with a Real one
1 parent 513ce1d commit 98a3095

File tree

6 files changed

+2511
-2560
lines changed

6 files changed

+2511
-2560
lines changed

.github/workflows/main.yml

Lines changed: 5 additions & 4 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:
@@ -15,10 +15,10 @@ jobs:
1515

1616
- uses: pnpm/action-setup@v4
1717
with:
18-
version: 9
18+
version: 10
1919
- uses: actions/setup-node@v4
2020
with:
21-
node-version: 20
21+
node-version: 22
2222
cache: pnpm
2323
- name: Install & Build
2424
run: |
@@ -27,6 +27,7 @@ jobs:
2727
2828
- name: Deploy to GitHub pages
2929
uses: peaceiris/actions-gh-pages@v4
30+
if: ${{ github.ref == 'refs/heads/master' }}
3031
with:
3132
publish_dir: ./dist
3233
personal_token: ${{ secrets.GITHUB_TOKEN }}
@@ -41,4 +42,4 @@ jobs:
4142
vercel-org-id: ${{ secrets.VERCEL_ORG_ID }}
4243
vercel-project-id: ${{ secrets.VERCEL_PROJECT_ID }}
4344
working-directory: ./dist
44-
vercel-args: --prod
45+
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: 29 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -17,32 +17,40 @@
1717
"test": "lint-staged && tsc --noEmit"
1818
},
1919
"dependencies": {
20-
"boot-cell": "^2.0.0-beta.29",
20+
"boot-cell": "^2.0.0-rc.19",
2121
"browser-unhandled-rejection": "^1.0.2",
22-
"cell-router": "^3.0.0-rc.8",
22+
"cell-router": "^4.0.4",
2323
"classnames": "^2.5.1",
24-
"dom-renderer": "^2.4.4",
24+
"dom-renderer": "^2.6.2",
2525
"iterable-observer": "^1.1.0",
26-
"koajax": "^3.0.3",
27-
"mobx": "^6.13.5",
28-
"mobx-restful": "^2.0.0",
29-
"web-cell": "^3.0.1",
30-
"web-utility": "^4.4.2"
26+
"koajax": "^3.1.2",
27+
"mobx": "^6.15.0",
28+
"mobx-restful": "^2.1.4",
29+
"web-cell": "^3.2.2",
30+
"web-utility": "^4.6.3"
3131
},
3232
"devDependencies": {
33-
"@parcel/config-default": "~2.12.0",
34-
"@parcel/packager-raw-url": "~2.12.0",
35-
"@parcel/transformer-less": "2.12.0",
36-
"@parcel/transformer-typescript-tsc": "~2.12.0",
37-
"@parcel/transformer-webmanifest": "~2.12.0",
38-
"@types/node": "^20.17.6",
39-
"husky": "^9.1.6",
40-
"lint-staged": "^15.2.10",
41-
"parcel": "~2.12.0",
42-
"postcss": "^8.4.48",
43-
"postcss-modules": "^4.3.1",
44-
"prettier": "^3.3.3",
45-
"typescript": "~5.6.3",
33+
"@parcel/config-default": "~2.16.0",
34+
"@parcel/packager-raw-url": "~2.16.0",
35+
"@parcel/transformer-less": "2.16.0",
36+
"@parcel/transformer-typescript-tsc": "~2.16.0",
37+
"@parcel/transformer-webmanifest": "~2.16.0",
38+
"@types/node": "^22.18.12",
39+
"husky": "^9.1.7",
40+
"lint-staged": "^16.2.6",
41+
"parcel": "~2.16.0",
42+
"postcss": "^8.5.6",
43+
"postcss-modules": "^6.0.1",
44+
"prettier": "^3.6.2",
45+
"typescript": "~5.9.3",
4646
"workbox-cli": "^7.3.0"
47+
},
48+
"pnpm": {
49+
"onlyBuiltDependencies": [
50+
"@parcel/watcher",
51+
"@swc/core",
52+
"lmdb",
53+
"msgpackr-extract"
54+
]
4755
}
4856
}

0 commit comments

Comments
 (0)