From afd1924a046058cb0a82a437a46c9183027242a6 Mon Sep 17 00:00:00 2001 From: Mike Maietta Date: Fri, 19 Aug 2022 00:03:09 -0700 Subject: [PATCH 1/6] Switching update-notifier to simple-update-notifier due to dependency vulnerability. Updating typescript, prettier, semver, and yargs --- docs/api/electron-builder.md | 2 +- docs/configuration/win.md | 2 +- package.json | 4 +- .../app-builder-lib/src/ProtonFramework.ts | 2 +- .../src/asar/asarFileChecker.ts | 4 +- .../src/codeSign/windowsCodeSign.ts | 4 +- .../src/electron/electronVersion.ts | 2 +- .../app-builder-lib/src/fileTransformer.ts | 2 +- packages/app-builder-lib/src/packager.ts | 2 +- .../app-builder-lib/src/platformPackager.ts | 2 +- .../src/publish/KeygenPublisher.ts | 4 +- .../src/publish/s3/s3Publisher.ts | 2 +- .../app-builder-lib/src/targets/archive.ts | 2 +- .../src/targets/nsis/NsisTarget.ts | 2 +- .../app-builder-lib/src/util/appBuilder.ts | 2 +- .../app-builder-lib/src/util/cacheManager.ts | 4 +- packages/app-builder-lib/src/util/config.ts | 2 +- packages/app-builder-lib/src/winPackager.ts | 4 +- .../builder-util-runtime/src/httpExecutor.ts | 6 +- packages/builder-util/src/fs.ts | 2 +- packages/builder-util/src/promise.ts | 2 +- packages/builder-util/src/util.ts | 4 +- packages/dmg-builder/src/dmg.ts | 2 +- packages/dmg-builder/src/dmgUtil.ts | 2 +- packages/dmg-builder/src/licenseButtons.ts | 4 +- packages/electron-builder/package.json | 7 +- packages/electron-builder/src/cli/cli.ts | 16 +- .../src/cli/install-app-deps.ts | 2 +- .../electron-publish/src/gitHubPublisher.ts | 2 +- packages/electron-updater/package.json | 2 +- .../electron-updater/src/AppImageUpdater.ts | 2 +- packages/electron-updater/src/AppUpdater.ts | 4 +- packages/electron-updater/src/BaseUpdater.ts | 2 +- .../src/DownloadedUpdateHelper.ts | 4 +- packages/electron-updater/src/MacUpdater.ts | 6 +- packages/electron-updater/src/NsisUpdater.ts | 20 +- .../DifferentialDownloader.ts | 2 +- ...hEmbeddedBlockMapDifferentialDownloader.ts | 2 +- .../src/providers/BitbucketProvider.ts | 2 +- .../src/providers/GenericProvider.ts | 4 +- .../src/providers/GitHubProvider.ts | 8 +- .../src/providers/KeygenProvider.ts | 2 +- .../src/providers/PrivateGitHubProvider.ts | 4 +- .../src/providers/Provider.ts | 2 +- pnpm-lock.yaml | 543 ++++-------------- test/fixtures/test-app-one/index.js | 4 +- .../packages/test-app/index.js | 2 +- .../packages/test-app/index.js | 2 +- .../packages/test-app/index.js | 2 +- test/package.json | 4 +- test/src/ArtifactPublisherTest.ts | 4 +- test/src/helpers/downloadElectron.ts | 2 +- test/src/helpers/fileAssert.ts | 2 +- test/src/mac/macIconTest.ts | 2 +- test/src/updater/differentialUpdateTest.ts | 6 +- 55 files changed, 196 insertions(+), 540 deletions(-) diff --git a/docs/api/electron-builder.md b/docs/api/electron-builder.md index 2d133713a3..0f57f0c454 100644 --- a/docs/api/electron-builder.md +++ b/docs/api/electron-builder.md @@ -1097,7 +1097,7 @@ return path.join(target.outDir, __${target.name}-${getArtifactArchName(arc outputFormat -“icns” | “ico” | “set” +“set” | “icns” | “ico” diff --git a/docs/configuration/win.md b/docs/configuration/win.md index 0b383d201b..23579699a5 100644 --- a/docs/configuration/win.md +++ b/docs/configuration/win.md @@ -15,7 +15,7 @@ The top-level [win](configuration.md#Configuration-win) key contains set of opti
    -
  • signingHashAlgorithms = ['sha1', 'sha256'] Array<“sha256” | “sha1”> | “undefined” - Array of signing algorithms used. For AppX sha256 is always used.
    • +
  • signingHashAlgorithms = ['sha1', 'sha256'] Array<“sha1” | “sha256”> | “undefined” - Array of signing algorithms used. For AppX sha256 is always used.
  • sign String | (configuration: CustomWindowsSignTaskConfiguration) => Promise - The custom function (or path to file or module id) to sign Windows executable.
  • certificateFile String | “undefined” - The path to the *.pfx certificate you want to sign with. Please use it only if you cannot use env variable CSC_LINK (WIN_CSC_LINK) for some reason. Please see Code Signing.
  • certificatePassword String | “undefined” - The password to the certificate provided in certificateFile. Please use it only if you cannot use env variable CSC_KEY_PASSWORD (WIN_CSC_KEY_PASSWORD) for some reason. Please see Code Signing.
    • diff --git a/package.json b/package.json index c41c58b723..52a29498de 100644 --- a/package.json +++ b/package.json @@ -67,11 +67,11 @@ "lint-staged": "11.1.2", "markdown2html-pro": "1.0.6", "path-sort": "0.1.0", - "prettier": "2.7.1", + "prettier": "2.3.2", "replace-in-file": "6.2.0", "source-map-support": "0.5.21", "ts-jsdoc": "3.2.2", - "typescript": "^4.4.0", + "typescript": "4.3.5", "typescript-json-schema": "0.51.0", "v8-compile-cache": "2.3.0" }, diff --git a/packages/app-builder-lib/src/ProtonFramework.ts b/packages/app-builder-lib/src/ProtonFramework.ts index d1311a64f1..69f74219e1 100644 --- a/packages/app-builder-lib/src/ProtonFramework.ts +++ b/packages/app-builder-lib/src/ProtonFramework.ts @@ -36,7 +36,7 @@ export class ProtonFramework extends LibUiFramework { } else { try { babel = require("babel-core") - } catch (e: any) { + } catch (e) { // babel isn't installed log.debug(null, "don't transpile source code using Babel") return null diff --git a/packages/app-builder-lib/src/asar/asarFileChecker.ts b/packages/app-builder-lib/src/asar/asarFileChecker.ts index b9a6fcc30b..485ea965ec 100644 --- a/packages/app-builder-lib/src/asar/asarFileChecker.ts +++ b/packages/app-builder-lib/src/asar/asarFileChecker.ts @@ -10,14 +10,14 @@ export async function checkFileInArchive(asarFile: string, relativeFile: string, let fs try { fs = await readAsar(asarFile) - } catch (e: any) { + } catch (e) { throw error(`is corrupted: ${e}`) } let stat: Node | null try { stat = fs.getFile(relativeFile) - } catch (e: any) { + } catch (e) { const fileStat = await statOrNull(asarFile) if (fileStat == null) { throw error(`does not exist. Seems like a wrong configuration.`) diff --git a/packages/app-builder-lib/src/codeSign/windowsCodeSign.ts b/packages/app-builder-lib/src/codeSign/windowsCodeSign.ts index 43d2cae671..af531a052a 100644 --- a/packages/app-builder-lib/src/codeSign/windowsCodeSign.ts +++ b/packages/app-builder-lib/src/codeSign/windowsCodeSign.ts @@ -82,7 +82,7 @@ export async function getCertInfo(file: string, password: string): Promise(["certificate-info", "--input", file, "--password", password]) - } catch (e: any) { + } catch (e) { throw new Error(`${errorMessagePrefix}${e.stack || e}`) } @@ -165,7 +165,7 @@ export async function doSign(configuration: CustomWindowsSignTaskConfiguration, try { await vm.exec(tool, args, { timeout, env }) - } catch (e: any) { + } catch (e) { if (e.message.includes("The file is being used by another process") || e.message.includes("The specified timestamp server either could not be reached")) { log.warn(`First attempt to code sign failed, another attempt will be made in 15 seconds: ${e.message}`) await new Promise((resolve, reject) => { diff --git a/packages/app-builder-lib/src/electron/electronVersion.ts b/packages/app-builder-lib/src/electron/electronVersion.ts index f866411681..6caebd76e7 100644 --- a/packages/app-builder-lib/src/electron/electronVersion.ts +++ b/packages/app-builder-lib/src/electron/electronVersion.ts @@ -89,7 +89,7 @@ export async function computeElectronVersion(projectDir: string, projectMetadata const version = releaseInfo.tag_name.startsWith("v") ? releaseInfo.tag_name.substring(1) : releaseInfo.tag_name log.info({ version }, `resolve ${dependency.name}@${dependency.version}`) return version - } catch (e: any) { + } catch (e) { log.warn(e) } diff --git a/packages/app-builder-lib/src/fileTransformer.ts b/packages/app-builder-lib/src/fileTransformer.ts index 88d1884e01..b33d723a67 100644 --- a/packages/app-builder-lib/src/fileTransformer.ts +++ b/packages/app-builder-lib/src/fileTransformer.ts @@ -99,7 +99,7 @@ function cleanupPackageJson(data: any, options: CleanupPackageFileOptions): any if (changed) { return JSON.stringify(data, null, 2) } - } catch (e: any) { + } catch (e) { debug(e) } diff --git a/packages/app-builder-lib/src/packager.ts b/packages/app-builder-lib/src/packager.ts index 0b780f7a7f..03fef8f4a4 100644 --- a/packages/app-builder-lib/src/packager.ts +++ b/packages/app-builder-lib/src/packager.ts @@ -231,7 +231,7 @@ export class Packager { try { log.info({ version: PACKAGE_VERSION, os: getOsRelease() }, "electron-builder") - } catch (e: any) { + } catch (e) { // error in dev mode without babel if (!(e instanceof ReferenceError)) { throw e diff --git a/packages/app-builder-lib/src/platformPackager.ts b/packages/app-builder-lib/src/platformPackager.ts index c664a481c8..ab4ebb7c5f 100644 --- a/packages/app-builder-lib/src/platformPackager.ts +++ b/packages/app-builder-lib/src/platformPackager.ts @@ -757,7 +757,7 @@ export function resolveFunction(executor: T | string, name: string): T { try { p = require.resolve(p) - } catch (e: any) { + } catch (e) { debug(e) p = path.resolve(p) } diff --git a/packages/app-builder-lib/src/publish/KeygenPublisher.ts b/packages/app-builder-lib/src/publish/KeygenPublisher.ts index 64cd2a0eae..383f888234 100644 --- a/packages/app-builder-lib/src/publish/KeygenPublisher.ts +++ b/packages/app-builder-lib/src/publish/KeygenPublisher.ts @@ -185,7 +185,7 @@ export class KeygenPublisher extends HttpPublisher { try { // First, we'll attempt to fetch the release. return await this.getRelease() - } catch (e: any) { + } catch (e) { if (e.statusCode !== 404) { throw e } @@ -193,7 +193,7 @@ export class KeygenPublisher extends HttpPublisher { try { // Next, if the release doesn't exist, we'll attempt to create it. return await this.createRelease() - } catch (e: any) { + } catch (e) { if (e.statusCode !== 409 && e.statusCode !== 422) { throw e } diff --git a/packages/app-builder-lib/src/publish/s3/s3Publisher.ts b/packages/app-builder-lib/src/publish/s3/s3Publisher.ts index a871412627..c751a3877f 100644 --- a/packages/app-builder-lib/src/publish/s3/s3Publisher.ts +++ b/packages/app-builder-lib/src/publish/s3/s3Publisher.ts @@ -20,7 +20,7 @@ export default class S3Publisher extends BaseS3Publisher { // on dotted bucket names, we need to use a path-based endpoint URL. Path-based endpoint URLs need to include the region. try { options.region = await executeAppBuilder(["get-bucket-location", "--bucket", bucket]) - } catch (e: any) { + } catch (e) { if (errorIfCannot) { throw e } else { diff --git a/packages/app-builder-lib/src/targets/archive.ts b/packages/app-builder-lib/src/targets/archive.ts index b332cfa7ab..d96e6509d4 100644 --- a/packages/app-builder-lib/src/targets/archive.ts +++ b/packages/app-builder-lib/src/targets/archive.ts @@ -182,7 +182,7 @@ export async function archive(format: string, outFile: string, dirToArchive: str }, debug7z.enabled ) - } catch (e: any) { + } catch (e) { if (e.code === "ENOENT" && !(await exists(dirToArchive))) { throw new Error(`Cannot create archive: "${dirToArchive}" doesn't exist`) } else { diff --git a/packages/app-builder-lib/src/targets/nsis/NsisTarget.ts b/packages/app-builder-lib/src/targets/nsis/NsisTarget.ts index 70c822912c..5e6fcbfa5d 100644 --- a/packages/app-builder-lib/src/targets/nsis/NsisTarget.ts +++ b/packages/app-builder-lib/src/targets/nsis/NsisTarget.ts @@ -749,7 +749,7 @@ async function ensureNotBusy(outFile: string): Promise { } else { fs.close(fd, () => resolve(true)) } - } catch (error: any) { + } catch (error) { reject(error) } }) diff --git a/packages/app-builder-lib/src/util/appBuilder.ts b/packages/app-builder-lib/src/util/appBuilder.ts index 42cd4ba626..38bf696c5f 100644 --- a/packages/app-builder-lib/src/util/appBuilder.ts +++ b/packages/app-builder-lib/src/util/appBuilder.ts @@ -9,7 +9,7 @@ export function executeAppBuilderAsJson(args: Array): Promise { try { return JSON.parse(rawResult) as T - } catch (e: any) { + } catch (e) { throw new Error(`Cannot parse result: ${e.message}: "${rawResult}"`) } }) diff --git a/packages/app-builder-lib/src/util/cacheManager.ts b/packages/app-builder-lib/src/util/cacheManager.ts index 078dca7d66..199ed72cc0 100644 --- a/packages/app-builder-lib/src/util/cacheManager.ts +++ b/packages/app-builder-lib/src/util/cacheManager.ts @@ -42,7 +42,7 @@ export class BuildCacheManager { try { await copyFile(this.cacheFile, this.executableFile, false) return true - } catch (e: any) { + } catch (e) { if (e.code === "ENOENT" || e.code === "ENOTDIR") { log.debug({ error: e.code }, "copy cached executable failed") } else { @@ -66,7 +66,7 @@ export class BuildCacheManager { try { await mkdir(this.cacheDir, { recursive: true }) await Promise.all([writeJson(this.cacheInfoFile, this.cacheInfo), copyFile(this.executableFile, this.cacheFile, false)]) - } catch (e: any) { + } catch (e) { log.warn({ error: e.stack || e }, `cannot save build cache`) } } diff --git a/packages/app-builder-lib/src/util/config.ts b/packages/app-builder-lib/src/util/config.ts index 37f0569704..d9abaabc46 100644 --- a/packages/app-builder-lib/src/util/config.ts +++ b/packages/app-builder-lib/src/util/config.ts @@ -168,7 +168,7 @@ function mergeFilters(value: Filter, other: Filter): string[] { } function mergeFileSets(lists: FileSet[][]): FileSet[] { - const result: FileSet[] = [] + const result = [] for (const list of lists) { for (const item of list) { diff --git a/packages/app-builder-lib/src/winPackager.ts b/packages/app-builder-lib/src/winPackager.ts index 9391325e5e..677c50dc83 100644 --- a/packages/app-builder-lib/src/winPackager.ts +++ b/packages/app-builder-lib/src/winPackager.ts @@ -170,7 +170,7 @@ export class WinPackager extends PlatformPackager { case "squirrel": try { return require("electron-builder-squirrel-windows").default - } catch (e: any) { + } catch (e) { throw new InvalidConfigurationError(`Module electron-builder-squirrel-windows must be installed in addition to build Squirrel.Windows: ${e.stack || e}`) } @@ -254,7 +254,7 @@ export class WinPackager extends PlatformPackager { try { await sign(options, this) break - } catch (e: any) { + } catch (e) { // https://github.com/electron-userland/electron-builder/issues/1414 const message = e.message if (message != null && message.includes("Couldn't resolve host name")) { diff --git a/packages/builder-util-runtime/src/httpExecutor.ts b/packages/builder-util-runtime/src/httpExecutor.ts index 21b020e421..0bca9b0c37 100644 --- a/packages/builder-util-runtime/src/httpExecutor.ts +++ b/packages/builder-util-runtime/src/httpExecutor.ts @@ -206,7 +206,7 @@ Please double check that your authentication token is correct. Due to security r } else { resolve(data.length === 0 ? null : data) } - } catch (e: any) { + } catch (e) { reject(e) } }) @@ -349,7 +349,7 @@ Please double check that your authentication token is correct. Due to security r for (let attemptNumber = 0; ; attemptNumber++) { try { return task() - } catch (e: any) { + } catch (e) { if (attemptNumber < maxRetries && ((e instanceof HttpError && e.isServerError()) || e.code === "EPIPE")) { continue } @@ -417,7 +417,7 @@ export class DigestTransform extends Transform { if (this.isValidateOnEnd) { try { this.validate() - } catch (e: any) { + } catch (e) { callback(e) return } diff --git a/packages/builder-util/src/fs.ts b/packages/builder-util/src/fs.ts index 15014db68f..a5719fac93 100644 --- a/packages/builder-util/src/fs.ts +++ b/packages/builder-util/src/fs.ts @@ -35,7 +35,7 @@ export async function exists(file: string): Promise { try { await access(file) return true - } catch (e: any) { + } catch (e) { return false } } diff --git a/packages/builder-util/src/promise.ts b/packages/builder-util/src/promise.ts index 4c549d88eb..e7095fc33f 100644 --- a/packages/builder-util/src/promise.ts +++ b/packages/builder-util/src/promise.ts @@ -13,7 +13,7 @@ export async function executeFinally(promise: Promise, task: (isErrorOccur } catch (originalError) { try { await task(true) - } catch (taskError: any) { + } catch (taskError) { throw new NestedError([originalError, taskError]) } diff --git a/packages/builder-util/src/util.ts b/packages/builder-util/src/util.ts index 654c6c66f6..ebfbc7575f 100644 --- a/packages/builder-util/src/util.ts +++ b/packages/builder-util/src/util.ts @@ -173,7 +173,7 @@ export function doSpawn(command: string, args: Array, options?: SpawnOpt logSpawn(command, args, options) try { return _spawn(command, args, options) - } catch (e: any) { + } catch (e) { throw new Error(`Cannot spawn ${command}: ${e.stack || e}`) } } @@ -394,7 +394,7 @@ export function executeAppBuilder( export async function retry(task: () => Promise, retriesLeft: number, interval: number): Promise { try { return await task() - } catch (error: any) { + } catch (error) { log.info(`Above command failed, retrying ${retriesLeft} more times`) if (retriesLeft > 0) { await new Promise(resolve => setTimeout(resolve, interval)) diff --git a/packages/dmg-builder/src/dmg.ts b/packages/dmg-builder/src/dmg.ts index f9c5b96286..5c18e7c316 100644 --- a/packages/dmg-builder/src/dmg.ts +++ b/packages/dmg-builder/src/dmg.ts @@ -309,7 +309,7 @@ async function customizeDmg(volumePath: string, specification: DmgOptions, packa } try { await executePython("python3") - } catch (error: any) { + } catch (error) { await executePython("python") } return packager.packagerOptions.effectiveOptionComputed == null || !(await packager.packagerOptions.effectiveOptionComputed({ volumePath, specification, packager })) diff --git a/packages/dmg-builder/src/dmgUtil.ts b/packages/dmg-builder/src/dmgUtil.ts index 64b83ae524..56dff8fd6c 100644 --- a/packages/dmg-builder/src/dmgUtil.ts +++ b/packages/dmg-builder/src/dmgUtil.ts @@ -36,7 +36,7 @@ export async function attachAndExecute(dmgPath: string, readWrite: boolean, task export async function detach(name: string) { try { await exec("hdiutil", ["detach", "-quiet", name]) - } catch (e: any) { + } catch (e) { await new Promise((resolve, reject) => { setTimeout(() => { exec("hdiutil", ["detach", "-force", name]).then(resolve).catch(reject) diff --git a/packages/dmg-builder/src/licenseButtons.ts b/packages/dmg-builder/src/licenseButtons.ts index fa35f58714..4b0e55dd90 100644 --- a/packages/dmg-builder/src/licenseButtons.ts +++ b/packages/dmg-builder/src/licenseButtons.ts @@ -51,7 +51,7 @@ export async function getLicenseButtons(licenseButtonFiles: Array log.warn({ error: e }, "cannot check updates")) } diff --git a/packages/electron-builder/src/cli/install-app-deps.ts b/packages/electron-builder/src/cli/install-app-deps.ts index 425eb1a20e..59f510d0b6 100644 --- a/packages/electron-builder/src/cli/install-app-deps.ts +++ b/packages/electron-builder/src/cli/install-app-deps.ts @@ -37,7 +37,7 @@ export function configureInstallAppDepsCommand(yargs: yargs.Argv): yargs.Argv { export async function installAppDeps(args: any) { try { log.info({ version: PACKAGE_VERSION }, "electron-builder") - } catch (e: any) { + } catch (e) { // error in dev mode without babel if (!(e instanceof ReferenceError)) { throw e diff --git a/packages/electron-publish/src/gitHubPublisher.ts b/packages/electron-publish/src/gitHubPublisher.ts index 500916ff73..0d7e41938f 100644 --- a/packages/electron-publish/src/gitHubPublisher.ts +++ b/packages/electron-publish/src/gitHubPublisher.ts @@ -249,7 +249,7 @@ export class GitHubPublisher extends HttpPublisher { for (let i = 0; i < 3; i++) { try { return await this.githubRequest(`/repos/${this.info.owner}/${this.info.repo}/releases/${release.id}`, this.token, null, "DELETE") - } catch (e: any) { + } catch (e) { if (e instanceof HttpError) { if (e.statusCode === 404) { log.warn({ releaseId: release.id, reason: "doesn't exist" }, "cannot delete release") diff --git a/packages/electron-updater/package.json b/packages/electron-updater/package.json index 306bc45253..a4d6d5435d 100644 --- a/packages/electron-updater/package.json +++ b/packages/electron-updater/package.json @@ -23,7 +23,7 @@ "lazy-val": "^1.0.5", "lodash.escaperegexp": "^4.1.2", "lodash.isequal": "^4.5.0", - "semver": "^7.3.7", + "semver": "^7.3.5", "typed-emitter": "^2.1.0" }, "devDependencies": { diff --git a/packages/electron-updater/src/AppImageUpdater.ts b/packages/electron-updater/src/AppImageUpdater.ts index 4de84a3ef5..0057bb211f 100644 --- a/packages/electron-updater/src/AppImageUpdater.ts +++ b/packages/electron-updater/src/AppImageUpdater.ts @@ -58,7 +58,7 @@ export class AppImageUpdater extends BaseUpdater { } await new FileWithEmbeddedBlockMapDifferentialDownloader(fileInfo.info, this.httpExecutor, downloadOptions).download() - } catch (e: any) { + } catch (e) { this._logger.error(`Cannot download differentially, fallback to full download: ${e.stack || e}`) // during test (developer machine mac) we must throw error isDownloadFull = process.platform === "linux" diff --git a/packages/electron-updater/src/AppUpdater.ts b/packages/electron-updater/src/AppUpdater.ts index b63d538004..25dd721287 100644 --- a/packages/electron-updater/src/AppUpdater.ts +++ b/packages/electron-updater/src/AppUpdater.ts @@ -548,7 +548,7 @@ export abstract class AppUpdater extends (EventEmitter as new () => TypedEmitter this._logger.info(`Generated new staging user ID: ${id}`) try { await outputFile(file, id) - } catch (e: any) { + } catch (e) { this._logger.warn(`Couldn't write out staging user ID: ${e}`) } return id @@ -660,7 +660,7 @@ export abstract class AppUpdater extends (EventEmitter as new () => TypedEmitter try { await taskOptions.task(tempUpdateFile, downloadOptions, packageFile, removeFileIfAny) await rename(tempUpdateFile, updateFile) - } catch (e: any) { + } catch (e) { await removeFileIfAny() if (e instanceof CancellationError) { diff --git a/packages/electron-updater/src/BaseUpdater.ts b/packages/electron-updater/src/BaseUpdater.ts index a6ba0c0c6f..3290c3fb42 100644 --- a/packages/electron-updater/src/BaseUpdater.ts +++ b/packages/electron-updater/src/BaseUpdater.ts @@ -64,7 +64,7 @@ export abstract class BaseUpdater extends AppUpdater { isForceRunAfter, isAdminRightsRequired: downloadedFileInfo.isAdminRightsRequired, }) - } catch (e: any) { + } catch (e) { this.dispatchError(e) return false } diff --git a/packages/electron-updater/src/DownloadedUpdateHelper.ts b/packages/electron-updater/src/DownloadedUpdateHelper.ts index 12a312c410..e5bd3fc874 100644 --- a/packages/electron-updater/src/DownloadedUpdateHelper.ts +++ b/packages/electron-updater/src/DownloadedUpdateHelper.ts @@ -111,7 +111,7 @@ export class DownloadedUpdateHelper { let cachedInfo: CachedUpdateInfo try { cachedInfo = await readJson(updateInfoFilePath) - } catch (error: any) { + } catch (error) { let message = `No cached update info available` if (error.code !== "ENOENT") { await this.cleanCacheDirForPendingUpdate() @@ -186,7 +186,7 @@ export async function createTempUpdateFile(name: string, cacheDir: string, log: try { await unlink(result) return result - } catch (e: any) { + } catch (e) { if (e.code === "ENOENT") { return result } diff --git a/packages/electron-updater/src/MacUpdater.ts b/packages/electron-updater/src/MacUpdater.ts index 44043bb9a3..f2dd2162aa 100644 --- a/packages/electron-updater/src/MacUpdater.ts +++ b/packages/electron-updater/src/MacUpdater.ts @@ -48,7 +48,7 @@ export class MacUpdater extends AppUpdater { const result = execFileSync("sysctl", [sysctlRosettaInfoKey], { encoding: "utf8" }) isRosetta = result.includes(`${sysctlRosettaInfoKey}: 1`) log.info(`Checked for macOS Rosetta environment (isRosetta=${isRosetta})`) - } catch (e: any) { + } catch (e) { log.warn(`sysctl shell command to check for macOS Rosetta environment failed: ${e}`) } @@ -59,7 +59,7 @@ export class MacUpdater extends AppUpdater { const isArm = result.includes("ARM") log.info(`Checked 'uname -a': arm64=${isArm}`) isArm64Mac = isArm64Mac || isArm - } catch (e: any) { + } catch (e) { log.warn(`uname shell command to check for arm64 failed: ${e}`) } @@ -171,7 +171,7 @@ export class MacUpdater extends AppUpdater { readStream.on("error", error => { try { response.end() - } catch (e: any) { + } catch (e) { log.warn(`cannot end response: ${e}`) } errorOccurred = true diff --git a/packages/electron-updater/src/NsisUpdater.ts b/packages/electron-updater/src/NsisUpdater.ts index 3e0a7ad00b..975223ecf3 100644 --- a/packages/electron-updater/src/NsisUpdater.ts +++ b/packages/electron-updater/src/NsisUpdater.ts @@ -63,16 +63,16 @@ export class NsisUpdater extends BaseUpdater { } if (isWebInstaller) { - if (await this.differentialDownloadWebPackage(downloadUpdateOptions, packageInfo, packageFile, provider)) { + if (await this.differentialDownloadWebPackage(downloadUpdateOptions, packageInfo!, packageFile!, provider)) { try { - await this.httpExecutor.download(new URL(packageInfo.path), packageFile, { + await this.httpExecutor.download(new URL(packageInfo!.path), packageFile!, { headers: downloadUpdateOptions.requestHeaders, cancellationToken: downloadUpdateOptions.cancellationToken, - sha512: packageInfo.sha512, + sha512: packageInfo!.sha512, }) - } catch (e: any) { + } catch (e) { try { - await unlink(packageFile) + await unlink(packageFile!) } catch (ignored) { // ignore } @@ -95,7 +95,7 @@ export class NsisUpdater extends BaseUpdater { if (publisherName == null) { return null } - } catch (e: any) { + } catch (e) { if (e.code === "ENOENT") { // no app-update.yml return null @@ -175,7 +175,7 @@ export class NsisUpdater extends BaseUpdater { try { return JSON.parse(gunzipSync(data).toString()) - } catch (e: any) { + } catch (e) { throw new Error(`Cannot parse blockmap "${url.href}", error: ${e}`) } } @@ -197,7 +197,7 @@ export class NsisUpdater extends BaseUpdater { const blockMapDataList = await Promise.all(blockmapFileUrls.map(u => downloadBlockMap(u))) await new GenericDifferentialDownloader(fileInfo.info, this.httpExecutor, downloadOptions).download(blockMapDataList[0], blockMapDataList[1]) return false - } catch (e: any) { + } catch (e) { this._logger.error(`Cannot download differentially, fallback to full download: ${e.stack || e}`) if (this._testOnlyOptions != null) { // test mode @@ -233,7 +233,7 @@ export class NsisUpdater extends BaseUpdater { } await new FileWithEmbeddedBlockMapDifferentialDownloader(packageInfo, this.httpExecutor, downloadOptions).download() - } catch (e: any) { + } catch (e) { this._logger.error(`Cannot download differentially, fallback to full download: ${e.stack || e}`) // during test (developer machine mac or linux) we must throw error return process.platform === "win32" @@ -262,7 +262,7 @@ async function _spawn(exe: string, args: Array): Promise { if (process.pid !== undefined) { resolve(true) } - } catch (error: any) { + } catch (error) { reject(error) } }) diff --git a/packages/electron-updater/src/differentialDownloader/DifferentialDownloader.ts b/packages/electron-updater/src/differentialDownloader/DifferentialDownloader.ts index 7b009309b4..3fe6a0342f 100644 --- a/packages/electron-updater/src/differentialDownloader/DifferentialDownloader.ts +++ b/packages/electron-updater/src/differentialDownloader/DifferentialDownloader.ts @@ -160,7 +160,7 @@ export abstract class DifferentialDownloader { fdList.splice(1, 1) try { digestTransform.validate() - } catch (e: any) { + } catch (e) { reject(e) return } diff --git a/packages/electron-updater/src/differentialDownloader/FileWithEmbeddedBlockMapDifferentialDownloader.ts b/packages/electron-updater/src/differentialDownloader/FileWithEmbeddedBlockMapDifferentialDownloader.ts index d4446db1d7..4a8cab343f 100644 --- a/packages/electron-updater/src/differentialDownloader/FileWithEmbeddedBlockMapDifferentialDownloader.ts +++ b/packages/electron-updater/src/differentialDownloader/FileWithEmbeddedBlockMapDifferentialDownloader.ts @@ -30,7 +30,7 @@ async function readEmbeddedBlockMapData(file: string): Promise { await close(fd) return readBlockMap(dataBuffer) - } catch (e: any) { + } catch (e) { await close(fd) throw e } diff --git a/packages/electron-updater/src/providers/BitbucketProvider.ts b/packages/electron-updater/src/providers/BitbucketProvider.ts index 0d420665f4..8252128260 100644 --- a/packages/electron-updater/src/providers/BitbucketProvider.ts +++ b/packages/electron-updater/src/providers/BitbucketProvider.ts @@ -27,7 +27,7 @@ export class BitbucketProvider extends Provider { try { const updateInfo = await this.httpRequest(channelUrl, undefined, cancellationToken) return parseUpdateInfo(updateInfo, channelFile, channelUrl) - } catch (e: any) { + } catch (e) { throw newError(`Unable to find latest version on ${this.toString()}, please ensure release exists: ${e.stack || e.message}`, "ERR_UPDATER_LATEST_VERSION_NOT_FOUND") } } diff --git a/packages/electron-updater/src/providers/GenericProvider.ts b/packages/electron-updater/src/providers/GenericProvider.ts index 5beff36ae6..743e7a807e 100644 --- a/packages/electron-updater/src/providers/GenericProvider.ts +++ b/packages/electron-updater/src/providers/GenericProvider.ts @@ -22,7 +22,7 @@ export class GenericProvider extends Provider { for (let attemptNumber = 0; ; attemptNumber++) { try { return parseUpdateInfo(await this.httpRequest(channelUrl), channelFile, channelUrl) - } catch (e: any) { + } catch (e) { if (e instanceof HttpError && e.statusCode === 404) { throw newError(`Cannot find channel "${channelFile}" update info: ${e.stack || e.message}`, "ERR_UPDATER_CHANNEL_FILE_NOT_FOUND") } else if (e.code === "ECONNREFUSED") { @@ -30,7 +30,7 @@ export class GenericProvider extends Provider { await new Promise((resolve, reject) => { try { setTimeout(resolve, 1000 * attemptNumber) - } catch (e: any) { + } catch (e) { reject(e) } }) diff --git a/packages/electron-updater/src/providers/GitHubProvider.ts b/packages/electron-updater/src/providers/GitHubProvider.ts index e895661288..3073cb09c9 100644 --- a/packages/electron-updater/src/providers/GitHubProvider.ts +++ b/packages/electron-updater/src/providers/GitHubProvider.ts @@ -102,7 +102,7 @@ export class GitHubProvider extends BaseGitHubProvider { } } } - } catch (e: any) { + } catch (e) { throw newError(`Cannot parse releases feed: ${e.stack || e.message},\nXML:\n${feedXml}`, "ERR_UPDATER_INVALID_RELEASE_FEED") } @@ -119,7 +119,7 @@ export class GitHubProvider extends BaseGitHubProvider { const requestOptions = this.createRequestOptions(channelFileUrl) try { return (await this.executor.request(requestOptions, cancellationToken))! - } catch (e: any) { + } catch (e) { if (e instanceof HttpError && e.statusCode === 404) { throw newError(`Cannot find ${channelFile} in the latest release artifacts (${channelFileUrl}): ${e.stack || e.message}`, "ERR_UPDATER_CHANNEL_FILE_NOT_FOUND") } @@ -130,7 +130,7 @@ export class GitHubProvider extends BaseGitHubProvider { try { const channel = this.updater.allowPrerelease ? this.getCustomChannelName(String(semver.prerelease(tag)?.[0] || "latest")) : this.getDefaultChannelName() rawData = await fetchData(channel) - } catch (e: any) { + } catch (e) { if (this.updater.allowPrerelease) { // Allow fallback to `latest.yml` rawData = await fetchData(this.getDefaultChannelName()) @@ -168,7 +168,7 @@ export class GitHubProvider extends BaseGitHubProvider { const releaseInfo: GithubReleaseInfo = JSON.parse(rawData) return releaseInfo.tag_name - } catch (e: any) { + } catch (e) { throw newError(`Unable to find latest version on GitHub (${url}), please ensure a production release exists: ${e.stack || e.message}`, "ERR_UPDATER_LATEST_VERSION_NOT_FOUND") } } diff --git a/packages/electron-updater/src/providers/KeygenProvider.ts b/packages/electron-updater/src/providers/KeygenProvider.ts index b9342c0d89..bb2a86fbf6 100644 --- a/packages/electron-updater/src/providers/KeygenProvider.ts +++ b/packages/electron-updater/src/providers/KeygenProvider.ts @@ -33,7 +33,7 @@ export class KeygenProvider extends Provider { cancellationToken ) return parseUpdateInfo(updateInfo, channelFile, channelUrl) - } catch (e: any) { + } catch (e) { throw newError(`Unable to find latest version on ${this.toString()}, please ensure release exists: ${e.stack || e.message}`, "ERR_UPDATER_LATEST_VERSION_NOT_FOUND") } } diff --git a/packages/electron-updater/src/providers/PrivateGitHubProvider.ts b/packages/electron-updater/src/providers/PrivateGitHubProvider.ts index 81b5ecb91a..400ff070da 100644 --- a/packages/electron-updater/src/providers/PrivateGitHubProvider.ts +++ b/packages/electron-updater/src/providers/PrivateGitHubProvider.ts @@ -39,7 +39,7 @@ export class PrivateGitHubProvider extends BaseGitHubProvider=6'} + dev: false + /@sinonjs/commons/1.8.3: resolution: {integrity: sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==} dependencies: @@ -3081,6 +3088,13 @@ packages: dependencies: '@sinonjs/commons': 1.8.3 + /@szmarczak/http-timer/1.1.2: + resolution: {integrity: sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==} + engines: {node: '>=6'} + dependencies: + defer-to-connect: 1.1.3 + dev: false + /@tootallnate/once/1.1.2: resolution: {integrity: sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==} engines: {node: '>= 6'} @@ -3159,6 +3173,10 @@ packages: '@babel/types': 7.17.0 dev: true + /@types/configstore/5.0.1: + resolution: {integrity: sha512-c/QCznvk7bLKGhHETj29rqKufui3jaAxjBhK4R2zUrMG5UG0qTwfWYxBoUbH8JCyDjdCWMIxPJ7/Fdz1UcAnWg==} + dev: true + /@types/cross-spawn/6.0.2: resolution: {integrity: sha512-KuwNhp3eza+Rhu8IFI5HUXRP0LIhqH5cAjubUvGXXthh4YYBuP2ntwEX+Cz8GJoZUHlKo247wPWOfA9LYEq4cw==} dependencies: @@ -3240,6 +3258,12 @@ packages: resolution: {integrity: sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==} dev: true + /@types/keyv/3.1.4: + resolution: {integrity: sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==} + dependencies: + '@types/node': 17.0.25 + dev: false + /@types/linkify-it/3.0.2: resolution: {integrity: sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==} dev: true @@ -3335,6 +3359,12 @@ packages: resolution: {integrity: sha512-G/AdOadiZhnJp0jXCaBQU449W2h716OW/EoXeYkCytxKL06X1WCXB4DZpp8TpZ8eyIJVS1cw4lrlkkSYU21cDw==} dev: true + /@types/responselike/1.0.0: + resolution: {integrity: sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==} + dependencies: + '@types/node': 17.0.25 + dev: false + /@types/sax/1.2.3: resolution: {integrity: sha512-+QSw6Tqvs/KQpZX8DvIl3hZSjNFLW/OqE5nlyHXtTwODaJvioN2rOWpBNEWZp2HZUFhOh+VohmJku/WxEXU2XA==} dependencies: @@ -3368,6 +3398,13 @@ packages: '@types/node': 16.11.12 dev: true + /@types/update-notifier/5.1.0: + resolution: {integrity: sha512-aGY5pH1Q/DcToKXl4MCj1c0uDUB+zSVFDRCI7Q7js5sguzBTqJV/5kJA2awofbtWYF3xnon1TYdZYnFditRPtQ==} + dependencies: + '@types/configstore': 5.0.1 + boxen: 4.2.0 + dev: true + /@types/verror/1.10.5: resolution: {integrity: sha512-9UjMCHK5GPgQRoNbqdLIAvAy0EInuiqbW0PBMtVP6B5B2HQJlvoJHM+KodPZMEjOa5VkSc+5LH7xy+cUzQdmHw==} requiresBuild: true @@ -3396,7 +3433,7 @@ packages: '@types/yargs-parser': 20.2.1 dev: false - /@typescript-eslint/eslint-plugin/4.33.0_7x3d43mfb3fexgl22i224ddjy4: + /@typescript-eslint/eslint-plugin/4.33.0_mxo4duoyrmtssqwgtnlqtynn34: resolution: {integrity: sha512-aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg==} engines: {node: ^10.12.0 || >=12.0.0} peerDependencies: @@ -3407,8 +3444,8 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/experimental-utils': 4.33.0_dqcs7jp2455ottgzcolweyyngu - '@typescript-eslint/parser': 4.33.0_dqcs7jp2455ottgzcolweyyngu + '@typescript-eslint/experimental-utils': 4.33.0_2cx4cdmmwelthzpkksdgbikuti + '@typescript-eslint/parser': 4.33.0_2cx4cdmmwelthzpkksdgbikuti '@typescript-eslint/scope-manager': 4.33.0 debug: 4.3.4 eslint: 7.30.0 @@ -3416,13 +3453,13 @@ packages: ignore: 5.2.0 regexpp: 3.2.0 semver: 7.3.7 - tsutils: 3.21.0_typescript@4.7.4 - typescript: 4.7.4 + tsutils: 3.21.0_typescript@4.3.5 + typescript: 4.3.5 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/experimental-utils/4.33.0_dqcs7jp2455ottgzcolweyyngu: + /@typescript-eslint/experimental-utils/4.33.0_2cx4cdmmwelthzpkksdgbikuti: resolution: {integrity: sha512-zeQjOoES5JFjTnAhI5QY7ZviczMzDptls15GFsI6jyUOq0kOf9+WonkhtlIhh0RgHRnqj5gdNxW5j1EvAyYg6Q==} engines: {node: ^10.12.0 || >=12.0.0} peerDependencies: @@ -3431,7 +3468,7 @@ packages: '@types/json-schema': 7.0.11 '@typescript-eslint/scope-manager': 4.33.0 '@typescript-eslint/types': 4.33.0 - '@typescript-eslint/typescript-estree': 4.33.0_typescript@4.7.4 + '@typescript-eslint/typescript-estree': 4.33.0_typescript@4.3.5 eslint: 7.30.0 eslint-scope: 5.1.1 eslint-utils: 3.0.0_eslint@7.30.0 @@ -3440,7 +3477,7 @@ packages: - typescript dev: true - /@typescript-eslint/parser/4.33.0_dqcs7jp2455ottgzcolweyyngu: + /@typescript-eslint/parser/4.33.0_2cx4cdmmwelthzpkksdgbikuti: resolution: {integrity: sha512-ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA==} engines: {node: ^10.12.0 || >=12.0.0} peerDependencies: @@ -3452,10 +3489,10 @@ packages: dependencies: '@typescript-eslint/scope-manager': 4.33.0 '@typescript-eslint/types': 4.33.0 - '@typescript-eslint/typescript-estree': 4.33.0_typescript@4.7.4 + '@typescript-eslint/typescript-estree': 4.33.0_typescript@4.3.5 debug: 4.3.4 eslint: 7.30.0 - typescript: 4.7.4 + typescript: 4.3.5 transitivePeerDependencies: - supports-color dev: true @@ -3473,7 +3510,7 @@ packages: engines: {node: ^8.10.0 || ^10.13.0 || >=11.10.1} dev: true - /@typescript-eslint/typescript-estree/4.33.0_typescript@4.7.4: + /@typescript-eslint/typescript-estree/4.33.0_typescript@4.3.5: resolution: {integrity: sha512-rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA==} engines: {node: ^10.12.0 || >=12.0.0} peerDependencies: @@ -3488,8 +3525,8 @@ packages: globby: 11.0.4 is-glob: 4.0.3 semver: 7.3.7 - tsutils: 3.21.0_typescript@4.7.4 - typescript: 4.7.4 + tsutils: 3.21.0_typescript@4.3.5 + typescript: 4.3.5 transitivePeerDependencies: - supports-color dev: true @@ -3662,6 +3699,11 @@ packages: string-width: 2.1.1 dev: true + /ansi-align/3.0.1: + resolution: {integrity: sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==} + dependencies: + string-width: 4.2.3 + /ansi-colors/4.1.1: resolution: {integrity: sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==} engines: {node: '>=6'} @@ -4183,6 +4225,34 @@ packages: widest-line: 2.0.1 dev: true + /boxen/4.2.0: + resolution: {integrity: sha512-eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ==} + engines: {node: '>=8'} + dependencies: + ansi-align: 3.0.1 + camelcase: 5.3.1 + chalk: 3.0.0 + cli-boxes: 2.2.1 + string-width: 4.2.3 + term-size: 2.2.1 + type-fest: 0.8.1 + widest-line: 3.1.0 + dev: true + + /boxen/5.1.2: + resolution: {integrity: sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ==} + engines: {node: '>=10'} + dependencies: + ansi-align: 3.0.1 + camelcase: 6.2.1 + chalk: 4.1.2 + cli-boxes: 2.2.1 + string-width: 4.2.3 + type-fest: 0.20.2 + widest-line: 3.1.0 + wrap-ansi: 7.0.0 + dev: false + /brace-expansion/1.1.11: resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==} dependencies: @@ -4317,6 +4387,19 @@ packages: mkdirp2: 1.0.5 dev: true + /cacheable-request/6.1.0: + resolution: {integrity: sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==} + engines: {node: '>=8'} + dependencies: + clone-response: 1.0.2 + get-stream: 5.2.0 + http-cache-semantics: 4.1.0 + keyv: 3.1.0 + lowercase-keys: 2.0.0 + normalize-url: 4.5.1 + responselike: 1.0.2 + dev: false + /call-bind/1.0.2: resolution: {integrity: sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==} dependencies: @@ -4439,7 +4522,6 @@ packages: /ci-info/2.0.0: resolution: {integrity: sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==} - dev: true /ci-info/3.3.0: resolution: {integrity: sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw==} @@ -4467,6 +4549,10 @@ packages: engines: {node: '>=0.10.0'} dev: true + /cli-boxes/2.2.1: + resolution: {integrity: sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==} + engines: {node: '>=6'} + /cli-cursor/3.1.0: resolution: {integrity: sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==} engines: {node: '>=8'} @@ -4496,6 +4582,12 @@ packages: strip-ansi: 6.0.1 wrap-ansi: 7.0.0 + /clone-response/1.0.2: + resolution: {integrity: sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=} + dependencies: + mimic-response: 1.0.1 + dev: false + /clone/1.0.4: resolution: {integrity: sha1-2jCcwmPfFZlMaIypAheco8fNfH4=} engines: {node: '>=0.8'} @@ -4660,6 +4752,18 @@ packages: walk-back: 2.0.1 dev: true + /configstore/5.0.1: + resolution: {integrity: sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==} + engines: {node: '>=8'} + dependencies: + dot-prop: 5.3.0 + graceful-fs: 4.2.8 + make-dir: 3.1.0 + unique-string: 2.0.0 + write-file-atomic: 3.0.3 + xdg-basedir: 4.0.0 + dev: false + /conventional-changelog-angular/5.0.13: resolution: {integrity: sha512-i/gipMxs7s8L/QeuavPF2hLnJgH6pEZAttySB6aiQLWcX3puWDL3ACVmvBhJGxnAy52Qc15ua26BufY6KpmrVA==} engines: {node: '>=10'} @@ -4908,6 +5012,11 @@ packages: shebang-command: 2.0.0 which: 2.0.2 + /crypto-random-string/2.0.0: + resolution: {integrity: sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==} + engines: {node: '>=8'} + dev: false + /cssom/0.3.8: resolution: {integrity: sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==} @@ -5504,6 +5613,13 @@ packages: engines: {node: '>=0.10'} dev: true + /decompress-response/3.3.0: + resolution: {integrity: sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=} + engines: {node: '>=4'} + dependencies: + mimic-response: 1.0.1 + dev: false + /decompress-zip/0.3.3: resolution: {integrity: sha512-/fy1L4s+4jujqj3kNptWjilFw3E6De8U6XUFvqmh4npN3Vsypm3oT2V0bXcmbBWS+5j5tr4okYaFrOmyZkszEg==} engines: {node: '>=0.10.0'} @@ -5524,7 +5640,6 @@ packages: /deep-extend/0.6.0: resolution: {integrity: sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==} engines: {node: '>=4.0.0'} - dev: true /deep-is/0.1.4: resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==} @@ -5539,6 +5654,10 @@ packages: clone: 1.0.4 dev: true + /defer-to-connect/1.1.3: + resolution: {integrity: sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==} + dev: false + /define-properties/1.1.3: resolution: {integrity: sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==} engines: {node: '>= 0.4'} @@ -5604,7 +5723,7 @@ packages: resolve: 1.20.0 sass: 1.45.0 scss-parser: 1.0.5 - semver: 7.3.7 + semver: 7.3.5 yargs: 16.2.0 transitivePeerDependencies: - supports-color @@ -5718,7 +5837,6 @@ packages: engines: {node: '>=8'} dependencies: is-obj: 2.0.0 - dev: true /dotenv-expand/5.1.0: resolution: {integrity: sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==} @@ -5734,6 +5852,10 @@ packages: engines: {node: '>=10'} dev: false + /duplexer3/0.1.4: + resolution: {integrity: sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=} + dev: false + /ejs/3.1.7: resolution: {integrity: sha512-BIar7R6abbUxDA3bfXrO4DSgwo8I+fB5/1zgujl3HLLjwd6+9iOnrT+t3grn2qbk9vOgBubXOFwX2m9axoFaGw==} engines: {node: '>=0.10.0'} @@ -5819,6 +5941,11 @@ packages: resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==} engines: {node: '>=6'} + /escape-goat/2.1.1: + resolution: {integrity: sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==} + engines: {node: '>=8'} + dev: false + /escape-string-regexp/1.0.5: resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==} engines: {node: '>=0.8.0'} @@ -5853,7 +5980,7 @@ packages: eslint: 7.30.0 dev: true - /eslint-plugin-prettier/3.4.0_5c6vq4sryxf5ndtmt5znqfahau: + /eslint-plugin-prettier/3.4.0_aryphpgqdcqelwqr2c53q2gwyy: resolution: {integrity: sha512-UDK6rJT6INSfcOo545jiaOwB701uAIt2/dR7WnFQoGCVl1/EMqdANBmwUaqqQ45aXprsTGzSa39LI1PyuRBxxw==} engines: {node: '>=6.0.0'} peerDependencies: @@ -5866,7 +5993,7 @@ packages: dependencies: eslint: 7.30.0 eslint-config-prettier: 8.3.0_eslint@7.30.0 - prettier: 2.7.1 + prettier: 2.3.2 prettier-linter-helpers: 1.0.0 dev: true @@ -6439,7 +6566,13 @@ packages: engines: {node: '>=6'} dependencies: pump: 3.0.0 - dev: true + + /get-stream/5.2.0: + resolution: {integrity: sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==} + engines: {node: '>=8'} + dependencies: + pump: 3.0.0 + dev: false /get-stream/6.0.1: resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==} @@ -6501,16 +6634,12 @@ packages: once: 1.4.0 path-is-absolute: 1.0.1 - /glob/7.2.3: - resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==} + /global-dirs/3.0.0: + resolution: {integrity: sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA==} + engines: {node: '>=10'} dependencies: - fs.realpath: 1.0.0 - inflight: 1.0.6 - inherits: 2.0.4 - minimatch: 3.1.2 - once: 1.4.0 - path-is-absolute: 1.0.1 - dev: true + ini: 2.0.0 + dev: false /globals/11.12.0: resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==} @@ -6535,6 +6664,25 @@ packages: slash: 3.0.0 dev: true + /got/9.6.0: + resolution: {integrity: sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==} + engines: {node: '>=8.6'} + dependencies: + '@sindresorhus/is': 0.14.0 + '@szmarczak/http-timer': 1.1.2 + '@types/keyv': 3.1.4 + '@types/responselike': 1.0.0 + cacheable-request: 6.1.0 + decompress-response: 3.3.0 + duplexer3: 0.1.4 + get-stream: 4.1.0 + lowercase-keys: 1.0.1 + mimic-response: 1.0.1 + p-cancelable: 1.1.0 + to-readable-stream: 1.0.0 + url-parse-lax: 3.0.0 + dev: false + /graceful-fs/4.2.10: resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==} @@ -6565,7 +6713,7 @@ packages: source-map: 0.6.1 wordwrap: 1.0.0 optionalDependencies: - uglify-js: 3.17.0 + uglify-js: 3.15.4 dev: true /hard-rejection/2.1.0: @@ -6617,6 +6765,11 @@ packages: kind-of: 4.0.0 dev: true + /has-yarn/2.1.0: + resolution: {integrity: sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==} + engines: {node: '>=8'} + dev: false + /has/1.0.3: resolution: {integrity: sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==} engines: {node: '>= 0.4.0'} @@ -6647,6 +6800,10 @@ packages: /html-escaper/2.0.2: resolution: {integrity: sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==} + /http-cache-semantics/4.1.0: + resolution: {integrity: sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==} + dev: false + /http-proxy-agent/4.0.1: resolution: {integrity: sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==} engines: {node: '>= 6'} @@ -6764,6 +6921,11 @@ packages: parent-module: 1.0.1 resolve-from: 4.0.0 + /import-lazy/2.1.0: + resolution: {integrity: sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=} + engines: {node: '>=4'} + dev: false + /import-local/3.0.3: resolution: {integrity: sha512-bE9iaUY3CXH8Cwfan/abDKAxe1KGT9kyGsBPqf6DMK/z0a2OzAsrukeYNgIH6cH5Xr452jb1TUL8rSfCLjZ9uA==} engines: {node: '>=8'} @@ -6783,7 +6945,7 @@ packages: dev: true /imurmurhash/0.1.4: - resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==} + resolution: {integrity: sha1-khi5srkoojixPcT7a21XbyMUU+o=} engines: {node: '>=0.8.19'} /indent-string/4.0.0: @@ -6806,7 +6968,11 @@ packages: /ini/1.3.8: resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==} - dev: true + + /ini/2.0.0: + resolution: {integrity: sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==} + engines: {node: '>=10'} + dev: false /internmap/2.0.3: resolution: {integrity: sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==} @@ -6852,7 +7018,6 @@ packages: hasBin: true dependencies: ci-info: 2.0.0 - dev: true /is-ci/3.0.1: resolution: {integrity: sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==} @@ -6944,6 +7109,19 @@ packages: dependencies: is-extglob: 2.1.1 + /is-installed-globally/0.4.0: + resolution: {integrity: sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==} + engines: {node: '>=10'} + dependencies: + global-dirs: 3.0.0 + is-path-inside: 3.0.3 + dev: false + + /is-npm/5.0.0: + resolution: {integrity: sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA==} + engines: {node: '>=10'} + dev: false + /is-number/3.0.0: resolution: {integrity: sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=} engines: {node: '>=0.10.0'} @@ -6963,7 +7141,11 @@ packages: /is-obj/2.0.0: resolution: {integrity: sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==} engines: {node: '>=8'} - dev: true + + /is-path-inside/3.0.3: + resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==} + engines: {node: '>=8'} + dev: false /is-plain-obj/1.1.0: resolution: {integrity: sha1-caUMhCnfync8kqOQpKA7OfzVHT4=} @@ -7009,7 +7191,7 @@ packages: dev: true /is-typedarray/1.0.0: - resolution: {integrity: sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==} + resolution: {integrity: sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=} /is-unicode-supported/0.1.0: resolution: {integrity: sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==} @@ -7028,6 +7210,10 @@ packages: is-docker: 2.2.1 dev: true + /is-yarn-global/0.3.0: + resolution: {integrity: sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==} + dev: false + /isarray/0.0.1: resolution: {integrity: sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=} dev: false @@ -7899,7 +8085,7 @@ packages: cjs-module-lexer: 1.2.2 collect-v8-coverage: 1.0.1 execa: 5.1.1 - glob: 7.2.3 + glob: 7.2.0 graceful-fs: 4.2.10 jest-haste-map: 27.5.1 jest-message-util: 27.5.1 @@ -8271,6 +8457,10 @@ packages: engines: {node: '>=4'} hasBin: true + /json-buffer/3.0.0: + resolution: {integrity: sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=} + dev: false + /json-parse-better-errors/1.0.2: resolution: {integrity: sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==} dev: true @@ -8334,6 +8524,12 @@ packages: engines: {'0': node >= 0.2.0} dev: true + /keyv/3.1.0: + resolution: {integrity: sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==} + dependencies: + json-buffer: 3.0.0 + dev: false + /khroma/1.4.1: resolution: {integrity: sha512-+GmxKvmiRuCcUYDgR7g5Ngo0JEDeOsGdNONdU2zsiBQaK4z19Y2NvXqfEDE0ZiIrg45GTZyAnPLVsLZZACYm3Q==} dev: true @@ -8377,6 +8573,13 @@ packages: resolution: {integrity: sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==} engines: {node: '>=6'} + /latest-version/5.1.0: + resolution: {integrity: sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==} + engines: {node: '>=8'} + dependencies: + package-json: 6.5.0 + dev: false + /lazy-val/1.0.5: resolution: {integrity: sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q==} dev: false @@ -8605,6 +8808,16 @@ packages: js-tokens: 4.0.0 dev: false + /lowercase-keys/1.0.1: + resolution: {integrity: sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==} + engines: {node: '>=0.10.0'} + dev: false + + /lowercase-keys/2.0.0: + resolution: {integrity: sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==} + engines: {node: '>=8'} + dev: false + /lru-cache/4.1.5: resolution: {integrity: sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==} dependencies: @@ -8950,6 +9163,11 @@ packages: resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==} engines: {node: '>=6'} + /mimic-response/1.0.1: + resolution: {integrity: sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==} + engines: {node: '>=4'} + dev: false + /min-indent/1.0.1: resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==} engines: {node: '>=4'} @@ -8984,7 +9202,6 @@ packages: /minimist/1.2.5: resolution: {integrity: sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==} - dev: true /minimist/1.2.6: resolution: {integrity: sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==} @@ -9169,6 +9386,11 @@ packages: resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==} engines: {node: '>=0.10.0'} + /normalize-url/4.5.1: + resolution: {integrity: sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==} + engines: {node: '>=8'} + dev: false + /npm-run-path/2.0.2: resolution: {integrity: sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=} engines: {node: '>=4'} @@ -9233,7 +9455,7 @@ packages: dev: true /once/1.4.0: - resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==} + resolution: {integrity: sha1-WDsap3WWHUsROsF9nFC6753Xa9E=} dependencies: wrappy: 1.0.2 @@ -9283,6 +9505,11 @@ packages: resolution: {integrity: sha512-/jHxFIzoMXdqPzTaCpFzAAWhpkSjZPF4Vsn6jAfNpmbH/ymsmd7Qc6VE9BGn0L6YMj6uwpQLxCECpus4ukKS9Q==} dev: true + /p-cancelable/1.1.0: + resolution: {integrity: sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==} + engines: {node: '>=6'} + dev: false + /p-filter/2.1.0: resolution: {integrity: sha512-ZBxxZ5sL2HghephhpGAQdoskxplTwr7ICaehZwLIlfL6acuVgZPm8yBNuRAFBGEqtD/hmUeq9eqLg2ys9Xr/yw==} engines: {node: '>=8'} @@ -9356,6 +9583,16 @@ packages: resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==} engines: {node: '>=6'} + /package-json/6.5.0: + resolution: {integrity: sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==} + engines: {node: '>=8'} + dependencies: + got: 9.6.0 + registry-auth-token: 4.2.1 + registry-url: 5.1.0 + semver: 6.3.0 + dev: false + /parent-module/1.0.1: resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==} engines: {node: '>=6'} @@ -9397,7 +9634,7 @@ packages: engines: {node: '>=8'} /path-is-absolute/1.0.1: - resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==} + resolution: {integrity: sha1-F0uSaHNVNP+8es5r9TpanhtcX18=} engines: {node: '>=0.10.0'} /path-key/2.0.1: @@ -9525,6 +9762,11 @@ packages: engines: {node: '>= 0.8.0'} dev: true + /prepend-http/2.0.0: + resolution: {integrity: sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=} + engines: {node: '>=4'} + dev: false + /prettier-linter-helpers/1.0.0: resolution: {integrity: sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==} engines: {node: '>=6.0.0'} @@ -9538,8 +9780,8 @@ packages: hasBin: true dev: true - /prettier/2.7.1: - resolution: {integrity: sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==} + /prettier/2.3.2: + resolution: {integrity: sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ==} engines: {node: '>=10.13.0'} hasBin: true dev: true @@ -9615,12 +9857,18 @@ packages: dependencies: end-of-stream: 1.4.4 once: 1.4.0 - dev: true /punycode/2.1.1: resolution: {integrity: sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==} engines: {node: '>=6'} + /pupa/2.1.1: + resolution: {integrity: sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==} + engines: {node: '>=8'} + dependencies: + escape-goat: 2.1.1 + dev: false + /puppeteer/2.1.1: resolution: {integrity: sha512-LWzaDVQkk1EPiuYeTOj+CZRIjda4k2s5w4MK4xoH2+kgWV/SDlkYHmxatDdtYrciHUKSXTsGgPgPP8ILVdBsxg==} engines: {node: '>=8.16.0'} @@ -9663,6 +9911,16 @@ packages: engines: {node: '>=8'} dev: true + /rc/1.2.8: + resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==} + hasBin: true + dependencies: + deep-extend: 0.6.0 + ini: 1.3.8 + minimist: 1.2.5 + strip-json-comments: 2.0.1 + dev: false + /react-is/17.0.2: resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==} @@ -9847,6 +10105,20 @@ packages: unicode-match-property-value-ecmascript: 2.0.0 dev: true + /registry-auth-token/4.2.1: + resolution: {integrity: sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw==} + engines: {node: '>=6.0.0'} + dependencies: + rc: 1.2.8 + dev: false + + /registry-url/5.1.0: + resolution: {integrity: sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==} + engines: {node: '>=8'} + dependencies: + rc: 1.2.8 + dev: false + /regjsgen/0.5.2: resolution: {integrity: sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==} dev: true @@ -9883,7 +10155,7 @@ packages: dev: true /require-directory/2.1.1: - resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==} + resolution: {integrity: sha1-jGStX9MNqxyXbiNE/+f3kqam30I=} engines: {node: '>=0.10.0'} /require-from-string/2.0.2: @@ -9943,6 +10215,12 @@ packages: supports-preserve-symlinks-flag: 1.0.0 dev: true + /responselike/1.0.2: + resolution: {integrity: sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=} + dependencies: + lowercase-keys: 1.0.1 + dev: false + /restore-cursor/3.1.0: resolution: {integrity: sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==} engines: {node: '>=8'} @@ -9969,7 +10247,7 @@ packages: resolution: {integrity: sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==} hasBin: true dependencies: - glob: 7.2.3 + glob: 7.2.0 dev: true /rimraf/3.0.2: @@ -10001,14 +10279,6 @@ packages: resolution: {integrity: sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==} dependencies: tslib: 2.4.0 - dev: true - - /rxjs/7.5.6: - resolution: {integrity: sha512-dnyv2/YsXhnm461G+R/Pe5bWP41Nm6LBXEYWI6eiFP4fiwx6WRI/CD0zbdVAudd9xwLEF2IDcKXLHit0FYjUzw==} - dependencies: - tslib: 2.4.0 - dev: false - optional: true /safe-buffer/5.1.2: resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==} @@ -10081,6 +10351,13 @@ packages: /semver-compare/1.0.0: resolution: {integrity: sha1-De4hahyUGrN+nvsXiPavxf9VN/w=} + /semver-diff/3.1.1: + resolution: {integrity: sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==} + engines: {node: '>=8'} + dependencies: + semver: 6.3.0 + dev: false + /semver/5.7.1: resolution: {integrity: sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==} hasBin: true @@ -10093,6 +10370,15 @@ packages: /semver/7.0.0: resolution: {integrity: sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==} hasBin: true + dev: true + + /semver/7.3.5: + resolution: {integrity: sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==} + engines: {node: '>=10'} + hasBin: true + dependencies: + lru-cache: 6.0.0 + dev: false /semver/7.3.7: resolution: {integrity: sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==} @@ -10137,8 +10423,8 @@ packages: resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==} engines: {node: '>=8'} - /shlex/2.1.2: - resolution: {integrity: sha512-Nz6gtibMVgYeMEhUjp2KuwAgqaJA1K155dU/HuDaEJUGgnmYfVtVZah+uerVWdH8UGnyahhDCgABbYTbs254+w==} + /shlex/2.1.0: + resolution: {integrity: sha512-Tk8PjohJbWpGu2NtAlsEi/9AS4GU2zW2ZWLFrWRDskZpSJmyBIU3nTkBtocxD90r3w4BwRevsNtIqIP9HMuYiQ==} dev: true /signal-exit/3.0.6: @@ -10148,13 +10434,6 @@ packages: /signal-exit/3.0.7: resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==} - /simple-update-notifier/1.0.7: - resolution: {integrity: sha512-BBKgR84BJQJm6WjWFMHgLVuo61FBDSj1z/xSFUIozqO6wO7ii0JxCqlIud7Enr/+LhlbNI0whErq96P2qHNWew==} - engines: {node: '>=8.10.0'} - dependencies: - semver: 7.0.0 - dev: false - /sisteransi/1.0.5: resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==} @@ -10468,6 +10747,11 @@ packages: min-indent: 1.0.1 dev: true + /strip-json-comments/2.0.1: + resolution: {integrity: sha1-PFMZQukIwml8DsNEhYwobHygpgo=} + engines: {node: '>=0.10.0'} + dev: false + /strip-json-comments/3.1.1: resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==} engines: {node: '>=8'} @@ -10696,6 +10980,11 @@ packages: kind-of: 3.2.2 dev: true + /to-readable-stream/1.0.0: + resolution: {integrity: sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==} + engines: {node: '>=6'} + dev: false + /to-regex-range/2.1.1: resolution: {integrity: sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=} engines: {node: '>=0.10.0'} @@ -10760,7 +11049,7 @@ packages: utf8-byte-length: 1.0.4 dev: false - /ts-jsdoc/3.2.2_typescript@4.7.4: + /ts-jsdoc/3.2.2_typescript@4.3.5: resolution: {integrity: sha512-+Bj4ROKDrk3pOdel5u+gz8pqyuPak9D/dgNFfrpEGTZarRnxPGYB3DXkpu4qkFCfPjqBBiZEj6hf3wmfvJqbgA==} engines: {node: '>=12.0.0'} hasBin: true @@ -10772,7 +11061,7 @@ packages: doctrine: 3.0.0 fs-extra: 10.0.0 source-map-support: 0.5.21 - typescript: 4.7.4 + typescript: 4.3.5 dev: true /ts-node/10.7.0_h6qgkuijqq7bkkewultswwpwpa: @@ -10813,14 +11102,14 @@ packages: /tslib/2.4.0: resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==} - /tsutils/3.21.0_typescript@4.7.4: + /tsutils/3.21.0_typescript@4.3.5: resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==} engines: {node: '>= 6'} peerDependencies: 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' dependencies: tslib: 1.14.1 - typescript: 4.7.4 + typescript: 4.3.5 dev: true /tty-table/2.8.13: @@ -10866,7 +11155,6 @@ packages: /type-fest/0.20.2: resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==} engines: {node: '>=10'} - dev: true /type-fest/0.21.3: resolution: {integrity: sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==} @@ -10885,7 +11173,7 @@ packages: /typed-emitter/2.1.0: resolution: {integrity: sha512-g/KzbYKbH5C2vPkaXGu8DJlHrGKHLsM25Zg9WuC9pMGfuvT+X25tZQWo5fK1BjBm8+UrVE9LDCvaY0CQk+fXDA==} optionalDependencies: - rxjs: 7.5.6 + rxjs: 7.5.5 dev: false /typedarray-to-buffer/3.1.5: @@ -10919,8 +11207,8 @@ packages: hasBin: true dev: true - /typescript/4.7.4: - resolution: {integrity: sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==} + /typescript/4.3.5: + resolution: {integrity: sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==} engines: {node: '>=4.2.0'} hasBin: true dev: true @@ -10943,8 +11231,8 @@ packages: resolution: {integrity: sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==} dev: true - /uglify-js/3.17.0: - resolution: {integrity: sha512-aTeNPVmgIMPpm1cxXr2Q/nEbvkmV8yq66F3om7X3P/cvOXQ0TMQ64Wk63iyT1gPlmdmGzjGpyLh1f3y8MZWXGg==} + /uglify-js/3.15.4: + resolution: {integrity: sha512-vMOPGDuvXecPs34V74qDKk4iJ/SN4vL3Ow/23ixafENYvtrNvtbcgUeugTcUGRGsOF/5fU8/NYSL5Hyb3l1OJA==} engines: {node: '>=0.8.0'} hasBin: true requiresBuild: true @@ -10988,6 +11276,13 @@ packages: set-value: 2.0.1 dev: true + /unique-string/2.0.0: + resolution: {integrity: sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==} + engines: {node: '>=8'} + dependencies: + crypto-random-string: 2.0.0 + dev: false + /universalify/0.1.2: resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==} engines: {node: '>= 4.0.0'} @@ -11004,6 +11299,26 @@ packages: isobject: 3.0.1 dev: true + /update-notifier/5.1.0: + resolution: {integrity: sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw==} + engines: {node: '>=10'} + dependencies: + boxen: 5.1.2 + chalk: 4.1.2 + configstore: 5.0.1 + has-yarn: 2.1.0 + import-lazy: 2.1.0 + is-ci: 2.0.0 + is-installed-globally: 0.4.0 + is-npm: 5.0.0 + is-yarn-global: 0.3.0 + latest-version: 5.1.0 + pupa: 2.1.1 + semver: 7.3.5 + semver-diff: 3.1.1 + xdg-basedir: 4.0.0 + dev: false + /uri-js/4.4.1: resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==} dependencies: @@ -11014,6 +11329,13 @@ packages: deprecated: Please see https://github.com/lydell/urix#deprecated dev: true + /url-parse-lax/3.0.0: + resolution: {integrity: sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=} + engines: {node: '>=4'} + dependencies: + prepend-http: 2.0.0 + dev: false + /use/3.1.1: resolution: {integrity: sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==} engines: {node: '>=0.10.0'} @@ -11186,6 +11508,12 @@ packages: string-width: 2.1.1 dev: true + /widest-line/3.1.0: + resolution: {integrity: sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==} + engines: {node: '>=8'} + dependencies: + string-width: 4.2.3 + /word-wrap/1.2.3: resolution: {integrity: sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==} engines: {node: '>=0.10.0'} @@ -11220,7 +11548,7 @@ packages: strip-ansi: 6.0.1 /wrappy/1.0.2: - resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==} + resolution: {integrity: sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=} /write-file-atomic/3.0.3: resolution: {integrity: sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==} @@ -11256,6 +11584,11 @@ packages: utf-8-validate: optional: true + /xdg-basedir/4.0.0: + resolution: {integrity: sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==} + engines: {node: '>=8'} + dev: false + /xml-name-validator/3.0.0: resolution: {integrity: sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==} @@ -11318,16 +11651,16 @@ packages: resolution: {integrity: sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==} engines: {node: '>=10'} + /yargs-parser/21.0.0: + resolution: {integrity: sha512-z9kApYUOCwoeZ78rfRYYWdiU/iNL6mwwYlkkZfJoyMR1xps+NEBX5X7XmRpxkZHhXJ6+Ey00IwKxBBSW9FIjyA==} + engines: {node: '>=12'} + dev: false + /yargs-parser/21.0.1: resolution: {integrity: sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==} engines: {node: '>=12'} dev: true - /yargs-parser/21.1.1: - resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==} - engines: {node: '>=12'} - dev: false - /yargs/15.4.1: resolution: {integrity: sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==} engines: {node: '>=8'} @@ -11357,8 +11690,8 @@ packages: y18n: 5.0.8 yargs-parser: 20.2.9 - /yargs/17.4.1: - resolution: {integrity: sha512-WSZD9jgobAg3ZKuCQZSa3g9QOJeCCqLoLAykiWgmXnDo9EPnn4RPf5qVTtzgOx66o6/oqhcA5tHtJXpG8pMt3g==} + /yargs/17.3.0: + resolution: {integrity: sha512-GQl1pWyDoGptFPJx9b9L6kmR33TGusZvXIZUT+BOz9f7X2L94oeAskFYLEg/FkhV06zZPBYLvLZRWeYId29lew==} engines: {node: '>=12'} dependencies: cliui: 7.0.4 @@ -11367,11 +11700,11 @@ packages: require-directory: 2.1.1 string-width: 4.2.3 y18n: 5.0.8 - yargs-parser: 21.0.1 - dev: true + yargs-parser: 21.0.0 + dev: false - /yargs/17.5.1: - resolution: {integrity: sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==} + /yargs/17.4.1: + resolution: {integrity: sha512-WSZD9jgobAg3ZKuCQZSa3g9QOJeCCqLoLAykiWgmXnDo9EPnn4RPf5qVTtzgOx66o6/oqhcA5tHtJXpG8pMt3g==} engines: {node: '>=12'} dependencies: cliui: 7.0.4 @@ -11380,8 +11713,8 @@ packages: require-directory: 2.1.1 string-width: 4.2.3 y18n: 5.0.8 - yargs-parser: 21.1.1 - dev: false + yargs-parser: 21.0.1 + dev: true /yauzl/2.10.0: resolution: {integrity: sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=} @@ -11430,7 +11763,7 @@ packages: open: 7.4.2 rimraf: 2.7.1 semver: 5.7.1 - shlex: 2.1.2 + shlex: 2.1.0 slash: 2.0.0 tmp: 0.0.33 dev: true diff --git a/test/fixtures/test-app-one/index.js b/test/fixtures/test-app-one/index.js index 37e325e0e7..63280cc370 100644 --- a/test/fixtures/test-app-one/index.js +++ b/test/fixtures/test-app-one/index.js @@ -21,7 +21,7 @@ function handleSquirrelEvent() { try { spawnedProcess = ChildProcess.spawn(command, args, {detached: true}); - } catch (error: any) {} + } catch (error) {} return spawnedProcess; }; @@ -132,7 +132,7 @@ function main() { // electron doesn't escape / in the product name fs.writeFileSync(path.join(app.getPath("appData"), "Test App ßW", "testFile"), "test") } - catch (e: any) { + catch (e) { mainWindow.webContents.executeJavaScript(`console.log(\`userData: ${e}\`)`) } }) diff --git a/test/fixtures/test-app-yarn-several-workspace/packages/test-app/index.js b/test/fixtures/test-app-yarn-several-workspace/packages/test-app/index.js index 975583fde0..c7e706aa9d 100644 --- a/test/fixtures/test-app-yarn-several-workspace/packages/test-app/index.js +++ b/test/fixtures/test-app-yarn-several-workspace/packages/test-app/index.js @@ -71,7 +71,7 @@ ipcMain.on("saveAppData", () => { // electron doesn't escape / in the product name fs.writeFileSync(path.join(app.getPath("appData"), "Test App ßW", "testFile"), "test") } - catch (e: any) { + catch (e) { mainWindow.webContents.executeJavaScript(`console.log(\`userData: ${e}\`)`) } }) \ No newline at end of file diff --git a/test/fixtures/test-app-yarn-workspace-version-conflict/packages/test-app/index.js b/test/fixtures/test-app-yarn-workspace-version-conflict/packages/test-app/index.js index 975583fde0..c7e706aa9d 100644 --- a/test/fixtures/test-app-yarn-workspace-version-conflict/packages/test-app/index.js +++ b/test/fixtures/test-app-yarn-workspace-version-conflict/packages/test-app/index.js @@ -71,7 +71,7 @@ ipcMain.on("saveAppData", () => { // electron doesn't escape / in the product name fs.writeFileSync(path.join(app.getPath("appData"), "Test App ßW", "testFile"), "test") } - catch (e: any) { + catch (e) { mainWindow.webContents.executeJavaScript(`console.log(\`userData: ${e}\`)`) } }) \ No newline at end of file diff --git a/test/fixtures/test-app-yarn-workspace/packages/test-app/index.js b/test/fixtures/test-app-yarn-workspace/packages/test-app/index.js index 975583fde0..c7e706aa9d 100644 --- a/test/fixtures/test-app-yarn-workspace/packages/test-app/index.js +++ b/test/fixtures/test-app-yarn-workspace/packages/test-app/index.js @@ -71,7 +71,7 @@ ipcMain.on("saveAppData", () => { // electron doesn't escape / in the product name fs.writeFileSync(path.join(app.getPath("appData"), "Test App ßW", "testFile"), "test") } - catch (e: any) { + catch (e) { mainWindow.webContents.executeJavaScript(`console.log(\`userData: ${e}\`)`) } }) \ No newline at end of file diff --git a/test/package.json b/test/package.json index 4b8115cb6b..2e33a57688 100644 --- a/test/package.json +++ b/test/package.json @@ -23,10 +23,10 @@ "jest-junit": "^12.0.0", "js-yaml": "^4.1.0", "path-sort": "^0.1.0", - "semver": "^7.3.7", + "semver": "^7.3.5", "stat-mode": "^1.0.0", "temp-file": "^3.4.0", - "yargs": "^17.5.1" + "yargs": "^17.0.1" }, "devDependencies": { "@types/fs-extra": "^9.0.11", diff --git a/test/src/ArtifactPublisherTest.ts b/test/src/ArtifactPublisherTest.ts index 503e870783..1b73316032 100644 --- a/test/src/ArtifactPublisherTest.ts +++ b/test/src/ArtifactPublisherTest.ts @@ -42,7 +42,7 @@ const publishContext: PublishContext = { test("GitHub unauthorized", async () => { try { await new GitHubPublisher(publishContext, { provider: "github", owner: "actperepo", repo: "ecb2", token: "incorrect token" }, versionNumber())._release.value - } catch (e: any) { + } catch (e) { expect(e.message).toMatch(/(Bad credentials|Unauthorized|API rate limit exceeded)/) return } @@ -63,7 +63,7 @@ function testAndIgnoreApiRate(name: string, testFunction: () => Promise) { test.skip(name, async () => { try { await testFunction() - } catch (e: any) { + } catch (e) { if (isApiRateError(e)) { console.warn(e.description.message) } else { diff --git a/test/src/helpers/downloadElectron.ts b/test/src/helpers/downloadElectron.ts index 3c601b27dc..d12f88c9a6 100644 --- a/test/src/helpers/downloadElectron.ts +++ b/test/src/helpers/downloadElectron.ts @@ -15,7 +15,7 @@ export async function deleteOldElectronVersion(): Promise { let files: Array try { files = await fs.readdir(cacheDir) - } catch (e: any) { + } catch (e) { if (e.code === "ENOENT") { return } else { diff --git a/test/src/helpers/fileAssert.ts b/test/src/helpers/fileAssert.ts index 6348297b69..d62e8c1635 100644 --- a/test/src/helpers/fileAssert.ts +++ b/test/src/helpers/fileAssert.ts @@ -61,7 +61,7 @@ class Assertions { let result: any try { result = await this.actual - } catch (e: any) { + } catch (e) { actualError = e } diff --git a/test/src/mac/macIconTest.ts b/test/src/mac/macIconTest.ts index 231633d067..b3971ff7a6 100644 --- a/test/src/mac/macIconTest.ts +++ b/test/src/mac/macIconTest.ts @@ -135,7 +135,7 @@ test.ifMac.ifAll("png icon small", () => { packed: async () => { try { await platformPackager!!.getIconPath() - } catch (e: any) { + } catch (e) { if (!e.message.includes("must be at least 512x512")) { throw e } diff --git a/test/src/updater/differentialUpdateTest.ts b/test/src/updater/differentialUpdateTest.ts index 073ccd895c..f5d17db77b 100644 --- a/test/src/updater/differentialUpdateTest.ts +++ b/test/src/updater/differentialUpdateTest.ts @@ -70,7 +70,7 @@ test.ifAll.ifDevOrWinCi("web installer", async () => { outDirs[0] = oldDir await buildApp("1.0.1", tmpDir) - } catch (e: any) { + } catch (e) { await tmpDir.cleanup() throw e } @@ -131,7 +131,7 @@ test.ifAll.ifDevOrWinCi("nsis", async () => { outDirs[0] = oldDir await buildApp("1.0.1") - } catch (e: any) { + } catch (e) { await tmpDir.cleanup() throw e } @@ -225,7 +225,7 @@ async function doBuild(outDirs: Array, targets: Map Date: Fri, 19 Aug 2022 09:28:51 -0700 Subject: [PATCH 3/6] only replace update-notifier --- packages/electron-builder/package.json | 7 +- packages/electron-builder/src/cli/cli.ts | 4 +- pnpm-lock.yaml | 400 ++--------------------- 3 files changed, 39 insertions(+), 372 deletions(-) diff --git a/packages/electron-builder/package.json b/packages/electron-builder/package.json index f9d3fdc80b..9e8916a547 100644 --- a/packages/electron-builder/package.json +++ b/packages/electron-builder/package.json @@ -60,13 +60,12 @@ "is-ci": "^3.0.0", "lazy-val": "^1.0.5", "read-config-file": "6.2.0", - "update-notifier": "^5.1.0", - "yargs": "^17.0.1" + "simple-update-notifier": "^1.0.7", + "yargs": "^17.5.1" }, "devDependencies": { "@types/fs-extra": "9.0.13", - "@types/is-ci": "3.0.0", - "@types/update-notifier": "5.1.0" + "@types/is-ci": "3.0.0" }, "typings": "./out/index.d.ts", "publishConfig": { diff --git a/packages/electron-builder/src/cli/cli.ts b/packages/electron-builder/src/cli/cli.ts index 3af3a8f48e..3e2f578bfd 100644 --- a/packages/electron-builder/src/cli/cli.ts +++ b/packages/electron-builder/src/cli/cli.ts @@ -3,11 +3,11 @@ import { InvalidConfigurationError, log } from "builder-util" import * as chalk from "chalk" import { getElectronVersion } from "app-builder-lib/out/electron/electronVersion" -import { pathExists, readJson } from "fs-extra" +import { readJson } from "fs-extra" import * as isCi from "is-ci" import * as path from "path" import { loadEnv } from "read-config-file" -import * as updateNotifier from "update-notifier" +import UpdateNotifier from "simple-update-notifier" import { ExecError } from "builder-util/out/util" import { build, configureBuildCommand, createYargs } from "../builder" import { createSelfSignedCert } from "./create-self-signed-cert" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a92d099224..18011b56a2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -270,7 +270,6 @@ importers: specifiers: '@types/fs-extra': 9.0.13 '@types/is-ci': 3.0.0 - '@types/update-notifier': 5.1.0 '@types/yargs': ^17.0.1 app-builder-lib: workspace:* builder-util: workspace:* @@ -281,8 +280,8 @@ importers: is-ci: ^3.0.0 lazy-val: ^1.0.5 read-config-file: 6.2.0 - update-notifier: ^5.1.0 - yargs: ^17.0.1 + simple-update-notifier: ^1.0.7 + yargs: ^17.5.1 dependencies: '@types/yargs': 17.0.7 app-builder-lib: link:../app-builder-lib @@ -294,12 +293,11 @@ importers: is-ci: 3.0.1 lazy-val: 1.0.5 read-config-file: 6.2.0 - update-notifier: 5.1.0 - yargs: 17.3.0 + simple-update-notifier: 1.0.7 + yargs: 17.5.1 devDependencies: '@types/fs-extra': 9.0.13 '@types/is-ci': 3.0.0 - '@types/update-notifier': 5.1.0 packages/electron-builder-squirrel-windows: specifiers: @@ -3073,11 +3071,6 @@ packages: fastq: 1.13.0 dev: true - /@sindresorhus/is/0.14.0: - resolution: {integrity: sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==} - engines: {node: '>=6'} - dev: false - /@sinonjs/commons/1.8.3: resolution: {integrity: sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==} dependencies: @@ -3088,13 +3081,6 @@ packages: dependencies: '@sinonjs/commons': 1.8.3 - /@szmarczak/http-timer/1.1.2: - resolution: {integrity: sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==} - engines: {node: '>=6'} - dependencies: - defer-to-connect: 1.1.3 - dev: false - /@tootallnate/once/1.1.2: resolution: {integrity: sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==} engines: {node: '>= 6'} @@ -3173,10 +3159,6 @@ packages: '@babel/types': 7.17.0 dev: true - /@types/configstore/5.0.1: - resolution: {integrity: sha512-c/QCznvk7bLKGhHETj29rqKufui3jaAxjBhK4R2zUrMG5UG0qTwfWYxBoUbH8JCyDjdCWMIxPJ7/Fdz1UcAnWg==} - dev: true - /@types/cross-spawn/6.0.2: resolution: {integrity: sha512-KuwNhp3eza+Rhu8IFI5HUXRP0LIhqH5cAjubUvGXXthh4YYBuP2ntwEX+Cz8GJoZUHlKo247wPWOfA9LYEq4cw==} dependencies: @@ -3258,12 +3240,6 @@ packages: resolution: {integrity: sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==} dev: true - /@types/keyv/3.1.4: - resolution: {integrity: sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==} - dependencies: - '@types/node': 17.0.25 - dev: false - /@types/linkify-it/3.0.2: resolution: {integrity: sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==} dev: true @@ -3359,12 +3335,6 @@ packages: resolution: {integrity: sha512-G/AdOadiZhnJp0jXCaBQU449W2h716OW/EoXeYkCytxKL06X1WCXB4DZpp8TpZ8eyIJVS1cw4lrlkkSYU21cDw==} dev: true - /@types/responselike/1.0.0: - resolution: {integrity: sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==} - dependencies: - '@types/node': 17.0.25 - dev: false - /@types/sax/1.2.3: resolution: {integrity: sha512-+QSw6Tqvs/KQpZX8DvIl3hZSjNFLW/OqE5nlyHXtTwODaJvioN2rOWpBNEWZp2HZUFhOh+VohmJku/WxEXU2XA==} dependencies: @@ -3398,13 +3368,6 @@ packages: '@types/node': 16.11.12 dev: true - /@types/update-notifier/5.1.0: - resolution: {integrity: sha512-aGY5pH1Q/DcToKXl4MCj1c0uDUB+zSVFDRCI7Q7js5sguzBTqJV/5kJA2awofbtWYF3xnon1TYdZYnFditRPtQ==} - dependencies: - '@types/configstore': 5.0.1 - boxen: 4.2.0 - dev: true - /@types/verror/1.10.5: resolution: {integrity: sha512-9UjMCHK5GPgQRoNbqdLIAvAy0EInuiqbW0PBMtVP6B5B2HQJlvoJHM+KodPZMEjOa5VkSc+5LH7xy+cUzQdmHw==} requiresBuild: true @@ -3699,11 +3662,6 @@ packages: string-width: 2.1.1 dev: true - /ansi-align/3.0.1: - resolution: {integrity: sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==} - dependencies: - string-width: 4.2.3 - /ansi-colors/4.1.1: resolution: {integrity: sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==} engines: {node: '>=6'} @@ -4225,34 +4183,6 @@ packages: widest-line: 2.0.1 dev: true - /boxen/4.2.0: - resolution: {integrity: sha512-eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ==} - engines: {node: '>=8'} - dependencies: - ansi-align: 3.0.1 - camelcase: 5.3.1 - chalk: 3.0.0 - cli-boxes: 2.2.1 - string-width: 4.2.3 - term-size: 2.2.1 - type-fest: 0.8.1 - widest-line: 3.1.0 - dev: true - - /boxen/5.1.2: - resolution: {integrity: sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ==} - engines: {node: '>=10'} - dependencies: - ansi-align: 3.0.1 - camelcase: 6.2.1 - chalk: 4.1.2 - cli-boxes: 2.2.1 - string-width: 4.2.3 - type-fest: 0.20.2 - widest-line: 3.1.0 - wrap-ansi: 7.0.0 - dev: false - /brace-expansion/1.1.11: resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==} dependencies: @@ -4387,19 +4317,6 @@ packages: mkdirp2: 1.0.5 dev: true - /cacheable-request/6.1.0: - resolution: {integrity: sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==} - engines: {node: '>=8'} - dependencies: - clone-response: 1.0.2 - get-stream: 5.2.0 - http-cache-semantics: 4.1.0 - keyv: 3.1.0 - lowercase-keys: 2.0.0 - normalize-url: 4.5.1 - responselike: 1.0.2 - dev: false - /call-bind/1.0.2: resolution: {integrity: sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==} dependencies: @@ -4522,6 +4439,7 @@ packages: /ci-info/2.0.0: resolution: {integrity: sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==} + dev: true /ci-info/3.3.0: resolution: {integrity: sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw==} @@ -4549,10 +4467,6 @@ packages: engines: {node: '>=0.10.0'} dev: true - /cli-boxes/2.2.1: - resolution: {integrity: sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==} - engines: {node: '>=6'} - /cli-cursor/3.1.0: resolution: {integrity: sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==} engines: {node: '>=8'} @@ -4582,12 +4496,6 @@ packages: strip-ansi: 6.0.1 wrap-ansi: 7.0.0 - /clone-response/1.0.2: - resolution: {integrity: sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=} - dependencies: - mimic-response: 1.0.1 - dev: false - /clone/1.0.4: resolution: {integrity: sha1-2jCcwmPfFZlMaIypAheco8fNfH4=} engines: {node: '>=0.8'} @@ -4752,18 +4660,6 @@ packages: walk-back: 2.0.1 dev: true - /configstore/5.0.1: - resolution: {integrity: sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==} - engines: {node: '>=8'} - dependencies: - dot-prop: 5.3.0 - graceful-fs: 4.2.8 - make-dir: 3.1.0 - unique-string: 2.0.0 - write-file-atomic: 3.0.3 - xdg-basedir: 4.0.0 - dev: false - /conventional-changelog-angular/5.0.13: resolution: {integrity: sha512-i/gipMxs7s8L/QeuavPF2hLnJgH6pEZAttySB6aiQLWcX3puWDL3ACVmvBhJGxnAy52Qc15ua26BufY6KpmrVA==} engines: {node: '>=10'} @@ -5012,11 +4908,6 @@ packages: shebang-command: 2.0.0 which: 2.0.2 - /crypto-random-string/2.0.0: - resolution: {integrity: sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==} - engines: {node: '>=8'} - dev: false - /cssom/0.3.8: resolution: {integrity: sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==} @@ -5613,13 +5504,6 @@ packages: engines: {node: '>=0.10'} dev: true - /decompress-response/3.3.0: - resolution: {integrity: sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=} - engines: {node: '>=4'} - dependencies: - mimic-response: 1.0.1 - dev: false - /decompress-zip/0.3.3: resolution: {integrity: sha512-/fy1L4s+4jujqj3kNptWjilFw3E6De8U6XUFvqmh4npN3Vsypm3oT2V0bXcmbBWS+5j5tr4okYaFrOmyZkszEg==} engines: {node: '>=0.10.0'} @@ -5640,6 +5524,7 @@ packages: /deep-extend/0.6.0: resolution: {integrity: sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==} engines: {node: '>=4.0.0'} + dev: true /deep-is/0.1.4: resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==} @@ -5654,10 +5539,6 @@ packages: clone: 1.0.4 dev: true - /defer-to-connect/1.1.3: - resolution: {integrity: sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==} - dev: false - /define-properties/1.1.3: resolution: {integrity: sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==} engines: {node: '>= 0.4'} @@ -5837,6 +5718,7 @@ packages: engines: {node: '>=8'} dependencies: is-obj: 2.0.0 + dev: true /dotenv-expand/5.1.0: resolution: {integrity: sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==} @@ -5852,10 +5734,6 @@ packages: engines: {node: '>=10'} dev: false - /duplexer3/0.1.4: - resolution: {integrity: sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=} - dev: false - /ejs/3.1.7: resolution: {integrity: sha512-BIar7R6abbUxDA3bfXrO4DSgwo8I+fB5/1zgujl3HLLjwd6+9iOnrT+t3grn2qbk9vOgBubXOFwX2m9axoFaGw==} engines: {node: '>=0.10.0'} @@ -5941,11 +5819,6 @@ packages: resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==} engines: {node: '>=6'} - /escape-goat/2.1.1: - resolution: {integrity: sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==} - engines: {node: '>=8'} - dev: false - /escape-string-regexp/1.0.5: resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==} engines: {node: '>=0.8.0'} @@ -6566,13 +6439,7 @@ packages: engines: {node: '>=6'} dependencies: pump: 3.0.0 - - /get-stream/5.2.0: - resolution: {integrity: sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==} - engines: {node: '>=8'} - dependencies: - pump: 3.0.0 - dev: false + dev: true /get-stream/6.0.1: resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==} @@ -6634,13 +6501,6 @@ packages: once: 1.4.0 path-is-absolute: 1.0.1 - /global-dirs/3.0.0: - resolution: {integrity: sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA==} - engines: {node: '>=10'} - dependencies: - ini: 2.0.0 - dev: false - /globals/11.12.0: resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==} engines: {node: '>=4'} @@ -6664,25 +6524,6 @@ packages: slash: 3.0.0 dev: true - /got/9.6.0: - resolution: {integrity: sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==} - engines: {node: '>=8.6'} - dependencies: - '@sindresorhus/is': 0.14.0 - '@szmarczak/http-timer': 1.1.2 - '@types/keyv': 3.1.4 - '@types/responselike': 1.0.0 - cacheable-request: 6.1.0 - decompress-response: 3.3.0 - duplexer3: 0.1.4 - get-stream: 4.1.0 - lowercase-keys: 1.0.1 - mimic-response: 1.0.1 - p-cancelable: 1.1.0 - to-readable-stream: 1.0.0 - url-parse-lax: 3.0.0 - dev: false - /graceful-fs/4.2.10: resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==} @@ -6765,11 +6606,6 @@ packages: kind-of: 4.0.0 dev: true - /has-yarn/2.1.0: - resolution: {integrity: sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==} - engines: {node: '>=8'} - dev: false - /has/1.0.3: resolution: {integrity: sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==} engines: {node: '>= 0.4.0'} @@ -6800,10 +6636,6 @@ packages: /html-escaper/2.0.2: resolution: {integrity: sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==} - /http-cache-semantics/4.1.0: - resolution: {integrity: sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==} - dev: false - /http-proxy-agent/4.0.1: resolution: {integrity: sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==} engines: {node: '>= 6'} @@ -6921,11 +6753,6 @@ packages: parent-module: 1.0.1 resolve-from: 4.0.0 - /import-lazy/2.1.0: - resolution: {integrity: sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=} - engines: {node: '>=4'} - dev: false - /import-local/3.0.3: resolution: {integrity: sha512-bE9iaUY3CXH8Cwfan/abDKAxe1KGT9kyGsBPqf6DMK/z0a2OzAsrukeYNgIH6cH5Xr452jb1TUL8rSfCLjZ9uA==} engines: {node: '>=8'} @@ -6968,11 +6795,7 @@ packages: /ini/1.3.8: resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==} - - /ini/2.0.0: - resolution: {integrity: sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==} - engines: {node: '>=10'} - dev: false + dev: true /internmap/2.0.3: resolution: {integrity: sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==} @@ -7018,6 +6841,7 @@ packages: hasBin: true dependencies: ci-info: 2.0.0 + dev: true /is-ci/3.0.1: resolution: {integrity: sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==} @@ -7109,19 +6933,6 @@ packages: dependencies: is-extglob: 2.1.1 - /is-installed-globally/0.4.0: - resolution: {integrity: sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==} - engines: {node: '>=10'} - dependencies: - global-dirs: 3.0.0 - is-path-inside: 3.0.3 - dev: false - - /is-npm/5.0.0: - resolution: {integrity: sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA==} - engines: {node: '>=10'} - dev: false - /is-number/3.0.0: resolution: {integrity: sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=} engines: {node: '>=0.10.0'} @@ -7141,11 +6952,7 @@ packages: /is-obj/2.0.0: resolution: {integrity: sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==} engines: {node: '>=8'} - - /is-path-inside/3.0.3: - resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==} - engines: {node: '>=8'} - dev: false + dev: true /is-plain-obj/1.1.0: resolution: {integrity: sha1-caUMhCnfync8kqOQpKA7OfzVHT4=} @@ -7210,10 +7017,6 @@ packages: is-docker: 2.2.1 dev: true - /is-yarn-global/0.3.0: - resolution: {integrity: sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==} - dev: false - /isarray/0.0.1: resolution: {integrity: sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=} dev: false @@ -8457,10 +8260,6 @@ packages: engines: {node: '>=4'} hasBin: true - /json-buffer/3.0.0: - resolution: {integrity: sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=} - dev: false - /json-parse-better-errors/1.0.2: resolution: {integrity: sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==} dev: true @@ -8524,12 +8323,6 @@ packages: engines: {'0': node >= 0.2.0} dev: true - /keyv/3.1.0: - resolution: {integrity: sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==} - dependencies: - json-buffer: 3.0.0 - dev: false - /khroma/1.4.1: resolution: {integrity: sha512-+GmxKvmiRuCcUYDgR7g5Ngo0JEDeOsGdNONdU2zsiBQaK4z19Y2NvXqfEDE0ZiIrg45GTZyAnPLVsLZZACYm3Q==} dev: true @@ -8573,13 +8366,6 @@ packages: resolution: {integrity: sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==} engines: {node: '>=6'} - /latest-version/5.1.0: - resolution: {integrity: sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==} - engines: {node: '>=8'} - dependencies: - package-json: 6.5.0 - dev: false - /lazy-val/1.0.5: resolution: {integrity: sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q==} dev: false @@ -8808,16 +8594,6 @@ packages: js-tokens: 4.0.0 dev: false - /lowercase-keys/1.0.1: - resolution: {integrity: sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==} - engines: {node: '>=0.10.0'} - dev: false - - /lowercase-keys/2.0.0: - resolution: {integrity: sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==} - engines: {node: '>=8'} - dev: false - /lru-cache/4.1.5: resolution: {integrity: sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==} dependencies: @@ -9163,11 +8939,6 @@ packages: resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==} engines: {node: '>=6'} - /mimic-response/1.0.1: - resolution: {integrity: sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==} - engines: {node: '>=4'} - dev: false - /min-indent/1.0.1: resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==} engines: {node: '>=4'} @@ -9202,6 +8973,7 @@ packages: /minimist/1.2.5: resolution: {integrity: sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==} + dev: true /minimist/1.2.6: resolution: {integrity: sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==} @@ -9386,11 +9158,6 @@ packages: resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==} engines: {node: '>=0.10.0'} - /normalize-url/4.5.1: - resolution: {integrity: sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==} - engines: {node: '>=8'} - dev: false - /npm-run-path/2.0.2: resolution: {integrity: sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=} engines: {node: '>=4'} @@ -9505,11 +9272,6 @@ packages: resolution: {integrity: sha512-/jHxFIzoMXdqPzTaCpFzAAWhpkSjZPF4Vsn6jAfNpmbH/ymsmd7Qc6VE9BGn0L6YMj6uwpQLxCECpus4ukKS9Q==} dev: true - /p-cancelable/1.1.0: - resolution: {integrity: sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==} - engines: {node: '>=6'} - dev: false - /p-filter/2.1.0: resolution: {integrity: sha512-ZBxxZ5sL2HghephhpGAQdoskxplTwr7ICaehZwLIlfL6acuVgZPm8yBNuRAFBGEqtD/hmUeq9eqLg2ys9Xr/yw==} engines: {node: '>=8'} @@ -9583,16 +9345,6 @@ packages: resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==} engines: {node: '>=6'} - /package-json/6.5.0: - resolution: {integrity: sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==} - engines: {node: '>=8'} - dependencies: - got: 9.6.0 - registry-auth-token: 4.2.1 - registry-url: 5.1.0 - semver: 6.3.0 - dev: false - /parent-module/1.0.1: resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==} engines: {node: '>=6'} @@ -9762,11 +9514,6 @@ packages: engines: {node: '>= 0.8.0'} dev: true - /prepend-http/2.0.0: - resolution: {integrity: sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=} - engines: {node: '>=4'} - dev: false - /prettier-linter-helpers/1.0.0: resolution: {integrity: sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==} engines: {node: '>=6.0.0'} @@ -9857,18 +9604,12 @@ packages: dependencies: end-of-stream: 1.4.4 once: 1.4.0 + dev: true /punycode/2.1.1: resolution: {integrity: sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==} engines: {node: '>=6'} - /pupa/2.1.1: - resolution: {integrity: sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==} - engines: {node: '>=8'} - dependencies: - escape-goat: 2.1.1 - dev: false - /puppeteer/2.1.1: resolution: {integrity: sha512-LWzaDVQkk1EPiuYeTOj+CZRIjda4k2s5w4MK4xoH2+kgWV/SDlkYHmxatDdtYrciHUKSXTsGgPgPP8ILVdBsxg==} engines: {node: '>=8.16.0'} @@ -9911,16 +9652,6 @@ packages: engines: {node: '>=8'} dev: true - /rc/1.2.8: - resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==} - hasBin: true - dependencies: - deep-extend: 0.6.0 - ini: 1.3.8 - minimist: 1.2.5 - strip-json-comments: 2.0.1 - dev: false - /react-is/17.0.2: resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==} @@ -10105,20 +9836,6 @@ packages: unicode-match-property-value-ecmascript: 2.0.0 dev: true - /registry-auth-token/4.2.1: - resolution: {integrity: sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw==} - engines: {node: '>=6.0.0'} - dependencies: - rc: 1.2.8 - dev: false - - /registry-url/5.1.0: - resolution: {integrity: sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==} - engines: {node: '>=8'} - dependencies: - rc: 1.2.8 - dev: false - /regjsgen/0.5.2: resolution: {integrity: sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==} dev: true @@ -10215,12 +9932,6 @@ packages: supports-preserve-symlinks-flag: 1.0.0 dev: true - /responselike/1.0.2: - resolution: {integrity: sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=} - dependencies: - lowercase-keys: 1.0.1 - dev: false - /restore-cursor/3.1.0: resolution: {integrity: sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==} engines: {node: '>=8'} @@ -10351,13 +10062,6 @@ packages: /semver-compare/1.0.0: resolution: {integrity: sha1-De4hahyUGrN+nvsXiPavxf9VN/w=} - /semver-diff/3.1.1: - resolution: {integrity: sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==} - engines: {node: '>=8'} - dependencies: - semver: 6.3.0 - dev: false - /semver/5.7.1: resolution: {integrity: sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==} hasBin: true @@ -10370,7 +10074,6 @@ packages: /semver/7.0.0: resolution: {integrity: sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==} hasBin: true - dev: true /semver/7.3.5: resolution: {integrity: sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==} @@ -10434,6 +10137,13 @@ packages: /signal-exit/3.0.7: resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==} + /simple-update-notifier/1.0.7: + resolution: {integrity: sha512-BBKgR84BJQJm6WjWFMHgLVuo61FBDSj1z/xSFUIozqO6wO7ii0JxCqlIud7Enr/+LhlbNI0whErq96P2qHNWew==} + engines: {node: '>=8.10.0'} + dependencies: + semver: 7.0.0 + dev: false + /sisteransi/1.0.5: resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==} @@ -10747,11 +10457,6 @@ packages: min-indent: 1.0.1 dev: true - /strip-json-comments/2.0.1: - resolution: {integrity: sha1-PFMZQukIwml8DsNEhYwobHygpgo=} - engines: {node: '>=0.10.0'} - dev: false - /strip-json-comments/3.1.1: resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==} engines: {node: '>=8'} @@ -10980,11 +10685,6 @@ packages: kind-of: 3.2.2 dev: true - /to-readable-stream/1.0.0: - resolution: {integrity: sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==} - engines: {node: '>=6'} - dev: false - /to-regex-range/2.1.1: resolution: {integrity: sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=} engines: {node: '>=0.10.0'} @@ -11155,6 +10855,7 @@ packages: /type-fest/0.20.2: resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==} engines: {node: '>=10'} + dev: true /type-fest/0.21.3: resolution: {integrity: sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==} @@ -11276,13 +10977,6 @@ packages: set-value: 2.0.1 dev: true - /unique-string/2.0.0: - resolution: {integrity: sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==} - engines: {node: '>=8'} - dependencies: - crypto-random-string: 2.0.0 - dev: false - /universalify/0.1.2: resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==} engines: {node: '>= 4.0.0'} @@ -11299,26 +10993,6 @@ packages: isobject: 3.0.1 dev: true - /update-notifier/5.1.0: - resolution: {integrity: sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw==} - engines: {node: '>=10'} - dependencies: - boxen: 5.1.2 - chalk: 4.1.2 - configstore: 5.0.1 - has-yarn: 2.1.0 - import-lazy: 2.1.0 - is-ci: 2.0.0 - is-installed-globally: 0.4.0 - is-npm: 5.0.0 - is-yarn-global: 0.3.0 - latest-version: 5.1.0 - pupa: 2.1.1 - semver: 7.3.5 - semver-diff: 3.1.1 - xdg-basedir: 4.0.0 - dev: false - /uri-js/4.4.1: resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==} dependencies: @@ -11329,13 +11003,6 @@ packages: deprecated: Please see https://github.com/lydell/urix#deprecated dev: true - /url-parse-lax/3.0.0: - resolution: {integrity: sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=} - engines: {node: '>=4'} - dependencies: - prepend-http: 2.0.0 - dev: false - /use/3.1.1: resolution: {integrity: sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==} engines: {node: '>=0.10.0'} @@ -11508,12 +11175,6 @@ packages: string-width: 2.1.1 dev: true - /widest-line/3.1.0: - resolution: {integrity: sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==} - engines: {node: '>=8'} - dependencies: - string-width: 4.2.3 - /word-wrap/1.2.3: resolution: {integrity: sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==} engines: {node: '>=0.10.0'} @@ -11584,11 +11245,6 @@ packages: utf-8-validate: optional: true - /xdg-basedir/4.0.0: - resolution: {integrity: sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==} - engines: {node: '>=8'} - dev: false - /xml-name-validator/3.0.0: resolution: {integrity: sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==} @@ -11659,7 +11315,6 @@ packages: /yargs-parser/21.0.1: resolution: {integrity: sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==} engines: {node: '>=12'} - dev: true /yargs/15.4.1: resolution: {integrity: sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==} @@ -11716,6 +11371,19 @@ packages: yargs-parser: 21.0.1 dev: true + /yargs/17.5.1: + resolution: {integrity: sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==} + engines: {node: '>=12'} + dependencies: + cliui: 7.0.4 + escalade: 3.1.1 + get-caller-file: 2.0.5 + require-directory: 2.1.1 + string-width: 4.2.3 + y18n: 5.0.8 + yargs-parser: 21.0.1 + dev: false + /yauzl/2.10.0: resolution: {integrity: sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=} dependencies: From ec36c6837e5fb43dae9e1a303d422e16932e837a Mon Sep 17 00:00:00 2001 From: Mike Maietta Date: Fri, 19 Aug 2022 09:32:39 -0700 Subject: [PATCH 4/6] fix build --- packages/electron-builder/src/cli/cli.ts | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/packages/electron-builder/src/cli/cli.ts b/packages/electron-builder/src/cli/cli.ts index 3e2f578bfd..c4bb6e9f2c 100644 --- a/packages/electron-builder/src/cli/cli.ts +++ b/packages/electron-builder/src/cli/cli.ts @@ -74,16 +74,7 @@ function checkIsOutdated() { return } - const packageManager = (await pathExists(path.join(__dirname, "..", "..", "package-lock.json"))) ? "npm" : "yarn" - - const notifier = updateNotifier({ pkg: it }) - if (notifier.update != null) { - notifier.notify({ - message: `Update available ${chalk.dim(notifier.update.current)}${chalk.reset(" → ")}${chalk.green(notifier.update.latest)} \nRun ${chalk.cyan( - `${packageManager} upgrade electron-builder` - )} to update`, - }) - } + await UpdateNotifier({ pkg: it }) }) .catch(e => log.warn({ error: e }, "cannot check updates")) } From 2ccc6f98f7b0a4adaa7c234d432d506ddc2f9fa3 Mon Sep 17 00:00:00 2001 From: Mike Maietta Date: Fri, 19 Aug 2022 10:01:09 -0700 Subject: [PATCH 5/6] Create fluffy-cobras-beg.md --- .changeset/fluffy-cobras-beg.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/fluffy-cobras-beg.md diff --git a/.changeset/fluffy-cobras-beg.md b/.changeset/fluffy-cobras-beg.md new file mode 100644 index 0000000000..f16619935e --- /dev/null +++ b/.changeset/fluffy-cobras-beg.md @@ -0,0 +1,5 @@ +--- +"electron-builder": patch +--- + +fix: replace update-notifier with simple-update-notifier due to security alert From ee48283e1b57dde9e41627438f307230b18bb0b2 Mon Sep 17 00:00:00 2001 From: Mike Maietta Date: Mon, 22 Aug 2022 12:26:26 -0700 Subject: [PATCH 6/6] loading simple-update-notifier via require --- packages/electron-builder/src/cli/cli.ts | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/packages/electron-builder/src/cli/cli.ts b/packages/electron-builder/src/cli/cli.ts index c4bb6e9f2c..f4e8b229af 100644 --- a/packages/electron-builder/src/cli/cli.ts +++ b/packages/electron-builder/src/cli/cli.ts @@ -7,7 +7,6 @@ import { readJson } from "fs-extra" import * as isCi from "is-ci" import * as path from "path" import { loadEnv } from "read-config-file" -import UpdateNotifier from "simple-update-notifier" import { ExecError } from "builder-util/out/util" import { build, configureBuildCommand, createYargs } from "../builder" import { createSelfSignedCert } from "./create-self-signed-cert" @@ -47,7 +46,7 @@ void createYargs() function wrap(task: (args: any) => Promise) { return (args: any) => { - checkIsOutdated() + checkIsOutdated().catch(e => log.warn({ error: e }, "cannot check updates")) loadEnv(path.join(process.cwd(), "electron-builder.env")) .then(() => task(args)) .catch(error => { @@ -63,20 +62,17 @@ function wrap(task: (args: any) => Promise) { } } -function checkIsOutdated() { +async function checkIsOutdated() { if (isCi || process.env.NO_UPDATE_NOTIFIER != null) { return } - readJson(path.join(__dirname, "..", "..", "package.json")) - .then(async it => { - if (it.version === "0.0.0-semantic-release") { - return - } - - await UpdateNotifier({ pkg: it }) - }) - .catch(e => log.warn({ error: e }, "cannot check updates")) + const pkg = await readJson(path.join(__dirname, "..", "..", "package.json")) + if (pkg.version === "0.0.0-semantic-release") { + return + } + const UpdateNotifier = require("simple-update-notifier") + await UpdateNotifier({ pkg }) } async function rebuildAppNativeCode(args: any) {