diff --git a/package.json b/package.json index d8c7eeb..26c7079 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lazy-admin", - "version": "0.6.4", + "version": "0.7.0", "description": "GUI for PowerShell scripts to simplify day to day IT tasks.", "productName": "Lazy Admin", "cordovaId": "eu.houby-studio.lazy-admin", @@ -13,11 +13,12 @@ "release": "quasar build --mode electron --publish onTagOrDraft" }, "dependencies": { + "@electron/remote": "^1.0.4", "@quasar/extras": "^1.9.17", - "axios": "^0.19.2", + "axios": "^0.21.1", "csv": "^5.3.2", - "electron-log": "^4.1.1", - "electron-updater": "^4.3.1", + "electron-log": "^4.3.2", + "electron-updater": "^4.3.5", "lodash": "^4.17.19", "node-powershell": "^4.0.0", "quasar": "^1.15.4", @@ -34,7 +35,7 @@ "awesome-node-loader": "^1.1.1", "babel-eslint": "^10.0.1", "devtron": "^1.4.0", - "electron": "^7.0.0", + "electron": "^11.3.0", "electron-builder": "^22.4.0", "electron-debug": "^3.0.0", "electron-devtools-installer": "^2.2.4", diff --git a/src-electron/main-process/electron-main.js b/src-electron/main-process/electron-main.js index 8fc5ec0..6dcb955 100644 --- a/src-electron/main-process/electron-main.js +++ b/src-electron/main-process/electron-main.js @@ -1,4 +1,5 @@ import { app, BrowserWindow, nativeTheme } from 'electron' +require('@electron/remote/main').initialize() try { if (process.platform === 'win32' && nativeTheme.shouldUseDarkColors === true) { @@ -28,7 +29,10 @@ function createWindow () { webPreferences: { // Change from /quasar.conf.js > electron > nodeIntegration; // More info: https://quasar.dev/quasar-cli/developing-electron-apps/node-integration - nodeIntegration: QUASAR_NODE_INTEGRATION + nodeIntegration: QUASAR_NODE_INTEGRATION, + + // Eanble @electron/remote + enableRemoteModule: true // More info: /quasar-cli/developing-electron-apps/electron-preload-script // preload: path.resolve(__dirname, 'electron-preload.js') diff --git a/src/boot/auto-updater.js b/src/boot/auto-updater.js index f220380..a49c689 100644 --- a/src/boot/auto-updater.js +++ b/src/boot/auto-updater.js @@ -1,5 +1,5 @@ // Electron-updater -const autoUpdater = require('electron').remote.require('electron-updater').autoUpdater +const autoUpdater = require('@electron/remote').require('electron-updater').autoUpdater // Register Auto Updater as prototype, to access it anywhere // This allows for easy calling via this.$autoUpdater anywhere in Vue App diff --git a/src/layouts/FullLayout.vue b/src/layouts/FullLayout.vue index b7cc04b..6f34c0e 100644 --- a/src/layouts/FullLayout.vue +++ b/src/layouts/FullLayout.vue @@ -432,7 +432,7 @@