Skip to content

Commit

Permalink
Merge branch 'lab-01-project-setup-solved' into lab-02-first-componen…
Browse files Browse the repository at this point in the history
…t-start
  • Loading branch information
mrkelly committed Mar 19, 2015
2 parents 79e5fa6 + 4da0845 commit 5d69209
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,12 @@ gulp.task('prod', ['core', 'jade:prod', 'uglify']);
gulp.task('init', ['build:css']);

// server tasks
gulp.task('serve:dev', shell.task([pkg.scripts.run_dev]));
// gulp.task('serve:dev', function () {
// nodemon({
// script: './api/server.js',
// env: {'NODE_ENV': 'development'}
// });
// });
gulp.task('serve:dev', function () {
nodemon({
script: './api/server.js',
env: {'NODE_ENV': 'development'}
});
});

gulp.task('serve:prod', function () {
nodemon({
Expand Down

0 comments on commit 5d69209

Please sign in to comment.