clones/edex-ui
1
0
Fork 0
mirror of https://github.com/GitSquared/edex-ui.git synced 2024-09-21 10:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: upgrade to Electron 12

Browse Source
This commit is contained in:
Gabriel Saillard 2021-05-25 10:34:30 +02:00
parent 8274e15535
commit 0fa76464ff
No known key found for this signature in database
GPG Key ID: 4F615B5FE436611A
9 changed files with 1502 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
package-lock.json generated
View File

@ -9,7 +9,7 @@
"license": "GPL-3.0",
"dependencies": {
"clean-css": "5.1.2",
"electron": "^11.4.6",
"electron": "^12.0.9",
"electron-builder": "22.11",
"electron-rebuild": "^2.3.5",
"mime-types": "^2.1.30",
@ -237,9 +237,9 @@
"optional": true
},
"node_modules/@types/node": {
"version": "12.19.9",
"resolved": "https://registry.npmjs.org/@types/node/-/node-12.19.9.tgz",
"integrity": "sha512-yj0DOaQeUrk3nJ0bd3Y5PeDRJ6W0r+kilosLA+dzF3dola/o9hxhMSg2sFvVcA2UHS5JSOsZp4S0c1OEXc4m1Q=="
"version": "14.17.1",
"resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.1.tgz",
"integrity": "sha512-/tpUyFD7meeooTRwl3sYlihx2BrJE7q9XF71EguPFIySj9B7qgnRtHsHTho+0AUm4m1SvWGm6uSncrR94q6Vtw=="
},
"node_modules/@types/plist": {
"version": "3.0.2",
@ -1429,13 +1429,13 @@
}
},
"node_modules/electron": {
"version": "11.4.6",
"resolved": "https://registry.npmjs.org/electron/-/electron-11.4.6.tgz",
"integrity": "sha512-WN7zUwaAmcB1lXyyaMxPsNWAFCpRMDltQb4zCjvoD5TBBoePcjd6UwyVUD93pSKJXjmWoae8PbZWrbZlXowcSg==",
"version": "12.0.9",
"resolved": "https://registry.npmjs.org/electron/-/electron-12.0.9.tgz",
"integrity": "sha512-p5aEt1tIh/PYjwN+6MHTc5HtW529XR9r4Qlj9PPcSb5ubkotSsS0BtWJoRPhDenSAN8sgHk3sbZLxXPJtdnRYA==",
"hasInstallScript": true,
"dependencies": {
"@electron/get": "^1.0.1",
"@types/node": "^12.0.12",
"@types/node": "^14.6.2",
"extract-zip": "^1.0.3"
},
"bin": {
@ -2619,9 +2619,9 @@
"integrity": "sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q=="
},
"node_modules/lodash": {
"version": "4.17.20",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
"integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="
"version": "4.17.21",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
},
"node_modules/log-symbols": {
"version": "4.0.0",
@ -4452,9 +4452,9 @@
"optional": true
},
"@types/node": {
"version": "12.19.9",
"resolved": "https://registry.npmjs.org/@types/node/-/node-12.19.9.tgz",
"integrity": "sha512-yj0DOaQeUrk3nJ0bd3Y5PeDRJ6W0r+kilosLA+dzF3dola/o9hxhMSg2sFvVcA2UHS5JSOsZp4S0c1OEXc4m1Q=="
"version": "14.17.1",
"resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.1.tgz",
"integrity": "sha512-/tpUyFD7meeooTRwl3sYlihx2BrJE7q9XF71EguPFIySj9B7qgnRtHsHTho+0AUm4m1SvWGm6uSncrR94q6Vtw=="
},
"@types/plist": {
"version": "3.0.2",
@ -5386,12 +5386,12 @@
}
},
"electron": {
"version": "11.4.6",
"resolved": "https://registry.npmjs.org/electron/-/electron-11.4.6.tgz",
"integrity": "sha512-WN7zUwaAmcB1lXyyaMxPsNWAFCpRMDltQb4zCjvoD5TBBoePcjd6UwyVUD93pSKJXjmWoae8PbZWrbZlXowcSg==",
"version": "12.0.9",
"resolved": "https://registry.npmjs.org/electron/-/electron-12.0.9.tgz",
"integrity": "sha512-p5aEt1tIh/PYjwN+6MHTc5HtW529XR9r4Qlj9PPcSb5ubkotSsS0BtWJoRPhDenSAN8sgHk3sbZLxXPJtdnRYA==",
"requires": {
"@electron/get": "^1.0.1",
"@types/node": "^12.0.12",
"@types/node": "^14.6.2",
"extract-zip": "^1.0.3"
}
},
@ -6299,9 +6299,9 @@
"integrity": "sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q=="
},
"lodash": {
"version": "4.17.20",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
"integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="
"version": "4.17.21",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
},
"log-symbols": {
"version": "4.0.0",

2
package.json
View File

@ -100,7 +100,7 @@
},
"dependencies": {
"clean-css": "5.1.2",
"electron": "^11.4.6",
"electron": "^12.0.9",
"electron-builder": "22.11",
"electron-rebuild": "^2.3.5",
"mime-types": "^2.1.30",

3
src/_boot.js
View File

@ -30,6 +30,7 @@ if (!gotLock) {
signale.time("Startup");
const electron = require("electron");
require('@electron/remote/main').initialize()
const ipc = electron.ipcMain;
const path = require("path");
const url = require("url");
@ -186,7 +187,7 @@ function createWindow(settings) {
backgroundColor: '#000000',
webPreferences: {
devTools: true,
enableRemoteModule: true,
enableRemoteModule: true,
contextIsolation: false,
backgroundThrottling: false,
webSecurity: true,

5
src/_renderer.js
View File

@ -37,9 +37,10 @@ window.onerror = (msg, path, line, col, error) => {
const path = require("path");
const fs = require("fs");
const electron = require("electron");
const remote = require("@electron/remote");
const ipc = electron.ipcRenderer;
const settingsDir = electron.remote.app.getPath("userData");
const settingsDir = remote.app.getPath("userData");
const themesDir = path.join(settingsDir, "themes");
const keyboardsDir = path.join(settingsDir, "keyboards");
const fontsDir = path.join(settingsDir, "fonts");
@ -53,7 +54,7 @@ window.shortcuts = require(shortcutsFile);
window.lastWindowState = require(lastWindowStateFile);
// Load CLI parameters
if (electron.remote.process.argv.includes("--nointro")) {
if (remote.process.argv.includes("--nointro")) {
window.settings.nointroOverride = true;
} else {
window.settings.nointroOverride = false;

2
src/classes/netstat.class.js
View File

@ -47,7 +47,7 @@ class Netstat {
};
let geolite2 = require("geolite2-redist");
let maxmind = require("maxmind");
geolite2.downloadDbs(require("path").join(require("electron").remote.app.getPath("userData"), "geoIPcache")).then(() => {
geolite2.downloadDbs(require("path").join(require("@electron/remote").app.getPath("userData"), "geoIPcache")).then(() => {
geolite2.open('GeoLite2-City', path => {
return maxmind.open(path);
}).catch(e => {throw e}).then(lookup => {

2
src/classes/terminal.class.js
View File

@ -291,7 +291,7 @@ class Terminal {
this.clipboard.didCopy = true;
},
paste: () => {
this.write(electron.remote.clipboard.readText());
this.write(remote.clipboard.readText());
this.clipboard.didCopy = false;
},
didCopy: false

3
src/classes/updateChecker.class.js
View File

@ -2,7 +2,8 @@ class UpdateChecker {
constructor() {
let https = require("https");
let electron = require("electron");
let current = electron.remote.app.getVersion();
let remote = require("@electron/remote");
let current = remote.app.getVersion();
this._failed = false;
this._willfail = false;

1476
src/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

3
src/package.json
View File

@ -23,6 +23,7 @@
},
"homepage": "https://github.com/GitSquared/edex-ui#readme",
"dependencies": {
"@electron/remote": "^1.1.0",
"augmented-ui": "^1.1.2",
"color": "3.1.3",
"geolite2-redist": "^2.0.3",
@ -36,7 +37,7 @@
"shell-env": "3.0.1",
"signale": "1.4.0",
"smoothie": "1.35.0",
"systeminformation": "5.6.21",
"systeminformation": "5.7.2",
"tail": "2.2.2",
"username": "5.1.0",
"which": "2.0.2",