Skip to content

Commit a234911

Browse files
committed
Upgrading gulp and other dependencies
1 parent 799dd23 commit a234911

File tree

5 files changed

+6945
-11212
lines changed

5 files changed

+6945
-11212
lines changed

app.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,5 +58,5 @@ db.connect(config.mongodb.uri, function(err) {
5858
io = io.listen(server);
5959
app.use('/r', roomsRoute('/r', io));
6060

61-
console.log('Listening on http://' + (app.get('host') || 'localhost') + ':' + app.get('port'))
61+
console.log('Listening on http://' + (app.get('host') || 'localhost') + ':' + app.get('port'));
6262
});

gulpfile.js

+28-24
Original file line numberDiff line numberDiff line change
@@ -3,55 +3,59 @@
33
var gulp = require('gulp');
44
var rename = require('gulp-rename');
55

6-
gulp.task('lint', function() {
6+
function lint(cb) {
77
var jshint = require('gulp-jshint');
88

9-
gulp.src('./**/*.js')
9+
return gulp.src('./**/*.js')
1010
.pipe(jshint())
1111
.pipe(jshint.reporter('default'));
12-
});
12+
}
13+
gulp.task(lint);
1314

14-
gulp.task('browserify', function() {
15+
function browserify(cb) {
1516
var browserify = require('browserify');
1617
var source = require('vinyl-source-stream');
1718

1819
return browserify('./public/javascript/room.js')
1920
.bundle()
2021
.pipe(source('room.bundle.js'))
2122
.pipe(gulp.dest('./public/javascript/'));
22-
});
23+
}
24+
gulp.task(browserify);
2325

24-
gulp.task('minify-css', function() {
26+
function minifyCss() {
2527
var minifyCss = require('gulp-minify-css');
2628

2729
return gulp.src(['!./**/*.min.css', 'public/stylesheet/**/*.css'])
2830
.pipe(minifyCss({compatibility: 'ie8'}))
2931
.pipe(rename({suffix: '.min'}))
3032
.pipe(gulp.dest('public/stylesheet'));
31-
});
33+
}
34+
gulp.task(minifyCss);
3235

33-
gulp.task('minify-js', ['browserify'], function() {
36+
function minifyJs() {
3437
var uglify = require('gulp-uglify');
3538

3639
return gulp.src(['!./**/*.min.js', './public/javascript/*.js'])
3740
.pipe(uglify())
3841
.pipe(rename({suffix: '.min'}))
3942
.pipe(gulp.dest('./public/javascript/'));
40-
});
43+
}
44+
gulp.task('minifyJs', gulp.series(browserify, minifyJs));
4145

42-
gulp.task('start', ['lint', 'browserify'], function() {
46+
function start() {
4347
var nodemon = require('gulp-nodemon');
44-
45-
nodemon({
46-
script: 'app.js',
47-
ext: 'js',
48-
tasks: ['lint', 'browserify'],
49-
ignore: ['*.bundle.js', '*.min.js'],
50-
env: {'NODE_ENV': 'development'}
51-
});
52-
});
53-
54-
gulp.task('build:development', ['lint', 'browserify']);
55-
gulp.task('build:production', ['minify-css', 'minify-js']);
56-
57-
gulp.task('default', ['start']);
48+
nodemon({
49+
script: 'app.js',
50+
ext: 'js',
51+
tasks: ['lint', 'browserify'],
52+
ignore: ['*.bundle.js', '*.min.js'],
53+
env: {'NODE_ENV': 'development'}
54+
});
55+
}
56+
gulp.task('start', gulp.series(lint, browserify, start));
57+
58+
gulp.task('build:development', gulp.series(lint, browserify));
59+
gulp.task('build:production', gulp.parallel(minifyCss, minifyJs));
60+
61+
gulp.task('default', start);

0 commit comments

Comments
 (0)