chore: update deps

.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: circleci/node:10.16.0
+      - image: circleci/node:10.16.3
     steps:
       - checkout
       - restore_cache:

docker/node/Dockerfile

@@ -1,6 +1,6 @@
 FROM electronuserland/builder:base
 
-ENV NODE_VERSION 12.8.1
+ENV NODE_VERSION 12.10.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

@@ -32,19 +32,19 @@
   "dependencies": {
     "7zip-bin": "~5.0.3",
     "@develar/schema-utils": "~2.1.0",
-    "@types/debug": "^4.1.4",
+    "@types/debug": "^4.1.5",
     "@types/is-ci": "^2.0.0",
-    "@types/semver": "^6.0.1",
-    "app-builder-bin": "3.4.3",
-    "archiver": "^3.0.3",
+    "@types/semver": "^6.0.2",
+    "app-builder-bin": "3.4.4",
+    "archiver": "^3.1.1",
     "async-exit-hook": "^2.0.1",
     "bluebird-lst": "^1.0.9",
     "chalk": "^2.4.2",
     "chromium-pickle-js": "^0.2.0",
     "debug": "^4.1.1",
-    "ejs": "^2.6.2",
+    "ejs": "^2.7.1",
     "fs-extra": "^8.1.0",
-    "hosted-git-info": "^2.7.1",
+    "hosted-git-info": "^3.0.0",
     "iconv-lite": "^0.5.0",
     "ini": "^1.3.5",
     "is-ci": "^2.0.0",
@@ -57,7 +57,7 @@
     "normalize-package-data": "^2.5.0",
     "pako": "^1.0.10",
     "read-config-file": "5.0.0",
-    "sanitize-filename": "^1.6.2",
+    "sanitize-filename": "^1.6.3",
     "sax": "^1.2.4",
     "semver": "^6.3.0",
     "source-map-support": "^0.5.13",
@@ -66,13 +66,13 @@
     "temp-file": "^3.3.4",
     "tunnel-agent": "^0.6.0",
     "update-notifier": "^3.0.1",
-    "yargs": "^13.3.0"
+    "yargs": "^14.0.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.5.5",
+    "@babel/core": "^7.6.0",
     "@babel/plugin-proposal-class-properties": "^7.5.5",
-    "@babel/plugin-proposal-decorators": "^7.4.4",
-    "@babel/plugin-proposal-do-expressions": "^7.5.0",
+    "@babel/plugin-proposal-decorators": "^7.6.0",
+    "@babel/plugin-proposal-do-expressions": "^7.6.0",
     "@babel/plugin-proposal-export-default-from": "^7.5.2",
     "@babel/plugin-proposal-export-namespace-from": "^7.5.2",
     "@babel/plugin-proposal-function-bind": "^7.2.0",
@@ -81,42 +81,41 @@
     "@babel/plugin-proposal-logical-assignment-operators": "^7.2.0",
     "@babel/plugin-proposal-nullish-coalescing-operator": "^7.4.4",
     "@babel/plugin-proposal-numeric-separator": "^7.2.0",
-    "@babel/plugin-proposal-optional-chaining": "^7.2.0",
+    "@babel/plugin-proposal-optional-chaining": "^7.6.0",
     "@babel/plugin-proposal-pipeline-operator": "^7.5.0",
     "@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.5.5",
+    "@babel/preset-env": "^7.6.0",
     "@babel/preset-react": "^7.0.0",
     "@types/ejs": "^2.6.3",
     "@types/fs-extra": "^8.0.0",
     "@types/ini": "^1.3.30",
-    "@types/jest": "^24.0.16",
+    "@types/jest": "^24.0.18",
     "@types/js-yaml": "^3.12.1",
     "@types/lodash.isequal": "^4.5.5",
     "@types/node-emoji": "^1.8.1",
-    "@types/sanitize-filename": "^1.1.28",
     "@types/sax": "^1.2.0",
     "@types/source-map-support": "^0.5.0",
     "@types/stat-mode": "^0.2.0",
-    "@types/yargs": "^13.0.1",
+    "@types/yargs": "^13.0.2",
     "babel-core": "^7.0.0-bridge.0",
-    "babel-preset-jest": "^24.6.0",
+    "babel-preset-jest": "^24.9.0",
     "babel-preset-ts-node8": "~4.0.0",
     "convert-source-map": "^1.6.0",
     "decompress-zip": "^0.3.1",
     "depcheck": "^0.8.3",
     "electron-builder-tslint-config": "^1.1.0",
     "globby": "^10.0.1",
-    "jest-cli": "^24.8.0",
-    "jest-junit": "^7.0.0",
-    "jsdoc-to-markdown": "^5.0.0",
+    "jest-cli": "^24.9.0",
+    "jest-junit": "^8.0.0",
+    "jsdoc-to-markdown": "^5.0.1",
     "path-sort": "^0.1.0",
     "sumchecker": "^3.0.0",
     "ts-babel": "6.1.7",
     "ts-jsdoc": "^3.1.1",
-    "tslint": "^5.18.0",
-    "typescript": "~3.5.3",
+    "tslint": "^5.20.0",
+    "typescript": "~3.6.3",
     "whitespace": "^2.1.0",
     "worker-farm": "^1.7.0"
   },

packages/app-builder-lib/package.json

@@ -51,20 +51,20 @@
     "builder-util": "0.0.0-semantic-release",
     "electron-publish": "0.0.0-semantic-release",
     "fs-extra": "^8.1.0",
-    "hosted-git-info": "^2.7.1",
+    "hosted-git-info": "^3.0.0",
     "is-ci": "^2.0.0",
     "isbinaryfile": "^4.0.2",
     "js-yaml": "^3.13.1",
     "read-config-file": "5.0.0",
     "minimatch": "^3.0.4",
     "normalize-package-data": "^2.5.0",
-    "sanitize-filename": "^1.6.2",
+    "sanitize-filename": "^1.6.3",
     "@develar/schema-utils": "~2.1.0",
     "semver": "^6.3.0",
     "debug": "^4.1.1",
     "lazy-val": "^1.0.4",
     "temp-file": "^3.3.4",
-    "ejs": "^2.6.2"
+    "ejs": "^2.7.1"
   },
   "typings": "./out/index.d.ts"
 }

packages/app-builder-lib/src/targets/nsis/NsisTarget.ts

@@ -203,7 +203,7 @@ export class NsisTarget extends Target {
       await BluebirdPromise.map(this.archs.keys(), async arch => {
         const fileInfo = await this.packageHelper.packArch(arch, this)
         const file = fileInfo.path
-        const defineKey = arch === Arch.x64 ? "APP_64" : (Arch.arm64 ? "APP_ARM64" : "APP_32")
+        const defineKey = arch === Arch.x64 ? "APP_64" : (arch === Arch.arm64 ? "APP_ARM64" : "APP_32")
         defines[defineKey] = file
         defines[`${defineKey}_NAME`] = path.basename(file)
         // nsis expect a hexadecimal string

packages/app-builder-lib/templates/nsis/include/extractAppPackage.nsh

@@ -7,31 +7,14 @@
 
   !ifdef APP_64
   	!ifdef APP_ARM64
-    StrCpy $packageArch "ARM64"
-	!else
-    StrCpy $packageArch "64"
-	!endif
+      StrCpy $packageArch "ARM64"
+	  !else
+      StrCpy $packageArch "64"
+	  !endif
 
-  !ifdef APP_32
-    !ifdef APP_ARM64
-      ${if} ${IsNativeARM64} == true
-      !insertmacro arm64_app_files
-      ${elseif} ${IsNativeAMD64} == true
-      !insertmacro x64_app_files
-      ${else}
-      !insertmacro ia32_app_files
-      ${endIf}
-    !else
-      ${if} ${RunningX64} == true
-        !ifdef APP_32
-          !insertmacro x64_app_files
-        !endif
-      ${else}
-        !insertmacro ia32_app_files
-      ${endIf}
-    !endif
+    !insertmacro compute_files_for_current_arch
   !else
-    !insertmacro x64_app_files
+    !insertmacro ia32_app_files
   !endif
 
   !ifdef COMPRESS
@@ -60,6 +43,36 @@
   ${endIf}
 !macroend
 
+!macro compute_files_for_current_arch
+  !ifdef APP_32
+    !ifdef APP_ARM64
+      ${if} ${IsNativeARM64}
+        !insertmacro arm64_app_files
+      ${elseif} ${RunningX64}
+        !insertmacro x64_app_files
+      ${else}
+        !insertmacro ia32_app_files
+      ${endIf}
+    !else
+      ${if} ${RunningX64}
+        !insertmacro x64_app_files
+      ${else}
+        !insertmacro ia32_app_files
+      ${endIf}
+    !endif
+  !else
+    !ifdef APP_ARM64
+      ${if} ${IsNativeARM64}
+        !insertmacro arm64_app_files
+      ${else}
+        !insertmacro x64_app_files
+      ${endIf}
+    !else
+      !insertmacro x64_app_files
+    !endif
+  !endif
+!macroend
+
 !macro arm64_app_files
   File /oname=$PLUGINSDIR\app-arm64.${COMPRESSION_METHOD} "${APP_ARM64}"
 !macroend

packages/builder-util/package.json

@@ -11,7 +11,7 @@
     "out"
   ],
   "dependencies": {
-    "app-builder-bin": "3.4.3",
+    "app-builder-bin": "3.4.4",
     "temp-file": "^3.3.4",
     "fs-extra": "^8.1.0",
     "is-ci": "^2.0.0",
@@ -23,7 +23,7 @@
     "source-map-support": "^0.5.13",
     "7zip-bin": "~5.0.3",
     "js-yaml": "^3.13.1",
-    "@types/debug": "^4.1.4"
+    "@types/debug": "^4.1.5"
   },
   "typings": "./out/util.d.ts"
 }

packages/dmg-builder/package.json

@@ -19,7 +19,7 @@
     "iconv-lite": "^0.5.0",
     "js-yaml": "^3.13.1",
     "app-builder-lib": "~0.0.0-semantic-release",
-    "sanitize-filename": "^1.6.2"
+    "sanitize-filename": "^1.6.3"
   },
   "typings": "./out/dmg.d.ts"
 }

packages/electron-builder-squirrel-windows/package.json

@@ -14,8 +14,8 @@
     "builder-util": "~0.0.0-semantic-release",
     "bluebird-lst": "^1.0.9",
     "fs-extra": "^8.1.0",
-    "archiver": "^3.0.3",
-    "sanitize-filename": "^1.6.2"
+    "archiver": "^3.1.1",
+    "sanitize-filename": "^1.6.3"
   },
   "optionalDependencies": {
     "7zip-bin": "~4.0.2"

packages/electron-builder/package.json

@@ -52,9 +52,9 @@
     "fs-extra": "^8.1.0",
     "is-ci": "^2.0.0",
     "read-config-file": "5.0.0",
-    "sanitize-filename": "^1.6.2",
+    "sanitize-filename": "^1.6.3",
     "update-notifier": "^3.0.1",
-    "yargs": "^13.3.0",
+    "yargs": "^14.0.0",
     "lazy-val": "^1.0.4",
     "app-builder-lib": "0.0.0-semantic-release",
     "dmg-builder": "0.0.0-semantic-release"

packages/electron-builder/src/cli/cli.ts

@@ -4,7 +4,7 @@ import { exec, InvalidConfigurationError, log } from "builder-util"
 import chalk from "chalk"
 import { getElectronVersion } from "app-builder-lib/out/electron/electronVersion"
 import { getGypEnv } from "app-builder-lib/out/util/yarn"
-import { existsSync, readJson } from "fs-extra"
+import { pathExists, readJson } from "fs-extra"
 import isCi from "is-ci"
 import * as path from "path"
 import { loadEnv } from "read-config-file"
@@ -64,12 +64,12 @@ function checkIsOutdated() {
   }
 
   readJson(path.join(__dirname, "..", "..", "package.json"))
-    .then(it => {
+    .then(async it => {
       if (it.version === "0.0.0-semantic-release") {
         return
       }
 
-      const packageManager = existsSync(path.join(__dirname, "..", "..", "package-lock.json")) ? "npm" : "yarn"
+      const packageManager = await pathExists(path.join(__dirname, "..", "..", "package-lock.json")) ? "npm" : "yarn"
 
       const notifier = updateNotifier({pkg: it})
       if (notifier.update != null) {

packages/electron-updater/package.json

@@ -12,7 +12,7 @@
     "out"
   ],
   "dependencies": {
-    "@types/semver": "^6.0.1",
+    "@types/semver": "^6.0.2",
     "lazy-val": "^1.0.4",
     "fs-extra": "^8.1.0",
     "js-yaml": "^3.13.1",

packages/electron-updater/src/AppUpdater.ts

@@ -176,7 +176,7 @@ export abstract class AppUpdater extends EventEmitter {
     if (options != null) {
       this.setFeedURL(options)
 
-      if (typeof options !== 'string' && options.requestHeaders) {
+      if (typeof options !== "string" && options.requestHeaders) {
         this.requestHeaders = options.requestHeaders
       }
     }

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

@@ -1,4 +1,4 @@
-electronVersion: 6.0.0
+electronVersion: 6.0.10
 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.0",
+    "electronVersion": "6.0.10",
     "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.0",
+    "electronVersion": "6.0.10",
     "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.0",
+    "electronVersion": "6.0.10",
     "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.0",
+    "electronVersion": "6.0.10",
     "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.0",
+    "electronVersion": "6.0.10",
     "appId": "org.electron-builder.testApp",
     "compression": "store",
     "npmRebuild": false,

test/out/__snapshots__/filesTest.js.snap

@@ -3,6 +3,12 @@
 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 [],
 }