diff options
Diffstat (limited to 'gulpfile.js')
| -rw-r--r-- | gulpfile.js | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/gulpfile.js b/gulpfile.js index a76c4bd..855e2a9 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -10,7 +10,7 @@ var minifyjs = require('gulp-minify'), notify = require('gulp-notify'), pug = require('gulp-pug-3'), - sass = require('gulp-sass-next'); + sass = require('gulp-sass')(require('sass')); var config = { jsPath: './resources/js', @@ -22,11 +22,12 @@ var config = { function css() { return gulp.src(config.sassPath + '/style.scss') .pipe(sass({ - outputStyle: 'compressed', - includePaths: [ + style: 'compressed', + loadPaths: [ './resources/sass', './node_modules' - ] + ], + quietDeps: true }) .on('error', notify.onError(function (error) { return "Error: " + error.message; @@ -84,10 +85,7 @@ function html() { function js() { var src = [ - './node_modules/bootstrap-sass/assets/javascripts/bootstrap/collapse.js', - './node_modules/bootstrap-sass/assets/javascripts/bootstrap/scrollspy.js', - './node_modules/bootstrap-sass/assets/javascripts/bootstrap/transition.js', - './node_modules/jquery/dist/jquery.slim.min.js', + './node_modules/bootstrap/dist/js/bootstrap.min.js', ]; var dst = './build/assets/js'; |