Merge branch 'release/2.7.0'

.github/workflows/release.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     env:
       npm_config_disturl: https://atom.io/download/electron
-      npm_config_target: 9.4.0
+      npm_config_target: 11.4.2
       npm_config_runtime: "electron"
 
     steps:
@@ -53,8 +53,19 @@ jobs:
           yarn run build
           cd ..
           yarn run build
+
+      - name: Electron-Win-Linux
+        if: matrix.platform != 'mac'
+        run: |
           yarn run electron-builder --${{ matrix.platform }} -p never | sed 's/identityName=.*$//'
 
+      - name: Electron-Mac
+        if: matrix.platform == 'mac'
+        run: |
+          yarn run electron-builder --${{ matrix.platform }} --x64 -p never | sed 's/identityName=.*$//'
+          cp ./files/*pty.node ./node_modules/node-pty/build/Release/pty.node
+          yarn run electron-builder --${{ matrix.platform }} --arm64 -p never | sed 's/identityName=.*$//'
+
       - name: GH Release
         uses: softprops/action-gh-release@v0.1.5
         env:

README.md

@@ -84,6 +84,10 @@
 <details>
 <summary>展开查看更多版本记录</summary>
 
+### [v2.7.0](https://github.com/purocean/yn/releases/tag/v2.7.0) 2021-04-08
+1. 升级 Electron 到 11.4.2
+2. 增加 Mac arm64 打包
+
 ### [v2.6.0](https://github.com/purocean/yn/releases/tag/v2.6.0) 2021-03-04
 1. 内部功能插件化，增强拓展性
 2. 微调界面样式

package.json

@@ -1,6 +1,6 @@
 {
   "name": "yank.note",
-  "version": "2.6.1",
+  "version": "2.7.0",
   "description": "Yank Note 一款面向程序员的 Markdown 笔记应用",
   "main": "dist/app.js",
   "license": "Apache-2.0",
@@ -19,14 +19,14 @@
     "electron-log": "^4.2.2",
     "electron-progressbar": "^1.2.0",
     "electron-store": "^5.2.0",
-    "electron-updater": "^4.3.1",
+    "electron-updater": "^4.3.8",
     "fs-extra": "^6.0.1",
     "koa": "^2.4.1",
     "koa-body": "^2.5.0",
     "koa-static": "^4.0.2",
     "mime": "^2.2.0",
     "natural-orderby": "^2.0.0",
-    "node-pty": "^0.9.0",
+    "node-pty": "^0.10.0",
     "opn": "^5.3.0",
     "plantuml-pipe": "^1.3.5",
     "request": "^2.88.0",
@@ -39,11 +39,11 @@
     "@types/koa": "^2.0.49",
     "@types/koa-static": "^4.0.1",
     "@types/mime": "^2.0.1",
-    "@types/node": "^12.6.1",
+    "@types/node": "^14.14.37",
     "@types/request": "^2.48.2",
-    "@types/yargs": "^15.0.4",
-    "electron": "^9.4.0",
-    "electron-builder": "^22.9.1",
+    "@types/yargs": "^16.0.1",
+    "electron": "^11.4.2",
+    "electron-builder": "^22.10.5",
     "electron-notarize": "^1.0.0",
     "ts-node": "^8.3.0",
     "typescript": "^3.9.5"

src/updater.ts

@@ -1,5 +1,6 @@
 import { dialog, app } from 'electron'
-import { autoUpdater, CancellationToken } from 'electron-updater'
+import { autoUpdater } from 'electron-updater'
+import { CancellationToken } from 'builder-util-runtime'
 const ProgressBar = require('electron-progressbar')
 const Store = require('electron-store')
 const opn = require('opn')

tsconfig.json

@@ -4,7 +4,8 @@
     "target": "es2017",
     "noImplicitAny": true,
     "outDir": "./dist",
-    "sourceMap": true
+    "sourceMap": true,
+    "skipLibCheck": true
   },
   "typeRoots": [
     "node_modules/@types",