Merge branch 'release/1.3.4'

Author: Steffan

README.md

@@ -18,9 +18,9 @@ $ npm install vue-resource
 ```
 
 ### CDN
-Available on [jsdelivr](https://cdn.jsdelivr.net/npm/[email protected].3), [unpkg](https://unpkg.com/[email protected].3) or [cdnjs](https://cdnjs.com/libraries/vue-resource).
+Available on [jsdelivr](https://cdn.jsdelivr.net/npm/[email protected].4), [unpkg](https://unpkg.com/[email protected].4) or [cdnjs](https://cdnjs.com/libraries/vue-resource).
 ```html
-<script src="https://cdn.jsdelivr.net/npm/[email protected].3"></script>
+<script src="https://cdn.jsdelivr.net/npm/[email protected].4"></script>
 ```
 
 ## Example

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "vue-resource",
   "main": "dist/vue-resource.js",
-  "version": "1.3.3",
+  "version": "1.3.4",
   "description": "The HTTP client for Vue.js",
   "homepage": "https://github.com/pagekit/vue-resource",
   "license": "MIT",

build/build.js

@@ -22,8 +22,9 @@ rollup.rollup({
   }).code, bundle);
 })
 .then(function (bundle) {
+  var code = fs.readFileSync('dist/vue-resource.js', 'utf8');
   return write('dist/vue-resource.min.js',
-    banner + '\n' + uglify.minify('dist/vue-resource.js').code,
+    banner + '\n' + uglify.minify(code).code,
   bundle);
 })
 .then(function (bundle) {

dist/vue-resource.common.js

@@ -1,5 +1,5 @@
 /*!
- * vue-resource v1.3.3
+ * vue-resource v1.3.4
  * https://github.com/pagekit/vue-resource
  * Released under the MIT License.
  */
@@ -1138,7 +1138,7 @@ var Client = function (context) {
     }
 
     function Client(request) {
-        return new PromiseObj(function (resolve) {
+        return new PromiseObj(function (resolve, reject) {
 
             function exec() {
 
@@ -1163,10 +1163,10 @@ var Client = function (context) {
                     resHandlers.forEach(function (handler) {
                         response = when(response, function (response) {
                             return handler.call(context, response) || response;
-                        });
+                        }, reject);
                     });
 
-                    when(response, resolve);
+                    when(response, resolve, reject);
 
                     return;
                 }

dist/vue-resource.es2015.js

@@ -1,5 +1,5 @@
 /*!
- * vue-resource v1.3.3
+ * vue-resource v1.3.4
  * https://github.com/pagekit/vue-resource
  * Released under the MIT License.
  */
@@ -1136,7 +1136,7 @@ var Client = function (context) {
     }
 
     function Client(request) {
-        return new PromiseObj(function (resolve) {
+        return new PromiseObj(function (resolve, reject) {
 
             function exec() {
 
@@ -1161,10 +1161,10 @@ var Client = function (context) {
                     resHandlers.forEach(function (handler) {
                         response = when(response, function (response) {
                             return handler.call(context, response) || response;
-                        });
+                        }, reject);
                     });
 
-                    when(response, resolve);
+                    when(response, resolve, reject);
 
                     return;
                 }

dist/vue-resource.js

@@ -1,5 +1,5 @@
 /*!
- * vue-resource v1.3.3
+ * vue-resource v1.3.4
  * https://github.com/pagekit/vue-resource
  * Released under the MIT License.
  */
@@ -1142,7 +1142,7 @@ var Client = function (context) {
     }
 
     function Client(request) {
-        return new PromiseObj(function (resolve) {
+        return new PromiseObj(function (resolve, reject) {
 
             function exec() {
 
@@ -1167,10 +1167,10 @@ var Client = function (context) {
                     resHandlers.forEach(function (handler) {
                         response = when(response, function (response) {
                             return handler.call(context, response) || response;
-                        });
+                        }, reject);
                     });
 
-                    when(response, resolve);
+                    when(response, resolve, reject);
 
                     return;
                 }

dist/vue-resource.min.js

@@ -1,6 +1,6 @@
 {
   "name": "vue-resource",
-  "version": "1.3.3",
+  "version": "1.3.4",
   "main": "dist/vue-resource.common.js",
   "module": "dist/vue-resource.es2015.js",
   "unpkg": "dist/vue-resource.min.js",
@@ -31,19 +31,19 @@
     "got": false
   },
   "dependencies": {
-    "got": "^6.7.1"
+    "got": "^7.0.0"
   },
   "devDependencies": {
     "buble": "^0.15.2",
     "buble-loader": "^0.4.1",
-    "generate-release": "^0.12.0",
+    "generate-release": "^0.13.0",
     "jasmine-core": "^2.6.2",
-    "jest": "^20.0.3",
+    "jest": "^20.0.4",
     "replace-in-file": "^2.5.0",
-    "rollup": "^0.41.6",
+    "rollup": "^0.42.0",
     "rollup-plugin-buble": "^0.15.0",
-    "uglify-js": "2.8.25",
+    "uglify-js": "^3.0.15",
     "vue": "^2.3.3",
-    "webpack": "^2.5.1"
+    "webpack": "^2.6.1"
   }
 }

package.json

@@ -16,7 +16,7 @@ export default function (context) {
     }
 
     function Client(request) {
-        return new Promise(resolve => {
+        return new Promise((resolve, reject) => {
 
             function exec() {
 
@@ -41,10 +41,10 @@ export default function (context) {
                     resHandlers.forEach(handler => {
                         response = when(response, response => {
                             return handler.call(context, response) || response;
-                        });
+                        }, reject);
                     });
 
-                    when(response, resolve);
+                    when(response, resolve, reject);
 
                     return;
                 }