Skip to content
This repository has been archived by the owner on Aug 29, 2023. It is now read-only.

Commit

Permalink
chore(sass): migrate from node-sass to sass
Browse files Browse the repository at this point in the history
Fixes #12114
  • Loading branch information
Splaktar committed Nov 23, 2021
1 parent 441a912 commit 5e2d213
Show file tree
Hide file tree
Showing 7 changed files with 72 additions and 1,149 deletions.
9 changes: 2 additions & 7 deletions .circleci/config.yml
Expand Up @@ -39,17 +39,14 @@ var_5: &save_cache
var_6: &npm_install
run: npm ci

var_7: &rebuild_node_sass
run: npm rebuild node-sass

var_8: &store_junit_test_results
var_7: &store_junit_test_results
store_test_results:
path: ./artifacts/junit

# Branch filter that we can specify for jobs that should only run on publish branches. This filter
# is used to ensure that not all upstream branches will be published as Github builds
# (e.g. revert branches, feature branches)
var_9: &publish_branches_filter
var_8: &publish_branches_filter
branches:
only:
- master
Expand Down Expand Up @@ -93,7 +90,6 @@ jobs:
- checkout_and_rebase
- *restore_cache
- *npm_install
- *rebuild_node_sass
- run: npm run lint

# -----------------------------------
Expand All @@ -105,7 +101,6 @@ jobs:
- checkout_and_rebase
- *restore_cache
- *npm_install
- *rebuild_node_sass
- run: npm run build
- *save_cache

Expand Down
2 changes: 1 addition & 1 deletion docs/gulpfile.js
Expand Up @@ -8,7 +8,7 @@ const lazypipe = require('lazypipe');
const mkdirp = require('mkdirp');
const ngHtml2js = require('gulp-ng-html2js');
const path = require('path');
const sass = require('gulp-sass');
const sass = require('gulp-sass')(require('sass'));
const through2 = require('through2');
const uglify = require('gulp-uglify');
const utils = require('../scripts/gulp-utils.js');
Expand Down
2 changes: 1 addition & 1 deletion gulp/tasks/build-module-demo.js
Expand Up @@ -7,7 +7,7 @@ const fs = require('fs');
const path = require('path');
const through2 = require('through2');
const lazypipe = require('lazypipe');
const sass = require('gulp-sass');
const sass = require('gulp-sass')(require('sass'));
const gulpif = require('gulp-if');
const _ = require('lodash');

Expand Down
2 changes: 1 addition & 1 deletion gulp/tasks/build-scss.js
Expand Up @@ -7,7 +7,7 @@ const concat = require('gulp-concat');
const series = require('stream-series');
const util = require('../util');
const sassUtils = require('../../scripts/gulp-utils');
const sass = require('gulp-sass');
const sass = require('gulp-sass')(require('sass'));
const insert = require('gulp-insert');
const gulpif = require('gulp-if');
const minifyCss = util.minifyCss;
Expand Down
2 changes: 1 addition & 1 deletion gulp/util.js
Expand Up @@ -12,7 +12,7 @@ const series = require('stream-series');
const lazypipe = require('lazypipe');
const glob = require('glob').sync;
const uglify = require('gulp-uglify');
const sass = require('gulp-sass');
const sass = require('gulp-sass')(require('sass'));
const plumber = require('gulp-plumber');
const ngAnnotate = require('gulp-ng-annotate');
const insert = require('gulp-insert');
Expand Down

0 comments on commit 5e2d213

Please sign in to comment.