UPDATE grunt tasks
This commit is contained in:
parent
e6519983ff
commit
2a30bc3c5e
21
Gruntfile.js
21
Gruntfile.js
@ -13,12 +13,27 @@ module.exports = function(grunt) {
|
||||
}
|
||||
},
|
||||
execute: {
|
||||
target: {
|
||||
less: {
|
||||
options: {
|
||||
nodeargs: ['--harmony-async-await'],
|
||||
args: ['less']
|
||||
},
|
||||
src: ['src/app.js']
|
||||
},
|
||||
wait: {
|
||||
options: {
|
||||
nodeargs: ['--harmony-async-await'],
|
||||
args: ['wait']
|
||||
},
|
||||
src: ['src/app.js']
|
||||
}
|
||||
},
|
||||
bgShell: {
|
||||
_defaults: {
|
||||
bg: true
|
||||
},
|
||||
express: {
|
||||
cmd: 'npm run server'
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
@ -29,7 +44,7 @@ module.exports = function(grunt) {
|
||||
'resumes/**/*.less',
|
||||
'less/**/*.less'
|
||||
],
|
||||
tasks: ['execute', 'babel'],
|
||||
tasks: ['execute', 'babel', 'bgShell:express'],
|
||||
options: {
|
||||
nospawn: false,
|
||||
livereload: true
|
||||
@ -38,5 +53,5 @@ module.exports = function(grunt) {
|
||||
}
|
||||
});
|
||||
|
||||
grunt.registerTask('default', ['babel', 'execute', 'watch']);
|
||||
grunt.registerTask('default', ['babel', 'execute:less', 'bgShell:express', 'execute:wait', 'watch']);
|
||||
};
|
||||
|
||||
0
docs/Docs.md
Normal file → Executable file
0
docs/Docs.md
Normal file → Executable file
19
package.json
19
package.json
@ -21,7 +21,7 @@
|
||||
],
|
||||
"scripts": {
|
||||
"server": "node --harmony-async-await src/app.js server",
|
||||
"dev": "concurrently --kill-others \"npm run server\" \"grunt --verbose\"",
|
||||
"dev": "grunt --verbose",
|
||||
"pdf": "concurrently \"npm run server\" \"grunt --gruntfile GruntfilePdf.js --verbose\"",
|
||||
"lint": "eslint src/",
|
||||
"test": "nyc mocha --harmony-async-await \"test/*.js\"",
|
||||
@ -64,17 +64,16 @@
|
||||
"write": "0.3.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"concurrently": "^3.3.0",
|
||||
"eslint": "3.15.0",
|
||||
"grunt": "^1.0.1",
|
||||
"grunt-babel": "^6.0.0",
|
||||
"grunt-cli": "^1.2.0",
|
||||
"grunt-contrib-watch": "^1.0.0",
|
||||
"grunt-execute": "^0.2.2",
|
||||
"grunt-shell": "^2.1.0",
|
||||
"load-grunt-tasks": "^3.5.2",
|
||||
"grunt": "1.0.1",
|
||||
"grunt-babel": "6.0.0",
|
||||
"grunt-bg-shell": "^2.3.3",
|
||||
"grunt-cli": "1.2.0",
|
||||
"grunt-contrib-watch": "1.0.0",
|
||||
"grunt-execute": "0.2.2",
|
||||
"load-grunt-tasks": "3.5.2",
|
||||
"mocha": "3.2.0",
|
||||
"nyc": "10.1.2",
|
||||
"reload": "^1.1.1"
|
||||
"reload": "1.1.1"
|
||||
}
|
||||
}
|
||||
|
||||
@ -16,5 +16,8 @@ process.argv.forEach(argument => {
|
||||
case 'kill':
|
||||
Server.kill();
|
||||
break;
|
||||
case 'wait':
|
||||
setTimeout(() => console.log('waiting'), 5000);
|
||||
break;
|
||||
}
|
||||
});
|
||||
|
||||
@ -4,8 +4,6 @@ const request = require('request-promise');
|
||||
const Config = require('./Config');
|
||||
const Util = require('./Util');
|
||||
const person = require('../person.js');
|
||||
const http = require('http');
|
||||
const reload = require('reload');
|
||||
|
||||
let app, resumes;
|
||||
const Server = {
|
||||
@ -71,10 +69,6 @@ const Server = {
|
||||
Server.setRoute('/' + resume, resume + '/index');
|
||||
}
|
||||
},
|
||||
autoReload: function() {
|
||||
const server = http.createServer(app);
|
||||
reload(server, app);
|
||||
},
|
||||
/**
|
||||
* run server
|
||||
* @return {Promise} resolves when server is running
|
||||
@ -87,7 +81,6 @@ const Server = {
|
||||
Server.setKillRoute();
|
||||
Server.kill();
|
||||
await Util.setTimeout(500);
|
||||
Server.autoReload();
|
||||
Server.start();
|
||||
}
|
||||
};
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user