sdc-build-wp 5.3.0 → 5.3.2

package/lib/build.js

@@ -39,7 +39,7 @@ export async function build(watch = false) {
 
 		promisesBuilds.push(
 			project.components[build].init().catch(error => {
-				console.error(error);
+				log(null, error);
 				log('error', `Failed to initialize ${build} component`);
 				return { failed: true, component: build, error };
 			})

package/lib/components/blocks.js

@@ -156,7 +156,7 @@ export default class BlocksComponent extends BaseComponent {
 
 			await this.updateBuildCache(workingBlockJson, cacheOutputFile, dependencies);
 		} catch (error) {
-			console.error(error.stdout || error.stderr || error.message);
+			this.log(null, error.stdout || error.stderr || error.message);
 			this.log('error', `Failed building ${entryLabel} block - See above error.`);
 			return false;
 		}
@@ -183,8 +183,8 @@ export default class BlocksComponent extends BaseComponent {
 			if (this.watcher) {
 				this.watcher.add([`${blockPath}/src`, `${blockPath}/src/**/*`]);
 			}
-			this.build(blockPath).catch(err => {
-				console.error(err);
+			this.build(blockPath).catch(error => {
+				this.log(null, error);
 				this.log('error', `Failed initial build for new block ${blockPath}`);
 			});
 		}
@@ -290,7 +290,7 @@ export default class BlocksComponent extends BaseComponent {
 						if (path.endsWith('.js')) {
 							if (!this.project.components.scripts.isBuilding) {
 								this.project.components.scripts.lint(path).catch(lintError => {
-									console.error(lintError);
+									this.log(null, lintError);
 									this.log('warn', `Linting failed for ${path}`);
 								});
 							}

package/lib/components/cache.js

@@ -8,7 +8,7 @@ export default class CacheComponent extends BaseComponent {
 	constructor() {
 		super();
 		this.description = 'Build caching';
-		this.cacheDir = `${this.project.path}/.sdc-build-wp/cache`;
+		this.cacheDir = this.project.cacheDir;
 		this.manifestPath = `${this.cacheDir}/manifest.json`;
 		this.manifest = {};
 		this.hashCache = new Map();
@@ -47,6 +47,7 @@ export default class CacheComponent extends BaseComponent {
 
 	async ensureGitignore() {
 		const gitignorePath = path.join(this.project.path, '.gitignore');
+		const cacheIgnoreEntry = `${path.basename(this.project.sdcDir)}/${path.basename(this.cacheDir)}/`;
 
 		try {
 			let gitignoreContent = '';
@@ -60,16 +61,16 @@ export default class CacheComponent extends BaseComponent {
 			}
 
 			const lines = gitignoreContent.split('\n');
-			let hasSDCBuild = lines.some(line => line.trim() === '.sdc-build-wp/cache');
+			let hasSDCBuild = lines.some(line => line.trim() === cacheIgnoreEntry);
 			let needsUpdate = false;
 
 			if (!hasSDCBuild) {
 				if (gitignoreContent && !gitignoreContent.endsWith('\n')) {
 					gitignoreContent += '\n';
 				}
-				gitignoreContent += '.sdc-build-wp/cache\n';
+				gitignoreContent += `${cacheIgnoreEntry}\n`;
 				needsUpdate = true;
-				this.log('info', 'Added .sdc-build-wp/cache to .gitignore');
+				this.log('info', `Added ${cacheIgnoreEntry} to .gitignore`);
 			}
 
 			if (needsUpdate || !gitignoreExists) {
@@ -277,7 +278,7 @@ export default class CacheComponent extends BaseComponent {
 	async watch() {
 		this.watcher = this.chokidar.watch([
 			`${this.project.path}/**/*`,
-			`!${this.project.path}/.sdc-build-wp/**/*`,
+			`!${this.project.sdcDir}/**/*`,
 			`!${this.project.paths.nodeModules}/**/*`,
 			`!${this.project.paths.composer.vendor}/**/*`,
 			`!${this.project.path}/.git/**/*`

package/lib/components/errors.js

@@ -1,4 +1,5 @@
 import BaseComponent from './base.js';
+import path from 'path';
 import fs from 'fs-extra';
 import { Tail } from 'tail';
 
@@ -23,6 +24,11 @@ export default class ErrorsComponent extends BaseComponent {
 
 	async watch() {
 		let component = this;
+		try {
+			await fs.access(this.project.paths.errorLog);
+		} catch {
+			await fs.ensureFile(path.resolve(this.project.paths.errorLog));
+		}
 		try {
 			await fs.access(this.project.paths.errorLog);
 			new Tail(this.project.paths.errorLog).on('line', function(data) {

package/lib/components/fonts.js

@@ -27,7 +27,7 @@ export default class FontsComponent extends BaseComponent {
 			if (fontsDir.length == 0) { throw new Error('No files present'); }
 			await fs.copy(entry, `${this.project.path}${entryLabel}`);
 			entryLabel += ` (${fontsDir.filter(file => !file.startsWith('.')).length} files)`;
-		} catch(error) {
+		} catch (error) {
 			this.log('error', `${error} at ${entry.replace(this.project.path, '')}/. Skipping font copy`);
 			return false;
 		}

package/lib/components/html.js

@@ -78,7 +78,7 @@ export default class HTMLComponent extends BaseComponent {
 				entryLabel = `${formattedCount} html file${formattedCount > 1 ? 's' : ''}`;
 			}
 		} catch (error) {
-			console.error(error);
+			this.log(null, error);
 			this.log('error', `Failed formatting ${entryLabel.replace(this.project.path, '')} - ${error.message}`);
 			return false;
 		}

package/lib/components/images.js

@@ -58,7 +58,7 @@ export default class ImagesComponent extends BaseComponent {
 				}
 				convertedImagesCount++;
 			} catch (error) {
-				console.error(error);
+				this.log(null, error);
 				this.log('error', `Failed optimizing ${filePath.replace(this.project.path, '')} - See above error.`);
 			}
 

package/lib/components/php.js

@@ -29,7 +29,7 @@ export default class PHPComponent extends BaseComponent {
 				this.log('warn', 'PHP syntax checker not found. Skipping syntax check.');
 				return true;
 			}
-			console.error(error.stderr.replace(this.project.path, ''));
+			this.log(null, error.stderr.replace(this.project.path, ''));
 			this.log('error', `Failed to validate ${entry.replace(this.project.path, '')} - See above error.`);
 			return false;
 		}
@@ -93,7 +93,7 @@ export default class PHPComponent extends BaseComponent {
 					)
 				)
 			) {
-				console.error(error.stderr?.length ? error.stderr : error.stdout);
+				this.log(null, error.stderr?.length ? error.stderr : error.stdout);
 				this.log('error', `Failed linting ${entryLabel.replace(this.project.path, '')} - See above error.`);
 				return false;
 			}

package/lib/components/scripts.js

@@ -2,7 +2,6 @@ import BaseComponent from './base.js';
 import * as esbuild from 'esbuild';
 import { ESLint } from 'eslint';
 import * as eslintConfig from '../../eslint.config.js';
-import tui from '../tui.js';
 
 export default class ScriptsComponent extends BaseComponent {
 
@@ -36,11 +35,7 @@ export default class ScriptsComponent extends BaseComponent {
 				throw thisLint;
 			}
 		} catch (error) {
-			if (tui.isInitialized) {
-				tui.log(String(error.stack || error));
-			} else {
-				console.error(error);
-			}
+			this.log(null, error);
 			this.log('error', `Failed linting ${entry.replace(`${this.project.path}/${this.project.paths.src.src}/${this.project.paths.src.scripts}/`, '')} - See above error.`);
 			return false;
 		}
@@ -64,6 +59,7 @@ export default class ScriptsComponent extends BaseComponent {
 				globalName: 'sdcBuild',
 				treeShaking: true,
 				entryPoints: [entry],
+				logLevel: 'silent',
 				bundle: true,
 				minify: true,
 				outdir: `${this.project.paths.dist}/${this.project.paths.src.scripts}/`,
@@ -77,11 +73,7 @@ export default class ScriptsComponent extends BaseComponent {
 
 			await this.updateBuildCache(entry, outFile, dependencies);
 		} catch (error) {
-			if (tui.isInitialized) {
-				tui.log(String(error.stack || error));
-			} else {
-				console.error(error);
-			}
+			this.log(null, String(error.message || error.stack || error));
 			this.log('error', `Failed building ${entryLabel} - See above error.`);
 			return false;
 		}
@@ -112,11 +104,7 @@ export default class ScriptsComponent extends BaseComponent {
 					await this.checkAndRebuildAffectedBlocks(path);
 				}
 			} catch (error) {
-				if (tui.isInitialized) {
-					tui.log(String(error.stack || error));
-				} else {
-					console.error(error);
-				}
+				this.log(null, String(error.stack || error));
 				this.log('error', `Failed to process scripts`);
 			}
 		});
@@ -134,11 +122,7 @@ export default class ScriptsComponent extends BaseComponent {
 					affectedBlocks.add(blockPath);
 				}
 			} catch (error) {
-				if (tui.isInitialized) {
-					tui.log(String(error.stack || error));
-				} else {
-					console.error(error);
-				}
+				this.log(null, String(error.stack || error));
 			}
 		}
 
@@ -168,23 +152,11 @@ export default class ScriptsComponent extends BaseComponent {
 			const formatterOutput = formatter.format(lintresults);
 			if (formatterOutput) {
 				const cleanedOutput = formatterOutput.replace(`${this.project.path}/${this.project.paths.src.src}/${this.project.paths.src.scripts}/`, '');
-				if (tui.isInitialized) {
-					cleanedOutput.split('\n').forEach(line => {
-						if (line.trim()) {
-							tui.log(line);
-						}
-					});
-				} else {
-					console.log(cleanedOutput);
-				}
+				this.log(null, cleanedOutput)
 			}
 			return true;
 		} catch (error) {
-			if (tui.isInitialized) {
-				tui.log(String(error.stack || error));
-			} else {
-				console.error(error);
-			}
+			this.log(null, error.stack || error);
 			return error;
 		}
 	}

package/lib/components/server.js

@@ -16,7 +16,7 @@ export default class ServerComponent extends BaseComponent {
 		this.server = create('SDC WP Build Server');
 		this.watchedFiles = [];
 		this.ignoredFiles = [
-			`.sdc-build-wp/cache/**`,
+			`${this.project.cacheDir}/**`,
 			`node_modules/**`,
 			`vendor/**/*`,
 			`**/*.map`

package/lib/components/style.js

@@ -84,12 +84,12 @@ export default class StyleComponent extends BaseComponent {
 			}
 			try {
 				await fs.writeFile(this.project.paths.theme.scss, themeFileData);
-			} catch(error) {
-				console.error(error);
+			} catch (error) {
+				this.log(null, error);
 				this.log('error', `Failed to write auto-generated _theme.scss - See above error.`);
 			}
-		} catch(error) {
-			console.error(error);
+		} catch (error) {
+			this.log(null, error);
 			this.log('error', `Failed to read theme.json - See above error.`);
 		}
 	}
@@ -110,7 +110,7 @@ export default class StyleComponent extends BaseComponent {
 
 		try {
 			await fs.access(`${this.project.path}/${this.project.paths.dist}/${this.project.paths.src.style}`);
-		} catch(error) {
+		} catch (error) {
 			await fs.mkdir(`${this.project.path}/${this.project.paths.dist}/${this.project.paths.src.style}`, { recursive: true });
 		}
 
@@ -123,7 +123,7 @@ export default class StyleComponent extends BaseComponent {
 				fix: true
 			});
 			if (stylelinted.errored) {
-				console.error(stylelinted.report);
+				this.log(null, stylelinted.report);
 				throw Error('Linting error');
 			}
 
@@ -162,8 +162,8 @@ export default class StyleComponent extends BaseComponent {
 			thisClass.end({
 				itemLabel: entryLabel
 			});
-		} catch(error) {
-			console.error(error);
+		} catch (error) {
+			this.log(null, error);
 			this.log('error', `Failed building ${entryLabel} - See above error.`);
 			return false;
 		}

package/lib/config-validator.js

@@ -75,8 +75,8 @@ function validateConfig(config) {
 			}
 		}
 		return true;
-	} catch (error) {``
-		console.error(error);
+	} catch (error) {
+		log(null, error);
 		log('error', `Configuration validation failed`);
 		return false;
 	}

package/lib/help.js

@@ -1,8 +1,9 @@
 import project from './project.js';
 import chalk from 'chalk';
+import log from './logging.js';
 
 export default function() {
-	console.log(`
+	log(null, `
 ${chalk.bold.blue('SDC Build WP')} - Custom WordPress build process
 
 ${chalk.yellow('Usage:')} sdc-build-wp [options] [arguments]
@@ -38,13 +39,13 @@ ${chalk.yellow('Examples:')}
 
 ${chalk.yellow('Watch Mode Controls:')}
   ${chalk.green('[r]')} Restart build process
-	${chalk.green('[c]')} Clear cache
+  ${chalk.green('[c]')} Clear cache
   ${chalk.green('[p]')} Pause/Resume watching
-	${chalk.green('[n]')} New component
+  ${chalk.green('[n]')} New component
   ${chalk.green('[q]')} Quit and exit
 
 ${chalk.yellow('Configuration:')}
-  Place your configuration in ${chalk.cyan('.sdc-build-wp/config.json')}
+  Place your configuration in ${chalk.cyan(`${project.sdcDirName}/${project.configFileName}`)}
   See documentation for available options.
 `);
 }

package/lib/logging.js

@@ -9,7 +9,8 @@ function getTime() {
 }
 
 function log(type, ...messages) {
-	let icon, time, prefix = '';
+	let icon, time = null;
+	let prefix = '';
 
 	switch (type) {
 		case 'success':
@@ -33,14 +34,36 @@ function log(type, ...messages) {
 			prefix = chalk.gray('PHP:  ');
 			break;
 		case 'info':
-		default:
 			icon = chalk.blue('ℹ');
 			time = chalk.bgBlue.gray(getTime());
 			break;
 	}
 
-	const logMessage = [icon, time, prefix, ...messages].filter(Boolean).join(' ');
-	tui.log(logMessage);
+	let messagesString = messages.join(' ');
+
+	const logMessage = [icon, time, prefix, messagesString].filter(Boolean).join(' ');
+	if (tui.isInitialized) {
+		if (!type && messagesString.includes('\n')) {
+			messagesString.split('\n').forEach(line => {
+				if (line.trim()) {
+					tui.log(line);
+				}
+			});
+			return;
+		}
+		tui.log(String(logMessage));
+	} else {
+		switch (type) {
+			case 'error':
+				console.error(logMessage);
+				break;
+			case 'warn':
+				console.warn(logMessage);
+				break;
+			default:
+				console.log(logMessage);
+		}
+	}
 }
 
 export default log;

package/lib/project.js

@@ -29,7 +29,12 @@ let project = {
 	}
 };
 
-const configPath = path.join(project.path, '.sdc-build-wp', 'config.json');
+project.sdcDirName = '.sdc-build-wp';
+project.cacheDirName = 'cache';
+project.configFileName = 'config.json';
+project.sdcDir = path.join(project.path, project.sdcDirName);
+project.cacheDir = path.join(project.sdcDir, project.cacheDirName);
+const configPath = path.join(project.sdcDir, project.configFileName);
 
 project.paths = {
 	src: {
@@ -66,7 +71,7 @@ project.chokidarOpts = {
 		`${project.paths.composer.vendor}/**/*`,
 		project.paths.theme.scss,
 		`${project.path}/blocks/*/build/*.php`,
-		`${project.path}/.sdc-build-wp/cache/**/*`,
+		`${project.cacheDir}/**/*`,
 	]
 };
 
@@ -92,14 +97,14 @@ export async function init() {
 	const styleDir = `${project.path}/${project.paths.src.src}/${project.paths.src.style}`;
 
 	if (project.argv.version || project.argv.v) {
-		console.log(await utils.getThisPackageVersion());
+		log(null, await utils.getThisPackageVersion());
 		process.exit(0);
 	} else if (project.argv['clear-cache']) {
 		try {
 			await project.components.cache.init();
 			await project.components.cache.clearCache();
 		} catch (error) {
-			console.error(error);
+			log(null, error);
 			log('error', `Failed to clear cache`);
 		}
 		process.exit(0);
@@ -153,7 +158,6 @@ export async function init() {
 	});
 
 	process.on('SIGINT', async function() {
-		console.log(`\r`);
 		if (project.isRunning) {
 			await utils.stopActiveComponents();
 			project.isRunning = false;
@@ -167,7 +171,7 @@ export async function init() {
 		if (tui.getLogHistory) {
 			const logDump = tui.getLogHistory();
 			if (logDump && logDump.trim()) {
-				console.log(logDump);
+				log(null, logDump);
 			}
 		}
 		log('info', `Exited sdc-build-wp`);
@@ -200,7 +204,7 @@ export function keypressListen() {
 		if (isPrompting) { return; }
 		switch (key) {
 			case '\r': // [Enter]/[Return]
-				console.log('\r');
+				log(null, '');
 				break;
 			case '\u0003': // [Ctrl]+C
 			case 'q':
@@ -290,7 +294,7 @@ async function handleCreateNew() {
 				project.components.blocks.addBlock(blockDir);
 			}
 		} catch (error) {
-			console.error(error);
+			log(null, error);
 			log('error', `Failed to scaffold block`);
 		}
 	} else if (typeKey === 'p') {
@@ -321,7 +325,7 @@ async function handleCreateNew() {
 				project.components.php.globs.push(filePath);
 			}
 		} catch (error) {
-			console.error(error);
+			log(null, error);
 			log('error', `Failed to create pattern`);
 		}
 	} else if (typeKey === 's') {
@@ -346,7 +350,7 @@ async function handleCreateNew() {
 			try {
 				templateObj = JSON.parse(templateRaw);
 			} catch (error) {
-				console.error(error);
+				log(null, error);
 				throw new Error('Invalid style variation template JSON');
 			}
 			templateObj.title = name;
@@ -354,7 +358,7 @@ async function handleCreateNew() {
 			await fs.writeFile(filePath, JSON.stringify(templateObj, null, '\t'));
 			log('success', `Created style variation at styles/${slug}.json`);
 		} catch (error) {
-			console.error(error);
+			log(null, error);
 			log('error', `Failed to create style variation`);
 		}
 	}
@@ -363,13 +367,14 @@ async function handleCreateNew() {
 export async function convertPackageToConfig() {
 	if (!project.package.sdc) { return; }
 	try {
+		await fs.mkdir(project.sdcDir, { recursive: true });
 		await fs.writeFile(configPath, JSON.stringify(project.package.sdc, null, '\t'));
-		log('success', 'Converted package.json sdc to .sdc-build-wp/config.json');
+		log('success', `Converted package.json sdc to ${path.basename(project.sdcDir)}/${project.configFileName}`);
 		delete project.package.sdc;
 		await fs.writeFile(path.join(project.path, 'package.json'), JSON.stringify(project.package, null, '\t'));
 		log('success', 'Updated package.json to remove sdc');
 	} catch (error) {
-		log('error', `Failed to convert package.json sdc to .sdc-build-wp/config.json: ${error.message}`);
+		log('error', `Failed to convert package.json sdc to ${path.basename(project.sdcDir)}/${project.configFileName}: ${error.message}`);
 		process.exit(1);
 	}
 }
@@ -395,7 +400,7 @@ export async function loadConfig() {
 			project.paths.images = `${project.path}/${project.paths.src.src}/${project.paths.src.images}`;
 			project.entries = {};
 		} else {
-			console.error(error);
+			log(null, error);
 			log('error', `Failed to load config: ${error.message}`);
 			process.exit(1);
 		}
@@ -414,7 +419,7 @@ export function setupConfigWatcher() {
 		await restartBuild();
 	});
 	configWatcher.on('error', (error) => {
-		console.error(error);
+		log(null, error);
 		log('warn', `Config file watcher error`);
 	});
 	project.configWatcher = configWatcher;

package/lib/tui.js

@@ -1,5 +1,6 @@
 import blessed from 'blessed';
 import chalk from 'chalk';
+import log from './logging.js';
 
 class TUI {
 	constructor() {
@@ -20,6 +21,9 @@ class TUI {
 
 	init() {
 		if (this.isInitialized) {
+			// If already initialized, redraw the header to reflect current state
+			this.updateHeader();
+			this.render();
 			return;
 		}
 
@@ -130,9 +134,6 @@ class TUI {
 		const lines = [];
 
 		let titleLine = ' ' + chalk.bold.blue('SDC Build WP');
-		if (this.watchMode) {
-			titleLine += chalk.gray(' (watch mode)');
-		}
 		if (this.isPaused) {
 			titleLine += chalk.bold.yellow(' [PAUSED]');
 		}
@@ -195,7 +196,7 @@ class TUI {
 	log(message) {
 		this._logHistory.push(message);
 		if (!this.isInitialized) {
-			console.log(message);
+			log(null, message);
 			return;
 		}
 		this.logBox.log(message);

package/lib/utils.js

@@ -21,7 +21,7 @@ export async function stopActiveComponents() {
 		try {
 			await project.configWatcher.close();
 		} catch (error) {
-			console.error(error);
+			log(null, error);
 			log('error', 'Failed to stop config file watcher');
 		}
 	}
@@ -29,7 +29,7 @@ export async function stopActiveComponents() {
 		try {
 			project.components.server.server.exit();
 		} catch (error) {
-			console.error(error);
+			this.log(null, error);
 			log('error', 'Failed to stop server');
 		}
 	}
@@ -41,7 +41,8 @@ export async function stopActiveComponents() {
 			try {
 				await component.watcher.close();
 			} catch (error) {
-				console.warn(`Failed to stop watcher for ${component.constructor.name}:`, error.message);
+				log(null, error);
+				log('error', `Failed to stop watcher for ${component.constructor.name}`);
 			}
 		}
 	}
@@ -219,7 +220,7 @@ export async function ensureDir(dir) {
 		await fs.mkdir(dir, { recursive: true });
 		return true;
 	} catch (error) {
-		console.error(error);
+		log(null, error);
 		log('error', `Failed to create directory ${dir}`);
 		return false;
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "sdc-build-wp",
-	"version": "5.3.0",
+	"version": "5.3.2",
 	"description": "Custom WordPress build process.",
 	"engines": {
 		"node": ">=22"