Skip to content

Commit 8d0516d

Browse files
iliakaniliakan
committed
gulp3 -> 4
1 parent 4330cae commit 8d0516d

File tree

9 files changed

+125
-137
lines changed

9 files changed

+125
-137
lines changed

‎gulpfile.js‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const glob = require('glob');
88
const path = require('path');
99
const fs = require('fs');
1010
const {lazyRequireTask, requireModuleTasks} = require('engine/gulp/requireModuleTasks');
11-
const runSequence = require('run-sequence');
11+
const {task, series, parallel} = require('gulp');
1212

1313
const config = require('config');
1414

@@ -18,7 +18,7 @@ process.on('uncaughtException', function(err) {
1818
});
1919

2020

21-
gulp.task("nodemon", lazyRequireTask('./tasks/nodemon', {
21+
task("nodemon", lazyRequireTask('./tasks/nodemon', {
2222
// shared client/server code has require('template.jade) which precompiles template on run
2323
// so I have to restart server to pickup the template change
2424
ext: "js,yml",
@@ -30,7 +30,7 @@ gulp.task("nodemon", lazyRequireTask('./tasks/nodemon', {
3030
watch: ["modules"]
3131
}));
3232

33-
gulp.task("livereload", lazyRequireTask("./tasks/livereload", {
33+
task("livereload", lazyRequireTask("./tasks/livereload", {
3434
// watch files *.*, not directories, no need to reload for new/removed files,
3535
// we're only interested in changes
3636

@@ -51,35 +51,30 @@ if (!process.env.TEST_E2E || process.env.CI && process.env.TRAVIS_SECURE_ENV_VAR
5151
testSrcs.push('!modules/**/test/e2e/*.js');
5252
}
5353

54-
gulp.task("test", lazyRequireTask('./tasks/test', {
54+
task("test", lazyRequireTask('./tasks/test', {
5555
src: testSrcs,
5656
reporter: 'spec',
5757
timeout: 100000 // big timeout for webdriver e2e tests
5858
}));
5959

6060

61-
gulp.task('deploy', function(callback) {
62-
runSequence("deploy:build", "deploy:update", callback);
63-
});
64-
65-
66-
gulp.task('webpack', lazyRequireTask('./tasks/webpack'));
61+
task('webpack', lazyRequireTask('./tasks/webpack'));
6762
// gulp.task('webpack-dev-server', lazyRequireTask('./tasks/webpackDevServer'));
6863

6964

70-
gulp.task('build', ['webpack']);
65+
task('build', series('webpack'));
7166

72-
gulp.task('server', lazyRequireTask('./tasks/server'));
67+
task('server', lazyRequireTask('./tasks/server'));
7368

74-
gulp.task('edit', ['webpack', 'engine:koa:tutorial:importWatch', 'livereload', 'server']);
69+
task('edit', parallel('webpack', 'engine:koa:tutorial:importWatch', 'livereload', 'server'));
7570

7671

77-
gulp.task('dev', ['nodemon', 'livereload', 'webpack']);
72+
task('dev', parallel('nodemon', 'livereload', 'webpack'));
7873

7974
gulp.on('err', function(gulpErr) {
8075
if (gulpErr.err) {
8176
// cause
8277
console.error("Gulp error details", [gulpErr.err.message, gulpErr.err.stack, gulpErr.err.errors].filter(Boolean));
8378
}
79+
mongoose.disconnect();
8480
});
85-

‎package.json‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "javascript-nodejs",
3-
"version": "1.0.0",
3+
"version": "2.0.0",
44
"private": true,
55
"scripts": {
66
"prod": "NODE_ENV=production NODE_PATH=./modules node ./bin/server.js",
@@ -29,9 +29,8 @@
2929
"file-loader": "^1.1",
3030
"fs-extra": "*",
3131
"gm": "*",
32-
"gulp": "^3",
33-
"gulp-livereload": "*",
34-
"gulp-ll": "*",
32+
"gulp": "^4",
33+
"gulp-livereload": "^4",
3534
"image-size": "*",
3635
"js-yaml": "*",
3736
"json-loader": "^0.5.7",
@@ -65,7 +64,6 @@
6564
"pug-runtime": "^2.0.4",
6665
"request": "*",
6766
"request-promise": "*",
68-
"run-sequence": "*",
6967
"rupture": "*",
7068
"style-loader": "^0",
7169
"stylus-loader": "^3",

‎tasks/livereload.js‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,36 +5,36 @@ let chokidar = require('chokidar');
55

66
// options.watch must NOT be www/**, because that breaks (why?!?) supervisor reloading
77
// www/**/*.* is fine
8-
module.exports = function(options) {
8+
module.exports = async function(options) {
99

1010
// listen to changes after the file events finish to arrive
1111
// no one is going to livereload right now anyway
12-
return function(callback) {
13-
livereload.listen();
14-
15-
// reload once after all scripts are rebuit
16-
livereload.changedSoon = throttle(livereload.changed, 1000, {leading: false});
17-
//livereload.changedVerySoon = _.throttle(livereload.changed, 100, {leading: false});
18-
19-
setTimeout(function() {
20-
console.log("livereload: listen on change " + options.watch);
21-
22-
chokidar.watch(options.watch, {
23-
awaitWriteFinish: {
24-
stabilityThreshold: 300,
25-
pollInterval: 100
26-
}
27-
}).on('change', function(changed) {
28-
if (changed.match(/\.(js|map)/)) {
29-
// full page reload
30-
livereload.changedSoon(changed);
31-
} else {
32-
livereload.changed(changed);
33-
}
34-
});
35-
36-
}, 1000);
37-
};
12+
livereload.listen();
13+
14+
// reload once after all scripts are rebuit
15+
livereload.changedSoon = throttle(livereload.changed, 1000, {leading: false});
16+
//livereload.changedVerySoon = _.throttle(livereload.changed, 100, {leading: false});
17+
18+
setTimeout(function() {
19+
console.log("livereload: listen on change " + options.watch);
20+
21+
chokidar.watch(options.watch, {
22+
awaitWriteFinish: {
23+
stabilityThreshold: 300,
24+
pollInterval: 100
25+
}
26+
}).on('change', function(changed) {
27+
if (changed.match(/\.(js|map)/)) {
28+
// full page reload
29+
livereload.changedSoon(changed);
30+
} else {
31+
livereload.changed(changed);
32+
}
33+
});
34+
35+
}, 1000);
36+
37+
await new Promise(resolve => {});
3838
};
3939

4040

‎tasks/nodemon.js‎

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,28 @@
11
const nodemon = require('nodemon');
22

3-
module.exports = function(options) {
3+
module.exports = async function(options) {
44

5-
return function(callback) {
6-
7-
nodemon({
8-
// shared client/server code has require('template.pug) which precompiles template on run
9-
// so I have to restart server to pickup the template change
10-
ext: "js",
11-
verbose: true,
12-
delay: 10,
13-
nodeArgs: process.env.NODE_DEBUG ? ['--inspect'] : [],
14-
script: "./bin/server.js",
15-
//ignoreRoot: ['.git', 'node_modules'].concat(glob.sync('{handlers,modules}/**/client')), // ignore handlers' client code
16-
ignore: ['**/client/', '**/photoCut/', 'public'], // ignore handlers' client code
17-
watch: ["modules"],
18-
watchOptions: {
19-
awaitWriteFinish: {
20-
stabilityThreshold: 300,
21-
pollInterval: 100
22-
}
5+
nodemon({
6+
// shared client/server code has require('template.pug) which precompiles template on run
7+
// so I have to restart server to pickup the template change
8+
ext: "js",
9+
verbose: true,
10+
delay: 10,
11+
nodeArgs: process.env.NODE_DEBUG ? ['--inspect'] : [],
12+
script: "./bin/server.js",
13+
//ignoreRoot: ['.git', 'node_modules'].concat(glob.sync('{handlers,modules}/**/client')), // ignore handlers' client code
14+
ignore: ['**/client/', '**/photoCut/', 'public'], // ignore handlers' client code
15+
watch: ["modules"],
16+
watchOptions: {
17+
awaitWriteFinish: {
18+
stabilityThreshold: 300,
19+
pollInterval: 100
2320
}
24-
})
25-
.on('log', function (log){
26-
console.log(log.colour);
27-
});
28-
29-
};
30-
21+
}
22+
})
23+
.on('log', function(log) {
24+
console.log(log.colour);
25+
});
3126

27+
await new Promise(resolve => {});
3228
};

‎tasks/server.js‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
let app = require('engine/koa/app');
22
let config = require('config');
33

4-
module.exports = function() {
5-
return function() {
6-
return app.waitBootAndListen(config.server.host, config.server.port);
7-
}
4+
module.exports = async function() {
5+
// this tasks never ends, because it runs the server
6+
await app.waitBootAndListen(config.server.host, config.server.port);
87
};
9-

‎tasks/syncResources.js‎

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,38 +2,34 @@ const fs = require('fs');
22
const fse = require('fs-extra');
33
const glob = require('glob');
44

5-
module.exports = function(resources) {
5+
module.exports = async function(resources) {
66

7-
return function(callback) {
7+
for (let src in resources) {
8+
let dst = resources[src];
89

9-
for (let src in resources) {
10-
let dst = resources[src];
10+
let files = glob.sync(src + '/**');
11+
for (let i = 0; i < files.length; i++) {
12+
let srcPath = files[i];
1113

12-
let files = glob.sync(src + '/**');
13-
for (let i = 0; i < files.length; i++) {
14-
let srcPath = files[i];
14+
let dstPath = srcPath.replace(src, dst);
15+
let srcStat = fs.statSync(srcPath);
1516

16-
let dstPath = srcPath.replace(src, dst);
17-
let srcStat = fs.statSync(srcPath);
18-
19-
if (srcStat.isDirectory()) {
20-
fse.ensureDirSync(dstPath);
21-
continue;
22-
}
23-
24-
let dstMtime = 0;
25-
try {
26-
dstMtime = fs.statSync(dstPath).mtime;
27-
} catch(e) {}
17+
if (srcStat.isDirectory()) {
18+
fse.ensureDirSync(dstPath);
19+
continue;
20+
}
2821

29-
if (srcStat.mtime > dstMtime) {
30-
fse.copySync(srcPath, dstPath);
31-
}
22+
let dstMtime = 0;
23+
try {
24+
dstMtime = fs.statSync(dstPath).mtime;
25+
} catch (e) {
26+
}
3227

28+
if (srcStat.mtime > dstMtime) {
29+
fse.copySync(srcPath, dstPath);
3330
}
34-
}
3531

36-
callback();
32+
}
33+
}
3734

38-
};
3935
};

‎tasks/test.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ const assert = require('assert');
55
require('should');
66
require('co-mocha');
77

8-
module.exports = function(options) {
8+
module.exports = async function(options) {
99

10-
return function() {
11-
// config needs the right env
12-
assert(process.env.NODE_ENV == 'test', "NODE_ENV=test must be set");
13-
14-
return gulp.src(options.src, {read: false})
15-
.pipe(mocha(options));
16-
};
10+
// config needs the right env
11+
assert(process.env.NODE_ENV === 'test', "NODE_ENV=test must be set");
1712

13+
return new Promise(resolve => {
14+
return gulp.src(options.src, {read: false, follow: true})
15+
.pipe(mocha(options))
16+
.on('finish', resolve);
17+
})
1818
};
1919

‎tasks/watch.js‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,12 @@ function pushTaskQueue(task) {
2929
log("queue: already exists", task);
3030
return;
3131
}
32-
32+
/* (maybe the task should be moved into the end of the queue? couldn't find any practical difference)
33+
if (~taskQueue.indexOf(task)) {
34+
log("queue: already exists, removing", task);
35+
taskQueue.splice(taskQueue.indexOf(task), 1);
36+
}
37+
*/
3338
taskQueue.push(task);
3439
log("push", taskQueue);
3540

@@ -96,23 +101,22 @@ function onModify(filePath) {
96101

97102
// options.root - where to start watching
98103
// options.taskMapping - regexp -> task mappings
99-
module.exports = function(options) {
104+
module.exports = async function(options) {
100105

101-
return function(callback) {
102-
let dirs = options.dirs.map(function(dir) {
103-
return path.join(options.root, dir);
104-
});
106+
let dirs = options.dirs.map(function(dir) {
107+
return path.join(options.root, dir);
108+
});
105109

106-
let watcher = chokidar.watch(dirs, {ignoreInitial: true});
110+
let watcher = chokidar.watch(dirs, {ignoreInitial: true});
107111

108-
watcher.root = options.root;
109-
watcher.taskMapping = options.taskMapping;
112+
watcher.root = options.root;
113+
watcher.taskMapping = options.taskMapping;
110114

111-
watcher.on('add', onModify);
112-
watcher.on('change', onModify);
113-
watcher.on('unlink', onModify);
114-
watcher.on('unlinkDir', onModify);
115-
watcher.on('addDir', onModify);
116-
};
115+
watcher.on('add', onModify);
116+
watcher.on('change', onModify);
117+
watcher.on('unlink', onModify);
118+
watcher.on('unlinkDir', onModify);
119+
watcher.on('addDir', onModify);
117120

121+
await new Promise(resolve => {});
118122
};

0 commit comments

Comments
 (0)