wp-advads 1.0.36 → 1.0.37

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "wp-advads",
-  "version": "1.0.36",
+  "version": "1.0.37",
   "description": "Create an Advanced Ads WordPress plugin ecosystem.",
   "author": {
     "name": "Shakeeb Ahmed",

package/src/commands/build.js

@@ -64,17 +64,33 @@ function run( commitMessages ) {
 		}
 
 		process.stdout.write('Building plugin resources...')
-		let buildScript
+		let pkg
 		try {
-			buildScript = JSON.parse( fs.readFileSync( 'package.json', 'utf8' ) ).scripts?.build
+			pkg = JSON.parse( fs.readFileSync( 'package.json', 'utf8' ) )
 		} catch {
-			buildScript = null
+			pkg = {}
 		}
+		const buildScript = pkg.scripts?.build
+		const usesWpScripts = Object.values( pkg.scripts || {} ).some( ( script ) => /\bwp-scripts\b/.test( script ) )
 
 		if ( ! buildScript ) {
 			onSameLine(`${logSymbols.warning} No package.json build script, skipping`)
+		} else if ( /\bwp-advads\b/.test( buildScript ) || process.env.WP_ADVADS_BUILDING ) {
+			if ( usesWpScripts ) {
+				await runExec( 'npx wp-scripts build', {
+					env: { ...process.env, WP_ADVADS_BUILDING: '1' },
+				} )
+				onSameLine(`${logSymbols.success} Built plugin resources`);
+				if ( Array.isArray( commitMessages ) ) {
+					commitMessages.push( 'Build plugin resources' )
+				}
+			} else {
+				onSameLine(`${logSymbols.warning} Skipping recursive npm run build`)
+			}
 		} else {
-			await runExec( 'npm run build' )
+			await runExec( 'npm run build', {
+				env: { ...process.env, WP_ADVADS_BUILDING: '1' },
+			} )
 			onSameLine(`${logSymbols.success} Built plugin resources`);
 			if ( Array.isArray( commitMessages ) ) {
 				commitMessages.push( 'Build plugin resources' )

package/test/build.test.js

@@ -136,6 +136,39 @@ test( 'resource build is skipped when package.json has no build script', async (
 	} )
 } )
 
+test( 'resource build is skipped when scripts.build invokes wp-advads', async () => {
+	await withPackage( { scripts: { build: 'rm -rf assets/dist && npx wp-advads build' } }, async () => {
+		await runBuild()
+
+		assert.equal(
+			execCalls.some( ( call ) => call.cmd === 'npm run build' ),
+			false
+		)
+		assert.equal( potCalled, true )
+	} )
+} )
+
+test( 'resource build runs wp-scripts when scripts.build invokes wp-advads', async () => {
+	await withPackage( {
+		scripts: {
+			build: 'rm -rf assets/dist && npx wp-advads build',
+			start: 'wp-scripts start',
+		},
+	}, async () => {
+		await runBuild()
+
+		assert.equal(
+			execCalls.some( ( call ) => call.cmd === 'npm run build' ),
+			false
+		)
+		assert.equal(
+			execCalls.some( ( call ) => call.cmd === 'npx wp-scripts build' ),
+			true
+		)
+		assert.equal( potCalled, true )
+	} )
+} )
+
 test( 'composer dump receives COMPOSER_VENDOR_DIR packages', async () => {
 	await runBuild()