Skip to content

Commit c979339

Browse files
committed
Merge branch 'dev'
2 parents 1b4c910 + 9393906 commit c979339

4 files changed

Lines changed: 27 additions & 15 deletions

File tree

.github/workflows/beta-pack.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ jobs:
3131
${{ runner.os }}-build-
3232
3333
- name: Install Dependencies
34-
run: npm install
34+
run: |
35+
npm install npm@8.5 -g
36+
npm install
3537
3638
- name: Build src code
3739
run: npm run build:src
@@ -122,7 +124,9 @@ jobs:
122124
${{ runner.os }}-build-
123125
124126
- name: Install Dependencies
125-
run: npm install
127+
run: |
128+
npm install npm@8.5 -g
129+
npm install
126130
127131
- name: Build src code
128132
run: npm run build:src
@@ -181,7 +185,9 @@ jobs:
181185
${{ runner.os }}-build-
182186
183187
- name: Install Dependencies
184-
run: npm install
188+
run: |
189+
npm install npm@8.5 -g
190+
npm install
185191
186192
- name: Build src code
187193
run: npm run build:src

.github/workflows/release.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ jobs:
3131
${{ runner.os }}-build-
3232
3333
- name: Install Dependencies
34-
run: npm install
34+
run: |
35+
npm install npm@8.5 -g
36+
npm install
3537
3638
- name: Build src code
3739
run: npm run build:src
@@ -79,7 +81,9 @@ jobs:
7981
${{ runner.os }}-build-
8082
8183
- name: Install Dependencies
82-
run: npm install
84+
run: |
85+
npm install npm@8.5 -g
86+
npm install
8387
8488
- name: Build src code
8589
run: npm run build:src
@@ -127,7 +131,9 @@ jobs:
127131
${{ runner.os }}-build-
128132
129133
- name: Install Dependencies
130-
run: npm install
134+
run: |
135+
npm install npm@8.5 -g
136+
npm install
131137
132138
- name: Build src code
133139
run: npm run build:src

package-lock.json

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,15 +238,15 @@
238238
"webpack": "^5.72.0",
239239
"webpack-cli": "^4.9.2",
240240
"webpack-dev-server": "^4.8.1",
241-
"webpack-hot-middleware": "git+https://github.com/lyswhut/webpack-hot-middleware#329c4375134b89d39da23a56a94db651247c74a1",
241+
"webpack-hot-middleware": "git+https://github.com/lyswhut/webpack-hot-middleware.git#329c4375134b89d39da23a56a94db651247c74a1",
242242
"webpack-merge": "^5.8.0"
243243
},
244244
"dependencies": {
245245
"bufferutil": "^4.0.6",
246246
"crypto-js": "^4.1.1",
247247
"electron-log": "^4.4.6",
248248
"electron-store": "^8.0.1",
249-
"font-list": "git+https://github.com/lyswhut/node-font-list#4edbb1933b49a9bac1eedd63a31da16b487fe57d",
249+
"font-list": "git+https://github.com/lyswhut/node-font-list.git#4edbb1933b49a9bac1eedd63a31da16b487fe57d",
250250
"http-terminator": "^3.2.0",
251251
"iconv-lite": "^0.6.3",
252252
"image-size": "^1.0.1",

0 commit comments

Comments
 (0)