martin/nci
1
0
Fork 0
mirror of https://gitlab.silvrtree.co.uk/martind2000/nci.git synced 2025-03-12 19:30:01 +00:00
Code Issues Projects Releases Wiki Activity

fix issue with undefined _, add parallelshell for safe script execution and chokidar for watch less

Browse Source
This commit is contained in:
Vladimir Polyakov 2015-12-22 21:40:51 +03:00
parent 88f9a77786
commit 3dea62a46b
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/components/builds/view/index.jade
View File

@ -69,7 +69,7 @@ mixin statusBadge(build)
DateTime(value=this.state.build.createDate) DateTime(value=this.state.build.createDate)
if this.state.build.endDate if this.state.build.endDate
- var durationTitle = _(this.state.build.stepTimings).map(function(stepTiming) { - var durationTitle = this.state.build.stepTimings.map(function(stepTiming) {
- return stepTiming.name + ': ' + (stepTiming.duration / 1000).toFixed(1) + ' sec'; - return stepTiming.name + ': ' + (stepTiming.duration / 1000).toFixed(1) + ' sec';
- }).join('\n'); - }).join('\n');
| , finished | , finished

1
app/styles/index.less
View File

@ -24,4 +24,3 @@
@import "./components/builds.less"; @import "./components/builds.less";
@import "./components/projects.less"; @import "./components/projects.less";
@import "./components/terminal.less"; @import "./components/terminal.less";

6
package.json
View File

@ -10,10 +10,10 @@
"test": "npm run makeTestRepos && mocha --bail --reporter=spec --timeout 4000", "test": "npm run makeTestRepos && mocha --bail --reporter=spec --timeout 4000",
"build-less": "lessc app/styles/index.less > static/css/index.css", "build-less": "lessc app/styles/index.less > static/css/index.css",
"build-js": "browserify app/app.js -t ./transforms/jade.js | uglifyjs -mc > static/js/app.build.js", "build-js": "browserify app/app.js -t ./transforms/jade.js | uglifyjs -mc > static/js/app.build.js",
"watch-less": "nodemon --ext less --watch app/styles --exec 'npm run build-less'", "watch-less": "chokidar --initial --silent app/styles/**/*.less app/styles/index.less -c 'npm run build-less'",
"watch-js": "watchify app/app.js -t ./transforms/jade.js -o static/js/app.build.js -dv", "watch-js": "watchify app/app.js -t ./transforms/jade.js -o static/js/app.build.js -dv",
"watch-server": "nodemon --ignore app --ignore static --ignore node_modules --ignore data app.js", "watch-server": "nodemon --ignore app --ignore static --ignore node_modules --ignore data app.js",
"dev": "npm run build-fonts && npm run watch-less & npm run watch-js & npm run watch-server", "dev": "parallelshell 'npm run build-fonts' 'npm run watch-less' 'npm run watch-js' 'npm run watch-server'",
"sync": "npm install && npm prune", "sync": "npm install && npm prune",
"build-fonts": "cp ./node_modules/bootstrap/fonts/* ./static/fonts/ & cp ./node_modules/font-awesome/fonts/* ./static/fonts/", "build-fonts": "cp ./node_modules/bootstrap/fonts/* ./static/fonts/ & cp ./node_modules/font-awesome/fonts/* ./static/fonts/",
"build-clean": "rm static/index.html", "build-clean": "rm static/index.html",
@ -70,6 +70,7 @@
"underscore": "1.8.3" "underscore": "1.8.3"
}, },
"devDependencies": { "devDependencies": {
"chokidar-cli": "^1.2.0",
"expect.js": "0.3.1", "expect.js": "0.3.1",
"jade": "1.11.0", "jade": "1.11.0",
"jshint": "^2.9.1-rc1", "jshint": "^2.9.1-rc1",
@ -79,6 +80,7 @@
"nci-yaml-reader": "0.1.0", "nci-yaml-reader": "0.1.0",
"nodemon": "1.3.7", "nodemon": "1.3.7",
"nrun": "0.1.4", "nrun": "0.1.4",
"parallelshell": "^2.0.0",
"sinon": "1.14.1", "sinon": "1.14.1",
"uglifyjs": "^2.4.10", "uglifyjs": "^2.4.10",
"watchify": "^3.6.1" "watchify": "^3.6.1"