Page MenuHomeDevCentral
Files F7636707

D2558.diff
No OneTemporary
Actions

D2558.diff
View Options

diff --git a/gulpfile.babel.js b/gulpfile.babel.js
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -14,6 +14,8 @@
import uncss from 'uncss';
import autoprefixer from 'autoprefixer';
+var sass = require('gulp-sass')(require('node-sass'));
+
// Load all Gulp plugins into one variable
const $ = plugins();
@@ -31,7 +33,7 @@
// Build the "dist" folder by running all of the below tasks
// Sass must be run later so UnCSS can search for used classes in the others assets.
gulp.task('build',
- gulp.series(clean, gulp.parallel(pages, javascript, images, copy), sass));
+ gulp.series(clean, gulp.parallel(pages, javascript, images, copy), compileSass));
// Build the site, run the server, and watch for file changes
gulp.task('default',
@@ -71,7 +73,7 @@
// Compile Sass into CSS
// In production, the CSS is compressed
-function sass() {
+function compileSass() {
const postCssPlugins = [
// Autoprefixer
@@ -83,10 +85,10 @@
return gulp.src('src/assets/scss/app.scss')
.pipe($.sourcemaps.init())
- .pipe($.sass({
+ .pipe(sass({
includePaths: PATHS.sass
})
- .on('error', $.sass.logError))
+ .on('error', sass.logError))
.pipe($.postcss(postCssPlugins))
.pipe($.if(PRODUCTION, $.cleanCss({ compatibility: 'ie9' })))
.pipe($.if(!PRODUCTION, $.sourcemaps.write()))
@@ -157,7 +159,7 @@
gulp.watch('src/{layouts,partials}/**/*.html').on('all', gulp.series(resetPages, pages, browser.reload));
gulp.watch('src/data/**/*.{js,json,yml}').on('all', gulp.series(resetPages, pages, browser.reload));
gulp.watch('src/helpers/**/*.js').on('all', gulp.series(resetPages, pages, browser.reload));
- gulp.watch('src/assets/scss/**/*.scss').on('all', sass);
+ gulp.watch('src/assets/scss/**/*.scss').on('all', compileSass);
gulp.watch('src/assets/js/**/*.js').on('all', gulp.series(javascript, browser.reload));
gulp.watch('src/assets/img/**/*').on('all', gulp.series(images, browser.reload));
}
diff --git a/package.json b/package.json
--- a/package.json
+++ b/package.json
@@ -32,12 +32,13 @@
"gulp-imagemin": "^4.1.0",
"gulp-load-plugins": "^1.1.0",
"gulp-postcss": "^8.0.0",
- "gulp-sass": "^4.0.1",
+ "gulp-sass": "^5.1.0",
"gulp-sourcemaps": "^2.6.4",
"gulp-uglify": "^3.0.1",
"js-yaml": "^3.4.6",
"panini": "^1.3.0",
"rimraf": "^2.4.3",
+ "node-sass": "^7.0.1",
"style-sherpa": "^1.0.0",
"uncss": "^0.16.2",
"vinyl-named": "^1.1.0",

File Metadata

Mime Type
text/plain
Expires
Thu, May 1, 04:02 (17 h, 27 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2620482
Default Alt Text
D2558.diff (2 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator