autofront 2.2.1 → 2.2.2

package/README.md

@@ -66,9 +66,9 @@ Other command options, that appear immediately below, are available. And to use
 
 Mainly the Gulp ones are the following:
 
-* `gulp` or `gulp serve` are for running a test server and develop with live reload.
-* `gulp build` only builds production code, the distributable application (`dist` folder).
-* With `gulp serve:dist`, a combination of the above is achieved: Specifically, the server runs that last version but without reload.
+- `gulp` or `gulp serve` are for running a test server and develop with live reload.
+- `gulp build` only builds production code, the distributable application (`dist` folder).
+- With `gulp serve:dist`, a combination of the above is achieved: Specifically, the server runs that last version but without reload.
 
 ### Domains
 
@@ -125,8 +125,6 @@ Any asset (e.g. a PDF document) will keep the location path and, particularly at
 
 Fixes and improvements to do:
 
-* Once the server watch for changes:
-  * Synchronize also the deletion of source files.
-  * Resolve overwriting bug between pure CSS and preprocessors (Less/Sass).
-* Replace Bower as dependency manager.
-* Migrate AngularJS to new [Angular](https://angular.io).
+- Once the server watch for changes, synchronize also the deletion of source files.
+- Replace Bower as dependency manager.
+- Migrate AngularJS to new [Angular](https://angular.io).

package/index.js

@@ -26,10 +26,11 @@ const paths = {
 	dist: 'dist/'
 };
 paths.srcIndexHtml = paths.src + indexHtmlFile;
+paths.srcCss = paths.src + stylesFolder + cssFullFilename;
 paths.srcSass = paths.src + getFiles('scss');
 paths.srcLess = paths.src + getFiles('less');
 paths.srcJs = paths.src + getFiles('js');
-paths.srcOthers = [paths.src + allFiles, '!' + paths.srcIndexHtml, '!' + paths.srcSass, '!' + paths.srcLess, '!' + paths.srcJs];
+paths.srcOthers = [paths.src + allFiles, '!' + paths.srcIndexHtml, '!' + paths.srcCss, '!' + paths.srcSass, '!' + paths.srcLess, '!' + paths.srcJs];
 
 const nl = '\n',
 	tab = '	';
@@ -57,13 +58,16 @@ gulp.task('index-build', () => gulp.src(paths.srcIndexHtml).pipe(injStr.after('<
 gulp.task('index-domain', () => gulp.src(paths.tmp + getFiles('js')).pipe(injStr.replace('{{AUTOFRONT_DOMAIN}}', domain)).pipe(gulp.dest(paths.tmp)));
 gulp.task('index', gulp.series('index-build', 'index-domain'));
 gulp.task('styles', () => {
-	return mergeStream(getCssStream('scss', gulpSass, '@import "variables";'), getCssStream('less', $.less))
+	return mergeStream(getCssStream('css'), getCssStream('scss', gulpSass, '@import "variables";'), getCssStream('less', $.less))
 		.pipe($.concat(cssFullFilename))
 		.pipe(gulp.dest(paths.tmp + stylesFolder))
 		.pipe(browserSync.stream());
 
 	function getCssStream(ext, process, extraCode) {
-		return gulp.src(paths.src + stylesFolder + cssFilename + '.' + ext, { allowEmpty: true }).pipe(injStr.prepend((extraCode ? extraCode + nl : '') + '// bower:' + ext + nl + '// endbower' + nl)).pipe($.wiredep()).pipe(process()).on('error', notifyError);
+		let stream = gulp.src(paths.src + stylesFolder + cssFilename + '.' + ext, { allowEmpty: true });
+		if (process)
+			return stream.pipe(injStr.prepend((extraCode ? extraCode + nl : '') + '// bower:' + ext + nl + '// endbower' + nl)).pipe($.wiredep()).pipe(process()).on('error', notifyError);
+		return stream;
 	}
 });
 gulp.task('fonts', () => gulp.src(mainBowerFiles()).pipe(filter(['eot', 'otf', 'svg', 'ttf', 'woff', 'woff2'], true)).pipe(gulp.dest(paths.tmp + 'fonts/')));
@@ -81,7 +85,7 @@ gulp.task('browser', gulp.series('build:tmp', (cb) => {
 }));
 gulp.task('serve', gulp.series('browser', () => {
 	gulp.watch([paths.srcIndexHtml, paths.srcJs], gulp.task('index'));
-	gulp.watch([paths.srcSass, paths.srcLess], gulp.task('styles'));
+	gulp.watch([paths.srcCss, paths.srcSass, paths.srcLess], gulp.task('styles'));
 	gulp.watch(paths.srcOthers, gulp.task('others'));
 	gulp.watch([paths.tmp + allFiles, '!' + paths.tmp + stylesFolder + cssFullFilename], function (cb) {
 		browserSync.reload();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "autofront",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "description": "Automatisation of front-end by Gulp and Bower.",
   "main": "index.js",
   "scripts": {