diff --git a/gulpfile.coffee b/gulpfile.coffee index f866da0..31a70a6 100644 --- a/gulpfile.coffee +++ b/gulpfile.coffee @@ -43,8 +43,9 @@ gulp.task 'scripts', -> bundle = browserify entries: [paths.scripts.source] extensions: ['.coffee'] + debug: not production - build = bundle.bundle(debug: not production) + build = bundle.bundle() .on 'error', handleError .pipe source paths.scripts.filename @@ -88,19 +89,23 @@ gulp.task 'server', -> .createServer ecstatic root: __dirname + '/public' .listen 9001 -gulp.task "watch", -> +gulp.task 'watch', -> livereload.listen() gulp.watch paths.templates.watch, ['templates'] gulp.watch paths.styles.watch, ['styles'] gulp.watch paths.assets.watch, ['assets'] - bundle = watchify + bundle = watchify browserify entries: [paths.scripts.source] extensions: ['.coffee'] + debug: not production + cache: {} + packageCache: {} + fullPaths: true bundle.on 'update', -> - build = bundle.bundle(debug: not production) + build = bundle.bundle() .on 'error', handleError .pipe source paths.scripts.filename @@ -111,5 +116,8 @@ gulp.task "watch", -> .emit 'update' -gulp.task "build", ['scripts', 'templates', 'styles', 'assets'] -gulp.task "default", ["build", "watch", "server"] +gulp.task 'no-js', ['templates', 'styles', 'assets'] +gulp.task 'build', ['scripts', 'no-js'] +# scripts and watch conflict and will produce invalid js upon first run +# which is why the no-js task exists. +gulp.task 'default', ['no-js', 'watch', 'server'] diff --git a/package.json b/package.json index 92d1edb..9c98301 100644 --- a/package.json +++ b/package.json @@ -16,31 +16,31 @@ "template" ], "dependencies": { - "coffee-script": "~1.7.1" + "coffee-script": "~1.8.0" }, "devDependencies": { "bower": "~1.3.5", - "browserify": "~4.1.11", + "browserify": "~6.1.0", "browserify-shim": "~3.8.0", "coffeeify": "~0.7.0", "deamdify": "^0.1.1", - "debowerify": "~0.8.2", + "debowerify": "~0.9.1", "ecstatic": "~0.5.3", "gulp": "~3.8.1", - "gulp-autoprefixer": "0.0.7", - "gulp-jade": "~0.6.0", + "gulp-autoprefixer": "1.0.1", + "gulp-jade": "~0.9.0", "gulp-livereload": "~2.1.0", "gulp-minify-css": "~0.3.5", "gulp-streamify": "0.0.5", "gulp-stylus": "1.3.3", - "gulp-uglify": "~0.1.0", - "gulp-util": "~2.2.17", + "gulp-uglify": "~1.0.1", + "gulp-util": "~3.0.1", "karma": "~0.12.21", "karma-chrome-launcher": "~0.1.4", "karma-coffee-preprocessor": "~0.2.1", - "karma-jasmine": "~0.1.5", - "vinyl-source-stream": "~0.1.1", - "watchify": "~0.10.2" + "karma-jasmine": "~0.2.2", + "vinyl-source-stream": "~1.0.0", + "watchify": "~2.0.0" }, "browser": {}, "browserify-shim": {},