Skip to content

Commit c01f935

Browse files
committed
Merge branch 'fix/electron-builder' into develop
2 parents c315502 + 9ef5bfc commit c01f935

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
4949
- Prefix of internal folder paths from `@` to `@` to avoid confusions with
5050
scoped NPM packages.
5151
- Indentation for `.ts` files is now set as `2` spaces instead of `4`.
52+
- `electron-builder` settings:
53+
- `win`:
54+
- Enabled `asar`. _(turn it off if the executable built doesn't work)_
55+
- Disabled one click installer.
56+
- Allowed custom installation directory in the installer built.
57+
- `mac`:
58+
- Changed build target back to `dmg`.
5259

5360
### Fixed
5461
- ESLint errors/warnings on `main.ts` & `renderer.tsx`.
62+
- `electron-builder` fails to build `dmg` on `macOS` (issue
63+
[electron-builder #3990])by upgrading the package version to `> 21.2.0`.
5564

5665
### Removed
5766
- NPM package `copy-pkg-json-webpack-plugin` as it doesn't work with Webpack 5
@@ -147,3 +156,4 @@ issue.
147156
[2.0.2]: https://github.com/Devtography/electron-react-typescript-webpack-boilerplate/compare/v2.0.1...v2.0.2
148157

149158
[Issue #2]: https://github.com/Devtography/electron-react-typescript-webpack-boilerplate/issues/2
159+
[electron-builder #3990]: https://github.com/electron-userland/electron-builder/issues/3990

package.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,15 @@
1919
"output": "./out/"
2020
},
2121
"mac": {
22-
"target": "pkg"
22+
"target": "dmg"
2323
},
2424
"win": {
2525
"target": "nsis",
26-
"asar": false
26+
"asar": true
27+
},
28+
"nsis": {
29+
"oneClick": false,
30+
"allowToChangeInstallationDirectory": true
2731
},
2832
"buildVersion": "1.0.0"
2933
},

0 commit comments

Comments
 (0)