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

Commit

Permalink
Merge branch 'release/1.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
steffans committed Jan 29, 2017
2 parents bb56a4e + 615fbb5 commit c5f080d
Show file tree
Hide file tree
Showing 26 changed files with 957 additions and 993 deletions.
13 changes: 8 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,21 @@ $ bower install vue-resource
```

### CDN
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).
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).
```html
<script src="https://cdn.jsdelivr.net/vue.resource/1.0.3/vue-resource.min.js"></script>
<script src="https://cdn.jsdelivr.net/vue.resource/1.1.0/vue-resource.min.js"></script>
```

## Example
```js
{
// GET /someUrl
this.$http.get('/someUrl').then((response) => {
// success callback
}, (response) => {
this.$http.get('/someUrl').then(response => {

// get body data
this.someData = response.body;

}, response => {
// error callback
});
}
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "vue-resource",
"main": "dist/vue-resource.js",
"version": "1.0.3",
"version": "1.1.0",
"description": "The HTTP client for Vue.js",
"homepage": "https://github.com/vuejs/vue-resource",
"license": "MIT",
Expand Down
9 changes: 3 additions & 6 deletions build/build.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
var fs = require('fs');
var rollup = require('rollup');
var uglify = require('uglify-js');
var babel = require('rollup-plugin-babel');
var buble = require('rollup-plugin-buble');
var package = require('../package.json');
var banner =
"/*!\n" +
Expand All @@ -12,11 +12,7 @@ var banner =

rollup.rollup({
entry: 'src/index.js',
plugins: [
babel({
presets: ['es2015-loose-rollup']
})
]
plugins: [buble()]
})
.then(function (bundle) {
return write('dist/vue-resource.js', bundle.generate({
Expand All @@ -32,6 +28,7 @@ rollup.rollup({
})
.then(function (bundle) {
return write('dist/vue-resource.es2015.js', bundle.generate({
format: 'es',
banner: banner,
footer: 'export { Url, Http, Resource };'
}).code, bundle);
Expand Down
Loading

0 comments on commit c5f080d

Please sign in to comment.