Upgrade dependencies, electron 13, electron-builder next
This commit is contained in:
parent
600ea07377
commit
102aea4158
10
package.json
10
package.json
@ -31,15 +31,15 @@
|
|||||||
"@babel/core": "^7.9.6",
|
"@babel/core": "^7.9.6",
|
||||||
"@babel/preset-env": "^7.9.6",
|
"@babel/preset-env": "^7.9.6",
|
||||||
"@fortawesome/fontawesome-free": "^5.13.0",
|
"@fortawesome/fontawesome-free": "^5.13.0",
|
||||||
"@types/node": "^14.6.2",
|
"@types/node": "^14.17.1",
|
||||||
"@typescript-eslint/eslint-plugin": "^4.3.0",
|
"@typescript-eslint/eslint-plugin": "^4.3.0",
|
||||||
"@typescript-eslint/parser": "^4.3.0",
|
"@typescript-eslint/parser": "^4.3.0",
|
||||||
"babel-loader": "^8.1.0",
|
"babel-loader": "^8.1.0",
|
||||||
"concurrently": "^6.0.0",
|
"concurrently": "^6.0.0",
|
||||||
"copy-webpack-plugin": "^8.0.0",
|
"copy-webpack-plugin": "^9.0.0",
|
||||||
"css-loader": "^5.0.0",
|
"css-loader": "^5.0.0",
|
||||||
"electron": "^12.0.0",
|
"electron": "^13.0.0",
|
||||||
"electron-builder": "^22.4.0",
|
"electron-builder": "^22.11.5",
|
||||||
"eslint": "^7.10.0",
|
"eslint": "^7.10.0",
|
||||||
"file-loader": "^6.0.0",
|
"file-loader": "^6.0.0",
|
||||||
"imagemin": "^7.0.1",
|
"imagemin": "^7.0.1",
|
||||||
@ -89,6 +89,6 @@
|
|||||||
"icon": "resources/images/logo.png",
|
"icon": "resources/images/logo.png",
|
||||||
"category": "public.app-category.utilities"
|
"category": "public.app-category.utilities"
|
||||||
},
|
},
|
||||||
"electronVersion": "12.0.7"
|
"electronVersion": "13.0.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,13 +1,5 @@
|
|||||||
import path from "path";
|
import path from "path";
|
||||||
import {
|
import {clipboard, ContextMenuParams, dialog, ipcMain, Menu, MenuItem, session, shell, webContents,} from "electron";
|
||||||
clipboard,
|
|
||||||
ContextMenuParams,
|
|
||||||
dialog,
|
|
||||||
ipcMain,
|
|
||||||
Menu,
|
|
||||||
MenuItem, session, shell,
|
|
||||||
webContents,
|
|
||||||
} from "electron";
|
|
||||||
import ServiceSettingsWindow from "./ServiceSettingsWindow";
|
import ServiceSettingsWindow from "./ServiceSettingsWindow";
|
||||||
import SettingsWindow from "./SettingsWindow";
|
import SettingsWindow from "./SettingsWindow";
|
||||||
import Application from "../Application";
|
import Application from "../Application";
|
||||||
@ -460,7 +452,9 @@ export default class MainWindow extends Window {
|
|||||||
): void {
|
): void {
|
||||||
const service = this.config.services[serviceId];
|
const service = this.config.services[serviceId];
|
||||||
|
|
||||||
function getUrlDomain(url: string) {
|
function getUrlDomain(url: string | undefined) {
|
||||||
|
if (!url) return '';
|
||||||
|
|
||||||
const matches = url.match(/^https?:\/\/((.+?)\/|(.+))/i);
|
const matches = url.match(/^https?:\/\/((.+?)\/|(.+))/i);
|
||||||
if (matches !== null) {
|
if (matches !== null) {
|
||||||
let domain = matches[1];
|
let domain = matches[1];
|
||||||
|
Loading…
Reference in New Issue
Block a user