Skip to content

Commit 28f720c

Browse files
authored
Merge branch 'electron-userland:master' into master
2 parents 7951fee + ef4e8d9 commit 28f720c

File tree

130 files changed

+14290
-3344
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

130 files changed

+14290
-3344
lines changed

.circleci/config.yml

-40
This file was deleted.

.github/actions/pnpm/action.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ inputs:
44
version: # id of input
55
description: 'The pnpm version to use'
66
required: false
7-
default: 7.13.2
7+
default: 8.6.10
88

99
runs:
1010
using: 'composite'
1111
steps:
1212
- name: Setup pnpm
13-
uses: pnpm/action-setup@c3b53f6a16e57305370b4ae5a540c2077a1d50dd # tag=v2.2.4
13+
uses: pnpm/action-setup@d882d12c64e032187b2edb46d3a0d003b7a43598 # v2.4.0
1414
with:
1515
version: ${{ inputs.version }}
1616

1717
- name: Setup node
18-
uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3
18+
uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3
1919
with:
20-
node-version: '14'
20+
node-version: '18'
2121
cache: 'pnpm'
2222

2323
- name: Install dependencies
@@ -28,4 +28,4 @@ runs:
2828
# - name: install and audit
2929
# uses: ./.github/actions/pnpm
3030
# with:
31-
# version: ${{ env.PNPM_VERSION }}
31+
# version: ${{ env.PNPM_VERSION }}

.github/actions/pretest/action.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@ inputs:
1010
version:
1111
description: 'The pnpm version to use'
1212
required: false
13-
default: 7.13.2
13+
default: 8.6.10
1414

1515
runs:
1616
using: 'composite'
1717
steps:
1818
- name: Setup pnpm
19-
uses: pnpm/action-setup@c3b53f6a16e57305370b4ae5a540c2077a1d50dd # tag=v2.2.4
19+
uses: pnpm/action-setup@d882d12c64e032187b2edb46d3a0d003b7a43598 # v2.4.0
2020
with:
2121
version: ${{ inputs.version }}
2222

2323
- name: Setup node
24-
uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3
24+
uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3
2525
with:
26-
node-version: '14'
26+
node-version: '18'
2727
cache: 'pnpm'
2828

2929
- name: Install dependencies
@@ -35,7 +35,7 @@ runs:
3535
shell: bash
3636

3737
- name: Cache Electron
38-
uses: actions/cache@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 # v3
38+
uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
3939
with:
4040
path: ${{ inputs.cache-path }}
4141
key: ${{ inputs.cache-key }}
@@ -45,4 +45,4 @@ runs:
4545
# uses: ./.github/actions/pretest
4646
# with:
4747
# cache-path: ~/Library/Caches/electron
48-
# cache-key: v-11.0.0-macos-electron
48+
# cache-key: v-17.0.0-macos-electron

.github/stale.yml

-4
This file was deleted.

.github/workflows/docker-deploy.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717

1818
steps:
1919
- name: Checkout code repository
20-
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
20+
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
2121

2222
- name: Login to DockerHub
23-
uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # tag=v2
23+
uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc # v2
2424
with:
2525
username: ${{ secrets.DOCKERHUB_USERNAME }}
2626
password: ${{ secrets.DOCKERHUB_TOKEN }}

.github/workflows/pr-labeler.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
pull-requests: write # for actions/labeler to add labels to PRs
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/labeler@ba790c862c380240c6d5e7427be5ace9a05c754b # v4
15+
- uses: actions/labeler@ac9175f8a1f3625fd0d4fb234536d26811351594 # v4
1616
with:
1717
repo-token: "${{ secrets.GITHUB_TOKEN }}"
1818
configuration-path: ".github/pr-labeler.yml"

.github/workflows/pr-release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest
2020
steps:
2121
- name: Checkout code repository
22-
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
22+
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
2323
with:
2424
# This makes Actions fetch all Git history so that Changesets can generate changelogs with the correct commits
2525
fetch-depth: 0

.github/workflows/stale.yml

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: 'Close stale issues and PR'
2+
on:
3+
schedule:
4+
- cron: '0 0 * * *'
5+
6+
jobs:
7+
stale:
8+
runs-on: ubuntu-latest
9+
permissions:
10+
issues: write
11+
pull-requests: write
12+
steps:
13+
- uses: actions/stale@1160a2240286f5da8ec72b1c0816ce2481aabf84 # v8
14+
with:
15+
stale-issue-message: 'This issue is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 30 days.'
16+
stale-pr-message: 'This PR is stale because it has been open 45 days with no activity. Remove stale label or comment or this will be closed in 10 days.'
17+
close-issue-message: 'This issue was closed because it has been stalled for 30 days with no activity.'
18+
days-before-stale: 60
19+
days-before-close: 30

.github/workflows/test.yaml

+8-8
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ jobs:
2727
- snapTest,debTest,fpmTest,protonTest
2828
steps:
2929
- name: Checkout code repository
30-
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
30+
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
3131
with:
3232
fetch-depth: 2
3333

3434
- name: Setup Tests
3535
uses: ./.github/actions/pretest
3636
with:
3737
cache-path: ~/.cache/electron
38-
cache-key: v-11.0.0-linux-electron
38+
cache-key: v-17.0.0-linux-electron
3939

4040
- name: Lint
4141
run: pnpm pretest
@@ -60,13 +60,13 @@ jobs:
6060
runs-on: macos-latest
6161
steps:
6262
- name: Checkout code repository
63-
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
63+
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
6464

6565
- name: Setup Tests
6666
uses: ./.github/actions/pretest
6767
with:
6868
cache-path: ~/Library/Caches/electron
69-
cache-key: v-11.0.0-macos-electron
69+
cache-key: v-17.0.0-macos-electron
7070

7171
- name: Test
7272
run: pnpm ci:test
@@ -79,13 +79,13 @@ jobs:
7979
runs-on: ubuntu-latest
8080
steps:
8181
- name: Checkout code repository
82-
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
82+
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
8383

8484
- name: Setup Tests
8585
uses: ./.github/actions/pretest
8686
with:
8787
cache-path: ~/.cache/electron
88-
cache-key: v-11.0.0-update-electron
88+
cache-key: v-17.0.0-update-electron
8989

9090
- name: Test
9191
run: pnpm ci:test
@@ -105,12 +105,12 @@ jobs:
105105
- BuildTest,oneClickInstallerTest,winCodeSignTest,winPackagerTest,webInstallerTest
106106
steps:
107107
- name: Checkout code repository
108-
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
108+
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
109109

110110
- name: Setup Tests
111111
uses: ./.github/actions/pretest
112112
with:
113-
cache-key: v-11.0.0-windows-electron
113+
cache-key: v-17.0.0-windows-electron
114114
cache-path: ~\AppData\Local\electron\Cache
115115

116116
- name: Test

CHANGELOG.md

+152
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,155 @@
1+
# [](https://github.com/electron-userland/electron-builder/compare/v24.6.2...v) (2023-07-24)
2+
3+
4+
### Bug Fixes
5+
6+
* add `signExts` configuration option to not sign `.node` files by default ([#7685](https://github.com/electron-userland/electron-builder/issues/7685)) ([78448af](https://github.com/electron-userland/electron-builder/commit/78448af062e2ce70c1eb590c05cce01919933e26))
7+
8+
9+
10+
# [](https://github.com/electron-userland/electron-builder/compare/v24.6.1...v) (2023-07-20)
11+
12+
13+
### Bug Fixes
14+
15+
* add back missing `createLazyProductionDeps` that was missed during revert ([#7679](https://github.com/electron-userland/electron-builder/issues/7679)) ([f5d23ef](https://github.com/electron-userland/electron-builder/commit/f5d23ef4edce6096759a3e25dfe453366ab72da2))
16+
* check null for `isCustomChannel` in GitHubProvider.ts [#7665](https://github.com/electron-userland/electron-builder/issues/7665) ([#7666](https://github.com/electron-userland/electron-builder/issues/7666)) ([441da40](https://github.com/electron-userland/electron-builder/commit/441da40d814d90154ed9b120684e7c1a7d919c52))
17+
18+
19+
20+
# [](https://github.com/electron-userland/electron-builder/compare/v24.6.0...v) (2023-07-19)
21+
22+
23+
### Bug Fixes
24+
25+
* reverting migration to electron-rebuild since Cxx flags were back-ported to latest versions of electron ([#7668](https://github.com/electron-userland/electron-builder/issues/7668)) ([9cfd35d](https://github.com/electron-userland/electron-builder/commit/9cfd35d5ad320255d88be67530ce5fe6e832f862))
26+
* updating simple-update-notifier version to resolve vulnerability ([#7673](https://github.com/electron-userland/electron-builder/issues/7673)) ([355e356](https://github.com/electron-userland/electron-builder/commit/355e35654510daded399ea31ed0bcd37effde935))
27+
28+
29+
30+
# [](https://github.com/electron-userland/electron-builder/compare/v24.5.2...v) (2023-07-10)
31+
32+
33+
### Bug Fixes
34+
35+
* re-enable changeDir step for assisted, perMachine installs ([#7648](https://github.com/electron-userland/electron-builder/issues/7648)) ([84ed3ff](https://github.com/electron-userland/electron-builder/commit/84ed3ff123b5ae92cd3350d64677434f9b397b76))
36+
* use nullish coalescing operator for hardenedRuntime default value ([#7643](https://github.com/electron-userland/electron-builder/issues/7643)) ([5fec686](https://github.com/electron-userland/electron-builder/commit/5fec686412b23614bf17f76d03fecc66c220ac99))
37+
38+
39+
### Features
40+
41+
* Added support for overriding ‘preAutoEntitlements’ for electron/osx-sign ([#7642](https://github.com/electron-userland/electron-builder/issues/7642)) ([2717282](https://github.com/electron-userland/electron-builder/commit/2717282cbff0dc0b6dee7e5af1fa0ecfcff1d5bf))
42+
43+
44+
### Reverts
45+
46+
* Revert "chore: update pnpm version for tests and docker images (#7640)" ([014397b](https://github.com/electron-userland/electron-builder/commit/014397b798047b0afda7d5f04d7a8e13036b351a)), closes [#7640](https://github.com/electron-userland/electron-builder/issues/7640)
47+
48+
49+
50+
# [](https://github.com/electron-userland/electron-builder/compare/v24.5.1...v) (2023-06-27)
51+
52+
53+
### Bug Fixes
54+
55+
* change typed-emitter to tiny-typed-emitter to remove rxjs dependency ([#7633](https://github.com/electron-userland/electron-builder/issues/7633)) ([531a630](https://github.com/electron-userland/electron-builder/commit/531a6309283ea1b2b262817a170e2c030735f8b6))
56+
* **linux:** make semver pre-release versions valid for "pacman" and "rpm" target ([#7630](https://github.com/electron-userland/electron-builder/issues/7630)) ([37db080](https://github.com/electron-userland/electron-builder/commit/37db080ffabf546132d278ff69532b0558ad0a41))
57+
* trigger `app.relaunch()` if `isForceRunAfter = true` for rpm and deb updaters ([#7637](https://github.com/electron-userland/electron-builder/issues/7637)) ([b3dfe64](https://github.com/electron-userland/electron-builder/commit/b3dfe64b22dc51375861f6b8a3517ff9ab562aaf))
58+
59+
60+
61+
# [](https://github.com/electron-userland/electron-builder/compare/v24.5.0...v) (2023-06-24)
62+
63+
64+
### Bug Fixes
65+
66+
* **mac:** use Identity `hash` instead of `name` if it exists ([#7622](https://github.com/electron-userland/electron-builder/issues/7622)) ([4652416](https://github.com/electron-userland/electron-builder/commit/46524169cefbfa18e342d7fa19e79e710aae848e))
67+
* removing stdio from spawnSync to fix crash on rpm/deb updaters ([#7628](https://github.com/electron-userland/electron-builder/issues/7628)) ([98f535e](https://github.com/electron-userland/electron-builder/commit/98f535e1f80b7f84dc3c2f135a4a5ea8cd142f31))
68+
* resolve unstable unit test that is on latest mac ([#7626](https://github.com/electron-userland/electron-builder/issues/7626)) ([16d1430](https://github.com/electron-userland/electron-builder/commit/16d1430b6c3721f3a258a02b70897a9b2af25c28))
69+
* use electron-rebuilder API directly so as to override the platform for cross-platform prebuild compilations ([#7629](https://github.com/electron-userland/electron-builder/issues/7629)) ([285aa76](https://github.com/electron-userland/electron-builder/commit/285aa766c2675448689f2e465b6fa2b2acacdbc6))
70+
71+
72+
73+
# [](https://github.com/electron-userland/electron-builder/compare/v24.4.0...v) (2023-06-16)
74+
75+
76+
### Bug Fixes
77+
78+
* Allow building MAS and MAC targets with different appId ([#7603](https://github.com/electron-userland/electron-builder/issues/7603)) ([f464e3e](https://github.com/electron-userland/electron-builder/commit/f464e3ee6b8a6330a9be2961afaaec150777f91c))
79+
* default the downloaded update file name to `fileInfo.info.url` ([#7597](https://github.com/electron-userland/electron-builder/issues/7597)) ([cd15e16](https://github.com/electron-userland/electron-builder/commit/cd15e161031e180200ab772f01198a5b68fa42fe))
80+
* **mac:** Wrap hditutil detach in retry w/ backoff ([#7600](https://github.com/electron-userland/electron-builder/issues/7600)) ([4dce371](https://github.com/electron-userland/electron-builder/commit/4dce3718abd75b8d0e29f37f6ba0ee1e76353c65))
81+
* **nsis:** Ensure application name sub-folder on fresh installs. ([#7552](https://github.com/electron-userland/electron-builder/issues/7552)) ([e3fc9b5](https://github.com/electron-userland/electron-builder/commit/e3fc9b544cc8c6728ffd77a45408d6e0e87dbb46)), closes [#6885](https://github.com/electron-userland/electron-builder/issues/6885)
82+
83+
84+
### Features
85+
86+
* added `ELECTRON_BUILDER_7Z_FILTER ` env variable for 7z filter ([#7609](https://github.com/electron-userland/electron-builder/issues/7609)) ([99f49cf](https://github.com/electron-userland/electron-builder/commit/99f49cf7a86afa33d35652ffc6329fefed2e5f75))
87+
88+
89+
90+
# [](https://github.com/electron-userland/electron-builder/compare/v24.3.0...v) (2023-05-08)
91+
92+
93+
### Bug Fixes
94+
95+
* missing [@types](https://github.com/types) dependencies for output d.ts files ([#7568](https://github.com/electron-userland/electron-builder/issues/7568)) ([c9d20db](https://github.com/electron-userland/electron-builder/commit/c9d20db964cce991dab137ec0105d40d8eacd95c))
96+
97+
98+
### Features
99+
100+
* allow specifying recommended dependencies for deb target ([#7558](https://github.com/electron-userland/electron-builder/issues/7558)) ([54c8537](https://github.com/electron-userland/electron-builder/commit/54c85374790f7a8e0dc520a20c716b4afe69be20))
101+
102+
103+
104+
# [](https://github.com/electron-userland/electron-builder/compare/v24.2.1...v) (2023-04-25)
105+
106+
107+
### Bug Fixes
108+
109+
* handle differential downloads when the blockmap HTTP response is compressed ([#7544](https://github.com/electron-userland/electron-builder/issues/7544)) ([dab3aeb](https://github.com/electron-userland/electron-builder/commit/dab3aeba2240ead4300c8fdb35e3d9c16b04a23d))
110+
111+
112+
### Features
113+
114+
* nsis install method - exposed as public to avoid quit the app for the install ([#7533](https://github.com/electron-userland/electron-builder/issues/7533)) ([4786d41](https://github.com/electron-userland/electron-builder/commit/4786d41575c638137c7016c905d089ab74bf5e28))
115+
* **nsis:** display "Space Required" text for NSIS installer ([#7531](https://github.com/electron-userland/electron-builder/issues/7531)) ([0db9c66](https://github.com/electron-userland/electron-builder/commit/0db9c66f0fff9a482d34aeaafaf11f542b786bf8))
116+
117+
118+
119+
# [](https://github.com/electron-userland/electron-builder/compare/v24.2.0...v) (2023-04-13)
120+
121+
122+
### Bug Fixes
123+
124+
* update `@electron/rebuild` version and update imports ([#7541](https://github.com/electron-userland/electron-builder/issues/7541)) ([a4888ac](https://github.com/electron-userland/electron-builder/commit/a4888ac490e4e5d3783858d27acd487b2b8444fd))
125+
* **updater:** handle errors on responses in differential download ([#7542](https://github.com/electron-userland/electron-builder/issues/7542)) ([9123e31](https://github.com/electron-userland/electron-builder/commit/9123e31eb792211da717804e5a5b8029fe694d5f)), closes [#2398](https://github.com/electron-userland/electron-builder/issues/2398)
126+
* Use `update-alternatives` instead of symlinks for [#7500](https://github.com/electron-userland/electron-builder/issues/7500) ([#7501](https://github.com/electron-userland/electron-builder/issues/7501)) ([e83dc81](https://github.com/electron-userland/electron-builder/commit/e83dc814725f543c6b51721fdbfee83158d35084))
127+
128+
129+
130+
# [](https://github.com/electron-userland/electron-builder/compare/v24.1.3...v) (2023-04-06)
131+
132+
133+
### Bug Fixes
134+
135+
* Fix electron-updater error handling when spawning a process asynchronously ([#7524](https://github.com/electron-userland/electron-builder/issues/7524)) ([1a13480](https://github.com/electron-userland/electron-builder/commit/1a13480036a2219007f866c64beea45292bc2946))
136+
137+
138+
### Features
139+
140+
* Moved `electronLanguages` to global config to support win/linux ([#7516](https://github.com/electron-userland/electron-builder/issues/7516)) ([1533501](https://github.com/electron-userland/electron-builder/commit/1533501f999b364b656cdaa2048a1a7fd5e7c361))
141+
142+
143+
144+
# [](https://github.com/electron-userland/electron-builder/compare/v24.1.2...v) (2023-04-05)
145+
146+
147+
### Bug Fixes
148+
149+
* "Can't reconcile two non-macho files" due to new Pre-Gyp-Copy functionality in electron/rebuild integration ([#7519](https://github.com/electron-userland/electron-builder/issues/7519)) ([abf3703](https://github.com/electron-userland/electron-builder/commit/abf370395f45e4005f12131c532325a1e3232309))
150+
151+
152+
1153
# [](https://github.com/electron-userland/electron-builder/compare/v24.1.1...v) (2023-03-30)
2154

3155

0 commit comments

Comments
 (0)