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

Backport of r63309 to the 6.9 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 61f1ccf95da32..02a4a510063c5 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1905,15 +1905,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 a9fec421c2b03..669c7181a713a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -152,6 +152,7 @@
 				"source-map-loader": "5.0.0",
 				"terser-webpack-plugin": "5.3.14",
 				"uglify-js": "^3.19.3",
+				"update-browserslist-db": "1.1.4",
 				"uuid": "13.0.0",
 				"wait-on": "9.0.3",
 				"webpack": "5.98.0",
diff --git a/package.json b/package.json
index 15df19f15f7b3..fb68149ed1456 100644
--- a/package.json
+++ b/package.json
@@ -69,6 +69,7 @@
 		"source-map-loader": "5.0.0",
 		"terser-webpack-plugin": "5.3.14",
 		"uglify-js": "^3.19.3",
+		"update-browserslist-db": "1.1.4",
 		"uuid": "13.0.0",
 		"wait-on": "9.0.3",
 		"webpack": "5.98.0",

From 391974a62ace3a3c5c43d36856026d499e762939 Mon Sep 17 00:00:00 2001
From: Adrian Moldovan <3854374+adimoldovan@users.noreply.github.com>
Date: Tue, 18 Aug 2026 12:00:15 +0300
Subject: [PATCH 2/2] Re-run CI after the GitHub API outage.