Skip to content

Commit 384c26c

Browse files
Add gulp modules, env for production
1 parent 86dcc68 commit 384c26c

File tree

5 files changed

+19
-16
lines changed

5 files changed

+19
-16
lines changed

lib/sass.js

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,32 +10,35 @@ const defaults = {
1010
dest: './dist/stylesheets',
1111
plumb: true,
1212
autoprefixer: true,
13+
combinemq: true,
1314
size: false,
1415
minify: false,
15-
beautifier: false
16+
beautifier: false,
17+
production: false
1618
};
1719

1820
module.exports = (gulp, options) => {
1921
const opts = merge({}, defaults, options);
2022
const src = opts.src;
2123
const taskname = opts.taskname;
2224
const prefixer = opts.autoprefixer;
25+
const combinemq = opts.combinemq;
2326
const minify = opts.minify;
2427
const beautifier = opts.beautifier;
2528
const plumb = opts.plumb;
2629
const dest = opts.dest;
2730
const size = opts.size;
31+
const isProd = opts.production;
2832

2933
gulp.task(taskname, done => gulp.src(src)
3034
.pipe(plumb ? $.plumber(config.plumberErrorHandler) : $.util.noop())
3135
.pipe($.sass(config.sassConfig))
3236
.pipe(prefixer ? $.autoprefixer(config.autoprefixer) : $.util.noop())
33-
.pipe(beautifier ? $.jsbeautifier(config.jsbeautifier) : $.util.noop())
34-
.pipe(size ? $.size({ title: `Gulp task ${taskname}`, gzip: false, showFiles: true }) : $.util.noop())
35-
.pipe((beautifier && minify) ? gulp.dest(dest) : $.util.noop())
36-
.pipe(minify ? $.cssnano() : $.util.noop())
37-
.pipe(minify ? $.rename({ suffix: '.min' }) : $.util.noop())
38-
.pipe(size ? $.size({ title: `Gulp task ${taskname}`, gzip: false, showFiles: true }) : $.util.noop())
37+
.pipe(combinemq ? $.combineMq() : $.util.noop())
38+
.pipe((!isProd && beautifier) ? $.jsbeautifier(config.jsbeautifier) : $.util.noop())
39+
.pipe((minify && isProd) ? $.cssnano() : $.util.noop())
40+
.pipe((minify && isProd) ? $.rename({ suffix: '.min' }) : $.util.noop())
41+
.pipe((!isProd && size) ? $.size({ title: `Gulp task ${taskname}`, gzip: false, showFiles: true }) : $.util.noop())
3942
.pipe(plumb ? $.plumber.stop() : $.util.noop())
4043
.pipe(gulp.dest(dest)));
4144
};

test/copy.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ tape('copy task', function (test) {
99
exec('gulp copy', { cwd: __dirname }, function () {
1010
var expected = utils.readFixture('static/logo.png');
1111
var actual = utils.readResult('logo.png');
12-
test.equal(expected, actual, 'Files copied!');
12+
test.equal(expected, actual, 'Processes copy task: Files copied!');
1313
});
1414
});

test/fixtures/output.min.css

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

test/gulpfile.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
const gulp = require('gulp');
3+
const gulp = require('gulp');
44
const tasks = require('../');
55

66
tasks.sass(gulp, {
@@ -15,3 +15,8 @@ tasks.copy(gulp, {
1515
src: './fixtures/static/*',
1616
size: true
1717
});
18+
19+
gulp.task('default', [
20+
'sass',
21+
'copy'
22+
]);

test/sass.spec.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,10 @@ const tape = require('tape');
55
const utils = require('./utils');
66

77
tape('sass task', (test) => {
8-
test.plan(2);
8+
test.plan(1);
99
exec('gulp sass', { cwd: __dirname }, () => {
1010
const expected = utils.readFixture('output.css');
1111
const actual = utils.readResult('input.css');
12-
test.equal(expected, actual, 'Processes SASS Task, generate CSS non minified files');
13-
14-
const expectedMin = utils.readFixture('output.min.css');
15-
const actualMin = utils.readResult('input.min.css');
16-
test.equal(expectedMin, actualMin, 'Processes SASS Task, enerate CSS Minified files');
12+
test.equal(expected, actual, 'Processes sass task!');
1713
});
1814
});

0 commit comments

Comments
 (0)