From 52e5744f7d323aedc33dbc7245ae8d8cb3bf5f08 Mon Sep 17 00:00:00 2001 From: Sinan Yasar Date: Wed, 10 Dec 2014 22:53:15 -0800 Subject: [PATCH 1/4] build: rimraf changed with del --- gulpfile.coffee | 11 +++-------- package.json | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/gulpfile.coffee b/gulpfile.coffee index 389b9d48..58018762 100644 --- a/gulpfile.coffee +++ b/gulpfile.coffee @@ -8,13 +8,13 @@ uglify = require 'gulp-uglify' stylus = require 'gulp-stylus' concat = require 'gulp-concat' minifyCSS = require 'gulp-minify-css' -rimraf = require 'gulp-rimraf' fs = require 'fs' http = require 'http' argv = require('minimist') process.argv source = require 'vinyl-source-stream' gulpBuffer = require 'gulp-buffer' Promise = require 'bluebird' +del = Promise.promisify require 'del' exec = Promise.promisify (require 'child_process').exec ENTRY_PATH = argv.entryPath ? './src/entry.coffee' @@ -326,16 +326,11 @@ gulp.task 'live', -> useLiveReload = yes gulp.task 'run', -> karmaAction = 'run' -gulp.task 'clean', -> +gulp.task 'clean', -> del ['build'], force : yes - gulp.src ['build'], read : no - .pipe rimraf force : yes +gulp.task 'clean-play', -> del ['./playground/{css,js}'], force : yes -gulp.task 'clean-play', -> - - gulp.src ['playground/{css/js}'], read : no - .pipe rimraf force : yes # Use markdox to output markdown files for the API Documentation. diff --git a/package.json b/package.json index deced227..446f875a 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "gulp-uglify": "^1.0.1", "gulp-stylus": "1.3.0", "gulp-minify-css": "^0.3.8", - "gulp-rimraf": "^0.1.0", + "del": "^1.1.0", "gulp-util": "^3.0.1", "gulp-concat": "^2.4.0", "coffee-script": "^1.8.0", From bf67743bd798d700543125c80c75b78d61d89268 Mon Sep 17 00:00:00 2001 From: Sinan Yasar Date: Wed, 10 Dec 2014 22:53:49 -0800 Subject: [PATCH 2/4] build: wait clean to finish before starting compilers --- gulpfile.coffee | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gulpfile.coffee b/gulpfile.coffee index 58018762..e9a38a25 100644 --- a/gulpfile.coffee +++ b/gulpfile.coffee @@ -60,7 +60,7 @@ theme = checkParam argv.theme # Build Tasks -gulp.task 'styles', -> +gulp.task 'styles', ['clean'], -> if theme resetStyles = require './src/themes/reset.includes.coffee' @@ -76,7 +76,7 @@ gulp.task 'styles', -> .pipe gulp.dest "#{buildDir}/css" -gulp.task 'libs', -> +gulp.task 'libs', ['clean'], -> gulp.src LIBS # INVESTIGATE: this somehow breaks jQuery - SY @@ -94,7 +94,7 @@ gulp.task 'export', -> exec "cd ./src;sh exporter.sh > entry.coffee; cd .." -gulp.task 'coffee', ['export'], -> +gulp.task 'coffee', ['export', 'clean'], -> gulpBrowserify entries : ENTRY_PATH @@ -349,9 +349,9 @@ gulp.task 'markdox', -> # Aggregate Tasks -gulp.task 'compile', ['clean', 'styles', 'libs', 'coffee'] +gulp.task 'compile', ['styles', 'libs', 'coffee'] -defaultTasks = ['compile', 'clean', 'watch-styles', 'watch-coffee', 'watch-libs'] +defaultTasks = ['compile', 'watch-styles', 'watch-coffee', 'watch-libs'] if buildDocs buildDir = 'docs' From 98ef45217b93494d66bf6e1638d8becaf85188ec Mon Sep 17 00:00:00 2001 From: Sinan Yasar Date: Wed, 10 Dec 2014 22:54:05 -0800 Subject: [PATCH 3/4] npm: updated dependencies --- package.json | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index 446f875a..31ddb432 100644 --- a/package.json +++ b/package.json @@ -20,37 +20,37 @@ "author": "Koding, Inc. - Sinan Yasar", "license": "MIT", "dependencies": { - "gulp": "^3.8.8", + "gulp": "^3.8.10", "gulp-coffee": "^2.2.0", "vinyl-source-stream": "^1.0.0", "gulp-rename": "^1.2.0", - "gulp-uglify": "^1.0.1", - "gulp-stylus": "1.3.0", - "gulp-minify-css": "^0.3.8", + "gulp-uglify": "^1.0.2", + "gulp-stylus": "1.3.4", + "gulp-minify-css": "^0.3.11", "del": "^1.1.0", "gulp-util": "^3.0.1", - "gulp-concat": "^2.4.0", + "gulp-concat": "^2.4.2", "coffee-script": "^1.8.0", - "coffeeify": "~0.7.0", + "coffeeify": "~1.0.0", "minimist": "1.1.0", - "gulp-if": "1.2.4", + "gulp-if": "1.2.5", "gulp-buffer": "0.0.2", - "browserify": "^5.11.1", + "browserify": "^7.0.0", "jquery-mousewheel": "^3.1.12", "findit": "^2.0.0", - "bluebird": "^2.3.2" + "bluebird": "^2.3.11" }, "devDependencies": { - "chai": "^1.9.1", - "express": "^4.9.0", + "chai": "^1.10.0", + "express": "^4.10.4", "gulp-karma": "0.0.4", "gulp-livereload": "^2.1.1", - "gulp-markdox": "^0.1.0", - "karma-chrome-launcher": "^0.1.4", + "gulp-markdox": "^0.1.1", + "karma-chrome-launcher": "^0.1.7", "karma-firefox-launcher": "^0.1.3", - "karma-mocha": "^0.1.9", + "karma-mocha": "^0.1.10", "karma-sauce-launcher": "^0.2.10", - "mocha": "^1.21.4", - "sinon": "^1.10.3" + "mocha": "^2.0.1", + "sinon": "^1.12.1" } } From 1b28d6ef211a9ce128adff6825940a939928e538 Mon Sep 17 00:00:00 2001 From: Sinan Yasar Date: Wed, 10 Dec 2014 22:54:14 -0800 Subject: [PATCH 4/4] npm: bumped up version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 31ddb432..b2831d4b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "kdf", - "version": "0.1.9", + "version": "0.1.10", "description": "KD: a non-document focused UI Framework for web applications.", "main": "gulpfile.js", "scripts": {