From 7d2fe37d62b3a093c0a702b7929a56b705d9b7db Mon Sep 17 00:00:00 2001 From: Marcin S Date: Thu, 9 Dec 2021 15:21:10 -0600 Subject: [PATCH 01/29] Implement logout and setup auto re-login --- package-lock.json | 1 + package.json | 1 + src/mysky.ts | 126 +++++++++++++++++++++++++++++++++++++++------- 3 files changed, 110 insertions(+), 18 deletions(-) diff --git a/package-lock.json b/package-lock.json index 355a8e1f..8cab8322 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,6 +9,7 @@ "version": "0.4.0", "license": "MIT", "dependencies": { + "axios": "^0.24.0", "buffer": "^6.0.3", "confusables": "^1.0.0", "crypto-browserify": "^3.12.0", diff --git a/package.json b/package.json index 5833696a..b511af93 100644 --- a/package.json +++ b/package.json @@ -43,6 +43,7 @@ "testEnvironment": "jsdom" }, "dependencies": { + "axios": "^0.24.0", "buffer": "^6.0.3", "confusables": "^1.0.0", "crypto-browserify": "^3.12.0", diff --git a/src/mysky.ts b/src/mysky.ts index 6344371c..f091dc8f 100644 --- a/src/mysky.ts +++ b/src/mysky.ts @@ -1,3 +1,4 @@ +import { AxiosResponse } from "axios"; import type { Connection } from "post-me"; import { ChildHandshake, WindowMessenger } from "post-me"; import { @@ -8,13 +9,16 @@ import { SkynetClient, PUBLIC_KEY_LENGTH, PRIVATE_KEY_LENGTH, + RequestConfig, + ExecuteRequestError, + JsonData, } from "skynet-js"; import { CheckPermissionsResponse, PermCategory, Permission, PermType } from "skynet-mysky-utils"; import { sign } from "tweetnacl"; import { genKeyPairFromSeed, hashWithSalt, sha512 } from "./crypto"; import { deriveEncryptedPathSeedForRoot, ENCRYPTION_ROOT_PATH_SEED_BYTES_LENGTH } from "./encrypted_files"; -import { logout } from "./portal-account"; +import { login, logout } from "./portal-account"; import { launchPermissionsProvider } from "./provider"; import { SEED_LENGTH } from "./seed"; import { fromHexString, log, readablePermission } from "./util"; @@ -97,24 +101,38 @@ export class MySky { } // Check for stored seed in localstorage. - const seed = checkStoredSeed(); + let email = null; + let portal = null; + if (seed) { + const userSettings = await getUserSettings(seed); + + // TODO: Check for stored portal and email in user settings. + if (userSettings) { + email = (userSettings.email as string) || null; + portal = (userSettings.portal as string) || null; + } + } + // Initialize the Skynet client. + const client = new SkynetClient(portal || undefined); - const client = new SkynetClient(); + if (seed) { + // Set up auto-relogin if the email was found. + if (email) { + setupAutoRelogin(client, seed, email); + } + } // Get the referrer. - const referrerDomain = await client.extractDomain(document.referrer); // Create MySky object. - log("Calling new MySky()"); const mySky = new MySky(client, referrerDomain, seed); // Set up the storage event listener. - mySky.setUpStorageEventListener(); return mySky; @@ -191,24 +209,45 @@ export class MySky { return deriveEncryptedPathSeedForRoot(rootPathSeedBytes, path, isDirectory); } - // TODO + // TODO: Logout from all tabs. /** * Logs out of MySky. */ async logout(): Promise { - // Clear the stored seed. + const errors = []; - clearStoredSeed(); + // Check if user is logged in. + const seed = checkStoredSeed(); + + if (seed) { + // Clear the stored seed. + clearStoredSeed(); + } else { + errors.push(new Error("MySky user is already logged out")); + } // Clear the JWT cookie. + // + // NOTE: We do this even if we could not find a seed above. The local + // storage might have been cleared with the JWT token still being active. + // + // NOTE: This will not auto-login on an expired JWT just to logout again. + try { + await logout(this.client); + } catch (e) { + errors.push(e); + } - // TODO: When auto re-login is implemented, this should not auto-login on an - // expired JWT just to logout again. - await logout(this.client); + // TODO: Restore original `executeRequest` on logout. + + // Throw all encountered errors. + if (errors.length > 0) { + throw new Error(`Error${errors.length > 1 ? "s" : ""} logging out: ${errors}`); + } } /** - * signs the given data using the MySky user's private key. This method can be + * Signs the given data using the MySky user's private key. This method can be * used for MySky user verification as the signature may be verified against * the user's public key, which is the MySky user id. * @@ -216,7 +255,7 @@ export class MySky { * verifies an original message against the signature and the user's public * key * - * NOTE: this function (internally) adds a salt to the given data array to + * NOTE: This function (internally) adds a salt to the given data array to * ensure there's no potential overlap with anything else, like registry * entries. * @@ -325,8 +364,11 @@ export class MySky { // ================ /** - * Set up a listener for the storage event. If the seed is set in the UI, it - * should trigger a load of the permissions provider. + * Set up a listener for the storage event. + * + * If the seed is set in the UI, it should trigger a load of the permissions + * provider. If the email is set, it should set up automatic re-login on JWT + * cookie expiry. */ setUpStorageEventListener(): void { window.addEventListener("storage", ({ key, newValue }: StorageEvent) => { @@ -364,7 +406,8 @@ export class MySky { // users can move across browsers etc. localStorage.removeItem(EMAIL_STORAGE_KEY); - // TODO: Set up auto-login. + // Set up auto re-login on JWT expiry. + setupAutoRelogin(this.client, seed, email); } }); } @@ -413,6 +456,42 @@ export class MySky { } } +// ======= +// Helpers +// ======= + +// TODO: Restore original executeRequest on logout. +/** + * Sets up auto re-login. It modifies the client's `executeRequest` method to + * check if the request failed with 401 Unauthorized Response. If so, it will + * try to login and make the request again. + * + * NOTE: If the request was a portal account logout, we will not login again + * just to logout. We also will not throw an error on 401, instead returning + * silently. There is no way for the client to know whether the cookie is set + * ahead of time, and an error would not be actionable. + * + * @param client - The Skynet client. + * @param seed - The user seed. + * @param email - The user email. + */ +function setupAutoRelogin(client: SkynetClient, seed: Uint8Array, email: string): void { + const executeRequest = client.executeRequest; + client.executeRequest = async function (config: RequestConfig): Promise { + try { + return await executeRequest(config); + } catch (e) { + if ((e as ExecuteRequestError).responseStatus === 401) { + // Try logging in again. + await login(this, seed, email); + return await executeRequest(config); + } else { + throw e; + } + } + }; +} + /** * Checks for seed stored in local storage from previous sessions. * @@ -449,7 +528,7 @@ export function checkStoredSeed(): Uint8Array | null { } /** - * + * Clears the stored seed from local storage. */ export function clearStoredSeed(): void { log("Entered clearStoredSeed"); @@ -461,3 +540,14 @@ export function clearStoredSeed(): void { localStorage.removeItem(SEED_STORAGE_KEY); } + +// TODO +/** + * Gets the user settings stored in the root of the MySky domain. + * + * @param _seed - The user seed. + * @returns - The user settings if found. + */ +async function getUserSettings(_seed: Uint8Array): Promise { + return null; +} From 6a03865e7d1d61dd63971923a362bd79fa4f9335 Mon Sep 17 00:00:00 2001 From: Marcin S Date: Thu, 9 Dec 2021 16:05:36 -0600 Subject: [PATCH 02/29] Fix up loose ends for logout and auto re-login --- src/mysky.ts | 122 ++++++++++++++++++++++++++---------------- src/portal-account.ts | 11 +++- 2 files changed, 84 insertions(+), 49 deletions(-) diff --git a/src/mysky.ts b/src/mysky.ts index f091dc8f..2e924607 100644 --- a/src/mysky.ts +++ b/src/mysky.ts @@ -52,16 +52,30 @@ export class PermissionsProvider { } } +/** + * The MySky object containing the parent connection and permissions provider. + * + * @property client - The associated SkynetClient. + * @property referrerDomain - The domain of the parent skapp. + * @property originalExecuteRequest - If this is set, it means we modified the `executeRequest` method on the client. This will contain the original `executeRequest` so it can be restored. + * @property parentConnection - The handshake connection with the parent window. + * @property permissionsProvider - The permissions provider, if it has been loaded. + */ export class MySky { + protected originalExecuteRequest: ((config: RequestConfig) => Promise) | null = null; protected parentConnection: Promise; protected permissionsProvider: Promise | null = null; - protected jwt: Promise | null = null; // ============ // Constructors // ============ - constructor(protected client: SkynetClient, protected referrerDomain: string, seed: Uint8Array | null) { + constructor( + protected client: SkynetClient, + protected referrerDomain: string, + seed: Uint8Array | null, + email: string | null + ) { // Set child methods. const methods = { @@ -91,6 +105,13 @@ export class MySky { if (seed) { this.permissionsProvider = launchPermissionsProvider(seed); } + + if (seed) { + // Set up auto-relogin if the email was found. + if (email) { + this.setupAutoRelogin(seed, email); + } + } } static async initialize(): Promise { @@ -118,19 +139,12 @@ export class MySky { // Initialize the Skynet client. const client = new SkynetClient(portal || undefined); - if (seed) { - // Set up auto-relogin if the email was found. - if (email) { - setupAutoRelogin(client, seed, email); - } - } - // Get the referrer. const referrerDomain = await client.extractDomain(document.referrer); // Create MySky object. log("Calling new MySky()"); - const mySky = new MySky(client, referrerDomain, seed); + const mySky = new MySky(client, referrerDomain, seed, email); // Set up the storage event listener. mySky.setUpStorageEventListener(); @@ -231,14 +245,21 @@ export class MySky { // NOTE: We do this even if we could not find a seed above. The local // storage might have been cleared with the JWT token still being active. // - // NOTE: This will not auto-login on an expired JWT just to logout again. + // NOTE: This will not auto-login on an expired JWT just to logout again. If + // we get a 401 error, we just return silently without throwing. try { - await logout(this.client); + await logout(this.client, { executeRequest: this.originalExecuteRequest || undefined }); } catch (e) { - errors.push(e); + if ((e as ExecuteRequestError).responseStatus !== 401) { + errors.push(e); + } } - // TODO: Restore original `executeRequest` on logout. + // Restore original `executeRequest` on logout. + if (this.originalExecuteRequest) { + this.client.executeRequest = this.originalExecuteRequest; + this.originalExecuteRequest = null; + } // Throw all encountered errors. if (errors.length > 0) { @@ -363,6 +384,45 @@ export class MySky { // Internal Methods // ================ + /** + * Sets up auto re-login. It modifies the client's `executeRequest` method to + * check if the request failed with `401 Unauthorized Response`. If so, it + * will try to login and make the request again. + * + * NOTE: If the request was a portal account logout, we will not login again + * just to logout. We also will not throw an error on 401, instead returning + * silently. There is no way for the client to know whether the cookie is set + * ahead of time, and an error would not be actionable. + * + * NOTE: We restore the original `executeRequest` on logout. We do not try to + * modify `executeRequest` if it is already modified and throw an error + * instead. + * + * @param seed - The user seed. + * @param email - The user email. + */ + setupAutoRelogin(seed: Uint8Array, email: string): void { + if (this.originalExecuteRequest) { + throw new Error("Tried to setup auto re-login with it already being set up"); + } + + const executeRequest = this.client.executeRequest; + this.originalExecuteRequest = executeRequest; + this.client.executeRequest = async function (config: RequestConfig): Promise { + try { + return await executeRequest(config); + } catch (e) { + if ((e as ExecuteRequestError).responseStatus === 401) { + // Try logging in again. + await login(this, seed, email); + return await executeRequest(config); + } else { + throw e; + } + } + }; + } + /** * Set up a listener for the storage event. * @@ -407,7 +467,7 @@ export class MySky { localStorage.removeItem(EMAIL_STORAGE_KEY); // Set up auto re-login on JWT expiry. - setupAutoRelogin(this.client, seed, email); + this.setupAutoRelogin(seed, email); } }); } @@ -460,38 +520,6 @@ export class MySky { // Helpers // ======= -// TODO: Restore original executeRequest on logout. -/** - * Sets up auto re-login. It modifies the client's `executeRequest` method to - * check if the request failed with 401 Unauthorized Response. If so, it will - * try to login and make the request again. - * - * NOTE: If the request was a portal account logout, we will not login again - * just to logout. We also will not throw an error on 401, instead returning - * silently. There is no way for the client to know whether the cookie is set - * ahead of time, and an error would not be actionable. - * - * @param client - The Skynet client. - * @param seed - The user seed. - * @param email - The user email. - */ -function setupAutoRelogin(client: SkynetClient, seed: Uint8Array, email: string): void { - const executeRequest = client.executeRequest; - client.executeRequest = async function (config: RequestConfig): Promise { - try { - return await executeRequest(config); - } catch (e) { - if ((e as ExecuteRequestError).responseStatus === 401) { - // Try logging in again. - await login(this, seed, email); - return await executeRequest(config); - } else { - throw e; - } - } - }; -} - /** * Checks for seed stored in local storage from previous sessions. * diff --git a/src/portal-account.ts b/src/portal-account.ts index 0b158a99..d66482c1 100644 --- a/src/portal-account.ts +++ b/src/portal-account.ts @@ -1,5 +1,6 @@ +import { AxiosResponse } from "axios"; import jwt_decode from "jwt-decode"; -import { KeyPair, SkynetClient } from "skynet-js"; +import { KeyPair, RequestConfig, SkynetClient } from "skynet-js"; import type { CustomClientOptions } from "skynet-js"; import { sign } from "tweetnacl"; @@ -65,9 +66,12 @@ export type CustomLoginOptions = CustomClientOptions & { * Custom logout options. * * @property [endpointLogout] - The relative URL path of the portal endpoint to contact for large uploads. + * @property [executeRequest] - A function to override the client's existing `executeRequest`. */ export type CustomLogoutOptions = CustomClientOptions & { endpointLogout?: string; + + executeRequest?: (config: RequestConfig) => Promise; }; /** @@ -99,6 +103,8 @@ export const DEFAULT_LOGOUT_OPTIONS = { ...DEFAULT_CUSTOM_CLIENT_OPTIONS, endpointLogout: "/api/logout", + + executeRequest: undefined, }; /** @@ -224,7 +230,8 @@ export async function login( export async function logout(client: SkynetClient, customOptions?: CustomLogoutOptions): Promise { const opts = { ...DEFAULT_LOGOUT_OPTIONS, ...client.customOptions, ...customOptions }; - await client.executeRequest({ + const executeRequest = opts.executeRequest || client.executeRequest; + await executeRequest({ endpointPath: opts.endpointLogout, method: "POST", subdomain: "account", From 3ef9ad774d251193d1453f57356504cee9f006f5 Mon Sep 17 00:00:00 2001 From: Marcin S Date: Wed, 15 Dec 2021 15:52:54 -0600 Subject: [PATCH 03/29] Polyfill Promise.any for Opera --- package-lock.json | 16 ++++++++++++++++ package.json | 1 + scripts/ui.ts | 5 ++++- 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 8cab8322..2a7710df 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,6 +12,7 @@ "axios": "^0.24.0", "buffer": "^6.0.3", "confusables": "^1.0.0", + "core-js-pure": "^3.19.3", "crypto-browserify": "^3.12.0", "idb-keyval": "^6.0.3", "jwt-decode": "^3.1.2", @@ -3900,6 +3901,16 @@ "semver": "bin/semver.js" } }, + "node_modules/core-js-pure": { + "version": "3.19.3", + "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.19.3.tgz", + "integrity": "sha512-N3JruInmCyt7EJj5mAq3csCgGYgiSqu7p7TQp2KOztr180/OAIxyIvL1FCjzgmQk/t3Yniua50Fsak7FShI9lA==", + "hasInstallScript": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/core-js" + } + }, "node_modules/cosmiconfig": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz", @@ -12730,6 +12741,11 @@ } } }, + "core-js-pure": { + "version": "3.19.3", + "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.19.3.tgz", + "integrity": "sha512-N3JruInmCyt7EJj5mAq3csCgGYgiSqu7p7TQp2KOztr180/OAIxyIvL1FCjzgmQk/t3Yniua50Fsak7FShI9lA==" + }, "cosmiconfig": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz", diff --git a/package.json b/package.json index b511af93..7fcbd211 100644 --- a/package.json +++ b/package.json @@ -46,6 +46,7 @@ "axios": "^0.24.0", "buffer": "^6.0.3", "confusables": "^1.0.0", + "core-js-pure": "^3.19.3", "crypto-browserify": "^3.12.0", "idb-keyval": "^6.0.3", "jwt-decode": "^3.1.2", diff --git a/scripts/ui.ts b/scripts/ui.ts index 67fcc365..7b46ae2d 100644 --- a/scripts/ui.ts +++ b/scripts/ui.ts @@ -1,3 +1,6 @@ +// Provide polyfill for Promise.any for Opera. +// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise/any#browser_compatibility +import Promise_any from "core-js-pure/stable/promise/any"; import { ChildHandshake, Connection, ParentHandshake, WindowMessenger } from "post-me"; import { CheckPermissionsResponse, @@ -297,7 +300,7 @@ async function connectToPortalAccount(seed: Uint8Array, email: string): Promise< // Make requests to login and register in parallel. At most one can succeed, // and this saves a lot of time. try { - await Promise.any([register(client, seed, email), login(client, seed, email)]); + await Promise_any([register(client, seed, email), login(client, seed, email)]); } catch (e) { throw new Error(`Could not register or login: ${e}`); } From 5e60df45237368f617ceb7043705b7342405d1c5 Mon Sep 17 00:00:00 2001 From: Marcin S Date: Wed, 15 Dec 2021 15:53:25 -0600 Subject: [PATCH 04/29] Implement getting preferred portal and redirect flow --- src/mysky.ts | 248 +++++++++++++++++++++++++++++++++++++-------------- src/util.ts | 17 ++++ 2 files changed, 199 insertions(+), 66 deletions(-) diff --git a/src/mysky.ts b/src/mysky.ts index 2e924607..7e0da6a2 100644 --- a/src/mysky.ts +++ b/src/mysky.ts @@ -2,8 +2,11 @@ import { AxiosResponse } from "axios"; import type { Connection } from "post-me"; import { ChildHandshake, WindowMessenger } from "post-me"; import { + decryptJSONFile, deriveDiscoverableFileTweak, deriveEncryptedFileTweak, + encryptJSONFile, + ENCRYPTED_JSON_RESPONSE_VERSION, RegistryEntry, signEntry, SkynetClient, @@ -12,6 +15,8 @@ import { RequestConfig, ExecuteRequestError, JsonData, + deriveEncryptedFileKeyEntropy, + EncryptedJSONResponse, } from "skynet-js"; import { CheckPermissionsResponse, PermCategory, Permission, PermType } from "skynet-mysky-utils"; @@ -21,10 +26,12 @@ import { deriveEncryptedPathSeedForRoot, ENCRYPTION_ROOT_PATH_SEED_BYTES_LENGTH import { login, logout } from "./portal-account"; import { launchPermissionsProvider } from "./provider"; import { SEED_LENGTH } from "./seed"; -import { fromHexString, log, readablePermission } from "./util"; +import { fromHexString, log, readablePermission, validateObject, validateString } from "./util"; -export const SEED_STORAGE_KEY = "seed"; export const EMAIL_STORAGE_KEY = "email"; +export const SEED_STORAGE_KEY = "seed"; + +const INITIAL_PORTAL = "https://siasky.net"; // Descriptive salt that should not be changed. const SALT_ENCRYPTED_PATH_SEED = "encrypted filesystem path seed"; @@ -52,6 +59,7 @@ export class PermissionsProvider { } } +// TODO: Rename to differentiate from `MySky` in SDK? Perhaps `MainMySky`. /** * The MySky object containing the parent connection and permissions provider. * @@ -64,7 +72,7 @@ export class PermissionsProvider { export class MySky { protected originalExecuteRequest: ((config: RequestConfig) => Promise) | null = null; protected parentConnection: Promise; - protected permissionsProvider: Promise | null = null; + protected preferredPortal: string | null = null; // ============ // Constructors @@ -73,47 +81,18 @@ export class MySky { constructor( protected client: SkynetClient, protected referrerDomain: string, - seed: Uint8Array | null, - email: string | null - ) { - // Set child methods. - - const methods = { - checkLogin: this.checkLogin.bind(this), - getEncryptedFileSeed: this.getEncryptedPathSeed.bind(this), - getEncryptedPathSeed: this.getEncryptedPathSeed.bind(this), - logout: this.logout.bind(this), - signMessage: this.signMessage.bind(this), - signRegistryEntry: this.signRegistryEntry.bind(this), - signEncryptedRegistryEntry: this.signEncryptedRegistryEntry.bind(this), - userID: this.userID.bind(this), - verifyMessageSignature: this.verifyMessageSignature.bind(this), - }; - - // Enable communication with connector in parent skapp. - - log("Making handshake"); - const messenger = new WindowMessenger({ - localWindow: window, - remoteWindow: window.parent, - remoteOrigin: "*", - }); - this.parentConnection = ChildHandshake(messenger, methods); - - // Launch the permissions provider if the seed was given. - - if (seed) { - this.permissionsProvider = launchPermissionsProvider(seed); - } - - if (seed) { - // Set up auto-relogin if the email was found. - if (email) { - this.setupAutoRelogin(seed, email); - } - } - } + protected permissionsProvider: Promise | null + ) {} + /** + * Do the asynchronous parts of initialization here before calling the + * constructor. + * + * NOTE: async is not allowed in constructors, which is why the work is split + * up like this. + * + * @returns - The MySky instance. + */ static async initialize(): Promise { log("Initializing..."); @@ -124,31 +103,37 @@ export class MySky { // Check for stored seed in localstorage. const seed = checkStoredSeed(); - let email = null; - let portal = null; + // Launch the permissions provider if the seed was given. + let permissionsProvider = null; if (seed) { - const userSettings = await getUserSettings(seed); - - // TODO: Check for stored portal and email in user settings. - if (userSettings) { - email = (userSettings.email as string) || null; - portal = (userSettings.portal as string) || null; - } + permissionsProvider = launchPermissionsProvider(seed); } // Initialize the Skynet client. - const client = new SkynetClient(portal || undefined); + // + // Always connect to siasky.net first. We may connect to a preferred portal later. + const initialClient = new SkynetClient(INITIAL_PORTAL); // Get the referrer. - const referrerDomain = await client.extractDomain(document.referrer); + // TODO: Extract domain from actual portal. + const referrerClient = new SkynetClient(); + const referrerDomain = await referrerClient.extractDomain(document.referrer); // Create MySky object. log("Calling new MySky()"); - const mySky = new MySky(client, referrerDomain, seed, email); + const mySky = new MySky(initialClient, referrerDomain, permissionsProvider); + + // Get the preferred portal and stored email. + if (seed) { + await mySky.setPreferredPortalAndStoredEmail(seed); + } // Set up the storage event listener. mySky.setUpStorageEventListener(); + // We are ready to accept requests. Set up the handshake connection. + mySky.connectToParent(); + return mySky; } @@ -223,6 +208,10 @@ export class MySky { return deriveEncryptedPathSeedForRoot(rootPathSeedBytes, path, isDirectory); } + async getPreferredPortal(): Promise { + return this.preferredPortal; + } + // TODO: Logout from all tabs. /** * Logs out of MySky. @@ -384,6 +373,144 @@ export class MySky { // Internal Methods // ================ + /** + * Sets up the handshake connection with the parent. + */ + connectToParent(): void { + // Set child methods. + + const methods = { + checkLogin: this.checkLogin.bind(this), + getEncryptedFileSeed: this.getEncryptedPathSeed.bind(this), + getEncryptedPathSeed: this.getEncryptedPathSeed.bind(this), + getPreferredPortal: this.getPreferredPortal.bind(this), + logout: this.logout.bind(this), + signMessage: this.signMessage.bind(this), + signRegistryEntry: this.signRegistryEntry.bind(this), + signEncryptedRegistryEntry: this.signEncryptedRegistryEntry.bind(this), + userID: this.userID.bind(this), + verifyMessageSignature: this.verifyMessageSignature.bind(this), + }; + + // Enable communication with connector in parent skapp. + + log("Making handshake"); + const messenger = new WindowMessenger({ + localWindow: window, + remoteWindow: window.parent, + remoteOrigin: "*", + }); + this.parentConnection = ChildHandshake(messenger, methods); + } + + /** + * Checks for the preferred portal and stored email in user settings, and sets + * them if found. + * + * @param seed - The user seed. + */ + async setPreferredPortalAndStoredEmail(seed: Uint8Array): Promise { + let email = null, + portal = null; + + // Check for stored portal and email in user settings. + const userSettings = await this.getUserSettings(); + if (userSettings) { + email = (userSettings.email as string) || null; + portal = (userSettings.portal as string) || null; + } + + // TODO: Connect to the preferred portal if it was found. + if (portal) { + this.client = new SkynetClient(portal); + } + + // Set up auto-relogin if the email was found. + if (email) { + this.setupAutoRelogin(seed, email); + } + } + + /** + * Gets Encrypted JSON at the given path through MySky, if the user has given + * Hidden Read permissions to do so. + * + * @param path - The data path. + * @returns - An object containing the decrypted json data. + * @throws - Will throw if the user does not have Hidden Read permission on the path. + */ + async getJSONEncrypted(path: string): Promise { + validateString("path", path, "parameter"); + + // Call MySky which checks for read permissions on the path. + const [publicKey, pathSeed] = await Promise.all([this.userID(), this.getEncryptedPathSeed(path, false)]); + + // Fetch the raw encrypted JSON data. + const dataKey = deriveEncryptedFileTweak(pathSeed); + const { data } = await this.client.db.getRawBytes(publicKey, dataKey); + if (data === null) { + return { data: null }; + } + + const encryptionKey = deriveEncryptedFileKeyEntropy(pathSeed); + const json = decryptJSONFile(data, encryptionKey); + + return { data: json }; + } + + // TODO + /** + * Sets Encrypted JSON at the given path through MySky, if the user has given + * Hidden Write permissions to do so. + * + * @param path - The data path. + * @param json - The json to encrypt and set. + * @param [customOptions] - Additional settings that can optionally be set. + * @returns - An object containing the original json data. + * @throws - Will throw if the user does not have Hidden Write permission on the path. + */ + async setJSONEncrypted(path: string, json: JsonData): Promise { + validateString("path", path, "parameter"); + validateObject("json", json, "parameter"); + + const opts = { hashedDataKeyHex: true }; + + // Call MySky which checks for read permissions on the path. + const [publicKey, pathSeed] = await Promise.all([this.userID(), this.getEncryptedPathSeed(path, false)]); + const dataKey = deriveEncryptedFileTweak(pathSeed); + const encryptionKey = deriveEncryptedFileKeyEntropy(pathSeed); + + // Pad and encrypt json file. + const data = encryptJSONFile(json, { version: ENCRYPTED_JSON_RESPONSE_VERSION }, encryptionKey); + + const entry = await getOrCreateRawBytesRegistryEntry(this.client, publicKey, dataKey, data, opts); + + // Call MySky which checks for write permissions on the path. + const signature = await this.signEncryptedRegistryEntry(entry, path); + + await this.client.registry.postSignedEntry(publicKey, entry, signature); + + return { data: json }; + } + + // TODO + /** + * Gets the user settings stored in the root of the MySky domain. + * + * @returns - The user settings if found. + */ + async getUserSettings(): Promise { + // TODO: Get the settings path for the MySky domain. + const path = await this.getUserSettingsPath(); + + return await this.getJSONEncrypted(path); + } + + async getUserSettingsPath(): Promise { + const domain = await this.client.extractDomain(window.location.href); + return `${domain}/settings.json`; + } + /** * Sets up auto re-login. It modifies the client's `executeRequest` method to * check if the request failed with `401 Unauthorized Response`. If so, it @@ -568,14 +695,3 @@ export function clearStoredSeed(): void { localStorage.removeItem(SEED_STORAGE_KEY); } - -// TODO -/** - * Gets the user settings stored in the root of the MySky domain. - * - * @param _seed - The user seed. - * @returns - The user settings if found. - */ -async function getUserSettings(_seed: Uint8Array): Promise { - return null; -} diff --git a/src/util.ts b/src/util.ts index 02fc77c8..c9704303 100644 --- a/src/util.ts +++ b/src/util.ts @@ -90,6 +90,23 @@ export function toHexString(byteArray: Uint8Array): string { // Validation Functions // ==================== +/** + * Validates the given value as an object. + * + * @param name - The name of the value. + * @param value - The actual value. + * @param valueKind - The kind of value that is being checked (e.g. "parameter", "response field", etc.) + * @throws - Will throw if not a valid object. + */ +export function validateObject(name: string, value: unknown, valueKind: string): void { + if (typeof value !== "object") { + throwValidationError(name, value, valueKind, "type 'object'"); + } + if (value === null) { + throwValidationError(name, value, valueKind, "non-null"); + } +} + /** * Validates the given value as a string. * From 6d10fe5458be9b760aebcd26735a2b022df9b109 Mon Sep 17 00:00:00 2001 From: Marcin S Date: Wed, 22 Dec 2021 16:16:33 -0600 Subject: [PATCH 05/29] Implement preferred portal flow, move portal login to Main MySky --- package-lock.json | 34 ++--- package.json | 2 +- scripts/ui.ts | 59 +------- src/mysky.ts | 306 +++++++++++++++++++++++++++++++----------- tsconfig.json | 3 + tsconfig.scripts.json | 4 +- webpack.config.js | 7 +- 7 files changed, 263 insertions(+), 152 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2a7710df..ed78ecd9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,6 @@ "axios": "^0.24.0", "buffer": "^6.0.3", "confusables": "^1.0.0", - "core-js-pure": "^3.19.3", "crypto-browserify": "^3.12.0", "idb-keyval": "^6.0.3", "jwt-decode": "^3.1.2", @@ -40,6 +39,7 @@ "@typescript-eslint/eslint-plugin": "^5.6.0", "@typescript-eslint/parser": "^5.6.0", "autoprefixer": "^10.4.0", + "core-js": "^3.20.0", "eslint": "^8.4.1", "eslint-plugin-jsdoc": "^37.2.0", "husky": "^7.0.4", @@ -3878,6 +3878,17 @@ "safe-buffer": "~5.1.1" } }, + "node_modules/core-js": { + "version": "3.20.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.20.0.tgz", + "integrity": "sha512-KjbKU7UEfg4YPpskMtMXPhUKn7m/1OdTHTVjy09ScR2LVaoUXe8Jh0UdvN2EKUR6iKTJph52SJP95mAB0MnVLQ==", + "dev": true, + "hasInstallScript": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/core-js" + } + }, "node_modules/core-js-compat": { "version": "3.19.1", "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.19.1.tgz", @@ -3901,16 +3912,6 @@ "semver": "bin/semver.js" } }, - "node_modules/core-js-pure": { - "version": "3.19.3", - "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.19.3.tgz", - "integrity": "sha512-N3JruInmCyt7EJj5mAq3csCgGYgiSqu7p7TQp2KOztr180/OAIxyIvL1FCjzgmQk/t3Yniua50Fsak7FShI9lA==", - "hasInstallScript": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/core-js" - } - }, "node_modules/cosmiconfig": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz", @@ -12723,6 +12724,12 @@ "safe-buffer": "~5.1.1" } }, + "core-js": { + "version": "3.20.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.20.0.tgz", + "integrity": "sha512-KjbKU7UEfg4YPpskMtMXPhUKn7m/1OdTHTVjy09ScR2LVaoUXe8Jh0UdvN2EKUR6iKTJph52SJP95mAB0MnVLQ==", + "dev": true + }, "core-js-compat": { "version": "3.19.1", "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.19.1.tgz", @@ -12741,11 +12748,6 @@ } } }, - "core-js-pure": { - "version": "3.19.3", - "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.19.3.tgz", - "integrity": "sha512-N3JruInmCyt7EJj5mAq3csCgGYgiSqu7p7TQp2KOztr180/OAIxyIvL1FCjzgmQk/t3Yniua50Fsak7FShI9lA==" - }, "cosmiconfig": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz", diff --git a/package.json b/package.json index 7fcbd211..d8d3dd32 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,6 @@ "axios": "^0.24.0", "buffer": "^6.0.3", "confusables": "^1.0.0", - "core-js-pure": "^3.19.3", "crypto-browserify": "^3.12.0", "idb-keyval": "^6.0.3", "jwt-decode": "^3.1.2", @@ -74,6 +73,7 @@ "@typescript-eslint/eslint-plugin": "^5.6.0", "@typescript-eslint/parser": "^5.6.0", "autoprefixer": "^10.4.0", + "core-js": "^3.20.0", "eslint": "^8.4.1", "eslint-plugin-jsdoc": "^37.2.0", "husky": "^7.0.4", diff --git a/scripts/ui.ts b/scripts/ui.ts index 7b46ae2d..c28c2dcb 100644 --- a/scripts/ui.ts +++ b/scripts/ui.ts @@ -1,6 +1,3 @@ -// Provide polyfill for Promise.any for Opera. -// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise/any#browser_compatibility -import Promise_any from "core-js-pure/stable/promise/any"; import { ChildHandshake, Connection, ParentHandshake, WindowMessenger } from "post-me"; import { CheckPermissionsResponse, @@ -15,7 +12,6 @@ import { import { MySky, SkynetClient } from "skynet-js"; import { hashWithSalt } from "../src/crypto"; -import { login, register } from "../src/portal-account"; import { checkStoredSeed, EMAIL_STORAGE_KEY, SEED_STORAGE_KEY } from "../src/mysky"; import { getPermissionsProviderUrl, @@ -159,12 +155,7 @@ async function checkBrowserSupported(): Promise { * then we display the signin-connect page where the user may connect his email * on signin. * - * 5. If we got the email, then we register/login to set the JWT cookie. - * - * 6. If the user provided a new email at some point, then we save it in user - * settings, after having successfully connected to a portal account. - * - * (7. We return the seed and email and save them in storage in another + * (5. We return the seed and email and save them in storage in another * function, which triggers Main MySky's storage listener.) * * @returns - The seed and email. @@ -211,16 +202,6 @@ async function getSeedAndEmail(): Promise<[Uint8Array, string | null]> { } } - // Register/login. - if (email) { - await connectToPortalAccount(seed, email); - } - - // TODO: Save the new provided email in user settings. - if (emailProvidedByUser) { - await saveEmailInSettings(); - } - return [seed, email]; } @@ -283,39 +264,6 @@ async function getPermissions(seed: Uint8Array, permissions: Permission[]): Prom return permissionsResponse; } -/** - * Connects to a portal account by either registering or logging in to an - * existing account. The resulting cookie will be set on the MySky domain and - * takes effect in Main MySky immediate. - * - * NOTE: Main MySky will register "auto re-login"; we don't have to do that - * here. - * - * @param seed - The user seed. - * @param email - The user email. - */ -async function connectToPortalAccount(seed: Uint8Array, email: string): Promise { - // Register and get the JWT cookie. - // - // Make requests to login and register in parallel. At most one can succeed, - // and this saves a lot of time. - try { - await Promise_any([register(client, seed, email), login(client, seed, email)]); - } catch (e) { - throw new Error(`Could not register or login: ${e}`); - } -} - -// TODO -/** - * If the email was provided by the user, save it in user settings. - * - * @returns - An empty promise. - */ -async function saveEmailInSettings(): Promise { - return; -} - /** * Gets the user's seed provider display URL if set, or the default. * @@ -513,8 +461,9 @@ async function catchError(errorMsg: string): Promise { /** * Stores the root seed and email in local storage. This triggers the storage - * event listener in the main invisible MySky frame. Main MySky needs the email - * so that it can login again when the JWT cookie expires. + * event listener in the main invisible MySky frame. This switches to the + * preferred portal, registers or logs in to the portal account and sets up + * login again when the JWT cookie expires. See `setUpStorageEventListener`. * * NOTE: If ENV == 'dev' the seed is salted before storage. * diff --git a/src/mysky.ts b/src/mysky.ts index 7e0da6a2..80fea083 100644 --- a/src/mysky.ts +++ b/src/mysky.ts @@ -18,17 +18,20 @@ import { deriveEncryptedFileKeyEntropy, EncryptedJSONResponse, } from "skynet-js"; +// TODO: Either remove after get/setJSON rework or export it from SDK. +import { getOrCreateRawBytesRegistryEntry } from "skynet-js/dist/cjs/skydb"; import { CheckPermissionsResponse, PermCategory, Permission, PermType } from "skynet-mysky-utils"; import { sign } from "tweetnacl"; import { genKeyPairFromSeed, hashWithSalt, sha512 } from "./crypto"; import { deriveEncryptedPathSeedForRoot, ENCRYPTION_ROOT_PATH_SEED_BYTES_LENGTH } from "./encrypted_files"; -import { login, logout } from "./portal-account"; +import { login, logout, register } from "./portal-account"; import { launchPermissionsProvider } from "./provider"; import { SEED_LENGTH } from "./seed"; import { fromHexString, log, readablePermission, validateObject, validateString } from "./util"; export const EMAIL_STORAGE_KEY = "email"; +export const PORTAL_STORAGE_KEY = "portal"; export const SEED_STORAGE_KEY = "seed"; const INITIAL_PORTAL = "https://siasky.net"; @@ -46,6 +49,14 @@ let dev = false; dev = true; /// #endif +/** + * Settings associated with a user's MySky account. + * + * @property portal - The user's preferred portal. We redirect a skapp to this portal, if it is set. + * @property email - The user's portal account email. We connect to their portal account if this is set. + */ +type UserSettings = { portal: string | null; email: string | null }; + /** * Convenience class containing the permissions provider handshake connection * and worker handle. @@ -71,8 +82,7 @@ export class PermissionsProvider { */ export class MySky { protected originalExecuteRequest: ((config: RequestConfig) => Promise) | null = null; - protected parentConnection: Promise; - protected preferredPortal: string | null = null; + protected parentConnection: Promise | null = null; // ============ // Constructors @@ -80,8 +90,10 @@ export class MySky { constructor( protected client: SkynetClient, + protected mySkyDomain: string, protected referrerDomain: string, - protected permissionsProvider: Promise | null + protected permissionsProvider: Promise | null, + protected preferredPortal: string | null ) {} /** @@ -91,6 +103,9 @@ export class MySky { * NOTE: async is not allowed in constructors, which is why the work is split * up like this. * + * For the preferred portal flow, see "Load MySky redirect flow" on + * `redirectIfNotOnPreferredPortal` in the SDK. + * * @returns - The MySky instance. */ static async initialize(): Promise { @@ -99,8 +114,11 @@ export class MySky { if (typeof Storage == "undefined") { throw new Error("Browser does not support web storage"); } + if (!localStorage) { + throw new Error("localStorage disabled"); + } - // Check for stored seed in localstorage. + // Check for the stored seed in localstorage. const seed = checkStoredSeed(); // Launch the permissions provider if the seed was given. @@ -109,27 +127,49 @@ export class MySky { permissionsProvider = launchPermissionsProvider(seed); } + // Check for the preferred portal in localstorage. + let preferredPortal = checkStoredPreferredPortal(); + // Initialize the Skynet client. // - // Always connect to siasky.net first. We may connect to a preferred portal later. - const initialClient = new SkynetClient(INITIAL_PORTAL); - - // Get the referrer. - // TODO: Extract domain from actual portal. - const referrerClient = new SkynetClient(); - const referrerDomain = await referrerClient.extractDomain(document.referrer); + // Connect to the preferred portal if it was found, otherwise connect to + // siasky.net if the seed was found, otherwise connect to the current + // portal. + const initialPortal = seed ? INITIAL_PORTAL : undefined; + const initialClient = new SkynetClient(preferredPortal || initialPortal); + + // Get the referrer and MySky domains. + const actualPortalClient = new SkynetClient(); + // Get the MySky domain (i.e. `skynet-mysky.hns or sandbridge.hns`). + const mySkyDomain = await actualPortalClient.extractDomain(window.location.href); + // Extract skapp domain from actual portal. + // NOTE: The skapp should have opened MySky on the same portal as itself. + const referrerDomain = await actualPortalClient.extractDomain(document.referrer); // Create MySky object. log("Calling new MySky()"); - const mySky = new MySky(initialClient, referrerDomain, permissionsProvider); + const mySky = new MySky(initialClient, mySkyDomain, referrerDomain, permissionsProvider, preferredPortal); - // Get the preferred portal and stored email. - if (seed) { - await mySky.setPreferredPortalAndStoredEmail(seed); + // Get email from local storage. + let storedEmail = checkStoredEmail(); + + // Get the preferred portal and stored email from user settings. + if (seed && !preferredPortal) { + const { portal, email } = await mySky.getUserSettings(seed); + preferredPortal = portal; + storedEmail = email; + } + + // Set the portal. + mySky.setPortal(preferredPortal); + + // Set up auto-relogin if the email was found. + if (seed && storedEmail) { + mySky.setupAutoRelogin(seed, storedEmail); } // Set up the storage event listener. - mySky.setUpStorageEventListener(); + mySky.setupStorageEventListener(); // We are ready to accept requests. Set up the handshake connection. mySky.connectToParent(); @@ -229,6 +269,10 @@ export class MySky { errors.push(new Error("MySky user is already logged out")); } + // Clear other stored values. + clearStoredEmail(); + clearStoredPreferredPortal(); + // Clear the JWT cookie. // // NOTE: We do this even if we could not find a seed above. The local @@ -376,7 +420,7 @@ export class MySky { /** * Sets up the handshake connection with the parent. */ - connectToParent(): void { + protected connectToParent(): void { // Set child methods. const methods = { @@ -403,32 +447,57 @@ export class MySky { this.parentConnection = ChildHandshake(messenger, methods); } + /** + * Connects to a portal account by either registering or logging in to an + * existing account. The resulting cookie will be set on the MySky domain. + * + * NOTE: We will register "auto re-login" in a separate function. + * + * @param seed - The user seed. + * @param email - The user email. + */ + protected async connectToPortalAccount(seed: Uint8Array, email: string): Promise { + // Register and get the JWT cookie. + // + // Make requests to login and register in parallel. At most one can succeed, + // and this saves a lot of time. + try { + await Promise.any([register(this.client, seed, email), login(this.client, seed, email)]); + } catch (e) { + throw new Error(`Could not register or login: ${e}`); + } + } + /** * Checks for the preferred portal and stored email in user settings, and sets * them if found. * - * @param seed - The user seed. + * @param _seed - The user seed. + * @returns - The portal and email, if found. */ - async setPreferredPortalAndStoredEmail(seed: Uint8Array): Promise { + protected async getUserSettings(_seed: Uint8Array): Promise { let email = null, portal = null; + // Get the settings path for the MySky domain. + const path = await this.getUserSettingsPath(); + // Check for stored portal and email in user settings. - const userSettings = await this.getUserSettings(); + const { data: userSettings } = await this.getJSONEncrypted(path); if (userSettings) { email = (userSettings.email as string) || null; portal = (userSettings.portal as string) || null; } - // TODO: Connect to the preferred portal if it was found. - if (portal) { - this.client = new SkynetClient(portal); - } + return { portal, email }; + } - // Set up auto-relogin if the email was found. - if (email) { - this.setupAutoRelogin(seed, email); - } + protected async setUserSettings(_seed: Uint8Array, settings: UserSettings): Promise { + // Get the settings path for the MySky domain. + const path = await this.getUserSettingsPath(); + + // Set preferred portal and email in user settings. + await this.setJSONEncrypted(path, settings); } /** @@ -439,7 +508,7 @@ export class MySky { * @returns - An object containing the decrypted json data. * @throws - Will throw if the user does not have Hidden Read permission on the path. */ - async getJSONEncrypted(path: string): Promise { + protected async getJSONEncrypted(path: string): Promise { validateString("path", path, "parameter"); // Call MySky which checks for read permissions on the path. @@ -465,11 +534,10 @@ export class MySky { * * @param path - The data path. * @param json - The json to encrypt and set. - * @param [customOptions] - Additional settings that can optionally be set. * @returns - An object containing the original json data. * @throws - Will throw if the user does not have Hidden Write permission on the path. */ - async setJSONEncrypted(path: string, json: JsonData): Promise { + protected async setJSONEncrypted(path: string, json: JsonData): Promise { validateString("path", path, "parameter"); validateObject("json", json, "parameter"); @@ -493,22 +561,30 @@ export class MySky { return { data: json }; } - // TODO /** - * Gets the user settings stored in the root of the MySky domain. + * Get the path to the user settings stored in the root MySky domain. * - * @returns - The user settings if found. + * @returns - The user settings path. */ - async getUserSettings(): Promise { - // TODO: Get the settings path for the MySky domain. - const path = await this.getUserSettingsPath(); - - return await this.getJSONEncrypted(path); + protected async getUserSettingsPath(): Promise { + return `${this.mySkyDomain}/settings.json`; } - async getUserSettingsPath(): Promise { - const domain = await this.client.extractDomain(window.location.href); - return `${domain}/settings.json`; + /** + * Sets the portal, either the preferred portal if given or the current portal + * otherwise. + * + * @param preferredPortal - The user's preferred portal + */ + protected setPortal(preferredPortal: string | null): void { + if (preferredPortal) { + // Connect to the preferred portal if it was found. + this.client = new SkynetClient(preferredPortal); + this.preferredPortal = preferredPortal; + } else { + // Else, connect to the current portal as opposed to siasky.net. + this.client = new SkynetClient(); + } } /** @@ -528,7 +604,7 @@ export class MySky { * @param seed - The user seed. * @param email - The user email. */ - setupAutoRelogin(seed: Uint8Array, email: string): void { + protected setupAutoRelogin(seed: Uint8Array, email: string): void { if (this.originalExecuteRequest) { throw new Error("Tried to setup auto re-login with it already being set up"); } @@ -550,22 +626,46 @@ export class MySky { }; } + // TODO: Figure out how to get stored data to persist across redirect. + // TODO: Signal to MySky UI that we are done. /** - * Set up a listener for the storage event. + * Set up a listener for the storage event. Triggered when the seed is set. + * Unloads the permission provider to disable MySky functionality until the + * permission provider is loaded again at the end. + * + * For the preferred portal flow, see "Load MySky redirect flow" on + * `redirectIfNotOnPreferredPortal` in the SDK. + * + * The login flow: + * + * 0. Unload the permissions provider and seed if stored. + * + * 1. Always use siasky.net first. + * + * 2. Get the preferred portal and switch to it (`setPortal`), or if not found + * switch to current portal. * - * If the seed is set in the UI, it should trigger a load of the permissions - * provider. If the email is set, it should set up automatic re-login on JWT + * 3. If we got the email, then we register/login to set the JWT cookie + * (`connectToPortalAccount`). + * + * 4. If the email is set, it should set up automatic re-login on JWT * cookie expiry. + * + * 5. Save the email in user settings. + * + * 6. Trigger a load of the permissions provider. */ - setUpStorageEventListener(): void { - window.addEventListener("storage", ({ key, newValue }: StorageEvent) => { + protected setupStorageEventListener(): void { + window.addEventListener("storage", async ({ key, newValue }: StorageEvent) => { if (key !== SEED_STORAGE_KEY) { return; } if (this.permissionsProvider) { - // Unload the old permissions provider. No need to await on this. - void this.permissionsProvider.then((provider) => provider.close()); + // Unload the old permissions provider first. This makes sure that MySky + // can't respond to more requests until the new permissions provider is + // loaded at the end of this function. + await this.permissionsProvider.then((provider) => provider.close()); this.permissionsProvider = null; } @@ -577,29 +677,53 @@ export class MySky { // Parse the seed. const seed = new Uint8Array(JSON.parse(newValue)); - // Launch the new permissions provider. - this.permissionsProvider = launchPermissionsProvider(seed); + // ===== + // LOGIN + // TODO: Refactor into a function? Reuse in MySky initialization? - // If the email is found, then set up auto-login on Main MySky. - const email = localStorage.getItem(EMAIL_STORAGE_KEY); - if (email) { - // Clear the stored email. - // - // The email can be cleared here because `localStorage` is only used to - // marshal the email from MySky UI over to the invisible MySky iframe. - // We don't clear the seed because we need it in storage so that users - // are automatically logged-in, when possible. But for the email, it - // should be stored on MySky, as the local storage can get cleared, - // users can move across browsers etc. - localStorage.removeItem(EMAIL_STORAGE_KEY); + // Connect to siasky.net first. + this.client = new SkynetClient(INITIAL_PORTAL); + + // Get the preferred portal and switch to it. + const { portal: preferredPortal, email } = await this.getUserSettings(seed); + let storedEmail = email; + + // Set the portal + this.setPortal(preferredPortal); + + // The email wasn't in the user settings but the user might have just + // signed up with it -- check local storage. We don't need to do this if + // the email was already found. + // TODO: Add dedicated flow(s) for changing the email after it's set. + let providedEmail = false; + if (!storedEmail) { + storedEmail = checkStoredEmail(); + providedEmail = storedEmail !== null; + } + + if (storedEmail) { + // Register/login to get the JWT cookie. + await this.connectToPortalAccount(seed, storedEmail); // Set up auto re-login on JWT expiry. - this.setupAutoRelogin(seed, email); + this.setupAutoRelogin(seed, storedEmail); + + // Save the email in user settings. + if (providedEmail) { + await this.setUserSettings(seed, { portal: preferredPortal, email: storedEmail }); + } } + + // Launch the new permissions provider. + this.permissionsProvider = launchPermissionsProvider(seed); }); } - async signRegistryEntryHelper(entry: RegistryEntry, path: string, category: PermCategory): Promise { + protected async signRegistryEntryHelper( + entry: RegistryEntry, + path: string, + category: PermCategory + ): Promise { log("Entered signRegistryEntry"); // Check with the permissions provider that we have permission for this request. @@ -623,7 +747,7 @@ export class MySky { return signature; } - async checkPermission(path: string, category: PermCategory, permType: PermType): Promise { + protected async checkPermission(path: string, category: PermCategory, permType: PermType): Promise { // Check for the permissions provider. if (!this.permissionsProvider) { @@ -647,6 +771,30 @@ export class MySky { // Helpers // ======= +/** + * Checks for email stored in local storage. + * + * @returns - The email, or null if not found. + */ +export function checkStoredEmail(): string | null { + log("Entered checkStoredEmail"); + + const email = localStorage.getItem(EMAIL_STORAGE_KEY); + return email || null; +} + +/** + * Checks for preferred portal stored in local storage. + * + * @returns - The preferred portal, or null if not found. + */ +export function checkStoredPreferredPortal(): string | null { + log("Entered checkStoredPreferredPortal"); + + const portal = localStorage.getItem(PORTAL_STORAGE_KEY); + return portal || null; +} + /** * Checks for seed stored in local storage from previous sessions. * @@ -655,11 +803,6 @@ export class MySky { export function checkStoredSeed(): Uint8Array | null { log("Entered checkStoredSeed"); - if (!localStorage) { - console.log("WARNING: localStorage disabled"); - return null; - } - const seedStr = localStorage.getItem(SEED_STORAGE_KEY); if (!seedStr) { return null; @@ -682,16 +825,23 @@ export function checkStoredSeed(): Uint8Array | null { return seed; } +function clearStoredEmail(): void { + log("Entered clearStoredEmail"); + + localStorage.removeItem(EMAIL_STORAGE_KEY); +} + +function clearStoredPreferredPortal(): void { + log("Entered clearStoredPreferredPortal"); + + localStorage.removeItem(PORTAL_STORAGE_KEY); +} + /** * Clears the stored seed from local storage. */ export function clearStoredSeed(): void { log("Entered clearStoredSeed"); - if (!localStorage) { - console.log("WARNING: localStorage disabled"); - return; - } - localStorage.removeItem(SEED_STORAGE_KEY); } diff --git a/tsconfig.json b/tsconfig.json index ecdca3ff..b4b24574 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -11,6 +11,9 @@ "strict": true, "strictNullChecks": true, + "lib": ["dom", "es2021"], + "target": "es6", + "moduleResolution": "node", "types": ["node", "jest"], "typeRoots": ["./types", "./node_modules/@types"] }, diff --git a/tsconfig.scripts.json b/tsconfig.scripts.json index 3774e482..7e4ddfbb 100644 --- a/tsconfig.scripts.json +++ b/tsconfig.scripts.json @@ -6,7 +6,9 @@ "strict": true, "skipLibCheck": true, - "lib": ["dom", "esnext", "webworker"], + "lib": ["dom", "es2021", "webworker"], + "target": "es6", + "moduleResolution": "node", "outDir": "dist", "types": ["node"], "typeRoots": ["./types", "./node_modules/@types"] diff --git a/webpack.config.js b/webpack.config.js index a5941272..1111e6fb 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -6,7 +6,12 @@ const opts = { }; module.exports = { - entry: "./src/index.ts", + entry: [ + // Provide polyfill for Promise.any for Opera. + // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise/any#browser_compatibility + "core-js/stable/promise/any", + "./src/index.ts", + ], mode: "production", devtool: "inline-source-map", From a56b4fe36b26ea1a41442a4caad27c5f5af6fbf4 Mon Sep 17 00:00:00 2001 From: Marcin S Date: Wed, 22 Dec 2021 16:18:09 -0600 Subject: [PATCH 06/29] Fix a couple of lint warnings --- src/mysky.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/mysky.ts b/src/mysky.ts index 80fea083..e430bf32 100644 --- a/src/mysky.ts +++ b/src/mysky.ts @@ -825,12 +825,18 @@ export function checkStoredSeed(): Uint8Array | null { return seed; } +/** + * Clears the stored email from local storage. + */ function clearStoredEmail(): void { log("Entered clearStoredEmail"); localStorage.removeItem(EMAIL_STORAGE_KEY); } +/** + * Clears the stored preferred portal from local storage. + */ function clearStoredPreferredPortal(): void { log("Entered clearStoredPreferredPortal"); From c1a78121bf7e994a232d101a14b988e9a8cb3f16 Mon Sep 17 00:00:00 2001 From: Marcin S Date: Fri, 7 Jan 2022 10:57:45 -0600 Subject: [PATCH 07/29] Signal to MySky UI that we are done logging in --- scripts/ui.ts | 22 +++++++- src/mysky.ts | 140 +++++++++++++++++++++++++++++--------------------- 2 files changed, 102 insertions(+), 60 deletions(-) diff --git a/scripts/ui.ts b/scripts/ui.ts index c28c2dcb..f4c1a55b 100644 --- a/scripts/ui.ts +++ b/scripts/ui.ts @@ -12,7 +12,7 @@ import { import { MySky, SkynetClient } from "skynet-js"; import { hashWithSalt } from "../src/crypto"; -import { checkStoredSeed, EMAIL_STORAGE_KEY, SEED_STORAGE_KEY } from "../src/mysky"; +import { checkStoredSeed, EMAIL_STORAGE_KEY, PORTAL_LOGIN_COMPLETE_SENTINEL_KEY, SEED_STORAGE_KEY } from "../src/mysky"; import { getPermissionsProviderUrl, relativePermissionsDisplayUrl, @@ -116,6 +116,9 @@ async function requestLoginAccess(permissions: Permission[]): Promise<[boolean, // Save the seed and email in local storage. saveSeedAndEmail(seed, email); + // Wait for Main MySky to login successfully. + await waitForMySkyPortalLogin(); + // Pass in any request permissions and get a permissions response. const permissionsResponse = await getPermissions(seed, permissions); @@ -445,6 +448,23 @@ async function setupAndRunDisplay(displayUrl: string, methodName: string, ... }); } +async function waitForMySkyPortalLogin(): Promise { + return new Promise((resolve, reject) => + window.addEventListener("storage", async ({ key, newValue }: StorageEvent) => { + if (key !== PORTAL_LOGIN_COMPLETE_SENTINEL_KEY) { + return; + } + + // Check for errors from Main MySky. + if (newValue !== "") { + reject(newValue); + } + + resolve(); + }) + ); +} + // ======= // Helpers // ======= diff --git a/src/mysky.ts b/src/mysky.ts index e430bf32..f95009c3 100644 --- a/src/mysky.ts +++ b/src/mysky.ts @@ -34,6 +34,8 @@ export const EMAIL_STORAGE_KEY = "email"; export const PORTAL_STORAGE_KEY = "portal"; export const SEED_STORAGE_KEY = "seed"; +export const PORTAL_LOGIN_COMPLETE_SENTINEL_KEY = "portal-login-complete"; + const INITIAL_PORTAL = "https://siasky.net"; // Descriptive salt that should not be changed. @@ -130,13 +132,7 @@ export class MySky { // Check for the preferred portal in localstorage. let preferredPortal = checkStoredPreferredPortal(); - // Initialize the Skynet client. - // - // Connect to the preferred portal if it was found, otherwise connect to - // siasky.net if the seed was found, otherwise connect to the current - // portal. - const initialPortal = seed ? INITIAL_PORTAL : undefined; - const initialClient = new SkynetClient(preferredPortal || initialPortal); + let initialClient = getLoginClient(seed, preferredPortal); // Get the referrer and MySky domains. const actualPortalClient = new SkynetClient(); @@ -150,22 +146,25 @@ export class MySky { log("Calling new MySky()"); const mySky = new MySky(initialClient, mySkyDomain, referrerDomain, permissionsProvider, preferredPortal); - // Get email from local storage. - let storedEmail = checkStoredEmail(); + // Login to portal. + { + // Get email from local storage. + let storedEmail = checkStoredEmail(); - // Get the preferred portal and stored email from user settings. - if (seed && !preferredPortal) { - const { portal, email } = await mySky.getUserSettings(seed); - preferredPortal = portal; - storedEmail = email; - } + // Get the preferred portal and stored email from user settings. + if (seed && !preferredPortal) { + const { portal, email } = await mySky.getUserSettings(seed); + preferredPortal = portal; + storedEmail = email; + } - // Set the portal. - mySky.setPortal(preferredPortal); + // Set the portal. + mySky.setPortal(preferredPortal); - // Set up auto-relogin if the email was found. - if (seed && storedEmail) { - mySky.setupAutoRelogin(seed, storedEmail); + // Set up auto-relogin if the email was found. + if (seed && storedEmail) { + mySky.setupAutoRelogin(seed, storedEmail); + } } // Set up the storage event listener. @@ -674,48 +673,59 @@ export class MySky { return; } - // Parse the seed. - const seed = new Uint8Array(JSON.parse(newValue)); - - // ===== - // LOGIN - // TODO: Refactor into a function? Reuse in MySky initialization? - - // Connect to siasky.net first. - this.client = new SkynetClient(INITIAL_PORTAL); - - // Get the preferred portal and switch to it. - const { portal: preferredPortal, email } = await this.getUserSettings(seed); - let storedEmail = email; - - // Set the portal - this.setPortal(preferredPortal); - - // The email wasn't in the user settings but the user might have just - // signed up with it -- check local storage. We don't need to do this if - // the email was already found. - // TODO: Add dedicated flow(s) for changing the email after it's set. - let providedEmail = false; - if (!storedEmail) { - storedEmail = checkStoredEmail(); - providedEmail = storedEmail !== null; - } - - if (storedEmail) { - // Register/login to get the JWT cookie. - await this.connectToPortalAccount(seed, storedEmail); + try { + // Parse the seed. + const seed = new Uint8Array(JSON.parse(newValue)); + + // Connect to siasky.net first. + // + // NOTE: Don't use the stored preferred portal here because we are just + // logging into a new account and need to get the user settings for the + // first time. Always use siasky.net. + this.client = getLoginClient(seed, null); + + // Login to portal. + { + // Get the preferred portal and switch to it. + const { portal: preferredPortal, email } = await this.getUserSettings(seed); + let storedEmail = email; + + // Set the portal + this.setPortal(preferredPortal); + + // The email wasn't in the user settings but the user might have just + // signed up with it -- check local storage. We don't need to do this if + // the email was already found. + // TODO: Add dedicated flow(s) for changing the email after it's set. + let providedEmail = false; + if (!storedEmail) { + storedEmail = checkStoredEmail(); + providedEmail = storedEmail !== null; + } + + if (storedEmail) { + // Register/login to get the JWT cookie. + await this.connectToPortalAccount(seed, storedEmail); + + // Set up auto re-login on JWT expiry. + this.setupAutoRelogin(seed, storedEmail); + + // Save the email in user settings. + if (providedEmail) { + await this.setUserSettings(seed, { portal: preferredPortal, email: storedEmail }); + } + } + } - // Set up auto re-login on JWT expiry. - this.setupAutoRelogin(seed, storedEmail); + // Launch the new permissions provider. + this.permissionsProvider = launchPermissionsProvider(seed); - // Save the email in user settings. - if (providedEmail) { - await this.setUserSettings(seed, { portal: preferredPortal, email: storedEmail }); - } + // Signal to MySky UI that we are done. + localStorage.setItem(PORTAL_LOGIN_COMPLETE_SENTINEL_KEY, ""); + } catch (e) { + // Send error to MySky UI. + localStorage.setItem(PORTAL_LOGIN_COMPLETE_SENTINEL_KEY, (e as Error).message); } - - // Launch the new permissions provider. - this.permissionsProvider = launchPermissionsProvider(seed); }); } @@ -851,3 +861,15 @@ export function clearStoredSeed(): void { localStorage.removeItem(SEED_STORAGE_KEY); } + +/** + * Initialize the Skynet client. + * + * Connect to the preferred portal if it was found, otherwise connect to + * siasky.net if the seed was found, otherwise connect to the current + * portal. + */ +function getLoginClient(seed: Uint8Array | null, preferredPortal: string | null): SkynetClient { + const initialPortal = seed ? INITIAL_PORTAL : undefined; + return new SkynetClient(preferredPortal || initialPortal); +} From a8e518d823739ab3d928f3269097a46d56e88296 Mon Sep 17 00:00:00 2001 From: Marcin S Date: Fri, 7 Jan 2022 10:58:41 -0600 Subject: [PATCH 08/29] Refactor MySky get/setJSON based on GSJ rework --- src/mysky.ts | 51 +++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 41 insertions(+), 10 deletions(-) diff --git a/src/mysky.ts b/src/mysky.ts index f95009c3..46081c47 100644 --- a/src/mysky.ts +++ b/src/mysky.ts @@ -7,6 +7,7 @@ import { deriveEncryptedFileTweak, encryptJSONFile, ENCRYPTED_JSON_RESPONSE_VERSION, + getOrCreateSkyDBRegistryEntry, RegistryEntry, signEntry, SkynetClient, @@ -17,9 +18,8 @@ import { JsonData, deriveEncryptedFileKeyEntropy, EncryptedJSONResponse, + MAX_REVISION, } from "skynet-js"; -// TODO: Either remove after get/setJSON rework or export it from SDK. -import { getOrCreateRawBytesRegistryEntry } from "skynet-js/dist/cjs/skydb"; import { CheckPermissionsResponse, PermCategory, Permission, PermType } from "skynet-mysky-utils"; import { sign } from "tweetnacl"; @@ -545,19 +545,31 @@ export class MySky { // Call MySky which checks for read permissions on the path. const [publicKey, pathSeed] = await Promise.all([this.userID(), this.getEncryptedPathSeed(path, false)]); const dataKey = deriveEncryptedFileTweak(pathSeed); - const encryptionKey = deriveEncryptedFileKeyEntropy(pathSeed); - // Pad and encrypt json file. - const data = encryptJSONFile(json, { version: ENCRYPTED_JSON_RESPONSE_VERSION }, encryptionKey); + // Immediately fail if the mutex is not available. + return await this.client.db.revisionNumberCache.withCachedEntryLock( + publicKey, + dataKey, + async (cachedRevisionEntry) => { + // Get the cached revision number before doing anything else. + const newRevision = incrementRevision(cachedRevisionEntry.revision); - const entry = await getOrCreateRawBytesRegistryEntry(this.client, publicKey, dataKey, data, opts); + // Derive the key. + const encryptionKey = deriveEncryptedFileKeyEntropy(pathSeed); - // Call MySky which checks for write permissions on the path. - const signature = await this.signEncryptedRegistryEntry(entry, path); + // Pad and encrypt json file. + const data = encryptJSONFile(json, { version: ENCRYPTED_JSON_RESPONSE_VERSION }, encryptionKey); - await this.client.registry.postSignedEntry(publicKey, entry, signature); + const [entry] = await getOrCreateSkyDBRegistryEntry(this.client, dataKey, data, newRevision, opts); - return { data: json }; + // Call MySky which checks for write permissions on the path. + const signature = await this.signEncryptedRegistryEntry(entry, path); + + await this.client.registry.postSignedEntry(publicKey, entry, signature); + + return { data: json }; + } + ); } /** @@ -873,3 +885,22 @@ function getLoginClient(seed: Uint8Array | null, preferredPortal: string | null) const initialPortal = seed ? INITIAL_PORTAL : undefined; return new SkynetClient(preferredPortal || initialPortal); } + +/** + * Increments the given revision number and checks to make sure it is not + * greater than the maximum revision. + * + * @param revision - The given revision number. + * @returns - The incremented revision number. + * @throws - Will throw if the incremented revision number is greater than the maximum revision. + */ +function incrementRevision(revision: bigint): bigint { + revision = revision + BigInt(1); + + // Throw if the revision is already the maximum value. + if (revision > MAX_REVISION) { + throw new Error("Current entry already has maximum allowed revision, could not update the entry"); + } + + return revision; +} From 181fd7082ec3ba0670ca37a18dbaabca2371701f Mon Sep 17 00:00:00 2001 From: Marcin S Date: Fri, 7 Jan 2022 11:00:46 -0600 Subject: [PATCH 09/29] Address lint errors --- scripts/ui.ts | 3 +++ src/mysky.ts | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/ui.ts b/scripts/ui.ts index f4c1a55b..d0edb318 100644 --- a/scripts/ui.ts +++ b/scripts/ui.ts @@ -448,6 +448,9 @@ async function setupAndRunDisplay(displayUrl: string, methodName: string, ... }); } +/** + * Waits for portal login on Main MySky to complete. + */ async function waitForMySkyPortalLogin(): Promise { return new Promise((resolve, reject) => window.addEventListener("storage", async ({ key, newValue }: StorageEvent) => { diff --git a/src/mysky.ts b/src/mysky.ts index 46081c47..80de51f0 100644 --- a/src/mysky.ts +++ b/src/mysky.ts @@ -132,7 +132,7 @@ export class MySky { // Check for the preferred portal in localstorage. let preferredPortal = checkStoredPreferredPortal(); - let initialClient = getLoginClient(seed, preferredPortal); + const initialClient = getLoginClient(seed, preferredPortal); // Get the referrer and MySky domains. const actualPortalClient = new SkynetClient(); @@ -880,6 +880,10 @@ export function clearStoredSeed(): void { * Connect to the preferred portal if it was found, otherwise connect to * siasky.net if the seed was found, otherwise connect to the current * portal. + * + * @param seed - The user seed, if given. + * @param preferredPortal - The user's preferred portal, if found. + * @returns - The Skynet client to be used for logging in to the portal. */ function getLoginClient(seed: Uint8Array | null, preferredPortal: string | null): SkynetClient { const initialPortal = seed ? INITIAL_PORTAL : undefined; From eae675bc8a14566d244bc23ce5917940258664b5 Mon Sep 17 00:00:00 2001 From: Marcin S Date: Wed, 12 Jan 2022 13:41:07 -0600 Subject: [PATCH 10/29] Fix compilation issues --- scripts/ui.ts | 7 +++---- src/mysky.ts | 6 +++--- webpack.config.js | 3 ++- webpack.config.permissions-display.js | 2 +- webpack.config.permissions.js | 2 +- webpack.config.seed-display.js | 2 +- webpack.config.seed-selection.js | 2 +- webpack.config.signin-connect.js | 2 +- webpack.config.ui.js | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/scripts/ui.ts b/scripts/ui.ts index d0edb318..8abb704d 100644 --- a/scripts/ui.ts +++ b/scripts/ui.ts @@ -31,6 +31,9 @@ let parentConnection: Connection | null = null; // Set value of dev on load. let dev = false; +/// #if ENV == 'dev' +dev = true; +/// #endif // ====== // Events @@ -64,10 +67,6 @@ window.onerror = function (error: any) { // TODO: Wrap in a try-catch block? Does onerror handler catch thrown errors? // Code that runs on page load. window.onload = () => { - /// #if ENV == 'dev' - dev = true; - /// #endif - void init(); }; diff --git a/src/mysky.ts b/src/mysky.ts index 80de51f0..7e7c51f5 100644 --- a/src/mysky.ts +++ b/src/mysky.ts @@ -709,10 +709,10 @@ export class MySky { // signed up with it -- check local storage. We don't need to do this if // the email was already found. // TODO: Add dedicated flow(s) for changing the email after it's set. - let providedEmail = false; + let isEmailProvided = false; if (!storedEmail) { storedEmail = checkStoredEmail(); - providedEmail = storedEmail !== null; + isEmailProvided = storedEmail !== null; } if (storedEmail) { @@ -723,7 +723,7 @@ export class MySky { this.setupAutoRelogin(seed, storedEmail); // Save the email in user settings. - if (providedEmail) { + if (isEmailProvided) { await this.setUserSettings(seed, { portal: preferredPortal, email: storedEmail }); } } diff --git a/webpack.config.js b/webpack.config.js index 1111e6fb..036960d4 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,4 +1,5 @@ const path = require("path"); +const process = require("process"); // define preprocessor variables const opts = { @@ -22,8 +23,8 @@ module.exports = { exclude: /node_modules/, // prettier-ignore use: [ - { loader: "ifdef-loader", options: opts }, { loader: "ts-loader" }, + { loader: "ifdef-loader", options: opts }, ], }, ], diff --git a/webpack.config.permissions-display.js b/webpack.config.permissions-display.js index 04193a95..113994a7 100644 --- a/webpack.config.permissions-display.js +++ b/webpack.config.permissions-display.js @@ -17,8 +17,8 @@ module.exports = { test: /\.tsx?$/, exclude: /node_modules/, use: [ - { loader: "ifdef-loader", options: opts }, { loader: "ts-loader", options: { configFile: "tsconfig.scripts.json" } }, + { loader: "ifdef-loader", options: opts }, ], include: [path.resolve(__dirname, `scripts/${name}.ts`)], }, diff --git a/webpack.config.permissions.js b/webpack.config.permissions.js index 8c18b602..c1bb0a09 100644 --- a/webpack.config.permissions.js +++ b/webpack.config.permissions.js @@ -17,8 +17,8 @@ module.exports = { test: /\.tsx?$/, exclude: /node_modules/, use: [ - { loader: "ifdef-loader", options: opts }, { loader: "ts-loader", options: { configFile: "tsconfig.scripts.json" } }, + { loader: "ifdef-loader", options: opts }, ], include: [path.resolve(__dirname, `scripts/${name}.ts`)], }, diff --git a/webpack.config.seed-display.js b/webpack.config.seed-display.js index 0b6a2ead..a049ed55 100644 --- a/webpack.config.seed-display.js +++ b/webpack.config.seed-display.js @@ -17,8 +17,8 @@ module.exports = { test: /\.tsx?$/, exclude: /node_modules/, use: [ - { loader: "ifdef-loader", options: opts }, { loader: "ts-loader", options: { configFile: "tsconfig.scripts.json" } }, + { loader: "ifdef-loader", options: opts }, ], include: [path.resolve(__dirname, "src"), path.resolve(__dirname, `scripts/${name}.ts`)], }, diff --git a/webpack.config.seed-selection.js b/webpack.config.seed-selection.js index 8ca1d438..d0cf06a3 100644 --- a/webpack.config.seed-selection.js +++ b/webpack.config.seed-selection.js @@ -17,8 +17,8 @@ module.exports = { test: /\.tsx?$/, exclude: /node_modules/, use: [ - { loader: "ifdef-loader", options: opts }, { loader: "ts-loader", options: { configFile: "tsconfig.scripts.json" } }, + { loader: "ifdef-loader", options: opts }, ], include: [path.resolve(__dirname, `scripts/${name}.ts`)], }, diff --git a/webpack.config.signin-connect.js b/webpack.config.signin-connect.js index dfb20ca1..127a1d1f 100644 --- a/webpack.config.signin-connect.js +++ b/webpack.config.signin-connect.js @@ -17,8 +17,8 @@ module.exports = { test: /\.tsx?$/, exclude: /node_modules/, use: [ - { loader: "ifdef-loader", options: opts }, { loader: "ts-loader", options: { configFile: "tsconfig.scripts.json" } }, + { loader: "ifdef-loader", options: opts }, ], include: [path.resolve(__dirname, "src"), path.resolve(__dirname, `scripts/${name}.ts`)], }, diff --git a/webpack.config.ui.js b/webpack.config.ui.js index 7f6aede7..4299c5b6 100644 --- a/webpack.config.ui.js +++ b/webpack.config.ui.js @@ -17,8 +17,8 @@ module.exports = { test: /\.tsx?$/, exclude: /node_modules/, use: [ - { loader: "ifdef-loader", options: opts }, { loader: "ts-loader", options: { configFile: "tsconfig.scripts.json" } }, + { loader: "ifdef-loader", options: opts }, ], include: [path.resolve(__dirname, "src"), path.resolve(__dirname, `scripts/${name}.ts`)], }, From 10a920994bf166d34b8e6902ad0232e299acb229 Mon Sep 17 00:00:00 2001 From: Marcin S Date: Wed, 12 Jan 2022 14:43:35 -0600 Subject: [PATCH 11/29] Update tests to use siasky.net, remove references to SKYNET-TOKEN --- package.json | 3 -- src/portal-account.ts | 61 ++++-------------------- tests/integration/portal-account.test.ts | 17 ++----- tests/unit/portal-account.test.ts | 28 ++++++----- 4 files changed, 29 insertions(+), 80 deletions(-) diff --git a/package.json b/package.json index 8b1cd6b4..6cb58a1f 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,6 @@ "confusables": "^1.0.0", "crypto-browserify": "^3.12.0", "idb-keyval": "^6.0.3", - "jwt-decode": "^3.1.2", "mustache": "^4.2.0", "post-me": "^0.4.5", "punycode": "^2.1.1", @@ -66,7 +65,6 @@ "@skynetlabs/skynet-nodejs": "^2.4.0", "@tailwindcss/forms": "^0.4.0", "@types/jest": "^27.0.3", - "@types/jwt-encode": "^1.0.0", "@types/mustache": "^4.1.2", "@types/randombytes": "^2.0.0", "@types/url-join": "^4.0.1", @@ -80,7 +78,6 @@ "ifdef-loader": "^2.3.2", "jest": "^27.4.5", "jsdom": "^19.0.0", - "jwt-encode": "^1.0.1", "lint-staged": "^12.1.3", "postcss": "^8.4.5", "postcss-cli": "^9.1.0", diff --git a/src/portal-account.ts b/src/portal-account.ts index d66482c1..fe9f4909 100644 --- a/src/portal-account.ts +++ b/src/portal-account.ts @@ -1,5 +1,4 @@ import { AxiosResponse } from "axios"; -import jwt_decode from "jwt-decode"; import { KeyPair, RequestConfig, SkynetClient } from "skynet-js"; import type { CustomClientOptions } from "skynet-js"; import { sign } from "tweetnacl"; @@ -7,11 +6,6 @@ import { sign } from "tweetnacl"; import { genKeyPairFromHash, hashWithSalt } from "./crypto"; import { hexToUint8Array, stringToUint8ArrayUtf8, toHexString, validateHexString, validateUint8ArrayLen } from "./util"; -/** - * The name of the response header containing the JWT token. - */ -export const JWT_HEADER_NAME = "skynet-token"; - /** * The size of the expected signature. */ @@ -29,17 +23,6 @@ const CHALLENGE_TYPE_LOGIN = "skynet-portal-login"; */ const CHALLENGE_TYPE_REGISTER = "skynet-portal-register"; -export type JWTData = { session: { identity: { traits: { email: string } } } }; - -/** - * Hack that allows us to use ?. optional chaining on unknown types in Typescript. - * - * See https://github.com/microsoft/TypeScript/issues/37700#issuecomment-940865298 - */ -type Unreliable = { [P in keyof T]?: Unreliable } | undefined; - -type JWTResult = Unreliable; - /** * Custom register options. * @@ -137,7 +120,7 @@ export async function register( seed: Uint8Array, email: string, customOptions?: CustomRegisterOptions -): Promise { +): Promise { const opts = { ...DEFAULT_REGISTER_OPTIONS, ...client.customOptions, ...customOptions }; const { publicKey, privateKey } = genPortalLoginKeypair(seed, email); @@ -158,19 +141,12 @@ export async function register( signature: challengeResponse.signature, email, }; - const registerResponse = await client.executeRequest({ + await client.executeRequest({ endpointPath: opts.endpointRegister, method: "POST", subdomain: "account", data, }); - - const jwt = registerResponse.headers[JWT_HEADER_NAME]; - const decodedEmail = getEmailFromJWT(jwt); - if (decodedEmail !== email) { - throw new Error("Email not found in JWT or did not match provided email"); - } - return jwt; } /** @@ -187,7 +163,7 @@ export async function login( seed: Uint8Array, email: string, customOptions?: CustomLoginOptions -): Promise { +): Promise { const opts = { ...DEFAULT_LOGIN_OPTIONS, ...client.customOptions, ...customOptions }; const { publicKey, privateKey } = genPortalLoginKeypair(seed, email); @@ -204,21 +180,12 @@ export async function login( const challengeResponse = signChallenge(privateKey, challenge, CHALLENGE_TYPE_LOGIN, portalRecipient); const data = challengeResponse; - const loginResponse = await client.executeRequest({ + await client.executeRequest({ endpointPath: opts.endpointLogin, method: "POST", subdomain: "account", data, }); - - const jwt = loginResponse.headers[JWT_HEADER_NAME]; - const decodedEmail = getEmailFromJWT(jwt); - if (decodedEmail !== email) { - throw new Error( - `Email not found in JWT or did not match provided email. Expected: '${email}', received: '${decodedEmail}'` - ); - } - return jwt; } /** @@ -242,17 +209,6 @@ export async function logout(client: SkynetClient, customOptions?: CustomLogoutO // Helpers // ======= -/** - * Decodes the given JWT and extracts the email, if found. - * - * @param jwt - The given JWT string. - * @returns - The email in the JWT, or undefined. - */ -export function getEmailFromJWT(jwt: string): string | undefined { - const decodedJWT = jwt_decode(jwt) as JWTResult; - return decodedJWT?.session?.identity?.traits?.email; -} - /** * Signs the given challenge. * @@ -303,15 +259,16 @@ function genPortalLoginKeypair(seed: Uint8Array, email: string): KeyPair { } /** - * Gets the portal recipient string from the portal URL, e.g. siasky.net => - * siasky.net, dev1.siasky.dev => siasky.dev. + * Gets the portal recipient string from the portal URL, e.g. https://siasky.net + * => https://siasky.net, https://dev1.siasky.dev => https://siasky.dev. * * @param portalUrl - The full portal URL. * @returns - The shortened portal recipient name. */ -function getPortalRecipient(portalUrl: string): string { +export function getPortalRecipient(portalUrl: string): string { const url = new URL(portalUrl); // Get last two portions of the hostname. - return url.hostname.split(".").slice(-2).join("."); + const domain = url.hostname.split(".").slice(-2).join("."); + return `https://${domain}`; } diff --git a/tests/integration/portal-account.test.ts b/tests/integration/portal-account.test.ts index 98e99435..92fe4e94 100644 --- a/tests/integration/portal-account.test.ts +++ b/tests/integration/portal-account.test.ts @@ -1,11 +1,10 @@ -import { SkynetClient } from "skynet-js"; +import { DEFAULT_SKYNET_PORTAL_URL, SkynetClient } from "skynet-js"; import { randomAsciiString } from "../utils"; import { generatePhrase, phraseToSeed } from "../../src/seed"; -import { getEmailFromJWT, login, register } from "../../src/portal-account"; +import { login, register } from "../../src/portal-account"; -// TODO: Remove hard-coded URL. -const portalUrl = "https://siasky.xyz"; +const portalUrl = DEFAULT_SKYNET_PORTAL_URL; const client = new SkynetClient(portalUrl); const phrase = generatePhrase(); const seed = phraseToSeed(phrase); @@ -13,17 +12,11 @@ const email = `${randomAsciiString(20)}@bar.com`; describe("Integration tests for registration and login", () => { it("should register a new user on the portal", async () => { - const jwt = await register(client, seed, email); - - expect(jwt).not.toEqual(""); - expect(getEmailFromJWT(jwt)).toEqual(email); + await register(client, seed, email); }); it("should login to an existing user on the portal", async () => { // Log into the user that was registered above. - const jwt = await login(client, seed, email); - - expect(jwt).not.toEqual(""); - expect(getEmailFromJWT(jwt)).toEqual(email); + await login(client, seed, email); }); }); diff --git a/tests/unit/portal-account.test.ts b/tests/unit/portal-account.test.ts index dd6233f0..5b4e2120 100644 --- a/tests/unit/portal-account.test.ts +++ b/tests/unit/portal-account.test.ts @@ -1,8 +1,7 @@ -import sign from "jwt-encode"; import { DEFAULT_SKYNET_PORTAL_URL, SkynetClient } from "skynet-js"; import { phraseToSeed } from "../../src/seed"; -import { login, register, JWT_HEADER_NAME, JWTData } from "../../src/portal-account"; +import { login, register, getPortalRecipient } from "../../src/portal-account"; const portalUrl = DEFAULT_SKYNET_PORTAL_URL; const client = new SkynetClient(portalUrl); @@ -12,12 +11,7 @@ const pubKey = "0fce18836a7f730ad8d0442c8f311530297ce2807456f1454a9a755cde5333a4 const email = "foo@bar.com"; const challenge = "490ccffbbbcc304652488903ca425d42490ccffbbbcc304652488903ca425d42"; -const jwtData: JWTData = { - session: { identity: { traits: { email } } }, -}; -const cookie = sign(jwtData, ""); const headers: Record = {}; -headers[JWT_HEADER_NAME] = cookie; client.executeRequest = jest.fn(); @@ -34,9 +28,7 @@ describe("Unit tests for registration and login", () => { headers, }); - const receivedCookie = await register(client, seed, email); - - expect(receivedCookie).toEqual(cookie); + await register(client, seed, email); expect(client.executeRequest).toHaveBeenCalledWith({ endpointPath: "/api/register", @@ -65,9 +57,7 @@ describe("Unit tests for registration and login", () => { headers, }); - const receivedCookie = await login(client, seed, email); - - expect(receivedCookie).toEqual(cookie); + await login(client, seed, email); expect(client.executeRequest).toHaveBeenCalledWith({ endpointPath: "/api/login", @@ -84,3 +74,15 @@ describe("Unit tests for registration and login", () => { ); }); }); + +describe("getPortalRecipient", () => { + const cases = [ + ["https://siasky.net", "https://siasky.net"], + ["https://dev1.siasky.dev", "https://siasky.dev"], + ]; + + it.each(cases)("(%s) should return '%s'", (portalUrl, expectedRecipient) => { + const recipient = getPortalRecipient(portalUrl); + expect(recipient).toEqual(expectedRecipient); + }); +}); From 3d3ce5295bb467de67bb7b93ac59052a949d613b Mon Sep 17 00:00:00 2001 From: Marcin S Date: Thu, 13 Jan 2022 14:42:51 -0600 Subject: [PATCH 12/29] Address review comments --- scripts/ui.ts | 41 ++++++++++++++++++++++++----------------- src/mysky.ts | 31 ++++++++++++++++++------------- 2 files changed, 42 insertions(+), 30 deletions(-) diff --git a/scripts/ui.ts b/scripts/ui.ts index 8abb704d..e3b9caad 100644 --- a/scripts/ui.ts +++ b/scripts/ui.ts @@ -26,6 +26,8 @@ import { log } from "../src/util"; const RELATIVE_SEED_SELECTION_DISPLAY_URL = "seed-selection.html"; const RELATIVE_SIGNIN_CONNECT_DISPLAY_URL = "signin-connect.html"; +const MYSKY_PORTAL_LOGIN_TIMEOUT = 30000; + const client = new SkynetClient(); let parentConnection: Connection | null = null; @@ -116,7 +118,7 @@ async function requestLoginAccess(permissions: Permission[]): Promise<[boolean, saveSeedAndEmail(seed, email); // Wait for Main MySky to login successfully. - await waitForMySkyPortalLogin(); + await resolveOnMySkyPortalLogin(); // Pass in any request permissions and get a permissions response. const permissionsResponse = await getPermissions(seed, permissions); @@ -448,23 +450,28 @@ async function setupAndRunDisplay(displayUrl: string, methodName: string, ... } /** - * Waits for portal login on Main MySky to complete. + * Resolves when portal login on Main MySky completes. + * + * @returns - An empty promise. */ -async function waitForMySkyPortalLogin(): Promise { - return new Promise((resolve, reject) => - window.addEventListener("storage", async ({ key, newValue }: StorageEvent) => { - if (key !== PORTAL_LOGIN_COMPLETE_SENTINEL_KEY) { - return; - } - - // Check for errors from Main MySky. - if (newValue !== "") { - reject(newValue); - } - - resolve(); - }) - ); +async function resolveOnMySkyPortalLogin(): Promise { + return Promise.race([ + new Promise((resolve, reject) => + window.addEventListener("storage", async ({ key, newValue }: StorageEvent) => { + if (key !== PORTAL_LOGIN_COMPLETE_SENTINEL_KEY) { + return; + } + + // Check for errors from Main MySky. + if (newValue !== "") { + reject(newValue); + } + + resolve(); + }) + ), + new Promise((_, reject) => setTimeout(reject, MYSKY_PORTAL_LOGIN_TIMEOUT)), + ]); } // ======= diff --git a/src/mysky.ts b/src/mysky.ts index 7e7c51f5..c1392c9e 100644 --- a/src/mysky.ts +++ b/src/mysky.ts @@ -424,6 +424,9 @@ export class MySky { const methods = { checkLogin: this.checkLogin.bind(this), + // NOTE: `getEncryptedFileSeed` was renamed to `getEncryptedPathSeed`, but + // we still expose `getEncryptedFileSeed` in the API for backwards + // compatibility. getEncryptedFileSeed: this.getEncryptedPathSeed.bind(this), getEncryptedPathSeed: this.getEncryptedPathSeed.bind(this), getPreferredPortal: this.getPreferredPortal.bind(this), @@ -437,7 +440,7 @@ export class MySky { // Enable communication with connector in parent skapp. - log("Making handshake"); + log("Performing handshake"); const messenger = new WindowMessenger({ localWindow: window, remoteWindow: window.parent, @@ -471,10 +474,9 @@ export class MySky { * Checks for the preferred portal and stored email in user settings, and sets * them if found. * - * @param _seed - The user seed. * @returns - The portal and email, if found. */ - protected async getUserSettings(_seed: Uint8Array): Promise { + protected async getUserSettings(): Promise { let email = null, portal = null; @@ -491,7 +493,12 @@ export class MySky { return { portal, email }; } - protected async setUserSettings(_seed: Uint8Array, settings: UserSettings): Promise { + /** + * Sets the user settings. + * + * @param settings - The given user settings. + */ + protected async setUserSettings(settings: UserSettings): Promise { // Get the settings path for the MySky domain. const path = await this.getUserSettingsPath(); @@ -526,7 +533,6 @@ export class MySky { return { data: json }; } - // TODO /** * Sets Encrypted JSON at the given path through MySky, if the user has given * Hidden Write permissions to do so. @@ -637,8 +643,6 @@ export class MySky { }; } - // TODO: Figure out how to get stored data to persist across redirect. - // TODO: Signal to MySky UI that we are done. /** * Set up a listener for the storage event. Triggered when the seed is set. * Unloads the permission provider to disable MySky functionality until the @@ -699,7 +703,7 @@ export class MySky { // Login to portal. { // Get the preferred portal and switch to it. - const { portal: preferredPortal, email } = await this.getUserSettings(seed); + const { portal: preferredPortal, email } = await this.getUserSettings(); let storedEmail = email; // Set the portal @@ -709,10 +713,10 @@ export class MySky { // signed up with it -- check local storage. We don't need to do this if // the email was already found. // TODO: Add dedicated flow(s) for changing the email after it's set. - let isEmailProvided = false; + let isEmailProvidedByUser = false; if (!storedEmail) { storedEmail = checkStoredEmail(); - isEmailProvided = storedEmail !== null; + isEmailProvidedByUser = storedEmail !== null; } if (storedEmail) { @@ -722,9 +726,10 @@ export class MySky { // Set up auto re-login on JWT expiry. this.setupAutoRelogin(seed, storedEmail); - // Save the email in user settings. - if (isEmailProvided) { - await this.setUserSettings(seed, { portal: preferredPortal, email: storedEmail }); + // Save the email in user settings. Do this after we've connected to + // the portal account so we know that the email is valid. + if (isEmailProvidedByUser) { + await this.setUserSettings({ portal: preferredPortal, email: storedEmail }); } } } From 6a197181ed9b73184d6ea6bccfc50cefa56c06bd Mon Sep 17 00:00:00 2001 From: Marcin S Date: Fri, 14 Jan 2022 13:01:58 -0600 Subject: [PATCH 13/29] Fix build errors --- html/seed-display.html | 2 +- package-lock.json | 6599 +++++++++++++++++++++++++++++----------- package.json | 3 +- src/mysky.ts | 2 +- 4 files changed, 4808 insertions(+), 1798 deletions(-) diff --git a/html/seed-display.html b/html/seed-display.html index 682b66d9..24edc4ef 100644 --- a/html/seed-display.html +++ b/html/seed-display.html @@ -245,7 +245,7 @@

} function confirmStoredPassphrase() { - if (seedConfirm.checked) { + if (uiSeedConfirm.checked) { uiSignupSubmit.removeAttribute("disabled") } else { uiSignupSubmit.setAttribute("disabled", "disabled") diff --git a/package-lock.json b/package-lock.json index 932d0eb8..75bce6bd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,6 +11,7 @@ "dependencies": { "buffer": "^6.0.3", "confusables": "^1.1.0", + "core-js": "^3.20.2", "crypto-browserify": "^3.12.0", "idb-keyval": "^6.1.0", "jwt-decode": "^3.1.2", @@ -18,7 +19,7 @@ "post-me": "^0.4.5", "punycode": "^2.1.1", "randombytes": "^2.1.0", - "skynet-js": "^4.0.20-beta", + "skynet-js": "^4.0.22-beta", "skynet-mysky-utils": "^0.3.0", "stream-browserify": "^3.0.0", "tweetnacl": "^1.0.3", @@ -79,20 +80,20 @@ } }, "node_modules/@babel/core": { - "version": "7.14.0", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.14.0.tgz", - "integrity": "sha512-8YqpRig5NmIHlMLw09zMlPTvUVMILjqCOtVgu+TVNWEBvy9b5I3RRyhqnrV4hjgEK7n8P9OqvkWJAFmEL6Wwfw==", + "version": "7.16.7", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.16.7.tgz", + "integrity": "sha512-aeLaqcqThRNZYmbMqtulsetOQZ/5gbR/dWruUCJcpas4Qoyy+QeagfDsPdMrqwsPRDNxJvBlRiZxxX7THO7qtA==", "dev": true, "dependencies": { - "@babel/code-frame": "^7.12.13", - "@babel/generator": "^7.14.0", - "@babel/helper-compilation-targets": "^7.13.16", - "@babel/helper-module-transforms": "^7.14.0", - "@babel/helpers": "^7.14.0", - "@babel/parser": "^7.14.0", - "@babel/template": "^7.12.13", - "@babel/traverse": "^7.14.0", - "@babel/types": "^7.14.0", + "@babel/code-frame": "^7.16.7", + "@babel/generator": "^7.16.7", + "@babel/helper-compilation-targets": "^7.16.7", + "@babel/helper-module-transforms": "^7.16.7", + "@babel/helpers": "^7.16.7", + "@babel/parser": "^7.16.7", + "@babel/template": "^7.16.7", + "@babel/traverse": "^7.16.7", + "@babel/types": "^7.16.7", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -447,14 +448,17 @@ } }, "node_modules/@babel/helpers": { - "version": "7.14.0", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.0.tgz", - "integrity": "sha512-+ufuXprtQ1D1iZTO/K9+EBRn+qPWMJjZSw/S0KlFrxCw4tkrzv9grgpDHkY9MeQTjTY8i2sp7Jep8DfU6tN9Mg==", + "version": "7.16.7", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.16.7.tgz", + "integrity": "sha512-9ZDoqtfY7AuEOt3cxchfii6C7GDyyMBffktR5B2jvWv8u2+efwvpnVKXMWzNehqy68tKgAfSwfdw/lWpthS2bw==", "dev": true, "dependencies": { - "@babel/template": "^7.12.13", - "@babel/traverse": "^7.14.0", - "@babel/types": "^7.14.0" + "@babel/template": "^7.16.7", + "@babel/traverse": "^7.16.7", + "@babel/types": "^7.16.7" + }, + "engines": { + "node": ">=6.9.0" } }, "node_modules/@babel/highlight": { @@ -471,68 +475,6 @@ "node": ">=6.9.0" } }, - "node_modules/@babel/highlight/node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "dependencies": { - "color-convert": "^1.9.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/@babel/highlight/node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true - }, - "node_modules/@babel/highlight/node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/@babel/parser": { "version": "7.16.8", "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.8.tgz", @@ -1752,9 +1694,9 @@ "dev": true }, "node_modules/@discoveryjs/json-ext": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.2.tgz", - "integrity": "sha512-HyYEUDeIj5rRQU2Hk5HTB2uHsbRQpF70nvMhVzi+VJR0X+xNEhjPui4/kBf3VeH/wqD28PT4sVOm8qqLjBrSZg==", + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.6.tgz", + "integrity": "sha512-ws57AidsDvREKrZKYffXddNkyaF14iHNHm8VQnZH6t99E8gczjNN0GpvcGny0imC80yQ0tHz1xVUKk/KFQSUyA==", "dev": true, "engines": { "node": ">=10.0.0" @@ -1794,12 +1736,6 @@ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, - "node_modules/@eslint/eslintrc/node_modules/argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true - }, "node_modules/@eslint/eslintrc/node_modules/globals": { "version": "13.12.0", "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz", @@ -1815,16 +1751,13 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/@eslint/eslintrc/node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "node_modules/@eslint/eslintrc/node_modules/ignore": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", + "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", "dev": true, - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" + "engines": { + "node": ">= 4" } }, "node_modules/@eslint/eslintrc/node_modules/type-fest": { @@ -1875,6 +1808,28 @@ "node": ">=8" } }, + "node_modules/@istanbuljs/load-nyc-config/node_modules/argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dev": true, + "dependencies": { + "sprintf-js": "~1.0.2" + } + }, + "node_modules/@istanbuljs/load-nyc-config/node_modules/js-yaml": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "dev": true, + "dependencies": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, "node_modules/@istanbuljs/load-nyc-config/node_modules/resolve-from": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", @@ -1910,6 +1865,76 @@ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" } }, + "node_modules/@jest/console/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/@jest/console/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/@jest/console/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/@jest/console/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/@jest/console/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/@jest/console/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/@jest/core": { "version": "27.4.7", "resolved": "https://registry.npmjs.org/@jest/core/-/core-27.4.7.tgz", @@ -1957,6 +1982,76 @@ } } }, + "node_modules/@jest/core/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/@jest/core/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/@jest/core/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/@jest/core/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/@jest/core/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/@jest/core/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/@jest/environment": { "version": "27.4.6", "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.4.6.tgz", @@ -2047,18 +2142,88 @@ } } }, - "node_modules/@jest/reporters/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "node_modules/@jest/reporters/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, "engines": { - "node": ">=0.10.0" + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/@jest/source-map": { - "version": "27.4.0", - "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-27.4.0.tgz", + "node_modules/@jest/reporters/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/@jest/reporters/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/@jest/reporters/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/@jest/reporters/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/@jest/reporters/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/@jest/reporters/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@jest/source-map": { + "version": "27.4.0", + "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-27.4.0.tgz", "integrity": "sha512-Ntjx9jzP26Bvhbm93z/AKcPRj/9wrkI88/gK60glXDx1q+IeI0rf7Lw2c89Ch6ofonB0On/iRDreQuQ6te9pgQ==", "dev": true, "dependencies": { @@ -2135,6 +2300,64 @@ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" } }, + "node_modules/@jest/transform/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/@jest/transform/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/@jest/transform/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/@jest/transform/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/@jest/transform/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/@jest/transform/node_modules/source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -2144,6 +2367,18 @@ "node": ">=0.10.0" } }, + "node_modules/@jest/transform/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/@jest/types": { "version": "27.4.2", "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.4.2.tgz", @@ -2160,13 +2395,83 @@ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" } }, + "node_modules/@jest/types/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/@jest/types/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/@jest/types/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/@jest/types/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/@jest/types/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/@jest/types/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/@nodelib/fs.scandir": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz", - "integrity": "sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==", + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", "dev": true, "dependencies": { - "@nodelib/fs.stat": "2.0.4", + "@nodelib/fs.stat": "2.0.5", "run-parallel": "^1.1.9" }, "engines": { @@ -2174,21 +2479,21 @@ } }, "node_modules/@nodelib/fs.stat": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz", - "integrity": "sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", "dev": true, "engines": { "node": ">= 8" } }, "node_modules/@nodelib/fs.walk": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz", - "integrity": "sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==", + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", "dev": true, "dependencies": { - "@nodelib/fs.scandir": "2.1.4", + "@nodelib/fs.scandir": "2.1.5", "fastq": "^1.6.0" }, "engines": { @@ -2285,12 +2590,12 @@ } }, "node_modules/@tootallnate/once": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", - "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", + "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", "dev": true, "engines": { - "node": ">= 6" + "node": ">= 10" } }, "node_modules/@types/babel__core": { @@ -2335,9 +2640,9 @@ } }, "node_modules/@types/eslint": { - "version": "7.2.10", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.10.tgz", - "integrity": "sha512-kUEPnMKrqbtpCq/KTaGFFKAcz6Ethm2EjCoKIDaCmfRBWLbFuTcOJfTlorwbnboXBzahqWLgUp1BQeKHiJzPUQ==", + "version": "8.2.2", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.2.2.tgz", + "integrity": "sha512-nQxgB8/Sg+QKhnV8e0WzPpxjIGT3tuJDDzybkDi8ItE/IgTlHo07U0shaIjzhcvQxlq9SDRE42lsJ23uvEgJ2A==", "dev": true, "dependencies": { "@types/estree": "*", @@ -2345,9 +2650,9 @@ } }, "node_modules/@types/eslint-scope": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.0.tgz", - "integrity": "sha512-O/ql2+rrCUe2W2rs7wMR+GqPRcgB6UiqN5RhrR5xruFlY7l9YLMn0ZkDzjoHLeiFkR8MCQZVudUuuvQ2BLC9Qw==", + "version": "3.7.3", + "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz", + "integrity": "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==", "dev": true, "dependencies": { "@types/eslint": "*", @@ -2370,9 +2675,9 @@ } }, "node_modules/@types/istanbul-lib-coverage": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz", - "integrity": "sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz", + "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==", "dev": true }, "node_modules/@types/istanbul-lib-report": { @@ -2385,9 +2690,9 @@ } }, "node_modules/@types/istanbul-reports": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz", - "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz", + "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==", "dev": true, "dependencies": { "@types/istanbul-lib-report": "*" @@ -2422,9 +2727,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "15.0.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-15.0.1.tgz", - "integrity": "sha512-TMkXt0Ck1y0KKsGr9gJtWGjttxlZnnvDtphxUOSd0bfaR6Q1jle+sPvrzNR1urqYTWMinoKvjKfXUGsumaO1PA==", + "version": "17.0.8", + "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.8.tgz", + "integrity": "sha512-YofkM6fGv4gDJq78g4j0mMuGMkZVxZDgtU0JRdx6FgiJDG+0fY0GKVolOV8WqVmEhLCXkQRjwDdKyPxJp/uucg==", "dev": true }, "node_modules/@types/parse-json": { @@ -2508,15 +2813,6 @@ } } }, - "node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": { - "version": "5.1.8", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", - "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==", - "dev": true, - "engines": { - "node": ">= 4" - } - }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": { "version": "7.3.5", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", @@ -2698,15 +2994,6 @@ "url": "https://opencollective.com/typescript-eslint" } }, - "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz", - "integrity": "sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA==", - "dev": true, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - } - }, "node_modules/@webassemblyjs/ast": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz", @@ -2908,9 +3195,9 @@ "dev": true }, "node_modules/acorn": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", - "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz", + "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==", "dev": true, "bin": { "acorn": "bin/acorn" @@ -2929,6 +3216,27 @@ "acorn-walk": "^7.1.1" } }, + "node_modules/acorn-globals/node_modules/acorn": { + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", + "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", + "dev": true, + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-import-assertions": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", + "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==", + "dev": true, + "peerDependencies": { + "acorn": "^8" + } + }, "node_modules/acorn-jsx": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", @@ -2949,6 +3257,18 @@ "xtend": "^4.0.2" } }, + "node_modules/acorn-node/node_modules/acorn": { + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", + "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", + "dev": true, + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/acorn-walk": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz", @@ -3042,18 +3362,15 @@ } }, "node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "dependencies": { + "color-convert": "^1.9.0" }, "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" + "node": ">=4" } }, "node_modules/anymatch": { @@ -3076,13 +3393,10 @@ "dev": true }, "node_modules/argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "dependencies": { - "sprintf-js": "~1.0.2" - } + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true }, "node_modules/array-union": { "version": "2.1.0", @@ -3125,17 +3439,17 @@ "dev": true }, "node_modules/autoprefixer": { - "version": "10.4.0", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.0.tgz", - "integrity": "sha512-7FdJ1ONtwzV1G43GDD0kpVMn/qbiNqyOPMFTX5nRffI+7vgWoFEc6DcXOxHJxrWNDXrZh18eDsZjvZGUljSRGA==", + "version": "10.4.2", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.2.tgz", + "integrity": "sha512-9fOPpHKuDW1w/0EKfRmVnxTDt8166MAnLI3mgZ1JCnhNtYWxcJ6Ud5CO/AVOZi/AvFa8DY9RTy3h3+tFBlrrdQ==", "dev": true, "dependencies": { - "browserslist": "^4.17.5", - "caniuse-lite": "^1.0.30001272", - "fraction.js": "^4.1.1", + "browserslist": "^4.19.1", + "caniuse-lite": "^1.0.30001297", + "fraction.js": "^4.1.2", "normalize-range": "^0.1.2", "picocolors": "^1.0.0", - "postcss-value-parser": "^4.1.0" + "postcss-value-parser": "^4.2.0" }, "bin": { "autoprefixer": "bin/autoprefixer" @@ -3181,6 +3495,76 @@ "@babel/core": "^7.8.0" } }, + "node_modules/babel-jest/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/babel-jest/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/babel-jest/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/babel-jest/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/babel-jest/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/babel-jest/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/babel-plugin-dynamic-import-node": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz", @@ -3532,9 +3916,9 @@ } }, "node_modules/buffer-from": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", - "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", "dev": true }, "node_modules/buffer-xor": { @@ -3593,19 +3977,17 @@ } }, "node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" }, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" + "node": ">=4" } }, "node_modules/char-regex": { @@ -3638,6 +4020,18 @@ "fsevents": "~2.3.2" } }, + "node_modules/chokidar/node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/chrome-trace-event": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz", @@ -3705,77 +4099,44 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/cli-truncate/node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "node_modules/cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" } }, - "node_modules/cli-truncate/node_modules/emoji-regex": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "node_modules/cliui/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", "dev": true }, - "node_modules/cli-truncate/node_modules/is-fullwidth-code-point": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz", - "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/cli-truncate/node_modules/string-width": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.0.1.tgz", - "integrity": "sha512-5ohWO/M4//8lErlUUtrFy3b11GtNOuMOU0ysKCDXFcfXuuvUXu95akgj/i8ofmaGdN0hCqyl6uu9i8dS/mQp5g==", + "node_modules/cliui/node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "dev": true, - "dependencies": { - "emoji-regex": "^9.2.2", - "is-fullwidth-code-point": "^4.0.0", - "strip-ansi": "^7.0.1" - }, "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">=8" } }, - "node_modules/cli-truncate/node_modules/strip-ansi": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz", - "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==", + "node_modules/cliui/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, "dependencies": { - "ansi-regex": "^6.0.1" + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" }, "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, - "node_modules/cliui": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", - "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", - "dev": true, - "dependencies": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", - "wrap-ansi": "^7.0.0" + "node": ">=8" } }, "node_modules/clone-deep": { @@ -3809,27 +4170,24 @@ "dev": true }, "node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", "dev": true, "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" + "color-name": "1.1.3" } }, "node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", "dev": true }, "node_modules/colorette": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz", - "integrity": "sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==", + "version": "2.0.16", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz", + "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==", "dev": true }, "node_modules/combine-errors": { @@ -3854,12 +4212,12 @@ } }, "node_modules/commander": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", - "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz", + "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==", "dev": true, "engines": { - "node": ">= 10" + "node": ">= 12" } }, "node_modules/comment-parser": { @@ -3887,14 +4245,24 @@ } }, "node_modules/convert-source-map": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", - "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==", + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz", + "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==", "dev": true, "dependencies": { "safe-buffer": "~5.1.1" } }, + "node_modules/core-js": { + "version": "3.20.2", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.20.2.tgz", + "integrity": "sha512-nuqhq11DcOAbFBV4zCbKeGbKQsUDRqTX0oqx7AttUBuqe3h20ixsE039QHelbL6P4h+9kytVqyEtyZ6gsiwEYw==", + "hasInstallScript": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/core-js" + } + }, "node_modules/core-js-compat": { "version": "3.20.2", "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.20.2.tgz", @@ -4063,15 +4431,6 @@ "node": ">=12" } }, - "node_modules/data-urls/node_modules/whatwg-mimetype": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz", - "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==", - "dev": true, - "engines": { - "node": ">=12" - } - }, "node_modules/debug": { "version": "4.3.3", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", @@ -4102,9 +4461,9 @@ "dev": true }, "node_modules/deep-is": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", - "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", "dev": true }, "node_modules/deepmerge": { @@ -4248,25 +4607,22 @@ } }, "node_modules/domexception": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz", - "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz", + "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==", "dev": true, "dependencies": { - "webidl-conversions": "^5.0.0" + "webidl-conversions": "^7.0.0" }, "engines": { - "node": ">=8" + "node": ">=12" } }, - "node_modules/domexception/node_modules/webidl-conversions": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz", - "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==", - "dev": true, - "engines": { - "node": ">=8" - } + "node_modules/eastasianwidth": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", + "dev": true }, "node_modules/electron-to-chromium": { "version": "1.4.45", @@ -4306,10 +4662,10 @@ } }, "node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "dev": true }, "node_modules/emojis-list": { "version": "3.0.0", @@ -4367,9 +4723,9 @@ } }, "node_modules/es-module-lexer": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.0.tgz", - "integrity": "sha512-qU2eN/XHsrl3E4y7mK1wdWnyy5c8gXtCbfP6Xcsemm7fPUR1PIV1JhZfP7ojcN0Fzp69CfrS3u76h2tusvfKiQ==", + "version": "0.9.3", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz", + "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==", "dev": true }, "node_modules/escalade": { @@ -4413,9 +4769,9 @@ } }, "node_modules/escodegen/node_modules/estraverse": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", - "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true, "engines": { "node": ">=4.0" @@ -4617,19 +4973,71 @@ "eslint": ">=5" } }, + "node_modules/eslint-utils/node_modules/eslint-visitor-keys": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", + "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", + "dev": true, + "engines": { + "node": ">=10" + } + }, "node_modules/eslint-visitor-keys": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz", - "integrity": "sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz", + "integrity": "sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA==", + "dev": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/eslint/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/eslint/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, "engines": { "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/eslint/node_modules/argparse": { + "node_modules/eslint/node_modules/color-convert": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/eslint/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, "node_modules/eslint/node_modules/escape-string-regexp": { @@ -4657,15 +5065,6 @@ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, - "node_modules/eslint/node_modules/eslint-visitor-keys": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz", - "integrity": "sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA==", - "dev": true, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - } - }, "node_modules/eslint/node_modules/estraverse": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", @@ -4675,22 +5074,10 @@ "node": ">=4.0" } }, - "node_modules/eslint/node_modules/glob-parent": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", - "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", - "dev": true, - "dependencies": { - "is-glob": "^4.0.3" - }, - "engines": { - "node": ">=10.13.0" - } - }, "node_modules/eslint/node_modules/globals": { - "version": "13.8.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.8.0.tgz", - "integrity": "sha512-rHtdA6+PDBIjeEvA91rpqzEvk/k3/i7EeNQiryiWuJH0Hw9cpyJMAt2jtbAwUaRdhD+573X4vWw6IcjKPasi9Q==", + "version": "13.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz", + "integrity": "sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==", "dev": true, "dependencies": { "type-fest": "^0.20.2" @@ -4702,16 +5089,22 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/eslint/node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "node_modules/eslint/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true, - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" + "engines": { + "node": ">=8" + } + }, + "node_modules/eslint/node_modules/ignore": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", + "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", + "dev": true, + "engines": { + "node": ">= 4" } }, "node_modules/eslint/node_modules/semver": { @@ -4729,6 +5122,18 @@ "node": ">=10" } }, + "node_modules/eslint/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/eslint/node_modules/type-fest": { "version": "0.20.2", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", @@ -4755,27 +5160,6 @@ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, - "node_modules/espree/node_modules/acorn": { - "version": "8.7.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz", - "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==", - "dev": true, - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/espree/node_modules/eslint-visitor-keys": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz", - "integrity": "sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA==", - "dev": true, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - } - }, "node_modules/esprima": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", @@ -4802,9 +5186,9 @@ } }, "node_modules/esquery/node_modules/estraverse": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", - "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true, "engines": { "node": ">=4.0" @@ -4823,9 +5207,9 @@ } }, "node_modules/esrecurse/node_modules/estraverse": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", - "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true, "engines": { "node": ">=4.0" @@ -4921,9 +5305,9 @@ "dev": true }, "node_modules/fast-glob": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz", - "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==", + "version": "3.2.10", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.10.tgz", + "integrity": "sha512-s9nFhFnvR63wls6/kM88kQqDhMu0AfdjqouE2l5GVQPbqLgyFjjU5ry/r2yKsJxpb9Py1EYNqieFrmMaX4v++A==", "dev": true, "dependencies": { "@nodelib/fs.stat": "^2.0.2", @@ -4933,7 +5317,19 @@ "micromatch": "^4.0.4" }, "engines": { - "node": ">=8" + "node": ">=8.6.0" + } + }, + "node_modules/fast-glob/node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" } }, "node_modules/fast-json-stable-stringify": { @@ -4955,9 +5351,9 @@ "dev": true }, "node_modules/fastq": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz", - "integrity": "sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==", + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz", + "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==", "dev": true, "dependencies": { "reusify": "^1.0.4" @@ -5023,15 +5419,15 @@ } }, "node_modules/flatted": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz", - "integrity": "sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==", + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.4.tgz", + "integrity": "sha512-8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw==", "dev": true }, "node_modules/follow-redirects": { - "version": "1.14.4", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.4.tgz", - "integrity": "sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g==", + "version": "1.14.7", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz", + "integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==", "funding": [ { "type": "individual", @@ -5062,9 +5458,9 @@ } }, "node_modules/fraction.js": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.1.1.tgz", - "integrity": "sha512-MHOhvvxHTfRFpF1geTK9czMIZ6xclsEor2wkIGYYq+PxcQqT7vStJqjhe6S1TenZrMZzo+wlqOufBDVepUEgPg==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.1.2.tgz", + "integrity": "sha512-o2RiJQ6DZaR/5+Si0qJUIy637QMRudSi9kU/FFzx9EZazrIdnBgpU+3sEWCxAVhH2RtxW2Oz+T4p2o8uOPVcgA==", "dev": true, "engines": { "node": "*" @@ -5088,15 +5484,6 @@ "node": ">=12" } }, - "node_modules/fs-extra/node_modules/universalify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", - "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", - "dev": true, - "engines": { - "node": ">= 10.0.0" - } - }, "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -5195,9 +5582,9 @@ } }, "node_modules/glob": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", - "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", + "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", "dev": true, "dependencies": { "fs.realpath": "^1.0.0", @@ -5215,15 +5602,15 @@ } }, "node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", "dev": true, "dependencies": { - "is-glob": "^4.0.1" + "is-glob": "^4.0.3" }, "engines": { - "node": ">= 6" + "node": ">=10.13.0" } }, "node_modules/glob-to-regexp": { @@ -5242,16 +5629,16 @@ } }, "node_modules/globby": { - "version": "11.0.4", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz", - "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==", + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", + "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", "dev": true, "dependencies": { "array-union": "^2.1.0", "dir-glob": "^3.0.1", - "fast-glob": "^3.1.1", - "ignore": "^5.1.4", - "merge2": "^1.3.0", + "fast-glob": "^3.2.9", + "ignore": "^5.2.0", + "merge2": "^1.4.1", "slash": "^3.0.0" }, "engines": { @@ -5261,15 +5648,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/globby/node_modules/ignore": { - "version": "5.1.8", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", - "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==", - "dev": true, - "engines": { - "node": ">= 4" - } - }, "node_modules/graceful-fs": { "version": "4.2.9", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz", @@ -5288,12 +5666,12 @@ } }, "node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", "dev": true, "engines": { - "node": ">=8" + "node": ">=4" } }, "node_modules/has-symbols": { @@ -5360,15 +5738,15 @@ } }, "node_modules/html-encoding-sniffer": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz", - "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz", + "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==", "dev": true, "dependencies": { - "whatwg-encoding": "^1.0.5" + "whatwg-encoding": "^2.0.0" }, "engines": { - "node": ">=10" + "node": ">=12" } }, "node_modules/html-escaper": { @@ -5378,12 +5756,12 @@ "dev": true }, "node_modules/http-proxy-agent": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", - "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", + "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", "dev": true, "dependencies": { - "@tootallnate/once": "1", + "@tootallnate/once": "2", "agent-base": "6", "debug": "4" }, @@ -5429,12 +5807,12 @@ } }, "node_modules/iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", "dev": true, "dependencies": { - "safer-buffer": ">= 2.1.2 < 3" + "safer-buffer": ">= 2.1.2 < 3.0.0" }, "engines": { "node": ">=0.10.0" @@ -5477,26 +5855,14 @@ } }, "node_modules/ignore": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", - "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", + "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==", "dev": true, "engines": { "node": ">= 4" } }, - "node_modules/import-cwd": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-3.0.0.tgz", - "integrity": "sha512-4pnzH16plW+hgvRECbDWpQl3cqtvSofHWh44met7ESfZ8UZOWWddm8hEyDTqREJ9RbYHY8gi8DqmaelApoOGMg==", - "dev": true, - "dependencies": { - "import-from": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/import-fresh": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", @@ -5513,31 +5879,10 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/import-from": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/import-from/-/import-from-3.0.0.tgz", - "integrity": "sha512-CiuXOFFSzkU5x/CR0+z7T91Iht4CXgfCxVOFRhh2Zyhg5wOpWvvDLQUsWl+gcN+QscYBjez8hDCt85O7RLDttQ==", - "dev": true, - "dependencies": { - "resolve-from": "^5.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/import-from/node_modules/resolve-from": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", - "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/import-local": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz", - "integrity": "sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz", + "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==", "dev": true, "dependencies": { "pkg-dir": "^4.2.0", @@ -5548,18 +5893,9 @@ }, "engines": { "node": ">=8" - } - }, - "node_modules/import-local/node_modules/pkg-dir": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", - "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", - "dev": true, - "dependencies": { - "find-up": "^4.0.0" - }, - "engines": { - "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/imurmurhash": { @@ -5623,9 +5959,9 @@ } }, "node_modules/is-core-module": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.3.0.tgz", - "integrity": "sha512-xSphU2KG9867tsYdLD4RWQ1VqdFl4HTO9Thf3I/3dLEfr0dbPTWKsuCKrgqMljg4nPE+Gq0VCnzT3gr0CyBmsw==", + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz", + "integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==", "dev": true, "dependencies": { "has": "^1.0.3" @@ -5644,12 +5980,15 @@ } }, "node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz", + "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==", "dev": true, "engines": { - "node": ">=8" + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/is-generator-fn": { @@ -5701,11 +6040,14 @@ "dev": true }, "node_modules/is-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", - "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", "engines": { "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/is-typedarray": { @@ -5768,6 +6110,27 @@ "node": ">=8" } }, + "node_modules/istanbul-lib-report/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-report/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/istanbul-lib-source-maps": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz", @@ -5873,6 +6236,76 @@ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" } }, + "node_modules/jest-circus/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/jest-circus/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/jest-circus/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/jest-circus/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/jest-circus/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-circus/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/jest-cli": { "version": "27.4.7", "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.4.7.tgz", @@ -5907,6 +6340,76 @@ } } }, + "node_modules/jest-cli/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/jest-cli/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/jest-cli/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/jest-cli/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/jest-cli/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-cli/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/jest-config": { "version": "27.4.7", "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.4.7.tgz", @@ -5948,81 +6451,288 @@ } } }, - "node_modules/jest-diff": { - "version": "27.4.6", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.4.6.tgz", - "integrity": "sha512-zjaB0sh0Lb13VyPsd92V7HkqF6yKRH9vm33rwBt7rPYrpQvS1nCvlIy2pICbKta+ZjWngYLNn4cCK4nyZkjS/w==", + "node_modules/jest-config/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, "dependencies": { - "chalk": "^4.0.0", - "diff-sequences": "^27.4.0", - "jest-get-type": "^27.4.0", - "pretty-format": "^27.4.6" + "color-convert": "^2.0.1" }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/jest-docblock": { - "version": "27.4.0", - "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.4.0.tgz", - "integrity": "sha512-7TBazUdCKGV7svZ+gh7C8esAnweJoG+SvcF6Cjqj4l17zA2q1cMwx2JObSioubk317H+cjcHgP+7fTs60paulg==", + "node_modules/jest-config/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, "dependencies": { - "detect-newline": "^3.0.0" + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/jest-each": { - "version": "27.4.6", - "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.4.6.tgz", - "integrity": "sha512-n6QDq8y2Hsmn22tRkgAk+z6MCX7MeVlAzxmZDshfS2jLcaBlyhpF3tZSJLR+kXmh23GEvS0ojMR8i6ZeRvpQcA==", + "node_modules/jest-config/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, "dependencies": { - "@jest/types": "^27.4.2", - "chalk": "^4.0.0", - "jest-get-type": "^27.4.0", - "jest-util": "^27.4.2", - "pretty-format": "^27.4.6" + "color-name": "~1.1.4" }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": ">=7.0.0" } }, - "node_modules/jest-environment-jsdom": { - "version": "27.4.6", - "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.4.6.tgz", - "integrity": "sha512-o3dx5p/kHPbUlRvSNjypEcEtgs6LmvESMzgRFQE6c+Prwl2JLA4RZ7qAnxc5VM8kutsGRTB15jXeeSbJsKN9iA==", + "node_modules/jest-config/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/jest-config/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true, - "dependencies": { - "@jest/environment": "^27.4.6", - "@jest/fake-timers": "^27.4.6", - "@jest/types": "^27.4.2", - "@types/node": "*", - "jest-mock": "^27.4.6", - "jest-util": "^27.4.2", - "jsdom": "^16.6.0" - }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": ">=8" } }, - "node_modules/jest-environment-jsdom/node_modules/acorn": { - "version": "8.7.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz", - "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==", + "node_modules/jest-config/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, - "bin": { - "acorn": "bin/acorn" + "dependencies": { + "has-flag": "^4.0.0" }, "engines": { - "node": ">=0.4.0" + "node": ">=8" } }, - "node_modules/jest-environment-jsdom/node_modules/cssom": { - "version": "0.4.4", + "node_modules/jest-diff": { + "version": "27.4.6", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.4.6.tgz", + "integrity": "sha512-zjaB0sh0Lb13VyPsd92V7HkqF6yKRH9vm33rwBt7rPYrpQvS1nCvlIy2pICbKta+ZjWngYLNn4cCK4nyZkjS/w==", + "dev": true, + "dependencies": { + "chalk": "^4.0.0", + "diff-sequences": "^27.4.0", + "jest-get-type": "^27.4.0", + "pretty-format": "^27.4.6" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-diff/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/jest-diff/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/jest-diff/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/jest-diff/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/jest-diff/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-diff/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-docblock": { + "version": "27.4.0", + "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.4.0.tgz", + "integrity": "sha512-7TBazUdCKGV7svZ+gh7C8esAnweJoG+SvcF6Cjqj4l17zA2q1cMwx2JObSioubk317H+cjcHgP+7fTs60paulg==", + "dev": true, + "dependencies": { + "detect-newline": "^3.0.0" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-each": { + "version": "27.4.6", + "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.4.6.tgz", + "integrity": "sha512-n6QDq8y2Hsmn22tRkgAk+z6MCX7MeVlAzxmZDshfS2jLcaBlyhpF3tZSJLR+kXmh23GEvS0ojMR8i6ZeRvpQcA==", + "dev": true, + "dependencies": { + "@jest/types": "^27.4.2", + "chalk": "^4.0.0", + "jest-get-type": "^27.4.0", + "jest-util": "^27.4.2", + "pretty-format": "^27.4.6" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-each/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/jest-each/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/jest-each/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/jest-each/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/jest-each/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-each/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-environment-jsdom": { + "version": "27.4.6", + "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.4.6.tgz", + "integrity": "sha512-o3dx5p/kHPbUlRvSNjypEcEtgs6LmvESMzgRFQE6c+Prwl2JLA4RZ7qAnxc5VM8kutsGRTB15jXeeSbJsKN9iA==", + "dev": true, + "dependencies": { + "@jest/environment": "^27.4.6", + "@jest/fake-timers": "^27.4.6", + "@jest/types": "^27.4.2", + "@types/node": "*", + "jest-mock": "^27.4.6", + "jest-util": "^27.4.2", + "jsdom": "^16.6.0" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-environment-jsdom/node_modules/@tootallnate/once": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", + "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", + "dev": true, + "engines": { + "node": ">= 6" + } + }, + "node_modules/jest-environment-jsdom/node_modules/cssom": { + "version": "0.4.4", "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz", "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==", "dev": true @@ -6041,6 +6751,27 @@ "node": ">=10" } }, + "node_modules/jest-environment-jsdom/node_modules/domexception": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz", + "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==", + "dev": true, + "dependencies": { + "webidl-conversions": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-environment-jsdom/node_modules/domexception/node_modules/webidl-conversions": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz", + "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/jest-environment-jsdom/node_modules/form-data": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz", @@ -6055,6 +6786,44 @@ "node": ">= 6" } }, + "node_modules/jest-environment-jsdom/node_modules/html-encoding-sniffer": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz", + "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==", + "dev": true, + "dependencies": { + "whatwg-encoding": "^1.0.5" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/jest-environment-jsdom/node_modules/http-proxy-agent": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", + "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", + "dev": true, + "dependencies": { + "@tootallnate/once": "1", + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/jest-environment-jsdom/node_modules/iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dev": true, + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/jest-environment-jsdom/node_modules/jsdom": { "version": "16.7.0", "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz", @@ -6101,6 +6870,54 @@ } } }, + "node_modules/jest-environment-jsdom/node_modules/tr46": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz", + "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==", + "dev": true, + "dependencies": { + "punycode": "^2.1.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-environment-jsdom/node_modules/w3c-xmlserializer": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz", + "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==", + "dev": true, + "dependencies": { + "xml-name-validator": "^3.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/jest-environment-jsdom/node_modules/webidl-conversions": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz", + "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==", + "dev": true, + "engines": { + "node": ">=10.4" + } + }, + "node_modules/jest-environment-jsdom/node_modules/whatwg-encoding": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz", + "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==", + "dev": true, + "dependencies": { + "iconv-lite": "0.4.24" + } + }, + "node_modules/jest-environment-jsdom/node_modules/whatwg-mimetype": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz", + "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==", + "dev": true + }, "node_modules/jest-environment-jsdom/node_modules/whatwg-url": { "version": "8.7.0", "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz", @@ -6136,6 +6953,12 @@ } } }, + "node_modules/jest-environment-jsdom/node_modules/xml-name-validator": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz", + "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==", + "dev": true + }, "node_modules/jest-environment-node": { "version": "27.4.6", "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.4.6.tgz", @@ -6216,6 +7039,76 @@ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" } }, + "node_modules/jest-jasmine2/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/jest-jasmine2/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/jest-jasmine2/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/jest-jasmine2/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/jest-jasmine2/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-jasmine2/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/jest-leak-detector": { "version": "27.4.6", "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.4.6.tgz", @@ -6244,6 +7137,76 @@ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" } }, + "node_modules/jest-matcher-utils/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/jest-matcher-utils/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/jest-matcher-utils/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/jest-matcher-utils/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/jest-matcher-utils/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-matcher-utils/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/jest-message-util": { "version": "27.4.6", "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.4.6.tgz", @@ -6264,6 +7227,76 @@ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" } }, + "node_modules/jest-message-util/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/jest-message-util/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/jest-message-util/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/jest-message-util/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/jest-message-util/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-message-util/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/jest-mock": { "version": "27.4.6", "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.4.6.tgz", @@ -6338,6 +7371,76 @@ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" } }, + "node_modules/jest-resolve/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/jest-resolve/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/jest-resolve/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/jest-resolve/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/jest-resolve/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-resolve/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/jest-runner": { "version": "27.4.6", "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.4.6.tgz", @@ -6371,6 +7474,76 @@ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" } }, + "node_modules/jest-runner/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/jest-runner/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/jest-runner/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/jest-runner/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/jest-runner/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-runner/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/jest-runtime": { "version": "27.4.6", "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.4.6.tgz", @@ -6404,6 +7577,76 @@ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" } }, + "node_modules/jest-runtime/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/jest-runtime/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/jest-runtime/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/jest-runtime/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/jest-runtime/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-runtime/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/jest-serializer": { "version": "27.4.0", "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-27.4.0.tgz", @@ -6450,6 +7693,64 @@ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" } }, + "node_modules/jest-snapshot/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/jest-snapshot/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/jest-snapshot/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/jest-snapshot/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/jest-snapshot/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/jest-snapshot/node_modules/semver": { "version": "7.3.5", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", @@ -6465,6 +7766,18 @@ "node": ">=10" } }, + "node_modules/jest-snapshot/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/jest-util": { "version": "27.4.2", "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.4.2.tgz", @@ -6482,6 +7795,76 @@ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" } }, + "node_modules/jest-util/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/jest-util/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/jest-util/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/jest-util/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/jest-util/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-util/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/jest-validate": { "version": "27.4.6", "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.4.6.tgz", @@ -6499,6 +7882,21 @@ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" } }, + "node_modules/jest-validate/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, "node_modules/jest-validate/node_modules/camelcase": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", @@ -6511,252 +7909,263 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/jest-watcher": { - "version": "27.4.6", - "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.4.6.tgz", - "integrity": "sha512-yKQ20OMBiCDigbD0quhQKLkBO+ObGN79MO4nT7YaCuQ5SM+dkBNWE8cZX0FjU6czwMvWw6StWbe+Wv4jJPJ+fw==", + "node_modules/jest-validate/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, "dependencies": { - "@jest/test-result": "^27.4.6", - "@jest/types": "^27.4.2", - "@types/node": "*", - "ansi-escapes": "^4.2.1", - "chalk": "^4.0.0", - "jest-util": "^27.4.2", - "string-length": "^4.0.1" + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" - } - }, - "node_modules/jest-worker": { - "version": "27.4.6", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.4.6.tgz", - "integrity": "sha512-gHWJF/6Xi5CTG5QCvROr6GcmpIqNYpDJyc8A1h/DyXqH1tD6SnRCM0d3U5msV31D2LB/U+E0M+W4oyvKV44oNw==", - "dev": true, - "dependencies": { - "@types/node": "*", - "merge-stream": "^2.0.0", - "supports-color": "^8.0.0" + "node": ">=10" }, - "engines": { - "node": ">= 10.13.0" + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/jest-worker/node_modules/supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "node_modules/jest-validate/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, "dependencies": { - "has-flag": "^4.0.0" + "color-name": "~1.1.4" }, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/supports-color?sponsor=1" + "node": ">=7.0.0" } }, - "node_modules/js-base64": { - "version": "2.6.4", - "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", - "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + "node_modules/jest-validate/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true }, - "node_modules/js-tokens": { + "node_modules/jest-validate/node_modules/has-flag": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } }, - "node_modules/js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "node_modules/jest-validate/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, "dependencies": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" + "has-flag": "^4.0.0" }, - "bin": { - "js-yaml": "bin/js-yaml.js" + "engines": { + "node": ">=8" } }, - "node_modules/jsdoc-type-pratt-parser": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-2.2.1.tgz", - "integrity": "sha512-rkbaDZw3IPwd/ZPXob4XqQwVDKN/qeC2Dd7jL8EEGLEHLRmkPJgGAPw6OIIVmnwJrdcDh3vMR83/fc7lR5YpqA==", + "node_modules/jest-watcher": { + "version": "27.4.6", + "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.4.6.tgz", + "integrity": "sha512-yKQ20OMBiCDigbD0quhQKLkBO+ObGN79MO4nT7YaCuQ5SM+dkBNWE8cZX0FjU6czwMvWw6StWbe+Wv4jJPJ+fw==", "dev": true, + "dependencies": { + "@jest/test-result": "^27.4.6", + "@jest/types": "^27.4.2", + "@types/node": "*", + "ansi-escapes": "^4.2.1", + "chalk": "^4.0.0", + "jest-util": "^27.4.2", + "string-length": "^4.0.1" + }, "engines": { - "node": ">=12.0.0" + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" } }, - "node_modules/jsdom": { - "version": "19.0.0", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-19.0.0.tgz", - "integrity": "sha512-RYAyjCbxy/vri/CfnjUWJQQtZ3LKlLnDqj+9XLNnJPgEGeirZs3hllKR20re8LUZ6o1b1X4Jat+Qd26zmP41+A==", + "node_modules/jest-watcher/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, "dependencies": { - "abab": "^2.0.5", - "acorn": "^8.5.0", - "acorn-globals": "^6.0.0", - "cssom": "^0.5.0", - "cssstyle": "^2.3.0", - "data-urls": "^3.0.1", - "decimal.js": "^10.3.1", - "domexception": "^4.0.0", - "escodegen": "^2.0.0", - "form-data": "^4.0.0", - "html-encoding-sniffer": "^3.0.0", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-potential-custom-element-name": "^1.0.1", - "nwsapi": "^2.2.0", - "parse5": "6.0.1", - "saxes": "^5.0.1", - "symbol-tree": "^3.2.4", - "tough-cookie": "^4.0.0", - "w3c-hr-time": "^1.0.2", - "w3c-xmlserializer": "^3.0.0", - "webidl-conversions": "^7.0.0", - "whatwg-encoding": "^2.0.0", - "whatwg-mimetype": "^3.0.0", - "whatwg-url": "^10.0.0", - "ws": "^8.2.3", - "xml-name-validator": "^4.0.0" + "color-convert": "^2.0.1" }, "engines": { - "node": ">=12" - }, - "peerDependencies": { - "canvas": "^2.5.0" + "node": ">=8" }, - "peerDependenciesMeta": { - "canvas": { - "optional": true - } + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/jsdom/node_modules/@tootallnate/once": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", - "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", + "node_modules/jest-watcher/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, "engines": { - "node": ">= 10" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/jsdom/node_modules/acorn": { - "version": "8.5.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz", - "integrity": "sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==", + "node_modules/jest-watcher/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, - "bin": { - "acorn": "bin/acorn" + "dependencies": { + "color-name": "~1.1.4" }, "engines": { - "node": ">=0.4.0" + "node": ">=7.0.0" } }, - "node_modules/jsdom/node_modules/domexception": { + "node_modules/jest-watcher/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/jest-watcher/node_modules/has-flag": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz", - "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true, - "dependencies": { - "webidl-conversions": "^7.0.0" - }, "engines": { - "node": ">=12" + "node": ">=8" } }, - "node_modules/jsdom/node_modules/html-encoding-sniffer": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz", - "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==", + "node_modules/jest-watcher/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, "dependencies": { - "whatwg-encoding": "^2.0.0" + "has-flag": "^4.0.0" }, "engines": { - "node": ">=12" + "node": ">=8" } }, - "node_modules/jsdom/node_modules/http-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", - "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", + "node_modules/jest-worker": { + "version": "27.4.6", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.4.6.tgz", + "integrity": "sha512-gHWJF/6Xi5CTG5QCvROr6GcmpIqNYpDJyc8A1h/DyXqH1tD6SnRCM0d3U5msV31D2LB/U+E0M+W4oyvKV44oNw==", "dev": true, "dependencies": { - "@tootallnate/once": "2", - "agent-base": "6", - "debug": "4" + "@types/node": "*", + "merge-stream": "^2.0.0", + "supports-color": "^8.0.0" }, "engines": { - "node": ">= 6" + "node": ">= 10.13.0" } }, - "node_modules/jsdom/node_modules/iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "node_modules/jest-worker/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true, - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - }, "engines": { - "node": ">=0.10.0" + "node": ">=8" } }, - "node_modules/jsdom/node_modules/w3c-xmlserializer": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-3.0.0.tgz", - "integrity": "sha512-3WFqGEgSXIyGhOmAFtlicJNMjEps8b1MG31NCA0/vOF9+nKMUW1ckhi9cnNHmf88Rzw5V+dwIwsm2C7X8k9aQg==", + "node_modules/jest-worker/node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", "dev": true, "dependencies": { - "xml-name-validator": "^4.0.0" + "has-flag": "^4.0.0" }, "engines": { - "node": ">=12" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" } }, - "node_modules/jsdom/node_modules/webidl-conversions": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", - "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==", - "dev": true, - "engines": { - "node": ">=12" - } + "node_modules/js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" }, - "node_modules/jsdom/node_modules/whatwg-encoding": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz", - "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==", + "node_modules/js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true + }, + "node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "dev": true, "dependencies": { - "iconv-lite": "0.6.3" + "argparse": "^2.0.1" }, - "engines": { - "node": ">=12" + "bin": { + "js-yaml": "bin/js-yaml.js" } }, - "node_modules/jsdom/node_modules/whatwg-mimetype": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz", - "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==", + "node_modules/jsdoc-type-pratt-parser": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-2.2.1.tgz", + "integrity": "sha512-rkbaDZw3IPwd/ZPXob4XqQwVDKN/qeC2Dd7jL8EEGLEHLRmkPJgGAPw6OIIVmnwJrdcDh3vMR83/fc7lR5YpqA==", "dev": true, "engines": { - "node": ">=12" + "node": ">=12.0.0" } }, - "node_modules/jsdom/node_modules/xml-name-validator": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz", - "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==", + "node_modules/jsdom": { + "version": "19.0.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-19.0.0.tgz", + "integrity": "sha512-RYAyjCbxy/vri/CfnjUWJQQtZ3LKlLnDqj+9XLNnJPgEGeirZs3hllKR20re8LUZ6o1b1X4Jat+Qd26zmP41+A==", "dev": true, + "dependencies": { + "abab": "^2.0.5", + "acorn": "^8.5.0", + "acorn-globals": "^6.0.0", + "cssom": "^0.5.0", + "cssstyle": "^2.3.0", + "data-urls": "^3.0.1", + "decimal.js": "^10.3.1", + "domexception": "^4.0.0", + "escodegen": "^2.0.0", + "form-data": "^4.0.0", + "html-encoding-sniffer": "^3.0.0", + "http-proxy-agent": "^5.0.0", + "https-proxy-agent": "^5.0.0", + "is-potential-custom-element-name": "^1.0.1", + "nwsapi": "^2.2.0", + "parse5": "6.0.1", + "saxes": "^5.0.1", + "symbol-tree": "^3.2.4", + "tough-cookie": "^4.0.0", + "w3c-hr-time": "^1.0.2", + "w3c-xmlserializer": "^3.0.0", + "webidl-conversions": "^7.0.0", + "whatwg-encoding": "^2.0.0", + "whatwg-mimetype": "^3.0.0", + "whatwg-url": "^10.0.0", + "ws": "^8.2.3", + "xml-name-validator": "^4.0.0" + }, "engines": { "node": ">=12" + }, + "peerDependencies": { + "canvas": "^2.5.0" + }, + "peerDependenciesMeta": { + "canvas": { + "optional": true + } } }, "node_modules/jsesc": { @@ -6822,15 +8231,6 @@ "graceful-fs": "^4.1.6" } }, - "node_modules/jsonfile/node_modules/universalify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", - "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", - "dev": true, - "engines": { - "node": ">= 10.0.0" - } - }, "node_modules/jwt-decode": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-3.1.2.tgz", @@ -6895,9 +8295,9 @@ } }, "node_modules/lines-and-columns": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz", - "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", + "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", "dev": true }, "node_modules/lint-staged": { @@ -6930,21 +8330,6 @@ "url": "https://opencollective.com/lint-staged" } }, - "node_modules/lint-staged/node_modules/colorette": { - "version": "2.0.16", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz", - "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==", - "dev": true - }, - "node_modules/lint-staged/node_modules/commander": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz", - "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==", - "dev": true, - "engines": { - "node": ">= 12" - } - }, "node_modules/lint-staged/node_modules/supports-color": { "version": "9.2.1", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-9.2.1.tgz", @@ -6958,9 +8343,9 @@ } }, "node_modules/listr2": { - "version": "3.13.5", - "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.13.5.tgz", - "integrity": "sha512-3n8heFQDSk+NcwBn3CgxEibZGaRzx+pC64n3YjpMD1qguV4nWus3Al+Oo3KooqFKTQEJ1v7MmnbnyyNspgx3NA==", + "version": "3.14.0", + "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.14.0.tgz", + "integrity": "sha512-TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g==", "dev": true, "dependencies": { "cli-truncate": "^2.1.0", @@ -6968,7 +8353,7 @@ "log-update": "^4.0.0", "p-map": "^4.0.0", "rfdc": "^1.3.0", - "rxjs": "^7.4.0", + "rxjs": "^7.5.1", "through": "^2.3.8", "wrap-ansi": "^7.0.0" }, @@ -6984,6 +8369,21 @@ } } }, + "node_modules/listr2/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, "node_modules/listr2/node_modules/cli-truncate": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz", @@ -7000,12 +8400,39 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/listr2/node_modules/colorette": { - "version": "2.0.16", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz", - "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==", + "node_modules/listr2/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/listr2/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/listr2/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", "dev": true }, + "node_modules/listr2/node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/listr2/node_modules/slice-ansi": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz", @@ -7020,6 +8447,20 @@ "node": ">=8" } }, + "node_modules/listr2/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/loader-runner": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz", @@ -7119,42 +8560,12 @@ "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=", "dev": true }, - "node_modules/lodash.difference": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz", - "integrity": "sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw=", - "dev": true - }, - "node_modules/lodash.forown": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.forown/-/lodash.forown-4.4.0.tgz", - "integrity": "sha1-hRFc8E9z75ZuztUlEdOJPMRmg68=", - "dev": true - }, - "node_modules/lodash.get": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", - "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=", - "dev": true - }, - "node_modules/lodash.groupby": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.groupby/-/lodash.groupby-4.6.0.tgz", - "integrity": "sha1-Cwih3PaDl8OXhVwyOXg4Mt90A9E=", - "dev": true - }, "node_modules/lodash.merge": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", "dev": true }, - "node_modules/lodash.sortby": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", - "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=", - "dev": true - }, "node_modules/lodash.throttle": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz", @@ -7187,6 +8598,54 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/log-update/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/log-update/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/log-update/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/log-update/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "node_modules/log-update/node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/log-update/node_modules/slice-ansi": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", @@ -7204,6 +8663,20 @@ "url": "https://github.com/chalk/slice-ansi?sponsor=1" } }, + "node_modules/log-update/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/log-update/node_modules/wrap-ansi": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", @@ -7321,21 +8794,21 @@ } }, "node_modules/mime-db": { - "version": "1.47.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.47.0.tgz", - "integrity": "sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw==", + "version": "1.51.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz", + "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==", "dev": true, "engines": { "node": ">= 0.6" } }, "node_modules/mime-types": { - "version": "2.1.30", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.30.tgz", - "integrity": "sha512-crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg==", + "version": "2.1.34", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz", + "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==", "dev": true, "dependencies": { - "mime-db": "1.47.0" + "mime-db": "1.51.0" }, "engines": { "node": ">= 0.6" @@ -7351,9 +8824,9 @@ } }, "node_modules/mini-svg-data-uri": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/mini-svg-data-uri/-/mini-svg-data-uri-1.3.3.tgz", - "integrity": "sha512-+fA2oRcR1dJI/7ITmeQJDrYWks0wodlOz0pAEhKYJ2IVc1z0AnwJUsKY2fzFmPAM3Jo9J0rBx8JAA9QQSJ5PuA==", + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/mini-svg-data-uri/-/mini-svg-data-uri-1.4.3.tgz", + "integrity": "sha512-gSfqpMRC8IxghvMcxzzmMnWpXAChSA+vy4cia33RgerMS8Fex95akUyQZPbxJJmeBGiGmK7n/1OpUX8ksRjIdA==", "dev": true, "bin": { "mini-svg-data-uri": "cli.js" @@ -7402,9 +8875,9 @@ } }, "node_modules/nanoid": { - "version": "3.1.30", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz", - "integrity": "sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ==", + "version": "3.1.32", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.32.tgz", + "integrity": "sha512-F8mf7R3iT9bvThBoW4tGXhXFHCctyCiUUPrWF8WaTqa3h96d9QybkSeba43XVOOE3oiLfkVDe4bT8MeGmkrTxw==", "dev": true, "bin": { "nanoid": "bin/nanoid.cjs" @@ -7727,9 +9200,9 @@ "dev": true }, "node_modules/picomatch": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz", - "integrity": "sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "dev": true, "engines": { "node": ">=8.6" @@ -7756,6 +9229,18 @@ "node": ">= 6" } }, + "node_modules/pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "dev": true, + "dependencies": { + "find-up": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/post-me": { "version": "0.4.5", "resolved": "https://registry.npmjs.org/post-me/-/post-me-0.4.5.tgz", @@ -7820,6 +9305,12 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/postcss-cli/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, "node_modules/postcss-cli/node_modules/globby": { "version": "12.0.2", "resolved": "https://registry.npmjs.org/globby/-/globby-12.0.2.tgz", @@ -7840,13 +9331,13 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/postcss-cli/node_modules/ignore": { - "version": "5.1.8", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", - "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==", + "node_modules/postcss-cli/node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "dev": true, "engines": { - "node": ">= 4" + "node": ">=8" } }, "node_modules/postcss-cli/node_modules/slash": { @@ -7861,24 +9352,47 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/postcss-cli/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/postcss-cli/node_modules/yargs": { - "version": "17.2.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.2.1.tgz", - "integrity": "sha512-XfR8du6ua4K6uLGm5S6fA+FIJom/MdJcFNVY8geLlp2v8GYbOXD4EB1tPNZsRn4vBzKGMgb5DRZMeWuFc2GO8Q==", + "version": "17.3.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.3.1.tgz", + "integrity": "sha512-WUANQeVgjLbNsEmGk20f+nlHgOqzRFpiGWVaBrYGYIGANIIu3lWjoyi0fNlFmJkvfhCZ6BXINe7/W2O2bV4iaA==", "dev": true, "dependencies": { "cliui": "^7.0.2", "escalade": "^3.1.1", "get-caller-file": "^2.0.5", "require-directory": "^2.1.1", - "string-width": "^4.2.0", + "string-width": "^4.2.3", "y18n": "^5.0.5", - "yargs-parser": "^20.2.2" + "yargs-parser": "^21.0.0" }, "engines": { "node": ">=12" } }, + "node_modules/postcss-cli/node_modules/yargs-parser": { + "version": "21.0.0", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.0.tgz", + "integrity": "sha512-z9kApYUOCwoeZ78rfRYYWdiU/iNL6mwwYlkkZfJoyMR1xps+NEBX5X7XmRpxkZHhXJ6+Ey00IwKxBBSW9FIjyA==", + "dev": true, + "engines": { + "node": ">=12" + } + }, "node_modules/postcss-js": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.0.tgz", @@ -7899,13 +9413,12 @@ } }, "node_modules/postcss-load-config": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.0.tgz", - "integrity": "sha512-ipM8Ds01ZUophjDTQYSVP70slFSYg3T0/zyfII5vzhN6V57YSxMgG5syXuwi5VtS8wSf3iL30v0uBdoIVx4Q0g==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.1.tgz", + "integrity": "sha512-c/9XYboIbSEUZpiD1UQD0IKiUe8n9WHYV7YFe7X7J+ZwCsEKkUJSFWjS9hBU1RR9THR7jMXst8sxiqP0jjo2mg==", "dev": true, "dependencies": { - "import-cwd": "^3.0.0", - "lilconfig": "^2.0.3", + "lilconfig": "^2.0.4", "yaml": "^1.10.2" }, "engines": { @@ -7944,17 +9457,13 @@ } }, "node_modules/postcss-reporter": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-7.0.2.tgz", - "integrity": "sha512-JyQ96NTQQsso42y6L1H1RqHfWH1C3Jr0pt91mVv5IdYddZAE9DUZxuferNgk6q0o6vBVOrfVJb10X1FgDzjmDw==", + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-7.0.5.tgz", + "integrity": "sha512-glWg7VZBilooZGOFPhN9msJ3FQs19Hie7l5a/eE6WglzYqVeH3ong3ShFcp9kDWJT1g2Y/wd59cocf9XxBtkWA==", "dev": true, "dependencies": { - "colorette": "^1.2.1", - "lodash.difference": "^4.5.0", - "lodash.forown": "^4.4.0", - "lodash.get": "^4.4.2", - "lodash.groupby": "^4.6.0", - "lodash.sortby": "^4.7.0" + "picocolors": "^1.0.0", + "thenby": "^1.3.4" }, "engines": { "node": ">=10" @@ -8203,9 +9712,9 @@ } }, "node_modules/rechoir": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.0.tgz", - "integrity": "sha512-ADsDEH2bvbjltXEP+hTIAmeFekTFK0V2BTxMkok6qILyAJEXV0AFfoWcAq4yfll5VdIMd/RVXq0lR+wQi5ZU3Q==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz", + "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==", "dev": true, "dependencies": { "resolve": "^1.9.0" @@ -8327,13 +9836,17 @@ "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=" }, "node_modules/resolve": { - "version": "1.20.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz", - "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==", + "version": "1.21.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.21.0.tgz", + "integrity": "sha512-3wCbTpk5WJlyE4mSOtDLhqQmGFi0/TD9VPwmiolnk8U0wRgMEktqCXd3vy5buTO3tljvalNvKrjHEfrd2WpEKA==", "dev": true, "dependencies": { - "is-core-module": "^2.2.0", - "path-parse": "^1.0.6" + "is-core-module": "^2.8.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -8463,20 +9976,14 @@ } }, "node_modules/rxjs": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.4.0.tgz", - "integrity": "sha512-7SQDi7xeTMCJpqViXh8gL/lebcwlp3d831F05+9B44A4B0WfsEwUQHR64gsH1kvJ+Ep/J9K2+n1hVl1CsGN23w==", + "version": "7.5.2", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.2.tgz", + "integrity": "sha512-PwDt186XaL3QN5qXj/H9DGyHhP3/RYYgZZwqBv9Tv8rsAaiwFH1IsJJlcgD37J7UW5a6O67qX0KWKS3/pu0m4w==", "dev": true, "dependencies": { - "tslib": "~2.1.0" + "tslib": "^2.1.0" } }, - "node_modules/rxjs/node_modules/tslib": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", - "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==", - "dev": true - }, "node_modules/safari-14-idb-fix": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/safari-14-idb-fix/-/safari-14-idb-fix-3.0.0.tgz", @@ -8586,9 +10093,9 @@ } }, "node_modules/signal-exit": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", - "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==", + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz", + "integrity": "sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==", "dev": true }, "node_modules/sisteransi": { @@ -8606,9 +10113,9 @@ } }, "node_modules/skynet-js": { - "version": "4.0.20-beta", - "resolved": "https://registry.npmjs.org/skynet-js/-/skynet-js-4.0.20-beta.tgz", - "integrity": "sha512-sm0UECmh79ZnzoNvKOl0YJuZG9TF6dfkc72WF9laHHtmoU5WWgI1DAirTP+szQSOPs8RFpTTJ0qr0Sh5CQIBrA==", + "version": "4.0.22-beta", + "resolved": "https://registry.npmjs.org/skynet-js/-/skynet-js-4.0.22-beta.tgz", + "integrity": "sha512-DpTCuMIT5JSBTwJX3nb/qkHVAFyCeEA8fanBGzZPj4QviYK3Mmk+lZKLETd5RzxavkBtgW7VlSogmxdTDjjbyg==", "dependencies": { "axios": "^0.24.0", "base32-decode": "^1.0.0", @@ -8673,18 +10180,6 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/slice-ansi/node_modules/is-fullwidth-code-point": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz", - "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/source-map": { "version": "0.5.7", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", @@ -8704,9 +10199,9 @@ } }, "node_modules/source-map-support": { - "version": "0.5.20", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.20.tgz", - "integrity": "sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==", + "version": "0.5.21", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", + "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", "dev": true, "dependencies": { "buffer-from": "^1.0.0", @@ -8739,9 +10234,9 @@ } }, "node_modules/spdx-license-ids": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz", - "integrity": "sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==", + "version": "3.0.11", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz", + "integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==", "dev": true }, "node_modules/sprintf-js": { @@ -8830,17 +10325,47 @@ } }, "node_modules/string-width": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", - "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.0.tgz", + "integrity": "sha512-7x54QnN21P+XL/v8SuNKvfgsUre6PXpN7mc77N3HlZv+f1SBRGmjxtOud2Z6FZ8DmdkD/IdjCaf9XXbnqmTZGQ==", "dev": true, "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" }, "engines": { - "node": ">=8" + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/string-width/node_modules/ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/string-width/node_modules/strip-ansi": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz", + "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==", + "dev": true, + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" } }, "node_modules/strip-ansi": { @@ -8886,15 +10411,15 @@ } }, "node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "dependencies": { - "has-flag": "^4.0.0" + "has-flag": "^3.0.0" }, "engines": { - "node": ">=8" + "node": ">=4" } }, "node_modules/supports-hyperlinks": { @@ -8910,6 +10435,39 @@ "node": ">=8" } }, + "node_modules/supports-hyperlinks/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/supports-hyperlinks/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/symbol-tree": { "version": "3.2.4", "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", @@ -8917,9 +10475,9 @@ "dev": true }, "node_modules/tailwindcss": { - "version": "3.0.12", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.12.tgz", - "integrity": "sha512-VqhF86z2c34sJyS5ZS8Q2nYuN0KzqZw1GGsuQQO9kJ3mY1oG7Fsag0vICkxUVXk6P+1sUkTkjMjKWCjEF0hNHw==", + "version": "3.0.14", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.14.tgz", + "integrity": "sha512-7VTZJVMY9iTZhGsiTC9d3gWk+tSJz8iKZoxd5mvO0w4n0lulzVPYEOiwKcz5h8M/rNhlpymU7Ix5519Tl5wrfA==", "dev": true, "dependencies": { "arg": "^5.0.1", @@ -8941,7 +10499,7 @@ "postcss-selector-parser": "^6.0.8", "postcss-value-parser": "^4.2.0", "quick-lru": "^5.1.1", - "resolve": "^1.20.0" + "resolve": "^1.21.0" }, "bin": { "tailwind": "lib/cli.js", @@ -8955,22 +10513,80 @@ "postcss": "^8.0.9" } }, - "node_modules/tailwindcss/node_modules/glob-parent": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", - "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "node_modules/tailwindcss/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, "dependencies": { - "is-glob": "^4.0.3" + "color-convert": "^2.0.1" }, "engines": { - "node": ">=10.13.0" + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/tailwindcss/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/tailwindcss/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/tailwindcss/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/tailwindcss/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/tailwindcss/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" } }, "node_modules/tapable": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.0.tgz", - "integrity": "sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", + "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", "dev": true, "engines": { "node": ">=6" @@ -8993,34 +10609,41 @@ } }, "node_modules/terser": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.7.2.tgz", - "integrity": "sha512-0Omye+RD4X7X69O0eql3lC4Heh/5iLj3ggxR/B5ketZLOtLiOqukUgjw3q4PDnNQbsrkKr3UMypqStQG3XKRvw==", + "version": "5.10.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.10.0.tgz", + "integrity": "sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==", "dev": true, "dependencies": { "commander": "^2.20.0", "source-map": "~0.7.2", - "source-map-support": "~0.5.19" + "source-map-support": "~0.5.20" }, "bin": { "terser": "bin/terser" }, "engines": { "node": ">=10" + }, + "peerDependencies": { + "acorn": "^8.5.0" + }, + "peerDependenciesMeta": { + "acorn": { + "optional": true + } } }, "node_modules/terser-webpack-plugin": { - "version": "5.1.4", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.1.4.tgz", - "integrity": "sha512-C2WkFwstHDhVEmsmlCxrXUtVklS+Ir1A7twrYzrDrQQOIMOaVAYykaoo/Aq1K0QRkMoY2hhvDQY1cm4jnIMFwA==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.0.tgz", + "integrity": "sha512-LPIisi3Ol4chwAaPP8toUJ3L4qCM1G0wao7L3qNv57Drezxj6+VEyySpPw4B1HSO2Eg/hDY/MNF5XihCAoqnsQ==", "dev": true, "dependencies": { - "jest-worker": "^27.0.2", - "p-limit": "^3.1.0", - "schema-utils": "^3.0.0", + "jest-worker": "^27.4.1", + "schema-utils": "^3.1.1", "serialize-javascript": "^6.0.0", "source-map": "^0.6.1", - "terser": "^5.7.0" + "terser": "^5.7.2" }, "engines": { "node": ">= 10.13.0" @@ -9031,21 +10654,17 @@ }, "peerDependencies": { "webpack": "^5.1.0" - } - }, - "node_modules/terser-webpack-plugin/node_modules/p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "dependencies": { - "yocto-queue": "^0.1.0" }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "esbuild": { + "optional": true + }, + "uglify-js": { + "optional": true + } } }, "node_modules/terser-webpack-plugin/node_modules/source-map": { @@ -9092,6 +10711,12 @@ "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", "dev": true }, + "node_modules/thenby": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/thenby/-/thenby-1.3.4.tgz", + "integrity": "sha512-89Gi5raiWA3QZ4b2ePcEwswC3me9JIg+ToSgtE0JWeCynLnLxNr/f9G+xfo9K+Oj4AFdom8YNJjibIARTJmapQ==", + "dev": true + }, "node_modules/throat": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/throat/-/throat-6.0.1.tgz", @@ -9150,16 +10775,25 @@ "node": ">=6" } }, + "node_modules/tough-cookie/node_modules/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, + "engines": { + "node": ">= 4.0.0" + } + }, "node_modules/tr46": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz", - "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz", + "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==", "dev": true, "dependencies": { "punycode": "^2.1.1" }, "engines": { - "node": ">=8" + "node": ">=12" } }, "node_modules/ts-loader": { @@ -9167,18 +10801,76 @@ "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.2.6.tgz", "integrity": "sha512-QMTC4UFzHmu9wU2VHZEmWWE9cUajjfcdcws+Gh7FhiO+Dy0RnR1bNz0YCHqhI0yRowCE9arVnNxYHqELOy9Hjw==", "dev": true, - "dependencies": { - "chalk": "^4.1.0", - "enhanced-resolve": "^5.0.0", - "micromatch": "^4.0.0", - "semver": "^7.3.4" - }, + "dependencies": { + "chalk": "^4.1.0", + "enhanced-resolve": "^5.0.0", + "micromatch": "^4.0.0", + "semver": "^7.3.4" + }, + "engines": { + "node": ">=12.0.0" + }, + "peerDependencies": { + "typescript": "*", + "webpack": "^5.0.0" + } + }, + "node_modules/ts-loader/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/ts-loader/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/ts-loader/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/ts-loader/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/ts-loader/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, "engines": { - "node": ">=12.0.0" - }, - "peerDependencies": { - "typescript": "*", - "webpack": "^5.0.0" + "node": ">=8" } }, "node_modules/ts-loader/node_modules/semver": { @@ -9196,6 +10888,18 @@ "node": ">=10" } }, + "node_modules/ts-loader/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/ts.cryptojs256": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/ts.cryptojs256/-/ts.cryptojs256-1.0.1.tgz", @@ -9203,9 +10907,9 @@ "dev": true }, "node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==", "dev": true }, "node_modules/tsutils": { @@ -9223,6 +10927,12 @@ "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" } }, + "node_modules/tsutils/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + }, "node_modules/tus-js-client": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/tus-js-client/-/tus-js-client-2.3.0.tgz", @@ -9343,12 +11053,12 @@ } }, "node_modules/universalify": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", + "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", "dev": true, "engines": { - "node": ">= 4.0.0" + "node": ">= 10.0.0" } }, "node_modules/uri-js": { @@ -9366,9 +11076,9 @@ "integrity": "sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==" }, "node_modules/url-parse": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.3.tgz", - "integrity": "sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==", + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.4.tgz", + "integrity": "sha512-ITeAByWWoqutFClc/lRZnFplgXgEZr3WJ6XngMM/N9DMIm4K8zXPCZ1Jdu0rERwO84w1WC5wkle2ubwTA4NTBg==", "dependencies": { "querystringify": "^2.1.1", "requires-port": "^1.0.0" @@ -9418,15 +11128,15 @@ } }, "node_modules/w3c-xmlserializer": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz", - "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-3.0.0.tgz", + "integrity": "sha512-3WFqGEgSXIyGhOmAFtlicJNMjEps8b1MG31NCA0/vOF9+nKMUW1ckhi9cnNHmf88Rzw5V+dwIwsm2C7X8k9aQg==", "dev": true, "dependencies": { - "xml-name-validator": "^3.0.0" + "xml-name-validator": "^4.0.0" }, "engines": { - "node": ">=10" + "node": ">=12" } }, "node_modules/walker": { @@ -9452,12 +11162,12 @@ } }, "node_modules/webidl-conversions": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz", - "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", + "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==", "dev": true, "engines": { - "node": ">=10.4" + "node": ">=12" } }, "node_modules/webpack": { @@ -9550,16 +11260,19 @@ } } }, - "node_modules/webpack-cli/node_modules/colorette": { - "version": "2.0.16", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz", - "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==", - "dev": true + "node_modules/webpack-cli/node_modules/commander": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", + "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", + "dev": true, + "engines": { + "node": ">= 10" + } }, "node_modules/webpack-merge": { - "version": "5.7.3", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.7.3.tgz", - "integrity": "sha512-6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA==", + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz", + "integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==", "dev": true, "dependencies": { "clone-deep": "^4.0.1", @@ -9570,50 +11283,35 @@ } }, "node_modules/webpack-sources": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.2.tgz", - "integrity": "sha512-cp5qdmHnu5T8wRg2G3vZZHoJPN14aqQ89SyQ11NpGH5zEMDCclt49rzo+MaRazk7/UeILhAI+/sEtcM+7Fr0nw==", + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", + "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", "dev": true, "engines": { "node": ">=10.13.0" } }, - "node_modules/webpack/node_modules/acorn": { - "version": "8.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.4.1.tgz", - "integrity": "sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA==", + "node_modules/whatwg-encoding": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz", + "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==", "dev": true, - "bin": { - "acorn": "bin/acorn" + "dependencies": { + "iconv-lite": "0.6.3" }, "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/webpack/node_modules/acorn-import-assertions": { - "version": "1.7.6", - "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.7.6.tgz", - "integrity": "sha512-FlVvVFA1TX6l3lp8VjDnYYq7R1nyW6x3svAt4nDgrWQ9SBaSh9CnbwgSUTasgfNfOG5HlM1ehugCvM+hjo56LA==", - "dev": true, - "peerDependencies": { - "acorn": "^8" + "node": ">=12" } }, - "node_modules/whatwg-encoding": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz", - "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==", + "node_modules/whatwg-mimetype": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz", + "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==", "dev": true, - "dependencies": { - "iconv-lite": "0.4.24" + "engines": { + "node": ">=12" } }, - "node_modules/whatwg-mimetype": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz", - "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==", - "dev": true - }, "node_modules/whatwg-url": { "version": "10.0.0", "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-10.0.0.tgz", @@ -9627,27 +11325,6 @@ "node": ">=12" } }, - "node_modules/whatwg-url/node_modules/tr46": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz", - "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==", - "dev": true, - "dependencies": { - "punycode": "^2.1.1" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/whatwg-url/node_modules/webidl-conversions": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", - "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==", - "dev": true, - "engines": { - "node": ">=12" - } - }, "node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -9695,6 +11372,68 @@ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, + "node_modules/wrap-ansi/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/wrap-ansi/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/wrap-ansi/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/wrap-ansi/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "node_modules/wrap-ansi/node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", @@ -9714,9 +11453,9 @@ } }, "node_modules/ws": { - "version": "8.2.3", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz", - "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==", + "version": "8.4.2", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.4.2.tgz", + "integrity": "sha512-Kbk4Nxyq7/ZWqr/tarI9yIt/+iNNFOjBXEWgTb4ydaNHBNGgvf2QHbS9fdfsndfjFlFwEd4Al+mw83YkaD10ZA==", "dev": true, "engines": { "node": ">=10.0.0" @@ -9735,10 +11474,13 @@ } }, "node_modules/xml-name-validator": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz", - "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==", - "dev": true + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz", + "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==", + "dev": true, + "engines": { + "node": ">=12" + } }, "node_modules/xmlchars": { "version": "2.2.0", @@ -9806,16 +11548,33 @@ "node": ">=10" } }, - "node_modules/yocto-queue": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "node_modules/yargs/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "node_modules/yargs/node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "dev": true, "engines": { - "node": ">=10" + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "engines": { + "node": ">=8" } } }, @@ -9836,20 +11595,20 @@ "dev": true }, "@babel/core": { - "version": "7.14.0", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.14.0.tgz", - "integrity": "sha512-8YqpRig5NmIHlMLw09zMlPTvUVMILjqCOtVgu+TVNWEBvy9b5I3RRyhqnrV4hjgEK7n8P9OqvkWJAFmEL6Wwfw==", + "version": "7.16.7", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.16.7.tgz", + "integrity": "sha512-aeLaqcqThRNZYmbMqtulsetOQZ/5gbR/dWruUCJcpas4Qoyy+QeagfDsPdMrqwsPRDNxJvBlRiZxxX7THO7qtA==", "dev": true, "requires": { - "@babel/code-frame": "^7.12.13", - "@babel/generator": "^7.14.0", - "@babel/helper-compilation-targets": "^7.13.16", - "@babel/helper-module-transforms": "^7.14.0", - "@babel/helpers": "^7.14.0", - "@babel/parser": "^7.14.0", - "@babel/template": "^7.12.13", - "@babel/traverse": "^7.14.0", - "@babel/types": "^7.14.0", + "@babel/code-frame": "^7.16.7", + "@babel/generator": "^7.16.7", + "@babel/helper-compilation-targets": "^7.16.7", + "@babel/helper-module-transforms": "^7.16.7", + "@babel/helpers": "^7.16.7", + "@babel/parser": "^7.16.7", + "@babel/template": "^7.16.7", + "@babel/traverse": "^7.16.7", + "@babel/types": "^7.16.7", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -10113,77 +11872,25 @@ } }, "@babel/helpers": { - "version": "7.14.0", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.0.tgz", - "integrity": "sha512-+ufuXprtQ1D1iZTO/K9+EBRn+qPWMJjZSw/S0KlFrxCw4tkrzv9grgpDHkY9MeQTjTY8i2sp7Jep8DfU6tN9Mg==", + "version": "7.16.7", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.16.7.tgz", + "integrity": "sha512-9ZDoqtfY7AuEOt3cxchfii6C7GDyyMBffktR5B2jvWv8u2+efwvpnVKXMWzNehqy68tKgAfSwfdw/lWpthS2bw==", "dev": true, "requires": { - "@babel/template": "^7.12.13", - "@babel/traverse": "^7.14.0", - "@babel/types": "^7.14.0" + "@babel/template": "^7.16.7", + "@babel/traverse": "^7.16.7", + "@babel/types": "^7.16.7" } }, "@babel/highlight": { "version": "7.16.7", "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.7.tgz", "integrity": "sha512-aKpPMfLvGO3Q97V0qhw/V2SWNWlwfJknuwAunU7wZLSfrM4xTBvg7E5opUVi1kJTBKihE38CPg4nBiqX83PWYw==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.16.7", - "chalk": "^2.0.0", - "js-tokens": "^4.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.16.7", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" } }, "@babel/parser": { @@ -11009,9 +12716,9 @@ "dev": true }, "@discoveryjs/json-ext": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.2.tgz", - "integrity": "sha512-HyYEUDeIj5rRQU2Hk5HTB2uHsbRQpF70nvMhVzi+VJR0X+xNEhjPui4/kBf3VeH/wqD28PT4sVOm8qqLjBrSZg==", + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.6.tgz", + "integrity": "sha512-ws57AidsDvREKrZKYffXddNkyaF14iHNHm8VQnZH6t99E8gczjNN0GpvcGny0imC80yQ0tHz1xVUKk/KFQSUyA==", "dev": true }, "@es-joy/jsdoccomment": { @@ -11042,12 +12749,6 @@ "strip-json-comments": "^3.1.1" }, "dependencies": { - "argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true - }, "globals": { "version": "13.12.0", "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz", @@ -11057,14 +12758,11 @@ "type-fest": "^0.20.2" } }, - "js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dev": true, - "requires": { - "argparse": "^2.0.1" - } + "ignore": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", + "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", + "dev": true }, "type-fest": { "version": "0.20.2", @@ -11104,6 +12802,25 @@ "resolve-from": "^5.0.0" }, "dependencies": { + "argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dev": true, + "requires": { + "sprintf-js": "~1.0.2" + } + }, + "js-yaml": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "dev": true, + "requires": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + } + }, "resolve-from": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", @@ -11130,6 +12847,57 @@ "jest-message-util": "^27.4.6", "jest-util": "^27.4.2", "slash": "^3.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } } }, "@jest/core": { @@ -11166,6 +12934,57 @@ "rimraf": "^3.0.0", "slash": "^3.0.0", "strip-ansi": "^6.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } } }, "@jest/environment": { @@ -11238,11 +13057,60 @@ "v8-to-istanbul": "^8.1.0" }, "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } } } }, @@ -11312,11 +13180,60 @@ "write-file-atomic": "^3.0.0" }, "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } } } }, @@ -11331,31 +13248,82 @@ "@types/node": "*", "@types/yargs": "^16.0.0", "chalk": "^4.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } } }, "@nodelib/fs.scandir": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz", - "integrity": "sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==", + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", "dev": true, "requires": { - "@nodelib/fs.stat": "2.0.4", + "@nodelib/fs.stat": "2.0.5", "run-parallel": "^1.1.9" } }, "@nodelib/fs.stat": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz", - "integrity": "sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", "dev": true }, "@nodelib/fs.walk": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz", - "integrity": "sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==", + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", "dev": true, "requires": { - "@nodelib/fs.scandir": "2.1.4", + "@nodelib/fs.scandir": "2.1.5", "fastq": "^1.6.0" } }, @@ -11444,9 +13412,9 @@ } }, "@tootallnate/once": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", - "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", + "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", "dev": true }, "@types/babel__core": { @@ -11491,9 +13459,9 @@ } }, "@types/eslint": { - "version": "7.2.10", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.10.tgz", - "integrity": "sha512-kUEPnMKrqbtpCq/KTaGFFKAcz6Ethm2EjCoKIDaCmfRBWLbFuTcOJfTlorwbnboXBzahqWLgUp1BQeKHiJzPUQ==", + "version": "8.2.2", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.2.2.tgz", + "integrity": "sha512-nQxgB8/Sg+QKhnV8e0WzPpxjIGT3tuJDDzybkDi8ItE/IgTlHo07U0shaIjzhcvQxlq9SDRE42lsJ23uvEgJ2A==", "dev": true, "requires": { "@types/estree": "*", @@ -11501,9 +13469,9 @@ } }, "@types/eslint-scope": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.0.tgz", - "integrity": "sha512-O/ql2+rrCUe2W2rs7wMR+GqPRcgB6UiqN5RhrR5xruFlY7l9YLMn0ZkDzjoHLeiFkR8MCQZVudUuuvQ2BLC9Qw==", + "version": "3.7.3", + "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz", + "integrity": "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==", "dev": true, "requires": { "@types/eslint": "*", @@ -11526,9 +13494,9 @@ } }, "@types/istanbul-lib-coverage": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz", - "integrity": "sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz", + "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==", "dev": true }, "@types/istanbul-lib-report": { @@ -11541,9 +13509,9 @@ } }, "@types/istanbul-reports": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz", - "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz", + "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==", "dev": true, "requires": { "@types/istanbul-lib-report": "*" @@ -11578,9 +13546,9 @@ "dev": true }, "@types/node": { - "version": "15.0.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-15.0.1.tgz", - "integrity": "sha512-TMkXt0Ck1y0KKsGr9gJtWGjttxlZnnvDtphxUOSd0bfaR6Q1jle+sPvrzNR1urqYTWMinoKvjKfXUGsumaO1PA==", + "version": "17.0.8", + "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.8.tgz", + "integrity": "sha512-YofkM6fGv4gDJq78g4j0mMuGMkZVxZDgtU0JRdx6FgiJDG+0fY0GKVolOV8WqVmEhLCXkQRjwDdKyPxJp/uucg==", "dev": true }, "@types/parse-json": { @@ -11648,12 +13616,6 @@ "tsutils": "^3.21.0" }, "dependencies": { - "ignore": { - "version": "5.1.8", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", - "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==", - "dev": true - }, "semver": { "version": "7.3.5", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", @@ -11752,14 +13714,6 @@ "requires": { "@typescript-eslint/types": "5.9.1", "eslint-visitor-keys": "^3.0.0" - }, - "dependencies": { - "eslint-visitor-keys": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz", - "integrity": "sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA==", - "dev": true - } } }, "@webassemblyjs/ast": { @@ -11950,9 +13904,9 @@ "dev": true }, "acorn": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", - "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz", + "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==", "dev": true }, "acorn-globals": { @@ -11963,8 +13917,23 @@ "requires": { "acorn": "^7.1.1", "acorn-walk": "^7.1.1" + }, + "dependencies": { + "acorn": { + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", + "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", + "dev": true + } } }, + "acorn-import-assertions": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", + "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==", + "dev": true, + "requires": {} + }, "acorn-jsx": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", @@ -11981,6 +13950,14 @@ "acorn": "^7.0.0", "acorn-walk": "^7.0.0", "xtend": "^4.0.2" + }, + "dependencies": { + "acorn": { + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", + "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", + "dev": true + } } }, "acorn-walk": { @@ -12049,12 +14026,12 @@ "dev": true }, "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "color-convert": "^2.0.1" + "color-convert": "^1.9.0" } }, "anymatch": { @@ -12074,13 +14051,10 @@ "dev": true }, "argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "requires": { - "sprintf-js": "~1.0.2" - } + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true }, "array-union": { "version": "2.1.0", @@ -12119,17 +14093,17 @@ "dev": true }, "autoprefixer": { - "version": "10.4.0", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.0.tgz", - "integrity": "sha512-7FdJ1ONtwzV1G43GDD0kpVMn/qbiNqyOPMFTX5nRffI+7vgWoFEc6DcXOxHJxrWNDXrZh18eDsZjvZGUljSRGA==", + "version": "10.4.2", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.2.tgz", + "integrity": "sha512-9fOPpHKuDW1w/0EKfRmVnxTDt8166MAnLI3mgZ1JCnhNtYWxcJ6Ud5CO/AVOZi/AvFa8DY9RTy3h3+tFBlrrdQ==", "dev": true, "requires": { - "browserslist": "^4.17.5", - "caniuse-lite": "^1.0.30001272", - "fraction.js": "^4.1.1", + "browserslist": "^4.19.1", + "caniuse-lite": "^1.0.30001297", + "fraction.js": "^4.1.2", "normalize-range": "^0.1.2", "picocolors": "^1.0.0", - "postcss-value-parser": "^4.1.0" + "postcss-value-parser": "^4.2.0" } }, "axios": { @@ -12154,6 +14128,57 @@ "chalk": "^4.0.0", "graceful-fs": "^4.2.4", "slash": "^3.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } } }, "babel-plugin-dynamic-import-node": { @@ -12424,9 +14449,9 @@ } }, "buffer-from": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", - "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", "dev": true }, "buffer-xor": { @@ -12469,13 +14494,14 @@ "dev": true }, "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "char-regex": { @@ -12498,6 +14524,17 @@ "is-glob": "~4.0.1", "normalize-path": "~3.0.0", "readdirp": "~3.6.0" + }, + "dependencies": { + "glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "requires": { + "is-glob": "^4.0.1" + } + } } }, "chrome-trace-event": { @@ -12550,59 +14587,44 @@ "requires": { "slice-ansi": "^5.0.0", "string-width": "^5.0.0" + } + }, + "cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "dev": true, + "requires": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" }, "dependencies": { - "ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", - "dev": true - }, "emoji-regex": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", "dev": true }, "is-fullwidth-code-point": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz", - "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "dev": true }, "string-width": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.0.1.tgz", - "integrity": "sha512-5ohWO/M4//8lErlUUtrFy3b11GtNOuMOU0ysKCDXFcfXuuvUXu95akgj/i8ofmaGdN0hCqyl6uu9i8dS/mQp5g==", - "dev": true, - "requires": { - "emoji-regex": "^9.2.2", - "is-fullwidth-code-point": "^4.0.0", - "strip-ansi": "^7.0.1" - } - }, - "strip-ansi": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz", - "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, "requires": { - "ansi-regex": "^6.0.1" + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" } } } }, - "cliui": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", - "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", - "dev": true, - "requires": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", - "wrap-ansi": "^7.0.0" - } - }, "clone-deep": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", @@ -12627,24 +14649,24 @@ "dev": true }, "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", "dev": true, "requires": { - "color-name": "~1.1.4" + "color-name": "1.1.3" } }, "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", "dev": true }, "colorette": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz", - "integrity": "sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==", + "version": "2.0.16", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz", + "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==", "dev": true }, "combine-errors": { @@ -12666,9 +14688,9 @@ } }, "commander": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", - "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz", + "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==", "dev": true }, "comment-parser": { @@ -12689,14 +14711,19 @@ "integrity": "sha512-jKqTxrTLsuwf1rUpKPU99cpDIxd+MB7nQuzV+tXjXzp+vbL6/0U0gN9DfjAOjgTnDJ7yvWFoT/xXnoFCqlw1Jw==" }, "convert-source-map": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", - "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==", + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz", + "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==", "dev": true, "requires": { "safe-buffer": "~5.1.1" } }, + "core-js": { + "version": "3.20.2", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.20.2.tgz", + "integrity": "sha512-nuqhq11DcOAbFBV4zCbKeGbKQsUDRqTX0oqx7AttUBuqe3h20ixsE039QHelbL6P4h+9kytVqyEtyZ6gsiwEYw==" + }, "core-js-compat": { "version": "3.20.2", "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.20.2.tgz", @@ -12841,14 +14868,6 @@ "abab": "^2.0.3", "whatwg-mimetype": "^3.0.0", "whatwg-url": "^10.0.0" - }, - "dependencies": { - "whatwg-mimetype": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz", - "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==", - "dev": true - } } }, "debug": { @@ -12873,9 +14892,9 @@ "dev": true }, "deep-is": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", - "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", "dev": true }, "deepmerge": { @@ -12991,22 +15010,20 @@ } }, "domexception": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz", - "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz", + "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==", "dev": true, "requires": { - "webidl-conversions": "^5.0.0" - }, - "dependencies": { - "webidl-conversions": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz", - "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==", - "dev": true - } + "webidl-conversions": "^7.0.0" } }, + "eastasianwidth": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", + "dev": true + }, "electron-to-chromium": { "version": "1.4.45", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.45.tgz", @@ -13041,9 +15058,9 @@ "dev": true }, "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", "dev": true }, "emojis-list": { @@ -13087,9 +15104,9 @@ } }, "es-module-lexer": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.0.tgz", - "integrity": "sha512-qU2eN/XHsrl3E4y7mK1wdWnyy5c8gXtCbfP6Xcsemm7fPUR1PIV1JhZfP7ojcN0Fzp69CfrS3u76h2tusvfKiQ==", + "version": "0.9.3", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz", + "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==", "dev": true }, "escalade": { @@ -13118,9 +15135,9 @@ }, "dependencies": { "estraverse": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", - "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true }, "levn": { @@ -13217,10 +15234,38 @@ "v8-compile-cache": "^2.0.3" }, "dependencies": { - "argparse": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, "escape-string-regexp": { @@ -13239,44 +15284,32 @@ "estraverse": "^5.2.0" } }, - "eslint-visitor-keys": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz", - "integrity": "sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA==", - "dev": true - }, "estraverse": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true }, - "glob-parent": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", - "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", - "dev": true, - "requires": { - "is-glob": "^4.0.3" - } - }, "globals": { - "version": "13.8.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.8.0.tgz", - "integrity": "sha512-rHtdA6+PDBIjeEvA91rpqzEvk/k3/i7EeNQiryiWuJH0Hw9cpyJMAt2jtbAwUaRdhD+573X4vWw6IcjKPasi9Q==", + "version": "13.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz", + "integrity": "sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==", "dev": true, "requires": { "type-fest": "^0.20.2" } }, - "js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dev": true, - "requires": { - "argparse": "^2.0.1" - } + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "ignore": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", + "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", + "dev": true }, "semver": { "version": "7.3.5", @@ -13287,6 +15320,15 @@ "lru-cache": "^6.0.0" } }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + }, "type-fest": { "version": "0.20.2", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", @@ -13345,12 +15387,20 @@ "dev": true, "requires": { "eslint-visitor-keys": "^2.0.0" + }, + "dependencies": { + "eslint-visitor-keys": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", + "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", + "dev": true + } } }, "eslint-visitor-keys": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz", - "integrity": "sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz", + "integrity": "sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA==", "dev": true }, "espree": { @@ -13362,20 +15412,6 @@ "acorn": "^8.7.0", "acorn-jsx": "^5.3.1", "eslint-visitor-keys": "^3.1.0" - }, - "dependencies": { - "acorn": { - "version": "8.7.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz", - "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==", - "dev": true - }, - "eslint-visitor-keys": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz", - "integrity": "sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA==", - "dev": true - } } }, "esprima": { @@ -13394,9 +15430,9 @@ }, "dependencies": { "estraverse": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", - "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true } } @@ -13411,9 +15447,9 @@ }, "dependencies": { "estraverse": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", - "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true } } @@ -13487,9 +15523,9 @@ "dev": true }, "fast-glob": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz", - "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==", + "version": "3.2.10", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.10.tgz", + "integrity": "sha512-s9nFhFnvR63wls6/kM88kQqDhMu0AfdjqouE2l5GVQPbqLgyFjjU5ry/r2yKsJxpb9Py1EYNqieFrmMaX4v++A==", "dev": true, "requires": { "@nodelib/fs.stat": "^2.0.2", @@ -13497,6 +15533,17 @@ "glob-parent": "^5.1.2", "merge2": "^1.3.0", "micromatch": "^4.0.4" + }, + "dependencies": { + "glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "requires": { + "is-glob": "^4.0.1" + } + } } }, "fast-json-stable-stringify": { @@ -13518,9 +15565,9 @@ "dev": true }, "fastq": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz", - "integrity": "sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==", + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz", + "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==", "dev": true, "requires": { "reusify": "^1.0.4" @@ -13574,15 +15621,15 @@ } }, "flatted": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz", - "integrity": "sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==", + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.4.tgz", + "integrity": "sha512-8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw==", "dev": true }, "follow-redirects": { - "version": "1.14.4", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.4.tgz", - "integrity": "sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g==" + "version": "1.14.7", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz", + "integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==" }, "form-data": { "version": "4.0.0", @@ -13596,9 +15643,9 @@ } }, "fraction.js": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.1.1.tgz", - "integrity": "sha512-MHOhvvxHTfRFpF1geTK9czMIZ6xclsEor2wkIGYYq+PxcQqT7vStJqjhe6S1TenZrMZzo+wlqOufBDVepUEgPg==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.1.2.tgz", + "integrity": "sha512-o2RiJQ6DZaR/5+Si0qJUIy637QMRudSi9kU/FFzx9EZazrIdnBgpU+3sEWCxAVhH2RtxW2Oz+T4p2o8uOPVcgA==", "dev": true }, "fs-extra": { @@ -13610,14 +15657,6 @@ "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", "universalify": "^2.0.0" - }, - "dependencies": { - "universalify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", - "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", - "dev": true - } } }, "fs.realpath": { @@ -13687,9 +15726,9 @@ "dev": true }, "glob": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", - "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", + "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", "dev": true, "requires": { "fs.realpath": "^1.0.0", @@ -13701,12 +15740,12 @@ } }, "glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", "dev": true, "requires": { - "is-glob": "^4.0.1" + "is-glob": "^4.0.3" } }, "glob-to-regexp": { @@ -13722,25 +15761,17 @@ "dev": true }, "globby": { - "version": "11.0.4", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz", - "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==", + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", + "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", "dev": true, "requires": { "array-union": "^2.1.0", "dir-glob": "^3.0.1", - "fast-glob": "^3.1.1", - "ignore": "^5.1.4", - "merge2": "^1.3.0", + "fast-glob": "^3.2.9", + "ignore": "^5.2.0", + "merge2": "^1.4.1", "slash": "^3.0.0" - }, - "dependencies": { - "ignore": { - "version": "5.1.8", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", - "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==", - "dev": true - } } }, "graceful-fs": { @@ -13758,9 +15789,9 @@ } }, "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", "dev": true }, "has-symbols": { @@ -13806,12 +15837,12 @@ } }, "html-encoding-sniffer": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz", - "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz", + "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==", "dev": true, "requires": { - "whatwg-encoding": "^1.0.5" + "whatwg-encoding": "^2.0.0" } }, "html-escaper": { @@ -13820,13 +15851,13 @@ "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", "dev": true }, - "http-proxy-agent": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", - "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", + "http-proxy-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", + "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", "dev": true, "requires": { - "@tootallnate/once": "1", + "@tootallnate/once": "2", "agent-base": "6", "debug": "4" } @@ -13854,12 +15885,12 @@ "dev": true }, "iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", "dev": true, "requires": { - "safer-buffer": ">= 2.1.2 < 3" + "safer-buffer": ">= 2.1.2 < 3.0.0" } }, "idb-keyval": { @@ -13885,20 +15916,11 @@ } }, "ignore": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", - "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", + "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==", "dev": true }, - "import-cwd": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-3.0.0.tgz", - "integrity": "sha512-4pnzH16plW+hgvRECbDWpQl3cqtvSofHWh44met7ESfZ8UZOWWddm8hEyDTqREJ9RbYHY8gi8DqmaelApoOGMg==", - "dev": true, - "requires": { - "import-from": "^3.0.0" - } - }, "import-fresh": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", @@ -13909,42 +15931,14 @@ "resolve-from": "^4.0.0" } }, - "import-from": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/import-from/-/import-from-3.0.0.tgz", - "integrity": "sha512-CiuXOFFSzkU5x/CR0+z7T91Iht4CXgfCxVOFRhh2Zyhg5wOpWvvDLQUsWl+gcN+QscYBjez8hDCt85O7RLDttQ==", - "dev": true, - "requires": { - "resolve-from": "^5.0.0" - }, - "dependencies": { - "resolve-from": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", - "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", - "dev": true - } - } - }, "import-local": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz", - "integrity": "sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz", + "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==", "dev": true, "requires": { "pkg-dir": "^4.2.0", "resolve-cwd": "^3.0.0" - }, - "dependencies": { - "pkg-dir": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", - "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", - "dev": true, - "requires": { - "find-up": "^4.0.0" - } - } } }, "imurmurhash": { @@ -13996,9 +15990,9 @@ } }, "is-core-module": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.3.0.tgz", - "integrity": "sha512-xSphU2KG9867tsYdLD4RWQ1VqdFl4HTO9Thf3I/3dLEfr0dbPTWKsuCKrgqMljg4nPE+Gq0VCnzT3gr0CyBmsw==", + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz", + "integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==", "dev": true, "requires": { "has": "^1.0.3" @@ -14011,9 +16005,9 @@ "dev": true }, "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz", + "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==", "dev": true }, "is-generator-fn": { @@ -14053,9 +16047,9 @@ "dev": true }, "is-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", - "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==" + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==" }, "is-typedarray": { "version": "1.0.0", @@ -14103,6 +16097,23 @@ "istanbul-lib-coverage": "^3.0.0", "make-dir": "^3.0.0", "supports-color": "^7.1.0" + }, + "dependencies": { + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } } }, "istanbul-lib-source-maps": { @@ -14181,6 +16192,57 @@ "slash": "^3.0.0", "stack-utils": "^2.0.3", "throat": "^6.0.1" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } } }, "jest-cli": { @@ -14201,6 +16263,57 @@ "jest-validate": "^27.4.6", "prompts": "^2.0.1", "yargs": "^16.2.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } } }, "jest-config": { @@ -14231,6 +16344,57 @@ "micromatch": "^4.0.4", "pretty-format": "^27.4.6", "slash": "^3.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } } }, "jest-diff": { @@ -14243,6 +16407,57 @@ "diff-sequences": "^27.4.0", "jest-get-type": "^27.4.0", "pretty-format": "^27.4.6" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } } }, "jest-docblock": { @@ -14265,6 +16480,57 @@ "jest-get-type": "^27.4.0", "jest-util": "^27.4.2", "pretty-format": "^27.4.6" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } } }, "jest-environment-jsdom": { @@ -14282,10 +16548,10 @@ "jsdom": "^16.6.0" }, "dependencies": { - "acorn": { - "version": "8.7.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz", - "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==", + "@tootallnate/once": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", + "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", "dev": true }, "cssom": { @@ -14305,15 +16571,61 @@ "whatwg-url": "^8.0.0" } }, - "form-data": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz", - "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==", + "domexception": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz", + "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==", + "dev": true, + "requires": { + "webidl-conversions": "^5.0.0" + }, + "dependencies": { + "webidl-conversions": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz", + "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==", + "dev": true + } + } + }, + "form-data": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz", + "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==", + "dev": true, + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + } + }, + "html-encoding-sniffer": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz", + "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==", + "dev": true, + "requires": { + "whatwg-encoding": "^1.0.5" + } + }, + "http-proxy-agent": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", + "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", + "dev": true, + "requires": { + "@tootallnate/once": "1", + "agent-base": "6", + "debug": "4" + } + }, + "iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "dev": true, "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "mime-types": "^2.1.12" + "safer-buffer": ">= 2.1.2 < 3" } }, "jsdom": { @@ -14351,6 +16663,45 @@ "xml-name-validator": "^3.0.0" } }, + "tr46": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz", + "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==", + "dev": true, + "requires": { + "punycode": "^2.1.1" + } + }, + "w3c-xmlserializer": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz", + "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==", + "dev": true, + "requires": { + "xml-name-validator": "^3.0.0" + } + }, + "webidl-conversions": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz", + "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==", + "dev": true + }, + "whatwg-encoding": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz", + "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==", + "dev": true, + "requires": { + "iconv-lite": "0.4.24" + } + }, + "whatwg-mimetype": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz", + "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==", + "dev": true + }, "whatwg-url": { "version": "8.7.0", "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz", @@ -14368,6 +16719,12 @@ "integrity": "sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA==", "dev": true, "requires": {} + }, + "xml-name-validator": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz", + "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==", + "dev": true } } }, @@ -14435,6 +16792,57 @@ "jest-util": "^27.4.2", "pretty-format": "^27.4.6", "throat": "^6.0.1" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } } }, "jest-leak-detector": { @@ -14457,6 +16865,57 @@ "jest-diff": "^27.4.6", "jest-get-type": "^27.4.0", "pretty-format": "^27.4.6" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } } }, "jest-message-util": { @@ -14474,6 +16933,57 @@ "pretty-format": "^27.4.6", "slash": "^3.0.0", "stack-utils": "^2.0.3" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } } }, "jest-mock": { @@ -14515,6 +17025,57 @@ "resolve": "^1.20.0", "resolve.exports": "^1.1.0", "slash": "^3.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } } }, "jest-resolve-dependencies": { @@ -14556,6 +17117,57 @@ "jest-worker": "^27.4.6", "source-map-support": "^0.5.6", "throat": "^6.0.1" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } } }, "jest-runtime": { @@ -14586,6 +17198,57 @@ "jest-util": "^27.4.2", "slash": "^3.0.0", "strip-bom": "^4.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } } }, "jest-serializer": { @@ -14628,6 +17291,46 @@ "semver": "^7.3.2" }, "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, "semver": { "version": "7.3.5", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", @@ -14636,6 +17339,15 @@ "requires": { "lru-cache": "^6.0.0" } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } } } }, @@ -14651,6 +17363,57 @@ "ci-info": "^3.2.0", "graceful-fs": "^4.2.4", "picomatch": "^2.2.3" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } } }, "jest-validate": { @@ -14667,11 +17430,60 @@ "pretty-format": "^27.4.6" }, "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, "camelcase": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", "dev": true + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } } } }, @@ -14688,6 +17500,57 @@ "chalk": "^4.0.0", "jest-util": "^27.4.2", "string-length": "^4.0.1" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } } }, "jest-worker": { @@ -14701,6 +17564,12 @@ "supports-color": "^8.0.0" }, "dependencies": { + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, "supports-color": { "version": "8.1.1", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", @@ -14724,13 +17593,12 @@ "dev": true }, "js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "dev": true, "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" + "argparse": "^2.0.1" } }, "jsdoc-type-pratt-parser": { @@ -14772,94 +17640,6 @@ "whatwg-url": "^10.0.0", "ws": "^8.2.3", "xml-name-validator": "^4.0.0" - }, - "dependencies": { - "@tootallnate/once": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", - "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", - "dev": true - }, - "acorn": { - "version": "8.5.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz", - "integrity": "sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==", - "dev": true - }, - "domexception": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz", - "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==", - "dev": true, - "requires": { - "webidl-conversions": "^7.0.0" - } - }, - "html-encoding-sniffer": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz", - "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==", - "dev": true, - "requires": { - "whatwg-encoding": "^2.0.0" - } - }, - "http-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", - "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", - "dev": true, - "requires": { - "@tootallnate/once": "2", - "agent-base": "6", - "debug": "4" - } - }, - "iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "dev": true, - "requires": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - } - }, - "w3c-xmlserializer": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-3.0.0.tgz", - "integrity": "sha512-3WFqGEgSXIyGhOmAFtlicJNMjEps8b1MG31NCA0/vOF9+nKMUW1ckhi9cnNHmf88Rzw5V+dwIwsm2C7X8k9aQg==", - "dev": true, - "requires": { - "xml-name-validator": "^4.0.0" - } - }, - "webidl-conversions": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", - "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==", - "dev": true - }, - "whatwg-encoding": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz", - "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==", - "dev": true, - "requires": { - "iconv-lite": "0.6.3" - } - }, - "whatwg-mimetype": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz", - "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==", - "dev": true - }, - "xml-name-validator": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz", - "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==", - "dev": true - } } }, "jsesc": { @@ -14909,14 +17689,6 @@ "requires": { "graceful-fs": "^4.1.6", "universalify": "^2.0.0" - }, - "dependencies": { - "universalify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", - "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", - "dev": true - } } }, "jwt-decode": { @@ -14968,9 +17740,9 @@ "dev": true }, "lines-and-columns": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz", - "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", + "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", "dev": true }, "lint-staged": { @@ -14994,18 +17766,6 @@ "yaml": "^1.10.2" }, "dependencies": { - "colorette": { - "version": "2.0.16", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz", - "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==", - "dev": true - }, - "commander": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz", - "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==", - "dev": true - }, "supports-color": { "version": "9.2.1", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-9.2.1.tgz", @@ -15015,9 +17775,9 @@ } }, "listr2": { - "version": "3.13.5", - "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.13.5.tgz", - "integrity": "sha512-3n8heFQDSk+NcwBn3CgxEibZGaRzx+pC64n3YjpMD1qguV4nWus3Al+Oo3KooqFKTQEJ1v7MmnbnyyNspgx3NA==", + "version": "3.14.0", + "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.14.0.tgz", + "integrity": "sha512-TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g==", "dev": true, "requires": { "cli-truncate": "^2.1.0", @@ -15025,11 +17785,20 @@ "log-update": "^4.0.0", "p-map": "^4.0.0", "rfdc": "^1.3.0", - "rxjs": "^7.4.0", + "rxjs": "^7.5.1", "through": "^2.3.8", "wrap-ansi": "^7.0.0" }, "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, "cli-truncate": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz", @@ -15040,10 +17809,31 @@ "string-width": "^4.2.0" } }, - "colorette": { - "version": "2.0.16", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz", - "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==", + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "dev": true }, "slice-ansi": { @@ -15056,6 +17846,17 @@ "astral-regex": "^2.0.0", "is-fullwidth-code-point": "^3.0.0" } + }, + "string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + } } } }, @@ -15148,42 +17949,12 @@ "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=", "dev": true }, - "lodash.difference": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz", - "integrity": "sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw=", - "dev": true - }, - "lodash.forown": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.forown/-/lodash.forown-4.4.0.tgz", - "integrity": "sha1-hRFc8E9z75ZuztUlEdOJPMRmg68=", - "dev": true - }, - "lodash.get": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", - "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=", - "dev": true - }, - "lodash.groupby": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.groupby/-/lodash.groupby-4.6.0.tgz", - "integrity": "sha1-Cwih3PaDl8OXhVwyOXg4Mt90A9E=", - "dev": true - }, "lodash.merge": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", "dev": true }, - "lodash.sortby": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", - "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=", - "dev": true - }, "lodash.throttle": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz", @@ -15210,6 +17981,42 @@ "wrap-ansi": "^6.2.0" }, "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, "slice-ansi": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", @@ -15221,6 +18028,17 @@ "is-fullwidth-code-point": "^3.0.0" } }, + "string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + } + }, "wrap-ansi": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", @@ -15315,18 +18133,18 @@ "integrity": "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==" }, "mime-db": { - "version": "1.47.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.47.0.tgz", - "integrity": "sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw==", + "version": "1.51.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz", + "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==", "dev": true }, "mime-types": { - "version": "2.1.30", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.30.tgz", - "integrity": "sha512-crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg==", + "version": "2.1.34", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz", + "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==", "dev": true, "requires": { - "mime-db": "1.47.0" + "mime-db": "1.51.0" } }, "mimic-fn": { @@ -15336,9 +18154,9 @@ "dev": true }, "mini-svg-data-uri": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/mini-svg-data-uri/-/mini-svg-data-uri-1.3.3.tgz", - "integrity": "sha512-+fA2oRcR1dJI/7ITmeQJDrYWks0wodlOz0pAEhKYJ2IVc1z0AnwJUsKY2fzFmPAM3Jo9J0rBx8JAA9QQSJ5PuA==", + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/mini-svg-data-uri/-/mini-svg-data-uri-1.4.3.tgz", + "integrity": "sha512-gSfqpMRC8IxghvMcxzzmMnWpXAChSA+vy4cia33RgerMS8Fex95akUyQZPbxJJmeBGiGmK7n/1OpUX8ksRjIdA==", "dev": true }, "minimalistic-assert": { @@ -15378,9 +18196,9 @@ "integrity": "sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==" }, "nanoid": { - "version": "3.1.30", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz", - "integrity": "sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ==", + "version": "3.1.32", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.32.tgz", + "integrity": "sha512-F8mf7R3iT9bvThBoW4tGXhXFHCctyCiUUPrWF8WaTqa3h96d9QybkSeba43XVOOE3oiLfkVDe4bT8MeGmkrTxw==", "dev": true }, "natural-compare": { @@ -15622,9 +18440,9 @@ "dev": true }, "picomatch": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz", - "integrity": "sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "dev": true }, "pify": { @@ -15639,6 +18457,15 @@ "integrity": "sha512-ZIrVPH+A52Dw84R0L3/VS9Op04PuQ2SEoJL6bkshmiTic/HldyW9Tf7oH5mhJZBK7NmDx27vSMrYEXPXclpDKw==", "dev": true }, + "pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "dev": true, + "requires": { + "find-up": "^4.0.0" + } + }, "post-me": { "version": "0.4.5", "resolved": "https://registry.npmjs.org/post-me/-/post-me-0.4.5.tgz", @@ -15681,6 +18508,12 @@ "integrity": "sha512-1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw==", "dev": true }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, "globby": { "version": "12.0.2", "resolved": "https://registry.npmjs.org/globby/-/globby-12.0.2.tgz", @@ -15695,10 +18528,10 @@ "slash": "^4.0.0" } }, - "ignore": { - "version": "5.1.8", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", - "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==", + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "dev": true }, "slash": { @@ -15707,20 +18540,37 @@ "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==", "dev": true }, + "string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + } + }, "yargs": { - "version": "17.2.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.2.1.tgz", - "integrity": "sha512-XfR8du6ua4K6uLGm5S6fA+FIJom/MdJcFNVY8geLlp2v8GYbOXD4EB1tPNZsRn4vBzKGMgb5DRZMeWuFc2GO8Q==", + "version": "17.3.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.3.1.tgz", + "integrity": "sha512-WUANQeVgjLbNsEmGk20f+nlHgOqzRFpiGWVaBrYGYIGANIIu3lWjoyi0fNlFmJkvfhCZ6BXINe7/W2O2bV4iaA==", "dev": true, "requires": { "cliui": "^7.0.2", "escalade": "^3.1.1", "get-caller-file": "^2.0.5", "require-directory": "^2.1.1", - "string-width": "^4.2.0", + "string-width": "^4.2.3", "y18n": "^5.0.5", - "yargs-parser": "^20.2.2" + "yargs-parser": "^21.0.0" } + }, + "yargs-parser": { + "version": "21.0.0", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.0.tgz", + "integrity": "sha512-z9kApYUOCwoeZ78rfRYYWdiU/iNL6mwwYlkkZfJoyMR1xps+NEBX5X7XmRpxkZHhXJ6+Ey00IwKxBBSW9FIjyA==", + "dev": true } } }, @@ -15734,13 +18584,12 @@ } }, "postcss-load-config": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.0.tgz", - "integrity": "sha512-ipM8Ds01ZUophjDTQYSVP70slFSYg3T0/zyfII5vzhN6V57YSxMgG5syXuwi5VtS8wSf3iL30v0uBdoIVx4Q0g==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.1.tgz", + "integrity": "sha512-c/9XYboIbSEUZpiD1UQD0IKiUe8n9WHYV7YFe7X7J+ZwCsEKkUJSFWjS9hBU1RR9THR7jMXst8sxiqP0jjo2mg==", "dev": true, "requires": { - "import-cwd": "^3.0.0", - "lilconfig": "^2.0.3", + "lilconfig": "^2.0.4", "yaml": "^1.10.2" } }, @@ -15754,17 +18603,13 @@ } }, "postcss-reporter": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-7.0.2.tgz", - "integrity": "sha512-JyQ96NTQQsso42y6L1H1RqHfWH1C3Jr0pt91mVv5IdYddZAE9DUZxuferNgk6q0o6vBVOrfVJb10X1FgDzjmDw==", + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-7.0.5.tgz", + "integrity": "sha512-glWg7VZBilooZGOFPhN9msJ3FQs19Hie7l5a/eE6WglzYqVeH3ong3ShFcp9kDWJT1g2Y/wd59cocf9XxBtkWA==", "dev": true, "requires": { - "colorette": "^1.2.1", - "lodash.difference": "^4.5.0", - "lodash.forown": "^4.4.0", - "lodash.get": "^4.4.2", - "lodash.groupby": "^4.6.0", - "lodash.sortby": "^4.7.0" + "picocolors": "^1.0.0", + "thenby": "^1.3.4" } }, "postcss-selector-parser": { @@ -15945,9 +18790,9 @@ } }, "rechoir": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.0.tgz", - "integrity": "sha512-ADsDEH2bvbjltXEP+hTIAmeFekTFK0V2BTxMkok6qILyAJEXV0AFfoWcAq4yfll5VdIMd/RVXq0lR+wQi5ZU3Q==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz", + "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==", "dev": true, "requires": { "resolve": "^1.9.0" @@ -16044,13 +18889,14 @@ "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=" }, "resolve": { - "version": "1.20.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz", - "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==", + "version": "1.21.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.21.0.tgz", + "integrity": "sha512-3wCbTpk5WJlyE4mSOtDLhqQmGFi0/TD9VPwmiolnk8U0wRgMEktqCXd3vy5buTO3tljvalNvKrjHEfrd2WpEKA==", "dev": true, "requires": { - "is-core-module": "^2.2.0", - "path-parse": "^1.0.6" + "is-core-module": "^2.8.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" } }, "resolve-cwd": { @@ -16137,20 +18983,12 @@ } }, "rxjs": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.4.0.tgz", - "integrity": "sha512-7SQDi7xeTMCJpqViXh8gL/lebcwlp3d831F05+9B44A4B0WfsEwUQHR64gsH1kvJ+Ep/J9K2+n1hVl1CsGN23w==", + "version": "7.5.2", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.2.tgz", + "integrity": "sha512-PwDt186XaL3QN5qXj/H9DGyHhP3/RYYgZZwqBv9Tv8rsAaiwFH1IsJJlcgD37J7UW5a6O67qX0KWKS3/pu0m4w==", "dev": true, "requires": { - "tslib": "~2.1.0" - }, - "dependencies": { - "tslib": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", - "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==", - "dev": true - } + "tslib": "^2.1.0" } }, "safari-14-idb-fix": { @@ -16237,9 +19075,9 @@ "dev": true }, "signal-exit": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", - "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==", + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz", + "integrity": "sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==", "dev": true }, "sisteransi": { @@ -16254,9 +19092,9 @@ "integrity": "sha512-LzIjEQ0S0DpIgnxMEayM1rq9aGwGRG4OnZhCdjx7glTaJtf4zRfpg87ImfjSJjoW9vKpagd82McDOwbRT5kQKQ==" }, "skynet-js": { - "version": "4.0.20-beta", - "resolved": "https://registry.npmjs.org/skynet-js/-/skynet-js-4.0.20-beta.tgz", - "integrity": "sha512-sm0UECmh79ZnzoNvKOl0YJuZG9TF6dfkc72WF9laHHtmoU5WWgI1DAirTP+szQSOPs8RFpTTJ0qr0Sh5CQIBrA==", + "version": "4.0.22-beta", + "resolved": "https://registry.npmjs.org/skynet-js/-/skynet-js-4.0.22-beta.tgz", + "integrity": "sha512-DpTCuMIT5JSBTwJX3nb/qkHVAFyCeEA8fanBGzZPj4QviYK3Mmk+lZKLETd5RzxavkBtgW7VlSogmxdTDjjbyg==", "requires": { "axios": "^0.24.0", "base32-decode": "^1.0.0", @@ -16305,12 +19143,6 @@ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.1.0.tgz", "integrity": "sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ==", "dev": true - }, - "is-fullwidth-code-point": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz", - "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==", - "dev": true } } }, @@ -16327,9 +19159,9 @@ "dev": true }, "source-map-support": { - "version": "0.5.20", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.20.tgz", - "integrity": "sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==", + "version": "0.5.21", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", + "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", "dev": true, "requires": { "buffer-from": "^1.0.0", @@ -16361,9 +19193,9 @@ } }, "spdx-license-ids": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz", - "integrity": "sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==", + "version": "3.0.11", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz", + "integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==", "dev": true }, "sprintf-js": { @@ -16430,14 +19262,31 @@ } }, "string-width": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", - "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.0.tgz", + "integrity": "sha512-7x54QnN21P+XL/v8SuNKvfgsUre6PXpN7mc77N3HlZv+f1SBRGmjxtOud2Z6FZ8DmdkD/IdjCaf9XXbnqmTZGQ==", "dev": true, "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + }, + "dependencies": { + "ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "dev": true + }, + "strip-ansi": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz", + "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==", + "dev": true, + "requires": { + "ansi-regex": "^6.0.1" + } + } } }, "strip-ansi": { @@ -16468,12 +19317,12 @@ "dev": true }, "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { - "has-flag": "^4.0.0" + "has-flag": "^3.0.0" } }, "supports-hyperlinks": { @@ -16484,8 +19333,31 @@ "requires": { "has-flag": "^4.0.0", "supports-color": "^7.0.0" + }, + "dependencies": { + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } } }, + "supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "dev": true + }, "symbol-tree": { "version": "3.2.4", "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", @@ -16493,9 +19365,9 @@ "dev": true }, "tailwindcss": { - "version": "3.0.12", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.12.tgz", - "integrity": "sha512-VqhF86z2c34sJyS5ZS8Q2nYuN0KzqZw1GGsuQQO9kJ3mY1oG7Fsag0vICkxUVXk6P+1sUkTkjMjKWCjEF0hNHw==", + "version": "3.0.14", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.14.tgz", + "integrity": "sha512-7VTZJVMY9iTZhGsiTC9d3gWk+tSJz8iKZoxd5mvO0w4n0lulzVPYEOiwKcz5h8M/rNhlpymU7Ix5519Tl5wrfA==", "dev": true, "requires": { "arg": "^5.0.1", @@ -16517,24 +19389,64 @@ "postcss-selector-parser": "^6.0.8", "postcss-value-parser": "^4.2.0", "quick-lru": "^5.1.1", - "resolve": "^1.20.0" + "resolve": "^1.21.0" }, "dependencies": { - "glob-parent": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", - "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, "requires": { - "is-glob": "^4.0.3" + "has-flag": "^4.0.0" } } } }, "tapable": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.0.tgz", - "integrity": "sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", + "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", "dev": true }, "terminal-link": { @@ -16548,14 +19460,14 @@ } }, "terser": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.7.2.tgz", - "integrity": "sha512-0Omye+RD4X7X69O0eql3lC4Heh/5iLj3ggxR/B5ketZLOtLiOqukUgjw3q4PDnNQbsrkKr3UMypqStQG3XKRvw==", + "version": "5.10.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.10.0.tgz", + "integrity": "sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==", "dev": true, "requires": { "commander": "^2.20.0", "source-map": "~0.7.2", - "source-map-support": "~0.5.19" + "source-map-support": "~0.5.20" }, "dependencies": { "commander": { @@ -16573,28 +19485,18 @@ } }, "terser-webpack-plugin": { - "version": "5.1.4", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.1.4.tgz", - "integrity": "sha512-C2WkFwstHDhVEmsmlCxrXUtVklS+Ir1A7twrYzrDrQQOIMOaVAYykaoo/Aq1K0QRkMoY2hhvDQY1cm4jnIMFwA==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.0.tgz", + "integrity": "sha512-LPIisi3Ol4chwAaPP8toUJ3L4qCM1G0wao7L3qNv57Drezxj6+VEyySpPw4B1HSO2Eg/hDY/MNF5XihCAoqnsQ==", "dev": true, "requires": { - "jest-worker": "^27.0.2", - "p-limit": "^3.1.0", - "schema-utils": "^3.0.0", + "jest-worker": "^27.4.1", + "schema-utils": "^3.1.1", "serialize-javascript": "^6.0.0", "source-map": "^0.6.1", - "terser": "^5.7.0" + "terser": "^5.7.2" }, "dependencies": { - "p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "requires": { - "yocto-queue": "^0.1.0" - } - }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -16620,6 +19522,12 @@ "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", "dev": true }, + "thenby": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/thenby/-/thenby-1.3.4.tgz", + "integrity": "sha512-89Gi5raiWA3QZ4b2ePcEwswC3me9JIg+ToSgtE0JWeCynLnLxNr/f9G+xfo9K+Oj4AFdom8YNJjibIARTJmapQ==", + "dev": true + }, "throat": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/throat/-/throat-6.0.1.tgz", @@ -16667,12 +19575,20 @@ "psl": "^1.1.33", "punycode": "^2.1.1", "universalify": "^0.1.2" + }, + "dependencies": { + "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 + } } }, "tr46": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz", - "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz", + "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==", "dev": true, "requires": { "punycode": "^2.1.1" @@ -16690,6 +19606,46 @@ "semver": "^7.3.4" }, "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, "semver": { "version": "7.3.5", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", @@ -16698,6 +19654,15 @@ "requires": { "lru-cache": "^6.0.0" } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } } } }, @@ -16708,9 +19673,9 @@ "dev": true }, "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==", "dev": true }, "tsutils": { @@ -16720,6 +19685,14 @@ "dev": true, "requires": { "tslib": "^1.8.1" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + } } }, "tus-js-client": { @@ -16813,9 +19786,9 @@ "dev": true }, "universalify": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", + "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", "dev": true }, "uri-js": { @@ -16833,9 +19806,9 @@ "integrity": "sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==" }, "url-parse": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.3.tgz", - "integrity": "sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==", + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.4.tgz", + "integrity": "sha512-ITeAByWWoqutFClc/lRZnFplgXgEZr3WJ6XngMM/N9DMIm4K8zXPCZ1Jdu0rERwO84w1WC5wkle2ubwTA4NTBg==", "requires": { "querystringify": "^2.1.1", "requires-port": "^1.0.0" @@ -16881,12 +19854,12 @@ } }, "w3c-xmlserializer": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz", - "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-3.0.0.tgz", + "integrity": "sha512-3WFqGEgSXIyGhOmAFtlicJNMjEps8b1MG31NCA0/vOF9+nKMUW1ckhi9cnNHmf88Rzw5V+dwIwsm2C7X8k9aQg==", "dev": true, "requires": { - "xml-name-validator": "^3.0.0" + "xml-name-validator": "^4.0.0" } }, "walker": { @@ -16909,9 +19882,9 @@ } }, "webidl-conversions": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz", - "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", + "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==", "dev": true }, "webpack": { @@ -16944,21 +19917,6 @@ "terser-webpack-plugin": "^5.1.3", "watchpack": "^2.3.1", "webpack-sources": "^3.2.2" - }, - "dependencies": { - "acorn": { - "version": "8.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.4.1.tgz", - "integrity": "sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA==", - "dev": true - }, - "acorn-import-assertions": { - "version": "1.7.6", - "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.7.6.tgz", - "integrity": "sha512-FlVvVFA1TX6l3lp8VjDnYYq7R1nyW6x3svAt4nDgrWQ9SBaSh9CnbwgSUTasgfNfOG5HlM1ehugCvM+hjo56LA==", - "dev": true, - "requires": {} - } } }, "webpack-cli": { @@ -16981,18 +19939,18 @@ "webpack-merge": "^5.7.3" }, "dependencies": { - "colorette": { - "version": "2.0.16", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz", - "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==", + "commander": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", + "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", "dev": true } } }, "webpack-merge": { - "version": "5.7.3", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.7.3.tgz", - "integrity": "sha512-6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA==", + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz", + "integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==", "dev": true, "requires": { "clone-deep": "^4.0.1", @@ -17000,24 +19958,24 @@ } }, "webpack-sources": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.2.tgz", - "integrity": "sha512-cp5qdmHnu5T8wRg2G3vZZHoJPN14aqQ89SyQ11NpGH5zEMDCclt49rzo+MaRazk7/UeILhAI+/sEtcM+7Fr0nw==", + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", + "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", "dev": true }, "whatwg-encoding": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz", - "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz", + "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==", "dev": true, "requires": { - "iconv-lite": "0.4.24" + "iconv-lite": "0.6.3" } }, "whatwg-mimetype": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz", - "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz", + "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==", "dev": true }, "whatwg-url": { @@ -17028,23 +19986,6 @@ "requires": { "tr46": "^3.0.0", "webidl-conversions": "^7.0.0" - }, - "dependencies": { - "tr46": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz", - "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==", - "dev": true, - "requires": { - "punycode": "^2.1.1" - } - }, - "webidl-conversions": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", - "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==", - "dev": true - } } }, "which": { @@ -17077,6 +20018,55 @@ "ansi-styles": "^4.0.0", "string-width": "^4.1.0", "strip-ansi": "^6.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, + "string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + } + } } }, "wrappy": { @@ -17098,16 +20088,16 @@ } }, "ws": { - "version": "8.2.3", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz", - "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==", + "version": "8.4.2", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.4.2.tgz", + "integrity": "sha512-Kbk4Nxyq7/ZWqr/tarI9yIt/+iNNFOjBXEWgTb4ydaNHBNGgvf2QHbS9fdfsndfjFlFwEd4Al+mw83YkaD10ZA==", "dev": true, "requires": {} }, "xml-name-validator": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz", - "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz", + "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==", "dev": true }, "xmlchars": { @@ -17153,6 +20143,31 @@ "string-width": "^4.2.0", "y18n": "^5.0.5", "yargs-parser": "^20.2.2" + }, + "dependencies": { + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, + "string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + } + } } }, "yargs-parser": { @@ -17160,12 +20175,6 @@ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", "dev": true - }, - "yocto-queue": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", - "dev": true } } } diff --git a/package.json b/package.json index 559e77a5..43f7a64d 100644 --- a/package.json +++ b/package.json @@ -45,6 +45,7 @@ "dependencies": { "buffer": "^6.0.3", "confusables": "^1.1.0", + "core-js": "^3.20.2", "crypto-browserify": "^3.12.0", "idb-keyval": "^6.1.0", "jwt-decode": "^3.1.2", @@ -52,7 +53,7 @@ "post-me": "^0.4.5", "punycode": "^2.1.1", "randombytes": "^2.1.0", - "skynet-js": "^4.0.20-beta", + "skynet-js": "^4.0.22-beta", "skynet-mysky-utils": "^0.3.0", "stream-browserify": "^3.0.0", "tweetnacl": "^1.0.3", diff --git a/src/mysky.ts b/src/mysky.ts index c1392c9e..2aee58bf 100644 --- a/src/mysky.ts +++ b/src/mysky.ts @@ -153,7 +153,7 @@ export class MySky { // Get the preferred portal and stored email from user settings. if (seed && !preferredPortal) { - const { portal, email } = await mySky.getUserSettings(seed); + const { portal, email } = await mySky.getUserSettings(); preferredPortal = portal; storedEmail = email; } From bc5065a2ce191ad5a7461eee1197f6bd53c695f3 Mon Sep 17 00:00:00 2001 From: Marcin S Date: Mon, 17 Jan 2022 15:04:47 -0600 Subject: [PATCH 14/29] Add some fixes, debug lines, and refactors --- scripts/ui.ts | 11 +- src/mysky.ts | 275 +++++++++++++++++++++++++----------------- src/portal-account.ts | 8 +- 3 files changed, 179 insertions(+), 115 deletions(-) diff --git a/scripts/ui.ts b/scripts/ui.ts index e3b9caad..fc6f6d0a 100644 --- a/scripts/ui.ts +++ b/scripts/ui.ts @@ -242,6 +242,8 @@ async function getEmailFromSettings(): Promise { * @returns - The permissions response. */ async function getPermissions(seed: Uint8Array, permissions: Permission[]): Promise { + log("Called getPermissions"); + // Open the permissions provider. log("Calling launchPermissionsProvider"); const permissionsProvider = await launchPermissionsProvider(seed); @@ -455,6 +457,8 @@ async function setupAndRunDisplay(displayUrl: string, methodName: string, ... * @returns - An empty promise. */ async function resolveOnMySkyPortalLogin(): Promise { + log("Called resolveOnMySkyPortalLogin"); + return Promise.race([ new Promise((resolve, reject) => window.addEventListener("storage", async ({ key, newValue }: StorageEvent) => { @@ -500,7 +504,8 @@ async function catchError(errorMsg: string): Promise { * @param email - The email. */ export function saveSeedAndEmail(seed: Uint8Array, email: string | null): void { - log("Called saveSeedAndEmail"); + log("Entered saveSeedAndEmail"); + if (!localStorage) { console.log("WARNING: localStorage disabled, seed not stored"); return; @@ -516,6 +521,10 @@ export function saveSeedAndEmail(seed: Uint8Array, email: string | null): void { localStorage.setItem(EMAIL_STORAGE_KEY, email); } + // Clear the seed, or if we set it to a value that's already set it will not + // trigger the even listener. + localStorage.removeItem(SEED_STORAGE_KEY); + // Set the seed, triggering the storage event. localStorage.setItem(SEED_STORAGE_KEY, JSON.stringify(Array.from(seed))); } diff --git a/src/mysky.ts b/src/mysky.ts index 2aee58bf..bd915734 100644 --- a/src/mysky.ts +++ b/src/mysky.ts @@ -1,4 +1,3 @@ -import { AxiosResponse } from "axios"; import type { Connection } from "post-me"; import { ChildHandshake, WindowMessenger } from "post-me"; import { @@ -13,7 +12,6 @@ import { SkynetClient, PUBLIC_KEY_LENGTH, PRIVATE_KEY_LENGTH, - RequestConfig, ExecuteRequestError, JsonData, deriveEncryptedFileKeyEntropy, @@ -78,12 +76,10 @@ export class PermissionsProvider { * * @property client - The associated SkynetClient. * @property referrerDomain - The domain of the parent skapp. - * @property originalExecuteRequest - If this is set, it means we modified the `executeRequest` method on the client. This will contain the original `executeRequest` so it can be restored. * @property parentConnection - The handshake connection with the parent window. * @property permissionsProvider - The permissions provider, if it has been loaded. */ export class MySky { - protected originalExecuteRequest: ((config: RequestConfig) => Promise) | null = null; protected parentConnection: Promise | null = null; // ============ @@ -153,7 +149,7 @@ export class MySky { // Get the preferred portal and stored email from user settings. if (seed && !preferredPortal) { - const { portal, email } = await mySky.getUserSettings(); + const { portal, email } = await mySky.getUserSettings(seed); preferredPortal = portal; storedEmail = email; } @@ -225,25 +221,18 @@ export class MySky { log("Entered getEncryptedPathSeed"); // Check with the permissions provider that we have permission for this request. - await this.checkPermission(path, PermCategory.Hidden, PermType.Read); // Get the seed. - const seed = checkStoredSeed(); if (!seed) { throw new Error("User seed not found"); } // Compute the root path seed. - - const bytes = new Uint8Array([...sha512(SALT_ENCRYPTED_PATH_SEED), ...sha512(seed)]); - // NOTE: Truncate to 32 bytes instead of the 64 bytes for a directory path - // seed. This is a historical artifact left for backwards compatibility. - const rootPathSeedBytes = sha512(bytes).slice(0, ENCRYPTION_ROOT_PATH_SEED_BYTES_LENGTH); + const rootPathSeedBytes = deriveRootPathSeed(seed); // Compute the child path seed. - return deriveEncryptedPathSeedForRoot(rootPathSeedBytes, path, isDirectory); } @@ -272,27 +261,25 @@ export class MySky { clearStoredEmail(); clearStoredPreferredPortal(); + // Restore original `executeRequest`. + this.client.customOptions.loginFn = undefined; + // Clear the JWT cookie. // // NOTE: We do this even if we could not find a seed above. The local // storage might have been cleared with the JWT token still being active. // - // NOTE: This will not auto-login on an expired JWT just to logout again. If - // we get a 401 error, we just return silently without throwing. + // NOTE: This will not auto-relogin on an expired JWT, just to logout again. + // If we get a 401 error, we just return silently without throwing. try { - await logout(this.client, { executeRequest: this.originalExecuteRequest || undefined }); + log("Calling logout"); + await logout(this.client); } catch (e) { if ((e as ExecuteRequestError).responseStatus !== 401) { errors.push(e); } } - // Restore original `executeRequest` on logout. - if (this.originalExecuteRequest) { - this.client.executeRequest = this.originalExecuteRequest; - this.originalExecuteRequest = null; - } - // Throw all encountered errors. if (errors.length > 0) { throw new Error(`Error${errors.length > 1 ? "s" : ""} logging out: ${errors}`); @@ -459,6 +446,8 @@ export class MySky { * @param email - The user email. */ protected async connectToPortalAccount(seed: Uint8Array, email: string): Promise { + log("Entered connectToPortalAccount"); + // Register and get the JWT cookie. // // Make requests to login and register in parallel. At most one can succeed, @@ -470,13 +459,33 @@ export class MySky { } } + /** + * Gets the encrypted path seed for the given path without requiring + * permissions. This should NOT be exported - for internal use only. + * + * @param seed - The user seed. + * @param path - The given file or directory path. + * @param isDirectory - Whether the path corresponds to a directory. + * @returns - The hex-encoded encrypted path seed. + */ + async getEncryptedPathSeedInternal(seed: Uint8Array, path: string, isDirectory: boolean): Promise { + log("Entered getEncryptedPathSeedInternal"); + + // Compute the root path seed. + const rootPathSeedBytes = deriveRootPathSeed(seed); + + // Compute the child path seed. + return deriveEncryptedPathSeedForRoot(rootPathSeedBytes, path, isDirectory); + } + /** * Checks for the preferred portal and stored email in user settings, and sets * them if found. * + * @param seed - The user seed. * @returns - The portal and email, if found. */ - protected async getUserSettings(): Promise { + protected async getUserSettings(seed: Uint8Array): Promise { let email = null, portal = null; @@ -484,7 +493,7 @@ export class MySky { const path = await this.getUserSettingsPath(); // Check for stored portal and email in user settings. - const { data: userSettings } = await this.getJSONEncrypted(path); + const { data: userSettings } = await this.getJSONEncrypted(seed, path); if (userSettings) { email = (userSettings.email as string) || null; portal = (userSettings.portal as string) || null; @@ -496,29 +505,34 @@ export class MySky { /** * Sets the user settings. * + * @param seed - The user seed. * @param settings - The given user settings. */ - protected async setUserSettings(settings: UserSettings): Promise { + protected async setUserSettings(seed: Uint8Array, settings: UserSettings): Promise { // Get the settings path for the MySky domain. const path = await this.getUserSettingsPath(); // Set preferred portal and email in user settings. - await this.setJSONEncrypted(path, settings); + await this.setJSONEncrypted(seed, path, settings); } /** * Gets Encrypted JSON at the given path through MySky, if the user has given * Hidden Read permissions to do so. * + * @param seed - The user seed. * @param path - The data path. * @returns - An object containing the decrypted json data. * @throws - Will throw if the user does not have Hidden Read permission on the path. */ - protected async getJSONEncrypted(path: string): Promise { + protected async getJSONEncrypted(seed: Uint8Array, path: string): Promise { validateString("path", path, "parameter"); // Call MySky which checks for read permissions on the path. - const [publicKey, pathSeed] = await Promise.all([this.userID(), this.getEncryptedPathSeed(path, false)]); + const [publicKey, pathSeed] = await Promise.all([ + this.userID(), + this.getEncryptedPathSeedInternal(seed, path, false), + ]); // Fetch the raw encrypted JSON data. const dataKey = deriveEncryptedFileTweak(pathSeed); @@ -537,19 +551,23 @@ export class MySky { * Sets Encrypted JSON at the given path through MySky, if the user has given * Hidden Write permissions to do so. * + * @param seed - The user seed. * @param path - The data path. * @param json - The json to encrypt and set. * @returns - An object containing the original json data. * @throws - Will throw if the user does not have Hidden Write permission on the path. */ - protected async setJSONEncrypted(path: string, json: JsonData): Promise { + protected async setJSONEncrypted(seed: Uint8Array, path: string, json: JsonData): Promise { validateString("path", path, "parameter"); validateObject("json", json, "parameter"); const opts = { hashedDataKeyHex: true }; // Call MySky which checks for read permissions on the path. - const [publicKey, pathSeed] = await Promise.all([this.userID(), this.getEncryptedPathSeed(path, false)]); + const [publicKey, pathSeed] = await Promise.all([ + this.userID(), + this.getEncryptedPathSeedInternal(seed, path, false), + ]); const dataKey = deriveEncryptedFileTweak(pathSeed); // Immediately fail if the mutex is not available. @@ -569,7 +587,7 @@ export class MySky { const [entry] = await getOrCreateSkyDBRegistryEntry(this.client, dataKey, data, newRevision, opts); // Call MySky which checks for write permissions on the path. - const signature = await this.signEncryptedRegistryEntry(entry, path); + const signature = await this.signEncryptedRegistryEntryInternal(seed, entry, path); await this.client.registry.postSignedEntry(publicKey, entry, signature); @@ -587,6 +605,77 @@ export class MySky { return `${this.mySkyDomain}/settings.json`; } + /** + * Logs in from MySky UI. + * + * Flow: + * + * 0. Unload the permissions provider and seed if stored. (Done in + * `setupStorageEventListener`.) + * + * 1. Always use siasky.net first. + * + * 2. Get the preferred portal and switch to it (`setPortal`), or if not found + * switch to current portal. + * + * 3. If we got the email, then we register/login to set the JWT cookie + * (`connectToPortalAccount`). + * + * 4. If the email is set, it should set up automatic re-login on JWT + * cookie expiry. + * + * 5. Save the email in user settings. + * + * 6. Trigger a load of the permissions provider. + * + * @param seed - The user seed. + */ + protected async loginFromUi(seed: Uint8Array): Promise { + // Connect to siasky.net first. + // + // NOTE: Don't use the stored preferred portal here because we are just + // logging into a new account and need to get the user settings for the + // first time. Always use siasky.net. + this.client = getLoginClient(seed, null); + + // Login to portal. + { + // Get the preferred portal and switch to it. + const { portal: preferredPortal, email } = await this.getUserSettings(seed); + let storedEmail = email; + + // Set the portal + this.setPortal(preferredPortal); + + // The email wasn't in the user settings but the user might have just + // signed up with it -- check local storage. We don't need to do this if + // the email was already found. + // TODO: Add dedicated flow(s) for changing the email after it's set. + let isEmailProvidedByUser = false; + if (!storedEmail) { + storedEmail = checkStoredEmail(); + isEmailProvidedByUser = storedEmail !== null; + } + + if (storedEmail) { + // Register/login to get the JWT cookie. + await this.connectToPortalAccount(seed, storedEmail); + + // Set up auto re-login on JWT expiry. + this.setupAutoRelogin(seed, storedEmail); + + // Save the email in user settings. Do this after we've connected to + // the portal account so we know that the email is valid. + if (isEmailProvidedByUser) { + await this.setUserSettings(seed, { portal: preferredPortal, email: storedEmail }); + } + } + } + + // Launch the new permissions provider. + this.permissionsProvider = launchPermissionsProvider(seed); + } + /** * Sets the portal, either the preferred portal if given or the current portal * otherwise. @@ -594,6 +683,8 @@ export class MySky { * @param preferredPortal - The user's preferred portal */ protected setPortal(preferredPortal: string | null): void { + log("Entered setPortal"); + if (preferredPortal) { // Connect to the preferred portal if it was found. this.client = new SkynetClient(preferredPortal); @@ -622,24 +713,14 @@ export class MySky { * @param email - The user email. */ protected setupAutoRelogin(seed: Uint8Array, email: string): void { - if (this.originalExecuteRequest) { + log("Entered setupAutoRelogin"); + + if (this.client.customOptions.loginFn) { throw new Error("Tried to setup auto re-login with it already being set up"); } - const executeRequest = this.client.executeRequest; - this.originalExecuteRequest = executeRequest; - this.client.executeRequest = async function (config: RequestConfig): Promise { - try { - return await executeRequest(config); - } catch (e) { - if ((e as ExecuteRequestError).responseStatus === 401) { - // Try logging in again. - await login(this, seed, email); - return await executeRequest(config); - } else { - throw e; - } - } + this.client.customOptions.loginFn = async () => { + await login(this.client, seed, email); }; } @@ -650,32 +731,17 @@ export class MySky { * * For the preferred portal flow, see "Load MySky redirect flow" on * `redirectIfNotOnPreferredPortal` in the SDK. - * - * The login flow: - * - * 0. Unload the permissions provider and seed if stored. - * - * 1. Always use siasky.net first. - * - * 2. Get the preferred portal and switch to it (`setPortal`), or if not found - * switch to current portal. - * - * 3. If we got the email, then we register/login to set the JWT cookie - * (`connectToPortalAccount`). - * - * 4. If the email is set, it should set up automatic re-login on JWT - * cookie expiry. - * - * 5. Save the email in user settings. - * - * 6. Trigger a load of the permissions provider. */ protected setupStorageEventListener(): void { + log("Entered setupStorageEventListener"); + window.addEventListener("storage", async ({ key, newValue }: StorageEvent) => { if (key !== SEED_STORAGE_KEY) { return; } + log("Entered storage event listener with seed storage key"); + if (this.permissionsProvider) { // Unload the old permissions provider first. This makes sure that MySky // can't respond to more requests until the new permissions provider is @@ -693,49 +759,7 @@ export class MySky { // Parse the seed. const seed = new Uint8Array(JSON.parse(newValue)); - // Connect to siasky.net first. - // - // NOTE: Don't use the stored preferred portal here because we are just - // logging into a new account and need to get the user settings for the - // first time. Always use siasky.net. - this.client = getLoginClient(seed, null); - - // Login to portal. - { - // Get the preferred portal and switch to it. - const { portal: preferredPortal, email } = await this.getUserSettings(); - let storedEmail = email; - - // Set the portal - this.setPortal(preferredPortal); - - // The email wasn't in the user settings but the user might have just - // signed up with it -- check local storage. We don't need to do this if - // the email was already found. - // TODO: Add dedicated flow(s) for changing the email after it's set. - let isEmailProvidedByUser = false; - if (!storedEmail) { - storedEmail = checkStoredEmail(); - isEmailProvidedByUser = storedEmail !== null; - } - - if (storedEmail) { - // Register/login to get the JWT cookie. - await this.connectToPortalAccount(seed, storedEmail); - - // Set up auto re-login on JWT expiry. - this.setupAutoRelogin(seed, storedEmail); - - // Save the email in user settings. Do this after we've connected to - // the portal account so we know that the email is valid. - if (isEmailProvidedByUser) { - await this.setUserSettings({ portal: preferredPortal, email: storedEmail }); - } - } - } - - // Launch the new permissions provider. - this.permissionsProvider = launchPermissionsProvider(seed); + await this.loginFromUi(seed); // Signal to MySky UI that we are done. localStorage.setItem(PORTAL_LOGIN_COMPLETE_SENTINEL_KEY, ""); @@ -746,6 +770,28 @@ export class MySky { }); } + /** + * Signs the encrypted registry entry without requiring permissions. For + * internal use only. + * + * @param seed - The user seed. + * @param entry - The encrypted registry entry. + * @param path - The MySky path. + * @returns - The signature. + */ + async signEncryptedRegistryEntryInternal(seed: Uint8Array, entry: RegistryEntry, path: string): Promise { + // Check that the entry data key corresponds to the right path. + + // Use `isDirectory: false` because registry entries can only correspond to files right now. + const pathSeed = await this.getEncryptedPathSeedInternal(seed, path, false); + const dataKey = deriveEncryptedFileTweak(pathSeed); + if (entry.dataKey !== dataKey) { + throw new Error("Path does not match the data key in the encrypted registry entry."); + } + + return this.signRegistryEntryHelper(entry, path, PermCategory.Hidden); + } + protected async signRegistryEntryHelper( entry: RegistryEntry, path: string, @@ -879,6 +925,19 @@ export function clearStoredSeed(): void { localStorage.removeItem(SEED_STORAGE_KEY); } +/** + * Derives the root path seed. + * + * @param seed - The user seed. + * @returns - The root path seed. + */ +function deriveRootPathSeed(seed: Uint8Array): Uint8Array { + const bytes = new Uint8Array([...sha512(SALT_ENCRYPTED_PATH_SEED), ...sha512(seed)]); + // NOTE: Truncate to 32 bytes instead of the 64 bytes for a directory path + // seed. This is a historical artifact left for backwards compatibility. + return sha512(bytes).slice(0, ENCRYPTION_ROOT_PATH_SEED_BYTES_LENGTH); +} + /** * Initialize the Skynet client. * diff --git a/src/portal-account.ts b/src/portal-account.ts index fe9f4909..12bcd5d2 100644 --- a/src/portal-account.ts +++ b/src/portal-account.ts @@ -1,5 +1,4 @@ -import { AxiosResponse } from "axios"; -import { KeyPair, RequestConfig, SkynetClient } from "skynet-js"; +import { KeyPair, SkynetClient } from "skynet-js"; import type { CustomClientOptions } from "skynet-js"; import { sign } from "tweetnacl"; @@ -53,8 +52,6 @@ export type CustomLoginOptions = CustomClientOptions & { */ export type CustomLogoutOptions = CustomClientOptions & { endpointLogout?: string; - - executeRequest?: (config: RequestConfig) => Promise; }; /** @@ -197,8 +194,7 @@ export async function login( export async function logout(client: SkynetClient, customOptions?: CustomLogoutOptions): Promise { const opts = { ...DEFAULT_LOGOUT_OPTIONS, ...client.customOptions, ...customOptions }; - const executeRequest = opts.executeRequest || client.executeRequest; - await executeRequest({ + await client.executeRequest({ endpointPath: opts.endpointLogout, method: "POST", subdomain: "account", From d922f2dbbece312a0e0d36e977421ca49766ef27 Mon Sep 17 00:00:00 2001 From: Marcin S Date: Tue, 18 Jan 2022 15:15:31 -0600 Subject: [PATCH 15/29] Fix some bugs, add debug lines, send URL parameters to UI screens --- html/seed-display.html | 2 +- html/signin-connect.html | 2 ++ scripts/signin-connect.ts | 6 ++++++ scripts/ui.ts | 20 +++++++++++++------- src/mysky.ts | 36 ++++++++++++++++++++++++++---------- src/provider.ts | 3 ++- 6 files changed, 50 insertions(+), 19 deletions(-) diff --git a/html/seed-display.html b/html/seed-display.html index 24edc4ef..f3161ee5 100644 --- a/html/seed-display.html +++ b/html/seed-display.html @@ -231,7 +231,7 @@

} function showPassword() { - if (seedInput.type === "password") { + if (uiSigninPassphraseText.type === "password") { uiSigninPassphraseText.type = "text"; uiShowSeedText.textContent = "Hide passphrase"; uiShowSeedOn.classList.add("hidden"); diff --git a/html/signin-connect.html b/html/signin-connect.html index ec4e308b..fe8cc6cf 100644 --- a/html/signin-connect.html +++ b/html/signin-connect.html @@ -65,5 +65,7 @@

+ + diff --git a/scripts/signin-connect.ts b/scripts/signin-connect.ts index 1724f35f..2d77fc44 100644 --- a/scripts/signin-connect.ts +++ b/scripts/signin-connect.ts @@ -1,5 +1,7 @@ import { ChildHandshake, Connection, WindowMessenger } from "post-me"; +import { log } from "../src/util"; + const uiConnectEmailText = document.getElementById("connect-email-text")!; let readyEmail: string | null = null; @@ -48,6 +50,8 @@ window.onload = async () => { * Initialize the communication with the UI. */ async function init(): Promise { + log("Entered init"); + // Establish handshake with parent window. const messenger = new WindowMessenger({ @@ -86,6 +90,8 @@ async function getEmail(): Promise { * @param email - The email. */ function handleEmail(email: string | null): void { + log(`Entered handleEmail with email: ${email}`); + // Set `readyEmail`, triggering `getEmail`. readyEmail = email; } diff --git a/scripts/ui.ts b/scripts/ui.ts index fc6f6d0a..6745cf9c 100644 --- a/scripts/ui.ts +++ b/scripts/ui.ts @@ -5,6 +5,7 @@ import { defaultHandshakeAttemptsInterval, defaultHandshakeMaxAttempts, dispatchedErrorEvent, + ensureUrl, errorWindowClosed, monitorWindowError, Permission, @@ -216,7 +217,7 @@ async function getSeedAndEmail(): Promise<[Uint8Array, string | null]> { */ async function getSeedAndEmailFromProvider(): Promise { // Show seed provider chooser. - const seedProviderDisplayUrl = await getSeedProviderDisplayUrl(); + const seedProviderDisplayUrl = ensureUrl(await getSeedProviderDisplayUrl()); // User has chosen seed provider, open seed provider display. log("Calling runSeedProviderDisplay"); @@ -242,7 +243,7 @@ async function getEmailFromSettings(): Promise { * @returns - The permissions response. */ async function getPermissions(seed: Uint8Array, permissions: Permission[]): Promise { - log("Called getPermissions"); + log("Entered getPermissions"); // Open the permissions provider. log("Calling launchPermissionsProvider"); @@ -296,7 +297,7 @@ async function getSeedProviderDisplayUrl(): Promise { * @returns - The URL. */ async function getSigninConnectDisplayUrl(): Promise { - return `${window.location.hostname}/${RELATIVE_SIGNIN_CONNECT_DISPLAY_URL}`; + return ensureUrl(`${window.location.hostname}/${RELATIVE_SIGNIN_CONNECT_DISPLAY_URL}`); } /** @@ -311,7 +312,7 @@ async function runPermissionsProviderDisplay( pendingPermissions: Permission[] ): Promise { const permissionsProviderUrl = await getPermissionsProviderUrl(seed); - const permissionsProviderDisplayUrl = `${permissionsProviderUrl}/${relativePermissionsDisplayUrl}`; + const permissionsProviderDisplayUrl = ensureUrl(`${permissionsProviderUrl}/${relativePermissionsDisplayUrl}`); return setupAndRunDisplay(permissionsProviderDisplayUrl, "getPermissions", pendingPermissions, document.referrer); } @@ -334,7 +335,7 @@ async function runSeedProviderDisplay(seedProviderDisplayUrl: string): Promise { // Get the display URL. - const seedSelectionDisplayUrl = `${window.location.hostname}/${RELATIVE_SEED_SELECTION_DISPLAY_URL}`; + const seedSelectionDisplayUrl = ensureUrl(`${window.location.hostname}/${RELATIVE_SEED_SELECTION_DISPLAY_URL}`); return setupAndRunDisplay(seedSelectionDisplayUrl, "getSeedProvider"); } @@ -402,6 +403,11 @@ async function connectDisplayProvider(childFrame: HTMLIFrameElement): Promise(displayUrl: string, methodName: string, ...methodParams: unknown[]): Promise { + // Add debug parameter to the URL. + const displayUrlObject = new URL(displayUrl); + displayUrlObject.search = window.location.search; + displayUrl = displayUrlObject.toString(); + // Add error listener. const { promise: promiseError, controller: controllerError } = monitorWindowError(); @@ -457,7 +463,7 @@ async function setupAndRunDisplay(displayUrl: string, methodName: string, ... * @returns - An empty promise. */ async function resolveOnMySkyPortalLogin(): Promise { - log("Called resolveOnMySkyPortalLogin"); + log("Entered resolveOnMySkyPortalLogin"); return Promise.race([ new Promise((resolve, reject) => @@ -467,7 +473,7 @@ async function resolveOnMySkyPortalLogin(): Promise { } // Check for errors from Main MySky. - if (newValue !== "") { + if (newValue !== "1") { reject(newValue); } diff --git a/src/mysky.ts b/src/mysky.ts index bd915734..8340536c 100644 --- a/src/mysky.ts +++ b/src/mysky.ts @@ -486,6 +486,8 @@ export class MySky { * @returns - The portal and email, if found. */ protected async getUserSettings(seed: Uint8Array): Promise { + log("Entered getUserSettings"); + let email = null, portal = null; @@ -493,7 +495,7 @@ export class MySky { const path = await this.getUserSettingsPath(); // Check for stored portal and email in user settings. - const { data: userSettings } = await this.getJSONEncrypted(seed, path); + const { data: userSettings } = await this.getJSONEncryptedInternal(seed, path); if (userSettings) { email = (userSettings.email as string) || null; portal = (userSettings.portal as string) || null; @@ -513,19 +515,20 @@ export class MySky { const path = await this.getUserSettingsPath(); // Set preferred portal and email in user settings. - await this.setJSONEncrypted(seed, path, settings); + await this.setJSONEncryptedInternal(seed, path, settings); } /** - * Gets Encrypted JSON at the given path through MySky, if the user has given - * Hidden Read permissions to do so. + * Gets Encrypted JSON at the given path through MySky. * * @param seed - The user seed. * @param path - The data path. * @returns - An object containing the decrypted json data. * @throws - Will throw if the user does not have Hidden Read permission on the path. */ - protected async getJSONEncrypted(seed: Uint8Array, path: string): Promise { + protected async getJSONEncryptedInternal(seed: Uint8Array, path: string): Promise { + log("Entered getJSONEncryptedInternal"); + validateString("path", path, "parameter"); // Call MySky which checks for read permissions on the path. @@ -536,6 +539,7 @@ export class MySky { // Fetch the raw encrypted JSON data. const dataKey = deriveEncryptedFileTweak(pathSeed); + log("Calling getRawBytes"); const { data } = await this.client.db.getRawBytes(publicKey, dataKey); if (data === null) { return { data: null }; @@ -548,8 +552,7 @@ export class MySky { } /** - * Sets Encrypted JSON at the given path through MySky, if the user has given - * Hidden Write permissions to do so. + * Sets Encrypted JSON at the given path through MySky. * * @param seed - The user seed. * @param path - The data path. @@ -557,7 +560,13 @@ export class MySky { * @returns - An object containing the original json data. * @throws - Will throw if the user does not have Hidden Write permission on the path. */ - protected async setJSONEncrypted(seed: Uint8Array, path: string, json: JsonData): Promise { + protected async setJSONEncryptedInternal( + seed: Uint8Array, + path: string, + json: JsonData + ): Promise { + log("Entered setJSONEncryptedInternal"); + validateString("path", path, "parameter"); validateObject("json", json, "parameter"); @@ -631,6 +640,8 @@ export class MySky { * @param seed - The user seed. */ protected async loginFromUi(seed: Uint8Array): Promise { + log("Entered loginFromUi"); + // Connect to siasky.net first. // // NOTE: Don't use the stored preferred portal here because we are just @@ -658,7 +669,8 @@ export class MySky { } if (storedEmail) { - // Register/login to get the JWT cookie. + // Register/login to ensure the email is valid and get the JWT (in case + // we don't redirect to a preferred portal). await this.connectToPortalAccount(seed, storedEmail); // Set up auto re-login on JWT expiry. @@ -762,8 +774,10 @@ export class MySky { await this.loginFromUi(seed); // Signal to MySky UI that we are done. - localStorage.setItem(PORTAL_LOGIN_COMPLETE_SENTINEL_KEY, ""); + localStorage.setItem(PORTAL_LOGIN_COMPLETE_SENTINEL_KEY, "1"); } catch (e) { + log(`Error in storage event listener: ${e}`); + // Send error to MySky UI. localStorage.setItem(PORTAL_LOGIN_COMPLETE_SENTINEL_KEY, (e as Error).message); } @@ -950,6 +964,8 @@ function deriveRootPathSeed(seed: Uint8Array): Uint8Array { * @returns - The Skynet client to be used for logging in to the portal. */ function getLoginClient(seed: Uint8Array | null, preferredPortal: string | null): SkynetClient { + log("Entered getLoginClient"); + const initialPortal = seed ? INITIAL_PORTAL : undefined; return new SkynetClient(preferredPortal || initialPortal); } diff --git a/src/provider.ts b/src/provider.ts index f7d59ffd..507b26fb 100644 --- a/src/provider.ts +++ b/src/provider.ts @@ -1,6 +1,7 @@ import { Connection, ParentHandshake, WorkerMessenger } from "post-me"; import { defaultHandshakeAttemptsInterval, defaultHandshakeMaxAttempts, ensureUrl } from "skynet-mysky-utils"; import { PermissionsProvider } from "./mysky"; +import { log } from "./util"; export const relativePermissionsWorkerUrl = "permissions.js"; export const relativePermissionsDisplayUrl = "permissions-display.html"; @@ -48,7 +49,7 @@ export async function getPermissionsProviderUrl(_seed: Uint8Array): Promise { - console.log("Entered launchPermissionsProvider"); + log("Entered launchPermissionsProvider"); const permissionsProviderUrl = await getPermissionsProviderUrl(seed); From 1815b87acb2f8c4ba3cfe8b5d51bf6945e2edcac Mon Sep 17 00:00:00 2001 From: Marcin S Date: Thu, 20 Jan 2022 13:56:34 -0600 Subject: [PATCH 16/29] Fix some bugs --- html/signin-connect.html | 2 +- scripts/signin-connect.ts | 10 +++---- scripts/ui.ts | 18 ++++++++++--- src/mysky.ts | 57 ++++++++++++++++++++++++--------------- 4 files changed, 55 insertions(+), 32 deletions(-) diff --git a/html/signin-connect.html b/html/signin-connect.html index fe8cc6cf..ab8a2fa8 100644 --- a/html/signin-connect.html +++ b/html/signin-connect.html @@ -54,7 +54,7 @@

- not now + not now diff --git a/scripts/signin-connect.ts b/scripts/signin-connect.ts index 2d77fc44..955d5330 100644 --- a/scripts/signin-connect.ts +++ b/scripts/signin-connect.ts @@ -39,7 +39,7 @@ window.onload = async () => { }; (window as any).continue = () => { - handleEmail(null); + handleEmail(""); }; // ========== @@ -71,11 +71,13 @@ async function init(): Promise { * @returns - The email, if set. */ async function getEmail(): Promise { + log("Entered getEmail"); + const checkInterval = 100; return new Promise((resolve) => { const checkFunc = () => { - if (readyEmail) { + if (readyEmail !== null) { resolve(readyEmail); } }; @@ -89,9 +91,7 @@ async function getEmail(): Promise { * * @param email - The email. */ -function handleEmail(email: string | null): void { - log(`Entered handleEmail with email: ${email}`); - +function handleEmail(email: string): void { // Set `readyEmail`, triggering `getEmail`. readyEmail = email; } diff --git a/scripts/ui.ts b/scripts/ui.ts index 6745cf9c..941eaf8c 100644 --- a/scripts/ui.ts +++ b/scripts/ui.ts @@ -348,7 +348,13 @@ async function _runSeedSelectionDisplay(): Promise { async function runSigninConnectDisplay(): Promise { const signinConnectDisplayUrl = await getSigninConnectDisplayUrl(); - return setupAndRunDisplay(signinConnectDisplayUrl, "getEmail"); + return setupAndRunDisplay(signinConnectDisplayUrl, "getEmail").then( + // Convert "" to null. In signin-connect.ts we use "" to signify no email + // was given. + (email: string) => { + return email === "" ? null : email; + } + ); } /** @@ -409,7 +415,6 @@ async function setupAndRunDisplay(displayUrl: string, methodName: string, ... displayUrl = displayUrlObject.toString(); // Add error listener. - const { promise: promiseError, controller: controllerError } = monitorWindowError(); let frame: HTMLIFrameElement; @@ -424,13 +429,13 @@ async function setupAndRunDisplay(displayUrl: string, methodName: string, ... try { // Launch the full-screen iframe and connection. - frame = launchDisplay(displayUrl); connection = await connectDisplayProvider(frame); // Get the response. - + // // TODO: This should be a dual-promise that also calls ping() on an interval and rejects if no response was found in a given amount of time. + log(`Calling method ${methodName} in iframe`); const response = await connection.remoteHandle().call(methodName, ...methodParams); resolve(response); @@ -472,6 +477,11 @@ async function resolveOnMySkyPortalLogin(): Promise { return; } + if (!newValue) { + // Key was removed. + return; + } + // Check for errors from Main MySky. if (newValue !== "1") { reject(newValue); diff --git a/src/mysky.ts b/src/mysky.ts index 8340536c..a381ef38 100644 --- a/src/mysky.ts +++ b/src/mysky.ts @@ -511,6 +511,8 @@ export class MySky { * @param settings - The given user settings. */ protected async setUserSettings(seed: Uint8Array, settings: UserSettings): Promise { + log("Entered setUserSettings"); + // Get the settings path for the MySky domain. const path = await this.getUserSettingsPath(); @@ -531,11 +533,8 @@ export class MySky { validateString("path", path, "parameter"); - // Call MySky which checks for read permissions on the path. - const [publicKey, pathSeed] = await Promise.all([ - this.userID(), - this.getEncryptedPathSeedInternal(seed, path, false), - ]); + const { publicKey } = genKeyPairFromSeed(seed); + const pathSeed = await this.getEncryptedPathSeedInternal(seed, path, false); // Fetch the raw encrypted JSON data. const dataKey = deriveEncryptedFileTweak(pathSeed); @@ -570,14 +569,10 @@ export class MySky { validateString("path", path, "parameter"); validateObject("json", json, "parameter"); - const opts = { hashedDataKeyHex: true }; - - // Call MySky which checks for read permissions on the path. - const [publicKey, pathSeed] = await Promise.all([ - this.userID(), - this.getEncryptedPathSeedInternal(seed, path, false), - ]); + const { publicKey } = genKeyPairFromSeed(seed); + const pathSeed = await this.getEncryptedPathSeedInternal(seed, path, false); const dataKey = deriveEncryptedFileTweak(pathSeed); + const opts = { hashedDataKeyHex: true }; // Immediately fail if the mutex is not available. return await this.client.db.revisionNumberCache.withCachedEntryLock( @@ -591,14 +586,18 @@ export class MySky { const encryptionKey = deriveEncryptedFileKeyEntropy(pathSeed); // Pad and encrypt json file. + log("Calling encryptJSONFile"); const data = encryptJSONFile(json, { version: ENCRYPTED_JSON_RESPONSE_VERSION }, encryptionKey); + log("Calling getOrCreateSkyDBRegistryEntry"); const [entry] = await getOrCreateSkyDBRegistryEntry(this.client, dataKey, data, newRevision, opts); - // Call MySky which checks for write permissions on the path. + // Sign the entry. + log("Calling signEncryptedRegistryEntryInternal"); const signature = await this.signEncryptedRegistryEntryInternal(seed, entry, path); - await this.client.registry.postSignedEntry(publicKey, entry, signature); + log("Calling postSignedEntry"); + await this.client.registry.postSignedEntry(publicKey, entry, signature, opts); return { data: json }; } @@ -767,6 +766,10 @@ export class MySky { return; } + // Clear any existing value to make sure the storage event is triggered + // when we set the key. + localStorage.removeItem(PORTAL_LOGIN_COMPLETE_SENTINEL_KEY); + try { // Parse the seed. const seed = new Uint8Array(JSON.parse(newValue)); @@ -794,8 +797,10 @@ export class MySky { * @returns - The signature. */ async signEncryptedRegistryEntryInternal(seed: Uint8Array, entry: RegistryEntry, path: string): Promise { - // Check that the entry data key corresponds to the right path. + log("Entered signEncryptedRegistryEntryInternal"); + // Check that the entry data key corresponds to the right path. + // // Use `isDirectory: false` because registry entries can only correspond to files right now. const pathSeed = await this.getEncryptedPathSeedInternal(seed, path, false); const dataKey = deriveEncryptedFileTweak(pathSeed); @@ -803,7 +808,7 @@ export class MySky { throw new Error("Path does not match the data key in the encrypted registry entry."); } - return this.signRegistryEntryHelper(entry, path, PermCategory.Hidden); + return this.signRegistryEntryHelperInternal(seed, entry); } protected async signRegistryEntryHelper( @@ -811,32 +816,40 @@ export class MySky { path: string, category: PermCategory ): Promise { - log("Entered signRegistryEntry"); + log("Entered signRegistryEntryHelper"); // Check with the permissions provider that we have permission for this request. - await this.checkPermission(path, category, PermType.Write); // Get the seed. - const seed = checkStoredSeed(); if (!seed) { throw new Error("User seed not found"); } // Get the private key. - const { privateKey } = genKeyPairFromSeed(seed); // Sign the entry. + const signature = await signEntry(privateKey, entry, true); + + return signature; + } + + protected async signRegistryEntryHelperInternal(seed: Uint8Array, entry: RegistryEntry): Promise { + log("Entered signRegistryEntryHelperInternal"); + // Get the private key. + const { privateKey } = genKeyPairFromSeed(seed); + + // Sign the entry. const signature = await signEntry(privateKey, entry, true); + return signature; } protected async checkPermission(path: string, category: PermCategory, permType: PermType): Promise { // Check for the permissions provider. - if (!this.permissionsProvider) { throw new Error("Permissions provider not loaded"); } @@ -904,7 +917,7 @@ export function checkStoredSeed(): Uint8Array | null { throw new Error("Bad seed length"); } } catch (err) { - log(err as string); + log(`Error getting stored seed: ${err as string}`); clearStoredSeed(); return null; } From ccbf35fcc6b9d5745255c65a34725ecb73496f5e Mon Sep 17 00:00:00 2001 From: Marcin S Date: Thu, 20 Jan 2022 16:36:41 -0600 Subject: [PATCH 17/29] Refactor, get user settings in scripts/ui.ts --- scripts/ui.ts | 26 +- src/crypto.ts | 17 ++ src/mysky.ts | 286 +++---------------- src/{portal-account.ts => portal_account.ts} | 0 src/skydb_internal.ts | 191 +++++++++++++ src/user_settings.ts | 77 +++++ tests/integration/portal-account.test.ts | 2 +- tests/unit/portal-account.test.ts | 2 +- 8 files changed, 334 insertions(+), 267 deletions(-) rename src/{portal-account.ts => portal_account.ts} (100%) create mode 100644 src/skydb_internal.ts create mode 100644 src/user_settings.ts diff --git a/scripts/ui.ts b/scripts/ui.ts index 941eaf8c..9d4e590f 100644 --- a/scripts/ui.ts +++ b/scripts/ui.ts @@ -13,7 +13,14 @@ import { import { MySky, SkynetClient } from "skynet-js"; import { hashWithSalt } from "../src/crypto"; -import { checkStoredSeed, EMAIL_STORAGE_KEY, PORTAL_LOGIN_COMPLETE_SENTINEL_KEY, SEED_STORAGE_KEY } from "../src/mysky"; +import { + checkStoredSeed, + EMAIL_STORAGE_KEY, + getCurrentAndReferrerDomains, + INITIAL_PORTAL, + PORTAL_LOGIN_COMPLETE_SENTINEL_KEY, + SEED_STORAGE_KEY, +} from "../src/mysky"; import { getPermissionsProviderUrl, relativePermissionsDisplayUrl, @@ -23,12 +30,14 @@ import { SeedProviderResponse, } from "../src/provider"; import { log } from "../src/util"; +import { getUserSettings } from "../src/user_settings"; const RELATIVE_SEED_SELECTION_DISPLAY_URL = "seed-selection.html"; const RELATIVE_SIGNIN_CONNECT_DISPLAY_URL = "signin-connect.html"; const MYSKY_PORTAL_LOGIN_TIMEOUT = 30000; +// Create a client on the current portal. const client = new SkynetClient(); let parentConnection: Connection | null = null; @@ -190,7 +199,10 @@ async function getSeedAndEmail(): Promise<[Uint8Array, string | null]> { // We're signing in, try to get the email from saved settings. let savedEmailFound = false; if (!email) { - email = await getEmailFromSettings(); + const siaskyClient = new SkynetClient(INITIAL_PORTAL); + const { currentDomain } = await getCurrentAndReferrerDomains(); + const { email: receivedEmail } = await getUserSettings(siaskyClient, seed, currentDomain); + email = receivedEmail; savedEmailFound = email !== null; } @@ -224,16 +236,6 @@ async function getSeedAndEmailFromProvider(): Promise { return await runSeedProviderDisplay(seedProviderDisplayUrl); } -// TODO -/** - * Tries to get the email from the saved user settings. - * - * @returns - The email if found. - */ -async function getEmailFromSettings(): Promise { - return null; -} - /** * Launch the permissions provider and get any ungranted permissions. Show * permissions to user and get their response. diff --git a/src/crypto.ts b/src/crypto.ts index 56768f3d..9e8f82a4 100644 --- a/src/crypto.ts +++ b/src/crypto.ts @@ -2,9 +2,26 @@ import { hash, sign } from "tweetnacl"; import { KeyPair, stringToUint8ArrayUtf8 } from "skynet-js"; import { toHexString } from "./util"; +import { ENCRYPTION_ROOT_PATH_SEED_BYTES_LENGTH } from "./encrypted_files"; + +// Descriptive salt that should not be changed. +const SALT_ENCRYPTED_PATH_SEED = "encrypted filesystem path seed"; const SALT_ROOT_DISCOVERABLE_KEY = "root discoverable key"; +/** + * Derives the root path seed. + * + * @param seed - The user seed. + * @returns - The root path seed. + */ +export function deriveRootPathSeed(seed: Uint8Array): Uint8Array { + const bytes = new Uint8Array([...sha512(SALT_ENCRYPTED_PATH_SEED), ...sha512(seed)]); + // NOTE: Truncate to 32 bytes instead of the 64 bytes for a directory path + // seed. This is a historical artifact left for backwards compatibility. + return sha512(bytes).slice(0, ENCRYPTION_ROOT_PATH_SEED_BYTES_LENGTH); +} + /** * Hashes the given message with the given salt applied. * diff --git a/src/mysky.ts b/src/mysky.ts index a381ef38..4b7dc68e 100644 --- a/src/mysky.ts +++ b/src/mysky.ts @@ -1,32 +1,25 @@ import type { Connection } from "post-me"; import { ChildHandshake, WindowMessenger } from "post-me"; import { - decryptJSONFile, deriveDiscoverableFileTweak, deriveEncryptedFileTweak, - encryptJSONFile, - ENCRYPTED_JSON_RESPONSE_VERSION, - getOrCreateSkyDBRegistryEntry, RegistryEntry, signEntry, SkynetClient, PUBLIC_KEY_LENGTH, PRIVATE_KEY_LENGTH, ExecuteRequestError, - JsonData, - deriveEncryptedFileKeyEntropy, - EncryptedJSONResponse, - MAX_REVISION, } from "skynet-js"; - import { CheckPermissionsResponse, PermCategory, Permission, PermType } from "skynet-mysky-utils"; import { sign } from "tweetnacl"; -import { genKeyPairFromSeed, hashWithSalt, sha512 } from "./crypto"; -import { deriveEncryptedPathSeedForRoot, ENCRYPTION_ROOT_PATH_SEED_BYTES_LENGTH } from "./encrypted_files"; -import { login, logout, register } from "./portal-account"; + +import { deriveRootPathSeed, genKeyPairFromSeed, hashWithSalt, sha512 } from "./crypto"; +import { deriveEncryptedPathSeedForRoot } from "./encrypted_files"; +import { login, logout, register } from "./portal_account"; import { launchPermissionsProvider } from "./provider"; import { SEED_LENGTH } from "./seed"; -import { fromHexString, log, readablePermission, validateObject, validateString } from "./util"; +import { getUserSettings, setUserSettings } from "./user_settings"; +import { fromHexString, log, readablePermission } from "./util"; export const EMAIL_STORAGE_KEY = "email"; export const PORTAL_STORAGE_KEY = "portal"; @@ -34,10 +27,7 @@ export const SEED_STORAGE_KEY = "seed"; export const PORTAL_LOGIN_COMPLETE_SENTINEL_KEY = "portal-login-complete"; -const INITIAL_PORTAL = "https://siasky.net"; - -// Descriptive salt that should not be changed. -const SALT_ENCRYPTED_PATH_SEED = "encrypted filesystem path seed"; +export const INITIAL_PORTAL = "https://siasky.net"; // SALT_MESSAGE_SIGNING is the prefix with which we salt the data that MySky // signs in order to be able to prove ownership of the MySky id. @@ -49,14 +39,6 @@ let dev = false; dev = true; /// #endif -/** - * Settings associated with a user's MySky account. - * - * @property portal - The user's preferred portal. We redirect a skapp to this portal, if it is set. - * @property email - The user's portal account email. We connect to their portal account if this is set. - */ -type UserSettings = { portal: string | null; email: string | null }; - /** * Convenience class containing the permissions provider handshake connection * and worker handle. @@ -130,17 +112,14 @@ export class MySky { const initialClient = getLoginClient(seed, preferredPortal); - // Get the referrer and MySky domains. - const actualPortalClient = new SkynetClient(); - // Get the MySky domain (i.e. `skynet-mysky.hns or sandbridge.hns`). - const mySkyDomain = await actualPortalClient.extractDomain(window.location.href); - // Extract skapp domain from actual portal. - // NOTE: The skapp should have opened MySky on the same portal as itself. - const referrerDomain = await actualPortalClient.extractDomain(document.referrer); + const { currentDomain, referrerDomain } = await getCurrentAndReferrerDomains(); + if (!referrerDomain) { + throw new Error("Referrer not found"); + } // Create MySky object. log("Calling new MySky()"); - const mySky = new MySky(initialClient, mySkyDomain, referrerDomain, permissionsProvider, preferredPortal); + const mySky = new MySky(initialClient, currentDomain, referrerDomain, permissionsProvider, preferredPortal); // Login to portal. { @@ -149,7 +128,7 @@ export class MySky { // Get the preferred portal and stored email from user settings. if (seed && !preferredPortal) { - const { portal, email } = await mySky.getUserSettings(seed); + const { portal, email } = await getUserSettings(initialClient, seed, currentDomain); preferredPortal = portal; storedEmail = email; } @@ -459,160 +438,6 @@ export class MySky { } } - /** - * Gets the encrypted path seed for the given path without requiring - * permissions. This should NOT be exported - for internal use only. - * - * @param seed - The user seed. - * @param path - The given file or directory path. - * @param isDirectory - Whether the path corresponds to a directory. - * @returns - The hex-encoded encrypted path seed. - */ - async getEncryptedPathSeedInternal(seed: Uint8Array, path: string, isDirectory: boolean): Promise { - log("Entered getEncryptedPathSeedInternal"); - - // Compute the root path seed. - const rootPathSeedBytes = deriveRootPathSeed(seed); - - // Compute the child path seed. - return deriveEncryptedPathSeedForRoot(rootPathSeedBytes, path, isDirectory); - } - - /** - * Checks for the preferred portal and stored email in user settings, and sets - * them if found. - * - * @param seed - The user seed. - * @returns - The portal and email, if found. - */ - protected async getUserSettings(seed: Uint8Array): Promise { - log("Entered getUserSettings"); - - let email = null, - portal = null; - - // Get the settings path for the MySky domain. - const path = await this.getUserSettingsPath(); - - // Check for stored portal and email in user settings. - const { data: userSettings } = await this.getJSONEncryptedInternal(seed, path); - if (userSettings) { - email = (userSettings.email as string) || null; - portal = (userSettings.portal as string) || null; - } - - return { portal, email }; - } - - /** - * Sets the user settings. - * - * @param seed - The user seed. - * @param settings - The given user settings. - */ - protected async setUserSettings(seed: Uint8Array, settings: UserSettings): Promise { - log("Entered setUserSettings"); - - // Get the settings path for the MySky domain. - const path = await this.getUserSettingsPath(); - - // Set preferred portal and email in user settings. - await this.setJSONEncryptedInternal(seed, path, settings); - } - - /** - * Gets Encrypted JSON at the given path through MySky. - * - * @param seed - The user seed. - * @param path - The data path. - * @returns - An object containing the decrypted json data. - * @throws - Will throw if the user does not have Hidden Read permission on the path. - */ - protected async getJSONEncryptedInternal(seed: Uint8Array, path: string): Promise { - log("Entered getJSONEncryptedInternal"); - - validateString("path", path, "parameter"); - - const { publicKey } = genKeyPairFromSeed(seed); - const pathSeed = await this.getEncryptedPathSeedInternal(seed, path, false); - - // Fetch the raw encrypted JSON data. - const dataKey = deriveEncryptedFileTweak(pathSeed); - log("Calling getRawBytes"); - const { data } = await this.client.db.getRawBytes(publicKey, dataKey); - if (data === null) { - return { data: null }; - } - - const encryptionKey = deriveEncryptedFileKeyEntropy(pathSeed); - const json = decryptJSONFile(data, encryptionKey); - - return { data: json }; - } - - /** - * Sets Encrypted JSON at the given path through MySky. - * - * @param seed - The user seed. - * @param path - The data path. - * @param json - The json to encrypt and set. - * @returns - An object containing the original json data. - * @throws - Will throw if the user does not have Hidden Write permission on the path. - */ - protected async setJSONEncryptedInternal( - seed: Uint8Array, - path: string, - json: JsonData - ): Promise { - log("Entered setJSONEncryptedInternal"); - - validateString("path", path, "parameter"); - validateObject("json", json, "parameter"); - - const { publicKey } = genKeyPairFromSeed(seed); - const pathSeed = await this.getEncryptedPathSeedInternal(seed, path, false); - const dataKey = deriveEncryptedFileTweak(pathSeed); - const opts = { hashedDataKeyHex: true }; - - // Immediately fail if the mutex is not available. - return await this.client.db.revisionNumberCache.withCachedEntryLock( - publicKey, - dataKey, - async (cachedRevisionEntry) => { - // Get the cached revision number before doing anything else. - const newRevision = incrementRevision(cachedRevisionEntry.revision); - - // Derive the key. - const encryptionKey = deriveEncryptedFileKeyEntropy(pathSeed); - - // Pad and encrypt json file. - log("Calling encryptJSONFile"); - const data = encryptJSONFile(json, { version: ENCRYPTED_JSON_RESPONSE_VERSION }, encryptionKey); - - log("Calling getOrCreateSkyDBRegistryEntry"); - const [entry] = await getOrCreateSkyDBRegistryEntry(this.client, dataKey, data, newRevision, opts); - - // Sign the entry. - log("Calling signEncryptedRegistryEntryInternal"); - const signature = await this.signEncryptedRegistryEntryInternal(seed, entry, path); - - log("Calling postSignedEntry"); - await this.client.registry.postSignedEntry(publicKey, entry, signature, opts); - - return { data: json }; - } - ); - } - - /** - * Get the path to the user settings stored in the root MySky domain. - * - * @returns - The user settings path. - */ - protected async getUserSettingsPath(): Promise { - return `${this.mySkyDomain}/settings.json`; - } - /** * Logs in from MySky UI. * @@ -651,7 +476,7 @@ export class MySky { // Login to portal. { // Get the preferred portal and switch to it. - const { portal: preferredPortal, email } = await this.getUserSettings(seed); + const { portal: preferredPortal, email } = await getUserSettings(this.client, seed, this.mySkyDomain); let storedEmail = email; // Set the portal @@ -678,7 +503,7 @@ export class MySky { // Save the email in user settings. Do this after we've connected to // the portal account so we know that the email is valid. if (isEmailProvidedByUser) { - await this.setUserSettings(seed, { portal: preferredPortal, email: storedEmail }); + await setUserSettings(this.client, seed, this.mySkyDomain, { portal: preferredPortal, email: storedEmail }); } } } @@ -787,30 +612,6 @@ export class MySky { }); } - /** - * Signs the encrypted registry entry without requiring permissions. For - * internal use only. - * - * @param seed - The user seed. - * @param entry - The encrypted registry entry. - * @param path - The MySky path. - * @returns - The signature. - */ - async signEncryptedRegistryEntryInternal(seed: Uint8Array, entry: RegistryEntry, path: string): Promise { - log("Entered signEncryptedRegistryEntryInternal"); - - // Check that the entry data key corresponds to the right path. - // - // Use `isDirectory: false` because registry entries can only correspond to files right now. - const pathSeed = await this.getEncryptedPathSeedInternal(seed, path, false); - const dataKey = deriveEncryptedFileTweak(pathSeed); - if (entry.dataKey !== dataKey) { - throw new Error("Path does not match the data key in the encrypted registry entry."); - } - - return this.signRegistryEntryHelperInternal(seed, entry); - } - protected async signRegistryEntryHelper( entry: RegistryEntry, path: string, @@ -836,18 +637,6 @@ export class MySky { return signature; } - protected async signRegistryEntryHelperInternal(seed: Uint8Array, entry: RegistryEntry): Promise { - log("Entered signRegistryEntryHelperInternal"); - - // Get the private key. - const { privateKey } = genKeyPairFromSeed(seed); - - // Sign the entry. - const signature = await signEntry(privateKey, entry, true); - - return signature; - } - protected async checkPermission(path: string, category: PermCategory, permType: PermType): Promise { // Check for the permissions provider. if (!this.permissionsProvider) { @@ -953,16 +742,26 @@ export function clearStoredSeed(): void { } /** - * Derives the root path seed. + * Gets the current and referrer domains. * - * @param seed - The user seed. - * @returns - The root path seed. + * @returns - The current and referrer domains. */ -function deriveRootPathSeed(seed: Uint8Array): Uint8Array { - const bytes = new Uint8Array([...sha512(SALT_ENCRYPTED_PATH_SEED), ...sha512(seed)]); - // NOTE: Truncate to 32 bytes instead of the 64 bytes for a directory path - // seed. This is a historical artifact left for backwards compatibility. - return sha512(bytes).slice(0, ENCRYPTION_ROOT_PATH_SEED_BYTES_LENGTH); +export async function getCurrentAndReferrerDomains(): Promise<{ + currentDomain: string; + referrerDomain: string | null; +}> { + // Get the referrer and MySky domains. + const actualPortalClient = new SkynetClient(); + // Get the MySky domain (i.e. `skynet-mysky.hns or sandbridge.hns`). + const currentDomain = await actualPortalClient.extractDomain(window.location.href); + // Extract skapp domain from actual portal. + // NOTE: The skapp should have opened MySky on the same portal as itself. + let referrerDomain = null; + if (document.referrer) { + referrerDomain = await actualPortalClient.extractDomain(document.referrer); + } + + return { currentDomain, referrerDomain }; } /** @@ -982,22 +781,3 @@ function getLoginClient(seed: Uint8Array | null, preferredPortal: string | null) const initialPortal = seed ? INITIAL_PORTAL : undefined; return new SkynetClient(preferredPortal || initialPortal); } - -/** - * Increments the given revision number and checks to make sure it is not - * greater than the maximum revision. - * - * @param revision - The given revision number. - * @returns - The incremented revision number. - * @throws - Will throw if the incremented revision number is greater than the maximum revision. - */ -function incrementRevision(revision: bigint): bigint { - revision = revision + BigInt(1); - - // Throw if the revision is already the maximum value. - if (revision > MAX_REVISION) { - throw new Error("Current entry already has maximum allowed revision, could not update the entry"); - } - - return revision; -} diff --git a/src/portal-account.ts b/src/portal_account.ts similarity index 100% rename from src/portal-account.ts rename to src/portal_account.ts diff --git a/src/skydb_internal.ts b/src/skydb_internal.ts new file mode 100644 index 00000000..613a1231 --- /dev/null +++ b/src/skydb_internal.ts @@ -0,0 +1,191 @@ +import { + deriveEncryptedFileKeyEntropy, + deriveEncryptedFileTweak, + decryptJSONFile, + ENCRYPTED_JSON_RESPONSE_VERSION, + EncryptedJSONResponse, + getOrCreateSkyDBRegistryEntry, + JsonData, + SkynetClient, + encryptJSONFile, + MAX_REVISION, + RegistryEntry, + signEntry, +} from "skynet-js"; + +import { deriveRootPathSeed, genKeyPairFromSeed } from "./crypto"; +import { deriveEncryptedPathSeedForRoot } from "./encrypted_files"; +import { log, validateObject, validateString } from "./util"; + +/** + * Gets Encrypted JSON at the given path through MySky. + * + * @param client - The Skynet client. + * @param seed - The user seed. + * @param path - The data path. + * @returns - An object containing the decrypted json data. + * @throws - Will throw if the user does not have Hidden Read permission on the path. + */ +export async function getJSONEncryptedInternal( + client: SkynetClient, + seed: Uint8Array, + path: string +): Promise { + log("Entered getJSONEncryptedInternal"); + + validateString("path", path, "parameter"); + + const { publicKey } = genKeyPairFromSeed(seed); + const pathSeed = await getEncryptedPathSeedInternal(seed, path, false); + + // Fetch the raw encrypted JSON data. + const dataKey = deriveEncryptedFileTweak(pathSeed); + log("Calling getRawBytes"); + const { data } = await client.db.getRawBytes(publicKey, dataKey); + if (data === null) { + return { data: null }; + } + + const encryptionKey = deriveEncryptedFileKeyEntropy(pathSeed); + const json = decryptJSONFile(data, encryptionKey); + + return { data: json }; +} + +/** + * Sets Encrypted JSON at the given path through MySky. + * + * @param client - The Skynet client. + * @param seed - The user seed. + * @param path - The data path. + * @param json - The json to encrypt and set. + * @returns - An object containing the original json data. + * @throws - Will throw if the user does not have Hidden Write permission on the path. + */ +export async function setJSONEncryptedInternal( + client: SkynetClient, + seed: Uint8Array, + path: string, + json: JsonData +): Promise { + log("Entered setJSONEncryptedInternal"); + + validateString("path", path, "parameter"); + validateObject("json", json, "parameter"); + + const { publicKey } = genKeyPairFromSeed(seed); + const pathSeed = await getEncryptedPathSeedInternal(seed, path, false); + const dataKey = deriveEncryptedFileTweak(pathSeed); + const opts = { hashedDataKeyHex: true }; + + // Immediately fail if the mutex is not available. + return await client.db.revisionNumberCache.withCachedEntryLock(publicKey, dataKey, async (cachedRevisionEntry) => { + // Get the cached revision number before doing anything else. + const newRevision = incrementRevision(cachedRevisionEntry.revision); + + // Derive the key. + const encryptionKey = deriveEncryptedFileKeyEntropy(pathSeed); + + // Pad and encrypt json file. + log("Calling encryptJSONFile"); + const data = encryptJSONFile(json, { version: ENCRYPTED_JSON_RESPONSE_VERSION }, encryptionKey); + + log("Calling getOrCreateSkyDBRegistryEntry"); + const [entry] = await getOrCreateSkyDBRegistryEntry(client, dataKey, data, newRevision, opts); + + // Sign the entry. + log("Calling signEncryptedRegistryEntryInternal"); + const signature = await signEncryptedRegistryEntryInternal(seed, entry, path); + + log("Calling postSignedEntry"); + await client.registry.postSignedEntry(publicKey, entry, signature, opts); + + return { data: json }; + }); +} + +/** + * Gets the encrypted path seed for the given path without requiring + * permissions. This should NOT be exported - for internal use only. + * + * @param seed - The user seed. + * @param path - The given file or directory path. + * @param isDirectory - Whether the path corresponds to a directory. + * @returns - The hex-encoded encrypted path seed. + */ +async function getEncryptedPathSeedInternal(seed: Uint8Array, path: string, isDirectory: boolean): Promise { + log("Entered getEncryptedPathSeedInternal"); + + // Compute the root path seed. + const rootPathSeedBytes = deriveRootPathSeed(seed); + + // Compute the child path seed. + return deriveEncryptedPathSeedForRoot(rootPathSeedBytes, path, isDirectory); +} + +/** + * Increments the given revision number and checks to make sure it is not + * greater than the maximum revision. + * + * @param revision - The given revision number. + * @returns - The incremented revision number. + * @throws - Will throw if the incremented revision number is greater than the maximum revision. + */ +function incrementRevision(revision: bigint): bigint { + revision = revision + BigInt(1); + + // Throw if the revision is already the maximum value. + if (revision > MAX_REVISION) { + throw new Error("Current entry already has maximum allowed revision, could not update the entry"); + } + + return revision; +} + +/** + * Signs the encrypted registry entry without requiring permissions. For + * internal use only. + * + * @param seed - The user seed. + * @param entry - The encrypted registry entry. + * @param path - The MySky path. + * @returns - The signature. + */ +async function signEncryptedRegistryEntryInternal( + seed: Uint8Array, + entry: RegistryEntry, + path: string +): Promise { + log("Entered signEncryptedRegistryEntryInternal"); + + // Check that the entry data key corresponds to the right path. + // + // Use `isDirectory: false` because registry entries can only correspond to files right now. + const pathSeed = await getEncryptedPathSeedInternal(seed, path, false); + const dataKey = deriveEncryptedFileTweak(pathSeed); + if (entry.dataKey !== dataKey) { + throw new Error("Path does not match the data key in the encrypted registry entry."); + } + + return signRegistryEntryHelperInternal(seed, entry); +} + +/** + * Internal version of `signRegistryEntryHelper` that does not check for + * permissions. + * + * @param seed - The user seed. + * @param entry - The registry entry. + * @returns - The signature. + */ +async function signRegistryEntryHelperInternal(seed: Uint8Array, entry: RegistryEntry): Promise { + log("Entered signRegistryEntryHelperInternal"); + + // Get the private key. + const { privateKey } = genKeyPairFromSeed(seed); + + // Sign the entry. + const signature = await signEntry(privateKey, entry, true); + + return signature; +} diff --git a/src/user_settings.ts b/src/user_settings.ts new file mode 100644 index 00000000..eab0124e --- /dev/null +++ b/src/user_settings.ts @@ -0,0 +1,77 @@ +import { SkynetClient } from "skynet-js"; + +import { getJSONEncryptedInternal, setJSONEncryptedInternal } from "./skydb_internal"; +import { log } from "./util"; + +/** + * Settings associated with a user's MySky account. + * + * @property portal - The user's preferred portal. We redirect a skapp to this portal, if it is set. + * @property email - The user's portal account email. We connect to their portal account if this is set. + */ +type UserSettings = { portal: string | null; email: string | null }; + +/** + * Checks for the preferred portal and stored email in user settings, and sets + * them if found. + * + * @param client - The Skynet client. + * @param seed - The user seed. + * @param mySkyDomain - The domain of the current MySky instance. + * @returns - The portal and email, if found. + */ +export async function getUserSettings( + client: SkynetClient, + seed: Uint8Array, + mySkyDomain: string +): Promise { + log("Entered getUserSettings"); + + let email = null, + portal = null; + + // Get the settings path for the MySky domain. + const path = getUserSettingsPath(mySkyDomain); + + // Check for stored portal and email in user settings. + const { data: userSettings } = await getJSONEncryptedInternal(client, seed, path); + if (userSettings) { + email = (userSettings.email as string) || null; + portal = (userSettings.portal as string) || null; + } + + return { portal, email }; +} + +/** + * Sets the user settings. + * + * @param client - The Skynet client. + * @param seed - The user seed. + * @param mySkyDomain - The domain of the current MySky instance. + * @param settings - The given user settings. + */ +export async function setUserSettings( + client: SkynetClient, + seed: Uint8Array, + mySkyDomain: string, + settings: UserSettings +): Promise { + log("Entered setUserSettings"); + + // Get the settings path for the MySky domain. + const path = getUserSettingsPath(mySkyDomain); + + // Set preferred portal and email in user settings. + await setJSONEncryptedInternal(client, seed, path, settings); +} + +/** + * Get the path to the user settings stored in the root MySky domain. + * + * @param mySkyDomain - The domain of the current MySky instance. + * @returns - The user settings path. + */ +function getUserSettingsPath(mySkyDomain: string): string { + return `${mySkyDomain}/settings.json`; +} diff --git a/tests/integration/portal-account.test.ts b/tests/integration/portal-account.test.ts index 92fe4e94..6956d78e 100644 --- a/tests/integration/portal-account.test.ts +++ b/tests/integration/portal-account.test.ts @@ -2,7 +2,7 @@ import { DEFAULT_SKYNET_PORTAL_URL, SkynetClient } from "skynet-js"; import { randomAsciiString } from "../utils"; import { generatePhrase, phraseToSeed } from "../../src/seed"; -import { login, register } from "../../src/portal-account"; +import { login, register } from "../../src/portal_account"; const portalUrl = DEFAULT_SKYNET_PORTAL_URL; const client = new SkynetClient(portalUrl); diff --git a/tests/unit/portal-account.test.ts b/tests/unit/portal-account.test.ts index 5b4e2120..1182760c 100644 --- a/tests/unit/portal-account.test.ts +++ b/tests/unit/portal-account.test.ts @@ -1,7 +1,7 @@ import { DEFAULT_SKYNET_PORTAL_URL, SkynetClient } from "skynet-js"; import { phraseToSeed } from "../../src/seed"; -import { login, register, getPortalRecipient } from "../../src/portal-account"; +import { login, register, getPortalRecipient } from "../../src/portal_account"; const portalUrl = DEFAULT_SKYNET_PORTAL_URL; const client = new SkynetClient(portalUrl); From 40340895b00c057661753ed79d7f377278d32e1e Mon Sep 17 00:00:00 2001 From: Marcin S Date: Fri, 21 Jan 2022 14:54:15 -0600 Subject: [PATCH 18/29] Expose functions to allow skynet-js to auto-relogin --- src/mysky.ts | 43 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 38 insertions(+), 5 deletions(-) diff --git a/src/mysky.ts b/src/mysky.ts index 4b7dc68e..cf3838f3 100644 --- a/src/mysky.ts +++ b/src/mysky.ts @@ -64,6 +64,9 @@ export class PermissionsProvider { export class MySky { protected parentConnection: Promise | null = null; + protected email: string | null = null; + protected preferredPortal: string | null = null; + // ============ // Constructors // ============ @@ -72,8 +75,7 @@ export class MySky { protected client: SkynetClient, protected mySkyDomain: string, protected referrerDomain: string, - protected permissionsProvider: Promise | null, - protected preferredPortal: string | null + protected permissionsProvider: Promise | null ) {} /** @@ -119,7 +121,7 @@ export class MySky { // Create MySky object. log("Calling new MySky()"); - const mySky = new MySky(initialClient, currentDomain, referrerDomain, permissionsProvider, preferredPortal); + const mySky = new MySky(initialClient, currentDomain, referrerDomain, permissionsProvider); // Login to portal. { @@ -138,6 +140,7 @@ export class MySky { // Set up auto-relogin if the email was found. if (seed && storedEmail) { + mySky.email = storedEmail; mySky.setupAutoRelogin(seed, storedEmail); } } @@ -189,6 +192,18 @@ export class MySky { return [true, permissionsResponse]; } + /** + * Checks whether the user can be automatically logged in to the portal (the + * user email was found). + * + * @returns - Whether the email was found. + */ + async checkPortalLogin(): Promise { + log("Entered checkPortalLogin"); + + return this.email !== null; + } + /** * Gets the encrypted path seed for the given path. * @@ -265,6 +280,22 @@ export class MySky { } } + async portalLogin(): Promise { + // Get the seed. + const seed = checkStoredSeed(); + if (!seed) { + throw new Error("User seed not found"); + } + + // Get the email. + const email = this.email; + if (!email) { + throw new Error("Email not found"); + } + + await login(this.client, seed, email); + } + /** * Signs the given data using the MySky user's private key. This method can be * used for MySky user verification as the signature may be verified against @@ -337,14 +368,12 @@ export class MySky { async userID(): Promise { // Get the seed. - const seed = checkStoredSeed(); if (!seed) { throw new Error("User seed not found"); } // Get the public key. - const { publicKey } = genKeyPairFromSeed(seed); return publicKey; } @@ -390,6 +419,7 @@ export class MySky { const methods = { checkLogin: this.checkLogin.bind(this), + checkPortalLogin: this.checkPortalLogin.bind(this), // NOTE: `getEncryptedFileSeed` was renamed to `getEncryptedPathSeed`, but // we still expose `getEncryptedFileSeed` in the API for backwards // compatibility. @@ -397,6 +427,7 @@ export class MySky { getEncryptedPathSeed: this.getEncryptedPathSeed.bind(this), getPreferredPortal: this.getPreferredPortal.bind(this), logout: this.logout.bind(this), + portalLogin: this.portalLogin.bind(this), signMessage: this.signMessage.bind(this), signRegistryEntry: this.signRegistryEntry.bind(this), signEncryptedRegistryEntry: this.signEncryptedRegistryEntry.bind(this), @@ -497,6 +528,8 @@ export class MySky { // we don't redirect to a preferred portal). await this.connectToPortalAccount(seed, storedEmail); + this.email = storedEmail; + // Set up auto re-login on JWT expiry. this.setupAutoRelogin(seed, storedEmail); From a45f435d0ea2ee0aa758e2924f869526a17f2f08 Mon Sep 17 00:00:00 2001 From: Marcin S Date: Fri, 28 Jan 2022 16:55:38 -0600 Subject: [PATCH 19/29] Fix domain extraction bugs (also fixing user settings bug) - [X] Fix domain extraction when on specific portal server - [X] Fix domain extraction for referrers - [X] Fix email not being saved in user settings (domain bug) --- src/mysky.ts | 33 +++++++++++++++++++++++++++++---- src/util.ts | 4 +++- 2 files changed, 32 insertions(+), 5 deletions(-) diff --git a/src/mysky.ts b/src/mysky.ts index cf3838f3..96edbd28 100644 --- a/src/mysky.ts +++ b/src/mysky.ts @@ -19,7 +19,7 @@ import { login, logout, register } from "./portal_account"; import { launchPermissionsProvider } from "./provider"; import { SEED_LENGTH } from "./seed"; import { getUserSettings, setUserSettings } from "./user_settings"; -import { fromHexString, log, readablePermission } from "./util"; +import { ALPHA_ENABLED, DEV_ENABLED, fromHexString, log, readablePermission } from "./util"; export const EMAIL_STORAGE_KEY = "email"; export const PORTAL_STORAGE_KEY = "portal"; @@ -783,15 +783,40 @@ export async function getCurrentAndReferrerDomains(): Promise<{ currentDomain: string; referrerDomain: string | null; }> { + // Get the MySky domain (i.e. `skynet-mysky.hns or sandbridge.hns`). Use + // hard-coded values since we don't expect official MySky to be hosted + // anywhere else for now. + let currentDomain; + if (ALPHA_ENABLED && DEV_ENABLED) { + throw new Error("Alpha and dev modes cannot both be enbaled"); + } else if (ALPHA_ENABLED) { + currentDomain = "sandbridge.hns"; + } else if (DEV_ENABLED) { + currentDomain = "skynet-mysky-dev.hns"; + } else { + currentDomain = "skynet-mysky.hns"; + } + // Get the referrer and MySky domains. const actualPortalClient = new SkynetClient(); - // Get the MySky domain (i.e. `skynet-mysky.hns or sandbridge.hns`). - const currentDomain = await actualPortalClient.extractDomain(window.location.href); // Extract skapp domain from actual portal. // NOTE: The skapp should have opened MySky on the same portal as itself. let referrerDomain = null; if (document.referrer) { - referrerDomain = await actualPortalClient.extractDomain(document.referrer); + const referrerUrlObj = new URL(document.referrer); + referrerDomain = await actualPortalClient.extractDomain(referrerUrlObj.hostname); + } + + // Sanity check that the current domain as extracted from the URL is + // equivalent to the hard-coded domain we got above. + { + // Extract the MySky domain from the current URL. + const currentDomainExtracted = await actualPortalClient.extractDomain(window.location.hostname); + if (currentDomainExtracted !== currentDomain) { + throw new Error( + `Extracted current domain '${currentDomainExtracted}' is different from the expected domain '${currentDomain}'` + ); + } } return { currentDomain, referrerDomain }; diff --git a/src/util.ts b/src/util.ts index c9704303..57541f21 100644 --- a/src/util.ts +++ b/src/util.ts @@ -2,7 +2,9 @@ import { Buffer } from "buffer"; import { permCategoryToString, Permission, permTypeToString } from "skynet-mysky-utils"; const urlParams = new URLSearchParams(window.location.search); -const DEBUG_ENABLED = urlParams.get("debug") === "true"; +export const ALPHA_ENABLED = urlParams.get("alpha") === "true"; +export const DEBUG_ENABLED = urlParams.get("debug") === "true"; +export const DEV_ENABLED = urlParams.get("dev") === "true"; /** * Converts a hex encoded string to a uint8 array. From 50be38eadeead51233f5b08f351a1d83a2ef0504 Mon Sep 17 00:00:00 2001 From: Marcin S Date: Mon, 31 Jan 2022 15:19:43 -0600 Subject: [PATCH 20/29] Fix bug in `getJSONEncryptedInternal` --- src/mysky.ts | 4 +++- src/skydb_internal.ts | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/mysky.ts b/src/mysky.ts index 96edbd28..d4c8a22e 100644 --- a/src/mysky.ts +++ b/src/mysky.ts @@ -231,6 +231,8 @@ export class MySky { } async getPreferredPortal(): Promise { + log("Entered getPreferredPortal"); + return this.preferredPortal; } @@ -552,7 +554,7 @@ export class MySky { * @param preferredPortal - The user's preferred portal */ protected setPortal(preferredPortal: string | null): void { - log("Entered setPortal"); + log(`Entered setPortal with portal: ${preferredPortal}`); if (preferredPortal) { // Connect to the preferred portal if it was found. diff --git a/src/skydb_internal.ts b/src/skydb_internal.ts index 613a1231..c3065ce2 100644 --- a/src/skydb_internal.ts +++ b/src/skydb_internal.ts @@ -40,8 +40,9 @@ export async function getJSONEncryptedInternal( // Fetch the raw encrypted JSON data. const dataKey = deriveEncryptedFileTweak(pathSeed); + const opts = { hashedDataKeyHex: true }; log("Calling getRawBytes"); - const { data } = await client.db.getRawBytes(publicKey, dataKey); + const { data } = await client.db.getRawBytes(publicKey, dataKey, opts); if (data === null) { return { data: null }; } From 4e10f5cb4ea4c429faff35bc654487dc82eae71f Mon Sep 17 00:00:00 2001 From: Marcin S Date: Tue, 1 Feb 2022 16:24:36 -0600 Subject: [PATCH 21/29] Fix referrer bug --- src/mysky.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/mysky.ts b/src/mysky.ts index d4c8a22e..5ba3132f 100644 --- a/src/mysky.ts +++ b/src/mysky.ts @@ -800,18 +800,19 @@ export async function getCurrentAndReferrerDomains(): Promise<{ } // Get the referrer and MySky domains. - const actualPortalClient = new SkynetClient(); // Extract skapp domain from actual portal. // NOTE: The skapp should have opened MySky on the same portal as itself. let referrerDomain = null; if (document.referrer) { + const referrerClient = new SkynetClient(document.referrer); const referrerUrlObj = new URL(document.referrer); - referrerDomain = await actualPortalClient.extractDomain(referrerUrlObj.hostname); + referrerDomain = await referrerClient.extractDomain(referrerUrlObj.hostname); } // Sanity check that the current domain as extracted from the URL is // equivalent to the hard-coded domain we got above. { + const actualPortalClient = new SkynetClient(); // Extract the MySky domain from the current URL. const currentDomainExtracted = await actualPortalClient.extractDomain(window.location.hostname); if (currentDomainExtracted !== currentDomain) { From fe13a7b842d8e6a729fa5a1b0a225feecac70f9b Mon Sep 17 00:00:00 2001 From: Marcin S Date: Wed, 2 Feb 2022 15:58:33 -0600 Subject: [PATCH 22/29] Fix integration tests --- package.json | 3 --- src/portal_account.ts | 11 ++++++----- tests/integration/portal-account.test.ts | 3 ++- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 43f7a64d..e7999eb8 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,6 @@ "core-js": "^3.20.2", "crypto-browserify": "^3.12.0", "idb-keyval": "^6.1.0", - "jwt-decode": "^3.1.2", "mustache": "^4.2.0", "post-me": "^0.4.5", "punycode": "^2.1.1", @@ -66,7 +65,6 @@ "@skynetlabs/skynet-nodejs": "^2.4.0", "@tailwindcss/forms": "^0.4.0", "@types/jest": "^27.4.0", - "@types/jwt-encode": "^1.0.0", "@types/mustache": "^4.1.2", "@types/randombytes": "^2.0.0", "@types/url-join": "^4.0.1", @@ -79,7 +77,6 @@ "ifdef-loader": "^2.3.2", "jest": "^27.4.7", "jsdom": "^19.0.0", - "jwt-encode": "^1.0.1", "lint-staged": "^12.1.7", "postcss": "^8.4.5", "postcss-cli": "^9.1.0", diff --git a/src/portal_account.ts b/src/portal_account.ts index 12bcd5d2..4a7f53f4 100644 --- a/src/portal_account.ts +++ b/src/portal_account.ts @@ -110,7 +110,7 @@ type ChallengeResponse = { * @param seed - The seed. * @param email - The user email. * @param [customOptions] - The custom register options. - * @returns - The JWT token. + * @returns - An empty promise. */ export async function register( client: SkynetClient, @@ -153,7 +153,7 @@ export async function register( * @param seed - The seed. * @param email - The user email. * @param [customOptions] - The custom login options. - * @returns - The JWT token. + * @returns - An empty promise. */ export async function login( client: SkynetClient, @@ -259,12 +259,13 @@ function genPortalLoginKeypair(seed: Uint8Array, email: string): KeyPair { * => https://siasky.net, https://dev1.siasky.dev => https://siasky.dev. * * @param portalUrl - The full portal URL. - * @returns - The shortened portal recipient name. + * @returns - The shortened portal recipient URL. */ export function getPortalRecipient(portalUrl: string): string { const url = new URL(portalUrl); // Get last two portions of the hostname. - const domain = url.hostname.split(".").slice(-2).join("."); - return `https://${domain}`; + url.hostname = url.hostname.split(".").slice(-2).join("."); + + return url.toString(); } diff --git a/tests/integration/portal-account.test.ts b/tests/integration/portal-account.test.ts index 6956d78e..78f7550c 100644 --- a/tests/integration/portal-account.test.ts +++ b/tests/integration/portal-account.test.ts @@ -4,7 +4,8 @@ import { randomAsciiString } from "../utils"; import { generatePhrase, phraseToSeed } from "../../src/seed"; import { login, register } from "../../src/portal_account"; -const portalUrl = DEFAULT_SKYNET_PORTAL_URL; +// const portalUrl = DEFAULT_SKYNET_PORTAL_URL; +const portalUrl = "https://siasky.xyz"; const client = new SkynetClient(portalUrl); const phrase = generatePhrase(); const seed = phraseToSeed(phrase); From d5b79d1cee4f125fce175c5eef19e98a82610452 Mon Sep 17 00:00:00 2001 From: Marcin S Date: Wed, 2 Feb 2022 17:29:22 -0600 Subject: [PATCH 23/29] Don't make MySky initialization fail if the email is invalid --- src/mysky.ts | 55 +++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 41 insertions(+), 14 deletions(-) diff --git a/src/mysky.ts b/src/mysky.ts index 5ba3132f..2d31fd1e 100644 --- a/src/mysky.ts +++ b/src/mysky.ts @@ -526,20 +526,7 @@ export class MySky { } if (storedEmail) { - // Register/login to ensure the email is valid and get the JWT (in case - // we don't redirect to a preferred portal). - await this.connectToPortalAccount(seed, storedEmail); - - this.email = storedEmail; - - // Set up auto re-login on JWT expiry. - this.setupAutoRelogin(seed, storedEmail); - - // Save the email in user settings. Do this after we've connected to - // the portal account so we know that the email is valid. - if (isEmailProvidedByUser) { - await setUserSettings(this.client, seed, this.mySkyDomain, { portal: preferredPortal, email: storedEmail }); - } + await this.loginHandleEmail(seed, storedEmail, isEmailProvidedByUser); } } @@ -547,6 +534,46 @@ export class MySky { this.permissionsProvider = launchPermissionsProvider(seed); } + /** + * Handling for when the email is found or provided while logging in. + * + * @param seed - The user seed. + * @param storedEmail - The email, either found in user settings or set in browser storage. + * @param isEmailProvidedByUser - Indicates whether the user provided the email (it was found in browser storage). + */ + protected async loginHandleEmail( + seed: Uint8Array, + storedEmail: string, + isEmailProvidedByUser: boolean + ): Promise { + try { + // Register/login to ensure the email is valid and get the JWT (in case + // we don't redirect to a preferred portal). + await this.connectToPortalAccount(seed, storedEmail); + } catch (e) { + // We don't want to make MySky initialization fail just because the + // user entered an invalid email. He'd never be able to log in and + // change it again. + // + // TODO: Maybe this should return a warning to the skapp? We don't + // have the ifrastructure in place for that yet. + console.warn(e); + + return; + } + + this.email = storedEmail; + + // Set up auto re-login on JWT expiry. + this.setupAutoRelogin(seed, storedEmail); + + // Save the email in user settings. Do this after we've connected to + // the portal account so we know that the email is valid. + if (isEmailProvidedByUser) { + await setUserSettings(this.client, seed, this.mySkyDomain, { portal: this.preferredPortal, email: storedEmail }); + } + } + /** * Sets the portal, either the preferred portal if given or the current portal * otherwise. From 1b44334af76e92e0417140e3a61e90da1e548339 Mon Sep 17 00:00:00 2001 From: Marcin S Date: Fri, 4 Feb 2022 14:57:32 -0600 Subject: [PATCH 24/29] Couple of critical fixes - [X] Fix portal account endpoints broken - [X] Fix bug with getting user settings (bad URL) - [X] Use `ensureUrl` when initializing client? --- scripts/permissions-display.ts | 2 +- scripts/permissions.ts | 2 +- scripts/seed-display.ts | 2 +- scripts/seed-selection.ts | 2 +- scripts/signin-connect.ts | 2 +- scripts/ui.ts | 4 ++-- src/index.ts | 4 ++-- src/mysky.ts | 9 ++++++--- src/portal_account.ts | 3 ++- webpack.config.js | 1 + 10 files changed, 18 insertions(+), 13 deletions(-) diff --git a/scripts/permissions-display.ts b/scripts/permissions-display.ts index 83cb1ab6..3a2d2562 100644 --- a/scripts/permissions-display.ts +++ b/scripts/permissions-display.ts @@ -19,7 +19,7 @@ let parentConnection: Connection | null = null; // ====== window.onerror = function (error: any) { - console.log(error); + console.warn(error); if (parentConnection) { if (typeof error === "string") { void parentConnection.remoteHandle().call("catchError", error); diff --git a/scripts/permissions.ts b/scripts/permissions.ts index 16dad5de..7208b402 100644 --- a/scripts/permissions.ts +++ b/scripts/permissions.ts @@ -34,7 +34,7 @@ const methods = { // ====== self.onerror = function (error: any) { - console.log(error); + console.warn(error); if (parentConnection) { if (typeof error === "string") { void parentConnection.remoteHandle().call("catchError", error); diff --git a/scripts/seed-display.ts b/scripts/seed-display.ts index 7af4e06e..5ef34abc 100644 --- a/scripts/seed-display.ts +++ b/scripts/seed-display.ts @@ -30,7 +30,7 @@ let parentConnection: Connection | null = null; // ====== window.onerror = function (error: any) { - console.log(error); + console.warn(error); if (parentConnection) { if (typeof error === "string") { void parentConnection.remoteHandle().call("catchError", error); diff --git a/scripts/seed-selection.ts b/scripts/seed-selection.ts index 39dd0ead..e8b6f595 100644 --- a/scripts/seed-selection.ts +++ b/scripts/seed-selection.ts @@ -8,7 +8,7 @@ let parentConnection: Connection | null = null; // ====== window.onerror = function (error: any) { - console.log(error); + console.warn(error); if (parentConnection) { if (typeof error === "string") { void parentConnection.remoteHandle().call("catchError", error); diff --git a/scripts/signin-connect.ts b/scripts/signin-connect.ts index 955d5330..8f2d01ae 100644 --- a/scripts/signin-connect.ts +++ b/scripts/signin-connect.ts @@ -13,7 +13,7 @@ let parentConnection: Connection | null = null; // ====== window.onerror = function (error: any) { - console.log(error); + console.warn(error); if (parentConnection) { if (typeof error === "string") { void parentConnection.remoteHandle().call("catchError", error); diff --git a/scripts/ui.ts b/scripts/ui.ts index 9d4e590f..ec517d77 100644 --- a/scripts/ui.ts +++ b/scripts/ui.ts @@ -66,7 +66,7 @@ window.addEventListener("beforeunload", function (event) { }); window.onerror = function (error: any) { - console.log(error); + console.warn(error); if (parentConnection) { if (typeof error === "string") { void parentConnection.remoteHandle().call("catchError", error); @@ -525,7 +525,7 @@ export function saveSeedAndEmail(seed: Uint8Array, email: string | null): void { log("Entered saveSeedAndEmail"); if (!localStorage) { - console.log("WARNING: localStorage disabled, seed not stored"); + console.warn("WARNING: localStorage disabled, seed not stored"); return; } diff --git a/src/index.ts b/src/index.ts index 6055afe7..9d93678d 100644 --- a/src/index.ts +++ b/src/index.ts @@ -13,8 +13,8 @@ import { log } from "./util"; try { await MySky.initialize(); } catch (err) { - console.log(err); + console.warn(err); } })().catch((err) => { - console.log(err); + console.warn(err); }); diff --git a/src/mysky.ts b/src/mysky.ts index 2d31fd1e..44967c71 100644 --- a/src/mysky.ts +++ b/src/mysky.ts @@ -460,14 +460,15 @@ export class MySky { protected async connectToPortalAccount(seed: Uint8Array, email: string): Promise { log("Entered connectToPortalAccount"); - // Register and get the JWT cookie. + // Try to connect to the portal account and set the JWT cookie. // // Make requests to login and register in parallel. At most one can succeed, // and this saves a lot of time. try { await Promise.any([register(this.client, seed, email), login(this.client, seed, email)]); - } catch (e) { - throw new Error(`Could not register or login: ${e}`); + } catch (err) { + const errors = (err as AggregateError).errors; + throw new Error(`Could not register or login: [${errors}]`); } } @@ -526,6 +527,8 @@ export class MySky { } if (storedEmail) { + // If an email was found, try to connect to a portal account and save + // the email if it was valid. await this.loginHandleEmail(seed, storedEmail, isEmailProvidedByUser); } } diff --git a/src/portal_account.ts b/src/portal_account.ts index 4a7f53f4..376c25b8 100644 --- a/src/portal_account.ts +++ b/src/portal_account.ts @@ -4,6 +4,7 @@ import { sign } from "tweetnacl"; import { genKeyPairFromHash, hashWithSalt } from "./crypto"; import { hexToUint8Array, stringToUint8ArrayUtf8, toHexString, validateHexString, validateUint8ArrayLen } from "./util"; +import { ensureUrl } from "skynet-mysky-utils"; /** * The size of the expected signature. @@ -262,7 +263,7 @@ function genPortalLoginKeypair(seed: Uint8Array, email: string): KeyPair { * @returns - The shortened portal recipient URL. */ export function getPortalRecipient(portalUrl: string): string { - const url = new URL(portalUrl); + const url = new URL(ensureUrl(portalUrl)); // Get last two portions of the hostname. url.hostname = url.hostname.split(".").slice(-2).join("."); diff --git a/webpack.config.js b/webpack.config.js index 036960d4..7bebe0f8 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -11,6 +11,7 @@ module.exports = { // Provide polyfill for Promise.any for Opera. // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise/any#browser_compatibility "core-js/stable/promise/any", + "core-js/stable/aggregate-error", "./src/index.ts", ], mode: "production", From 49eebcc74bb5123e12ab25f783bec11510e62bde Mon Sep 17 00:00:00 2001 From: Marcin S Date: Mon, 7 Feb 2022 12:59:56 -0600 Subject: [PATCH 25/29] Fix unexpected request with seed --- html/seed-display.html | 2 +- scripts/seed-display.ts | 6 +++++- tests/integration/portal-account.test.ts | 2 +- tests/unit/portal-account.test.ts | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/html/seed-display.html b/html/seed-display.html index f3161ee5..ae7c49f7 100644 --- a/html/seed-display.html +++ b/html/seed-display.html @@ -111,7 +111,7 @@

-
+
diff --git a/scripts/seed-display.ts b/scripts/seed-display.ts index 5ef34abc..8ad80b56 100644 --- a/scripts/seed-display.ts +++ b/scripts/seed-display.ts @@ -71,6 +71,7 @@ window.onload = async () => { }; (window as any).signIn = (event: Event) => { + // Prevent making unnecessary request. event.preventDefault(); const phraseValue = uiSigninPassphraseText.value; @@ -86,7 +87,10 @@ window.onload = async () => { handleResponse({ seed, email: null, action: "signin" }); }; -(window as any).signUp = () => { +(window as any).signUp = (event: Event) => { + // Prevent making unnecessary request. + event.preventDefault(); + if (uiSeedConfirm.checked === false) return; const seed = phraseToSeed(uiSignupPassphraseText.value); diff --git a/tests/integration/portal-account.test.ts b/tests/integration/portal-account.test.ts index ce0f469c..78f7550c 100644 --- a/tests/integration/portal-account.test.ts +++ b/tests/integration/portal-account.test.ts @@ -2,7 +2,7 @@ import { DEFAULT_SKYNET_PORTAL_URL, SkynetClient } from "skynet-js"; import { randomAsciiString } from "../utils"; import { generatePhrase, phraseToSeed } from "../../src/seed"; -import { login, register } from "../../src/portal-account"; +import { login, register } from "../../src/portal_account"; // const portalUrl = DEFAULT_SKYNET_PORTAL_URL; const portalUrl = "https://siasky.xyz"; diff --git a/tests/unit/portal-account.test.ts b/tests/unit/portal-account.test.ts index 3b905127..a997ebb8 100644 --- a/tests/unit/portal-account.test.ts +++ b/tests/unit/portal-account.test.ts @@ -1,7 +1,7 @@ import { DEFAULT_SKYNET_PORTAL_URL, SkynetClient } from "skynet-js"; import { phraseToSeed } from "../../src/seed"; -import { login, register } from "../../src/portal-account"; +import { getPortalRecipient, login, register } from "../../src/portal_account"; const portalUrl = DEFAULT_SKYNET_PORTAL_URL; const client = new SkynetClient(portalUrl); From 307b83a784b6685fe61aecedf4e463954fc77bc3 Mon Sep 17 00:00:00 2001 From: Marcin S Date: Tue, 8 Feb 2022 15:44:27 -0600 Subject: [PATCH 26/29] Fix lint warnings --- src/mysky.ts | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/src/mysky.ts b/src/mysky.ts index 09515b1d..efc51b0f 100644 --- a/src/mysky.ts +++ b/src/mysky.ts @@ -68,6 +68,7 @@ export class PermissionsProvider { * communicating with skapps and with the permissions provider. * * @property client - The associated SkynetClient. + * @property mySkyDomain - The current domain of this MySky instance. * @property referrerDomain - The domain of the parent skapp. * @property parentConnection - The handshake connection with the parent window. * @property permissionsProvider - The permissions provider, if it has been loaded. @@ -84,6 +85,11 @@ export class MySky { /** * Creates the `MySky` instance. + * + * @param client - The Skynet client. + * @param mySkyDomain - The current domain of this MySky instance. + * @param referrerDomain - The domain that referred us here (i.e. of the host skapp). + * @param permissionsProvider - The permissions provider, if it has been loaded. */ constructor( protected client: SkynetClient, @@ -102,11 +108,6 @@ export class MySky { * For the preferred portal flow, see "Load MySky redirect flow" on * `redirectIfNotOnPreferredPortal` in the SDK. * - * @returns - The MySky instance. - - /** - * Initializes MySky and returns a handle to the `MySky` instance. - * * @returns - The `MySky` instance. * @throws - Will throw if the browser does not support web strorage. */ @@ -250,6 +251,11 @@ export class MySky { return deriveEncryptedPathSeedForRoot(rootPathSeedBytes, path, isDirectory); } + /** + * Gets the user's preferred portal, if set. + * + * @returns - The preferred portal, if set. + */ async getPreferredPortal(): Promise { log("Entered getPreferredPortal"); @@ -302,6 +308,10 @@ export class MySky { } } + /** + * Tries to log in to the portal through MySky. Should be called by the SDK + * whenever it detects an expired JWT. + */ async portalLogin(): Promise { // Get the seed. const seed = checkStoredSeed(); @@ -651,6 +661,7 @@ export class MySky { * * @param seed - The user seed. * @param email - The user email. + * @throws - Will throw if auto-login is already set up. */ protected setupAutoRelogin(seed: Uint8Array, email: string): void { log("Entered setupAutoRelogin"); From 58d6196f8f31b256deea6aea7509af69d6c7565c Mon Sep 17 00:00:00 2001 From: Marcin S Date: Thu, 10 Feb 2022 19:50:02 -0600 Subject: [PATCH 27/29] Address most review comments --- src/mysky.ts | 5 +++-- src/provider.ts | 4 ++++ src/skydb_internal.ts | 52 ++++++++++++++++++++++--------------------- src/user_settings.ts | 4 ++-- 4 files changed, 36 insertions(+), 29 deletions(-) diff --git a/src/mysky.ts b/src/mysky.ts index efc51b0f..3e4df29d 100644 --- a/src/mysky.ts +++ b/src/mysky.ts @@ -26,6 +26,7 @@ export const PORTAL_STORAGE_KEY = "portal"; export const SEED_STORAGE_KEY = "seed"; export const PORTAL_LOGIN_COMPLETE_SENTINEL_KEY = "portal-login-complete"; +const PORTAL_LOGIN_COMPLETE_SUCCESS_VALUE = "1"; export const INITIAL_PORTAL = "https://siasky.net"; @@ -717,7 +718,7 @@ export class MySky { await this.loginFromUi(seed); // Signal to MySky UI that we are done. - localStorage.setItem(PORTAL_LOGIN_COMPLETE_SENTINEL_KEY, "1"); + localStorage.setItem(PORTAL_LOGIN_COMPLETE_SENTINEL_KEY, PORTAL_LOGIN_COMPLETE_SUCCESS_VALUE); } catch (e) { log(`Error in storage event listener: ${e}`); @@ -888,7 +889,7 @@ export async function getCurrentAndReferrerDomains(): Promise<{ // anywhere else for now. let currentDomain; if (ALPHA_ENABLED && DEV_ENABLED) { - throw new Error("Alpha and dev modes cannot both be enbaled"); + throw new Error("Alpha and dev modes cannot both be enabled"); } else if (ALPHA_ENABLED) { currentDomain = "sandbridge.hns"; } else if (DEV_ENABLED) { diff --git a/src/provider.ts b/src/provider.ts index 507b26fb..d46ec1da 100644 --- a/src/provider.ts +++ b/src/provider.ts @@ -24,6 +24,10 @@ export type SeedProviderResponse = { action: SeedProviderAction; }; +// TODO: Either remove, or fully implement if we still want to have custom +// permissions providers. This is from when we decided that users can choose +// their own permissions providers, but we didn't yet have a way to access/save +// user settings. /** * Tries to get the saved permissions provider preference, returning the default provider if not found. * diff --git a/src/skydb_internal.ts b/src/skydb_internal.ts index c3065ce2..41cf5c67 100644 --- a/src/skydb_internal.ts +++ b/src/skydb_internal.ts @@ -21,7 +21,7 @@ import { log, validateObject, validateString } from "./util"; * Gets Encrypted JSON at the given path through MySky. * * @param client - The Skynet client. - * @param seed - The user seed. + * @param seed - The root MySky user seed. * @param path - The data path. * @returns - An object containing the decrypted json data. * @throws - Will throw if the user does not have Hidden Read permission on the path. @@ -57,7 +57,7 @@ export async function getJSONEncryptedInternal( * Sets Encrypted JSON at the given path through MySky. * * @param client - The Skynet client. - * @param seed - The user seed. + * @param seed - The root MySky user seed. * @param path - The data path. * @param json - The json to encrypt and set. * @returns - An object containing the original json data. @@ -80,36 +80,40 @@ export async function setJSONEncryptedInternal( const opts = { hashedDataKeyHex: true }; // Immediately fail if the mutex is not available. - return await client.db.revisionNumberCache.withCachedEntryLock(publicKey, dataKey, async (cachedRevisionEntry) => { - // Get the cached revision number before doing anything else. - const newRevision = incrementRevision(cachedRevisionEntry.revision); + return await client.db.revisionNumberCache.withCachedEntryLock( + publicKey, + dataKey, + async (cachedRevisionEntry: { revision: bigint }) => { + // Get the cached revision number before doing anything else. + const newRevision = incrementRevision(cachedRevisionEntry.revision); - // Derive the key. - const encryptionKey = deriveEncryptedFileKeyEntropy(pathSeed); + // Derive the key. + const encryptionKey = deriveEncryptedFileKeyEntropy(pathSeed); - // Pad and encrypt json file. - log("Calling encryptJSONFile"); - const data = encryptJSONFile(json, { version: ENCRYPTED_JSON_RESPONSE_VERSION }, encryptionKey); + // Pad and encrypt json file. + log("Calling encryptJSONFile"); + const data = encryptJSONFile(json, { version: ENCRYPTED_JSON_RESPONSE_VERSION }, encryptionKey); - log("Calling getOrCreateSkyDBRegistryEntry"); - const [entry] = await getOrCreateSkyDBRegistryEntry(client, dataKey, data, newRevision, opts); + log("Calling getOrCreateSkyDBRegistryEntry"); + const [entry] = await getOrCreateSkyDBRegistryEntry(client, dataKey, data, newRevision, opts); - // Sign the entry. - log("Calling signEncryptedRegistryEntryInternal"); - const signature = await signEncryptedRegistryEntryInternal(seed, entry, path); + // Sign the entry. + log("Calling signEncryptedRegistryEntryInternal"); + const signature = await signEncryptedRegistryEntryInternal(seed, entry, path); - log("Calling postSignedEntry"); - await client.registry.postSignedEntry(publicKey, entry, signature, opts); + log("Calling postSignedEntry"); + await client.registry.postSignedEntry(publicKey, entry, signature, opts); - return { data: json }; - }); + return { data: json }; + } + ); } /** * Gets the encrypted path seed for the given path without requiring * permissions. This should NOT be exported - for internal use only. * - * @param seed - The user seed. + * @param seed - The root MySky user seed. * @param path - The given file or directory path. * @param isDirectory - Whether the path corresponds to a directory. * @returns - The hex-encoded encrypted path seed. @@ -147,7 +151,7 @@ function incrementRevision(revision: bigint): bigint { * Signs the encrypted registry entry without requiring permissions. For * internal use only. * - * @param seed - The user seed. + * @param seed - The root MySky user seed. * @param entry - The encrypted registry entry. * @param path - The MySky path. * @returns - The signature. @@ -175,7 +179,7 @@ async function signEncryptedRegistryEntryInternal( * Internal version of `signRegistryEntryHelper` that does not check for * permissions. * - * @param seed - The user seed. + * @param seed - The root MySky user seed. * @param entry - The registry entry. * @returns - The signature. */ @@ -186,7 +190,5 @@ async function signRegistryEntryHelperInternal(seed: Uint8Array, entry: Registry const { privateKey } = genKeyPairFromSeed(seed); // Sign the entry. - const signature = await signEntry(privateKey, entry, true); - - return signature; + return await signEntry(privateKey, entry, true); } diff --git a/src/user_settings.ts b/src/user_settings.ts index eab0124e..a4cab487 100644 --- a/src/user_settings.ts +++ b/src/user_settings.ts @@ -16,7 +16,7 @@ type UserSettings = { portal: string | null; email: string | null }; * them if found. * * @param client - The Skynet client. - * @param seed - The user seed. + * @param seed - The root MySky user seed. * @param mySkyDomain - The domain of the current MySky instance. * @returns - The portal and email, if found. */ @@ -47,7 +47,7 @@ export async function getUserSettings( * Sets the user settings. * * @param client - The Skynet client. - * @param seed - The user seed. + * @param seed - The root MySky user seed. * @param mySkyDomain - The domain of the current MySky instance. * @param settings - The given user settings. */ From f9d0b5983d6a745be2f1ef419f404bd3956dab82 Mon Sep 17 00:00:00 2001 From: Marcin S Date: Fri, 11 Feb 2022 17:09:02 -0600 Subject: [PATCH 28/29] Comment `resolveOnMySkyPortalLogin` and unregister event listener --- scripts/ui.ts | 70 ++++++++++++++++++++++++++++++++++----------------- src/mysky.ts | 2 +- 2 files changed, 48 insertions(+), 24 deletions(-) diff --git a/scripts/ui.ts b/scripts/ui.ts index ec517d77..97fa1250 100644 --- a/scripts/ui.ts +++ b/scripts/ui.ts @@ -19,6 +19,7 @@ import { getCurrentAndReferrerDomains, INITIAL_PORTAL, PORTAL_LOGIN_COMPLETE_SENTINEL_KEY, + PORTAL_LOGIN_COMPLETE_SUCCESS_VALUE, SEED_STORAGE_KEY, } from "../src/mysky"; import { @@ -465,35 +466,58 @@ async function setupAndRunDisplay(displayUrl: string, methodName: string, ... } /** - * Resolves when portal login on Main MySky completes. + * Resolves when portal login on Main MySky completes successfully. + * + * We register a storage event listener inside a promise that resolves the + * promise when we detect a successful portal login. The successful login is + * signaled via local storage. Any value other than "1" is considered to be an + * error message. If a successful login is not detected within a given timeout, + * then we reject the promise. * * @returns - An empty promise. */ async function resolveOnMySkyPortalLogin(): Promise { log("Entered resolveOnMySkyPortalLogin"); - return Promise.race([ - new Promise((resolve, reject) => - window.addEventListener("storage", async ({ key, newValue }: StorageEvent) => { - if (key !== PORTAL_LOGIN_COMPLETE_SENTINEL_KEY) { - return; - } - - if (!newValue) { - // Key was removed. - return; - } - - // Check for errors from Main MySky. - if (newValue !== "1") { - reject(newValue); - } - - resolve(); - }) - ), - new Promise((_, reject) => setTimeout(reject, MYSKY_PORTAL_LOGIN_TIMEOUT)), - ]); + const abortController = new AbortController(); + + // Set up a promise that succeeds on successful login in main MySky, and fails + // when the login attempt returns an error. + const promise1 = new Promise((resolve, reject) => { + const handleEvent = async ({ key, newValue }: StorageEvent) => { + if (key !== PORTAL_LOGIN_COMPLETE_SENTINEL_KEY) { + return; + } + if (!newValue) { + // Key was removed. + return; + } + + // Check for errors from Main MySky. + if (newValue !== PORTAL_LOGIN_COMPLETE_SUCCESS_VALUE) { + reject(newValue); + } + + // We got the value signaling a successful login, resolve the promise. + resolve(); + }; + + // Set up a storage event listener. + window.addEventListener("storage", handleEvent, { + signal: abortController.signal, + }); + }); + + // Set up promise that rejects on timeout. + const promise2 = new Promise((_, reject) => setTimeout(reject, MYSKY_PORTAL_LOGIN_TIMEOUT)); + + // Return when either promise finishes. Promise 1 returns when a login either + // fails or succeeds. Promise 2 returns when the execution time surpasses the + // timeout window. + return Promise.race([promise1, promise2]).finally(() => { + // Unregister the event listener. + abortController.abort(); + }); } // ======= diff --git a/src/mysky.ts b/src/mysky.ts index 3e4df29d..4f63b3c5 100644 --- a/src/mysky.ts +++ b/src/mysky.ts @@ -26,7 +26,7 @@ export const PORTAL_STORAGE_KEY = "portal"; export const SEED_STORAGE_KEY = "seed"; export const PORTAL_LOGIN_COMPLETE_SENTINEL_KEY = "portal-login-complete"; -const PORTAL_LOGIN_COMPLETE_SUCCESS_VALUE = "1"; +export const PORTAL_LOGIN_COMPLETE_SUCCESS_VALUE = "1"; export const INITIAL_PORTAL = "https://siasky.net"; From f441ee542a1f9e884639f071703df3dee5a24b9a Mon Sep 17 00:00:00 2001 From: Marcin S Date: Mon, 14 Feb 2022 09:19:56 -0600 Subject: [PATCH 29/29] Add explanatory comments --- scripts/ui.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/ui.ts b/scripts/ui.ts index 97fa1250..8d5bb79f 100644 --- a/scripts/ui.ts +++ b/scripts/ui.ts @@ -485,9 +485,16 @@ async function resolveOnMySkyPortalLogin(): Promise { // when the login attempt returns an error. const promise1 = new Promise((resolve, reject) => { const handleEvent = async ({ key, newValue }: StorageEvent) => { + // We only want the promise to resolve or reject when the right storage + // key is encountered. Any other storage key shouldn't trigger a `resolve`. if (key !== PORTAL_LOGIN_COMPLETE_SENTINEL_KEY) { return; } + // We only want the promise to resolve or reject when the right storage + // key is set, and not removed. + // + // NOTE: We do remove the storage key before setting it in Main MySky, + // because otherwise, setting an already-set key has no effect. if (!newValue) { // Key was removed. return;