Merge branch 'develop'

Author: manhtai

.github/workflows/publish.yml

@@ -52,4 +52,4 @@ jobs:
           # This is used for uploading release assets to github
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          yarn postinstall && yarn build && yarn electron-builder --publish always
+          yarn postinstall && yarn build && yarn electron-builder --publish always --arm64 --x64

README.md

@@ -13,9 +13,16 @@
 - Convert screenshots into a PDF
 - Auto click on the Next button
 
-## Download
+## Installation
 
-- For macOS & Windows: https://github.com/plainlab/plainprinter/releases
+For macOS & Windows: https://github.com/plainlab/plainprinter/releases
+
+- macOS: Get `.dmg` file, open it and drag the app into Applications folder, for M1 mac: get `arm64.dmg` file instead.
+- Windows: Get `.exe` file and open it to install.
+
+## CLI version
+
+https://github.com/manhtai/vitalsource-printer
 
 ---
 

package.json

@@ -8,7 +8,7 @@
     "build:renderer": "cross-env NODE_ENV=production webpack --config ./.erb/configs/webpack.config.renderer.prod.babel.js",
     "rebuild": "electron-rebuild --parallel --types prod,dev,optional --module-dir src",
     "lint": "cross-env NODE_ENV=development eslint . --cache --ext .js,.jsx,.ts,.tsx",
-    "package": "rm -rf src/dist && yarn build && electron-builder build --publish never --mac",
+    "package": "rm -rf src/dist && yarn build && electron-builder build --publish never --x64 --arm64",
     "release": "rm -rf src/dist && yarn build && electron-builder build --publish always",
     "postinstall": "node -r @babel/register .erb/scripts/CheckNativeDep.js && electron-builder install-app-deps && yarn cross-env NODE_ENV=development webpack --config ./.erb/configs/webpack.config.renderer.dev.dll.babel.js && opencollective-postinstall && yarn-deduplicate yarn.lock",
     "start": "node -r @babel/register ./.erb/scripts/CheckPortInUse.js && yarn start:renderer",