Skip to content

Commit 1c8a006

Browse files
committed
Add support for scss - drop support for less.
1 parent 07c6b43 commit 1c8a006

File tree

10 files changed

+220
-262
lines changed

10 files changed

+220
-262
lines changed

gulpfile.js

Lines changed: 53 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@ var paths = require('./paths');
1212
var plato = require('plato');
1313
var Server = require('karma').Server;
1414

15+
gulp.task('build-css', ['scss'], function () {
16+
var Comb = require('csscomb');
17+
var config = require('./.csscomb.json');
18+
var comb = new Comb(config);
19+
comb.processPath('./src/css/');
20+
});
21+
1522
gulp.task('complexity', function (done) {
1623

1724
var callback = function () {
@@ -29,6 +36,43 @@ gulp.task('csslint', function () {
2936
.pipe(csslint.failReporter());
3037
});
3138

39+
gulp.task('jscs', function () {
40+
return gulp
41+
.src(paths.lint)
42+
.pipe(jscs('.jscsrc'));
43+
});
44+
45+
gulp.task('lint', function () {
46+
return gulp
47+
.src(paths.lint)
48+
.pipe(jshint('.jshintrc'))
49+
.pipe(jshint.reporter('default', {verbose: true}))
50+
.pipe(jshint.reporter('jshint-stylish'))
51+
.pipe(jshint.reporter('fail'));
52+
});
53+
54+
55+
gulp.task('scss', ['scss-lint'], function () {
56+
var scss = require('gulp-sass');
57+
var postcss = require('gulp-postcss');
58+
var sourcemaps = require('gulp-sourcemaps');
59+
var autoprefixer = require('autoprefixer');
60+
61+
return gulp.src(paths.scss)
62+
.pipe(scss())
63+
.pipe(sourcemaps.init())
64+
.pipe(postcss([autoprefixer({browsers: ['last 2 versions']})]))
65+
.pipe(sourcemaps.write('.'))
66+
.pipe(gulp.dest('./src/css'));
67+
});
68+
69+
gulp.task('scss-lint', function () {
70+
var scssLint = require('gulp-scss-lint');
71+
var scssLintStylish = require('gulp-scss-lint-stylish');
72+
return gulp.src('./src/scss/*.scss')
73+
.pipe(scssLint({customReport: scssLintStylish}));
74+
});
75+
3276
var testConfig = function (options) {
3377
var travisOptions = process.env.TRAVIS &&
3478
{
@@ -39,70 +83,36 @@ var testConfig = function (options) {
3983
return lodash.assign(options, travisOptions);
4084
};
4185

42-
gulp.task('test', function (done) {
86+
gulp.task('tdd', function (done) {
87+
gulp.watch(paths.all.concat(paths.scss), ['jscs', 'lint', 'build-css']);
4388

4489
var config = testConfig(
4590
{
91+
autoWatch: true,
92+
browsers: ['PhantomJS'],
4693
configFile: karmaConfig,
47-
singleRun: true,
48-
reporters: ['progress', 'coverage', 'threshold']
94+
singleRun: false
4995
}
5096
);
5197

5298
var server = new Server(config, done);
5399
server.start();
54100
});
55101

56-
gulp.task('less', function () {
57-
var less = require('gulp-less');
58-
var postcss = require('gulp-postcss');
59-
var sourcemaps = require('gulp-sourcemaps');
60-
var autoprefixer = require('autoprefixer');
61-
62-
return gulp.src('./src/less/datetimepicker.less')
63-
.pipe(less())
64-
.pipe(sourcemaps.init())
65-
.pipe(postcss([ autoprefixer({ browsers: ['last 2 versions'] }) ]))
66-
.pipe(sourcemaps.write('.'))
67-
.pipe(gulp.dest('./src/css'));
68-
});
69-
70-
gulp.task('csscomb', ['less'], function () {
71-
var Comb = require('csscomb');
72-
var comb = new Comb();
73-
comb.processPath('./src/css');
74-
});
75102

76-
gulp.task('tdd', function (done) {
77-
gulp.watch(paths.all.concat(paths.less), ['jscs', 'lint', 'makecss']);
103+
gulp.task('test', function (done) {
78104

79105
var config = testConfig(
80106
{
81-
autoWatch: true,
82-
browsers: ['PhantomJS'],
83107
configFile: karmaConfig,
84-
singleRun: false
108+
singleRun: true,
109+
reporters: ['progress', 'coverage', 'threshold']
85110
}
86111
);
87112

88113
var server = new Server(config, done);
89114
server.start();
90115
});
91116

92-
gulp.task('lint', function () {
93-
return gulp
94-
.src(paths.lint)
95-
.pipe(jshint('.jshintrc'))
96-
.pipe(jshint.reporter('default', {verbose: true}))
97-
.pipe(jshint.reporter('jshint-stylish'))
98-
.pipe(jshint.reporter('fail'));
99-
});
100-
101-
gulp.task('jscs', function () {
102-
return gulp
103-
.src(paths.lint)
104-
.pipe(jscs('.jscsrc'));
105-
});
106117

107-
gulp.task('makecss', ['less', 'csscomb']);
108-
gulp.task('default', ['jscs', 'lint', 'csslint', 'complexity', 'test']);
118+
gulp.task('default', ['jscs', 'lint', 'complexity', 'csslint', 'test']);

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,10 @@
2626
"gulp-csslint": "^0.2.0",
2727
"gulp-jscs": "^3.0.0",
2828
"gulp-jshint": "^1.11.2",
29-
"gulp-less": "^3.0.3",
3029
"gulp-postcss": "^6.0.1",
30+
"gulp-sass": "^2.0.4",
31+
"gulp-scss-lint": "^0.3.6",
32+
"gulp-scss-lint-stylish": "^1.0.0",
3133
"gulp-sourcemaps": "^1.6.0",
3234
"jquery": "^2.1.4",
3335
"jshint": "^2.6.0",

paths.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@ var modules = [
99
'node_modules/angular-mocks/angular-mocks.js'
1010
];
1111
var bumpFiles = ['package.json', 'bower.json', 'README.md', 'src/js/*.js'];
12-
var lessFiles = ['src/less/*.less'];
1312
var cssFiles = ['src/css/*.css'];
1413
var demoFiles = ['demo/**/*.js'];
1514
var miscFiles = ['GruntFile.js', 'gulpfile.js', 'karma.conf.js', 'paths.js'];
15+
var scssFiles = ['src/scss/*.scss'];
1616
var sourceFiles = ['src/**/*.js'];
1717
var testFiles = ['test/**/*.spec.js'];
1818

1919
module.exports = {
2020
all: modules.concat(sourceFiles).concat(testFiles).concat(demoFiles).concat(cssFiles),
2121
app: sourceFiles,
22-
bump: bumpFiles.concat(cssFiles).concat(lessFiles),
22+
bump: bumpFiles.concat(scssFiles).concat(cssFiles),
2323
css: cssFiles,
24-
less: lessFiles,
2524
lint: miscFiles.concat(sourceFiles).concat(testFiles).concat(miscFiles),
25+
scss: scssFiles,
2626
src: sourceFiles,
2727
test: testFiles
2828
};

src/css/datetimepicker.css

Lines changed: 36 additions & 65 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/css/datetimepicker.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)