Merge pull request #362 from manosim/setup-electron-builder

* Move /dist to /build

* Bump version 3.0.0

* Setup Electron Builder

* Remove electron-packager

* Trigger CircleCI

* Setup Github Actions

* Store artifact

* Fix checkbox css

* Restructure assets

Author: manosim

.circleci/config.yml

@@ -0,0 +1,78 @@
+name: CI
+
+on: [push]
+
+jobs:
+  setup:
+    runs-on: ubuntu-18.04
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Get yarn cache
+      id: yarn-cache
+      run: echo "::set-output name=dir::$(yarn cache dir)"
+
+    - uses: actions/cache@v1
+      with:
+        path: ${{ steps.yarn-cache.outputs.dir }}
+        key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-yarn-
+
+    - name: Install Dependencies
+      run: yarn install
+
+  run-unit-tests:
+    runs-on: ubuntu-18.04
+    needs: setup
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Get yarn cache
+      id: yarn-cache
+      run: echo "::set-output name=dir::$(yarn cache dir)"
+
+    - name: Install Dependencies
+      run: yarn install
+
+    - name: Run Prettier (Check)
+      run: yarn prettier-check
+
+    - name: Run Jest
+      run: yarn test --coverage --runInBand
+
+  build-macos:
+    runs-on: macos-10.15
+    needs: setup
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Get yarn cache
+      id: yarn-cache
+      run: echo "::set-output name=dir::$(yarn cache dir)"
+
+    - name: Install Dependencies
+      run: yarn install
+
+    - name: Build
+      run: yarn build
+
+    - name: Pack (electron-builder)
+      run: yarn pack
+
+    - name: Make macOS (electron-builder)
+      env:
+        CSC_LINK: ${{ secrets.mac_certs }}
+        CSC_KEY_PASSWORD: ${{ secrets.mac_certs_password }}
+      run: yarn make:macos
+
+    - name: Clean up builds
+      run: rm -rfv dist/mac dist/Gitify-*.dmg*
+
+    - uses: actions/upload-artifact@v1
+      with:
+        name: Gitify-dist
+        path: dist

.github/workflows/main.yml

@@ -77,4 +77,4 @@ tmp/
 temp/
 
 dist/
-Gitify-darwin-x64/
+build/

.gitignore

@@ -1,8 +1,8 @@
-# Gitify [![circleci][circleci-image]][circleci-url] [![codecov][codecov-image]][codecov-url] [![downloads][downloads-image]][downloads-url]
+# Gitify [![github][github-image]][github-url] [![codecov][codecov-image]][codecov-url] [![downloads][downloads-image]][downloads-url]
 
 > The mobile app has been depreacated in favor of the official GitHub mobile app the is coming out [soon](https://github.com/mobile).
 
-![Gitify](images/press.jpg)
+![Gitify](assets/images/press.jpg)
 
 ### Download
 
@@ -86,8 +86,8 @@ Since version `1.1.0` you can now debug Gitify by pressing `alt+cmd+I`. This wil
 
 Gitify is licensed under the MIT Open Source license. For more information, see the LICENSE file in this repository.
 
-[circleci-image]: https://circleci.com/gh/manosim/gitify.svg?style=svg
-[circleci-url]: https://circleci.com/gh/manosim/gitify
+[github-image]: https://github.com/manosim/gitify/workflows/CI/badge.svg
+[github-url]: https://circleci.com/gh/manosim/gitify
 [codecov-image]: https://codecov.io/gh/manosim/gitify/branch/master/graph/badge.svg
 [codecov-url]: https://codecov.io/gh/manosim/gitify
 [downloads-image]: https://img.shields.io/github/downloads/manosim/gitify/total.svg

README.md

@@ -12,5 +12,5 @@
     <div id="gitify"></div>
   </body>
 
-  <script src="./dist/js/app.js"></script>
+  <script src="./build/js/app.js"></script>
 </html>

images/app-icon.icns renamed to assets/images/app-icon.icns

@@ -4,8 +4,8 @@ const path = require('path');
 const AutoLaunch = require('auto-launch');
 const GhReleases = require('electron-gh-releases');
 
-const iconIdle = path.join(__dirname, 'images', 'tray-idleTemplate.png');
-const iconActive = path.join(__dirname, 'images', 'tray-active.png');
+const iconIdle = path.join(__dirname, 'assets', 'images', 'tray-idleTemplate.png');
+const iconActive = path.join(__dirname, 'assets', 'images', 'tray-active.png');
 
 const isDarwin = process.platform === 'darwin';
 const isLinux = process.platform === 'linux';

images/press.jpg renamed to assets/images/press.jpg

@@ -6,9 +6,8 @@
   "scripts": {
     "build": "webpack --config webpack.prod.js",
     "watch": "webpack --config webpack.common.js --watch",
-    "package": "electron-packager . Gitify --overwrite --platform=darwin --arch=x64 --electron-version=7.1.7 --asar --icon=images/app-icon.icns --ignore='src' --ignore='coverage'",
-    "codesign": "bash scripts/codesign.bash",
-    "dist": "yarn build && yarn package && yarn codesign",
+    "pack": "electron-builder --dir",
+    "make:macos": "electron-builder --mac",
     "prettier-check": "prettier --check 'src/**/*.{js,ts,tsx}'",
     "prettier": "prettier --single-quote --trailing-comma es5 --write 'src/**/*.{js,ts,tsx}'",
     "jest": "jest",
@@ -55,20 +54,39 @@
       }
     }
   },
+  "build": {
+    "appId": "com.electron.gitify",
+    "productName": "Gitify",
+    "files": [
+      "build/**/*",
+      "assets/**/*",
+      "index.html",
+      "LICENSE",
+      "main.js"
+    ],
+    "mac": {
+      "category": "public.app-category.developer-tools",
+      "icon": "assets/images/app-icon.icns",
+      "identity": "Emmanouil Konstantinidis (3YP8SXP3BF)"
+    },
+    "dmg": {
+      "icon": "assets/images/app-icon.icns"
+    }
+  },
   "dependencies": {
-    "@primer/octicons-react": "^9.3.1",
+    "@primer/octicons-react": "^9.4.0",
     "auto-launch": "=5.0.5",
-    "axios": "=0.19.0",
-    "date-fns": "^2.8.1",
+    "axios": "=0.19.2",
+    "date-fns": "^2.9.0",
     "electron-gh-releases": "=2.0.4",
-    "final-form": "^4.18.6",
+    "final-form": "^4.18.7",
     "lodash": "^4.17.15",
     "menubar": "^7.2.0",
     "nprogress": "=0.2.0",
     "react": "=16.12.0",
     "react-dom": "=16.12.0",
     "react-emojione": "=5.0.1",
-    "react-final-form": "^6.3.3",
+    "react-final-form": "^6.3.5",
     "react-redux": "=7.1.3",
     "react-router-dom": "^5.1.2",
     "react-transition-group": "^4.3.0",
@@ -78,23 +96,23 @@
     "redux-storage-decorator-filter": "=1.1.8",
     "redux-storage-engine-localstorage": "=1.1.4",
     "redux-thunk": "=2.3.0",
-    "styled-components": "^4.4.1",
+    "styled-components": "^5.0.0",
     "ts-loader": "^6.2.1",
-    "typescript": "^3.7.4"
+    "typescript": "^3.7.5"
   },
   "devDependencies": {
     "@testing-library/react": "^9.4.0",
     "@types/jest": "^24.0.25",
     "@types/lodash": "^4.14.149",
     "@types/node": "^12.12.21",
-    "@types/react": "^16.9.17",
-    "@types/react-redux": "^7.1.5",
+    "@types/react": "^16.9.19",
+    "@types/react-redux": "^7.1.7",
     "@types/react-transition-group": "^4.2.3",
-    "@types/styled-components": "^4.4.1",
-    "electron": "=7.1.9",
-    "electron-packager": "=14.1.1",
+    "@types/styled-components": "^4.4.2",
+    "electron": "=7.1.11",
+    "electron-builder": "^22.3.2",
     "jest": "^24.9.0",
-    "nock": "=11.7.0",
+    "nock": "=11.7.2",
     "prettier": "=1.19.1",
     "react-test-renderer": "=16.12.0",
     "redux-logger": "=3.0.6",

images/tray-active.png renamed to assets/images/tray-active.png

@@ -2,7 +2,7 @@
 
 exports[`components/account-notifications.tsx should render itself (github.com with notifications) 1`] = `
 <div
-  className="sc-bdVaJa dCCnan"
+  className="sc-AykKC hkjopf"
 >
   github.com
   <svg
@@ -31,7 +31,7 @@ exports[`components/account-notifications.tsx should render itself (github.com w
 
 exports[`components/account-notifications.tsx should render itself (github.com without notifications) 1`] = `
 <div
-  className="sc-bdVaJa dCCnan"
+  className="sc-AykKC hkjopf"
 >
   github.com
   <svg

images/[email protected] renamed to assets/images/[email protected]

@@ -2,18 +2,18 @@
 
 exports[`components/all-read.tsx should render itself & its children 1`] = `
 <div
-  className="sc-bdVaJa jZnlmR"
+  className="sc-AykKC iqXGQ"
 >
   <div
-    className="sc-bwzfXH flHJOa"
+    className="sc-AykKD dxnFup"
   >
     😉
   </div>
   <h2
-    className="sc-htpNat XhagL"
+    className="sc-AykKE kxNnyc"
   />
   <h4
-    className="sc-bxivhb ijKRfN"
+    className="sc-AykKF hXdduO"
   >
     No new notifications.
   </h4>

images/tray-idleTemplate.png renamed to assets/images/tray-idleTemplate.png

@@ -2,10 +2,10 @@
 
 exports[`components/notification.js should render itself & its children 1`] = `
 <div
-  className="sc-bdVaJa ctpORT"
+  className="sc-AykKC geylAL"
 >
   <div
-    className="sc-ifAKCX ePGmxi"
+    className="sc-AykKG nSNMR"
   >
     <svg
       aria-hidden="false"
@@ -31,17 +31,17 @@ exports[`components/notification.js should render itself & its children 1`] = `
     </svg>
   </div>
   <div
-    className="sc-bwzfXH jcDBsP"
+    className="sc-AykKD dWNlSI"
     onClick={[Function]}
     role="main"
   >
     <h6
-      className="sc-htpNat VDmcF"
+      className="sc-AykKE fsnEEy"
     >
       I am a robot and this is a test!
     </h6>
     <div
-      className="sc-bxivhb blvFzN"
+      className="sc-AykKF drOcmQ"
     >
       <span
         title="You're watching the repository."
@@ -54,10 +54,10 @@ exports[`components/notification.js should render itself & its children 1`] = `
     </div>
   </div>
   <div
-    className="sc-ifAKCX ePGmxi"
+    className="sc-AykKG nSNMR"
   >
     <button
-      className="sc-EHOje dAXcTp"
+      className="sc-AykKH iotryN"
       onClick={[Function]}
     >
       <svg