autofront 1.1.0 → 1.2.0

package/README.md

@@ -8,7 +8,7 @@ Gulp settings for projects.
 - With `gulp serve:dist`, the server is production, but without the reload.
 - `gulp build` builds the distributable version.
 
-Additionally, a parameter can be included (e.g.: `gulp serve --dev` o `gulp build --pro`) to indicate the connection server. Defaults to local. And these domain URLs must to appear listed in `package.json` with the property `domains` (optionally also `domainsAlias`).
+Additionally, a parameter can be included (e.g.: `gulp serve --dev` o `gulp build --pro`) to indicate the connection server. Defaults to local. And these domain URLs must to appear listed in `package.json` with the property `domains` (optionally also `domainsAliases`).
 
 ## Folder structure
 

package/index.js

@@ -4,8 +4,8 @@ const gulp = require('gulp'),
 	$ = require('gulp-load-plugins')(),
 	injStr = $.injectString,
 	gulpSync = $.sync(gulp),
-	browserSync = require('browser-sync').create(),
-	deleteEmpty = require('delete-empty');
+	notifyError = $.notify.onError(error => error.message),
+	browserSync = require('browser-sync').create();
 
 var domain = undefined;
 
@@ -30,10 +30,10 @@ const nl = '\n',
 
 gulp.task('check', () => {
 	const pckg = require('./package.json'),
-		domainAlias = pckg.domainAlias;
+		domainAliases = pckg.domainAliases;
 	var domainIndex = args[0]||'local';
-	if (domainAlias) {
-		const alias = domainAlias[domainIndex];
+	if (domainAliases) {
+		const alias = domainAliases[domainIndex];
 		if (alias)
 			domainIndex = alias;
 	}
@@ -49,9 +49,14 @@ gulp.task('index', gulpSync.sync([
 	'index-build',
 	'index-domain'
 ]));
-gulp.task('styles', () => gulp.src(paths.src+cssFilename+'.less').pipe(injStr.prepend('// bower:less'+nl+'// endbower'+nl)).pipe($.wiredep()).pipe($.less()).on('error', $.notify.onError(error => error.message)).pipe(gulp.dest(paths.tmp+stylesFolder)));
+gulp.task('styles', () => gulp.src(paths.src+cssFilename+'.less').pipe(injStr.prepend('// bower:less'+nl+'// endbower'+nl)).pipe($.wiredep()).pipe($.less()).on('error', notifyError).pipe(gulp.dest(paths.tmp+stylesFolder)));
 gulp.task('fonts', () => gulp.src(mainBowerFiles()).pipe(filter(['eot','otf','svg','ttf', 'woff', 'woff2'], true)).pipe(gulp.dest(paths.tmp+'fonts/')));
-gulp.task('others', () => gulp.src(paths.srcOthers).pipe(gulp.dest(paths.tmp)));
+gulp.task('others', () => {
+	const pugFilter = filter('pug');
+	return gulp.src(paths.srcOthers)
+		.pipe(pugFilter).pipe($.pug()).on('error', notifyError).pipe(pugFilter.restore)
+		.pipe(gulp.dest(paths.tmp));
+});
 gulp.task('about', () => gulp.src('package.json').pipe($.about()).pipe(gulp.dest(paths.tmp)));
 gulp.task('build:tmp', gulpSync.sync([
 	'del',
@@ -70,8 +75,8 @@ gulp.task('serve', ['browser'], () => {
 
 gulp.task('del:dist', () => delFolder(paths.dist));
 gulp.task('copy', ['del:dist'], () => gulp.src(paths.tmp+allFiles).pipe(gulp.dest(paths.dist)));
-gulp.task('templates-build', () => gulp.src([paths.dist+getFiles('html'), '!'+paths.dist+indexHtmlFile]).pipe($.cleanDest(paths.dist)).pipe($.htmlmin({collapseWhitespace: true, conservativeCollapse: true})).pipe($.angularTemplatecache(jsTemplatesFile, {module: 'app'})).pipe(gulp.dest(paths.dist)));
-gulp.task('templates-clean', () => deleteEmpty(paths.dist));
+gulp.task('templates-build', () => gulp.src([paths.dist+getFiles('html'), '!'+paths.dist+indexHtmlFile]).pipe($.cleanDest(paths.dist)).pipe(minifyHtml()).pipe($.angularTemplatecache(jsTemplatesFile, {module: 'app'})).pipe(gulp.dest(paths.dist)));
+gulp.task('templates-clean', () => require('delete-empty')(paths.dist));
 gulp.task('templates', gulpSync.sync([
 	'templates-build',
 	'templates-clean'
@@ -88,7 +93,7 @@ gulp.task('build', gulpSync.sync([
 		imgFilter = filter(['png','jpg','gif','svg']),
 		jsonFilter = filter('json');
 	return gulp.src(paths.dist+allFiles)
-		.pipe(indexHtmlFilter).pipe(injStr.before('</body>', '<script src="'+jsTemplatesFile+'"></script>'+nl)).pipe($.htmlmin({collapseWhitespace: true})).pipe(indexHtmlFilter.restore)
+		.pipe(indexHtmlFilter).pipe(injStr.before('</body>', '<script src="'+jsTemplatesFile+'"></script>'+nl)).pipe(minifyHtml()).pipe(indexHtmlFilter.restore)
 		.pipe(cssFilter).pipe($.cssnano({zindex: false})).pipe(cssFilter.restore)
 		.pipe(jsFilter).pipe($.ngAnnotate()).pipe($.uglify()).pipe(jsFilter.restore)
 		.pipe(cssAndJsFilter).pipe($.rev()).pipe($.revDeleteOriginal()).pipe(cssAndJsFilter.restore)
@@ -123,4 +128,8 @@ function browserSyncInit(path) {
 			baseDir: path
 		}
 	});
+}
+
+function minifyHtml() {
+	return $.htmlmin({collapseWhitespace: true, conservativeCollapse: true});
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "autofront",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Gulp settings for projects.",
   "main": "index.js",
   "scripts": {
@@ -38,6 +38,7 @@
     "gulp-load-plugins": "^1.5.0",
     "gulp-ng-annotate": "^2.1.0",
     "gulp-notify": "^3.2.0",
+    "gulp-pug": "^4.0.1",
     "gulp-rev": "^8.1.1",
     "gulp-rev-delete-original": "^0.2.3",
     "gulp-rev-replace": "^0.4.4",