ilia/resume
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UPDATE grunt tasks

Browse Source
This commit is contained in:
unpregnant 2017-02-22 22:50:50 +01:00
parent e6519983ff
commit 2a30bc3c5e
5 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Gruntfile.js
View File

@ -13,12 +13,27 @@ module.exports = function(grunt) {
} }
}, },
execute: { execute: {
target: { less: {
options: { options: {
nodeargs: ['--harmony-async-await'], nodeargs: ['--harmony-async-await'],
args: ['less'] args: ['less']
}, },
src: ['src/app.js'] 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: { watch: {
@ -29,7 +44,7 @@ module.exports = function(grunt) {
'resumes/**/*.less', 'resumes/**/*.less',
'less/**/*.less' 'less/**/*.less'
], ],
tasks: ['execute', 'babel'], tasks: ['execute', 'babel', 'bgShell:express'],
options: { options: {
nospawn: false, nospawn: false,
livereload: true 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
View File

19
package.json
View File

@ -21,7 +21,7 @@
], ],
"scripts": { "scripts": {
"server": "node --harmony-async-await src/app.js server", "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\"", "pdf": "concurrently \"npm run server\" \"grunt --gruntfile GruntfilePdf.js --verbose\"",
"lint": "eslint src/", "lint": "eslint src/",
"test": "nyc mocha --harmony-async-await \"test/*.js\"", "test": "nyc mocha --harmony-async-await \"test/*.js\"",
@ -64,17 +64,16 @@
"write": "0.3.2" "write": "0.3.2"
}, },
"devDependencies": { "devDependencies": {
"concurrently": "^3.3.0",
"eslint": "3.15.0", "eslint": "3.15.0",
"grunt": "^1.0.1", "grunt": "1.0.1",
"grunt-babel": "^6.0.0", "grunt-babel": "6.0.0",
"grunt-cli": "^1.2.0", "grunt-bg-shell": "^2.3.3",
"grunt-contrib-watch": "^1.0.0", "grunt-cli": "1.2.0",
"grunt-execute": "^0.2.2", "grunt-contrib-watch": "1.0.0",
"grunt-shell": "^2.1.0", "grunt-execute": "0.2.2",
"load-grunt-tasks": "^3.5.2", "load-grunt-tasks": "3.5.2",
"mocha": "3.2.0", "mocha": "3.2.0",
"nyc": "10.1.2", "nyc": "10.1.2",
"reload": "^1.1.1" "reload": "1.1.1"
} }
} }

3
src/app.js
View File

@ -16,5 +16,8 @@ process.argv.forEach(argument => {
case 'kill': case 'kill':
Server.kill(); Server.kill();
break; break;
case 'wait':
setTimeout(() => console.log('waiting'), 5000);
break;
} }
}); });

7
src/node/Server.js
View File

@ -4,8 +4,6 @@ const request = require('request-promise');
const Config = require('./Config'); const Config = require('./Config');
const Util = require('./Util'); const Util = require('./Util');
const person = require('../person.js'); const person = require('../person.js');
const http = require('http');
const reload = require('reload');
let app, resumes; let app, resumes;
const Server = { const Server = {
@ -71,10 +69,6 @@ const Server = {
Server.setRoute('/' + resume, resume + '/index'); Server.setRoute('/' + resume, resume + '/index');
} }
}, },
autoReload: function() {
const server = http.createServer(app);
reload(server, app);
},
/** /**
* run server * run server
* @return {Promise} resolves when server is running * @return {Promise} resolves when server is running
@ -87,7 +81,6 @@ const Server = {
Server.setKillRoute(); Server.setKillRoute();
Server.kill(); Server.kill();
await Util.setTimeout(500); await Util.setTimeout(500);
Server.autoReload();
Server.start(); Server.start();
} }
}; };