sdc-build-wp 4.6.1 → 4.6.3

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/lib/components/blocks.js

@@ -87,7 +87,10 @@ export default class BlocksComponent extends BaseComponent {
 				...this.project.chokidarOpts
 			}).on('all', (event, path) => {
 				if (!['unlink', 'unlinkDir'].includes(event)) {
-					this.process(path);
+					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.`);
@@ -70,7 +64,7 @@ export default class ScriptsComponent extends BaseComponent {
 	}
 
 	async process() {
-		const promisesScripts = this.files.map((block, index) => this.build(block.file, { entriesToLint: index == 0 ? this.globs : null }));
+		const promisesScripts = this.files.map((group, index) => this.build(group.file, { entriesToLint: index == 0 ? this.globs : null }));
 		await Promise.all(promisesScripts);
 	}
 
@@ -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/lib/components/style.js

@@ -160,13 +160,13 @@ export default class StyleComponent extends BaseComponent {
 			await this.buildTheme();
 		}
 		let i = 0;
-		for (var block of this.files) {
-			if (!entry || entry == block.file) {
-				await this.build(block.file, {
-					name: block.name,
+		for (let group of this.files) {
+			if (!entry || entry == group.file) {
+				await this.build(group.file, {
+					name: group.name,
 					entriesToLint: i == 0 ? this.globs : null
 				});
-				if (entry == block.file) {
+				if (entry == group.file) {
 					break;
 				}
 				i++;
@@ -182,9 +182,9 @@ export default class StyleComponent extends BaseComponent {
 			...this.project.chokidarOpts
 		}).on('all', (event, path) => {
 			let hasRanSingle = false;
-			for (var block of this.files) {
-				if (path == block.file || this.utils.getImportedSASSFiles(block.file).includes(path)) {
-					this.process(block.file, { buildTheme: path == this.project.paths.theme.json });
+			for (let group of this.files) {
+				if (path == group.file || this.utils.getImportedSASSFiles(group.file).includes(path)) {
+					this.process(group.file, { buildTheme: path == this.project.paths.theme.json });
 					hasRanSingle = true;
 				}
 			}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "sdc-build-wp",
-	"version": "4.6.1",
+	"version": "4.6.3",
 	"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",