chore: update deps, use electron 8 in tests

electron-userland · Mar 3, 2020 · d33065b · d33065b
1 parent 87037c9
commit d33065b
Show file tree

Hide file tree

Showing 28 changed files with 235 additions and 214 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,15 +3,15 @@ version: 2
 jobs:
   build:
     docker:
-      - image: circleci/node:12.14.1
+      - image: circleci/node:12.16.1
     steps:
       - checkout
       - restore_cache:
           keys:
             - deps-{{ checksum "yarn.lock" }}
       - restore_cache:
           keys:
-            - v-7.1.10-electron
+            - v-8.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-7.1.10-electron
+          key: v-8.0.0-electron
           paths:
             - ~/.cache/electron
 
@@ -34,15 +34,14 @@ 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.10-electron
+            - v-8.0.0-electron
       # because in the build job we use circleci docker image and circleci restores cache to original user home
       - run:
           command: |

diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,4 @@
-osx_image: xcode11.2
+osx_image: xcode11.3
 language: node_js
 
 env:

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-image: Visual Studio 2017
+image: Visual Studio 2019
 platform: x64
 
 cache:
@@ -10,7 +10,7 @@ environment:
   TEST_FILES: ExtraBuildTest,BuildTest,extraMetadataTest,filesTest,globTest,nsisUpdaterTest,oneClickInstallerTest,installerTest,appxTest,msiTest,protonTest
 
 install:
-  - ps: Install-Product node 10 x64
+  - ps: Install-Product node 12 x64
   - yarn --frozen-lockfile
 
 build: off

diff --git a/docker/node/Dockerfile b/docker/node/Dockerfile
@@ -1,6 +1,6 @@
 FROM electronuserland/builder:base
 
-ENV NODE_VERSION 12.14.1
+ENV NODE_VERSION 12.16.1
 
 # 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 && \

diff --git a/docker/wine/Dockerfile b/docker/wine/Dockerfile
@@ -1,6 +1,8 @@
 FROM electronuserland/builder:latest
 
-RUN apt-get update && apt-get install -y --no-install-recommends software-properties-common && dpkg --add-architecture i386 && curl -L https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_18.04/Release.key > winehq.key && apt-key add winehq.key && apt-add-repository 'deb https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_18.04/ ./' && \
+RUN apt-get update && apt-get install -y --no-install-recommends software-properties-common && dpkg --add-architecture i386 && \
+  curl -L https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_18.04/Release.key > winehq.key && apt-key add winehq.key && \
+  apt-add-repository 'deb https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_18.04/ ./' && \
   apt-get update && \
   apt-get -y purge software-properties-common libdbus-glib-1-2 python3-dbus python3-gi python3-pycurl python3-software-properties && \
   apt-get install -y --no-install-recommends winehq-stable && \

diff --git a/package.json b/package.json
@@ -36,8 +36,8 @@
     "@types/fs-extra": "^8.1.0",
     "@types/is-ci": "^2.0.0",
     "@types/semver": "^7.1.0",
-    "@types/yargs": "^15.0.3",
-    "app-builder-bin": "3.5.2",
+    "@types/yargs": "^15.0.4",
+    "app-builder-bin": "3.5.4",
     "archiver": "^3.1.1",
     "async-exit-hook": "^2.0.1",
     "bluebird-lst": "^1.0.9",
@@ -46,7 +46,7 @@
     "debug": "^4.1.1",
     "ejs": "^3.0.1",
     "fs-extra": "^8.1.0",
-    "hosted-git-info": "^3.0.2",
+    "hosted-git-info": "^3.0.4",
     "iconv-lite": "^0.5.1",
     "ini": "^1.3.5",
     "is-ci": "^2.0.0",
@@ -58,20 +58,20 @@
     "minimatch": "^3.0.4",
     "normalize-package-data": "^2.5.0",
     "pako": "^1.0.11",
-    "read-config-file": "5.0.1",
+    "read-config-file": "5.0.2",
     "sanitize-filename": "^1.6.3",
     "sax": "^1.2.4",
     "semver": "^7.1.3",
     "source-map-support": "^0.5.16",
     "stat-mode": "^1.0.0",
     "sumchecker": "^3.0.1",
-    "temp-file": "^3.3.6",
+    "temp-file": "^3.3.7",
     "tunnel-agent": "^0.6.0",
     "update-notifier": "^4.1.0",
     "yargs": "^15.1.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.8.4",
+    "@babel/core": "^7.8.6",
     "@babel/plugin-proposal-class-properties": "^7.8.3",
     "@babel/plugin-proposal-decorators": "^7.8.3",
     "@babel/plugin-proposal-do-expressions": "^7.8.3",
@@ -88,7 +88,7 @@
     "@babel/plugin-proposal-throw-expressions": "^7.8.3",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/plugin-syntax-import-meta": "^7.8.3",
-    "@babel/preset-env": "^7.8.4",
+    "@babel/preset-env": "^7.8.6",
     "@babel/preset-react": "^7.8.3",
     "@jest/core": "^25.1.0",
     "@types/ejs": "^3.0.1",
@@ -102,7 +102,7 @@
     "@types/stat-mode": "^0.2.0",
     "babel-core": "^7.0.0-bridge.0",
     "babel-preset-jest": "^25.1.0",
-    "babel-preset-ts-node8": "~4.0.0",
+    "babel-preset-ts-node8": "~4.0.1",
     "convert-source-map": "^1.7.0",
     "decompress-zip": "^0.3.1",
     "depcheck": "^0.9.2",
@@ -116,7 +116,7 @@
     "ts-babel": "6.1.7",
     "ts-jsdoc": "^3.1.1",
     "tslint": "^6.0.0",
-    "typescript": "~3.8.2",
+    "typescript": "~3.8.3",
     "whitespace": "^2.1.0",
     "worker-farm": "^1.7.0"
   },

diff --git a/packages/app-builder-lib/package.json b/packages/app-builder-lib/package.json
@@ -51,19 +51,19 @@
     "builder-util": "0.0.0-semantic-release",
     "electron-publish": "0.0.0-semantic-release",
     "fs-extra": "^8.1.0",
-    "hosted-git-info": "^3.0.2",
+    "hosted-git-info": "^3.0.4",
     "is-ci": "^2.0.0",
     "isbinaryfile": "^4.0.4",
     "js-yaml": "^3.13.1",
-    "read-config-file": "5.0.1",
+    "read-config-file": "5.0.2",
     "minimatch": "^3.0.4",
     "normalize-package-data": "^2.5.0",
     "sanitize-filename": "^1.6.3",
     "@develar/schema-utils": "~2.1.0",
     "semver": "^7.1.3",
     "debug": "^4.1.1",
     "lazy-val": "^1.0.4",
-    "temp-file": "^3.3.6",
+    "temp-file": "^3.3.7",
     "ejs": "^3.0.1"
   },
   "typings": "./out/index.d.ts"

diff --git a/packages/builder-util/package.json b/packages/builder-util/package.json
@@ -12,8 +12,8 @@
   ],
   "dependencies": {
     "@types/fs-extra": "^8.1.0",
-    "app-builder-bin": "3.5.2",
-    "temp-file": "^3.3.6",
+    "app-builder-bin": "3.5.4",
+    "temp-file": "^3.3.7",
     "fs-extra": "^8.1.0",
     "is-ci": "^2.0.0",
     "stat-mode": "^1.0.0",

diff --git a/packages/electron-builder/package.json b/packages/electron-builder/package.json
@@ -45,14 +45,14 @@
   "bugs": "https://github.com/electron-userland/electron-builder/issues",
   "homepage": "https://github.com/electron-userland/electron-builder",
   "dependencies": {
-    "@types/yargs": "^15.0.3",
+    "@types/yargs": "^15.0.4",
     "bluebird-lst": "^1.0.9",
     "chalk": "^3.0.0",
     "builder-util-runtime": "0.0.0-semantic-release",
     "builder-util": "0.0.0-semantic-release",
     "fs-extra": "^8.1.0",
     "is-ci": "^2.0.0",
-    "read-config-file": "5.0.1",
+    "read-config-file": "5.0.2",
     "sanitize-filename": "^1.6.3",
     "update-notifier": "^4.1.0",
     "yargs": "^15.1.0",

diff --git a/test/fixtures/test-app-build-sub/electron-builder.yml b/test/fixtures/test-app-build-sub/electron-builder.yml
@@ -1,4 +1,4 @@
-electronVersion: 7.1.10
+electronVersion: 8.0.0
 appId: org.electron-builder.testApp
 compression: store
 npmRebuild: false

diff --git a/test/fixtures/test-app-one/package.json b/test/fixtures/test-app-one/package.json
@@ -8,7 +8,7 @@
   "author": "Foo Bar <foo@example.com>",
   "license": "MIT",
   "build": {
-    "electronVersion": "7.1.10",
+    "electronVersion": "8.0.0",
     "appId": "org.electron-builder.testApp",
     "compression": "store",
     "npmRebuild": false,

diff --git a/test/fixtures/test-app-yarn-several-workspace/packages/test-app/package.json b/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": "7.1.10",
+    "electronVersion": "8.0.0",
     "appId": "org.electron-builder.testApp",
     "compression": "store",
     "npmRebuild": false,

diff --git a/test/fixtures/test-app-yarn-workspace-version-conflict/packages/test-app/package.json b/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": "7.1.10",
+    "electronVersion": "8.0.0",
     "appId": "org.electron-builder.testApp",
     "compression": "store",
     "npmRebuild": false,

diff --git a/test/fixtures/test-app-yarn-workspace/packages/test-app/package.json b/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": "7.1.10",
+    "electronVersion": "8.0.0",
     "appId": "org.electron-builder.testApp",
     "compression": "store",
     "npmRebuild": false,

diff --git a/test/fixtures/test-app/package.json b/test/fixtures/test-app/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "build": {
-    "electronVersion": "7.1.10",
+    "electronVersion": "8.0.0",
     "appId": "org.electron-builder.testApp",
     "compression": "store",
     "npmRebuild": false,

diff --git a/test/jestSetup.js b/test/jestSetup.js
@@ -21,6 +21,7 @@ const isMac = process.platform === "darwin"
 test.ifMac = isMac ? test : skip
 
 test.ifNotWindows = isWindows ? skip : test
+test.ifNotMac = isMac ? skip : test
 test.ifNotWindows.ifNotCiMac = isCi && isMac ? skip : test
 
 test.ifWindows = isWindows ? test : skip
@@ -30,7 +31,7 @@ skip.ifLinux = skip
 skip.ifWindows = skip
 
 skip.ifNotWindows = skip
-skip.ifNotWindows.ifNotCiMac = skip
+skip.ifNotMac = skip
 
 skip.ifCi = skip
 skip.ifNotCi = skip

diff --git a/test/out/__snapshots__/BuildTest.js.snap b/test/out/__snapshots__/BuildTest.js.snap
@@ -363,10 +363,10 @@ Object {
               "size": 765,
             },
             "chownr.js": Object {
-              "size": 3548,
+              "size": 4275,
             },
             "package.json": Object {
-              "size": 402,
+              "size": 452,
             },
           },
         },
@@ -1063,7 +1063,7 @@ Object {
               "size": 1069,
             },
             "index.js": Object {
-              "size": 5127,
+              "size": 5192,
             },
             "package.json": Object {
               "size": 525,

diff --git a/test/out/__snapshots__/filesTest.js.snap b/test/out/__snapshots__/filesTest.js.snap
@@ -45,13 +45,14 @@ Array [
   "lib/net45/libGLESv2.dll",
   "lib/net45/LICENSE.electron.txt",
   "lib/net45/LICENSES.chromium.html",
-  "lib/net45/natives_blob.bin",
   "lib/net45/resources.pak",
   "lib/net45/snapshot_blob.bin",
   "lib/net45/Test App ßW.exe",
   "lib/net45/Test App ßW_ExecutionStub.exe",
   "lib/net45/Update.exe",
   "lib/net45/v8_context_snapshot.bin",
+  "lib/net45/vk_swiftshader.dll",
+  "lib/net45/vk_swiftshader_icd.json",
   "lib/net45/locales/en-US.pak",
   "lib/net45/resources/app.asar",
   "lib/net45/resources/platformSpecificR",