Skip to content

Commit 67f6149

Browse files
committed
Stable Version 1.1.2.
Converted to ES6.
1 parent f398a35 commit 67f6149

File tree

7 files changed

+755
-222
lines changed

7 files changed

+755
-222
lines changed

.jshintrc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
{
22
"node": false,
33
"browser": true,
4-
"es5": true,
54
"esnext": true,
65
"bitwise": true,
7-
"camelcase": true,
6+
"camelcase": false,
87
"curly": true,
98
"eqeqeq": true,
109
"immed": true,

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
##### 1.1.2 - 07 March 2015
2+
3+
###### Other
4+
- Converted to ES6, using Babel.js to transpile to ES5.
5+
16
##### 1.1.1 - 25 February 2015
27

38
- Updated dependencies

Gruntfile.js

Lines changed: 42 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* js-data-rethinkdb
33
* http://github.com/js-data/js-data-rethinkdb
44
*
5-
* Copyright (c) 2014 Jason Dobry <http://www.js-data.io/js-data-rethinkdb>
5+
* Copyright (c) 2014-2015 Jason Dobry <http://www.js-data.io/js-data-rethinkdb>
66
* Licensed under the MIT license. <https://github.com/js-data/js-data-rethinkdb/blob/master/LICENSE>
77
*/
88
module.exports = function (grunt) {
@@ -41,14 +41,54 @@ module.exports = function (grunt) {
4141
},
4242
src: ['mocha.start.js', 'test/**/*.js']
4343
}
44+
},
45+
webpack: {
46+
dist: {
47+
debug: true,
48+
entry: './src/index.js',
49+
output: {
50+
filename: './dist/js-data-rethinkdb.js',
51+
libraryTarget: 'commonjs2',
52+
library: 'js-data-rethinkdb'
53+
},
54+
externals: [
55+
'mout/array/contains',
56+
'mout/object/forOwn',
57+
'mout/object/keys',
58+
'mout/object/deepMixIn',
59+
'mout/array/forEach',
60+
'mout/lang/isObject',
61+
'mout/lang/isArray',
62+
'mout/lang/isEmpty',
63+
'mout/lang/isString',
64+
'mout/string/upperCase',
65+
'mout/string/underscore',
66+
'bluebird',
67+
'js-data',
68+
'js-data-schema',
69+
'rethinkdbdash'
70+
],
71+
module: {
72+
loaders: [
73+
{ test: /(src)(.+)\.js$/, exclude: /node_modules/, loader: 'babel-loader?blacklist=useStrict' }
74+
],
75+
preLoaders: [
76+
{
77+
test: /(src)(.+)\.js$|(test)(.+)\.js$/, // include .js files
78+
exclude: /node_modules/, // exclude any and all files in the node_modules folder
79+
loader: "jshint-loader?failOnHint=true"
80+
}
81+
]
82+
}
83+
}
4484
}
4585
});
4686

4787
grunt.registerTask('n', ['mochaTest']);
4888

4989
grunt.registerTask('test', ['build', 'n']);
5090
grunt.registerTask('build', [
51-
'jshint'
91+
'webpack'
5292
]);
5393
grunt.registerTask('go', ['build', 'watch:dist']);
5494
grunt.registerTask('default', ['build']);

0 commit comments

Comments
 (0)