mirror of
https://github.com/GitSquared/edex-ui.git
synced 2024-09-21 10:37:29 +00:00
chore: upgrade to Electron 12
This commit is contained in:
parent
8274e15535
commit
0fa76464ff
42
package-lock.json
generated
42
package-lock.json
generated
@ -9,7 +9,7 @@
|
|||||||
"license": "GPL-3.0",
|
"license": "GPL-3.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"clean-css": "5.1.2",
|
"clean-css": "5.1.2",
|
||||||
"electron": "^11.4.6",
|
"electron": "^12.0.9",
|
||||||
"electron-builder": "22.11",
|
"electron-builder": "22.11",
|
||||||
"electron-rebuild": "^2.3.5",
|
"electron-rebuild": "^2.3.5",
|
||||||
"mime-types": "^2.1.30",
|
"mime-types": "^2.1.30",
|
||||||
@ -237,9 +237,9 @@
|
|||||||
"optional": true
|
"optional": true
|
||||||
},
|
},
|
||||||
"node_modules/@types/node": {
|
"node_modules/@types/node": {
|
||||||
"version": "12.19.9",
|
"version": "14.17.1",
|
||||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-12.19.9.tgz",
|
"resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.1.tgz",
|
||||||
"integrity": "sha512-yj0DOaQeUrk3nJ0bd3Y5PeDRJ6W0r+kilosLA+dzF3dola/o9hxhMSg2sFvVcA2UHS5JSOsZp4S0c1OEXc4m1Q=="
|
"integrity": "sha512-/tpUyFD7meeooTRwl3sYlihx2BrJE7q9XF71EguPFIySj9B7qgnRtHsHTho+0AUm4m1SvWGm6uSncrR94q6Vtw=="
|
||||||
},
|
},
|
||||||
"node_modules/@types/plist": {
|
"node_modules/@types/plist": {
|
||||||
"version": "3.0.2",
|
"version": "3.0.2",
|
||||||
@ -1429,13 +1429,13 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/electron": {
|
"node_modules/electron": {
|
||||||
"version": "11.4.6",
|
"version": "12.0.9",
|
||||||
"resolved": "https://registry.npmjs.org/electron/-/electron-11.4.6.tgz",
|
"resolved": "https://registry.npmjs.org/electron/-/electron-12.0.9.tgz",
|
||||||
"integrity": "sha512-WN7zUwaAmcB1lXyyaMxPsNWAFCpRMDltQb4zCjvoD5TBBoePcjd6UwyVUD93pSKJXjmWoae8PbZWrbZlXowcSg==",
|
"integrity": "sha512-p5aEt1tIh/PYjwN+6MHTc5HtW529XR9r4Qlj9PPcSb5ubkotSsS0BtWJoRPhDenSAN8sgHk3sbZLxXPJtdnRYA==",
|
||||||
"hasInstallScript": true,
|
"hasInstallScript": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@electron/get": "^1.0.1",
|
"@electron/get": "^1.0.1",
|
||||||
"@types/node": "^12.0.12",
|
"@types/node": "^14.6.2",
|
||||||
"extract-zip": "^1.0.3"
|
"extract-zip": "^1.0.3"
|
||||||
},
|
},
|
||||||
"bin": {
|
"bin": {
|
||||||
@ -2619,9 +2619,9 @@
|
|||||||
"integrity": "sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q=="
|
"integrity": "sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q=="
|
||||||
},
|
},
|
||||||
"node_modules/lodash": {
|
"node_modules/lodash": {
|
||||||
"version": "4.17.20",
|
"version": "4.17.21",
|
||||||
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
|
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
|
||||||
"integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="
|
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
|
||||||
},
|
},
|
||||||
"node_modules/log-symbols": {
|
"node_modules/log-symbols": {
|
||||||
"version": "4.0.0",
|
"version": "4.0.0",
|
||||||
@ -4452,9 +4452,9 @@
|
|||||||
"optional": true
|
"optional": true
|
||||||
},
|
},
|
||||||
"@types/node": {
|
"@types/node": {
|
||||||
"version": "12.19.9",
|
"version": "14.17.1",
|
||||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-12.19.9.tgz",
|
"resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.1.tgz",
|
||||||
"integrity": "sha512-yj0DOaQeUrk3nJ0bd3Y5PeDRJ6W0r+kilosLA+dzF3dola/o9hxhMSg2sFvVcA2UHS5JSOsZp4S0c1OEXc4m1Q=="
|
"integrity": "sha512-/tpUyFD7meeooTRwl3sYlihx2BrJE7q9XF71EguPFIySj9B7qgnRtHsHTho+0AUm4m1SvWGm6uSncrR94q6Vtw=="
|
||||||
},
|
},
|
||||||
"@types/plist": {
|
"@types/plist": {
|
||||||
"version": "3.0.2",
|
"version": "3.0.2",
|
||||||
@ -5386,12 +5386,12 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"electron": {
|
"electron": {
|
||||||
"version": "11.4.6",
|
"version": "12.0.9",
|
||||||
"resolved": "https://registry.npmjs.org/electron/-/electron-11.4.6.tgz",
|
"resolved": "https://registry.npmjs.org/electron/-/electron-12.0.9.tgz",
|
||||||
"integrity": "sha512-WN7zUwaAmcB1lXyyaMxPsNWAFCpRMDltQb4zCjvoD5TBBoePcjd6UwyVUD93pSKJXjmWoae8PbZWrbZlXowcSg==",
|
"integrity": "sha512-p5aEt1tIh/PYjwN+6MHTc5HtW529XR9r4Qlj9PPcSb5ubkotSsS0BtWJoRPhDenSAN8sgHk3sbZLxXPJtdnRYA==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"@electron/get": "^1.0.1",
|
"@electron/get": "^1.0.1",
|
||||||
"@types/node": "^12.0.12",
|
"@types/node": "^14.6.2",
|
||||||
"extract-zip": "^1.0.3"
|
"extract-zip": "^1.0.3"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@ -6299,9 +6299,9 @@
|
|||||||
"integrity": "sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q=="
|
"integrity": "sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q=="
|
||||||
},
|
},
|
||||||
"lodash": {
|
"lodash": {
|
||||||
"version": "4.17.20",
|
"version": "4.17.21",
|
||||||
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
|
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
|
||||||
"integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="
|
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
|
||||||
},
|
},
|
||||||
"log-symbols": {
|
"log-symbols": {
|
||||||
"version": "4.0.0",
|
"version": "4.0.0",
|
||||||
|
@ -100,7 +100,7 @@
|
|||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"clean-css": "5.1.2",
|
"clean-css": "5.1.2",
|
||||||
"electron": "^11.4.6",
|
"electron": "^12.0.9",
|
||||||
"electron-builder": "22.11",
|
"electron-builder": "22.11",
|
||||||
"electron-rebuild": "^2.3.5",
|
"electron-rebuild": "^2.3.5",
|
||||||
"mime-types": "^2.1.30",
|
"mime-types": "^2.1.30",
|
||||||
|
@ -30,6 +30,7 @@ if (!gotLock) {
|
|||||||
signale.time("Startup");
|
signale.time("Startup");
|
||||||
|
|
||||||
const electron = require("electron");
|
const electron = require("electron");
|
||||||
|
require('@electron/remote/main').initialize()
|
||||||
const ipc = electron.ipcMain;
|
const ipc = electron.ipcMain;
|
||||||
const path = require("path");
|
const path = require("path");
|
||||||
const url = require("url");
|
const url = require("url");
|
||||||
@ -186,7 +187,7 @@ function createWindow(settings) {
|
|||||||
backgroundColor: '#000000',
|
backgroundColor: '#000000',
|
||||||
webPreferences: {
|
webPreferences: {
|
||||||
devTools: true,
|
devTools: true,
|
||||||
enableRemoteModule: true,
|
enableRemoteModule: true,
|
||||||
contextIsolation: false,
|
contextIsolation: false,
|
||||||
backgroundThrottling: false,
|
backgroundThrottling: false,
|
||||||
webSecurity: true,
|
webSecurity: true,
|
||||||
|
@ -37,9 +37,10 @@ window.onerror = (msg, path, line, col, error) => {
|
|||||||
const path = require("path");
|
const path = require("path");
|
||||||
const fs = require("fs");
|
const fs = require("fs");
|
||||||
const electron = require("electron");
|
const electron = require("electron");
|
||||||
|
const remote = require("@electron/remote");
|
||||||
const ipc = electron.ipcRenderer;
|
const ipc = electron.ipcRenderer;
|
||||||
|
|
||||||
const settingsDir = electron.remote.app.getPath("userData");
|
const settingsDir = remote.app.getPath("userData");
|
||||||
const themesDir = path.join(settingsDir, "themes");
|
const themesDir = path.join(settingsDir, "themes");
|
||||||
const keyboardsDir = path.join(settingsDir, "keyboards");
|
const keyboardsDir = path.join(settingsDir, "keyboards");
|
||||||
const fontsDir = path.join(settingsDir, "fonts");
|
const fontsDir = path.join(settingsDir, "fonts");
|
||||||
@ -53,7 +54,7 @@ window.shortcuts = require(shortcutsFile);
|
|||||||
window.lastWindowState = require(lastWindowStateFile);
|
window.lastWindowState = require(lastWindowStateFile);
|
||||||
|
|
||||||
// Load CLI parameters
|
// Load CLI parameters
|
||||||
if (electron.remote.process.argv.includes("--nointro")) {
|
if (remote.process.argv.includes("--nointro")) {
|
||||||
window.settings.nointroOverride = true;
|
window.settings.nointroOverride = true;
|
||||||
} else {
|
} else {
|
||||||
window.settings.nointroOverride = false;
|
window.settings.nointroOverride = false;
|
||||||
|
@ -47,7 +47,7 @@ class Netstat {
|
|||||||
};
|
};
|
||||||
let geolite2 = require("geolite2-redist");
|
let geolite2 = require("geolite2-redist");
|
||||||
let maxmind = require("maxmind");
|
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 => {
|
geolite2.open('GeoLite2-City', path => {
|
||||||
return maxmind.open(path);
|
return maxmind.open(path);
|
||||||
}).catch(e => {throw e}).then(lookup => {
|
}).catch(e => {throw e}).then(lookup => {
|
||||||
|
@ -291,7 +291,7 @@ class Terminal {
|
|||||||
this.clipboard.didCopy = true;
|
this.clipboard.didCopy = true;
|
||||||
},
|
},
|
||||||
paste: () => {
|
paste: () => {
|
||||||
this.write(electron.remote.clipboard.readText());
|
this.write(remote.clipboard.readText());
|
||||||
this.clipboard.didCopy = false;
|
this.clipboard.didCopy = false;
|
||||||
},
|
},
|
||||||
didCopy: false
|
didCopy: false
|
||||||
|
@ -2,7 +2,8 @@ class UpdateChecker {
|
|||||||
constructor() {
|
constructor() {
|
||||||
let https = require("https");
|
let https = require("https");
|
||||||
let electron = require("electron");
|
let electron = require("electron");
|
||||||
let current = electron.remote.app.getVersion();
|
let remote = require("@electron/remote");
|
||||||
|
let current = remote.app.getVersion();
|
||||||
|
|
||||||
this._failed = false;
|
this._failed = false;
|
||||||
this._willfail = false;
|
this._willfail = false;
|
||||||
|
1476
src/package-lock.json
generated
1476
src/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -23,6 +23,7 @@
|
|||||||
},
|
},
|
||||||
"homepage": "https://github.com/GitSquared/edex-ui#readme",
|
"homepage": "https://github.com/GitSquared/edex-ui#readme",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"@electron/remote": "^1.1.0",
|
||||||
"augmented-ui": "^1.1.2",
|
"augmented-ui": "^1.1.2",
|
||||||
"color": "3.1.3",
|
"color": "3.1.3",
|
||||||
"geolite2-redist": "^2.0.3",
|
"geolite2-redist": "^2.0.3",
|
||||||
@ -36,7 +37,7 @@
|
|||||||
"shell-env": "3.0.1",
|
"shell-env": "3.0.1",
|
||||||
"signale": "1.4.0",
|
"signale": "1.4.0",
|
||||||
"smoothie": "1.35.0",
|
"smoothie": "1.35.0",
|
||||||
"systeminformation": "5.6.21",
|
"systeminformation": "5.7.2",
|
||||||
"tail": "2.2.2",
|
"tail": "2.2.2",
|
||||||
"username": "5.1.0",
|
"username": "5.1.0",
|
||||||
"which": "2.0.2",
|
"which": "2.0.2",
|
||||||
|
Loading…
Reference in New Issue
Block a user