π Upscayl - #1 Free and Open Source AI Image Upscaler for Linux, MacOS and Windows.
TypeScript aielectronesrgangigapixelgigapixel-imagesimageimage-upscalingtopazupscaleupscalerimageupscayl
Fix macos builds
Nayam Amarshee610e7b8a921
diff --git a/electron/commands/custom-models-select.ts b/electron/commands/custom-models-select.tsindex 0f9ad48..01ed980 100644--- a/electron/commands/custom-models-select.ts+++ b/electron/commands/custom-models-select.ts@@ -8,7 +8,7 @@ import slash from "../utils/slash";import COMMAND from "../constants/commands";import getModels from "../utils/get-models";import { getMainWindow } from "../main-window";-import { settings } from "../utils/settings";+import settings from "electron-settings";const customModelsSelect = async (event, message) => {const mainWindow = getMainWindow();@@ -23,11 +23,12 @@ const customModelsSelect = async (event, message) => {title: "Select Custom Models Folder",defaultPath: customModelsFolderPath,securityScopedBookmarks: true,+ message: "Select Custom Models Folder that is named 'models'",});if (bookmarks && bookmarks.length > 0) {- logit("π Bookmarks: ", bookmarks);- settings.set("custom-models-bookmarks", bookmarks[0]);+ console.log("π¨ Setting Bookmark: ", bookmarks);+ await settings.set("custom-models-bookmarks", bookmarks[0]);}if (canceled) {@@ -52,10 +53,8 @@ const customModelsSelect = async (event, message) => {return null;}- mainWindow.webContents.send(- COMMAND.CUSTOM_MODEL_FILES_LIST,- getModels(customModelsFolderPath)- );+ const models = await getModels(customModelsFolderPath);+ mainWindow.webContents.send(COMMAND.CUSTOM_MODEL_FILES_LIST, models);logit("π Custom Folder Path: ", customModelsFolderPath);return customModelsFolderPath;diff --git a/electron/commands/get-models-list.ts b/electron/commands/get-models-list.tsindex 420e855..e174a14 100644--- a/electron/commands/get-models-list.ts+++ b/electron/commands/get-models-list.ts@@ -15,11 +15,9 @@ const getModelsList = async (event, payload) => {setCustomModelsFolderPath(payload);logit("π Custom Models Folder Path: ", customModelsFolderPath);+ const models = await getModels(payload);- mainWindow.webContents.send(- COMMAND.CUSTOM_MODEL_FILES_LIST,- getModels(payload)- );+ mainWindow.webContents.send(COMMAND.CUSTOM_MODEL_FILES_LIST, models);}};diff --git a/electron/commands/select-file.ts b/electron/commands/select-file.tsindex 9cb0026..71caff1 100644--- a/electron/commands/select-file.ts+++ b/electron/commands/select-file.ts@@ -1,21 +1,37 @@-import { MessageBoxOptions, dialog } from "electron";+import { MessageBoxOptions, app, dialog } from "electron";import { getMainWindow } from "../main-window";import { imagePath, setImagePath } from "../utils/config-variables";import logit from "../utils/logit";-import { settings } from "../utils/settings";+import settings from "electron-settings";const selectFile = async () => {const mainWindow = getMainWindow();const { canceled, filePaths, bookmarks } = await dialog.showOpenDialog({- properties: ["openFile", "multiSelections"],+ properties: ["openFile"],title: "Select Image",defaultPath: imagePath,securityScopedBookmarks: true,+ message: "Select Image to Upscale",+ filters: [+ {+ name: "Images",+ extensions: [+ "png",+ "jpg",+ "jpeg",+ "webp",+ "PNG",+ "JPG",+ "JPEG",+ "WEBP",+ ],+ },+ ],});if (bookmarks && bookmarks.length > 0) {- logit("π Bookmarks: ", bookmarks);+ console.log("π¨ Setting Bookmark: ", bookmarks);settings.set("file-bookmarks", bookmarks[0]);}diff --git a/electron/commands/select-folder.ts b/electron/commands/select-folder.tsindex 31c243c..2796820 100644--- a/electron/commands/select-folder.ts+++ b/electron/commands/select-folder.ts@@ -1,9 +1,22 @@-import { dialog } from "electron";+import { app, dialog } from "electron";import { folderPath, setFolderPath } from "../utils/config-variables";import logit from "../utils/logit";-import { settings } from "../utils/settings";+import settings from "electron-settings";const selectFolder = async (event, message) => {+ let closeAccess;+ const folderBookmarks = await settings.get("folder-bookmarks");+ if (folderBookmarks) {+ logit("π¨ Folder Bookmarks: ", folderBookmarks);+ try {+ closeAccess = app.startAccessingSecurityScopedResource(+ folderBookmarks as string+ );+ } catch (error) {+ logit("π Folder Bookmarks Error: ", error);+ }+ }+const {canceled,filePaths: folderPaths,@@ -15,8 +28,8 @@ const selectFolder = async (event, message) => {});if (bookmarks && bookmarks.length > 0) {- logit("π Bookmarks: ", bookmarks);- settings.set("folder-bookmarks", bookmarks[0]);+ console.log("π¨ Setting folder Bookmark: ", bookmarks);+ await settings.set("folder-bookmarks", bookmarks[0]);}if (canceled) {diff --git a/electron/index.ts b/electron/index.tsindex 9bc95a7..e9d170e 100644--- a/electron/index.ts+++ b/electron/index.ts@@ -19,7 +19,7 @@ import doubleUpscayl from "./commands/double-upscayl";import autoUpdate from "./commands/auto-update";import sharp from "sharp";import { featureFlags } from "../common/feature-flags";-import { settings } from "./utils/settings";+import settings from "electron-settings";// INITIALIZATIONlog.initialize({ preload: true });@@ -45,21 +45,17 @@ app.on("ready", async () => {log.info("π UPSCAYL EXEC PATH: ", execPath("bin"));log.info("π MODELS PATH: ", modelsPath);- // SECURITY SCOPED BOOKMARKS- const fileBookmarks = settings.get("file-bookmarks", true);- const folderBookmarks = settings.get("folder-bookmarks", true);- const customModelsBookmarks = settings.get("custom-models-bookmarks", true);- if (fileBookmarks) {- log.info("π File Bookmarks: ", fileBookmarks);- app.startAccessingSecurityScopedResource(fileBookmarks);- }+ let closeAccess;+ const folderBookmarks = await settings.get("folder-bookmarks");if (folderBookmarks) {- log.info("π Folder Bookmarks: ", folderBookmarks);- app.startAccessingSecurityScopedResource(folderBookmarks);- }- if (customModelsBookmarks) {- log.info("π Custom Models Bookmarks: ", customModelsBookmarks);- app.startAccessingSecurityScopedResource(customModelsBookmarks);+ logit("π¨ Folder Bookmarks: ", folderBookmarks);+ try {+ closeAccess = app.startAccessingSecurityScopedResource(+ folderBookmarks as string+ );+ } catch (error) {+ logit("π Folder Bookmarks Error: ", error);+ }}});diff --git a/electron/utils/get-models.ts b/electron/utils/get-models.tsindex b0fa04e..69f017e 100644--- a/electron/utils/get-models.ts+++ b/electron/utils/get-models.ts@@ -1,11 +1,29 @@import fs from "fs";import logit from "./logit";-import { MessageBoxOptions, dialog } from "electron";+import { MessageBoxOptions, app, dialog } from "electron";+import settings from "electron-settings";-const getModels = (folderPath: string | undefined) => {+const getModels = async (folderPath: string | undefined) => {let models: string[] = [];let isValid = false;+ // SECURITY SCOPED BOOKMARKS+ let closeAccess;+ const customModelsBookmarks = await settings.get("custom-models-bookmarks");+ if (customModelsBookmarks) {+ console.log(+ "π => file: get-models.ts:18 => customModelsBookmarks:",+ customModelsBookmarks+ );+ try {+ closeAccess = app.startAccessingSecurityScopedResource(+ customModelsBookmarks as string+ );+ } catch (error) {+ logit("π Custom Models Bookmarks Error: ", error);+ }+ }+if (!folderPath) {logit("β Invalid Custom Model Folder Detected");const options: MessageBoxOptions = {diff --git a/electron/utils/settings.ts b/electron/utils/local-storage.tssimilarity index 90%rename from electron/utils/settings.tsrename to electron/utils/local-storage.tsindex b0299f1..160be42 100644--- a/electron/utils/settings.ts+++ b/electron/utils/local-storage.ts@@ -11,8 +11,8 @@ import { getMainWindow } from "../main-window";* // Set a value* settings.set("key", value);*/-export const settings = {- get: (key: string, parse: boolean = false): any => {+export const localStorage = {+ get: <T>(key: string, parse: boolean = false): T | null => {const mainWindow = getMainWindow();if (!mainWindow) return null;let result = null;diff --git a/package-lock.json b/package-lock.jsonindex 2313531..9d098e0 100644--- a/package-lock.json+++ b/package-lock.json@@ -13,6 +13,7 @@"electron-is-dev": "^2.0.0","electron-log": "^5.0.0-beta.16","electron-next": "^3.1.5",+ "electron-settings": "^4.0.2","electron-updater": "^6.1.4","firebase": "^10.3.0","jotai": "^2.2.2",@@ -565,7 +566,6 @@"version": "2.0.2","resolved": "https://registry.npmjs.org/@electron/get/-/get-2.0.2.tgz","integrity": "sha512-eFZVFoRXb3GFGd7Ak7W4+6jBl9wBtiZ4AaYOse97ej6mKj5tkyO0dUnUChs1IhJZtx1BENo4/p4WUTXpi6vT+g==",- "dev": true,"dependencies": {"debug": "^4.1.1","env-paths": "^2.2.0",@@ -1863,7 +1863,6 @@"version": "4.6.0","resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz","integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==",- "dev": true,"engines": {"node": ">=10"},@@ -1884,7 +1883,6 @@"version": "4.0.6","resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz","integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==",- "dev": true,"dependencies": {"defer-to-connect": "^2.0.0"},@@ -1905,7 +1903,6 @@"version": "6.0.3","resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.3.tgz","integrity": "sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==",- "dev": true,"dependencies": {"@types/http-cache-semantics": "*","@types/keyv": "^3.1.4",@@ -1934,14 +1931,12 @@"node_modules/@types/http-cache-semantics": {"version": "4.0.1","resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz",- "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==",- "dev": true+ "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ=="},"node_modules/@types/keyv": {"version": "3.1.4","resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz","integrity": "sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==",- "dev": true,"dependencies": {"@types/node": "*"}@@ -2009,7 +2004,6 @@"version": "1.0.0","resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz","integrity": "sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==",- "dev": true,"dependencies": {"@types/node": "*"}@@ -2030,7 +2024,6 @@"version": "2.10.0","resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz","integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==",- "dev": true,"optional": true,"dependencies": {"@types/node": "*"@@ -2428,7 +2421,6 @@"version": "3.2.0","resolved": "https://registry.npmjs.org/boolean/-/boolean-3.2.0.tgz","integrity": "sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==",- "dev": true,"optional": true},"node_modules/brace-expansion": {@@ -2509,7 +2501,6 @@"version": "0.2.13","resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz","integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",- "dev": true,"engines": {"node": "*"}@@ -2619,7 +2610,6 @@"version": "5.0.4","resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz","integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==",- "dev": true,"engines": {"node": ">=10.6.0"}@@ -2628,7 +2618,6 @@"version": "7.0.2","resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.2.tgz","integrity": "sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==",- "dev": true,"dependencies": {"clone-response": "^1.0.2","get-stream": "^5.1.0",@@ -2805,7 +2794,6 @@"version": "1.0.3","resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz","integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==",- "dev": true,"dependencies": {"mimic-response": "^1.0.0"},@@ -3069,7 +3057,6 @@"version": "2.0.1","resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz","integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==",- "dev": true,"engines": {"node": ">=10"}@@ -3078,7 +3065,6 @@"version": "1.2.0","resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz","integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==",- "dev": true,"optional": true,"dependencies": {"has-property-descriptors": "^1.0.0",@@ -3112,7 +3098,6 @@"version": "2.1.0","resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz","integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",- "dev": true,"optional": true},"node_modules/didyoumean": {@@ -3258,7 +3243,6 @@"version": "27.0.2","resolved": "https://registry.npmjs.org/electron/-/electron-27.0.2.tgz","integrity": "sha512-4fbcHQ40ZDlqhr5Pamm+M5BF7ry2lGqjFTWTJ/mrBwuiPWu6xhV/RWgUhKBaLqKNfAaNl3eMxV3Jc82gv6JauQ==",- "dev": true,"hasInstallScript": true,"dependencies": {"@electron/get": "^2.0.0",@@ -3409,6 +3393,22 @@"node": ">= 10.0.0"}},+ "node_modules/electron-settings": {+ "version": "4.0.2",+ "resolved": "https://registry.npmjs.org/electron-settings/-/electron-settings-4.0.2.tgz",+ "integrity": "sha512-WnUlrnBsO784oXcag0ym+A3ySoIwonz5GhYFsWroMHVzslzmsP+81f/Fof41T9UrRUxuPPKiZPZMwGO+yvWChg==",+ "dependencies": {+ "lodash.get": "^4.4.2",+ "lodash.has": "^4.5.2",+ "lodash.set": "^4.3.2",+ "lodash.unset": "^4.5.2",+ "mkdirp": "^1.0.4",+ "write-file-atomic": "^3.0.3"+ },+ "peerDependencies": {+ "electron": ">= 2"+ }+ },"node_modules/electron-to-chromium": {"version": "1.4.567","resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.567.tgz",@@ -3502,7 +3502,6 @@"version": "2.2.1","resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz","integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",- "dev": true,"engines": {"node": ">=6"}@@ -3525,7 +3524,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": {@@ -3556,7 +3554,6 @@"version": "2.0.1","resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz","integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",- "dev": true,"dependencies": {"debug": "^4.1.1","get-stream": "^5.1.0",@@ -3654,7 +3651,6 @@"version": "1.1.0","resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz","integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",- "dev": true,"dependencies": {"pend": "~1.2.0"}@@ -3774,7 +3770,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",@@ -3855,7 +3850,6 @@"version": "1.2.0","resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz","integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==",- "dev": true,"optional": true,"dependencies": {"function-bind": "^1.1.1",@@ -3870,7 +3864,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"},@@ -3927,7 +3920,6 @@"version": "3.0.0","resolved": "https://registry.npmjs.org/global-agent/-/global-agent-3.0.0.tgz","integrity": "sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==",- "dev": true,"optional": true,"dependencies": {"boolean": "^3.0.1",@@ -3945,7 +3937,6 @@"version": "7.5.4","resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz","integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",- "dev": true,"optional": true,"dependencies": {"lru-cache": "^6.0.0"@@ -3970,7 +3961,6 @@"version": "1.0.3","resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz","integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",- "dev": true,"optional": true,"dependencies": {"define-properties": "^1.1.3"@@ -3986,7 +3976,6 @@"version": "11.8.6","resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz","integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==",- "dev": true,"dependencies": {"@sindresorhus/is": "^4.0.0","@szmarczak/http-timer": "^4.0.5",@@ -4016,7 +4005,6 @@"version": "1.0.3","resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz","integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",- "dev": true,"optional": true,"dependencies": {"function-bind": "^1.1.1"@@ -4038,7 +4026,6 @@"version": "1.0.0","resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz","integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",- "dev": true,"optional": true,"dependencies": {"get-intrinsic": "^1.1.1"@@ -4051,7 +4038,6 @@"version": "1.0.3","resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz","integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",- "dev": true,"optional": true,"engines": {"node": ">= 0.4"@@ -4094,8 +4080,7 @@"node_modules/http-cache-semantics": {"version": "4.1.1","resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",- "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==",- "dev": true+ "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ=="},"node_modules/http-parser-js": {"version": "0.5.8",@@ -4120,7 +4105,6 @@"version": "1.0.3","resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz","integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==",- "dev": true,"dependencies": {"quick-lru": "^5.1.1","resolve-alpn": "^1.0.0"@@ -4210,6 +4194,14 @@"url": "https://github.com/sponsors/sindresorhus"}},+ "node_modules/imurmurhash": {+ "version": "0.1.4",+ "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",+ "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",+ "engines": {+ "node": ">=0.8.19"+ }+ },"node_modules/inflight": {"version": "1.0.6","resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",@@ -4303,6 +4295,11 @@"node": ">=0.12.0"}},+ "node_modules/is-typedarray": {+ "version": "1.0.0",+ "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",+ "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="+ },"node_modules/isbinaryfile": {"version": "5.0.0","resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-5.0.0.tgz",@@ -4394,8 +4391,7 @@"node_modules/json-buffer": {"version": "3.0.1","resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",- "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",- "dev": true+ "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ=="},"node_modules/json-parse-even-better-errors": {"version": "2.3.1",@@ -4412,7 +4408,6 @@"version": "5.0.1","resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz","integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",- "dev": true,"optional": true},"node_modules/json5": {@@ -4430,7 +4425,6 @@"version": "4.0.0","resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz","integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",- "dev": true,"optionalDependencies": {"graceful-fs": "^4.1.6"}@@ -4439,7 +4433,6 @@"version": "4.5.2","resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.2.tgz","integrity": "sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g==",- "dev": true,"dependencies": {"json-buffer": "3.0.1"}@@ -4478,11 +4471,31 @@"resolved": "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz","integrity": "sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw=="},+ "node_modules/lodash.get": {+ "version": "4.4.2",+ "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",+ "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ=="+ },+ "node_modules/lodash.has": {+ "version": "4.5.2",+ "resolved": "https://registry.npmjs.org/lodash.has/-/lodash.has-4.5.2.tgz",+ "integrity": "sha512-rnYUdIo6xRCJnQmbVFEwcxF144erlD+M3YcJUVesflU9paQaE8p+fJDcIQrlMYbxoANFL+AB9hZrzSBBk5PL+g=="+ },"node_modules/lodash.isequal": {"version": "4.5.0","resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz","integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ=="},+ "node_modules/lodash.set": {+ "version": "4.3.2",+ "resolved": "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz",+ "integrity": "sha512-4hNPN5jlm/N/HLMCO43v8BXKq9Z7QdAGc/VGrRD61w8gN9g/6jF9A4L1pbUgBLCffi0w9VsXfTOij5x8iTyFvg=="+ },+ "node_modules/lodash.unset": {+ "version": "4.5.2",+ "resolved": "https://registry.npmjs.org/lodash.unset/-/lodash.unset-4.5.2.tgz",+ "integrity": "sha512-bwKX88k2JhCV9D1vtE8+naDKlLiGrSmf8zi/Y9ivFHwbmRfA8RxS/aVJ+sIht2XOwqoNr4xUPUkGZpc1sHFEKg=="+ },"node_modules/long": {"version": "5.2.3","resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz",@@ -4503,7 +4516,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"}@@ -4523,7 +4535,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"@@ -4536,7 +4547,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"@@ -4607,7 +4617,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"}@@ -4669,7 +4678,6 @@"version": "1.0.4","resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz","integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",- "dev": true,"bin": {"mkdirp": "bin/cmd.js"},@@ -4823,7 +4831,6 @@"version": "6.1.0","resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz","integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",- "dev": true,"engines": {"node": ">=10"},@@ -4851,7 +4858,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"@@ -4869,7 +4875,6 @@"version": "2.1.1","resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz","integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==",- "dev": true,"engines": {"node": ">=8"}@@ -4935,8 +4940,7 @@"node_modules/pend": {"version": "1.2.0","resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",- "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",- "dev": true+ "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg=="},"node_modules/picocolors": {"version": "1.0.0",@@ -5265,7 +5269,6 @@"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"}@@ -5362,7 +5365,6 @@"version": "5.1.1","resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz","integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",- "dev": true,"engines": {"node": ">=10"},@@ -5559,8 +5561,7 @@"node_modules/resolve-alpn": {"version": "1.2.1","resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz",- "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==",- "dev": true+ "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g=="},"node_modules/resolve-from": {"version": "4.0.0",@@ -5574,7 +5575,6 @@"version": "2.0.1","resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz","integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==",- "dev": true,"dependencies": {"lowercase-keys": "^2.0.0"},@@ -5619,7 +5619,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",@@ -5714,14 +5713,12 @@"version": "1.0.0","resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz","integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==",- "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"@@ -5795,6 +5792,11 @@"node": ">=8"}},+ "node_modules/signal-exit": {+ "version": "3.0.7",+ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",+ "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="+ },"node_modules/simple-concat": {"version": "1.0.1","resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",@@ -5943,7 +5945,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/stat-mode": {@@ -6106,7 +6107,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"},@@ -6374,7 +6374,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"@@ -6383,6 +6382,14 @@"url": "https://github.com/sponsors/sindresorhus"}},+ "node_modules/typedarray-to-buffer": {+ "version": "3.1.5",+ "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",+ "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",+ "dependencies": {+ "is-typedarray": "^1.0.0"+ }+ },"node_modules/typescript": {"version": "4.8.4","resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz",@@ -6400,7 +6407,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"}@@ -6566,6 +6572,17 @@"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz","integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="},+ "node_modules/write-file-atomic": {+ "version": "3.0.3",+ "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",+ "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",+ "dependencies": {+ "imurmurhash": "^0.1.4",+ "is-typedarray": "^1.0.0",+ "signal-exit": "^3.0.2",+ "typedarray-to-buffer": "^3.1.5"+ }+ },"node_modules/xmlbuilder": {"version": "15.1.1","resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz",@@ -6625,7 +6642,6 @@"version": "2.10.0","resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz","integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",- "dev": true,"dependencies": {"buffer-crc32": "~0.2.3","fd-slicer": "~1.1.0"@@ -7029,7 +7045,6 @@"version": "2.0.2","resolved": "https://registry.npmjs.org/@electron/get/-/get-2.0.2.tgz","integrity": "sha512-eFZVFoRXb3GFGd7Ak7W4+6jBl9wBtiZ4AaYOse97ej6mKj5tkyO0dUnUChs1IhJZtx1BENo4/p4WUTXpi6vT+g==",- "dev": true,"requires": {"debug": "^4.1.1","env-paths": "^2.2.0",@@ -8012,8 +8027,7 @@"@sindresorhus/is": {"version": "4.6.0","resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz",- "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==",- "dev": true+ "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw=="},"@swc/helpers": {"version": "0.5.2",@@ -8028,7 +8042,6 @@"version": "4.0.6","resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz","integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==",- "dev": true,"requires": {"defer-to-connect": "^2.0.0"}@@ -8043,7 +8056,6 @@"version": "6.0.3","resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.3.tgz","integrity": "sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==",- "dev": true,"requires": {"@types/http-cache-semantics": "*","@types/keyv": "^3.1.4",@@ -8072,14 +8084,12 @@"@types/http-cache-semantics": {"version": "4.0.1","resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz",- "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==",- "dev": true+ "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ=="},"@types/keyv": {"version": "3.1.4","resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz","integrity": "sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==",- "dev": true,"requires": {"@types/node": "*"}@@ -8147,7 +8157,6 @@"version": "1.0.0","resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz","integrity": "sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==",- "dev": true,"requires": {"@types/node": "*"}@@ -8168,7 +8177,6 @@"version": "2.10.0","resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz","integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==",- "dev": true,"optional": true,"requires": {"@types/node": "*"@@ -8465,7 +8473,6 @@"version": "3.2.0","resolved": "https://registry.npmjs.org/boolean/-/boolean-3.2.0.tgz","integrity": "sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==",- "dev": true,"optional": true},"brace-expansion": {@@ -8508,8 +8515,7 @@"buffer-crc32": {"version": "0.2.13","resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",- "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",- "dev": true+ "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ=="},"buffer-equal": {"version": "1.0.1",@@ -8597,14 +8603,12 @@"cacheable-lookup": {"version": "5.0.4","resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz",- "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==",- "dev": true+ "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA=="},"cacheable-request": {"version": "7.0.2","resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.2.tgz","integrity": "sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==",- "dev": true,"requires": {"clone-response": "^1.0.2","get-stream": "^5.1.0",@@ -8719,7 +8723,6 @@"version": "1.0.3","resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz","integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==",- "dev": true,"requires": {"mimic-response": "^1.0.0"}@@ -8915,14 +8918,12 @@"defer-to-connect": {"version": "2.0.1","resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",- "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==",- "dev": true+ "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg=="},"define-properties": {"version": "1.2.0","resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz","integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==",- "dev": true,"optional": true,"requires": {"has-property-descriptors": "^1.0.0",@@ -8944,7 +8945,6 @@"version": "2.1.0","resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz","integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",- "dev": true,"optional": true},"didyoumean": {@@ -9061,7 +9061,6 @@"version": "27.0.2","resolved": "https://registry.npmjs.org/electron/-/electron-27.0.2.tgz","integrity": "sha512-4fbcHQ40ZDlqhr5Pamm+M5BF7ry2lGqjFTWTJ/mrBwuiPWu6xhV/RWgUhKBaLqKNfAaNl3eMxV3Jc82gv6JauQ==",- "dev": true,"requires": {"@electron/get": "^2.0.0","@types/node": "^18.11.18",@@ -9179,6 +9178,19 @@}}},+ "electron-settings": {+ "version": "4.0.2",+ "resolved": "https://registry.npmjs.org/electron-settings/-/electron-settings-4.0.2.tgz",+ "integrity": "sha512-WnUlrnBsO784oXcag0ym+A3ySoIwonz5GhYFsWroMHVzslzmsP+81f/Fof41T9UrRUxuPPKiZPZMwGO+yvWChg==",+ "requires": {+ "lodash.get": "^4.4.2",+ "lodash.has": "^4.5.2",+ "lodash.set": "^4.3.2",+ "lodash.unset": "^4.5.2",+ "mkdirp": "^1.0.4",+ "write-file-atomic": "^3.0.3"+ }+ },"electron-to-chromium": {"version": "1.4.567","resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.567.tgz",@@ -9259,8 +9271,7 @@"env-paths": {"version": "2.2.1","resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",- "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",- "dev": true+ "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A=="},"err-code": {"version": "2.0.3",@@ -9280,7 +9291,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": {@@ -9302,7 +9312,6 @@"version": "2.0.1","resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz","integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",- "dev": true,"requires": {"@types/yauzl": "^2.9.1","debug": "^4.1.1",@@ -9382,7 +9391,6 @@"version": "1.1.0","resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz","integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",- "dev": true,"requires": {"pend": "~1.2.0"}@@ -9488,7 +9496,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",@@ -9546,7 +9553,6 @@"version": "1.2.0","resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz","integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==",- "dev": true,"optional": true,"requires": {"function-bind": "^1.1.1",@@ -9558,7 +9564,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"}@@ -9600,7 +9605,6 @@"version": "3.0.0","resolved": "https://registry.npmjs.org/global-agent/-/global-agent-3.0.0.tgz","integrity": "sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==",- "dev": true,"optional": true,"requires": {"boolean": "^3.0.1",@@ -9615,7 +9619,6 @@"version": "7.5.4","resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz","integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",- "dev": true,"optional": true,"requires": {"lru-cache": "^6.0.0"@@ -9633,7 +9636,6 @@"version": "1.0.3","resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz","integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",- "dev": true,"optional": true,"requires": {"define-properties": "^1.1.3"@@ -9643,7 +9645,6 @@"version": "11.8.6","resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz","integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==",- "dev": true,"requires": {"@sindresorhus/is": "^4.0.0","@szmarczak/http-timer": "^4.0.5",@@ -9667,7 +9668,6 @@"version": "1.0.3","resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz","integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",- "dev": true,"optional": true,"requires": {"function-bind": "^1.1.1"@@ -9683,7 +9683,6 @@"version": "1.0.0","resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz","integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",- "dev": true,"optional": true,"requires": {"get-intrinsic": "^1.1.1"@@ -9693,7 +9692,6 @@"version": "1.0.3","resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz","integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",- "dev": true,"optional": true},"hasown": {@@ -9724,8 +9722,7 @@"http-cache-semantics": {"version": "4.1.1","resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",- "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==",- "dev": true+ "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ=="},"http-parser-js": {"version": "0.5.8",@@ -9747,7 +9744,6 @@"version": "1.0.3","resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz","integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==",- "dev": true,"requires": {"quick-lru": "^5.1.1","resolve-alpn": "^1.0.0"@@ -9802,6 +9798,11 @@"resolve-from": "^4.0.0"}},+ "imurmurhash": {+ "version": "0.1.4",+ "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",+ "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="+ },"inflight": {"version": "1.0.6","resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",@@ -9874,6 +9875,11 @@"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz","integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="},+ "is-typedarray": {+ "version": "1.0.0",+ "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",+ "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="+ },"isbinaryfile": {"version": "5.0.0","resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-5.0.0.tgz",@@ -9931,8 +9937,7 @@"json-buffer": {"version": "3.0.1","resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",- "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",- "dev": true+ "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ=="},"json-parse-even-better-errors": {"version": "2.3.1",@@ -9949,7 +9954,6 @@"version": "5.0.1","resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz","integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",- "dev": true,"optional": true},"json5": {@@ -9961,7 +9965,6 @@"version": "4.0.0","resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz","integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",- "dev": true,"requires": {"graceful-fs": "^4.1.6"}@@ -9970,7 +9973,6 @@"version": "4.5.2","resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.2.tgz","integrity": "sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g==",- "dev": true,"requires": {"json-buffer": "3.0.1"}@@ -10006,11 +10008,31 @@"resolved": "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz","integrity": "sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw=="},+ "lodash.get": {+ "version": "4.4.2",+ "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",+ "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ=="+ },+ "lodash.has": {+ "version": "4.5.2",+ "resolved": "https://registry.npmjs.org/lodash.has/-/lodash.has-4.5.2.tgz",+ "integrity": "sha512-rnYUdIo6xRCJnQmbVFEwcxF144erlD+M3YcJUVesflU9paQaE8p+fJDcIQrlMYbxoANFL+AB9hZrzSBBk5PL+g=="+ },"lodash.isequal": {"version": "4.5.0","resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz","integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ=="},+ "lodash.set": {+ "version": "4.3.2",+ "resolved": "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz",+ "integrity": "sha512-4hNPN5jlm/N/HLMCO43v8BXKq9Z7QdAGc/VGrRD61w8gN9g/6jF9A4L1pbUgBLCffi0w9VsXfTOij5x8iTyFvg=="+ },+ "lodash.unset": {+ "version": "4.5.2",+ "resolved": "https://registry.npmjs.org/lodash.unset/-/lodash.unset-4.5.2.tgz",+ "integrity": "sha512-bwKX88k2JhCV9D1vtE8+naDKlLiGrSmf8zi/Y9ivFHwbmRfA8RxS/aVJ+sIht2XOwqoNr4xUPUkGZpc1sHFEKg=="+ },"long": {"version": "5.2.3","resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz",@@ -10027,8 +10049,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=="},"lru-cache": {"version": "6.0.0",@@ -10042,7 +10063,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"@@ -10052,7 +10072,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}}@@ -10100,8 +10119,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.1.2",@@ -10146,8 +10164,7 @@"mkdirp": {"version": "1.0.4","resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",- "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",- "dev": true+ "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="},"mkdirp-classic": {"version": "0.5.3",@@ -10247,8 +10264,7 @@"normalize-url": {"version": "6.1.0","resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",- "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",- "dev": true+ "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A=="},"object-assign": {"version": "4.1.1",@@ -10264,7 +10280,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},"once": {@@ -10278,8 +10293,7 @@"p-cancelable": {"version": "2.1.1","resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",- "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==",- "dev": true+ "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg=="},"parent-module": {"version": "1.0.1",@@ -10324,8 +10338,7 @@"pend": {"version": "1.2.0","resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",- "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",- "dev": true+ "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg=="},"picocolors": {"version": "1.0.0",@@ -10489,8 +10502,7 @@"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=="},"promise-retry": {"version": "2.0.1",@@ -10559,8 +10571,7 @@"quick-lru": {"version": "5.1.1","resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",- "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",- "dev": true+ "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA=="},"rc": {"version": "1.2.8",@@ -10708,8 +10719,7 @@"resolve-alpn": {"version": "1.2.1","resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz",- "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==",- "dev": true+ "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g=="},"resolve-from": {"version": "4.0.0",@@ -10720,7 +10730,6 @@"version": "2.0.1","resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz","integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==",- "dev": true,"requires": {"lowercase-keys": "^2.0.0"}@@ -10749,7 +10758,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",@@ -10810,14 +10818,12 @@"version": "1.0.0","resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz","integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==",- "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"@@ -10868,6 +10874,11 @@"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==","dev": true},+ "signal-exit": {+ "version": "3.0.7",+ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",+ "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="+ },"simple-concat": {"version": "1.0.1","resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",@@ -10969,7 +10980,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},"stat-mode": {@@ -11086,7 +11096,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"}@@ -11306,9 +11315,16 @@"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-to-buffer": {+ "version": "3.1.5",+ "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",+ "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",+ "requires": {+ "is-typedarray": "^1.0.0"+ }+ },"typescript": {"version": "4.8.4","resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz",@@ -11318,8 +11334,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=="},"update-browserslist-db": {"version": "1.0.13",@@ -11431,6 +11446,17 @@"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz","integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="},+ "write-file-atomic": {+ "version": "3.0.3",+ "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",+ "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",+ "requires": {+ "imurmurhash": "^0.1.4",+ "is-typedarray": "^1.0.0",+ "signal-exit": "^3.0.2",+ "typedarray-to-buffer": "^3.1.5"+ }+ },"xmlbuilder": {"version": "15.1.1","resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz",@@ -11475,7 +11501,6 @@"version": "2.10.0","resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz","integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",- "dev": true,"requires": {"buffer-crc32": "~0.2.3","fd-slicer": "~1.1.0"diff --git a/package.json b/package.jsonindex d76cc19..f6b3d4a 100644--- a/package.json+++ b/package.json@@ -225,6 +225,7 @@"electron-is-dev": "^2.0.0","electron-log": "^5.0.0-beta.16","electron-next": "^3.1.5",+ "electron-settings": "^4.0.2","electron-updater": "^6.1.4","firebase": "^10.3.0","jotai": "^2.2.2",diff --git a/renderer/atoms/userSettingsAtom.ts b/renderer/atoms/userSettingsAtom.tsindex 44655c7..23bf328 100644--- a/renderer/atoms/userSettingsAtom.ts+++ b/renderer/atoms/userSettingsAtom.ts@@ -5,10 +5,10 @@ export const customModelsPathAtom = atomWithStorage<string | null>("customModelsPath",null);-export const scaleAtom = atomWithStorage<"2" | "3" | "4">("scale", "4");-export const batchModeAtom = atom<boolean>(false);+export const outputPathAtom = atom<string | null>("");+export const progressAtom = atom<string>("");export const rememberOutputFolderAtom = atomWithStorage<boolean>("rememberOutputFolder",diff --git a/renderer/components/settings-tab/SaveOutputFolderToggle.tsx b/renderer/components/settings-tab/SaveOutputFolderToggle.tsxindex d2aac7f..0c76040 100644--- a/renderer/components/settings-tab/SaveOutputFolderToggle.tsx+++ b/renderer/components/settings-tab/SaveOutputFolderToggle.tsx@@ -17,7 +17,7 @@ export function SaveOutputFolderToggle({</p><inputtype="checkbox"- className="toggle-primary toggle"+ className="toggle"checked={rememberOutputFolder}onClick={() => {setRememberOutputFolder((oldValue) => {diff --git a/renderer/components/upscayl-tab/config/LeftPaneImageSteps.tsx b/renderer/components/upscayl-tab/config/LeftPaneImageSteps.tsxindex e15763a..24f5be6 100644--- a/renderer/components/upscayl-tab/config/LeftPaneImageSteps.tsx+++ b/renderer/components/upscayl-tab/config/LeftPaneImageSteps.tsx@@ -1,4 +1,4 @@-import { useAtomValue } from "jotai";+import { useAtom, useAtomValue } from "jotai";import React, { useCallback, useEffect, useMemo, useState } from "react";import Select from "react-select";import { Tooltip } from "react-tooltip";@@ -7,12 +7,13 @@ import { modelsListAtom } from "../../../atoms/modelsListAtom";import useLog from "../../hooks/useLog";import {noImageProcessingAtom,+ outputPathAtom,+ progressAtom,scaleAtom,} from "../../../atoms/userSettingsAtom";import { featureFlags } from "@common/feature-flags";interface IProps {- progress: string;selectImageHandler: () => Promise<void>;selectFolderHandler: () => Promise<void>;handleModelChange: (e: any) => void;@@ -21,7 +22,6 @@ interface IProps {batchMode: boolean;setBatchMode: React.Dispatch<React.SetStateAction<boolean>>;imagePath: string;- outputPath: string;doubleUpscayl: boolean;setDoubleUpscayl: React.Dispatch<React.SetStateAction<boolean>>;dimensions: {@@ -35,7 +35,6 @@ interface IProps {}function LeftPaneImageSteps({- progress,selectImageHandler,selectFolderHandler,handleModelChange,@@ -44,7 +43,6 @@ function LeftPaneImageSteps({batchMode,setBatchMode,imagePath,- outputPath,doubleUpscayl,setDoubleUpscayl,dimensions,@@ -64,6 +62,8 @@ function LeftPaneImageSteps({const modelOptions = useAtomValue(modelsListAtom);const scale = useAtomValue(scaleAtom);const noImageProcessing = useAtomValue(noImageProcessingAtom);+ const [outputPath, setOutputPath] = useAtom(outputPathAtom);+ const [progress, setProgress] = useAtom(progressAtom);const { logit } = useLog();@@ -162,7 +162,11 @@ function LeftPaneImageSteps({type="checkbox"className="toggle"defaultChecked={batchMode}- onClick={() => setBatchMode((oldValue) => !oldValue)}></input>+ onClick={() => {+ setOutputPath("");+ setProgress("");+ setBatchMode((oldValue) => !oldValue);+ }}></input><pclassName="mr-1 inline-block cursor-help text-sm"data-tooltip-id="tooltip"@@ -182,7 +186,7 @@ function LeftPaneImageSteps({</div>{/* STEP 2 */}- <div className="animate-step-in">+ <div className="animate-step-in group"><p className="step-heading">Step 2</p><p className="mb-2 text-sm">Select Model</p>@@ -196,7 +200,7 @@ function LeftPaneImageSteps({handleModelChange(e);setCurrentModel({ label: e.label, value: e.value });}}- className="react-select-container active:w-full focus:w-full hover:w-full transition-all"+ className="react-select-container group-active:w-full focus:w-full group-hover:w-full transition-all"classNamePrefix="react-select"value={currentModel}/>@@ -239,9 +243,9 @@ function LeftPaneImageSteps({data-tooltip-id="tooltip"><div className="step-heading flex items-center gap-2"><span>Step 3</span>- {!outputPath && (+ {!outputPath && featureFlags.APP_STORE_BUILD && (<div className="text-xs">- <span className="bg-error font-medium uppercase text-error-content rounded-btn px-2">+ <span className="bg-base-200 font-medium uppercase text-base-content/50 rounded-btn px-2">Not selected</span></div>@@ -274,8 +278,11 @@ function LeftPaneImageSteps({)}<buttonclassName="btn-accent btn"- onClick={upscaylHandler}- disabled={progress.length > 0 || !outputPath}>+ onClick={+ progress.length > 0 || !outputPath+ ? () => alert("Please select an output folder first")+ : upscaylHandler+ }>{progress.length > 0 ? "Upscaylingβ³" : "Upscayl"}</button></div>diff --git a/renderer/pages/index.tsx b/renderer/pages/index.tsxindex 3ef8e82..e9db93d 100644--- a/renderer/pages/index.tsx+++ b/renderer/pages/index.tsx@@ -16,6 +16,8 @@ import { modelsListAtom } from "../atoms/modelsListAtom";import {batchModeAtom,dontShowCloudModalAtom,+ outputPathAtom,+ progressAtom,scaleAtom,} from "../atoms/userSettingsAtom";import useLog from "../components/hooks/useLog";@@ -27,9 +29,9 @@ const Home = () => {const [os, setOs] = useState<"linux" | "mac" | "win" | undefined>(undefined);const [imagePath, SetImagePath] = useState("");const [upscaledImagePath, setUpscaledImagePath] = useState("");- const [outputPath, setOutputPath] = useState("");+ const [outputPath, setOutputPath] = useAtom(outputPathAtom);const [scaleFactor] = useState(4);- const [progress, setProgress] = useState("");+ const [progress, setProgress] = useAtom(progressAtom);const [model, setModel] = useState("realesrgan-x4plus");const [loaded, setLoaded] = useState(false);const [version, setVersion] = useState("");@@ -77,7 +79,7 @@ const Home = () => {if (batchMode) return;alert(data.includes("encode")- ? "ENCODING ERROR => "+ ? `ENCODING ERROR: ${data}`: "DECODING ERROR => " +"This image is possibly corrupt or not supported by Upscayl, or your GPU drivers are acting funny (Did you check if your GPU is compatible and drivers are alright?). You could try converting the image into another format and upscaling again. Also make sure that the output path is correct and you have the proper write permissions for the directory. If not, then unfortuantely there's not much we can do to help, sorry.");@@ -175,6 +177,8 @@ const Home = () => {// CUSTOM FOLDER LISTENERwindow.electron.on(COMMAND.CUSTOM_MODEL_FILES_LIST, (_, data: string[]) => {+ console.log("π => file: index.tsx:178 => data:", data);+logit(`π CUSTOM_MODEL_FILES_LIST: `, data);const newModelOptions = data.map((model) => {return {@@ -182,7 +186,10 @@ const Home = () => {label: model,};});-+ console.log(+ "π => file: index.tsx:185 => newModelOptions:",+ newModelOptions+ );// Add newModelsList to modelOptions and remove duplicatesconst combinedModelOptions = [...modelOptions, ...newModelOptions];const uniqueModelOptions = combinedModelOptions.filter(@@ -190,8 +197,13 @@ const Home = () => {(model, index, array) =>array.findIndex((t) => t.value === model.value) === index);+ console.log(+ "π => file: index.tsx:197 => uniqueModelOptions:",+ uniqueModelOptions+ );setModelOptions(uniqueModelOptions);});+if (!localStorage.getItem("upscaylCloudModalShown")) {logit("βοΈ upscayl cloud show to true");localStorage.setItem("upscaylCloudModalShown", "true");@@ -210,10 +222,15 @@ const Home = () => {}}, []);+ // CHECK IF OUTPUT FOLDER IS REMEMBEREDuseEffect(() => {const rememberOutputFolder = localStorage.getItem("rememberOutputFolder");- const lastOutputFolderPath = localStorage.getItem("lastOutputFolderPath");+ console.log(+ "π => file: index.tsx:226 => rememberOutputFolder:",+ rememberOutputFolder+ );+ const lastOutputFolderPath = localStorage.getItem("lastOutputFolderPath");// GET OVERWRITEif (!localStorage.getItem("overwrite")) {localStorage.setItem("overwrite", JSON.stringify(overwrite));@@ -223,8 +240,8 @@ const Home = () => {setOverwrite(currentlySavedOverwrite === "true");}}-if (rememberOutputFolder === "true") {+ logit("π§ Recalling Output Folder: ", lastOutputFolderPath);setOutputPath(lastOutputFolderPath);} else {setOutputPath("");@@ -232,11 +249,6 @@ const Home = () => {}}, []);- useEffect(() => {- setProgress("");- setOutputPath("");- }, [batchMode]);-useEffect(() => {if (imagePath.length > 0) {logit("πΌ imagePath: ", imagePath);@@ -523,7 +535,6 @@ const Home = () => {{selectedTab === 0 && (<LeftPaneImageSteps- progress={progress}selectImageHandler={selectImageHandler}selectFolderHandler={selectFolderHandler}handleModelChange={handleModelChange}@@ -532,7 +543,6 @@ const Home = () => {batchMode={batchMode}setBatchMode={setBatchMode}imagePath={imagePath}- outputPath={outputPath}doubleUpscayl={doubleUpscayl}setDoubleUpscayl={setDoubleUpscayl}dimensions={dimensions}