@@ -76,25 +76,27 @@ var banner = {
7676
7777// General
7878var { gulp, src, dest, watch, series, parallel} = require ( 'gulp' ) ;
79- var del = require ( 'del' ) ;
80- var flatmap = require ( 'gulp-flatmap' ) ;
81- var lazypipe = require ( 'lazypipe' ) ;
82- var rename = require ( 'gulp-rename' ) ;
83- var header = require ( 'gulp-header' ) ;
84- var package = require ( './package.json' ) ;
79+
80+ var del = require ( 'del' ) ,
81+ flatmap = require ( 'gulp-flatmap' ) ,
82+ lazypipe = require ( 'lazypipe' ) ,
83+ rename = require ( 'gulp-rename' ) ,
84+ header = require ( 'gulp-header' ) ,
85+ package = require ( './package.json' ) ;
8586
8687// Scripts
87- var jshint = require ( 'gulp-jshint' ) ;
88- var stylish = require ( 'jshint-stylish' ) ;
89- var concat = require ( 'gulp-concat' ) ;
90- var uglify = require ( 'gulp-terser' ) ;
91- var optimizejs = require ( 'gulp-optimize-js' ) ;
88+ var jshint = require ( 'gulp-jshint' ) ,
89+ stylish = require ( 'jshint-stylish' ) ,
90+ concat = require ( 'gulp-concat' ) ,
91+ uglify = require ( 'gulp-terser' ) ,
92+ optimizejs = require ( 'gulp-optimize-js' ) ;
9293
9394// Styles
94- var sass = require ( 'gulp-sass' ) ;
95- var sourcemaps = require ( 'gulp-sourcemaps' ) ;
96- var prefix = require ( 'gulp-autoprefixer' ) ;
97- var minify = require ( 'gulp-cssnano' ) ;
95+ var sass = require ( 'gulp-sass' ) ,
96+ sassGlob = require ( 'gulp-sass-glob' ) ,
97+ sourcemaps = require ( 'gulp-sourcemaps' ) ,
98+ prefix = require ( 'gulp-autoprefixer' ) ,
99+ minify = require ( 'gulp-cssnano' ) ;
98100
99101// Templates
100102var twig = require ( 'gulp-twig' ) ,
@@ -148,8 +150,8 @@ var cleanDist = function (done) {
148150var jsTasks = lazypipe ( )
149151 . pipe ( header , banner . full , { package : package } )
150152 . pipe ( optimizejs )
151- . pipe ( dest , paths . scripts . output )
152- . pipe ( rename , { suffix : '.min' } )
153+ // .pipe(dest, paths.scripts.output)
154+ // .pipe(rename, {suffix: '.min'})
153155 . pipe ( uglify )
154156 . pipe ( optimizejs )
155157 . pipe ( header , banner . min , { package : package } )
@@ -223,6 +225,7 @@ var buildStyles = function (done) {
223225 // Run tasks on all Sass files
224226 return src ( paths . styles . input )
225227 . pipe ( sourcemaps . init ( ) )
228+ . pipe ( sassGlob ( ) )
226229 . pipe ( sass ( {
227230 includePaths : require ( 'node-normalize-scss' ) . includePaths ,
228231 outputStyle : 'expanded' ,
@@ -234,15 +237,16 @@ var buildStyles = function (done) {
234237 remove : true
235238 } ) )
236239 . pipe ( header ( banner . full , { package : package } ) )
237- . pipe ( sourcemaps . write ( ) )
238- . pipe ( dest ( paths . styles . output ) )
239- . pipe ( rename ( { suffix : '.min' } ) )
240+ // .pipe(sourcemaps.write('./maps' ))
241+ // .pipe(dest(paths.styles.output))
242+ // .pipe(rename({suffix: '.min'}))
240243 . pipe ( minify ( {
241244 discardComments : {
242245 removeAll : true
243246 }
244247 } ) )
245248 . pipe ( header ( banner . min , { package : package } ) )
249+ . pipe ( sourcemaps . write ( '.' ) )
246250 . pipe ( dest ( paths . styles . output ) ) ;
247251
248252} ;
0 commit comments