better fix for #36

// @gauntface
master
Sindre Sorhus 2014-06-06 14:01:17 +02:00
parent 94dd46090e
commit 45b5bcb3c4
1 changed files with 16 additions and 20 deletions

View File

@ -10,24 +10,20 @@ var $ = require('gulp-load-plugins')();
// hosted URL for your page
var hostedUrl = 'https://example.com';
// The __dirname allows us to run gulp from within a subdirectory
var paths = {
app: __dirname + '/app',
dist: __dirname + '/dist',
tmp: __dirname + '/.tmp'
};
// enable use of relative paths even though gulp is run in sub-directories
process.chdir(__dirname);
gulp.task('styles', function () {
return gulp.src(paths.app+'/styles/sass/styles.scss')
return gulp.src('app/styles/sass/styles.scss')
.pipe($.rubySass({style: 'expanded', precision: 10}))
.pipe($.autoprefixer('last 1 version'))
.pipe(gulp.dest(paths.dist+'/styles'))
.pipe(gulp.dest('dist/styles'))
.pipe(reload({stream: true}))
.pipe($.size());
});
gulp.task('jshint', function () {
return gulp.src(paths.app+'/scripts/**/*.js')
return gulp.src('app/scripts/**/*.js')
.pipe($.jshint())
.pipe($.jshint.reporter('jshint-stylish'))
.pipe($.jshint.reporter('fail'))
@ -39,7 +35,7 @@ gulp.task('html', ['styles'], function () {
var jsFilter = $.filter('**/*.js');
var cssFilter = $.filter('**/*.css');
return gulp.src(paths.app+'/**/*.html')
return gulp.src('app/**/*.html')
.pipe($.useref.assets())
.pipe(jsFilter)
.pipe($.uglify())
@ -49,17 +45,17 @@ gulp.task('html', ['styles'], function () {
.pipe(cssFilter.restore())
.pipe($.useref.restore())
.pipe($.useref())
.pipe(gulp.dest(paths.dist))
.pipe(gulp.dest('dist'))
.pipe($.size());
});
gulp.task('images', function () {
return gulp.src(paths.app+'/images/**/*')
return gulp.src('app/images/**/*')
.pipe($.cache($.imagemin({
progressive: true,
interlaced: true
})))
.pipe(gulp.dest(paths.dist+'/images'))
.pipe(gulp.dest('dist/images'))
.pipe(reload({stream: true, once: true}))
.pipe($.size());
});
@ -67,7 +63,7 @@ gulp.task('images', function () {
gulp.task('fonts', function () {
return gulp.src('**/*.{eot,svg,ttf,woff}')
.pipe($.flatten())
.pipe(gulp.dest(paths.dist+'/images/icons'))
.pipe(gulp.dest('dist/images/icons'))
.pipe($.size());
});
@ -76,7 +72,7 @@ gulp.task('pagespeed', function () {
});
gulp.task('clean', function () {
return gulp.src([paths.tmp, paths.dist], {read: false}).pipe($.clean());
return gulp.src(['.tmp', 'dist'], {read: false}).pipe($.clean());
});
gulp.task('build', ['jshint', 'html', 'images', 'fonts']);
@ -88,14 +84,14 @@ gulp.task('default', ['clean'], function (cb) {
gulp.task('serve', ['styles'], function () {
browserSync.init(null, {
server: {
baseDir: [paths.app, paths.tmp]
baseDir: ['app', '.tmp']
},
});
});
gulp.task('watch', ['serve'], function () {
gulp.watch(['*.html'], reload);
gulp.watch(['styles/**/*.scss','styles/**/*.css'], ['styles']);
gulp.watch('scripts/**/*.js', ['jshint']);
gulp.watch('images/**/*', ['images']);
gulp.watch(['app/*.html'], reload);
gulp.watch(['app/styles/**/*.scss', 'app/styles/**/*.css'], ['styles']);
gulp.watch('app/scripts/**/*.js', ['jshint']);
gulp.watch('app/images/**/*', ['images']);
});