autofront 2.1.1 → 2.2.1

package/README.md

@@ -113,7 +113,7 @@ One of modules should to be named "app", ideally the main one.
 Optionally, to work with [HTML5 mode](https://docs.angularjs.org/api/ng/provider/$locationProvider#html5Mode), invoke it:
 
 ```js
-var autofront = require('autofront');
+let autofront = require('autofront');
 autofront.html5Mode();
 ```
 
@@ -125,7 +125,6 @@ Any asset (e.g. a PDF document) will keep the location path and, particularly at
 
 Fixes and improvements to do:
 
-* Avoid process-breaking Sass errors, like Less rightly does.
 * Once the server watch for changes:
   * Synchronize also the deletion of source files.
   * Resolve overwriting bug between pure CSS and preprocessors (Less/Sass).

package/index.js

@@ -1,150 +1,149 @@
-this.html5Mode = html5Mode;
-
-const gulp = require('gulp'),
-	path = require('path'),
-	args = require('get-gulp-args')(),
-	mergeStream = require('merge-stream'),
-	mainBowerFiles = require('main-bower-files'),
-	$ = require('gulp-load-plugins')(),
-	injStr = $.injectString,
-	gulpSass = $.sass(require('sass')),
-	notifyError = $.notify.onError(error => error.message),
-	browserSync = require('browser-sync').create();
-
-var domain = undefined;
-
-const allFiles = getFiles(),
-	indexHtmlFile = 'index.html',
-	cssFilename = 'index',
-	cssFullFilename = cssFilename + '.css';
-var stylesFolder = 'styles/',
-	jsTemplatesFile = 'scripts/templates.js';
-
-const paths = {
-	src: 'src/',
-	tmp: '.tmp/',
-	dist: 'dist/'
-};
-paths.srcIndexHtml = paths.src + indexHtmlFile;
-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];
-
-const nl = '\n',
-	tab = '	';
-
-gulp.task('check', () => {
-	const pckg = require(path.resolve('package.json')),
-		domains = pckg.domains;
-	var domainIndex = args[0] || 'local';
-	if (domains) {
-		const domainAliases = pckg.domainAliases;
-		if (domainAliases) {
-			const alias = domainAliases[domainIndex];
-			if (alias)
-				domainIndex = alias;
-		}
-		domain = domains[domainIndex];
-	}
-	const isMatched = domain !== undefined;
-	return gulp.src(paths.src)
-		.pipe($.notify(isMatched ? 'Matching domain: "' + domainIndex + '".' : 'No domain matched.'));
-});
-
-gulp.task('del', () => delFolder(paths.tmp));
-gulp.task('index-build', () => gulp.src(paths.srcIndexHtml).pipe(injStr.after('<!-- endbuild -->', nl + tab + '<link rel="stylesheet" href="' + stylesFolder + cssFullFilename + '">')).pipe($.inject(gulp.src(paths.srcJs).pipe($.angularFilesort()), { relative: true })).on('error', notifyError).pipe($.wiredep()).pipe($.useref()).pipe(gulp.dest(paths.tmp)));
-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))
-		.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);
-	}
-});
-gulp.task('fonts', () => gulp.src(mainBowerFiles()).pipe(filter(['eot', 'otf', 'svg', 'ttf', 'woff', 'woff2'], true)).pipe(gulp.dest(paths.tmp + 'fonts/')));
-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', gulp.series('del', 'check', gulp.parallel('index', 'styles', 'fonts', 'others', 'about')));
-gulp.task('browser', gulp.series('build:tmp', (cb) => {
-	browserSyncInit(paths.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.srcOthers, gulp.task('others'));
-	gulp.watch([paths.tmp + allFiles, '!' + paths.tmp + stylesFolder + cssFullFilename], function (cb) {
-		browserSync.reload();
-		cb();
-	});
-}));
-
-gulp.task('del:dist', () => delFolder(paths.dist));
-gulp.task('copy', gulp.series('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(minifyHtml()).pipe($.angularTemplatecache(jsTemplatesFile, { module: 'app', transformUrl: function (url) { return url.slice(1); } })).pipe(gulp.dest(paths.dist)));
-gulp.task('templates-clean', () => require('delete-empty')(paths.dist));
-gulp.task('templates', gulp.series('templates-build', 'templates-clean'));
-gulp.task('build', gulp.series('build:tmp', 'copy', 'templates', () => {
-	const indexHtmlFilter = filter('html'),
-		cssFilter = filter('css'),
-		jsFilter = filter('js'),
-		cssAndJsFilter = filter(['css', 'js']),
-		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(minifyHtml()).pipe(indexHtmlFilter.restore)
-		.pipe(cssFilter).pipe($.cssnano({ zindex: false })).pipe(cssFilter.restore)
-		.pipe(jsFilter).pipe($.ngAnnotate()).pipe($.terser()).pipe(jsFilter.restore)
-		.pipe(cssAndJsFilter).pipe($.rev()).pipe($.revDeleteOriginal()).pipe(cssAndJsFilter.restore)
-		.pipe($.revReplace())
-		.pipe(imgFilter).pipe($.imagemin()).pipe(imgFilter.restore)
-		.pipe(jsonFilter).pipe($.jsonmin()).pipe(jsonFilter.restore)
-		.pipe($.size({ showFiles: true }))
-		.pipe(gulp.dest(paths.dist));
-}));
-gulp.task('serve:dist', gulp.series('build', () => browserSyncInit(paths.dist)));
-
-gulp.task('default', gulp.task('serve'));
-
-function html5Mode() {
-	const pathPrefix = '/';
-	stylesFolder = pathPrefix + stylesFolder;
-	jsTemplatesFile = pathPrefix + jsTemplatesFile;
-}
-
-function getFiles(ext) {
-	ext = ext || '*';
-	const isArray = typeof ext != 'string';
-	return '**/*.' + (isArray ? '{' : '') + (isArray ? ext.join() : ext) + (isArray ? '}' : '');
-}
-
-function delFolder(path) {
-	return gulp.src(path, { allowEmpty: true, read: false })
-		.pipe($.clean());
-}
-
-function filter(ext, isUnrestored) {
-	return $.filter(getFiles(ext), { restore: !isUnrestored });
-}
-
-function browserSyncInit(path) {
-	browserSync.init({
-		server: {
-			baseDir: path
-		}
-	});
-}
-
-function minifyHtml() {
-	return $.htmlmin({ collapseWhitespace: true, conservativeCollapse: true });
+this.html5Mode = html5Mode;
+
+const gulp = require('gulp'),
+	path = require('path'),
+	args = require('get-gulp-args')(),
+	mergeStream = require('merge-stream'),
+	mainBowerFiles = require('main-bower-files'),
+	$ = require('gulp-load-plugins')(),
+	injStr = $.injectString,
+	gulpSass = $.sass(require('sass')),
+	notifyError = $.notify.onError(error => error.message),
+	browserSync = require('browser-sync').create();
+
+let domain = undefined;
+
+const allFiles = getFiles(),
+	indexHtmlFile = 'index.html',
+	cssFilename = 'index',
+	cssFullFilename = cssFilename + '.css';
+let stylesFolder = 'styles/',
+	jsTemplatesFile = 'scripts/templates.js';
+
+const paths = {
+	src: 'src/',
+	tmp: '.tmp/',
+	dist: 'dist/'
+};
+paths.srcIndexHtml = paths.src + indexHtmlFile;
+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];
+
+const nl = '\n',
+	tab = '	';
+
+gulp.task('check', () => {
+	const pckg = require(path.resolve('package.json')),
+		domains = pckg.domains;
+	let domainIndex = args[0] || 'local';
+	if (domains) {
+		const domainAliases = pckg.domainAliases;
+		if (domainAliases) {
+			const alias = domainAliases[domainIndex];
+			if (alias)
+				domainIndex = alias;
+		}
+		domain = domains[domainIndex];
+	}
+	const isMatched = domain !== undefined;
+	return gulp.src(paths.src)
+		.pipe($.notify(isMatched ? `Matching domain: "${domainIndex}".` : 'No domain matched.'));
+});
+
+gulp.task('del', () => delFolder(paths.tmp));
+gulp.task('index-build', () => gulp.src(paths.srcIndexHtml).pipe(injStr.after('<!-- endbuild -->', nl + tab + `<link rel="stylesheet" href="${stylesFolder}${cssFullFilename}">`)).pipe($.inject(gulp.src(paths.srcJs).pipe($.angularFilesort()), { relative: true })).on('error', notifyError).pipe($.wiredep()).pipe($.useref()).pipe(gulp.dest(paths.tmp)));
+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))
+		.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);
+	}
+});
+gulp.task('fonts', () => gulp.src(mainBowerFiles()).pipe(filter(['eot', 'otf', 'svg', 'ttf', 'woff', 'woff2'], true)).pipe(gulp.dest(paths.tmp + 'fonts/')));
+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', gulp.series('del', 'check', gulp.parallel('index', 'styles', 'fonts', 'others', 'about')));
+gulp.task('browser', gulp.series('build:tmp', (cb) => {
+	browserSyncInit(paths.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.srcOthers, gulp.task('others'));
+	gulp.watch([paths.tmp + allFiles, '!' + paths.tmp + stylesFolder + cssFullFilename], function (cb) {
+		browserSync.reload();
+		cb();
+	});
+}));
+
+gulp.task('del:dist', () => delFolder(paths.dist));
+gulp.task('copy', gulp.series('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(minifyHtml()).pipe($.angularTemplatecache(jsTemplatesFile, { module: 'app', transformUrl: function (url) { return url.slice(1); } })).pipe(gulp.dest(paths.dist)));
+gulp.task('templates-clean', () => require('delete-empty')(paths.dist));
+gulp.task('templates', gulp.series('templates-build', 'templates-clean'));
+gulp.task('build', gulp.series('build:tmp', 'copy', 'templates', () => {
+	const indexHtmlFilter = filter('html'),
+		cssFilter = filter('css'),
+		jsFilter = filter('js'),
+		cssAndJsFilter = filter(['css', 'js']),
+		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(minifyHtml()).pipe(indexHtmlFilter.restore)
+		.pipe(cssFilter).pipe($.cssnano({ zindex: false })).pipe(cssFilter.restore)
+		.pipe(jsFilter).pipe($.ngAnnotate()).pipe($.terser()).pipe(jsFilter.restore)
+		.pipe(cssAndJsFilter).pipe($.rev()).pipe($.revDeleteOriginal()).pipe(cssAndJsFilter.restore)
+		.pipe($.revReplace())
+		.pipe(imgFilter).pipe($.imagemin()).pipe(imgFilter.restore)
+		.pipe(jsonFilter).pipe($.jsonmin()).pipe(jsonFilter.restore)
+		.pipe($.size({ showFiles: true }))
+		.pipe(gulp.dest(paths.dist));
+}));
+gulp.task('serve:dist', gulp.series('build', () => browserSyncInit(paths.dist)));
+
+gulp.task('default', gulp.task('serve'));
+
+function html5Mode() {
+	const pathPrefix = '/';
+	stylesFolder = pathPrefix + stylesFolder;
+	jsTemplatesFile = pathPrefix + jsTemplatesFile;
+}
+
+function getFiles(ext = '*') {
+	const isArray = typeof ext != 'string';
+	return '**/*.' + (isArray ? '{' : '') + (isArray ? ext.join() : ext) + (isArray ? '}' : '');
+}
+
+function delFolder(path) {
+	return gulp.src(path, { allowEmpty: true, read: false })
+		.pipe($.clean());
+}
+
+function filter(ext, isUnrestored) {
+	return $.filter(getFiles(ext), { restore: !isUnrestored });
+}
+
+function browserSyncInit(path) {
+	browserSync.init({
+		server: {
+			baseDir: path
+		}
+	});
+}
+
+function minifyHtml() {
+	return $.htmlmin({ collapseWhitespace: true, conservativeCollapse: true });
 }

package/package.json

@@ -1,63 +1,66 @@
-{
-  "name": "autofront",
-  "version": "2.1.1",
-  "description": "Automatisation of front-end by Gulp and Bower.",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/mvicens/autofront.git"
-  },
-  "keywords": [
-    "html",
-    "pug",
-    "css",
-    "less",
-    "sass",
-    "javascript",
-    "angularjs"
-  ],
-  "author": "Miquel Alejandro Vicens Dalmau",
-  "license": "ISC",
-  "bugs": {
-    "url": "https://github.com/mvicens/autofront/issues"
-  },
-  "homepage": "https://github.com/mvicens/autofront#readme",
-  "dependencies": {
-    "browser-sync": "^2.26.3",
-    "delete-empty": "^2.0.0",
-    "get-gulp-args": "^0.0.1",
-    "gulp": "^4.0.2",
-    "gulp-about": "^1.1.0",
-    "gulp-angular-filesort": "^1.2.1",
-    "gulp-angular-templatecache": "^2.2.3",
-    "gulp-clean": "^0.4.0",
-    "gulp-clean-dest": "^0.2.0",
-    "gulp-concat": "^2.6.1",
-    "gulp-cssnano": "^2.1.3",
-    "gulp-filter": "^5.1.0",
-    "gulp-htmlmin": "^4.0.0",
-    "gulp-imagemin": "^4.1.0",
-    "gulp-inject": "^4.3.2",
-    "gulp-inject-string": "^1.1.1",
-    "gulp-jsonmin": "^1.2.0",
-    "gulp-less": "^3.5.0",
-    "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",
-    "gulp-sass": "^5.0.0",
-    "gulp-size": "^3.0.0",
-    "gulp-terser": "^1.1.7",
-    "gulp-useref": "^3.1.6",
-    "gulp-wiredep": "^1.2.0",
-    "main-bower-files": "^2.13.1",
-    "merge-stream": "^1.0.1",
-    "sass": "^1.38.2"
-  }
-}
+{
+  "name": "autofront",
+  "version": "2.2.1",
+  "description": "Automatisation of front-end by Gulp and Bower.",
+  "main": "index.js",
+  "scripts": {
+    "serve": "gulp",
+    "serve:dist": "gulp serve:dist",
+    "build": "gulp build",
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/mvicens/autofront.git"
+  },
+  "keywords": [
+    "html",
+    "pug",
+    "css",
+    "less",
+    "sass",
+    "javascript",
+    "angularjs"
+  ],
+  "author": "Miquel Alejandro Vicens Dalmau",
+  "license": "ISC",
+  "bugs": {
+    "url": "https://github.com/mvicens/autofront/issues"
+  },
+  "homepage": "https://github.com/mvicens/autofront#readme",
+  "dependencies": {
+    "browser-sync": "^2.26.3",
+    "delete-empty": "^2.0.0",
+    "get-gulp-args": "^0.0.1",
+    "gulp": "^4.0.2",
+    "gulp-about": "^1.1.0",
+    "gulp-angular-filesort": "^1.2.1",
+    "gulp-angular-templatecache": "^2.2.3",
+    "gulp-clean": "^0.4.0",
+    "gulp-clean-dest": "^0.2.0",
+    "gulp-concat": "^2.6.1",
+    "gulp-cssnano": "^2.1.3",
+    "gulp-filter": "^5.1.0",
+    "gulp-htmlmin": "^4.0.0",
+    "gulp-imagemin": "^4.1.0",
+    "gulp-inject": "^4.3.2",
+    "gulp-inject-string": "^1.1.1",
+    "gulp-jsonmin": "^1.2.0",
+    "gulp-less": "^3.5.0",
+    "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",
+    "gulp-sass": "^5.0.0",
+    "gulp-size": "^3.0.0",
+    "gulp-terser": "^1.1.7",
+    "gulp-useref": "^3.1.6",
+    "gulp-wiredep": "^1.2.0",
+    "main-bower-files": "^2.13.1",
+    "merge-stream": "^1.0.1",
+    "sass": "^1.38.2"
+  }
+}