Skip to content

Commit

Permalink
migrate from deprecated node-sass, update sass tooling (ampproject#5635)
Browse files Browse the repository at this point in the history
  • Loading branch information
patrickkettner authored Apr 6, 2021
1 parent a75bca4 commit dc90eea
Show file tree
Hide file tree
Showing 5 changed files with 286 additions and 586 deletions.
2 changes: 1 addition & 1 deletion boilerplate/lib/templates.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const Handlebars = require('handlebars');
const io = require('./io');
const path = require('path');
const hljs = require('highlight.js');
const sass = require('node-sass');
const sass = require('sass');

const FRONTEND_DIR = '../../frontend/scss';
const TEMPLATES_DIR = '../templates';
Expand Down
6 changes: 3 additions & 3 deletions gulpfile.js/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const git = require('@lib/utils/git');
const ComponentReferenceImporter = require('@lib/pipeline/componentReferenceImporter');
const SpecImporter = require('@lib/pipeline/specImporter');
const RecentGuides = require('@lib/pipeline/recentGuides');
const gulpSass = require('gulp-sass');
const gulpSass = require('@mr-hope/gulp-sass');
const importRoadmap = require('./import/importRoadmap.js');
const importWorkingGroups = require('./import/importWorkingGroups.js');
const importAdVendorList = require('./import/importAdVendorList.js');
Expand Down Expand Up @@ -97,12 +97,12 @@ function clean() {
function sass() {
const options = {
'outputStyle': 'compressed',
'includePaths': project.paths.SCSS,
'includePaths': [project.paths.SCSS],
};

return gulp
.src(`${project.paths.SCSS}/**/[^_]*.scss`)
.pipe(gulpSass(options))
.pipe(gulpSass.sassSync(options))
.on('error', function (e) {
console.error(e);
// eslint-disable-next-line no-invalid-this
Expand Down
Loading

0 comments on commit dc90eea

Please sign in to comment.