Merge branch 'main' of https://github.com/fhilipecrash/hydra

2025-02-09 03:37:45 +03:00 · 2024-04-11 22:01:33 -03:00 · 2024-04-11 22:01:33 -03:00 · 6d58243138
commit 6d58243138
parent 53f85503e2 3d78a852b5
9 changed files with 110 additions and 167 deletions
--- a/src/locales/en/translation.json
+++ b/src/locales/en/translation.json
@ -88,9 +88,6 @@
    "delete": "Remove all files"
  },
  "settings": {
-    "error_title_modal": "Error",
-    "error_modal_download": "Your selected folder does not have write permissions or does not exist, please check the folder in your \"Settings\" tab",
-    "error_description_modal": "The selected directory does not have write permissions or does not exist, please choose another folder",
    "downloads_path": "Downloads path",
    "change": "Update",
    "notifications": "Notifications",
--- a/src/locales/pt/translation.json
+++ b/src/locales/pt/translation.json
@ -88,9 +88,6 @@
    "delete": "Apagar arquivos"
  },
  "settings": {
-    "error_title_modal": "Erro",
-    "error_modal_download": "Você selecionou uma pasta que não tem permissão de escrita ou não existe, por favor verifique na área \"Configurações\"",
-    "error_description_modal": "O diretório selecionado não possui permissão de escrita ou não existe, favor selecione outra pasta",
    "downloads_path": "Diretório dos downloads",
    "change": "Mudar",
    "notifications": "Notificações",
--- a/src/main/events/catalogue/get-catalogue.ts
+++ b/src/main/events/catalogue/get-catalogue.ts
@ -1,9 +1,9 @@
-import { formatName, repackerFormatter } from "@main/helpers";
+import { formatName, getSteamAppAsset, repackerFormatter } from "@main/helpers";
 import { getTrendingGames } from "@main/services";
-import type { CatalogueCategory, CatalogueEntry } from "@types";
+import type { CatalogueCategory, CatalogueEntry, GameShop } from "@types";

 import { stateManager } from "@main/state-manager";
-import { searchGames } from "../helpers/search-games";
+import { searchGames, searchRepacks } from "../helpers/search-games";
 import { registerEvent } from "../register-event";

 const repacks = stateManager.getValue("repacks");
@ -12,14 +12,7 @@ const getCatalogue = async (
  _event: Electron.IpcMainInvokeEvent,
  category: CatalogueCategory
 ) => {
-  const trendingGames = await getTrendingGames();
-
-  let i = 0;
-  const results: CatalogueEntry[] = [];
-
  const getStringForLookup = (index: number) => {
-    if (category === "trending") return trendingGames[index];
-
    const repack = repacks[index];
    const formatter =
      repackerFormatter[repack.repacker as keyof typeof repackerFormatter];
@ -30,10 +23,56 @@ const getCatalogue = async (
  if (!repacks.length) return [];

  const resultSize = 12;
-  const requestSize = resultSize * 2;
-  let lookupRequest = [];
+  const requestSize = resultSize;

-  while (results.length < resultSize) {
+  if (category === "trending") {
+    return searchTrending(resultSize);
+  } else {
+    return searchRecentlyAdded(resultSize, requestSize, getStringForLookup);
+  }
+};
+
+const searchTrending = async (
+  resultSize: number
+): Promise<CatalogueEntry[]> => {
+  const results: CatalogueEntry[] = [];
+  const trendingGames = await getTrendingGames();
+  for (
+    let i = 0;
+    i < trendingGames.length && results.length < resultSize;
+    i++
+  ) {
+    if (!trendingGames[i]) continue;
+
+    const { title, objectID } = trendingGames[i];
+    const repacks = searchRepacks(title);
+
+    if (title && repacks.length) {
+      const catalogueEntry = {
+        objectID,
+        title,
+        shop: "steam" as GameShop,
+        cover: getSteamAppAsset("library", objectID),
+      };
+      repacks.sort(
+        (a, b) =>
+          new Date(a.updatedAt).getTime() - new Date(b.updatedAt).getTime()
+      );
+      results.push({ ...catalogueEntry, repacks });
+    }
+  }
+  return results;
+};
+
+const searchRecentlyAdded = async (
+  resultSize: number,
+  requestSize: number,
+  getStringForLookup: { (index: number): any; (arg0: any): any }
+): Promise<CatalogueEntry[]> => {
+  let lookupRequest = [];
+  const results: CatalogueEntry[] = [];
+
+  for (let i = 0; results.length < resultSize; i++) {
    const stringForLookup = getStringForLookup(i);

    if (!stringForLookup) {
@ -43,8 +82,6 @@ const getCatalogue = async (

    lookupRequest.push(searchGames(stringForLookup));

-    i++;
-
    if (lookupRequest.length < requestSize) {
      continue;
    }
--- a/src/main/events/torrenting/start-game-download.ts
+++ b/src/main/events/torrenting/start-game-download.ts
@ -8,9 +8,6 @@ import type { GameShop } from "@types";
 import { getDownloadsPath } from "../helpers/get-downloads-path";
 import { getImageBase64 } from "@main/helpers";
 import { In } from "typeorm";
-import validatePath from "./helpers/validate-path";
-import { dialog } from "electron";
-import { t } from "i18next";

 const startGameDownload = async (
  _event: Electron.IpcMainInvokeEvent,
@ -41,20 +38,6 @@ const startGameDownload = async (
  writePipe.write({ action: "pause" });

  const downloadsPath = game?.downloadPath ?? (await getDownloadsPath());
-  const error = validatePath(downloadsPath);
-  if (error) {
-    dialog.showErrorBox(
-      t("error_title_modal", {
-        ns: "settings",
-        lng: "en",
-      }),
-      `${t("error_modal_download", {
-        ns: "settings",
-        lng: "en",
-      })}${error instanceof Error ? "\n" + error.message : ""}`
-    );
-    return;
-  }

  await gameRepository.update(
    {
--- a/src/main/events/user-preferences/update-user-preferences.ts
+++ b/src/main/events/user-preferences/update-user-preferences.ts
@ -1,44 +1,19 @@
 import { userPreferencesRepository } from "@main/repository";
-import { registerEvent } from "./register-event";
-import { dialog } from "electron";
-import { t } from "i18next";
+import { registerEvent } from "../register-event";
+
 import type { UserPreferences } from "@types";
-import validatePath from "./helpers/validate-path";

 const updateUserPreferences = async (
  _event: Electron.IpcMainInvokeEvent,
  preferences: Partial<UserPreferences>
 ) => {
-  const payload = async () =>
-    await userPreferencesRepository.upsert(
-      {
-        id: 1,
-        ...preferences,
-      },
-      ["id"]
-    );
-
-  if (preferences.downloadsPath) {
-    const error = validatePath(preferences.downloadsPath);
-
-    if (!error) {
-      payload();
-      return true;
-    }
-    dialog.showErrorBox(
-      t("error_title_modal", {
-        ns: "settings",
-        lng: "en",
-      }),
-      `${t("error_description_modal", {
-        ns: "settings",
-        lng: "en",
-      })}${error instanceof Error ? "\n" + error.message : ""}`
-    );
-    return false;
-  }
-  payload();
-  return true;
+  await userPreferencesRepository.upsert(
+    {
+      id: 1,
+      ...preferences,
+    },
+    ["id"]
+  );
 };

 registerEvent(updateUserPreferences, {
--- a/src/main/services/steam-250.ts
+++ b/src/main/services/steam-250.ts
@ -19,7 +19,14 @@ export const getTrendingGames = async () => {
  const { document } = window;

  return Array.from(document.querySelectorAll(".appline .title a")).map(
-    ($title) => $title.textContent!
+    ($title: HTMLAnchorElement) => {
+      const steamGameUrld = $title.href;
+      if (!steamGameUrld) return null;
+      return {
+        title: $title.textContent,
+        objectID: steamGameUrld.split("/").pop(),
+      };
+    }
  );
 };

--- a/src/renderer/declaration.d.ts
+++ b/src/renderer/declaration.d.ts
@ -52,7 +52,7 @@ declare global {
    getUserPreferences: () => Promise<UserPreferences | null>;
    updateUserPreferences: (
      preferences: Partial<UserPreferences>
-    ) => Promise<boolean>;
+    ) => Promise<void>;

    /* Hardware */
    getDiskFreeSpace: () => Promise<DiskSpace>;
--- a/src/renderer/pages/settings/settings.tsx
+++ b/src/renderer/pages/settings/settings.tsx
@ -29,14 +29,15 @@ export function Settings() {
    });
  }, []);

-  const updateUserPreferences = async <T extends keyof UserPreferences>(
+  const updateUserPreferences = <T extends keyof UserPreferences>(
    field: T,
    value: UserPreferences[T]
  ) => {
-    const payload = await window.electron.updateUserPreferences({
+    setForm((prev) => ({ ...prev, [field]: value }));
+
+    window.electron.updateUserPreferences({
      [field]: value,
    });
-    setForm((prev) => (payload ? { ...prev, [field]: value } : prev));
  };

  const handleChooseDownloadsPath = async () => {
--- a/yarn.lock
+++ b/yarn.lock
@ -1582,12 +1582,12 @@

 "@esbuild/darwin-x64@0.19.12":
  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz#e37d9633246d52aecf491ee916ece709f9d5f4cd"
+  resolved "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz"
  integrity sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==

 "@esbuild/darwin-x64@0.20.2":
  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz#90ed098e1f9dd8a9381695b207e1cff45540a0d0"
+  resolved "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz"
  integrity sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==

 "@esbuild/freebsd-arm64@0.19.12":
@ -1752,13 +1752,13 @@

 "@esbuild/win32-x64@0.19.12":
  version "0.19.12"
-  resolved "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz"
-  integrity sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz#c57c8afbb4054a3ab8317591a0b7320360b444ae"
+  integrity sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==

-"@esbuild/darwin-x64@0.20.2":
+"@esbuild/win32-x64@0.20.2":
  version "0.20.2"
-  resolved "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz"
-  integrity sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz#9c907b21e30a52db959ba4f80bb01a0cc403d5cc"
+  integrity sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==

 "@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":
  version "4.4.0"
@ -1922,7 +1922,7 @@

 "@malept/cross-spawn-promise@^1.0.0":
  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz#504af200af6b98e198bce768bc1730c6936ae01d"
+  resolved "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz"
  integrity sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ==
  dependencies:
    cross-spawn "^7.0.1"
@ -2203,7 +2203,7 @@

 "@rollup/rollup-darwin-x64@4.14.0":
  version "4.14.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.14.0.tgz#8baf2fda277c9729125017c65651296282412886"
+  resolved "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.14.0.tgz"
  integrity sha512-LDyFB9GRolGN7XI6955aFeI3wCdCUszFWumWU0deHA8VpR3nWRrjG6GtGjBrQxQKFevnUTHKCfPR4IvrW3kCgQ==

 "@rollup/rollup-linux-arm-gnueabihf@4.14.0":
@ -2258,8 +2258,8 @@

 "@rollup/rollup-win32-x64-msvc@4.14.0":
  version "4.14.0"
-  resolved "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.14.0.tgz"
-  integrity sha512-LDyFB9GRolGN7XI6955aFeI3wCdCUszFWumWU0deHA8VpR3nWRrjG6GtGjBrQxQKFevnUTHKCfPR4IvrW3kCgQ==
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.14.0.tgz#0bb7ac3cd1c3292db1f39afdabfd03ccea3a3d34"
+  integrity sha512-aGg7iToJjdklmxlUlJh/PaPNa4PmqHfyRMLunbL3eaMO0gp656+q1zOKkpJ/CVe9CryJv6tAN1HDoR8cNGzkag==

 "@sindresorhus/is@^4.0.0":
  version "4.6.0"
@ -2384,7 +2384,7 @@

 "@swc/core-darwin-x64@1.4.12":
  version "1.4.12"
-  resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.4.12.tgz#77a2125679948f320e6038b6d62a477a3fa0e37b"
+  resolved "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.4.12.tgz"
  integrity sha512-Wkk8rq1RwCOgg5ybTlfVtOYXLZATZ+QjgiBNM7pIn03A5/zZicokNTYd8L26/mifly2e74Dz34tlIZBT4aTGDA==

 "@swc/core-linux-arm-gnueabihf@1.4.12":
@ -2424,8 +2424,8 @@

 "@swc/core-win32-x64-msvc@1.4.12":
  version "1.4.12"
-  resolved "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.4.12.tgz"
-  integrity sha512-Wkk8rq1RwCOgg5ybTlfVtOYXLZATZ+QjgiBNM7pIn03A5/zZicokNTYd8L26/mifly2e74Dz34tlIZBT4aTGDA==
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.4.12.tgz#50e313d906b8c3d107a7639ea6fbf8156e82c894"
+  integrity sha512-3A4qMtddBDbtprV5edTB/SgJn9L+X5TL7RGgS3eWtEgn/NG8gA80X/scjf1v2MMeOsrcxiYhnemI2gXCKuQN2g==

 "@swc/core@^1.3.107":
  version "1.4.12"
@ -2618,14 +2618,14 @@

 "@types/fs-extra@^9.0.1":
  version "9.0.13"
-  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.13.tgz#7594fbae04fe7f1918ce8b3d213f74ff44ac1f45"
+  resolved "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.13.tgz"
  integrity sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==
  dependencies:
    "@types/node" "*"

 "@types/glob@^7.1.1":
  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb"
+  resolved "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz"
  integrity sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==
  dependencies:
    "@types/minimatch" "*"
@ -3527,7 +3527,7 @@ asap@^2.0.0:

 asar@^3.0.0:
  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/asar/-/asar-3.2.0.tgz#e6edb5edd6f627ebef04db62f771c61bea9c1221"
+  resolved "https://registry.npmjs.org/asar/-/asar-3.2.0.tgz"
  integrity sha512-COdw2ZQvKdFGFxXwX3oYh2/sOsJWJegrdJCGxnN4MZ7IULgRBp9P6665aqj9z1v9VwP4oP1hRBojRDQ//IGgAg==
  dependencies:
    chromium-pickle-js "^0.2.0"
@ -3968,7 +3968,7 @@ chrome-trace-event@^1.0.2, chrome-trace-event@^1.0.3:

 chromium-pickle-js@^0.2.0:
  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz#04a106672c18b085ab774d983dfa3ea138f22205"
+  resolved "https://registry.npmjs.org/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz"
  integrity sha512-1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw==

 classnames@^2.5.1:
@ -4075,7 +4075,6 @@ clone@^1.0.2:
  resolved "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz"
  integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==

-color-convert@^1.9.0, color-convert@^1.9.3:
 color-convert@^1.9.0, color-convert@^1.9.3:
  version "1.9.3"
  resolved "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"
@ -4751,7 +4750,7 @@ ee-first@1.1.1:

 electron-installer-common@^0.10.2:
  version "0.10.3"
-  resolved "https://registry.yarnpkg.com/electron-installer-common/-/electron-installer-common-0.10.3.tgz#40f9db644ca60eb28673d545b67ee0113aef4444"
+  resolved "https://registry.npmjs.org/electron-installer-common/-/electron-installer-common-0.10.3.tgz"
  integrity sha512-mYbP+6i+nHMIm0WZHXgGdmmXMe+KXncl6jZYQNcCF9C1WsNA9C5SZ2VP4TLQMSIoFO+X4ugkMEA5uld1bmyEvA==
  dependencies:
    "@malept/cross-spawn-promise" "^1.0.0"
@ -4768,7 +4767,7 @@ electron-installer-common@^0.10.2:

 electron-installer-debian@^3.2.0:
  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/electron-installer-debian/-/electron-installer-debian-3.2.0.tgz#2a9c8220f50a57807de8f93619a0d61ec41271e0"
+  resolved "https://registry.npmjs.org/electron-installer-debian/-/electron-installer-debian-3.2.0.tgz"
  integrity sha512-58ZrlJ1HQY80VucsEIG9tQ//HrTlG6sfofA3nRGr6TmkX661uJyu4cMPPh6kXW+aHdq/7+q25KyQhDrXvRL7jw==
  dependencies:
    "@malept/cross-spawn-promise" "^1.0.0"
@ -4782,7 +4781,7 @@ electron-installer-debian@^3.2.0:

 electron-installer-redhat@^3.2.0:
  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/electron-installer-redhat/-/electron-installer-redhat-3.4.0.tgz#4a7f8d67b48b7d5b23bd1eb074f4b684ae43b192"
+  resolved "https://registry.npmjs.org/electron-installer-redhat/-/electron-installer-redhat-3.4.0.tgz"
  integrity sha512-gEISr3U32Sgtj+fjxUAlSDo3wyGGq6OBx7rF5UdpIgbnpUvMN4W5uYb0ThpnAZ42VEJh/3aODQXHbFS4f5J3Iw==
  dependencies:
    "@malept/cross-spawn-promise" "^1.0.0"
@ -5169,7 +5168,6 @@ escape-html@~1.0.3:
  resolved "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"
  integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==

-escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
 escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
  version "1.0.5"
  resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
@ -5371,16 +5369,7 @@ espree@^7.3.0, espree@^7.3.1:
    acorn-jsx "^5.3.1"
    eslint-visitor-keys "^1.3.0"

-espree@^9.6.0:
-  version "9.6.1"
-  resolved "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz"
-  integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
-  dependencies:
-    acorn "^8.9.0"
-    acorn-jsx "^5.3.2"
-    eslint-visitor-keys "^3.4.1"
-
-espree@^9.6.1:
+espree@^9.6.0, espree@^9.6.1:
  version "9.6.1"
  resolved "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz"
  integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
@ -5868,7 +5857,7 @@ fs.realpath@^1.0.0:

 fsevents@~2.3.2, fsevents@~2.3.3:
  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
+  resolved "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz"
  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==

 function-bind@^1.1.2:
@ -5907,7 +5896,7 @@ galactus@^1.0.0:

 gar@^1.0.4:
  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/gar/-/gar-1.0.4.tgz#f777bc7db425c0572fdeb52676172ca1ae9888b8"
+  resolved "https://registry.npmjs.org/gar/-/gar-1.0.4.tgz"
  integrity sha512-w4n9cPWyP7aHxKxYHFQMegj7WIAsL/YX/C4Bs5Rr8s1H9M1rNtRWRsw+ovYMkXDQ5S4ZbYHsHAPmevPjPgw44w==

 gauge@^3.0.0:
@ -5951,7 +5940,7 @@ get-caller-file@^2.0.5:

 get-folder-size@^2.0.1:
  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/get-folder-size/-/get-folder-size-2.0.1.tgz#3fe0524dd3bad05257ef1311331417bcd020a497"
+  resolved "https://registry.npmjs.org/get-folder-size/-/get-folder-size-2.0.1.tgz"
  integrity sha512-+CEb+GDCM7tkOS2wdMKTn9vU7DgnKUTuDlehkNJKNSovdCOVxs14OfKCk4cvSaR3za4gj+OBdl9opPN9xrJ0zA==
  dependencies:
    gar "^1.0.4"
@ -6030,7 +6019,6 @@ github-url-to-object@^4.0.4:
  dependencies:
    is-url "^1.1.0"

-glob-parent@^5.1.2, glob-parent@~5.1.2:
 glob-parent@^5.1.2, glob-parent@~5.1.2:
  version "5.1.2"
  resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"
@ -6121,7 +6109,6 @@ globals@^11.1.0:
  resolved "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz"
  integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==

-globals@^13.19.0, globals@^13.6.0, globals@^13.9.0:
 globals@^13.19.0, globals@^13.6.0, globals@^13.9.0:
  version "13.24.0"
  resolved "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz"
@ -7200,7 +7187,6 @@ lodash.truncate@^4.4.2:
  resolved "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz"
  integrity sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==

-lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4:
 lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4:
  version "4.17.21"
  resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"
@ -8236,7 +8222,7 @@ path-key@^2.0.0, path-key@^2.0.1:
  resolved "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz"
  integrity sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==

-path-key@^3.1.0:
+path-key@^3.0.0, path-key@^3.1.0:
  version "3.1.1"
  resolved "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz"
  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
@ -9464,16 +9450,7 @@ statuses@2.0.1:
  resolved "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz"
  integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==

-"string-width-cjs@npm:string-width@^4.2.0":
-  version "4.2.3"
-  resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
-"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
  version "4.2.3"
  resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@ -9551,14 +9528,7 @@ string_decoder@~1.1.1:
  dependencies:
    safe-buffer "~5.1.0"

-"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
-  version "6.0.1"
-  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
  version "6.0.1"
  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@ -9799,19 +9769,19 @@ thunky@^1.0.2:

 tiny-each-async@2.0.3:
  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/tiny-each-async/-/tiny-each-async-2.0.3.tgz#8ebbbfd6d6295f1370003fbb37162afe5a0a51d1"
+  resolved "https://registry.npmjs.org/tiny-each-async/-/tiny-each-async-2.0.3.tgz"
  integrity sha512-5ROII7nElnAirvFn8g7H7MtpfV1daMcyfTGQwsn/x2VtyV+VPiO5CjReCJtWLvoKTDEDmZocf3cNPraiMnBXLA==

 tmp-promise@^3.0.2:
  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-3.0.3.tgz#60a1a1cc98c988674fcbfd23b6e3367bdeac4ce7"
+  resolved "https://registry.npmjs.org/tmp-promise/-/tmp-promise-3.0.3.tgz"
  integrity sha512-RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ==
  dependencies:
    tmp "^0.2.0"

 tmp@^0.2.0:
  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.3.tgz#eb783cc22bc1e8bebd0671476d46ea4eb32a79ae"
+  resolved "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz"
  integrity sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==

 to-fast-properties@^2.0.0:
@ -10052,7 +10022,7 @@ typescript@^5.4.3:
  resolved "https://registry.npmjs.org/typescript/-/typescript-5.4.4.tgz"
  integrity sha512-dGE2Vv8cpVvw28v8HCPqyb08EzbBURxDpuhJvTrusShUfGnhHBafDsLdS1EhhxyL6BJQE+2cT3dDPAv+MQ6oLw==

-"typescript@>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta", typescript@~4.2.4:
+typescript@~4.2.4:
  version "4.2.4"
  resolved "https://registry.npmjs.org/typescript/-/typescript-4.2.4.tgz"
  integrity sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg==
@ -10398,7 +10368,7 @@ webpack-sources@^3.2.3:
  resolved "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz"
  integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==

-webpack@^5.69.1:
+webpack@^5, webpack@^5.69.1:
  version "5.91.0"
  resolved "https://registry.npmjs.org/webpack/-/webpack-5.91.0.tgz"
  integrity sha512-rzVwlLeBWHJbmgTC/8TvAcu5vpJNII+MelQpylD4jNERPwpBJOE2lEcko1zJX3QJeLjTTAnQxn/OJ8bjDzVQaw==
@ -10586,10 +10556,10 @@ winston@^3.12.0:

 word-wrap@^1.2.3:
  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
+  resolved "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz"
  integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==

-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
  version "7.0.0"
  resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"
  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@ -10607,15 +10577,6 @@ wrap-ansi@^6.2.0:
    string-width "^4.1.0"
    strip-ansi "^6.0.0"

-wrap-ansi@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
 wrap-ansi@^8.1.0:
  version "8.1.0"
  resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz"
@ -10635,7 +10596,6 @@ ws@^7.4.6:
  resolved "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz"
  integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==

-ws@^8.13.0, ws@^8.16.0:
 ws@^8.13.0, ws@^8.16.0:
  version "8.16.0"
  resolved "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz"
@ -10701,7 +10661,6 @@ yargs-parser@^21.1.1:
  resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz"
  integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==

-yargs@^16.0.0, yargs@^16.0.2:
 yargs@^16.0.0, yargs@^16.0.2:
  version "16.2.0"
  resolved "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz"
@ -10715,20 +10674,7 @@ yargs@^16.0.0, yargs@^16.0.2:
    y18n "^5.0.5"
    yargs-parser "^20.2.2"

-yargs@^17.0.1:
-  version "17.7.2"
-  resolved "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz"
-  integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
-  dependencies:
-    cliui "^8.0.1"
-    escalade "^3.1.1"
-    get-caller-file "^2.0.5"
-    require-directory "^2.1.1"
-    string-width "^4.2.3"
-    y18n "^5.0.5"
-    yargs-parser "^21.1.1"
-
-yargs@^17.6.2:
+yargs@^17.0.1, yargs@^17.6.2:
  version "17.7.2"
  resolved "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz"
  integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==