feat(maker-dmg): update electron-installer-dmg for new features

package.json

@@ -153,7 +153,7 @@
   },
   "optionalDependencies": {
     "electron-installer-debian": "^0.8.0",
-    "electron-installer-dmg": "^0.2.0",
+    "electron-installer-dmg": "^2.0.0",
     "electron-installer-flatpak": "^0.8.0",
     "electron-installer-redhat": "^0.5.0",
     "electron-installer-snap": "^2.0.0",

packages/maker/appx/package.json

@@ -26,7 +26,6 @@
     "pify": "^3.0.0"
   },
   "optionalDependencies": {
-    "electron-installer-dmg": "^0.2.0",
     "electron-windows-store": "^0.12.0"
   }
 }

packages/maker/dmg/package.json

@@ -27,6 +27,6 @@
     "pify": "^3.0.0"
   },
   "optionalDependencies": {
-    "electron-installer-dmg": "^0.2.0"
+    "electron-installer-dmg": "^2.0.0"
   }
 }

packages/maker/dmg/src/Config.ts

@@ -1,3 +1,38 @@
+export interface CodeSignOptions {
+  'signing-identity': string;
+  identifier?: string;
+}
+
+export interface DMGContents {
+  x: number;
+  y: number;
+  type: 'link' | 'file' | 'position';
+  path: string;
+  name: string;
+}
+
+export interface WindowPositionOptions {
+  x: number;
+  y: number;
+}
+
+export interface WindowSizeOptions {
+  width: number;
+  height: number;
+}
+
+export interface WindowOptions {
+  position?: WindowPositionOptions;
+  size?: WindowSizeOptions;
+}
+
+export interface AdditionalDMGOptions {
+  'background-color'?: string;
+  'icon-size'?: number;
+  window?: WindowOptions;
+  'code-sign'?: CodeSignOptions;
+}
+
 export interface MakerDMGConfig {
   /**
    * The application name
@@ -22,11 +57,21 @@ export interface MakerDMGConfig {
   /**
    * How big to make the icon for the app in the DMG
    */
-  'icon-size'?: number;
+  iconSize?: number;
   /**
    * Disk image format
    * 
    * Default: UDZO
    */
   format?: 'UDRW' | 'UDRO' | 'UDCO' | 'UDZO' | 'UDBZ' | 'ULFO';
+  /**
+   * Override the contents of the DMG, has a reasonable default
+   */
+  contents?: DMGContents[] | ((opts: MakerDMGConfig & AdditionalDMGOptions) => DMGContents[]);
+  /**
+   * Additional options to pass through to node-appdmng
+   *
+   * All available options are available in the [`appdmg` docs](https://github.com/LinusU/node-appdmg)
+   */
+  additionalDMGOptions?: AdditionalDMGOptions;
 }

yarn.lock

@@ -1361,11 +1361,12 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
-appdmg@^0.4.5:
-  version "0.4.5"
-  resolved "https://registry.yarnpkg.com/appdmg/-/appdmg-0.4.5.tgz#47a827865b8a0be48abb3522567e3493d2f1b838"
+appdmg@^0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/appdmg/-/appdmg-0.5.2.tgz#85732299b508f040473fa43ab6f6bce8b7eadc98"
   dependencies:
     async "^1.4.2"
+    buffer-alloc "^1.1.0"
     cp-file "^3.1.0"
     ds-store "^0.1.5"
     execa "^0.4.0"
@@ -1979,6 +1980,21 @@ btoa-lite@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/btoa-lite/-/btoa-lite-1.0.0.tgz#337766da15801210fdd956c22e9c6891ab9d0337"
 
+buffer-alloc-unsafe@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
+
+buffer-alloc@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
+  dependencies:
+    buffer-alloc-unsafe "^1.1.0"
+    buffer-fill "^1.0.0"
+
+buffer-fill@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
+
 buffer-from@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-0.1.1.tgz#57b18b1da0a19ec06f33837a5275a242351bd75e"
@@ -3140,14 +3156,15 @@ electron-installer-debian@^0.8.0:
     word-wrap "^1.2.3"
     yargs "^10.0.3"
 
-electron-installer-dmg@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/electron-installer-dmg/-/electron-installer-dmg-0.2.1.tgz#de835f02009b83f82e408036ac31462c3d6cb249"
+electron-installer-dmg@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/electron-installer-dmg/-/electron-installer-dmg-2.0.0.tgz#a38916476261e0b3a3bc318d5dcc8a80e634dedf"
   dependencies:
-    debug "^2.2.0"
+    debug "^3.1.0"
+    fs-extra "^6.0.1"
     minimist "^1.1.1"
   optionalDependencies:
-    appdmg "^0.4.5"
+    appdmg "^0.5.2"
 
 electron-installer-flatpak@^0.8.0:
   version "0.8.0"
@@ -4075,6 +4092,14 @@ fs-extra@^5.0.0:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
+fs-extra@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-6.0.1.tgz#8abc128f7946e310135ddc93b98bddb410e7a34b"
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
 fs-readdir-recursive@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27"