Skip to content

Commit da66ac9

Browse files
jmdobryjmdobry
committed
Stable Version 3.0.0-beta.1.
1 parent e41418a commit da66ac9

36 files changed

+484
-2052
lines changed

‎.gitignore‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,9 @@ bower_components/
66
*.iml
77

88
coverage/
9+
10+
build_examples/r.js/bundle.js
11+
build_examples/browserify/bundle.js
12+
build_examples/webpack/bundle.js
13+
build_examples/webpack_es6/bundle.js
14+
build_examples/webpack_es6_2/bundle.js

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
##### 3.0.0-beta.1 - 06 July 2015
2+
3+
###### Breaking API changes
4+
- `axios` is now a peerDependency, and is not bundled with js-data-http.js You now have to configure the adapter to use an http library.
5+
16
##### 2.0.0 - 02 July 2015
27

38
Stable Version 2.0.0

‎Gruntfile.js‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,12 @@ module.exports = function (grunt) {
105105
browsers: ['Chrome', 'Firefox', 'PhantomJS'],
106106
options: {
107107
files: [
108+
'bower_components/axios/dist/axios.js',
108109
'node_modules/es6-promise/dist/es6-promise.js',
109110
'node_modules/js-data/dist/js-data.js',
110111
'dist/js-data-http.min.js',
111112
'karma.start.js',
112-
'test/**/*.js'
113+
'test/browser/**/*.js'
113114
]
114115
}
115116
},
@@ -121,6 +122,14 @@ module.exports = function (grunt) {
121122
options: {
122123
coverage_dir: 'coverage'
123124
}
125+
},
126+
mochaTest: {
127+
all: {
128+
options: {
129+
reporter: 'spec'
130+
},
131+
src: ['mocha.start.js', 'test/node/**/*.js']
132+
}
124133
}
125134
});
126135

@@ -132,7 +141,7 @@ module.exports = function (grunt) {
132141
grunt.file.write(filePath, file);
133142
});
134143

135-
grunt.registerTask('test', ['build', 'karma:ci', 'karma:min']);
144+
grunt.registerTask('test', ['build', 'karma:ci', 'karma:min', 'mochaTest']);
136145
grunt.registerTask('build', [
137146
'clean',
138147
'webpack',

‎bower.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
"karma.start.js"
3030
],
3131
"dependencies": {
32+
"axios": "0.5.x",
3233
"js-data": ">=2.0.0"
3334
}
3435
}

‎build_examples/browserify/README.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Running `browserify -x axios app.js > bundle.js` in this directory will produce `bundle.js`
2+
3+
Note the external dependency "axios" that is excluded from the build (it's not needed when using js-data-angular).

‎build_examples/browserify/app.js‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
var JSData = require('js-data');
2+
var axios = require('axios');
3+
// normally this would be var DSHttpAdapter = require('js-data-http');
4+
var DSHttpAdapter = require('../../');
5+
6+
document.getElementById('main').innerHTML = JSData.version.full;
7+
8+
var adapter = new DSHttpAdapter({
9+
http: axios
10+
});
11+
var store = new JSData.DS();
12+
store.registerAdapter('http', adapter, { default: true });
13+
var User = store.defineResource('user');
14+
15+
User.find(1).catch(function (err) {
16+
console.log(err);
17+
});

‎build_examples/browserify/index.html‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<title>My App</title>
5+
</head>
6+
<body>
7+
<h1 id="main"></h1>
8+
<!-- load bundled scripts -->
9+
<script src="bundle.js"></script>
10+
</body>
11+
</html>

‎build_examples/node/app.js‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
var Promise = require('es6-promise');
2+
var JSData = require('js-data');
3+
var axios = require('axios');
4+
var DSHttpAdapter = require('../../');
5+
6+
var adapter = new DSHttpAdapter({
7+
http: axios
8+
});
9+
var store = new JSData.DS();
10+
store.registerAdapter('http', adapter, { default: true });
11+
var User = store.defineResource('user');
12+
13+
User.find(1).catch(function (err) {
14+
console.log(err);
15+
});

‎build_examples/r.js/README.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Running `r.js -o require.config.js` in this directory will produce `bundle.js`
2+
3+
In `index.html` switch `script/main` between `main` (load scripts dynamically) and `bundle` (load bundled scripts)

‎build_examples/r.js/app.js‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
define('app', [
2+
'js-data',
3+
'axios',
4+
'js-data-http'
5+
], function (JSData, axios, DSHttpAdapter) {
6+
document.getElementById('main').innerHTML = JSData.version.full;
7+
8+
var adapter = new DSHttpAdapter({
9+
http: axios
10+
});
11+
var store = new JSData.DS();
12+
store.registerAdapter('http', adapter, { default: true });
13+
return store.defineResource('user');
14+
});

0 commit comments

Comments
 (0)