fix: updated all npm dependencies

BranchMetrics · Mar 14, 2017 · 5fb5bb4 · 5fb5bb4
1 parent 636e4ba
commit 5fb5bb4
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -457,15 +457,15 @@
     Branch.setIdentity(userId).then(function (res) {
       alert('Response: ' + JSON.stringify(res))
     }).catch(function (err) {
-      alert('Error: ' + JSON.stringify(err))
+      alert('Error: ' + JSON.stringify(err.message))
     })
     ```
 
     ```js
     Branch.logout().then(function (res) {
       alert('Response: ' + JSON.stringify(res))
     }).catch(function (err) {
-      alert('Error: ' + JSON.stringify(err))
+      alert('Error: ' + JSON.stringify(err.message))
     })
     ```
 
@@ -483,7 +483,7 @@
     Branch.userCompletedAction(eventName, metaData).then(function (res) {
       alert('Response: ' + JSON.stringify(res))
     }).catch(function (err) {
-      alert('Error: ' + JSON.stringify(err))
+      alert('Error: ' + JSON.stringify(err.message))
     })
     ```
 
@@ -492,7 +492,7 @@
     Branch.userCompletedAction(eventName).then(function (res) {
       alert('Response: ' + JSON.stringify(res))
     }).catch(function (err) {
-      alert('Error: ' + JSON.stringify(err))
+      alert('Error: ' + JSON.stringify(err.message))
     })
     ```
 

diff --git a/package.json b/package.json
@@ -46,18 +46,18 @@
   "dependencies": {
     "mkpath": "^1.0.0",
     "node-version-compare": "^1.0.1",
-    "plist": "^1.2.0",
-    "xml2js": "^0.4.16"
+    "plist": "^2.0.1",
+    "xml2js": "^0.4.17"
   },
   "devDependencies": {
     "gulp": "^3.9.1",
-    "gulp-standard": "^8.0.3",
-    "husky": "^0.12.0",
+    "gulp-standard": "^9.0.0",
+    "husky": "^0.13.2",
     "mkpath": "^1.0.0",
     "node-version-compare": "^1.0.1",
-    "plist": "^1.2.0",
+    "plist": "^2.0.1",
     "semantic-release": "^6.3.6",
-    "validate-commit-msg": "^2.8.2",
+    "validate-commit-msg": "^2.11.2",
     "xml2js": "^0.4.17"
   }
-}
+}
diff --git a/src/branch.js b/src/branch.js
@@ -86,7 +86,7 @@ Branch.prototype.setIdentity = function (identity) {
     return execute('setIdentity', [String(identity)])
   } else {
     return new Promise(function (resolve, reject) {
-      reject('Please set an identity')
+      reject(new Error('Please set an identity'))
     })
   }
 }
@@ -98,7 +98,7 @@ Branch.prototype.logout = function () {
 Branch.prototype.userCompletedAction = function (action, metaData) {
   if (!action) {
     return new Promise(function (resolve, reject) {
-      reject('Please set an event name')
+      reject(new Error('Please set an event name'))
     })
   }
 
@@ -159,7 +159,7 @@ Branch.prototype.createBranchUniversalObject = function (options) {
           return execute('listOnSpotlight', [obj.instanceId])
         } else {
           return new Promise(function (resolve, reject) {
-            reject('iOS Spotlight only')
+            reject(new Error('iOS Spotlight only'))
           })
         }
       }

diff --git a/src/scripts/ios/updatePlist.js b/src/scripts/ios/updatePlist.js
@@ -17,6 +17,7 @@
     var obj = convertXmlToObject(xml)
 
     obj = appendPlist(obj, preferences)
+    obj = correctPlistBlanks(obj)
     xml = convertObjectToXml(obj)
     writePList(filePath, xml)
   }
@@ -87,4 +88,15 @@
 
     return obj
   }
+
+  // npm list 1.2.0 -> 2.0.1 causes app crash due to malformed plist (from <string/> to <string></string>)
+  // specifically NSMainNibFile and NSMainNibFile~ipad
+  function correctPlistBlanks (obj) {
+    for (var key in obj) {
+      var val = obj[key]
+      if (!val) obj[key] = ''
+    }
+
+    return obj
+  }
 })()
diff --git a/testbed/www/js/index.js b/testbed/www/js/index.js
@@ -46,7 +46,7 @@ function BranchEvent () {
   console.log('Trigger BranchEvent()')
 
   // event name
-  var event = document.getElementById('custom-action').value || 'blank'
+  var event = document.getElementById('custom-action').value
 
   // optional
   var metadata = { 'custom_dictionary': 123, 'anything': 'everything' }
@@ -55,7 +55,7 @@ function BranchEvent () {
     alert('Response: ' + JSON.stringify(res))
   }).catch(function (err) {
     console.error(err)
-    alert('Error: ' + JSON.stringify(err))
+    alert('Error: ' + JSON.stringify(err.message))
   })
 }
 
@@ -92,7 +92,7 @@ function BranchUser () {
     alert('Response: ' + JSON.stringify(res))
   }).catch(function (err) {
     console.error(err)
-    alert('Error: ' + JSON.stringify(err))
+    alert('Error: ' + JSON.stringify(err.message))
   })
 }