Skip to content

Commit 8bbf22a

Browse files
authored
Merge pull request #8 from creaminternet/7-remove-node-sass
Removed node-sass and use dart-sass as a default
2 parents 292bfc2 + 11b6d05 commit 8bbf22a

File tree

6 files changed

+1252
-4708
lines changed

6 files changed

+1252
-4708
lines changed

README.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,6 @@ Check `config/themes.json.sample` to get samples.
3434
Check `config/watcher.json.sample` to get samples.
3535
- `usePolling` - set this to `true` to successfully watch files over a network (i.e. Docker or Vagrant) or when your watcher dosen't work well. Warning, enabling this option may lead to high CPU utilization! [chokidar docs](https://github.com/paulmillr/chokidar#performance)
3636

37-
## `sass-compiler.json` structure
38-
You can choose Sass compiler between the default, but [already deprecated](https://github.com/sass/node-sass/issues/2952), `node-sass` or a newer and faster `dart-sass`.
39-
40-
Since the Dart Sass does not have the same set of features as Node Sass, for now we will keep the older version as default.
41-
4237
## Optional configurations for 3rd party plugins
4338
You will find sample config files for theses plugins in `vendor/creaminternet/frontools/config` directory.
4439
* Create [browserSync](https://www.browsersync.io/) configuration

config/sass-compiler.json.sample

Lines changed: 0 additions & 1 deletion
This file was deleted.

helpers/scss.mjs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import gulp from 'gulp'
22
import path from 'path'
33
import gulpIf from 'gulp-if'
44
import dartSass from 'sass'
5-
import nodeSass from 'node-sass'
65
import gulpSass from 'gulp-sass'
76
import rename from 'gulp-rename'
87
import multiDest from './multi-dest.mjs'
@@ -28,7 +27,6 @@ export default function(name, file) {
2827
const includePaths = theme.includePaths ? theme.includePaths : []
2928
const postcssConfig = []
3029
const disableSuffix = theme.disableSuffix || false
31-
const sassCompiler = configLoader('sass-compiler.json', false)
3230

3331
configLoader('.browserslistrc')
3432

@@ -68,7 +66,7 @@ export default function(name, file) {
6866
)
6967
)
7068
.pipe(gulpIf(!disableMaps, sourcemaps.init()))
71-
.pipe(gulpSass(sassCompiler === 'dart-sass' ? dartSass : nodeSass)({ includePaths: includePaths })
69+
.pipe(gulpSass(dartSass)({ includePaths: includePaths })
7270
.on('error', sassError(env.ci || false)))
7371
.pipe(gulpIf(production, postcss([cssnano()])))
7472
.pipe(gulpIf(postcssConfig.length, postcss(postcssConfig || [])))

0 commit comments

Comments
 (0)