Skip to content
This repository was archived by the owner on Dec 1, 2023. It is now read-only.

Commit c5f080d

Browse files
committed
Merge branch 'release/1.1.0'
2 parents bb56a4e + 615fbb5 commit c5f080d

26 files changed

+957
-993
lines changed

README.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,21 @@ $ bower install vue-resource
2222
```
2323

2424
### CDN
25-
Available on [jsdelivr](https://cdn.jsdelivr.net/vue.resource/1.0.3/vue-resource.min.js), [cdnjs](https://cdnjs.com/libraries/vue-resource) or [unpkg](https://unpkg.com/vue-resource@1.0.3/dist/vue-resource.min.js).
25+
Available on [jsdelivr](https://cdn.jsdelivr.net/vue.resource/1.1.0/vue-resource.min.js), [cdnjs](https://cdnjs.com/libraries/vue-resource) or [unpkg](https://unpkg.com/vue-resource@1.1.0/dist/vue-resource.min.js).
2626
```html
27-
<script src="https://cdn.jsdelivr.net/vue.resource/1.0.3/vue-resource.min.js"></script>
27+
<script src="https://cdn.jsdelivr.net/vue.resource/1.1.0/vue-resource.min.js"></script>
2828
```
2929

3030
## Example
3131
```js
3232
{
3333
// GET /someUrl
34-
this.$http.get('/someUrl').then((response) => {
35-
// success callback
36-
}, (response) => {
34+
this.$http.get('/someUrl').then(response => {
35+
36+
// get body data
37+
this.someData = response.body;
38+
39+
}, response => {
3740
// error callback
3841
});
3942
}

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "vue-resource",
33
"main": "dist/vue-resource.js",
4-
"version": "1.0.3",
4+
"version": "1.1.0",
55
"description": "The HTTP client for Vue.js",
66
"homepage": "https://github.com/vuejs/vue-resource",
77
"license": "MIT",

build/build.js

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
var fs = require('fs');
22
var rollup = require('rollup');
33
var uglify = require('uglify-js');
4-
var babel = require('rollup-plugin-babel');
4+
var buble = require('rollup-plugin-buble');
55
var package = require('../package.json');
66
var banner =
77
"/*!\n" +
@@ -12,11 +12,7 @@ var banner =
1212

1313
rollup.rollup({
1414
entry: 'src/index.js',
15-
plugins: [
16-
babel({
17-
presets: ['es2015-loose-rollup']
18-
})
19-
]
15+
plugins: [buble()]
2016
})
2117
.then(function (bundle) {
2218
return write('dist/vue-resource.js', bundle.generate({
@@ -32,6 +28,7 @@ rollup.rollup({
3228
})
3329
.then(function (bundle) {
3430
return write('dist/vue-resource.es2015.js', bundle.generate({
31+
format: 'es',
3532
banner: banner,
3633
footer: 'export { Url, Http, Resource };'
3734
}).code, bundle);

0 commit comments

Comments
 (0)