From f887513e0953ec8a15fd02c5a763b8ad26039822 Mon Sep 17 00:00:00 2001 From: smartfridge <37928912+smartfrigde@users.noreply.github.com> Date: Mon, 10 May 2021 16:35:07 +0200 Subject: [PATCH 01/63] Follow Discord tray behaviour --- main.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/main.js b/main.js index dd0ff40..565d915 100644 --- a/main.js +++ b/main.js @@ -73,6 +73,9 @@ function createWindow() { }, }, ]); + appIcon.on("click", () => { + mainWindow.show() + }); appIcon.setContextMenu(contextMenu); From 522ffa9ea0e9759390604a65f04fa7c7a0c6c5c8 Mon Sep 17 00:00:00 2001 From: smartfridge <37928912+smartfrigde@users.noreply.github.com> Date: Fri, 14 May 2021 16:59:42 +0200 Subject: [PATCH 02/63] Tweak electon-forge config --- package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 0eec7e7..dd09d8d 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,6 @@ "main": "main.js", "scripts": { "start": "electron-forge start", - "dist": "electron-builder", "test": "echo \"Error: no test specified\" && exit 1", "package": "electron-forge package", "publish": "electron-forge publish", @@ -44,7 +43,9 @@ "homepage": "https://github.com/smartfrigde/armcord#readme", "config": { "forge": { - "packagerConfig": {}, + "packagerConfig": { + "icon": "discord.png" + }, "makers": [ { "name": "@electron-forge/maker-squirrel", From d5012e79a15069bba3e97a33ce9e77322837d3e7 Mon Sep 17 00:00:00 2001 From: smartfridge <37928912+smartfrigde@users.noreply.github.com> Date: Fri, 14 May 2021 17:00:00 +0200 Subject: [PATCH 03/63] Bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index dd09d8d..3ff0d25 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "armcord", - "version": "2.4.0", + "version": "2.5.0", "description": "ArmCord is a Discord client made for ARM Linux that allows you to customize your experience.", "main": "main.js", "scripts": { From 3b35a9f8888f068834403e2e71f0a224649a24a9 Mon Sep 17 00:00:00 2001 From: smartfridge <37928912+smartfrigde@users.noreply.github.com> Date: Fri, 14 May 2021 17:03:08 +0200 Subject: [PATCH 04/63] Bump version and remove vulnerabilities (npm audit fix) --- package-lock.json | 74 +++++++++++++++++++++++------------------------ 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/package-lock.json b/package-lock.json index e5d0f06..86f2969 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { "name": "armcord", - "version": "2.3.0", + "version": "2.5.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "version": "2.3.0", + "version": "2.5.0", "license": "MIT", "dependencies": { "custom-electron-titlebar": "3.2.6", @@ -4029,6 +4029,12 @@ "node": ">=0.10.0" } }, + "node_modules/hosted-git-info": { + "version": "2.8.9", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", + "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", + "dev": true + }, "node_modules/http-cache-semantics": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz", @@ -4428,9 +4434,9 @@ } }, "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==", "dev": true }, "node_modules/lodash._reinterpolate": { @@ -5090,12 +5096,6 @@ "validate-npm-package-license": "^3.0.1" } }, - "node_modules/normalize-package-data/node_modules/hosted-git-info": { - "version": "2.8.8", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz", - "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==", - "dev": true - }, "node_modules/normalize-package-data/node_modules/semver": { "version": "5.7.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", @@ -5639,14 +5639,14 @@ } }, "node_modules/plist": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.1.tgz", - "integrity": "sha512-GpgvHHocGRyQm74b6FWEZZVRroHKE1I0/BTjAmySaohK+cUn+hZpbqXkc3KWgW3gQYkqcQej35FohcT0FRlkRQ==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.2.tgz", + "integrity": "sha512-MSrkwZBdQ6YapHy87/8hDU8MnIcyxBKjeF+McXnr5A9MtffPewTs7G3hlpodT5TacyfIyFTaJEhh3GGcmasTgQ==", "dev": true, "dependencies": { - "base64-js": "^1.2.3", + "base64-js": "^1.5.1", "xmlbuilder": "^9.0.7", - "xmldom": "0.1.x" + "xmldom": "^0.5.0" }, "engines": { "node": ">=6" @@ -6916,12 +6916,12 @@ } }, "node_modules/xmldom": { - "version": "0.1.31", - "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.31.tgz", - "integrity": "sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==", + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.5.0.tgz", + "integrity": "sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA==", "dev": true, "engines": { - "node": ">=0.1" + "node": ">=10.0.0" } }, "node_modules/xtend": { @@ -10308,6 +10308,12 @@ "parse-passwd": "^1.0.0" } }, + "hosted-git-info": { + "version": "2.8.9", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", + "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", + "dev": true + }, "http-cache-semantics": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz", @@ -10624,9 +10630,9 @@ } }, "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==", "dev": true }, "lodash._reinterpolate": { @@ -11155,12 +11161,6 @@ "validate-npm-package-license": "^3.0.1" }, "dependencies": { - "hosted-git-info": { - "version": "2.8.8", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz", - "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==", - "dev": true - }, "semver": { "version": "5.7.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", @@ -11579,14 +11579,14 @@ } }, "plist": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.1.tgz", - "integrity": "sha512-GpgvHHocGRyQm74b6FWEZZVRroHKE1I0/BTjAmySaohK+cUn+hZpbqXkc3KWgW3gQYkqcQej35FohcT0FRlkRQ==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.2.tgz", + "integrity": "sha512-MSrkwZBdQ6YapHy87/8hDU8MnIcyxBKjeF+McXnr5A9MtffPewTs7G3hlpodT5TacyfIyFTaJEhh3GGcmasTgQ==", "dev": true, "requires": { - "base64-js": "^1.2.3", + "base64-js": "^1.5.1", "xmlbuilder": "^9.0.7", - "xmldom": "0.1.x" + "xmldom": "^0.5.0" } }, "prepend-http": { @@ -12615,9 +12615,9 @@ "dev": true }, "xmldom": { - "version": "0.1.31", - "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.31.tgz", - "integrity": "sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==", + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.5.0.tgz", + "integrity": "sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA==", "dev": true }, "xtend": { From 7dab560a994f8708fb1ef7059a7e9984dccb6cdd Mon Sep 17 00:00:00 2001 From: smartfridge <37928912+smartfrigde@users.noreply.github.com> Date: Fri, 14 May 2021 17:17:39 +0200 Subject: [PATCH 05/63] Create theme.html --- theme.html | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 theme.html diff --git a/theme.html b/theme.html new file mode 100644 index 0000000..e69de29 From 38edef38ee77340a65740244b0aff208813c9c15 Mon Sep 17 00:00:00 2001 From: smartfridge <37928912+smartfrigde@users.noreply.github.com> Date: Fri, 14 May 2021 17:35:25 +0200 Subject: [PATCH 06/63] Add shortcut to theme manager and make base for it --- preload.js | 3 +++ renderer.js | 55 --------------------------------------- theme.html | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 78 insertions(+), 55 deletions(-) delete mode 100644 renderer.js diff --git a/preload.js b/preload.js index 137d858..52af680 100644 --- a/preload.js +++ b/preload.js @@ -22,6 +22,9 @@ window.addEventListener("DOMContentLoaded", () => { electronLocalshortcut.register(currentWindow, "F2", () => { window.location.href = "https://discord.com/invite/F25bc4RYDt"; }); + electronLocalshortcut.register(currentWindow, "F3", () => { + window.location.href = "./theme.html"; + }); require("./utils/capturer.js"); ArmCord.addStyle(` diff --git a/renderer.js b/renderer.js deleted file mode 100644 index d2ec9f5..0000000 --- a/renderer.js +++ /dev/null @@ -1,55 +0,0 @@ -// This file is required by the index.html file and will -// be executed in the renderer process for that window. -// All of the Node.js APIs are available in this process. -const remote = require('electron').remote; - -const win = remote.getCurrentWindow(); /* Note this is different to the -html global `window` variable */ - -// When document has loaded, initialise -document.onreadystatechange = (event) => { - if (document.readyState == "complete") { - handleWindowControls(); - - document.getElementById('electron-ver').innerHTML = `${process.versions.electron}` - } -}; - -window.onbeforeunload = (event) => { - /* If window is reloaded, remove win event listeners - (DOM element listeners get auto garbage collected but not - Electron win listeners as the win is not dereferenced unless closed) */ - win.removeAllListeners(); -} - -function handleWindowControls() { - // Make minimise/maximise/restore/close buttons work when they are clicked - document.getElementById('min-button').addEventListener("click", event => { - win.minimize(); - }); - - document.getElementById('max-button').addEventListener("click", event => { - win.maximize(); - }); - - document.getElementById('restore-button').addEventListener("click", event => { - win.unmaximize(); - }); - - document.getElementById('close-button').addEventListener("click", event => { - win.close(); - }); - - // Toggle maximise/restore buttons when maximisation/unmaximisation occurs - toggleMaxRestoreButtons(); - win.on('maximize', toggleMaxRestoreButtons); - win.on('unmaximize', toggleMaxRestoreButtons); - - function toggleMaxRestoreButtons() { - if (win.isMaximized()) { - document.body.classList.add('maximized'); - } else { - document.body.classList.remove('maximized'); - } - } -} \ No newline at end of file diff --git a/theme.html b/theme.html index e69de29..569d7dd 100644 --- a/theme.html +++ b/theme.html @@ -0,0 +1,75 @@ + + + + + + ArmCord Theme Manager + + + + + + + + + \ No newline at end of file From 9608851fa240c93674cffe6f80a024abc5e8f5e0 Mon Sep 17 00:00:00 2001 From: smartfridge <37928912+smartfrigde@users.noreply.github.com> Date: Fri, 14 May 2021 18:01:52 +0200 Subject: [PATCH 07/63] Theme Manager test --- preload.js | 2 +- utils/theme.js | 7 +++++++ utils/themes/revertBrand.css | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 utils/theme.js create mode 100644 utils/themes/revertBrand.css diff --git a/preload.js b/preload.js index 52af680..80e8eb5 100644 --- a/preload.js +++ b/preload.js @@ -2,7 +2,7 @@ const customTitlebar = require("custom-electron-titlebar"); const electronLocalshortcut = require("electron-localshortcut"); const { remote } = require("electron"); const ArmCord = require("./utils/ArmCord.js"); - +require('./utils/theme.js') window.addEventListener("DOMContentLoaded", () => { new customTitlebar.Titlebar({ backgroundColor: customTitlebar.Color.fromHex("#202225"), diff --git a/utils/theme.js b/utils/theme.js new file mode 100644 index 0000000..e9b5d63 --- /dev/null +++ b/utils/theme.js @@ -0,0 +1,7 @@ +const themeFolder = __dirname + "/themes/"; +const fs = require("fs"); +const armcord = require("./armcord.js") +fs.readdirSync(themeFolder).forEach((file) => { + armcord.addStyle(fs.readFileSync(file)) + console.log(file) +}); diff --git a/utils/themes/revertBrand.css b/utils/themes/revertBrand.css new file mode 100644 index 0000000..104ae18 --- /dev/null +++ b/utils/themes/revertBrand.css @@ -0,0 +1 @@ +@import url('https://Goose-Nest.github.io/GT-RevertRebrand/src/main.css'); \ No newline at end of file From 41306d6cde2211cc49ad898cabaf9cf9f3f0b599 Mon Sep 17 00:00:00 2001 From: smartfridge <37928912+smartfrigde@users.noreply.github.com> Date: Fri, 14 May 2021 20:27:59 +0200 Subject: [PATCH 08/63] Add barebones theme loading! --- utils/theme.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/utils/theme.js b/utils/theme.js index e9b5d63..d5605e6 100644 --- a/utils/theme.js +++ b/utils/theme.js @@ -1,7 +1,14 @@ const themeFolder = __dirname + "/themes/"; const fs = require("fs"); const armcord = require("./armcord.js") +window.addEventListener("DOMContentLoaded", () => { fs.readdirSync(themeFolder).forEach((file) => { - armcord.addStyle(fs.readFileSync(file)) - console.log(file) + console.log(file); + try { + const style = fs.readFileSync(`${__dirname}/themes/${file}`, "utf8"); + armcord.addStyle(style) + } catch (err) { + console.error(err); + } }); +}) From 8d3b5f523adb7986014a4a599e7b0917686097a1 Mon Sep 17 00:00:00 2001 From: smartfridge <37928912+smartfrigde@users.noreply.github.com> Date: Fri, 14 May 2021 21:47:01 +0200 Subject: [PATCH 09/63] i have no idea what i am doing --- preload.js | 2 +- theme.html | 122 +++++++++++++++++------------------ utils/theme.js | 63 +++++++++++++++--- utils/themes/revertBrand.css | 8 +++ 4 files changed, 121 insertions(+), 74 deletions(-) diff --git a/preload.js b/preload.js index 80e8eb5..6f4238e 100644 --- a/preload.js +++ b/preload.js @@ -23,7 +23,7 @@ window.addEventListener("DOMContentLoaded", () => { window.location.href = "https://discord.com/invite/F25bc4RYDt"; }); electronLocalshortcut.register(currentWindow, "F3", () => { - window.location.href = "./theme.html"; + window.location.href = __dirname + "/theme.html"; }); require("./utils/capturer.js"); diff --git a/theme.html b/theme.html index 569d7dd..6533388 100644 --- a/theme.html +++ b/theme.html @@ -1,75 +1,71 @@ + + + ArmCord Theme Manager + + - .container { - position: fixed; - top: 50%; - left: 50%; - color: #fff; - transform: translate(-50%, -50%); - } - - - - - - - - - \ No newline at end of file + + +
+ + diff --git a/utils/theme.js b/utils/theme.js index d5605e6..9097ac7 100644 --- a/utils/theme.js +++ b/utils/theme.js @@ -1,14 +1,57 @@ const themeFolder = __dirname + "/themes/"; const fs = require("fs"); -const armcord = require("./armcord.js") -window.addEventListener("DOMContentLoaded", () => { -fs.readdirSync(themeFolder).forEach((file) => { - console.log(file); - try { - const style = fs.readFileSync(`${__dirname}/themes/${file}`, "utf8"); - armcord.addStyle(style) - } catch (err) { - console.error(err); +const armcord = require("./armcord.js"); +const splitRegex = /[^\S\r\n]*?\r?(?:\r\n|\n)[^\S\r\n]*?\*[^\S\r\n]?/; +const escapedAtRegex = /^\\@/; +function parseMeta(fileContent) { + //https://github.com/rauenzi/BetterDiscordApp/blob/01941c1178c13e1229e39e1f1434678a39a020b8/renderer/src/modules/addonmanager.js + const block = fileContent.split("/**", 2)[1].split("*/", 1)[0]; + const out = {}; + let field = ""; + let accum = ""; + for (const line of block.split(splitRegex)) { + if (line.length === 0) continue; + if (line.charAt(0) === "@" && line.charAt(1) !== " ") { + out[field] = accum; + const l = line.indexOf(" "); + field = line.substr(1, l - 1); + accum = line.substr(l + 1); + } else { + accum += " " + line.replace("\\n", "\n").replace(escapedAtRegex, "@"); + } } + out[field] = accum.trim(); + delete out[""]; + out.format = "jsdoc"; + return out; +} +function loadPluginMenu() { + window.addEventListener("DOMContentLoaded", () => { + fs.readdirSync(themeFolder).forEach((file) => { + console.log(file); + try { + const style = fs.readFileSync(`${__dirname}/themes/${file}`, "utf8"); + document.getElementById("tm-list").appendChild( + ` +

${parseMeta(style)}

+ ` + ); + } catch (err) { + console.error(err); + } + }); + }); +} + +window.addEventListener("DOMContentLoaded", () => { + loadPluginMenu() + fs.readdirSync(themeFolder).forEach((file) => { + console.log(file); + try { + const style = fs.readFileSync(`${__dirname}/themes/${file}`, "utf8"); + armcord.addStyle(style); + } catch (err) { + console.error(err); + } + }); }); -}) diff --git a/utils/themes/revertBrand.css b/utils/themes/revertBrand.css index 104ae18..c342047 100644 --- a/utils/themes/revertBrand.css +++ b/utils/themes/revertBrand.css @@ -1 +1,9 @@ +/** + * @name Revert Rebrand + * @author GooseNest + * @description Reverts Discord's 2021 rebrand (font, colors, reactions, mentions, loading screen, home icon, reply ping color, and more) + * @invite neMncS2 + * @version 3.0 +*/ + @import url('https://Goose-Nest.github.io/GT-RevertRebrand/src/main.css'); \ No newline at end of file From 6232c01006b4b87b5f8255e471ffd6b3b592274d Mon Sep 17 00:00:00 2001 From: smartfridge <37928912+smartfrigde@users.noreply.github.com> Date: Fri, 14 May 2021 22:54:40 +0200 Subject: [PATCH 10/63] Partial Powercord Theme Support --- utils/theme.js | 54 +--- utils/themes/GT-RevertRebrand-main/LICENSE | 21 ++ utils/themes/GT-RevertRebrand-main/README.md | 12 + .../RevertRebrand.theme.css} | 0 .../assets/authorized_apps_checkmark_icon.svg | 6 + .../assets/call_icon.svg | 3 + .../assets/mfa_lock_icon.svg | 11 + .../assets/server_join_icon.svg | 6 + .../themes/GT-RevertRebrand-main/gnTheme.mjs | 6 + .../GT-RevertRebrand-main/manifest.json | 8 + .../powercord_manifest.json | 8 + .../src/components/mentions.css | 14 + .../src/components/reactions.css | 39 +++ .../GT-RevertRebrand-main/src/general/bd.css | 4 + .../src/general/inputs.css | 48 ++++ .../src/general/other.css | 50 ++++ .../src/general/svgs.css | 25 ++ .../themes/GT-RevertRebrand-main/src/main.css | 249 ++++++++++++++++++ .../GT-RevertRebrand-main/src/main.scss | 11 + .../GT-RevertRebrand-main/src/variables.css | 66 +++++ 20 files changed, 595 insertions(+), 46 deletions(-) create mode 100644 utils/themes/GT-RevertRebrand-main/LICENSE create mode 100644 utils/themes/GT-RevertRebrand-main/README.md rename utils/themes/{revertBrand.css => GT-RevertRebrand-main/RevertRebrand.theme.css} (100%) create mode 100644 utils/themes/GT-RevertRebrand-main/assets/authorized_apps_checkmark_icon.svg create mode 100644 utils/themes/GT-RevertRebrand-main/assets/call_icon.svg create mode 100644 utils/themes/GT-RevertRebrand-main/assets/mfa_lock_icon.svg create mode 100644 utils/themes/GT-RevertRebrand-main/assets/server_join_icon.svg create mode 100644 utils/themes/GT-RevertRebrand-main/gnTheme.mjs create mode 100644 utils/themes/GT-RevertRebrand-main/manifest.json create mode 100644 utils/themes/GT-RevertRebrand-main/powercord_manifest.json create mode 100644 utils/themes/GT-RevertRebrand-main/src/components/mentions.css create mode 100644 utils/themes/GT-RevertRebrand-main/src/components/reactions.css create mode 100644 utils/themes/GT-RevertRebrand-main/src/general/bd.css create mode 100644 utils/themes/GT-RevertRebrand-main/src/general/inputs.css create mode 100644 utils/themes/GT-RevertRebrand-main/src/general/other.css create mode 100644 utils/themes/GT-RevertRebrand-main/src/general/svgs.css create mode 100644 utils/themes/GT-RevertRebrand-main/src/main.css create mode 100644 utils/themes/GT-RevertRebrand-main/src/main.scss create mode 100644 utils/themes/GT-RevertRebrand-main/src/variables.css diff --git a/utils/theme.js b/utils/theme.js index 9097ac7..825f674 100644 --- a/utils/theme.js +++ b/utils/theme.js @@ -1,55 +1,17 @@ -const themeFolder = __dirname + "/themes/"; const fs = require("fs"); const armcord = require("./armcord.js"); -const splitRegex = /[^\S\r\n]*?\r?(?:\r\n|\n)[^\S\r\n]*?\*[^\S\r\n]?/; -const escapedAtRegex = /^\\@/; -function parseMeta(fileContent) { - //https://github.com/rauenzi/BetterDiscordApp/blob/01941c1178c13e1229e39e1f1434678a39a020b8/renderer/src/modules/addonmanager.js - const block = fileContent.split("/**", 2)[1].split("*/", 1)[0]; - const out = {}; - let field = ""; - let accum = ""; - for (const line of block.split(splitRegex)) { - if (line.length === 0) continue; - if (line.charAt(0) === "@" && line.charAt(1) !== " ") { - out[field] = accum; - const l = line.indexOf(" "); - field = line.substr(1, l - 1); - accum = line.substr(l + 1); - } else { - accum += " " + line.replace("\\n", "\n").replace(escapedAtRegex, "@"); - } - } - out[field] = accum.trim(); - delete out[""]; - out.format = "jsdoc"; - return out; -} -function loadPluginMenu() { - window.addEventListener("DOMContentLoaded", () => { - fs.readdirSync(themeFolder).forEach((file) => { - console.log(file); - try { - const style = fs.readFileSync(`${__dirname}/themes/${file}`, "utf8"); - document.getElementById("tm-list").appendChild( - ` -

${parseMeta(style)}

- ` - ); - } catch (err) { - console.error(err); - } - }); - }); -} - +const themeFolder = __dirname + "/themes/"; window.addEventListener("DOMContentLoaded", () => { - loadPluginMenu() fs.readdirSync(themeFolder).forEach((file) => { console.log(file); try { - const style = fs.readFileSync(`${__dirname}/themes/${file}`, "utf8"); - armcord.addStyle(style); + const manifest = fs.readFileSync(`${__dirname}/themes/${file}/manifest.json`, "utf8"); + var themeFile = JSON.parse(manifest); + console.log(themeFile.theme); + console.log(themeFile) + const theme = fs.readFileSync(`${__dirname}/themes/${file}/${themeFile.theme}`, "utf8"); + armcord.addStyle(theme) + console.log(`Loaded ${themeFile.name} made by ${themeFile.author}`); } catch (err) { console.error(err); } diff --git a/utils/themes/GT-RevertRebrand-main/LICENSE b/utils/themes/GT-RevertRebrand-main/LICENSE new file mode 100644 index 0000000..3cf6dad --- /dev/null +++ b/utils/themes/GT-RevertRebrand-main/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2021 GooseNest + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/utils/themes/GT-RevertRebrand-main/README.md b/utils/themes/GT-RevertRebrand-main/README.md new file mode 100644 index 0000000..e463215 --- /dev/null +++ b/utils/themes/GT-RevertRebrand-main/README.md @@ -0,0 +1,12 @@ +# GT-RevertRebrand + +Reverts Discord's 2021 rebrand (font, colors, reactions, mentions, loading screen, home icon, reply ping color, and more) + +## Mods Supported + +- Powercord +- BetterDiscord +- Vizality + +## Screenshots + diff --git a/utils/themes/revertBrand.css b/utils/themes/GT-RevertRebrand-main/RevertRebrand.theme.css similarity index 100% rename from utils/themes/revertBrand.css rename to utils/themes/GT-RevertRebrand-main/RevertRebrand.theme.css diff --git a/utils/themes/GT-RevertRebrand-main/assets/authorized_apps_checkmark_icon.svg b/utils/themes/GT-RevertRebrand-main/assets/authorized_apps_checkmark_icon.svg new file mode 100644 index 0000000..c379d0e --- /dev/null +++ b/utils/themes/GT-RevertRebrand-main/assets/authorized_apps_checkmark_icon.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/utils/themes/GT-RevertRebrand-main/assets/call_icon.svg b/utils/themes/GT-RevertRebrand-main/assets/call_icon.svg new file mode 100644 index 0000000..63cbd39 --- /dev/null +++ b/utils/themes/GT-RevertRebrand-main/assets/call_icon.svg @@ -0,0 +1,3 @@ + + + diff --git a/utils/themes/GT-RevertRebrand-main/assets/mfa_lock_icon.svg b/utils/themes/GT-RevertRebrand-main/assets/mfa_lock_icon.svg new file mode 100644 index 0000000..67d2121 --- /dev/null +++ b/utils/themes/GT-RevertRebrand-main/assets/mfa_lock_icon.svg @@ -0,0 +1,11 @@ + + + icon-green-lock + Created with Sketch. + + + + + + + diff --git a/utils/themes/GT-RevertRebrand-main/assets/server_join_icon.svg b/utils/themes/GT-RevertRebrand-main/assets/server_join_icon.svg new file mode 100644 index 0000000..419984e --- /dev/null +++ b/utils/themes/GT-RevertRebrand-main/assets/server_join_icon.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/utils/themes/GT-RevertRebrand-main/gnTheme.mjs b/utils/themes/GT-RevertRebrand-main/gnTheme.mjs new file mode 100644 index 0000000..0661ae4 --- /dev/null +++ b/utils/themes/GT-RevertRebrand-main/gnTheme.mjs @@ -0,0 +1,6 @@ +export default { + name: 'Revert Rebrand', + description: 'Reverts Discord\'s 2021 rebrand (font, colors, reactions, mentions, loading screen, home icon, reply ping color, and more)', + version: '3.0', + screenshots: [] +}; diff --git a/utils/themes/GT-RevertRebrand-main/manifest.json b/utils/themes/GT-RevertRebrand-main/manifest.json new file mode 100644 index 0000000..c464284 --- /dev/null +++ b/utils/themes/GT-RevertRebrand-main/manifest.json @@ -0,0 +1,8 @@ +{ + "name": "Revert Rebrand", + "description": "Reverts Discord's 2021 rebrand (font, colors, reactions, mentions, loading screen, home icon, reply ping color, and more)", + "version": "3.0", + "author": "GooseNest", + "license": "MIT", + "theme": "src/main.scss" +} \ No newline at end of file diff --git a/utils/themes/GT-RevertRebrand-main/powercord_manifest.json b/utils/themes/GT-RevertRebrand-main/powercord_manifest.json new file mode 100644 index 0000000..c464284 --- /dev/null +++ b/utils/themes/GT-RevertRebrand-main/powercord_manifest.json @@ -0,0 +1,8 @@ +{ + "name": "Revert Rebrand", + "description": "Reverts Discord's 2021 rebrand (font, colors, reactions, mentions, loading screen, home icon, reply ping color, and more)", + "version": "3.0", + "author": "GooseNest", + "license": "MIT", + "theme": "src/main.scss" +} \ No newline at end of file diff --git a/utils/themes/GT-RevertRebrand-main/src/components/mentions.css b/utils/themes/GT-RevertRebrand-main/src/components/mentions.css new file mode 100644 index 0000000..55b6071 --- /dev/null +++ b/utils/themes/GT-RevertRebrand-main/src/components/mentions.css @@ -0,0 +1,14 @@ +/* Revert mentions and channel links */ +#app-mount .wrapper-3WhCwL { + color: var(--brand-experiment-400); + background: var(--brand-experiment-10a); +} + +#app-mount .wrapper-3WhCwL:hover { + background: var(--brand-experiment-25a); +} + +/* Hide semi-transparent background if mentioned in message */ +/* .mentioned-xhSam7 .mention { + background: transparent !important; +} */ \ No newline at end of file diff --git a/utils/themes/GT-RevertRebrand-main/src/components/reactions.css b/utils/themes/GT-RevertRebrand-main/src/components/reactions.css new file mode 100644 index 0000000..112f25c --- /dev/null +++ b/utils/themes/GT-RevertRebrand-main/src/components/reactions.css @@ -0,0 +1,39 @@ +/* Revert reactions */ +.reaction-1hd86g { + border-radius: .25rem; + background: var(--background-modifier-selected); + + border-color: transparent !important; + + margin-right: 3px; +} + +.reaction-1hd86g .reactionCount-2mvXRV { + color: var(--text-muted); /* A11Y-- */ +} + +.reaction-1hd86g .reactionInner-15NvIl { + padding: 0 4.5px; +} + +/* Self reactions */ +.reaction-1hd86g.reactionMe-wv5HKu .reactionCount-2mvXRV { + color: var(--brand-experiment); /* A11Y-- */ +} + +.reaction-1hd86g.reactionMe-wv5HKu { + background-color: var(--brand-experiment-30a); +} + +/* Reaction hover */ +.reaction-1hd86g:hover .reactionCount-2mvXRV { + color: var(--interactive-active) !important; +} + +.reaction-1hd86g:hover { + background-color: var(--background-modifier-selected); +} + +.reaction-1hd86g.reactionMe-wv5HKu:hover { + background-color: var(--brand-experiment-40a); +} \ No newline at end of file diff --git a/utils/themes/GT-RevertRebrand-main/src/general/bd.css b/utils/themes/GT-RevertRebrand-main/src/general/bd.css new file mode 100644 index 0000000..00a66a0 --- /dev/null +++ b/utils/themes/GT-RevertRebrand-main/src/general/bd.css @@ -0,0 +1,4 @@ +/* Color BD specific settings elements */ +.bd-addon-views .bd-view-button.selected, .bd-button { + background-color: var(--brand-experiment); +} \ No newline at end of file diff --git a/utils/themes/GT-RevertRebrand-main/src/general/inputs.css b/utils/themes/GT-RevertRebrand-main/src/general/inputs.css new file mode 100644 index 0000000..be56f71 --- /dev/null +++ b/utils/themes/GT-RevertRebrand-main/src/general/inputs.css @@ -0,0 +1,48 @@ +/* Restyle the create server and discovery buttons to the old green */ +.circleIconButton-1QV--U.circleButtonBase-2DCxIZ { + color: var(--old-green); +} +.circleIconButton-1QV--U.circleButtonBase-2DCxIZ.selected-1JjBPm { + color: white; + background-color: var(--old-green); +} + +/* On switches to old green */ +.container-3auIfb[style="opacity: 1; background-color: rgb(59, 165, 92);"] { + background-color: var(--old-green) !important; +} + +/* Text input focus border color is now focus / link, change back to original brand color */ +.input-cIJ7To.focused-1mmYsC, .input-cIJ7To:focus { + border-color: var(--brand-experiment); +} + +/* Restyle the create server and discovery buttons to the old green */ +.circleIconButton-1QV--U.circleButtonBase-2DCxIZ { + color: var(--old-green); +} +.circleIconButton-1QV--U.circleButtonBase-2DCxIZ.selected-1JjBPm { + color: white; + background-color: var(--old-green); +} + +/* On switches to old green */ +.container-3auIfb[style="opacity: 1; background-color: rgb(59, 165, 92);"] { + background-color: var(--old-green) !important; +} + +/* Text input focus border color is now focus / link, change back to original brand color */ +.input-cIJ7To.focused-1mmYsC, .input-cIJ7To:focus { + border-color: var(--brand-experiment); +} + +/* Change all radio bars with the new green to the old green */ +/* In particular, this fixes the privacy and safety settings' 'keep me safe' option */ +.radioBar-bMNUI-[style*="--radio-bar-accent-color:#3ba55c"] { + --radio-bar-accent-color: var(--old-green) !important; +} + +/* Revert ping mention button being link colored (used to be brand) */ +.colorLink-2vG20E.size14-e6ZScH.mentionButton-3710-W { + color: var(--brand-experiment) !important; +} \ No newline at end of file diff --git a/utils/themes/GT-RevertRebrand-main/src/general/other.css b/utils/themes/GT-RevertRebrand-main/src/general/other.css new file mode 100644 index 0000000..292c5cb --- /dev/null +++ b/utils/themes/GT-RevertRebrand-main/src/general/other.css @@ -0,0 +1,50 @@ +/* Change green colorables from the new green color to the old green color. */ +/* In particular, this fixes the join call buttons, but it may also fix other stuff around the app */ +.colorable-1bkp8v.green-plH-Mj { + background-color: var(--old-green); +} + +/* Verified check mark color */ +.verified-1eC5dy { + color: var(--old-green); +} + +/* Fix the speaking ring around your avatar in the bottom left corner of your screen */ +.avatarSpeaking-2c8-9i { + box-shadow: inset 0 0 0 2px var(--old-green), inset 0 0 0 3px #2f3136; +} + +/* And fix speaking avatars in calls in general */ +.speaking-B2MXPi.border-Jn5IOt { + box-shadow: inset 0 0 0 2px var(--old-green), inset 0 0 0 3px #2f3136; +} + +/* Revert new Nitro icon by setting item */ +.premiumTabItem-1QTfBr .icon-Zc-uZZ { + display: none; +} + +/* Online status */ +.wrapper-3t9DeA rect.pointerEvents-2zdfdO[mask="url(#svg-mask-status-online)"]:not([fill="#ffffff"]) { + fill: var(--old-green); +} + +/* Online status (mobile) */ +.wrapper-3t9DeA rect.pointerEvents-2zdfdO[mask="url(#svg-mask-status-online-mobile)"]:not([fill="#ffffff"]) { + fill: var(--old-green); +} + +/* Online status (typing and other) */ +.wrapper-3t9DeA svg.cursorDefault-dsQJ1n > rect[fill="#3ba55c"] { + fill: var(--old-green); +} + +/* Revert loading tip title color */ +.tipTitle-GL9qAt { + color: var(--brand-experiment) !important; +} + +/* Revert home icon */ +.homeIcon-FuNwkv > path { + d: path("M 20.6644 20 C 20.6644 20 19.8014 18.9762 19.0822 18.0714 C 22.2226 17.1905 23.4212 15.2381 23.4212 15.2381 C 22.4384 15.881 21.5034 16.3334 20.6644 16.6429 C 19.4658 17.1429 18.3151 17.4762 17.1884 17.6667 C 14.887 18.0953 12.7774 17.9762 10.9795 17.6429 C 9.61301 17.381 8.43836 17 7.45548 16.6191 C 6.90411 16.4048 6.30479 16.1429 5.70548 15.8096 C 5.63356 15.7619 5.56164 15.7381 5.48973 15.6905 C 5.44178 15.6667 5.41781 15.6429 5.39384 15.6191 C 4.96233 15.381 4.7226 15.2143 4.7226 15.2143 C 4.7226 15.2143 5.87329 17.1191 8.91781 18.0238 C 8.19863 18.9286 7.31164 20 7.31164 20 C 2.0137 19.8333 0 16.381 0 16.381 C 0 8.7144 3.45205 2.50017 3.45205 2.50017 C 6.90411 -0.07123 10.1884 0.000197861 10.1884 0.000197861 L 10.4281 0.285909 C 6.11301 1.52399 4.12329 3.40493 4.12329 3.40493 C 4.12329 3.40493 4.65068 3.11921 5.53767 2.71446 C 8.10274 1.59542 10.1404 1.2859 10.9795 1.21447 C 11.1233 1.19066 11.2432 1.16685 11.387 1.16685 C 12.8493 0.976379 14.5034 0.92876 16.2295 1.11923 C 18.5068 1.38114 20.9521 2.0478 23.4452 3.40493 C 23.4452 3.40493 21.5514 1.61923 17.476 0.381146 L 17.8116 0.000197861 C 17.8116 0.000197861 21.0959 -0.07123 24.5479 2.50017 C 24.5479 2.50017 28 8.7144 28 16.381 C 28 16.381 25.9623 19.8333 20.6644 20 Z M 9.51712 8.88106 C 8.15068 8.88106 7.07192 10.0715 7.07192 11.5239 C 7.07192 12.9763 8.17466 14.1667 9.51712 14.1667 C 10.8836 14.1667 11.9623 12.9763 11.9623 11.5239 C 11.9863 10.0715 10.8836 8.88106 9.51712 8.88106 Z M 18.2671 8.88106 C 16.9007 8.88106 15.8219 10.0715 15.8219 11.5239 C 15.8219 12.9763 16.9247 14.1667 18.2671 14.1667 C 19.6336 14.1667 20.7123 12.9763 20.7123 11.5239 C 20.7123 10.0715 19.6336 8.88106 18.2671 8.88106 Z"); +} \ No newline at end of file diff --git a/utils/themes/GT-RevertRebrand-main/src/general/svgs.css b/utils/themes/GT-RevertRebrand-main/src/general/svgs.css new file mode 100644 index 0000000..279f5a8 --- /dev/null +++ b/utils/themes/GT-RevertRebrand-main/src/general/svgs.css @@ -0,0 +1,25 @@ +/* Fix misc SVGs that for some reason sometimes weren't targeted by the previous rules (particularly presence SVGs) */ +*[fill="#3ba55c"] { + fill: var(--old-green); +} + +/* Fix the call icons in chat */ +.icon-2Po-VO.iconSize-2tmqqh[style='background-image: url("/assets/7f75ab26bc5deb393cd8db44d9fe14e7.svg");'] { + background-image: url("https://Goose-Nest.github.io/GT-RevertRebrand/assets/call_icon.svg") !important; +} + +/* Server join icon to old green (arrow left to join system message) */ +.icon-2Po-VO.iconSize-2tmqqh[style='background-image: url("/assets/e06a573355c490f7ce6e3125ac01db81.svg");'] { + background-image: url("https://Goose-Nest.github.io/GT-RevertRebrand/assets/server_join_icon.svg") !important; +} + +/* Change the lock icon in the settings, it's an img tag so we need to use the content: css attribute instead of background-image */ +.lockIcon-2Hj8Tq[src="/assets/acea8fd38500a12d0509c027a274caaa.svg"] { + content: url("https://Goose-Nest.github.io/GT-RevertRebrand/assets/mfa_lock_icon.svg") !important; +} + +/* Permission checkmarks in authorized apps to the old green */ +/* The images in these are specified by class, so it's impossible to get more specific of a match than this */ +.permissionCheckmark-1SeKr2 { + background: url("https://Goose-Nest.github.io/GT-RevertRebrand/assets/authorized_apps_checkmark_icon.svg") no-repeat; +} \ No newline at end of file diff --git a/utils/themes/GT-RevertRebrand-main/src/main.css b/utils/themes/GT-RevertRebrand-main/src/main.css new file mode 100644 index 0000000..6bb8149 --- /dev/null +++ b/utils/themes/GT-RevertRebrand-main/src/main.css @@ -0,0 +1,249 @@ +body { + /* Revert new green to old color */ + --old-green: #43b581; + --info-positive-foreground: var(--old-green); + --status-positive-background: var(--old-green); + --text-positive: var(--old-green); + /* Revert new red to old color */ + --old-red: #f04747; + --text-danger: var(--old-red); + --info-danger-foreground: var(--old-red); + --status-danger-background: var(--old-red); + /* Revert to old font var */ + --font-display: var(--font-primary); + /* Found in Discord's CSS file: oldBrand vs newBrand HTML class - here we force old brand vars via copying */ + --brand-experiment-100: #f8f9fd; + --brand-experiment-130: #f2f4fc; + --brand-experiment-160: #ebeefa; + --brand-experiment-200: #e3e7f8; + --brand-experiment-230: #dae0f5; + --brand-experiment-260: #d1d9f3; + --brand-experiment-300: #c7d0f0; + --brand-experiment-330: #b5c1ec; + --brand-experiment-360: #a5b3e7; + --brand-experiment-400: #8ea1e1; + --brand-experiment-430: #869adf; + --brand-experiment-460: #7d92dd; + --brand-experiment: #7289da; + --brand-experiment-500: #7289da; + --brand-experiment-530: #687dc6; + --brand-experiment-560: #5c6fb1; + --brand-experiment-600: #4e5d94; + --brand-experiment-630: #435180; + --brand-experiment-660: #3b4770; + --brand-experiment-700: #2e3757; + --brand-experiment-730: #2b3352; + --brand-experiment-760: #272f4b; + --brand-experiment-800: #222941; + --brand-experiment-830: #1a2032; + --brand-experiment-860: #111521; + --brand-experiment-900: #06070b; + --brand-experiment-05a: rgba(114,137,218,0.05); + --brand-experiment-10a: rgba(114,137,218,0.1); + --brand-experiment-15a: rgba(114,137,218,0.15); + --brand-experiment-20a: rgba(114,137,218,0.2); + --brand-experiment-25a: rgba(114,137,218,0.25); + --brand-experiment-30a: rgba(114,137,218,0.3); + --brand-experiment-35a: rgba(114,137,218,0.35); + --brand-experiment-40a: rgba(114,137,218,0.4); + --brand-experiment-45a: rgba(114,137,218,0.45); + --brand-experiment-50a: rgba(114,137,218,0.5); + --brand-experiment-55a: rgba(114,137,218,0.55); + --brand-experiment-60a: rgba(114,137,218,0.6); + --brand-experiment-65a: rgba(114,137,218,0.65); + --brand-experiment-70a: rgba(114,137,218,0.7); + --brand-experiment-75a: rgba(114,137,218,0.75); + --brand-experiment-80a: rgba(114,137,218,0.8); + --brand-experiment-85a: rgba(114,137,218,0.85); + --brand-experiment-90a: rgba(114,137,218,0.9); + --brand-experiment-95a: rgba(114,137,218,0.95); +} + +/* Revert mentions and channel links */ +#app-mount .wrapper-3WhCwL { + color: var(--brand-experiment-400); + background: var(--brand-experiment-10a); +} + +#app-mount .wrapper-3WhCwL:hover { + background: var(--brand-experiment-25a); +} + +/* Hide semi-transparent background if mentioned in message */ +/* .mentioned-xhSam7 .mention { + background: transparent !important; +} */ +/* Revert reactions */ +.reaction-1hd86g { + border-radius: 0.25rem; + background: var(--background-modifier-selected); + border-color: transparent !important; + margin-right: 3px; +} + +.reaction-1hd86g .reactionCount-2mvXRV { + color: var(--text-muted); + /* A11Y-- */ +} + +.reaction-1hd86g .reactionInner-15NvIl { + padding: 0 4.5px; +} + +/* Self reactions */ +.reaction-1hd86g.reactionMe-wv5HKu .reactionCount-2mvXRV { + color: var(--brand-experiment); + /* A11Y-- */ +} + +.reaction-1hd86g.reactionMe-wv5HKu { + background-color: var(--brand-experiment-30a); +} + +/* Reaction hover */ +.reaction-1hd86g:hover .reactionCount-2mvXRV { + color: var(--interactive-active) !important; +} + +.reaction-1hd86g:hover { + background-color: var(--background-modifier-selected); +} + +.reaction-1hd86g.reactionMe-wv5HKu:hover { + background-color: var(--brand-experiment-40a); +} + +/* Color BD specific settings elements */ +.bd-addon-views .bd-view-button.selected, .bd-button { + background-color: var(--brand-experiment); +} + +/* Restyle the create server and discovery buttons to the old green */ +.circleIconButton-1QV--U.circleButtonBase-2DCxIZ { + color: var(--old-green); +} + +.circleIconButton-1QV--U.circleButtonBase-2DCxIZ.selected-1JjBPm { + color: white; + background-color: var(--old-green); +} + +/* On switches to old green */ +.container-3auIfb[style="opacity: 1; background-color: rgb(59, 165, 92);"] { + background-color: var(--old-green) !important; +} + +/* Text input focus border color is now focus / link, change back to original brand color */ +.input-cIJ7To.focused-1mmYsC, .input-cIJ7To:focus { + border-color: var(--brand-experiment); +} + +/* Restyle the create server and discovery buttons to the old green */ +.circleIconButton-1QV--U.circleButtonBase-2DCxIZ { + color: var(--old-green); +} + +.circleIconButton-1QV--U.circleButtonBase-2DCxIZ.selected-1JjBPm { + color: white; + background-color: var(--old-green); +} + +/* On switches to old green */ +.container-3auIfb[style="opacity: 1; background-color: rgb(59, 165, 92);"] { + background-color: var(--old-green) !important; +} + +/* Text input focus border color is now focus / link, change back to original brand color */ +.input-cIJ7To.focused-1mmYsC, .input-cIJ7To:focus { + border-color: var(--brand-experiment); +} + +/* Change all radio bars with the new green to the old green */ +/* In particular, this fixes the privacy and safety settings' 'keep me safe' option */ +.radioBar-bMNUI-[style*="--radio-bar-accent-color:#3ba55c"] { + --radio-bar-accent-color: var(--old-green) !important; +} + +/* Revert ping mention button being link colored (used to be brand) */ +.colorLink-2vG20E.size14-e6ZScH.mentionButton-3710-W { + color: var(--brand-experiment) !important; +} + +/* Fix misc SVGs that for some reason sometimes weren't targeted by the previous rules (particularly presence SVGs) */ +*[fill="#3ba55c"] { + fill: var(--old-green); +} + +/* Fix the call icons in chat */ +.icon-2Po-VO.iconSize-2tmqqh[style='background-image: url("/assets/7f75ab26bc5deb393cd8db44d9fe14e7.svg");'] { + background-image: url("https://Goose-Nest.github.io/GT-RevertRebrand/assets/call_icon.svg") !important; +} + +/* Server join icon to old green (arrow left to join system message) */ +.icon-2Po-VO.iconSize-2tmqqh[style='background-image: url("/assets/e06a573355c490f7ce6e3125ac01db81.svg");'] { + background-image: url("https://Goose-Nest.github.io/GT-RevertRebrand/assets/server_join_icon.svg") !important; +} + +/* Change the lock icon in the settings, it's an img tag so we need to use the content: css attribute instead of background-image */ +.lockIcon-2Hj8Tq[src="/assets/acea8fd38500a12d0509c027a274caaa.svg"] { + content: url("https://Goose-Nest.github.io/GT-RevertRebrand/assets/mfa_lock_icon.svg") !important; +} + +/* Permission checkmarks in authorized apps to the old green */ +/* The images in these are specified by class, so it's impossible to get more specific of a match than this */ +.permissionCheckmark-1SeKr2 { + background: url("https://Goose-Nest.github.io/GT-RevertRebrand/assets/authorized_apps_checkmark_icon.svg") no-repeat; +} + +/* Change green colorables from the new green color to the old green color. */ +/* In particular, this fixes the join call buttons, but it may also fix other stuff around the app */ +.colorable-1bkp8v.green-plH-Mj { + background-color: var(--old-green); +} + +/* Verified check mark color */ +.verified-1eC5dy { + color: var(--old-green); +} + +/* Fix the speaking ring around your avatar in the bottom left corner of your screen */ +.avatarSpeaking-2c8-9i { + box-shadow: inset 0 0 0 2px var(--old-green), inset 0 0 0 3px #2f3136; +} + +/* And fix speaking avatars in calls in general */ +.speaking-B2MXPi.border-Jn5IOt { + box-shadow: inset 0 0 0 2px var(--old-green), inset 0 0 0 3px #2f3136; +} + +/* Revert new Nitro icon by setting item */ +.premiumTabItem-1QTfBr .icon-Zc-uZZ { + display: none; +} + +/* Online status */ +.wrapper-3t9DeA rect.pointerEvents-2zdfdO[mask="url(#svg-mask-status-online)"]:not([fill="#ffffff"]) { + fill: var(--old-green); +} + +/* Online status (mobile) */ +.wrapper-3t9DeA rect.pointerEvents-2zdfdO[mask="url(#svg-mask-status-online-mobile)"]:not([fill="#ffffff"]) { + fill: var(--old-green); +} + +/* Online status (typing and other) */ +.wrapper-3t9DeA svg.cursorDefault-dsQJ1n > rect[fill="#3ba55c"] { + fill: var(--old-green); +} + +/* Revert loading tip title color */ +.tipTitle-GL9qAt { + color: var(--brand-experiment) !important; +} + +/* Revert home icon */ +.homeIcon-FuNwkv > path { + d: path("M 20.6644 20 C 20.6644 20 19.8014 18.9762 19.0822 18.0714 C 22.2226 17.1905 23.4212 15.2381 23.4212 15.2381 C 22.4384 15.881 21.5034 16.3334 20.6644 16.6429 C 19.4658 17.1429 18.3151 17.4762 17.1884 17.6667 C 14.887 18.0953 12.7774 17.9762 10.9795 17.6429 C 9.61301 17.381 8.43836 17 7.45548 16.6191 C 6.90411 16.4048 6.30479 16.1429 5.70548 15.8096 C 5.63356 15.7619 5.56164 15.7381 5.48973 15.6905 C 5.44178 15.6667 5.41781 15.6429 5.39384 15.6191 C 4.96233 15.381 4.7226 15.2143 4.7226 15.2143 C 4.7226 15.2143 5.87329 17.1191 8.91781 18.0238 C 8.19863 18.9286 7.31164 20 7.31164 20 C 2.0137 19.8333 0 16.381 0 16.381 C 0 8.7144 3.45205 2.50017 3.45205 2.50017 C 6.90411 -0.07123 10.1884 0.000197861 10.1884 0.000197861 L 10.4281 0.285909 C 6.11301 1.52399 4.12329 3.40493 4.12329 3.40493 C 4.12329 3.40493 4.65068 3.11921 5.53767 2.71446 C 8.10274 1.59542 10.1404 1.2859 10.9795 1.21447 C 11.1233 1.19066 11.2432 1.16685 11.387 1.16685 C 12.8493 0.976379 14.5034 0.92876 16.2295 1.11923 C 18.5068 1.38114 20.9521 2.0478 23.4452 3.40493 C 23.4452 3.40493 21.5514 1.61923 17.476 0.381146 L 17.8116 0.000197861 C 17.8116 0.000197861 21.0959 -0.07123 24.5479 2.50017 C 24.5479 2.50017 28 8.7144 28 16.381 C 28 16.381 25.9623 19.8333 20.6644 20 Z M 9.51712 8.88106 C 8.15068 8.88106 7.07192 10.0715 7.07192 11.5239 C 7.07192 12.9763 8.17466 14.1667 9.51712 14.1667 C 10.8836 14.1667 11.9623 12.9763 11.9623 11.5239 C 11.9863 10.0715 10.8836 8.88106 9.51712 8.88106 Z M 18.2671 8.88106 C 16.9007 8.88106 15.8219 10.0715 15.8219 11.5239 C 15.8219 12.9763 16.9247 14.1667 18.2671 14.1667 C 19.6336 14.1667 20.7123 12.9763 20.7123 11.5239 C 20.7123 10.0715 19.6336 8.88106 18.2671 8.88106 Z"); +} + +/* Import all the CSS files */ \ No newline at end of file diff --git a/utils/themes/GT-RevertRebrand-main/src/main.scss b/utils/themes/GT-RevertRebrand-main/src/main.scss new file mode 100644 index 0000000..fcefb7c --- /dev/null +++ b/utils/themes/GT-RevertRebrand-main/src/main.scss @@ -0,0 +1,11 @@ +/* Import all the CSS files */ + +@use "variables"; + +@use "components/mentions"; +@use "components/reactions"; + +@use "general/bd"; +@use "general/inputs"; +@use "general/svgs"; +@use "general/other"; \ No newline at end of file diff --git a/utils/themes/GT-RevertRebrand-main/src/variables.css b/utils/themes/GT-RevertRebrand-main/src/variables.css new file mode 100644 index 0000000..24e4a46 --- /dev/null +++ b/utils/themes/GT-RevertRebrand-main/src/variables.css @@ -0,0 +1,66 @@ +body { + /* Revert new green to old color */ + --old-green: #43b581; + --info-positive-foreground: var(--old-green); + --status-positive-background: var(--old-green); + --text-positive: var(--old-green); + + /* Revert new red to old color */ + --old-red: #f04747; + --text-danger: var(--old-red); + --info-danger-foreground: var(--old-red); + --status-danger-background: var(--old-red); + + /* Revert to old font var */ + --font-display: var(--font-primary); + + /* Found in Discord's CSS file: oldBrand vs newBrand HTML class - here we force old brand vars via copying */ + --brand-experiment-100: #f8f9fd; + --brand-experiment-130: #f2f4fc; + --brand-experiment-160: #ebeefa; + --brand-experiment-200: #e3e7f8; + --brand-experiment-230: #dae0f5; + --brand-experiment-260: #d1d9f3; + --brand-experiment-300: #c7d0f0; + --brand-experiment-330: #b5c1ec; + --brand-experiment-360: #a5b3e7; + --brand-experiment-400: #8ea1e1; + --brand-experiment-430: #869adf; + --brand-experiment-460: #7d92dd; + + --brand-experiment: #7289da; + + --brand-experiment-500: #7289da; + --brand-experiment-530: #687dc6; + --brand-experiment-560: #5c6fb1; + --brand-experiment-600: #4e5d94; + --brand-experiment-630: #435180; + --brand-experiment-660: #3b4770; + --brand-experiment-700: #2e3757; + --brand-experiment-730: #2b3352; + --brand-experiment-760: #272f4b; + --brand-experiment-800: #222941; + --brand-experiment-830: #1a2032; + --brand-experiment-860: #111521; + --brand-experiment-900: #06070b; + + --brand-experiment-05a: rgba(114,137,218,0.05); + --brand-experiment-10a: rgba(114,137,218,0.1); + --brand-experiment-15a: rgba(114,137,218,0.15); + --brand-experiment-20a: rgba(114,137,218,0.2); + --brand-experiment-25a: rgba(114,137,218,0.25); + --brand-experiment-30a: rgba(114,137,218,0.3); + --brand-experiment-35a: rgba(114,137,218,0.35); + --brand-experiment-40a: rgba(114,137,218,0.4); + --brand-experiment-45a: rgba(114,137,218,0.45); + --brand-experiment-50a: rgba(114,137,218,0.5); + --brand-experiment-55a: rgba(114,137,218,0.55); + --brand-experiment-60a: rgba(114,137,218,0.6); + --brand-experiment-65a: rgba(114,137,218,0.65); + --brand-experiment-70a: rgba(114,137,218,0.7); + --brand-experiment-75a: rgba(114,137,218,0.75); + --brand-experiment-80a: rgba(114,137,218,0.8); + --brand-experiment-85a: rgba(114,137,218,0.85); + --brand-experiment-90a: rgba(114,137,218,0.9); + --brand-experiment-95a: rgba(114,137,218,0.95); +} \ No newline at end of file From 45d8b89c9e309759d20b35937d31c688d308828b Mon Sep 17 00:00:00 2001 From: smartfridge <37928912+smartfrigde@users.noreply.github.com> Date: Sat, 15 May 2021 12:35:22 +0200 Subject: [PATCH 11/63] Some tweaks to theme loading --- utils/theme.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/theme.js b/utils/theme.js index 825f674..dc92b95 100644 --- a/utils/theme.js +++ b/utils/theme.js @@ -10,8 +10,8 @@ window.addEventListener("DOMContentLoaded", () => { console.log(themeFile.theme); console.log(themeFile) const theme = fs.readFileSync(`${__dirname}/themes/${file}/${themeFile.theme}`, "utf8"); - armcord.addStyle(theme) - console.log(`Loaded ${themeFile.name} made by ${themeFile.author}`); + armcord.addStyle(theme); + console.log(`%cLoaded ${themeFile.name} made by ${themeFile.author}`, "color:red"); } catch (err) { console.error(err); } From f03642e51efed0fe672baa942df75730ca4768c9 Mon Sep 17 00:00:00 2001 From: smartfridge <37928912+smartfrigde@users.noreply.github.com> Date: Sat, 15 May 2021 12:53:27 +0200 Subject: [PATCH 12/63] Themes loading tweaks + Revert Brand ported theme --- preload.js | 7 +- utils/themes/GT-RevertRebrand-main/README.md | 11 +- .../assets/authorized_apps_checkmark_icon.svg | 6 - .../assets/call_icon.svg | 3 - .../assets/mfa_lock_icon.svg | 11 - .../assets/server_join_icon.svg | 6 - .../themes/GT-RevertRebrand-main/gnTheme.mjs | 6 - .../GT-RevertRebrand-main/manifest.json | 2 +- .../powercord_manifest.json | 8 - .../src/components/mentions.css | 14 - .../src/components/reactions.css | 39 --- .../GT-RevertRebrand-main/src/general/bd.css | 4 - .../src/general/inputs.css | 48 ---- .../src/general/other.css | 50 ---- .../src/general/svgs.css | 25 -- .../themes/GT-RevertRebrand-main/src/main.css | 249 ------------------ .../GT-RevertRebrand-main/src/main.scss | 11 - .../GT-RevertRebrand-main/src/variables.css | 66 ----- 18 files changed, 7 insertions(+), 559 deletions(-) delete mode 100644 utils/themes/GT-RevertRebrand-main/assets/authorized_apps_checkmark_icon.svg delete mode 100644 utils/themes/GT-RevertRebrand-main/assets/call_icon.svg delete mode 100644 utils/themes/GT-RevertRebrand-main/assets/mfa_lock_icon.svg delete mode 100644 utils/themes/GT-RevertRebrand-main/assets/server_join_icon.svg delete mode 100644 utils/themes/GT-RevertRebrand-main/gnTheme.mjs delete mode 100644 utils/themes/GT-RevertRebrand-main/powercord_manifest.json delete mode 100644 utils/themes/GT-RevertRebrand-main/src/components/mentions.css delete mode 100644 utils/themes/GT-RevertRebrand-main/src/components/reactions.css delete mode 100644 utils/themes/GT-RevertRebrand-main/src/general/bd.css delete mode 100644 utils/themes/GT-RevertRebrand-main/src/general/inputs.css delete mode 100644 utils/themes/GT-RevertRebrand-main/src/general/other.css delete mode 100644 utils/themes/GT-RevertRebrand-main/src/general/svgs.css delete mode 100644 utils/themes/GT-RevertRebrand-main/src/main.css delete mode 100644 utils/themes/GT-RevertRebrand-main/src/main.scss delete mode 100644 utils/themes/GT-RevertRebrand-main/src/variables.css diff --git a/preload.js b/preload.js index 6f4238e..2966446 100644 --- a/preload.js +++ b/preload.js @@ -23,10 +23,13 @@ window.addEventListener("DOMContentLoaded", () => { window.location.href = "https://discord.com/invite/F25bc4RYDt"; }); electronLocalshortcut.register(currentWindow, "F3", () => { - window.location.href = __dirname + "/theme.html"; + currentWindow.loadFile('theme.html') }); require("./utils/capturer.js"); - + console.log( + "%c ArmCord", + "font-weight: bold; font-size: 50px;color: red; text-shadow: 3px 3px 0 rgb(217,31,38) , 6px 6px 0 rgb(226,91,14) , 9px 9px 0 rgb(245,221,8) , 12px 12px 0 rgb(5,148,68) , 15px 15px 0 rgb(2,135,206) , 18px 18px 0 rgb(4,77,145) , 21px 21px 0 rgb(42,21,113)" + ); ArmCord.addStyle(` @import url("https://kckarnige.github.io/femboi_owo/discord-font.css"); :root { diff --git a/utils/themes/GT-RevertRebrand-main/README.md b/utils/themes/GT-RevertRebrand-main/README.md index e463215..3fb7430 100644 --- a/utils/themes/GT-RevertRebrand-main/README.md +++ b/utils/themes/GT-RevertRebrand-main/README.md @@ -1,12 +1,3 @@ -# GT-RevertRebrand +# GT-RevertRebrand ArmCord Reverts Discord's 2021 rebrand (font, colors, reactions, mentions, loading screen, home icon, reply ping color, and more) - -## Mods Supported - -- Powercord -- BetterDiscord -- Vizality - -## Screenshots - diff --git a/utils/themes/GT-RevertRebrand-main/assets/authorized_apps_checkmark_icon.svg b/utils/themes/GT-RevertRebrand-main/assets/authorized_apps_checkmark_icon.svg deleted file mode 100644 index c379d0e..0000000 --- a/utils/themes/GT-RevertRebrand-main/assets/authorized_apps_checkmark_icon.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/utils/themes/GT-RevertRebrand-main/assets/call_icon.svg b/utils/themes/GT-RevertRebrand-main/assets/call_icon.svg deleted file mode 100644 index 63cbd39..0000000 --- a/utils/themes/GT-RevertRebrand-main/assets/call_icon.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/utils/themes/GT-RevertRebrand-main/assets/mfa_lock_icon.svg b/utils/themes/GT-RevertRebrand-main/assets/mfa_lock_icon.svg deleted file mode 100644 index 67d2121..0000000 --- a/utils/themes/GT-RevertRebrand-main/assets/mfa_lock_icon.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - icon-green-lock - Created with Sketch. - - - - - - - diff --git a/utils/themes/GT-RevertRebrand-main/assets/server_join_icon.svg b/utils/themes/GT-RevertRebrand-main/assets/server_join_icon.svg deleted file mode 100644 index 419984e..0000000 --- a/utils/themes/GT-RevertRebrand-main/assets/server_join_icon.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/utils/themes/GT-RevertRebrand-main/gnTheme.mjs b/utils/themes/GT-RevertRebrand-main/gnTheme.mjs deleted file mode 100644 index 0661ae4..0000000 --- a/utils/themes/GT-RevertRebrand-main/gnTheme.mjs +++ /dev/null @@ -1,6 +0,0 @@ -export default { - name: 'Revert Rebrand', - description: 'Reverts Discord\'s 2021 rebrand (font, colors, reactions, mentions, loading screen, home icon, reply ping color, and more)', - version: '3.0', - screenshots: [] -}; diff --git a/utils/themes/GT-RevertRebrand-main/manifest.json b/utils/themes/GT-RevertRebrand-main/manifest.json index c464284..9af1803 100644 --- a/utils/themes/GT-RevertRebrand-main/manifest.json +++ b/utils/themes/GT-RevertRebrand-main/manifest.json @@ -4,5 +4,5 @@ "version": "3.0", "author": "GooseNest", "license": "MIT", - "theme": "src/main.scss" + "theme": "RevertRebrand.theme.css" } \ No newline at end of file diff --git a/utils/themes/GT-RevertRebrand-main/powercord_manifest.json b/utils/themes/GT-RevertRebrand-main/powercord_manifest.json deleted file mode 100644 index c464284..0000000 --- a/utils/themes/GT-RevertRebrand-main/powercord_manifest.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "Revert Rebrand", - "description": "Reverts Discord's 2021 rebrand (font, colors, reactions, mentions, loading screen, home icon, reply ping color, and more)", - "version": "3.0", - "author": "GooseNest", - "license": "MIT", - "theme": "src/main.scss" -} \ No newline at end of file diff --git a/utils/themes/GT-RevertRebrand-main/src/components/mentions.css b/utils/themes/GT-RevertRebrand-main/src/components/mentions.css deleted file mode 100644 index 55b6071..0000000 --- a/utils/themes/GT-RevertRebrand-main/src/components/mentions.css +++ /dev/null @@ -1,14 +0,0 @@ -/* Revert mentions and channel links */ -#app-mount .wrapper-3WhCwL { - color: var(--brand-experiment-400); - background: var(--brand-experiment-10a); -} - -#app-mount .wrapper-3WhCwL:hover { - background: var(--brand-experiment-25a); -} - -/* Hide semi-transparent background if mentioned in message */ -/* .mentioned-xhSam7 .mention { - background: transparent !important; -} */ \ No newline at end of file diff --git a/utils/themes/GT-RevertRebrand-main/src/components/reactions.css b/utils/themes/GT-RevertRebrand-main/src/components/reactions.css deleted file mode 100644 index 112f25c..0000000 --- a/utils/themes/GT-RevertRebrand-main/src/components/reactions.css +++ /dev/null @@ -1,39 +0,0 @@ -/* Revert reactions */ -.reaction-1hd86g { - border-radius: .25rem; - background: var(--background-modifier-selected); - - border-color: transparent !important; - - margin-right: 3px; -} - -.reaction-1hd86g .reactionCount-2mvXRV { - color: var(--text-muted); /* A11Y-- */ -} - -.reaction-1hd86g .reactionInner-15NvIl { - padding: 0 4.5px; -} - -/* Self reactions */ -.reaction-1hd86g.reactionMe-wv5HKu .reactionCount-2mvXRV { - color: var(--brand-experiment); /* A11Y-- */ -} - -.reaction-1hd86g.reactionMe-wv5HKu { - background-color: var(--brand-experiment-30a); -} - -/* Reaction hover */ -.reaction-1hd86g:hover .reactionCount-2mvXRV { - color: var(--interactive-active) !important; -} - -.reaction-1hd86g:hover { - background-color: var(--background-modifier-selected); -} - -.reaction-1hd86g.reactionMe-wv5HKu:hover { - background-color: var(--brand-experiment-40a); -} \ No newline at end of file diff --git a/utils/themes/GT-RevertRebrand-main/src/general/bd.css b/utils/themes/GT-RevertRebrand-main/src/general/bd.css deleted file mode 100644 index 00a66a0..0000000 --- a/utils/themes/GT-RevertRebrand-main/src/general/bd.css +++ /dev/null @@ -1,4 +0,0 @@ -/* Color BD specific settings elements */ -.bd-addon-views .bd-view-button.selected, .bd-button { - background-color: var(--brand-experiment); -} \ No newline at end of file diff --git a/utils/themes/GT-RevertRebrand-main/src/general/inputs.css b/utils/themes/GT-RevertRebrand-main/src/general/inputs.css deleted file mode 100644 index be56f71..0000000 --- a/utils/themes/GT-RevertRebrand-main/src/general/inputs.css +++ /dev/null @@ -1,48 +0,0 @@ -/* Restyle the create server and discovery buttons to the old green */ -.circleIconButton-1QV--U.circleButtonBase-2DCxIZ { - color: var(--old-green); -} -.circleIconButton-1QV--U.circleButtonBase-2DCxIZ.selected-1JjBPm { - color: white; - background-color: var(--old-green); -} - -/* On switches to old green */ -.container-3auIfb[style="opacity: 1; background-color: rgb(59, 165, 92);"] { - background-color: var(--old-green) !important; -} - -/* Text input focus border color is now focus / link, change back to original brand color */ -.input-cIJ7To.focused-1mmYsC, .input-cIJ7To:focus { - border-color: var(--brand-experiment); -} - -/* Restyle the create server and discovery buttons to the old green */ -.circleIconButton-1QV--U.circleButtonBase-2DCxIZ { - color: var(--old-green); -} -.circleIconButton-1QV--U.circleButtonBase-2DCxIZ.selected-1JjBPm { - color: white; - background-color: var(--old-green); -} - -/* On switches to old green */ -.container-3auIfb[style="opacity: 1; background-color: rgb(59, 165, 92);"] { - background-color: var(--old-green) !important; -} - -/* Text input focus border color is now focus / link, change back to original brand color */ -.input-cIJ7To.focused-1mmYsC, .input-cIJ7To:focus { - border-color: var(--brand-experiment); -} - -/* Change all radio bars with the new green to the old green */ -/* In particular, this fixes the privacy and safety settings' 'keep me safe' option */ -.radioBar-bMNUI-[style*="--radio-bar-accent-color:#3ba55c"] { - --radio-bar-accent-color: var(--old-green) !important; -} - -/* Revert ping mention button being link colored (used to be brand) */ -.colorLink-2vG20E.size14-e6ZScH.mentionButton-3710-W { - color: var(--brand-experiment) !important; -} \ No newline at end of file diff --git a/utils/themes/GT-RevertRebrand-main/src/general/other.css b/utils/themes/GT-RevertRebrand-main/src/general/other.css deleted file mode 100644 index 292c5cb..0000000 --- a/utils/themes/GT-RevertRebrand-main/src/general/other.css +++ /dev/null @@ -1,50 +0,0 @@ -/* Change green colorables from the new green color to the old green color. */ -/* In particular, this fixes the join call buttons, but it may also fix other stuff around the app */ -.colorable-1bkp8v.green-plH-Mj { - background-color: var(--old-green); -} - -/* Verified check mark color */ -.verified-1eC5dy { - color: var(--old-green); -} - -/* Fix the speaking ring around your avatar in the bottom left corner of your screen */ -.avatarSpeaking-2c8-9i { - box-shadow: inset 0 0 0 2px var(--old-green), inset 0 0 0 3px #2f3136; -} - -/* And fix speaking avatars in calls in general */ -.speaking-B2MXPi.border-Jn5IOt { - box-shadow: inset 0 0 0 2px var(--old-green), inset 0 0 0 3px #2f3136; -} - -/* Revert new Nitro icon by setting item */ -.premiumTabItem-1QTfBr .icon-Zc-uZZ { - display: none; -} - -/* Online status */ -.wrapper-3t9DeA rect.pointerEvents-2zdfdO[mask="url(#svg-mask-status-online)"]:not([fill="#ffffff"]) { - fill: var(--old-green); -} - -/* Online status (mobile) */ -.wrapper-3t9DeA rect.pointerEvents-2zdfdO[mask="url(#svg-mask-status-online-mobile)"]:not([fill="#ffffff"]) { - fill: var(--old-green); -} - -/* Online status (typing and other) */ -.wrapper-3t9DeA svg.cursorDefault-dsQJ1n > rect[fill="#3ba55c"] { - fill: var(--old-green); -} - -/* Revert loading tip title color */ -.tipTitle-GL9qAt { - color: var(--brand-experiment) !important; -} - -/* Revert home icon */ -.homeIcon-FuNwkv > path { - d: path("M 20.6644 20 C 20.6644 20 19.8014 18.9762 19.0822 18.0714 C 22.2226 17.1905 23.4212 15.2381 23.4212 15.2381 C 22.4384 15.881 21.5034 16.3334 20.6644 16.6429 C 19.4658 17.1429 18.3151 17.4762 17.1884 17.6667 C 14.887 18.0953 12.7774 17.9762 10.9795 17.6429 C 9.61301 17.381 8.43836 17 7.45548 16.6191 C 6.90411 16.4048 6.30479 16.1429 5.70548 15.8096 C 5.63356 15.7619 5.56164 15.7381 5.48973 15.6905 C 5.44178 15.6667 5.41781 15.6429 5.39384 15.6191 C 4.96233 15.381 4.7226 15.2143 4.7226 15.2143 C 4.7226 15.2143 5.87329 17.1191 8.91781 18.0238 C 8.19863 18.9286 7.31164 20 7.31164 20 C 2.0137 19.8333 0 16.381 0 16.381 C 0 8.7144 3.45205 2.50017 3.45205 2.50017 C 6.90411 -0.07123 10.1884 0.000197861 10.1884 0.000197861 L 10.4281 0.285909 C 6.11301 1.52399 4.12329 3.40493 4.12329 3.40493 C 4.12329 3.40493 4.65068 3.11921 5.53767 2.71446 C 8.10274 1.59542 10.1404 1.2859 10.9795 1.21447 C 11.1233 1.19066 11.2432 1.16685 11.387 1.16685 C 12.8493 0.976379 14.5034 0.92876 16.2295 1.11923 C 18.5068 1.38114 20.9521 2.0478 23.4452 3.40493 C 23.4452 3.40493 21.5514 1.61923 17.476 0.381146 L 17.8116 0.000197861 C 17.8116 0.000197861 21.0959 -0.07123 24.5479 2.50017 C 24.5479 2.50017 28 8.7144 28 16.381 C 28 16.381 25.9623 19.8333 20.6644 20 Z M 9.51712 8.88106 C 8.15068 8.88106 7.07192 10.0715 7.07192 11.5239 C 7.07192 12.9763 8.17466 14.1667 9.51712 14.1667 C 10.8836 14.1667 11.9623 12.9763 11.9623 11.5239 C 11.9863 10.0715 10.8836 8.88106 9.51712 8.88106 Z M 18.2671 8.88106 C 16.9007 8.88106 15.8219 10.0715 15.8219 11.5239 C 15.8219 12.9763 16.9247 14.1667 18.2671 14.1667 C 19.6336 14.1667 20.7123 12.9763 20.7123 11.5239 C 20.7123 10.0715 19.6336 8.88106 18.2671 8.88106 Z"); -} \ No newline at end of file diff --git a/utils/themes/GT-RevertRebrand-main/src/general/svgs.css b/utils/themes/GT-RevertRebrand-main/src/general/svgs.css deleted file mode 100644 index 279f5a8..0000000 --- a/utils/themes/GT-RevertRebrand-main/src/general/svgs.css +++ /dev/null @@ -1,25 +0,0 @@ -/* Fix misc SVGs that for some reason sometimes weren't targeted by the previous rules (particularly presence SVGs) */ -*[fill="#3ba55c"] { - fill: var(--old-green); -} - -/* Fix the call icons in chat */ -.icon-2Po-VO.iconSize-2tmqqh[style='background-image: url("/assets/7f75ab26bc5deb393cd8db44d9fe14e7.svg");'] { - background-image: url("https://Goose-Nest.github.io/GT-RevertRebrand/assets/call_icon.svg") !important; -} - -/* Server join icon to old green (arrow left to join system message) */ -.icon-2Po-VO.iconSize-2tmqqh[style='background-image: url("/assets/e06a573355c490f7ce6e3125ac01db81.svg");'] { - background-image: url("https://Goose-Nest.github.io/GT-RevertRebrand/assets/server_join_icon.svg") !important; -} - -/* Change the lock icon in the settings, it's an img tag so we need to use the content: css attribute instead of background-image */ -.lockIcon-2Hj8Tq[src="/assets/acea8fd38500a12d0509c027a274caaa.svg"] { - content: url("https://Goose-Nest.github.io/GT-RevertRebrand/assets/mfa_lock_icon.svg") !important; -} - -/* Permission checkmarks in authorized apps to the old green */ -/* The images in these are specified by class, so it's impossible to get more specific of a match than this */ -.permissionCheckmark-1SeKr2 { - background: url("https://Goose-Nest.github.io/GT-RevertRebrand/assets/authorized_apps_checkmark_icon.svg") no-repeat; -} \ No newline at end of file diff --git a/utils/themes/GT-RevertRebrand-main/src/main.css b/utils/themes/GT-RevertRebrand-main/src/main.css deleted file mode 100644 index 6bb8149..0000000 --- a/utils/themes/GT-RevertRebrand-main/src/main.css +++ /dev/null @@ -1,249 +0,0 @@ -body { - /* Revert new green to old color */ - --old-green: #43b581; - --info-positive-foreground: var(--old-green); - --status-positive-background: var(--old-green); - --text-positive: var(--old-green); - /* Revert new red to old color */ - --old-red: #f04747; - --text-danger: var(--old-red); - --info-danger-foreground: var(--old-red); - --status-danger-background: var(--old-red); - /* Revert to old font var */ - --font-display: var(--font-primary); - /* Found in Discord's CSS file: oldBrand vs newBrand HTML class - here we force old brand vars via copying */ - --brand-experiment-100: #f8f9fd; - --brand-experiment-130: #f2f4fc; - --brand-experiment-160: #ebeefa; - --brand-experiment-200: #e3e7f8; - --brand-experiment-230: #dae0f5; - --brand-experiment-260: #d1d9f3; - --brand-experiment-300: #c7d0f0; - --brand-experiment-330: #b5c1ec; - --brand-experiment-360: #a5b3e7; - --brand-experiment-400: #8ea1e1; - --brand-experiment-430: #869adf; - --brand-experiment-460: #7d92dd; - --brand-experiment: #7289da; - --brand-experiment-500: #7289da; - --brand-experiment-530: #687dc6; - --brand-experiment-560: #5c6fb1; - --brand-experiment-600: #4e5d94; - --brand-experiment-630: #435180; - --brand-experiment-660: #3b4770; - --brand-experiment-700: #2e3757; - --brand-experiment-730: #2b3352; - --brand-experiment-760: #272f4b; - --brand-experiment-800: #222941; - --brand-experiment-830: #1a2032; - --brand-experiment-860: #111521; - --brand-experiment-900: #06070b; - --brand-experiment-05a: rgba(114,137,218,0.05); - --brand-experiment-10a: rgba(114,137,218,0.1); - --brand-experiment-15a: rgba(114,137,218,0.15); - --brand-experiment-20a: rgba(114,137,218,0.2); - --brand-experiment-25a: rgba(114,137,218,0.25); - --brand-experiment-30a: rgba(114,137,218,0.3); - --brand-experiment-35a: rgba(114,137,218,0.35); - --brand-experiment-40a: rgba(114,137,218,0.4); - --brand-experiment-45a: rgba(114,137,218,0.45); - --brand-experiment-50a: rgba(114,137,218,0.5); - --brand-experiment-55a: rgba(114,137,218,0.55); - --brand-experiment-60a: rgba(114,137,218,0.6); - --brand-experiment-65a: rgba(114,137,218,0.65); - --brand-experiment-70a: rgba(114,137,218,0.7); - --brand-experiment-75a: rgba(114,137,218,0.75); - --brand-experiment-80a: rgba(114,137,218,0.8); - --brand-experiment-85a: rgba(114,137,218,0.85); - --brand-experiment-90a: rgba(114,137,218,0.9); - --brand-experiment-95a: rgba(114,137,218,0.95); -} - -/* Revert mentions and channel links */ -#app-mount .wrapper-3WhCwL { - color: var(--brand-experiment-400); - background: var(--brand-experiment-10a); -} - -#app-mount .wrapper-3WhCwL:hover { - background: var(--brand-experiment-25a); -} - -/* Hide semi-transparent background if mentioned in message */ -/* .mentioned-xhSam7 .mention { - background: transparent !important; -} */ -/* Revert reactions */ -.reaction-1hd86g { - border-radius: 0.25rem; - background: var(--background-modifier-selected); - border-color: transparent !important; - margin-right: 3px; -} - -.reaction-1hd86g .reactionCount-2mvXRV { - color: var(--text-muted); - /* A11Y-- */ -} - -.reaction-1hd86g .reactionInner-15NvIl { - padding: 0 4.5px; -} - -/* Self reactions */ -.reaction-1hd86g.reactionMe-wv5HKu .reactionCount-2mvXRV { - color: var(--brand-experiment); - /* A11Y-- */ -} - -.reaction-1hd86g.reactionMe-wv5HKu { - background-color: var(--brand-experiment-30a); -} - -/* Reaction hover */ -.reaction-1hd86g:hover .reactionCount-2mvXRV { - color: var(--interactive-active) !important; -} - -.reaction-1hd86g:hover { - background-color: var(--background-modifier-selected); -} - -.reaction-1hd86g.reactionMe-wv5HKu:hover { - background-color: var(--brand-experiment-40a); -} - -/* Color BD specific settings elements */ -.bd-addon-views .bd-view-button.selected, .bd-button { - background-color: var(--brand-experiment); -} - -/* Restyle the create server and discovery buttons to the old green */ -.circleIconButton-1QV--U.circleButtonBase-2DCxIZ { - color: var(--old-green); -} - -.circleIconButton-1QV--U.circleButtonBase-2DCxIZ.selected-1JjBPm { - color: white; - background-color: var(--old-green); -} - -/* On switches to old green */ -.container-3auIfb[style="opacity: 1; background-color: rgb(59, 165, 92);"] { - background-color: var(--old-green) !important; -} - -/* Text input focus border color is now focus / link, change back to original brand color */ -.input-cIJ7To.focused-1mmYsC, .input-cIJ7To:focus { - border-color: var(--brand-experiment); -} - -/* Restyle the create server and discovery buttons to the old green */ -.circleIconButton-1QV--U.circleButtonBase-2DCxIZ { - color: var(--old-green); -} - -.circleIconButton-1QV--U.circleButtonBase-2DCxIZ.selected-1JjBPm { - color: white; - background-color: var(--old-green); -} - -/* On switches to old green */ -.container-3auIfb[style="opacity: 1; background-color: rgb(59, 165, 92);"] { - background-color: var(--old-green) !important; -} - -/* Text input focus border color is now focus / link, change back to original brand color */ -.input-cIJ7To.focused-1mmYsC, .input-cIJ7To:focus { - border-color: var(--brand-experiment); -} - -/* Change all radio bars with the new green to the old green */ -/* In particular, this fixes the privacy and safety settings' 'keep me safe' option */ -.radioBar-bMNUI-[style*="--radio-bar-accent-color:#3ba55c"] { - --radio-bar-accent-color: var(--old-green) !important; -} - -/* Revert ping mention button being link colored (used to be brand) */ -.colorLink-2vG20E.size14-e6ZScH.mentionButton-3710-W { - color: var(--brand-experiment) !important; -} - -/* Fix misc SVGs that for some reason sometimes weren't targeted by the previous rules (particularly presence SVGs) */ -*[fill="#3ba55c"] { - fill: var(--old-green); -} - -/* Fix the call icons in chat */ -.icon-2Po-VO.iconSize-2tmqqh[style='background-image: url("/assets/7f75ab26bc5deb393cd8db44d9fe14e7.svg");'] { - background-image: url("https://Goose-Nest.github.io/GT-RevertRebrand/assets/call_icon.svg") !important; -} - -/* Server join icon to old green (arrow left to join system message) */ -.icon-2Po-VO.iconSize-2tmqqh[style='background-image: url("/assets/e06a573355c490f7ce6e3125ac01db81.svg");'] { - background-image: url("https://Goose-Nest.github.io/GT-RevertRebrand/assets/server_join_icon.svg") !important; -} - -/* Change the lock icon in the settings, it's an img tag so we need to use the content: css attribute instead of background-image */ -.lockIcon-2Hj8Tq[src="/assets/acea8fd38500a12d0509c027a274caaa.svg"] { - content: url("https://Goose-Nest.github.io/GT-RevertRebrand/assets/mfa_lock_icon.svg") !important; -} - -/* Permission checkmarks in authorized apps to the old green */ -/* The images in these are specified by class, so it's impossible to get more specific of a match than this */ -.permissionCheckmark-1SeKr2 { - background: url("https://Goose-Nest.github.io/GT-RevertRebrand/assets/authorized_apps_checkmark_icon.svg") no-repeat; -} - -/* Change green colorables from the new green color to the old green color. */ -/* In particular, this fixes the join call buttons, but it may also fix other stuff around the app */ -.colorable-1bkp8v.green-plH-Mj { - background-color: var(--old-green); -} - -/* Verified check mark color */ -.verified-1eC5dy { - color: var(--old-green); -} - -/* Fix the speaking ring around your avatar in the bottom left corner of your screen */ -.avatarSpeaking-2c8-9i { - box-shadow: inset 0 0 0 2px var(--old-green), inset 0 0 0 3px #2f3136; -} - -/* And fix speaking avatars in calls in general */ -.speaking-B2MXPi.border-Jn5IOt { - box-shadow: inset 0 0 0 2px var(--old-green), inset 0 0 0 3px #2f3136; -} - -/* Revert new Nitro icon by setting item */ -.premiumTabItem-1QTfBr .icon-Zc-uZZ { - display: none; -} - -/* Online status */ -.wrapper-3t9DeA rect.pointerEvents-2zdfdO[mask="url(#svg-mask-status-online)"]:not([fill="#ffffff"]) { - fill: var(--old-green); -} - -/* Online status (mobile) */ -.wrapper-3t9DeA rect.pointerEvents-2zdfdO[mask="url(#svg-mask-status-online-mobile)"]:not([fill="#ffffff"]) { - fill: var(--old-green); -} - -/* Online status (typing and other) */ -.wrapper-3t9DeA svg.cursorDefault-dsQJ1n > rect[fill="#3ba55c"] { - fill: var(--old-green); -} - -/* Revert loading tip title color */ -.tipTitle-GL9qAt { - color: var(--brand-experiment) !important; -} - -/* Revert home icon */ -.homeIcon-FuNwkv > path { - d: path("M 20.6644 20 C 20.6644 20 19.8014 18.9762 19.0822 18.0714 C 22.2226 17.1905 23.4212 15.2381 23.4212 15.2381 C 22.4384 15.881 21.5034 16.3334 20.6644 16.6429 C 19.4658 17.1429 18.3151 17.4762 17.1884 17.6667 C 14.887 18.0953 12.7774 17.9762 10.9795 17.6429 C 9.61301 17.381 8.43836 17 7.45548 16.6191 C 6.90411 16.4048 6.30479 16.1429 5.70548 15.8096 C 5.63356 15.7619 5.56164 15.7381 5.48973 15.6905 C 5.44178 15.6667 5.41781 15.6429 5.39384 15.6191 C 4.96233 15.381 4.7226 15.2143 4.7226 15.2143 C 4.7226 15.2143 5.87329 17.1191 8.91781 18.0238 C 8.19863 18.9286 7.31164 20 7.31164 20 C 2.0137 19.8333 0 16.381 0 16.381 C 0 8.7144 3.45205 2.50017 3.45205 2.50017 C 6.90411 -0.07123 10.1884 0.000197861 10.1884 0.000197861 L 10.4281 0.285909 C 6.11301 1.52399 4.12329 3.40493 4.12329 3.40493 C 4.12329 3.40493 4.65068 3.11921 5.53767 2.71446 C 8.10274 1.59542 10.1404 1.2859 10.9795 1.21447 C 11.1233 1.19066 11.2432 1.16685 11.387 1.16685 C 12.8493 0.976379 14.5034 0.92876 16.2295 1.11923 C 18.5068 1.38114 20.9521 2.0478 23.4452 3.40493 C 23.4452 3.40493 21.5514 1.61923 17.476 0.381146 L 17.8116 0.000197861 C 17.8116 0.000197861 21.0959 -0.07123 24.5479 2.50017 C 24.5479 2.50017 28 8.7144 28 16.381 C 28 16.381 25.9623 19.8333 20.6644 20 Z M 9.51712 8.88106 C 8.15068 8.88106 7.07192 10.0715 7.07192 11.5239 C 7.07192 12.9763 8.17466 14.1667 9.51712 14.1667 C 10.8836 14.1667 11.9623 12.9763 11.9623 11.5239 C 11.9863 10.0715 10.8836 8.88106 9.51712 8.88106 Z M 18.2671 8.88106 C 16.9007 8.88106 15.8219 10.0715 15.8219 11.5239 C 15.8219 12.9763 16.9247 14.1667 18.2671 14.1667 C 19.6336 14.1667 20.7123 12.9763 20.7123 11.5239 C 20.7123 10.0715 19.6336 8.88106 18.2671 8.88106 Z"); -} - -/* Import all the CSS files */ \ No newline at end of file diff --git a/utils/themes/GT-RevertRebrand-main/src/main.scss b/utils/themes/GT-RevertRebrand-main/src/main.scss deleted file mode 100644 index fcefb7c..0000000 --- a/utils/themes/GT-RevertRebrand-main/src/main.scss +++ /dev/null @@ -1,11 +0,0 @@ -/* Import all the CSS files */ - -@use "variables"; - -@use "components/mentions"; -@use "components/reactions"; - -@use "general/bd"; -@use "general/inputs"; -@use "general/svgs"; -@use "general/other"; \ No newline at end of file diff --git a/utils/themes/GT-RevertRebrand-main/src/variables.css b/utils/themes/GT-RevertRebrand-main/src/variables.css deleted file mode 100644 index 24e4a46..0000000 --- a/utils/themes/GT-RevertRebrand-main/src/variables.css +++ /dev/null @@ -1,66 +0,0 @@ -body { - /* Revert new green to old color */ - --old-green: #43b581; - --info-positive-foreground: var(--old-green); - --status-positive-background: var(--old-green); - --text-positive: var(--old-green); - - /* Revert new red to old color */ - --old-red: #f04747; - --text-danger: var(--old-red); - --info-danger-foreground: var(--old-red); - --status-danger-background: var(--old-red); - - /* Revert to old font var */ - --font-display: var(--font-primary); - - /* Found in Discord's CSS file: oldBrand vs newBrand HTML class - here we force old brand vars via copying */ - --brand-experiment-100: #f8f9fd; - --brand-experiment-130: #f2f4fc; - --brand-experiment-160: #ebeefa; - --brand-experiment-200: #e3e7f8; - --brand-experiment-230: #dae0f5; - --brand-experiment-260: #d1d9f3; - --brand-experiment-300: #c7d0f0; - --brand-experiment-330: #b5c1ec; - --brand-experiment-360: #a5b3e7; - --brand-experiment-400: #8ea1e1; - --brand-experiment-430: #869adf; - --brand-experiment-460: #7d92dd; - - --brand-experiment: #7289da; - - --brand-experiment-500: #7289da; - --brand-experiment-530: #687dc6; - --brand-experiment-560: #5c6fb1; - --brand-experiment-600: #4e5d94; - --brand-experiment-630: #435180; - --brand-experiment-660: #3b4770; - --brand-experiment-700: #2e3757; - --brand-experiment-730: #2b3352; - --brand-experiment-760: #272f4b; - --brand-experiment-800: #222941; - --brand-experiment-830: #1a2032; - --brand-experiment-860: #111521; - --brand-experiment-900: #06070b; - - --brand-experiment-05a: rgba(114,137,218,0.05); - --brand-experiment-10a: rgba(114,137,218,0.1); - --brand-experiment-15a: rgba(114,137,218,0.15); - --brand-experiment-20a: rgba(114,137,218,0.2); - --brand-experiment-25a: rgba(114,137,218,0.25); - --brand-experiment-30a: rgba(114,137,218,0.3); - --brand-experiment-35a: rgba(114,137,218,0.35); - --brand-experiment-40a: rgba(114,137,218,0.4); - --brand-experiment-45a: rgba(114,137,218,0.45); - --brand-experiment-50a: rgba(114,137,218,0.5); - --brand-experiment-55a: rgba(114,137,218,0.55); - --brand-experiment-60a: rgba(114,137,218,0.6); - --brand-experiment-65a: rgba(114,137,218,0.65); - --brand-experiment-70a: rgba(114,137,218,0.7); - --brand-experiment-75a: rgba(114,137,218,0.75); - --brand-experiment-80a: rgba(114,137,218,0.8); - --brand-experiment-85a: rgba(114,137,218,0.85); - --brand-experiment-90a: rgba(114,137,218,0.9); - --brand-experiment-95a: rgba(114,137,218,0.95); -} \ No newline at end of file From 0c7b7af2b3f024f89e1b96120e8dc2b40853e1ac Mon Sep 17 00:00:00 2001 From: smartfridge <37928912+smartfrigde@users.noreply.github.com> Date: Sat, 15 May 2021 16:20:57 +0200 Subject: [PATCH 13/63] SCSS warning that doesn't work :godmode: --- utils/theme.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/utils/theme.js b/utils/theme.js index dc92b95..15fa223 100644 --- a/utils/theme.js +++ b/utils/theme.js @@ -10,6 +10,12 @@ window.addEventListener("DOMContentLoaded", () => { console.log(themeFile.theme); console.log(themeFile) const theme = fs.readFileSync(`${__dirname}/themes/${file}/${themeFile.theme}`, "utf8"); + if (themeFile.theme.endsWith(".scss")) { + console.log( + `%cCouldn't load ${themeFile.name} made by ${themeFile.author}. ArmCord doesn't suppot scss files if you want to have this theme ported feel free to reach out https://discord.gg/F25bc4RYDt `, + "color:red; font-weight: bold; font-size: 50px;color: red;" + ); + } armcord.addStyle(theme); console.log(`%cLoaded ${themeFile.name} made by ${themeFile.author}`, "color:red"); } catch (err) { From 8cdd7e15b76e0c02479e077d476ce3dfd8cf8440 Mon Sep 17 00:00:00 2001 From: smartfridge <37928912+smartfrigde@users.noreply.github.com> Date: Sun, 16 May 2021 13:08:20 +0200 Subject: [PATCH 14/63] fix typo --- preload.js | 1 - utils/theme.js | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/preload.js b/preload.js index 2966446..d2db5d6 100644 --- a/preload.js +++ b/preload.js @@ -8,7 +8,6 @@ window.addEventListener("DOMContentLoaded", () => { backgroundColor: customTitlebar.Color.fromHex("#202225"), menu: false, }); - const currentWindow = remote.getCurrentWindow(); electronLocalshortcut.register(currentWindow, "F5", () => { location.reload(); diff --git a/utils/theme.js b/utils/theme.js index 15fa223..b58dc05 100644 --- a/utils/theme.js +++ b/utils/theme.js @@ -12,7 +12,7 @@ window.addEventListener("DOMContentLoaded", () => { const theme = fs.readFileSync(`${__dirname}/themes/${file}/${themeFile.theme}`, "utf8"); if (themeFile.theme.endsWith(".scss")) { console.log( - `%cCouldn't load ${themeFile.name} made by ${themeFile.author}. ArmCord doesn't suppot scss files if you want to have this theme ported feel free to reach out https://discord.gg/F25bc4RYDt `, + `%cCouldn't load ${themeFile.name} made by ${themeFile.author}. ArmCord doesn't support scss files if you want to have this theme ported feel free to reach out https://discord.gg/F25bc4RYDt `, "color:red; font-weight: bold; font-size: 50px;color: red;" ); } From 22f8ea112335a8a5546f0f1217d38045c4b44f56 Mon Sep 17 00:00:00 2001 From: smartfridge <37928912+smartfrigde@users.noreply.github.com> Date: Sun, 16 May 2021 16:29:37 +0200 Subject: [PATCH 15/63] Plugin Loading --- main.js | 4 +--- utils/plugin.js | 23 +++++++++++++++++++ {goosemod => utils/plugins/goosemod}/CSP.js | 0 {goosemod => utils/plugins/goosemod}/LICENSE | 0 {goosemod => utils/plugins/goosemod}/gm.js | 0 .../plugins/goosemod}/manifest.json | 1 + 6 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 utils/plugin.js rename {goosemod => utils/plugins/goosemod}/CSP.js (100%) rename {goosemod => utils/plugins/goosemod}/LICENSE (100%) rename {goosemod => utils/plugins/goosemod}/gm.js (100%) rename {goosemod => utils/plugins/goosemod}/manifest.json (93%) diff --git a/main.js b/main.js index 565d915..0b97d8d 100644 --- a/main.js +++ b/main.js @@ -101,9 +101,7 @@ function createWindow() { // Some APIs can only be used after this event occurs. app.whenReady().then(() => { createWindow(); - session.defaultSession.loadExtension( - `${require("electron").app.getAppPath()}/goosemod/` - ); + require("./utils/plugin.js"); session .fromPartition("some-partition") .setPermissionRequestHandler((webContents, permission, callback) => { diff --git a/utils/plugin.js b/utils/plugin.js new file mode 100644 index 0000000..cfcfe7a --- /dev/null +++ b/utils/plugin.js @@ -0,0 +1,23 @@ +const fs = require("fs"); +const { app, session, remote } = require("electron"); +const pluginFolder = __dirname + "/plugins/"; +app.whenReady().then(() => { +fs.readdirSync(pluginFolder).forEach((file) => { + console.log(file); + try { + const manifest = fs.readFileSync( + `${__dirname}/plugins/${file}/manifest.json`, + "utf8" + ); + var pluginFile = JSON.parse(manifest); + console.log(pluginFile); + session.defaultSession.loadExtension(`${__dirname}/plugins/${file}/`); + console.log( + `%cLoaded ${pluginFile.name} made by ${pluginFile.author}`, + "color:red" + ); + } catch (err) { + console.error(err); + } +}); +}); diff --git a/goosemod/CSP.js b/utils/plugins/goosemod/CSP.js similarity index 100% rename from goosemod/CSP.js rename to utils/plugins/goosemod/CSP.js diff --git a/goosemod/LICENSE b/utils/plugins/goosemod/LICENSE similarity index 100% rename from goosemod/LICENSE rename to utils/plugins/goosemod/LICENSE diff --git a/goosemod/gm.js b/utils/plugins/goosemod/gm.js similarity index 100% rename from goosemod/gm.js rename to utils/plugins/goosemod/gm.js diff --git a/goosemod/manifest.json b/utils/plugins/goosemod/manifest.json similarity index 93% rename from goosemod/manifest.json rename to utils/plugins/goosemod/manifest.json index 5d71e59..f073a57 100644 --- a/goosemod/manifest.json +++ b/utils/plugins/goosemod/manifest.json @@ -1,6 +1,7 @@ { "name": "GooseMod", "version": "1.0", + "author": "AAGaming00", "description": "Loads GooseMod, a discord client modification", "background": { "scripts": [ From 7fe38ad3071cbc462ac6fc14c649c8038281fc6e Mon Sep 17 00:00:00 2001 From: smartfridge <37928912+smartfrigde@users.noreply.github.com> Date: Sun, 16 May 2021 16:31:20 +0200 Subject: [PATCH 16/63] remove remote in require thing since it's not used --- utils/plugin.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/plugin.js b/utils/plugin.js index cfcfe7a..d569d67 100644 --- a/utils/plugin.js +++ b/utils/plugin.js @@ -1,5 +1,5 @@ const fs = require("fs"); -const { app, session, remote } = require("electron"); +const { app, session } = require("electron"); const pluginFolder = __dirname + "/plugins/"; app.whenReady().then(() => { fs.readdirSync(pluginFolder).forEach((file) => { From a348117cb2708a64eacc7f83e1dcc85fa476bcf2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 May 2021 13:10:14 +0000 Subject: [PATCH 17/63] Bump @electron-forge/cli from 6.0.0-beta.54 to 6.0.0-beta.55 Bumps [@electron-forge/cli](https://github.com/electron-userland/electron-forge) from 6.0.0-beta.54 to 6.0.0-beta.55. - [Release notes](https://github.com/electron-userland/electron-forge/releases) - [Changelog](https://github.com/electron-userland/electron-forge/blob/master/CHANGELOG.md) - [Commits](https://github.com/electron-userland/electron-forge/compare/v6.0.0-beta.54...v6.0.0-beta.55) Signed-off-by: dependabot[bot] --- package-lock.json | 1034 ++++++++++++++++++++++++++++++++------------- package.json | 2 +- 2 files changed, 733 insertions(+), 303 deletions(-) diff --git a/package-lock.json b/package-lock.json index e5d0f06..6cce676 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { "name": "armcord", - "version": "2.3.0", + "version": "2.4.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "version": "2.3.0", + "version": "2.4.0", "license": "MIT", "dependencies": { "custom-electron-titlebar": "3.2.6", @@ -15,13 +15,13 @@ "v8-compile-cache": "^2.3.0" }, "devDependencies": { - "@electron-forge/cli": "^6.0.0-beta.54", + "@electron-forge/cli": "^6.0.0-beta.55", "@electron-forge/maker-deb": "^6.0.0-beta.54", "@electron-forge/maker-rpm": "^6.0.0-beta.54", "@electron-forge/maker-squirrel": "^6.0.0-beta.54", "@electron-forge/maker-zip": "^6.0.0-beta.54", "@electron-forge/publisher-github": "*", - "electron": "latest" + "electron": "*" } }, "node_modules/@electron-forge/async-ora": { @@ -40,19 +40,10 @@ "node": ">= 10.0.0" } }, - "node_modules/@electron-forge/async-ora/node_modules/colors": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", - "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==", - "dev": true, - "engines": { - "node": ">=0.1.90" - } - }, "node_modules/@electron-forge/cli": { - "version": "6.0.0-beta.54", - "resolved": "https://registry.npmjs.org/@electron-forge/cli/-/cli-6.0.0-beta.54.tgz", - "integrity": "sha512-+Ui1BI8c5CnBawH2OEySa5QR8DzrFd/I9FHlClvrTsIDfsBAeMSv9NTbSNcmo9Af5kI+aNsLQa8tp1vD8DNrng==", + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/cli/-/cli-6.0.0-beta.55.tgz", + "integrity": "sha512-RQ4l9ApVCC3gfZWMHWd5B0liqvHXzYVrdMG7TVGUjTiCdQXUUUbnMPAEZBQqJUiY6mFfCUsM3/3KiVyiAAi3cg==", "dev": true, "funding": [ { @@ -65,15 +56,15 @@ } ], "dependencies": { - "@electron-forge/async-ora": "6.0.0-beta.54", - "@electron-forge/core": "6.0.0-beta.54", - "@electron-forge/shared-types": "6.0.0-beta.54", + "@electron-forge/async-ora": "6.0.0-beta.55", + "@electron-forge/core": "6.0.0-beta.55", + "@electron-forge/shared-types": "6.0.0-beta.55", "@electron/get": "^1.9.0", "colors": "^1.4.0", "commander": "^4.1.1", - "debug": "^4.1.0", + "debug": "^4.3.1", "fs-extra": "^9.0.1", - "inquirer": "^7.3.3", + "inquirer": "^8.0.0", "semver": "^7.2.1" }, "bin": { @@ -85,13 +76,35 @@ "node": ">= 10.0.0" } }, - "node_modules/@electron-forge/cli/node_modules/colors": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", - "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==", + "node_modules/@electron-forge/cli/node_modules/@electron-forge/async-ora": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.55.tgz", + "integrity": "sha512-B5td9OP13wn5zQO6mcJp99dsckKA33qsCy8uyoBeaS5pRlX3DPzJjoP+rlmAgHDeEBbay/PzbgZjeB1bCJpAQA==", "dev": true, + "dependencies": { + "colors": "^1.4.0", + "debug": "^4.3.1", + "log-symbols": "^4.0.0", + "ora": "^5.0.0", + "pretty-ms": "^7.0.0" + }, "engines": { - "node": ">=0.1.90" + "node": ">= 10.0.0" + } + }, + "node_modules/@electron-forge/cli/node_modules/@electron-forge/shared-types": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.55.tgz", + "integrity": "sha512-tPXnt2Eh1gW8wlk0ieN/IYGgKFPG6LEUUsTh+zPmnsD4Md9M6Tv9nNiUitM5xvVhNZkezJB/Q0K7f9t+6J4sdw==", + "dev": true, + "dependencies": { + "@electron-forge/async-ora": "6.0.0-beta.55", + "electron-packager": "^15.0.0", + "electron-rebuild": "^2.3.2", + "ora": "^5.0.0" + }, + "engines": { + "node": ">= 10.0.0" } }, "node_modules/@electron-forge/cli/node_modules/commander": { @@ -155,9 +168,9 @@ } }, "node_modules/@electron-forge/core": { - "version": "6.0.0-beta.54", - "resolved": "https://registry.npmjs.org/@electron-forge/core/-/core-6.0.0-beta.54.tgz", - "integrity": "sha512-yggZeiwRLnIsQYCT5jKhx2L7I02CwUCjnIzA+CqUZXD0AU1c2o0BA/26dNOGvY/+pr5yWjOXcrGy1hvj3dnLmQ==", + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/core/-/core-6.0.0-beta.55.tgz", + "integrity": "sha512-i+DLumF1m5ltyMYha+THPtGGbNkl+zkMTjlWcse+2+wbg/LxzVcEDcIJRh+YQPWFgCSZt1o6EvwXQqSfE2AU2w==", "dev": true, "funding": [ { @@ -170,27 +183,27 @@ } ], "dependencies": { - "@electron-forge/async-ora": "6.0.0-beta.54", - "@electron-forge/installer-base": "6.0.0-beta.54", - "@electron-forge/installer-deb": "6.0.0-beta.54", - "@electron-forge/installer-dmg": "6.0.0-beta.54", - "@electron-forge/installer-exe": "6.0.0-beta.54", - "@electron-forge/installer-rpm": "6.0.0-beta.54", - "@electron-forge/installer-zip": "6.0.0-beta.54", - "@electron-forge/maker-base": "6.0.0-beta.54", - "@electron-forge/plugin-base": "6.0.0-beta.54", - "@electron-forge/publisher-base": "6.0.0-beta.54", - "@electron-forge/shared-types": "6.0.0-beta.54", - "@electron-forge/template-base": "6.0.0-beta.54", - "@electron-forge/template-typescript": "6.0.0-beta.54", - "@electron-forge/template-typescript-webpack": "6.0.0-beta.54", - "@electron-forge/template-webpack": "6.0.0-beta.54", + "@electron-forge/async-ora": "6.0.0-beta.55", + "@electron-forge/installer-base": "6.0.0-beta.55", + "@electron-forge/installer-deb": "6.0.0-beta.55", + "@electron-forge/installer-dmg": "6.0.0-beta.55", + "@electron-forge/installer-exe": "6.0.0-beta.55", + "@electron-forge/installer-rpm": "6.0.0-beta.55", + "@electron-forge/installer-zip": "6.0.0-beta.55", + "@electron-forge/maker-base": "6.0.0-beta.55", + "@electron-forge/plugin-base": "6.0.0-beta.55", + "@electron-forge/publisher-base": "6.0.0-beta.55", + "@electron-forge/shared-types": "6.0.0-beta.55", + "@electron-forge/template-base": "6.0.0-beta.55", + "@electron-forge/template-typescript": "6.0.0-beta.55", + "@electron-forge/template-typescript-webpack": "6.0.0-beta.55", + "@electron-forge/template-webpack": "6.0.0-beta.55", "@electron/get": "^1.9.0", - "@malept/cross-spawn-promise": "^1.1.0", + "@malept/cross-spawn-promise": "^1.1.1", "colors": "^1.4.0", - "debug": "^4.1.0", + "debug": "^4.3.1", "electron-packager": "^15.0.0", - "electron-rebuild": "^2.0.3", + "electron-rebuild": "^2.3.2", "find-up": "^5.0.0", "fs-extra": "^9.0.1", "glob": "^7.1.5", @@ -209,13 +222,61 @@ "node": ">= 10.0.0" } }, - "node_modules/@electron-forge/core/node_modules/colors": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", - "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==", + "node_modules/@electron-forge/core/node_modules/@electron-forge/async-ora": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.55.tgz", + "integrity": "sha512-B5td9OP13wn5zQO6mcJp99dsckKA33qsCy8uyoBeaS5pRlX3DPzJjoP+rlmAgHDeEBbay/PzbgZjeB1bCJpAQA==", "dev": true, + "dependencies": { + "colors": "^1.4.0", + "debug": "^4.3.1", + "log-symbols": "^4.0.0", + "ora": "^5.0.0", + "pretty-ms": "^7.0.0" + }, "engines": { - "node": ">=0.1.90" + "node": ">= 10.0.0" + } + }, + "node_modules/@electron-forge/core/node_modules/@electron-forge/maker-base": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-6.0.0-beta.55.tgz", + "integrity": "sha512-fsRj+RAkOtAZNm2y6e7HKF/FQEaIbujqaTtfcKVL401FMCfb8+Y/LuXDnulMTenLfXDtpMvgMiDGMKAnxa8pUQ==", + "dev": true, + "dependencies": { + "@electron-forge/shared-types": "6.0.0-beta.55", + "fs-extra": "^9.0.1", + "which": "^2.0.2" + }, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/@electron-forge/core/node_modules/@electron-forge/publisher-base": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/publisher-base/-/publisher-base-6.0.0-beta.55.tgz", + "integrity": "sha512-Hh3uBRxO0o3ULZjv80YtjjOONC1R8gkc/M/BIC8C+GytHbpF4GhCN0kNCGRHgyASPTuC2iPtd4nU65PZIf2c2w==", + "dev": true, + "dependencies": { + "@electron-forge/shared-types": "6.0.0-beta.55" + }, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/@electron-forge/core/node_modules/@electron-forge/shared-types": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.55.tgz", + "integrity": "sha512-tPXnt2Eh1gW8wlk0ieN/IYGgKFPG6LEUUsTh+zPmnsD4Md9M6Tv9nNiUitM5xvVhNZkezJB/Q0K7f9t+6J4sdw==", + "dev": true, + "dependencies": { + "@electron-forge/async-ora": "6.0.0-beta.55", + "electron-packager": "^15.0.0", + "electron-rebuild": "^2.3.2", + "ora": "^5.0.0" + }, + "engines": { + "node": ">= 10.0.0" } }, "node_modules/@electron-forge/core/node_modules/find-up": { @@ -340,25 +401,41 @@ } }, "node_modules/@electron-forge/installer-base": { - "version": "6.0.0-beta.54", - "resolved": "https://registry.npmjs.org/@electron-forge/installer-base/-/installer-base-6.0.0-beta.54.tgz", - "integrity": "sha512-q6Z5kBAE6StKqn+3Z5tXVHu7WGCb9OMeIomw9H9Q41UUIehF7V0J3tCWTkJdhZ8D6/tkXcis3GKptaj0wfMpyg==", + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/installer-base/-/installer-base-6.0.0-beta.55.tgz", + "integrity": "sha512-Q6HCkvHVwXnHznpdof3he9ZN93WVeLpCDXZ5Dfx7TWnIz/5A7v0wne7V2lCoTgMlUcOpaBq+3O0x+3x5wLT1EA==", "dev": true, "dependencies": { - "@electron-forge/async-ora": "6.0.0-beta.54" + "@electron-forge/async-ora": "6.0.0-beta.55" + }, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/@electron-forge/installer-base/node_modules/@electron-forge/async-ora": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.55.tgz", + "integrity": "sha512-B5td9OP13wn5zQO6mcJp99dsckKA33qsCy8uyoBeaS5pRlX3DPzJjoP+rlmAgHDeEBbay/PzbgZjeB1bCJpAQA==", + "dev": true, + "dependencies": { + "colors": "^1.4.0", + "debug": "^4.3.1", + "log-symbols": "^4.0.0", + "ora": "^5.0.0", + "pretty-ms": "^7.0.0" }, "engines": { "node": ">= 10.0.0" } }, "node_modules/@electron-forge/installer-darwin": { - "version": "6.0.0-beta.54", - "resolved": "https://registry.npmjs.org/@electron-forge/installer-darwin/-/installer-darwin-6.0.0-beta.54.tgz", - "integrity": "sha512-kRbH24+QBhbcIugnIvevnf43JGzLFLoyFsoY3YeyZeeDL3vfyg0vtSyUx0hfq1GpHG+zObDf3o18c3WbxdXlXA==", + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/installer-darwin/-/installer-darwin-6.0.0-beta.55.tgz", + "integrity": "sha512-khdt9lz9k/epiQKjGFOmhk8baxfONbEvj6g7fYRGQ/gofEYXt/xgl7MiQDTFmv1ynEznaySlSCqCnJkawfNm2Q==", "dev": true, "dependencies": { - "@electron-forge/async-ora": "6.0.0-beta.54", - "@electron-forge/installer-base": "6.0.0-beta.54", + "@electron-forge/async-ora": "6.0.0-beta.55", + "@electron-forge/installer-base": "6.0.0-beta.55", "fs-extra": "^9.0.1", "sudo-prompt": "^9.1.1" }, @@ -366,6 +443,22 @@ "node": ">= 10.0.0" } }, + "node_modules/@electron-forge/installer-darwin/node_modules/@electron-forge/async-ora": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.55.tgz", + "integrity": "sha512-B5td9OP13wn5zQO6mcJp99dsckKA33qsCy8uyoBeaS5pRlX3DPzJjoP+rlmAgHDeEBbay/PzbgZjeB1bCJpAQA==", + "dev": true, + "dependencies": { + "colors": "^1.4.0", + "debug": "^4.3.1", + "log-symbols": "^4.0.0", + "ora": "^5.0.0", + "pretty-ms": "^7.0.0" + }, + "engines": { + "node": ">= 10.0.0" + } + }, "node_modules/@electron-forge/installer-darwin/node_modules/fs-extra": { "version": "9.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", @@ -403,26 +496,26 @@ } }, "node_modules/@electron-forge/installer-deb": { - "version": "6.0.0-beta.54", - "resolved": "https://registry.npmjs.org/@electron-forge/installer-deb/-/installer-deb-6.0.0-beta.54.tgz", - "integrity": "sha512-UbJR2Md0SBqex5AIv9YZ56hY2Iz5gZ6f1iAx0q4PlYpCY19W9nRXdudLNhx1w5go26DsT53+h6EzX2NGpBLq3Q==", + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/installer-deb/-/installer-deb-6.0.0-beta.55.tgz", + "integrity": "sha512-IMWhgCFx5jh9x2WNXsY2qc9q5h+wRuqFFXz+/hByhxkEFD8uYSXbRzPcwbT6+1iGMPOr1cAwAqH2FtQB97aN9A==", "dev": true, "dependencies": { - "@electron-forge/installer-linux": "6.0.0-beta.54" + "@electron-forge/installer-linux": "6.0.0-beta.55" }, "engines": { "node": ">= 10.0.0" } }, "node_modules/@electron-forge/installer-dmg": { - "version": "6.0.0-beta.54", - "resolved": "https://registry.npmjs.org/@electron-forge/installer-dmg/-/installer-dmg-6.0.0-beta.54.tgz", - "integrity": "sha512-F9jwhUTzdFNlbLus7RQ8paoGPryr79JFYDLi42f0dyuFwlOjwlrA1wN5xWqrvcMeqFlc3DfjjeRWZ+10RQyorA==", + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/installer-dmg/-/installer-dmg-6.0.0-beta.55.tgz", + "integrity": "sha512-39sXQfK8ygmdMEkOwTPnbjpR9ZE8PZXdnZiVUAwfhypQqpr5LtNTWSaEGcrB8HyJWpq6uZltg+kyBkGj5zRh6g==", "dev": true, "dependencies": { - "@electron-forge/installer-darwin": "6.0.0-beta.54", - "@malept/cross-spawn-promise": "^1.1.0", - "debug": "^4.1.0", + "@electron-forge/installer-darwin": "6.0.0-beta.55", + "@malept/cross-spawn-promise": "^1.1.1", + "debug": "^4.3.1", "fs-extra": "^9.0.1" }, "engines": { @@ -466,12 +559,12 @@ } }, "node_modules/@electron-forge/installer-exe": { - "version": "6.0.0-beta.54", - "resolved": "https://registry.npmjs.org/@electron-forge/installer-exe/-/installer-exe-6.0.0-beta.54.tgz", - "integrity": "sha512-PE7RBPerSenNcSkKXJWpervKNl7AVT+JeMzx61OHUQSw3h63NHRvXWh31llxk32mmJcaKRgGle2GsWob87Lv/w==", + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/installer-exe/-/installer-exe-6.0.0-beta.55.tgz", + "integrity": "sha512-sEolJtnv4LHYy4cqK28Izs2YFqErQRQsbxUK2yzYgZ7IwsBbiu0389UQah4ixvWYeDsiqqment2BDjamUgEB1w==", "dev": true, "dependencies": { - "@electron-forge/installer-base": "6.0.0-beta.54", + "@electron-forge/installer-base": "6.0.0-beta.55", "open": "^7.2.1" }, "engines": { @@ -479,12 +572,12 @@ } }, "node_modules/@electron-forge/installer-linux": { - "version": "6.0.0-beta.54", - "resolved": "https://registry.npmjs.org/@electron-forge/installer-linux/-/installer-linux-6.0.0-beta.54.tgz", - "integrity": "sha512-WQVV5fitsfTyktjb18m9Bx+Dho6rCFvVILqFNZAu1RfXIsjLl/h0WdkozdGDccfeDMqlRYmaNs3e5THn5swnAg==", + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/installer-linux/-/installer-linux-6.0.0-beta.55.tgz", + "integrity": "sha512-Ac+VH3TN1KbrKTwVujNL+nfiCxuDyqAv7ukDQxP8DoOUmaU9HlSMdh5raVQZ8ffNnSk6D+3s1dU6Dlcmdi8ReA==", "dev": true, "dependencies": { - "@electron-forge/installer-base": "6.0.0-beta.54", + "@electron-forge/installer-base": "6.0.0-beta.55", "sudo-prompt": "^9.1.1" }, "engines": { @@ -492,25 +585,25 @@ } }, "node_modules/@electron-forge/installer-rpm": { - "version": "6.0.0-beta.54", - "resolved": "https://registry.npmjs.org/@electron-forge/installer-rpm/-/installer-rpm-6.0.0-beta.54.tgz", - "integrity": "sha512-8gaJA2m8+Y/ZhV4xEeijXz8UksrliMEzyUAdwM5ZdAsmfmGlnhchGr0L6rI23D66dQP9DeyvUIuUwXrsTlj1nQ==", + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/installer-rpm/-/installer-rpm-6.0.0-beta.55.tgz", + "integrity": "sha512-OCcw59va1W5BtNm+yFXDFJcBYfyiEd8ntO2t1Op5IMPMmVt8Op9AveHsxPBY8BpCVOuHmCHrDRrIlFm2PAOPeA==", "dev": true, "dependencies": { - "@electron-forge/installer-linux": "6.0.0-beta.54" + "@electron-forge/installer-linux": "6.0.0-beta.55" }, "engines": { "node": ">= 10.0.0" } }, "node_modules/@electron-forge/installer-zip": { - "version": "6.0.0-beta.54", - "resolved": "https://registry.npmjs.org/@electron-forge/installer-zip/-/installer-zip-6.0.0-beta.54.tgz", - "integrity": "sha512-KCY5zreA79wjZODhLmtrbFweTWdlh9JgmW9WruIrmHm3sK19rRhCdaZ+Dg5ZWUhMx2A79d5a2C7r78lWGcHl7A==", + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/installer-zip/-/installer-zip-6.0.0-beta.55.tgz", + "integrity": "sha512-fZBjP6HKDUVAq2HBSLdw16KgqWuyuW1FOc+lAfShHJiYcB+KYJZVIv9CqVudmcyT0riePIb4fKFXhYFYc232kQ==", "dev": true, "dependencies": { - "@electron-forge/installer-darwin": "6.0.0-beta.54", - "@malept/cross-spawn-promise": "^1.1.0", + "@electron-forge/installer-darwin": "6.0.0-beta.55", + "@malept/cross-spawn-promise": "^1.1.1", "fs-extra": "^9.0.1" }, "engines": { @@ -740,12 +833,43 @@ } }, "node_modules/@electron-forge/plugin-base": { - "version": "6.0.0-beta.54", - "resolved": "https://registry.npmjs.org/@electron-forge/plugin-base/-/plugin-base-6.0.0-beta.54.tgz", - "integrity": "sha512-8HwGzgNCHo2PgUfNnTch3Gvj7l6fqOgjnARK1y056UfsxFy+hwvHaAO+7LLfr7ktNwU/bH3hGhOpE+ZmBSwSqQ==", + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/plugin-base/-/plugin-base-6.0.0-beta.55.tgz", + "integrity": "sha512-z2e76XwLXdswXUPqLpM2jF9ZbUoNyGn1/kzfVRWrplth5yUnaIuZoT5n5y9t4cWTHQ9m2i9DEFVRfdzF9P7G8g==", "dev": true, "dependencies": { - "@electron-forge/shared-types": "6.0.0-beta.54" + "@electron-forge/shared-types": "6.0.0-beta.55" + }, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/@electron-forge/plugin-base/node_modules/@electron-forge/async-ora": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.55.tgz", + "integrity": "sha512-B5td9OP13wn5zQO6mcJp99dsckKA33qsCy8uyoBeaS5pRlX3DPzJjoP+rlmAgHDeEBbay/PzbgZjeB1bCJpAQA==", + "dev": true, + "dependencies": { + "colors": "^1.4.0", + "debug": "^4.3.1", + "log-symbols": "^4.0.0", + "ora": "^5.0.0", + "pretty-ms": "^7.0.0" + }, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/@electron-forge/plugin-base/node_modules/@electron-forge/shared-types": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.55.tgz", + "integrity": "sha512-tPXnt2Eh1gW8wlk0ieN/IYGgKFPG6LEUUsTh+zPmnsD4Md9M6Tv9nNiUitM5xvVhNZkezJB/Q0K7f9t+6J4sdw==", + "dev": true, + "dependencies": { + "@electron-forge/async-ora": "6.0.0-beta.55", + "electron-packager": "^15.0.0", + "electron-rebuild": "^2.3.2", + "ora": "^5.0.0" }, "engines": { "node": ">= 10.0.0" @@ -835,14 +959,14 @@ } }, "node_modules/@electron-forge/template-base": { - "version": "6.0.0-beta.54", - "resolved": "https://registry.npmjs.org/@electron-forge/template-base/-/template-base-6.0.0-beta.54.tgz", - "integrity": "sha512-LuSpeOiM6AzUbamz5U/NqRkn4y7dzof1JK1ISAb+6tORf7JU014aKqDcLdwgP8Lxaz6P1bdlMmNJTvg5+SBrEw==", + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/template-base/-/template-base-6.0.0-beta.55.tgz", + "integrity": "sha512-1ht7h+ZtOn0LsiZc6HMrT5LGTHM7zvySQgJyMkiYQPhYMhNJiIv6dJv6SEI9n12CO5WBTZcx/ACHh012A/caKg==", "dev": true, "dependencies": { - "@electron-forge/async-ora": "6.0.0-beta.54", - "@electron-forge/shared-types": "6.0.0-beta.54", - "debug": "^4.1.0", + "@electron-forge/async-ora": "6.0.0-beta.55", + "@electron-forge/shared-types": "6.0.0-beta.55", + "debug": "^4.3.1", "fs-extra": "^9.0.1", "username": "^5.1.0" }, @@ -850,6 +974,37 @@ "node": ">= 10.0.0" } }, + "node_modules/@electron-forge/template-base/node_modules/@electron-forge/async-ora": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.55.tgz", + "integrity": "sha512-B5td9OP13wn5zQO6mcJp99dsckKA33qsCy8uyoBeaS5pRlX3DPzJjoP+rlmAgHDeEBbay/PzbgZjeB1bCJpAQA==", + "dev": true, + "dependencies": { + "colors": "^1.4.0", + "debug": "^4.3.1", + "log-symbols": "^4.0.0", + "ora": "^5.0.0", + "pretty-ms": "^7.0.0" + }, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/@electron-forge/template-base/node_modules/@electron-forge/shared-types": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.55.tgz", + "integrity": "sha512-tPXnt2Eh1gW8wlk0ieN/IYGgKFPG6LEUUsTh+zPmnsD4Md9M6Tv9nNiUitM5xvVhNZkezJB/Q0K7f9t+6J4sdw==", + "dev": true, + "dependencies": { + "@electron-forge/async-ora": "6.0.0-beta.55", + "electron-packager": "^15.0.0", + "electron-rebuild": "^2.3.2", + "ora": "^5.0.0" + }, + "engines": { + "node": ">= 10.0.0" + } + }, "node_modules/@electron-forge/template-base/node_modules/fs-extra": { "version": "9.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", @@ -887,14 +1042,14 @@ } }, "node_modules/@electron-forge/template-typescript": { - "version": "6.0.0-beta.54", - "resolved": "https://registry.npmjs.org/@electron-forge/template-typescript/-/template-typescript-6.0.0-beta.54.tgz", - "integrity": "sha512-7V87LWH+vJ1YibM9MsTttbz7upfwLrmXgchQ399EfLxK306g7q/ouyGkeTerhLr2gCUAvm/Oqx+sXQ7402ol9w==", + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/template-typescript/-/template-typescript-6.0.0-beta.55.tgz", + "integrity": "sha512-JDG/1lmBEHBRA85qZD4KtO60lhndsH8mMs6TmfEw828NQ9+zXoMYxv5h3XG8COh1u7IbZJQHDcoNSzMd2eANMw==", "dev": true, "dependencies": { - "@electron-forge/async-ora": "6.0.0-beta.54", - "@electron-forge/shared-types": "6.0.0-beta.54", - "@electron-forge/template-base": "6.0.0-beta.54", + "@electron-forge/async-ora": "6.0.0-beta.55", + "@electron-forge/shared-types": "6.0.0-beta.55", + "@electron-forge/template-base": "6.0.0-beta.55", "fs-extra": "^9.0.1" }, "engines": { @@ -902,20 +1057,51 @@ } }, "node_modules/@electron-forge/template-typescript-webpack": { - "version": "6.0.0-beta.54", - "resolved": "https://registry.npmjs.org/@electron-forge/template-typescript-webpack/-/template-typescript-webpack-6.0.0-beta.54.tgz", - "integrity": "sha512-1MIw1eGlMZg7KLG4oAEE0rB28WDOtz01OSoW2a2NqkmUzmu4BxJdSvQ97Tp7xCU0naW0H1uU39B9QOjJQgLGCQ==", + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/template-typescript-webpack/-/template-typescript-webpack-6.0.0-beta.55.tgz", + "integrity": "sha512-tHrHiPaD5w8X58+uEMUFdvIPWnFJSKg2HtNQi2QOV6oDceNY2yA5GSZU09NSwFtlhNqhGB2JZjnnTu0QGY9MUw==", "dev": true, "dependencies": { - "@electron-forge/async-ora": "6.0.0-beta.54", - "@electron-forge/shared-types": "6.0.0-beta.54", - "@electron-forge/template-base": "6.0.0-beta.54", + "@electron-forge/async-ora": "6.0.0-beta.55", + "@electron-forge/shared-types": "6.0.0-beta.55", + "@electron-forge/template-base": "6.0.0-beta.55", "fs-extra": "^9.0.1" }, "engines": { "node": ">= 10.0.0" } }, + "node_modules/@electron-forge/template-typescript-webpack/node_modules/@electron-forge/async-ora": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.55.tgz", + "integrity": "sha512-B5td9OP13wn5zQO6mcJp99dsckKA33qsCy8uyoBeaS5pRlX3DPzJjoP+rlmAgHDeEBbay/PzbgZjeB1bCJpAQA==", + "dev": true, + "dependencies": { + "colors": "^1.4.0", + "debug": "^4.3.1", + "log-symbols": "^4.0.0", + "ora": "^5.0.0", + "pretty-ms": "^7.0.0" + }, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/@electron-forge/template-typescript-webpack/node_modules/@electron-forge/shared-types": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.55.tgz", + "integrity": "sha512-tPXnt2Eh1gW8wlk0ieN/IYGgKFPG6LEUUsTh+zPmnsD4Md9M6Tv9nNiUitM5xvVhNZkezJB/Q0K7f9t+6J4sdw==", + "dev": true, + "dependencies": { + "@electron-forge/async-ora": "6.0.0-beta.55", + "electron-packager": "^15.0.0", + "electron-rebuild": "^2.3.2", + "ora": "^5.0.0" + }, + "engines": { + "node": ">= 10.0.0" + } + }, "node_modules/@electron-forge/template-typescript-webpack/node_modules/fs-extra": { "version": "9.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", @@ -952,6 +1138,37 @@ "node": ">= 10.0.0" } }, + "node_modules/@electron-forge/template-typescript/node_modules/@electron-forge/async-ora": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.55.tgz", + "integrity": "sha512-B5td9OP13wn5zQO6mcJp99dsckKA33qsCy8uyoBeaS5pRlX3DPzJjoP+rlmAgHDeEBbay/PzbgZjeB1bCJpAQA==", + "dev": true, + "dependencies": { + "colors": "^1.4.0", + "debug": "^4.3.1", + "log-symbols": "^4.0.0", + "ora": "^5.0.0", + "pretty-ms": "^7.0.0" + }, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/@electron-forge/template-typescript/node_modules/@electron-forge/shared-types": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.55.tgz", + "integrity": "sha512-tPXnt2Eh1gW8wlk0ieN/IYGgKFPG6LEUUsTh+zPmnsD4Md9M6Tv9nNiUitM5xvVhNZkezJB/Q0K7f9t+6J4sdw==", + "dev": true, + "dependencies": { + "@electron-forge/async-ora": "6.0.0-beta.55", + "electron-packager": "^15.0.0", + "electron-rebuild": "^2.3.2", + "ora": "^5.0.0" + }, + "engines": { + "node": ">= 10.0.0" + } + }, "node_modules/@electron-forge/template-typescript/node_modules/fs-extra": { "version": "9.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", @@ -989,20 +1206,51 @@ } }, "node_modules/@electron-forge/template-webpack": { - "version": "6.0.0-beta.54", - "resolved": "https://registry.npmjs.org/@electron-forge/template-webpack/-/template-webpack-6.0.0-beta.54.tgz", - "integrity": "sha512-4/zUOZ8MCZqs8PcUCeeG6ofpy6HT53tQiLknM23OPaFP6ckuE6kOunC6N/teijUrJuLpKl3P8d39SWPVacxEzg==", + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/template-webpack/-/template-webpack-6.0.0-beta.55.tgz", + "integrity": "sha512-WjHUFT2khvWLcMrHkjj2hlcHrX03fxJ8k6G723OQJ+nR4UYeSzVfbNAT2h2smchUe9n1bSwbB6TdU0SRsCPCFA==", "dev": true, "dependencies": { - "@electron-forge/async-ora": "6.0.0-beta.54", - "@electron-forge/shared-types": "6.0.0-beta.54", - "@electron-forge/template-base": "6.0.0-beta.54", + "@electron-forge/async-ora": "6.0.0-beta.55", + "@electron-forge/shared-types": "6.0.0-beta.55", + "@electron-forge/template-base": "6.0.0-beta.55", "fs-extra": "^9.0.1" }, "engines": { "node": ">= 10.0.0" } }, + "node_modules/@electron-forge/template-webpack/node_modules/@electron-forge/async-ora": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.55.tgz", + "integrity": "sha512-B5td9OP13wn5zQO6mcJp99dsckKA33qsCy8uyoBeaS5pRlX3DPzJjoP+rlmAgHDeEBbay/PzbgZjeB1bCJpAQA==", + "dev": true, + "dependencies": { + "colors": "^1.4.0", + "debug": "^4.3.1", + "log-symbols": "^4.0.0", + "ora": "^5.0.0", + "pretty-ms": "^7.0.0" + }, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/@electron-forge/template-webpack/node_modules/@electron-forge/shared-types": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.55.tgz", + "integrity": "sha512-tPXnt2Eh1gW8wlk0ieN/IYGgKFPG6LEUUsTh+zPmnsD4Md9M6Tv9nNiUitM5xvVhNZkezJB/Q0K7f9t+6J4sdw==", + "dev": true, + "dependencies": { + "@electron-forge/async-ora": "6.0.0-beta.55", + "electron-packager": "^15.0.0", + "electron-rebuild": "^2.3.2", + "ora": "^5.0.0" + }, + "engines": { + "node": ">= 10.0.0" + } + }, "node_modules/@electron-forge/template-webpack/node_modules/fs-extra": { "version": "9.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", @@ -1929,6 +2177,15 @@ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, + "node_modules/colors": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", + "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==", + "dev": true, + "engines": { + "node": ">=0.1.90" + } + }, "node_modules/combined-stream": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", @@ -2931,15 +3188,6 @@ "node": ">=8" } }, - "node_modules/electron-rebuild/node_modules/colors": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", - "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==", - "dev": true, - "engines": { - "node": ">=0.1.90" - } - }, "node_modules/electron-rebuild/node_modules/decompress-response": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", @@ -3413,18 +3661,6 @@ "node": ">=4" } }, - "node_modules/external-editor/node_modules/iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "dev": true, - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/extract-zip": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz", @@ -4063,6 +4299,18 @@ "node": ">=10.19.0" } }, + "node_modules/iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dev": true, + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/ieee754": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", @@ -4127,9 +4375,9 @@ "dev": true }, "node_modules/inquirer": { - "version": "7.3.3", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz", - "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.0.0.tgz", + "integrity": "sha512-ON8pEJPPCdyjxj+cxsYRe6XfCJepTxANdNnTebsTuQgXpRyZRRT9t4dJwjRubgmvn20CLSEnozRUayXyM9VTXA==", "dev": true, "dependencies": { "ansi-escapes": "^4.2.1", @@ -4138,10 +4386,10 @@ "cli-width": "^3.0.0", "external-editor": "^3.0.3", "figures": "^3.0.0", - "lodash": "^4.17.19", + "lodash": "^4.17.21", "mute-stream": "0.0.8", "run-async": "^2.4.0", - "rxjs": "^6.6.0", + "rxjs": "^6.6.6", "string-width": "^4.1.0", "strip-ansi": "^6.0.0", "through": "^2.3.6" @@ -4428,9 +4676,9 @@ } }, "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==", "dev": true }, "node_modules/lodash._reinterpolate": { @@ -4856,18 +5104,6 @@ "ms": "^2.1.1" } }, - "node_modules/needle/node_modules/iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "dev": true, - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/nice-try": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", @@ -7103,39 +7339,50 @@ "log-symbols": "^4.0.0", "ora": "^5.0.0", "pretty-ms": "^7.0.0" - }, - "dependencies": { - "colors": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", - "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==", - "dev": true - } } }, "@electron-forge/cli": { - "version": "6.0.0-beta.54", - "resolved": "https://registry.npmjs.org/@electron-forge/cli/-/cli-6.0.0-beta.54.tgz", - "integrity": "sha512-+Ui1BI8c5CnBawH2OEySa5QR8DzrFd/I9FHlClvrTsIDfsBAeMSv9NTbSNcmo9Af5kI+aNsLQa8tp1vD8DNrng==", + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/cli/-/cli-6.0.0-beta.55.tgz", + "integrity": "sha512-RQ4l9ApVCC3gfZWMHWd5B0liqvHXzYVrdMG7TVGUjTiCdQXUUUbnMPAEZBQqJUiY6mFfCUsM3/3KiVyiAAi3cg==", "dev": true, "requires": { - "@electron-forge/async-ora": "6.0.0-beta.54", - "@electron-forge/core": "6.0.0-beta.54", - "@electron-forge/shared-types": "6.0.0-beta.54", + "@electron-forge/async-ora": "6.0.0-beta.55", + "@electron-forge/core": "6.0.0-beta.55", + "@electron-forge/shared-types": "6.0.0-beta.55", "@electron/get": "^1.9.0", "colors": "^1.4.0", "commander": "^4.1.1", - "debug": "^4.1.0", + "debug": "^4.3.1", "fs-extra": "^9.0.1", - "inquirer": "^7.3.3", + "inquirer": "^8.0.0", "semver": "^7.2.1" }, "dependencies": { - "colors": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", - "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==", - "dev": true + "@electron-forge/async-ora": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.55.tgz", + "integrity": "sha512-B5td9OP13wn5zQO6mcJp99dsckKA33qsCy8uyoBeaS5pRlX3DPzJjoP+rlmAgHDeEBbay/PzbgZjeB1bCJpAQA==", + "dev": true, + "requires": { + "colors": "^1.4.0", + "debug": "^4.3.1", + "log-symbols": "^4.0.0", + "ora": "^5.0.0", + "pretty-ms": "^7.0.0" + } + }, + "@electron-forge/shared-types": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.55.tgz", + "integrity": "sha512-tPXnt2Eh1gW8wlk0ieN/IYGgKFPG6LEUUsTh+zPmnsD4Md9M6Tv9nNiUitM5xvVhNZkezJB/Q0K7f9t+6J4sdw==", + "dev": true, + "requires": { + "@electron-forge/async-ora": "6.0.0-beta.55", + "electron-packager": "^15.0.0", + "electron-rebuild": "^2.3.2", + "ora": "^5.0.0" + } }, "commander": { "version": "4.1.1", @@ -7183,32 +7430,32 @@ } }, "@electron-forge/core": { - "version": "6.0.0-beta.54", - "resolved": "https://registry.npmjs.org/@electron-forge/core/-/core-6.0.0-beta.54.tgz", - "integrity": "sha512-yggZeiwRLnIsQYCT5jKhx2L7I02CwUCjnIzA+CqUZXD0AU1c2o0BA/26dNOGvY/+pr5yWjOXcrGy1hvj3dnLmQ==", + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/core/-/core-6.0.0-beta.55.tgz", + "integrity": "sha512-i+DLumF1m5ltyMYha+THPtGGbNkl+zkMTjlWcse+2+wbg/LxzVcEDcIJRh+YQPWFgCSZt1o6EvwXQqSfE2AU2w==", "dev": true, "requires": { - "@electron-forge/async-ora": "6.0.0-beta.54", - "@electron-forge/installer-base": "6.0.0-beta.54", - "@electron-forge/installer-deb": "6.0.0-beta.54", - "@electron-forge/installer-dmg": "6.0.0-beta.54", - "@electron-forge/installer-exe": "6.0.0-beta.54", - "@electron-forge/installer-rpm": "6.0.0-beta.54", - "@electron-forge/installer-zip": "6.0.0-beta.54", - "@electron-forge/maker-base": "6.0.0-beta.54", - "@electron-forge/plugin-base": "6.0.0-beta.54", - "@electron-forge/publisher-base": "6.0.0-beta.54", - "@electron-forge/shared-types": "6.0.0-beta.54", - "@electron-forge/template-base": "6.0.0-beta.54", - "@electron-forge/template-typescript": "6.0.0-beta.54", - "@electron-forge/template-typescript-webpack": "6.0.0-beta.54", - "@electron-forge/template-webpack": "6.0.0-beta.54", + "@electron-forge/async-ora": "6.0.0-beta.55", + "@electron-forge/installer-base": "6.0.0-beta.55", + "@electron-forge/installer-deb": "6.0.0-beta.55", + "@electron-forge/installer-dmg": "6.0.0-beta.55", + "@electron-forge/installer-exe": "6.0.0-beta.55", + "@electron-forge/installer-rpm": "6.0.0-beta.55", + "@electron-forge/installer-zip": "6.0.0-beta.55", + "@electron-forge/maker-base": "6.0.0-beta.55", + "@electron-forge/plugin-base": "6.0.0-beta.55", + "@electron-forge/publisher-base": "6.0.0-beta.55", + "@electron-forge/shared-types": "6.0.0-beta.55", + "@electron-forge/template-base": "6.0.0-beta.55", + "@electron-forge/template-typescript": "6.0.0-beta.55", + "@electron-forge/template-typescript-webpack": "6.0.0-beta.55", + "@electron-forge/template-webpack": "6.0.0-beta.55", "@electron/get": "^1.9.0", - "@malept/cross-spawn-promise": "^1.1.0", + "@malept/cross-spawn-promise": "^1.1.1", "colors": "^1.4.0", - "debug": "^4.1.0", + "debug": "^4.3.1", "electron-packager": "^15.0.0", - "electron-rebuild": "^2.0.3", + "electron-rebuild": "^2.3.2", "find-up": "^5.0.0", "fs-extra": "^9.0.1", "glob": "^7.1.5", @@ -7224,11 +7471,50 @@ "yarn-or-npm": "^3.0.1" }, "dependencies": { - "colors": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", - "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==", - "dev": true + "@electron-forge/async-ora": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.55.tgz", + "integrity": "sha512-B5td9OP13wn5zQO6mcJp99dsckKA33qsCy8uyoBeaS5pRlX3DPzJjoP+rlmAgHDeEBbay/PzbgZjeB1bCJpAQA==", + "dev": true, + "requires": { + "colors": "^1.4.0", + "debug": "^4.3.1", + "log-symbols": "^4.0.0", + "ora": "^5.0.0", + "pretty-ms": "^7.0.0" + } + }, + "@electron-forge/maker-base": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-6.0.0-beta.55.tgz", + "integrity": "sha512-fsRj+RAkOtAZNm2y6e7HKF/FQEaIbujqaTtfcKVL401FMCfb8+Y/LuXDnulMTenLfXDtpMvgMiDGMKAnxa8pUQ==", + "dev": true, + "requires": { + "@electron-forge/shared-types": "6.0.0-beta.55", + "fs-extra": "^9.0.1", + "which": "^2.0.2" + } + }, + "@electron-forge/publisher-base": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/publisher-base/-/publisher-base-6.0.0-beta.55.tgz", + "integrity": "sha512-Hh3uBRxO0o3ULZjv80YtjjOONC1R8gkc/M/BIC8C+GytHbpF4GhCN0kNCGRHgyASPTuC2iPtd4nU65PZIf2c2w==", + "dev": true, + "requires": { + "@electron-forge/shared-types": "6.0.0-beta.55" + } + }, + "@electron-forge/shared-types": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.55.tgz", + "integrity": "sha512-tPXnt2Eh1gW8wlk0ieN/IYGgKFPG6LEUUsTh+zPmnsD4Md9M6Tv9nNiUitM5xvVhNZkezJB/Q0K7f9t+6J4sdw==", + "dev": true, + "requires": { + "@electron-forge/async-ora": "6.0.0-beta.55", + "electron-packager": "^15.0.0", + "electron-rebuild": "^2.3.2", + "ora": "^5.0.0" + } }, "find-up": { "version": "5.0.0", @@ -7313,26 +7599,54 @@ } }, "@electron-forge/installer-base": { - "version": "6.0.0-beta.54", - "resolved": "https://registry.npmjs.org/@electron-forge/installer-base/-/installer-base-6.0.0-beta.54.tgz", - "integrity": "sha512-q6Z5kBAE6StKqn+3Z5tXVHu7WGCb9OMeIomw9H9Q41UUIehF7V0J3tCWTkJdhZ8D6/tkXcis3GKptaj0wfMpyg==", + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/installer-base/-/installer-base-6.0.0-beta.55.tgz", + "integrity": "sha512-Q6HCkvHVwXnHznpdof3he9ZN93WVeLpCDXZ5Dfx7TWnIz/5A7v0wne7V2lCoTgMlUcOpaBq+3O0x+3x5wLT1EA==", "dev": true, "requires": { - "@electron-forge/async-ora": "6.0.0-beta.54" + "@electron-forge/async-ora": "6.0.0-beta.55" + }, + "dependencies": { + "@electron-forge/async-ora": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.55.tgz", + "integrity": "sha512-B5td9OP13wn5zQO6mcJp99dsckKA33qsCy8uyoBeaS5pRlX3DPzJjoP+rlmAgHDeEBbay/PzbgZjeB1bCJpAQA==", + "dev": true, + "requires": { + "colors": "^1.4.0", + "debug": "^4.3.1", + "log-symbols": "^4.0.0", + "ora": "^5.0.0", + "pretty-ms": "^7.0.0" + } + } } }, "@electron-forge/installer-darwin": { - "version": "6.0.0-beta.54", - "resolved": "https://registry.npmjs.org/@electron-forge/installer-darwin/-/installer-darwin-6.0.0-beta.54.tgz", - "integrity": "sha512-kRbH24+QBhbcIugnIvevnf43JGzLFLoyFsoY3YeyZeeDL3vfyg0vtSyUx0hfq1GpHG+zObDf3o18c3WbxdXlXA==", + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/installer-darwin/-/installer-darwin-6.0.0-beta.55.tgz", + "integrity": "sha512-khdt9lz9k/epiQKjGFOmhk8baxfONbEvj6g7fYRGQ/gofEYXt/xgl7MiQDTFmv1ynEznaySlSCqCnJkawfNm2Q==", "dev": true, "requires": { - "@electron-forge/async-ora": "6.0.0-beta.54", - "@electron-forge/installer-base": "6.0.0-beta.54", + "@electron-forge/async-ora": "6.0.0-beta.55", + "@electron-forge/installer-base": "6.0.0-beta.55", "fs-extra": "^9.0.1", "sudo-prompt": "^9.1.1" }, "dependencies": { + "@electron-forge/async-ora": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.55.tgz", + "integrity": "sha512-B5td9OP13wn5zQO6mcJp99dsckKA33qsCy8uyoBeaS5pRlX3DPzJjoP+rlmAgHDeEBbay/PzbgZjeB1bCJpAQA==", + "dev": true, + "requires": { + "colors": "^1.4.0", + "debug": "^4.3.1", + "log-symbols": "^4.0.0", + "ora": "^5.0.0", + "pretty-ms": "^7.0.0" + } + }, "fs-extra": { "version": "9.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", @@ -7364,23 +7678,23 @@ } }, "@electron-forge/installer-deb": { - "version": "6.0.0-beta.54", - "resolved": "https://registry.npmjs.org/@electron-forge/installer-deb/-/installer-deb-6.0.0-beta.54.tgz", - "integrity": "sha512-UbJR2Md0SBqex5AIv9YZ56hY2Iz5gZ6f1iAx0q4PlYpCY19W9nRXdudLNhx1w5go26DsT53+h6EzX2NGpBLq3Q==", + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/installer-deb/-/installer-deb-6.0.0-beta.55.tgz", + "integrity": "sha512-IMWhgCFx5jh9x2WNXsY2qc9q5h+wRuqFFXz+/hByhxkEFD8uYSXbRzPcwbT6+1iGMPOr1cAwAqH2FtQB97aN9A==", "dev": true, "requires": { - "@electron-forge/installer-linux": "6.0.0-beta.54" + "@electron-forge/installer-linux": "6.0.0-beta.55" } }, "@electron-forge/installer-dmg": { - "version": "6.0.0-beta.54", - "resolved": "https://registry.npmjs.org/@electron-forge/installer-dmg/-/installer-dmg-6.0.0-beta.54.tgz", - "integrity": "sha512-F9jwhUTzdFNlbLus7RQ8paoGPryr79JFYDLi42f0dyuFwlOjwlrA1wN5xWqrvcMeqFlc3DfjjeRWZ+10RQyorA==", + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/installer-dmg/-/installer-dmg-6.0.0-beta.55.tgz", + "integrity": "sha512-39sXQfK8ygmdMEkOwTPnbjpR9ZE8PZXdnZiVUAwfhypQqpr5LtNTWSaEGcrB8HyJWpq6uZltg+kyBkGj5zRh6g==", "dev": true, "requires": { - "@electron-forge/installer-darwin": "6.0.0-beta.54", - "@malept/cross-spawn-promise": "^1.1.0", - "debug": "^4.1.0", + "@electron-forge/installer-darwin": "6.0.0-beta.55", + "@malept/cross-spawn-promise": "^1.1.1", + "debug": "^4.3.1", "fs-extra": "^9.0.1" }, "dependencies": { @@ -7415,42 +7729,42 @@ } }, "@electron-forge/installer-exe": { - "version": "6.0.0-beta.54", - "resolved": "https://registry.npmjs.org/@electron-forge/installer-exe/-/installer-exe-6.0.0-beta.54.tgz", - "integrity": "sha512-PE7RBPerSenNcSkKXJWpervKNl7AVT+JeMzx61OHUQSw3h63NHRvXWh31llxk32mmJcaKRgGle2GsWob87Lv/w==", + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/installer-exe/-/installer-exe-6.0.0-beta.55.tgz", + "integrity": "sha512-sEolJtnv4LHYy4cqK28Izs2YFqErQRQsbxUK2yzYgZ7IwsBbiu0389UQah4ixvWYeDsiqqment2BDjamUgEB1w==", "dev": true, "requires": { - "@electron-forge/installer-base": "6.0.0-beta.54", + "@electron-forge/installer-base": "6.0.0-beta.55", "open": "^7.2.1" } }, "@electron-forge/installer-linux": { - "version": "6.0.0-beta.54", - "resolved": "https://registry.npmjs.org/@electron-forge/installer-linux/-/installer-linux-6.0.0-beta.54.tgz", - "integrity": "sha512-WQVV5fitsfTyktjb18m9Bx+Dho6rCFvVILqFNZAu1RfXIsjLl/h0WdkozdGDccfeDMqlRYmaNs3e5THn5swnAg==", + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/installer-linux/-/installer-linux-6.0.0-beta.55.tgz", + "integrity": "sha512-Ac+VH3TN1KbrKTwVujNL+nfiCxuDyqAv7ukDQxP8DoOUmaU9HlSMdh5raVQZ8ffNnSk6D+3s1dU6Dlcmdi8ReA==", "dev": true, "requires": { - "@electron-forge/installer-base": "6.0.0-beta.54", + "@electron-forge/installer-base": "6.0.0-beta.55", "sudo-prompt": "^9.1.1" } }, "@electron-forge/installer-rpm": { - "version": "6.0.0-beta.54", - "resolved": "https://registry.npmjs.org/@electron-forge/installer-rpm/-/installer-rpm-6.0.0-beta.54.tgz", - "integrity": "sha512-8gaJA2m8+Y/ZhV4xEeijXz8UksrliMEzyUAdwM5ZdAsmfmGlnhchGr0L6rI23D66dQP9DeyvUIuUwXrsTlj1nQ==", + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/installer-rpm/-/installer-rpm-6.0.0-beta.55.tgz", + "integrity": "sha512-OCcw59va1W5BtNm+yFXDFJcBYfyiEd8ntO2t1Op5IMPMmVt8Op9AveHsxPBY8BpCVOuHmCHrDRrIlFm2PAOPeA==", "dev": true, "requires": { - "@electron-forge/installer-linux": "6.0.0-beta.54" + "@electron-forge/installer-linux": "6.0.0-beta.55" } }, "@electron-forge/installer-zip": { - "version": "6.0.0-beta.54", - "resolved": "https://registry.npmjs.org/@electron-forge/installer-zip/-/installer-zip-6.0.0-beta.54.tgz", - "integrity": "sha512-KCY5zreA79wjZODhLmtrbFweTWdlh9JgmW9WruIrmHm3sK19rRhCdaZ+Dg5ZWUhMx2A79d5a2C7r78lWGcHl7A==", + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/installer-zip/-/installer-zip-6.0.0-beta.55.tgz", + "integrity": "sha512-fZBjP6HKDUVAq2HBSLdw16KgqWuyuW1FOc+lAfShHJiYcB+KYJZVIv9CqVudmcyT0riePIb4fKFXhYFYc232kQ==", "dev": true, "requires": { - "@electron-forge/installer-darwin": "6.0.0-beta.54", - "@malept/cross-spawn-promise": "^1.1.0", + "@electron-forge/installer-darwin": "6.0.0-beta.55", + "@malept/cross-spawn-promise": "^1.1.1", "fs-extra": "^9.0.1" }, "dependencies": { @@ -7632,12 +7946,39 @@ } }, "@electron-forge/plugin-base": { - "version": "6.0.0-beta.54", - "resolved": "https://registry.npmjs.org/@electron-forge/plugin-base/-/plugin-base-6.0.0-beta.54.tgz", - "integrity": "sha512-8HwGzgNCHo2PgUfNnTch3Gvj7l6fqOgjnARK1y056UfsxFy+hwvHaAO+7LLfr7ktNwU/bH3hGhOpE+ZmBSwSqQ==", + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/plugin-base/-/plugin-base-6.0.0-beta.55.tgz", + "integrity": "sha512-z2e76XwLXdswXUPqLpM2jF9ZbUoNyGn1/kzfVRWrplth5yUnaIuZoT5n5y9t4cWTHQ9m2i9DEFVRfdzF9P7G8g==", "dev": true, "requires": { - "@electron-forge/shared-types": "6.0.0-beta.54" + "@electron-forge/shared-types": "6.0.0-beta.55" + }, + "dependencies": { + "@electron-forge/async-ora": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.55.tgz", + "integrity": "sha512-B5td9OP13wn5zQO6mcJp99dsckKA33qsCy8uyoBeaS5pRlX3DPzJjoP+rlmAgHDeEBbay/PzbgZjeB1bCJpAQA==", + "dev": true, + "requires": { + "colors": "^1.4.0", + "debug": "^4.3.1", + "log-symbols": "^4.0.0", + "ora": "^5.0.0", + "pretty-ms": "^7.0.0" + } + }, + "@electron-forge/shared-types": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.55.tgz", + "integrity": "sha512-tPXnt2Eh1gW8wlk0ieN/IYGgKFPG6LEUUsTh+zPmnsD4Md9M6Tv9nNiUitM5xvVhNZkezJB/Q0K7f9t+6J4sdw==", + "dev": true, + "requires": { + "@electron-forge/async-ora": "6.0.0-beta.55", + "electron-packager": "^15.0.0", + "electron-rebuild": "^2.3.2", + "ora": "^5.0.0" + } + } } }, "@electron-forge/publisher-base": { @@ -7709,18 +8050,43 @@ } }, "@electron-forge/template-base": { - "version": "6.0.0-beta.54", - "resolved": "https://registry.npmjs.org/@electron-forge/template-base/-/template-base-6.0.0-beta.54.tgz", - "integrity": "sha512-LuSpeOiM6AzUbamz5U/NqRkn4y7dzof1JK1ISAb+6tORf7JU014aKqDcLdwgP8Lxaz6P1bdlMmNJTvg5+SBrEw==", + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/template-base/-/template-base-6.0.0-beta.55.tgz", + "integrity": "sha512-1ht7h+ZtOn0LsiZc6HMrT5LGTHM7zvySQgJyMkiYQPhYMhNJiIv6dJv6SEI9n12CO5WBTZcx/ACHh012A/caKg==", "dev": true, "requires": { - "@electron-forge/async-ora": "6.0.0-beta.54", - "@electron-forge/shared-types": "6.0.0-beta.54", - "debug": "^4.1.0", + "@electron-forge/async-ora": "6.0.0-beta.55", + "@electron-forge/shared-types": "6.0.0-beta.55", + "debug": "^4.3.1", "fs-extra": "^9.0.1", "username": "^5.1.0" }, "dependencies": { + "@electron-forge/async-ora": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.55.tgz", + "integrity": "sha512-B5td9OP13wn5zQO6mcJp99dsckKA33qsCy8uyoBeaS5pRlX3DPzJjoP+rlmAgHDeEBbay/PzbgZjeB1bCJpAQA==", + "dev": true, + "requires": { + "colors": "^1.4.0", + "debug": "^4.3.1", + "log-symbols": "^4.0.0", + "ora": "^5.0.0", + "pretty-ms": "^7.0.0" + } + }, + "@electron-forge/shared-types": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.55.tgz", + "integrity": "sha512-tPXnt2Eh1gW8wlk0ieN/IYGgKFPG6LEUUsTh+zPmnsD4Md9M6Tv9nNiUitM5xvVhNZkezJB/Q0K7f9t+6J4sdw==", + "dev": true, + "requires": { + "@electron-forge/async-ora": "6.0.0-beta.55", + "electron-packager": "^15.0.0", + "electron-rebuild": "^2.3.2", + "ora": "^5.0.0" + } + }, "fs-extra": { "version": "9.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", @@ -7752,17 +8118,42 @@ } }, "@electron-forge/template-typescript": { - "version": "6.0.0-beta.54", - "resolved": "https://registry.npmjs.org/@electron-forge/template-typescript/-/template-typescript-6.0.0-beta.54.tgz", - "integrity": "sha512-7V87LWH+vJ1YibM9MsTttbz7upfwLrmXgchQ399EfLxK306g7q/ouyGkeTerhLr2gCUAvm/Oqx+sXQ7402ol9w==", + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/template-typescript/-/template-typescript-6.0.0-beta.55.tgz", + "integrity": "sha512-JDG/1lmBEHBRA85qZD4KtO60lhndsH8mMs6TmfEw828NQ9+zXoMYxv5h3XG8COh1u7IbZJQHDcoNSzMd2eANMw==", "dev": true, "requires": { - "@electron-forge/async-ora": "6.0.0-beta.54", - "@electron-forge/shared-types": "6.0.0-beta.54", - "@electron-forge/template-base": "6.0.0-beta.54", + "@electron-forge/async-ora": "6.0.0-beta.55", + "@electron-forge/shared-types": "6.0.0-beta.55", + "@electron-forge/template-base": "6.0.0-beta.55", "fs-extra": "^9.0.1" }, "dependencies": { + "@electron-forge/async-ora": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.55.tgz", + "integrity": "sha512-B5td9OP13wn5zQO6mcJp99dsckKA33qsCy8uyoBeaS5pRlX3DPzJjoP+rlmAgHDeEBbay/PzbgZjeB1bCJpAQA==", + "dev": true, + "requires": { + "colors": "^1.4.0", + "debug": "^4.3.1", + "log-symbols": "^4.0.0", + "ora": "^5.0.0", + "pretty-ms": "^7.0.0" + } + }, + "@electron-forge/shared-types": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.55.tgz", + "integrity": "sha512-tPXnt2Eh1gW8wlk0ieN/IYGgKFPG6LEUUsTh+zPmnsD4Md9M6Tv9nNiUitM5xvVhNZkezJB/Q0K7f9t+6J4sdw==", + "dev": true, + "requires": { + "@electron-forge/async-ora": "6.0.0-beta.55", + "electron-packager": "^15.0.0", + "electron-rebuild": "^2.3.2", + "ora": "^5.0.0" + } + }, "fs-extra": { "version": "9.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", @@ -7794,17 +8185,42 @@ } }, "@electron-forge/template-typescript-webpack": { - "version": "6.0.0-beta.54", - "resolved": "https://registry.npmjs.org/@electron-forge/template-typescript-webpack/-/template-typescript-webpack-6.0.0-beta.54.tgz", - "integrity": "sha512-1MIw1eGlMZg7KLG4oAEE0rB28WDOtz01OSoW2a2NqkmUzmu4BxJdSvQ97Tp7xCU0naW0H1uU39B9QOjJQgLGCQ==", + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/template-typescript-webpack/-/template-typescript-webpack-6.0.0-beta.55.tgz", + "integrity": "sha512-tHrHiPaD5w8X58+uEMUFdvIPWnFJSKg2HtNQi2QOV6oDceNY2yA5GSZU09NSwFtlhNqhGB2JZjnnTu0QGY9MUw==", "dev": true, "requires": { - "@electron-forge/async-ora": "6.0.0-beta.54", - "@electron-forge/shared-types": "6.0.0-beta.54", - "@electron-forge/template-base": "6.0.0-beta.54", + "@electron-forge/async-ora": "6.0.0-beta.55", + "@electron-forge/shared-types": "6.0.0-beta.55", + "@electron-forge/template-base": "6.0.0-beta.55", "fs-extra": "^9.0.1" }, "dependencies": { + "@electron-forge/async-ora": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.55.tgz", + "integrity": "sha512-B5td9OP13wn5zQO6mcJp99dsckKA33qsCy8uyoBeaS5pRlX3DPzJjoP+rlmAgHDeEBbay/PzbgZjeB1bCJpAQA==", + "dev": true, + "requires": { + "colors": "^1.4.0", + "debug": "^4.3.1", + "log-symbols": "^4.0.0", + "ora": "^5.0.0", + "pretty-ms": "^7.0.0" + } + }, + "@electron-forge/shared-types": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.55.tgz", + "integrity": "sha512-tPXnt2Eh1gW8wlk0ieN/IYGgKFPG6LEUUsTh+zPmnsD4Md9M6Tv9nNiUitM5xvVhNZkezJB/Q0K7f9t+6J4sdw==", + "dev": true, + "requires": { + "@electron-forge/async-ora": "6.0.0-beta.55", + "electron-packager": "^15.0.0", + "electron-rebuild": "^2.3.2", + "ora": "^5.0.0" + } + }, "fs-extra": { "version": "9.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", @@ -7836,17 +8252,42 @@ } }, "@electron-forge/template-webpack": { - "version": "6.0.0-beta.54", - "resolved": "https://registry.npmjs.org/@electron-forge/template-webpack/-/template-webpack-6.0.0-beta.54.tgz", - "integrity": "sha512-4/zUOZ8MCZqs8PcUCeeG6ofpy6HT53tQiLknM23OPaFP6ckuE6kOunC6N/teijUrJuLpKl3P8d39SWPVacxEzg==", + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/template-webpack/-/template-webpack-6.0.0-beta.55.tgz", + "integrity": "sha512-WjHUFT2khvWLcMrHkjj2hlcHrX03fxJ8k6G723OQJ+nR4UYeSzVfbNAT2h2smchUe9n1bSwbB6TdU0SRsCPCFA==", "dev": true, "requires": { - "@electron-forge/async-ora": "6.0.0-beta.54", - "@electron-forge/shared-types": "6.0.0-beta.54", - "@electron-forge/template-base": "6.0.0-beta.54", + "@electron-forge/async-ora": "6.0.0-beta.55", + "@electron-forge/shared-types": "6.0.0-beta.55", + "@electron-forge/template-base": "6.0.0-beta.55", "fs-extra": "^9.0.1" }, "dependencies": { + "@electron-forge/async-ora": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.55.tgz", + "integrity": "sha512-B5td9OP13wn5zQO6mcJp99dsckKA33qsCy8uyoBeaS5pRlX3DPzJjoP+rlmAgHDeEBbay/PzbgZjeB1bCJpAQA==", + "dev": true, + "requires": { + "colors": "^1.4.0", + "debug": "^4.3.1", + "log-symbols": "^4.0.0", + "ora": "^5.0.0", + "pretty-ms": "^7.0.0" + } + }, + "@electron-forge/shared-types": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.55.tgz", + "integrity": "sha512-tPXnt2Eh1gW8wlk0ieN/IYGgKFPG6LEUUsTh+zPmnsD4Md9M6Tv9nNiUitM5xvVhNZkezJB/Q0K7f9t+6J4sdw==", + "dev": true, + "requires": { + "@electron-forge/async-ora": "6.0.0-beta.55", + "electron-packager": "^15.0.0", + "electron-rebuild": "^2.3.2", + "ora": "^5.0.0" + } + }, "fs-extra": { "version": "9.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", @@ -8634,6 +9075,12 @@ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, + "colors": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", + "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==", + "dev": true + }, "combined-stream": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", @@ -9410,12 +9857,6 @@ "responselike": "^2.0.0" } }, - "colors": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", - "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==", - "dev": true - }, "decompress-response": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", @@ -9789,17 +10230,6 @@ "chardet": "^0.7.0", "iconv-lite": "^0.4.24", "tmp": "^0.0.33" - }, - "dependencies": { - "iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "dev": true, - "requires": { - "safer-buffer": ">= 2.1.2 < 3" - } - } } }, "extract-zip": { @@ -10335,6 +10765,15 @@ "resolve-alpn": "^1.0.0" } }, + "iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dev": true, + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + }, "ieee754": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", @@ -10382,9 +10821,9 @@ "dev": true }, "inquirer": { - "version": "7.3.3", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz", - "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.0.0.tgz", + "integrity": "sha512-ON8pEJPPCdyjxj+cxsYRe6XfCJepTxANdNnTebsTuQgXpRyZRRT9t4dJwjRubgmvn20CLSEnozRUayXyM9VTXA==", "dev": true, "requires": { "ansi-escapes": "^4.2.1", @@ -10393,10 +10832,10 @@ "cli-width": "^3.0.0", "external-editor": "^3.0.3", "figures": "^3.0.0", - "lodash": "^4.17.19", + "lodash": "^4.17.21", "mute-stream": "0.0.8", "run-async": "^2.4.0", - "rxjs": "^6.6.0", + "rxjs": "^6.6.6", "string-width": "^4.1.0", "strip-ansi": "^6.0.0", "through": "^2.3.6" @@ -10624,9 +11063,9 @@ } }, "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==", "dev": true }, "lodash._reinterpolate": { @@ -10958,15 +11397,6 @@ "requires": { "ms": "^2.1.1" } - }, - "iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "dev": true, - "requires": { - "safer-buffer": ">= 2.1.2 < 3" - } } } }, diff --git a/package.json b/package.json index 0eec7e7..610ad4c 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "v8-compile-cache": "^2.3.0" }, "devDependencies": { - "@electron-forge/cli": "^6.0.0-beta.54", + "@electron-forge/cli": "^6.0.0-beta.55", "@electron-forge/maker-deb": "^6.0.0-beta.54", "@electron-forge/maker-rpm": "^6.0.0-beta.54", "@electron-forge/maker-squirrel": "^6.0.0-beta.54", From d405b89fa965fe270c5692aa4223a4096fa47eee Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 May 2021 13:10:21 +0000 Subject: [PATCH 18/63] Bump electron-context-menu from 3.0.0 to 3.1.0 Bumps [electron-context-menu](https://github.com/sindresorhus/electron-context-menu) from 3.0.0 to 3.1.0. - [Release notes](https://github.com/sindresorhus/electron-context-menu/releases) - [Commits](https://github.com/sindresorhus/electron-context-menu/compare/v3.0.0...v3.1.0) Signed-off-by: dependabot[bot] --- package-lock.json | 20 ++++++++++---------- package.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index e5d0f06..f9e7019 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,15 +1,15 @@ { "name": "armcord", - "version": "2.3.0", + "version": "2.4.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "version": "2.3.0", + "version": "2.4.0", "license": "MIT", "dependencies": { "custom-electron-titlebar": "3.2.6", - "electron-context-menu": "^3.0.0", + "electron-context-menu": "^3.1.0", "electron-localshortcut": "^3.2.1", "electron-squirrel-startup": "^1.0.0", "v8-compile-cache": "^2.3.0" @@ -21,7 +21,7 @@ "@electron-forge/maker-squirrel": "^6.0.0-beta.54", "@electron-forge/maker-zip": "^6.0.0-beta.54", "@electron-forge/publisher-github": "*", - "electron": "latest" + "electron": "*" } }, "node_modules/@electron-forge/async-ora": { @@ -2247,9 +2247,9 @@ } }, "node_modules/electron-context-menu": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/electron-context-menu/-/electron-context-menu-3.0.0.tgz", - "integrity": "sha512-dF0INSIIpcwofaKAXtdSKkQl08s9j0SMF+Nsi6jGBam6kfx97cIOmJLUHYlBW56DQo05umts2pRIfbcDPHNh9g==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/electron-context-menu/-/electron-context-menu-3.1.0.tgz", + "integrity": "sha512-U7Q7d0ovfA8UOt7RCYsJkQ7l6qKMKDg3W9kvL3gEecGfHVDcjybs695L5oTS7d+kv7C2qfADo/EY06Cl4zAh9A==", "dependencies": { "cli-truncate": "^2.1.0", "electron-dl": "^3.2.1", @@ -8877,9 +8877,9 @@ } }, "electron-context-menu": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/electron-context-menu/-/electron-context-menu-3.0.0.tgz", - "integrity": "sha512-dF0INSIIpcwofaKAXtdSKkQl08s9j0SMF+Nsi6jGBam6kfx97cIOmJLUHYlBW56DQo05umts2pRIfbcDPHNh9g==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/electron-context-menu/-/electron-context-menu-3.1.0.tgz", + "integrity": "sha512-U7Q7d0ovfA8UOt7RCYsJkQ7l6qKMKDg3W9kvL3gEecGfHVDcjybs695L5oTS7d+kv7C2qfADo/EY06Cl4zAh9A==", "requires": { "cli-truncate": "^2.1.0", "electron-dl": "^3.2.1", diff --git a/package.json b/package.json index 0eec7e7..7921e30 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "license": "MIT", "dependencies": { "custom-electron-titlebar": "3.2.6", - "electron-context-menu": "^3.0.0", + "electron-context-menu": "^3.1.0", "electron-localshortcut": "^3.2.1", "electron-squirrel-startup": "^1.0.0", "v8-compile-cache": "^2.3.0" From df83567d9915983aedb1611a8625c2da39d6ca7d Mon Sep 17 00:00:00 2001 From: KayoticCarnige Date: Thu, 20 May 2021 12:00:51 -0400 Subject: [PATCH 19/63] Fixed up the theme menu CSS and removed "Download Discord" popup --- preload.js | 3 +++ theme.html | 42 +++++++++++++++++++++++++++++++----------- 2 files changed, 34 insertions(+), 11 deletions(-) diff --git a/preload.js b/preload.js index d2db5d6..44bdfe1 100644 --- a/preload.js +++ b/preload.js @@ -75,6 +75,9 @@ div.menubar[role="menubar"] { .titlebar .window-controls-container .window-icon { background: var(--window-buttons) !important; } +.notice-3bPHh-.colorDefault-22HBa0 { + display: none; +} `); ArmCord.addStyle( diff --git a/theme.html b/theme.html index 6533388..c035ebc 100644 --- a/theme.html +++ b/theme.html @@ -27,20 +27,11 @@ transform: translateY(-105%); } - h1:before { + .logo:before { content: "ARM"; color: #7289da; font-weight: normal; font-family: Helvetica, sans-serif; - font-size: 32px; - } - - h1:after { - content: "Cord"; - color: #ffffff; - font-weight: normal; - font-family: Discordinated; - font-size: 32px; } span { @@ -52,6 +43,7 @@ font-weight: normal; font-family: Discordinated; font-size: 32px; + text-align: center; } .container { @@ -61,11 +53,39 @@ color: #fff; transform: translate(-50%, -50%); } + + button.back-btn { + position: absolute; + background-color: #7289da; + font-family: Whitney,"Helvetica Neue",Helvetica,Arial,sans-serif; + color: #ffffff; + padding: 4px; + border-radius: 5px; + width: 105px; + height: 25px; + margin-top: 5px; + margin-left: 5px; + text-align: center; + border-style: none; + outline: none; + } + + button.back-btn:hover { + background-color: #687dc6; + border-style: none; + outline: none; + cursor: pointer; + } + + button.back-btn:active { + background-color: #5c6fb1; + } - + +
From 2faf59b43e74aa4e041fa472da523e69bd231325 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 20 May 2021 16:11:38 +0000 Subject: [PATCH 20/63] Bump electron from 12.0.6 to 12.0.9 Bumps [electron](https://github.com/electron/electron) from 12.0.6 to 12.0.9. - [Release notes](https://github.com/electron/electron/releases) - [Changelog](https://github.com/electron/electron/blob/master/docs/breaking-changes.md) - [Commits](https://github.com/electron/electron/compare/v12.0.6...v12.0.9) Signed-off-by: dependabot[bot] --- package-lock.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index dd2997d..d73bdd4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { "name": "armcord", - "version": "2.4.0", + "version": "2.5.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "version": "2.4.0", + "version": "2.5.0", "license": "MIT", "dependencies": { "custom-electron-titlebar": "3.2.6", @@ -2229,9 +2229,9 @@ } }, "node_modules/electron": { - "version": "12.0.6", - "resolved": "https://registry.npmjs.org/electron/-/electron-12.0.6.tgz", - "integrity": "sha512-+fqhpdG6Fd6LzsizMdaSPC1I8tfsMT8/7fsYBgABED3hEWdus/rt6CQ54P3/EWZyQebtyHR6HXtlofUqKMV3KQ==", + "version": "12.0.9", + "resolved": "https://registry.npmjs.org/electron/-/electron-12.0.9.tgz", + "integrity": "sha512-p5aEt1tIh/PYjwN+6MHTc5HtW529XR9r4Qlj9PPcSb5ubkotSsS0BtWJoRPhDenSAN8sgHk3sbZLxXPJtdnRYA==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -8866,9 +8866,9 @@ } }, "electron": { - "version": "12.0.6", - "resolved": "https://registry.npmjs.org/electron/-/electron-12.0.6.tgz", - "integrity": "sha512-+fqhpdG6Fd6LzsizMdaSPC1I8tfsMT8/7fsYBgABED3hEWdus/rt6CQ54P3/EWZyQebtyHR6HXtlofUqKMV3KQ==", + "version": "12.0.9", + "resolved": "https://registry.npmjs.org/electron/-/electron-12.0.9.tgz", + "integrity": "sha512-p5aEt1tIh/PYjwN+6MHTc5HtW529XR9r4Qlj9PPcSb5ubkotSsS0BtWJoRPhDenSAN8sgHk3sbZLxXPJtdnRYA==", "dev": true, "requires": { "@electron/get": "^1.0.1", From 3461a997dfa15c36a8f07e017324aa5806880943 Mon Sep 17 00:00:00 2001 From: smartfridge <37928912+smartfrigde@users.noreply.github.com> Date: Thu, 20 May 2021 18:27:04 +0200 Subject: [PATCH 21/63] fuck depandabot all my homies hate dependabot --- package-lock.json | 2127 ++++++++++++++++++++------------------------- package.json | 20 +- 2 files changed, 938 insertions(+), 1209 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6cce676..5dec907 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,25 +1,25 @@ { "name": "armcord", - "version": "2.4.0", + "version": "2.5.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "version": "2.4.0", + "version": "2.5.0", "license": "MIT", "dependencies": { - "custom-electron-titlebar": "3.2.6", + "custom-electron-titlebar": "3.2.7", "electron-context-menu": "^3.0.0", "electron-localshortcut": "^3.2.1", "electron-squirrel-startup": "^1.0.0", "v8-compile-cache": "^2.3.0" }, "devDependencies": { - "@electron-forge/cli": "^6.0.0-beta.55", - "@electron-forge/maker-deb": "^6.0.0-beta.54", - "@electron-forge/maker-rpm": "^6.0.0-beta.54", - "@electron-forge/maker-squirrel": "^6.0.0-beta.54", - "@electron-forge/maker-zip": "^6.0.0-beta.54", + "@electron-forge/cli": "^6.0.0-beta.54", + "@electron-forge/maker-deb": "^6.0.0-beta.55", + "@electron-forge/maker-rpm": "^6.0.0-beta.55", + "@electron-forge/maker-squirrel": "^6.0.0-beta.55", + "@electron-forge/maker-zip": "^6.0.0-beta.55", "@electron-forge/publisher-github": "*", "electron": "*" } @@ -41,9 +41,9 @@ } }, "node_modules/@electron-forge/cli": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/cli/-/cli-6.0.0-beta.55.tgz", - "integrity": "sha512-RQ4l9ApVCC3gfZWMHWd5B0liqvHXzYVrdMG7TVGUjTiCdQXUUUbnMPAEZBQqJUiY6mFfCUsM3/3KiVyiAAi3cg==", + "version": "6.0.0-beta.54", + "resolved": "https://registry.npmjs.org/@electron-forge/cli/-/cli-6.0.0-beta.54.tgz", + "integrity": "sha512-+Ui1BI8c5CnBawH2OEySa5QR8DzrFd/I9FHlClvrTsIDfsBAeMSv9NTbSNcmo9Af5kI+aNsLQa8tp1vD8DNrng==", "dev": true, "funding": [ { @@ -56,15 +56,15 @@ } ], "dependencies": { - "@electron-forge/async-ora": "6.0.0-beta.55", - "@electron-forge/core": "6.0.0-beta.55", - "@electron-forge/shared-types": "6.0.0-beta.55", + "@electron-forge/async-ora": "6.0.0-beta.54", + "@electron-forge/core": "6.0.0-beta.54", + "@electron-forge/shared-types": "6.0.0-beta.54", "@electron/get": "^1.9.0", "colors": "^1.4.0", "commander": "^4.1.1", - "debug": "^4.3.1", + "debug": "^4.1.0", "fs-extra": "^9.0.1", - "inquirer": "^8.0.0", + "inquirer": "^7.3.3", "semver": "^7.2.1" }, "bin": { @@ -76,37 +76,6 @@ "node": ">= 10.0.0" } }, - "node_modules/@electron-forge/cli/node_modules/@electron-forge/async-ora": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.55.tgz", - "integrity": "sha512-B5td9OP13wn5zQO6mcJp99dsckKA33qsCy8uyoBeaS5pRlX3DPzJjoP+rlmAgHDeEBbay/PzbgZjeB1bCJpAQA==", - "dev": true, - "dependencies": { - "colors": "^1.4.0", - "debug": "^4.3.1", - "log-symbols": "^4.0.0", - "ora": "^5.0.0", - "pretty-ms": "^7.0.0" - }, - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/@electron-forge/cli/node_modules/@electron-forge/shared-types": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.55.tgz", - "integrity": "sha512-tPXnt2Eh1gW8wlk0ieN/IYGgKFPG6LEUUsTh+zPmnsD4Md9M6Tv9nNiUitM5xvVhNZkezJB/Q0K7f9t+6J4sdw==", - "dev": true, - "dependencies": { - "@electron-forge/async-ora": "6.0.0-beta.55", - "electron-packager": "^15.0.0", - "electron-rebuild": "^2.3.2", - "ora": "^5.0.0" - }, - "engines": { - "node": ">= 10.0.0" - } - }, "node_modules/@electron-forge/cli/node_modules/commander": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz", @@ -168,9 +137,9 @@ } }, "node_modules/@electron-forge/core": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/core/-/core-6.0.0-beta.55.tgz", - "integrity": "sha512-i+DLumF1m5ltyMYha+THPtGGbNkl+zkMTjlWcse+2+wbg/LxzVcEDcIJRh+YQPWFgCSZt1o6EvwXQqSfE2AU2w==", + "version": "6.0.0-beta.54", + "resolved": "https://registry.npmjs.org/@electron-forge/core/-/core-6.0.0-beta.54.tgz", + "integrity": "sha512-yggZeiwRLnIsQYCT5jKhx2L7I02CwUCjnIzA+CqUZXD0AU1c2o0BA/26dNOGvY/+pr5yWjOXcrGy1hvj3dnLmQ==", "dev": true, "funding": [ { @@ -183,27 +152,27 @@ } ], "dependencies": { - "@electron-forge/async-ora": "6.0.0-beta.55", - "@electron-forge/installer-base": "6.0.0-beta.55", - "@electron-forge/installer-deb": "6.0.0-beta.55", - "@electron-forge/installer-dmg": "6.0.0-beta.55", - "@electron-forge/installer-exe": "6.0.0-beta.55", - "@electron-forge/installer-rpm": "6.0.0-beta.55", - "@electron-forge/installer-zip": "6.0.0-beta.55", - "@electron-forge/maker-base": "6.0.0-beta.55", - "@electron-forge/plugin-base": "6.0.0-beta.55", - "@electron-forge/publisher-base": "6.0.0-beta.55", - "@electron-forge/shared-types": "6.0.0-beta.55", - "@electron-forge/template-base": "6.0.0-beta.55", - "@electron-forge/template-typescript": "6.0.0-beta.55", - "@electron-forge/template-typescript-webpack": "6.0.0-beta.55", - "@electron-forge/template-webpack": "6.0.0-beta.55", + "@electron-forge/async-ora": "6.0.0-beta.54", + "@electron-forge/installer-base": "6.0.0-beta.54", + "@electron-forge/installer-deb": "6.0.0-beta.54", + "@electron-forge/installer-dmg": "6.0.0-beta.54", + "@electron-forge/installer-exe": "6.0.0-beta.54", + "@electron-forge/installer-rpm": "6.0.0-beta.54", + "@electron-forge/installer-zip": "6.0.0-beta.54", + "@electron-forge/maker-base": "6.0.0-beta.54", + "@electron-forge/plugin-base": "6.0.0-beta.54", + "@electron-forge/publisher-base": "6.0.0-beta.54", + "@electron-forge/shared-types": "6.0.0-beta.54", + "@electron-forge/template-base": "6.0.0-beta.54", + "@electron-forge/template-typescript": "6.0.0-beta.54", + "@electron-forge/template-typescript-webpack": "6.0.0-beta.54", + "@electron-forge/template-webpack": "6.0.0-beta.54", "@electron/get": "^1.9.0", - "@malept/cross-spawn-promise": "^1.1.1", + "@malept/cross-spawn-promise": "^1.1.0", "colors": "^1.4.0", - "debug": "^4.3.1", + "debug": "^4.1.0", "electron-packager": "^15.0.0", - "electron-rebuild": "^2.3.2", + "electron-rebuild": "^2.0.3", "find-up": "^5.0.0", "fs-extra": "^9.0.1", "glob": "^7.1.5", @@ -222,63 +191,6 @@ "node": ">= 10.0.0" } }, - "node_modules/@electron-forge/core/node_modules/@electron-forge/async-ora": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.55.tgz", - "integrity": "sha512-B5td9OP13wn5zQO6mcJp99dsckKA33qsCy8uyoBeaS5pRlX3DPzJjoP+rlmAgHDeEBbay/PzbgZjeB1bCJpAQA==", - "dev": true, - "dependencies": { - "colors": "^1.4.0", - "debug": "^4.3.1", - "log-symbols": "^4.0.0", - "ora": "^5.0.0", - "pretty-ms": "^7.0.0" - }, - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/@electron-forge/core/node_modules/@electron-forge/maker-base": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-6.0.0-beta.55.tgz", - "integrity": "sha512-fsRj+RAkOtAZNm2y6e7HKF/FQEaIbujqaTtfcKVL401FMCfb8+Y/LuXDnulMTenLfXDtpMvgMiDGMKAnxa8pUQ==", - "dev": true, - "dependencies": { - "@electron-forge/shared-types": "6.0.0-beta.55", - "fs-extra": "^9.0.1", - "which": "^2.0.2" - }, - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/@electron-forge/core/node_modules/@electron-forge/publisher-base": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/publisher-base/-/publisher-base-6.0.0-beta.55.tgz", - "integrity": "sha512-Hh3uBRxO0o3ULZjv80YtjjOONC1R8gkc/M/BIC8C+GytHbpF4GhCN0kNCGRHgyASPTuC2iPtd4nU65PZIf2c2w==", - "dev": true, - "dependencies": { - "@electron-forge/shared-types": "6.0.0-beta.55" - }, - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/@electron-forge/core/node_modules/@electron-forge/shared-types": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.55.tgz", - "integrity": "sha512-tPXnt2Eh1gW8wlk0ieN/IYGgKFPG6LEUUsTh+zPmnsD4Md9M6Tv9nNiUitM5xvVhNZkezJB/Q0K7f9t+6J4sdw==", - "dev": true, - "dependencies": { - "@electron-forge/async-ora": "6.0.0-beta.55", - "electron-packager": "^15.0.0", - "electron-rebuild": "^2.3.2", - "ora": "^5.0.0" - }, - "engines": { - "node": ">= 10.0.0" - } - }, "node_modules/@electron-forge/core/node_modules/find-up": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", @@ -401,41 +313,25 @@ } }, "node_modules/@electron-forge/installer-base": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/installer-base/-/installer-base-6.0.0-beta.55.tgz", - "integrity": "sha512-Q6HCkvHVwXnHznpdof3he9ZN93WVeLpCDXZ5Dfx7TWnIz/5A7v0wne7V2lCoTgMlUcOpaBq+3O0x+3x5wLT1EA==", + "version": "6.0.0-beta.54", + "resolved": "https://registry.npmjs.org/@electron-forge/installer-base/-/installer-base-6.0.0-beta.54.tgz", + "integrity": "sha512-q6Z5kBAE6StKqn+3Z5tXVHu7WGCb9OMeIomw9H9Q41UUIehF7V0J3tCWTkJdhZ8D6/tkXcis3GKptaj0wfMpyg==", "dev": true, "dependencies": { - "@electron-forge/async-ora": "6.0.0-beta.55" - }, - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/@electron-forge/installer-base/node_modules/@electron-forge/async-ora": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.55.tgz", - "integrity": "sha512-B5td9OP13wn5zQO6mcJp99dsckKA33qsCy8uyoBeaS5pRlX3DPzJjoP+rlmAgHDeEBbay/PzbgZjeB1bCJpAQA==", - "dev": true, - "dependencies": { - "colors": "^1.4.0", - "debug": "^4.3.1", - "log-symbols": "^4.0.0", - "ora": "^5.0.0", - "pretty-ms": "^7.0.0" + "@electron-forge/async-ora": "6.0.0-beta.54" }, "engines": { "node": ">= 10.0.0" } }, "node_modules/@electron-forge/installer-darwin": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/installer-darwin/-/installer-darwin-6.0.0-beta.55.tgz", - "integrity": "sha512-khdt9lz9k/epiQKjGFOmhk8baxfONbEvj6g7fYRGQ/gofEYXt/xgl7MiQDTFmv1ynEznaySlSCqCnJkawfNm2Q==", + "version": "6.0.0-beta.54", + "resolved": "https://registry.npmjs.org/@electron-forge/installer-darwin/-/installer-darwin-6.0.0-beta.54.tgz", + "integrity": "sha512-kRbH24+QBhbcIugnIvevnf43JGzLFLoyFsoY3YeyZeeDL3vfyg0vtSyUx0hfq1GpHG+zObDf3o18c3WbxdXlXA==", "dev": true, "dependencies": { - "@electron-forge/async-ora": "6.0.0-beta.55", - "@electron-forge/installer-base": "6.0.0-beta.55", + "@electron-forge/async-ora": "6.0.0-beta.54", + "@electron-forge/installer-base": "6.0.0-beta.54", "fs-extra": "^9.0.1", "sudo-prompt": "^9.1.1" }, @@ -443,22 +339,6 @@ "node": ">= 10.0.0" } }, - "node_modules/@electron-forge/installer-darwin/node_modules/@electron-forge/async-ora": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.55.tgz", - "integrity": "sha512-B5td9OP13wn5zQO6mcJp99dsckKA33qsCy8uyoBeaS5pRlX3DPzJjoP+rlmAgHDeEBbay/PzbgZjeB1bCJpAQA==", - "dev": true, - "dependencies": { - "colors": "^1.4.0", - "debug": "^4.3.1", - "log-symbols": "^4.0.0", - "ora": "^5.0.0", - "pretty-ms": "^7.0.0" - }, - "engines": { - "node": ">= 10.0.0" - } - }, "node_modules/@electron-forge/installer-darwin/node_modules/fs-extra": { "version": "9.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", @@ -496,26 +376,26 @@ } }, "node_modules/@electron-forge/installer-deb": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/installer-deb/-/installer-deb-6.0.0-beta.55.tgz", - "integrity": "sha512-IMWhgCFx5jh9x2WNXsY2qc9q5h+wRuqFFXz+/hByhxkEFD8uYSXbRzPcwbT6+1iGMPOr1cAwAqH2FtQB97aN9A==", + "version": "6.0.0-beta.54", + "resolved": "https://registry.npmjs.org/@electron-forge/installer-deb/-/installer-deb-6.0.0-beta.54.tgz", + "integrity": "sha512-UbJR2Md0SBqex5AIv9YZ56hY2Iz5gZ6f1iAx0q4PlYpCY19W9nRXdudLNhx1w5go26DsT53+h6EzX2NGpBLq3Q==", "dev": true, "dependencies": { - "@electron-forge/installer-linux": "6.0.0-beta.55" + "@electron-forge/installer-linux": "6.0.0-beta.54" }, "engines": { "node": ">= 10.0.0" } }, "node_modules/@electron-forge/installer-dmg": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/installer-dmg/-/installer-dmg-6.0.0-beta.55.tgz", - "integrity": "sha512-39sXQfK8ygmdMEkOwTPnbjpR9ZE8PZXdnZiVUAwfhypQqpr5LtNTWSaEGcrB8HyJWpq6uZltg+kyBkGj5zRh6g==", + "version": "6.0.0-beta.54", + "resolved": "https://registry.npmjs.org/@electron-forge/installer-dmg/-/installer-dmg-6.0.0-beta.54.tgz", + "integrity": "sha512-F9jwhUTzdFNlbLus7RQ8paoGPryr79JFYDLi42f0dyuFwlOjwlrA1wN5xWqrvcMeqFlc3DfjjeRWZ+10RQyorA==", "dev": true, "dependencies": { - "@electron-forge/installer-darwin": "6.0.0-beta.55", - "@malept/cross-spawn-promise": "^1.1.1", - "debug": "^4.3.1", + "@electron-forge/installer-darwin": "6.0.0-beta.54", + "@malept/cross-spawn-promise": "^1.1.0", + "debug": "^4.1.0", "fs-extra": "^9.0.1" }, "engines": { @@ -559,12 +439,12 @@ } }, "node_modules/@electron-forge/installer-exe": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/installer-exe/-/installer-exe-6.0.0-beta.55.tgz", - "integrity": "sha512-sEolJtnv4LHYy4cqK28Izs2YFqErQRQsbxUK2yzYgZ7IwsBbiu0389UQah4ixvWYeDsiqqment2BDjamUgEB1w==", + "version": "6.0.0-beta.54", + "resolved": "https://registry.npmjs.org/@electron-forge/installer-exe/-/installer-exe-6.0.0-beta.54.tgz", + "integrity": "sha512-PE7RBPerSenNcSkKXJWpervKNl7AVT+JeMzx61OHUQSw3h63NHRvXWh31llxk32mmJcaKRgGle2GsWob87Lv/w==", "dev": true, "dependencies": { - "@electron-forge/installer-base": "6.0.0-beta.55", + "@electron-forge/installer-base": "6.0.0-beta.54", "open": "^7.2.1" }, "engines": { @@ -572,12 +452,12 @@ } }, "node_modules/@electron-forge/installer-linux": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/installer-linux/-/installer-linux-6.0.0-beta.55.tgz", - "integrity": "sha512-Ac+VH3TN1KbrKTwVujNL+nfiCxuDyqAv7ukDQxP8DoOUmaU9HlSMdh5raVQZ8ffNnSk6D+3s1dU6Dlcmdi8ReA==", + "version": "6.0.0-beta.54", + "resolved": "https://registry.npmjs.org/@electron-forge/installer-linux/-/installer-linux-6.0.0-beta.54.tgz", + "integrity": "sha512-WQVV5fitsfTyktjb18m9Bx+Dho6rCFvVILqFNZAu1RfXIsjLl/h0WdkozdGDccfeDMqlRYmaNs3e5THn5swnAg==", "dev": true, "dependencies": { - "@electron-forge/installer-base": "6.0.0-beta.55", + "@electron-forge/installer-base": "6.0.0-beta.54", "sudo-prompt": "^9.1.1" }, "engines": { @@ -585,25 +465,25 @@ } }, "node_modules/@electron-forge/installer-rpm": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/installer-rpm/-/installer-rpm-6.0.0-beta.55.tgz", - "integrity": "sha512-OCcw59va1W5BtNm+yFXDFJcBYfyiEd8ntO2t1Op5IMPMmVt8Op9AveHsxPBY8BpCVOuHmCHrDRrIlFm2PAOPeA==", + "version": "6.0.0-beta.54", + "resolved": "https://registry.npmjs.org/@electron-forge/installer-rpm/-/installer-rpm-6.0.0-beta.54.tgz", + "integrity": "sha512-8gaJA2m8+Y/ZhV4xEeijXz8UksrliMEzyUAdwM5ZdAsmfmGlnhchGr0L6rI23D66dQP9DeyvUIuUwXrsTlj1nQ==", "dev": true, "dependencies": { - "@electron-forge/installer-linux": "6.0.0-beta.55" + "@electron-forge/installer-linux": "6.0.0-beta.54" }, "engines": { "node": ">= 10.0.0" } }, "node_modules/@electron-forge/installer-zip": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/installer-zip/-/installer-zip-6.0.0-beta.55.tgz", - "integrity": "sha512-fZBjP6HKDUVAq2HBSLdw16KgqWuyuW1FOc+lAfShHJiYcB+KYJZVIv9CqVudmcyT0riePIb4fKFXhYFYc232kQ==", + "version": "6.0.0-beta.54", + "resolved": "https://registry.npmjs.org/@electron-forge/installer-zip/-/installer-zip-6.0.0-beta.54.tgz", + "integrity": "sha512-KCY5zreA79wjZODhLmtrbFweTWdlh9JgmW9WruIrmHm3sK19rRhCdaZ+Dg5ZWUhMx2A79d5a2C7r78lWGcHl7A==", "dev": true, "dependencies": { - "@electron-forge/installer-darwin": "6.0.0-beta.55", - "@malept/cross-spawn-promise": "^1.1.1", + "@electron-forge/installer-darwin": "6.0.0-beta.54", + "@malept/cross-spawn-promise": "^1.1.0", "fs-extra": "^9.0.1" }, "engines": { @@ -697,13 +577,13 @@ } }, "node_modules/@electron-forge/maker-deb": { - "version": "6.0.0-beta.54", - "resolved": "https://registry.npmjs.org/@electron-forge/maker-deb/-/maker-deb-6.0.0-beta.54.tgz", - "integrity": "sha512-PEAYULi7n/JkwvaEQnM554ewmLYkxGtHvuh6vUf5wsh48Xw3jcEVHejsc4FDjx5I6cKAByb9nscTtZpKt3ngXw==", + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-deb/-/maker-deb-6.0.0-beta.55.tgz", + "integrity": "sha512-3dxhTHH2c2p+bkg0uktOECXXYxFsD9clsK9A+PZO81llX+p8EF/iLuXfkVupinnwDO5wl9K2mv4LEEkBnnpOVQ==", "dev": true, "dependencies": { - "@electron-forge/maker-base": "6.0.0-beta.54", - "@electron-forge/shared-types": "6.0.0-beta.54" + "@electron-forge/maker-base": "6.0.0-beta.55", + "@electron-forge/shared-types": "6.0.0-beta.55" }, "engines": { "node": ">= 10.0.0" @@ -712,14 +592,95 @@ "electron-installer-debian": "^3.0.0" } }, - "node_modules/@electron-forge/maker-rpm": { - "version": "6.0.0-beta.54", - "resolved": "https://registry.npmjs.org/@electron-forge/maker-rpm/-/maker-rpm-6.0.0-beta.54.tgz", - "integrity": "sha512-6nqBOUnojRE8+KdvE8zVXN2/H/V/QuWJQ4cwCLahJQxG1kG5RXOh6VbsM1mEFxjJwOhVnK+wkNCODf1qi56JZw==", + "node_modules/@electron-forge/maker-deb/node_modules/@electron-forge/async-ora": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.55.tgz", + "integrity": "sha512-B5td9OP13wn5zQO6mcJp99dsckKA33qsCy8uyoBeaS5pRlX3DPzJjoP+rlmAgHDeEBbay/PzbgZjeB1bCJpAQA==", "dev": true, "dependencies": { - "@electron-forge/maker-base": "6.0.0-beta.54", - "@electron-forge/shared-types": "6.0.0-beta.54" + "colors": "^1.4.0", + "debug": "^4.3.1", + "log-symbols": "^4.0.0", + "ora": "^5.0.0", + "pretty-ms": "^7.0.0" + }, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/@electron-forge/maker-deb/node_modules/@electron-forge/maker-base": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-6.0.0-beta.55.tgz", + "integrity": "sha512-fsRj+RAkOtAZNm2y6e7HKF/FQEaIbujqaTtfcKVL401FMCfb8+Y/LuXDnulMTenLfXDtpMvgMiDGMKAnxa8pUQ==", + "dev": true, + "dependencies": { + "@electron-forge/shared-types": "6.0.0-beta.55", + "fs-extra": "^9.0.1", + "which": "^2.0.2" + }, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/@electron-forge/maker-deb/node_modules/@electron-forge/shared-types": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.55.tgz", + "integrity": "sha512-tPXnt2Eh1gW8wlk0ieN/IYGgKFPG6LEUUsTh+zPmnsD4Md9M6Tv9nNiUitM5xvVhNZkezJB/Q0K7f9t+6J4sdw==", + "dev": true, + "dependencies": { + "@electron-forge/async-ora": "6.0.0-beta.55", + "electron-packager": "^15.0.0", + "electron-rebuild": "^2.3.2", + "ora": "^5.0.0" + }, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/@electron-forge/maker-deb/node_modules/fs-extra": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "dev": true, + "dependencies": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@electron-forge/maker-deb/node_modules/jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "dependencies": { + "universalify": "^2.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/@electron-forge/maker-deb/node_modules/universalify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", + "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", + "dev": true, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/@electron-forge/maker-rpm": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-rpm/-/maker-rpm-6.0.0-beta.55.tgz", + "integrity": "sha512-f+YmztQ+4lhub8ULMtCSksx+AcILEA4J+CXIzUWC+9IdLTid42t8yZSkRnwxHrQUSFF6g1hF6LKsE2S/jlrJoQ==", + "dev": true, + "dependencies": { + "@electron-forge/maker-base": "6.0.0-beta.55", + "@electron-forge/shared-types": "6.0.0-beta.55" }, "engines": { "node": ">= 10.0.0" @@ -728,21 +689,147 @@ "electron-installer-redhat": "^3.2.0" } }, - "node_modules/@electron-forge/maker-squirrel": { - "version": "6.0.0-beta.54", - "resolved": "https://registry.npmjs.org/@electron-forge/maker-squirrel/-/maker-squirrel-6.0.0-beta.54.tgz", - "integrity": "sha512-JJ+HmUe94zZ6mZnyv3IvNLQ5nwoj4dcQ4gzwps4P3fCEpuABMr74KOlza7fMXrrs8cwOrGfMFwsk80GTcLdWkg==", + "node_modules/@electron-forge/maker-rpm/node_modules/@electron-forge/async-ora": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.55.tgz", + "integrity": "sha512-B5td9OP13wn5zQO6mcJp99dsckKA33qsCy8uyoBeaS5pRlX3DPzJjoP+rlmAgHDeEBbay/PzbgZjeB1bCJpAQA==", "dev": true, "dependencies": { - "@electron-forge/maker-base": "6.0.0-beta.54", - "@electron-forge/shared-types": "6.0.0-beta.54", + "colors": "^1.4.0", + "debug": "^4.3.1", + "log-symbols": "^4.0.0", + "ora": "^5.0.0", + "pretty-ms": "^7.0.0" + }, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/@electron-forge/maker-rpm/node_modules/@electron-forge/maker-base": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-6.0.0-beta.55.tgz", + "integrity": "sha512-fsRj+RAkOtAZNm2y6e7HKF/FQEaIbujqaTtfcKVL401FMCfb8+Y/LuXDnulMTenLfXDtpMvgMiDGMKAnxa8pUQ==", + "dev": true, + "dependencies": { + "@electron-forge/shared-types": "6.0.0-beta.55", + "fs-extra": "^9.0.1", + "which": "^2.0.2" + }, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/@electron-forge/maker-rpm/node_modules/@electron-forge/shared-types": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.55.tgz", + "integrity": "sha512-tPXnt2Eh1gW8wlk0ieN/IYGgKFPG6LEUUsTh+zPmnsD4Md9M6Tv9nNiUitM5xvVhNZkezJB/Q0K7f9t+6J4sdw==", + "dev": true, + "dependencies": { + "@electron-forge/async-ora": "6.0.0-beta.55", + "electron-packager": "^15.0.0", + "electron-rebuild": "^2.3.2", + "ora": "^5.0.0" + }, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/@electron-forge/maker-rpm/node_modules/fs-extra": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "dev": true, + "dependencies": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@electron-forge/maker-rpm/node_modules/jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "dependencies": { + "universalify": "^2.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/@electron-forge/maker-rpm/node_modules/universalify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", + "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", + "dev": true, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/@electron-forge/maker-squirrel": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-squirrel/-/maker-squirrel-6.0.0-beta.55.tgz", + "integrity": "sha512-2ugnVUA1His7nquOtqXjmEFcfVqBV2WWKlEYb4T71aw4Sq+Dzsu3EPmcIjR7dtU8mBrQxRt0EYcz/ZDtgZOPag==", + "dev": true, + "dependencies": { + "@electron-forge/maker-base": "6.0.0-beta.55", + "@electron-forge/shared-types": "6.0.0-beta.55", "fs-extra": "^9.0.1" }, "engines": { "node": ">= 10.0.0" }, "optionalDependencies": { - "electron-winstaller": "^4.0.1" + "electron-winstaller": "^5.0.0" + } + }, + "node_modules/@electron-forge/maker-squirrel/node_modules/@electron-forge/async-ora": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.55.tgz", + "integrity": "sha512-B5td9OP13wn5zQO6mcJp99dsckKA33qsCy8uyoBeaS5pRlX3DPzJjoP+rlmAgHDeEBbay/PzbgZjeB1bCJpAQA==", + "dev": true, + "dependencies": { + "colors": "^1.4.0", + "debug": "^4.3.1", + "log-symbols": "^4.0.0", + "ora": "^5.0.0", + "pretty-ms": "^7.0.0" + }, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/@electron-forge/maker-squirrel/node_modules/@electron-forge/maker-base": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-6.0.0-beta.55.tgz", + "integrity": "sha512-fsRj+RAkOtAZNm2y6e7HKF/FQEaIbujqaTtfcKVL401FMCfb8+Y/LuXDnulMTenLfXDtpMvgMiDGMKAnxa8pUQ==", + "dev": true, + "dependencies": { + "@electron-forge/shared-types": "6.0.0-beta.55", + "fs-extra": "^9.0.1", + "which": "^2.0.2" + }, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/@electron-forge/maker-squirrel/node_modules/@electron-forge/shared-types": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.55.tgz", + "integrity": "sha512-tPXnt2Eh1gW8wlk0ieN/IYGgKFPG6LEUUsTh+zPmnsD4Md9M6Tv9nNiUitM5xvVhNZkezJB/Q0K7f9t+6J4sdw==", + "dev": true, + "dependencies": { + "@electron-forge/async-ora": "6.0.0-beta.55", + "electron-packager": "^15.0.0", + "electron-rebuild": "^2.3.2", + "ora": "^5.0.0" + }, + "engines": { + "node": ">= 10.0.0" } }, "node_modules/@electron-forge/maker-squirrel/node_modules/fs-extra": { @@ -782,13 +869,13 @@ } }, "node_modules/@electron-forge/maker-zip": { - "version": "6.0.0-beta.54", - "resolved": "https://registry.npmjs.org/@electron-forge/maker-zip/-/maker-zip-6.0.0-beta.54.tgz", - "integrity": "sha512-wbJhK1rDOCZMTtKrjvavT8R+Yi+v/6axsnTXvzbkzzMQ0xADKNslTwzO6mmbBJea4oIbYmQ44DRAjI21TNyQ/A==", + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-zip/-/maker-zip-6.0.0-beta.55.tgz", + "integrity": "sha512-man3kGnsYldnKf2HI99JBOpU/AALsYzmt33kFxq1ptUnK8cWcJWB/HxWIzY1fEyLAkcFTVWt4wnN/L4PahzO/w==", "dev": true, "dependencies": { - "@electron-forge/maker-base": "6.0.0-beta.54", - "@electron-forge/shared-types": "6.0.0-beta.54", + "@electron-forge/maker-base": "6.0.0-beta.55", + "@electron-forge/shared-types": "6.0.0-beta.55", "cross-zip": "^3.0.0", "fs-extra": "^9.0.1" }, @@ -796,6 +883,51 @@ "node": ">= 10.0.0" } }, + "node_modules/@electron-forge/maker-zip/node_modules/@electron-forge/async-ora": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.55.tgz", + "integrity": "sha512-B5td9OP13wn5zQO6mcJp99dsckKA33qsCy8uyoBeaS5pRlX3DPzJjoP+rlmAgHDeEBbay/PzbgZjeB1bCJpAQA==", + "dev": true, + "dependencies": { + "colors": "^1.4.0", + "debug": "^4.3.1", + "log-symbols": "^4.0.0", + "ora": "^5.0.0", + "pretty-ms": "^7.0.0" + }, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/@electron-forge/maker-zip/node_modules/@electron-forge/maker-base": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-6.0.0-beta.55.tgz", + "integrity": "sha512-fsRj+RAkOtAZNm2y6e7HKF/FQEaIbujqaTtfcKVL401FMCfb8+Y/LuXDnulMTenLfXDtpMvgMiDGMKAnxa8pUQ==", + "dev": true, + "dependencies": { + "@electron-forge/shared-types": "6.0.0-beta.55", + "fs-extra": "^9.0.1", + "which": "^2.0.2" + }, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/@electron-forge/maker-zip/node_modules/@electron-forge/shared-types": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.55.tgz", + "integrity": "sha512-tPXnt2Eh1gW8wlk0ieN/IYGgKFPG6LEUUsTh+zPmnsD4Md9M6Tv9nNiUitM5xvVhNZkezJB/Q0K7f9t+6J4sdw==", + "dev": true, + "dependencies": { + "@electron-forge/async-ora": "6.0.0-beta.55", + "electron-packager": "^15.0.0", + "electron-rebuild": "^2.3.2", + "ora": "^5.0.0" + }, + "engines": { + "node": ">= 10.0.0" + } + }, "node_modules/@electron-forge/maker-zip/node_modules/fs-extra": { "version": "9.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", @@ -833,43 +965,12 @@ } }, "node_modules/@electron-forge/plugin-base": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/plugin-base/-/plugin-base-6.0.0-beta.55.tgz", - "integrity": "sha512-z2e76XwLXdswXUPqLpM2jF9ZbUoNyGn1/kzfVRWrplth5yUnaIuZoT5n5y9t4cWTHQ9m2i9DEFVRfdzF9P7G8g==", + "version": "6.0.0-beta.54", + "resolved": "https://registry.npmjs.org/@electron-forge/plugin-base/-/plugin-base-6.0.0-beta.54.tgz", + "integrity": "sha512-8HwGzgNCHo2PgUfNnTch3Gvj7l6fqOgjnARK1y056UfsxFy+hwvHaAO+7LLfr7ktNwU/bH3hGhOpE+ZmBSwSqQ==", "dev": true, "dependencies": { - "@electron-forge/shared-types": "6.0.0-beta.55" - }, - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/@electron-forge/plugin-base/node_modules/@electron-forge/async-ora": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.55.tgz", - "integrity": "sha512-B5td9OP13wn5zQO6mcJp99dsckKA33qsCy8uyoBeaS5pRlX3DPzJjoP+rlmAgHDeEBbay/PzbgZjeB1bCJpAQA==", - "dev": true, - "dependencies": { - "colors": "^1.4.0", - "debug": "^4.3.1", - "log-symbols": "^4.0.0", - "ora": "^5.0.0", - "pretty-ms": "^7.0.0" - }, - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/@electron-forge/plugin-base/node_modules/@electron-forge/shared-types": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.55.tgz", - "integrity": "sha512-tPXnt2Eh1gW8wlk0ieN/IYGgKFPG6LEUUsTh+zPmnsD4Md9M6Tv9nNiUitM5xvVhNZkezJB/Q0K7f9t+6J4sdw==", - "dev": true, - "dependencies": { - "@electron-forge/async-ora": "6.0.0-beta.55", - "electron-packager": "^15.0.0", - "electron-rebuild": "^2.3.2", - "ora": "^5.0.0" + "@electron-forge/shared-types": "6.0.0-beta.54" }, "engines": { "node": ">= 10.0.0" @@ -888,17 +989,17 @@ } }, "node_modules/@electron-forge/publisher-github": { - "version": "6.0.0-beta.54", - "resolved": "https://registry.npmjs.org/@electron-forge/publisher-github/-/publisher-github-6.0.0-beta.54.tgz", - "integrity": "sha512-B6jwlYBtLjxpL0K6X7DKr8RgOk7mFEDbPsnExmZBbdY19FJ6Z5IdW8atOOqVQl7i+8XjwtXGOKBFv2QDKHp48A==", + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/publisher-github/-/publisher-github-6.0.0-beta.55.tgz", + "integrity": "sha512-NS0WinKvV8X+6hSk6kiBhlZ+OSmb2Ht3UCvrXKnsg24v6IegOwrPK7zG3ls0GkaPFIFUx5DEhEmpnYk1jFDAeQ==", "dev": true, "dependencies": { - "@electron-forge/async-ora": "6.0.0-beta.54", - "@electron-forge/publisher-base": "6.0.0-beta.54", - "@electron-forge/shared-types": "6.0.0-beta.54", - "@octokit/core": "^3.1.2", - "@octokit/rest": "^18.0.6", - "@octokit/types": "^5.5.0", + "@electron-forge/async-ora": "6.0.0-beta.55", + "@electron-forge/publisher-base": "6.0.0-beta.55", + "@electron-forge/shared-types": "6.0.0-beta.55", + "@octokit/core": "^3.2.4", + "@octokit/rest": "^18.0.11", + "@octokit/types": "^6.1.2", "fs-extra": "^9.0.1", "lodash": "^4.17.20", "mime-types": "^2.1.25" @@ -907,6 +1008,49 @@ "node": ">= 10.0.0" } }, + "node_modules/@electron-forge/publisher-github/node_modules/@electron-forge/async-ora": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.55.tgz", + "integrity": "sha512-B5td9OP13wn5zQO6mcJp99dsckKA33qsCy8uyoBeaS5pRlX3DPzJjoP+rlmAgHDeEBbay/PzbgZjeB1bCJpAQA==", + "dev": true, + "dependencies": { + "colors": "^1.4.0", + "debug": "^4.3.1", + "log-symbols": "^4.0.0", + "ora": "^5.0.0", + "pretty-ms": "^7.0.0" + }, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/@electron-forge/publisher-github/node_modules/@electron-forge/publisher-base": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/publisher-base/-/publisher-base-6.0.0-beta.55.tgz", + "integrity": "sha512-Hh3uBRxO0o3ULZjv80YtjjOONC1R8gkc/M/BIC8C+GytHbpF4GhCN0kNCGRHgyASPTuC2iPtd4nU65PZIf2c2w==", + "dev": true, + "dependencies": { + "@electron-forge/shared-types": "6.0.0-beta.55" + }, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/@electron-forge/publisher-github/node_modules/@electron-forge/shared-types": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.55.tgz", + "integrity": "sha512-tPXnt2Eh1gW8wlk0ieN/IYGgKFPG6LEUUsTh+zPmnsD4Md9M6Tv9nNiUitM5xvVhNZkezJB/Q0K7f9t+6J4sdw==", + "dev": true, + "dependencies": { + "@electron-forge/async-ora": "6.0.0-beta.55", + "electron-packager": "^15.0.0", + "electron-rebuild": "^2.3.2", + "ora": "^5.0.0" + }, + "engines": { + "node": ">= 10.0.0" + } + }, "node_modules/@electron-forge/publisher-github/node_modules/fs-extra": { "version": "9.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", @@ -959,14 +1103,14 @@ } }, "node_modules/@electron-forge/template-base": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/template-base/-/template-base-6.0.0-beta.55.tgz", - "integrity": "sha512-1ht7h+ZtOn0LsiZc6HMrT5LGTHM7zvySQgJyMkiYQPhYMhNJiIv6dJv6SEI9n12CO5WBTZcx/ACHh012A/caKg==", + "version": "6.0.0-beta.54", + "resolved": "https://registry.npmjs.org/@electron-forge/template-base/-/template-base-6.0.0-beta.54.tgz", + "integrity": "sha512-LuSpeOiM6AzUbamz5U/NqRkn4y7dzof1JK1ISAb+6tORf7JU014aKqDcLdwgP8Lxaz6P1bdlMmNJTvg5+SBrEw==", "dev": true, "dependencies": { - "@electron-forge/async-ora": "6.0.0-beta.55", - "@electron-forge/shared-types": "6.0.0-beta.55", - "debug": "^4.3.1", + "@electron-forge/async-ora": "6.0.0-beta.54", + "@electron-forge/shared-types": "6.0.0-beta.54", + "debug": "^4.1.0", "fs-extra": "^9.0.1", "username": "^5.1.0" }, @@ -974,37 +1118,6 @@ "node": ">= 10.0.0" } }, - "node_modules/@electron-forge/template-base/node_modules/@electron-forge/async-ora": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.55.tgz", - "integrity": "sha512-B5td9OP13wn5zQO6mcJp99dsckKA33qsCy8uyoBeaS5pRlX3DPzJjoP+rlmAgHDeEBbay/PzbgZjeB1bCJpAQA==", - "dev": true, - "dependencies": { - "colors": "^1.4.0", - "debug": "^4.3.1", - "log-symbols": "^4.0.0", - "ora": "^5.0.0", - "pretty-ms": "^7.0.0" - }, - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/@electron-forge/template-base/node_modules/@electron-forge/shared-types": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.55.tgz", - "integrity": "sha512-tPXnt2Eh1gW8wlk0ieN/IYGgKFPG6LEUUsTh+zPmnsD4Md9M6Tv9nNiUitM5xvVhNZkezJB/Q0K7f9t+6J4sdw==", - "dev": true, - "dependencies": { - "@electron-forge/async-ora": "6.0.0-beta.55", - "electron-packager": "^15.0.0", - "electron-rebuild": "^2.3.2", - "ora": "^5.0.0" - }, - "engines": { - "node": ">= 10.0.0" - } - }, "node_modules/@electron-forge/template-base/node_modules/fs-extra": { "version": "9.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", @@ -1042,14 +1155,14 @@ } }, "node_modules/@electron-forge/template-typescript": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/template-typescript/-/template-typescript-6.0.0-beta.55.tgz", - "integrity": "sha512-JDG/1lmBEHBRA85qZD4KtO60lhndsH8mMs6TmfEw828NQ9+zXoMYxv5h3XG8COh1u7IbZJQHDcoNSzMd2eANMw==", + "version": "6.0.0-beta.54", + "resolved": "https://registry.npmjs.org/@electron-forge/template-typescript/-/template-typescript-6.0.0-beta.54.tgz", + "integrity": "sha512-7V87LWH+vJ1YibM9MsTttbz7upfwLrmXgchQ399EfLxK306g7q/ouyGkeTerhLr2gCUAvm/Oqx+sXQ7402ol9w==", "dev": true, "dependencies": { - "@electron-forge/async-ora": "6.0.0-beta.55", - "@electron-forge/shared-types": "6.0.0-beta.55", - "@electron-forge/template-base": "6.0.0-beta.55", + "@electron-forge/async-ora": "6.0.0-beta.54", + "@electron-forge/shared-types": "6.0.0-beta.54", + "@electron-forge/template-base": "6.0.0-beta.54", "fs-extra": "^9.0.1" }, "engines": { @@ -1057,51 +1170,20 @@ } }, "node_modules/@electron-forge/template-typescript-webpack": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/template-typescript-webpack/-/template-typescript-webpack-6.0.0-beta.55.tgz", - "integrity": "sha512-tHrHiPaD5w8X58+uEMUFdvIPWnFJSKg2HtNQi2QOV6oDceNY2yA5GSZU09NSwFtlhNqhGB2JZjnnTu0QGY9MUw==", + "version": "6.0.0-beta.54", + "resolved": "https://registry.npmjs.org/@electron-forge/template-typescript-webpack/-/template-typescript-webpack-6.0.0-beta.54.tgz", + "integrity": "sha512-1MIw1eGlMZg7KLG4oAEE0rB28WDOtz01OSoW2a2NqkmUzmu4BxJdSvQ97Tp7xCU0naW0H1uU39B9QOjJQgLGCQ==", "dev": true, "dependencies": { - "@electron-forge/async-ora": "6.0.0-beta.55", - "@electron-forge/shared-types": "6.0.0-beta.55", - "@electron-forge/template-base": "6.0.0-beta.55", + "@electron-forge/async-ora": "6.0.0-beta.54", + "@electron-forge/shared-types": "6.0.0-beta.54", + "@electron-forge/template-base": "6.0.0-beta.54", "fs-extra": "^9.0.1" }, "engines": { "node": ">= 10.0.0" } }, - "node_modules/@electron-forge/template-typescript-webpack/node_modules/@electron-forge/async-ora": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.55.tgz", - "integrity": "sha512-B5td9OP13wn5zQO6mcJp99dsckKA33qsCy8uyoBeaS5pRlX3DPzJjoP+rlmAgHDeEBbay/PzbgZjeB1bCJpAQA==", - "dev": true, - "dependencies": { - "colors": "^1.4.0", - "debug": "^4.3.1", - "log-symbols": "^4.0.0", - "ora": "^5.0.0", - "pretty-ms": "^7.0.0" - }, - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/@electron-forge/template-typescript-webpack/node_modules/@electron-forge/shared-types": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.55.tgz", - "integrity": "sha512-tPXnt2Eh1gW8wlk0ieN/IYGgKFPG6LEUUsTh+zPmnsD4Md9M6Tv9nNiUitM5xvVhNZkezJB/Q0K7f9t+6J4sdw==", - "dev": true, - "dependencies": { - "@electron-forge/async-ora": "6.0.0-beta.55", - "electron-packager": "^15.0.0", - "electron-rebuild": "^2.3.2", - "ora": "^5.0.0" - }, - "engines": { - "node": ">= 10.0.0" - } - }, "node_modules/@electron-forge/template-typescript-webpack/node_modules/fs-extra": { "version": "9.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", @@ -1138,37 +1220,6 @@ "node": ">= 10.0.0" } }, - "node_modules/@electron-forge/template-typescript/node_modules/@electron-forge/async-ora": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.55.tgz", - "integrity": "sha512-B5td9OP13wn5zQO6mcJp99dsckKA33qsCy8uyoBeaS5pRlX3DPzJjoP+rlmAgHDeEBbay/PzbgZjeB1bCJpAQA==", - "dev": true, - "dependencies": { - "colors": "^1.4.0", - "debug": "^4.3.1", - "log-symbols": "^4.0.0", - "ora": "^5.0.0", - "pretty-ms": "^7.0.0" - }, - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/@electron-forge/template-typescript/node_modules/@electron-forge/shared-types": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.55.tgz", - "integrity": "sha512-tPXnt2Eh1gW8wlk0ieN/IYGgKFPG6LEUUsTh+zPmnsD4Md9M6Tv9nNiUitM5xvVhNZkezJB/Q0K7f9t+6J4sdw==", - "dev": true, - "dependencies": { - "@electron-forge/async-ora": "6.0.0-beta.55", - "electron-packager": "^15.0.0", - "electron-rebuild": "^2.3.2", - "ora": "^5.0.0" - }, - "engines": { - "node": ">= 10.0.0" - } - }, "node_modules/@electron-forge/template-typescript/node_modules/fs-extra": { "version": "9.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", @@ -1206,51 +1257,20 @@ } }, "node_modules/@electron-forge/template-webpack": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/template-webpack/-/template-webpack-6.0.0-beta.55.tgz", - "integrity": "sha512-WjHUFT2khvWLcMrHkjj2hlcHrX03fxJ8k6G723OQJ+nR4UYeSzVfbNAT2h2smchUe9n1bSwbB6TdU0SRsCPCFA==", + "version": "6.0.0-beta.54", + "resolved": "https://registry.npmjs.org/@electron-forge/template-webpack/-/template-webpack-6.0.0-beta.54.tgz", + "integrity": "sha512-4/zUOZ8MCZqs8PcUCeeG6ofpy6HT53tQiLknM23OPaFP6ckuE6kOunC6N/teijUrJuLpKl3P8d39SWPVacxEzg==", "dev": true, "dependencies": { - "@electron-forge/async-ora": "6.0.0-beta.55", - "@electron-forge/shared-types": "6.0.0-beta.55", - "@electron-forge/template-base": "6.0.0-beta.55", + "@electron-forge/async-ora": "6.0.0-beta.54", + "@electron-forge/shared-types": "6.0.0-beta.54", + "@electron-forge/template-base": "6.0.0-beta.54", "fs-extra": "^9.0.1" }, "engines": { "node": ">= 10.0.0" } }, - "node_modules/@electron-forge/template-webpack/node_modules/@electron-forge/async-ora": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.55.tgz", - "integrity": "sha512-B5td9OP13wn5zQO6mcJp99dsckKA33qsCy8uyoBeaS5pRlX3DPzJjoP+rlmAgHDeEBbay/PzbgZjeB1bCJpAQA==", - "dev": true, - "dependencies": { - "colors": "^1.4.0", - "debug": "^4.3.1", - "log-symbols": "^4.0.0", - "ora": "^5.0.0", - "pretty-ms": "^7.0.0" - }, - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/@electron-forge/template-webpack/node_modules/@electron-forge/shared-types": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.55.tgz", - "integrity": "sha512-tPXnt2Eh1gW8wlk0ieN/IYGgKFPG6LEUUsTh+zPmnsD4Md9M6Tv9nNiUitM5xvVhNZkezJB/Q0K7f9t+6J4sdw==", - "dev": true, - "dependencies": { - "@electron-forge/async-ora": "6.0.0-beta.55", - "electron-packager": "^15.0.0", - "electron-rebuild": "^2.3.2", - "ora": "^5.0.0" - }, - "engines": { - "node": ">= 10.0.0" - } - }, "node_modules/@electron-forge/template-webpack/node_modules/fs-extra": { "version": "9.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", @@ -1291,7 +1311,6 @@ "version": "1.12.3", "resolved": "https://registry.npmjs.org/@electron/get/-/get-1.12.3.tgz", "integrity": "sha512-NFwSnVZQK7dhOYF1NQCt+HGqgL1aNdj0LUSx75uCqnZJqyiWCVdAMFV4b4/kC8HjUJAnsvdSEmjEt4G2qNQ9+Q==", - "dev": true, "dependencies": { "debug": "^4.1.1", "env-paths": "^2.2.0", @@ -1341,15 +1360,6 @@ "@octokit/types": "^6.0.3" } }, - "node_modules/@octokit/auth-token/node_modules/@octokit/types": { - "version": "6.14.2", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.14.2.tgz", - "integrity": "sha512-wiQtW9ZSy4OvgQ09iQOdyXYNN60GqjCL/UdMsepDr1Gr0QzpW6irIKbH3REuAHXAhxkEk9/F2a3Gcs1P6kW5jA==", - "dev": true, - "dependencies": { - "@octokit/openapi-types": "^7.0.0" - } - }, "node_modules/@octokit/core": { "version": "3.4.0", "resolved": "https://registry.npmjs.org/@octokit/core/-/core-3.4.0.tgz", @@ -1365,15 +1375,6 @@ "universal-user-agent": "^6.0.0" } }, - "node_modules/@octokit/core/node_modules/@octokit/types": { - "version": "6.14.2", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.14.2.tgz", - "integrity": "sha512-wiQtW9ZSy4OvgQ09iQOdyXYNN60GqjCL/UdMsepDr1Gr0QzpW6irIKbH3REuAHXAhxkEk9/F2a3Gcs1P6kW5jA==", - "dev": true, - "dependencies": { - "@octokit/openapi-types": "^7.0.0" - } - }, "node_modules/@octokit/endpoint": { "version": "6.0.11", "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.11.tgz", @@ -1385,15 +1386,6 @@ "universal-user-agent": "^6.0.0" } }, - "node_modules/@octokit/endpoint/node_modules/@octokit/types": { - "version": "6.14.2", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.14.2.tgz", - "integrity": "sha512-wiQtW9ZSy4OvgQ09iQOdyXYNN60GqjCL/UdMsepDr1Gr0QzpW6irIKbH3REuAHXAhxkEk9/F2a3Gcs1P6kW5jA==", - "dev": true, - "dependencies": { - "@octokit/openapi-types": "^7.0.0" - } - }, "node_modules/@octokit/graphql": { "version": "4.6.1", "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.6.1.tgz", @@ -1405,15 +1397,6 @@ "universal-user-agent": "^6.0.0" } }, - "node_modules/@octokit/graphql/node_modules/@octokit/types": { - "version": "6.14.2", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.14.2.tgz", - "integrity": "sha512-wiQtW9ZSy4OvgQ09iQOdyXYNN60GqjCL/UdMsepDr1Gr0QzpW6irIKbH3REuAHXAhxkEk9/F2a3Gcs1P6kW5jA==", - "dev": true, - "dependencies": { - "@octokit/openapi-types": "^7.0.0" - } - }, "node_modules/@octokit/openapi-types": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-7.0.0.tgz", @@ -1432,15 +1415,6 @@ "@octokit/core": ">=2" } }, - "node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/types": { - "version": "6.14.2", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.14.2.tgz", - "integrity": "sha512-wiQtW9ZSy4OvgQ09iQOdyXYNN60GqjCL/UdMsepDr1Gr0QzpW6irIKbH3REuAHXAhxkEk9/F2a3Gcs1P6kW5jA==", - "dev": true, - "dependencies": { - "@octokit/openapi-types": "^7.0.0" - } - }, "node_modules/@octokit/plugin-request-log": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.3.tgz", @@ -1463,15 +1437,6 @@ "@octokit/core": ">=3" } }, - "node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types": { - "version": "6.14.2", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.14.2.tgz", - "integrity": "sha512-wiQtW9ZSy4OvgQ09iQOdyXYNN60GqjCL/UdMsepDr1Gr0QzpW6irIKbH3REuAHXAhxkEk9/F2a3Gcs1P6kW5jA==", - "dev": true, - "dependencies": { - "@octokit/openapi-types": "^7.0.0" - } - }, "node_modules/@octokit/request": { "version": "5.4.15", "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.4.15.tgz", @@ -1497,24 +1462,6 @@ "once": "^1.4.0" } }, - "node_modules/@octokit/request-error/node_modules/@octokit/types": { - "version": "6.14.2", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.14.2.tgz", - "integrity": "sha512-wiQtW9ZSy4OvgQ09iQOdyXYNN60GqjCL/UdMsepDr1Gr0QzpW6irIKbH3REuAHXAhxkEk9/F2a3Gcs1P6kW5jA==", - "dev": true, - "dependencies": { - "@octokit/openapi-types": "^7.0.0" - } - }, - "node_modules/@octokit/request/node_modules/@octokit/types": { - "version": "6.14.2", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.14.2.tgz", - "integrity": "sha512-wiQtW9ZSy4OvgQ09iQOdyXYNN60GqjCL/UdMsepDr1Gr0QzpW6irIKbH3REuAHXAhxkEk9/F2a3Gcs1P6kW5jA==", - "dev": true, - "dependencies": { - "@octokit/openapi-types": "^7.0.0" - } - }, "node_modules/@octokit/rest": { "version": "18.5.3", "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-18.5.3.tgz", @@ -1528,19 +1475,18 @@ } }, "node_modules/@octokit/types": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-5.5.0.tgz", - "integrity": "sha512-UZ1pErDue6bZNjYOotCNveTXArOMZQFG6hKJfOnGnulVCMcVVi7YIIuuR4WfBhjo7zgpmzn/BkPDnUXtNx+PcQ==", + "version": "6.14.2", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.14.2.tgz", + "integrity": "sha512-wiQtW9ZSy4OvgQ09iQOdyXYNN60GqjCL/UdMsepDr1Gr0QzpW6irIKbH3REuAHXAhxkEk9/F2a3Gcs1P6kW5jA==", "dev": true, "dependencies": { - "@types/node": ">= 8" + "@octokit/openapi-types": "^7.0.0" } }, "node_modules/@sindresorhus/is": { "version": "0.14.0", "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz", "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==", - "dev": true, "engines": { "node": ">=6" } @@ -1549,7 +1495,6 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz", "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==", - "dev": true, "dependencies": { "defer-to-connect": "^1.0.1" }, @@ -1615,8 +1560,7 @@ "node_modules/@types/node": { "version": "14.14.43", "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.43.tgz", - "integrity": "sha512-3pwDJjp1PWacPTpH0LcfhgjvurQvrZFBrC6xxjaUEZ7ifUtT32jtjPxEMMblpqd2Mvx+k8haqQJLQxolyGN/cQ==", - "dev": true + "integrity": "sha512-3pwDJjp1PWacPTpH0LcfhgjvurQvrZFBrC6xxjaUEZ7ifUtT32jtjPxEMMblpqd2Mvx+k8haqQJLQxolyGN/cQ==" }, "node_modules/@types/responselike": { "version": "1.0.0", @@ -1878,7 +1822,6 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.0.2.tgz", "integrity": "sha512-RwywHlpCRc3/Wh81MiCKun4ydaIFyW5Ea6JbL6sRCVx5q5irDw7pMXBUFYF/jArQ6YrG36q0kpovc9P/Kd3I4g==", - "dev": true, "optional": true }, "node_modules/brace-expansion": { @@ -1935,7 +1878,6 @@ "version": "0.2.13", "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=", - "dev": true, "engines": { "node": "*" } @@ -1949,8 +1891,7 @@ "node_modules/buffer-from": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", - "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==", - "dev": true + "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==" }, "node_modules/cacheable-lookup": { "version": "5.0.4", @@ -1965,7 +1906,6 @@ "version": "6.1.0", "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz", "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==", - "dev": true, "dependencies": { "clone-response": "^1.0.2", "get-stream": "^5.1.0", @@ -1983,7 +1923,6 @@ "version": "5.2.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", - "dev": true, "dependencies": { "pump": "^3.0.0" }, @@ -1995,7 +1934,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==", - "dev": true, "engines": { "node": ">=8" } @@ -2147,7 +2085,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz", "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=", - "dev": true, "dependencies": { "mimic-response": "^1.0.0" } @@ -2226,7 +2163,6 @@ "version": "1.6.2", "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", - "dev": true, "engines": [ "node >= 0.8" ], @@ -2241,7 +2177,6 @@ "version": "1.1.12", "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz", "integrity": "sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==", - "dev": true, "optional": true, "dependencies": { "ini": "^1.3.4", @@ -2258,14 +2193,12 @@ "version": "3.8.3", "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.8.3.tgz", "integrity": "sha512-KPYXeVZYemC2TkNEkX/01I+7yd+nX3KddKwZ1Ww7SKWdI2wQprSgLmrTddT8nw92AjEklTsPBoSdQBhbI1bQ6Q==", - "dev": true, "optional": true }, "node_modules/core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", - "dev": true + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, "node_modules/cross-spawn": { "version": "7.0.3", @@ -2339,9 +2272,12 @@ } }, "node_modules/custom-electron-titlebar": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/custom-electron-titlebar/-/custom-electron-titlebar-3.2.6.tgz", - "integrity": "sha512-P3ZGEr0eouUHqhdBBXllpuy2bFhfSmp+32HQBPcwzujjIsUhQxQj/nCpJiFa4SUGAEp1ifu/icuZdDKNNX72Tw==" + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/custom-electron-titlebar/-/custom-electron-titlebar-3.2.7.tgz", + "integrity": "sha512-KO/6e3r6YflfNUOzi5QHLwkLHBP+ICtHPo70u/kUIKR8UUkDTPb4a9i19q0uDZQcjkH6oqRvFCz9wEHeEpCgxw==", + "peerDependencies": { + "electron": "^10.0.0 || ^11.0.0 || ^12.0.0" + } }, "node_modules/dashdash": { "version": "1.14.1", @@ -2384,7 +2320,6 @@ "version": "3.3.0", "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=", - "dev": true, "dependencies": { "mimic-response": "^1.0.0" }, @@ -2413,14 +2348,12 @@ "node_modules/defer-to-connect": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz", - "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==", - "dev": true + "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==" }, "node_modules/define-properties": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", - "dev": true, "optional": true, "dependencies": { "object-keys": "^1.0.12" @@ -2466,14 +2399,12 @@ "version": "2.0.4", "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz", "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==", - "dev": true, "optional": true }, "node_modules/duplexer3": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz", - "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=", - "dev": true + "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=" }, "node_modules/ecc-jsbn": { "version": "0.1.2", @@ -2489,7 +2420,6 @@ "version": "12.0.6", "resolved": "https://registry.npmjs.org/electron/-/electron-12.0.6.tgz", "integrity": "sha512-+fqhpdG6Fd6LzsizMdaSPC1I8tfsMT8/7fsYBgABED3hEWdus/rt6CQ54P3/EWZyQebtyHR6HXtlofUqKMV3KQ==", - "dev": true, "hasInstallScript": true, "dependencies": { "@electron/get": "^1.0.1", @@ -3364,10 +3294,11 @@ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, "node_modules/electron-winstaller": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/electron-winstaller/-/electron-winstaller-4.0.2.tgz", - "integrity": "sha512-tYmzIyi+W0CXd9o/jmR0VT+vwJ+nOaE/dQz8f64IlbQ/J9d2lpwsmmOKxx6veAVKeYiJHYQHR1eYsLzznNzd5g==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/electron-winstaller/-/electron-winstaller-5.0.0.tgz", + "integrity": "sha512-V+jFda7aVAm0htCG8Q95buPUpmXZW9ujh1HdhSlWY6y4QnJnw4TfrmxTlQWV4p2ioF/71JMI/1YF+/qbSICogA==", "dev": true, + "hasInstallScript": true, "optional": true, "dependencies": { "asar": "^2.0.1", @@ -3455,7 +3386,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=", - "dev": true, "optional": true, "engines": { "node": ">= 0.8" @@ -3465,7 +3395,6 @@ "version": "1.4.4", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", - "dev": true, "dependencies": { "once": "^1.4.0" } @@ -3474,7 +3403,6 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.0.tgz", "integrity": "sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA==", - "dev": true, "engines": { "node": ">=6" } @@ -3492,7 +3420,6 @@ "version": "4.1.1", "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==", - "dev": true, "optional": true }, "node_modules/escalade": { @@ -3516,7 +3443,6 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true, "engines": { "node": ">=0.8.0" } @@ -3661,11 +3587,22 @@ "node": ">=4" } }, + "node_modules/external-editor/node_modules/iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dev": true, + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/extract-zip": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz", "integrity": "sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==", - "dev": true, "dependencies": { "concat-stream": "^1.6.2", "debug": "^2.6.9", @@ -3680,7 +3617,6 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, "dependencies": { "ms": "2.0.0" } @@ -3688,8 +3624,7 @@ "node_modules/extract-zip/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, "node_modules/extsprintf": { "version": "1.4.0", @@ -3716,7 +3651,6 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=", - "dev": true, "dependencies": { "pend": "~1.2.0" } @@ -3740,7 +3674,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz", "integrity": "sha1-q/c9+rc10EVECr/qLZHzieu/oik=", - "dev": true, "engines": { "node": ">=4" } @@ -3749,7 +3682,6 @@ "version": "4.2.0", "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-4.2.0.tgz", "integrity": "sha512-pkgE+4p7N1n7QieOopmn3TqJaefjdWXwEkj2XLZJLKfOgcQKkn11ahvGNgTD8mLggexLiDFQxeTs14xVU22XPA==", - "dev": true, "dependencies": { "filename-reserved-regex": "^2.0.0", "strip-outer": "^1.0.1", @@ -3825,7 +3757,6 @@ "version": "8.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", - "dev": true, "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^4.0.0", @@ -4035,7 +3966,6 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", - "dev": true, "dependencies": { "pump": "^3.0.0" }, @@ -4073,7 +4003,6 @@ "version": "2.1.12", "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-2.1.12.tgz", "integrity": "sha512-caAljRMS/qcDo69X9BfkgrihGUgGx44Fb4QQToNQjsiWh+YlQ66uqYVAdA8Olqit+5Ng0nkz09je3ZzANMZcjg==", - "dev": true, "optional": true, "dependencies": { "boolean": "^3.0.1", @@ -4092,7 +4021,6 @@ "version": "7.3.4", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz", "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==", - "dev": true, "optional": true, "dependencies": { "lru-cache": "^6.0.0" @@ -4150,7 +4078,6 @@ "version": "2.7.1", "resolved": "https://registry.npmjs.org/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz", "integrity": "sha512-4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg==", - "dev": true, "optional": true, "dependencies": { "encodeurl": "^1.0.2", @@ -4166,7 +4093,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.1.tgz", "integrity": "sha512-mJPRTc/P39NH/iNG4mXa9aIhNymaQikTrnspeCa2ZuJ+mH2QN/rXwtX3XwKrHqWgUQFbNZKtHM105aHzJalElw==", - "dev": true, "optional": true, "dependencies": { "define-properties": "^1.1.3" @@ -4179,7 +4105,6 @@ "version": "9.6.0", "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz", "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==", - "dev": true, "dependencies": { "@sindresorhus/is": "^0.14.0", "@szmarczak/http-timer": "^1.1.2", @@ -4200,8 +4125,7 @@ "node_modules/graceful-fs": { "version": "4.2.4", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", - "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", - "dev": true + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==" }, "node_modules/har-schema": { "version": "2.0.0", @@ -4268,8 +4192,7 @@ "node_modules/http-cache-semantics": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz", - "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==", - "dev": true + "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==" }, "node_modules/http-signature": { "version": "1.2.0", @@ -4299,18 +4222,6 @@ "node": ">=10.19.0" } }, - "node_modules/iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "dev": true, - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/ieee754": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", @@ -4365,19 +4276,18 @@ "node_modules/inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "node_modules/ini": { "version": "1.3.8", "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", - "dev": true + "devOptional": true }, "node_modules/inquirer": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.0.0.tgz", - "integrity": "sha512-ON8pEJPPCdyjxj+cxsYRe6XfCJepTxANdNnTebsTuQgXpRyZRRT9t4dJwjRubgmvn20CLSEnozRUayXyM9VTXA==", + "version": "7.3.3", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz", + "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==", "dev": true, "dependencies": { "ansi-escapes": "^4.2.1", @@ -4386,10 +4296,10 @@ "cli-width": "^3.0.0", "external-editor": "^3.0.3", "figures": "^3.0.0", - "lodash": "^4.17.21", + "lodash": "^4.17.19", "mute-stream": "0.0.8", "run-async": "^2.4.0", - "rxjs": "^6.6.6", + "rxjs": "^6.6.0", "string-width": "^4.1.0", "strip-ansi": "^6.0.0", "through": "^2.3.6" @@ -4532,8 +4442,7 @@ "node_modules/isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" }, "node_modules/isexe": { "version": "2.0.0", @@ -4556,8 +4465,7 @@ "node_modules/json-buffer": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz", - "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=", - "dev": true + "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=" }, "node_modules/json-schema": { "version": "0.2.3", @@ -4575,13 +4483,12 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", - "dev": true + "devOptional": true }, "node_modules/jsonfile": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", - "dev": true, "dependencies": { "graceful-fs": "^4.1.6" } @@ -4633,7 +4540,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz", "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==", - "dev": true, "dependencies": { "json-buffer": "3.0.0" } @@ -4676,10 +4582,10 @@ } }, "node_modules/lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", + "devOptional": true }, "node_modules/lodash._reinterpolate": { "version": "3.0.0", @@ -4748,7 +4654,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -4757,7 +4662,7 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, + "devOptional": true, "dependencies": { "yallist": "^4.0.0" }, @@ -4809,7 +4714,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/matcher/-/matcher-3.0.0.tgz", "integrity": "sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==", - "dev": true, "optional": true, "dependencies": { "escape-string-regexp": "^4.0.0" @@ -4822,7 +4726,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", - "dev": true, "optional": true, "engines": { "node": ">=10" @@ -4999,7 +4902,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz", "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==", - "dev": true, "engines": { "node": ">=4" } @@ -5019,8 +4921,7 @@ "node_modules/minimist": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", - "dev": true + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" }, "node_modules/minipass": { "version": "3.1.3", @@ -5051,7 +4952,6 @@ "version": "0.5.5", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", - "dev": true, "dependencies": { "minimist": "^1.2.5" }, @@ -5104,6 +5004,18 @@ "ms": "^2.1.1" } }, + "node_modules/needle/node_modules/iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dev": true, + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/nice-try": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", @@ -5345,7 +5257,6 @@ "version": "4.5.0", "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz", "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==", - "dev": true, "engines": { "node": ">=8" } @@ -5363,7 +5274,6 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz", "integrity": "sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==", - "dev": true, "optional": true, "dependencies": { "config-chain": "^1.1.11", @@ -5487,7 +5397,6 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", - "dev": true, "optional": true, "engines": { "node": ">= 0.4" @@ -5497,7 +5406,6 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dev": true, "dependencies": { "wrappy": "1" } @@ -5588,7 +5496,6 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz", "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==", - "dev": true, "engines": { "node": ">=6" } @@ -5752,8 +5659,7 @@ "node_modules/pend": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", - "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=", - "dev": true + "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=" }, "node_modules/performance-now": { "version": "2.1.0", @@ -5765,7 +5671,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "dev": true, "optional": true, "engines": { "node": ">=4" @@ -5892,7 +5797,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=", - "dev": true, "engines": { "node": ">=4" } @@ -5931,14 +5835,12 @@ "node_modules/process-nextick-args": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", - "dev": true + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" }, "node_modules/progress": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", - "dev": true, "engines": { "node": ">=0.4.0" } @@ -5957,7 +5859,6 @@ "version": "1.2.4", "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=", - "dev": true, "optional": true }, "node_modules/psl": { @@ -5970,7 +5871,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", - "dev": true, "dependencies": { "end-of-stream": "^1.1.0", "once": "^1.3.1" @@ -6072,7 +5972,6 @@ "version": "2.3.7", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "dev": true, "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -6205,7 +6104,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz", "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=", - "dev": true, "dependencies": { "lowercase-keys": "^1.0.0" } @@ -6239,7 +6137,6 @@ "version": "2.15.4", "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.4.tgz", "integrity": "sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==", - "dev": true, "optional": true, "dependencies": { "boolean": "^3.0.1", @@ -6277,8 +6174,7 @@ "node_modules/safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, "node_modules/safer-buffer": { "version": "2.1.2", @@ -6296,7 +6192,6 @@ "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true, "bin": { "semver": "bin/semver.js" } @@ -6305,14 +6200,12 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz", "integrity": "sha1-De4hahyUGrN+nvsXiPavxf9VN/w=", - "dev": true, "optional": true }, "node_modules/serialize-error": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz", "integrity": "sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==", - "dev": true, "optional": true, "dependencies": { "type-fest": "^0.13.1" @@ -6514,7 +6407,6 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz", "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==", - "dev": true, "optional": true }, "node_modules/sshpk": { @@ -6546,7 +6438,6 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, "dependencies": { "safe-buffer": "~5.1.0" } @@ -6634,7 +6525,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz", "integrity": "sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==", - "dev": true, "dependencies": { "escape-string-regexp": "^1.0.2" }, @@ -6652,7 +6542,6 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.1.tgz", "integrity": "sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==", - "dev": true, "dependencies": { "debug": "^4.1.0" }, @@ -6836,7 +6725,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz", "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==", - "dev": true, "engines": { "node": ">=6" } @@ -6867,7 +6755,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz", "integrity": "sha1-42RqLqTokTEr9+rObPsFOAvAHCE=", - "dev": true, "dependencies": { "escape-string-regexp": "^1.0.2" }, @@ -6885,7 +6772,6 @@ "version": "0.0.6", "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz", "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==", - "dev": true, "optional": true, "engines": { "node": ">=0.6.11 <=0.7.0 || >=0.7.3" @@ -6913,7 +6799,6 @@ "version": "0.13.1", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz", "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==", - "dev": true, "optional": true, "engines": { "node": ">=10" @@ -6922,8 +6807,7 @@ "node_modules/typedarray": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", - "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", - "dev": true + "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" }, "node_modules/universal-user-agent": { "version": "6.0.0", @@ -6935,7 +6819,6 @@ "version": "0.1.2", "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", - "dev": true, "engines": { "node": ">= 4.0.0" } @@ -6973,7 +6856,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=", - "dev": true, "dependencies": { "prepend-http": "^2.0.0" }, @@ -6997,8 +6879,7 @@ "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", - "dev": true + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, "node_modules/uuid": { "version": "3.4.0", @@ -7139,8 +7020,7 @@ "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, "node_modules/xmlbuilder": { "version": "9.0.7", @@ -7191,7 +7071,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true + "devOptional": true }, "node_modules/yargs": { "version": "16.2.0", @@ -7308,7 +7188,6 @@ "version": "2.10.0", "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=", - "dev": true, "dependencies": { "buffer-crc32": "~0.2.3", "fd-slicer": "~1.1.0" @@ -7342,48 +7221,23 @@ } }, "@electron-forge/cli": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/cli/-/cli-6.0.0-beta.55.tgz", - "integrity": "sha512-RQ4l9ApVCC3gfZWMHWd5B0liqvHXzYVrdMG7TVGUjTiCdQXUUUbnMPAEZBQqJUiY6mFfCUsM3/3KiVyiAAi3cg==", + "version": "6.0.0-beta.54", + "resolved": "https://registry.npmjs.org/@electron-forge/cli/-/cli-6.0.0-beta.54.tgz", + "integrity": "sha512-+Ui1BI8c5CnBawH2OEySa5QR8DzrFd/I9FHlClvrTsIDfsBAeMSv9NTbSNcmo9Af5kI+aNsLQa8tp1vD8DNrng==", "dev": true, "requires": { - "@electron-forge/async-ora": "6.0.0-beta.55", - "@electron-forge/core": "6.0.0-beta.55", - "@electron-forge/shared-types": "6.0.0-beta.55", + "@electron-forge/async-ora": "6.0.0-beta.54", + "@electron-forge/core": "6.0.0-beta.54", + "@electron-forge/shared-types": "6.0.0-beta.54", "@electron/get": "^1.9.0", "colors": "^1.4.0", "commander": "^4.1.1", - "debug": "^4.3.1", + "debug": "^4.1.0", "fs-extra": "^9.0.1", - "inquirer": "^8.0.0", + "inquirer": "^7.3.3", "semver": "^7.2.1" }, "dependencies": { - "@electron-forge/async-ora": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.55.tgz", - "integrity": "sha512-B5td9OP13wn5zQO6mcJp99dsckKA33qsCy8uyoBeaS5pRlX3DPzJjoP+rlmAgHDeEBbay/PzbgZjeB1bCJpAQA==", - "dev": true, - "requires": { - "colors": "^1.4.0", - "debug": "^4.3.1", - "log-symbols": "^4.0.0", - "ora": "^5.0.0", - "pretty-ms": "^7.0.0" - } - }, - "@electron-forge/shared-types": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.55.tgz", - "integrity": "sha512-tPXnt2Eh1gW8wlk0ieN/IYGgKFPG6LEUUsTh+zPmnsD4Md9M6Tv9nNiUitM5xvVhNZkezJB/Q0K7f9t+6J4sdw==", - "dev": true, - "requires": { - "@electron-forge/async-ora": "6.0.0-beta.55", - "electron-packager": "^15.0.0", - "electron-rebuild": "^2.3.2", - "ora": "^5.0.0" - } - }, "commander": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz", @@ -7430,32 +7284,32 @@ } }, "@electron-forge/core": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/core/-/core-6.0.0-beta.55.tgz", - "integrity": "sha512-i+DLumF1m5ltyMYha+THPtGGbNkl+zkMTjlWcse+2+wbg/LxzVcEDcIJRh+YQPWFgCSZt1o6EvwXQqSfE2AU2w==", + "version": "6.0.0-beta.54", + "resolved": "https://registry.npmjs.org/@electron-forge/core/-/core-6.0.0-beta.54.tgz", + "integrity": "sha512-yggZeiwRLnIsQYCT5jKhx2L7I02CwUCjnIzA+CqUZXD0AU1c2o0BA/26dNOGvY/+pr5yWjOXcrGy1hvj3dnLmQ==", "dev": true, "requires": { - "@electron-forge/async-ora": "6.0.0-beta.55", - "@electron-forge/installer-base": "6.0.0-beta.55", - "@electron-forge/installer-deb": "6.0.0-beta.55", - "@electron-forge/installer-dmg": "6.0.0-beta.55", - "@electron-forge/installer-exe": "6.0.0-beta.55", - "@electron-forge/installer-rpm": "6.0.0-beta.55", - "@electron-forge/installer-zip": "6.0.0-beta.55", - "@electron-forge/maker-base": "6.0.0-beta.55", - "@electron-forge/plugin-base": "6.0.0-beta.55", - "@electron-forge/publisher-base": "6.0.0-beta.55", - "@electron-forge/shared-types": "6.0.0-beta.55", - "@electron-forge/template-base": "6.0.0-beta.55", - "@electron-forge/template-typescript": "6.0.0-beta.55", - "@electron-forge/template-typescript-webpack": "6.0.0-beta.55", - "@electron-forge/template-webpack": "6.0.0-beta.55", + "@electron-forge/async-ora": "6.0.0-beta.54", + "@electron-forge/installer-base": "6.0.0-beta.54", + "@electron-forge/installer-deb": "6.0.0-beta.54", + "@electron-forge/installer-dmg": "6.0.0-beta.54", + "@electron-forge/installer-exe": "6.0.0-beta.54", + "@electron-forge/installer-rpm": "6.0.0-beta.54", + "@electron-forge/installer-zip": "6.0.0-beta.54", + "@electron-forge/maker-base": "6.0.0-beta.54", + "@electron-forge/plugin-base": "6.0.0-beta.54", + "@electron-forge/publisher-base": "6.0.0-beta.54", + "@electron-forge/shared-types": "6.0.0-beta.54", + "@electron-forge/template-base": "6.0.0-beta.54", + "@electron-forge/template-typescript": "6.0.0-beta.54", + "@electron-forge/template-typescript-webpack": "6.0.0-beta.54", + "@electron-forge/template-webpack": "6.0.0-beta.54", "@electron/get": "^1.9.0", - "@malept/cross-spawn-promise": "^1.1.1", + "@malept/cross-spawn-promise": "^1.1.0", "colors": "^1.4.0", - "debug": "^4.3.1", + "debug": "^4.1.0", "electron-packager": "^15.0.0", - "electron-rebuild": "^2.3.2", + "electron-rebuild": "^2.0.3", "find-up": "^5.0.0", "fs-extra": "^9.0.1", "glob": "^7.1.5", @@ -7471,51 +7325,6 @@ "yarn-or-npm": "^3.0.1" }, "dependencies": { - "@electron-forge/async-ora": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.55.tgz", - "integrity": "sha512-B5td9OP13wn5zQO6mcJp99dsckKA33qsCy8uyoBeaS5pRlX3DPzJjoP+rlmAgHDeEBbay/PzbgZjeB1bCJpAQA==", - "dev": true, - "requires": { - "colors": "^1.4.0", - "debug": "^4.3.1", - "log-symbols": "^4.0.0", - "ora": "^5.0.0", - "pretty-ms": "^7.0.0" - } - }, - "@electron-forge/maker-base": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-6.0.0-beta.55.tgz", - "integrity": "sha512-fsRj+RAkOtAZNm2y6e7HKF/FQEaIbujqaTtfcKVL401FMCfb8+Y/LuXDnulMTenLfXDtpMvgMiDGMKAnxa8pUQ==", - "dev": true, - "requires": { - "@electron-forge/shared-types": "6.0.0-beta.55", - "fs-extra": "^9.0.1", - "which": "^2.0.2" - } - }, - "@electron-forge/publisher-base": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/publisher-base/-/publisher-base-6.0.0-beta.55.tgz", - "integrity": "sha512-Hh3uBRxO0o3ULZjv80YtjjOONC1R8gkc/M/BIC8C+GytHbpF4GhCN0kNCGRHgyASPTuC2iPtd4nU65PZIf2c2w==", - "dev": true, - "requires": { - "@electron-forge/shared-types": "6.0.0-beta.55" - } - }, - "@electron-forge/shared-types": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.55.tgz", - "integrity": "sha512-tPXnt2Eh1gW8wlk0ieN/IYGgKFPG6LEUUsTh+zPmnsD4Md9M6Tv9nNiUitM5xvVhNZkezJB/Q0K7f9t+6J4sdw==", - "dev": true, - "requires": { - "@electron-forge/async-ora": "6.0.0-beta.55", - "electron-packager": "^15.0.0", - "electron-rebuild": "^2.3.2", - "ora": "^5.0.0" - } - }, "find-up": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", @@ -7599,54 +7408,26 @@ } }, "@electron-forge/installer-base": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/installer-base/-/installer-base-6.0.0-beta.55.tgz", - "integrity": "sha512-Q6HCkvHVwXnHznpdof3he9ZN93WVeLpCDXZ5Dfx7TWnIz/5A7v0wne7V2lCoTgMlUcOpaBq+3O0x+3x5wLT1EA==", + "version": "6.0.0-beta.54", + "resolved": "https://registry.npmjs.org/@electron-forge/installer-base/-/installer-base-6.0.0-beta.54.tgz", + "integrity": "sha512-q6Z5kBAE6StKqn+3Z5tXVHu7WGCb9OMeIomw9H9Q41UUIehF7V0J3tCWTkJdhZ8D6/tkXcis3GKptaj0wfMpyg==", "dev": true, "requires": { - "@electron-forge/async-ora": "6.0.0-beta.55" - }, - "dependencies": { - "@electron-forge/async-ora": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.55.tgz", - "integrity": "sha512-B5td9OP13wn5zQO6mcJp99dsckKA33qsCy8uyoBeaS5pRlX3DPzJjoP+rlmAgHDeEBbay/PzbgZjeB1bCJpAQA==", - "dev": true, - "requires": { - "colors": "^1.4.0", - "debug": "^4.3.1", - "log-symbols": "^4.0.0", - "ora": "^5.0.0", - "pretty-ms": "^7.0.0" - } - } + "@electron-forge/async-ora": "6.0.0-beta.54" } }, "@electron-forge/installer-darwin": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/installer-darwin/-/installer-darwin-6.0.0-beta.55.tgz", - "integrity": "sha512-khdt9lz9k/epiQKjGFOmhk8baxfONbEvj6g7fYRGQ/gofEYXt/xgl7MiQDTFmv1ynEznaySlSCqCnJkawfNm2Q==", + "version": "6.0.0-beta.54", + "resolved": "https://registry.npmjs.org/@electron-forge/installer-darwin/-/installer-darwin-6.0.0-beta.54.tgz", + "integrity": "sha512-kRbH24+QBhbcIugnIvevnf43JGzLFLoyFsoY3YeyZeeDL3vfyg0vtSyUx0hfq1GpHG+zObDf3o18c3WbxdXlXA==", "dev": true, "requires": { - "@electron-forge/async-ora": "6.0.0-beta.55", - "@electron-forge/installer-base": "6.0.0-beta.55", + "@electron-forge/async-ora": "6.0.0-beta.54", + "@electron-forge/installer-base": "6.0.0-beta.54", "fs-extra": "^9.0.1", "sudo-prompt": "^9.1.1" }, "dependencies": { - "@electron-forge/async-ora": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.55.tgz", - "integrity": "sha512-B5td9OP13wn5zQO6mcJp99dsckKA33qsCy8uyoBeaS5pRlX3DPzJjoP+rlmAgHDeEBbay/PzbgZjeB1bCJpAQA==", - "dev": true, - "requires": { - "colors": "^1.4.0", - "debug": "^4.3.1", - "log-symbols": "^4.0.0", - "ora": "^5.0.0", - "pretty-ms": "^7.0.0" - } - }, "fs-extra": { "version": "9.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", @@ -7678,23 +7459,23 @@ } }, "@electron-forge/installer-deb": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/installer-deb/-/installer-deb-6.0.0-beta.55.tgz", - "integrity": "sha512-IMWhgCFx5jh9x2WNXsY2qc9q5h+wRuqFFXz+/hByhxkEFD8uYSXbRzPcwbT6+1iGMPOr1cAwAqH2FtQB97aN9A==", + "version": "6.0.0-beta.54", + "resolved": "https://registry.npmjs.org/@electron-forge/installer-deb/-/installer-deb-6.0.0-beta.54.tgz", + "integrity": "sha512-UbJR2Md0SBqex5AIv9YZ56hY2Iz5gZ6f1iAx0q4PlYpCY19W9nRXdudLNhx1w5go26DsT53+h6EzX2NGpBLq3Q==", "dev": true, "requires": { - "@electron-forge/installer-linux": "6.0.0-beta.55" + "@electron-forge/installer-linux": "6.0.0-beta.54" } }, "@electron-forge/installer-dmg": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/installer-dmg/-/installer-dmg-6.0.0-beta.55.tgz", - "integrity": "sha512-39sXQfK8ygmdMEkOwTPnbjpR9ZE8PZXdnZiVUAwfhypQqpr5LtNTWSaEGcrB8HyJWpq6uZltg+kyBkGj5zRh6g==", + "version": "6.0.0-beta.54", + "resolved": "https://registry.npmjs.org/@electron-forge/installer-dmg/-/installer-dmg-6.0.0-beta.54.tgz", + "integrity": "sha512-F9jwhUTzdFNlbLus7RQ8paoGPryr79JFYDLi42f0dyuFwlOjwlrA1wN5xWqrvcMeqFlc3DfjjeRWZ+10RQyorA==", "dev": true, "requires": { - "@electron-forge/installer-darwin": "6.0.0-beta.55", - "@malept/cross-spawn-promise": "^1.1.1", - "debug": "^4.3.1", + "@electron-forge/installer-darwin": "6.0.0-beta.54", + "@malept/cross-spawn-promise": "^1.1.0", + "debug": "^4.1.0", "fs-extra": "^9.0.1" }, "dependencies": { @@ -7729,42 +7510,42 @@ } }, "@electron-forge/installer-exe": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/installer-exe/-/installer-exe-6.0.0-beta.55.tgz", - "integrity": "sha512-sEolJtnv4LHYy4cqK28Izs2YFqErQRQsbxUK2yzYgZ7IwsBbiu0389UQah4ixvWYeDsiqqment2BDjamUgEB1w==", + "version": "6.0.0-beta.54", + "resolved": "https://registry.npmjs.org/@electron-forge/installer-exe/-/installer-exe-6.0.0-beta.54.tgz", + "integrity": "sha512-PE7RBPerSenNcSkKXJWpervKNl7AVT+JeMzx61OHUQSw3h63NHRvXWh31llxk32mmJcaKRgGle2GsWob87Lv/w==", "dev": true, "requires": { - "@electron-forge/installer-base": "6.0.0-beta.55", + "@electron-forge/installer-base": "6.0.0-beta.54", "open": "^7.2.1" } }, "@electron-forge/installer-linux": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/installer-linux/-/installer-linux-6.0.0-beta.55.tgz", - "integrity": "sha512-Ac+VH3TN1KbrKTwVujNL+nfiCxuDyqAv7ukDQxP8DoOUmaU9HlSMdh5raVQZ8ffNnSk6D+3s1dU6Dlcmdi8ReA==", + "version": "6.0.0-beta.54", + "resolved": "https://registry.npmjs.org/@electron-forge/installer-linux/-/installer-linux-6.0.0-beta.54.tgz", + "integrity": "sha512-WQVV5fitsfTyktjb18m9Bx+Dho6rCFvVILqFNZAu1RfXIsjLl/h0WdkozdGDccfeDMqlRYmaNs3e5THn5swnAg==", "dev": true, "requires": { - "@electron-forge/installer-base": "6.0.0-beta.55", + "@electron-forge/installer-base": "6.0.0-beta.54", "sudo-prompt": "^9.1.1" } }, "@electron-forge/installer-rpm": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/installer-rpm/-/installer-rpm-6.0.0-beta.55.tgz", - "integrity": "sha512-OCcw59va1W5BtNm+yFXDFJcBYfyiEd8ntO2t1Op5IMPMmVt8Op9AveHsxPBY8BpCVOuHmCHrDRrIlFm2PAOPeA==", + "version": "6.0.0-beta.54", + "resolved": "https://registry.npmjs.org/@electron-forge/installer-rpm/-/installer-rpm-6.0.0-beta.54.tgz", + "integrity": "sha512-8gaJA2m8+Y/ZhV4xEeijXz8UksrliMEzyUAdwM5ZdAsmfmGlnhchGr0L6rI23D66dQP9DeyvUIuUwXrsTlj1nQ==", "dev": true, "requires": { - "@electron-forge/installer-linux": "6.0.0-beta.55" + "@electron-forge/installer-linux": "6.0.0-beta.54" } }, "@electron-forge/installer-zip": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/installer-zip/-/installer-zip-6.0.0-beta.55.tgz", - "integrity": "sha512-fZBjP6HKDUVAq2HBSLdw16KgqWuyuW1FOc+lAfShHJiYcB+KYJZVIv9CqVudmcyT0riePIb4fKFXhYFYc232kQ==", + "version": "6.0.0-beta.54", + "resolved": "https://registry.npmjs.org/@electron-forge/installer-zip/-/installer-zip-6.0.0-beta.54.tgz", + "integrity": "sha512-KCY5zreA79wjZODhLmtrbFweTWdlh9JgmW9WruIrmHm3sK19rRhCdaZ+Dg5ZWUhMx2A79d5a2C7r78lWGcHl7A==", "dev": true, "requires": { - "@electron-forge/installer-darwin": "6.0.0-beta.55", - "@malept/cross-spawn-promise": "^1.1.1", + "@electron-forge/installer-darwin": "6.0.0-beta.54", + "@malept/cross-spawn-promise": "^1.1.0", "fs-extra": "^9.0.1" }, "dependencies": { @@ -7840,39 +7621,207 @@ } }, "@electron-forge/maker-deb": { - "version": "6.0.0-beta.54", - "resolved": "https://registry.npmjs.org/@electron-forge/maker-deb/-/maker-deb-6.0.0-beta.54.tgz", - "integrity": "sha512-PEAYULi7n/JkwvaEQnM554ewmLYkxGtHvuh6vUf5wsh48Xw3jcEVHejsc4FDjx5I6cKAByb9nscTtZpKt3ngXw==", + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-deb/-/maker-deb-6.0.0-beta.55.tgz", + "integrity": "sha512-3dxhTHH2c2p+bkg0uktOECXXYxFsD9clsK9A+PZO81llX+p8EF/iLuXfkVupinnwDO5wl9K2mv4LEEkBnnpOVQ==", "dev": true, "requires": { - "@electron-forge/maker-base": "6.0.0-beta.54", - "@electron-forge/shared-types": "6.0.0-beta.54", + "@electron-forge/maker-base": "6.0.0-beta.55", + "@electron-forge/shared-types": "6.0.0-beta.55", "electron-installer-debian": "^3.0.0" + }, + "dependencies": { + "@electron-forge/async-ora": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.55.tgz", + "integrity": "sha512-B5td9OP13wn5zQO6mcJp99dsckKA33qsCy8uyoBeaS5pRlX3DPzJjoP+rlmAgHDeEBbay/PzbgZjeB1bCJpAQA==", + "dev": true, + "requires": { + "colors": "^1.4.0", + "debug": "^4.3.1", + "log-symbols": "^4.0.0", + "ora": "^5.0.0", + "pretty-ms": "^7.0.0" + } + }, + "@electron-forge/maker-base": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-6.0.0-beta.55.tgz", + "integrity": "sha512-fsRj+RAkOtAZNm2y6e7HKF/FQEaIbujqaTtfcKVL401FMCfb8+Y/LuXDnulMTenLfXDtpMvgMiDGMKAnxa8pUQ==", + "dev": true, + "requires": { + "@electron-forge/shared-types": "6.0.0-beta.55", + "fs-extra": "^9.0.1", + "which": "^2.0.2" + } + }, + "@electron-forge/shared-types": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.55.tgz", + "integrity": "sha512-tPXnt2Eh1gW8wlk0ieN/IYGgKFPG6LEUUsTh+zPmnsD4Md9M6Tv9nNiUitM5xvVhNZkezJB/Q0K7f9t+6J4sdw==", + "dev": true, + "requires": { + "@electron-forge/async-ora": "6.0.0-beta.55", + "electron-packager": "^15.0.0", + "electron-rebuild": "^2.3.2", + "ora": "^5.0.0" + } + }, + "fs-extra": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "dev": true, + "requires": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + } + }, + "jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.6", + "universalify": "^2.0.0" + } + }, + "universalify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", + "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", + "dev": true + } } }, "@electron-forge/maker-rpm": { - "version": "6.0.0-beta.54", - "resolved": "https://registry.npmjs.org/@electron-forge/maker-rpm/-/maker-rpm-6.0.0-beta.54.tgz", - "integrity": "sha512-6nqBOUnojRE8+KdvE8zVXN2/H/V/QuWJQ4cwCLahJQxG1kG5RXOh6VbsM1mEFxjJwOhVnK+wkNCODf1qi56JZw==", + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-rpm/-/maker-rpm-6.0.0-beta.55.tgz", + "integrity": "sha512-f+YmztQ+4lhub8ULMtCSksx+AcILEA4J+CXIzUWC+9IdLTid42t8yZSkRnwxHrQUSFF6g1hF6LKsE2S/jlrJoQ==", "dev": true, "requires": { - "@electron-forge/maker-base": "6.0.0-beta.54", - "@electron-forge/shared-types": "6.0.0-beta.54", + "@electron-forge/maker-base": "6.0.0-beta.55", + "@electron-forge/shared-types": "6.0.0-beta.55", "electron-installer-redhat": "^3.2.0" + }, + "dependencies": { + "@electron-forge/async-ora": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.55.tgz", + "integrity": "sha512-B5td9OP13wn5zQO6mcJp99dsckKA33qsCy8uyoBeaS5pRlX3DPzJjoP+rlmAgHDeEBbay/PzbgZjeB1bCJpAQA==", + "dev": true, + "requires": { + "colors": "^1.4.0", + "debug": "^4.3.1", + "log-symbols": "^4.0.0", + "ora": "^5.0.0", + "pretty-ms": "^7.0.0" + } + }, + "@electron-forge/maker-base": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-6.0.0-beta.55.tgz", + "integrity": "sha512-fsRj+RAkOtAZNm2y6e7HKF/FQEaIbujqaTtfcKVL401FMCfb8+Y/LuXDnulMTenLfXDtpMvgMiDGMKAnxa8pUQ==", + "dev": true, + "requires": { + "@electron-forge/shared-types": "6.0.0-beta.55", + "fs-extra": "^9.0.1", + "which": "^2.0.2" + } + }, + "@electron-forge/shared-types": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.55.tgz", + "integrity": "sha512-tPXnt2Eh1gW8wlk0ieN/IYGgKFPG6LEUUsTh+zPmnsD4Md9M6Tv9nNiUitM5xvVhNZkezJB/Q0K7f9t+6J4sdw==", + "dev": true, + "requires": { + "@electron-forge/async-ora": "6.0.0-beta.55", + "electron-packager": "^15.0.0", + "electron-rebuild": "^2.3.2", + "ora": "^5.0.0" + } + }, + "fs-extra": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "dev": true, + "requires": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + } + }, + "jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.6", + "universalify": "^2.0.0" + } + }, + "universalify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", + "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", + "dev": true + } } }, "@electron-forge/maker-squirrel": { - "version": "6.0.0-beta.54", - "resolved": "https://registry.npmjs.org/@electron-forge/maker-squirrel/-/maker-squirrel-6.0.0-beta.54.tgz", - "integrity": "sha512-JJ+HmUe94zZ6mZnyv3IvNLQ5nwoj4dcQ4gzwps4P3fCEpuABMr74KOlza7fMXrrs8cwOrGfMFwsk80GTcLdWkg==", + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-squirrel/-/maker-squirrel-6.0.0-beta.55.tgz", + "integrity": "sha512-2ugnVUA1His7nquOtqXjmEFcfVqBV2WWKlEYb4T71aw4Sq+Dzsu3EPmcIjR7dtU8mBrQxRt0EYcz/ZDtgZOPag==", "dev": true, "requires": { - "@electron-forge/maker-base": "6.0.0-beta.54", - "@electron-forge/shared-types": "6.0.0-beta.54", - "electron-winstaller": "^4.0.1", + "@electron-forge/maker-base": "6.0.0-beta.55", + "@electron-forge/shared-types": "6.0.0-beta.55", + "electron-winstaller": "^5.0.0", "fs-extra": "^9.0.1" }, "dependencies": { + "@electron-forge/async-ora": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.55.tgz", + "integrity": "sha512-B5td9OP13wn5zQO6mcJp99dsckKA33qsCy8uyoBeaS5pRlX3DPzJjoP+rlmAgHDeEBbay/PzbgZjeB1bCJpAQA==", + "dev": true, + "requires": { + "colors": "^1.4.0", + "debug": "^4.3.1", + "log-symbols": "^4.0.0", + "ora": "^5.0.0", + "pretty-ms": "^7.0.0" + } + }, + "@electron-forge/maker-base": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-6.0.0-beta.55.tgz", + "integrity": "sha512-fsRj+RAkOtAZNm2y6e7HKF/FQEaIbujqaTtfcKVL401FMCfb8+Y/LuXDnulMTenLfXDtpMvgMiDGMKAnxa8pUQ==", + "dev": true, + "requires": { + "@electron-forge/shared-types": "6.0.0-beta.55", + "fs-extra": "^9.0.1", + "which": "^2.0.2" + } + }, + "@electron-forge/shared-types": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.55.tgz", + "integrity": "sha512-tPXnt2Eh1gW8wlk0ieN/IYGgKFPG6LEUUsTh+zPmnsD4Md9M6Tv9nNiUitM5xvVhNZkezJB/Q0K7f9t+6J4sdw==", + "dev": true, + "requires": { + "@electron-forge/async-ora": "6.0.0-beta.55", + "electron-packager": "^15.0.0", + "electron-rebuild": "^2.3.2", + "ora": "^5.0.0" + } + }, "fs-extra": { "version": "9.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", @@ -7904,17 +7853,53 @@ } }, "@electron-forge/maker-zip": { - "version": "6.0.0-beta.54", - "resolved": "https://registry.npmjs.org/@electron-forge/maker-zip/-/maker-zip-6.0.0-beta.54.tgz", - "integrity": "sha512-wbJhK1rDOCZMTtKrjvavT8R+Yi+v/6axsnTXvzbkzzMQ0xADKNslTwzO6mmbBJea4oIbYmQ44DRAjI21TNyQ/A==", + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-zip/-/maker-zip-6.0.0-beta.55.tgz", + "integrity": "sha512-man3kGnsYldnKf2HI99JBOpU/AALsYzmt33kFxq1ptUnK8cWcJWB/HxWIzY1fEyLAkcFTVWt4wnN/L4PahzO/w==", "dev": true, "requires": { - "@electron-forge/maker-base": "6.0.0-beta.54", - "@electron-forge/shared-types": "6.0.0-beta.54", + "@electron-forge/maker-base": "6.0.0-beta.55", + "@electron-forge/shared-types": "6.0.0-beta.55", "cross-zip": "^3.0.0", "fs-extra": "^9.0.1" }, "dependencies": { + "@electron-forge/async-ora": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.55.tgz", + "integrity": "sha512-B5td9OP13wn5zQO6mcJp99dsckKA33qsCy8uyoBeaS5pRlX3DPzJjoP+rlmAgHDeEBbay/PzbgZjeB1bCJpAQA==", + "dev": true, + "requires": { + "colors": "^1.4.0", + "debug": "^4.3.1", + "log-symbols": "^4.0.0", + "ora": "^5.0.0", + "pretty-ms": "^7.0.0" + } + }, + "@electron-forge/maker-base": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-6.0.0-beta.55.tgz", + "integrity": "sha512-fsRj+RAkOtAZNm2y6e7HKF/FQEaIbujqaTtfcKVL401FMCfb8+Y/LuXDnulMTenLfXDtpMvgMiDGMKAnxa8pUQ==", + "dev": true, + "requires": { + "@electron-forge/shared-types": "6.0.0-beta.55", + "fs-extra": "^9.0.1", + "which": "^2.0.2" + } + }, + "@electron-forge/shared-types": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.55.tgz", + "integrity": "sha512-tPXnt2Eh1gW8wlk0ieN/IYGgKFPG6LEUUsTh+zPmnsD4Md9M6Tv9nNiUitM5xvVhNZkezJB/Q0K7f9t+6J4sdw==", + "dev": true, + "requires": { + "@electron-forge/async-ora": "6.0.0-beta.55", + "electron-packager": "^15.0.0", + "electron-rebuild": "^2.3.2", + "ora": "^5.0.0" + } + }, "fs-extra": { "version": "9.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", @@ -7946,12 +7931,38 @@ } }, "@electron-forge/plugin-base": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/plugin-base/-/plugin-base-6.0.0-beta.55.tgz", - "integrity": "sha512-z2e76XwLXdswXUPqLpM2jF9ZbUoNyGn1/kzfVRWrplth5yUnaIuZoT5n5y9t4cWTHQ9m2i9DEFVRfdzF9P7G8g==", + "version": "6.0.0-beta.54", + "resolved": "https://registry.npmjs.org/@electron-forge/plugin-base/-/plugin-base-6.0.0-beta.54.tgz", + "integrity": "sha512-8HwGzgNCHo2PgUfNnTch3Gvj7l6fqOgjnARK1y056UfsxFy+hwvHaAO+7LLfr7ktNwU/bH3hGhOpE+ZmBSwSqQ==", "dev": true, "requires": { - "@electron-forge/shared-types": "6.0.0-beta.55" + "@electron-forge/shared-types": "6.0.0-beta.54" + } + }, + "@electron-forge/publisher-base": { + "version": "6.0.0-beta.54", + "resolved": "https://registry.npmjs.org/@electron-forge/publisher-base/-/publisher-base-6.0.0-beta.54.tgz", + "integrity": "sha512-Dny0jW0N8QcNYKHTtzQFZD4pBWJ7tclJWf3ZCX031vUKG7RhThdA06IPNzV6JtWJswrvAE9TPndzZONMza2V7g==", + "dev": true, + "requires": { + "@electron-forge/shared-types": "6.0.0-beta.54" + } + }, + "@electron-forge/publisher-github": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/publisher-github/-/publisher-github-6.0.0-beta.55.tgz", + "integrity": "sha512-NS0WinKvV8X+6hSk6kiBhlZ+OSmb2Ht3UCvrXKnsg24v6IegOwrPK7zG3ls0GkaPFIFUx5DEhEmpnYk1jFDAeQ==", + "dev": true, + "requires": { + "@electron-forge/async-ora": "6.0.0-beta.55", + "@electron-forge/publisher-base": "6.0.0-beta.55", + "@electron-forge/shared-types": "6.0.0-beta.55", + "@octokit/core": "^3.2.4", + "@octokit/rest": "^18.0.11", + "@octokit/types": "^6.1.2", + "fs-extra": "^9.0.1", + "lodash": "^4.17.20", + "mime-types": "^2.1.25" }, "dependencies": { "@electron-forge/async-ora": { @@ -7967,6 +7978,15 @@ "pretty-ms": "^7.0.0" } }, + "@electron-forge/publisher-base": { + "version": "6.0.0-beta.55", + "resolved": "https://registry.npmjs.org/@electron-forge/publisher-base/-/publisher-base-6.0.0-beta.55.tgz", + "integrity": "sha512-Hh3uBRxO0o3ULZjv80YtjjOONC1R8gkc/M/BIC8C+GytHbpF4GhCN0kNCGRHgyASPTuC2iPtd4nU65PZIf2c2w==", + "dev": true, + "requires": { + "@electron-forge/shared-types": "6.0.0-beta.55" + } + }, "@electron-forge/shared-types": { "version": "6.0.0-beta.55", "resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.55.tgz", @@ -7978,35 +7998,7 @@ "electron-rebuild": "^2.3.2", "ora": "^5.0.0" } - } - } - }, - "@electron-forge/publisher-base": { - "version": "6.0.0-beta.54", - "resolved": "https://registry.npmjs.org/@electron-forge/publisher-base/-/publisher-base-6.0.0-beta.54.tgz", - "integrity": "sha512-Dny0jW0N8QcNYKHTtzQFZD4pBWJ7tclJWf3ZCX031vUKG7RhThdA06IPNzV6JtWJswrvAE9TPndzZONMza2V7g==", - "dev": true, - "requires": { - "@electron-forge/shared-types": "6.0.0-beta.54" - } - }, - "@electron-forge/publisher-github": { - "version": "6.0.0-beta.54", - "resolved": "https://registry.npmjs.org/@electron-forge/publisher-github/-/publisher-github-6.0.0-beta.54.tgz", - "integrity": "sha512-B6jwlYBtLjxpL0K6X7DKr8RgOk7mFEDbPsnExmZBbdY19FJ6Z5IdW8atOOqVQl7i+8XjwtXGOKBFv2QDKHp48A==", - "dev": true, - "requires": { - "@electron-forge/async-ora": "6.0.0-beta.54", - "@electron-forge/publisher-base": "6.0.0-beta.54", - "@electron-forge/shared-types": "6.0.0-beta.54", - "@octokit/core": "^3.1.2", - "@octokit/rest": "^18.0.6", - "@octokit/types": "^5.5.0", - "fs-extra": "^9.0.1", - "lodash": "^4.17.20", - "mime-types": "^2.1.25" - }, - "dependencies": { + }, "fs-extra": { "version": "9.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", @@ -8050,43 +8042,18 @@ } }, "@electron-forge/template-base": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/template-base/-/template-base-6.0.0-beta.55.tgz", - "integrity": "sha512-1ht7h+ZtOn0LsiZc6HMrT5LGTHM7zvySQgJyMkiYQPhYMhNJiIv6dJv6SEI9n12CO5WBTZcx/ACHh012A/caKg==", + "version": "6.0.0-beta.54", + "resolved": "https://registry.npmjs.org/@electron-forge/template-base/-/template-base-6.0.0-beta.54.tgz", + "integrity": "sha512-LuSpeOiM6AzUbamz5U/NqRkn4y7dzof1JK1ISAb+6tORf7JU014aKqDcLdwgP8Lxaz6P1bdlMmNJTvg5+SBrEw==", "dev": true, "requires": { - "@electron-forge/async-ora": "6.0.0-beta.55", - "@electron-forge/shared-types": "6.0.0-beta.55", - "debug": "^4.3.1", + "@electron-forge/async-ora": "6.0.0-beta.54", + "@electron-forge/shared-types": "6.0.0-beta.54", + "debug": "^4.1.0", "fs-extra": "^9.0.1", "username": "^5.1.0" }, "dependencies": { - "@electron-forge/async-ora": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.55.tgz", - "integrity": "sha512-B5td9OP13wn5zQO6mcJp99dsckKA33qsCy8uyoBeaS5pRlX3DPzJjoP+rlmAgHDeEBbay/PzbgZjeB1bCJpAQA==", - "dev": true, - "requires": { - "colors": "^1.4.0", - "debug": "^4.3.1", - "log-symbols": "^4.0.0", - "ora": "^5.0.0", - "pretty-ms": "^7.0.0" - } - }, - "@electron-forge/shared-types": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.55.tgz", - "integrity": "sha512-tPXnt2Eh1gW8wlk0ieN/IYGgKFPG6LEUUsTh+zPmnsD4Md9M6Tv9nNiUitM5xvVhNZkezJB/Q0K7f9t+6J4sdw==", - "dev": true, - "requires": { - "@electron-forge/async-ora": "6.0.0-beta.55", - "electron-packager": "^15.0.0", - "electron-rebuild": "^2.3.2", - "ora": "^5.0.0" - } - }, "fs-extra": { "version": "9.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", @@ -8118,42 +8085,17 @@ } }, "@electron-forge/template-typescript": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/template-typescript/-/template-typescript-6.0.0-beta.55.tgz", - "integrity": "sha512-JDG/1lmBEHBRA85qZD4KtO60lhndsH8mMs6TmfEw828NQ9+zXoMYxv5h3XG8COh1u7IbZJQHDcoNSzMd2eANMw==", + "version": "6.0.0-beta.54", + "resolved": "https://registry.npmjs.org/@electron-forge/template-typescript/-/template-typescript-6.0.0-beta.54.tgz", + "integrity": "sha512-7V87LWH+vJ1YibM9MsTttbz7upfwLrmXgchQ399EfLxK306g7q/ouyGkeTerhLr2gCUAvm/Oqx+sXQ7402ol9w==", "dev": true, "requires": { - "@electron-forge/async-ora": "6.0.0-beta.55", - "@electron-forge/shared-types": "6.0.0-beta.55", - "@electron-forge/template-base": "6.0.0-beta.55", + "@electron-forge/async-ora": "6.0.0-beta.54", + "@electron-forge/shared-types": "6.0.0-beta.54", + "@electron-forge/template-base": "6.0.0-beta.54", "fs-extra": "^9.0.1" }, "dependencies": { - "@electron-forge/async-ora": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.55.tgz", - "integrity": "sha512-B5td9OP13wn5zQO6mcJp99dsckKA33qsCy8uyoBeaS5pRlX3DPzJjoP+rlmAgHDeEBbay/PzbgZjeB1bCJpAQA==", - "dev": true, - "requires": { - "colors": "^1.4.0", - "debug": "^4.3.1", - "log-symbols": "^4.0.0", - "ora": "^5.0.0", - "pretty-ms": "^7.0.0" - } - }, - "@electron-forge/shared-types": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.55.tgz", - "integrity": "sha512-tPXnt2Eh1gW8wlk0ieN/IYGgKFPG6LEUUsTh+zPmnsD4Md9M6Tv9nNiUitM5xvVhNZkezJB/Q0K7f9t+6J4sdw==", - "dev": true, - "requires": { - "@electron-forge/async-ora": "6.0.0-beta.55", - "electron-packager": "^15.0.0", - "electron-rebuild": "^2.3.2", - "ora": "^5.0.0" - } - }, "fs-extra": { "version": "9.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", @@ -8185,42 +8127,17 @@ } }, "@electron-forge/template-typescript-webpack": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/template-typescript-webpack/-/template-typescript-webpack-6.0.0-beta.55.tgz", - "integrity": "sha512-tHrHiPaD5w8X58+uEMUFdvIPWnFJSKg2HtNQi2QOV6oDceNY2yA5GSZU09NSwFtlhNqhGB2JZjnnTu0QGY9MUw==", + "version": "6.0.0-beta.54", + "resolved": "https://registry.npmjs.org/@electron-forge/template-typescript-webpack/-/template-typescript-webpack-6.0.0-beta.54.tgz", + "integrity": "sha512-1MIw1eGlMZg7KLG4oAEE0rB28WDOtz01OSoW2a2NqkmUzmu4BxJdSvQ97Tp7xCU0naW0H1uU39B9QOjJQgLGCQ==", "dev": true, "requires": { - "@electron-forge/async-ora": "6.0.0-beta.55", - "@electron-forge/shared-types": "6.0.0-beta.55", - "@electron-forge/template-base": "6.0.0-beta.55", + "@electron-forge/async-ora": "6.0.0-beta.54", + "@electron-forge/shared-types": "6.0.0-beta.54", + "@electron-forge/template-base": "6.0.0-beta.54", "fs-extra": "^9.0.1" }, "dependencies": { - "@electron-forge/async-ora": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.55.tgz", - "integrity": "sha512-B5td9OP13wn5zQO6mcJp99dsckKA33qsCy8uyoBeaS5pRlX3DPzJjoP+rlmAgHDeEBbay/PzbgZjeB1bCJpAQA==", - "dev": true, - "requires": { - "colors": "^1.4.0", - "debug": "^4.3.1", - "log-symbols": "^4.0.0", - "ora": "^5.0.0", - "pretty-ms": "^7.0.0" - } - }, - "@electron-forge/shared-types": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.55.tgz", - "integrity": "sha512-tPXnt2Eh1gW8wlk0ieN/IYGgKFPG6LEUUsTh+zPmnsD4Md9M6Tv9nNiUitM5xvVhNZkezJB/Q0K7f9t+6J4sdw==", - "dev": true, - "requires": { - "@electron-forge/async-ora": "6.0.0-beta.55", - "electron-packager": "^15.0.0", - "electron-rebuild": "^2.3.2", - "ora": "^5.0.0" - } - }, "fs-extra": { "version": "9.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", @@ -8252,42 +8169,17 @@ } }, "@electron-forge/template-webpack": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/template-webpack/-/template-webpack-6.0.0-beta.55.tgz", - "integrity": "sha512-WjHUFT2khvWLcMrHkjj2hlcHrX03fxJ8k6G723OQJ+nR4UYeSzVfbNAT2h2smchUe9n1bSwbB6TdU0SRsCPCFA==", + "version": "6.0.0-beta.54", + "resolved": "https://registry.npmjs.org/@electron-forge/template-webpack/-/template-webpack-6.0.0-beta.54.tgz", + "integrity": "sha512-4/zUOZ8MCZqs8PcUCeeG6ofpy6HT53tQiLknM23OPaFP6ckuE6kOunC6N/teijUrJuLpKl3P8d39SWPVacxEzg==", "dev": true, "requires": { - "@electron-forge/async-ora": "6.0.0-beta.55", - "@electron-forge/shared-types": "6.0.0-beta.55", - "@electron-forge/template-base": "6.0.0-beta.55", + "@electron-forge/async-ora": "6.0.0-beta.54", + "@electron-forge/shared-types": "6.0.0-beta.54", + "@electron-forge/template-base": "6.0.0-beta.54", "fs-extra": "^9.0.1" }, "dependencies": { - "@electron-forge/async-ora": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.55.tgz", - "integrity": "sha512-B5td9OP13wn5zQO6mcJp99dsckKA33qsCy8uyoBeaS5pRlX3DPzJjoP+rlmAgHDeEBbay/PzbgZjeB1bCJpAQA==", - "dev": true, - "requires": { - "colors": "^1.4.0", - "debug": "^4.3.1", - "log-symbols": "^4.0.0", - "ora": "^5.0.0", - "pretty-ms": "^7.0.0" - } - }, - "@electron-forge/shared-types": { - "version": "6.0.0-beta.55", - "resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.55.tgz", - "integrity": "sha512-tPXnt2Eh1gW8wlk0ieN/IYGgKFPG6LEUUsTh+zPmnsD4Md9M6Tv9nNiUitM5xvVhNZkezJB/Q0K7f9t+6J4sdw==", - "dev": true, - "requires": { - "@electron-forge/async-ora": "6.0.0-beta.55", - "electron-packager": "^15.0.0", - "electron-rebuild": "^2.3.2", - "ora": "^5.0.0" - } - }, "fs-extra": { "version": "9.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", @@ -8322,7 +8214,6 @@ "version": "1.12.3", "resolved": "https://registry.npmjs.org/@electron/get/-/get-1.12.3.tgz", "integrity": "sha512-NFwSnVZQK7dhOYF1NQCt+HGqgL1aNdj0LUSx75uCqnZJqyiWCVdAMFV4b4/kC8HjUJAnsvdSEmjEt4G2qNQ9+Q==", - "dev": true, "requires": { "debug": "^4.1.1", "env-paths": "^2.2.0", @@ -8352,17 +8243,6 @@ "dev": true, "requires": { "@octokit/types": "^6.0.3" - }, - "dependencies": { - "@octokit/types": { - "version": "6.14.2", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.14.2.tgz", - "integrity": "sha512-wiQtW9ZSy4OvgQ09iQOdyXYNN60GqjCL/UdMsepDr1Gr0QzpW6irIKbH3REuAHXAhxkEk9/F2a3Gcs1P6kW5jA==", - "dev": true, - "requires": { - "@octokit/openapi-types": "^7.0.0" - } - } } }, "@octokit/core": { @@ -8378,17 +8258,6 @@ "@octokit/types": "^6.0.3", "before-after-hook": "^2.2.0", "universal-user-agent": "^6.0.0" - }, - "dependencies": { - "@octokit/types": { - "version": "6.14.2", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.14.2.tgz", - "integrity": "sha512-wiQtW9ZSy4OvgQ09iQOdyXYNN60GqjCL/UdMsepDr1Gr0QzpW6irIKbH3REuAHXAhxkEk9/F2a3Gcs1P6kW5jA==", - "dev": true, - "requires": { - "@octokit/openapi-types": "^7.0.0" - } - } } }, "@octokit/endpoint": { @@ -8400,17 +8269,6 @@ "@octokit/types": "^6.0.3", "is-plain-object": "^5.0.0", "universal-user-agent": "^6.0.0" - }, - "dependencies": { - "@octokit/types": { - "version": "6.14.2", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.14.2.tgz", - "integrity": "sha512-wiQtW9ZSy4OvgQ09iQOdyXYNN60GqjCL/UdMsepDr1Gr0QzpW6irIKbH3REuAHXAhxkEk9/F2a3Gcs1P6kW5jA==", - "dev": true, - "requires": { - "@octokit/openapi-types": "^7.0.0" - } - } } }, "@octokit/graphql": { @@ -8422,17 +8280,6 @@ "@octokit/request": "^5.3.0", "@octokit/types": "^6.0.3", "universal-user-agent": "^6.0.0" - }, - "dependencies": { - "@octokit/types": { - "version": "6.14.2", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.14.2.tgz", - "integrity": "sha512-wiQtW9ZSy4OvgQ09iQOdyXYNN60GqjCL/UdMsepDr1Gr0QzpW6irIKbH3REuAHXAhxkEk9/F2a3Gcs1P6kW5jA==", - "dev": true, - "requires": { - "@octokit/openapi-types": "^7.0.0" - } - } } }, "@octokit/openapi-types": { @@ -8448,17 +8295,6 @@ "dev": true, "requires": { "@octokit/types": "^6.11.0" - }, - "dependencies": { - "@octokit/types": { - "version": "6.14.2", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.14.2.tgz", - "integrity": "sha512-wiQtW9ZSy4OvgQ09iQOdyXYNN60GqjCL/UdMsepDr1Gr0QzpW6irIKbH3REuAHXAhxkEk9/F2a3Gcs1P6kW5jA==", - "dev": true, - "requires": { - "@octokit/openapi-types": "^7.0.0" - } - } } }, "@octokit/plugin-request-log": { @@ -8476,17 +8312,6 @@ "requires": { "@octokit/types": "^6.13.1", "deprecation": "^2.3.1" - }, - "dependencies": { - "@octokit/types": { - "version": "6.14.2", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.14.2.tgz", - "integrity": "sha512-wiQtW9ZSy4OvgQ09iQOdyXYNN60GqjCL/UdMsepDr1Gr0QzpW6irIKbH3REuAHXAhxkEk9/F2a3Gcs1P6kW5jA==", - "dev": true, - "requires": { - "@octokit/openapi-types": "^7.0.0" - } - } } }, "@octokit/request": { @@ -8501,17 +8326,6 @@ "is-plain-object": "^5.0.0", "node-fetch": "^2.6.1", "universal-user-agent": "^6.0.0" - }, - "dependencies": { - "@octokit/types": { - "version": "6.14.2", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.14.2.tgz", - "integrity": "sha512-wiQtW9ZSy4OvgQ09iQOdyXYNN60GqjCL/UdMsepDr1Gr0QzpW6irIKbH3REuAHXAhxkEk9/F2a3Gcs1P6kW5jA==", - "dev": true, - "requires": { - "@octokit/openapi-types": "^7.0.0" - } - } } }, "@octokit/request-error": { @@ -8523,17 +8337,6 @@ "@octokit/types": "^6.0.3", "deprecation": "^2.0.0", "once": "^1.4.0" - }, - "dependencies": { - "@octokit/types": { - "version": "6.14.2", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.14.2.tgz", - "integrity": "sha512-wiQtW9ZSy4OvgQ09iQOdyXYNN60GqjCL/UdMsepDr1Gr0QzpW6irIKbH3REuAHXAhxkEk9/F2a3Gcs1P6kW5jA==", - "dev": true, - "requires": { - "@octokit/openapi-types": "^7.0.0" - } - } } }, "@octokit/rest": { @@ -8549,25 +8352,23 @@ } }, "@octokit/types": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-5.5.0.tgz", - "integrity": "sha512-UZ1pErDue6bZNjYOotCNveTXArOMZQFG6hKJfOnGnulVCMcVVi7YIIuuR4WfBhjo7zgpmzn/BkPDnUXtNx+PcQ==", + "version": "6.14.2", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.14.2.tgz", + "integrity": "sha512-wiQtW9ZSy4OvgQ09iQOdyXYNN60GqjCL/UdMsepDr1Gr0QzpW6irIKbH3REuAHXAhxkEk9/F2a3Gcs1P6kW5jA==", "dev": true, "requires": { - "@types/node": ">= 8" + "@octokit/openapi-types": "^7.0.0" } }, "@sindresorhus/is": { "version": "0.14.0", "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz", - "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==", - "dev": true + "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==" }, "@szmarczak/http-timer": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz", "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==", - "dev": true, "requires": { "defer-to-connect": "^1.0.1" } @@ -8630,8 +8431,7 @@ "@types/node": { "version": "14.14.43", "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.43.tgz", - "integrity": "sha512-3pwDJjp1PWacPTpH0LcfhgjvurQvrZFBrC6xxjaUEZ7ifUtT32jtjPxEMMblpqd2Mvx+k8haqQJLQxolyGN/cQ==", - "dev": true + "integrity": "sha512-3pwDJjp1PWacPTpH0LcfhgjvurQvrZFBrC6xxjaUEZ7ifUtT32jtjPxEMMblpqd2Mvx+k8haqQJLQxolyGN/cQ==" }, "@types/responselike": { "version": "1.0.0", @@ -8846,7 +8646,6 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.0.2.tgz", "integrity": "sha512-RwywHlpCRc3/Wh81MiCKun4ydaIFyW5Ea6JbL6sRCVx5q5irDw7pMXBUFYF/jArQ6YrG36q0kpovc9P/Kd3I4g==", - "dev": true, "optional": true }, "brace-expansion": { @@ -8888,8 +8687,7 @@ "buffer-crc32": { "version": "0.2.13", "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", - "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=", - "dev": true + "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=" }, "buffer-fill": { "version": "1.0.0", @@ -8900,8 +8698,7 @@ "buffer-from": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", - "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==", - "dev": true + "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==" }, "cacheable-lookup": { "version": "5.0.4", @@ -8913,7 +8710,6 @@ "version": "6.1.0", "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz", "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==", - "dev": true, "requires": { "clone-response": "^1.0.2", "get-stream": "^5.1.0", @@ -8928,7 +8724,6 @@ "version": "5.2.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", - "dev": true, "requires": { "pump": "^3.0.0" } @@ -8936,8 +8731,7 @@ "lowercase-keys": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", - "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==", - "dev": true + "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==" } } }, @@ -9051,7 +8845,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz", "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=", - "dev": true, "requires": { "mimic-response": "^1.0.0" } @@ -9112,7 +8905,6 @@ "version": "1.6.2", "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", - "dev": true, "requires": { "buffer-from": "^1.0.0", "inherits": "^2.0.3", @@ -9124,7 +8916,6 @@ "version": "1.1.12", "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz", "integrity": "sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==", - "dev": true, "optional": true, "requires": { "ini": "^1.3.4", @@ -9141,14 +8932,12 @@ "version": "3.8.3", "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.8.3.tgz", "integrity": "sha512-KPYXeVZYemC2TkNEkX/01I+7yd+nX3KddKwZ1Ww7SKWdI2wQprSgLmrTddT8nw92AjEklTsPBoSdQBhbI1bQ6Q==", - "dev": true, "optional": true }, "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", - "dev": true + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, "cross-spawn": { "version": "7.0.3", @@ -9198,9 +8987,10 @@ } }, "custom-electron-titlebar": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/custom-electron-titlebar/-/custom-electron-titlebar-3.2.6.tgz", - "integrity": "sha512-P3ZGEr0eouUHqhdBBXllpuy2bFhfSmp+32HQBPcwzujjIsUhQxQj/nCpJiFa4SUGAEp1ifu/icuZdDKNNX72Tw==" + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/custom-electron-titlebar/-/custom-electron-titlebar-3.2.7.tgz", + "integrity": "sha512-KO/6e3r6YflfNUOzi5QHLwkLHBP+ICtHPo70u/kUIKR8UUkDTPb4a9i19q0uDZQcjkH6oqRvFCz9wEHeEpCgxw==", + "requires": {} }, "dashdash": { "version": "1.14.1", @@ -9229,7 +9019,6 @@ "version": "3.3.0", "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=", - "dev": true, "requires": { "mimic-response": "^1.0.0" } @@ -9252,14 +9041,12 @@ "defer-to-connect": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz", - "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==", - "dev": true + "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==" }, "define-properties": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", - "dev": true, "optional": true, "requires": { "object-keys": "^1.0.12" @@ -9293,14 +9080,12 @@ "version": "2.0.4", "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz", "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==", - "dev": true, "optional": true }, "duplexer3": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz", - "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=", - "dev": true + "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=" }, "ecc-jsbn": { "version": "0.1.2", @@ -9316,7 +9101,6 @@ "version": "12.0.6", "resolved": "https://registry.npmjs.org/electron/-/electron-12.0.6.tgz", "integrity": "sha512-+fqhpdG6Fd6LzsizMdaSPC1I8tfsMT8/7fsYBgABED3hEWdus/rt6CQ54P3/EWZyQebtyHR6HXtlofUqKMV3KQ==", - "dev": true, "requires": { "@electron/get": "^1.0.1", "@types/node": "^14.6.2", @@ -9996,9 +9780,9 @@ } }, "electron-winstaller": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/electron-winstaller/-/electron-winstaller-4.0.2.tgz", - "integrity": "sha512-tYmzIyi+W0CXd9o/jmR0VT+vwJ+nOaE/dQz8f64IlbQ/J9d2lpwsmmOKxx6veAVKeYiJHYQHR1eYsLzznNzd5g==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/electron-winstaller/-/electron-winstaller-5.0.0.tgz", + "integrity": "sha512-V+jFda7aVAm0htCG8Q95buPUpmXZW9ujh1HdhSlWY6y4QnJnw4TfrmxTlQWV4p2ioF/71JMI/1YF+/qbSICogA==", "dev": true, "optional": true, "requires": { @@ -10072,14 +9856,12 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=", - "dev": true, "optional": true }, "end-of-stream": { "version": "1.4.4", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", - "dev": true, "requires": { "once": "^1.4.0" } @@ -10087,8 +9869,7 @@ "env-paths": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.0.tgz", - "integrity": "sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA==", - "dev": true + "integrity": "sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA==" }, "error-ex": { "version": "1.3.2", @@ -10103,7 +9884,6 @@ "version": "4.1.1", "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==", - "dev": true, "optional": true }, "escalade": { @@ -10120,8 +9900,7 @@ "escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" }, "execa": { "version": "1.0.0", @@ -10230,13 +10009,23 @@ "chardet": "^0.7.0", "iconv-lite": "^0.4.24", "tmp": "^0.0.33" + }, + "dependencies": { + "iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dev": true, + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + } } }, "extract-zip": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz", "integrity": "sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==", - "dev": true, "requires": { "concat-stream": "^1.6.2", "debug": "^2.6.9", @@ -10248,7 +10037,6 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, "requires": { "ms": "2.0.0" } @@ -10256,8 +10044,7 @@ "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" } } }, @@ -10283,7 +10070,6 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=", - "dev": true, "requires": { "pend": "~1.2.0" } @@ -10300,14 +10086,12 @@ "filename-reserved-regex": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz", - "integrity": "sha1-q/c9+rc10EVECr/qLZHzieu/oik=", - "dev": true + "integrity": "sha1-q/c9+rc10EVECr/qLZHzieu/oik=" }, "filenamify": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-4.2.0.tgz", "integrity": "sha512-pkgE+4p7N1n7QieOopmn3TqJaefjdWXwEkj2XLZJLKfOgcQKkn11ahvGNgTD8mLggexLiDFQxeTs14xVU22XPA==", - "dev": true, "requires": { "filename-reserved-regex": "^2.0.0", "strip-outer": "^1.0.1", @@ -10367,7 +10151,6 @@ "version": "8.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", - "dev": true, "requires": { "graceful-fs": "^4.2.0", "jsonfile": "^4.0.0", @@ -10553,7 +10336,6 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", - "dev": true, "requires": { "pump": "^3.0.0" } @@ -10585,7 +10367,6 @@ "version": "2.1.12", "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-2.1.12.tgz", "integrity": "sha512-caAljRMS/qcDo69X9BfkgrihGUgGx44Fb4QQToNQjsiWh+YlQ66uqYVAdA8Olqit+5Ng0nkz09je3ZzANMZcjg==", - "dev": true, "optional": true, "requires": { "boolean": "^3.0.1", @@ -10601,7 +10382,6 @@ "version": "7.3.4", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz", "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==", - "dev": true, "optional": true, "requires": { "lru-cache": "^6.0.0" @@ -10648,7 +10428,6 @@ "version": "2.7.1", "resolved": "https://registry.npmjs.org/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz", "integrity": "sha512-4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg==", - "dev": true, "optional": true, "requires": { "encodeurl": "^1.0.2", @@ -10661,7 +10440,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.1.tgz", "integrity": "sha512-mJPRTc/P39NH/iNG4mXa9aIhNymaQikTrnspeCa2ZuJ+mH2QN/rXwtX3XwKrHqWgUQFbNZKtHM105aHzJalElw==", - "dev": true, "optional": true, "requires": { "define-properties": "^1.1.3" @@ -10671,7 +10449,6 @@ "version": "9.6.0", "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz", "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==", - "dev": true, "requires": { "@sindresorhus/is": "^0.14.0", "@szmarczak/http-timer": "^1.1.2", @@ -10689,8 +10466,7 @@ "graceful-fs": { "version": "4.2.4", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", - "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", - "dev": true + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==" }, "har-schema": { "version": "2.0.0", @@ -10741,8 +10517,7 @@ "http-cache-semantics": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz", - "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==", - "dev": true + "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==" }, "http-signature": { "version": "1.2.0", @@ -10765,15 +10540,6 @@ "resolve-alpn": "^1.0.0" } }, - "iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "dev": true, - "requires": { - "safer-buffer": ">= 2.1.2 < 3" - } - }, "ieee754": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", @@ -10811,19 +10577,18 @@ "inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "ini": { "version": "1.3.8", "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", - "dev": true + "devOptional": true }, "inquirer": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.0.0.tgz", - "integrity": "sha512-ON8pEJPPCdyjxj+cxsYRe6XfCJepTxANdNnTebsTuQgXpRyZRRT9t4dJwjRubgmvn20CLSEnozRUayXyM9VTXA==", + "version": "7.3.3", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz", + "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==", "dev": true, "requires": { "ansi-escapes": "^4.2.1", @@ -10832,10 +10597,10 @@ "cli-width": "^3.0.0", "external-editor": "^3.0.3", "figures": "^3.0.0", - "lodash": "^4.17.21", + "lodash": "^4.17.19", "mute-stream": "0.0.8", "run-async": "^2.4.0", - "rxjs": "^6.6.6", + "rxjs": "^6.6.0", "string-width": "^4.1.0", "strip-ansi": "^6.0.0", "through": "^2.3.6" @@ -10933,8 +10698,7 @@ "isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" }, "isexe": { "version": "2.0.0", @@ -10957,8 +10721,7 @@ "json-buffer": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz", - "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=", - "dev": true + "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=" }, "json-schema": { "version": "0.2.3", @@ -10976,13 +10739,12 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", - "dev": true + "devOptional": true }, "jsonfile": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", - "dev": true, "requires": { "graceful-fs": "^4.1.6" } @@ -11027,7 +10789,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz", "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==", - "dev": true, "requires": { "json-buffer": "3.0.0" } @@ -11063,10 +10824,10 @@ } }, "lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", + "devOptional": true }, "lodash._reinterpolate": { "version": "3.0.0", @@ -11125,14 +10886,13 @@ "lowercase-keys": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", - "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==", - "dev": true + "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==" }, "lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, + "devOptional": true, "requires": { "yallist": "^4.0.0" } @@ -11168,7 +10928,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/matcher/-/matcher-3.0.0.tgz", "integrity": "sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==", - "dev": true, "optional": true, "requires": { "escape-string-regexp": "^4.0.0" @@ -11178,7 +10937,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", - "dev": true, "optional": true } } @@ -11316,8 +11074,7 @@ "mimic-response": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz", - "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==", - "dev": true + "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==" }, "minimatch": { "version": "3.0.4", @@ -11331,8 +11088,7 @@ "minimist": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", - "dev": true + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" }, "minipass": { "version": "3.1.3", @@ -11357,7 +11113,6 @@ "version": "0.5.5", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", - "dev": true, "requires": { "minimist": "^1.2.5" } @@ -11397,6 +11152,15 @@ "requires": { "ms": "^2.1.1" } + }, + "iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dev": true, + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } } } }, @@ -11602,8 +11366,7 @@ "normalize-url": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz", - "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==", - "dev": true + "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==" }, "npm-bundled": { "version": "1.1.2", @@ -11618,7 +11381,6 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz", "integrity": "sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==", - "dev": true, "optional": true, "requires": { "config-chain": "^1.1.11", @@ -11725,14 +11487,12 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", - "dev": true, "optional": true }, "once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dev": true, "requires": { "wrappy": "1" } @@ -11798,8 +11558,7 @@ "p-cancelable": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz", - "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==", - "dev": true + "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==" }, "p-defer": { "version": "1.0.0", @@ -11917,8 +11676,7 @@ "pend": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", - "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=", - "dev": true + "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=" }, "performance-now": { "version": "2.1.0", @@ -11930,7 +11688,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "dev": true, "optional": true }, "pinkie": { @@ -12022,8 +11779,7 @@ "prepend-http": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", - "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=", - "dev": true + "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=" }, "pretty-bytes": { "version": "1.0.4", @@ -12047,14 +11803,12 @@ "process-nextick-args": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", - "dev": true + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" }, "progress": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", - "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", - "dev": true + "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==" }, "progress-stream": { "version": "1.2.0", @@ -12070,7 +11824,6 @@ "version": "1.2.4", "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=", - "dev": true, "optional": true }, "psl": { @@ -12083,7 +11836,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", - "dev": true, "requires": { "end-of-stream": "^1.1.0", "once": "^1.3.1" @@ -12158,7 +11910,6 @@ "version": "2.3.7", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "dev": true, "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -12268,7 +12019,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz", "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=", - "dev": true, "requires": { "lowercase-keys": "^1.0.0" } @@ -12296,7 +12046,6 @@ "version": "2.15.4", "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.4.tgz", "integrity": "sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==", - "dev": true, "optional": true, "requires": { "boolean": "^3.0.1", @@ -12325,8 +12074,7 @@ "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, "safer-buffer": { "version": "2.1.2", @@ -12343,21 +12091,18 @@ "semver": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" }, "semver-compare": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz", "integrity": "sha1-De4hahyUGrN+nvsXiPavxf9VN/w=", - "dev": true, "optional": true }, "serialize-error": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz", "integrity": "sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==", - "dev": true, "optional": true, "requires": { "type-fest": "^0.13.1" @@ -12527,7 +12272,6 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz", "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==", - "dev": true, "optional": true }, "sshpk": { @@ -12551,7 +12295,6 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, "requires": { "safe-buffer": "~5.1.0" } @@ -12617,7 +12360,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz", "integrity": "sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==", - "dev": true, "requires": { "escape-string-regexp": "^1.0.2" } @@ -12632,7 +12374,6 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.1.tgz", "integrity": "sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==", - "dev": true, "requires": { "debug": "^4.1.0" } @@ -12790,8 +12531,7 @@ "to-readable-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz", - "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==", - "dev": true + "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==" }, "tough-cookie": { "version": "2.5.0", @@ -12813,7 +12553,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz", "integrity": "sha1-42RqLqTokTEr9+rObPsFOAvAHCE=", - "dev": true, "requires": { "escape-string-regexp": "^1.0.2" } @@ -12828,7 +12567,6 @@ "version": "0.0.6", "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz", "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==", - "dev": true, "optional": true }, "tunnel-agent": { @@ -12850,14 +12588,12 @@ "version": "0.13.1", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz", "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==", - "dev": true, "optional": true }, "typedarray": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", - "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", - "dev": true + "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" }, "universal-user-agent": { "version": "6.0.0", @@ -12868,8 +12604,7 @@ "universalify": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", - "dev": true + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==" }, "unused-filename": { "version": "2.1.0", @@ -12900,7 +12635,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=", - "dev": true, "requires": { "prepend-http": "^2.0.0" } @@ -12918,8 +12652,7 @@ "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", - "dev": true + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, "uuid": { "version": "3.4.0", @@ -13035,8 +12768,7 @@ "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, "xmlbuilder": { "version": "9.0.7", @@ -13077,7 +12809,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true + "devOptional": true }, "yargs": { "version": "16.2.0", @@ -13165,7 +12897,6 @@ "version": "2.10.0", "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=", - "dev": true, "requires": { "buffer-crc32": "~0.2.3", "fd-slicer": "~1.1.0" @@ -13178,4 +12909,4 @@ "dev": true } } -} +} \ No newline at end of file diff --git a/package.json b/package.json index 5aee2dd..13536a2 100644 --- a/package.json +++ b/package.json @@ -13,18 +13,18 @@ "author": "smartfrigde", "license": "MIT", "dependencies": { - "custom-electron-titlebar": "3.2.6", - "electron-context-menu": "^3.1.0", + "custom-electron-titlebar": "3.2.7", + "electron-context-menu": "^3.0.0", "electron-localshortcut": "^3.2.1", "electron-squirrel-startup": "^1.0.0", "v8-compile-cache": "^2.3.0" }, "devDependencies": { - "@electron-forge/cli": "^6.0.0-beta.55", - "@electron-forge/maker-deb": "^6.0.0-beta.54", - "@electron-forge/maker-rpm": "^6.0.0-beta.54", - "@electron-forge/maker-squirrel": "^6.0.0-beta.54", - "@electron-forge/maker-zip": "^6.0.0-beta.54", + "@electron-forge/cli": "^6.0.0-beta.54", + "@electron-forge/maker-deb": "^6.0.0-beta.55", + "@electron-forge/maker-rpm": "^6.0.0-beta.55", + "@electron-forge/maker-squirrel": "^6.0.0-beta.55", + "@electron-forge/maker-zip": "^6.0.0-beta.55", "@electron-forge/publisher-github": "*", "electron": "latest" }, @@ -43,9 +43,7 @@ "homepage": "https://github.com/smartfrigde/armcord#readme", "config": { "forge": { - "packagerConfig": { - "icon": "discord.png" - }, + "packagerConfig": {}, "makers": [ { "name": "@electron-forge/maker-squirrel", @@ -81,4 +79,4 @@ ] } } -} +} \ No newline at end of file From 0d7a68c713b511f287b51147cbc127bd1c6f159f Mon Sep 17 00:00:00 2001 From: smartfridge <37928912+smartfrigde@users.noreply.github.com> Date: Thu, 20 May 2021 18:42:16 +0200 Subject: [PATCH 22/63] amongus broke my discord :( --- package-lock.json | 4 ++-- package.json | 2 +- preload.js | 2 +- utils/theme.js | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5dec907..183e6f5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,7 +21,7 @@ "@electron-forge/maker-squirrel": "^6.0.0-beta.55", "@electron-forge/maker-zip": "^6.0.0-beta.55", "@electron-forge/publisher-github": "*", - "electron": "*" + "electron": "latest" } }, "node_modules/@electron-forge/async-ora": { @@ -12909,4 +12909,4 @@ "dev": true } } -} \ No newline at end of file +} diff --git a/package.json b/package.json index 13536a2..fc37710 100644 --- a/package.json +++ b/package.json @@ -79,4 +79,4 @@ ] } } -} \ No newline at end of file +} diff --git a/preload.js b/preload.js index b0ddc5e..92be85f 100644 --- a/preload.js +++ b/preload.js @@ -8,7 +8,7 @@ window.addEventListener("DOMContentLoaded", () => { backgroundColor: customTitlebar.Color.fromHex("#202225"), menu: false, }); - + require("./utils/theme.js"); const currentWindow = remote.getCurrentWindow(); electronLocalshortcut.register(currentWindow, "F5", () => { location.reload(); diff --git a/utils/theme.js b/utils/theme.js index b58dc05..8d0ce72 100644 --- a/utils/theme.js +++ b/utils/theme.js @@ -1,6 +1,7 @@ const fs = require("fs"); const armcord = require("./armcord.js"); const themeFolder = __dirname + "/themes/"; +console.log("Theme Module Loaded") window.addEventListener("DOMContentLoaded", () => { fs.readdirSync(themeFolder).forEach((file) => { console.log(file); From 9985c8cabe22ed0e15e090d68ecfa53bf9cbbe09 Mon Sep 17 00:00:00 2001 From: smartfridge <37928912+smartfrigde@users.noreply.github.com> Date: Fri, 21 May 2021 19:20:30 +0200 Subject: [PATCH 23/63] Update LICENSE --- LICENSE | 185 ++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 168 insertions(+), 17 deletions(-) diff --git a/LICENSE b/LICENSE index 1b93163..95230e3 100644 --- a/LICENSE +++ b/LICENSE @@ -1,21 +1,172 @@ -MIT License +Open Software License ("OSL") v. 3.0 -Copyright (c) 2021 smartfridge +This Open Software License (the "License") applies to any original work of +authorship (the "Original Work") whose owner (the "Licensor") has placed the +following licensing notice adjacent to the copyright notice for the Original +Work: -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: +Licensed under the Open Software License version 3.0 -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. +1) Grant of Copyright License. Licensor grants You a worldwide, royalty-free, +non-exclusive, sublicensable license, for the duration of the copyright, to do +the following: -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. + a) to reproduce the Original Work in copies, either alone or as part of a + collective work; + + b) to translate, adapt, alter, transform, modify, or arrange the Original + Work, thereby creating derivative works ("Derivative Works") based upon the + Original Work; + + c) to distribute or communicate copies of the Original Work and Derivative + Works to the public, with the proviso that copies of Original Work or + Derivative Works that You distribute or communicate shall be licensed under + this Open Software License; + + d) to perform the Original Work publicly; and + + e) to display the Original Work publicly. + +2) Grant of Patent License. Licensor grants You a worldwide, royalty-free, +non-exclusive, sublicensable license, under patent claims owned or controlled +by the Licensor that are embodied in the Original Work as furnished by the +Licensor, for the duration of the patents, to make, use, sell, offer for sale, +have made, and import the Original Work and Derivative Works. + +3) Grant of Source Code License. The term "Source Code" means the preferred +form of the Original Work for making modifications to it and all available +documentation describing how to modify the Original Work. Licensor agrees to +provide a machine-readable copy of the Source Code of the Original Work along +with each copy of the Original Work that Licensor distributes. Licensor +reserves the right to satisfy this obligation by placing a machine-readable +copy of the Source Code in an information repository reasonably calculated to +permit inexpensive and convenient access by You for as long as Licensor +continues to distribute the Original Work. + +4) Exclusions From License Grant. Neither the names of Licensor, nor the names +of any contributors to the Original Work, nor any of their trademarks or +service marks, may be used to endorse or promote products derived from this +Original Work without express prior permission of the Licensor. Except as +expressly stated herein, nothing in this License grants any license to +Licensor's trademarks, copyrights, patents, trade secrets or any other +intellectual property. No patent license is granted to make, use, sell, offer +for sale, have made, or import embodiments of any patent claims other than the +licensed claims defined in Section 2. No license is granted to the trademarks +of Licensor even if such marks are included in the Original Work. Nothing in +this License shall be interpreted to prohibit Licensor from licensing under +terms different from this License any Original Work that Licensor otherwise +would have a right to license. + +5) External Deployment. The term "External Deployment" means the use, +distribution, or communication of the Original Work or Derivative Works in any +way such that the Original Work or Derivative Works may be used by anyone +other than You, whether those works are distributed or communicated to those +persons or made available as an application intended for use over a network. +As an express condition for the grants of license hereunder, You must treat +any External Deployment by You of the Original Work or a Derivative Work as a +distribution under section 1(c). + +6) Attribution Rights. You must retain, in the Source Code of any Derivative +Works that You create, all copyright, patent, or trademark notices from the +Source Code of the Original Work, as well as any notices of licensing and any +descriptive text identified therein as an "Attribution Notice." You must cause +the Source Code for any Derivative Works that You create to carry a prominent +Attribution Notice reasonably calculated to inform recipients that You have +modified the Original Work. + +7) Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that +the copyright in and to the Original Work and the patent rights granted herein +by Licensor are owned by the Licensor or are sublicensed to You under the +terms of this License with the permission of the contributor(s) of those +copyrights and patent rights. Except as expressly stated in the immediately +preceding sentence, the Original Work is provided under this License on an "AS +IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without +limitation, the warranties of non-infringement, merchantability or fitness for +a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK +IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this +License. No license to the Original Work is granted by this License except +under this disclaimer. + +8) Limitation of Liability. Under no circumstances and under no legal theory, +whether in tort (including negligence), contract, or otherwise, shall the +Licensor be liable to anyone for any indirect, special, incidental, or +consequential damages of any character arising as a result of this License or +the use of the Original Work including, without limitation, damages for loss +of goodwill, work stoppage, computer failure or malfunction, or any and all +other commercial damages or losses. This limitation of liability shall not +apply to the extent applicable law prohibits such limitation. + +9) Acceptance and Termination. If, at any time, You expressly assented to this +License, that assent indicates your clear and irrevocable acceptance of this +License and all of its terms and conditions. If You distribute or communicate +copies of the Original Work or a Derivative Work, You must make a reasonable +effort under the circumstances to obtain the express assent of recipients to +the terms of this License. This License conditions your rights to undertake +the activities listed in Section 1, including your right to create Derivative +Works based upon the Original Work, and doing so without honoring these terms +and conditions is prohibited by copyright law and international treaty. +Nothing in this License is intended to affect copyright exceptions and +limitations (including "fair use" or "fair dealing"). This License shall +terminate immediately and You may no longer exercise any of the rights granted +to You by this License upon your failure to honor the conditions in Section +1(c). + +10) Termination for Patent Action. This License shall terminate automatically +and You may no longer exercise any of the rights granted to You by this +License as of the date You commence an action, including a cross-claim or +counterclaim, against Licensor or any licensee alleging that the Original Work +infringes a patent. This termination provision shall not apply for an action +alleging patent infringement by combinations of the Original Work with other +software or hardware. + +11) Jurisdiction, Venue and Governing Law. Any action or suit relating to this +License may be brought only in the courts of a jurisdiction wherein the +Licensor resides or in which Licensor conducts its primary business, and under +the laws of that jurisdiction excluding its conflict-of-law provisions. The +application of the United Nations Convention on Contracts for the +International Sale of Goods is expressly excluded. Any use of the Original +Work outside the scope of this License or after its termination shall be +subject to the requirements and penalties of copyright or patent law in the +appropriate jurisdiction. This section shall survive the termination of this +License. + +12) Attorneys' Fees. In any action to enforce the terms of this License or +seeking damages relating thereto, the prevailing party shall be entitled to +recover its costs and expenses, including, without limitation, reasonable +attorneys' fees and costs incurred in connection with such action, including +any appeal of such action. This section shall survive the termination of this +License. + +13) Miscellaneous. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent necessary +to make it enforceable. + +14) Definition of "You" in This License. "You" throughout this License, +whether in upper or lower case, means an individual or a legal entity +exercising rights under, and complying with all of the terms of, this License. +For legal entities, "You" includes any entity that controls, is controlled by, +or is under common control with you. For purposes of this definition, +"control" means (i) the power, direct or indirect, to cause the direction or +management of such entity, whether by contract or otherwise, or (ii) ownership +of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial +ownership of such entity. + +15) Right to Use. You may use the Original Work in all ways not otherwise +restricted or conditioned by this License or by law, and Licensor promises not +to interfere with or be responsible for such uses by You. + +16) Modification of This License. This License is Copyright © 2005 Lawrence +Rosen. Permission is granted to copy, distribute, or communicate this License +without modification. Nothing in this License permits You to modify this +License as applied to the Original Work or to Derivative Works. However, You +may modify the text of this License and copy, distribute or communicate your +modified version (the "Modified License") and apply it to other original works +of authorship subject to the following conditions: (i) You may not indicate in +any way that your Modified License is the "Open Software License" or "OSL" and +you may not use those names in the name of your Modified License; (ii) You +must replace the notice specified in the first paragraph above with the notice +"Licensed under " or with a notice of your own +that is not confusingly similar to the notice in this License; and (iii) You +may not claim that your original works are open source software unless your +Modified License has been approved by Open Source Initiative (OSI) and You +comply with its license review and certification process. From 5e10467bf782847a225772581213f7a39b48a8d0 Mon Sep 17 00:00:00 2001 From: smartfridge <37928912+smartfrigde@users.noreply.github.com> Date: Fri, 21 May 2021 19:27:32 +0200 Subject: [PATCH 24/63] Fix theme loading --- preload.js | 4 ++-- utils/theme.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/preload.js b/preload.js index 92be85f..1213095 100644 --- a/preload.js +++ b/preload.js @@ -2,13 +2,13 @@ const customTitlebar = require("custom-electron-titlebar"); const electronLocalshortcut = require("electron-localshortcut"); const { remote } = require("electron"); const ArmCord = require("./utils/ArmCord.js"); - +require("./utils/theme.js"); window.addEventListener("DOMContentLoaded", () => { new customTitlebar.Titlebar({ backgroundColor: customTitlebar.Color.fromHex("#202225"), menu: false, }); - require("./utils/theme.js"); + const currentWindow = remote.getCurrentWindow(); electronLocalshortcut.register(currentWindow, "F5", () => { location.reload(); diff --git a/utils/theme.js b/utils/theme.js index 8d0ce72..0cd3774 100644 --- a/utils/theme.js +++ b/utils/theme.js @@ -1,8 +1,8 @@ const fs = require("fs"); const armcord = require("./armcord.js"); const themeFolder = __dirname + "/themes/"; -console.log("Theme Module Loaded") window.addEventListener("DOMContentLoaded", () => { + console.log("Theme Module Loaded"); fs.readdirSync(themeFolder).forEach((file) => { console.log(file); try { From 51beca4d2fb9a2cbd42812727de02fbdec4cd57f Mon Sep 17 00:00:00 2001 From: smartfridge <37928912+smartfrigde@users.noreply.github.com> Date: Fri, 21 May 2021 19:33:11 +0200 Subject: [PATCH 25/63] armcord manager the --- theme.html => manager.html | 4 ++-- preload.js | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) rename theme.html => manager.html (95%) diff --git a/theme.html b/manager.html similarity index 95% rename from theme.html rename to manager.html index c035ebc..96d3d7f 100644 --- a/theme.html +++ b/manager.html @@ -2,7 +2,7 @@ - ArmCord Theme Manager + ArmCord Manager + diff --git a/utils/theme.js b/utils/theme.js index c515406..8814e82 100644 --- a/utils/theme.js +++ b/utils/theme.js @@ -1,5 +1,5 @@ const fs = require("fs"); -const armcord = require("./ArmCord.js"); +const armcord = require("./armcord.js"); const themeFolder = __dirname + "/themes/"; window.addEventListener("DOMContentLoaded", () => { @@ -14,13 +14,13 @@ window.addEventListener("DOMContentLoaded", () => { const theme = fs.readFileSync(`${__dirname}/themes/${file}/${themeFile.theme}`, "utf8"); if (themeFile.theme.endsWith(".scss")) { console.log( - `%cCouldn't load ${themeFile.name} made by ${themeFile.author}. ArmCord doesn't support scss files if you want to have this theme ported feel free to reach out https://discord.gg/F25bc4RYDt `, + `%cCouldn't load ${themeFile.name} made by ${themeFile.author}. ArmCord doesn't support SCSS files! If you want to have this theme ported, feel free to reach out https://discord.gg/F25bc4RYDt `, "color:red; font-weight: bold; font-size: 50px;color: red;" ); } armcord.addStyle(theme); - var html = `

${themeFile.name}

`; - document.getElementById("tm-list").insertAdjacentHTML("afterend", html); + var html = `
${themeFile.name}
By ${themeFile.author}
${themeFile.description}


`; + document.getElementById("tm-list").innerHTML = html + document.getElementById("tm-list").innerHTML; console.log(`%cLoaded ${themeFile.name} made by ${themeFile.author}`, "color:red"); } catch (err) { console.error(err); diff --git a/utils/themes/test_thing/LICENSE b/utils/themes/test_thing/LICENSE new file mode 100644 index 0000000..3cf6dad --- /dev/null +++ b/utils/themes/test_thing/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2021 GooseNest + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/utils/themes/test_thing/README.md b/utils/themes/test_thing/README.md new file mode 100644 index 0000000..3fb7430 --- /dev/null +++ b/utils/themes/test_thing/README.md @@ -0,0 +1,3 @@ +# GT-RevertRebrand ArmCord + +Reverts Discord's 2021 rebrand (font, colors, reactions, mentions, loading screen, home icon, reply ping color, and more) diff --git a/utils/themes/test_thing/RevertRebrand.theme.css b/utils/themes/test_thing/RevertRebrand.theme.css new file mode 100644 index 0000000..c342047 --- /dev/null +++ b/utils/themes/test_thing/RevertRebrand.theme.css @@ -0,0 +1,9 @@ +/** + * @name Revert Rebrand + * @author GooseNest + * @description Reverts Discord's 2021 rebrand (font, colors, reactions, mentions, loading screen, home icon, reply ping color, and more) + * @invite neMncS2 + * @version 3.0 +*/ + +@import url('https://Goose-Nest.github.io/GT-RevertRebrand/src/main.css'); \ No newline at end of file diff --git a/utils/themes/test_thing/manifest.json b/utils/themes/test_thing/manifest.json new file mode 100644 index 0000000..c0dad3e --- /dev/null +++ b/utils/themes/test_thing/manifest.json @@ -0,0 +1,8 @@ +{ + "name": "Test Theme", + "description": "A test description (For theme seperation)", + "version": "3.0", + "author": "KayoticCarnige", + "license": "MIT", + "theme": "RevertRebrand.theme.css" +} \ No newline at end of file From 024e37e5d068e7a8963fd95d383617a2e675ac43 Mon Sep 17 00:00:00 2001 From: KayoticCarnige Date: Sat, 22 May 2021 11:03:32 -0400 Subject: [PATCH 29/63] Update main.js --- main.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/main.js b/main.js index 5123dfe..0b97d8d 100644 --- a/main.js +++ b/main.js @@ -6,7 +6,12 @@ const os = require("os"); require("v8-compile-cache"); require("./utils/updater"); -var iconformat = __dirname + "/discord.png" +if (os.type() == 'Linux'){ + var iconformat = __dirname + "/discord.png" +} else { //test this + console.log("Running Non-Linux") + var iconformat = __dirname + "/discord.ico"; +} contextMenu({ prepend: (defaultActions, parameters, browserWindow) => [ From 493c35d2696fd625261f638badd1c7fcff136870 Mon Sep 17 00:00:00 2001 From: KayoticCarnige Date: Sat, 22 May 2021 11:28:29 -0400 Subject: [PATCH 30/63] Update preload.js --- preload.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/preload.js b/preload.js index 77074c2..59b9354 100644 --- a/preload.js +++ b/preload.js @@ -73,6 +73,9 @@ div.menubar[role="menubar"] { .titlebar .window-controls-container .window-icon { background: var(--window-buttons) !important; } +.notice-3bPHh-.colorDefault-22HBa0 { + display: none; +} `); ArmCord.addStyle( From 70e8a95a50ce0e60a835a7fc8cbf05e60aa84f1e Mon Sep 17 00:00:00 2001 From: smartfridge <37928912+smartfrigde@users.noreply.github.com> Date: Sat, 22 May 2021 17:29:39 +0200 Subject: [PATCH 31/63] Fix Linux file naming or something --- utils/theme.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/theme.js b/utils/theme.js index 8814e82..ec69650 100644 --- a/utils/theme.js +++ b/utils/theme.js @@ -1,5 +1,5 @@ const fs = require("fs"); -const armcord = require("./armcord.js"); +const armcord = require("./ArmCord.js"); const themeFolder = __dirname + "/themes/"; window.addEventListener("DOMContentLoaded", () => { From dccf461fc3818df9b34767a8b61f4a5338243f89 Mon Sep 17 00:00:00 2001 From: KayoticCarnige Date: Sat, 22 May 2021 12:03:48 -0400 Subject: [PATCH 32/63] Update package.json --- package.json | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index fc37710..2cf72b2 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "armcord", + "name": "ArmCord", "version": "2.5.0", "description": "ArmCord is a Discord client made for ARM Linux that allows you to customize your experience.", "main": "main.js", @@ -43,12 +43,14 @@ "homepage": "https://github.com/smartfrigde/armcord#readme", "config": { "forge": { - "packagerConfig": {}, + "packagerConfig": { + "icon": "discord.png" + }, "makers": [ { "name": "@electron-forge/maker-squirrel", "config": { - "name": "armcord" + "name": "ArmCord" } }, { From e4b54dda05ecb05f3c710f6acf3933d53a287d84 Mon Sep 17 00:00:00 2001 From: smartfridge <37928912+smartfrigde@users.noreply.github.com> Date: Sat, 22 May 2021 23:21:07 +0200 Subject: [PATCH 33/63] cors my beloved <3 --- utils/plugins/goosemod/CSP.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/utils/plugins/goosemod/CSP.js b/utils/plugins/goosemod/CSP.js index 03dea62..19dc3d5 100644 --- a/utils/plugins/goosemod/CSP.js +++ b/utils/plugins/goosemod/CSP.js @@ -8,3 +8,14 @@ chrome.webRequest.onHeadersReceived.addListener((h) => { }, {urls: ["*://*.discord.com/*"]}, ['blocking', 'responseHeaders'] ) + +const corsAllowUrls = [ + 'https://github.com/GooseMod/GooseMod/releases/download/dev/index.js', + 'https://github-releases.githubusercontent.com/' + ]; + +if (corsAllowUrls.some((x) => url.startsWith(x))) { + responseHeaders['access-control-allow-origin'] = ['*']; + } +//psst stolen from https://raw.githubusercontent.com/Goose-Nest/GooseUpdate/main/branches/goosemod/patch.js +//dont tell anyone :troll: From 253ff66cc384640e63d0b3952bfda529ee7b1752 Mon Sep 17 00:00:00 2001 From: KayoticCarnige Date: Tue, 25 May 2021 06:24:42 -0400 Subject: [PATCH 34/63] Added Theme Folder Button --- manager.css | 29 +++++++++++++++++++++++++++++ manager.html | 3 ++- preload.js | 5 +++-- utils/theme.js | 6 ++++-- 4 files changed, 38 insertions(+), 5 deletions(-) diff --git a/manager.css b/manager.css index b9b0858..ce6de20 100644 --- a/manager.css +++ b/manager.css @@ -56,6 +56,7 @@ button.back-btn { height: 25px; margin-top: 5px; margin-left: 5px; + left: 0; text-align: center; border-style: none; outline: none; @@ -72,6 +73,34 @@ button.back-btn:active { background-color: #5c6fb1; } +button#open-themes-btn { + position: absolute; + background-color: #7289da; + font-family: Whitney, "Helvetica Neue", Helvetica, Arial, sans-serif; + color: #ffffff; + padding: 4px; + border-radius: 5px; + width: 105px; + height: 25px; + margin-top: 5px; + margin-right: 5px; + right: 0; + text-align: center; + border-style: none; + outline: none; +} + +button#open-themes-btn:hover { + background-color: #687dc6; + border-style: none; + outline: none; + cursor: pointer; +} + +button#open-themes-btn:active { + background-color: #5c6fb1; +} + #tm-list { position: absolute; top: 100px; diff --git a/manager.html b/manager.html index 60f668f..afae175 100644 --- a/manager.html +++ b/manager.html @@ -8,7 +8,8 @@ +
- + \ No newline at end of file diff --git a/preload.js b/preload.js index 59b9354..0b6e37e 100644 --- a/preload.js +++ b/preload.js @@ -33,6 +33,7 @@ window.addEventListener("DOMContentLoaded", () => { --window-buttons: var(--header-secondary); --cord-color: var(--header-primary); --armcord-color: #7289da; + --titlebar-color: var(--background-tertiary); } .base-3dtUhz, .sidebar-2K8pFh { display: -webkit-box; @@ -64,10 +65,10 @@ div.menubar[role="menubar"] { .window-title { font-size: 0px !important; margin-left: initial !important; - transform: translate(10px, 2px) !important; + transform: translate(10px, 2px); } .titlebar { - background: var(--background-tertiary) !important; + background: var(--titlebar-color) !important; font-family: Verdana, Geneva, Tahoma, sans-serif; } .titlebar .window-controls-container .window-icon { diff --git a/utils/theme.js b/utils/theme.js index ec69650..fee3882 100644 --- a/utils/theme.js +++ b/utils/theme.js @@ -1,5 +1,6 @@ const fs = require("fs"); -const armcord = require("./ArmCord.js"); +const {shell} = require('electron'); +const ArmCord = require("./ArmCord.js"); const themeFolder = __dirname + "/themes/"; window.addEventListener("DOMContentLoaded", () => { @@ -18,7 +19,7 @@ window.addEventListener("DOMContentLoaded", () => { "color:red; font-weight: bold; font-size: 50px;color: red;" ); } - armcord.addStyle(theme); + ArmCord.addStyle(theme); var html = `
${themeFile.name}
By ${themeFile.author}
${themeFile.description}


`; document.getElementById("tm-list").innerHTML = html + document.getElementById("tm-list").innerHTML; console.log(`%cLoaded ${themeFile.name} made by ${themeFile.author}`, "color:red"); @@ -26,4 +27,5 @@ window.addEventListener("DOMContentLoaded", () => { console.error(err); } }); + document.getElementById("open-themes-btn").onclick = function () {shell.openPath(`${__dirname}/themes`);}; }); From adece2efc9be0ef7894c11acb85734c8dd7b1053 Mon Sep 17 00:00:00 2001 From: KayoticCarnige Date: Fri, 28 May 2021 12:00:30 -0400 Subject: [PATCH 35/63] Added channels (settings.json) --- index.html | 21 ++++++++++++++++++++- manager.css | 4 ++++ manager.html | 3 ++- preload.js | 5 ++++- settings.json | 3 +++ utils/ArmCord.js | 2 ++ utils/theme.js | 13 +++++++++++++ 7 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 settings.json diff --git a/index.html b/index.html index 623f28a..1c95244 100644 --- a/index.html +++ b/index.html @@ -3,8 +3,22 @@ - ArmCord +