diff --git a/.changeset/short-llamas-fly.md b/.changeset/short-llamas-fly.md new file mode 100644 index 00000000000..1b108895aec --- /dev/null +++ b/.changeset/short-llamas-fly.md @@ -0,0 +1,11 @@ +--- +"app-builder-lib": patch +"builder-util": patch +"builder-util-runtime": patch +"dmg-builder": patch +"electron-builder-squirrel-windows": patch +"electron-publish": patch +"electron-updater": patch +--- + +chore: upgrading connected dependencies (typescript requires higher eslint version) diff --git a/.eslintrc.js b/.eslintrc.js index d5225113d63..833257e3567 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -41,5 +41,6 @@ module.exports = { // "allowExpressions": false, }, ], + "@typescript-eslint/no-redundant-type-constituents": "off" }, } diff --git a/package.json b/package.json index 51b88c73885..265263af56d 100644 --- a/package.json +++ b/package.json @@ -48,14 +48,14 @@ "@changesets/changelog-github": "0.4.7", "@changesets/cli": "2.25.0", "@types/node": "16.18.55", - "@typescript-eslint/eslint-plugin": "5.41.0", - "@typescript-eslint/parser": "5.41.0", + "@typescript-eslint/eslint-plugin": "^7.0.1", + "@typescript-eslint/parser": "^7.0.1", "catharsis": "0.9.0", "conventional-changelog-cli": "2.2.2", "dmd": "6.1.0", - "eslint": "8.26.0", - "eslint-config-prettier": "8.5.0", - "eslint-plugin-prettier": "4.2.1", + "eslint": "^8.56.0", + "eslint-config-prettier": "^9.1.0", + "eslint-plugin-prettier": "^5.1.3", "fs-extra": "10.1.0", "globby": "11.1.0", "husky": "7.0.4", @@ -64,11 +64,11 @@ "lint-staged": "11.1.2", "markdown2html-pro": "1.0.6", "path-sort": "0.1.0", - "prettier": "2.8.0", + "prettier": "3.2.4", "replace-in-file": "6.2.0", "source-map-support": "0.5.21", "ts-jsdoc": "3.2.2", - "typescript": "5.1.6", + "typescript": "5.3.3", "typescript-json-schema": "0.51.0", "v8-compile-cache": "2.3.0" }, diff --git a/packages/app-builder-lib/src/asar/asar.ts b/packages/app-builder-lib/src/asar/asar.ts index f99d63cd413..15674ded1f1 100644 --- a/packages/app-builder-lib/src/asar/asar.ts +++ b/packages/app-builder-lib/src/asar/asar.ts @@ -34,7 +34,11 @@ export class Node { export class AsarFilesystem { private offset = 0 - constructor(readonly src: string, readonly header = new Node(), readonly headerSize: number = -1) { + constructor( + readonly src: string, + readonly header = new Node(), + readonly headerSize: number = -1 + ) { if (this.header.files == null) { this.header.files = {} } diff --git a/packages/app-builder-lib/src/asar/asarUtil.ts b/packages/app-builder-lib/src/asar/asarUtil.ts index 7a85473d554..f6d84988dc2 100644 --- a/packages/app-builder-lib/src/asar/asarUtil.ts +++ b/packages/app-builder-lib/src/asar/asarUtil.ts @@ -20,7 +20,12 @@ export class AsarPackager { private readonly outFile: string private readonly unpackedDest: string - constructor(private readonly src: string, private readonly destination: string, private readonly options: AsarOptions, private readonly unpackPattern: Filter | null) { + constructor( + private readonly src: string, + private readonly destination: string, + private readonly options: AsarOptions, + private readonly unpackPattern: Filter | null + ) { this.outFile = path.join(destination, "app.asar") this.unpackedDest = `${this.outFile}.unpacked` } diff --git a/packages/app-builder-lib/src/core.ts b/packages/app-builder-lib/src/core.ts index 8cafe343180..99c15b8843f 100644 --- a/packages/app-builder-lib/src/core.ts +++ b/packages/app-builder-lib/src/core.ts @@ -23,7 +23,11 @@ export class Platform { static LINUX = new Platform("linux", "linux", "linux") static WINDOWS = new Platform("windows", "win", "win32") - constructor(public name: string, public buildConfigurationKey: string, public nodeName: NodeJS.Platform) {} + constructor( + public name: string, + public buildConfigurationKey: string, + public nodeName: NodeJS.Platform + ) {} toString() { return this.name @@ -71,7 +75,10 @@ export abstract class Target { abstract readonly outDir: string abstract readonly options: TargetSpecificOptions | null | undefined - protected constructor(readonly name: string, readonly isAsyncSupported: boolean = true) {} + protected constructor( + readonly name: string, + readonly isAsyncSupported: boolean = true + ) {} async checkOptions(): Promise { // ignore diff --git a/packages/app-builder-lib/src/electron/ElectronFramework.ts b/packages/app-builder-lib/src/electron/ElectronFramework.ts index d09d9d94819..d47c64bf186 100644 --- a/packages/app-builder-lib/src/electron/ElectronFramework.ts +++ b/packages/app-builder-lib/src/electron/ElectronFramework.ts @@ -131,7 +131,11 @@ class ElectronFramework implements Framework { // noinspection JSUnusedGlobalSymbols readonly isNpmRebuildRequired = true - constructor(readonly name: string, readonly version: string, readonly distMacOsAppName: string) {} + constructor( + readonly name: string, + readonly version: string, + readonly distMacOsAppName: string + ) {} getDefaultIcon(platform: Platform) { if (platform === Platform.LINUX) { diff --git a/packages/app-builder-lib/src/electron/electronVersion.ts b/packages/app-builder-lib/src/electron/electronVersion.ts index 8011162f0fb..07024c94083 100644 --- a/packages/app-builder-lib/src/electron/electronVersion.ts +++ b/packages/app-builder-lib/src/electron/electronVersion.ts @@ -100,7 +100,7 @@ export async function computeElectronVersion(projectDir: string): Promise string, patterns?: Array | string | null | undefined) { + constructor( + from: string, + to: string, + readonly macroExpander: (pattern: string) => string, + patterns?: Array | string | null | undefined + ) { this.from = ensureNoEndSlash(macroExpander(from)) this.to = ensureNoEndSlash(macroExpander(to)) this.patterns = asArray(patterns).map(it => this.normalizePattern(it)) diff --git a/packages/app-builder-lib/src/frameworks/LibUiFramework.ts b/packages/app-builder-lib/src/frameworks/LibUiFramework.ts index 5c8af499ca7..f60c16530fe 100644 --- a/packages/app-builder-lib/src/frameworks/LibUiFramework.ts +++ b/packages/app-builder-lib/src/frameworks/LibUiFramework.ts @@ -22,7 +22,11 @@ export class LibUiFramework implements Framework { // noinspection JSUnusedGlobalSymbols readonly isNpmRebuildRequired = false - constructor(readonly version: string, readonly distMacOsAppName: string, protected readonly isUseLaunchUi: boolean) {} + constructor( + readonly version: string, + readonly distMacOsAppName: string, + protected readonly isUseLaunchUi: boolean + ) {} async prepareApplicationStageDirectory(options: PrepareApplicationStageDirectoryOptions) { await emptyDir(options.appOutDir) diff --git a/packages/app-builder-lib/src/packager.ts b/packages/app-builder-lib/src/packager.ts index 8e5db68faac..5a22d018709 100644 --- a/packages/app-builder-lib/src/packager.ts +++ b/packages/app-builder-lib/src/packager.ts @@ -168,7 +168,10 @@ export class Packager { } //noinspection JSUnusedGlobalSymbols - constructor(options: PackagerOptions, readonly cancellationToken = new CancellationToken()) { + constructor( + options: PackagerOptions, + readonly cancellationToken = new CancellationToken() + ) { if ("devMetadata" in options) { throw new InvalidConfigurationError("devMetadata in the options is deprecated, please use config instead") } diff --git a/packages/app-builder-lib/src/platformPackager.ts b/packages/app-builder-lib/src/platformPackager.ts index c62a75f48c0..70a4aa772bd 100644 --- a/packages/app-builder-lib/src/platformPackager.ts +++ b/packages/app-builder-lib/src/platformPackager.ts @@ -59,7 +59,10 @@ export abstract class PlatformPackager readonly appInfo: AppInfo - protected constructor(readonly info: Packager, readonly platform: Platform) { + protected constructor( + readonly info: Packager, + readonly platform: Platform + ) { this.platformSpecificBuildOptions = PlatformPackager.normalizePlatformSpecificBuildOptions((this.config as any)[platform.buildConfigurationKey]) this.appInfo = this.prepareAppInfo(info.appInfo) } @@ -169,8 +172,8 @@ export abstract class PlatformPackager const base = isResources ? this.getResourcesDir(appOutDir) : this.platform === Platform.MAC - ? path.join(appOutDir, `${this.appInfo.productFilename}.app`, "Contents") - : appOutDir + ? path.join(appOutDir, `${this.appInfo.productFilename}.app`, "Contents") + : appOutDir return getFileMatchers(this.config, isResources ? "extraResources" : "extraFiles", base, options) } @@ -272,8 +275,8 @@ export abstract class PlatformPackager this.platform === Platform.MAC ? path.join(appOutDir, framework.distMacOsAppName, "Contents", "Resources") : isElectronBased(framework) - ? path.join(appOutDir, "resources") - : appOutDir + ? path.join(appOutDir, "resources") + : appOutDir const taskManager = new AsyncTaskManager(this.info.cancellationToken) this.copyAppFiles(taskManager, asarOptions, resourcesPath, path.join(resourcesPath, "app"), packContext, platformSpecificBuildOptions, excludePatterns, macroExpander) await taskManager.awaitTasks() diff --git a/packages/app-builder-lib/src/publish/PublishManager.ts b/packages/app-builder-lib/src/publish/PublishManager.ts index 11c02270afe..9dfd357f600 100644 --- a/packages/app-builder-lib/src/publish/PublishManager.ts +++ b/packages/app-builder-lib/src/publish/PublishManager.ts @@ -62,7 +62,11 @@ export class PublishManager implements PublishContext { private readonly updateFileWriteTask: Array = [] - constructor(private readonly packager: Packager, private readonly publishOptions: PublishOptions, readonly cancellationToken: CancellationToken = packager.cancellationToken) { + constructor( + private readonly packager: Packager, + private readonly publishOptions: PublishOptions, + readonly cancellationToken: CancellationToken = packager.cancellationToken + ) { checkOptions(publishOptions.publish) this.taskManager = new AsyncTaskManager(cancellationToken) diff --git a/packages/app-builder-lib/src/publish/SnapStorePublisher.ts b/packages/app-builder-lib/src/publish/SnapStorePublisher.ts index dd934d28bf5..ca9e02f99cf 100644 --- a/packages/app-builder-lib/src/publish/SnapStorePublisher.ts +++ b/packages/app-builder-lib/src/publish/SnapStorePublisher.ts @@ -6,7 +6,10 @@ import { SnapStoreOptions } from "builder-util-runtime/out/publishOptions" export class SnapStorePublisher extends Publisher { readonly providerName = "snapStore" - constructor(context: PublishContext, private options: SnapStoreOptions) { + constructor( + context: PublishContext, + private options: SnapStoreOptions + ) { super(context) } diff --git a/packages/app-builder-lib/src/publish/s3/BaseS3Publisher.ts b/packages/app-builder-lib/src/publish/s3/BaseS3Publisher.ts index a6576bf3add..e1f418838ac 100644 --- a/packages/app-builder-lib/src/publish/s3/BaseS3Publisher.ts +++ b/packages/app-builder-lib/src/publish/s3/BaseS3Publisher.ts @@ -5,7 +5,10 @@ import { mkdir, symlink } from "fs/promises" import * as path from "path" export abstract class BaseS3Publisher extends Publisher { - protected constructor(context: PublishContext, private options: BaseS3Options) { + protected constructor( + context: PublishContext, + private options: BaseS3Options + ) { super(context) } @@ -29,7 +32,7 @@ export abstract class BaseS3Publisher extends Publisher { this.configureS3Options(args) if (process.env.__TEST_S3_PUBLISHER__ != null) { - const testFile = path.join(process.env.__TEST_S3_PUBLISHER__!, target) + const testFile = path.join(process.env.__TEST_S3_PUBLISHER__, target) await mkdir(path.dirname(testFile), { recursive: true }) await symlink(task.file, testFile) return diff --git a/packages/app-builder-lib/src/publish/s3/s3Publisher.ts b/packages/app-builder-lib/src/publish/s3/s3Publisher.ts index a8714126272..17a8cced9f6 100644 --- a/packages/app-builder-lib/src/publish/s3/s3Publisher.ts +++ b/packages/app-builder-lib/src/publish/s3/s3Publisher.ts @@ -6,7 +6,10 @@ import { BaseS3Publisher } from "./BaseS3Publisher" export default class S3Publisher extends BaseS3Publisher { readonly providerName = "s3" - constructor(context: PublishContext, private readonly info: S3Options) { + constructor( + context: PublishContext, + private readonly info: S3Options + ) { super(context, info) } diff --git a/packages/app-builder-lib/src/publish/s3/spacesPublisher.ts b/packages/app-builder-lib/src/publish/s3/spacesPublisher.ts index 192f90360c6..d9826c0f191 100644 --- a/packages/app-builder-lib/src/publish/s3/spacesPublisher.ts +++ b/packages/app-builder-lib/src/publish/s3/spacesPublisher.ts @@ -6,7 +6,10 @@ import { BaseS3Publisher } from "./BaseS3Publisher" export default class SpacesPublisher extends BaseS3Publisher { readonly providerName = "spaces" - constructor(context: PublishContext, private readonly info: SpacesOptions) { + constructor( + context: PublishContext, + private readonly info: SpacesOptions + ) { super(context, info) } diff --git a/packages/app-builder-lib/src/targets/AppImageTarget.ts b/packages/app-builder-lib/src/targets/AppImageTarget.ts index a0d125ba6a1..7e506a5481f 100644 --- a/packages/app-builder-lib/src/targets/AppImageTarget.ts +++ b/packages/app-builder-lib/src/targets/AppImageTarget.ts @@ -16,7 +16,12 @@ export default class AppImageTarget extends Target { readonly options: AppImageOptions = { ...this.packager.platformSpecificBuildOptions, ...(this.packager.config as any)[this.name] } private readonly desktopEntry: Lazy - constructor(ignored: string, private readonly packager: LinuxPackager, private readonly helper: LinuxTargetHelper, readonly outDir: string) { + constructor( + ignored: string, + private readonly packager: LinuxPackager, + private readonly helper: LinuxTargetHelper, + readonly outDir: string + ) { super("appImage") this.desktopEntry = new Lazy(() => { @@ -49,7 +54,7 @@ export default class AppImageTarget extends Target { createStageDir(this, packager, arch), ]) const license = c[3] - const stageDir = c[4]! + const stageDir = c[4] const publishConfig = c[2] if (publishConfig != null) { diff --git a/packages/app-builder-lib/src/targets/AppxTarget.ts b/packages/app-builder-lib/src/targets/AppxTarget.ts index 7eebcbb78f8..87726951902 100644 --- a/packages/app-builder-lib/src/targets/AppxTarget.ts +++ b/packages/app-builder-lib/src/targets/AppxTarget.ts @@ -25,7 +25,10 @@ const DEFAULT_RESOURCE_LANG = "en-US" export default class AppXTarget extends Target { readonly options: AppXOptions = deepAssign({}, this.packager.platformSpecificBuildOptions, this.packager.config.appx) - constructor(private readonly packager: WinPackager, readonly outDir: string) { + constructor( + private readonly packager: WinPackager, + readonly outDir: string + ) { super("appx") if (process.platform !== "darwin" && (process.platform !== "win32" || isOldWin6())) { diff --git a/packages/app-builder-lib/src/targets/ArchiveTarget.ts b/packages/app-builder-lib/src/targets/ArchiveTarget.ts index 14c05649688..ce78eeff467 100644 --- a/packages/app-builder-lib/src/targets/ArchiveTarget.ts +++ b/packages/app-builder-lib/src/targets/ArchiveTarget.ts @@ -9,7 +9,12 @@ import { appendBlockmap, createBlockmap } from "./differentialUpdateInfoBuilder" export class ArchiveTarget extends Target { readonly options: TargetSpecificOptions = (this.packager.config as any)[this.name] - constructor(name: string, readonly outDir: string, private readonly packager: PlatformPackager, private readonly isWriteUpdateInfo = false) { + constructor( + name: string, + readonly outDir: string, + private readonly packager: PlatformPackager, + private readonly isWriteUpdateInfo = false + ) { super(name) } diff --git a/packages/app-builder-lib/src/targets/FlatpakTarget.ts b/packages/app-builder-lib/src/targets/FlatpakTarget.ts index 24e28542ae9..21fad89e790 100644 --- a/packages/app-builder-lib/src/targets/FlatpakTarget.ts +++ b/packages/app-builder-lib/src/targets/FlatpakTarget.ts @@ -15,7 +15,12 @@ export default class FlatpakTarget extends Target { ...(this.packager.config as any)[this.name], } - constructor(name: string, private readonly packager: LinuxPackager, private helper: LinuxTargetHelper, readonly outDir: string) { + constructor( + name: string, + private readonly packager: LinuxPackager, + private helper: LinuxTargetHelper, + readonly outDir: string + ) { super(name) } diff --git a/packages/app-builder-lib/src/targets/FpmTarget.ts b/packages/app-builder-lib/src/targets/FpmTarget.ts index bdd83080ced..9571122a5ae 100644 --- a/packages/app-builder-lib/src/targets/FpmTarget.ts +++ b/packages/app-builder-lib/src/targets/FpmTarget.ts @@ -31,7 +31,12 @@ export default class FpmTarget extends Target { private readonly scriptFiles: Promise> - constructor(name: string, private readonly packager: LinuxPackager, private readonly helper: LinuxTargetHelper, readonly outDir: string) { + constructor( + name: string, + private readonly packager: LinuxPackager, + private readonly helper: LinuxTargetHelper, + readonly outDir: string + ) { super(name, false) this.scriptFiles = this.createScripts() @@ -150,7 +155,7 @@ export default class FpmTarget extends Target { "--after-remove", scripts[1], "--description", - smarten(target === "rpm" ? this.helper.getDescription(options)! : `${synopsis || ""}\n ${this.helper.getDescription(options)}`), + smarten(target === "rpm" ? this.helper.getDescription(options) : `${synopsis || ""}\n ${this.helper.getDescription(options)}`), "--version", this.helper.getSanitizedVersion(target), "--package", diff --git a/packages/app-builder-lib/src/targets/MsiTarget.ts b/packages/app-builder-lib/src/targets/MsiTarget.ts index 988e4a5081b..389c9ca1ab1 100644 --- a/packages/app-builder-lib/src/targets/MsiTarget.ts +++ b/packages/app-builder-lib/src/targets/MsiTarget.ts @@ -27,7 +27,12 @@ export default class MsiTarget extends Target { readonly options: MsiOptions = deepAssign(this.packager.platformSpecificBuildOptions, this.packager.config.msi) - constructor(protected readonly packager: WinPackager, readonly outDir: string, name = "msi", isAsyncSupported = true) { + constructor( + protected readonly packager: WinPackager, + readonly outDir: string, + name = "msi", + isAsyncSupported = true + ) { super(name, isAsyncSupported) } diff --git a/packages/app-builder-lib/src/targets/MsiWrappedTarget.ts b/packages/app-builder-lib/src/targets/MsiWrappedTarget.ts index e657f8dc005..63dac3f557b 100644 --- a/packages/app-builder-lib/src/targets/MsiWrappedTarget.ts +++ b/packages/app-builder-lib/src/targets/MsiWrappedTarget.ts @@ -15,7 +15,10 @@ export default class MsiWrappedTarget extends MsiTarget { /** @private */ private readonly archs: Map = new Map() - constructor(packager: WinPackager, readonly outDir: string) { + constructor( + packager: WinPackager, + readonly outDir: string + ) { // must be synchronous so it can run after nsis super(packager, outDir, "msiWrapped", false) } diff --git a/packages/app-builder-lib/src/targets/archive.ts b/packages/app-builder-lib/src/targets/archive.ts index 30fdc5c0fe8..d1c14bbe9d4 100644 --- a/packages/app-builder-lib/src/targets/archive.ts +++ b/packages/app-builder-lib/src/targets/archive.ts @@ -9,14 +9,7 @@ import { getLinuxToolsPath } from "./tools" import { getPath7za } from "builder-util" /** @internal */ -export async function tar( - compression: CompressionLevel | any | any, - format: string, - outFile: string, - dirToArchive: string, - isMacApp: boolean, - tempDirManager: TmpDir -): Promise { +export async function tar(compression: CompressionLevel | any, format: string, outFile: string, dirToArchive: string, isMacApp: boolean, tempDirManager: TmpDir): Promise { const tarFile = await tempDirManager.getTempFile({ suffix: ".tar" }) const tarArgs: CreateOptions & FileOptions = { file: tarFile, diff --git a/packages/app-builder-lib/src/targets/nsis/NsisTarget.ts b/packages/app-builder-lib/src/targets/nsis/NsisTarget.ts index 69e1e40e8cc..0f8b17fbbbf 100644 --- a/packages/app-builder-lib/src/targets/nsis/NsisTarget.ts +++ b/packages/app-builder-lib/src/targets/nsis/NsisTarget.ts @@ -43,7 +43,12 @@ export class NsisTarget extends Target { readonly archs: Map = new Map() readonly isAsyncSupported = false - constructor(readonly packager: WinPackager, readonly outDir: string, targetName: string, protected readonly packageHelper: AppPackageHelper) { + constructor( + readonly packager: WinPackager, + readonly outDir: string, + targetName: string, + protected readonly packageHelper: AppPackageHelper + ) { super(targetName) this.packageHelper.refCount++ @@ -564,7 +569,7 @@ export class NsisTarget extends Target { const args: Array = this.options.warningsAsErrors === false ? [] : ["-WX"] args.push("-INPUTCHARSET", "UTF8") for (const name of Object.keys(defines)) { - const value = defines[name as keyof Defines] + const value: any = defines[name as keyof Defines] if (value == null) { args.push(`-D${name}`) } else { diff --git a/packages/app-builder-lib/src/targets/pkg.ts b/packages/app-builder-lib/src/targets/pkg.ts index 16df3a18cbd..32d776c60e1 100644 --- a/packages/app-builder-lib/src/targets/pkg.ts +++ b/packages/app-builder-lib/src/targets/pkg.ts @@ -24,7 +24,10 @@ export class PkgTarget extends Target { ...this.packager.config.pkg, } - constructor(private readonly packager: MacPackager, readonly outDir: string) { + constructor( + private readonly packager: MacPackager, + readonly outDir: string + ) { super("pkg") } diff --git a/packages/app-builder-lib/src/targets/snap.ts b/packages/app-builder-lib/src/targets/snap.ts index fea7fa6b4ed..1a007cb451c 100644 --- a/packages/app-builder-lib/src/targets/snap.ts +++ b/packages/app-builder-lib/src/targets/snap.ts @@ -19,7 +19,12 @@ export default class SnapTarget extends Target { public isUseTemplateApp = false - constructor(name: string, private readonly packager: LinuxPackager, private readonly helper: LinuxTargetHelper, readonly outDir: string) { + constructor( + name: string, + private readonly packager: LinuxPackager, + private readonly helper: LinuxTargetHelper, + readonly outDir: string + ) { super(name) } diff --git a/packages/app-builder-lib/src/util/AppFileWalker.ts b/packages/app-builder-lib/src/util/AppFileWalker.ts index 4fc9d8155a7..75058b06334 100644 --- a/packages/app-builder-lib/src/util/AppFileWalker.ts +++ b/packages/app-builder-lib/src/util/AppFileWalker.ts @@ -16,7 +16,11 @@ function addAllPatternIfNeed(matcher: FileMatcher) { export abstract class FileCopyHelper { readonly metadata = new Map() - protected constructor(protected readonly matcher: FileMatcher, readonly filter: Filter | null, protected readonly packager: Packager) {} + protected constructor( + protected readonly matcher: FileMatcher, + readonly filter: Filter | null, + protected readonly packager: Packager + ) {} protected handleFile(file: string, parent: string, fileStat: Stats): Promise | null { if (!fileStat.isSymbolicLink()) { diff --git a/packages/app-builder-lib/src/util/cacheManager.ts b/packages/app-builder-lib/src/util/cacheManager.ts index 078dca7d667..307813f4313 100644 --- a/packages/app-builder-lib/src/util/cacheManager.ts +++ b/packages/app-builder-lib/src/util/cacheManager.ts @@ -22,7 +22,11 @@ export class BuildCacheManager { private newDigest: string | null = null - constructor(outDir: string, private readonly executableFile: string, arch: Arch) { + constructor( + outDir: string, + private readonly executableFile: string, + arch: Arch + ) { this.cacheDir = path.join(outDir, ".cache", Arch[arch]) this.cacheFile = path.join(this.cacheDir, "app.exe") this.cacheInfoFile = path.join(this.cacheDir, "info.json") diff --git a/packages/builder-util-runtime/src/ProgressCallbackTransform.ts b/packages/builder-util-runtime/src/ProgressCallbackTransform.ts index 4df91bbe782..39fd25ea75a 100644 --- a/packages/builder-util-runtime/src/ProgressCallbackTransform.ts +++ b/packages/builder-util-runtime/src/ProgressCallbackTransform.ts @@ -16,7 +16,11 @@ export class ProgressCallbackTransform extends Transform { private nextUpdate = this.start + 1000 - constructor(private readonly total: number, private readonly cancellationToken: CancellationToken, private readonly onProgress: (info: ProgressInfo) => any) { + constructor( + private readonly total: number, + private readonly cancellationToken: CancellationToken, + private readonly onProgress: (info: ProgressInfo) => any + ) { super() } diff --git a/packages/builder-util-runtime/src/httpExecutor.ts b/packages/builder-util-runtime/src/httpExecutor.ts index a327a0fc82d..74cd971e25a 100644 --- a/packages/builder-util-runtime/src/httpExecutor.ts +++ b/packages/builder-util-runtime/src/httpExecutor.ts @@ -54,7 +54,11 @@ const HTTP_STATUS_CODES = new Map([ ]) export class HttpError extends Error { - constructor(readonly statusCode: number, message = `HTTP error: ${HTTP_STATUS_CODES.get(statusCode) || statusCode}`, readonly description: any | null = null) { + constructor( + readonly statusCode: number, + message = `HTTP error: ${HTTP_STATUS_CODES.get(statusCode) || statusCode}`, + readonly description: any | null = null + ) { super(message) this.name = "HttpError" @@ -375,7 +379,11 @@ export class DigestTransform extends Transform { isValidateOnEnd = true - constructor(readonly expected: string, private readonly algorithm: string = "sha512", private readonly encoding: BinaryToTextEncoding = "base64") { + constructor( + readonly expected: string, + private readonly algorithm: string = "sha512", + private readonly encoding: BinaryToTextEncoding = "base64" + ) { super() this.digester = createHash(algorithm) diff --git a/packages/builder-util/src/asyncTaskManager.ts b/packages/builder-util/src/asyncTaskManager.ts index f27ca28b8d7..992fb5a7cdd 100644 --- a/packages/builder-util/src/asyncTaskManager.ts +++ b/packages/builder-util/src/asyncTaskManager.ts @@ -73,6 +73,7 @@ export class AsyncTaskManager { return [] } + // eslint-disable-next-line @typescript-eslint/no-floating-promises list = tasks.slice() tasks.length = 0 } diff --git a/packages/builder-util/src/fs.ts b/packages/builder-util/src/fs.ts index bdf71c580c0..ba18ae06011 100644 --- a/packages/builder-util/src/fs.ts +++ b/packages/builder-util/src/fs.ts @@ -212,7 +212,10 @@ function doCopyFile(src: string, dest: string, stats: Stats | null | undefined): export class FileCopier { isUseHardLink: boolean - constructor(private readonly isUseHardLinkFunction?: ((file: string) => boolean) | null, private readonly transformer?: FileTransformer | null) { + constructor( + private readonly isUseHardLinkFunction?: ((file: string) => boolean) | null, + private readonly transformer?: FileTransformer | null + ) { if (isUseHardLinkFunction === USE_HARD_LINKS) { this.isUseHardLink = true } else { diff --git a/packages/builder-util/src/util.ts b/packages/builder-util/src/util.ts index 9003a6504af..f89fc610854 100644 --- a/packages/builder-util/src/util.ts +++ b/packages/builder-util/src/util.ts @@ -261,7 +261,13 @@ function formatOut(text: string, title: string) { export class ExecError extends Error { alreadyLogged = false - constructor(command: string, readonly exitCode: number, out: string, errorOut: string, code = "ERR_ELECTRON_BUILDER_CANNOT_EXECUTE") { + constructor( + command: string, + readonly exitCode: number, + out: string, + errorOut: string, + code = "ERR_ELECTRON_BUILDER_CANNOT_EXECUTE" + ) { super(`${command} process failed ${code}${formatOut(String(exitCode), "Exit code")}${formatOut(out, "Output")}${formatOut(errorOut, "Error output")}`) ;(this as NodeJS.ErrnoException).code = code } diff --git a/packages/dmg-builder/src/dmg.ts b/packages/dmg-builder/src/dmg.ts index 90c766b5d8e..bdedad28367 100644 --- a/packages/dmg-builder/src/dmg.ts +++ b/packages/dmg-builder/src/dmg.ts @@ -17,7 +17,10 @@ import { release as getOsRelease } from "os" export class DmgTarget extends Target { readonly options: DmgOptions = this.packager.config.dmg || Object.create(null) - constructor(private readonly packager: MacPackager, readonly outDir: string) { + constructor( + private readonly packager: MacPackager, + readonly outDir: string + ) { super("dmg") } diff --git a/packages/electron-builder-squirrel-windows/src/SquirrelWindowsTarget.ts b/packages/electron-builder-squirrel-windows/src/SquirrelWindowsTarget.ts index 29b4be11aff..a31b7868ddd 100644 --- a/packages/electron-builder-squirrel-windows/src/SquirrelWindowsTarget.ts +++ b/packages/electron-builder-squirrel-windows/src/SquirrelWindowsTarget.ts @@ -10,7 +10,10 @@ export default class SquirrelWindowsTarget extends Target { //tslint:disable-next-line:no-object-literal-type-assertion readonly options: SquirrelWindowsOptions = { ...this.packager.platformSpecificBuildOptions, ...this.packager.config.squirrelWindows } as SquirrelWindowsOptions - constructor(private readonly packager: WinPackager, readonly outDir: string) { + constructor( + private readonly packager: WinPackager, + readonly outDir: string + ) { super("squirrel") } diff --git a/packages/electron-builder-squirrel-windows/src/squirrelPack.ts b/packages/electron-builder-squirrel-windows/src/squirrelPack.ts index 6bc348aa944..fcf3b74c7de 100644 --- a/packages/electron-builder-squirrel-windows/src/squirrelPack.ts +++ b/packages/electron-builder-squirrel-windows/src/squirrelPack.ts @@ -52,7 +52,11 @@ export interface OutFileNames { } export class SquirrelBuilder { - constructor(private readonly options: SquirrelOptions, private readonly outputDirectory: string, private readonly packager: WinPackager) {} + constructor( + private readonly options: SquirrelOptions, + private readonly outputDirectory: string, + private readonly packager: WinPackager + ) {} async buildInstaller(outFileNames: OutFileNames, appOutDir: string, outDir: string, arch: Arch) { const packager = this.packager diff --git a/packages/electron-publish/src/gitHubPublisher.ts b/packages/electron-publish/src/gitHubPublisher.ts index ed372af8b14..641f0725092 100644 --- a/packages/electron-publish/src/gitHubPublisher.ts +++ b/packages/electron-publish/src/gitHubPublisher.ts @@ -37,7 +37,12 @@ export class GitHubPublisher extends HttpPublisher { private releaseLogFields: Fields | null = null - constructor(context: PublishContext, private readonly info: GithubOptions, private readonly version: string, private readonly options: PublishOptions = {}) { + constructor( + context: PublishContext, + private readonly info: GithubOptions, + private readonly version: string, + private readonly options: PublishOptions = {} + ) { super(context, true) let token = info.token diff --git a/packages/electron-publish/src/progress.ts b/packages/electron-publish/src/progress.ts index 6b2cebc91b6..d2c31e465db 100644 --- a/packages/electron-publish/src/progress.ts +++ b/packages/electron-publish/src/progress.ts @@ -43,7 +43,10 @@ export abstract class ProgressBar { * - `:eta` eta in seconds * - `:rate` rate of ticks per second */ - constructor(private readonly format: string, options: any = {}) { + constructor( + private readonly format: string, + options: any = {} + ) { this.stream = options.stream || process.stderr this.total = options.total diff --git a/packages/electron-publish/src/publisher.ts b/packages/electron-publish/src/publisher.ts index c560785eb77..4a6f9127479 100644 --- a/packages/electron-publish/src/publisher.ts +++ b/packages/electron-publish/src/publisher.ts @@ -70,7 +70,10 @@ export abstract class Publisher { } export abstract class HttpPublisher extends Publisher { - protected constructor(protected readonly context: PublishContext, private readonly useSafeArtifactName = false) { + protected constructor( + protected readonly context: PublishContext, + private readonly useSafeArtifactName = false + ) { super(context) } diff --git a/packages/electron-updater/src/AppUpdater.ts b/packages/electron-updater/src/AppUpdater.ts index 8aae97272d0..ffbcdcf147a 100644 --- a/packages/electron-updater/src/AppUpdater.ts +++ b/packages/electron-updater/src/AppUpdater.ts @@ -433,7 +433,7 @@ export abstract class AppUpdater extends (EventEmitter as new () => TypedEmitter const updateInfo = result.info if (!(await this.isUpdateAvailable(updateInfo))) { this._logger.info( - `Update for version ${this.currentVersion} is not available (latest version: ${updateInfo.version}, downgrade is ${this.allowDowngrade ? "allowed" : "disallowed"}).` + `Update for version ${this.currentVersion.format()} is not available (latest version: ${updateInfo.version}, downgrade is ${this.allowDowngrade ? "allowed" : "disallowed"}).` ) this.emit("update-not-available", updateInfo) return { diff --git a/packages/electron-updater/src/differentialDownloader/DifferentialDownloader.ts b/packages/electron-updater/src/differentialDownloader/DifferentialDownloader.ts index 2394d5df1ec..dea23481dfc 100644 --- a/packages/electron-updater/src/differentialDownloader/DifferentialDownloader.ts +++ b/packages/electron-updater/src/differentialDownloader/DifferentialDownloader.ts @@ -31,7 +31,11 @@ export abstract class DifferentialDownloader { private readonly logger: Logger // noinspection TypeScriptAbstractClassConstructorCanBeMadeProtected - constructor(protected readonly blockAwareFileInfo: BlockMapDataHolder, readonly httpExecutor: HttpExecutor, readonly options: DifferentialDownloaderOptions) { + constructor( + protected readonly blockAwareFileInfo: BlockMapDataHolder, + readonly httpExecutor: HttpExecutor, + readonly options: DifferentialDownloaderOptions + ) { this.logger = options.logger } diff --git a/packages/electron-updater/src/providers/BitbucketProvider.ts b/packages/electron-updater/src/providers/BitbucketProvider.ts index 0d420665f4f..2ff206396fa 100644 --- a/packages/electron-updater/src/providers/BitbucketProvider.ts +++ b/packages/electron-updater/src/providers/BitbucketProvider.ts @@ -7,7 +7,11 @@ import { parseUpdateInfo, Provider, ProviderRuntimeOptions, resolveFiles } from export class BitbucketProvider extends Provider { private readonly baseUrl: URL - constructor(private readonly configuration: BitbucketOptions, private readonly updater: AppUpdater, runtimeOptions: ProviderRuntimeOptions) { + constructor( + private readonly configuration: BitbucketOptions, + private readonly updater: AppUpdater, + runtimeOptions: ProviderRuntimeOptions + ) { super({ ...runtimeOptions, isUseMultipleRangeRequest: false, diff --git a/packages/electron-updater/src/providers/GenericProvider.ts b/packages/electron-updater/src/providers/GenericProvider.ts index 5beff36ae61..aa1dbed35c4 100644 --- a/packages/electron-updater/src/providers/GenericProvider.ts +++ b/packages/electron-updater/src/providers/GenericProvider.ts @@ -7,7 +7,11 @@ import { parseUpdateInfo, Provider, ProviderRuntimeOptions, resolveFiles } from export class GenericProvider extends Provider { private readonly baseUrl = newBaseUrl(this.configuration.url) - constructor(private readonly configuration: GenericServerOptions, private readonly updater: AppUpdater, runtimeOptions: ProviderRuntimeOptions) { + constructor( + private readonly configuration: GenericServerOptions, + private readonly updater: AppUpdater, + runtimeOptions: ProviderRuntimeOptions + ) { super(runtimeOptions) } diff --git a/packages/electron-updater/src/providers/GitHubProvider.ts b/packages/electron-updater/src/providers/GitHubProvider.ts index c0494fd55f5..1b15b6ff71c 100644 --- a/packages/electron-updater/src/providers/GitHubProvider.ts +++ b/packages/electron-updater/src/providers/GitHubProvider.ts @@ -16,7 +16,11 @@ export abstract class BaseGitHubProvider extends Provider< protected readonly baseUrl: URL protected readonly baseApiUrl: URL - protected constructor(protected readonly options: GithubOptions, defaultHost: string, runtimeOptions: ProviderRuntimeOptions) { + protected constructor( + protected readonly options: GithubOptions, + defaultHost: string, + runtimeOptions: ProviderRuntimeOptions + ) { super({ ...runtimeOptions, /* because GitHib uses S3 */ @@ -36,7 +40,11 @@ export abstract class BaseGitHubProvider extends Provider< } export class GitHubProvider extends BaseGitHubProvider { - constructor(protected readonly options: GithubOptions, private readonly updater: AppUpdater, runtimeOptions: ProviderRuntimeOptions) { + constructor( + protected readonly options: GithubOptions, + private readonly updater: AppUpdater, + runtimeOptions: ProviderRuntimeOptions + ) { super(options, "github.com", runtimeOptions) } diff --git a/packages/electron-updater/src/providers/KeygenProvider.ts b/packages/electron-updater/src/providers/KeygenProvider.ts index b9342c0d89b..3e07fc36211 100644 --- a/packages/electron-updater/src/providers/KeygenProvider.ts +++ b/packages/electron-updater/src/providers/KeygenProvider.ts @@ -7,7 +7,11 @@ import { parseUpdateInfo, Provider, ProviderRuntimeOptions, resolveFiles } from export class KeygenProvider extends Provider { private readonly baseUrl: URL - constructor(private readonly configuration: KeygenOptions, private readonly updater: AppUpdater, runtimeOptions: ProviderRuntimeOptions) { + constructor( + private readonly configuration: KeygenOptions, + private readonly updater: AppUpdater, + runtimeOptions: ProviderRuntimeOptions + ) { super({ ...runtimeOptions, isUseMultipleRangeRequest: false, diff --git a/packages/electron-updater/src/providers/PrivateGitHubProvider.ts b/packages/electron-updater/src/providers/PrivateGitHubProvider.ts index 81b5ecb91a4..94558de95be 100644 --- a/packages/electron-updater/src/providers/PrivateGitHubProvider.ts +++ b/packages/electron-updater/src/providers/PrivateGitHubProvider.ts @@ -14,7 +14,12 @@ export interface PrivateGitHubUpdateInfo extends UpdateInfo { } export class PrivateGitHubProvider extends BaseGitHubProvider { - constructor(options: GithubOptions, private readonly updater: AppUpdater, private readonly token: string, runtimeOptions: ProviderRuntimeOptions) { + constructor( + options: GithubOptions, + private readonly updater: AppUpdater, + private readonly token: string, + runtimeOptions: ProviderRuntimeOptions + ) { super(options, "api.github.com", runtimeOptions) } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e8c6548efa2..f5269f38ea8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -30,11 +30,11 @@ importers: specifier: 16.18.55 version: 16.18.55 '@typescript-eslint/eslint-plugin': - specifier: 5.41.0 - version: 5.41.0(@typescript-eslint/parser@5.41.0)(eslint@8.26.0)(typescript@5.1.6) + specifier: ^7.0.1 + version: 7.0.1(@typescript-eslint/parser@7.0.1)(eslint@8.56.0)(typescript@5.3.3) '@typescript-eslint/parser': - specifier: 5.41.0 - version: 5.41.0(eslint@8.26.0)(typescript@5.1.6) + specifier: ^7.0.1 + version: 7.0.1(eslint@8.56.0)(typescript@5.3.3) catharsis: specifier: 0.9.0 version: 0.9.0 @@ -45,14 +45,14 @@ importers: specifier: 6.1.0 version: 6.1.0 eslint: - specifier: 8.26.0 - version: 8.26.0 + specifier: ^8.56.0 + version: 8.56.0 eslint-config-prettier: - specifier: 8.5.0 - version: 8.5.0(eslint@8.26.0) + specifier: ^9.1.0 + version: 9.1.0(eslint@8.56.0) eslint-plugin-prettier: - specifier: 4.2.1 - version: 4.2.1(eslint-config-prettier@8.5.0)(eslint@8.26.0)(prettier@2.8.0) + specifier: ^5.1.3 + version: 5.1.3(eslint-config-prettier@9.1.0)(eslint@8.56.0)(prettier@3.2.4) fs-extra: specifier: 10.1.0 version: 10.1.0 @@ -78,8 +78,8 @@ importers: specifier: 0.1.0 version: 0.1.0 prettier: - specifier: 2.8.0 - version: 2.8.0 + specifier: 3.2.4 + version: 3.2.4 replace-in-file: specifier: 6.2.0 version: 6.2.0 @@ -88,10 +88,10 @@ importers: version: 0.5.21 ts-jsdoc: specifier: 3.2.2 - version: 3.2.2(typescript@5.1.6) + version: 3.2.2(typescript@5.3.3) typescript: - specifier: 5.1.6 - version: 5.1.6 + specifier: 5.3.3 + version: 5.3.3 typescript-json-schema: specifier: 0.51.0 version: 0.51.0 @@ -2284,8 +2284,23 @@ packages: - supports-color dev: false - /@eslint/eslintrc@1.4.1: - resolution: {integrity: sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==} + /@eslint-community/eslint-utils@4.4.0(eslint@8.56.0): + resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + peerDependencies: + eslint: ^6.0.0 || ^7.0.0 || >=8.0.0 + dependencies: + eslint: 8.56.0 + eslint-visitor-keys: 3.4.3 + dev: true + + /@eslint-community/regexpp@4.10.0: + resolution: {integrity: sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==} + engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} + dev: true + + /@eslint/eslintrc@2.1.4: + resolution: {integrity: sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: ajv: 6.12.6 @@ -2301,11 +2316,16 @@ packages: - supports-color dev: true - /@humanwhocodes/config-array@0.11.11: - resolution: {integrity: sha512-N2brEuAadi0CcdeMXUkhbZB84eskAc8MEX1By6qEchoVywSgXPIjou4rYsl0V3Hj0ZnuGycGCjdNgockbzeWNA==} + /@eslint/js@8.56.0: + resolution: {integrity: sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + dev: true + + /@humanwhocodes/config-array@0.11.14: + resolution: {integrity: sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==} engines: {node: '>=10.10.0'} dependencies: - '@humanwhocodes/object-schema': 1.2.1 + '@humanwhocodes/object-schema': 2.0.2 debug: 4.3.4 minimatch: 3.1.2 transitivePeerDependencies: @@ -2317,8 +2337,8 @@ packages: engines: {node: '>=12.22'} dev: true - /@humanwhocodes/object-schema@1.2.1: - resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==} + /@humanwhocodes/object-schema@2.0.2: + resolution: {integrity: sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==} dev: true /@hutson/parse-repository-url@3.0.2: @@ -2653,6 +2673,11 @@ packages: fastq: 1.15.0 dev: true + /@pkgr/core@0.1.1: + resolution: {integrity: sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==} + engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0} + dev: true + /@sinonjs/commons@1.8.6: resolution: {integrity: sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==} dependencies: @@ -2928,134 +2953,142 @@ packages: '@types/yargs-parser': 21.0.0 dev: true - /@typescript-eslint/eslint-plugin@5.41.0(@typescript-eslint/parser@5.41.0)(eslint@8.26.0)(typescript@5.1.6): - resolution: {integrity: sha512-DXUS22Y57/LAFSg3x7Vi6RNAuLpTXwxB9S2nIA7msBb/Zt8p7XqMwdpdc1IU7CkOQUPgAqR5fWvxuKCbneKGmA==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + /@typescript-eslint/eslint-plugin@7.0.1(@typescript-eslint/parser@7.0.1)(eslint@8.56.0)(typescript@5.3.3): + resolution: {integrity: sha512-OLvgeBv3vXlnnJGIAgCLYKjgMEU+wBGj07MQ/nxAaON+3mLzX7mJbhRYrVGiVvFiXtwFlkcBa/TtmglHy0UbzQ==} + engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: - '@typescript-eslint/parser': ^5.0.0 - eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 + '@typescript-eslint/parser': ^7.0.0 + eslint: ^8.56.0 typescript: '*' peerDependenciesMeta: typescript: optional: true dependencies: - '@typescript-eslint/parser': 5.41.0(eslint@8.26.0)(typescript@5.1.6) - '@typescript-eslint/scope-manager': 5.41.0 - '@typescript-eslint/type-utils': 5.41.0(eslint@8.26.0)(typescript@5.1.6) - '@typescript-eslint/utils': 5.41.0(eslint@8.26.0)(typescript@5.1.6) + '@eslint-community/regexpp': 4.10.0 + '@typescript-eslint/parser': 7.0.1(eslint@8.56.0)(typescript@5.3.3) + '@typescript-eslint/scope-manager': 7.0.1 + '@typescript-eslint/type-utils': 7.0.1(eslint@8.56.0)(typescript@5.3.3) + '@typescript-eslint/utils': 7.0.1(eslint@8.56.0)(typescript@5.3.3) + '@typescript-eslint/visitor-keys': 7.0.1 debug: 4.3.4 - eslint: 8.26.0 + eslint: 8.56.0 + graphemer: 1.4.0 ignore: 5.2.4 - regexpp: 3.2.0 + natural-compare: 1.4.0 semver: 7.5.4 - tsutils: 3.21.0(typescript@5.1.6) - typescript: 5.1.6 + ts-api-utils: 1.2.1(typescript@5.3.3) + typescript: 5.3.3 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/parser@5.41.0(eslint@8.26.0)(typescript@5.1.6): - resolution: {integrity: sha512-HQVfix4+RL5YRWZboMD1pUfFN8MpRH4laziWkkAzyO1fvNOY/uinZcvo3QiFJVS/siNHupV8E5+xSwQZrl6PZA==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + /@typescript-eslint/parser@7.0.1(eslint@8.56.0)(typescript@5.3.3): + resolution: {integrity: sha512-8GcRRZNzaHxKzBPU3tKtFNing571/GwPBeCvmAUw0yBtfE2XVd0zFKJIMSWkHJcPQi0ekxjIts6L/rrZq5cxGQ==} + engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: - eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 + eslint: ^8.56.0 typescript: '*' peerDependenciesMeta: typescript: optional: true dependencies: - '@typescript-eslint/scope-manager': 5.41.0 - '@typescript-eslint/types': 5.41.0 - '@typescript-eslint/typescript-estree': 5.41.0(typescript@5.1.6) + '@typescript-eslint/scope-manager': 7.0.1 + '@typescript-eslint/types': 7.0.1 + '@typescript-eslint/typescript-estree': 7.0.1(typescript@5.3.3) + '@typescript-eslint/visitor-keys': 7.0.1 debug: 4.3.4 - eslint: 8.26.0 - typescript: 5.1.6 + eslint: 8.56.0 + typescript: 5.3.3 transitivePeerDependencies: - supports-color dev: true - /@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} + /@typescript-eslint/scope-manager@7.0.1: + resolution: {integrity: sha512-v7/T7As10g3bcWOOPAcbnMDuvctHzCFYCG/8R4bK4iYzdFqsZTbXGln0cZNVcwQcwewsYU2BJLay8j0/4zOk4w==} + engines: {node: ^16.0.0 || >=18.0.0} dependencies: - '@typescript-eslint/types': 5.41.0 - '@typescript-eslint/visitor-keys': 5.41.0 + '@typescript-eslint/types': 7.0.1 + '@typescript-eslint/visitor-keys': 7.0.1 dev: true - /@typescript-eslint/type-utils@5.41.0(eslint@8.26.0)(typescript@5.1.6): - resolution: {integrity: sha512-L30HNvIG6A1Q0R58e4hu4h+fZqaO909UcnnPbwKiN6Rc3BUEx6ez2wgN7aC0cBfcAjZfwkzE+E2PQQ9nEuoqfA==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + /@typescript-eslint/type-utils@7.0.1(eslint@8.56.0)(typescript@5.3.3): + resolution: {integrity: sha512-YtT9UcstTG5Yqy4xtLiClm1ZpM/pWVGFnkAa90UfdkkZsR1eP2mR/1jbHeYp8Ay1l1JHPyGvoUYR6o3On5Nhmw==} + engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: - eslint: '*' + eslint: ^8.56.0 typescript: '*' peerDependenciesMeta: typescript: optional: true dependencies: - '@typescript-eslint/typescript-estree': 5.41.0(typescript@5.1.6) - '@typescript-eslint/utils': 5.41.0(eslint@8.26.0)(typescript@5.1.6) + '@typescript-eslint/typescript-estree': 7.0.1(typescript@5.3.3) + '@typescript-eslint/utils': 7.0.1(eslint@8.56.0)(typescript@5.3.3) debug: 4.3.4 - eslint: 8.26.0 - tsutils: 3.21.0(typescript@5.1.6) - typescript: 5.1.6 + eslint: 8.56.0 + ts-api-utils: 1.2.1(typescript@5.3.3) + typescript: 5.3.3 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/types@5.41.0: - resolution: {integrity: sha512-5BejraMXMC+2UjefDvrH0Fo/eLwZRV6859SXRg+FgbhA0R0l6lDqDGAQYhKbXhPN2ofk2kY5sgGyLNL907UXpA==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + /@typescript-eslint/types@7.0.1: + resolution: {integrity: sha512-uJDfmirz4FHib6ENju/7cz9SdMSkeVvJDK3VcMFvf/hAShg8C74FW+06MaQPODHfDJp/z/zHfgawIJRjlu0RLg==} + engines: {node: ^16.0.0 || >=18.0.0} dev: true - /@typescript-eslint/typescript-estree@5.41.0(typescript@5.1.6): - resolution: {integrity: sha512-SlzFYRwFSvswzDSQ/zPkIWcHv8O5y42YUskko9c4ki+fV6HATsTODUPbRbcGDFYP86gaJL5xohUEytvyNNcXWg==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + /@typescript-eslint/typescript-estree@7.0.1(typescript@5.3.3): + resolution: {integrity: sha512-SO9wHb6ph0/FN5OJxH4MiPscGah5wjOd0RRpaLvuBv9g8565Fgu0uMySFEPqwPHiQU90yzJ2FjRYKGrAhS1xig==} + engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: typescript: '*' peerDependenciesMeta: typescript: optional: true dependencies: - '@typescript-eslint/types': 5.41.0 - '@typescript-eslint/visitor-keys': 5.41.0 + '@typescript-eslint/types': 7.0.1 + '@typescript-eslint/visitor-keys': 7.0.1 debug: 4.3.4 globby: 11.1.0 is-glob: 4.0.3 + minimatch: 9.0.3 semver: 7.5.4 - tsutils: 3.21.0(typescript@5.1.6) - typescript: 5.1.6 + ts-api-utils: 1.2.1(typescript@5.3.3) + typescript: 5.3.3 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/utils@5.41.0(eslint@8.26.0)(typescript@5.1.6): - resolution: {integrity: sha512-QlvfwaN9jaMga9EBazQ+5DDx/4sAdqDkcs05AsQHMaopluVCUyu1bTRUVKzXbgjDlrRAQrYVoi/sXJ9fmG+KLQ==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + /@typescript-eslint/utils@7.0.1(eslint@8.56.0)(typescript@5.3.3): + resolution: {integrity: sha512-oe4his30JgPbnv+9Vef1h48jm0S6ft4mNwi9wj7bX10joGn07QRfqIqFHoMiajrtoU88cIhXf8ahwgrcbNLgPA==} + engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: - eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 + eslint: ^8.56.0 dependencies: + '@eslint-community/eslint-utils': 4.4.0(eslint@8.56.0) '@types/json-schema': 7.0.12 '@types/semver': 7.5.1 - '@typescript-eslint/scope-manager': 5.41.0 - '@typescript-eslint/types': 5.41.0 - '@typescript-eslint/typescript-estree': 5.41.0(typescript@5.1.6) - eslint: 8.26.0 - eslint-scope: 5.1.1 - eslint-utils: 3.0.0(eslint@8.26.0) + '@typescript-eslint/scope-manager': 7.0.1 + '@typescript-eslint/types': 7.0.1 + '@typescript-eslint/typescript-estree': 7.0.1(typescript@5.3.3) + eslint: 8.56.0 semver: 7.5.4 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} + /@typescript-eslint/visitor-keys@7.0.1: + resolution: {integrity: sha512-hwAgrOyk++RTXrP4KzCg7zB2U0xt7RUU0ZdMSCsqF3eKUwkdXUMyTb0qdCuji7VIbcpG62kKTU9M1J1c9UpFBw==} + engines: {node: ^16.0.0 || >=18.0.0} dependencies: - '@typescript-eslint/types': 5.41.0 + '@typescript-eslint/types': 7.0.1 eslint-visitor-keys: 3.4.3 dev: true + /@ungap/structured-clone@1.2.0: + resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==} + dev: true + /@vue/compiler-core@3.3.4: resolution: {integrity: sha512-cquyDNvZ6jTbf/+x+AgM2Arrp6G4Dzbb0R64jiG804HRMfRiFXWI6kqUVqZ6ZR0bQhIoQjB4+2bhNtVwndW15g==} dependencies: @@ -3672,7 +3705,6 @@ packages: resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==} dependencies: balanced-match: 1.0.2 - dev: false /braces@2.3.2: resolution: {integrity: sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==} @@ -5291,38 +5323,34 @@ packages: optionalDependencies: source-map: 0.6.1 - /eslint-config-prettier@8.5.0(eslint@8.26.0): - resolution: {integrity: sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==} + /eslint-config-prettier@9.1.0(eslint@8.56.0): + resolution: {integrity: sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==} hasBin: true peerDependencies: eslint: '>=7.0.0' dependencies: - eslint: 8.26.0 + eslint: 8.56.0 dev: true - /eslint-plugin-prettier@4.2.1(eslint-config-prettier@8.5.0)(eslint@8.26.0)(prettier@2.8.0): - resolution: {integrity: sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==} - engines: {node: '>=12.0.0'} + /eslint-plugin-prettier@5.1.3(eslint-config-prettier@9.1.0)(eslint@8.56.0)(prettier@3.2.4): + resolution: {integrity: sha512-C9GCVAs4Eq7ZC/XFQHITLiHJxQngdtraXaM+LoUFoFp/lHNl2Zn8f3WQbe9HvTBBQ9YnKFB0/2Ajdqwo5D1EAw==} + engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: - eslint: '>=7.28.0' + '@types/eslint': '>=8.0.0' + eslint: '>=8.0.0' eslint-config-prettier: '*' - prettier: '>=2.0.0' + prettier: '>=3.0.0' peerDependenciesMeta: + '@types/eslint': + optional: true eslint-config-prettier: optional: true dependencies: - eslint: 8.26.0 - eslint-config-prettier: 8.5.0(eslint@8.26.0) - prettier: 2.8.0 + eslint: 8.56.0 + eslint-config-prettier: 9.1.0(eslint@8.56.0) + prettier: 3.2.4 prettier-linter-helpers: 1.0.0 - dev: true - - /eslint-scope@5.1.1: - resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==} - engines: {node: '>=8.0.0'} - dependencies: - esrecurse: 4.3.0 - estraverse: 4.3.0 + synckit: 0.8.8 dev: true /eslint-scope@7.2.2: @@ -5333,35 +5361,24 @@ packages: estraverse: 5.3.0 dev: true - /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: 8.26.0 - eslint-visitor-keys: 2.1.0 - dev: true - - /eslint-visitor-keys@2.1.0: - resolution: {integrity: sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==} - engines: {node: '>=10'} - dev: true - /eslint-visitor-keys@3.4.3: resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /eslint@8.26.0: - resolution: {integrity: sha512-kzJkpaw1Bfwheq4VXUezFriD1GxszX6dUekM7Z3aC2o4hju+tsR/XyTC3RcoSD7jmy9VkPU3+N6YjVU2e96Oyg==} + /eslint@8.56.0: + resolution: {integrity: sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} hasBin: true dependencies: - '@eslint/eslintrc': 1.4.1 - '@humanwhocodes/config-array': 0.11.11 + '@eslint-community/eslint-utils': 4.4.0(eslint@8.56.0) + '@eslint-community/regexpp': 4.10.0 + '@eslint/eslintrc': 2.1.4 + '@eslint/js': 8.56.0 + '@humanwhocodes/config-array': 0.11.14 '@humanwhocodes/module-importer': 1.0.1 '@nodelib/fs.walk': 1.2.8 + '@ungap/structured-clone': 1.2.0 ajv: 6.12.6 chalk: 4.1.2 cross-spawn: 7.0.3 @@ -5369,7 +5386,6 @@ packages: doctrine: 3.0.0 escape-string-regexp: 4.0.0 eslint-scope: 7.2.2 - eslint-utils: 3.0.0(eslint@8.26.0) eslint-visitor-keys: 3.4.3 espree: 9.6.1 esquery: 1.5.0 @@ -5379,13 +5395,11 @@ packages: find-up: 5.0.0 glob-parent: 6.0.2 globals: 13.21.0 - grapheme-splitter: 1.0.4 + graphemer: 1.4.0 ignore: 5.2.4 - import-fresh: 3.3.0 imurmurhash: 0.1.4 is-glob: 4.0.3 is-path-inside: 3.0.3 - js-sdsl: 4.4.2 js-yaml: 4.1.0 json-stable-stringify-without-jsonify: 1.0.1 levn: 0.4.1 @@ -5393,9 +5407,7 @@ packages: minimatch: 3.1.2 natural-compare: 1.4.0 optionator: 0.9.3 - regexpp: 3.2.0 strip-ansi: 6.0.1 - strip-json-comments: 3.1.1 text-table: 0.2.0 transitivePeerDependencies: - supports-color @@ -5429,11 +5441,6 @@ packages: estraverse: 5.3.0 dev: true - /estraverse@4.3.0: - resolution: {integrity: sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==} - engines: {node: '>=4.0'} - dev: true - /estraverse@5.3.0: resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==} engines: {node: '>=4.0'} @@ -5981,6 +5988,10 @@ packages: resolution: {integrity: sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==} dev: true + /graphemer@1.4.0: + resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==} + dev: true + /graphlib@2.1.8: resolution: {integrity: sha512-jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A==} dependencies: @@ -6178,6 +6189,7 @@ packages: /ieee754@1.2.1: resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==} + requiresBuild: true dev: false /ignore@5.2.4: @@ -7134,10 +7146,6 @@ packages: - utf-8-validate dev: false - /js-sdsl@4.4.2: - resolution: {integrity: sha512-dwXFwByc/ajSV6m5bcKAPwe4yDDF6D614pxmIi5odytzxRlwqF6nwoiCek80Ixc7Cvma5awClxrzFtxCQvcM8w==} - dev: true - /js-tokens@4.0.0: resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==} @@ -7937,6 +7945,13 @@ packages: brace-expansion: 2.0.1 dev: false + /minimatch@9.0.3: + resolution: {integrity: sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==} + engines: {node: '>=16 || 14 >=14.17'} + dependencies: + brace-expansion: 2.0.1 + dev: true + /minimist-options@4.1.0: resolution: {integrity: sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==} engines: {node: '>= 6'} @@ -8477,6 +8492,12 @@ packages: hasBin: true dev: true + /prettier@3.2.4: + resolution: {integrity: sha512-FWu1oLHKCrtpO1ypU6J0SbK2d9Ckwysq6bHj/uaCP26DxrPpppCLQRGVuqAxSTvhF00AcvDRyYrLNW7ocBhFFQ==} + engines: {node: '>=14'} + hasBin: true + dev: true + /pretty-format@26.6.2: resolution: {integrity: sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==} engines: {node: '>= 10'} @@ -8767,11 +8788,6 @@ packages: functions-have-names: 1.2.3 dev: true - /regexpp@3.2.0: - resolution: {integrity: sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==} - engines: {node: '>=8'} - dev: true - /regexpu-core@5.3.2: resolution: {integrity: sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==} engines: {node: '>=4'} @@ -9450,6 +9466,14 @@ packages: /symbol-tree@3.2.4: resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==} + /synckit@0.8.8: + resolution: {integrity: sha512-HwOKAP7Wc5aRGYdKH+dw0PRRpbO841v2DENBtjnR5HFWoiNByAl7vrx3p0G/rCyYXQsrxqtX48TImFtPcIHSpQ==} + engines: {node: ^14.18.0 || >=16.0.0} + dependencies: + '@pkgr/core': 0.1.1 + tslib: 2.6.2 + dev: true + /table-layout@0.4.5: resolution: {integrity: sha512-zTvf0mcggrGeTe/2jJ6ECkJHAQPIYEwDoqsiqBjI24mvRmQbInK5jq33fyypaCBxX08hMkfmdOqj6haT33EqWw==} engines: {node: '>=4.0.0'} @@ -9683,7 +9707,16 @@ packages: utf8-byte-length: 1.0.4 dev: false - /ts-jsdoc@3.2.2(typescript@5.1.6): + /ts-api-utils@1.2.1(typescript@5.3.3): + resolution: {integrity: sha512-RIYA36cJn2WiH9Hy77hdF9r7oEwxAtB/TS9/S4Qd90Ap4z5FSiin5zEiTL44OII1Y3IIlEvxwxFUVgrHSZ/UpA==} + engines: {node: '>=16'} + peerDependencies: + typescript: '>=4.2.0' + dependencies: + typescript: 5.3.3 + dev: true + + /ts-jsdoc@3.2.2(typescript@5.3.3): resolution: {integrity: sha512-+Bj4ROKDrk3pOdel5u+gz8pqyuPak9D/dgNFfrpEGTZarRnxPGYB3DXkpu4qkFCfPjqBBiZEj6hf3wmfvJqbgA==} engines: {node: '>=12.0.0'} hasBin: true @@ -9695,7 +9728,7 @@ packages: doctrine: 3.0.0 fs-extra: 10.1.0 source-map-support: 0.5.21 - typescript: 5.1.6 + typescript: 5.3.3 dev: true /ts-node@10.9.1(@types/node@16.18.55)(typescript@4.2.4): @@ -9729,24 +9762,10 @@ packages: yn: 3.1.1 dev: true - /tslib@1.14.1: - resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==} - dev: true - /tslib@2.6.2: resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==} dev: true - /tsutils@3.21.0(typescript@5.1.6): - 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: 5.1.6 - dev: true - /tty-table@4.2.1: resolution: {integrity: sha512-xz0uKo+KakCQ+Dxj1D/tKn2FSyreSYWzdkL/BYhgN6oMW808g8QRMuh1atAV9fjTPbWBjfbkKQpI/5rEcnAc7g==} engines: {node: '>=8.0.0'} @@ -9876,8 +9895,8 @@ packages: hasBin: true dev: false - /typescript@5.1.6: - resolution: {integrity: sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==} + /typescript@5.3.3: + resolution: {integrity: sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==} engines: {node: '>=14.17'} hasBin: true dev: true diff --git a/test/src/helpers/TestAppAdapter.ts b/test/src/helpers/TestAppAdapter.ts index 5521137a5c8..11f8e2a5596 100644 --- a/test/src/helpers/TestAppAdapter.ts +++ b/test/src/helpers/TestAppAdapter.ts @@ -2,7 +2,10 @@ import { ElectronAppAdapter } from "electron-updater/out/ElectronAppAdapter" // do not implement AppAdapter directly, test that our ElectronAppAdapter implementation is correct export class TestAppAdapter extends ElectronAppAdapter { - constructor(version: string, private _baseCachePath: string) { + constructor( + version: string, + private _baseCachePath: string + ) { super(new MockApp(version)) } diff --git a/test/src/helpers/downloadElectron.ts b/test/src/helpers/downloadElectron.ts index 3c601b27dcb..0cc2dbddf6b 100644 --- a/test/src/helpers/downloadElectron.ts +++ b/test/src/helpers/downloadElectron.ts @@ -45,8 +45,8 @@ export function downloadAllRequiredElectronVersions(): Promise { platform === "mas" || platform === "darwin" ? ["x64"] : platform === "win32" - ? ["ia32", "x64"] - : require(`${path.join(__dirname, "../../..")}/packages/builder-util/out/util`).getArchCliNames() + ? ["ia32", "x64"] + : require(`${path.join(__dirname, "../../..")}/packages/builder-util/out/util`).getArchCliNames() for (const arch of archs) { versions.push({ version: ELECTRON_VERSION, diff --git a/test/src/windows/msiTest.ts b/test/src/windows/msiTest.ts index 296cc3f93f5..0a9d76a87d8 100644 --- a/test/src/windows/msiTest.ts +++ b/test/src/windows/msiTest.ts @@ -79,9 +79,7 @@ test.ifAll.ifDevOrWinCi( msiProjectCreated: async path => { await fs.promises.writeFile( path, - ( - await fs.promises.readFile(path, "utf8") - ).replace( + (await fs.promises.readFile(path, "utf8")).replace( "", `