From 8115e4aadecbdeea12336a575f5f2ae78ce8985b Mon Sep 17 00:00:00 2001 From: Mike Maietta Date: Wed, 26 Feb 2025 18:27:23 -0800 Subject: [PATCH 1/2] chore(refactor): refactoring code to reduce cyclical imports in order to prep for migration to rollup + vite (which have much more strict module resolutions) --- .changeset/khaki-sheep-bake.md | 5 ++ .../electron-updater/src/AppImageUpdater.ts | 2 +- packages/electron-updater/src/AppUpdater.ts | 15 +--- packages/electron-updater/src/DebUpdater.ts | 2 +- .../src/DownloadedUpdateHelper.ts | 3 +- packages/electron-updater/src/MacUpdater.ts | 3 +- packages/electron-updater/src/NsisUpdater.ts | 3 +- .../electron-updater/src/PacmanUpdater.ts | 2 +- packages/electron-updater/src/RpmUpdater.ts | 2 +- .../DifferentialDownloader.ts | 2 +- .../downloadPlanBuilder.ts | 2 +- packages/electron-updater/src/exports.ts | 81 ++++++++++++++++++ packages/electron-updater/src/main.ts | 85 +------------------ .../src/providers/BitbucketProvider.ts | 2 +- .../src/providers/GenericProvider.ts | 2 +- .../src/providers/GitHubProvider.ts | 2 +- .../src/providers/KeygenProvider.ts | 2 +- .../src/providers/PrivateGitHubProvider.ts | 2 +- .../src/providers/Provider.ts | 2 +- .../windowsExecutableCodeSignatureVerifier.ts | 2 +- 20 files changed, 111 insertions(+), 110 deletions(-) create mode 100644 .changeset/khaki-sheep-bake.md create mode 100644 packages/electron-updater/src/exports.ts diff --git a/.changeset/khaki-sheep-bake.md b/.changeset/khaki-sheep-bake.md new file mode 100644 index 00000000000..aed356ff9be --- /dev/null +++ b/.changeset/khaki-sheep-bake.md @@ -0,0 +1,5 @@ +--- +"electron-updater": patch +--- + +chore(refactor): refactoring code to reduce cyclical imports in order to migrate to rollup + vite (which have much more strict module resolutions) diff --git a/packages/electron-updater/src/AppImageUpdater.ts b/packages/electron-updater/src/AppImageUpdater.ts index 6803fc7cb49..d25572ef23c 100644 --- a/packages/electron-updater/src/AppImageUpdater.ts +++ b/packages/electron-updater/src/AppImageUpdater.ts @@ -7,8 +7,8 @@ import { DownloadUpdateOptions } from "./AppUpdater" import { BaseUpdater, InstallOptions } from "./BaseUpdater" import { DifferentialDownloaderOptions } from "./differentialDownloader/DifferentialDownloader" import { FileWithEmbeddedBlockMapDifferentialDownloader } from "./differentialDownloader/FileWithEmbeddedBlockMapDifferentialDownloader" -import { DOWNLOAD_PROGRESS, ResolvedUpdateFileInfo } from "./main" import { findFile, Provider } from "./providers/Provider" +import { DOWNLOAD_PROGRESS, ResolvedUpdateFileInfo } from "./exports" export class AppImageUpdater extends BaseUpdater { constructor(options?: AllPublishOptions | null, app?: any) { diff --git a/packages/electron-updater/src/AppUpdater.ts b/packages/electron-updater/src/AppUpdater.ts index be764d1d1c7..3de3f162c3f 100644 --- a/packages/electron-updater/src/AppUpdater.ts +++ b/packages/electron-updater/src/AppUpdater.ts @@ -26,19 +26,8 @@ import { createTempUpdateFile, DownloadedUpdateHelper } from "./DownloadedUpdate import { ElectronAppAdapter } from "./ElectronAppAdapter" import { ElectronHttpExecutor, getNetSession, LoginCallback } from "./electronHttpExecutor" import { GenericProvider } from "./providers/GenericProvider" -import { - DOWNLOAD_PROGRESS, - Logger, - Provider, - ResolvedUpdateFileInfo, - UPDATE_DOWNLOADED, - UpdateCheckResult, - UpdateDownloadedEvent, - UpdaterSignal, - VerifyUpdateSupport, -} from "./main" import { createClient, isUrlProbablySupportMultiRangeRequests } from "./providerFactory" -import { ProviderPlatform } from "./providers/Provider" +import { Provider, ProviderPlatform } from "./providers/Provider" import type { TypedEmitter } from "tiny-typed-emitter" import Session = Electron.Session import type { AuthInfo } from "electron" @@ -46,6 +35,8 @@ import { gunzipSync } from "zlib" import { blockmapFiles } from "./util" import { DifferentialDownloaderOptions } from "./differentialDownloader/DifferentialDownloader" import { GenericDifferentialDownloader } from "./differentialDownloader/GenericDifferentialDownloader" +import { DOWNLOAD_PROGRESS, Logger, ResolvedUpdateFileInfo, UPDATE_DOWNLOADED, UpdateCheckResult, UpdateDownloadedEvent, UpdaterSignal } from "./exports" +import { VerifyUpdateSupport } from "./main" export type AppUpdaterEvents = { error: (error: Error, message?: string) => void diff --git a/packages/electron-updater/src/DebUpdater.ts b/packages/electron-updater/src/DebUpdater.ts index a537d4ec2e5..8a3e13b5718 100644 --- a/packages/electron-updater/src/DebUpdater.ts +++ b/packages/electron-updater/src/DebUpdater.ts @@ -2,8 +2,8 @@ import { AllPublishOptions } from "builder-util-runtime" import { AppAdapter } from "./AppAdapter" import { DownloadUpdateOptions } from "./AppUpdater" import { BaseUpdater, InstallOptions } from "./BaseUpdater" -import { DOWNLOAD_PROGRESS } from "./main" import { findFile } from "./providers/Provider" +import { DOWNLOAD_PROGRESS } from "./exports" export class DebUpdater extends BaseUpdater { constructor(options?: AllPublishOptions | null, app?: AppAdapter) { diff --git a/packages/electron-updater/src/DownloadedUpdateHelper.ts b/packages/electron-updater/src/DownloadedUpdateHelper.ts index ffb5719b451..7bb74088e65 100644 --- a/packages/electron-updater/src/DownloadedUpdateHelper.ts +++ b/packages/electron-updater/src/DownloadedUpdateHelper.ts @@ -3,7 +3,8 @@ import { createHash } from "crypto" import { createReadStream } from "fs" // @ts-ignore import * as isEqual from "lodash.isequal" -import { Logger, ResolvedUpdateFileInfo } from "./main" +import { ResolvedUpdateFileInfo } from "./exports" +import { Logger } from "./exports" import { pathExists, readJson, emptyDir, outputJson, unlink } from "fs-extra" import * as path from "path" diff --git a/packages/electron-updater/src/MacUpdater.ts b/packages/electron-updater/src/MacUpdater.ts index 83b576c0f5a..bf2697a0391 100644 --- a/packages/electron-updater/src/MacUpdater.ts +++ b/packages/electron-updater/src/MacUpdater.ts @@ -5,7 +5,8 @@ import * as path from "path" import { createServer, IncomingMessage, Server, ServerResponse } from "http" import { AppAdapter } from "./AppAdapter" import { AppUpdater, DownloadUpdateOptions } from "./AppUpdater" -import { ResolvedUpdateFileInfo, UpdateDownloadedEvent } from "./main" +import { ResolvedUpdateFileInfo } from "./main" +import { UpdateDownloadedEvent } from "./exports" import { findFile } from "./providers/Provider" import AutoUpdater = Electron.AutoUpdater import { execFileSync } from "child_process" diff --git a/packages/electron-updater/src/NsisUpdater.ts b/packages/electron-updater/src/NsisUpdater.ts index 1d9755c178d..80540096420 100644 --- a/packages/electron-updater/src/NsisUpdater.ts +++ b/packages/electron-updater/src/NsisUpdater.ts @@ -5,7 +5,8 @@ import { DownloadUpdateOptions } from "./AppUpdater" import { BaseUpdater, InstallOptions } from "./BaseUpdater" import { DifferentialDownloaderOptions } from "./differentialDownloader/DifferentialDownloader" import { FileWithEmbeddedBlockMapDifferentialDownloader } from "./differentialDownloader/FileWithEmbeddedBlockMapDifferentialDownloader" -import { DOWNLOAD_PROGRESS, VerifyUpdateCodeSignature } from "./main" +import { DOWNLOAD_PROGRESS } from "./exports" +import { VerifyUpdateCodeSignature } from "./main" import { findFile, Provider } from "./providers/Provider" import { unlink } from "fs-extra" import { verifySignature } from "./windowsExecutableCodeSignatureVerifier" diff --git a/packages/electron-updater/src/PacmanUpdater.ts b/packages/electron-updater/src/PacmanUpdater.ts index 7082dbfeb8b..1e2d27f378b 100644 --- a/packages/electron-updater/src/PacmanUpdater.ts +++ b/packages/electron-updater/src/PacmanUpdater.ts @@ -2,7 +2,7 @@ import { AllPublishOptions } from "builder-util-runtime" import { AppAdapter } from "./AppAdapter" import { DownloadUpdateOptions } from "./AppUpdater" import { BaseUpdater, InstallOptions } from "./BaseUpdater" -import { DOWNLOAD_PROGRESS } from "./main" +import { DOWNLOAD_PROGRESS } from "./exports" import { findFile } from "./providers/Provider" export class PacmanUpdater extends BaseUpdater { diff --git a/packages/electron-updater/src/RpmUpdater.ts b/packages/electron-updater/src/RpmUpdater.ts index 95252b848cc..f051e804078 100644 --- a/packages/electron-updater/src/RpmUpdater.ts +++ b/packages/electron-updater/src/RpmUpdater.ts @@ -2,7 +2,7 @@ import { AllPublishOptions } from "builder-util-runtime" import { AppAdapter } from "./AppAdapter" import { DownloadUpdateOptions } from "./AppUpdater" import { BaseUpdater, InstallOptions } from "./BaseUpdater" -import { DOWNLOAD_PROGRESS } from "./main" +import { DOWNLOAD_PROGRESS } from "./exports" import { findFile } from "./providers/Provider" export class RpmUpdater extends BaseUpdater { diff --git a/packages/electron-updater/src/differentialDownloader/DifferentialDownloader.ts b/packages/electron-updater/src/differentialDownloader/DifferentialDownloader.ts index 4fcb8ccd302..2301f93e81c 100644 --- a/packages/electron-updater/src/differentialDownloader/DifferentialDownloader.ts +++ b/packages/electron-updater/src/differentialDownloader/DifferentialDownloader.ts @@ -4,7 +4,7 @@ import { close, open } from "fs-extra" import { createWriteStream } from "fs" import { OutgoingHttpHeaders, RequestOptions } from "http" import { ProgressInfo, CancellationToken } from "builder-util-runtime" -import { Logger } from "../main" +import { Logger } from "../exports" import { copyData } from "./DataSplitter" import { URL } from "url" import { computeOperations, Operation, OperationKind } from "./downloadPlanBuilder" diff --git a/packages/electron-updater/src/differentialDownloader/downloadPlanBuilder.ts b/packages/electron-updater/src/differentialDownloader/downloadPlanBuilder.ts index f836a63f69c..f94996804a4 100644 --- a/packages/electron-updater/src/differentialDownloader/downloadPlanBuilder.ts +++ b/packages/electron-updater/src/differentialDownloader/downloadPlanBuilder.ts @@ -1,5 +1,5 @@ import { BlockMap, BlockMapFile } from "builder-util-runtime/out/blockMapApi" -import { Logger } from "../main" +import { Logger } from "../exports" export enum OperationKind { COPY, diff --git a/packages/electron-updater/src/exports.ts b/packages/electron-updater/src/exports.ts new file mode 100644 index 00000000000..2ebb0b1aec9 --- /dev/null +++ b/packages/electron-updater/src/exports.ts @@ -0,0 +1,81 @@ +import { CancellationToken, PackageFileInfo, ProgressInfo, UpdateFileInfo, UpdateInfo } from "builder-util-runtime" +import { EventEmitter } from "events" +import { URL } from "url" +import { LoginCallback } from "./electronHttpExecutor" + +export const DOWNLOAD_PROGRESS = "download-progress" +export const UPDATE_DOWNLOADED = "update-downloaded" + +export interface Logger { + info(message?: any): void + + warn(message?: any): void + + error(message?: any): void + + debug?(message: string): void +} + +export class UpdaterSignal { + constructor(private emitter: EventEmitter) {} + + /** + * Emitted when an authenticating proxy is [asking for user credentials](https://github.com/electron/electron/blob/master/docs/api/client-request.md#event-login). + */ + login(handler: LoginHandler): void { + addHandler(this.emitter, "login", handler) + } + + progress(handler: (info: ProgressInfo) => void): void { + addHandler(this.emitter, DOWNLOAD_PROGRESS, handler) + } + + updateDownloaded(handler: (info: UpdateDownloadedEvent) => void): void { + addHandler(this.emitter, UPDATE_DOWNLOADED, handler) + } + + updateCancelled(handler: (info: UpdateInfo) => void): void { + addHandler(this.emitter, "update-cancelled", handler) + } +} + +const isLogEvent = false + +export function addHandler(emitter: EventEmitter, event: UpdaterEvents, handler: (...args: Array) => void): void { + if (isLogEvent) { + emitter.on(event, (...args: Array) => { + console.log("%s %s", event, args) + handler(...args) + }) + } else { + emitter.on(event, handler) + } +} + +export interface UpdateCheckResult { + readonly isUpdateAvailable: boolean + + readonly updateInfo: UpdateInfo + + readonly downloadPromise?: Promise> | null + + readonly cancellationToken?: CancellationToken + + /** @deprecated */ + readonly versionInfo: UpdateInfo +} + +export interface UpdateDownloadedEvent extends UpdateInfo { + downloadedFile: string +} + +export interface ResolvedUpdateFileInfo { + readonly url: URL + readonly info: UpdateFileInfo + + packageInfo?: PackageFileInfo +} + +export type UpdaterEvents = "login" | "checking-for-update" | "update-available" | "update-not-available" | "update-cancelled" | "download-progress" | "update-downloaded" | "error" + +export type LoginHandler = (authInfo: any, callback: LoginCallback) => void diff --git a/packages/electron-updater/src/main.ts b/packages/electron-updater/src/main.ts index 3e84cd0108e..2408793fb69 100644 --- a/packages/electron-updater/src/main.ts +++ b/packages/electron-updater/src/main.ts @@ -1,14 +1,10 @@ -import { CancellationToken, PackageFileInfo, ProgressInfo, UpdateFileInfo, UpdateInfo } from "builder-util-runtime" -import { EventEmitter } from "events" import { existsSync, readFileSync } from "fs-extra" import * as path from "path" -import { URL } from "url" import { AppUpdater } from "./AppUpdater" -import { LoginCallback } from "./electronHttpExecutor" +import { UpdateInfo } from "builder-util-runtime" export { BaseUpdater } from "./BaseUpdater" export { AppUpdater, NoOpLogger } from "./AppUpdater" -export { CancellationToken, PackageFileInfo, ProgressInfo, UpdateFileInfo, UpdateInfo } export { Provider } from "./providers/Provider" export { AppImageUpdater } from "./AppImageUpdater" export { DebUpdater } from "./DebUpdater" @@ -17,6 +13,8 @@ export { RpmUpdater } from "./RpmUpdater" export { MacUpdater } from "./MacUpdater" export { NsisUpdater } from "./NsisUpdater" +export * from "./exports" + // autoUpdater to mimic electron bundled autoUpdater let _autoUpdater: any @@ -69,83 +67,6 @@ Object.defineProperty(exports, "autoUpdater", { }, }) -export interface ResolvedUpdateFileInfo { - readonly url: URL - readonly info: UpdateFileInfo - - packageInfo?: PackageFileInfo -} - -export interface UpdateCheckResult { - readonly isUpdateAvailable: boolean - - readonly updateInfo: UpdateInfo - - readonly downloadPromise?: Promise> | null - - readonly cancellationToken?: CancellationToken - - /** @deprecated */ - readonly versionInfo: UpdateInfo -} - -export type UpdaterEvents = "login" | "checking-for-update" | "update-available" | "update-not-available" | "update-cancelled" | "download-progress" | "update-downloaded" | "error" - -export const DOWNLOAD_PROGRESS = "download-progress" -export const UPDATE_DOWNLOADED = "update-downloaded" - -export type LoginHandler = (authInfo: any, callback: LoginCallback) => void - -export class UpdaterSignal { - constructor(private emitter: EventEmitter) {} - - /** - * Emitted when an authenticating proxy is [asking for user credentials](https://github.com/electron/electron/blob/master/docs/api/client-request.md#event-login). - */ - login(handler: LoginHandler): void { - addHandler(this.emitter, "login", handler) - } - - progress(handler: (info: ProgressInfo) => void): void { - addHandler(this.emitter, DOWNLOAD_PROGRESS, handler) - } - - updateDownloaded(handler: (info: UpdateDownloadedEvent) => void): void { - addHandler(this.emitter, UPDATE_DOWNLOADED, handler) - } - - updateCancelled(handler: (info: UpdateInfo) => void): void { - addHandler(this.emitter, "update-cancelled", handler) - } -} - -export interface UpdateDownloadedEvent extends UpdateInfo { - downloadedFile: string -} - -const isLogEvent = false - -function addHandler(emitter: EventEmitter, event: UpdaterEvents, handler: (...args: Array) => void): void { - if (isLogEvent) { - emitter.on(event, (...args: Array) => { - console.log("%s %s", event, args) - handler(...args) - }) - } else { - emitter.on(event, handler) - } -} - -export interface Logger { - info(message?: any): void - - warn(message?: any): void - - error(message?: any): void - - debug?(message: string): void -} - /** * return null if verify signature succeed * return error message if verify signature failed diff --git a/packages/electron-updater/src/providers/BitbucketProvider.ts b/packages/electron-updater/src/providers/BitbucketProvider.ts index 2ff206396fa..6a12fa1123e 100644 --- a/packages/electron-updater/src/providers/BitbucketProvider.ts +++ b/packages/electron-updater/src/providers/BitbucketProvider.ts @@ -1,6 +1,6 @@ import { CancellationToken, BitbucketOptions, newError, UpdateInfo } from "builder-util-runtime" import { AppUpdater } from "../AppUpdater" -import { ResolvedUpdateFileInfo } from "../main" +import { ResolvedUpdateFileInfo } from "../exports" import { getChannelFilename, newBaseUrl, newUrlFromBase } from "../util" import { parseUpdateInfo, Provider, ProviderRuntimeOptions, resolveFiles } from "./Provider" diff --git a/packages/electron-updater/src/providers/GenericProvider.ts b/packages/electron-updater/src/providers/GenericProvider.ts index aa1dbed35c4..9dad9df9911 100644 --- a/packages/electron-updater/src/providers/GenericProvider.ts +++ b/packages/electron-updater/src/providers/GenericProvider.ts @@ -1,6 +1,6 @@ import { GenericServerOptions, HttpError, newError, UpdateInfo } from "builder-util-runtime" import { AppUpdater } from "../AppUpdater" -import { ResolvedUpdateFileInfo } from "../main" +import { ResolvedUpdateFileInfo } from "../exports" import { getChannelFilename, newBaseUrl, newUrlFromBase } from "../util" import { parseUpdateInfo, Provider, ProviderRuntimeOptions, resolveFiles } from "./Provider" diff --git a/packages/electron-updater/src/providers/GitHubProvider.ts b/packages/electron-updater/src/providers/GitHubProvider.ts index a91cf6be4ae..4f5bfae0173 100644 --- a/packages/electron-updater/src/providers/GitHubProvider.ts +++ b/packages/electron-updater/src/providers/GitHubProvider.ts @@ -2,7 +2,7 @@ import { CancellationToken, GithubOptions, githubUrl, HttpError, newError, parse import * as semver from "semver" import { URL } from "url" import { AppUpdater } from "../AppUpdater" -import { ResolvedUpdateFileInfo } from "../main" +import { ResolvedUpdateFileInfo } from "../exports" import { getChannelFilename, newBaseUrl, newUrlFromBase } from "../util" import { parseUpdateInfo, Provider, ProviderRuntimeOptions, resolveFiles } from "./Provider" diff --git a/packages/electron-updater/src/providers/KeygenProvider.ts b/packages/electron-updater/src/providers/KeygenProvider.ts index 74034c614e7..d84d6676716 100644 --- a/packages/electron-updater/src/providers/KeygenProvider.ts +++ b/packages/electron-updater/src/providers/KeygenProvider.ts @@ -1,6 +1,6 @@ import { CancellationToken, KeygenOptions, newError, UpdateInfo } from "builder-util-runtime" import { AppUpdater } from "../AppUpdater" -import { ResolvedUpdateFileInfo } from "../main" +import { ResolvedUpdateFileInfo } from "../exports" import { getChannelFilename, newBaseUrl, newUrlFromBase } from "../util" import { parseUpdateInfo, Provider, ProviderRuntimeOptions, resolveFiles } from "./Provider" diff --git a/packages/electron-updater/src/providers/PrivateGitHubProvider.ts b/packages/electron-updater/src/providers/PrivateGitHubProvider.ts index 872c8c4dc05..b1c39b744d2 100644 --- a/packages/electron-updater/src/providers/PrivateGitHubProvider.ts +++ b/packages/electron-updater/src/providers/PrivateGitHubProvider.ts @@ -6,7 +6,7 @@ import { AppUpdater } from "../AppUpdater" import { URL } from "url" import { getChannelFilename, newUrlFromBase } from "../util" import { BaseGitHubProvider } from "./GitHubProvider" -import { ResolvedUpdateFileInfo } from "../main" +import { ResolvedUpdateFileInfo } from "../exports" import { getFileList, ProviderRuntimeOptions } from "./Provider" export interface PrivateGitHubUpdateInfo extends UpdateInfo { diff --git a/packages/electron-updater/src/providers/Provider.ts b/packages/electron-updater/src/providers/Provider.ts index 37f6502fd3c..3b050cc8927 100644 --- a/packages/electron-updater/src/providers/Provider.ts +++ b/packages/electron-updater/src/providers/Provider.ts @@ -3,7 +3,7 @@ import { OutgoingHttpHeaders, RequestOptions } from "http" import { load } from "js-yaml" import { URL } from "url" import { ElectronHttpExecutor } from "../electronHttpExecutor" -import { ResolvedUpdateFileInfo } from "../main" +import { ResolvedUpdateFileInfo } from "../exports" import { newUrlFromBase } from "../util" export type ProviderPlatform = "darwin" | "linux" | "win32" diff --git a/packages/electron-updater/src/windowsExecutableCodeSignatureVerifier.ts b/packages/electron-updater/src/windowsExecutableCodeSignatureVerifier.ts index 891d5c7cc13..3e2b04ed751 100644 --- a/packages/electron-updater/src/windowsExecutableCodeSignatureVerifier.ts +++ b/packages/electron-updater/src/windowsExecutableCodeSignatureVerifier.ts @@ -1,7 +1,7 @@ import { parseDn } from "builder-util-runtime" import { execFile, execFileSync } from "child_process" import * as os from "os" -import { Logger } from "./main" +import { Logger } from "./exports" import * as path from "path" // $certificateInfo = (Get-AuthenticodeSignature 'xxx\yyy.exe' From 9652f54045ef5b09d37db241466684bcf4ae63ff Mon Sep 17 00:00:00 2001 From: Mike Maietta Date: Thu, 27 Feb 2025 07:48:44 -0800 Subject: [PATCH 2/2] rename file to `types.ts` --- packages/electron-updater/src/AppImageUpdater.ts | 2 +- packages/electron-updater/src/AppUpdater.ts | 2 +- packages/electron-updater/src/DebUpdater.ts | 2 +- packages/electron-updater/src/DownloadedUpdateHelper.ts | 4 ++-- packages/electron-updater/src/MacUpdater.ts | 2 +- packages/electron-updater/src/NsisUpdater.ts | 2 +- packages/electron-updater/src/PacmanUpdater.ts | 2 +- packages/electron-updater/src/RpmUpdater.ts | 2 +- .../src/differentialDownloader/DifferentialDownloader.ts | 2 +- .../src/differentialDownloader/downloadPlanBuilder.ts | 2 +- packages/electron-updater/src/main.ts | 2 +- packages/electron-updater/src/providers/BitbucketProvider.ts | 2 +- packages/electron-updater/src/providers/GenericProvider.ts | 2 +- packages/electron-updater/src/providers/GitHubProvider.ts | 2 +- packages/electron-updater/src/providers/KeygenProvider.ts | 2 +- .../electron-updater/src/providers/PrivateGitHubProvider.ts | 2 +- packages/electron-updater/src/providers/Provider.ts | 2 +- packages/electron-updater/src/{exports.ts => types.ts} | 0 .../src/windowsExecutableCodeSignatureVerifier.ts | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) rename packages/electron-updater/src/{exports.ts => types.ts} (100%) diff --git a/packages/electron-updater/src/AppImageUpdater.ts b/packages/electron-updater/src/AppImageUpdater.ts index d25572ef23c..707ff9b3f7e 100644 --- a/packages/electron-updater/src/AppImageUpdater.ts +++ b/packages/electron-updater/src/AppImageUpdater.ts @@ -8,7 +8,7 @@ import { BaseUpdater, InstallOptions } from "./BaseUpdater" import { DifferentialDownloaderOptions } from "./differentialDownloader/DifferentialDownloader" import { FileWithEmbeddedBlockMapDifferentialDownloader } from "./differentialDownloader/FileWithEmbeddedBlockMapDifferentialDownloader" import { findFile, Provider } from "./providers/Provider" -import { DOWNLOAD_PROGRESS, ResolvedUpdateFileInfo } from "./exports" +import { DOWNLOAD_PROGRESS, ResolvedUpdateFileInfo } from "./types" export class AppImageUpdater extends BaseUpdater { constructor(options?: AllPublishOptions | null, app?: any) { diff --git a/packages/electron-updater/src/AppUpdater.ts b/packages/electron-updater/src/AppUpdater.ts index 3de3f162c3f..3e7ff8a9e0b 100644 --- a/packages/electron-updater/src/AppUpdater.ts +++ b/packages/electron-updater/src/AppUpdater.ts @@ -35,7 +35,7 @@ import { gunzipSync } from "zlib" import { blockmapFiles } from "./util" import { DifferentialDownloaderOptions } from "./differentialDownloader/DifferentialDownloader" import { GenericDifferentialDownloader } from "./differentialDownloader/GenericDifferentialDownloader" -import { DOWNLOAD_PROGRESS, Logger, ResolvedUpdateFileInfo, UPDATE_DOWNLOADED, UpdateCheckResult, UpdateDownloadedEvent, UpdaterSignal } from "./exports" +import { DOWNLOAD_PROGRESS, Logger, ResolvedUpdateFileInfo, UPDATE_DOWNLOADED, UpdateCheckResult, UpdateDownloadedEvent, UpdaterSignal } from "./types" import { VerifyUpdateSupport } from "./main" export type AppUpdaterEvents = { diff --git a/packages/electron-updater/src/DebUpdater.ts b/packages/electron-updater/src/DebUpdater.ts index 8a3e13b5718..1d4e88c91c8 100644 --- a/packages/electron-updater/src/DebUpdater.ts +++ b/packages/electron-updater/src/DebUpdater.ts @@ -3,7 +3,7 @@ import { AppAdapter } from "./AppAdapter" import { DownloadUpdateOptions } from "./AppUpdater" import { BaseUpdater, InstallOptions } from "./BaseUpdater" import { findFile } from "./providers/Provider" -import { DOWNLOAD_PROGRESS } from "./exports" +import { DOWNLOAD_PROGRESS } from "./types" export class DebUpdater extends BaseUpdater { constructor(options?: AllPublishOptions | null, app?: AppAdapter) { diff --git a/packages/electron-updater/src/DownloadedUpdateHelper.ts b/packages/electron-updater/src/DownloadedUpdateHelper.ts index 7bb74088e65..c032d790892 100644 --- a/packages/electron-updater/src/DownloadedUpdateHelper.ts +++ b/packages/electron-updater/src/DownloadedUpdateHelper.ts @@ -3,8 +3,8 @@ import { createHash } from "crypto" import { createReadStream } from "fs" // @ts-ignore import * as isEqual from "lodash.isequal" -import { ResolvedUpdateFileInfo } from "./exports" -import { Logger } from "./exports" +import { ResolvedUpdateFileInfo } from "./types" +import { Logger } from "./types" import { pathExists, readJson, emptyDir, outputJson, unlink } from "fs-extra" import * as path from "path" diff --git a/packages/electron-updater/src/MacUpdater.ts b/packages/electron-updater/src/MacUpdater.ts index bf2697a0391..0a76b2a1701 100644 --- a/packages/electron-updater/src/MacUpdater.ts +++ b/packages/electron-updater/src/MacUpdater.ts @@ -6,7 +6,7 @@ import { createServer, IncomingMessage, Server, ServerResponse } from "http" import { AppAdapter } from "./AppAdapter" import { AppUpdater, DownloadUpdateOptions } from "./AppUpdater" import { ResolvedUpdateFileInfo } from "./main" -import { UpdateDownloadedEvent } from "./exports" +import { UpdateDownloadedEvent } from "./types" import { findFile } from "./providers/Provider" import AutoUpdater = Electron.AutoUpdater import { execFileSync } from "child_process" diff --git a/packages/electron-updater/src/NsisUpdater.ts b/packages/electron-updater/src/NsisUpdater.ts index 80540096420..4c38195c9dc 100644 --- a/packages/electron-updater/src/NsisUpdater.ts +++ b/packages/electron-updater/src/NsisUpdater.ts @@ -5,7 +5,7 @@ import { DownloadUpdateOptions } from "./AppUpdater" import { BaseUpdater, InstallOptions } from "./BaseUpdater" import { DifferentialDownloaderOptions } from "./differentialDownloader/DifferentialDownloader" import { FileWithEmbeddedBlockMapDifferentialDownloader } from "./differentialDownloader/FileWithEmbeddedBlockMapDifferentialDownloader" -import { DOWNLOAD_PROGRESS } from "./exports" +import { DOWNLOAD_PROGRESS } from "./types" import { VerifyUpdateCodeSignature } from "./main" import { findFile, Provider } from "./providers/Provider" import { unlink } from "fs-extra" diff --git a/packages/electron-updater/src/PacmanUpdater.ts b/packages/electron-updater/src/PacmanUpdater.ts index 1e2d27f378b..a2dd2e7f9bf 100644 --- a/packages/electron-updater/src/PacmanUpdater.ts +++ b/packages/electron-updater/src/PacmanUpdater.ts @@ -2,7 +2,7 @@ import { AllPublishOptions } from "builder-util-runtime" import { AppAdapter } from "./AppAdapter" import { DownloadUpdateOptions } from "./AppUpdater" import { BaseUpdater, InstallOptions } from "./BaseUpdater" -import { DOWNLOAD_PROGRESS } from "./exports" +import { DOWNLOAD_PROGRESS } from "./types" import { findFile } from "./providers/Provider" export class PacmanUpdater extends BaseUpdater { diff --git a/packages/electron-updater/src/RpmUpdater.ts b/packages/electron-updater/src/RpmUpdater.ts index f051e804078..5937af8b68f 100644 --- a/packages/electron-updater/src/RpmUpdater.ts +++ b/packages/electron-updater/src/RpmUpdater.ts @@ -2,7 +2,7 @@ import { AllPublishOptions } from "builder-util-runtime" import { AppAdapter } from "./AppAdapter" import { DownloadUpdateOptions } from "./AppUpdater" import { BaseUpdater, InstallOptions } from "./BaseUpdater" -import { DOWNLOAD_PROGRESS } from "./exports" +import { DOWNLOAD_PROGRESS } from "./types" import { findFile } from "./providers/Provider" export class RpmUpdater extends BaseUpdater { diff --git a/packages/electron-updater/src/differentialDownloader/DifferentialDownloader.ts b/packages/electron-updater/src/differentialDownloader/DifferentialDownloader.ts index 2301f93e81c..e92faab4e33 100644 --- a/packages/electron-updater/src/differentialDownloader/DifferentialDownloader.ts +++ b/packages/electron-updater/src/differentialDownloader/DifferentialDownloader.ts @@ -4,7 +4,7 @@ import { close, open } from "fs-extra" import { createWriteStream } from "fs" import { OutgoingHttpHeaders, RequestOptions } from "http" import { ProgressInfo, CancellationToken } from "builder-util-runtime" -import { Logger } from "../exports" +import { Logger } from "../types" import { copyData } from "./DataSplitter" import { URL } from "url" import { computeOperations, Operation, OperationKind } from "./downloadPlanBuilder" diff --git a/packages/electron-updater/src/differentialDownloader/downloadPlanBuilder.ts b/packages/electron-updater/src/differentialDownloader/downloadPlanBuilder.ts index f94996804a4..7a7c1612c0a 100644 --- a/packages/electron-updater/src/differentialDownloader/downloadPlanBuilder.ts +++ b/packages/electron-updater/src/differentialDownloader/downloadPlanBuilder.ts @@ -1,5 +1,5 @@ import { BlockMap, BlockMapFile } from "builder-util-runtime/out/blockMapApi" -import { Logger } from "../exports" +import { Logger } from "../types" export enum OperationKind { COPY, diff --git a/packages/electron-updater/src/main.ts b/packages/electron-updater/src/main.ts index 2408793fb69..70c48ca2706 100644 --- a/packages/electron-updater/src/main.ts +++ b/packages/electron-updater/src/main.ts @@ -13,7 +13,7 @@ export { RpmUpdater } from "./RpmUpdater" export { MacUpdater } from "./MacUpdater" export { NsisUpdater } from "./NsisUpdater" -export * from "./exports" +export * from "./types" // autoUpdater to mimic electron bundled autoUpdater let _autoUpdater: any diff --git a/packages/electron-updater/src/providers/BitbucketProvider.ts b/packages/electron-updater/src/providers/BitbucketProvider.ts index 6a12fa1123e..824a5fca77f 100644 --- a/packages/electron-updater/src/providers/BitbucketProvider.ts +++ b/packages/electron-updater/src/providers/BitbucketProvider.ts @@ -1,6 +1,6 @@ import { CancellationToken, BitbucketOptions, newError, UpdateInfo } from "builder-util-runtime" import { AppUpdater } from "../AppUpdater" -import { ResolvedUpdateFileInfo } from "../exports" +import { ResolvedUpdateFileInfo } from "../types" import { getChannelFilename, newBaseUrl, newUrlFromBase } from "../util" import { parseUpdateInfo, Provider, ProviderRuntimeOptions, resolveFiles } from "./Provider" diff --git a/packages/electron-updater/src/providers/GenericProvider.ts b/packages/electron-updater/src/providers/GenericProvider.ts index 9dad9df9911..b5a23d0013c 100644 --- a/packages/electron-updater/src/providers/GenericProvider.ts +++ b/packages/electron-updater/src/providers/GenericProvider.ts @@ -1,6 +1,6 @@ import { GenericServerOptions, HttpError, newError, UpdateInfo } from "builder-util-runtime" import { AppUpdater } from "../AppUpdater" -import { ResolvedUpdateFileInfo } from "../exports" +import { ResolvedUpdateFileInfo } from "../types" import { getChannelFilename, newBaseUrl, newUrlFromBase } from "../util" import { parseUpdateInfo, Provider, ProviderRuntimeOptions, resolveFiles } from "./Provider" diff --git a/packages/electron-updater/src/providers/GitHubProvider.ts b/packages/electron-updater/src/providers/GitHubProvider.ts index 4f5bfae0173..3a14f0f6df8 100644 --- a/packages/electron-updater/src/providers/GitHubProvider.ts +++ b/packages/electron-updater/src/providers/GitHubProvider.ts @@ -2,7 +2,7 @@ import { CancellationToken, GithubOptions, githubUrl, HttpError, newError, parse import * as semver from "semver" import { URL } from "url" import { AppUpdater } from "../AppUpdater" -import { ResolvedUpdateFileInfo } from "../exports" +import { ResolvedUpdateFileInfo } from "../types" import { getChannelFilename, newBaseUrl, newUrlFromBase } from "../util" import { parseUpdateInfo, Provider, ProviderRuntimeOptions, resolveFiles } from "./Provider" diff --git a/packages/electron-updater/src/providers/KeygenProvider.ts b/packages/electron-updater/src/providers/KeygenProvider.ts index d84d6676716..6842628a030 100644 --- a/packages/electron-updater/src/providers/KeygenProvider.ts +++ b/packages/electron-updater/src/providers/KeygenProvider.ts @@ -1,6 +1,6 @@ import { CancellationToken, KeygenOptions, newError, UpdateInfo } from "builder-util-runtime" import { AppUpdater } from "../AppUpdater" -import { ResolvedUpdateFileInfo } from "../exports" +import { ResolvedUpdateFileInfo } from "../types" import { getChannelFilename, newBaseUrl, newUrlFromBase } from "../util" import { parseUpdateInfo, Provider, ProviderRuntimeOptions, resolveFiles } from "./Provider" diff --git a/packages/electron-updater/src/providers/PrivateGitHubProvider.ts b/packages/electron-updater/src/providers/PrivateGitHubProvider.ts index b1c39b744d2..708d50a2c32 100644 --- a/packages/electron-updater/src/providers/PrivateGitHubProvider.ts +++ b/packages/electron-updater/src/providers/PrivateGitHubProvider.ts @@ -6,7 +6,7 @@ import { AppUpdater } from "../AppUpdater" import { URL } from "url" import { getChannelFilename, newUrlFromBase } from "../util" import { BaseGitHubProvider } from "./GitHubProvider" -import { ResolvedUpdateFileInfo } from "../exports" +import { ResolvedUpdateFileInfo } from "../types" import { getFileList, ProviderRuntimeOptions } from "./Provider" export interface PrivateGitHubUpdateInfo extends UpdateInfo { diff --git a/packages/electron-updater/src/providers/Provider.ts b/packages/electron-updater/src/providers/Provider.ts index 3b050cc8927..218f04548fc 100644 --- a/packages/electron-updater/src/providers/Provider.ts +++ b/packages/electron-updater/src/providers/Provider.ts @@ -3,7 +3,7 @@ import { OutgoingHttpHeaders, RequestOptions } from "http" import { load } from "js-yaml" import { URL } from "url" import { ElectronHttpExecutor } from "../electronHttpExecutor" -import { ResolvedUpdateFileInfo } from "../exports" +import { ResolvedUpdateFileInfo } from "../types" import { newUrlFromBase } from "../util" export type ProviderPlatform = "darwin" | "linux" | "win32" diff --git a/packages/electron-updater/src/exports.ts b/packages/electron-updater/src/types.ts similarity index 100% rename from packages/electron-updater/src/exports.ts rename to packages/electron-updater/src/types.ts diff --git a/packages/electron-updater/src/windowsExecutableCodeSignatureVerifier.ts b/packages/electron-updater/src/windowsExecutableCodeSignatureVerifier.ts index 3e2b04ed751..8a6eb0298a3 100644 --- a/packages/electron-updater/src/windowsExecutableCodeSignatureVerifier.ts +++ b/packages/electron-updater/src/windowsExecutableCodeSignatureVerifier.ts @@ -1,7 +1,7 @@ import { parseDn } from "builder-util-runtime" import { execFile, execFileSync } from "child_process" import * as os from "os" -import { Logger } from "./exports" +import { Logger } from "./types" import * as path from "path" // $certificateInfo = (Get-AuthenticodeSignature 'xxx\yyy.exe'