sdc-build-wp 4.6.2 → 4.7.0

package/README.md

@@ -15,3 +15,5 @@ Develop locally with the following command from within the test project director
 ```
 node ~/sites/sdc/sdc-build-wp/index.js --watch
 ```
+
+While watch is running, pressing `r` restarts the process. Pressing `q` quits the process.

package/eslint.config.js

@@ -1,7 +1,11 @@
 import { defineConfig } from 'eslint/config';
+import stylistic from '@stylistic/eslint-plugin';
 
 export default defineConfig([
 	{
+		plugins: {
+			'@stylistic': stylistic
+		},
 		languageOptions: {
 			parserOptions: {
 				ecmaVersion: 'latest',
@@ -19,7 +23,8 @@ export default defineConfig([
 				{
 					max: 1
 				}
-			]
+			],
+			'@stylistic/quotes': [1, 'single']
 		}
 	}
 ]);

package/index.js

@@ -12,7 +12,7 @@ project.components = Object.fromEntries(Object.entries(LibComponents).map(([name
 const argv = parseArgs(process.argv.slice(2));
 
 if (argv.help || argv.h) {
-console.log(`
+	console.log(`
 Usage: sdc-build-wp [options] [arguments]
 
 Options:
@@ -33,16 +33,56 @@ sdc-build-wp --watch
 sdc-build-wp --watch --builds=style,scripts
 `);
 
-process.exit(0);
+	process.exit(0);
 } else if (argv.version || argv.v) {
-console.log(JSON.parse(await fs.readFile(path.join(path.dirname(fileURLToPath(import.meta.url)), 'package.json'))).version);
-process.exit(0);
+	console.log(JSON.parse(await fs.readFile(path.join(path.dirname(fileURLToPath(import.meta.url)), 'package.json'))).version);
+	process.exit(0);
 }
 
 project.builds = argv.builds ? (Array.isArray(argv.builds) ? argv.builds : argv.builds.split(',')) : Object.keys(project.components);
 
-(async() => {
+(async () => {
+	keypressListen();
+	await runBuild();
+})();
+
+process.on('SIGINT', function () {
+	console.log(`\r`);
+	if (process.stdin.isTTY) {
+		process.stdin.setRawMode(false);
+		process.stdin.pause();
+	}
+	stopActiveComponents()
+	log('info', `Exiting sdc-build-wp`);
+	process.exit(0);
+});
+
+function keypressListen() {
+	if (!process.stdin.isTTY) { return; }
+
+	process.stdin.setRawMode(true);
+	process.stdin.resume();
+	process.stdin.setEncoding('utf8');
 
+	process.stdin.on('data', (key) => {
+		switch (key) {
+			case '\u0003': // Ctrl+C
+			case 'q':
+				process.emit('SIGINT');
+				return;
+			case 'r':
+				log('info', 'Restart requested...');
+				stopActiveComponents()
+				setTimeout(() => {
+					process.stdout.write('\x1B[2J\x1B[0f'); // Clear screen
+					runBuild();
+				}, 100);
+				break;
+		}
+	});
+}
+
+async function runBuild() {
 	if (argv.watch && project.builds.includes('server')) {
 		project.builds.splice(project.builds.indexOf('server'), 1);
 		project.builds.unshift('server');
@@ -62,18 +102,15 @@ project.builds = argv.builds ? (Array.isArray(argv.builds) ? argv.builds : argv.
 		project.builds.splice(project.builds.indexOf('server'), 1);
 		project.builds.push('server');
 		log('info', `Started watching [${project.builds.join(', ')}]`);
+		log('info', `[r] to restart, [q] to quit`);
 		for (let build of project.builds) {
 			await project.components[build].watch();
 		}
 	}
+}
 
-})();
-
-process.on('SIGINT', function() {
-	console.log(`\r`);
+function stopActiveComponents() {
 	if (project.components.server?.server) {
 		project.components.server.server.exit();
 	}
-	log('info', `Exiting sdc-build-wp`);
-	process.exit(0);
-});
+}

package/lib/components/blocks.js

@@ -1,3 +1,4 @@
+import { fileURLToPath } from 'url';
 import BaseComponent from './base.js';
 import { stat } from 'fs/promises';
 import { exec } from 'child_process';
@@ -55,12 +56,13 @@ export default class BlocksComponent extends BaseComponent {
 				`build`,
 				`--source-path=.${entry.replace(this.project.path, '')}/src`,
 				`--output-path=.${entry.replace(this.project.path, '')}/build`,
-				`--webpack-copy-php`
+				`--webpack-copy-php`,
+				`--config=${this.path.resolve(this.path.dirname(fileURLToPath(import.meta.url)), '../../webpack.config.js')}`,
 			];
 			let execPromise = promisify(exec);
 			const { stdout, stderr } = await execPromise(cmds.join(' '));
 		} catch (error) {
-			console.log(error.stdout);
+			console.log(error.stdout || error);
 			this.log('error', `Failed building ${entryLabel} block - See above error.`);
 			return false;
 		}
@@ -87,6 +89,9 @@ export default class BlocksComponent extends BaseComponent {
 				...this.project.chokidarOpts
 			}).on('all', (event, path) => {
 				if (!['unlink', 'unlinkDir'].includes(event)) {
+					if (path.endsWith('.js')) {
+						this.project.components.scripts.lint(path);
+					}
 					this.process(block);
 				}
 			});

package/lib/components/scripts.js

@@ -28,16 +28,10 @@ export default class ScriptsComponent extends BaseComponent {
 		this.start();
 
 		try {
-			const eslint = new ESLint({
-				fix: true,
-				overrideConfigFile: true,
-				overrideConfig: eslintConfig.default[0]
-			});
-			const lintresults = await eslint.lintFiles(options.entriesToLint || [entry]);
-			await ESLint.outputFixes(lintresults);
-			const formatter = await eslint.loadFormatter('stylish');
-			const formatterOutput = formatter.format(lintresults);
-			if (formatterOutput) { console.log(formatterOutput.replace(`${this.project.path}/${this.project.paths.src.src}/${this.project.paths.src.scripts}/`, '')); }
+			let thisLint = await this.lint(entry, options);
+			if (thisLint instanceof Error) {
+				throw thisLint;
+			}
 		} catch (error) {
 			console.log(error);
 			this.log('error', `Failed linting ${entry.replace(`${this.project.path}/${this.project.paths.src.src}/${this.project.paths.src.scripts}/`, '')} - See above error.`);
@@ -82,4 +76,22 @@ export default class ScriptsComponent extends BaseComponent {
 		});
 	}
 
+	async lint(entry, options) {
+		try {
+			const eslint = new ESLint({
+				fix: true,
+				overrideConfigFile: true,
+				overrideConfig: eslintConfig.default[0]
+			});
+			const lintresults = await eslint.lintFiles(options?.entriesToLint || [entry]);
+			await ESLint.outputFixes(lintresults);
+			const formatter = await eslint.loadFormatter('stylish');
+			const formatterOutput = formatter.format(lintresults);
+			if (formatterOutput) { console.log(formatterOutput.replace(`${this.project.path}/${this.project.paths.src.src}/${this.project.paths.src.scripts}/`, '')); }
+			return true;
+		} catch (error) {
+			return error;
+		}
+	}
+
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "sdc-build-wp",
-	"version": "4.6.2",
+	"version": "4.7.0",
 	"description": "Custom WordPress build process.",
 	"engines": {
 		"node": ">=22"
@@ -22,6 +22,7 @@
 		"sdc-build-wp": "./index.js"
 	},
 	"dependencies": {
+		"@stylistic/eslint-plugin": "^5.2.2",
 		"@stylistic/stylelint-plugin": "^4.0.0",
 		"@typescript-eslint/eslint-plugin": "^8.38.0",
 		"@typescript-eslint/parser": "^8.38.0",

package/webpack.config.js

@@ -0,0 +1,9 @@
+import defaultConfig from '@wordpress/scripts/config/webpack.config.js';
+
+export default {
+	...defaultConfig,
+	mode: 'production',
+	cache: {
+		type: 'memory'
+	}
+};