From 08f6cf943e3a699745dc4ecc50d0395dba142db7 Mon Sep 17 00:00:00 2001 From: Mike Maietta Date: Tue, 25 Oct 2022 12:59:49 -0700 Subject: [PATCH 1/3] chore(dep): upgrading typescript and eslint deps --- .eslintrc.js | 1 + package.json | 12 +- .../app-builder-lib/src/ProtonFramework.ts | 2 +- .../src/asar/asarFileChecker.ts | 4 +- packages/app-builder-lib/src/asar/asarUtil.ts | 2 +- .../src/codeSign/macCodeSign.ts | 2 +- .../src/codeSign/windowsCodeSign.ts | 4 +- .../src/electron/electronVersion.ts | 2 +- .../app-builder-lib/src/fileTransformer.ts | 4 +- packages/app-builder-lib/src/packager.ts | 4 +- .../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 | 8 +- .../src/CancellationToken.ts | 2 +- .../builder-util-runtime/src/httpExecutor.ts | 6 +- packages/builder-util/src/fs.ts | 4 +- packages/builder-util/src/promise.ts | 6 +- 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 +- .../src/squirrelPack.ts | 2 +- packages/electron-builder/src/cli/cli.ts | 2 +- .../src/cli/install-app-deps.ts | 2 +- .../electron-publish/src/gitHubPublisher.ts | 4 +- .../electron-updater/src/AppImageUpdater.ts | 2 +- packages/electron-updater/src/AppUpdater.ts | 8 +- packages/electron-updater/src/BaseUpdater.ts | 2 +- .../src/DownloadedUpdateHelper.ts | 4 +- packages/electron-updater/src/MacUpdater.ts | 6 +- packages/electron-updater/src/NsisUpdater.ts | 22 +- .../DifferentialDownloader.ts | 6 +- ...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 | 402 +++++++++--------- scripts/jsdoc2md2html.js | 2 +- 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/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 +- 56 files changed, 304 insertions(+), 305 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index c90946260e9..d5225113d63 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -28,6 +28,7 @@ module.exports = { "@typescript-eslint/no-unsafe-member-access": "off", "@typescript-eslint/restrict-template-expressions": "off", "@typescript-eslint/no-unsafe-return": "off", + "@typescript-eslint/no-unsafe-argument": "off", "@typescript-eslint/no-unsafe-assignment": "off", "@typescript-eslint/no-explicit-any": "off", "@typescript-eslint/no-unsafe-call": "off", diff --git a/package.json b/package.json index 2cfeb57e4ad..030474b1d51 100644 --- a/package.json +++ b/package.json @@ -49,14 +49,14 @@ "@changesets/changelog-github": "0.4.2", "@changesets/cli": "2.19.0", "@types/node": "16.11.43", - "@typescript-eslint/eslint-plugin": "4.33.0", - "@typescript-eslint/parser": "4.33.0", + "@typescript-eslint/eslint-plugin": "5.41.0", + "@typescript-eslint/parser": "5.41.0", "catharsis": "0.9.0", "conventional-changelog-cli": "2.1.1", "dmd": "6.0.0", - "eslint": "7.30.0", - "eslint-config-prettier": "8.3.0", - "eslint-plugin-prettier": "3.4.0", + "eslint": "8.26.0", + "eslint-config-prettier": "8.5.0", + "eslint-plugin-prettier": "4.2.1", "fs-extra": "10.0.0", "globby": "11.1.0", "husky": "7.0.4", @@ -69,7 +69,7 @@ "replace-in-file": "6.2.0", "source-map-support": "0.5.21", "ts-jsdoc": "3.2.2", - "typescript": "4.3.5", + "typescript": "4.8.4", "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 69f74219e1e..d1311a64f15 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) { + } catch (e: any) { // 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 485ea965eca..b9a6fcc30b2 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) { + } catch (e: any) { throw error(`is corrupted: ${e}`) } let stat: Node | null try { stat = fs.getFile(relativeFile) - } catch (e) { + } catch (e: any) { 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/asar/asarUtil.ts b/packages/app-builder-lib/src/asar/asarUtil.ts index c3102ecd7c3..7a85473d554 100644 --- a/packages/app-builder-lib/src/asar/asarUtil.ts +++ b/packages/app-builder-lib/src/asar/asarUtil.ts @@ -202,7 +202,7 @@ export class AsarPackager { .then(it => { writeStream.write(it, () => w(index + 1)) }) - .catch(e => reject(`Cannot read file ${file}: ${e.stack || e}`)) + .catch((e: any) => reject(`Cannot read file ${file}: ${e.stack || e}`)) } else { const readStream = createReadStream(file) readStream.on("error", reject) diff --git a/packages/app-builder-lib/src/codeSign/macCodeSign.ts b/packages/app-builder-lib/src/codeSign/macCodeSign.ts index fe6e1c2dc64..9b26214070b 100644 --- a/packages/app-builder-lib/src/codeSign/macCodeSign.ts +++ b/packages/app-builder-lib/src/codeSign/macCodeSign.ts @@ -146,7 +146,7 @@ export interface CreateKeychainOptions { } export function removeKeychain(keychainFile: string, printWarn = true): Promise { - return exec("security", ["delete-keychain", keychainFile]).catch(e => { + return exec("security", ["delete-keychain", keychainFile]).catch((e: any) => { if (printWarn) { log.warn({ file: keychainFile, error: e.stack || e }, "cannot delete keychain") } diff --git a/packages/app-builder-lib/src/codeSign/windowsCodeSign.ts b/packages/app-builder-lib/src/codeSign/windowsCodeSign.ts index af531a052a6..43d2cae671e 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) { + } catch (e: any) { 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) { + } catch (e: any) { 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 6caebd76e76..f8664116819 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) { + } catch (e: any) { log.warn(e) } diff --git a/packages/app-builder-lib/src/fileTransformer.ts b/packages/app-builder-lib/src/fileTransformer.ts index b33d723a677..24b8fb83504 100644 --- a/packages/app-builder-lib/src/fileTransformer.ts +++ b/packages/app-builder-lib/src/fileTransformer.ts @@ -44,7 +44,7 @@ export function createTransformer(srcDir: string, configuration: Configuration, isRemovePackageKeywords, }) ) - .catch(e => log.warn(e)) + .catch((e: any) => log.warn(e)) } else if (extraTransformer != null) { return extraTransformer(file) } else { @@ -99,7 +99,7 @@ function cleanupPackageJson(data: any, options: CleanupPackageFileOptions): any if (changed) { return JSON.stringify(data, null, 2) } - } catch (e) { + } catch (e: any) { debug(e) } diff --git a/packages/app-builder-lib/src/packager.ts b/packages/app-builder-lib/src/packager.ts index 561590628b8..70ac0141086 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) { + } catch (e: any) { // error in dev mode without babel if (!(e instanceof ReferenceError)) { throw e @@ -381,7 +381,7 @@ export class Packager { const toDispose = this.toDispose.slice() this.toDispose.length = 0 for (const disposer of toDispose) { - await disposer().catch(e => { + await disposer().catch((e: any) => { log.warn({ error: e }, "cannot dispose") }) } diff --git a/packages/app-builder-lib/src/platformPackager.ts b/packages/app-builder-lib/src/platformPackager.ts index ab4ebb7c5f6..c664a481c88 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) { + } catch (e: any) { 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 383f888234f..64cd2a0eae2 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) { + } catch (e: any) { 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) { + } catch (e: any) { 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 c751a3877fb..a8714126272 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) { + } catch (e: any) { 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 d96e6509d47..b332cfa7ab3 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) { + } catch (e: any) { 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 6a9ecab56c1..09bd29ab225 100644 --- a/packages/app-builder-lib/src/targets/nsis/NsisTarget.ts +++ b/packages/app-builder-lib/src/targets/nsis/NsisTarget.ts @@ -753,7 +753,7 @@ async function ensureNotBusy(outFile: string): Promise { } else { fs.close(fd, () => resolve(true)) } - } catch (error) { + } catch (error: any) { reject(error) } }) diff --git a/packages/app-builder-lib/src/util/appBuilder.ts b/packages/app-builder-lib/src/util/appBuilder.ts index 38bf696c5f5..42cd4ba6265 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) { + } catch (e: any) { 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 199ed72cc04..078dca7d667 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) { + } catch (e: any) { 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) { + } catch (e: any) { 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 d9abaabc466..37f0569704a 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 = [] + const result: FileSet[] = [] 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 946a0d3571a..91e0a95a24c 100644 --- a/packages/app-builder-lib/src/winPackager.ts +++ b/packages/app-builder-lib/src/winPackager.ts @@ -40,7 +40,7 @@ export class WinPackager extends PlatformPackager { if (platformSpecificBuildOptions.certificateSubjectName != null || platformSpecificBuildOptions.certificateSha1 != null) { return this.vm.value .then(vm => getCertificateFromStoreInfo(platformSpecificBuildOptions, vm)) - .catch(e => { + .catch((e: any) => { // https://github.com/electron-userland/electron-builder/pull/2397 if (platformSpecificBuildOptions.sign == null) { throw e @@ -68,7 +68,7 @@ export class WinPackager extends PlatformPackager { return ( importCertificate(cscLink, this.info.tempDirManager, this.projectDir) // before then - .catch(e => { + .catch((e: any) => { if (e instanceof InvalidConfigurationError) { throw new InvalidConfigurationError(`Env WIN_CSC_LINK is not correct, cannot resolve: ${e.message}`) } else { @@ -170,7 +170,7 @@ export class WinPackager extends PlatformPackager { case "squirrel": try { return require("electron-builder-squirrel-windows").default - } catch (e) { + } catch (e: any) { 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) { + } catch (e: any) { // 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/CancellationToken.ts b/packages/builder-util-runtime/src/CancellationToken.ts index 37b68d15543..099b90ce923 100644 --- a/packages/builder-util-runtime/src/CancellationToken.ts +++ b/packages/builder-util-runtime/src/CancellationToken.ts @@ -88,7 +88,7 @@ export class CancellationToken extends EventEmitter { finallyHandler() return it }) - .catch(e => { + .catch((e: any) => { finallyHandler() throw e }) diff --git a/packages/builder-util-runtime/src/httpExecutor.ts b/packages/builder-util-runtime/src/httpExecutor.ts index 0a2035550f7..e049703502e 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) { + } catch (e: any) { 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) { + } catch (e: any) { 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) { + } catch (e: any) { callback(e) return } diff --git a/packages/builder-util/src/fs.ts b/packages/builder-util/src/fs.ts index a5719fac93c..5dc2bf7ebb1 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) { + } catch (e: any) { return false } } @@ -185,7 +185,7 @@ export function copyOrLinkFile(src: string, dest: string, stats?: Stats | null, } if (isUseHardLink) { - return link(src, dest).catch(e => { + return link(src, dest).catch((e: any) => { if (e.code === "EXDEV") { const isLog = exDevErrorHandler == null ? true : exDevErrorHandler() if (isLog && log.isDebugEnabled) { diff --git a/packages/builder-util/src/promise.ts b/packages/builder-util/src/promise.ts index e7095fc33f1..24e737df262 100644 --- a/packages/builder-util/src/promise.ts +++ b/packages/builder-util/src/promise.ts @@ -10,10 +10,10 @@ export async function executeFinally(promise: Promise, task: (isErrorOccur let result: T | null = null try { result = await promise - } catch (originalError) { + } catch (originalError: any) { try { await task(true) - } catch (taskError) { + } catch (taskError: any) { throw new NestedError([originalError, taskError]) } @@ -41,7 +41,7 @@ export function orNullIfFileNotExist(promise: Promise): Promise } export function orIfFileNotExist(promise: Promise, fallbackValue: T): Promise { - return promise.catch(e => { + return promise.catch((e: any) => { if (e.code === "ENOENT" || e.code === "ENOTDIR") { return fallbackValue } diff --git a/packages/builder-util/src/util.ts b/packages/builder-util/src/util.ts index fe8f98c4497..471490057be 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) { + } catch (e: any) { throw new Error(`Cannot spawn ${command}: ${e.stack || e}`) } } @@ -399,7 +399,7 @@ export function executeAppBuilder( export async function retry(task: () => Promise, retriesLeft: number, interval: number): Promise { try { return await task() - } catch (error) { + } catch (error: any) { 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 5c18e7c316d..f9c5b962866 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) { + } catch (error: any) { 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 56dff8fd6c3..64b83ae524b 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) { + } catch (e: any) { 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 4b0e55dd90b..fa35f58714e 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 debug(e.toString())), + unlink(path.join(outputDirectory, outFile.replace(".msi", ".wixpdb"))).catch((e: any) => debug(e.toString())), ]) } diff --git a/packages/electron-builder/src/cli/cli.ts b/packages/electron-builder/src/cli/cli.ts index 562dca64669..e8e8c23f770 100644 --- a/packages/electron-builder/src/cli/cli.ts +++ b/packages/electron-builder/src/cli/cli.ts @@ -45,7 +45,7 @@ void createYargs() function wrap(task: (args: any) => Promise) { return (args: any) => { - checkIsOutdated().catch(e => log.warn({ error: e }, "cannot check updates")) + checkIsOutdated().catch((e: any) => log.warn({ error: e }, "cannot check updates")) loadEnv(path.join(process.cwd(), "electron-builder.env")) .then(() => task(args)) .catch(error => { diff --git a/packages/electron-builder/src/cli/install-app-deps.ts b/packages/electron-builder/src/cli/install-app-deps.ts index 13e565e671d..c2cf674bc9a 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) { + } catch (e: any) { // 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 0d7e41938f8..ed372af8b14 100644 --- a/packages/electron-publish/src/gitHubPublisher.ts +++ b/packages/electron-publish/src/gitHubPublisher.ts @@ -198,7 +198,7 @@ export class GitHubPublisher extends HttpPublisher { this.context.cancellationToken, requestProcessor ) - .catch(e => { + .catch((e: any) => { if (attemptNumber > 3) { return Promise.reject(e) } else if (this.doesErrorMeanAlreadyExists(e)) { @@ -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) { + } catch (e: any) { 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/src/AppImageUpdater.ts b/packages/electron-updater/src/AppImageUpdater.ts index 0057bb211f3..4de84a3ef5c 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) { + } catch (e: any) { 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 92e4c98768a..aed7dd87a22 100644 --- a/packages/electron-updater/src/AppUpdater.ts +++ b/packages/electron-updater/src/AppUpdater.ts @@ -282,7 +282,7 @@ export abstract class AppUpdater extends (EventEmitter as new () => TypedEmitter nullizePromise() return it }) - .catch(e => { + .catch((e: any) => { nullizePromise() this.emit("error", e, `Cannot check for updates: ${(e.stack || e).toString()}`) throw e @@ -493,7 +493,7 @@ export abstract class AppUpdater extends (EventEmitter as new () => TypedEmitter requestHeaders: this.computeRequestHeaders(updateInfoAndProvider.provider), cancellationToken, disableWebInstaller: this.disableWebInstaller, - }).catch(e => { + }).catch((e: any) => { throw errorHandler(e) }) } catch (e: any) { @@ -564,7 +564,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) { + } catch (e: any) { this._logger.warn(`Couldn't write out staging user ID: ${e}`) } return id @@ -676,7 +676,7 @@ export abstract class AppUpdater extends (EventEmitter as new () => TypedEmitter try { await taskOptions.task(tempUpdateFile, downloadOptions, packageFile, removeFileIfAny) await rename(tempUpdateFile, updateFile) - } catch (e) { + } catch (e: any) { await removeFileIfAny() if (e instanceof CancellationError) { diff --git a/packages/electron-updater/src/BaseUpdater.ts b/packages/electron-updater/src/BaseUpdater.ts index c4170b599c8..863e8a45a64 100644 --- a/packages/electron-updater/src/BaseUpdater.ts +++ b/packages/electron-updater/src/BaseUpdater.ts @@ -65,7 +65,7 @@ export abstract class BaseUpdater extends AppUpdater { isForceRunAfter, isAdminRightsRequired: downloadedFileInfo.isAdminRightsRequired, }) - } catch (e) { + } catch (e: any) { this.dispatchError(e) return false } diff --git a/packages/electron-updater/src/DownloadedUpdateHelper.ts b/packages/electron-updater/src/DownloadedUpdateHelper.ts index e5bd3fc8745..12a312c410e 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) { + } catch (error: any) { 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) { + } catch (e: any) { if (e.code === "ENOENT") { return result } diff --git a/packages/electron-updater/src/MacUpdater.ts b/packages/electron-updater/src/MacUpdater.ts index f2dd2162aa6..44043bb9a38 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) { + } catch (e: any) { 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) { + } catch (e: any) { 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) { + } catch (e: any) { 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 975223ecf36..3840dc105ce 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) { + } catch (e: any) { 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) { + } catch (e: any) { if (e.code === "ENOENT") { // no app-update.yml return null @@ -127,7 +127,7 @@ export class NsisUpdater extends BaseUpdater { } const callUsingElevation = (): void => { - _spawn(path.join(process.resourcesPath!, "elevate.exe"), [options.installerPath].concat(args)).catch(e => this.dispatchError(e)) + _spawn(path.join(process.resourcesPath!, "elevate.exe"), [options.installerPath].concat(args)).catch((e: any) => this.dispatchError(e)) } if (options.isAdminRightsRequired) { @@ -175,7 +175,7 @@ export class NsisUpdater extends BaseUpdater { try { return JSON.parse(gunzipSync(data).toString()) - } catch (e) { + } catch (e: any) { 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) { + } catch (e: any) { 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) { + } catch (e: any) { 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) { + } catch (error: any) { reject(error) } }) diff --git a/packages/electron-updater/src/differentialDownloader/DifferentialDownloader.ts b/packages/electron-updater/src/differentialDownloader/DifferentialDownloader.ts index 3fe6a0342f3..5d99a8b67bf 100644 --- a/packages/electron-updater/src/differentialDownloader/DifferentialDownloader.ts +++ b/packages/electron-updater/src/differentialDownloader/DifferentialDownloader.ts @@ -86,7 +86,7 @@ export abstract class DifferentialDownloader { const closeFiles = (): Promise> => { return Promise.all( fdList.map(openedFile => { - return close(openedFile.descriptor).catch(e => { + return close(openedFile.descriptor).catch((e: any) => { this.logger.error(`cannot close file "${openedFile.path}": ${e}`) }) }) @@ -94,7 +94,7 @@ export abstract class DifferentialDownloader { } return this.doDownloadFile(tasks, fdList) .then(closeFiles) - .catch(e => { + .catch((e: any) => { // then must be after catch here (since then always throws error) return closeFiles() .catch(closeFilesError => { @@ -160,7 +160,7 @@ export abstract class DifferentialDownloader { fdList.splice(1, 1) try { digestTransform.validate() - } catch (e) { + } catch (e: any) { reject(e) return } diff --git a/packages/electron-updater/src/differentialDownloader/FileWithEmbeddedBlockMapDifferentialDownloader.ts b/packages/electron-updater/src/differentialDownloader/FileWithEmbeddedBlockMapDifferentialDownloader.ts index 4a8cab343fc..d4446db1d7a 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) { + } catch (e: any) { await close(fd) throw e } diff --git a/packages/electron-updater/src/providers/BitbucketProvider.ts b/packages/electron-updater/src/providers/BitbucketProvider.ts index 82521282601..0d420665f4f 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) { + } catch (e: any) { 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 743e7a807e4..5beff36ae61 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) { + } catch (e: any) { 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) { + } catch (e: any) { reject(e) } }) diff --git a/packages/electron-updater/src/providers/GitHubProvider.ts b/packages/electron-updater/src/providers/GitHubProvider.ts index 3073cb09c9d..e895661288c 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) { + } catch (e: any) { 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) { + } catch (e: any) { 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) { + } catch (e: any) { 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) { + } catch (e: any) { 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 bb2a86fbf6d..b9342c0d89b 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) { + } catch (e: any) { 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 400ff070dac..81b5ecb91a4 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.9.0'} @@ -2555,17 +2549,17 @@ packages: - supports-color dev: false - /@eslint/eslintrc/0.4.3: - resolution: {integrity: sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==} - engines: {node: ^10.12.0 || >=12.0.0} + /@eslint/eslintrc/1.3.3: + resolution: {integrity: sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: ajv: 6.12.6 debug: 4.3.4 - espree: 7.3.1 - globals: 13.13.0 - ignore: 4.0.6 + espree: 9.4.0 + globals: 13.17.0 + ignore: 5.2.0 import-fresh: 3.3.0 - js-yaml: 3.14.1 + js-yaml: 4.1.0 minimatch: 3.1.2 strip-json-comments: 3.1.1 transitivePeerDependencies: @@ -2576,8 +2570,8 @@ packages: resolution: {integrity: sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==} dev: false - /@humanwhocodes/config-array/0.5.0: - resolution: {integrity: sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==} + /@humanwhocodes/config-array/0.11.6: + resolution: {integrity: sha512-jJr+hPTJYKyDILJfhNSHsjiwXYf26Flsz8DvNndOsHs5pwSnpGUEy8yzF0JYhCEvTDdV2vuOK5tt8BVhwO5/hg==} engines: {node: '>=10.10.0'} dependencies: '@humanwhocodes/object-schema': 1.2.1 @@ -2587,6 +2581,11 @@ packages: - supports-color dev: true + /@humanwhocodes/module-importer/1.0.1: + resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==} + engines: {node: '>=12.22'} + dev: true + /@humanwhocodes/object-schema/1.2.1: resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==} dev: true @@ -3343,6 +3342,10 @@ packages: resolution: {integrity: sha512-KQf+QAMWKMrtBMsB8/24w53tEsxllMj6TuA80TT/5igJalLI/zm0L3oXRbIAl4Ohfc85gyHX/jhMwsVkmhLU4A==} dev: true + /@types/semver/7.3.12: + resolution: {integrity: sha512-WwA1MW0++RfXmCr12xeYOOC5baSC9mSb0ZqCquFzKhcoF4TvHu5MKOuXsncgZcpVFhB1pXd5hZmM0ryAoCp12A==} + dev: true + /@types/semver/7.3.8: resolution: {integrity: sha512-D/2EJvAlCEtYFEYmmlGwbGXuK886HzyCc3nZX/tkFTQdEU8jZDAgiv08P162yB17y4ZXZoq7yFAnW4GDBb9Now==} dev: true @@ -3395,110 +3398,132 @@ packages: '@types/yargs-parser': 20.2.1 dev: false - /@typescript-eslint/eslint-plugin/4.33.0_mxo4duoyrmtssqwgtnlqtynn34: - resolution: {integrity: sha512-aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg==} - engines: {node: ^10.12.0 || >=12.0.0} + /@typescript-eslint/eslint-plugin/5.41.0_huremdigmcnkianavgfk3x6iou: + resolution: {integrity: sha512-DXUS22Y57/LAFSg3x7Vi6RNAuLpTXwxB9S2nIA7msBb/Zt8p7XqMwdpdc1IU7CkOQUPgAqR5fWvxuKCbneKGmA==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: - '@typescript-eslint/parser': ^4.0.0 - eslint: ^5.0.0 || ^6.0.0 || ^7.0.0 + '@typescript-eslint/parser': ^5.0.0 + eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 typescript: '*' peerDependenciesMeta: typescript: optional: true dependencies: - '@typescript-eslint/experimental-utils': 4.33.0_2cx4cdmmwelthzpkksdgbikuti - '@typescript-eslint/parser': 4.33.0_2cx4cdmmwelthzpkksdgbikuti - '@typescript-eslint/scope-manager': 4.33.0 + '@typescript-eslint/parser': 5.41.0_wyqvi574yv7oiwfeinomdzmc3m + '@typescript-eslint/scope-manager': 5.41.0 + '@typescript-eslint/type-utils': 5.41.0_wyqvi574yv7oiwfeinomdzmc3m + '@typescript-eslint/utils': 5.41.0_wyqvi574yv7oiwfeinomdzmc3m debug: 4.3.4 - eslint: 7.30.0 - functional-red-black-tree: 1.0.1 + eslint: 8.26.0 ignore: 5.2.0 regexpp: 3.2.0 - semver: 7.3.7 - tsutils: 3.21.0_typescript@4.3.5 - typescript: 4.3.5 + semver: 7.3.8 + tsutils: 3.21.0_typescript@4.8.4 + typescript: 4.8.4 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/experimental-utils/4.33.0_2cx4cdmmwelthzpkksdgbikuti: - resolution: {integrity: sha512-zeQjOoES5JFjTnAhI5QY7ZviczMzDptls15GFsI6jyUOq0kOf9+WonkhtlIhh0RgHRnqj5gdNxW5j1EvAyYg6Q==} - engines: {node: ^10.12.0 || >=12.0.0} + /@typescript-eslint/parser/5.41.0_wyqvi574yv7oiwfeinomdzmc3m: + resolution: {integrity: sha512-HQVfix4+RL5YRWZboMD1pUfFN8MpRH4laziWkkAzyO1fvNOY/uinZcvo3QiFJVS/siNHupV8E5+xSwQZrl6PZA==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: - eslint: '*' + eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true dependencies: - '@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.3.5 - eslint: 7.30.0 - eslint-scope: 5.1.1 - eslint-utils: 3.0.0_eslint@7.30.0 + '@typescript-eslint/scope-manager': 5.41.0 + '@typescript-eslint/types': 5.41.0 + '@typescript-eslint/typescript-estree': 5.41.0_typescript@4.8.4 + debug: 4.3.4 + eslint: 8.26.0 + typescript: 4.8.4 transitivePeerDependencies: - supports-color - - typescript dev: true - /@typescript-eslint/parser/4.33.0_2cx4cdmmwelthzpkksdgbikuti: - resolution: {integrity: sha512-ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA==} - engines: {node: ^10.12.0 || >=12.0.0} + /@typescript-eslint/scope-manager/5.41.0: + resolution: {integrity: sha512-xOxPJCnuktUkY2xoEZBKXO5DBCugFzjrVndKdUnyQr3+9aDWZReKq9MhaoVnbL+maVwWJu/N0SEtrtEUNb62QQ==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + dependencies: + '@typescript-eslint/types': 5.41.0 + '@typescript-eslint/visitor-keys': 5.41.0 + dev: true + + /@typescript-eslint/type-utils/5.41.0_wyqvi574yv7oiwfeinomdzmc3m: + resolution: {integrity: sha512-L30HNvIG6A1Q0R58e4hu4h+fZqaO909UcnnPbwKiN6Rc3BUEx6ez2wgN7aC0cBfcAjZfwkzE+E2PQQ9nEuoqfA==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: - eslint: ^5.0.0 || ^6.0.0 || ^7.0.0 + eslint: '*' typescript: '*' peerDependenciesMeta: typescript: optional: true dependencies: - '@typescript-eslint/scope-manager': 4.33.0 - '@typescript-eslint/types': 4.33.0 - '@typescript-eslint/typescript-estree': 4.33.0_typescript@4.3.5 + '@typescript-eslint/typescript-estree': 5.41.0_typescript@4.8.4 + '@typescript-eslint/utils': 5.41.0_wyqvi574yv7oiwfeinomdzmc3m debug: 4.3.4 - eslint: 7.30.0 - typescript: 4.3.5 + eslint: 8.26.0 + tsutils: 3.21.0_typescript@4.8.4 + typescript: 4.8.4 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/scope-manager/4.33.0: - resolution: {integrity: sha512-5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ==} - engines: {node: ^8.10.0 || ^10.13.0 || >=11.10.1} - dependencies: - '@typescript-eslint/types': 4.33.0 - '@typescript-eslint/visitor-keys': 4.33.0 - dev: true - - /@typescript-eslint/types/4.33.0: - resolution: {integrity: sha512-zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ==} - engines: {node: ^8.10.0 || ^10.13.0 || >=11.10.1} + /@typescript-eslint/types/5.41.0: + resolution: {integrity: sha512-5BejraMXMC+2UjefDvrH0Fo/eLwZRV6859SXRg+FgbhA0R0l6lDqDGAQYhKbXhPN2ofk2kY5sgGyLNL907UXpA==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /@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} + /@typescript-eslint/typescript-estree/5.41.0_typescript@4.8.4: + resolution: {integrity: sha512-SlzFYRwFSvswzDSQ/zPkIWcHv8O5y42YUskko9c4ki+fV6HATsTODUPbRbcGDFYP86gaJL5xohUEytvyNNcXWg==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: typescript: '*' peerDependenciesMeta: typescript: optional: true dependencies: - '@typescript-eslint/types': 4.33.0 - '@typescript-eslint/visitor-keys': 4.33.0 + '@typescript-eslint/types': 5.41.0 + '@typescript-eslint/visitor-keys': 5.41.0 debug: 4.3.4 globby: 11.1.0 is-glob: 4.0.3 - semver: 7.3.7 - tsutils: 3.21.0_typescript@4.3.5 - typescript: 4.3.5 + semver: 7.3.8 + tsutils: 3.21.0_typescript@4.8.4 + typescript: 4.8.4 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/visitor-keys/4.33.0: - resolution: {integrity: sha512-uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg==} - engines: {node: ^8.10.0 || ^10.13.0 || >=11.10.1} + /@typescript-eslint/utils/5.41.0_wyqvi574yv7oiwfeinomdzmc3m: + resolution: {integrity: sha512-QlvfwaN9jaMga9EBazQ+5DDx/4sAdqDkcs05AsQHMaopluVCUyu1bTRUVKzXbgjDlrRAQrYVoi/sXJ9fmG+KLQ==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + peerDependencies: + eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 dependencies: - '@typescript-eslint/types': 4.33.0 - eslint-visitor-keys: 2.1.0 + '@types/json-schema': 7.0.11 + '@types/semver': 7.3.12 + '@typescript-eslint/scope-manager': 5.41.0 + '@typescript-eslint/types': 5.41.0 + '@typescript-eslint/typescript-estree': 5.41.0_typescript@4.8.4 + eslint: 8.26.0 + eslint-scope: 5.1.1 + eslint-utils: 3.0.0_eslint@8.26.0 + semver: 7.3.8 + transitivePeerDependencies: + - supports-color + - typescript + dev: true + + /@typescript-eslint/visitor-keys/5.41.0: + resolution: {integrity: sha512-vilqeHj267v8uzzakbm13HkPMl7cbYpKVjgFWZPIOHIJHZtinvypUhJ5xBXfWYg4eFKqztbMMpOgFpT9Gfx4fw==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + dependencies: + '@typescript-eslint/types': 5.41.0 + eslint-visitor-keys: 3.3.0 dev: true /@vue/compiler-core/3.2.26: @@ -3574,12 +3599,12 @@ packages: acorn: 7.4.1 acorn-walk: 7.2.0 - /acorn-jsx/5.3.2_acorn@7.4.1: + /acorn-jsx/5.3.2_acorn@8.8.1: resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==} peerDependencies: acorn: ^6.0.0 || ^7.0.0 || ^8.0.0 dependencies: - acorn: 7.4.1 + acorn: 8.8.1 dev: true /acorn-walk/7.2.0: @@ -3600,6 +3625,12 @@ packages: resolution: {integrity: sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==} engines: {node: '>=0.4.0'} hasBin: true + dev: true + + /acorn/8.8.1: + resolution: {integrity: sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==} + engines: {node: '>=0.4.0'} + hasBin: true /add-stream/1.0.0: resolution: {integrity: sha1-anmQQ3ynNtXhKI25K9MmbV9csqo=} @@ -3652,15 +3683,6 @@ packages: json-schema-traverse: 0.4.1 uri-js: 4.4.1 - /ajv/8.11.0: - resolution: {integrity: sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==} - dependencies: - fast-deep-equal: 3.1.3 - json-schema-traverse: 1.0.0 - require-from-string: 2.0.2 - uri-js: 4.4.1 - dev: true - /ansi-align/2.0.0: resolution: {integrity: sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=} dependencies: @@ -5922,28 +5944,28 @@ packages: optionalDependencies: source-map: 0.6.1 - /eslint-config-prettier/8.3.0_eslint@7.30.0: - resolution: {integrity: sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==} + /eslint-config-prettier/8.5.0_eslint@8.26.0: + resolution: {integrity: sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==} hasBin: true peerDependencies: eslint: '>=7.0.0' dependencies: - eslint: 7.30.0 + eslint: 8.26.0 dev: true - /eslint-plugin-prettier/3.4.0_aryphpgqdcqelwqr2c53q2gwyy: - resolution: {integrity: sha512-UDK6rJT6INSfcOo545jiaOwB701uAIt2/dR7WnFQoGCVl1/EMqdANBmwUaqqQ45aXprsTGzSa39LI1PyuRBxxw==} - engines: {node: '>=6.0.0'} + /eslint-plugin-prettier/4.2.1_ipjlkoj6tsaulsgbqcrrprafti: + resolution: {integrity: sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==} + engines: {node: '>=12.0.0'} peerDependencies: - eslint: '>=5.0.0' + eslint: '>=7.28.0' eslint-config-prettier: '*' - prettier: '>=1.13.0' + prettier: '>=2.0.0' peerDependenciesMeta: eslint-config-prettier: optional: true dependencies: - eslint: 7.30.0 - eslint-config-prettier: 8.3.0_eslint@7.30.0 + eslint: 8.26.0 + eslint-config-prettier: 8.5.0_eslint@8.26.0 prettier: 2.3.2 prettier-linter-helpers: 1.0.0 dev: true @@ -5956,89 +5978,89 @@ packages: estraverse: 4.3.0 dev: true - /eslint-utils/2.1.0: - resolution: {integrity: sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==} - engines: {node: '>=6'} + /eslint-scope/7.1.1: + resolution: {integrity: sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: - eslint-visitor-keys: 1.3.0 + esrecurse: 4.3.0 + estraverse: 5.3.0 dev: true - /eslint-utils/3.0.0_eslint@7.30.0: + /eslint-utils/3.0.0_eslint@8.26.0: resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==} engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0} peerDependencies: eslint: '>=5' dependencies: - eslint: 7.30.0 + eslint: 8.26.0 eslint-visitor-keys: 2.1.0 dev: true - /eslint-visitor-keys/1.3.0: - resolution: {integrity: sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==} - engines: {node: '>=4'} - dev: true - /eslint-visitor-keys/2.1.0: resolution: {integrity: sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==} engines: {node: '>=10'} dev: true - /eslint/7.30.0: - resolution: {integrity: sha512-VLqz80i3as3NdloY44BQSJpFw534L9Oh+6zJOUaViV4JPd+DaHwutqP7tcpkW3YiXbK6s05RZl7yl7cQn+lijg==} - engines: {node: ^10.12.0 || >=12.0.0} + /eslint-visitor-keys/3.3.0: + resolution: {integrity: sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + dev: true + + /eslint/8.26.0: + resolution: {integrity: sha512-kzJkpaw1Bfwheq4VXUezFriD1GxszX6dUekM7Z3aC2o4hju+tsR/XyTC3RcoSD7jmy9VkPU3+N6YjVU2e96Oyg==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} hasBin: true dependencies: - '@babel/code-frame': 7.12.11 - '@eslint/eslintrc': 0.4.3 - '@humanwhocodes/config-array': 0.5.0 + '@eslint/eslintrc': 1.3.3 + '@humanwhocodes/config-array': 0.11.6 + '@humanwhocodes/module-importer': 1.0.1 + '@nodelib/fs.walk': 1.2.8 ajv: 6.12.6 chalk: 4.1.2 cross-spawn: 7.0.3 debug: 4.3.4 doctrine: 3.0.0 - enquirer: 2.3.6 escape-string-regexp: 4.0.0 - eslint-scope: 5.1.1 - eslint-utils: 2.1.0 - eslint-visitor-keys: 2.1.0 - espree: 7.3.1 + eslint-scope: 7.1.1 + eslint-utils: 3.0.0_eslint@8.26.0 + eslint-visitor-keys: 3.3.0 + espree: 9.4.0 esquery: 1.4.0 esutils: 2.0.3 fast-deep-equal: 3.1.3 file-entry-cache: 6.0.1 - functional-red-black-tree: 1.0.1 - glob-parent: 5.1.2 - globals: 13.13.0 - ignore: 4.0.6 + find-up: 5.0.0 + glob-parent: 6.0.2 + globals: 13.17.0 + grapheme-splitter: 1.0.4 + ignore: 5.2.0 import-fresh: 3.3.0 imurmurhash: 0.1.4 is-glob: 4.0.3 - js-yaml: 3.14.1 + is-path-inside: 3.0.3 + js-sdsl: 4.1.5 + js-yaml: 4.1.0 json-stable-stringify-without-jsonify: 1.0.1 levn: 0.4.1 lodash.merge: 4.6.2 minimatch: 3.1.2 natural-compare: 1.4.0 optionator: 0.9.1 - progress: 2.0.3 regexpp: 3.2.0 - semver: 7.3.7 strip-ansi: 6.0.1 strip-json-comments: 3.1.1 - table: 6.8.0 text-table: 0.2.0 - v8-compile-cache: 2.3.0 transitivePeerDependencies: - supports-color dev: true - /espree/7.3.1: - resolution: {integrity: sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==} - engines: {node: ^10.12.0 || >=12.0.0} + /espree/9.4.0: + resolution: {integrity: sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: - acorn: 7.4.1 - acorn-jsx: 5.3.2_acorn@7.4.1 - eslint-visitor-keys: 1.3.0 + acorn: 8.8.1 + acorn-jsx: 5.3.2_acorn@8.8.1 + eslint-visitor-keys: 3.3.0 dev: true /esprima/4.0.1: @@ -6307,7 +6329,7 @@ packages: dev: true /find-up/2.1.0: - resolution: {integrity: sha1-RdG35QbHF93UgndaK3eSCjwMV6c=} + resolution: {integrity: sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==} engines: {node: '>=4'} dependencies: locate-path: 2.0.0 @@ -6339,12 +6361,12 @@ packages: resolution: {integrity: sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==} engines: {node: ^10.12.0 || >=12.0.0} dependencies: - flatted: 3.2.5 + flatted: 3.2.7 rimraf: 3.0.2 dev: true - /flatted/3.2.5: - resolution: {integrity: sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==} + /flatted/3.2.7: + resolution: {integrity: sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==} dev: true /for-in/1.0.2: @@ -6449,10 +6471,6 @@ packages: /function-bind/1.1.1: resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==} - /functional-red-black-tree/1.0.1: - resolution: {integrity: sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=} - dev: true - /gauge/4.0.4: resolution: {integrity: sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==} engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0} @@ -6571,6 +6589,13 @@ packages: dependencies: is-glob: 4.0.3 + /glob-parent/6.0.2: + resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==} + engines: {node: '>=10.13.0'} + dependencies: + is-glob: 4.0.3 + dev: true + /glob/7.2.0: resolution: {integrity: sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==} dependencies: @@ -6606,8 +6631,8 @@ packages: resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==} engines: {node: '>=4'} - /globals/13.13.0: - resolution: {integrity: sha512-EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A==} + /globals/13.17.0: + resolution: {integrity: sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==} engines: {node: '>=8'} dependencies: type-fest: 0.20.2 @@ -6673,7 +6698,7 @@ packages: source-map: 0.6.1 wordwrap: 1.0.0 optionalDependencies: - uglify-js: 3.17.3 + uglify-js: 3.17.4 dev: true /hard-rejection/2.1.0: @@ -6868,11 +6893,6 @@ packages: requiresBuild: true dev: false - /ignore/4.0.6: - resolution: {integrity: sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==} - engines: {node: '>= 4'} - dev: true - /ignore/5.1.9: resolution: {integrity: sha512-2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ==} engines: {node: '>= 4'} @@ -7104,6 +7124,11 @@ packages: engines: {node: '>=8'} dev: true + /is-path-inside/3.0.3: + resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==} + engines: {node: '>=8'} + dev: true + /is-plain-obj/1.1.0: resolution: {integrity: sha1-caUMhCnfync8kqOQpKA7OfzVHT4=} engines: {node: '>=0.10.0'} @@ -8070,6 +8095,10 @@ packages: - utf-8-validate dev: false + /js-sdsl/4.1.5: + resolution: {integrity: sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q==} + dev: true + /js-tokens/4.0.0: resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==} @@ -8085,7 +8114,6 @@ packages: hasBin: true dependencies: argparse: 2.0.1 - dev: false /js2xmlparser/4.0.2: resolution: {integrity: sha512-6n4D8gLlLf1n5mNLQPRfViYzu9RATblzPEtm1SthMX1Pjao0r9YI9nw7ZIfRxQMERS87mcswrg+r/OYrPRX6jA==} @@ -8166,7 +8194,7 @@ packages: optional: true dependencies: abab: 2.0.6 - acorn: 8.7.0 + acorn: 8.8.1 acorn-globals: 6.0.0 cssom: 0.4.4 cssstyle: 2.3.0 @@ -8222,12 +8250,8 @@ packages: resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==} requiresBuild: true - /json-schema-traverse/1.0.0: - resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==} - dev: true - /json-stable-stringify-without-jsonify/1.0.1: - resolution: {integrity: sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=} + resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==} dev: true /json-stable-stringify/1.0.1: @@ -8509,10 +8533,6 @@ packages: resolution: {integrity: sha1-lDbjTtJgk+1/+uGTYUQ1CRXZrdg=} dev: true - /lodash.truncate/4.4.2: - resolution: {integrity: sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=} - dev: true - /lodash.union/4.6.0: resolution: {integrity: sha1-SLtQiECfFvGCFmZkHETdGqrjzYg=} dev: false @@ -9115,7 +9135,7 @@ packages: dev: true /natural-compare/1.4.0: - resolution: {integrity: sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=} + resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==} /negotiator/0.6.3: resolution: {integrity: sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==} @@ -9991,11 +10011,6 @@ packages: resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==} engines: {node: '>=0.10.0'} - /require-from-string/2.0.2: - resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==} - engines: {node: '>=0.10.0'} - dev: true - /require-main-filename/2.0.0: resolution: {integrity: sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==} dev: true @@ -10219,6 +10234,7 @@ packages: hasBin: true dependencies: lru-cache: 6.0.0 + dev: false /semver/7.3.8: resolution: {integrity: sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==} @@ -10657,17 +10673,6 @@ packages: wordwrapjs: 3.0.0 dev: true - /table/6.8.0: - resolution: {integrity: sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==} - engines: {node: '>=10.0.0'} - dependencies: - ajv: 8.11.0 - lodash.truncate: 4.4.2 - slice-ansi: 4.0.0 - string-width: 4.2.3 - strip-ansi: 6.0.1 - dev: true - /taffydb/2.6.2: resolution: {integrity: sha1-fLy2S1oUG2ou/CxdLGe04VCyomg=} dev: true @@ -10775,7 +10780,7 @@ packages: dev: true /text-table/0.2.0: - resolution: {integrity: sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=} + resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==} dev: true /throat/6.0.1: @@ -10896,7 +10901,7 @@ packages: utf8-byte-length: 1.0.4 dev: false - /ts-jsdoc/3.2.2_typescript@4.3.5: + /ts-jsdoc/3.2.2_typescript@4.8.4: resolution: {integrity: sha512-+Bj4ROKDrk3pOdel5u+gz8pqyuPak9D/dgNFfrpEGTZarRnxPGYB3DXkpu4qkFCfPjqBBiZEj6hf3wmfvJqbgA==} engines: {node: '>=12.0.0'} hasBin: true @@ -10908,7 +10913,7 @@ packages: doctrine: 3.0.0 fs-extra: 10.0.0 source-map-support: 0.5.21 - typescript: 4.3.5 + typescript: 4.8.4 dev: true /ts-node/10.7.0_h6qgkuijqq7bkkewultswwpwpa: @@ -10949,14 +10954,14 @@ packages: /tslib/2.4.0: resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==} - /tsutils/3.21.0_typescript@4.3.5: + /tsutils/3.21.0_typescript@4.8.4: 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.3.5 + typescript: 4.8.4 dev: true /tty-table/2.8.13: @@ -11055,17 +11060,10 @@ packages: hasBin: true dev: true - /typescript/4.3.5: - resolution: {integrity: sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==} - engines: {node: '>=4.2.0'} - hasBin: true - dev: true - /typescript/4.8.4: resolution: {integrity: sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==} engines: {node: '>=4.2.0'} hasBin: true - dev: false /typical/2.6.1: resolution: {integrity: sha1-XAgOXWYcu+OCWdLnCjxyU+hziB0=} @@ -11085,8 +11083,8 @@ packages: resolution: {integrity: sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==} dev: true - /uglify-js/3.17.3: - resolution: {integrity: sha512-JmMFDME3iufZnBpyKL+uS78LRiC+mK55zWfM5f/pWBJfpOttXAqYfdDGRukYhJuyRinvPVAtUhvy7rlDybNtFg==} + /uglify-js/3.17.4: + resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==} engines: {node: '>=0.8.0'} hasBin: true requiresBuild: true diff --git a/scripts/jsdoc2md2html.js b/scripts/jsdoc2md2html.js index 68cd56bbf54..e3add0b767d 100644 --- a/scripts/jsdoc2md2html.js +++ b/scripts/jsdoc2md2html.js @@ -419,7 +419,7 @@ async function writeDocFile(docOutFile, content) { try { existingContent = await fs.readFile(docOutFile, "utf8") } - catch (e) { + catch (e: any) { } console.log(`Write doc to ${docOutFile}`) diff --git a/test/fixtures/test-app-one/index.js b/test/fixtures/test-app-one/index.js index 63280cc3705..37e325e0e7f 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) {} + } catch (error: any) {} 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) { + catch (e: any) { 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 c7e706aa9db..975583fde05 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) { + catch (e: any) { 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 c7e706aa9db..975583fde05 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) { + catch (e: any) { 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 c7e706aa9db..975583fde05 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) { + catch (e: any) { mainWindow.webContents.executeJavaScript(`console.log(\`userData: ${e}\`)`) } }) \ No newline at end of file diff --git a/test/src/ArtifactPublisherTest.ts b/test/src/ArtifactPublisherTest.ts index 1b73316032e..503e8707831 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) { + } catch (e: any) { 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) { + } catch (e: any) { if (isApiRateError(e)) { console.warn(e.description.message) } else { diff --git a/test/src/helpers/downloadElectron.ts b/test/src/helpers/downloadElectron.ts index d12f88c9a64..3c601b27dcb 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) { + } catch (e: any) { if (e.code === "ENOENT") { return } else { diff --git a/test/src/helpers/fileAssert.ts b/test/src/helpers/fileAssert.ts index d62e8c16356..6348297b69f 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) { + } catch (e: any) { actualError = e } diff --git a/test/src/mac/macIconTest.ts b/test/src/mac/macIconTest.ts index b3971ff7a6d..231633d0671 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) { + } catch (e: any) { 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 f5d17db77ba..073ccd895cc 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) { + } catch (e: any) { await tmpDir.cleanup() throw e } @@ -131,7 +131,7 @@ test.ifAll.ifDevOrWinCi("nsis", async () => { outDirs[0] = oldDir await buildApp("1.0.1") - } catch (e) { + } catch (e: any) { await tmpDir.cleanup() throw e } @@ -225,7 +225,7 @@ async function doBuild(outDirs: Array, targets: Map Date: Tue, 25 Oct 2022 14:31:37 -0700 Subject: [PATCH 2/3] remove typesafety from js files :p --- scripts/jsdoc2md2html.js | 2 +- test/fixtures/test-app-one/index.js | 4 ++-- .../packages/test-app/index.js | 2 +- .../packages/test-app/index.js | 2 +- .../test-app-yarn-workspace/packages/test-app/index.js | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/jsdoc2md2html.js b/scripts/jsdoc2md2html.js index e3add0b767d..68cd56bbf54 100644 --- a/scripts/jsdoc2md2html.js +++ b/scripts/jsdoc2md2html.js @@ -419,7 +419,7 @@ async function writeDocFile(docOutFile, content) { try { existingContent = await fs.readFile(docOutFile, "utf8") } - catch (e: any) { + catch (e) { } console.log(`Write doc to ${docOutFile}`) diff --git a/test/fixtures/test-app-one/index.js b/test/fixtures/test-app-one/index.js index 37e325e0e7f..63280cc3705 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 975583fde05..c7e706aa9db 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 975583fde05..c7e706aa9db 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 975583fde05..c7e706aa9db 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 From 7716524603d9f87cca49e61503b96cf42e483923 Mon Sep 17 00:00:00 2001 From: Mike Maietta Date: Tue, 25 Oct 2022 17:19:36 -0700 Subject: [PATCH 3/3] Create two-toes-care.md --- .changeset/two-toes-care.md | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .changeset/two-toes-care.md diff --git a/.changeset/two-toes-care.md b/.changeset/two-toes-care.md new file mode 100644 index 00000000000..1fb1ec7005a --- /dev/null +++ b/.changeset/two-toes-care.md @@ -0,0 +1,10 @@ +--- +"app-builder-lib": patch +"builder-util-runtime": patch +"builder-util": patch +"dmg-builder": patch +"electron-builder-squirrel-windows": patch +"electron-builder": patch +--- + +chore(dep): upgrading typescript and eslint dependencies