update tooling dependencies

package.json

@@ -173,13 +173,13 @@
     "@types/winston": "^2.2.0",
     "@types/xml2js": "^0.4.0",
     "electron": "9.3.1",
-    "electron-builder": "^22.7.0",
-    "electron-packager": "^14.2.1",
+    "electron-builder": "^22.9.1",
+    "electron-packager": "^15.2.0",
     "electron-winstaller": "4.0.0"
   },
   "optionalDependencies": {
-    "electron-installer-debian": "3.0.0",
-    "electron-installer-redhat": "3.0.0"
+    "electron-installer-debian": "3.1.0",
+    "electron-installer-redhat": "3.2.0"
   },
   "resolutions": {
     "electron/@electron/get": "1.12.2"

script/build.ts

@@ -5,9 +5,9 @@ import * as path from 'path'
 import * as cp from 'child_process'
 import * as fs from 'fs-extra'
 import packager, {
-  arch,
-  ElectronNotarizeOptions,
-  ElectronOsXSignOptions,
+  TargetArch,
+  OsxNotarizeOptions,
+  OsxSignOptions,
   Options,
 } from 'electron-packager'
 import frontMatter from 'front-matter'
@@ -122,7 +122,7 @@ interface IPackageAdditionalOptions {
     readonly name: string
     readonly schemes: ReadonlyArray<string>
   }>
-  readonly osxSign: ElectronOsXSignOptions & {
+  readonly osxSign: OsxSignOptions & {
     readonly hardenedRuntime?: boolean
   }
 }
@@ -139,7 +139,7 @@ function packageApp() {
     )
   }
 
-  const toPackageArch = (targetArch: string | undefined): arch => {
+  const toPackageArch = (targetArch: string | undefined): TargetArch => {
     if (targetArch === undefined) {
       return 'x64'
     }
@@ -304,13 +304,9 @@ function copyDependencies() {
   const updatedPackage = Object.assign({}, originalPackage, {
     productName: getProductName(),
     dependencies: newDependencies,
-    devDependencies: newDevDependencies,
+    devDependencies: isDevelopmentBuild ? newDevDependencies : undefined,
   })
 
-  if (!isDevelopmentBuild) {
-    delete updatedPackage.devDependencies
-  }
-
   fs.writeFileSync(
     path.join(outRoot, 'package.json'),
     JSON.stringify(updatedPackage)
@@ -426,7 +422,7 @@ ${licenseText}`
   fs.removeSync(chooseALicense)
 }
 
-function getNotarizationCredentials(): ElectronNotarizeOptions | undefined {
+function getNotarizationCredentials(): OsxNotarizeOptions | undefined {
   const appleId = process.env.APPLE_ID
   const appleIdPassword = process.env.APPLE_ID_PASSWORD
   if (appleId === undefined || appleIdPassword === undefined) {

script/electron-builder-linux.yml

@@ -11,10 +11,6 @@ linux:
   maintainer: 'GitHub, Inc <opensource+desktop@github.com>'
 rpm:
   depends:
-    # default Electron dependencies
-    - libXScrnSaver
-    - libappindicator
-    - libnotify
     # dugite-native dependencies
     - libcurl
     # keytar dependencies

script/package-debian.ts

@@ -47,10 +47,6 @@ const options: DebianOptions = {
   priority: 'extra',
   homepage: 'https://github.com/shiftkey/desktop',
   depends: [
-    // additional core dependencies - are these still needed?
-    'gconf2',
-    'gconf-service',
-    'libappindicator1',
     // Desktop-specific dependencies
     'libcurl3 | libcurl4',
     'libsecret-1-0',

script/package-redhat.ts

@@ -42,10 +42,6 @@ const options: RedhatOptions = {
     'This is the unofficial port of GitHub Desktop for Linux distributions',
   categories: ['GNOME', 'GTK', 'Development'],
   requires: [
-    // default Electron dependencies
-    'libXScrnSaver',
-    '(libX11-xcb or libX11-xcb1)',
-    'alsa-lib',
     // dugite-native dependencies
     '(libcurl or libcurl4)',
     // keytar dependencies