Commit 49339b2180 for wordpress.org
commit 49339b21805d08ed4be4294a4eb58d651c8b2ca5
Author: youknowriad <youknowriad@git.wordpress.org>
Date: Mon Jan 5 13:43:03 2026 +0000
Build/Test Tools: Fix Gutenberg integration script prefixes and theme-i18n.json handling.
This changeset addresses two issues in the Gutenberg integration workflow:
* Sets `wpPlugin.name` to `wp` in `build-gutenberg.js` so generated PHP files use `wp_` prefixes instead of `gutenberg_`.
* Persists `theme-i18n.json` in the repository for WP-CLI compatibility, as this file is required but was being ignored.
Props youknowriad, swissspidy.
See #64393.
Built from https://develop.svn.wordpress.org/trunk@61439
git-svn-id: http://core.svn.wordpress.org/trunk@60751 1a063a9b-81f0-0310-95a4-ce76da25c4cd
diff --git a/wp-includes/build/pages.php b/wp-includes/build/pages.php
index 1703d0fe98..a80b7368ee 100644
--- a/wp-includes/build/pages.php
+++ b/wp-includes/build/pages.php
@@ -3,7 +3,7 @@
* Pages loader - Auto-generated by build process.
* Do not edit this file manually.
*
- * @package gutenberg
+ * @package wp
*/
require_once __DIR__ . '/pages/site-editor/page.php';
diff --git a/wp-includes/build/pages/font-library/page-wp-admin.php b/wp-includes/build/pages/font-library/page-wp-admin.php
index 2cc8f0f2f8..87982ebb34 100644
--- a/wp-includes/build/pages/font-library/page-wp-admin.php
+++ b/wp-includes/build/pages/font-library/page-wp-admin.php
@@ -7,13 +7,13 @@
* This version integrates with the standard WordPress admin interface,
* keeping the wp-admin sidebar and scripts/styles intact.
*
- * @package gutenberg
+ * @package wp
*/
// Global storage for font-library routes and menu items
-global $gutenberg_font_library_wp_admin_routes, $gutenberg_font_library_wp_admin_menu_items;
-$gutenberg_font_library_wp_admin_routes = array();
-$gutenberg_font_library_wp_admin_menu_items = array();
+global $wp_font_library_wp_admin_routes, $wp_font_library_wp_admin_menu_items;
+$wp_font_library_wp_admin_routes = array();
+$wp_font_library_wp_admin_menu_items = array();
if ( ! function_exists( 'register_font_library_wp_admin_route' ) ) {
/**
@@ -24,7 +24,7 @@ if ( ! function_exists( 'register_font_library_wp_admin_route' ) ) {
* @param string|null $route_module Script module ID for route lifecycle hooks.
*/
function register_font_library_wp_admin_route( $path, $content_module = null, $route_module = null ) {
- global $gutenberg_font_library_wp_admin_routes;
+ global $wp_font_library_wp_admin_routes;
$route = array( 'path' => $path );
if ( ! empty( $content_module ) ) {
@@ -34,7 +34,7 @@ if ( ! function_exists( 'register_font_library_wp_admin_route' ) ) {
$route['route_module'] = $route_module;
}
- $gutenberg_font_library_wp_admin_routes[] = $route;
+ $wp_font_library_wp_admin_routes[] = $route;
}
}
@@ -49,7 +49,7 @@ if ( ! function_exists( 'register_font_library_wp_admin_menu_item' ) ) {
* @param string $parent_id Optional. Parent menu item ID.
*/
function register_font_library_wp_admin_menu_item( $id, $label, $to, $parent_id = '' ) {
- global $gutenberg_font_library_wp_admin_menu_items;
+ global $wp_font_library_wp_admin_menu_items;
$menu_item = array(
'id' => $id,
@@ -61,7 +61,7 @@ if ( ! function_exists( 'register_font_library_wp_admin_menu_item' ) ) {
$menu_item['parent'] = $parent_id;
}
- $gutenberg_font_library_wp_admin_menu_items[] = $menu_item;
+ $wp_font_library_wp_admin_menu_items[] = $menu_item;
}
}
@@ -72,8 +72,8 @@ if ( ! function_exists( 'get_font_library_wp_admin_routes' ) ) {
* @return array Array of route objects.
*/
function get_font_library_wp_admin_routes() {
- global $gutenberg_font_library_wp_admin_routes;
- return $gutenberg_font_library_wp_admin_routes ?? array();
+ global $wp_font_library_wp_admin_routes;
+ return $wp_font_library_wp_admin_routes ?? array();
}
}
@@ -84,8 +84,8 @@ if ( ! function_exists( 'get_font_library_wp_admin_menu_items' ) ) {
* @return array Array of menu item objects.
*/
function get_font_library_wp_admin_menu_items() {
- global $gutenberg_font_library_wp_admin_menu_items;
- return $gutenberg_font_library_wp_admin_menu_items ?? array();
+ global $wp_font_library_wp_admin_menu_items;
+ return $wp_font_library_wp_admin_menu_items ?? array();
}
}
diff --git a/wp-includes/build/pages/font-library/page.php b/wp-includes/build/pages/font-library/page.php
index a0310e37ba..5a443762f4 100644
--- a/wp-includes/build/pages/font-library/page.php
+++ b/wp-includes/build/pages/font-library/page.php
@@ -4,13 +4,13 @@
* Auto-generated by build process.
* Do not edit this file manually.
*
- * @package gutenberg
+ * @package wp
*/
// Global storage for font-library routes and menu items
-global $gutenberg_font_library_routes, $gutenberg_font_library_menu_items;
-$gutenberg_font_library_routes = array();
-$gutenberg_font_library_menu_items = array();
+global $wp_font_library_routes, $wp_font_library_menu_items;
+$wp_font_library_routes = array();
+$wp_font_library_menu_items = array();
if ( ! function_exists( 'register_font_library_route' ) ) {
/**
@@ -21,7 +21,7 @@ if ( ! function_exists( 'register_font_library_route' ) ) {
* @param string|null $route_module Script module ID for route lifecycle hooks.
*/
function register_font_library_route( $path, $content_module = null, $route_module = null ) {
- global $gutenberg_font_library_routes;
+ global $wp_font_library_routes;
$route = array( 'path' => $path );
if ( ! empty( $content_module ) ) {
@@ -31,7 +31,7 @@ if ( ! function_exists( 'register_font_library_route' ) ) {
$route['route_module'] = $route_module;
}
- $gutenberg_font_library_routes[] = $route;
+ $wp_font_library_routes[] = $route;
}
}
@@ -46,7 +46,7 @@ if ( ! function_exists( 'register_font_library_menu_item' ) ) {
* @param string $parent_type Optional. Parent type: 'drilldown' or 'dropdown'.
*/
function register_font_library_menu_item( $id, $label, $to, $parent_id = '', $parent_type = '' ) {
- global $gutenberg_font_library_menu_items;
+ global $wp_font_library_menu_items;
$menu_item = array(
'id' => $id,
@@ -62,7 +62,7 @@ if ( ! function_exists( 'register_font_library_menu_item' ) ) {
$menu_item['parent_type'] = $parent_type;
}
- $gutenberg_font_library_menu_items[] = $menu_item;
+ $wp_font_library_menu_items[] = $menu_item;
}
}
@@ -73,8 +73,8 @@ if ( ! function_exists( 'get_font_library_routes' ) ) {
* @return array Array of route objects.
*/
function get_font_library_routes() {
- global $gutenberg_font_library_routes;
- return $gutenberg_font_library_routes ?? array();
+ global $wp_font_library_routes;
+ return $wp_font_library_routes ?? array();
}
}
@@ -85,8 +85,8 @@ if ( ! function_exists( 'get_font_library_menu_items' ) ) {
* @return array Array of menu item objects.
*/
function get_font_library_menu_items() {
- global $gutenberg_font_library_menu_items;
- return $gutenberg_font_library_menu_items ?? array();
+ global $wp_font_library_menu_items;
+ return $wp_font_library_menu_items ?? array();
}
}
diff --git a/wp-includes/build/pages/site-editor/page-wp-admin.php b/wp-includes/build/pages/site-editor/page-wp-admin.php
index 0c74b8b96a..2cc4eb9a9d 100644
--- a/wp-includes/build/pages/site-editor/page-wp-admin.php
+++ b/wp-includes/build/pages/site-editor/page-wp-admin.php
@@ -7,13 +7,13 @@
* This version integrates with the standard WordPress admin interface,
* keeping the wp-admin sidebar and scripts/styles intact.
*
- * @package gutenberg
+ * @package wp
*/
// Global storage for site-editor routes and menu items
-global $gutenberg_site_editor_wp_admin_routes, $gutenberg_site_editor_wp_admin_menu_items;
-$gutenberg_site_editor_wp_admin_routes = array();
-$gutenberg_site_editor_wp_admin_menu_items = array();
+global $wp_site_editor_wp_admin_routes, $wp_site_editor_wp_admin_menu_items;
+$wp_site_editor_wp_admin_routes = array();
+$wp_site_editor_wp_admin_menu_items = array();
if ( ! function_exists( 'register_site_editor_wp_admin_route' ) ) {
/**
@@ -24,7 +24,7 @@ if ( ! function_exists( 'register_site_editor_wp_admin_route' ) ) {
* @param string|null $route_module Script module ID for route lifecycle hooks.
*/
function register_site_editor_wp_admin_route( $path, $content_module = null, $route_module = null ) {
- global $gutenberg_site_editor_wp_admin_routes;
+ global $wp_site_editor_wp_admin_routes;
$route = array( 'path' => $path );
if ( ! empty( $content_module ) ) {
@@ -34,7 +34,7 @@ if ( ! function_exists( 'register_site_editor_wp_admin_route' ) ) {
$route['route_module'] = $route_module;
}
- $gutenberg_site_editor_wp_admin_routes[] = $route;
+ $wp_site_editor_wp_admin_routes[] = $route;
}
}
@@ -49,7 +49,7 @@ if ( ! function_exists( 'register_site_editor_wp_admin_menu_item' ) ) {
* @param string $parent_id Optional. Parent menu item ID.
*/
function register_site_editor_wp_admin_menu_item( $id, $label, $to, $parent_id = '' ) {
- global $gutenberg_site_editor_wp_admin_menu_items;
+ global $wp_site_editor_wp_admin_menu_items;
$menu_item = array(
'id' => $id,
@@ -61,7 +61,7 @@ if ( ! function_exists( 'register_site_editor_wp_admin_menu_item' ) ) {
$menu_item['parent'] = $parent_id;
}
- $gutenberg_site_editor_wp_admin_menu_items[] = $menu_item;
+ $wp_site_editor_wp_admin_menu_items[] = $menu_item;
}
}
@@ -72,8 +72,8 @@ if ( ! function_exists( 'get_site_editor_wp_admin_routes' ) ) {
* @return array Array of route objects.
*/
function get_site_editor_wp_admin_routes() {
- global $gutenberg_site_editor_wp_admin_routes;
- return $gutenberg_site_editor_wp_admin_routes ?? array();
+ global $wp_site_editor_wp_admin_routes;
+ return $wp_site_editor_wp_admin_routes ?? array();
}
}
@@ -84,8 +84,8 @@ if ( ! function_exists( 'get_site_editor_wp_admin_menu_items' ) ) {
* @return array Array of menu item objects.
*/
function get_site_editor_wp_admin_menu_items() {
- global $gutenberg_site_editor_wp_admin_menu_items;
- return $gutenberg_site_editor_wp_admin_menu_items ?? array();
+ global $wp_site_editor_wp_admin_menu_items;
+ return $wp_site_editor_wp_admin_menu_items ?? array();
}
}
diff --git a/wp-includes/build/pages/site-editor/page.php b/wp-includes/build/pages/site-editor/page.php
index 164da16a29..6b5ddeb757 100644
--- a/wp-includes/build/pages/site-editor/page.php
+++ b/wp-includes/build/pages/site-editor/page.php
@@ -4,13 +4,13 @@
* Auto-generated by build process.
* Do not edit this file manually.
*
- * @package gutenberg
+ * @package wp
*/
// Global storage for site-editor routes and menu items
-global $gutenberg_site_editor_routes, $gutenberg_site_editor_menu_items;
-$gutenberg_site_editor_routes = array();
-$gutenberg_site_editor_menu_items = array();
+global $wp_site_editor_routes, $wp_site_editor_menu_items;
+$wp_site_editor_routes = array();
+$wp_site_editor_menu_items = array();
if ( ! function_exists( 'register_site_editor_route' ) ) {
/**
@@ -21,7 +21,7 @@ if ( ! function_exists( 'register_site_editor_route' ) ) {
* @param string|null $route_module Script module ID for route lifecycle hooks.
*/
function register_site_editor_route( $path, $content_module = null, $route_module = null ) {
- global $gutenberg_site_editor_routes;
+ global $wp_site_editor_routes;
$route = array( 'path' => $path );
if ( ! empty( $content_module ) ) {
@@ -31,7 +31,7 @@ if ( ! function_exists( 'register_site_editor_route' ) ) {
$route['route_module'] = $route_module;
}
- $gutenberg_site_editor_routes[] = $route;
+ $wp_site_editor_routes[] = $route;
}
}
@@ -46,7 +46,7 @@ if ( ! function_exists( 'register_site_editor_menu_item' ) ) {
* @param string $parent_type Optional. Parent type: 'drilldown' or 'dropdown'.
*/
function register_site_editor_menu_item( $id, $label, $to, $parent_id = '', $parent_type = '' ) {
- global $gutenberg_site_editor_menu_items;
+ global $wp_site_editor_menu_items;
$menu_item = array(
'id' => $id,
@@ -62,7 +62,7 @@ if ( ! function_exists( 'register_site_editor_menu_item' ) ) {
$menu_item['parent_type'] = $parent_type;
}
- $gutenberg_site_editor_menu_items[] = $menu_item;
+ $wp_site_editor_menu_items[] = $menu_item;
}
}
@@ -73,8 +73,8 @@ if ( ! function_exists( 'get_site_editor_routes' ) ) {
* @return array Array of route objects.
*/
function get_site_editor_routes() {
- global $gutenberg_site_editor_routes;
- return $gutenberg_site_editor_routes ?? array();
+ global $wp_site_editor_routes;
+ return $wp_site_editor_routes ?? array();
}
}
@@ -85,8 +85,8 @@ if ( ! function_exists( 'get_site_editor_menu_items' ) ) {
* @return array Array of menu item objects.
*/
function get_site_editor_menu_items() {
- global $gutenberg_site_editor_menu_items;
- return $gutenberg_site_editor_menu_items ?? array();
+ global $wp_site_editor_menu_items;
+ return $wp_site_editor_menu_items ?? array();
}
}
diff --git a/wp-includes/build/routes.php b/wp-includes/build/routes.php
index ed7913bb5e..c77d26b1a8 100644
--- a/wp-includes/build/routes.php
+++ b/wp-includes/build/routes.php
@@ -4,7 +4,7 @@
* Registers all routes on their respective page init hooks.
* Do not edit this file manually.
*
- * @package gutenberg
+ * @package wp
*/
// Load routes registry
diff --git a/wp-includes/build/routes/index.php b/wp-includes/build/routes/index.php
index d15dc90504..f4a321936f 100644
--- a/wp-includes/build/routes/index.php
+++ b/wp-includes/build/routes/index.php
@@ -3,7 +3,7 @@
* Route registry - Auto-generated by build process.
* Do not edit this file manually.
*
- * @package gutenberg
+ * @package wp
*/
return array(
diff --git a/wp-includes/css/dist/index.php b/wp-includes/css/dist/index.php
index c73fa8751c..891157ecaa 100644
--- a/wp-includes/css/dist/index.php
+++ b/wp-includes/css/dist/index.php
@@ -3,7 +3,7 @@
* Style registry - Auto-generated by build process.
* Do not edit this file manually.
*
- * @package gutenberg
+ * @package wp
*/
return array(
@@ -22,16 +22,21 @@ return array(
'path' => 'preferences/style',
'dependencies' => array('wp-components'),
),
- array(
- 'handle' => 'wp-commands',
- 'path' => 'commands/style',
- 'dependencies' => array('wp-components'),
- ),
array(
'handle' => 'wp-reusable-blocks',
'path' => 'reusable-blocks/style',
'dependencies' => array('wp-block-editor', 'wp-components'),
),
+ array(
+ 'handle' => 'wp-patterns',
+ 'path' => 'patterns/style',
+ 'dependencies' => array('wp-block-editor', 'wp-components'),
+ ),
+ array(
+ 'handle' => 'wp-commands',
+ 'path' => 'commands/style',
+ 'dependencies' => array('wp-components'),
+ ),
array(
'handle' => 'wp-widgets',
'path' => 'widgets/style',
@@ -42,11 +47,6 @@ return array(
'path' => 'components/style',
'dependencies' => array(),
),
- array(
- 'handle' => 'wp-patterns',
- 'path' => 'patterns/style',
- 'dependencies' => array('wp-block-editor', 'wp-components'),
- ),
array(
'handle' => 'wp-format-library',
'path' => 'format-library/style',
diff --git a/wp-includes/js/dist/script-modules/index.php b/wp-includes/js/dist/script-modules/index.php
index a91b925859..3fe0e32738 100644
--- a/wp-includes/js/dist/script-modules/index.php
+++ b/wp-includes/js/dist/script-modules/index.php
@@ -3,20 +3,25 @@
* Script module registry - Auto-generated by build process.
* Do not edit this file manually.
*
- * @package gutenberg
+ * @package wp
*/
return array(
- array(
- 'id' => '@wordpress/a11y',
- 'path' => 'a11y/index',
- 'asset' => 'a11y/index.min.asset.php',
- ),
array(
'id' => '@wordpress/interactivity',
'path' => 'interactivity/index',
'asset' => 'interactivity/index.min.asset.php',
),
+ array(
+ 'id' => '@wordpress/latex-to-mathml',
+ 'path' => 'latex-to-mathml/index',
+ 'asset' => 'latex-to-mathml/index.min.asset.php',
+ ),
+ array(
+ 'id' => '@wordpress/latex-to-mathml/loader',
+ 'path' => 'latex-to-mathml/loader',
+ 'asset' => 'latex-to-mathml/loader.min.asset.php',
+ ),
array(
'id' => '@wordpress/interactivity-router',
'path' => 'interactivity-router/index',
@@ -28,24 +33,19 @@ return array(
'asset' => 'interactivity-router/full-page.min.asset.php',
),
array(
- 'id' => '@wordpress/core-abilities',
- 'path' => 'core-abilities/index',
- 'asset' => 'core-abilities/index.min.asset.php',
- ),
- array(
- 'id' => '@wordpress/latex-to-mathml',
- 'path' => 'latex-to-mathml/index',
- 'asset' => 'latex-to-mathml/index.min.asset.php',
+ 'id' => '@wordpress/abilities',
+ 'path' => 'abilities/index',
+ 'asset' => 'abilities/index.min.asset.php',
),
array(
- 'id' => '@wordpress/latex-to-mathml/loader',
- 'path' => 'latex-to-mathml/loader',
- 'asset' => 'latex-to-mathml/loader.min.asset.php',
+ 'id' => '@wordpress/a11y',
+ 'path' => 'a11y/index',
+ 'asset' => 'a11y/index.min.asset.php',
),
array(
- 'id' => '@wordpress/abilities',
- 'path' => 'abilities/index',
- 'asset' => 'abilities/index.min.asset.php',
+ 'id' => '@wordpress/core-abilities',
+ 'path' => 'core-abilities/index',
+ 'asset' => 'core-abilities/index.min.asset.php',
),
array(
'id' => '@wordpress/edit-site-init',
diff --git a/wp-includes/version.php b/wp-includes/version.php
index faa94e0078..0103d4950b 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
*
* @global string $wp_version
*/
-$wp_version = '7.0-alpha-61438';
+$wp_version = '7.0-alpha-61439';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.