Skip to content

Commit 0f8764c

Browse files
sylingdsylingd
committed
Merge branch 'dev'
2 parents 72a9dbd + 2c30075 commit 0f8764c

98 files changed

Lines changed: 293 additions & 647 deletions

Some content is hidden

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

‎.github/workflows/dev.yml‎

Lines changed: 31 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ jobs:
2929
docs_changed: ${{ steps.filter.outputs.docs }}
3030
src_changed: ${{ steps.filter.outputs.src }}
3131
steps:
32-
- uses: actions/checkout@v4
32+
- uses: actions/checkout@v6
3333
with:
3434
fetch-depth: 2
35-
- uses: dorny/paths-filter@v3
35+
- uses: dorny/paths-filter@v4
3636
id: filter
3737
with:
3838
base: ${{ github.ref_name }}
@@ -54,18 +54,18 @@ jobs:
5454
runs-on: ubuntu-24.04
5555
if: ${{ needs.check_changes.outputs.src_changed == 'true' || github.event_name == 'workflow_dispatch' }}
5656
steps:
57-
- uses: actions/checkout@v4
57+
- uses: actions/checkout@v6
5858
- name: Inject Env
5959
run: |
6060
echo "INPUT_PLATFORM=${{ github.event.inputs.platform }}" >> $GITHUB_ENV
6161
echo "INPUT_VERSION=${{ github.event.inputs.version }}" >> $GITHUB_ENV
62-
- uses: pnpm/action-setup@v4
62+
- uses: pnpm/action-setup@v6
6363
with:
64-
version: 10
64+
version: 11
6565
- name: Setup Node.js
66-
uses: actions/setup-node@v4
66+
uses: actions/setup-node@v6
6767
with:
68-
node-version: 20
68+
node-version: 24
6969
cache: 'pnpm'
7070
- name: Install dependencies
7171
run: pnpm i --frozen-lockfile
@@ -76,30 +76,29 @@ jobs:
7676
run: node ./scripts/get-snapshot-version.mjs
7777
- name: Build
7878
uses: ./.github/actions/build
79-
# - name: Publish snapshot
80-
# env:
81-
# AMO_KEY: ${{ secrets.ORG_AMO_KEY }}
82-
# AMO_SECRET: ${{ secrets.ORG_AMO_SECRET }}
83-
# PACK_PLATFORM: xpi
84-
# DEBUG: '*'
85-
# run: npm run pack
86-
# - name: Upload snapshot release
87-
# uses: actions/upload-artifact@v4
88-
# with:
89-
# name: release
90-
# retention-days: 7
91-
# path: temp/release
79+
- name: Publish snapshot
80+
env:
81+
AMO_KEY: ${{ secrets.ORG_AMO_KEY }}
82+
AMO_SECRET: ${{ secrets.ORG_AMO_SECRET }}
83+
PACK_PLATFORM: xpi
84+
run: npm run pack
85+
- name: Upload snapshot release
86+
uses: actions/upload-artifact@v4
87+
with:
88+
name: release
89+
retention-days: 7
90+
path: temp/release
9291

9392
sync-locale:
9493
needs: check_changes
9594
runs-on: ubuntu-24.04
9695
if: ${{ needs.check_changes.outputs.locale_changed == 'true' }}
9796
steps:
98-
- uses: actions/checkout@v4
97+
- uses: actions/checkout@v6
9998
- name: Setup Node.js
100-
uses: actions/setup-node@v4
99+
uses: actions/setup-node@v6
101100
with:
102-
node-version: 20
101+
node-version: 24
103102
- name: Sort
104103
run: node ./locale/sort-origin.js
105104
- name: Deploy
@@ -115,14 +114,14 @@ jobs:
115114
runs-on: ubuntu-24.04
116115
if: ${{ needs.check_changes.outputs.docs_changed == 'true' }}
117116
steps:
118-
- uses: actions/checkout@v4
119-
- uses: pnpm/action-setup@v4
117+
- uses: actions/checkout@v6
118+
- uses: pnpm/action-setup@v6
120119
with:
121-
version: 10
120+
version: 11
122121
- name: Setup Node.js
123-
uses: actions/setup-node@v4
122+
uses: actions/setup-node@v6
124123
with:
125-
node-version: 20
124+
node-version: 24
126125
- name: Install base dependencies
127126
run: pnpm i --frozen-lockfile
128127
- name: Install dependencies
@@ -145,9 +144,9 @@ jobs:
145144
runs-on: ubuntu-24.04
146145
steps:
147146
- name: Setup Node.js
148-
uses: actions/setup-node@v4
147+
uses: actions/setup-node@v6
149148
with:
150-
node-version: 20
149+
node-version: 24
151150
- name: Download
152151
uses: actions/download-artifact@v5
153152
with:
@@ -164,9 +163,9 @@ jobs:
164163
runs-on: ubuntu-24.04
165164
steps:
166165
- name: Setup Node.js
167-
uses: actions/setup-node@v4
166+
uses: actions/setup-node@v6
168167
with:
169-
node-version: 20
168+
node-version: 24
170169
- name: Download
171170
uses: actions/download-artifact@v5
172171
with:

‎.github/workflows/main.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ jobs:
1515
outputs:
1616
docs_changed: ${{ steps.filter.outputs.docs }}
1717
steps:
18-
- uses: actions/checkout@v4
18+
- uses: actions/checkout@v6
1919
with:
2020
fetch-depth: 2
21-
- uses: dorny/paths-filter@v3
21+
- uses: dorny/paths-filter@v4
2222
id: filter
2323
with:
2424
base: ${{ github.ref_name }}
@@ -31,14 +31,14 @@ jobs:
3131
runs-on: ubuntu-24.04
3232
if: ${{ needs.check_changes.outputs.docs_changed == 'true' }}
3333
steps:
34-
- uses: actions/checkout@v4
35-
- uses: pnpm/action-setup@v4
34+
- uses: actions/checkout@v6
35+
- uses: pnpm/action-setup@v6
3636
with:
37-
version: 10
37+
version: 11
3838
- name: Setup Node.js
39-
uses: actions/setup-node@v4
39+
uses: actions/setup-node@v6
4040
with:
41-
node-version: 20
41+
node-version: 24
4242
- name: Install base dependencies
4343
run: pnpm i --frozen-lockfile
4444
- name: Install dependencies
@@ -61,9 +61,9 @@ jobs:
6161
runs-on: ubuntu-24.04
6262
steps:
6363
- name: Setup Node.js
64-
uses: actions/setup-node@v4
64+
uses: actions/setup-node@v6
6565
with:
66-
node-version: 20
66+
node-version: 24
6767
- name: Download
6868
uses: actions/download-artifact@v5
6969
with:
@@ -80,9 +80,9 @@ jobs:
8080
runs-on: ubuntu-24.04
8181
steps:
8282
- name: Setup Node.js
83-
uses: actions/setup-node@v4
83+
uses: actions/setup-node@v6
8484
with:
85-
node-version: 20
85+
node-version: 24
8686
- name: Download
8787
uses: actions/download-artifact@v5
8888
with:

‎.github/workflows/release.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,18 @@ jobs:
2828
build:
2929
runs-on: ubuntu-24.04
3030
steps:
31-
- uses: actions/checkout@v4
31+
- uses: actions/checkout@v6
3232
- name: Inject Env
3333
run: |
3434
echo "INPUT_PLATFORM=${{ github.event.inputs.platform }}" >> $GITHUB_ENV
3535
echo "INPUT_VERSION=${{ github.event.inputs.version }}" >> $GITHUB_ENV
36-
- uses: pnpm/action-setup@v4
36+
- uses: pnpm/action-setup@v6
3737
with:
38-
version: 10
38+
version: 11
3939
- name: Setup Node.js
40-
uses: actions/setup-node@v4
40+
uses: actions/setup-node@v6
4141
with:
42-
node-version: 20
42+
node-version: 24
4343
cache: 'pnpm'
4444
- name: Install dependencies
4545
run: pnpm i --frozen-lockfile

‎.npmrc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
registry=https://registry.npmjs.org/
2-
auto-install-peers=false

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Nebula Shift Tab 自身不收集任何数据。但是，在使用第三方服务
4545

4646
## How to build
4747

48-
* Install Node.js 20.x and pnpm 10.x.
48+
* Install Node.js 24.x and pnpm 11.x.
4949
* Clone this project, or download the source code and extract it.
5050
* Run `pnpm i --frozen-lockfile`.
5151
* Run build command
@@ -60,7 +60,7 @@ Nebula Shift Tab 自身不收集任何数据。但是，在使用第三方服务
6060
* default: 从 App Store、Play 等应用商店获取各应用的原始图标，然后使用 cwebp 转换
6161
* mbe-style: 来源于[meolunr/MBEStyle](https://github.com/meolunr/MBEStyle)，原始协议为 [GPL-3.0](https://github.com/meolunr/MBEStyle/blob/master/LICENSE)
6262
* delta-icons: 来源于[Delta-Icons/android](https://github.com/Delta-Icons/android)，原始协议为 [CC BY-NC-ND License 4.0](https://creativecommons.org/licenses/by-nc-nd/4.0/)
63-
* liquid-glass: 来源于网络收集
63+
* pure / liquid-glass: 来源于网络收集
6464

6565
上述图标作者未参与本项目开发，不以任何形式为本项目背书。本项目亦无权转授权。如您认为项目所使用的图标侵犯了您的权利，请提交 issue，我们将从项目中移除相关图标。
6666

@@ -69,7 +69,7 @@ All icon packs are sourced from third parties, including:
6969
* default: get the original icons of each app from app stores such as the App Store and Play Store, then convert them using cwebp
7070
* mbe-style: from [meolunr/MBEStyle](https://github.com/meolunr/MBEStyle), originally licensed under [GPL-3.0](https://github.com/meolunr/MBEStyle/blob/master/LICENSE)
7171
* delta-icons: from [Delta-Icons/android](https://github.com/Delta-Icons/android), originally licensed under [CC BY-NC-ND License 4.0](https://creativecommons.org/licenses/by-nc-nd/4.0/)
72-
* liquid-glass: collected from the internet
72+
* pure / liquid-glass: collected from the internet
7373

7474
The authors of the above icons were not involved in the development of this project and do not endorse it in any way. This project is not authorized for sublicensing. If you believe that the icons used in this project infringe upon your rights, please submit an issue, and we will remove the relevant icons from the project.
7575

‎package.json‎

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,13 @@
5555
"@types/node": "^18.15.5",
5656
"@types/react": "^18.3.1",
5757
"@types/react-dom": "^18.3.1",
58-
"amo-upload": "^1.0.0",
58+
"amo-upload": "^1.1.0",
5959
"axios": "^1.7.2",
6060
"cpr": "^3.0.1",
6161
"cross-env": "^7.0.3",
6262
"lint-staged": "^13.2.2",
6363
"lodash": "^4.17.21",
6464
"rimraf": "^6.0.1",
65-
"sign-addon": "^6.4.0",
6665
"simple-git-hooks": "^2.13.0",
6766
"typescript": "^5.7.3"
6867
},
@@ -75,20 +74,7 @@
7574
]
7675
},
7776
"engines": {
78-
"node": ">=20",
79-
"pnpm": ">=10"
80-
},
81-
"pnpm": {
82-
"patchedDependencies": {
83-
"lodash-es": "patches/lodash-es.patch",
84-
"lodash": "patches/lodash.patch"
85-
},
86-
"ignoredBuiltDependencies": [
87-
"core-js"
88-
],
89-
"onlyBuiltDependencies": [
90-
"simple-git-hooks",
91-
"spawn-sync"
92-
]
77+
"node": ">=24",
78+
"pnpm": ">=11"
9379
}
9480
}

0 commit comments

Comments
 (0)