Merge pull request #271 from yang991178/1.0.2

Version 1.0.2

build/resignAndPackage.sh

@@ -1,4 +1,7 @@
-#TODO: add "<key>ElectronTeamID</key><string>EM8VE646TZ</string>" to Info.plist
+# Build the MAS app
+CSC_IDENTITY_AUTO_DISCOVERY=false npx electron-builder -c electron-builder-mas.yml --mac mas:universal
+# Add ElectronTeamID to Info.plist
+sed -i '' -e 's/<\/dict>/<key>ElectronTeamID<\/key><string>EM8VE646TZ<\/string><\/dict>/g' "bin/darwin/universal/mas-universal/Fluent Reader.app/Contents/Info.plist"
 
 printf "......................\nresignAndPackage start\n\n"
 
@@ -7,11 +10,11 @@ APP="Fluent Reader"
 # Your Certificate name.
 CERT="Jieyu Yan (EM8VE646TZ)"
 # The path of your app to sign.
-APP_PATH="/Users/bruce/Documents/repos/fluent-reader/bin/$APP.app"
+APP_PATH="bin/darwin/universal/mas-universal/Fluent Reader.app"
 # The path to the location you want to put the signed package.
-RESULT_PATH="/Users/bruce/Documents/repos/fluent-reader/bin/$APP-mac_store.pkg"
+RESULT_PATH="bin/$APP-mac_store.pkg"
 # The name of certificates you requested.
-APP_KEY="3rd Party Mac Developer Application: $CERT"
+APP_KEY="Apple Distribution: $CERT"
 INSTALLER_KEY="3rd Party Mac Developer Installer: $CERT"
 # The path of your plist files.
 PARENT_PLIST="build/entitlements.mas.plist"

dist/styles/global.css

@@ -207,7 +207,7 @@ body.darwin .btn-group .seperator {
     height: var(--navHeight);
     line-height: var(--navHeight);
 }
-body.darwin #root > nav .btn-group .btn:first-of-type {
+body.darwin.not-fullscreen #root > nav .btn-group .btn:first-of-type {
     margin-left: 72px;
 }
 #root > nav .btn-group .btn.system {

dist/styles/main.css

@@ -222,7 +222,7 @@ img.favicon.dropdown {
     height: calc(var(--navHeight) - 4px);
     box-shadow: 0 1.6px 3.6px 0 rgba(0,0,0,.132), 0 0.3px 0.9px 0 rgba(0,0,0,.108);
 }
-body.darwin .article-search {
+body.darwin.not-fullscreen .article-search {
     left: 108px;
     max-width: calc(100% - 384px);
 }

electron-builder-mas.yml

@@ -0,0 +1,35 @@
+appId: DevHYLiu.FluentReader
+buildVersion: 24
+productName: Fluent Reader
+copyright: Copyright © 2020 Haoyuan Liu
+files:
+  - "./dist/**/*"
+  - "!**/*.js.map"
+directories:
+  output: "./bin/${platform}/${arch}/"
+mac:
+  darkModeSupport: true
+  target:
+    - dmg
+  category: public.app-category.news
+  electronLanguages:
+    - zh_CN
+    - zh_TW
+    - en
+    - fr
+    - es
+    - de
+    - tr
+    - ja
+    - sv
+    - uk
+    - it
+    - nl
+  minimumSystemVersion: 10.14.0
+mas:
+  entitlements: build/entitlements.mas.plist
+  entitlementsInherit: build/entitlements.mas.inherit.plist
+  provisioningProfile: build/embedded.provisionprofile
+  hardenedRuntime: false
+  gatekeeperAssess: false
+  asarUnpack: []

electron-builder.yml

@@ -0,0 +1,62 @@
+appId: me.hyliu.fluentreader
+productName: Fluent Reader
+copyright: Copyright © 2020 Haoyuan Liu
+files:
+  - "./dist/**/*"
+  - "!**/*.js.map"
+directories:
+  output: "./bin/${platform}/${arch}/"
+mac:
+  darkModeSupport: true
+  target:
+    - dmg
+  category: public.app-category.news
+  electronLanguages:
+    - zh_CN
+    - zh_TW
+    - en
+    - fr
+    - es
+    - de
+    - tr
+    - ja
+    - sv
+    - uk
+    - it
+    - nl
+win:
+  target:
+    - nsis
+    - zip
+appx:
+  applicationId: FluentReader
+  identityName: 25286HaoyuanLiu.FluentReader
+  publisher: CN=FD70E7FA-E5AC-41C4-B9C4-6E8708A6616A
+  backgroundColor: transparent
+  languages:
+    - zh-CN
+    - zh-TW
+    - en-US
+    - fr-FR
+    - es
+    - de
+    - tr
+    - ja
+    - sv
+    - uk
+    - it
+    - nl
+  showNameOnTiles: true
+  setBuildNumber: true
+nsis:
+  oneClick: false
+  perMachine: true
+  allowToChangeInstallationDirectory: true
+  deleteAppDataOnUninstall: true
+linux:
+  target:
+    - AppImage
+  icon: build/icons
+  category: Utility
+  desktop:
+    StartupWMClass: fluent-reader