Skip to content

Commit 23ef6e8

Browse files
committed
Merge branch 'dev'
2 parents 2df8c2f + c385a79 commit 23ef6e8

78 files changed

Lines changed: 4258 additions & 4009 deletions

File tree

Some content is hidden

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

.eslintrc-auto-import.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,11 @@
105105
"refAutoReset": true,
106106
"refDebounced": true,
107107
"refDefault": true,
108+
"refManualReset": true,
108109
"refThrottled": true,
109110
"refWithControl": true,
110111
"resolveComponent": true,
111112
"resolveRef": true,
112-
"resolveUnref": true,
113113
"setActivePinia": true,
114114
"setMapStoreSuffix": true,
115115
"shallowReactive": true,
@@ -167,6 +167,7 @@
167167
"useCountdown": true,
168168
"useCounter": true,
169169
"useCssModule": true,
170+
"useCssSupports": true,
170171
"useCssVar": true,
171172
"useCssVars": true,
172173
"useCurrentElement": true,

.eslintrc-define-import.json

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

.github/workflows/dev.yml

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
name: Dev
2+
3+
on:
4+
workflow_dispatch:
5+
6+
jobs:
7+
build:
8+
name: Build ${{ matrix.os }}
9+
runs-on: ${{ matrix.os }}
10+
11+
strategy:
12+
matrix:
13+
os: [ubuntu-latest, windows-latest]
14+
15+
steps:
16+
- name: Checkout Repo
17+
uses: actions/checkout@v6
18+
19+
- name: Set Up Node.js
20+
uses: actions/setup-node@v6
21+
with:
22+
node-version: 'latest'
23+
24+
- name: Enable Corepack
25+
run: corepack enable
26+
27+
- name: Cache Linux pnpm
28+
if: matrix.os == 'ubuntu-latest'
29+
uses: actions/cache@v5
30+
with:
31+
path: ~/.local/share/pnpm/store
32+
key: pnpm-${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
33+
restore-keys: |
34+
pnpm-${{ runner.os }}-
35+
36+
- name: Cache Windows pnpm
37+
if: matrix.os == 'windows-latest'
38+
uses: actions/cache@v5
39+
with:
40+
path: D:\.pnpm-store
41+
key: pnpm-${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
42+
restore-keys: |
43+
pnpm-${{ runner.os }}-
44+
45+
- name: Install Dependencies
46+
run: pnpm install
47+
48+
- name: Build Electron App
49+
run: pnpm run build:latest
50+
51+
- name: Upload Linux Artifacts
52+
if: matrix.os == 'ubuntu-latest'
53+
uses: actions/upload-artifact@v7
54+
with:
55+
name: linux-release-assets-${{ github.sha }}
56+
path: release/*/jm-desktop-Linux-*.zip
57+
58+
- name: Upload Windows Artifacts
59+
if: matrix.os == 'windows-latest'
60+
uses: actions/upload-artifact@v7
61+
with:
62+
name: windows-release-assets-${{ github.sha }}
63+
path: release/*/jm-desktop-Windows-*.zip

.github/workflows/latest.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,28 +16,28 @@ jobs:
1616

1717
steps:
1818
- name: Checkout Repo
19-
uses: actions/checkout@v4
19+
uses: actions/checkout@v6
2020

2121
- name: Set Up Node.js
22-
uses: actions/setup-node@v4
22+
uses: actions/setup-node@v6
2323
with:
24-
node-version: "latest"
25-
24+
node-version: 'latest'
25+
2626
- name: Enable Corepack
2727
run: corepack enable
28-
28+
2929
- name: Cache Linux pnpm
3030
if: matrix.os == 'ubuntu-latest'
31-
uses: actions/cache@v4
31+
uses: actions/cache@v5
3232
with:
3333
path: ~/.local/share/pnpm/store
3434
key: pnpm-${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
3535
restore-keys: |
3636
pnpm-${{ runner.os }}-
37-
37+
3838
- name: Cache Windows pnpm
3939
if: matrix.os == 'windows-latest'
40-
uses: actions/cache@v4
40+
uses: actions/cache@v5
4141
with:
4242
path: D:\.pnpm-store
4343
key: pnpm-${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
@@ -49,17 +49,17 @@ jobs:
4949

5050
- name: Build Electron App
5151
run: pnpm run build:latest
52-
52+
5353
- name: Upload Linux Artifacts
5454
if: matrix.os == 'ubuntu-latest'
55-
uses: actions/upload-artifact@v4
55+
uses: actions/upload-artifact@v7
5656
with:
5757
name: linux-release-assets-${{ github.sha }}
5858
path: release/*/jm-desktop-Linux-*.zip
59-
59+
6060
- name: Upload Windows Artifacts
6161
if: matrix.os == 'windows-latest'
62-
uses: actions/upload-artifact@v4
62+
uses: actions/upload-artifact@v7
6363
with:
6464
name: windows-release-assets-${{ github.sha }}
65-
path: release/*/jm-desktop-Windows-*.zip
65+
path: release/*/jm-desktop-Windows-*.zip

.github/workflows/release.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
workflow_dispatch:
55
push:
66
tags:
7-
- 'v*.*.*' # 只在版本标签推送时触发
7+
- 'v*.*.*' # 只在版本标签推送时触发
88

99
jobs:
1010
build:
@@ -17,28 +17,28 @@ jobs:
1717

1818
steps:
1919
- name: Checkout Repo
20-
uses: actions/checkout@v4
20+
uses: actions/checkout@v6
2121

2222
- name: Set Up Node.js
23-
uses: actions/setup-node@v4
23+
uses: actions/setup-node@v6
2424
with:
25-
node-version: "latest"
26-
25+
node-version: 'latest'
26+
2727
- name: Enable Corepack
2828
run: corepack enable
2929

3030
- name: Cache Linux pnpm
3131
if: matrix.os == 'ubuntu-latest'
32-
uses: actions/cache@v4
32+
uses: actions/cache@v5
3333
with:
3434
path: ~/.local/share/pnpm/store
3535
key: pnpm-${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
3636
restore-keys: |
3737
pnpm-${{ runner.os }}-
38-
38+
3939
- name: Cache Windows pnpm
4040
if: matrix.os == 'windows-latest'
41-
uses: actions/cache@v4
41+
uses: actions/cache@v5
4242
with:
4343
path: D:\.pnpm-store
4444
key: pnpm-${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}

.oxfmtrc.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"$schema": "./node_modules/oxfmt/configuration_schema.json",
3+
"ignorePatterns": [],
4+
"semi": false,
5+
"singleQuote": true
6+
}

0 commit comments

Comments
 (0)