sdc-build-wp 5.3.1 → 5.3.3

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/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/help.js

@@ -45,7 +45,7 @@ ${chalk.yellow('Watch Mode Controls:')}
   ${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/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}/**/*`,
 	]
 };
 
@@ -148,6 +153,24 @@ export async function init() {
 	process.on('uncaughtException', async (error) => {
 		log('error', `Uncaught Exception: ${error.message}`);
 		log('warn', 'Attempting graceful shutdown');
+
+		// Clean up terminal state
+		if (process.stdin.isTTY) {
+			try {
+				process.stdin.setRawMode(false);
+				process.stdin.pause();
+				process.stdin.removeAllListeners('data');
+			} catch (e) {
+				// Ignore errors
+			}
+		}
+
+		if (process.stdout.isTTY) {
+			process.stdout.write('\x1b[?25h');
+			process.stdout.write('\x1b[0m');
+		}
+
+		tui.destroy();
 		await utils.stopActiveComponents();
 		process.exit(1);
 	});
@@ -162,7 +185,19 @@ export async function init() {
 			await project.configWatcher.close();
 			project.configWatcher = null;
 		}
+
+		if (process.stdin.isTTY) {
+			try {
+				process.stdin.setRawMode(false);
+			} catch (e) {
+				// Ignore errors if raw mode is already off
+			}
+			process.stdin.pause();
+			process.stdin.removeAllListeners('data');
+		}
+
 		tui.destroy();
+
 		if (tui.getLogHistory) {
 			const logDump = tui.getLogHistory();
 			if (logDump && logDump.trim()) {
@@ -170,13 +205,29 @@ export async function init() {
 			}
 		}
 		log('info', `Exited sdc-build-wp`);
-		if (process.stdin.isTTY) {
-			process.stdin.setRawMode(false);
-			process.stdin.pause();
+
+		if (process.stdout.isTTY) {
+			process.stdout.write('\x1b[?25h');
+			process.stdout.write('\x1b[0m');
 		}
+
 		setTimeout(() => process.exit(0), 100);
 	});
 
+	process.on('exit', () => {
+		if (process.stdin.isTTY) {
+			try {
+				process.stdin.setRawMode(false);
+			} catch (e) {
+				// Ignore errors
+			}
+		}
+		if (process.stdout.isTTY) {
+			process.stdout.write('\x1b[?25h');
+			process.stdout.write('\x1b[0m');
+		}
+	});
+
 }
 
 export function keypressListen() {
@@ -362,13 +413,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);
 	}
 }

package/lib/tui.js

@@ -21,9 +21,17 @@ class TUI {
 
 	init() {
 		if (this.isInitialized) {
+			// If already initialized, redraw the header to reflect current state
+			this.updateHeader();
+			this.render();
 			return;
 		}
 
+		if (process.stdout.isTTY) {
+			process.stdout.write('\x1b[?25h');
+			process.stdout.write('\x1b[0m');
+		}
+
 		this.screen = blessed.screen({
 			smartCSR: true,
 			fullUnicode: true,
@@ -131,9 +139,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]');
 		}
@@ -332,11 +337,24 @@ class TUI {
 
 	destroy() {
 		if (this.isInitialized && this.screen) {
+			if (this.screen.program) {
+				this.screen.program.showCursor();
+				this.screen.program.normalBuffer();
+				this.screen.program.reset();
+			}
+
 			this.screen.destroy();
 			this.isInitialized = false;
 			this.screen = null;
 			this.headerBox = null;
 			this.logBox = null;
+
+			if (process.stdout.isTTY) {
+				process.stdout.write('\x1b[?25h');
+				process.stdout.write('\x1b[0m');
+				process.stdout.write('\x1b[2J');
+				process.stdout.write('\x1b[H');
+			}
 		}
 	}
 }

package/package.json

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