Skip to content
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .changeset/fair-gifts-explain.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/gentle-singers-sip.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/stale-dodos-refuse.md

This file was deleted.

10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
# [](https://github.com/electron-userland/electron-builder/compare/v23.3.1...v) (2022-07-16)


### Bug Fixes

* **electron-updater:** fix backward compatibility for GitHub provider without channels ([#6998](https://github.com/electron-userland/electron-builder/issues/6998)) ([d6115bc](https://github.com/electron-userland/electron-builder/commit/d6115bc5d066d6eee2638015be0c804b31ffcc18))
* Wrap the nsProcess include in a !ifndef ([#6996](https://github.com/electron-userland/electron-builder/issues/6996)) ([5301525](https://github.com/electron-userland/electron-builder/commit/53015253939f450468a6d8e0405697ea70c2a138))



# [](https://github.com/electron-userland/electron-builder/compare/v23.3.0...v) (2022-07-07)


Expand Down
2 changes: 1 addition & 1 deletion docs/api/electron-builder.md
Original file line number Diff line number Diff line change
Expand Up @@ -1849,7 +1849,7 @@ This is different from the normal quit event sequence.</p>
<strong>Extends</strong>: <code>module:electron-updater/out/BaseUpdater.BaseUpdater</code><br>
<strong>Properties</strong></p>
<ul>
<li><strong><code id="NsisUpdater-installDirectory">installDirectory</code></strong> String | “undefined” - Install dir</li>
<li><code id="NsisUpdater-installDirectory">installDirectory</code> String - Specify custom install directory path</li>
</ul>
<p><a name="Provider"></a></p>
<h2 id="provider">Provider</h2>
Expand Down
6 changes: 6 additions & 0 deletions packages/app-builder-lib/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# app-builder-lib

## 23.3.2

### Patch Changes

- [#6996](https://github.com/electron-userland/electron-builder/pull/6996) [`53015253`](https://github.com/electron-userland/electron-builder/commit/53015253939f450468a6d8e0405697ea70c2a138) Thanks [@titus-anromedonn](https://github.com/titus-anromedonn)! - fix: Wrap the nsProcess.nsh include in a !ifndef in case it has already been imported in a custom install script

## 23.3.1

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/app-builder-lib/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "app-builder-lib",
"description": "electron-builder lib",
"version": "23.3.1",
"version": "23.3.2",
"main": "out/index.js",
"files": [
"out",
Expand Down
2 changes: 1 addition & 1 deletion packages/app-builder-lib/src/version.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const PACKAGE_VERSION = "23.3.1"
export const PACKAGE_VERSION = "23.3.2"
7 changes: 7 additions & 0 deletions packages/dmg-builder/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# dmg-builder

## 23.3.2

### Patch Changes

- Updated dependencies [[`53015253`](https://github.com/electron-userland/electron-builder/commit/53015253939f450468a6d8e0405697ea70c2a138)]:
- app-builder-lib@23.3.2

## 23.3.1

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/dmg-builder/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dmg-builder",
"version": "23.3.1",
"version": "23.3.2",
"main": "out/dmgUtil.js",
"author": "Vladimir Krivosheev",
"license": "MIT",
Expand Down
7 changes: 7 additions & 0 deletions packages/electron-builder-squirrel-windows/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# electron-builder-squirrel-windows

## 23.3.2

### Patch Changes

- Updated dependencies [[`53015253`](https://github.com/electron-userland/electron-builder/commit/53015253939f450468a6d8e0405697ea70c2a138)]:
- app-builder-lib@23.3.2

## 23.3.1

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/electron-builder-squirrel-windows/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "electron-builder-squirrel-windows",
"version": "23.3.1",
"version": "23.3.2",
"main": "out/SquirrelWindowsTarget.js",
"author": "Vladimir Krivosheev",
"license": "MIT",
Expand Down
8 changes: 8 additions & 0 deletions packages/electron-builder/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# electron-builder

## 23.3.2

### Patch Changes

- Updated dependencies [[`53015253`](https://github.com/electron-userland/electron-builder/commit/53015253939f450468a6d8e0405697ea70c2a138)]:
- app-builder-lib@23.3.2
- dmg-builder@23.3.2

## 23.3.1

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/electron-builder/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "electron-builder",
"description": "A complete solution to package and build a ready for distribution Electron app for MacOS, Windows and Linux with “auto update” support out of the box",
"version": "23.3.1",
"version": "23.3.2",
"main": "out/index.js",
"files": [
"out"
Expand Down
7 changes: 7 additions & 0 deletions packages/electron-forge-maker-appimage/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# electron-forge-maker-appimage

## 23.3.2

### Patch Changes

- Updated dependencies [[`53015253`](https://github.com/electron-userland/electron-builder/commit/53015253939f450468a6d8e0405697ea70c2a138)]:
- app-builder-lib@23.3.2

## 23.3.1

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/electron-forge-maker-appimage/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "electron-forge-maker-appimage",
"version": "23.3.1",
"version": "23.3.2",
"main": "main.js",
"author": "Vladimir Krivosheev",
"license": "MIT",
Expand Down
7 changes: 7 additions & 0 deletions packages/electron-forge-maker-nsis-web/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# electron-forge-maker-nsis-web

## 23.3.2

### Patch Changes

- Updated dependencies [[`53015253`](https://github.com/electron-userland/electron-builder/commit/53015253939f450468a6d8e0405697ea70c2a138)]:
- app-builder-lib@23.3.2

## 23.3.1

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/electron-forge-maker-nsis-web/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "electron-forge-maker-nsis-web",
"version": "23.3.1",
"version": "23.3.2",
"main": "main.js",
"author": "Vladimir Krivosheev",
"license": "MIT",
Expand Down
7 changes: 7 additions & 0 deletions packages/electron-forge-maker-nsis/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# electron-forge-maker-nsis

## 23.3.2

### Patch Changes

- Updated dependencies [[`53015253`](https://github.com/electron-userland/electron-builder/commit/53015253939f450468a6d8e0405697ea70c2a138)]:
- app-builder-lib@23.3.2

## 23.3.1

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/electron-forge-maker-nsis/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "electron-forge-maker-nsis",
"version": "23.3.1",
"version": "23.3.2",
"main": "main.js",
"author": "Vladimir Krivosheev",
"license": "MIT",
Expand Down
7 changes: 7 additions & 0 deletions packages/electron-forge-maker-snap/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# electron-forge-maker-snap

## 23.3.2

### Patch Changes

- Updated dependencies [[`53015253`](https://github.com/electron-userland/electron-builder/commit/53015253939f450468a6d8e0405697ea70c2a138)]:
- app-builder-lib@23.3.2

## 23.3.1

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/electron-forge-maker-snap/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "electron-forge-maker-snap",
"version": "23.3.1",
"version": "23.3.2",
"main": "main.js",
"author": "Vladimir Krivosheev",
"license": "MIT",
Expand Down
8 changes: 8 additions & 0 deletions packages/electron-updater/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
## 4.3.0

## 5.2.1

### Patch Changes

- [#6998](https://github.com/electron-userland/electron-builder/pull/6998) [`d6115bc5`](https://github.com/electron-userland/electron-builder/commit/d6115bc5d066d6eee2638015be0c804b31ffcc18) Thanks [@matejkriz](https://github.com/matejkriz)! - fix(electron-updater): fix backward compatibility for GitHub provider without channels

* [#6995](https://github.com/electron-userland/electron-builder/pull/6995) [`c9f0da51`](https://github.com/electron-userland/electron-builder/commit/c9f0da51cab25a60d4adea94f8c8e7e05362b0ca) Thanks [@panther7](https://github.com/panther7)! - Fix installDir definition #6907

## 5.2.0

### Minor Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/electron-updater/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "electron-updater",
"version": "5.2.0",
"version": "5.2.1",
"description": "Cross platform updater for electron applications",
"main": "out/main.js",
"author": "Vladimir Krivosheev",
Expand Down
2 changes: 1 addition & 1 deletion packages/electron-updater/src/providers/GitHubProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export class GitHubProvider extends BaseGitHubProvider<GithubUpdateInfo> {
try {
if (this.updater.allowPrerelease) {
const currentChannel = this.updater?.channel || (semver.prerelease(this.updater.currentVersion)?.[0] as string) || null

if (currentChannel === null) {
// noinspection TypeScriptValidateJSTypes
tag = hrefRegExp.exec(latestRelease.element("link").attribute("href"))![1]
Expand Down
8 changes: 4 additions & 4 deletions test/src/updater/nsisUpdaterTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,24 +42,24 @@ test("downgrade (disallowed, beta)", async () => {
})

test("github allowPrerelease=true", async () => {
const updater = await createNsisUpdater('1.0.1')
const updater = await createNsisUpdater("1.0.1")
updater.allowPrerelease = true
updater.updateConfigPath = await writeUpdateConfig<GithubOptions>({
provider: "github",
owner: "mmaietta",
repo: "electron-builder-test"
repo: "electron-builder-test",
})
const updateCheckResult = await updater.checkForUpdates()
expect(removeUnstableProperties(updateCheckResult?.updateInfo)).toMatchSnapshot()
})

test("github allowPrerelease=false", async () => {
const updater = await createNsisUpdater('1.0.1')
const updater = await createNsisUpdater("1.0.1")
updater.allowPrerelease = false
updater.updateConfigPath = await writeUpdateConfig<GithubOptions>({
provider: "github",
owner: "mmaietta",
repo: "electron-builder-test"
repo: "electron-builder-test",
})
const updateCheckResult = await updater.checkForUpdates()
expect(removeUnstableProperties(updateCheckResult?.updateInfo)).toMatchSnapshot()
Expand Down