Skip to content

Commit 8c15359

Browse files
authored
Merge pull request #13520 from IgniteUI/simeonoff/sass-build-15.1.x
build(sass): switch from gulp-sass to sass-embedded
2 parents a1d5fe6 + c7c5be0 commit 8c15359

File tree

5 files changed

+3747
-2556
lines changed

5 files changed

+3747
-2556
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ ng update igniteui-cli
195195
ng build igniteui-angular
196196
197197
// build the css
198-
npm run build:style
198+
npm run build:styles
199199
200200
// build them both
201201
npm run build:lib

gulpfile.js

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,24 @@
11
'use strict';
22

3-
const autoprefixer = require('autoprefixer');
43
const browserSync = require('browser-sync').create();
54
const del = require('del');
65
const gulp = require('gulp');
7-
const sass = require('gulp-sass')(require('sass'));
8-
const sourcemaps = require('gulp-sourcemaps');
9-
const postcss = require('gulp-postcss');
106
const process = require('process');
117
const fs = require('fs');
128
const argv = require('yargs').argv;
139
const sassdoc = require('sassdoc');
1410
const path = require('path');
15-
const EventEmitter = require('events').EventEmitter;
1611
const { series } = require('gulp');
1712
const { spawnSync } = require('child_process');
1813
const slash = require('slash');
1914

20-
const STYLES = {
21-
SRC: './projects/igniteui-angular/src/lib/core/styles/themes/presets/**/*',
22-
DIST: './dist/igniteui-angular/styles',
23-
MAPS: './maps',
24-
THEMING: {
25-
SRC: './projects/igniteui-angular/src/lib/core/styles/**/*',
26-
DIST: './dist/igniteui-angular/lib/core/styles'
27-
},
28-
CONFIG: {
29-
outputStyle: 'compressed',
30-
includePaths: ['node_modules']
31-
}
32-
};
33-
3415
const DOCS_OUTPUT_PATH = slash(path.join(__dirname, 'dist', 'igniteui-angular', 'docs'));
3516

3617
const TYPEDOC_THEME = {
3718
SRC: slash(path.join(__dirname, 'node_modules', 'ig-typedoc-theme', 'dist')),
3819
OUTPUT: slash(path.join(DOCS_OUTPUT_PATH, 'typescript'))
3920
};
4021

41-
module.exports.buildStyle = () => {
42-
const prefixer = postcss([autoprefixer({
43-
cascade: false,
44-
grid: true
45-
})]);
46-
47-
gulp.src(STYLES.THEMING.SRC)
48-
.pipe(gulp.dest(STYLES.THEMING.DIST));
49-
50-
const myEventEmitter = new EventEmitter();
51-
52-
return gulp.src(STYLES.SRC)
53-
.pipe(sourcemaps.init())
54-
.pipe(sass.sync(STYLES.CONFIG).on('error', err => {
55-
sass.logError.bind(myEventEmitter)(err);
56-
myEventEmitter.emit('end');
57-
process.exit(1);
58-
}))
59-
.pipe(prefixer)
60-
.pipe(sourcemaps.write(STYLES.MAPS))
61-
.pipe(gulp.dest(STYLES.DIST))
62-
};
63-
6422
module.exports.copyGitHooks = async (cb) => {
6523

6624
if (process.env.AZURE_PIPELINES || process.env.TRAVIS || process.env.CI || !fs.existsSync('.git')) {

0 commit comments

Comments
 (0)