Merge branch 'dev'

lyswhut · Apr 17, 2022 · c979339 · c979339
2 parents 1b4c910 + 9393906
commit c979339
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 15 deletions.
diff --git a/.github/workflows/beta-pack.yml b/.github/workflows/beta-pack.yml
@@ -31,7 +31,9 @@ jobs:
             ${{ runner.os }}-build-
 
       - name: Install Dependencies
-        run: npm install
+        run: |
+          npm install [email protected] -g
+          npm install
 
       - name: Build src code
         run: npm run build:src
@@ -122,7 +124,9 @@ jobs:
             ${{ runner.os }}-build-
 
       - name: Install Dependencies
-        run: npm install
+        run: |
+          npm install [email protected] -g
+          npm install
 
       - name: Build src code
         run: npm run build:src
@@ -181,7 +185,9 @@ jobs:
             ${{ runner.os }}-build-
 
       - name: Install Dependencies
-        run: npm install
+        run: |
+          npm install [email protected] -g
+          npm install
 
       - name: Build src code
         run: npm run build:src

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -31,7 +31,9 @@ jobs:
             ${{ runner.os }}-build-
 
       - name: Install Dependencies
-        run: npm install
+        run: |
+          npm install [email protected] -g
+          npm install
 
       - name: Build src code
         run: npm run build:src
@@ -79,7 +81,9 @@ jobs:
             ${{ runner.os }}-build-
 
       - name: Install Dependencies
-        run: npm install
+        run: |
+          npm install [email protected] -g
+          npm install
 
       - name: Build src code
         run: npm run build:src
@@ -127,7 +131,9 @@ jobs:
             ${{ runner.os }}-build-
 
       - name: Install Dependencies
-        run: npm install
+        run: |
+          npm install [email protected] -g
+          npm install
 
       - name: Build src code
         run: npm run build:src

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -238,15 +238,15 @@
     "webpack": "^5.72.0",
     "webpack-cli": "^4.9.2",
     "webpack-dev-server": "^4.8.1",
-    "webpack-hot-middleware": "git+https://github.com/lyswhut/webpack-hot-middleware#329c4375134b89d39da23a56a94db651247c74a1",
+    "webpack-hot-middleware": "git+https://github.com/lyswhut/webpack-hot-middleware.git#329c4375134b89d39da23a56a94db651247c74a1",
     "webpack-merge": "^5.8.0"
   },
   "dependencies": {
     "bufferutil": "^4.0.6",
     "crypto-js": "^4.1.1",
     "electron-log": "^4.4.6",
     "electron-store": "^8.0.1",
-    "font-list": "git+https://github.com/lyswhut/node-font-list#4edbb1933b49a9bac1eedd63a31da16b487fe57d",
+    "font-list": "git+https://github.com/lyswhut/node-font-list.git#4edbb1933b49a9bac1eedd63a31da16b487fe57d",
     "http-terminator": "^3.2.0",
     "iconv-lite": "^0.6.3",
     "image-size": "^1.0.1",