Skip to content
This repository was archived by the owner on Sep 5, 2024. It is now read-only.

Commit b8e60b9

Browse files
committed
chore(sass): migrate from node-sass to sass
Fixes #12114
1 parent 441a912 commit b8e60b9

File tree

7 files changed

+72
-1149
lines changed

7 files changed

+72
-1149
lines changed

.circleci/config.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,14 @@ var_5: &save_cache
3939
var_6: &npm_install
4040
run: npm ci
4141

42-
var_7: &rebuild_node_sass
43-
run: npm rebuild node-sass
44-
45-
var_8: &store_junit_test_results
42+
var_7: &store_junit_test_results
4643
store_test_results:
4744
path: ./artifacts/junit
4845

4946
# Branch filter that we can specify for jobs that should only run on publish branches. This filter
5047
# is used to ensure that not all upstream branches will be published as Github builds
5148
# (e.g. revert branches, feature branches)
52-
var_9: &publish_branches_filter
49+
var_8: &publish_branches_filter
5350
branches:
5451
only:
5552
- master
@@ -93,7 +90,6 @@ jobs:
9390
- checkout_and_rebase
9491
- *restore_cache
9592
- *npm_install
96-
- *rebuild_node_sass
9793
- run: npm run lint
9894

9995
# -----------------------------------
@@ -105,7 +101,6 @@ jobs:
105101
- checkout_and_rebase
106102
- *restore_cache
107103
- *npm_install
108-
- *rebuild_node_sass
109104
- run: npm run build
110105
- *save_cache
111106

docs/gulpfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const lazypipe = require('lazypipe');
88
const mkdirp = require('mkdirp');
99
const ngHtml2js = require('gulp-ng-html2js');
1010
const path = require('path');
11-
const sass = require('gulp-sass');
11+
const sass = require('gulp-sass')(require('sass'));
1212
const through2 = require('through2');
1313
const uglify = require('gulp-uglify');
1414
const utils = require('../scripts/gulp-utils.js');

gulp/tasks/build-module-demo.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const fs = require('fs');
77
const path = require('path');
88
const through2 = require('through2');
99
const lazypipe = require('lazypipe');
10-
const sass = require('gulp-sass');
10+
const sass = require('gulp-sass')(require('sass'));
1111
const gulpif = require('gulp-if');
1212
const _ = require('lodash');
1313

gulp/tasks/build-scss.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const concat = require('gulp-concat');
77
const series = require('stream-series');
88
const util = require('../util');
99
const sassUtils = require('../../scripts/gulp-utils');
10-
const sass = require('gulp-sass');
10+
const sass = require('gulp-sass')(require('sass'));
1111
const insert = require('gulp-insert');
1212
const gulpif = require('gulp-if');
1313
const minifyCss = util.minifyCss;

gulp/util.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const series = require('stream-series');
1212
const lazypipe = require('lazypipe');
1313
const glob = require('glob').sync;
1414
const uglify = require('gulp-uglify');
15-
const sass = require('gulp-sass');
15+
const sass = require('gulp-sass')(require('sass'));
1616
const plumber = require('gulp-plumber');
1717
const ngAnnotate = require('gulp-ng-annotate');
1818
const insert = require('gulp-insert');

0 commit comments

Comments
 (0)