chore: update deps

.circleci/config.yml

@@ -3,15 +3,15 @@ version: 2
 jobs:
   build:
     docker:
-      - image: circleci/node:10.16.3
+      - image: circleci/node:12.13.0
     steps:
       - checkout
       - restore_cache:
           keys:
             - deps-{{ checksum "yarn.lock" }}
       - restore_cache:
           keys:
-            - v-6.0.0-electron
+            - v-7.0.0-electron
       - run:
           command: yarn --frozen-lockfile
       - run:
@@ -23,7 +23,7 @@ jobs:
       - run:
           command: node ./test/out/helpers/downloadElectron.js
       - save_cache:
-          key: v-6.0.0-electron
+          key: v-7.0.0-electron
           paths:
             - ~/.cache/electron
 
@@ -41,7 +41,7 @@ jobs:
             - deps-{{ checksum "yarn.lock" }}
       - restore_cache:
           keys:
-            - v-6.0.0-electron
+            - v-7.0.0-electron
       # because in the build job we use circleci docker image and circleci restores cache to original user home
       - run:
           command: |

.travis.yml

@@ -1,4 +1,4 @@
-osx_image: xcode10.2
+osx_image: xcode11.2
 language: node_js
 
 env:
@@ -9,15 +9,15 @@ matrix:
   include:
     - os: osx
       env: TEST_FILES=BuildTest,extraMetadataTest,globTest,filesTest,ignoreTest,linux,windows,macIconTest
-      node_js: "10"
+      node_js: "12"
 
     - os: osx
       env: TEST_FILES=CodeSignTest,macArchiveTest,macPackagerTest
-      node_js: "10"
+      node_js: "12"
 
     - os: osx
       env: TEST_FILES=masTest,dmgTest,protonTest
-      node_js: "10"
+      node_js: "12"
 
 cache:
   yarn: true

docker/node/Dockerfile

@@ -1,6 +1,6 @@
 FROM electronuserland/builder:base
 
-ENV NODE_VERSION 12.10.0
+ENV NODE_VERSION 12.13.0
 
 # this package is used for snapcraft and we should not clear apt list - to avoid apt-get update during snap build
 RUN curl -L https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.gz | tar xz -C /usr/local --strip-components=1 && \

package.json

@@ -35,7 +35,7 @@
     "@types/debug": "^4.1.5",
     "@types/is-ci": "^2.0.0",
     "@types/semver": "^6.0.2",
-    "app-builder-bin": "3.4.4",
+    "app-builder-bin": "3.4.5",
     "archiver": "^3.1.1",
     "async-exit-hook": "^2.0.1",
     "bluebird-lst": "^1.0.9",
@@ -44,7 +44,7 @@
     "debug": "^4.1.1",
     "ejs": "^2.7.1",
     "fs-extra": "^8.1.0",
-    "hosted-git-info": "^3.0.0",
+    "hosted-git-info": "^3.0.2",
     "iconv-lite": "^0.5.0",
     "ini": "^1.3.5",
     "is-ci": "^2.0.0",
@@ -66,10 +66,10 @@
     "temp-file": "^3.3.4",
     "tunnel-agent": "^0.6.0",
     "update-notifier": "^3.0.1",
-    "yargs": "^14.0.0"
+    "yargs": "^14.2.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.6.0",
+    "@babel/core": "^7.6.4",
     "@babel/plugin-proposal-class-properties": "^7.5.5",
     "@babel/plugin-proposal-decorators": "^7.6.0",
     "@babel/plugin-proposal-do-expressions": "^7.6.0",
@@ -86,19 +86,19 @@
     "@babel/plugin-proposal-throw-expressions": "^7.2.0",
     "@babel/plugin-syntax-dynamic-import": "^7.2.0",
     "@babel/plugin-syntax-import-meta": "^7.2.0",
-    "@babel/preset-env": "^7.6.0",
-    "@babel/preset-react": "^7.0.0",
+    "@babel/preset-env": "^7.6.3",
+    "@babel/preset-react": "^7.6.3",
     "@types/ejs": "^2.6.3",
-    "@types/fs-extra": "^8.0.0",
+    "@types/fs-extra": "^8.0.1",
     "@types/ini": "^1.3.30",
-    "@types/jest": "^24.0.18",
+    "@types/jest": "^24.0.19",
     "@types/js-yaml": "^3.12.1",
     "@types/lodash.isequal": "^4.5.5",
     "@types/node-emoji": "^1.8.1",
     "@types/sax": "^1.2.0",
     "@types/source-map-support": "^0.5.0",
     "@types/stat-mode": "^0.2.0",
-    "@types/yargs": "^13.0.2",
+    "@types/yargs": "^13.0.3",
     "babel-core": "^7.0.0-bridge.0",
     "babel-preset-jest": "^24.9.0",
     "babel-preset-ts-node8": "~4.0.0",
@@ -109,13 +109,13 @@
     "globby": "^10.0.1",
     "jest-cli": "^24.9.0",
     "jest-junit": "^8.0.0",
-    "jsdoc-to-markdown": "^5.0.1",
+    "jsdoc-to-markdown": "^5.0.2",
     "path-sort": "^0.1.0",
     "sumchecker": "^3.0.0",
     "ts-babel": "6.1.7",
     "ts-jsdoc": "^3.1.1",
     "tslint": "^5.20.0",
-    "typescript": "~3.6.3",
+    "typescript": "~3.6.4",
     "whitespace": "^2.1.0",
     "worker-farm": "^1.7.0"
   },

packages/app-builder-lib/src/targets/pkg.ts

@@ -155,6 +155,7 @@ export class PkgTarget extends Target {
     // now build the package
     const args = [
       "--root", rootPath,
+      "--identifier", this.packager.appInfo.id,
       "--component-plist", propertyListOutputFile,
     ]
 

packages/app-builder-lib/src/targets/snap.ts

@@ -219,7 +219,7 @@ export default class SnapTarget extends Target {
   }
 
   private isElectronVersionGreaterOrEqualThen(version: string) {
-    return semver.gte(this.packager.config.electronVersion || "5.0.3", version)
+    return semver.gte(this.packager.config.electronVersion || "7.0.0", version)
   }
 }
 

packages/electron-builder-squirrel-windows/src/SquirrelWindowsTarget.ts

@@ -1,4 +1,4 @@
-import { InvalidConfigurationError, log } from "builder-util"
+import { InvalidConfigurationError, log, isEmptyOrSpaces } from "builder-util"
 import { getBinFromUrl } from "app-builder-lib/out/binDownload"
 import { Arch, getArchSuffix, SquirrelWindowsOptions, Target } from "app-builder-lib"
 import { WinPackager } from "app-builder-lib/out/winPackager"
@@ -111,8 +111,8 @@ export default class SquirrelWindowsTarget extends Target {
       ...this.options as any,
     }
 
-    if (!options.description) {
-      throw new InvalidConfigurationError("Description is required, go to package.json and create a description in order to successfully build a windows installer with squirrel.")
+    if (isEmptyOrSpaces(options.description)) {
+      options.description = options.productName
     }
 
     if (options.remoteToken == null) {

packages/electron-builder-squirrel-windows/src/squirrelPack.ts

@@ -1,5 +1,5 @@
 import { path7za } from "7zip-bin"
-import { Arch, debug, exec, log, spawn } from "builder-util"
+import { Arch, debug, exec, log, spawn, isEmptyOrSpaces } from "builder-util"
 import { copyFile, walk } from "builder-util/out/fs"
 import { compute7zCompressArgs } from "app-builder-lib/out/targets/archive"
 import { execWine, prepareWindowsExecutableArgs as prepareArgs } from "app-builder-lib/out/wine"
@@ -70,8 +70,8 @@ export class SquirrelBuilder {
         .then(() => ensureDir(outputDirectory))
     ])
 
-    if (!options.description) {
-      throw new Error("Description is required, go to package.json and create a description in order to successfully build a windows installer with squirrel.")
+    if (isEmptyOrSpaces(options.description)) {
+      options.description = options.productName
     }
 
     if (options.remoteReleases) {

packages/electron-updater/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 4.2.0
+
+### Bug Fixes
+
+* when AllowDowngrade is true and latest version is older, take the update ([#4218](https://github.com/electron-userland/electron-builder/issues/4218)) ([5bf4498](https://github.com/electron-userland/electron-builder/commit/5bf4498))
+
+### Features
+
+* export updaters for configurability ([#4250](https://github.com/electron-userland/electron-builder/issues/4250)) ([9df845e](https://github.com/electron-userland/electron-builder/commit/9df845e))
+
 ## 4.1.2
 
 ### Features

test/fixtures/test-app-build-sub/electron-builder.yml

@@ -1,4 +1,4 @@
-electronVersion: 6.0.10
+electronVersion: 7.0.0
 appId: org.electron-builder.testApp
 compression: store
 npmRebuild: false

test/fixtures/test-app-one/package.json

@@ -8,7 +8,7 @@
   "author": "Foo Bar <foo@example.com>",
   "license": "MIT",
   "build": {
-    "electronVersion": "6.0.10",
+    "electronVersion": "7.0.0",
     "appId": "org.electron-builder.testApp",
     "compression": "store",
     "npmRebuild": false,

test/fixtures/test-app-yarn-several-workspace/packages/test-app/package.json

@@ -7,7 +7,7 @@
   "author": "Foo Bar <foo@example.com>",
   "license": "MIT",
   "build": {
-    "electronVersion": "6.0.10",
+    "electronVersion": "7.0.0",
     "appId": "org.electron-builder.testApp",
     "compression": "store",
     "npmRebuild": false,

test/fixtures/test-app-yarn-workspace-version-conflict/packages/test-app/package.json

@@ -7,7 +7,7 @@
   "author": "Foo Bar <foo@example.com>",
   "license": "MIT",
   "build": {
-    "electronVersion": "6.0.10",
+    "electronVersion": "7.0.0",
     "appId": "org.electron-builder.testApp",
     "compression": "store",
     "npmRebuild": false,

test/fixtures/test-app-yarn-workspace/packages/test-app/package.json

@@ -7,7 +7,7 @@
   "author": "Foo Bar <foo@example.com>",
   "license": "MIT",
   "build": {
-    "electronVersion": "6.0.10",
+    "electronVersion": "7.0.0",
     "appId": "org.electron-builder.testApp",
     "compression": "store",
     "npmRebuild": false,

test/fixtures/test-app/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "build": {
-    "electronVersion": "6.0.10",
+    "electronVersion": "7.0.0",
     "appId": "org.electron-builder.testApp",
     "compression": "store",
     "npmRebuild": false,

test/out/__snapshots__/BuildTest.js.snap

@@ -363,7 +363,7 @@ Object {
               "size": 765,
             },
             "chownr.js": Object {
-              "size": 3512,
+              "size": 3548,
             },
             "package.json": Object {
               "size": 402,
@@ -606,10 +606,10 @@ Object {
               "size": 1078,
             },
             "index.js": Object {
-              "size": 2493,
+              "size": 2678,
             },
             "package.json": Object {
-              "size": 484,
+              "size": 534,
             },
           },
         },
@@ -1063,7 +1063,7 @@ Object {
               "size": 1069,
             },
             "index.js": Object {
-              "size": 4962,
+              "size": 5027,
             },
             "package.json": Object {
               "size": 525,
@@ -1746,7 +1746,6 @@ Object {
 exports[`posix smart unpack 3`] = `
 Array [
   "app.asar",
-  "electron.asar",
 ]
 `;
 
@@ -1959,7 +1958,6 @@ Object {
 exports[`win smart unpack 3`] = `
 Array [
   "app.asar",
-  "electron.asar",
   "app.asar.unpacked/node_modules/edge-cs/LICENSE.txt",
   Object {
     "content": "{

test/out/__snapshots__/PublishManagerTest.js.snap

@@ -189,7 +189,6 @@ Object {
     },
   },
   "NSHighResolutionCapable": true,
-  "NSMainNibFile": "MainMenu",
   "NSPrincipalClass": "AtomApplication",
   "NSSupportsAutomaticGraphicsSwitching": true,
 }
@@ -294,7 +293,6 @@ Object {
     },
   },
   "NSHighResolutionCapable": true,
-  "NSMainNibFile": "MainMenu",
   "NSPrincipalClass": "AtomApplication",
   "NSSupportsAutomaticGraphicsSwitching": true,
 }
@@ -371,7 +369,6 @@ Object {
     },
   },
   "NSHighResolutionCapable": true,
-  "NSMainNibFile": "MainMenu",
   "NSPrincipalClass": "AtomApplication",
   "NSSupportsAutomaticGraphicsSwitching": true,
 }

test/out/__snapshots__/filesTest.js.snap

@@ -3,12 +3,6 @@
 exports[`expand not defined env 1`] = `"ERR_ELECTRON_BUILDER_ENV_NOT_DEFINED"`;
 
 exports[`extraResources - two-package 1`] = `
-Object {
-  "mac": Array [],
-}
-`;
-
-exports[`extraResources - two-package 2`] = `
 Object {
   "linux": Array [],
 }
@@ -60,7 +54,6 @@ Array [
   "lib/net45/v8_context_snapshot.bin",
   "lib/net45/locales/en-US.pak",
   "lib/net45/resources/app.asar",
-  "lib/net45/resources/electron.asar",
   "lib/net45/resources/platformSpecificR",
   "lib/net45/swiftshader/libEGL.dll",
   "lib/net45/swiftshader/libGLESv2.dll",