Skip to content

Commit 989e9ed

Browse files
committed
Updated to electron 11
1 parent 6a6b0cb commit 989e9ed

File tree

7 files changed

+42
-39
lines changed

7 files changed

+42
-39
lines changed

package.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lazy-admin",
3-
"version": "0.6.4",
3+
"version": "0.7.0",
44
"description": "GUI for PowerShell scripts to simplify day to day IT tasks.",
55
"productName": "Lazy Admin",
66
"cordovaId": "eu.houby-studio.lazy-admin",
@@ -13,11 +13,12 @@
1313
"release": "quasar build --mode electron --publish onTagOrDraft"
1414
},
1515
"dependencies": {
16+
"@electron/remote": "^1.0.4",
1617
"@quasar/extras": "^1.9.17",
17-
"axios": "^0.19.2",
18+
"axios": "^0.21.1",
1819
"csv": "^5.3.2",
19-
"electron-log": "^4.1.1",
20-
"electron-updater": "^4.3.1",
20+
"electron-log": "^4.3.2",
21+
"electron-updater": "^4.3.5",
2122
"lodash": "^4.17.19",
2223
"node-powershell": "^4.0.0",
2324
"quasar": "^1.15.4",
@@ -34,7 +35,7 @@
3435
"awesome-node-loader": "^1.1.1",
3536
"babel-eslint": "^10.0.1",
3637
"devtron": "^1.4.0",
37-
"electron": "^7.0.0",
38+
"electron": "^11.3.0",
3839
"electron-builder": "^22.4.0",
3940
"electron-debug": "^3.0.0",
4041
"electron-devtools-installer": "^2.2.4",

src-electron/main-process/electron-main.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { app, BrowserWindow, nativeTheme } from 'electron'
2+
require('@electron/remote/main').initialize()
23

34
try {
45
if (process.platform === 'win32' && nativeTheme.shouldUseDarkColors === true) {
@@ -28,7 +29,10 @@ function createWindow () {
2829
webPreferences: {
2930
// Change from /quasar.conf.js > electron > nodeIntegration;
3031
// More info: https://quasar.dev/quasar-cli/developing-electron-apps/node-integration
31-
nodeIntegration: QUASAR_NODE_INTEGRATION
32+
nodeIntegration: QUASAR_NODE_INTEGRATION,
33+
34+
// Eanble @electron/remote
35+
enableRemoteModule: true
3236

3337
// More info: /quasar-cli/developing-electron-apps/electron-preload-script
3438
// preload: path.resolve(__dirname, 'electron-preload.js')

src/boot/auto-updater.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Electron-updater
2-
const autoUpdater = require('electron').remote.require('electron-updater').autoUpdater
2+
const autoUpdater = require('@electron/remote').require('electron-updater').autoUpdater
33

44
// Register Auto Updater as prototype, to access it anywhere
55
// This allows for easy calling via this.$autoUpdater anywhere in Vue App

src/layouts/FullLayout.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@
432432
<script>
433433
import { exportFile } from 'quasar'
434434
import { mapGetters } from 'vuex'
435-
const { app, globalShortcut } = require('electron').remote
435+
const { app, globalShortcut } = require('@electron/remote')
436436
const { shell } = require('electron')
437437
const { transports } = require('electron-log')
438438
@@ -707,17 +707,17 @@ export default {
707707
708708
debugOpenAppDataPath () {
709709
console.log('DEBUG function: Openining Lazy Admin\'s AppData folder.')
710-
shell.openItem(app.getPath('userData'))
710+
shell.openPath(app.getPath('userData'))
711711
},
712712
713713
debugOpenLog () {
714714
console.log('DEBUG function: Opening electron log.')
715-
shell.openItem(transports.file.getFile().path)
715+
shell.openPath(transports.file.getFile().path)
716716
},
717717
718718
debugOpenInstallPath () {
719719
console.log('DEBUG function: Opening install location folder.')
720-
shell.openItem(app.getAppPath().slice(0, (process.env.PROD ? -18 : 0)))
720+
shell.openPath(app.getAppPath().slice(0, (process.env.PROD ? -18 : 0)))
721721
},
722722
723723
debugUpdateMasterDefinition () {

src/pages/AboutPage.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ export default {
7070
...mapGetters('lazystore', ['getLanguage', 'getMenuEntries', 'getMasterDefinition', 'getUpdateInProgress', 'getUpdateProgress', 'getDefinitionsUpdateInProgress', 'getRestartRequired']),
7171
lazyVersion: {
7272
get () {
73-
return require('electron').remote.app.getVersion()
73+
return require('@electron/remote').app.getVersion()
7474
}
7575
},
7676
masterDefinitionVersion: function () {

src/pages/Index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export default {
3131
},
3232
methods: {
3333
lazyVersion () {
34-
let version = require('electron').remote.app.getVersion()
34+
let version = require('@electron/remote').app.getVersion()
3535
console.log(version)
3636
}
3737
}

yarn.lock

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -938,6 +938,11 @@
938938
global-agent "^2.0.2"
939939
global-tunnel-ng "^2.7.1"
940940

941+
"@electron/remote@^1.0.4":
942+
version "1.0.4"
943+
resolved "https://registry.yarnpkg.com/@electron/remote/-/remote-1.0.4.tgz#f1c8cf3560bab762b462bfae9991919cced8bc33"
944+
integrity sha512-kguDJRhL3ZynHrkbX8Tr7xoAzGsNgh4eqXkycXb6cgXbOgehGqkBVe+MnjSVMXz3QJykerGKPy28gqcM7AFGYw==
945+
941946
"@hapi/address@2.x.x":
942947
version "2.1.4"
943948
resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.4.tgz#5d67ed43f3fd41a69d4b9ff7b56e7c0d1d0a81e5"
@@ -2066,12 +2071,12 @@ aws4@^1.8.0:
20662071
resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
20672072
integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
20682073

2069-
axios@^0.19.2:
2070-
version "0.19.2"
2071-
resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.2.tgz#3ea36c5d8818d0d5f8a8a97a6d36b86cdc00cb27"
2072-
integrity sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==
2074+
axios@^0.21.1:
2075+
version "0.21.1"
2076+
resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8"
2077+
integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==
20732078
dependencies:
2074-
follow-redirects "1.5.10"
2079+
follow-redirects "^1.10.0"
20752080

20762081
babel-eslint@^10.0.1:
20772082
version "10.1.0"
@@ -3597,13 +3602,6 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
35973602
dependencies:
35983603
ms "2.0.0"
35993604

3600-
debug@=3.1.0, debug@~3.1.0:
3601-
version "3.1.0"
3602-
resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
3603-
integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
3604-
dependencies:
3605-
ms "2.0.0"
3606-
36073605
debug@^3.1.0, debug@^3.1.1, debug@^3.2.5:
36083606
version "3.2.7"
36093607
resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
@@ -3618,6 +3616,13 @@ debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.0:
36183616
dependencies:
36193617
ms "2.1.2"
36203618

3619+
debug@~3.1.0:
3620+
version "3.1.0"
3621+
resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
3622+
integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
3623+
dependencies:
3624+
ms "2.0.0"
3625+
36213626
decamelize@^1.1.2, decamelize@^1.2.0:
36223627
version "1.2.0"
36233628
resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
@@ -3999,7 +4004,7 @@ electron-localshortcut@^3.1.0:
39994004
keyboardevent-from-electron-accelerator "^2.0.0"
40004005
keyboardevents-areequal "^0.2.1"
40014006

4002-
electron-log@^4.1.1:
4007+
electron-log@^4.3.2:
40034008
version "4.3.2"
40044009
resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-4.3.2.tgz#213334c69f0498fac677a7a73eae4a61fb69949e"
40054010
integrity sha512-PJPWE8JDzQ137UlxX9K917nI8GTcwgiJpE2PMPXZo+I6C4AaZU+JWQ3lW5NjQ1Lg8Qk8qbze+Ly0yAiqhbmpeA==
@@ -4074,7 +4079,7 @@ electron-to-chromium@^1.3.649:
40744079
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.673.tgz#b4f81c930b388f962b7eba20d0483299aaa40913"
40754080
integrity sha512-ms+QR2ckfrrpEAjXweLx6kNCbpAl66DcW//3BZD4BV5KhUgr0RZRce1ON/9J3QyA3JO28nzgb5Xv8DnPr05ILg==
40764081

4077-
electron-updater@^4.3.1:
4082+
electron-updater@^4.3.5:
40784083
version "4.3.5"
40794084
resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-4.3.5.tgz#4fb36f593a031c87ea07ee141c9f064d5deffb15"
40804085
integrity sha512-5jjN7ebvfj1cLI0VZMdCnJk6aC4bP+dy7ryBf21vArR0JzpRVk0OZHA2QBD+H5rm6ZSeDYHOY6+8PrMEqJ4wlQ==
@@ -4087,10 +4092,10 @@ electron-updater@^4.3.1:
40874092
lodash.isequal "^4.5.0"
40884093
semver "^7.3.2"
40894094

4090-
electron@^7.0.0:
4091-
version "7.3.3"
4092-
resolved "https://registry.yarnpkg.com/electron/-/electron-7.3.3.tgz#f61502a3d42d85adfecd8e37f98da449b591f8af"
4093-
integrity sha512-PrJEsuRiaAhTDHtbH3EM+RIne+nZ6ifGChUadmtmPqHUQ+rIhf4jSi2ZN768IgBDw4SidMJiCrvQRiuDha9+Ew==
4095+
electron@^11.3.0:
4096+
version "11.3.0"
4097+
resolved "https://registry.yarnpkg.com/electron/-/electron-11.3.0.tgz#87e8528fd23ae53b0eeb3a738f1fe0a3ad27c2db"
4098+
integrity sha512-MhdS0gok3wZBTscLBbYrOhLaQybCSAfkupazbK1dMP5c+84eVMxJE/QGohiWQkzs0tVFIJsAHyN19YKPbelNrQ==
40944099
dependencies:
40954100
"@electron/get" "^1.0.1"
40964101
"@types/node" "^12.0.12"
@@ -4870,14 +4875,7 @@ flush-write-stream@^1.0.0:
48704875
inherits "^2.0.3"
48714876
readable-stream "^2.3.6"
48724877

4873-
follow-redirects@1.5.10:
4874-
version "1.5.10"
4875-
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a"
4876-
integrity sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==
4877-
dependencies:
4878-
debug "=3.1.0"
4879-
4880-
follow-redirects@^1.0.0:
4878+
follow-redirects@^1.0.0, follow-redirects@^1.10.0:
48814879
version "1.13.2"
48824880
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.2.tgz#dd73c8effc12728ba5cf4259d760ea5fb83e3147"
48834881
integrity sha512-6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA==

0 commit comments

Comments
 (0)