diff --git a/html/dir.txt b/html/dir.txt new file mode 100644 index 0000000..e69de29 diff --git a/package.json b/package.json index 3e2da31..d0c2d12 100644 --- a/package.json +++ b/package.json @@ -42,6 +42,7 @@ "handlebars": "^3.0.0", "hbsfy": "^2.2.1", "vinyl-buffer": "^1.0.0", - "vinyl-source-stream": "^1.1.0" + "vinyl-source-stream": "^1.1.0", + "merge-stream": "0.1.7" } } diff --git a/run/tasks/build/gulp.js b/run/tasks/build/gulp.js index 9ed2d23..adb46c5 100644 --- a/run/tasks/build/gulp.js +++ b/run/tasks/build/gulp.js @@ -11,9 +11,15 @@ var gulp = require('gulp'), args = require('yargs').argv, - globalSettings = require('../../_global'); + globalSettings = require('../../_global'), + mergeStream = require('merge-stream'); gulp.task('build', ['styles', 'scripts'], function() { - return gulp.src(['./fonts/**/*', './img/**/*'], { base: './' }) - .pipe(gulp.dest(globalSettings.destPath)); -}); \ No newline at end of file + var htmlStream = gulp.src(['./html/**/*.html']) + .pipe(gulp.dest(globalSettings.destPath)); + + var assetStream = gulp.src(['./fonts/**/!(dir.txt)', './img/**/!(dir.txt)'], { base: './' }) + .pipe(gulp.dest(globalSettings.destPath)); + + return mergeStream(htmlStream, assetStream); +});