From 3e4eb9166861b74c135c867c8047e90233f6cfea Mon Sep 17 00:00:00 2001 From: Pablo Vazquez Date: Thu, 6 Sep 2018 15:42:37 +0200 Subject: [PATCH] Gulp: fix broken path in Sass And when defining gulp-uglify-es needs '.default' at the end. --- gulpfile.js | 6 +++--- src/styles/plugins/js_select2.sass | 3 +++ src/styles/plugins/pikaday.sass | 3 +++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 6a40d8d..3a421d9 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,18 +1,18 @@ var argv = require('minimist')(process.argv.slice(2)); var autoprefixer = require('gulp-autoprefixer'); +var cache = require('gulp-cached'); var chmod = require('gulp-chmod'); var concat = require('gulp-concat'); var git = require('gulp-git'); var gulp = require('gulp'); var gulpif = require('gulp-if'); -var pug = require('gulp-pug'); var livereload = require('gulp-livereload'); var plumber = require('gulp-plumber'); +var pug = require('gulp-pug'); var rename = require('gulp-rename'); var sass = require('gulp-sass'); var sourcemaps = require('gulp-sourcemaps'); -var uglify = require('gulp-uglify'); -var cache = require('gulp-cached'); +var uglify = require('gulp-uglify-es').default; var enabled = { uglify: argv.production, diff --git a/src/styles/plugins/js_select2.sass b/src/styles/plugins/js_select2.sass index 099ead6..f96a24c 100644 --- a/src/styles/plugins/js_select2.sass +++ b/src/styles/plugins/js_select2.sass @@ -1,3 +1,6 @@ +@import ../../../node_modules/bootstrap/scss/functions +@import ../../../node_modules/bootstrap/scss/variables +@import ../../../node_modules/bootstrap/scss/mixins @import ../../../../pillar/src/styles/_config .select2-container diff --git a/src/styles/plugins/pikaday.sass b/src/styles/plugins/pikaday.sass index c8a4385..f6182c9 100644 --- a/src/styles/plugins/pikaday.sass +++ b/src/styles/plugins/pikaday.sass @@ -1,3 +1,6 @@ +@import ../../../node_modules/bootstrap/scss/functions +@import ../../../node_modules/bootstrap/scss/variables +@import ../../../node_modules/bootstrap/scss/mixins @import ../../../../pillar/src/styles/_config @import ../../../../pillar/src/styles/_utils @charset "UTF-8"