Skip to content

Commit 58b94a3

Browse files
committed
build: switch to dart-sass
* Switches to dart-sass in order to be consistent with the Bazel output. That way we can identify potential issues with the SASS output (e.g. demo-app) before we at some point make the full-switch. * Also speeds-up the project installs because libsass bindings are no longer needed (trade-off with compilation time though; but pretty minimal due to our amount of Sass files)
1 parent 6aa1a55 commit 58b94a3

File tree

3 files changed

+102
-24
lines changed

3 files changed

+102
-24
lines changed

package-lock.json

Lines changed: 98 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,14 @@
8484
"gulp-cli": "^1.3.0",
8585
"gulp-connect": "^5.0.0",
8686
"gulp-conventional-changelog": "^1.1.3",
87+
"gulp-dart-sass": "^0.9.0",
8788
"gulp-dom": "^0.9.17",
8889
"gulp-flatten": "^0.3.1",
8990
"gulp-highlight-files": "^0.0.5",
9091
"gulp-htmlmin": "^3.0.0",
9192
"gulp-if": "^2.0.2",
9293
"gulp-markdown": "^1.2.0",
9394
"gulp-rename": "^1.2.2",
94-
"gulp-sass": "^3.1.0",
9595
"gulp-transform": "^2.0.0",
9696
"gulp-util": "^3.0.8",
9797
"hammerjs": "^2.0.8",
@@ -111,7 +111,6 @@
111111
"minimatch": "^3.0.4",
112112
"minimist": "^1.2.0",
113113
"moment": "^2.18.1",
114-
"node-sass": "^4.5.3",
115114
"parse5": "^5.0.0",
116115
"protractor": "^5.2.0",
117116
"request": "^2.83.0",
@@ -120,6 +119,7 @@
120119
"rollup-plugin-alias": "^1.4.0",
121120
"rollup-plugin-node-resolve": "^3.0.3",
122121
"run-sequence": "^1.2.2",
122+
"sass": "^1.10.1",
123123
"scss-bundle": "^2.0.1-beta.7",
124124
"selenium-webdriver": "^3.6.0",
125125
"sorcery": "^0.10.0",

tools/package-tools/gulp/build-scss-task.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ import {src, dest} from 'gulp';
22
import {join} from 'path';
33

44
// These imports lack of type definitions.
5-
const gulpSass = require('gulp-sass');
5+
const gulpDartSass = require('gulp-dart-sass');
66
const gulpIf = require('gulp-if');
77
const gulpCleanCss = require('gulp-clean-css');
88

99
/** Create a gulp task that builds SCSS files. */
1010
export function buildScssTask(outputDir: string, sourceDir: string, minifyOutput = false) {
1111
return () => {
1212
return src(join(sourceDir, '**/*.scss'))
13-
.pipe(gulpSass().on('error', gulpSass.logError))
13+
.pipe(gulpDartSass.sync().on('error', gulpDartSass.logError))
1414
.pipe(gulpIf(minifyOutput, gulpCleanCss()))
1515
.pipe(dest(outputDir));
1616
};

0 commit comments

Comments
 (0)