Merge branch 'master' into app-builder-new

beyondkmp · May 22, 2024 · 33ea866 · 33ea866
2 parents e2fd9ee + 77f9774
commit 33ea866
Show file tree

Hide file tree

Showing 27 changed files with 164 additions and 12 deletions.
diff --git a/.changeset/four-taxis-doubt.md b/.changeset/four-taxis-doubt.md
@@ -0,0 +1,5 @@
+---
+"app-builder-lib": minor
+---
+
+feat(mac): support macos signature `additionalArguments` parameter
diff --git a/.changeset/pre.json b/.changeset/pre.json
@@ -25,6 +25,9 @@
     "fair-rockets-march",
     "fast-maps-dress",
     "flat-keys-wonder",
+    "four-taxis-doubt",
+    "good-pots-design",
+    "green-parrots-drum",
     "lucky-otters-report",
     "mighty-spies-knock",
     "moody-years-poke",
@@ -37,6 +40,7 @@
     "spotty-foxes-count",
     "stale-otters-turn",
     "tame-balloons-walk",
+    "tough-clouds-think",
     "twelve-points-whisper",
     "wild-buttons-pretend",
     "wild-socks-chew"

diff --git a/.changeset/serious-berries-knock.md b/.changeset/serious-berries-knock.md
@@ -0,0 +1,5 @@
+---
+
+---
+
+fix(deps): update dependency ejs to v3.1.10 [security]
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,18 @@
+# [](https://github.com/electron-userland/electron-builder/compare/v25.0.0-alpha.7...v) (2024-05-20)
+
+
+### Bug Fixes
+
+* **deps:** update dependency tar to v6.2.1 [security] ([#8171](https://github.com/electron-userland/electron-builder/issues/8171)) ([393f140](https://github.com/electron-userland/electron-builder/commit/393f140459dc4a7d6008750dc48de83c8e8d33a7))
+
+
+### Features
+
+* add `afterExtract` hook for after electron distributable has been unpacked ([#8194](https://github.com/electron-userland/electron-builder/issues/8194)) ([588c5db](https://github.com/electron-userland/electron-builder/commit/588c5db47c97e06b540bdc7f7a6de9a936a7603b))
+* **mac:** support macos signature `additionalArguments` parameter  ([#8218](https://github.com/electron-userland/electron-builder/issues/8218)) ([22737b2](https://github.com/electron-userland/electron-builder/commit/22737b2b2db5a10785b1ed3fd05fd9d237fcd731))
+
+
+
 # [](https://github.com/electron-userland/electron-builder/compare/v25.0.0-alpha.6...v) (2024-05-06)
 
 

diff --git a/docs/configuration/configuration.md b/docs/configuration/configuration.md
@@ -147,6 +147,7 @@ Env file `electron-builder.env` in the current dir ([example](https://github.com
 <li><code id="Configuration-launchUiVersion">launchUiVersion</code> Boolean | String | “undefined” - <em>libui-based frameworks only</em> The version of LaunchUI you are packaging for. Applicable for Windows only. Defaults to version suitable for used framework version.</li>
 <li><code id="Configuration-framework">framework</code> String | “undefined” - The framework name. One of <code>electron</code>, <code>proton</code>, <code>libui</code>. Defaults to <code>electron</code>.</li>
 <li><code id="Configuration-beforePack">beforePack</code> module:app-builder-lib/out/configuration.__type | String | “undefined” - The function (or path to file or module id) to be <a href="#beforepack">run before pack</a></li>
+<li><code id="Configuration-afterExtract">afterExtract</code> module:app-builder-lib/out/configuration.__type | String | “undefined” - The function (or path to file or module id) to be <a href="#afterextract">run after the prebuilt Electron binary has been extracted to the output directory</a></li>
 </ul>
 <hr>
 <ul>

diff --git a/docs/configuration/mac.md b/docs/configuration/mac.md
@@ -110,6 +110,10 @@ The top-level [mac](configuration.md#Configuration-mac) key contains set of opti
 <p>This option has no effect unless building for “universal” arch and applies only if <code>mergeASARs</code> is <code>true</code>.</p>
 </li>
 <li>
+<p><code id="MacConfiguration-additionalArguments">additionalArguments</code> Array&lt;String&gt; | “undefined” - Array of strings specifying additional arguments to pass to the <code>codesign</code> command used to sign a specific file.</p>
+<p>Some subresources that you may include in your Electron app may need to be signed with --deep, this is not typically safe to apply to the entire Electron app and therefore should be applied to just your file. Usage Example: <code>['--deep']</code></p>
+</li>
+<li>
 <p><code id="MacConfiguration-notarize">notarize</code> <a href="#NotarizeLegacyOptions">NotarizeLegacyOptions</a> | <a href="#NotarizeNotaryOptions">NotarizeNotaryOptions</a> | Boolean | “undefined” - Options to use for @electron/notarize (ref: <a href="https://github.com/electron/notarize">https://github.com/electron/notarize</a>). Use <code>false</code> to explicitly disable</p>
 <p>Note: In order to activate the notarization step You MUST specify one of the following via environment variables: 1. <code>APPLE_API_KEY</code>, <code>APPLE_API_KEY_ID</code> and <code>APPLE_API_ISSUER</code>. 2. <code>APPLE_ID</code>, <code>APPLE_APP_SPECIFIC_PASSWORD</code>, and <code>APPLE_TEAM_ID</code> 3. <code>APPLE_KEYCHAIN</code> and <code>APPLE_KEYCHAIN_PROFILE</code></p>
 <p>For security reasons it is recommended to use the first option (see <a href="https://github.com/electron-userland/electron-builder/issues/7859">https://github.com/electron-userland/electron-builder/issues/7859</a>)</p>

diff --git a/packages/app-builder-lib/CHANGELOG.md b/packages/app-builder-lib/CHANGELOG.md
@@ -1,5 +1,21 @@
 # app-builder-lib
 
+## 25.0.0-alpha.8
+
+### Minor Changes
+
+- [#8218](https://github.com/electron-userland/electron-builder/pull/8218) [`22737b2b`](https://github.com/electron-userland/electron-builder/commit/22737b2b2db5a10785b1ed3fd05fd9d237fcd731) Thanks [@PBK-B](https://github.com/PBK-B)! - feat(mac): support macos signature `additionalArguments` parameter
+
+- [#8194](https://github.com/electron-userland/electron-builder/pull/8194) [`588c5db4`](https://github.com/electron-userland/electron-builder/commit/588c5db47c97e06b540bdc7f7a6de9a936a7603b) Thanks [@rafaberaldo](https://github.com/rafaberaldo)! - feat: add `afterExtract` hook to build process with the same payload interface as `beforePack` and `afterPack`
+
+### Patch Changes
+
+- [#8216](https://github.com/electron-userland/electron-builder/pull/8216) [`08852365`](https://github.com/electron-userland/electron-builder/commit/088523652934b87419c15c068459627dcf9a0535) Thanks [@mmaietta](https://github.com/mmaietta)! - chore: update read-config-file dependency
+
+- Updated dependencies []:
+  - [email protected]
+  - [email protected]
+
 ## 25.0.0-alpha.7
 
 ### Patch Changes

diff --git a/packages/app-builder-lib/package.json b/packages/app-builder-lib/package.json
@@ -1,7 +1,7 @@
 {
   "name": "app-builder-lib",
   "description": "electron-builder lib",
-  "version": "25.0.0-alpha.7",
+  "version": "25.0.0-alpha.8",
   "main": "out/index.js",
   "files": [
     "out",
@@ -48,7 +48,7 @@
   "dependencies": {
     "@develar/schema-utils": "~2.6.5",
     "@electron/notarize": "2.3.0",
-    "@electron/osx-sign": "1.0.5",
+    "@electron/osx-sign": "1.3.0",
     "@electron/rebuild": "3.6.0",
     "@electron/universal": "2.0.1",
     "@malept/flatpak-bundler": "^0.4.0",

diff --git a/packages/app-builder-lib/scheme.json b/packages/app-builder-lib/scheme.json
@@ -2125,6 +2125,20 @@
     "MacConfiguration": {
       "additionalProperties": false,
       "properties": {
+        "additionalArguments": {
+          "anyOf": [
+            {
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "description": "Array of strings specifying additional arguments to pass to the `codesign` command used to sign a specific file.\n\nSome subresources that you may include in your Electron app may need to be signed with --deep, this is not typically safe to apply to the entire Electron app and therefore should be applied to just your file.\nUsage Example: `['--deep']`"
+        },
         "appId": {
           "default": "com.electron.${name}",
           "description": "The application id. Used as [CFBundleIdentifier](https://developer.apple.com/library/ios/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html#//apple_ref/doc/uid/20001431-102070) for MacOS and as\n[Application User Model ID](https://msdn.microsoft.com/en-us/library/windows/desktop/dd378459(v=vs.85).aspx) for Windows (NSIS target only, Squirrel.Windows not supported). It is strongly recommended that an explicit ID is set.",
@@ -2744,6 +2758,20 @@
     "MasConfiguration": {
       "additionalProperties": false,
       "properties": {
+        "additionalArguments": {
+          "anyOf": [
+            {
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "description": "Array of strings specifying additional arguments to pass to the `codesign` command used to sign a specific file.\n\nSome subresources that you may include in your Electron app may need to be signed with --deep, this is not typically safe to apply to the entire Electron app and therefore should be applied to just your file.\nUsage Example: `['--deep']`"
+        },
         "appId": {
           "default": "com.electron.${name}",
           "description": "The application id. Used as [CFBundleIdentifier](https://developer.apple.com/library/ios/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html#//apple_ref/doc/uid/20001431-102070) for MacOS and as\n[Application User Model ID](https://msdn.microsoft.com/en-us/library/windows/desktop/dd378459(v=vs.85).aspx) for Windows (NSIS target only, Squirrel.Windows not supported). It is strongly recommended that an explicit ID is set.",

diff --git a/packages/app-builder-lib/src/macPackager.ts b/packages/app-builder-lib/src/macPackager.ts
@@ -378,6 +378,7 @@ export class MacPackager extends PlatformPackager<MacConfiguration> {
         hardenedRuntime: hardenedRuntime ?? undefined,
         timestamp: customSignOptions.timestamp || undefined,
         requirements: requirements || undefined,
+        additionalArguments: customSignOptions.additionalArguments || [],
       }
       log.debug({ file: log.filePath(filePath), ...args }, "selecting signing options")
       return args

diff --git a/packages/app-builder-lib/src/options/macOptions.ts b/packages/app-builder-lib/src/options/macOptions.ts
@@ -212,6 +212,14 @@ export interface MacConfiguration extends PlatformSpecificBuildOptions {
    */
   readonly x64ArchFiles?: string | null
 
+  /**
+   * Array of strings specifying additional arguments to pass to the `codesign` command used to sign a specific file.
+   *
+   * Some subresources that you may include in your Electron app may need to be signed with --deep, this is not typically safe to apply to the entire Electron app and therefore should be applied to just your file.
+   * Usage Example: `['--deep']`
+   */
+  readonly additionalArguments?: Array<string> | null
+
   /**
    * Options to use for @electron/notarize (ref: https://github.com/electron/notarize).
    * Use `false` to explicitly disable

diff --git a/packages/app-builder-lib/src/version.ts b/packages/app-builder-lib/src/version.ts
@@ -1 +1 @@
-export const PACKAGE_VERSION = "25.0.0-alpha.7"
+export const PACKAGE_VERSION = "25.0.0-alpha.8"
diff --git a/packages/dmg-builder/CHANGELOG.md b/packages/dmg-builder/CHANGELOG.md
@@ -1,5 +1,12 @@
 # dmg-builder
 
+## 25.0.0-alpha.8
+
+### Patch Changes
+
+- Updated dependencies [[`22737b2b`](https://github.com/electron-userland/electron-builder/commit/22737b2b2db5a10785b1ed3fd05fd9d237fcd731), [`08852365`](https://github.com/electron-userland/electron-builder/commit/088523652934b87419c15c068459627dcf9a0535), [`588c5db4`](https://github.com/electron-userland/electron-builder/commit/588c5db47c97e06b540bdc7f7a6de9a936a7603b)]:
+  - [email protected]
+
 ## 25.0.0-alpha.7
 
 ### Patch Changes

diff --git a/packages/dmg-builder/package.json b/packages/dmg-builder/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "dmg-builder",
-	"version": "25.0.0-alpha.7",
+	"version": "25.0.0-alpha.8",
 	"main": "out/dmgUtil.js",
 	"author": "Vladimir Krivosheev",
 	"license": "MIT",

diff --git a/packages/electron-builder-squirrel-windows/CHANGELOG.md b/packages/electron-builder-squirrel-windows/CHANGELOG.md
@@ -1,5 +1,12 @@
 # electron-builder-squirrel-windows
 
+## 25.0.0-alpha.8
+
+### Patch Changes
+
+- Updated dependencies [[`22737b2b`](https://github.com/electron-userland/electron-builder/commit/22737b2b2db5a10785b1ed3fd05fd9d237fcd731), [`08852365`](https://github.com/electron-userland/electron-builder/commit/088523652934b87419c15c068459627dcf9a0535), [`588c5db4`](https://github.com/electron-userland/electron-builder/commit/588c5db47c97e06b540bdc7f7a6de9a936a7603b)]:
+  - [email protected]
+
 ## 25.0.0-alpha.7
 
 ### Patch Changes

diff --git a/packages/electron-builder-squirrel-windows/package.json b/packages/electron-builder-squirrel-windows/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron-builder-squirrel-windows",
-  "version": "25.0.0-alpha.7",
+  "version": "25.0.0-alpha.8",
   "main": "out/SquirrelWindowsTarget.js",
   "author": "Vladimir Krivosheev",
   "license": "MIT",

diff --git a/packages/electron-builder/CHANGELOG.md b/packages/electron-builder/CHANGELOG.md
@@ -1,5 +1,13 @@
 # electron-builder
 
+## 25.0.0-alpha.8
+
+### Patch Changes
+
+- Updated dependencies [[`22737b2b`](https://github.com/electron-userland/electron-builder/commit/22737b2b2db5a10785b1ed3fd05fd9d237fcd731), [`08852365`](https://github.com/electron-userland/electron-builder/commit/088523652934b87419c15c068459627dcf9a0535), [`588c5db4`](https://github.com/electron-userland/electron-builder/commit/588c5db47c97e06b540bdc7f7a6de9a936a7603b)]:
+  - [email protected]
+  - [email protected]
+
 ## 25.0.0-alpha.7
 
 ### Patch Changes

diff --git a/packages/electron-builder/package.json b/packages/electron-builder/package.json
@@ -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": "25.0.0-alpha.7",
+  "version": "25.0.0-alpha.8",
   "main": "out/index.js",
   "files": [
     "out"

diff --git a/packages/electron-forge-maker-appimage/CHANGELOG.md b/packages/electron-forge-maker-appimage/CHANGELOG.md
@@ -1,5 +1,12 @@
 # electron-forge-maker-appimage
 
+## 25.0.0-alpha.8
+
+### Patch Changes
+
+- Updated dependencies [[`22737b2b`](https://github.com/electron-userland/electron-builder/commit/22737b2b2db5a10785b1ed3fd05fd9d237fcd731), [`08852365`](https://github.com/electron-userland/electron-builder/commit/088523652934b87419c15c068459627dcf9a0535), [`588c5db4`](https://github.com/electron-userland/electron-builder/commit/588c5db47c97e06b540bdc7f7a6de9a936a7603b)]:
+  - [email protected]
+
 ## 25.0.0-alpha.7
 
 ### Patch Changes

diff --git a/packages/electron-forge-maker-appimage/package.json b/packages/electron-forge-maker-appimage/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron-forge-maker-appimage",
-  "version": "25.0.0-alpha.7",
+  "version": "25.0.0-alpha.8",
   "main": "main.js",
   "author": "Vladimir Krivosheev",
   "license": "MIT",

diff --git a/packages/electron-forge-maker-nsis-web/CHANGELOG.md b/packages/electron-forge-maker-nsis-web/CHANGELOG.md
@@ -1,5 +1,12 @@
 # electron-forge-maker-nsis-web
 
+## 25.0.0-alpha.8
+
+### Patch Changes
+
+- Updated dependencies [[`22737b2b`](https://github.com/electron-userland/electron-builder/commit/22737b2b2db5a10785b1ed3fd05fd9d237fcd731), [`08852365`](https://github.com/electron-userland/electron-builder/commit/088523652934b87419c15c068459627dcf9a0535), [`588c5db4`](https://github.com/electron-userland/electron-builder/commit/588c5db47c97e06b540bdc7f7a6de9a936a7603b)]:
+  - [email protected]
+
 ## 25.0.0-alpha.7
 
 ### Patch Changes

diff --git a/packages/electron-forge-maker-nsis-web/package.json b/packages/electron-forge-maker-nsis-web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron-forge-maker-nsis-web",
-  "version": "25.0.0-alpha.7",
+  "version": "25.0.0-alpha.8",
   "main": "main.js",
   "author": "Vladimir Krivosheev",
   "license": "MIT",

diff --git a/packages/electron-forge-maker-nsis/CHANGELOG.md b/packages/electron-forge-maker-nsis/CHANGELOG.md
@@ -1,5 +1,12 @@
 # electron-forge-maker-nsis
 
+## 25.0.0-alpha.8
+
+### Patch Changes
+
+- Updated dependencies [[`22737b2b`](https://github.com/electron-userland/electron-builder/commit/22737b2b2db5a10785b1ed3fd05fd9d237fcd731), [`08852365`](https://github.com/electron-userland/electron-builder/commit/088523652934b87419c15c068459627dcf9a0535), [`588c5db4`](https://github.com/electron-userland/electron-builder/commit/588c5db47c97e06b540bdc7f7a6de9a936a7603b)]:
+  - [email protected]
+
 ## 25.0.0-alpha.7
 
 ### Patch Changes

diff --git a/packages/electron-forge-maker-nsis/package.json b/packages/electron-forge-maker-nsis/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron-forge-maker-nsis",
-  "version": "25.0.0-alpha.7",
+  "version": "25.0.0-alpha.8",
   "main": "main.js",
   "author": "Vladimir Krivosheev",
   "license": "MIT",

diff --git a/packages/electron-forge-maker-snap/CHANGELOG.md b/packages/electron-forge-maker-snap/CHANGELOG.md
@@ -1,5 +1,12 @@
 # electron-forge-maker-snap
 
+## 25.0.0-alpha.8
+
+### Patch Changes
+
+- Updated dependencies [[`22737b2b`](https://github.com/electron-userland/electron-builder/commit/22737b2b2db5a10785b1ed3fd05fd9d237fcd731), [`08852365`](https://github.com/electron-userland/electron-builder/commit/088523652934b87419c15c068459627dcf9a0535), [`588c5db4`](https://github.com/electron-userland/electron-builder/commit/588c5db47c97e06b540bdc7f7a6de9a936a7603b)]:
+  - [email protected]
+
 ## 25.0.0-alpha.7
 
 ### Patch Changes

diff --git a/packages/electron-forge-maker-snap/package.json b/packages/electron-forge-maker-snap/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron-forge-maker-snap",
-  "version": "25.0.0-alpha.7",
+  "version": "25.0.0-alpha.8",
   "main": "main.js",
   "author": "Vladimir Krivosheev",
   "license": "MIT",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export const PACKAGE_VERSION = "25.0.0-alpha.7"
		export const PACKAGE_VERSION = "25.0.0-alpha.8"