From ec3bc5db6aade8c37109c738cfa4de08b83731fd Mon Sep 17 00:00:00 2001 From: Alex Gyujin Kim Date: Fri, 22 May 2020 12:22:43 -0400 Subject: [PATCH 01/11] add electron-updater, add deploy yarn script --- .github/workflows/nodejs.yml | 2 +- app.js | 8 ++++-- package.json | 13 ++++++++-- src/helpers/updater.js | 50 ++++++++++++++++++++++++++++++++++++ src/js/mainwindow.js | 8 ++++-- src/templates/index.html | 3 +++ yarn.lock | 32 ++++++++++++++++++++++- 7 files changed, 108 insertions(+), 8 deletions(-) create mode 100644 src/helpers/updater.js diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 309a5b4..a81cbf0 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -37,4 +37,4 @@ jobs: - name: Build with electron-builder run: | yarn --frozen-lockfile - yarn dist --publish=never + yarn deploy diff --git a/app.js b/app.js index 39474a6..45dc74f 100644 --- a/app.js +++ b/app.js @@ -1,5 +1,9 @@ -// Modules to control application life and create native browser window -const { BrowserWindow, ipcMain, nativeTheme, app } = require("electron"); +const { + BrowserWindow, + ipcMain, + nativeTheme, + app +} = require("electron"); const store = require("./src/helpers/store"); const config = require("./src/helpers/config"); diff --git a/package.json b/package.json index 4fc98a1..794e521 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,8 @@ "start": "electron .", "dev": "cross-env NODE_ENV=development electron .", "pack": "electron-builder --dir && yarn update-cask", - "dist": "electron-builder -mwl", + "build": "electron-builder -mwl -p never", + "deploy": "electron-builder -mwl -p onTagOrDraft", "update-cask": "./Casks/update.sh $npm_package_version" }, "keywords": [ @@ -32,6 +33,12 @@ "build": { "appId": "com.alexgyujinkim.GDesktopSuite", "copyright": "Copyright © 2018-2020 Alex Gyujin Kim", + "publish": [ + { + "provider": "github", + "token": "${{ secrets.GITHUB_TOKEN }}" + } + ], "files": [ "./build/**/*", "./src/**/*", @@ -68,13 +75,15 @@ "cross-env": "^7.0.2", "del": "^5.1.0", "electron": "^8.2.5", - "electron-builder": "^22.6.0" + "electron-builder": "^22.6.0", + "electron-log": "^4.1.4" }, "dependencies": { "about-window": "^1.12.1", "darkreader": "^4.9.2", "electron-localshortcut": "https://github.com/alexkim205/electron-localshortcut/tarball/master", "electron-store": "^5.1.1", + "electron-updater": "^4.3.1", "electron-window-state": "^5.0.1", "file-system": "^2.2.2" } diff --git a/src/helpers/updater.js b/src/helpers/updater.js new file mode 100644 index 0000000..143d2c6 --- /dev/null +++ b/src/helpers/updater.js @@ -0,0 +1,50 @@ +const { dialog } = require("electron"); +const { autoUpdater } = require("electron-updater"); + +// Send update info to main window. +autoUpdater.on("update-available", () => { + console.log("update avaliable"); + dialog.showMessageBox( + { + type: "info", + title: "Found Updates", + message: "Found updates, do you want update now?", + buttons: ["Sure", "No"], + }, + (buttonIndex) => { + if (buttonIndex === 0) { + autoUpdater.downloadUpdate(); + } else { + updater.enabled = true; + updater = null; + } + } + ); +}); +autoUpdater.on("update-not-available", () => { + console.log("update not avaliable"); + dialog.showMessageBox({ + title: "No Updates", + message: "Current version is up-to-date.", + }); + updater.enabled = true; + updater = null; +}); + +autoUpdater.on("update-downloaded", () => { + dialog.showMessageBox( + { + title: "Install Updates", + message: "Updates downloaded, application will be quit for update...", + }, + () => { + setImmediate(() => autoUpdater.quitAndInstall()); + } + ); +}); + +const checkForUpdates = () => { + autoUpdater.checkForUpdates(); +}; + +module.exports = { checkForUpdates }; diff --git a/src/js/mainwindow.js b/src/js/mainwindow.js index dc54ffd..d0b4b40 100644 --- a/src/js/mainwindow.js +++ b/src/js/mainwindow.js @@ -5,6 +5,7 @@ const path = require("path"); const { signInURL, userAgent, isDev } = require("../helpers/config"); const { TITLE_BAR_HEIGHT } = require("../helpers/util"); +const { checkForUpdates } = require("../helpers/updater"); const { createChildWindow } = require("./childwindow"); var { template } = require("./menu"); @@ -68,8 +69,8 @@ var createMainWindow = () => { win.setBrowserView(view); view.setBounds({ x: 0, - // y: 800, - y: TITLE_BAR_HEIGHT, + y: 800, + // y: TITLE_BAR_HEIGHT, width: win.getContentBounds().width, height: win.getContentBounds().height - TITLE_BAR_HEIGHT, }); @@ -89,6 +90,9 @@ var createMainWindow = () => { view.webContents.once("did-finish-load", () => { win.show(); view.webContents.focus(); + + // Check for updates when main window is ready + checkForUpdates(); }); // On new window, create child window diff --git a/src/templates/index.html b/src/templates/index.html index 3aeb6bf..e3435fa 100644 --- a/src/templates/index.html +++ b/src/templates/index.html @@ -10,3 +10,6 @@
+ + + diff --git a/yarn.lock b/yarn.lock index 1ea2e49..f5fc1e3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -110,6 +110,13 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.39.tgz#532d25c1e639d89dd6f3aa1d7b3962e3e7fa943d" integrity sha512-pADGfwnDkr6zagDwEiCVE4yQrv7XDkoeVa4OfA9Ju/zRTk6YNDLGtQbkdL4/56mCQQCs4AhNrBIag6jrp7ZuOg== +"@types/semver@^7.1.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.2.0.tgz#0d72066965e910531e1db4621c15d0ca36b8d83b" + integrity sha512-TbB0A8ACUWZt3Y6bQPstW9QNbhNeebdgLX4T/ZfkrswAfUzRiXrgd9seol+X379Wa589Pu4UEx9Uok0D4RjRCQ== + dependencies: + "@types/node" "*" + "@types/yargs-parser@*": version "15.0.0" resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d" @@ -703,6 +710,11 @@ electron-is-accelerator@^0.1.0: keyboardevent-from-electron-accelerator "^1.1.0" keyboardevents-areequal "^0.2.1" +electron-log@^4.1.4: + version "4.1.4" + resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-4.1.4.tgz#b027c76b42b622c59fcf921cf8c67f1588b6a363" + integrity sha512-lRXc8yENqbViOLn2U91DzoNno14wgNWuURgliLXxLtXCVTxB1FK6J0zj7o/SrtPAIcXQa2JPXKlM/qRxP8D9iQ== + electron-publish@22.6.0: version "22.6.0" resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.6.0.tgz#11dca595cfe3c0fdbc364c28dbb8838a1c6ec799" @@ -725,6 +737,19 @@ electron-store@^5.1.1: conf "^6.2.1" type-fest "^0.7.1" +electron-updater@^4.3.1: + version "4.3.1" + resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-4.3.1.tgz#9d485b6262bc56fcf7ee62b1dc1b3b105a3e96a7" + integrity sha512-UDC5AHCgeiHJYDYWZG/rsl1vdAFKqI/Lm7whN57LKAk8EfhTewhcEHzheRcncLgikMcQL8gFo1KeX51tf5a5Wg== + dependencies: + "@types/semver" "^7.1.0" + builder-util-runtime "8.7.0" + fs-extra "^9.0.0" + js-yaml "^3.13.1" + lazy-val "^1.0.4" + lodash.isequal "^4.5.0" + semver "^7.1.3" + electron-window-state@^5.0.1: version "5.0.3" resolved "https://registry.yarnpkg.com/electron-window-state/-/electron-window-state-5.0.3.tgz#4f36d09e3f953d87aff103bf010f460056050aa8" @@ -1305,6 +1330,11 @@ locate-path@^5.0.0: dependencies: p-locate "^4.1.0" +lodash.isequal@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" + integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA= + lodash@^4.17.10, lodash@^4.17.15: version "4.17.15" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" @@ -1754,7 +1784,7 @@ semver@^6.0.0, semver@^6.2.0, semver@^6.3.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@^7.1.2, semver@^7.3.2: +semver@^7.1.2, semver@^7.1.3, semver@^7.3.2: version "7.3.2" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938" integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ== From 30f26a4a0ba6a482bfc9298fdda0241553a23379 Mon Sep 17 00:00:00 2001 From: Alex Gyujin Kim Date: Fri, 22 May 2020 12:43:48 -0400 Subject: [PATCH 02/11] debug build --- app.js | 7 +------ dev-app-update.yml | 3 +++ package.json | 3 ++- 3 files changed, 6 insertions(+), 7 deletions(-) create mode 100644 dev-app-update.yml diff --git a/app.js b/app.js index 45dc74f..9f24176 100644 --- a/app.js +++ b/app.js @@ -1,9 +1,4 @@ -const { - BrowserWindow, - ipcMain, - nativeTheme, - app -} = require("electron"); +const { BrowserWindow, ipcMain, nativeTheme, app } = require("electron"); const store = require("./src/helpers/store"); const config = require("./src/helpers/config"); diff --git a/dev-app-update.yml b/dev-app-update.yml new file mode 100644 index 0000000..d52d2bb --- /dev/null +++ b/dev-app-update.yml @@ -0,0 +1,3 @@ +owner: alexkim205 +repo: G-Desktop-Suite +provider: github \ No newline at end of file diff --git a/package.json b/package.json index 794e521..ae5ecb5 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,8 @@ "publish": [ { "provider": "github", - "token": "${{ secrets.GITHUB_TOKEN }}" + "repo": "G-Desktop-Suite", + "owner": "alexkim205" } ], "files": [ From 823bc7dc66d6cf6e81f278aa2d966ab8cff803d8 Mon Sep 17 00:00:00 2001 From: Alex Gyujin Kim Date: Fri, 22 May 2020 15:10:43 -0400 Subject: [PATCH 03/11] expose gh token --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8b12554..d0cb140 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,6 +36,7 @@ jobs: - name: Build with electron-builder run: | + export GH_TOKEN=${{ secrets.GH_TOKEN }} yarn --frozen-lockfile yarn deploy From c165a4b2834ece0931f397ce683b29643af17d1d Mon Sep 17 00:00:00 2001 From: Alex Gyujin Kim Date: Fri, 22 May 2020 15:12:53 -0400 Subject: [PATCH 04/11] reset title height --- src/js/mainwindow.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/js/mainwindow.js b/src/js/mainwindow.js index d0b4b40..04a4ba7 100644 --- a/src/js/mainwindow.js +++ b/src/js/mainwindow.js @@ -69,8 +69,8 @@ var createMainWindow = () => { win.setBrowserView(view); view.setBounds({ x: 0, - y: 800, - // y: TITLE_BAR_HEIGHT, + // y: 800, + y: TITLE_BAR_HEIGHT, width: win.getContentBounds().width, height: win.getContentBounds().height - TITLE_BAR_HEIGHT, }); From d0fa83948c1855b16e81652c013e5cb820793ab3 Mon Sep 17 00:00:00 2001 From: Alex Gyujin Kim Date: Fri, 22 May 2020 15:42:47 -0400 Subject: [PATCH 05/11] add cask update script --- .github/workflows/build.yml | 6 +++++- Casks/{gsuite.rb => g-desktop-suite.rb} | 0 package.json | 5 +++-- 3 files changed, 8 insertions(+), 3 deletions(-) rename Casks/{gsuite.rb => g-desktop-suite.rb} (100%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d0cb140..1f7be55 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,7 +39,11 @@ jobs: export GH_TOKEN=${{ secrets.GH_TOKEN }} yarn --frozen-lockfile yarn deploy - + + - name: Update and create PR for update for cask + run: | + brew install vitorgalvao/tiny-scripts/cask-repair + yarn update-cask style: runs-on: macos-latest diff --git a/Casks/gsuite.rb b/Casks/g-desktop-suite.rb similarity index 100% rename from Casks/gsuite.rb rename to Casks/g-desktop-suite.rb diff --git a/package.json b/package.json index 7e4a470..cb191b9 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "gdesktopsuite", "productName": "G Desktop Suite", - "version": "0.2.2", + "version": "0.3.0", "description": "A Google Suite desktop app made with Electron", "copyright": "Copyright © 2018-2020 Alex Gyujin Kim", "main": "app.js", @@ -11,7 +11,8 @@ "pack": "electron-builder --dir && yarn update-cask", "build": "electron-builder -mwl -p never", "deploy": "electron-builder -mwl -p onTagOrDraft", - "update-cask": "./Casks/update.sh $npm_package_version", + "build-cask": "./Casks/update.sh $npm_package_version", + "deploy-cask": "cask-repair g-desktop-suite -v $npm_package_version -b", "clean": "concurrently \"prettier './**/*.js' --write\" \"eslint ./**/*.js --fix\"", "clean-check": "concurrently \"prettier './**/*.js' --list-different\" \"eslint ./**/*.js\"" }, From 050109e9d39f5ba7d636387fcf7023b6ef23f9e2 Mon Sep 17 00:00:00 2001 From: Alex Gyujin Kim Date: Fri, 22 May 2020 15:51:48 -0400 Subject: [PATCH 06/11] grammar --- src/helpers/updater.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/helpers/updater.js b/src/helpers/updater.js index 143d2c6..9cee4d0 100644 --- a/src/helpers/updater.js +++ b/src/helpers/updater.js @@ -35,7 +35,7 @@ autoUpdater.on("update-downloaded", () => { dialog.showMessageBox( { title: "Install Updates", - message: "Updates downloaded, application will be quit for update...", + message: "Updates downloaded, application will close for an update...", }, () => { setImmediate(() => autoUpdater.quitAndInstall()); From cff4624aeaff800a8a451215ac503b283f1b88b7 Mon Sep 17 00:00:00 2001 From: Alex Gyujin Kim Date: Fri, 22 May 2020 16:05:41 -0400 Subject: [PATCH 07/11] fix scripts in build.yml --- .github/workflows/build.yml | 3 +- yarn.lock | 120 ++++++++++++++++++------------------ 2 files changed, 62 insertions(+), 61 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1f7be55..aa10fd1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,7 +43,8 @@ jobs: - name: Update and create PR for update for cask run: | brew install vitorgalvao/tiny-scripts/cask-repair - yarn update-cask + yarn build-cask + yarn deploy-cask style: runs-on: macos-latest diff --git a/yarn.lock b/yarn.lock index bd50c64..f882a65 100644 --- a/yarn.lock +++ b/yarn.lock @@ -193,14 +193,14 @@ integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== "@types/node@*": - version "14.0.1" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.1.tgz#5d93e0a099cd0acd5ef3d5bde3c086e1f49ff68c" - integrity sha512-FAYBGwC+W6F9+huFIDtn43cpy7+SzG+atzRiTfdp3inUKL2hXnd4rG8hylJLIh4+hqrQy1P17kvJByE/z825hA== + version "14.0.5" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.5.tgz#3d03acd3b3414cf67faf999aed11682ed121f22b" + integrity sha512-90hiq6/VqtQgX8Sp0EzeIsv3r+ellbGj4URKj5j30tLlZvRUpnAe9YbYnjl3pJM93GyXU0tghHhvXHq+5rnCKA== "@types/node@^12.0.12": - version "12.12.39" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.39.tgz#532d25c1e639d89dd6f3aa1d7b3962e3e7fa943d" - integrity sha512-pADGfwnDkr6zagDwEiCVE4yQrv7XDkoeVa4OfA9Ju/zRTk6YNDLGtQbkdL4/56mCQQCs4AhNrBIag6jrp7ZuOg== + version "12.12.42" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.42.tgz#d0d1149336bd07540dd1ea576692829d575dec34" + integrity sha512-R/9QdYFLL9dE9l5cWWzWIZByVGFd7lk7JVOJ7KD+E1SJ4gni7XJRLz9QTjyYQiHIqEAgku9VgxdLjMlhhUaAFg== "@types/parse-json@^4.0.0": version "4.0.0" @@ -219,7 +219,7 @@ resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d" integrity sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw== -"@types/yargs@^15.0.4": +"@types/yargs@^15.0.5": version "15.0.5" resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.5.tgz#947e9a6561483bdee9adffc983e91a6902af8b79" integrity sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w== @@ -303,26 +303,26 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0: "@types/color-name" "^1.1.1" color-convert "^2.0.1" -app-builder-bin@3.5.8: - version "3.5.8" - resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.8.tgz#4b96cf7d114171b20f32138082dc7cf20f16b85d" - integrity sha512-ni3q7QTfQNWHNWuyn5x3FZu6GnQZv+TFnfgk5++svqleKEhHGqS1mIaKsh7x5pBX6NFXU3/+ktk98wA/AW4EXw== +app-builder-bin@3.5.9: + version "3.5.9" + resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.9.tgz#a3ac0c25286bac68357321cb2eaf7128b0bc0a4f" + integrity sha512-NSjtqZ3x2kYiDp3Qezsgukx/AUzKPr3Xgf9by4cYt05ILWGAptepeeu0Uv+7MO+41o6ujhLixTou8979JGg2Kg== -app-builder-lib@22.6.0: - version "22.6.0" - resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.6.0.tgz#65782fa8fc96180a22c008eb78c1355349bb0b86" - integrity sha512-ky2aLYy92U+Gh6dKq/e8/bNmCotp6/GMhnX8tDZPv9detLg9WuBnWWi1ktBPlpbl1DREusy+TIh+9rgvfduQoA== +app-builder-lib@22.6.1: + version "22.6.1" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.6.1.tgz#f17bfbde1bbb26ae438e450b66005bf6714feb30" + integrity sha512-ENL7r+H7IBfDb4faeLASgndsXrAT7AV7m7yJjcpbFDXYma6an7ZWGFIvR0HJrsfiC5TIB8kdLJ/aMSImrrSi/Q== dependencies: "7zip-bin" "~5.0.3" "@develar/schema-utils" "~2.6.5" async-exit-hook "^2.0.1" bluebird-lst "^1.0.9" - builder-util "22.6.0" + builder-util "22.6.1" builder-util-runtime "8.7.0" chromium-pickle-js "^0.2.0" debug "^4.1.1" ejs "^3.1.2" - electron-publish "22.6.0" + electron-publish "22.6.1" fs-extra "^9.0.0" hosted-git-info "^3.0.4" is-ci "^2.0.0" @@ -449,15 +449,15 @@ builder-util-runtime@8.7.0: debug "^4.1.1" sax "^1.2.4" -builder-util@22.6.0: - version "22.6.0" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.6.0.tgz#25a3aca05d2c44949f0600282264dace8d289ee7" - integrity sha512-jgdES2ExJYkuXC3DEaGAjFctKNA81C4QDy8zdoc+rqdSqheTizuDNtZg02uMFklmUES4V4fggmqds+Y7wraqng== +builder-util@22.6.1: + version "22.6.1" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.6.1.tgz#78172c3634da460325277ef798994592e595eff3" + integrity sha512-A9cF+bSHqRTSKIUHEyE92Tl0Uh12N7yZRH9bccIL3gRUwtp6ulF28LsjNIWTSQ1clZo2M895cT5PCrKzjPQFVg== dependencies: "7zip-bin" "~5.0.3" "@types/debug" "^4.1.5" "@types/fs-extra" "^8.1.0" - app-builder-bin "3.5.8" + app-builder-bin "3.5.9" bluebird-lst "^1.0.9" builder-util-runtime "8.7.0" chalk "^4.0.0" @@ -724,9 +724,9 @@ darkreader@^4.9.2: malevic "0.18.0" date-fns@^2.0.1: - version "2.13.0" - resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.13.0.tgz#d7b8a0a2d392e8d88a8024d0a46b980bbfdbd708" - integrity sha512-xm0c61mevGF7f0XpCGtDTGpzEFC/1fpLXHbmFpxZZQJuvByIK2ozm6cSYuU+nxFYOPh2EuCfzUwlTEFwKG+h5w== + version "2.14.0" + resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.14.0.tgz#359a87a265bb34ef2e38f93ecf63ac453f9bc7ba" + integrity sha512-1zD+68jhFgDIM0rF05rcwYO8cExdNqxjq4xP1QKM60Q45mnO6zaMWB4tOzrIr4M4GSLntsKeE4c9Bdl2jhL/yw== debounce-fn@^3.0.1: version "3.0.1" @@ -809,13 +809,13 @@ dir-glob@^3.0.1: dependencies: path-type "^4.0.0" -dmg-builder@22.6.0: - version "22.6.0" - resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.6.0.tgz#78c3dee24f5713f4844d458949041e31fe7eec30" - integrity sha512-rJxuGhHIpcuDGBtWZMM8aLxkbZNgYO2MO5dUerDIBXebhX1K8DA23iz/uZ8ahcRNgWEv57b8GDqJbXKEfr5T0A== +dmg-builder@22.6.1: + version "22.6.1" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.6.1.tgz#5777a9eb6904db5bf1f4c69addbf462f5f9bf4e4" + integrity sha512-jUTN0acP15puzevtQASj7QEPgUGpedWSuSnOwR/++JbeYRTwU2oro09h/KZnaeMcxgxjdmT3tYLJeY1XUfPbRg== dependencies: - app-builder-lib "22.6.0" - builder-util "22.6.0" + app-builder-lib "22.6.1" + builder-util "22.6.1" fs-extra "^9.0.0" iconv-lite "^0.5.1" js-yaml "^3.13.1" @@ -851,24 +851,24 @@ duplexer3@^0.1.4: integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI= ejs@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.2.tgz#a9986e6920a60f2a3229e87d4f0f3c073209874c" - integrity sha512-zFuywxrAWtX5Mk2KAuoJNkXXbfezpNA0v7i+YC971QORguPekpjpAgeOv99YWSdKXwj7JxI2QAWDeDkE8fWtXw== + version "3.1.3" + resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.3.tgz#514d967a8894084d18d3d47bd169a1c0560f093d" + integrity sha512-wmtrUGyfSC23GC/B1SMv2ogAUgbQEtDmTIhfqielrG5ExIM9TP4UoYdi90jLF1aTcsWCJNEO0UrgKzP0y3nTSg== dependencies: jake "^10.6.1" electron-builder@^22.6.0: - version "22.6.0" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.6.0.tgz#3ac81634e27026892d66f3a52568e65a7d28d26a" - integrity sha512-aLHlB6DTfjJ3MI4AUIFeWnwIozNgNlbOk2c2sTHxB10cAKp0dBVSPZ7xF5NK0uwDhElvRzJQubnHtJD6zKg42Q== + version "22.6.1" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.6.1.tgz#9cc704356ecba1342ff1c94d610aad1f3c6a8b02" + integrity sha512-3/VNg9GfXKHM53TilFtfF1+bsAR8THK1XHgeqCpsiequa02J9jTPc/DhpCUKQPkrs6/EIGxP7uboop7XYoew0Q== dependencies: - "@types/yargs" "^15.0.4" - app-builder-lib "22.6.0" + "@types/yargs" "^15.0.5" + app-builder-lib "22.6.1" bluebird-lst "^1.0.9" - builder-util "22.6.0" + builder-util "22.6.1" builder-util-runtime "8.7.0" chalk "^4.0.0" - dmg-builder "22.6.0" + dmg-builder "22.6.1" fs-extra "^9.0.0" is-ci "^2.0.0" lazy-val "^1.0.4" @@ -892,23 +892,23 @@ electron-is-accelerator@^0.1.0: keyboardevents-areequal "^0.2.1" electron-log@^4.1.4: - version "4.1.4" - resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-4.1.4.tgz#b027c76b42b622c59fcf921cf8c67f1588b6a363" - integrity sha512-lRXc8yENqbViOLn2U91DzoNno14wgNWuURgliLXxLtXCVTxB1FK6J0zj7o/SrtPAIcXQa2JPXKlM/qRxP8D9iQ== + version "4.2.0" + resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-4.2.0.tgz#44ef0987fcc53097ad0574b94672fc6712b234e1" + integrity sha512-Yy1X8iZEzoBA8pu5b7YU07dRHi1GPM9C5jLEOn87Uqtdc9rbe6KbvvQ/AAAtGvn4/GC3azRW/eeiSI4ZF+Hm2A== -electron-publish@22.6.0: - version "22.6.0" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.6.0.tgz#11dca595cfe3c0fdbc364c28dbb8838a1c6ec799" - integrity sha512-+v05SBf9qR7Os5au+fifloNHy5QxHQkUGudBj68YaTb43Pn37UkwRxSc49Lf13s4wW32ohM45g8BOVInPJEdnA== +electron-publish@22.6.1: + version "22.6.1" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.6.1.tgz#d5381220d3e0f3bfa869c5a059fd253a561e0f8a" + integrity sha512-/MkS47ospdSfAFW5Jp52OzYou14HhGJpZ51uAc3GJ5rCfACeqpimC/n1ajRLE3hcXxTWfd3t9MCuClq5jrUO5w== dependencies: "@types/fs-extra" "^8.1.0" bluebird-lst "^1.0.9" - builder-util "22.6.0" + builder-util "22.6.1" builder-util-runtime "8.7.0" chalk "^4.0.0" fs-extra "^9.0.0" lazy-val "^1.0.4" - mime "^2.4.4" + mime "^2.4.5" electron-store@^5.1.1: version "5.1.1" @@ -1490,9 +1490,9 @@ ignore@^4.0.6: integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== ignore@^5.1.1: - version "5.1.4" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz#84b7b3dbe64552b6ef0eca99f6743dbec6d97adf" - integrity sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A== + version "5.1.6" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.6.tgz#643194ad4bf2712f37852e386b6998eff0db2106" + integrity sha512-cgXgkypZBcCnOgSihyeqbo6gjIaIyDqPQB7Ra4vhE9m6kigdGoQDMHjviFhRZo3IMlRy6yElosoviMs5YxZXUA== import-fresh@^3.0.0, import-fresh@^3.1.0: version "3.2.1" @@ -1662,9 +1662,9 @@ js-tokens@^4.0.0: integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== js-yaml@^3.13.1: - version "3.13.1" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847" - integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw== + version "3.14.0" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz#a7a34170f26a21bb162424d8adacb4113a69e482" + integrity sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A== dependencies: argparse "^1.0.7" esprima "^4.0.0" @@ -1843,7 +1843,7 @@ micromatch@^4.0.2: braces "^3.0.1" picomatch "^2.0.5" -mime@^2.4.4: +mime@^2.4.5: version "2.4.5" resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.5.tgz#d8de2ecb92982dedbb6541c9b6841d7f218ea009" integrity sha512-3hQhEUF027BuxZjQA3s7rIv/7VCQPa27hN9u9g87sEkWaKwQPuXOkVKtOeiyUrnWqTDiOs8Ed2rwg733mB0R5w== @@ -2425,9 +2425,9 @@ spawn-command@^0.0.2-1: integrity sha1-YvXpRmmBwbeW3Fkpk34RycaSG9A= spdx-correct@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4" - integrity sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q== + version "3.1.1" + resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9" + integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w== dependencies: spdx-expression-parse "^3.0.0" spdx-license-ids "^3.0.0" From a5d6bb7d29b82016029069cf08bc097c5cf2e2c4 Mon Sep 17 00:00:00 2001 From: Alex Gyujin Kim Date: Fri, 22 May 2020 16:09:10 -0400 Subject: [PATCH 08/11] grammar --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index aa10fd1..2ed2c27 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,7 +40,7 @@ jobs: yarn --frozen-lockfile yarn deploy - - name: Update and create PR for update for cask + - name: Update cask and create PR run: | brew install vitorgalvao/tiny-scripts/cask-repair yarn build-cask From a66da39964ef08c1e2e0c22b54e2cce0d4e227d0 Mon Sep 17 00:00:00 2001 From: Alex Gyujin Kim Date: Fri, 22 May 2020 16:22:12 -0400 Subject: [PATCH 09/11] update readme with new scripts --- README.md | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 6450e9d..b8033c4 100644 --- a/README.md +++ b/README.md @@ -56,11 +56,12 @@ yay -S g-desktop-suite-git ### 🎶 Versions -- v.conscious-club / 0.2.0-0.2.1 -- v.fugue-state / 0.1.0 -- v.dean-town / 0.0.3 -- v.funky-duck / 0.0.2 -- v.aunt-leslie / 0.0.1 +- v.0.3.0 // mr-finish-line +- v.0.2.0-0.2.1 // conscious-club +- v.0.1.0 // fugue-state +- v.0.0.3 // dean-town +- v.0.0.2 // funky-duck +- v.0.0.1 // aunt-leslie Version names inspired by Vulfpeck songs. They're a great band, check them out [here](https://vulfpeck.com/). @@ -83,17 +84,27 @@ yarn install ```sh $ yarn run yarn run v1.22.4 + - build + electron-builder -mwl -p never + - build-cask + ./Casks/update.sh $npm_package_version + - clean + concurrently "prettier './**/*.js' --write" "eslint ./**/*.js --fix" + - clean-check + concurrently "prettier './**/*.js' --list-different" "eslint ./**/*.js" + - deploy + electron-builder -mwl -p onTagOrDraft + - deploy-cask + cask-repair g-desktop-suite -v $npm_package_version -b - dev cross-env NODE_ENV=development electron . - - dist - electron-builder -mwl - pack - electron-builder --dir + electron-builder --dir && yarn update-cask - start electron . ``` -To build production ready applications for macos (dmg), windows (exe), and linux (sh), run `yarn dist`. +To build production ready applications for macos (dmg), windows (exe), and linux (sh), run `yarn build`. 🛎️ **Have suggestions?** Feel free to create an issue or make a pull request. From 83d75e9fd1cd2d7677181ce696ba754cf7a5bbb9 Mon Sep 17 00:00:00 2001 From: Alex Gyujin Kim Date: Fri, 22 May 2020 16:41:55 -0400 Subject: [PATCH 10/11] wording --- src/helpers/updater.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/helpers/updater.js b/src/helpers/updater.js index 9cee4d0..ae20029 100644 --- a/src/helpers/updater.js +++ b/src/helpers/updater.js @@ -35,7 +35,7 @@ autoUpdater.on("update-downloaded", () => { dialog.showMessageBox( { title: "Install Updates", - message: "Updates downloaded, application will close for an update...", + message: "Updates downloaded, application will quit for an update...", }, () => { setImmediate(() => autoUpdater.quitAndInstall()); From 77f873dc89437fa98ffe7284665a554b7c010ee3 Mon Sep 17 00:00:00 2001 From: Alex Gyujin Kim Date: Fri, 22 May 2020 17:02:27 -0400 Subject: [PATCH 11/11] remove cask deploy from workflow, just do manually --- .github/workflows/build.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2ed2c27..ab3df88 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,11 +40,6 @@ jobs: yarn --frozen-lockfile yarn deploy - - name: Update cask and create PR - run: | - brew install vitorgalvao/tiny-scripts/cask-repair - yarn build-cask - yarn deploy-cask style: runs-on: macos-latest