sdc-build-wp 3.2.4 → 3.4.0

package/index.js

@@ -4,8 +4,11 @@ import project from './lib/project.js';
 import parseArgs from 'minimist';
 const argv = parseArgs(process.argv.slice(2));
 import chokidar from 'chokidar';
-import { glob } from 'glob';
+import { glob, globSync } from 'glob';
+import { existsSync } from 'node:fs';
+import { Tail } from 'tail';
 
+import log from './lib/logging.js';
 import bustCache from './lib/bustCache.js';
 import { buildSass, buildSassTheme } from './lib/style.js';
 import buildJS from './lib/scripts.js';
@@ -22,32 +25,56 @@ let chokidarOpts = {
 };
 
 let sassGlobPath = project.package?.sdc?.sassGlobPath || project.path + '{/_src/style,/blocks}/**/*.scss';
-let sassGlob = glob.sync(sassGlobPath, {
+let sassGlob = globSync(sassGlobPath, {
 	ignore: [
 		project.path + '/_src/style/partials/_theme.scss'
 	]
 });
 let jsGlobPath = project.package?.sdc?.jsGlobPath || project.path + '/_src/scripts/**/*.js';
-let jsGlob = glob.sync(jsGlobPath, {
+let jsGlob = globSync(jsGlobPath, {
 	ignore: []
 });
 let blockGlobPath = project.package?.sdc?.blockGlobPath || project.path + '/blocks/*';
-let blockGlob = glob.sync(blockGlobPath);
+let blockGlob = globSync(blockGlobPath);
 
 function bustFunctionsCache() {
 	bustCache(project.path + '/functions.php');
 }
 
 function frontrunImages() {
-	[project.path + '/_src/images/', project.path + '/_src/images/**/*/'].forEach((block) => {
-		glob(block, {}, function(err, directory) {
-			directory.forEach((dir) => {
-				buildImages(dir);
-			});
+	[
+		project.path + '/_src/images/',
+		project.path + '/_src/images/**/*/'
+	].forEach((block) => {
+		const imageDirectories = globSync(block);
+		imageDirectories.forEach((dir) => {
+			buildImages(dir);
 		});
 	});
 }
 
+function runBlocks() {
+	for (var block of blockGlob) {
+		buildBlock(block);
+	}
+	bustFunctionsCache();
+}
+
+function runSass() {
+	buildSassTheme();
+	for (var block of filesSass) {
+		buildSass(block.file, block.name, sassGlob);
+		bustFunctionsCache();
+	}
+}
+
+function runJS() {
+	for (var block of filesJS) {
+		buildJS(block.file, block.name, jsGlob);
+		bustFunctionsCache();
+	}
+}
+
 let entries = {};
 for (const [name, files] of Object.entries(project.package.sdc.entries)) {
 	entries[name] = [];
@@ -55,7 +82,7 @@ for (const [name, files] of Object.entries(project.package.sdc.entries)) {
 		entries[name].push(project.path + file);
 	});
 }
-let sassBlocksGlob = glob.sync(project.path + '/blocks/*/*.scss');
+let sassBlocksGlob = globSync(project.path + '/blocks/*/*.scss');
 for (var filename of sassBlocksGlob) {
 	entries[`blocks/${path.basename(path.dirname(filename))}/style`] = [ filename ];
 }
@@ -82,64 +109,36 @@ for (const [name, files] of Object.entries(entries)) {
 	});
 }
 
-function runBlocks() {
-	for (var block of blockGlob) {
-		buildBlock(block);
-	}
-	bustFunctionsCache();
-}
-
 runBlocks();
+runSass();
+runJS();
+frontrunImages()
+buildFonts(project.path + '/_src/fonts');
+
 if (argv.watch) {
+	buildBrowserSync();
 	chokidar.watch(blockGlob, chokidarOpts).on('all', (event, path) => {
 		runBlocks();
 	});
-}
-
-function runSass() {
-	buildSassTheme();
-	for (var block of filesSass) {
-		buildSass(block.file, block.name, sassGlob);
-		bustFunctionsCache();
-	}
-}
-
-runSass();
-if (argv.watch) {
 	chokidar.watch(sassGlob, chokidarOpts).on('all', (event, path) => {
 		runSass();
 	});
-}
-
-function runJS() {
-	for (var block of filesJS) {
-		buildJS(block.file, block.name, jsGlob);
-		bustFunctionsCache();
-	}
-}
-
-runJS();
-if (argv.watch) {
-	chokidar.watch(jsGlob, chokidarOpts).on('all', (event, path) => {
-		runJS();
-	});
-}
-
-if (argv.watch) {
 	chokidar.watch(project.path + '/theme.json', chokidarOpts).on('all', (event, path) => {
 		runSass();
 	});
-}
-
-frontrunImages()
-if (argv.watch) {
+	chokidar.watch(jsGlob, chokidarOpts).on('all', (event, path) => {
+		runJS();
+	});
 	chokidar.watch(project.path + '/_src/images/**/*', chokidarOpts).on('all', (event, path) => {
 		frontrunImages();
 	});
-}
-
-buildFonts(project.path + '/_src/fonts');
-
-if (argv.watch) {
-	buildBrowserSync();
+	let errorLogPath = process.env.ERROR_LOG_PATH || project.package.sdc?.error_log_path || '../../../../../logs/php/error.log';
+	if (existsSync(errorLogPath)) {
+		let errorLogTail = new Tail(errorLogPath);
+		errorLogTail.on('line', function(data) {
+			log('php', data);
+		});
+	} else {
+		log('info', `Cannot find error log @ ${errorLogPath}. Skipping watching php error logs`);
+	}
 }

package/lib/browsersync.js

@@ -27,6 +27,14 @@ const buildBrowserSync = () => {
 				bottom: '0',
 				borderRadius: '5px 0px 0px'
 			}
+		},
+		snippetOptions: {
+			rule: {
+				match: /<\/body>/i,
+				fn: function (snippet, match) {
+					return snippet + match;
+				}
+			}
 		}
 	});
 };

package/lib/images.js

@@ -7,15 +7,16 @@ import imageminSvgo from 'imagemin-svgo';
 
 const buildImages = async (images) => {
 	let timerStart = Date.now();
-	const files = await imagemin([images + '*'], {
-		destination: project.path + '/dist/images/' + (images.replace(project.path + '/_src/images/', '')),
+	let dest = images.replace('_src/images', 'dist/images');
+	const files = await imagemin([images + '/*'], {
+		destination: dest,
 		plugins: [
 			imageminJpegtran(),
 			imageminPngquant(),
 			imageminSvgo()
 		]
 	});
-	log('success', `Built /dist/images/${images.replace(project.path + '/_src/images/', '')} in ${Date.now() - timerStart}ms`);
+	log('success', `Built ${dest.replace(project.path, '')} (${files.length} image${files.length == 1 ? '' : 's'}) in ${Date.now() - timerStart}ms`);
 };
 
 export default buildImages;

package/lib/logging.js

@@ -32,6 +32,13 @@ function log(type, ...messages) {
 				...messages
 			);
 			break;
+		case 'php':
+			console.log.call(
+				console,
+				chalk.blue('ℹ'),
+				...messages
+			);
+			break;
 		case 'info':
 		default:
 			console.log.call(

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "sdc-build-wp",
-	"version": "3.2.4",
+	"version": "3.4.0",
 	"description": "Custom WordPress build process.",
 	"engines": {
 		"node": "^20"
@@ -41,6 +41,7 @@
 		"postcss-scss": "^4.0.9",
 		"postcss-sort-media-queries": "^5.2.0",
 		"sass": "^1.75.0",
-		"stylelint": "^16.4.0"
+		"stylelint": "^16.4.0",
+		"tail": "^2.2.6"
 	}
 }