Skip to content

Commit 1254420

Browse files
committed
Merge remote-tracking branch 'origin/develop'
Conflicts: dist/kuzzle.js dist/kuzzle.min.js dist/kuzzle.min.map
2 parents 235168e + 8d9d362 commit 1254420

File tree

9 files changed

+93
-5239
lines changed

9 files changed

+93
-5239
lines changed

.eslintignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
dist/**/*.js
2+
bower_components/

.travis.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,9 @@ addons:
1010
- gcc-4.9
1111
- g++-4.9
1212
script:
13-
- grunt && npm test && cat ./coverage/lcov.info | ./node_modules/.bin/codecov
13+
- npm run build && npm test && cat ./coverage/lcov.info | ./node_modules/.bin/codecov
1414
before_install:
1515
- export CC="gcc-4.9" CXX="g++-4.9"
16-
- npm install -g grunt-cli
1716
install:
1817
- npm install
1918
after_success:
@@ -42,4 +41,3 @@ notifications:
4241
on_success: never
4342
on_failure: always
4443
on_start: never
45-

Gruntfile.js

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

build.js

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
var ora = require('ora');
2+
var webpack = require('webpack');
3+
var webpackConfig = require('./webpack.config.js');
4+
var spinner = ora('Building SDK for browser use...');
5+
6+
process.env.NODE_ENV = 'production';
7+
8+
spinner.start();
9+
10+
webpack(webpackConfig, function (err, stats) {
11+
spinner.stop();
12+
if (err) {
13+
throw err;
14+
}
15+
process.stdout.write(stats.toString({
16+
colors: true,
17+
modules: false,
18+
children: false,
19+
chunks: false,
20+
chunkModules: false
21+
}) + '\n');
22+
});

0 commit comments

Comments
 (0)