sdc-build-wp 4.3.1 → 4.3.3

package/index.js

@@ -1,6 +1,8 @@
 #!/usr/bin/env node
 import parseArgs from 'minimist';
 const argv = parseArgs(process.argv.slice(2));
+import path from 'path';
+import { fileURLToPath } from 'url';
 import { promises as fs } from 'fs';
 import { Tail } from 'tail';
 import project from './lib/project.js';
@@ -14,9 +16,10 @@ console.log(`
 Usage: sdc-build-wp [options] [arguments]
 
 Options:
-  -h, --help					Show help message and exit
-  -w, --watch					Build and watch
-  -b, --build BUILDS  Build with specific components
+  -h, --help           Show help message and exit
+	-v, --version        Version
+  -w, --watch          Build and watch
+  -b, --build BUILDS   Build with specific components
 
 Components:
 
@@ -30,6 +33,9 @@ sdc-build-wp --watch
 sdc-build-wp --watch --builds=style,scripts
 `);
 
+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);
 }
 
@@ -44,7 +50,7 @@ project.builds = argv.builds ? argv.builds.split(',') : Object.keys(project.comp
 	}
 	log('info', `Finished initial build in ${Math.round((Date.now() - initialBuildTimerStart) / 1000)} seconds`);
 
-	if (argv.watch || argv.w) {
+	if (argv.watch) {
 		for (let build of project.builds) {
 			await project.components[build].watch();
 		}

package/lib/components/style.js

@@ -1,6 +1,5 @@
 import BaseComponent from './base.js';
-import fs from 'fs';
-import { promises } from 'fs';
+import { promises as fs } from 'fs';
 import { fileURLToPath } from 'url';
 import * as sass from 'sass';
 import postcss from 'postcss';
@@ -26,7 +25,7 @@ export default class StyleComponent extends BaseComponent {
 
 	async buildTheme() {
 		try {
-			let theme = JSON.parse(await promises.readFile(this.project.path + '/theme.json'));
+			let theme = JSON.parse(await fs.readFile(this.project.path + '/theme.json'));
 			let themeFileData = `// This file is automatically generated from theme.json. Do not edit.\n`;
 			if (theme.settings?.custom) {
 				for (var customAttribute in theme.settings.custom) {
@@ -75,7 +74,7 @@ export default class StyleComponent extends BaseComponent {
 				}
 			}
 			try {
-				await promises.writeFile(this.project.path + '/_src/style/partials/_theme.scss', themeFileData);
+				await fs.writeFile(this.project.path + '/_src/style/partials/_theme.scss', themeFileData);
 			} catch(error) {
 				console.error(error);
 				this.log('error', `Failed to write auto-generated _theme.scss - See above error.`);
@@ -100,57 +99,38 @@ export default class StyleComponent extends BaseComponent {
 		this.start();
 
 		try {
-			await promises.access(`${this.project.path}/dist/style`);
+			await fs.access(`${this.project.path}/dist/style`);
 		} catch(error) {
-			await promises.mkdir(`${this.project.path}/dist/style`, { recursive: true });
+			await fs.mkdir(`${this.project.path}/dist/style`, { recursive: true });
 		}
-
-		stylelint.lint({
-			configFile: this.path.resolve(this.path.dirname(fileURLToPath(import.meta.url)), '../../.stylelintrc.json'),
-			formatter: 'string',
-			files: options.entriesToLint || [entry],
-			customSyntax: 'postcss-scss',
-			fix: true
-		}).then((data) => {
-			if (data.errored) {
-				console.error(data.report);
-				this.log('error', `Failed linting ${entry.replace(this.project.path + '/_src/style/', '')} - See above linting error.`);
-				return false;
-			}
-			try {
-				const result = sass.compile(entry, {
-					style: 'compressed'
-				});
-				fs.writeFile(outFile, result.css, function(err) {
-					if (err) {
-						console.error(err);
-						this.log('error', `Failed compiling ${entryLabel} - See above file writing error.`);
-						return false;
-					} else {
-						postcss([
-							autoprefixer(),
-							sortMQ()
-						]).process(result.css, { from: undefined }).then(resultPost => {
-							fs.writeFile(outFile, resultPost.css, function(err) {
-								if (err) {
-									console.log(err);
-									this.log('error', `Failed saving ${entryLabel} - See above postcss error.`);
-									return false;
-								} else {
-									thisClass.end({
-										itemLabel: entryLabel
-									});
-								}
-							});
-						});
-					}
-				});
-			} catch(error) {
-				console.error(error);
-				log('error', `Failed building ${entryLabel} - See above sass error.`);
-				return false;
+		try {
+			const stylelinted = await stylelint.lint({
+				configFile: this.path.resolve(this.path.dirname(fileURLToPath(import.meta.url)), '../../.stylelintrc.json'),
+				formatter: 'string',
+				files: options.entriesToLint || [entry],
+				customSyntax: 'postcss-scss',
+				fix: true
+			});
+			if (stylelinted.errored) {
+				console.error(stylelinted.report);
+				throw Error('Linting error');
 			}
-		});
+			const compileResult = await sass.compileAsync(entry, {
+				style: 'compressed'
+			});
+			const postcssResult = await postcss([
+				autoprefixer(),
+				sortMQ()
+			]).process(compileResult.css, { from: undefined });
+			await fs.writeFile(outFile, postcssResult.css);
+			thisClass.end({
+				itemLabel: entryLabel
+			});
+		} catch(error) {
+			console.error(error);
+			this.log('error', `Failed building ${entryLabel} - See above error.`);
+			return false;
+		}
 	}
 
 	async process(entry, options) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "sdc-build-wp",
-	"version": "4.3.1",
+	"version": "4.3.3",
 	"description": "Custom WordPress build process.",
 	"engines": {
 		"node": ">=22"
@@ -23,7 +23,7 @@
 	},
 	"dependencies": {
 		"@stylistic/stylelint-plugin": "^3.1.2",
-		"@wordpress/scripts": "^30.11.0",
+		"@wordpress/scripts": "^30.12.0",
 		"autoprefixer": "^10.4.20",
 		"browser-sync": "^3.0.3",
 		"chalk": "^5.4.1",
@@ -39,8 +39,8 @@
 		"postcss": "^8.5.3",
 		"postcss-scss": "^4.0.9",
 		"postcss-sort-media-queries": "^5.2.0",
-		"sass": "^1.85.0",
-		"stylelint": "^16.14.1",
+		"sass": "^1.85.1",
+		"stylelint": "^16.15.0",
 		"tail": "^2.2.6"
 	}
 }