Merge branch 'release/0.9.3'

README.md

@@ -22,9 +22,9 @@ $ bower install vue-resource
 ```
 
 ### CDN
-Available on [jsdelivr](https://cdn.jsdelivr.net/vue.resource/0.9.2/vue-resource.min.js), [cdnjs](https://cdnjs.com/libraries/vue-resource) or [npmcdn](https://npmcdn.com/[email protected].2/dist/vue-resource.min.js).
+Available on [jsdelivr](https://cdn.jsdelivr.net/vue.resource/0.9.3/vue-resource.min.js), [cdnjs](https://cdnjs.com/libraries/vue-resource) or [npmcdn](https://npmcdn.com/[email protected].3/dist/vue-resource.min.js).
 ```html
-<script src="https://cdn.jsdelivr.net/vue.resource/0.9.2/vue-resource.min.js"></script>
+<script src="https://cdn.jsdelivr.net/vue.resource/0.9.3/vue-resource.min.js"></script>
 ```
 
 ## Documentation

bower.json

@@ -2,7 +2,7 @@
   "name": "vue-resource",
   "main": "dist/vue-resource.js",
   "description": "A web request service for Vue.js",
-  "version": "0.9.2",
+  "version": "0.9.3",
   "homepage": "https://github.com/vuejs/vue-resource",
   "license": "MIT",
   "ignore": [

build/build.js

@@ -3,10 +3,9 @@ var rollup = require('rollup');
 var uglify = require('uglify-js');
 var babel = require('rollup-plugin-babel');
 var package = require('../package.json');
-var version = process.env.VERSION || package.version;
 var banner =
     "/*!\n" +
-    " * vue-resource v" + version + "\n" +
+    " * vue-resource v" + package.version + "\n" +
     " * https://github.com/vuejs/vue-resource\n" +
     " * Released under the MIT License.\n" +
     " */\n";

build/release.js

@@ -0,0 +1,20 @@
+var replace = require('replace-in-file');
+var version = process.argv[2];
+
+replace({
+  files: "bower.json",
+  replace: /("version"\s*:\s*")\d+\.\d+\.\d+("\s*,)/g,
+  with: "$1" + version + "$2"
+});
+
+replace({
+  files: "package.json",
+  replace: /("version"\s*:\s*")\d+\.\d+\.\d+("\s*,)/g,
+  with: "$1" + version + "$2"
+});
+
+replace({
+  files: "README.md",
+  replace: /(\/|@)\d+\.\d+\.\d+/g,
+  with: "$1" + version
+});

dist/vue-resource.common.js

@@ -1,5 +1,5 @@
 /*!
- * vue-resource v0.9.2
+ * vue-resource v0.9.3
  * https://github.com/vuejs/vue-resource
  * Released under the MIT License.
  */
@@ -913,7 +913,7 @@ function timeout (request, next) {
 
     if (request.timeout) {
         timeout = setTimeout(function () {
-            request.cancel();
+            request.abort();
         }, request.timeout);
     }
 

dist/vue-resource.es2015.js

@@ -1,5 +1,5 @@
 /*!
- * vue-resource v0.9.2
+ * vue-resource v0.9.3
  * https://github.com/vuejs/vue-resource
  * Released under the MIT License.
  */
@@ -911,7 +911,7 @@ function timeout (request, next) {
 
     if (request.timeout) {
         timeout = setTimeout(function () {
-            request.cancel();
+            request.abort();
         }, request.timeout);
     }
 

dist/vue-resource.js

@@ -1,5 +1,5 @@
 /*!
- * vue-resource v0.9.2
+ * vue-resource v0.9.3
  * https://github.com/vuejs/vue-resource
  * Released under the MIT License.
  */
@@ -917,7 +917,7 @@
 
       if (request.timeout) {
           timeout = setTimeout(function () {
-              request.cancel();
+              request.abort();
           }, request.timeout);
       }
 

package.json

@@ -1,12 +1,13 @@
 {
   "name": "vue-resource",
-  "version": "0.9.2",
+  "version": "0.9.3",
   "description": "A web request service for Vue.js",
   "main": "dist/vue-resource.common.js",
   "jsnext:main": "dist/vue-resource.es2015.js",
   "scripts": {
+    "test": "webpack --config test/webpack.config.js",
     "build": "node build/build.js",
-    "test": "webpack --config test/webpack.config.js"
+    "release": "node build/release.js"
   },
   "repository": {
     "type": "git",
@@ -31,6 +32,7 @@
     "babel-preset-es2015-loose-rollup": "^7.0.0",
     "babel-runtime": "^6.9.2",
     "jasmine-core": "^2.3.4",
+    "replace-in-file": "^1.1.1",
     "rollup": "^0.33.0",
     "rollup-plugin-babel": "^2.6.1",
     "uglify-js": "^2.6.4",

src/http/interceptor/timeout.js

@@ -8,7 +8,7 @@ export default function (request, next) {
 
     if (request.timeout) {
         timeout = setTimeout(() => {
-            request.cancel();
+            request.abort();
         }, request.timeout);
     }