Merge branch 'master' into v3.x

Author: buddywinangun

config.js

@@ -20,7 +20,6 @@ const errorHandler = err => {
 
 // -- Validate Path
 
-const bannerProject = path.join(cli.cwd, 'banner.txt');
 const confProject = require(path.join(cli.cwd, 'config'));
 const dataProject = require(path.join(cli.cwd, 'package.json'));
 
@@ -45,7 +44,6 @@ module.exports = {
   //
 
   project: {
-    banner: bannerProject,
     data: dataProject,
     dir: cli.cwd,
     ...confProject,

lib/trim.js

@@ -2,7 +2,7 @@ const through = require('through2');
 
 module.exports = () => {
   return through.obj(function (file, enc, cb) {
-    let content = file.contents.toString('utf8');
+    let content = file.contents?.toString('utf8');
 
     content = '\n\n\n\n' + content + '\n\n\n\n';
     content = content.trim();

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@buddywinangun/gulp-xtend",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "description": "A Starter kit for building web projects with Gulp.js",
   "license": "MIT",
   "homepage": "https://github.com/buddywinangun/gulp-xtend#readme",

start/banner.txt

@@ -24,6 +24,18 @@ module.exports = {
     },
   },
 
+  //
+  // Banner Template | Append of banner in script js or css
+  //
+
+  banner: ['/**',
+    ' * <%= data.title %> v<%= data.version %> <%= "("+data.homepage+")" %>',
+    ' * Copyright ' + (new Date()).getFullYear() + ' <%= data.author.name %>',
+    ' * Licensed under <%= data.license %>',
+    ' */',
+    ''
+  ].join('\n'),
+
   //
   // Language Direction
   //

start/config.js

@@ -55,15 +55,10 @@ gulp.task('sass-compile', (done) => {
   if (!config.settings.sass) return done();
 
   const banner = {
-    text: stripIndent(
-      fs.readFileSync(sassOpts.compile.banner.text, 'utf8').trim()
-    ) + '\n\n',
+    text: sassOpts.compile.banner.text,
     data: sassOpts.compile.banner.data
   };
 
-  // theme.ext
-  let buildExt = '.css'; // .ext
-
   // Run tasks on all Sass files
   gulp.src(sassOpts.compile.src)
     .pipe(plumber(config.utils.errorHandler))
@@ -85,7 +80,7 @@ gulp.task('sass-compile', (done) => {
     ]))
     .pipe(replace('/*!', '/*'))
     .pipe(rename(function (p) {
-      p.extname = buildExt;
+      p.extname = '.css';
     }))
     .pipe(trim())
     .pipe(!config.utils.isProd ? noop() : cleancss({

tasks/sass.js

@@ -8,12 +8,10 @@
 
 const gulp = require('gulp');
 const sourcemaps = require("gulp-sourcemaps");
-const rename = require("gulp-rename");
 const noop = require("gulp-noop");
 const plumber = require("gulp-plumber");
 const path = require("path");
 const header = require("gulp-header");
-const glob = require('glob');
 const stripIndent = require('strip-indent');
 const fs = require("fs");
 const trim = require('../lib/trim');
@@ -45,14 +43,8 @@ const opts = config.paths.version(config.project, path);
 
 const jsOpts = {
 	compile: {
-		src: {
-			dir: path.join(opts.src, 'js', 'index.js'),
-			filename: 'index.js',
-		},
-		dest: {
-			dir: path.join(opts.build, config.project.paths.assets, 'js'),
-			filename: 'script.js',
-		},
+		src: path.join(opts.src, 'js'),
+		dest: path.join(opts.build, config.project.paths.assets, 'js'),
 		banner: {
 			text: config.project.banner,
 			data: config.project
@@ -69,29 +61,22 @@ gulp.task('script-compile', (done) => {
 	// Make sure this feature is activated before running
 	if (!config.settings.script) return done();
 
-	// index.ext
-	let srcExt = path.extname(jsOpts.compile.src.filename); // .ext
-	let srcName = path.basename(jsOpts.compile.src.filename, srcExt); // index
-	// script.ext
-	let buildExt = path.extname(jsOpts.compile.dest.filename); // .ext
-	let buildName = path.basename(jsOpts.compile.dest.filename, buildExt); // script
-
-	const variant = path.join(jsOpts.compile.src.dir, srcName + '-*' + srcExt);
-
-	const files = [
-		jsOpts.compile.src.dir,
-		...glob.sync(variant)
-	];
+	let files = [];
+	const fileList = fs.readdirSync(jsOpts.compile.src)
+	for (const file of fileList) {
+		const filePath = `${path.join(jsOpts.compile.src, file)}`
+		const srcExt = `${path.extname(file)}`; // .ext
+		if (fs.statSync(filePath).isFile() && srcExt === '.js') {
+			files.push(filePath)
+		}
+	}
 
 	const banner = {
-		text: stripIndent(
-			fs.readFileSync(jsOpts.compile.banner.text, 'utf8').trim()
-		) + '\n\n',
+		text: jsOpts.compile.banner.text,
 		data: jsOpts.compile.banner.data
 	};
 
 	const bundles = files.map(entry => {
-
 		const options = {
 			input: entry,
 			output: {
@@ -125,11 +110,6 @@ gulp.task('script-compile', (done) => {
 			.pipe(plumber(config.utils.errorHandler))
 			.pipe(source(path.basename(entry)))
 			.pipe(buffer())
-			.pipe(rename(function (p) {
-				p.basename = p.basename.replace(srcName + '-', buildName + '-');
-				p.basename = p.basename.replace(srcName, buildName);
-				p.extname = buildExt;
-			}))
 			.pipe(trim())
 			.pipe(!config.utils.isProd ? noop() : terser({
 				mangle: true,
@@ -146,7 +126,7 @@ gulp.task('script-compile', (done) => {
 				loadMaps: true
 			}))
 			.pipe(config.utils.isProd ? noop() : sourcemaps.write('./maps'))
-			.pipe(gulp.dest(jsOpts.compile.dest.dir, {
+			.pipe(gulp.dest(jsOpts.compile.dest, {
 				overwrite: true
 			}));
 	});

tasks/script.js

@@ -34,10 +34,13 @@ gulp.task('static-compile', done => {
   if (!config.settings.static) return done();
 
   // Copy static files
-  return gulp.src(staticOpts.compile.src)
+  gulp.src(staticOpts.compile.src)
     .pipe(gulp.dest(staticOpts.compile.dest, {
       overwrite: true
     }));
+
+  // Signal completion
+  done();
 });
 
 gulp.task('static-tasks', gulp.series(

tasks/static.js

@@ -35,11 +35,14 @@ gulp.task('svgs-compile', done => {
   if (!config.settings.svgs) return done();
 
   // Optimize SVG files
-  return gulp.src(svgOpts.compile.src)
+  gulp.src(svgOpts.compile.src)
     .pipe(svgmin())
     .pipe(gulp.dest(svgOpts.compile.dest, {
       overwrite: true
     }));
+
+  // Signal completion
+  done();
 });
 
 gulp.task('svgs-tasks', gulp.series(