Forráskód Böngészése

v1.0.5-pre.2 - Further work on investigating mac issue.

Upgraded xcode image to v10.
Added proper handler for auto-update errors.
Upgraded dependencies.
Daniel Scalzi 7 éve
szülő
commit
eb946d6a2a
4 módosított fájl, 55 hozzáadás és 54 törlés
  1. 1 1
      .travis.yml
  2. 4 1
      index.js
  3. 47 47
      package-lock.json
  4. 3 5
      package.json

+ 1 - 1
.travis.yml

@@ -1,7 +1,7 @@
 matrix:
   include:
     - os: osx
-      osx_image: xcode9.4
+      osx_image: xcode10
       language: node_js
       node_js: "10"
       env:

+ 4 - 1
index.js

@@ -33,7 +33,10 @@ function initAutoUpdater(event, data) {
     })
     autoUpdater.on('checking-for-update', () => {
         event.sender.send('autoUpdateNotification', 'checking-for-update')
-    })  
+    })
+    autoUpdater.on('error', () => {
+        event.sender.send('autoUpdateNotification', 'realerror', err)
+    }) 
 }
 
 // Open channel to listen for update actions.

+ 47 - 47
package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "westeroscraftlauncher",
-  "version": "1.0.5-pre.1",
+  "version": "1.0.5-pre.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -140,22 +140,22 @@
       "dev": true
     },
     "app-builder-lib": {
-      "version": "20.31.0",
-      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-20.31.0.tgz",
-      "integrity": "sha512-R9VFBHM6nX7EmipzxXhRfTE4X2REvR77LqfH1LHqhD8n7J15EowplCCRbxLtrXcnOAk+LgvU/puc0LheHQ+u9A==",
+      "version": "20.31.1",
+      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-20.31.1.tgz",
+      "integrity": "sha512-YveVI7JYJPDreWRQkfRGdTBTxoFKhuslsoVcfNP1yQi+mx2UfRp4xFNOdTJdIoxbpYfmJ/llddD8fDNuTF4p/A==",
       "dev": true,
       "requires": {
         "7zip-bin": "~4.1.0",
         "app-builder-bin": "2.2.0",
         "async-exit-hook": "^2.0.1",
         "bluebird-lst": "^1.0.6",
-        "builder-util": "7.2.0",
-        "builder-util-runtime": "6.0.0",
+        "builder-util": "7.2.1",
+        "builder-util-runtime": "6.1.0",
         "chromium-pickle-js": "^0.2.0",
         "debug": "^4.1.0",
         "ejs": "^2.6.1",
         "electron-osx-sign": "0.4.11",
-        "electron-publish": "20.31.0",
+        "electron-publish": "20.31.1",
         "fs-extra-p": "^7.0.0",
         "hosted-git-info": "^2.7.1",
         "is-ci": "^1.2.1",
@@ -181,9 +181,9 @@
           }
         },
         "builder-util-runtime": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-6.0.0.tgz",
-          "integrity": "sha512-iT+h5+hhqQg7oFizX1gchLWHCAbl+Hp9EyGfh+meXlE9NDXh/Z541asARFmrRT7LQVxTJNusEqcje4OT9dysUQ==",
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-6.1.0.tgz",
+          "integrity": "sha512-/1dvNkUNSlMQuIEMBGzJUS60tmDBBA6CYiWT5P9ZTIl2nskMX8VdEClTNTfknkCBQqZArgSTXfWrNmcbXEkbEg==",
           "dev": true,
           "requires": {
             "bluebird-lst": "^1.0.6",
@@ -465,15 +465,15 @@
       "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
     },
     "builder-util": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-7.2.0.tgz",
-      "integrity": "sha512-6E6p+TO9/LQBzOOStKpDn2eXi6dAR+3GSoy3fsynLkJTyQDNHeb6Gny/9XisS3rjeR2a+DEwSXrVQ7kWgvnb8g==",
+      "version": "7.2.1",
+      "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-7.2.1.tgz",
+      "integrity": "sha512-40RhIM7dzvLht1jrUXhLYYXZZb5zCLKoG5pbdrNdsKncoBSQfOZ8dfCPVG0vgi1Ngh8kisbSVmHxss3nylJ1WQ==",
       "dev": true,
       "requires": {
         "7zip-bin": "~4.1.0",
         "app-builder-bin": "2.2.0",
         "bluebird-lst": "^1.0.6",
-        "builder-util-runtime": "^6.0.0",
+        "builder-util-runtime": "^6.1.0",
         "chalk": "^2.4.1",
         "debug": "^4.1.0",
         "fs-extra-p": "^7.0.0",
@@ -496,9 +496,9 @@
           }
         },
         "builder-util-runtime": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-6.0.0.tgz",
-          "integrity": "sha512-iT+h5+hhqQg7oFizX1gchLWHCAbl+Hp9EyGfh+meXlE9NDXh/Z541asARFmrRT7LQVxTJNusEqcje4OT9dysUQ==",
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-6.1.0.tgz",
+          "integrity": "sha512-/1dvNkUNSlMQuIEMBGzJUS60tmDBBA6CYiWT5P9ZTIl2nskMX8VdEClTNTfknkCBQqZArgSTXfWrNmcbXEkbEg==",
           "dev": true,
           "requires": {
             "bluebird-lst": "^1.0.6",
@@ -925,14 +925,14 @@
       }
     },
     "dmg-builder": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-6.1.0.tgz",
-      "integrity": "sha512-s8Gf6h0EUgff8pgJ0Vlf4SaqmKKJuAi+AcpOoTmLQ495oCwzIFQimB+x6J9fRQMXKAFERgN9aaH9oKNLGbPtiA==",
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-6.1.1.tgz",
+      "integrity": "sha512-aMB7o/z0MmzwBHZzJDefmcH7bR98DinRyjT3TRs3Z2UKsjMiagQ4F9jGq50uqs4CnaHJ7aOfq3PcwBppdFMRiw==",
       "dev": true,
       "requires": {
-        "app-builder-lib": "~20.31.0",
+        "app-builder-lib": "~20.31.1",
         "bluebird-lst": "^1.0.6",
-        "builder-util": "~7.2.0",
+        "builder-util": "~7.2.1",
         "fs-extra-p": "^7.0.0",
         "iconv-lite": "^0.4.24",
         "js-yaml": "^3.12.0",
@@ -1044,17 +1044,17 @@
       }
     },
     "electron-builder": {
-      "version": "20.31.0",
-      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-20.31.0.tgz",
-      "integrity": "sha512-tvzI+A3kJKEoegr6CXiXrM6GXCxH92TDZBL156wwej8sCU1esVl6Ld1rgmx/2vqhmiIzhv6slBjaZks6huD3MA==",
+      "version": "20.31.1",
+      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-20.31.1.tgz",
+      "integrity": "sha512-a/V2QAVt0ZXFD/Lyqe0s1mqQ9funqznAYc9ygMjal+oUG6rXkhJRYVvvL+IT96coQeJKPtpc80F+SDi/PHFqlQ==",
       "dev": true,
       "requires": {
-        "app-builder-lib": "20.31.0",
+        "app-builder-lib": "20.31.1",
         "bluebird-lst": "^1.0.6",
-        "builder-util": "7.2.0",
-        "builder-util-runtime": "6.0.0",
+        "builder-util": "7.2.1",
+        "builder-util-runtime": "6.1.0",
         "chalk": "^2.4.1",
-        "dmg-builder": "6.1.0",
+        "dmg-builder": "6.1.1",
         "fs-extra-p": "^7.0.0",
         "is-ci": "^1.2.1",
         "lazy-val": "^1.0.3",
@@ -1074,9 +1074,9 @@
           }
         },
         "builder-util-runtime": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-6.0.0.tgz",
-          "integrity": "sha512-iT+h5+hhqQg7oFizX1gchLWHCAbl+Hp9EyGfh+meXlE9NDXh/Z541asARFmrRT7LQVxTJNusEqcje4OT9dysUQ==",
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-6.1.0.tgz",
+          "integrity": "sha512-/1dvNkUNSlMQuIEMBGzJUS60tmDBBA6CYiWT5P9ZTIl2nskMX8VdEClTNTfknkCBQqZArgSTXfWrNmcbXEkbEg==",
           "dev": true,
           "requires": {
             "bluebird-lst": "^1.0.6",
@@ -1171,14 +1171,14 @@
       }
     },
     "electron-publish": {
-      "version": "20.31.0",
-      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-20.31.0.tgz",
-      "integrity": "sha512-hAZLswpFPJFZES/2M6lMLXR5IkvIZB2x8M3LccaLZPqIP9OAxmXDD5X6T2RFIGknmDQgQq5pQ9K7MU3ndLSQHw==",
+      "version": "20.31.1",
+      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-20.31.1.tgz",
+      "integrity": "sha512-R4p+BxuuDr40a7GyuW0xnRkFwmVuA4QkmwLAPl53+57utA9bw+NZ8ssKtbBFhVAXDI1s3aapT5vsok3F6VOPrw==",
       "dev": true,
       "requires": {
         "bluebird-lst": "^1.0.6",
-        "builder-util": "~7.2.0",
-        "builder-util-runtime": "^6.0.0",
+        "builder-util": "~7.2.1",
+        "builder-util-runtime": "^6.1.0",
         "chalk": "^2.4.1",
         "fs-extra-p": "^7.0.0",
         "lazy-val": "^1.0.3",
@@ -1195,9 +1195,9 @@
           }
         },
         "builder-util-runtime": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-6.0.0.tgz",
-          "integrity": "sha512-iT+h5+hhqQg7oFizX1gchLWHCAbl+Hp9EyGfh+meXlE9NDXh/Z541asARFmrRT7LQVxTJNusEqcje4OT9dysUQ==",
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-6.1.0.tgz",
+          "integrity": "sha512-/1dvNkUNSlMQuIEMBGzJUS60tmDBBA6CYiWT5P9ZTIl2nskMX8VdEClTNTfknkCBQqZArgSTXfWrNmcbXEkbEg==",
           "dev": true,
           "requires": {
             "bluebird-lst": "^1.0.6",
@@ -1685,7 +1685,7 @@
     },
     "get-stream": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+      "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
       "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
       "dev": true
     },
@@ -1746,7 +1746,7 @@
     },
     "got": {
       "version": "6.7.1",
-      "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
+      "resolved": "http://registry.npmjs.org/got/-/got-6.7.1.tgz",
       "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
       "dev": true,
       "requires": {
@@ -1980,7 +1980,7 @@
     },
     "is-obj": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+      "resolved": "http://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
       "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
       "dev": true
     },
@@ -2124,7 +2124,7 @@
     },
     "json5": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "resolved": "http://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
       "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
       "dev": true,
       "requires": {
@@ -2553,7 +2553,7 @@
     },
     "p-is-promise": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz",
+      "resolved": "http://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz",
       "integrity": "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=",
       "dev": true
     },
@@ -3212,7 +3212,7 @@
     },
     "strip-eof": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "resolved": "http://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
       "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
       "dev": true
     },
@@ -3692,7 +3692,7 @@
     },
     "wrap-ansi": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+      "resolved": "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
       "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
       "dev": true,
       "requires": {

+ 3 - 5
package.json

@@ -1,6 +1,6 @@
 {
   "name": "westeroscraftlauncher",
-  "version": "1.0.5-pre.1",
+  "version": "1.0.5-pre.2",
   "description": "Custom modded launcher for Westeroscraft",
   "productName": "WesterosCraft Launcher",
   "main": "index.js",
@@ -49,7 +49,7 @@
   },
   "devDependencies": {
     "electron": "^3.0.7",
-    "electron-builder": "^20.31.0",
+    "electron-builder": "^20.31.1",
     "eslint": "^5.8.0"
   },
   "build": {
@@ -78,10 +78,8 @@
       "uninstallerIcon": "build/icon.ico"
     },
     "mac": {
-      "target": "default",
       "category": "public.app-category.games",
-      "icon": "build/icon.icns",
-      "type": "distribution"
+      "icon": "build/icon.icns"
     },
     "linux": {
       "target": "AppImage",