changeset c8a12d87e511 in www.tryton.org:default details: https://hg.tryton.org/www.tryton.org?cmd=changeset&node=c8a12d87e511 description: Update gulp-sass and use dart sass compiler
issue10698 review358741003 diffstat: gulpfile.js | 3 ++- package.json | 3 ++- sass/bootstrap/_override.scss | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diffs (60 lines): diff -r 9dc15d2f2407 -r c8a12d87e511 gulpfile.js --- a/gulpfile.js Tue Jan 18 16:27:30 2022 +0000 +++ b/gulpfile.js Tue Jan 18 16:31:30 2022 +0000 @@ -1,7 +1,7 @@ var gulp = require('gulp'); var uglify = require('gulp-uglify'); var concat = require('gulp-concat'); -var sass = require('gulp-sass'); +var sass = require('gulp-sass')(require('sass')); var sassPackageImporter = require('node-sass-package-importer'); var autoprefixer = require('gulp-autoprefixer'); var cleanCSS = require('gulp-clean-css'); @@ -48,6 +48,7 @@ .pipe(sass({ importer: sassPackageImporter(), outputStyle: 'compressed', + quietDeps: true, }).on('error', sass.logError)) .pipe(autoprefixer()) .pipe(cleanCSS()) diff -r 9dc15d2f2407 -r c8a12d87e511 package.json --- a/package.json Tue Jan 18 16:27:30 2022 +0000 +++ b/package.json Tue Jan 18 16:31:30 2022 +0000 @@ -13,7 +13,7 @@ "gulp-iconfont": "^11.0.1", "gulp-iconfont-css": "^3.0.0", "gulp-rename": "^2.0.0", - "gulp-sass": "^4.1.0", + "gulp-sass": "^5.1.0", "gulp-sourcemaps": "^3.0.0", "gulp-touch-fd": "^2.0.0", "gulp-uglify": "^3.0.2", @@ -25,6 +25,7 @@ "popper.js": "^1.16.1" }, "devDependencies": { + "sass": "^1.48.0", "sass-lint": "^1.13.1" } } diff -r 9dc15d2f2407 -r c8a12d87e511 sass/bootstrap/_override.scss --- a/sass/bootstrap/_override.scss Tue Jan 18 16:27:30 2022 +0000 +++ b/sass/bootstrap/_override.scss Tue Jan 18 16:31:30 2022 +0000 @@ -1,6 +1,7 @@ // OVERRIDE BOOTSTRAP // @Override Bootstrap variables // See "bootstrap/scss/_variables.scss" +@use "sass:math"; // COLORS $primary: $tryton-color-primary; @@ -52,7 +53,7 @@ // SPACERS $spacers: ( 'gutter': $grid-gutter-width, - 'gutter-half': $grid-gutter-width / 2, + 'gutter-half': math.div($grid-gutter-width, 2), ); // CONTAINER