Too lazy for this

2026-04-05 20:31:58 +02:00 · 2020-01-25 23:25:11 +01:00
parent 1ca392fb40
commit eca57f9276
9 changed files with 243 additions and 291 deletions
--- a/.github/deploy.ts
+++ b/.github/deploy.ts
@@ -1,42 +0,0 @@
-import * as Client from "ssh2-sftp-client";
-import * as archiver from "archiver";
-import * as rimraf from "rimraf";
-import { platform } from "os";
-import { createWriteStream } from "fs";
-
-let sftp = new Client();
-
-sftp
-  .connect({
-    host: process.env.SSH_HOST,
-    username: process.env.SSH_USERNAME,
-    password: process.env.SSH_PASSWORD
-  })
-  .then(async () => {
-    rimraf.sync("../dist/app/");
-
-    console.log("Zipping...");
-    let output = createWriteStream("app.zip"),
-      archive = archiver("zip");
-
-    archive.directory(`../dist/`, platform());
-
-    output.on("close", function() {
-      console.log("Uploading...");
-      sftp
-        .fastPut("app.zip", `/home/PreMiD/builds/${platform()}.zip`)
-        .then(() => {
-          console.log("Done!");
-          sftp.end();
-        });
-    });
-
-    archive.on("error", function(err) {
-      sftp.end();
-      throw err;
-    });
-
-    archive.pipe(output);
-
-    archive.finalize();
-  });
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -13,7 +13,7 @@ jobs:
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        os: [macOS-latest, windows-latest, ubuntu-latest]
+        os: [macOS-latest, windows-latest]
    steps:
      - uses: actions/checkout@master
      - uses: actions/setup-node@master
@@ -24,34 +24,22 @@ jobs:
      - name: Package
        run: |
          npm run pkg
-          rm -r dist/app
          node util/zip dist ${{ matrix.os }}.zip --zip
-      - uses: actions/upload-artifact@master
-        with:
-          name: ${{ matrix.os }}
-          path: ${{ matrix.os }}.zip
-  installer:
-    needs: package
+      - name: Uplaod bundle
+        env:
+          SSHHOST: ${{ secrets.SSHHOST }}
+          SSHUSERNAME: ${{ secrets.SSHUSERNAME }}
+          SSHPASSWORD: ${{ secrets.SSHPASSWORD }}
+        run: |
+          tsc util/uploadFile
+          node util/uploadFile ${{ matrix.os }}.zip /home/PreMiD/download/util/${{ matrix.os }}.zip
+  createInstallers:
    runs-on: "ubuntu-latest"
    steps:
      - uses: actions/checkout@master
      - uses: actions/setup-node@master
-      - uses: actions/download-artifact@master
-        with:
-          name: macOS-latest
-      - uses: actions/download-artifact@master
-        with:
-          name: windows-latest
-      - name: Unzip MacOS
-        run: |
-          mkdir dist/
-          unzip macOS-latest/macOS-latest.zip
-          mv macOS-latest/* dist/
-          ls -ls dist/
-      - name: Unzip Windows
-        run: |
-          unzip windows-latest/windows-latest.zip
-          mv windows-latest/** dist/
+      - name: Install dependencies
+        run: npm i
      - name: Download InstallBuilder
        run: |
          wget https://clients.bitrock.com/installbuilder/installbuilder-enterprise-19.10.0-linux-x64-installer.run
@@ -60,40 +48,23 @@ jobs:
        run: |
          ./installbuilder-enterprise-19.10.0-linux-x64-installer.run --installer-language en --prefix ./installbuilder --mode unattended
          echo "${{ secrets.IBLICENSE }}" > ./installbuilder/license.xml
-      - name: Install Dependencies
+      - name: Prepare Upgrade Installer
        run: |
-          npm i -D
          tsc util/prepare
-      - name: Create Updaters
+          node util/prepare
+      - name: Create Upgrade Installer (MacOS 64bit)
        run: |
-          installbuilder/autoupdate/bin/customize.run build installer_assets/updater.xml osx
-          installbuilder/autoupdate/bin/customize.run build installer_assets/updater.xml windows
-      - name: Create installer (MacOS 64bit)
+          installbuilder/bin/builder build installer_assets/PreMiD-Upgrade.xml osx
+      - name: Create Upgrade Installer (Windows)
        run: |
-          node util/prepare PreMiD-darwin-x64
-          installbuilder/bin/builder build installer.xml osx
-          zip -r PreMiD-darwin-x64.zip dist/installer
-      - uses: actions/upload-artifact@master
-        with:
-          name: PreMiD-darwin-x64
-          path: PreMiD-darwin-x64.zip
-      - name: Create installer (Windows 64bit)
+          installbuilder/bin/builder build installer_assets/PreMiD-Upgrade.xml windows
+      - name: Upload files
+        env:
+          SSHHOST: ${{ secrets.SSHHOST }}
+          SSHUSERNAME: ${{ secrets.SSHUSERNAME }}
+          SSHPASSWORD: ${{ secrets.SSHPASSWORD }}
        run: |
-          rm -r dist/installer/*
-          node util/prepare PreMiD-win32-x64
-          installbuilder/bin/builder build installer.xml windows
-          zip -r PreMiD-win32-x64.zip dist/installer
-      - uses: actions/upload-artifact@master
-        with:
-          name: PreMiD-win32-x64
-          path: PreMiD-win32-x64.zip
-      - name: Create installer (Windows 32bit)
-        run: |
-          rm -r dist/installer/*
-          node util/prepare PreMiD-win32-ia32
-          installbuilder/bin/builder build installer.xml windows
-          zip -r PreMiD-win32-ia32.zip dist/installer
-      - uses: actions/upload-artifact@master
-        with:
-          name: PreMiD-win32-ia32
-          path: PreMiD-win32-ia32.zip
+          tsc util/uploadFile
+          node util/uploadFile installer_assets/update.ini /home/PreMiD/download/util/update.ini
+          node util/uploadFile dist/installer/upgrader.exe /home/PreMiD/download/upgrader.exe
+          node util/uploadFile dist/installer/upgrader.app /home/PreMiD/download/upgrader.app
--- a/installer_assets/PreMiD-Upgrade.xml
+++ b/installer_assets/PreMiD-Upgrade.xml
@@ -1,7 +1,7 @@
 <project>
    <shortName>PreMiD</shortName>
    <fullName>PreMiD</fullName>
-    <version>2.1</version>
+    <version>VERSION</version>
    <installerFilename>upgrader.${platform_exec_suffix}</installerFilename>
    <debugLevel>0</debugLevel>
    <licenseFile>../LICENSE</licenseFile>
@@ -141,7 +141,7 @@
    <readyToInstallActionList>
        <actionGroup>
            <actionList>
-                <!-- Remove the old ARP Entry 
+                <!-- Remove the old ARP Entry
 Get the old version -->
                <registryGet>
                    <key>HKEY_LOCAL_MACHINE\Software\${project.windowsSoftwareRegistryPrefix}</key>
@@ -460,4 +460,3 @@
        </platformOptions>
    </platformOptionsList>
 </project>
-
--- a/package.json
+++ b/package.json
@@ -1,54 +1,55 @@
 {
-  "name": "premid",
-  "productName": "PreMiD",
-  "description": "Discord Rich Presence for websites.",
-  "version": "2.0.5",
-  "repository": "https://github.com/PreMiD/PreMiD",
-  "scripts": {
-    "init": "tsc && tsc pkg util/prepare util/zip && devScript --copyOnly",
-    "start": "electron dist/app/.",
-    "dev": "devScript",
-    "pkg": "rimraf dist && tsc && devScript --copyOnly && cd dist/app/ && yarn && cd ../../ && node pkg",
-    "deploy": "tsc .github/deploy && cd .github && node deploy.js"
-  },
-  "license": "MIT",
-  "devDependencies": {
-    "@timeraa/devscript": "Timeraa/DevScript",
-    "@types/archiver": "3.0.0",
-    "@types/auto-launch": "5.0.1",
-    "@types/discord-rpc": "3.0.2",
-    "@types/electron-packager": "14.0.0",
-    "@types/fs-extra": "8.0.1",
-    "@types/ini": "1.3.30",
+	"name": "premid",
+	"productName": "PreMiD",
+	"description": "Discord Rich Presence for websites.",
+	"version": "2.0.6",
+	"repository": "https://github.com/PreMiD/PreMiD",
+	"scripts": {
+		"init": "tsc --skipLibCheck && tsc pkg util/prepare util/zip && devScript --copyOnly",
+		"start": "electron dist/app/.",
+		"dev": "devScript",
+		"pkg": "rimraf dist && tsc --skipLibCheck && devScript --copyOnly && cd dist/app/ && yarn && cd ../../ && node pkg",
+		"deploy": "tsc --skipLibCheck .github/deploy && cd .github && node deploy.js"
+	},
+	"license": "MIT",
+	"devDependencies": {
+		"@timeraa/devscript": "Timeraa/DevScript",
+		"@types/archiver": "3.0.0",
+		"@types/auto-launch": "5.0.1",
+		"@types/discord-rpc": "3.0.2",
+		"@types/electron-packager": "14.0.0",
+		"@types/fs-extra": "8.0.1",
+		"@types/ini": "1.3.30",
 		"@types/node": "13.5.0",
-    "@types/prompts": "2.0.3",
-    "@types/request-promise-native": "1.0.17",
-    "@types/rimraf": "2.0.3",
-    "@types/socket.io": "2.1.4",
-    "@types/ssh2-sftp-client": "4.1.2",
-    "@types/unzipper": "^0.10.1",
-    "archiver": "3.1.1",
-    "chalk": "3.0.0",
-    "electron": "7.1.10",
+		"@types/prompts": "2.0.3",
+		"@types/request-promise-native": "1.0.17",
+		"@types/rimraf": "2.0.3",
+		"@types/socket.io": "2.1.4",
+		"@types/ssh2-sftp-client": "4.1.2",
+		"@types/unzipper": "^0.10.1",
+		"archiver": "3.1.1",
+		"chalk": "3.0.0",
+		"electron": "7.1.10",
 		"electron-packager": "14.2.0",
-    "fast-glob": "3.1.1",
-    "fs-extra": "8.1.0",
-    "ini": "1.3.5",
-    "nodemon": "2.0.2",
-    "ora": "4.0.3",
-    "prompts": "2.3.0",
-    "rimraf": "3.0.0",
-    "source-map-support": "0.5.16",
+		"fast-glob": "3.1.1",
+		"fs-extra": "8.1.0",
+		"ini": "1.3.5",
+		"nodemon": "2.0.2",
+		"ora": "4.0.3",
+		"prompts": "2.3.0",
+		"rimraf": "3.0.0",
+		"source-map-support": "0.5.16",
 		"ssh2-sftp-client": "5.0.2",
-    "typescript": "3.7.5",
+		"typescript": "3.7.5",
 		"unzipper": "0.10.7",
 		"yarn": "1.21.1"
-  },
-  "dependencies": {
-    "auto-launch": "5.0.5",
-    "discord-rpc": "github:discordjs/RPC",
-    "electron-store": "5.1.0",
-    "socket.io": "2.3.0",
-    "sudo-prompt": "9.1.1"
-  }
+	},
+	"dependencies": {
+		"auto-launch": "5.0.5",
+		"axios": "0.19.2",
+		"discord-rpc": "github:discordjs/RPC",
+		"electron-store": "5.1.0",
+		"socket.io": "2.3.0",
+		"sudo-prompt": "9.1.1"
+	}
 }
--- a/pkg.ts
+++ b/pkg.ts
@@ -3,7 +3,7 @@ import { platform, arch } from "os";
 import { existsSync, readFileSync, writeFileSync, copyFileSync } from "fs";
 import { resolve } from "path";
 import { exec } from "child_process";
-import { removeSync, ensureDirSync } from "fs-extra";
+import { removeSync } from "fs-extra";
 import { parse, stringify } from "ini";
 import * as prompts from "prompts";
 import * as ora from "ora";
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,17 +1,17 @@
 {
-  "compilerOptions": {
-    "module": "commonjs",
-    "target": "es2018",
-    "inlineSourceMap": true,
-    "outDir": "dist/app",
-    "removeComments": true,
-    "esModuleInterop": true
-  },
-  "include": ["src/**/*"],
-  "exclude": [
-    "pkg.ts",
-    "util/**/*",
-    "installer_assets/builder.ts",
-    ".github/deploy.ts"
-  ]
+	"compilerOptions": {
+		"module": "commonjs",
+		"target": "es2018",
+		"inlineSourceMap": true,
+		"outDir": "dist/app",
+		"removeComments": true,
+		"esModuleInterop": true
+	},
+	"include": ["src/**/*"],
+	"exclude": [
+		"pkg.ts",
+		"util/**/*",
+		"installer_assets/builder.ts",
+		".github/uploadFile.ts"
+	]
 }
--- a/util/prepare.ts
+++ b/util/prepare.ts
@@ -1,23 +1,17 @@
 import { readFileSync, writeFileSync } from "fs";
 import { parse, stringify } from "ini";

-let file = readFileSync("installer_assets/installer.xml", "utf-8");
+let file = readFileSync("installer_assets/PreMiD-Upgrade.xml", "utf-8");

 file = file.replace("VERSION", require("../package.json").version);
-file = file.replace(/(PACKAGEDNAME)/g, process.argv[2]);

-if (process.argv[2].includes("ia32"))
-  file = file.replace(/(installer_64bit)/g, "installer_32bit");
-
-file = file.replace(/(\.\.\/)/g, "");
-
-writeFileSync("installer.xml", file);
+writeFileSync("installer_assets/PreMiD-Upgrade.xml", file);

 let versionId = (require("../package.json").version as string)
-    .replace(/[.]/g, "")
-    .padStart(4, "0"),
-  updateIni = parse(readFileSync("installer_assets/update.ini", "utf-8"));
+		.replace(/[.]/g, "")
+		.padStart(4, "0"),
+	updateIni = parse(readFileSync("installer_assets/update.ini", "utf-8"));

 updateIni.Update.version_id = versionId;

-writeFileSync("update.ini", stringify(updateIni));
+writeFileSync("installer_assets/update.ini", stringify(updateIni));
--- a/util/uploadFile.ts
+++ b/util/uploadFile.ts
@@ -0,0 +1,18 @@
+import * as Client from "ssh2-sftp-client";
+
+let sftp = new Client();
+
+sftp
+	.connect({
+		host: process.env.SSHHOST,
+		username: process.env.SSHUSERNAME,
+		password: process.env.SSHPASSWORD
+	})
+	.then(async () => {
+		sftp
+			.fastPut(process.argv[2], process.argv[3])
+			.then(() => {
+				sftp.end();
+			})
+			.catch(console.error);
+	});
--- a/yarn.lock
+++ b/yarn.lock
@@ -3,16 +3,16 @@


 "@electron/get@^1.0.1", "@electron/get@^1.3.1", "@electron/get@^1.6.0":
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.7.1.tgz#41aa60871b9d7e225bbe68135012f88a9ef87012"
-  integrity sha512-+BOIzkmYbe+oOBGqSByq8zXYXCFztccoymR3uNkvX5ckJ/5xU+4peVyEvFyH6+zfv58hCo99RxgIpwuaMfRtRg==
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.7.2.tgz#286436a9fb56ff1a1fcdf0e80131fd65f4d1e0fd"
+  integrity sha512-LSE4LZGMjGS9TloDx0yO44D2UTbaeKRk+QjlhWLiQlikV6J4spgDCjb6z4YIcqmPAwNzlNCnWF4dubytwI+ATA==
  dependencies:
    debug "^4.1.1"
    env-paths "^2.2.0"
    fs-extra "^8.1.0"
    got "^9.6.0"
    sanitize-filename "^1.6.2"
-    sumchecker "^3.0.0"
+    sumchecker "^3.0.1"
  optionalDependencies:
    global-agent "^2.0.2"
    global-tunnel-ng "^2.7.1"
@@ -51,10 +51,11 @@
    defer-to-connect "^1.0.1"

 "@timeraa/devscript@Timeraa/DevScript":
-  version "1.0.2"
-  resolved "https://codeload.github.com/Timeraa/DevScript/tar.gz/ef9b9ec5bcc4c2c220f6340478d80c351b868e1e"
+  version "1.0.3"
+  resolved "https://codeload.github.com/Timeraa/DevScript/tar.gz/201329e3396b9f1a6b9ce514df1ef05fa274504a"
  dependencies:
-    chalk "^2.4.2"
+    chalk "^3.0.0"
+    chokidar "^3.3.1"
    fast-glob "^3.1.0"
    fs-extra "^8.1.0"
    typescript "^3.6.4"
@@ -127,10 +128,15 @@
  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
  integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==

-"@types/node@*", "@types/node@^12.0.12", "@types/node@^12.12.21":
-  version "12.12.21"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.21.tgz#aa44a6363291c7037111c47e4661ad210aded23f"
-  integrity sha512-8sRGhbpU+ck1n0PGAUgVrWrWdjSW2aqNeyC15W88GRsMpSwzv6RJGlLhE7s2RhVSOdyDmxbqlWSeThq4/7xqlA==
+"@types/node@*", "@types/node@13.5.0":
+  version "13.5.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-13.5.0.tgz#4e498dbf355795a611a87ae5ef811a8660d42662"
+  integrity sha512-Onhn+z72D2O2Pb2ql2xukJ55rglumsVo1H6Fmyi8mlU9SvKdBk/pUSUAiBY/d9bAOF7VVWajX3sths/+g6ZiAQ==
+
+"@types/node@^12.0.12":
+  version "12.12.25"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.25.tgz#792c0afb798f1dd681dce9c4b4c431f7245a0a42"
+  integrity sha512-nf1LMGZvgFX186geVZR1xMZKKblJiRfiASTHw85zED2kI1yDKHDwTKMdkaCbTlXoRKlGKaDfYywt+V0As30q3w==

 "@types/prompts@2.0.3":
  version "2.0.3"
@@ -145,9 +151,9 @@
    "@types/request" "*"

 "@types/request@*":
-  version "2.48.3"
-  resolved "https://registry.yarnpkg.com/@types/request/-/request-2.48.3.tgz#970b8ed2317568c390361d29c555a95e74bd6135"
-  integrity sha512-3Wo2jNYwqgXcIz/rrq18AdOZUQB8cQ34CXZo+LUwPJNpvRAL86+Kc2wwI8mqpz9Cr1V+enIox5v+WZhy/p3h8w==
+  version "2.48.4"
+  resolved "https://registry.yarnpkg.com/@types/request/-/request-2.48.4.tgz#df3d43d7b9ed3550feaa1286c6eabf0738e6cf7e"
+  integrity sha512-W1t1MTKYR8PxICH+A4HgEIPuAC3sbljoEVfyZbeFJJDbr30guDspJri2XOaM2E+Un7ZjrihaDi7cf6fPa2tbgw==
  dependencies:
    "@types/caseless" "*"
    "@types/node" "*"
@@ -223,11 +229,11 @@ after@0.8.2:
  integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=

 ajv@^6.10.2:
-  version "6.10.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz#d3cea04d6b017b2894ad69040fec8b623eb4bd52"
-  integrity sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==
+  version "6.11.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.11.0.tgz#c3607cbc8ae392d8a5a536f25b21f8e5f3f87fe9"
+  integrity sha512-nCprB/0syFYy9fVYU1ox1l2KN8S9I+tziH8D4zdZuLT3N6RMlGSGt5FSTpAiHB/Whv8Qs1cWHma1aMKZyaHRKA==
  dependencies:
-    fast-deep-equal "^2.0.1"
+    fast-deep-equal "^3.1.1"
    fast-json-stable-stringify "^2.0.0"
    json-schema-traverse "^0.4.1"
    uri-js "^4.2.2"
@@ -257,9 +263,9 @@ ansi-styles@^3.2.1:
    color-convert "^1.9.0"

 ansi-styles@^4.1.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.0.tgz#5681f0dcf7ae5880a7841d8831c4724ed9cc0172"
-  integrity sha512-7kFQgnEaMdRtwf6uSfUnVr9gSGC7faurn+J/Mv90/W+iTtN0405/nLdopfMWwchyxhbGYl6TC4Sccn9TUkGAgg==
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359"
+  integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==
  dependencies:
    "@types/color-name" "^1.1.1"
    color-convert "^2.0.1"
@@ -312,9 +318,9 @@ arraybuffer.slice@~0.0.7:
  integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==

 asar@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/asar/-/asar-2.0.1.tgz#8518a1c62c238109c15a5f742213e83a09b9fd38"
-  integrity sha512-Vo9yTuUtyFahkVMFaI6uMuX6N7k5DWa6a/8+7ov0/f8Lq9TVR0tUjzSzxQSxT1Y+RJIZgnP7BVb6Uhi+9cjxqA==
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/asar/-/asar-2.0.3.tgz#250eebf56d29253948763e2c457537448211ccd9"
+  integrity sha512-QdHKO+HOYVtE4B/M3up3i4LSJeJgsa2CTVBrjBf9GgLUPGGUFZowcdJ5yE4gOJuRAHNdqB9JFeRfFfaOu5x8Rw==
  dependencies:
    chromium-pickle-js "^0.2.0"
    commander "^2.20.0"
@@ -364,6 +370,13 @@ auto-launch@5.0.5:
    untildify "^3.0.2"
    winreg "1.2.4"

+axios@0.19.2:
+  version "0.19.2"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.2.tgz#3ea36c5d8818d0d5f8a8a97a6d36b86cdc00cb27"
+  integrity sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==
+  dependencies:
+    follow-redirects "1.5.10"
+
 backo2@1.0.2:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
@@ -579,10 +592,10 @@ chalk@^2.0.1, chalk@^2.4.2:
    escape-string-regexp "^1.0.5"
    supports-color "^5.3.0"

-chokidar@^3.2.2:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.3.0.tgz#12c0714668c55800f659e262d4962a97faf554a6"
-  integrity sha512-dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A==
+chokidar@^3.2.2, chokidar@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.3.1.tgz#c84e5b3d18d9a4d77558fef466b1bf16bbeb3450"
+  integrity sha512-4QYCEWOcK3OJrxwvyyAOxFuhpvOVCYkr33LPfFNBjAD/w3sEzWsp2BUOkI4l9bHvWioAd0rc6NlHUOEaWkTeqg==
  dependencies:
    anymatch "~3.1.1"
    braces "~3.0.2"
@@ -590,9 +603,9 @@ chokidar@^3.2.2:
    is-binary-path "~2.1.0"
    is-glob "~4.0.1"
    normalize-path "~3.0.0"
-    readdirp "~3.2.0"
+    readdirp "~3.3.0"
  optionalDependencies:
-    fsevents "~2.1.1"
+    fsevents "~2.1.2"

 chromium-pickle-js@^0.2.0:
  version "0.2.0"
@@ -766,9 +779,9 @@ cookie@0.3.1:
  integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=

 core-js@^3.4.1:
-  version "3.4.8"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.4.8.tgz#e0fc0c61f2ef90cbc10c531dbffaa46dfb7152dd"
-  integrity sha512-b+BBmCZmVgho8KnBUOXpvlqEMguko+0P+kXCwD4vIprsXC6ht1qgPxtb1OK6XgSlrySF71wkwBQ0Hv695bk9gQ==
+  version "3.6.4"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.4.tgz#440a83536b458114b9cb2ac1580ba377dc470647"
+  integrity sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==

 core-util-is@~1.0.0:
  version "1.0.2"
@@ -837,6 +850,13 @@ debug@2.6.9, debug@^2.2.0, debug@^2.6.8:
  dependencies:
    ms "2.0.0"

+debug@=3.1.0, debug@~3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
+  dependencies:
+    ms "2.0.0"
+
 debug@^3.1.0, debug@^3.2.6:
  version "3.2.6"
  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
@@ -851,13 +871,6 @@ debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@~4.1.0:
  dependencies:
    ms "^2.1.1"

-debug@~3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
-  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
-  dependencies:
-    ms "2.0.0"
-
 decamelize@^1.2.0:
  version "1.2.0"
  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
@@ -887,7 +900,7 @@ defer-to-connect@^1.0.1:
  resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.1.tgz#88ae694b93f67b81815a2c8c769aef6574ac8f2f"
  integrity sha512-J7thop4u3mRTkYRQ+Vpfwy2G5Ehoy82I14+14W4YMDLKdWloI9gSzRbV30s/NckQGVJtPkWNcW4oMAUigTdqiQ==

-define-properties@^1.1.2:
+define-properties@^1.1.3:
  version "1.1.3"
  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
@@ -906,7 +919,7 @@ detect-node@^2.0.4:

 "discord-rpc@github:discordjs/RPC":
  version "3.1.0"
-  resolved "https://codeload.github.com/discordjs/RPC/tar.gz/d7929b23fe28bac7b3ee06a35484e314e6e2e991"
+  resolved "https://codeload.github.com/discordjs/RPC/tar.gz/cfddf66c372abe430a284ff3ea885e8cc0477f99"
  dependencies:
    node-fetch "2.6.0"
    ws "7.1.2"
@@ -965,10 +978,10 @@ electron-osx-sign@^0.4.11:
    minimist "^1.2.0"
    plist "^3.0.1"

-electron-packager@14.1.1:
-  version "14.1.1"
-  resolved "https://registry.yarnpkg.com/electron-packager/-/electron-packager-14.1.1.tgz#260affa0287070e1cf25e5fed074564b8c5494ed"
-  integrity sha512-PODWJ8LFfwUCniTMy4Z5iiZyVHi4W71Pvn/SxJPC6kbI3EfZvo8n5H856XATxNUGVxlmAB5qeSbRym8/f9jISg==
+electron-packager@14.2.0:
+  version "14.2.0"
+  resolved "https://registry.yarnpkg.com/electron-packager/-/electron-packager-14.2.0.tgz#6bd143983f8ba3898e6e21591f37fa97da7f8b67"
+  integrity sha512-6JHv0zfRpxpFta4MJBt7RtcS6zhtl4f76ombZKqicgl5I3Ighx8WBQRYUKMdAO3tNYEq/B0i1FYsBp6oXzlTfA==
  dependencies:
    "@electron/get" "^1.6.0"
    asar "^2.0.1"
@@ -1107,10 +1120,10 @@ extract-zip@^1.0.3:
    mkdirp "0.5.1"
    yauzl "2.4.1"

-fast-deep-equal@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
-  integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
+fast-deep-equal@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
+  integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==

 fast-glob@3.1.1, fast-glob@^3.1.0:
  version "3.1.1"
@@ -1124,9 +1137,9 @@ fast-glob@3.1.1, fast-glob@^3.1.0:
    micromatch "^4.0.2"

 fast-json-stable-stringify@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
-  integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
+  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==

 fastq@^1.6.0:
  version "1.6.0"
@@ -1171,6 +1184,13 @@ flora-colossus@^1.0.0:
    debug "^4.1.1"
    fs-extra "^7.0.0"

+follow-redirects@1.5.10:
+  version "1.5.10"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a"
+  integrity sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==
+  dependencies:
+    debug "=3.1.0"
+
 form-data@^2.5.0:
  version "2.5.1"
  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.1.tgz#f2cbec57b5e59e23716e128fe44d4e5dd23895f4"
@@ -1217,7 +1237,7 @@ fs.realpath@^1.0.0:
  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=

-fsevents@~2.1.1:
+fsevents@~2.1.2:
  version "2.1.2"
  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.2.tgz#4c0a1fb34bc68e543b4b82a9ec392bfbda840805"
  integrity sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==
@@ -1232,11 +1252,6 @@ fstream@^1.0.12:
    mkdirp ">=0.5 0"
    rimraf "2"

-function-bind@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
-  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
-
 galactus@^0.2.1:
  version "0.2.1"
  resolved "https://registry.yarnpkg.com/galactus/-/galactus-0.2.1.tgz#cbed2d20a40c1f5679a35908e2b9415733e78db9"
@@ -1325,13 +1340,11 @@ global-tunnel-ng@^2.7.1:
    tunnel "^0.0.6"

 globalthis@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.0.tgz#c5fb98213a9b4595f59cf3e7074f141b4169daae"
-  integrity sha512-vcCAZTJ3r5Qcu5l8/2oyVdoFwxKgfYnMTR2vwWeux/NAVZK3PwcMaWkdUIn4GJbmKuRK7xcvDsLuK+CKcXyodg==
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.1.tgz#40116f5d9c071f9e8fb0037654df1ab3a83b7ef9"
+  integrity sha512-mJPRTc/P39NH/iNG4mXa9aIhNymaQikTrnspeCa2ZuJ+mH2QN/rXwtX3XwKrHqWgUQFbNZKtHM105aHzJalElw==
  dependencies:
-    define-properties "^1.1.2"
-    function-bind "^1.1.1"
-    object-keys "^1.0.12"
+    define-properties "^1.1.3"

 got@^6.7.1:
  version "6.7.1"
@@ -1748,17 +1761,17 @@ micromatch@^4.0.2:
    braces "^3.0.1"
    picomatch "^2.0.5"

-mime-db@1.42.0:
-  version "1.42.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.42.0.tgz#3e252907b4c7adb906597b4b65636272cf9e7bac"
-  integrity sha512-UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ==
+mime-db@1.43.0:
+  version "1.43.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz#0a12e0502650e473d735535050e7c8f4eb4fae58"
+  integrity sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==

 mime-types@^2.1.12, mime-types@~2.1.24:
-  version "2.1.25"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.25.tgz#39772d46621f93e2a80a856c53b86a62156a6437"
-  integrity sha512-5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg==
+  version "2.1.26"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz#9c921fc09b7e149a65dfdc0da4d20997200b0a06"
+  integrity sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==
  dependencies:
-    mime-db "1.42.0"
+    mime-db "1.43.0"

 mimic-fn@^2.1.0:
  version "2.1.0"
@@ -1933,9 +1946,9 @@ p-limit@^1.1.0:
    p-try "^1.0.0"

 p-limit@^2.0.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.1.tgz#aa07a788cc3151c939b5131f63570f0dd2009537"
-  integrity sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.2.tgz#61279b67721f5287aa1c13a9a7fbbc48c9291b1e"
+  integrity sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==
  dependencies:
    p-try "^2.0.0"

@@ -2038,10 +2051,10 @@ pend@~1.2.0:
  resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
  integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA=

-picomatch@^2.0.4, picomatch@^2.0.5:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.1.1.tgz#ecdfbea7704adb5fe6fb47f9866c4c0e15e905c5"
-  integrity sha512-OYMyqkKzK7blWO/+XZYP6w8hH0LDvkBvdvKukti+7kqYFCiEAk+gI3DWnryapc0Dau05ugGTy0foQ6mqn4AHYA==
+picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.0.7:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.1.tgz#21bac888b6ed8601f831ce7816e335bc779f0a4a"
+  integrity sha512-ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA==

 pify@^2.0.0:
  version "2.3.0"
@@ -2153,9 +2166,9 @@ read-pkg@^2.0.0:
    path-type "^2.0.0"

 readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.2.2, readable-stream@^2.3.6, readable-stream@~2.3.6:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
-  integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
+  version "2.3.7"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
+  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
  dependencies:
    core-util-is "~1.0.0"
    inherits "~2.0.3"
@@ -2166,20 +2179,20 @@ readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.5, readable
    util-deprecate "~1.0.1"

 readable-stream@^3.0.1, readable-stream@^3.0.2, readable-stream@^3.1.1, readable-stream@^3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.4.0.tgz#a51c26754658e0a3c21dbf59163bd45ba6f447fc"
-  integrity sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.5.0.tgz#465d70e6d1087f6162d079cd0b5db7fbebfd1606"
+  integrity sha512-gSz026xs2LfxBPudDuI41V1lka8cxg64E66SGe78zJlsUofOg/yqwezdIcdfwik6B4h8LFmWPA9ef9X3FiNFLA==
  dependencies:
    inherits "^2.0.3"
    string_decoder "^1.1.1"
    util-deprecate "^1.0.1"

-readdirp@~3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.2.0.tgz#c30c33352b12c96dfb4b895421a49fd5a9593839"
-  integrity sha512-crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==
+readdirp@~3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.3.0.tgz#984458d13a1e42e2e9f5841b129e162f369aff17"
+  integrity sha512-zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ==
  dependencies:
-    picomatch "^2.0.4"
+    picomatch "^2.0.7"

 registry-auth-token@^3.0.1:
  version "3.4.0"
@@ -2197,9 +2210,9 @@ registry-url@^3.0.3:
    rc "^1.0.1"

 resolve@^1.1.6, resolve@^1.10.0:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.13.1.tgz#be0aa4c06acd53083505abb35f4d66932ab35d16"
-  integrity sha512-CxqObCX8K8YtAhOBRg+lrcdn+LK+WYOS8tSjqSFbjtrI5PnS63QPhZl4+yKfrU9tdsbMu9Anr/amegT87M9Z6w==
+  version "1.15.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.0.tgz#1b7ca96073ebb52e741ffd799f6b39ea462c67f5"
+  integrity sha512-+hTmAldEGE80U2wJJDC1lebb5jWqvTYAfm3YZ1ckk1gBr0MnCqUKlwK1e+anaFljIl+F5tR5IoZcm4ZDA1zMQw==
  dependencies:
    path-parse "^1.0.6"

@@ -2436,10 +2449,10 @@ sprintf-js@^1.1.2:
  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
  integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==

-ssh2-sftp-client@4.3.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/ssh2-sftp-client/-/ssh2-sftp-client-4.3.1.tgz#73871750fa068c3f6b979d28b276c174566d6692"
-  integrity sha512-KAvu6EqIKCGoh9lKvH/WbFt8+vrXEq/WgcCQFBNuS9S4oyVkbZv1TtLkZ0ppaHkQteRDf1gGFh/HOT7FrO4DwQ==
+ssh2-sftp-client@5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/ssh2-sftp-client/-/ssh2-sftp-client-5.0.2.tgz#ab40e102e4deabc31182ba5c3f71d24417028b98"
+  integrity sha512-uQdeR9TOvuYsegswqTCDy0xEHjGiu570ERKL+s2ddDZzoqnk7du7o1kbDVXawcmvGRrbbpNKAUfAJKQ8HvbFsA==
  dependencies:
    concat-stream "^2.0.0"
    retry "^0.12.0"
@@ -2522,7 +2535,7 @@ sudo-prompt@9.1.1:
  resolved "https://registry.yarnpkg.com/sudo-prompt/-/sudo-prompt-9.1.1.tgz#73853d729770392caec029e2470db9c221754db0"
  integrity sha512-es33J1g2HjMpyAhz8lOR+ICmXXAqTuKbuXuUWLhOLew20oN9oUCgCJx615U/v7aioZg7IX5lIh9x34vwneu4pA==

-sumchecker@^3.0.0:
+sumchecker@^3.0.1:
  version "3.0.1"
  resolved "https://registry.yarnpkg.com/sumchecker/-/sumchecker-3.0.1.tgz#6377e996795abb0b6d348e9b3e1dfb24345a8e42"
  integrity sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==
@@ -2683,10 +2696,10 @@ unzip-response@^2.0.1:
  resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
  integrity sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=

-unzipper@^0.10.5:
-  version "0.10.5"
-  resolved "https://registry.yarnpkg.com/unzipper/-/unzipper-0.10.5.tgz#4d189ae6f8af634b26efe1a1817c399e0dd4a1a0"
-  integrity sha512-i5ufkXNjWZYxU/0nKKf6LkvW8kn9YzRvfwuPWjXP+JTFce/8bqeR0gEfbiN2IDdJa6ZU6/2IzFRLK0z1v0uptw==
+unzipper@0.10.7:
+  version "0.10.7"
+  resolved "https://registry.yarnpkg.com/unzipper/-/unzipper-0.10.7.tgz#ed5d72d12337f66f790d42fef47eb9f9de0a0906"
+  integrity sha512-0ltrg7/F12h3KqY1zBfZB6bVnPTVlzhdK1iu2xCaGxGMF/Es9ETMAS0M89CnCB4hemPb/AoTWtj+62l7XFZKqQ==
  dependencies:
    big-integer "^1.6.17"
    binary "~0.3.0"
@@ -2812,11 +2825,9 @@ ws@7.1.2:
    async-limiter "^1.0.0"

 ws@^7.1.2:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.2.0.tgz#422eda8c02a4b5dba7744ba66eebbd84bcef0ec7"
-  integrity sha512-+SqNqFbwTm/0DC18KYzIsMTnEWpLwJsiasW/O17la4iDRRIO9uaHbvKiAS3AHgTiuuWerK/brj4O6MYZkei9xg==
-  dependencies:
-    async-limiter "^1.0.0"
+  version "7.2.1"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.2.1.tgz#03ed52423cd744084b2cf42ed197c8b65a936b8e"
+  integrity sha512-sucePNSafamSKoOqoNfBd8V0StlkzJKL2ZAhGQinCfNQ+oacw+Pk7lcdAElecBF2VkLNZRiIb5Oi1Q5lVUVt2A==

 ws@~6.1.0:
  version "6.1.4"
@@ -2836,9 +2847,9 @@ xmlbuilder@^9.0.7:
  integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=

 xmldom@0.1.x:
-  version "0.1.27"
-  resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"
-  integrity sha1-1QH5ezvbQDr4757MIFcxh6rawOk=
+  version "0.1.31"
+  resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.31.tgz#b76c9a1bd9f0a9737e5a72dc37231cf38375e2ff"
+  integrity sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==

 xmlhttprequest-ssl@~1.5.4:
  version "1.5.5"
@@ -2858,7 +2869,7 @@ yargs-parser@^16.0.0:
    camelcase "^5.0.0"
    decamelize "^1.2.0"

-yarn@^1.21.1:
+yarn@1.21.1:
  version "1.21.1"
  resolved "https://registry.yarnpkg.com/yarn/-/yarn-1.21.1.tgz#1d5da01a9a03492dc4a5957befc1fd12da83d89c"
  integrity sha512-dQgmJv676X/NQczpbiDtc2hsE/pppGDJAzwlRiADMTvFzYbdxPj2WO4PcNyriSt2c4jsCMpt8UFRKHUozt21GQ==
@@ -2876,9 +2887,9 @@ yeast@0.1.2:
  integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk=

 zip-stream@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-2.1.2.tgz#841efd23214b602ff49c497cba1a85d8b5fbc39c"
-  integrity sha512-ykebHGa2+uzth/R4HZLkZh3XFJzivhVsjJt8bN3GvBzLaqqrUdRacu+c4QtnUgjkkQfsOuNE1JgLKMCPNmkKgg==
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-2.1.3.tgz#26cc4bdb93641a8590dd07112e1f77af1758865b"
+  integrity sha512-EkXc2JGcKhO5N5aZ7TmuNo45budRaFGHOmz24wtJR7znbNqDPmdZtUauKX6et8KAVseAMBOyWJqEpXcHTBsh7Q==
  dependencies:
    archiver-utils "^2.1.0"
    compress-commons "^2.1.1"