Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: workaround vite replacing process.env in updater #6160

Merged
merged 2 commits into from Aug 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/five-worms-work.md
@@ -0,0 +1,5 @@
---
"electron-updater": patch
---

fix(electron-updater): workaround vite's process.env.\* replacement
4 changes: 2 additions & 2 deletions packages/electron-updater/src/AppAdapter.ts
Expand Up @@ -34,11 +34,11 @@ export function getAppCacheDir() {
// https://github.com/electron/electron/issues/1404#issuecomment-194391247
let result: string
if (process.platform === "win32") {
result = process.env.LOCALAPPDATA || path.join(homedir, "AppData", "Local")
result = process.env["LOCALAPPDATA"] || path.join(homedir, "AppData", "Local")
} else if (process.platform === "darwin") {
result = path.join(homedir, "Library", "Application Support", "Caches")
} else {
result = process.env.XDG_CACHE_HOME || path.join(homedir, ".cache")
result = process.env["XDG_CACHE_HOME"] || path.join(homedir, ".cache")
}
return result
}
8 changes: 4 additions & 4 deletions packages/electron-updater/src/AppImageUpdater.ts
Expand Up @@ -16,8 +16,8 @@ export class AppImageUpdater extends BaseUpdater {
}

public isUpdaterActive(): boolean {
if (process.env.APPIMAGE == null) {
if (process.env.SNAP == null) {
if (process.env["APPIMAGE"] == null) {
if (process.env["SNAP"] == null) {
this._logger.warn("APPIMAGE env is not defined, current application is not an AppImage")
} else {
this._logger.info("SNAP env is defined, updater is disabled")
Expand All @@ -36,7 +36,7 @@ export class AppImageUpdater extends BaseUpdater {
fileInfo,
downloadUpdateOptions,
task: async (updateFile, downloadOptions) => {
const oldFile = process.env.APPIMAGE!
const oldFile = process.env["APPIMAGE"]!
if (oldFile == null) {
throw newError("APPIMAGE env is not defined", "ERR_UPDATER_OLD_FILE_NOT_FOUND")
}
Expand Down Expand Up @@ -74,7 +74,7 @@ export class AppImageUpdater extends BaseUpdater {
}

protected doInstall(options: InstallOptions): boolean {
const appImageFile = process.env.APPIMAGE!
const appImageFile = process.env["APPIMAGE"]!
if (appImageFile == null) {
throw newError("APPIMAGE env is not defined", "ERR_UPDATER_OLD_FILE_NOT_FOUND")
}
Expand Down
Expand Up @@ -87,7 +87,7 @@ export function computeOperations(oldBlockMap: BlockMap, newBlockMap: BlockMap,
return operations
}

const isValidateOperationRange = process.env.DIFFERENTIAL_DOWNLOAD_PLAN_BUILDER_VALIDATE_RANGES === "true"
const isValidateOperationRange = process.env["DIFFERENTIAL_DOWNLOAD_PLAN_BUILDER_VALIDATE_RANGES"] === "true"

function validateAndAdd(operation: Operation, operations: Array<Operation>, checksum: string, index: number): void {
if (isValidateOperationRange && operations.length !== 0) {
Expand Down
2 changes: 1 addition & 1 deletion packages/electron-updater/src/providerFactory.ts
Expand Up @@ -30,7 +30,7 @@ export function createClient(data: PublishConfiguration | AllPublishOptions, upd
switch (provider) {
case "github": {
const githubOptions = data as GithubOptions
const token = (githubOptions.private ? process.env.GH_TOKEN || process.env.GITHUB_TOKEN : null) || githubOptions.token
const token = (githubOptions.private ? process.env["GH_TOKEN"] || process.env["GITHUB_TOKEN"] : null) || githubOptions.token
if (token == null) {
return new GitHubProvider(githubOptions, updater, runtimeOptions)
} else {
Expand Down
2 changes: 1 addition & 1 deletion packages/electron-updater/src/providers/Provider.ts
Expand Up @@ -28,7 +28,7 @@ export abstract class Provider<T extends UpdateInfo> {

private getChannelFilePrefix(): string {
if (this.runtimeOptions.platform === "linux") {
const arch = process.env.TEST_UPDATER_ARCH || process.arch
const arch = process.env["TEST_UPDATER_ARCH"] || process.arch
const archSuffix = arch === "x64" ? "" : `-${arch}`
return "-linux" + archSuffix
} else {
Expand Down