From edb0f6265d29f13607578a88e4d50a6086a56a58 Mon Sep 17 00:00:00 2001
From: Adrian Moldovan <3854374+adimoldovan@users.noreply.github.com>
Date: Mon, 17 Aug 2026 21:28:08 +0300
Subject: [PATCH 1/2] Build/Test Tools: Remove all `npx` commands.

Backport of r63309 to the 6.4 branch.
---
 Gruntfile.js      | 6 +++---
 package-lock.json | 1 +
 package.json      | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 92feec563818a..cbf3c08cad12d 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1684,15 +1684,15 @@ module.exports = function(grunt) {
 	grunt.registerTask( 'wp-packages:update', 'Update WordPress packages', function() {
 		const distTag = grunt.option('dist-tag') || 'latest';
 		grunt.log.writeln( `Updating WordPress packages (--dist-tag=${distTag})` );
-		spawn( 'npx', [ 'wp-scripts', 'packages-update', `--dist-tag=${distTag}` ], {
+		spawn( 'npm', [ 'exec', '--no', '--', 'wp-scripts', 'packages-update', `--dist-tag=${distTag}` ], {
 			cwd: __dirname,
 			stdio: 'inherit',
 		} );
 	} );
 
 	grunt.registerTask( 'browserslist:update', 'Update the local database of browser supports', function() {
-		grunt.log.writeln( `Updating browsers list` );
-		spawn( 'npx', [ 'browserslist@latest', '--update-db' ], {
+		grunt.log.writeln( 'Updating browsers list' );
+		spawn( 'npm', [ 'exec', '--no', '--', 'update-browserslist-db' ], {
 			cwd: __dirname,
 			stdio: 'inherit',
 		} );
diff --git a/package-lock.json b/package-lock.json
index 6800b907311f2..37a97d8eb3bab 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -153,6 +153,7 @@
 				"source-map-loader": "4.0.1",
 				"terser-webpack-plugin": "5.3.9",
 				"uglify-js": "^3.17.4",
+				"update-browserslist-db": "1.0.11",
 				"uuid": "9.0.1",
 				"wait-on": "7.0.1",
 				"webpack": "5.89.0",
diff --git a/package.json b/package.json
index e7e0a1a1a0627..7209f5f0a8e04 100644
--- a/package.json
+++ b/package.json
@@ -72,6 +72,7 @@
 		"source-map-loader": "4.0.1",
 		"terser-webpack-plugin": "5.3.9",
 		"uglify-js": "^3.17.4",
+		"update-browserslist-db": "1.0.11",
 		"uuid": "9.0.1",
 		"wait-on": "7.0.1",
 		"webpack": "5.89.0",

From f90f6526d1755c13500f547af5bd5c0c048eed4c Mon Sep 17 00:00:00 2001
From: Adrian Moldovan <3854374+adimoldovan@users.noreply.github.com>
Date: Tue, 18 Aug 2026 12:23:20 +0300
Subject: [PATCH 2/2] Re-run CI.