Merge branch 'trunk' of github.com:amitraj2203/gutenberg into fix/iss…

…ue-61349
amitraj2203 · May 6, 2024 · aeab50e · aeab50e
2 parents c932836 + ea2e969
commit aeab50e
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 9 deletions.
diff --git a/lib/compat/wordpress-6.4/block-hooks.php b/lib/compat/wordpress-6.4/block-hooks.php
@@ -290,7 +290,7 @@ function gutenberg_register_block_hooks_rest_field() {
 		'block_hooks',
 		array(
 			'schema' => array(
-				'description'       => __( 'This block is automatically inserted near any occurence of the block types used as keys of this map, into a relative position given by the corresponding value.', 'gutenberg' ),
+				'description'       => __( 'This block is automatically inserted near any occurrence of the block types used as keys of this map, into a relative position given by the corresponding value.', 'gutenberg' ),
 				'type'              => 'object',
 				'patternProperties' => array(
 					'^[a-zA-Z0-9-]+/[a-zA-Z0-9-]+$' => array(

diff --git a/lib/compat/wordpress-6.5/fonts/class-wp-font-utils.php b/lib/compat/wordpress-6.5/fonts/class-wp-font-utils.php
@@ -162,7 +162,7 @@ function ( $elem ) {
 		 * The schema structure should mirror the data tree. Each value provided in the
 		 * schema should be a callable that will be applied to sanitize the corresponding
 		 * value in the data tree. Keys that are in the data tree, but not present in the
-		 * schema, will be removed in the santized data. Nested arrays are traversed recursively.
+		 * schema, will be removed in the sanitized data. Nested arrays are traversed recursively.
 		 *
 		 * @since 6.5.0
 		 *

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/create-block/README.md b/packages/create-block/README.md
@@ -19,7 +19,7 @@ $ npm start
 The `slug` provided (`todo-list` in the example) defines the folder name for the scaffolded plugin and the internal block name. The WordPress plugin generated must [be installed manually](https://wordpress.org/documentation/article/manage-plugins/#manual-plugin-installation-1).
 
 
-_(requires `node` version `14.0.0` or above, and `npm` version `6.14.4` or above)_
+_(requires `node` version `18.0.0` or above, and `npm` version `10.5.0` or above)_
 
 
 > [Watch a video introduction to create-block on Learn.wordpress.org](https://learn.wordpress.org/tutorial/using-the-create-block-tool/)

diff --git a/packages/create-block/package.json b/packages/create-block/package.json
@@ -20,8 +20,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=14",
-		"npm": ">=6.14.4"
+		"node": ">=18",
+		"npm": ">=10.5.0"
 	},
 	"files": [
 		"lib"

diff --git a/packages/edit-site/src/components/global-styles/variations/variation.js b/packages/edit-site/src/components/global-styles/variations/variation.js
@@ -82,7 +82,7 @@ export default function Variation( { variation, children, isPill } ) {
 				onBlur={ () => setIsFocused( false ) }
 			>
 				<div
-					className={ classnames(
+					className={ clsx(
 						'edit-site-global-styles-variations_item-preview',
 						{ 'is-pill': isPill }
 					) }

diff --git a/packages/interactivity-router/src/head.js b/packages/interactivity-router/src/head.js
@@ -3,7 +3,6 @@
  *
  * @async
  * @param {Array} newHead The head elements of the new page.
- *
  */
 export const updateHead = async ( newHead ) => {
 	// Helper to get the tag id store in the cache.