Skip to content

Commit 5a873c2

Browse files
committed
Merge branch 'master' into develop
Conflicts: package.json src/kuzzleDataCollection.js
2 parents 8e59dfc + 779b6ac commit 5a873c2

File tree

4 files changed

+16
-14
lines changed

4 files changed

+16
-14
lines changed

deploy.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#! /bin/bash
2+
set -e
23

34
if [ "${TRAVIS_BRANCH}" = "master" -a "${TRAVIS_PULL_REQUEST}" = "false" ]
45
then

package.json

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "kuzzle-sdk",
3-
"version": "2.3.0",
3+
"version": "2.3.2",
44
"description": "Official Javascript SDK for Kuzzle",
55
"author": "The Kuzzle Team <[email protected]>",
66
"repository": {
@@ -27,25 +27,26 @@
2727
"main": "index.js",
2828
"license": "Apache-2.0",
2929
"dependencies": {
30-
"bluebird": "3.4.7",
31-
"bufferutil": "^1.3.0",
32-
"uuid": "3.0.1",
33-
"utf-8-validate": "^2.0.0",
30+
"bluebird": "3.4.6",
31+
"bufferutil": "^1.2.1",
32+
"eslint-loader": "^1.6.1",
33+
"utf-8-validate": "^1.2.1",
34+
"uuid": "3.0.0",
3435
"ws": "^1.1.1"
3536
},
3637
"devDependencies": {
37-
"ora": "^0.4.0",
38-
"webpack": "^1.14.0",
39-
"eslint": "^3.12.2",
38+
"ora": "^0.3.0",
39+
"webpack": "^1.13.1",
40+
"eslint": "^3.7.1",
4041
"eslint-friendly-formatter": "^2.0.6",
41-
"browserify": "13.1.1",
42+
"browserify": "13.1.0",
4243
"codecov": "^1.0.1",
4344
"istanbul": "0.4.5",
4445
"istanbul-middleware": "0.2.2",
45-
"mocha": "3.2.0",
46+
"mocha": "3.1.0",
4647
"proxyquire": "^1.7.10",
4748
"rewire": "^2.5.2",
48-
"should": "11.1.2",
49-
"sinon": "^1.17.6"
49+
"should": "11.1.0",
50+
"sinon": "^1.17.5"
5051
}
5152
}

src/kuzzleDataCollection.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ KuzzleDataCollection.prototype.fetchAllDocuments = function (options, cb) {
319319
console.warn('KuzzleDataCollection.fetchAllDocuments may return extremely large amounts of documents, which may cause performance issues. Unless you know what you are doing, consider using KuzzleDataCollection.search or KuzzleDataCollection.scroll instead'); // eslint-disable-line no-console
320320
}
321321

322-
searchResult.documents.forEach(function (document) {
322+
searchResult.documents.forEach(function(document) {
323323
documents.push(document);
324324
});
325325
searchResult.next(getNextDocuments);

webpack.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ module.exports = {
2424
loaders: [
2525
{
2626
test: /\.js$/,
27-
loader: 'eslint',
27+
loader: 'eslint-loader',
2828
include: path.resolve(__dirname, './src/'),
2929
exclude: /node_modules/
3030
}

0 commit comments

Comments
 (0)