Skip to content

Commit 334c06c

Browse files
author
David Bengsch
authored
Merge branch 'develop' into fix-160-add-banner-to-bundle
2 parents 196f6ee + 2dd9ece commit 334c06c

File tree

5 files changed

+19
-16
lines changed

5 files changed

+19
-16
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ install:
1818
- npm install
1919
env:
2020
global:
21-
secure: J5FHR91BBBrVqS5QMl+ZC3Oi2UgyQpW5SlKhfCwXJU2rz8XHNWajT5hjihlNiE6SVuUDVNflCcJI7DRD7+hwCt+G0rL9UuLnkKuMGVuVc/vMAjYpjRoVgWHk4KSwN4qWYcbF0k9d5POelI36xFnuQM0ttb3kDi/8T1s26Vsqw2Db1YDoK94ZkqO633gwwmr9RX05+sLXIuKai1bfIjUGU3YTusY0hDVw78Sg+/o1qCHNVwLDutpae/wLypO1/hujgh8SjIkAQBa/yp1gT2W+ykIaApk8eZn630usVttdToDgh2Z5+RLcgHOMi/p2/NvB/XKDq+sYh55tuKtdzu6MNx1vEVolcfiPkI0yPzwAs1IgTxAtGpKVkRlIZNMyksAQBikLqI6iFJHqYcPDHo+R+IwrXXSwZL/gbcfAtLiYWx1JnZHL8KfFz5KvRtINA4iEopzTQrOPJibFYNMWMyybvx7cHe4SAbtZxKq6cCt3fUzvwzfTIQ8m5k6y+w/bOiYY/HV8zvNw5bCS1N6h/6u8mmZMw3wv9N9eQz+h2BKwSziWt27CXcUKl6HhHklR7zj3/b7HwKW1o7Y0cixTl8kUBC8k+093Mhg4FmJWEAacfXVzRDs5nEejronmNUTi8hnpsSBeNMQnuD99zQp+eIi5PjfZ9DsCCM85cYb/LG1HyLs=
21+
secure: I4D0AX3ftua5iHdzj5NHm3Tzdr5ZVR0UTDOKzo6IhjqZOmcFsowD047nRHkSa9iMcefij/lVCgBvHdIIxNPQeJkOCssHapjKzOsppjW4rW2qfrwKmEQa/rpzdV4tXPuiX/JWspWc4Ll7rAQZJESLesp3ksoWafvViluJ7PY9OOXwIGPY7fdd6DO4yP795NwnigxBZ0ZJ3A0icbczntSZQztCxaVEHtNgy7W9MYJ3nLINsbiQN8FRa1UgvPdecgw05ST7mW82QK8y+ajR1YwG+/M8HWBxHuLPuLxN87UCPX6qe9upHPU9/RQvm7L4SoLckqcxJDtPoFueZf6pn1PN18Jp3b0D7frUJaY1qMx1x4KvYNQlgvJhZlEOtbvdolVecbL5sIYv7un/BzCAhe456WyB2LRBG/qPSzKdqrmsUWS5vVOdIMPqRLvC5GU/UC6pbVWIOytwcFYPs4xHyViyTpBQnlvF9oSx+D0RW726vKUEWPCG00KaNH9TY2BW3Ircvss8wc53/zRIG6xyppkoy9MbLPRV3tgfBXtr0ytKRBh4WbdCpTHl5CfDS2iuk49H0ZqnaG/8izmylqZXdZSKxdXCBcDv/6bV12qRWDzdBALaAthhR9mkjtpg6YKdNTcLpdkCCejiuoBsnI9Des9F6tOLAff8hLjv2xkgnrdbfzM=
2222
deploy:
2323
provider: npm
2424
skip_cleanup: true

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.3",
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: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@ module.exports = {
88
output: {
99
path: './dist',
1010
filename: 'kuzzle.js',
11+
library: 'Kuzzle',
1112
libraryTarget: 'umd'
1213
},
1314
watch: false,
1415
debug: false,
1516
devtool: 'source-map',
1617
node: {
1718
console: false,
18-
global: false,
19+
global: true,
1920
process: false,
2021
Buffer: false,
2122
__filename: false,
@@ -26,7 +27,7 @@ module.exports = {
2627
loaders: [
2728
{
2829
test: /\.js$/,
29-
loader: 'eslint',
30+
loader: 'eslint-loader',
3031
include: path.resolve(__dirname, './src/'),
3132
exclude: /node_modules/
3233
}

0 commit comments

Comments
 (0)