chore: update deps

Author: develar

.circleci/config.yml

@@ -11,7 +11,7 @@ jobs:
             - deps-{{ checksum "yarn.lock" }}
       - restore_cache:
           keys:
-            - v-7.1.2-electron
+            - v-7.1.10-electron
       - run:
           command: yarn --frozen-lockfile
       - run:
@@ -23,7 +23,7 @@ jobs:
       - run:
           command: node ./test/out/helpers/downloadElectron.js
       - save_cache:
-          key: v-7.1.2-electron
+          key: v-7.1.10-electron
           paths:
             - ~/.cache/electron
 
@@ -34,14 +34,15 @@ jobs:
         environment:
           JEST_JUNIT_OUTPUT: ./test-reports/test.xml
           TZ: Europe/Berlin
+          DEBUG: electron-builder
     steps:
       - checkout
       - restore_cache:
           keys:
             - deps-{{ checksum "yarn.lock" }}
       - restore_cache:
           keys:
-            - v-7.1.2-electron
+            - v-7.1.10-electron
       # because in the build job we use circleci docker image and circleci restores cache to original user home
       - run:
           command: |

package.json

@@ -35,7 +35,7 @@
     "@types/debug": "^4.1.5",
     "@types/is-ci": "^2.0.0",
     "@types/semver": "^6.2.0",
-    "app-builder-bin": "3.5.1",
+    "app-builder-bin": "3.5.2",
     "archiver": "^3.1.1",
     "async-exit-hook": "^2.0.1",
     "bluebird-lst": "^1.0.9",
@@ -88,33 +88,34 @@
     "@babel/plugin-syntax-import-meta": "^7.8.3",
     "@babel/preset-env": "^7.8.3",
     "@babel/preset-react": "^7.8.3",
+    "@jest/core": "^25.1.0",
     "@types/ejs": "^3.0.0",
     "@types/fs-extra": "^8.0.1",
     "@types/ini": "^1.3.30",
-    "@types/jest": "^24.9.0",
-    "@types/js-yaml": "^3.12.1",
+    "@types/jest": "^24.9.1",
+    "@types/js-yaml": "^3.12.2",
     "@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/sax": "^1.2.1",
+    "@types/source-map-support": "^0.5.1",
     "@types/stat-mode": "^0.2.0",
-    "@types/yargs": "^15.0.0",
+    "@types/yargs": "^15.0.1",
     "babel-core": "^7.0.0-bridge.0",
-    "babel-preset-jest": "^24.9.0",
+    "babel-preset-jest": "^25.1.0",
     "babel-preset-ts-node8": "~4.0.0",
     "convert-source-map": "^1.7.0",
     "decompress-zip": "^0.3.1",
     "depcheck": "^0.9.1",
     "electron-builder-tslint-config": "^1.1.0",
     "globby": "^11.0.0",
-    "jest-cli": "^24.9.0",
+    "jest-cli": "^25.1.0",
     "jest-junit": "^10.0.0",
     "jsdoc-to-markdown": "^5.0.3",
     "path-sort": "^0.1.0",
     "sumchecker": "^3.0.1",
     "ts-babel": "6.1.7",
     "ts-jsdoc": "^3.1.1",
-    "tslint": "^5.20.1",
+    "tslint": "^6.0.0",
     "typescript": "~3.7.5",
     "whitespace": "^2.1.0",
     "worker-farm": "^1.7.0"

packages/app-builder-lib/src/electron/electronVersion.ts

@@ -78,12 +78,14 @@ export async function computeElectronVersion(projectDir: string, projectMetadata
     try {
       const releaseInfo = JSON.parse((await httpExecutor.request({
         hostname: "github.com",
-        path: `/electron/${dependency?.name === "electron-nightly" ? "nightlies" : "electron"}/releases/latest`,
+        path: `/electron/${dependency.name === "electron-nightly" ? "nightlies" : "electron"}/releases/latest`,
         headers: {
           accept: "application/json",
         },
       }))!!)
-      return (releaseInfo.tag_name.startsWith("v")) ? releaseInfo.tag_name.substring(1) : releaseInfo.tag_name
+      const version = (releaseInfo.tag_name.startsWith("v")) ? releaseInfo.tag_name.substring(1) : releaseInfo.tag_name
+      log.info({version}, `resolve ${dependency.name}@${dependency.version}`)
+      return version
     }
     catch (e) {
       log.warn(e)

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

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

packages/builder-util/package.json

@@ -11,7 +11,7 @@
     "out"
   ],
   "dependencies": {
-    "app-builder-bin": "3.5.1",
+    "app-builder-bin": "3.5.2",
     "temp-file": "^3.3.6",
     "fs-extra": "^8.1.0",
     "is-ci": "^2.0.0",

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

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

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

@@ -8,7 +8,7 @@
   "author": "Foo Bar <[email protected]>",
   "license": "MIT",
   "build": {
-    "electronVersion": "7.1.2",
+    "electronVersion": "7.1.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 <[email protected]>",
   "license": "MIT",
   "build": {
-    "electronVersion": "7.1.2",
+    "electronVersion": "7.1.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 <[email protected]>",
   "license": "MIT",
   "build": {
-    "electronVersion": "7.1.2",
+    "electronVersion": "7.1.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 <[email protected]>",
   "license": "MIT",
   "build": {
-    "electronVersion": "7.1.2",
+    "electronVersion": "7.1.10",
     "appId": "org.electron-builder.testApp",
     "compression": "store",
     "npmRebuild": false,