Skip to content

Commit 0bbc68e

Browse files
committed
Stable Version 1.2.2.
Fixes #10
1 parent af81d23 commit 0bbc68e

12 files changed

+2325
-2147
lines changed

.travis.yml

Lines changed: 0 additions & 13 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
##### 1.2.2 - 04 March 2015
2+
3+
###### Backwards compatible bug fixes
4+
- #10 - DSHttpAdapter#find does not call queryTransform
5+
6+
###### Other
7+
- Switched build to webpack. UMD should actually work now.
8+
19
##### 1.2.1 - 25 February 2015
210

311
###### Backwards compatible bug fixes

Gruntfile.js

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* js-data-http
33
* http://github.com/js-data/js-data-http
44
*
5-
* Copyright (c) 2014 Jason Dobry <http://www.js-data.io/js-data-http>
5+
* Copyright (c) 2014-2015 Jason Dobry <http://www.js-data.io/js-data-http>
66
* Licensed under the MIT license. <https://github.com/js-data/js-data-http/blob/master/LICENSE>
77
*/
88
module.exports = function (grunt) {
@@ -42,27 +42,38 @@ module.exports = function (grunt) {
4242
'* @author Jason Dobry <[email protected]>\n' +
4343
'* @file js-data-http.min.js\n' +
4444
'* @version <%= pkg.version %> - Homepage <http://www.js-data.io/docs/dshttpadapter>\n' +
45-
'* @copyright (c) 2014 Jason Dobry\n' +
45+
'* @copyright (c) 2014-2015 Jason Dobry\n' +
4646
'* @license MIT <https://github.com/js-data/js-data-http/blob/master/LICENSE>\n' +
4747
'*\n' +
48-
'* @overview My Adapter.\n' +
48+
'* @overview Http adapter for js-data.\n' +
4949
'*/\n'
5050
},
5151
files: {
5252
'dist/js-data-http.min.js': ['dist/js-data-http.js']
5353
}
5454
}
5555
},
56-
browserify: {
57-
options: {
58-
browserifyOptions: {
59-
standalone: 'DSHttpAdapter'
60-
},
61-
external: ['js-data']
62-
},
56+
webpack: {
6357
dist: {
64-
files: {
65-
'dist/js-data-http.js': ['src/index.js']
58+
entry: './src/index.js',
59+
output: {
60+
filename: './dist/js-data-http.js',
61+
libraryTarget: 'umd',
62+
library: 'DSHttpAdapter'
63+
},
64+
externals: {
65+
'js-data': {
66+
amd: 'js-data',
67+
commonjs: 'js-data',
68+
commonjs2: 'js-data',
69+
root: 'JSData'
70+
},
71+
'js-data-schema': {
72+
amd: 'js-data-schema',
73+
commonjs: 'js-data-schema',
74+
commonjs2: 'js-data-schema',
75+
root: 'Schemator'
76+
}
6677
}
6778
}
6879
},
@@ -114,10 +125,10 @@ module.exports = function (grunt) {
114125
'* @author Jason Dobry <[email protected]>\n' +
115126
'* @file js-data-http.js\n' +
116127
'* @version ' + pkg.version + ' - Homepage <http://www.js-data.io/docs/dshttpadapter>\n' +
117-
'* @copyright (c) 2014 Jason Dobry \n' +
128+
'* @copyright (c) 2014-2015 Jason Dobry \n' +
118129
'* @license MIT <https://github.com/js-data/js-data-http/blob/master/LICENSE>\n' +
119130
'*\n' +
120-
'* @overview My Adapter.\n' +
131+
'* @overview Http adapter for js-data.\n' +
121132
'*/\n';
122133

123134
file = banner + file;
@@ -129,7 +140,7 @@ module.exports = function (grunt) {
129140
grunt.registerTask('build', [
130141
'clean',
131142
'jshint',
132-
'browserify',
143+
'webpack',
133144
'banner',
134145
'uglify:main'
135146
]);

0 commit comments

Comments
 (0)