Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Auto update application #57

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Auto update application #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e238abe
Remove chart.js & vue-chartjs package
mittalyashu May 22, 2019
4db8c11
Install electron-updater package
mittalyashu May 23, 2019
411a55d
Publish instructions for artifacts & build update
mittalyashu May 23, 2019
e2f258e
Enable auto update src/main/index.js
mittalyashu May 23, 2019
145c769
Use autoUpdate checker in app.on() function
mittalyashu Jul 8, 2019
b16055d
Trigger auto update checker on window initialization
mittalyashu Jul 8, 2019
b597e3d
Change new releaseType to draft
mittalyashu Jul 8, 2019
a1ff5b4
Remove github token
mittalyashu Jul 8, 2019
2cd6da3
Append publish flag to run only onTag
mittalyashu Jul 8, 2019
e6dd037
Add github token variable and set private to false
mittalyashu Jul 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 16 additions & 6 deletions package.json
View file
Open in desktop
Expand Up @@ -14,9 +14,9 @@
},
"main": "./dist/electron/main.js",
"scripts": {
"build:window": "node .electron-vue/build.js && electron-builder --win",
"build:mac": "node .electron-vue/build.js && electron-builder --mac",
"build:linux": "node .electron-vue/build.js && electron-builder --linux",
"build:window": "node .electron-vue/build.js && electron-builder --win --publish onTag",
"build:mac": "node .electron-vue/build.js && electron-builder --mac --publish onTag",
"build:linux": "node .electron-vue/build.js && electron-builder --linux --publish onTag",
"build:dir": "node .electron-vue/build.js && electron-builder --dir",
"build:clean": "cross-env BUILD_TARGET=clean node .electron-vue/build.js",
"build:web": "cross-env BUILD_TARGET=web node .electron-vue/build.js",
Expand Down Expand Up @@ -86,15 +86,24 @@
"snap"
],
"icon": "build/icons"
}
},
"publish": {
"provider": "github",
"repo": "thermal",
"owner": "gitthermal",
"vPrefixedTagName": true,
"host": "github.com",
"protocol": "https",
"token": "GH_TOKEN",
"private": false,
"releaseType": "draft"
}
},
"dependencies": {
"@sentry/electron": "^0.17.0",
"axios": "^0.18.0",
"chart.js": "^2.8.0",
"simple-git": "1.110.0",
"vue": "2.6.10",
"vue-chartjs": "^3.4.2",
"vue-electron": "^1.0.6",
"vue-router": "3.0.2",
"vuex": "^3.0.1"
Expand All @@ -121,6 +130,7 @@
"electron-builder": "20.39.0",
"electron-debug": "2.2.0",
"electron-devtools-installer": "^2.2.4",
"electron-updater": "^4.0.6",
"eslint": "5.16.0",
"eslint-config-prettier": "^4.1.0",
"eslint-config-standard": "12.0.0",
Expand Down
30 changes: 11 additions & 19 deletions src/main/index.js
View file
Open in desktop
@@ -1,6 +1,7 @@
"use strict";

import { app, BrowserWindow } from "electron";
import { autoUpdater } from "electron-updater";
import * as Sentry from "@sentry/electron";
import packageJson from "../../package.json";

Expand Down Expand Up @@ -46,10 +47,17 @@ function createWindow() {
mainWindow.on("closed", () => {
mainWindow = null;
});

// trigger autoupdate check
autoUpdater.checkForUpdates();
}

app.on("ready", () => {
createWindow();

if (process.env.NODE_ENV === "production") {
autoUpdater.checkForUpdates();
}
});

app.on("window-all-closed", () => {
Expand All @@ -64,22 +72,6 @@ app.on("activate", () => {
}
});

/**
* Auto Updater
*
* Uncomment the following code below and install `electron-updater` to
* support auto updating. Code Signing with a valid certificate is required.
* https://simulatedgreg.gitbooks.io/electron-vue/content/en/using-electron-builder.html#auto-updating
*/

/*
import { autoUpdater } from 'electron-updater'

autoUpdater.on('update-downloaded', () => {
autoUpdater.quitAndInstall()
})

app.on('ready', () => {
if (process.env.NODE_ENV === 'production') autoUpdater.checkForUpdates()
})
*/
autoUpdater.on("update-downloaded", () => {
autoUpdater.quitAndInstall();
});
81 changes: 39 additions & 42 deletions yarn.lock
View file
Open in desktop
Expand Up @@ -1911,6 +1911,16 @@ builder-util-runtime@^8.2.0, builder-util-runtime@^8.2.1:
fs-extra-p "^7.0.1"
sax "^1.2.4"

builder-util-runtime@~8.1.0:
version "8.1.1"
resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.1.1.tgz#f2f6fc43e33d26892bd491667fc746ad69bccc50"
integrity sha512-+ieS4PMB33vVE2S3ZNWBEQJ1zKmAs/agrBdh7XadE1lKLjrH4aXYuOh9OOGdxqIRldhlhNBaF+yKMMEFOdNVig==
dependencies:
bluebird-lst "^1.0.6"
debug "^4.1.1"
fs-extra-p "^7.0.0"
sax "^1.2.4"

builder-util@9.7.0:
version "9.7.0"
resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-9.7.0.tgz#7aabec1136bf646023f2ebe231a26e82bb9d42cf"
Expand Down Expand Up @@ -2144,29 +2154,6 @@ chardet@^0.7.0:
resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==

chart.js@^2.8.0:
version "2.8.0"
resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-2.8.0.tgz#b703b10d0f4ec5079eaefdcd6ca32dc8f826e0e9"
integrity sha512-Di3wUL4BFvqI5FB5K26aQ+hvWh8wnP9A3DWGvXHVkO13D3DSnaSsdZx29cXlEsYKVkn1E2az+ZYFS4t0zi8x0w==
dependencies:
chartjs-color "^2.1.0"
moment "^2.10.2"

chartjs-color-string@^0.6.0:
version "0.6.0"
resolved "https://registry.yarnpkg.com/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz#1df096621c0e70720a64f4135ea171d051402f71"
integrity sha512-TIB5OKn1hPJvO7JcteW4WY/63v6KwEdt6udfnDE9iCAZgy+V4SrbSxoIbTw/xkUIapjEI4ExGtD0+6D3KyFd7A==
dependencies:
color-name "^1.0.0"

chartjs-color@^2.1.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/chartjs-color/-/chartjs-color-2.3.0.tgz#0e7e1e8dba37eae8415fd3db38bf572007dd958f"
integrity sha512-hEvVheqczsoHD+fZ+tfPUE+1+RbV6b+eksp2LwAhwRTVXEjCSEavvk+Hg3H6SZfGlPh/UfmWKGIvZbtobOEm3g==
dependencies:
chartjs-color-string "^0.6.0"
color-convert "^0.5.3"

chokidar@^2.0.0, chokidar@^2.0.2:
version "2.1.5"
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.5.tgz#0ae8434d962281a5f56c72869e79cb6d9d86ad4d"
Expand Down Expand Up @@ -2325,28 +2312,23 @@ collection-visit@^1.0.0:
map-visit "^1.0.0"
object-visit "^1.0.0"

color-convert@^0.5.3, color-convert@~0.5.0:
version "0.5.3"
resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-0.5.3.tgz#bdb6c69ce660fadffe0b0007cc447e1b9f7282bd"
integrity sha1-vbbGnOZg+t/+CwAHzER+G59ygr0=

color-convert@^1.9.0:
version "1.9.3"
resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
dependencies:
color-name "1.1.3"

color-convert@~0.5.0:
version "0.5.3"
resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-0.5.3.tgz#bdb6c69ce660fadffe0b0007cc447e1b9f7282bd"
integrity sha1-vbbGnOZg+t/+CwAHzER+G59ygr0=

color-name@1.1.3:
version "1.1.3"
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=

color-name@^1.0.0:
version "1.1.4"
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==

combined-stream@1.0.6:
version "1.0.6"
resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
Expand Down Expand Up @@ -3209,6 +3191,21 @@ electron-to-chromium@^1.3.122:
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.124.tgz#861fc0148748a11b3e5ccebdf8b795ff513fa11f"
integrity sha512-glecGr/kFdfeXUHOHAWvGcXrxNU+1wSO/t5B23tT1dtlvYB26GY8aHzZSWD7HqhqC800Lr+w/hQul6C5AF542w==

electron-updater@^4.0.6:
version "4.0.6"
resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-4.0.6.tgz#9c4f495ae0e80bf4425e3e1b801c5ed2ab933c2d"
integrity sha512-JPGLME6fxJcHG8hX7HWFl6Aew6iVm0DkcrENreKa5SUJCHG+uUaAhxDGDt+YGcNkyx1uJ6eBGMvFxDTLUv67pg==
dependencies:
bluebird-lst "^1.0.6"
builder-util-runtime "~8.1.0"
fs-extra-p "^7.0.0"
js-yaml "^3.12.0"
lazy-val "^1.0.3"
lodash.isequal "^4.5.0"
pako "^1.0.7"
semver "^5.6.0"
source-map-support "^0.5.9"

electron@4.1.4:
version "4.1.4"
resolved "https://registry.yarnpkg.com/electron/-/electron-4.1.4.tgz#41ba9e041f38c25c62a7db806884410654df058f"
Expand Down Expand Up @@ -5073,7 +5070,7 @@ js-tokens@^3.0.2:
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=

js-yaml@^3.12.1, js-yaml@^3.13.0:
js-yaml@^3.12.0, js-yaml@^3.12.1, js-yaml@^3.13.0:
version "3.13.1"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
Expand Down Expand Up @@ -5225,7 +5222,7 @@ lazy-cache@^1.0.3:
resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
integrity sha1-odePw6UEdMuAhF07O24dpJpEbo4=

lazy-val@^1.0.4:
lazy-val@^1.0.3, lazy-val@^1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.4.tgz#882636a7245c2cfe6e0a4e3ba6c5d68a137e5c65"
integrity sha512-u93kb2fPbIrfzBuLjZE+w+fJbUUMhNDXxNmMfaqNgpfQf1CO5ZSe2LfsnBqVAk7i/2NF48OSoRj+Xe2VT+lE8Q==
Expand Down Expand Up @@ -5413,6 +5410,11 @@ lodash.isarray@^3.0.0:
resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
integrity sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=

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.isplainobject@^3.0.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-3.2.0.tgz#9a8238ae16b200432960cd7346512d0123fbf4c5"
Expand Down Expand Up @@ -5836,7 +5838,7 @@ mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdi
dependencies:
minimist "0.0.8"

moment@^2.10.2, moment@^2.11.1:
moment@^2.11.1:
version "2.24.0"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==
Expand Down Expand Up @@ -6390,7 +6392,7 @@ package-json@^4.0.0:
registry-url "^3.0.3"
semver "^5.1.0"

pako@~1.0.5:
pako@^1.0.7, pako@~1.0.5:
version "1.0.10"
resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.10.tgz#4328badb5086a426aa90f541977d4955da5c9732"
integrity sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==
Expand Down Expand Up @@ -8542,11 +8544,6 @@ vue-apexcharts@^1.3.5:
resolved "https://registry.yarnpkg.com/vue-apexcharts/-/vue-apexcharts-1.3.5.tgz#4c98c314ffdb6ea63c9354678bf93a666a859921"
integrity sha512-9UeY9013+BQfQbx7JrBjLiQf3wNa041OrfnC3F1onmsIY1z842xGMiRD60PqBSvc3wHzxYtKzj8LngSuDYWaCA==

vue-chartjs@^3.4.2:
version "3.4.2"
resolved "https://registry.yarnpkg.com/vue-chartjs/-/vue-chartjs-3.4.2.tgz#0323e6a99a10a68f38d426899c3994f48596fd23"
integrity sha512-EhoXUJ17+9isMLhJpOliS++xE5z5FM8iAVytIqnKofByVMr8AISRL/SCy3zvWbvzhjgQPStd9y6adMF5bnWQdg==

vue-content-loader@^0.2.1:
version "0.2.1"
resolved "https://registry.yarnpkg.com/vue-content-loader/-/vue-content-loader-0.2.1.tgz#0eb332e2a72643d57fb209d72d6526573b191f5a"
Expand Down