sdc-build-wp 4.0.2 → 4.1.1

package/eslint.config.js

@@ -2,7 +2,7 @@ export default [
 	{
 		languageOptions: {
 			parserOptions: {
-				ecmaVersion: 6,
+				ecmaVersion: "latest",
 				sourceType: "module",
 				ecmaFeatures: {
 					jsx: true,

package/index.js

@@ -4,12 +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, globSync } from 'glob';
+import { glob, readdir } from 'node:fs/promises';
 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';
 import { default as buildPHP, shouldPHPLint } from './lib/php.js';
@@ -18,149 +17,244 @@ import buildImages from './lib/images.js';
 import buildFonts from './lib/fonts.js';
 import buildBrowserSync from './lib/browsersync.js';
 
+let paths = {
+	theme: {
+		json: `${project.path}/theme.json`,
+		scss: `${project.path}/_src/style/partials/_theme.scss`
+	},
+	nodeModules: `${project.path}/node_modules`,
+	composer: {
+		vendor: `${project.path}/vendor`
+	},
+	images: project.package?.sdc?.imagesPath || `${project.path}/_src/images`,
+	errorLog: process.env.ERROR_LOG_PATH || project.package.sdc?.error_log_path || '../../../../../logs/php/error.log'
+};
+
 let chokidarOpts = {
 	ignoreInitial: true,
 	ignored: [
-		project.path + '/node_modules',
-		project.path + '/vendor',
-		project.path + '/blocks/*/build/**/*'
+		paths.nodeModules,
+		paths.composer.vendor,
+		paths.theme.scss
 	]
 };
 
-let phpGlobPath = project.package?.sdc?.phpGlobPath || project.path + '/**/*.php';
-let phpGlob = globSync(phpGlobPath, {
-	ignore: [
-		project.path + '/node_modules',
-		project.path + '/vendor'
-	]
-});
-let sassGlobPath = project.package?.sdc?.sassGlobPath || project.path + '{/_src/style,/blocks}/**/*.scss';
-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 = globSync(jsGlobPath, {
-	ignore: []
-});
-let blockGlobPath = project.package?.sdc?.blockGlobPath || project.path + '/blocks/*';
-let blockGlob = globSync(blockGlobPath);
-
-function bustFunctionsCache() {
-	bustCache(project.path + '/functions.php');
-}
+let globs = {};
+let entries = {};
+let filesSass = [];
+let filesJS = [];
+
+let builds = argv.builds ? argv.builds.split(',') : [
+	'sass',
+	'js',
+	'blocks',
+	'images',
+	'fonts',
+	'php'
+];
 
-function frontrunImages() {
-	[
-		project.path + '/_src/images/',
-		project.path + '/_src/images/**/*/'
-	].forEach((block) => {
-		const imageDirectories = globSync(block);
-		imageDirectories.forEach((dir) => {
-			buildImages(dir);
+(async() => {
+
+	if (builds.includes('sass')) {
+		globs.sass = await Array.fromAsync(
+			glob(project.package?.sdc?.sassGlobPath ||
+			`${project.path}{/_src/style,/blocks}/**/*.scss`)
+		);
+	}
+	if (builds.includes('js')) {
+		globs.js = await Array.fromAsync(
+			glob(project.package?.sdc?.jsGlobPath ||
+			`${project.path}/_src/scripts/**/*.js`)
+		);
+	}
+	if (builds.includes('blocks')) {
+		globs.blocks = await Array.fromAsync(
+			glob(`${project.path}/blocks/*`)
+		);
+		globs.blocksSass = await Array.fromAsync(
+			glob(`${project.path}/blocks/*/src/*.scss`)
+		);
+	}
+	if (builds.includes('images')) {
+		globs.images = await Array.fromAsync(
+			glob(project.package?.sdc?.imagesPath ||
+			`${paths.images}/**/*`)
+		);
+		globs.imageDirectories = [
+			paths.images,
+			...await getAllSubdirectories(paths.images)
+		];
+	}
+	if (builds.includes('php')) {
+		globs.php = await Array.fromAsync(
+			glob(project.package?.sdc?.jsGlobPath ||
+			`${project.path}/**/*.php`)
+		);
+		globs.blocksPHP = await Array.fromAsync(
+			glob(`${project.path}/blocks/*/build/*.php`)
+		);
+		chokidarOpts.ignored = [
+			...chokidarOpts.ignored,
+			...globs.blocksPHP
+		];
+	}
+
+	for (const [name, files] of Object.entries(project.package.sdc.entries)) {
+		entries[name] = [];
+		files.forEach(function(file) {
+			entries[name].push(project.path + file);
 		});
+	}
+	// for (var filename of globs.blocksSass) {
+	// 	entries[`blocks/${path.basename(path.dirname(filename))}/style`] = [ filename ];
+	// }
+
+	for (const [name, files] of Object.entries(entries)) {
+		files.forEach(function(file) {
+			switch (path.parse(file).ext) {
+				case '.scss':
+					if (builds.includes('sass')) {
+						filesSass.push({
+							'name': name,
+							'file': file
+						});
+					}
+					break;
+				case '.js':
+					if (builds.includes('js')) {
+						filesJS.push({
+							'name': name,
+							'file': file
+						});
+					}
+					break;
+			}
+		});
+	}
+
+	if (builds.includes('sass')) {
+		await runSass(true);
+	}
+	if (builds.includes('js')) {
+		await runJS();
+	}
+	if (builds.includes('blocks')) {
+		await runBlocks();
+	}
+	if (builds.includes('images')) {
+		await frontrunImages();
+	}
+	if (builds.includes('fonts')) {
+		await buildFonts(project.path + '/_src/fonts');
+	}
+	// if (builds.includes('php') && shouldPHPLint) {
+	// 	await runPHP(null, 'warn'); // this errors "Fatal error: Allowed memory size"
+	// }
+
+	if (argv.watch) {
+
+		buildBrowserSync();
+
+		if (builds.includes('sass')) {
+			chokidar.watch([
+				...[paths.theme.json],
+				globs.sass
+			], {
+				...chokidarOpts
+			}).on('all', (event, path) => {
+				runSass(path == paths.theme.json);
+			});
+		}
+
+		if (builds.includes('js')) {
+			chokidar.watch(globs.js, {
+				...chokidarOpts
+			}).on('all', (event, path) => {
+				runJS();
+			});
+		}
+
+		if (builds.includes('blocks')) {
+			for (let block of globs.blocks) {
+				chokidar.watch(`${block}/src`, {
+					...chokidarOpts
+				}).on('all', (event, path) => {
+					runBlocks(block);
+				});
+			}
+		}
+
+		if (builds.includes('images')) {
+			chokidar.watch(paths.images, chokidarOpts).on('all', (event, path) => {
+				frontrunImages();
+			});
+		}
+
+		if (builds.includes('php') && shouldPHPLint) {
+			chokidar.watch(globs.php, {
+				...chokidarOpts
+			}).on('all', (event, path) => {
+				runPHP(path);
+			});
+		}
+
+		if (existsSync(paths.errorLog)) {
+			let errorLogTail = new Tail(paths.errorLog);
+			errorLogTail.on('line', function(data) {
+				log('php', data);
+			});
+		} else {
+			log('info', `Cannot find error log @ ${paths.errorLog}. Skipping watching php error logs`);
+		}
+	}
+
+})();
+
+async function frontrunImages() {
+	globs.imageDirectories.forEach(directory => {
+		buildImages(directory);
 	});
 }
 
-function runBlocks() {
-	for (var block of blockGlob) {
-		buildBlock(block);
+async function runBlocks(singleBlock) {
+	if (singleBlock) {
+		await buildBlock(singleBlock);
+	} else {
+		for (var block of globs.blocks) {
+			await buildBlock(block);
+		}
 	}
-	bustFunctionsCache();
 }
 
-function runSass() {
-	buildSassTheme();
+async function runSass(buildTheme = true) {
+	if (buildTheme) {
+		await buildSassTheme();
+	}
 	for (var block of filesSass) {
-		buildSass(block.file, block.name, sassGlob);
-		bustFunctionsCache();
+		await buildSass(block.file, block.name, globs.sass);
 	}
 }
 
-function runJS() {
+async function runJS() {
 	for (var block of filesJS) {
-		buildJS(block.file, block.name, jsGlob);
-		bustFunctionsCache();
+		await buildJS(block.file, block.name, globs.js);
 	}
 }
 
-function runPHP(file, method) {
-	buildPHP(file, method);
-}
-
-let entries = {};
-for (const [name, files] of Object.entries(project.package.sdc.entries)) {
-	entries[name] = [];
-	files.forEach(function(file) {
-		entries[name].push(project.path + file);
-	});
-}
-let sassBlocksGlob = globSync(project.path + '/blocks/*/*.scss');
-for (var filename of sassBlocksGlob) {
-	entries[`blocks/${path.basename(path.dirname(filename))}/style`] = [ filename ];
+async function runPHP(file, method) {
+	await buildPHP(file, method);
 }
 
-let filesSass = [];
-let filesJS = [];
-
-for (const [name, files] of Object.entries(entries)) {
-	files.forEach(function(file) {
-		switch (path.parse(file).ext) {
-			case '.scss':
-				filesSass.push({
-					'name': name,
-					'file': file
-				});
-				break;
-			case '.js':
-				filesJS.push({
-					'name': name,
-					'file': file
-				});
-				break;
+async function getAllSubdirectories(dir) {
+	let subdirectories = [];
+	const subdirectoriesEntries = await readdir(dir, { withFileTypes: true });
+	for (const subdirectoriesEntry of subdirectoriesEntries) {
+		if (subdirectoriesEntry.isDirectory()) {
+			const subdirPath = path.join(dir, subdirectoriesEntry.name);
+			subdirectories.push(subdirPath);
+			const nestedSubdirs = await getAllSubdirectories(subdirPath);
+			subdirectories = subdirectories.concat(nestedSubdirs);
 		}
-	});
-}
-
-// if (shouldPHPLint) {
-// 	runPHP(null, 'warn'); // this errors "Fatal error: Allowed memory size"
-// }
-runBlocks();
-runSass();
-runJS();
-frontrunImages()
-buildFonts(project.path + '/_src/fonts');
-
-if (argv.watch) {
-	buildBrowserSync();
-	chokidar.watch(blockGlob, chokidarOpts).on('all', (event, path) => {
-		runBlocks();
-	});
-	chokidar.watch(sassGlob, chokidarOpts).on('all', (event, path) => {
-		runSass();
-	});
-	chokidar.watch(project.path + '/theme.json', chokidarOpts).on('all', (event, path) => {
-		runSass();
-	});
-	chokidar.watch(jsGlob, chokidarOpts).on('all', (event, path) => {
-		runJS();
-	});
-	chokidar.watch(project.path + '/_src/images/**/*', chokidarOpts).on('all', (event, path) => {
-		frontrunImages();
-	});
-	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`);
-	}
-	if (shouldPHPLint) {
-		chokidar.watch(phpGlob, chokidarOpts).on('change', (path) => {
-			runPHP(path);
-		});
 	}
+	return subdirectories;
 }

package/lib/blocks.js

@@ -6,6 +6,8 @@ import { stat } from 'fs/promises';
 import { spawn } from 'child_process';
 import process from 'process';
 
+let activeEntry;
+
 function cmd(...command) {
   let p = spawn(command[0], command.slice(1), {
 		shell: true
@@ -14,13 +16,13 @@ function cmd(...command) {
     p.stdout.on('data', (x) => {
 			if (x.toString().includes('Error:')) {
 				process.stdout.write(x.toString());
-				log('error', `Failed building blocks - See above error.`);
+				log('error', `Failed building ${activeEntry.replace(project.path, '')} block - See above error.`);
 			}
     });
     p.stderr.on('data', (x) => {
 			if (x.toString().includes('Error:')) {
 				process.stderr.write(x.toString());
-				log('error', `Failed building blocks - See above error.`);
+				log('error', `Failed building ${activeEntry.replace(project.path, '')} block - See above error.`);
 			}
     });
     p.on('exit', (code) => {
@@ -30,6 +32,7 @@ function cmd(...command) {
 }
 
 const buildBlock = async (entry) => {
+	activeEntry = entry;
 	let workingBlockJson = null;
 	let potentialBlockJsonLocations = [
 		`${entry}/src/block.json`,
@@ -50,11 +53,10 @@ const buildBlock = async (entry) => {
 	}
 	let timerStart = Date.now();
 	let cmds = [`build`];
-	for (var file of (await fs.readdir(`${entry}/src`)).filter(file => path.extname(file) == '.js')) {
-		cmds.push(`src/${file}`);
-	}
+	cmds.push(`--source-path=.${entry.replace(project.path, '')}/src`);
+	cmds.push(`--output-path=.${entry.replace(project.path, '')}/build`);
 	cmds.push('--webpack-copy-php');
-	await cmd(`cd ${entry} && ${project.path}/node_modules/@wordpress/scripts/bin/wp-scripts.js`, ...cmds);
+	await cmd(`${project.path}/node_modules/@wordpress/scripts/bin/wp-scripts.js`, ...cmds);
 	log('success', `Built ${entry.replace(project.path, '')} in ${Date.now() - timerStart}ms`);
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "sdc-build-wp",
-	"version": "4.0.2",
+	"version": "4.1.1",
 	"description": "Custom WordPress build process.",
 	"engines": {
 		"node": ">=20"
@@ -27,11 +27,10 @@
 		"autoprefixer": "^10.4.20",
 		"browser-sync": "^3.0.3",
 		"chalk": "^5.4.1",
-		"chokidar": "^3.6.0",
+		"chokidar": "^4.0.3",
 		"esbuild": "^0.25.0",
 		"eslint": "^9.21.0",
 		"fs-extra": "^11.3.0",
-		"glob": "^11.0.1",
 		"imagemin": "^9.0.0",
 		"imagemin-jpegtran": "^8.0.0",
 		"imagemin-pngquant": "^10.0.0",

package/lib/bustCache.js

@@ -1,14 +0,0 @@
-import fs from 'fs';
-
-const bustCache = (file) => {
-	fs.readFile(file, 'utf8', function (err, data) {
-		if (err) { return console.log(err); }
-		if (!data.includes('$cacheVersion')) { return; }
-		var result = data.replace(/(\$cacheVersion\ \=\ \')(.*)(\'\;)/g, "$1" + new Date().getTime() + "$3");
-		fs.writeFile(file, result, 'utf8', function (err) {
-			if (err) return console.log(err);
-		});
-	});
-};
-
-export default bustCache;