diff --git a/.mocharc.json b/.mocharc.json index 84fb9a4..c8b1580 100644 --- a/.mocharc.json +++ b/.mocharc.json @@ -1,6 +1,6 @@ { "reporter": "spec", "ui": "bdd", - "require": "coffee-script/register", + "require": "coffeescript/register", "extension": ["coffee"] } diff --git a/gulpfile.coffee b/gulpfile.coffee index e8713f2..42a6e6d 100644 --- a/gulpfile.coffee +++ b/gulpfile.coffee @@ -3,10 +3,6 @@ peg = require 'gulp-peg' webpack = require 'gulp-webpack' rename = require 'gulp-rename' -gulp.task 'default', ['build'] - -gulp.task 'build', ['peg', 'webpack'] - gulp.task 'peg', -> gulp .src('src/tag-data.peg') @@ -19,3 +15,8 @@ gulp.task 'webpack', -> .src('src/index.js') .pipe(webpack(require('./webpack.config'))) .pipe(gulp.dest('./')) + +# webpack bundles dist/parser.js, so peg has to finish first +gulp.task 'build', gulp.series('peg', 'webpack') + +gulp.task 'default', gulp.series('build') diff --git a/package.json b/package.json index b28c92f..1832d84 100644 --- a/package.json +++ b/package.json @@ -19,9 +19,9 @@ }, "devDependencies": { "chai": "^6.3.0", - "coffee-script": "^1.9.0", + "coffeescript": "^2.7.0", "exports-loader": "^0.6.2", - "gulp": "^3.8.11", + "gulp": "^5.0.1", "gulp-peg": "^0.1.2", "gulp-rename": "^2.1.0", "gulp-webpack": "^1.3.0",