sdc-build-wp 5.6.0 → 5.6.1

package/lib/components/blocks.js

@@ -1,6 +1,7 @@
+import { fileURLToPath } from 'url';
 import BaseComponent from './base.js';
-import { access, stat, readFile } from 'fs/promises';
-import { execFile } from 'child_process';
+import { stat, readFile } from 'fs/promises';
+import { exec } from 'child_process';
 import { promisify } from 'util';
 import { createHash } from 'crypto';
 
@@ -9,31 +10,6 @@ export default class BlocksComponent extends BaseComponent {
 	constructor() {
 		super();
 		this.description = `Process the theme's WordPress blocks`;
-		this._didLogWpScriptsFallback = false;
-	}
-
-	async getWpScriptsRunner() {
-		const localWpScripts = `${this.project.path}/node_modules/@wordpress/scripts/bin/wp-scripts.js`;
-
-		try {
-			await access(localWpScripts);
-			return {
-				command: process.execPath,
-				baseArgs: [localWpScripts]
-			};
-		} catch {
-			if (!this._didLogWpScriptsFallback) {
-				this.log('info', 'Using temporary @wordpress/scripts via npx for block builds');
-				this._didLogWpScriptsFallback = true;
-			}
-
-			const npxCommand = process.platform === 'win32' ? 'npx.cmd' : 'npx';
-
-			return {
-				command: npxCommand,
-				baseArgs: ['--yes', '--package', '@wordpress/scripts@31', 'wp-scripts']
-			};
-		}
 	}
 
 	async init() {
@@ -156,17 +132,17 @@ export default class BlocksComponent extends BaseComponent {
 		this.clearHashCache([workingBlockJson, ...dependencies]);
 
 		try {
-			const runner = await this.getWpScriptsRunner();
-			const args = [
-				...runner.baseArgs,
-				'build',
+			const cmds = [
+				`${this.project.path}/node_modules/@wordpress/scripts/bin/wp-scripts.js`,
+				`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')}`,
 			];
-			const execFilePromise = promisify(execFile);
+			const execPromise = promisify(exec);
 			const timeoutMS = 40000;
-			const buildPromise = execFilePromise(runner.command, args, {
+			const buildPromise = execPromise(cmds.join(' '), {
 				maxBuffer: 1024 * 1024 * 10,
 				cwd: this.project.path
 			});

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "sdc-build-wp",
-	"version": "5.6.0",
+	"version": "5.6.1",
 	"description": "Custom WordPress build process.",
 	"engines": {
 		"node": ">=22"
@@ -26,6 +26,8 @@
 		"@stylistic/stylelint-plugin": "^4.0.0",
 		"@typescript-eslint/eslint-plugin": "^8.48.1",
 		"@typescript-eslint/parser": "^8.48.1",
+		"@wordpress/scripts": "^31.4.0",
+		"ajv": "^8.18.0",
 		"autoprefixer": "^10.4.24",
 		"browser-sync": "^3.0.4",
 		"chokidar": "^5.0.0",

package/webpack.config.js

@@ -1,11 +1,4 @@
-let defaultConfig = {};
-
-try {
-	const wpConfig = await import('@wordpress/scripts/config/webpack.config.js');
-	defaultConfig = wpConfig.default || {};
-} catch {
-	defaultConfig = {};
-}
+import defaultConfig from '@wordpress/scripts/config/webpack.config.js';
 
 export default {
 	...defaultConfig,