build(deps): upgrade electron-installer-snap to ^5.1.0 (#1644)

Fixes #1607.

package.json

@@ -149,7 +149,7 @@
     "electron-installer-debian": "^3.0.0",
     "electron-installer-dmg": "^3.0.0",
     "electron-installer-redhat": "^3.0.0",
-    "electron-installer-snap": "^5.0.0",
+    "electron-installer-snap": "^5.1.0",
     "electron-windows-store": "^2.1.0",
     "electron-winstaller": "^4.0.0",
     "electron-wix-msi": "^2.1.1"

packages/maker/snap/package.json

@@ -22,6 +22,6 @@
     "@electron-forge/shared-types": "6.0.0-beta.50"
   },
   "optionalDependencies": {
-    "electron-installer-snap": "^5.0.0"
+    "electron-installer-snap": "^5.1.0"
   }
 }

packages/maker/snap/src/Config.ts

@@ -1,94 +1,4 @@
+import { Options } from 'electron-installer-snap';
+
 // eslint-disable-next-line import/prefer-default-export
-export interface MakerSnapConfig {
-  /**
-   * [Additional Snapcraft configuration](https://docs.snapcraft.io/build-snaps/syntax#app-name) for the Electron app.
-   */
-  appConfig?: string;
-  /**
-   * Additional [plugs](https://docs.snapcraft.io/reference/interfaces) for the
-   * Electron app which are necessary for the app to
-   * be a consumer of a feature in the system. Common features can be set via
-   * the `features` option. To set any attributes for the plugs, set them in the
-   * plugs option.
-   */
-  appPlugs?: string[];
-  /**
-   * Additional [slots](https://docs.snapcraft.io/reference/interfaces) for the
-   * Electron app which are necessary for the app to
-   * be a producer of a feature in the system. Common features can be set via
-   * the `features` option. To set any attributes for the plugs, set them in
-   * the slots option.
-   */
-  appSlots?: string[];
-  /**
-   * See the [Snapcraft documentation](https://snapcraft.io/docs/reference/confinement).
-   *
-   * Default: devmode
-   */
-  confinement?: 'strict' | 'devmode' | 'classic';
-  /**
-   * The longer description for the snap. Can contain newlines.
-   */
-  description?: string;
-  /**
-   * The absolute path to a custom Freedesktop.org desktop file template.
-   */
-  desktopTemplate?: string;
-  /**
-   * The executable name of the Electron app, sans file extension. Corresponds
-   * to the [`executableName` option](https://github.com/electron-userland/electron-packager/blob/master/docs/api#executablename)
-   * in Electron Packager.
-   */
-  executableName?: string;
-  /**
-   * Describes what functionality the Electron app needs, in order to work inside the Snap sandbox.
-   */
-  features?: {
-    /**
-     * PulseAudio support
-     */
-    audio?: true;
-    /**
-     * ALSA support (replaces audio support if both are specified)
-     */
-    alsa?: true;
-    /**
-     * [web browser functionality](https://github.com/snapcore/snapd/wiki/Interfaces#browser-support) (e.g., Brave)
-     */
-    browserSandbox?: true;
-    /**
-     * [MPRIS](https://specifications.freedesktop.org/mpris-spec/latest/) support.
-     *
-     * If enabled, the interface name must be specified as the feature value.
-     */
-    mpris?: string;
-    /**
-     * Access the secret service (e.g., GNOME Keyring)
-     */
-    passwords?: true;
-    /**
-     * WebGL support (requires Mesa, etc.)
-     */
-    webgl?: true;
-  };
-  /**
-   * The quality grade of the Snap. See the [Snapcraft documentation](https://docs.snapcraft.io/build-snaps/syntax#grade) for valid values.
-   */
-  grade?: 'devel' | 'stable';
-  /**
-   * The name of the Snap package
-   */
-  name?: string;
-  /**
-   * The absolute path to the snapcraft executable
-   */
-  snapcraft?: string;
-  /**
-   * A 78 character long summary for the Snap
-   */
-  summary?: string;
-  /**
-   * The version of the Snap package
-   */
-  version?: string;
-}
+export type MakerSnapConfig = Omit<Options, 'arch' | 'dest' | 'src'>;

packages/maker/snap/src/MakerSnap.ts

@@ -1,6 +1,5 @@
-import MakerBase, { MakerOptions } from '@electron-forge/maker-base';
 import { ForgePlatform } from '@electron-forge/shared-types';
-
+import MakerBase, { MakerOptions } from '@electron-forge/maker-base';
 import path from 'path';
 
 import { MakerSnapConfig } from './Config';

packages/publisher/snapcraft/package.json

@@ -20,6 +20,6 @@
     "fs-extra": "^9.0.0"
   },
   "optionalDependencies": {
-    "electron-installer-snap": "^5.0.0"
+    "electron-installer-snap": "^5.1.0"
   }
 }

yarn.lock

@@ -3457,7 +3457,7 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
-electron-installer-common@^0.10.0:
+electron-installer-common@^0.10.0, electron-installer-common@^0.10.1:
   version "0.10.1"
   resolved "https://registry.yarnpkg.com/electron-installer-common/-/electron-installer-common-0.10.1.tgz#42738f140c15270758681ac3f32039430b9fc023"
   integrity sha512-d9gEXhfSSyMn8mkFNdbUdkqdLkxVZ8nO3NDso3nuSnG1+wy7cJuuCjutwR4+zsXdQuNFC1n/DxpTk4pBLZSCTQ==
@@ -3508,14 +3508,15 @@ electron-installer-redhat@^3.0.0:
     word-wrap "^1.2.3"
     yargs "^15.1.0"
 
-electron-installer-snap@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/electron-installer-snap/-/electron-installer-snap-5.0.0.tgz#09553749b367aa6d00c1f92e57d3f3e05daced5a"
-  integrity sha512-M5ADJ7MP3QX1bRfdMZer4B/t5p2fVWciCXkqUs1t3kBSyxEJw4N2jNMydAeJRLend9cbM1E2Jq5+bhPEES85Kg==
+electron-installer-snap@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/electron-installer-snap/-/electron-installer-snap-5.1.0.tgz#30334cd9b59bb8efa70f2fe45b54a6b10545b134"
+  integrity sha512-lZ/EQ8SFbmEplhxbGdDRKGJUVZqXzoK+CbZtL3SoCwWz1MWKfOZzlx0VhNlLDuaAo6DKFN2Hxh+3yPikzqfbew==
   dependencies:
+    "@malept/cross-spawn-promise" "^1.0.0"
     debug "^4.1.1"
-    electron-installer-common "^0.10.0"
-    fs-extra "^8.0.1"
+    electron-installer-common "^0.10.1"
+    fs-extra "^9.0.0"
     js-yaml "^3.10.0"
     lodash "^4.17.15"
     semver "^7.1.1"