BrajamohanDas-afk · Jan 10, 2026 · Jan 11, 2026 · Jan 11, 2026 · Jan 11, 2026 · Jan 12, 2026
diff --git a/.stylelintignore b/.stylelintignore
@@ -2,4 +2,5 @@ build
 build-style
 node_modules
 packages/stylelint-config/test
+packages/theme/src/prebuilt
 packages/theme/src/stylelint-plugins/test/fixtures
@@ -203,15 +203,15 @@ async function dev() {
 		// Wait for wp-build to complete its initial build, then signal ready.
 		// Using .then() ensures cleanup handlers are registered before awaiting,
 		// so early termination still triggers cleanup.
-		const onStdoutData = ( data ) => {
+		let isReady = false;
+		buildWatch.stdout.on( 'data', ( data ) => {
 			const output = data.toString();
 			process.stdout.write( output );
-			if ( output.includes( 'Watching for changes' ) ) {
-				buildWatch.stdout.off( 'data', onStdoutData );
+			if ( ! isReady && output.includes( 'Watching for changes' ) ) {
+				isReady = true;
 				readyMarkerFile.create();
 			}
-		};
-		buildWatch.stdout.on( 'data', onStdoutData );
+		} );
 
 		// Keep the process running
 		await new Promise( () => {} );

@@ -145,7 +145,7 @@ When defining a direct descendent block, use the `parent` block setting to defin
 
 An example of this is the Comment Author Name block, which is assigned the `ancestor` block setting. This allows the Comment Author Name block to only be available as a nested descendant in its ancestral Comment Template block. Otherwise, the Comment Author Name block will not be available as an option within the block inserter. See [Comment Author Name code for reference](https://github.com/WordPress/gutenberg/tree/HEAD/packages/block-library/src/comment-author-name).
 
-The `ancestor` relationship allows the Comment Author Name block to be anywhere in the hierarchical tree, and not _just_ a direct child of the parent Comment Template block, while still limiting its availability within the block inserter to only be visible an an option to insert if the Comment Template block is available.
+The `ancestor` relationship allows the Comment Author Name block to be anywhere in the hierarchical tree, and not _just_ a direct child of the parent Comment Template block, while still limiting its availability within the block inserter to only be visible as an option to insert if the Comment Template block is available.
 
 When defining a descendent block, use the `ancestor` block setting. This prevents the nested block from showing in the inserter outside of the InnerBlock it is defined for.
 

@@ -2100,7 +2100,7 @@
 		"parent": "packages"
 	},
 	{
-		"title": "@wordpress/wp-build",
+		"title": "@wordpress/build",
 		"slug": "packages-wp-build",
 		"markdown_source": "../packages/wp-build/README.md",
 		"parent": "packages"

@@ -408,8 +408,8 @@ Introduce new sections and organize content to help visitors (and search engines
 
 -	**Name:** core/heading
 -	**Category:** text
--	**Supports:** __unstablePasteTextInline, align (full, wide), anchor, className, color (background, gradients, link, text), interactivity (clientNavigation), spacing (margin, padding), splitting, typography (fitText, fontSize, lineHeight)
--	**Attributes:** content, level, levelOptions, placeholder, textAlign
+-	**Supports:** __unstablePasteTextInline, align (full, wide), anchor, className, color (background, gradients, link, text), interactivity (clientNavigation), spacing (margin, padding), splitting, typography (fitText, fontSize, lineHeight, textAlign)
+-	**Attributes:** content, level, levelOptions, placeholder
 
 ## Home Link
 
@@ -520,7 +520,7 @@ Content before this block will be shown in the excerpt on your archives page. ([
 
 -	**Name:** core/more
 -	**Category:** design
--	**Supports:** interactivity (clientNavigation), ~~className~~, ~~customClassName~~, ~~html~~, ~~multiple~~
+-	**Supports:** interactivity (clientNavigation), ~~className~~, ~~customClassName~~, ~~html~~, ~~multiple~~, ~~visibility~~
 -	**Attributes:** customText, noTeaser
 
 ## Navigation
@@ -571,7 +571,7 @@ Separate your content into a multi-page experience. ([Source](https://github.com
 -	**Name:** core/nextpage
 -	**Category:** design
 -	**Parent:** core/post-content
--	**Supports:** anchor, interactivity (clientNavigation), ~~className~~, ~~customClassName~~, ~~html~~
+-	**Supports:** anchor, interactivity (clientNavigation), ~~className~~, ~~customClassName~~, ~~html~~, ~~visibility~~
 
 ## Page List
 

@@ -4,7 +4,7 @@ Namespace: `core/notices`.
 
 ## Selectors
 
-<!-- START TOKEN(Autogenerated selectors|../../../packages/notices/src/store/selectors.js) -->
+<!-- START TOKEN(Autogenerated selectors|../../../packages/notices/src/store/selectors.ts) -->
 
 ### getNotices
 
@@ -32,18 +32,18 @@ const ExampleComponent = () => {
 
 _Parameters_
 
--   _state_ `Object`: Notices state.
--   _context_ `?string`: Optional grouping context.
+-   _state_ `Record< string, Array< Notice > >`: Notices state.
+-   _context_ `string`: Optional grouping context.
 
 _Returns_
 
--   `WPNotice[]`: Array of notices.
+-   Array of notices.
 
-<!-- END TOKEN(Autogenerated selectors|../../../packages/notices/src/store/selectors.js) -->
+<!-- END TOKEN(Autogenerated selectors|../../../packages/notices/src/store/selectors.ts) -->
 
 ## Actions
 
-<!-- START TOKEN(Autogenerated actions|../../../packages/notices/src/store/actions.js) -->
+<!-- START TOKEN(Autogenerated actions|../../../packages/notices/src/store/actions.ts) -->
 
 ### createErrorNotice
 
@@ -83,11 +83,11 @@ const ExampleComponent = () => {
 _Parameters_
 
 -   _content_ `string`: Notice message.
--   _options_ `[Object]`: Optional notice options.
+-   _options_ `NoticeOptions`: Optional notice options.
 
 _Returns_
 
--   `Object`: Action object.
+-   Action object.
 
 ### createInfoNotice
 
@@ -124,11 +124,11 @@ const ExampleComponent = () => {
 _Parameters_
 
 -   _content_ `string`: Notice message.
--   _options_ `[Object]`: Optional notice options.
+-   _options_ `NoticeOptions`: Optional notice options.
 
 _Returns_
 
--   `Object`: Action object.
+-   Action object.
 
 ### createNotice
 
@@ -156,22 +156,13 @@ const ExampleComponent = () => {
 
 _Parameters_
 
--   _status_ `string|undefined`: Notice status ("info" if undefined is passed).
+-   _status_ Notice status ("info" if undefined is passed).
 -   _content_ `string`: Notice message.
--   _options_ `[Object]`: Notice options.
--   _options.context_ `[string]`: Context under which to group notice.
--   _options.id_ `[string]`: Identifier for notice. Automatically assigned if not specified.
--   _options.isDismissible_ `[boolean]`: Whether the notice can be dismissed by user.
--   _options.type_ `[string]`: Type of notice, one of `default`, or `snackbar`.
--   _options.speak_ `[boolean]`: Whether the notice content should be announced to screen readers.
--   _options.actions_ `[Array<WPNoticeAction>]`: User actions to be presented with notice.
--   _options.icon_ `[string]`: An icon displayed with the notice. Only used when type is set to `snackbar`.
--   _options.explicitDismiss_ `[boolean]`: Whether the notice includes an explicit dismiss button and can't be dismissed by clicking the body of the notice. Only applies when type is set to `snackbar`.
--   _options.onDismiss_ `[Function]`: Called when the notice is dismissed.
+-   _options_ `NoticeOptions`: Optional notice options.
 
 _Returns_
 
--   `Object`: Action object.
+-   `Extract< ReducerAction, { type: 'CREATE_NOTICE'; } >`: Action object.
 
 ### createSuccessNotice
 
@@ -209,11 +200,11 @@ const ExampleComponent = () => {
 _Parameters_
 
 -   _content_ `string`: Notice message.
--   _options_ `[Object]`: Optional notice options.
+-   _options_ `NoticeOptions`: Optional notice options.
 
 _Returns_
 
--   `Object`: Action object.
+-   Action object.
 
 ### createWarningNotice
 
@@ -255,11 +246,11 @@ const ExampleComponent = () => {
 _Parameters_
 
 -   _content_ `string`: Notice message.
--   _options_ `[Object]`: Optional notice options.
+-   _options_ `NoticeOptions`: Optional notice options.
 
 _Returns_
 
--   `Object`: Action object.
+-   Action object.
 
 ### removeAllNotices
 
@@ -301,12 +292,12 @@ export const ExampleComponent = () => {
 
 _Parameters_
 
--   _noticeType_ `string`: The context to remove all notices from.
--   _context_ `string`: The context to remove all notices from.
+-   _noticeType_ The context to remove all notices from.
+-   _context_ `string`: The optional context to remove all notices from.
 
 _Returns_
 
--   `Object`: Action object.
+-   `Extract< ReducerAction, { type: 'REMOVE_ALL_NOTICES'; } >`: Action object.
 
 ### removeNotice
 
@@ -350,11 +341,11 @@ const ExampleComponent = () => {
 _Parameters_
 
 -   _id_ `string`: Notice unique identifier.
--   _context_ `[string]`: Optional context (grouping) in which the notice is intended to appear. Defaults to default context.
+-   _context_ `string`: Optional context (grouping) in which the notice is intended to appear. Defaults to 'default' context.
 
 _Returns_
 
--   `Object`: Action object.
+-   `Extract< ReducerAction, { type: 'REMOVE_NOTICE'; } >`: Action object.
 
 ### removeNotices
 
@@ -394,11 +385,11 @@ const ExampleComponent = () => {
 
 _Parameters_
 
--   _ids_ `string[]`: List of unique notice identifiers.
--   _context_ `[string]`: Optional context (grouping) in which the notices are intended to appear. Defaults to default context.
+-   _ids_ `Array< string >`: List of unique notice identifiers.
+-   _context_ `string`: Optional context (grouping) in which the notices are intended to appear. Defaults to 'default' context.
 
 _Returns_
 
--   `Object`: Action object.
+-   `Extract< ReducerAction, { type: 'REMOVE_NOTICES'; } >`: Action object.
 
-<!-- END TOKEN(Autogenerated actions|../../../packages/notices/src/store/actions.js) -->
+<!-- END TOKEN(Autogenerated actions|../../../packages/notices/src/store/actions.ts) -->
@@ -40,10 +40,20 @@ function getPackageManifest( packageFolderNames ) {
 	return packageFolderNames.reduce( ( manifest, folderName ) => {
 		const path = `${ baseRepoUrl }/packages/${ folderName }/README.md`;
 		const tocPath = `${ baseRepoUrl }/packages/${ folderName }/docs/toc.json`;
+		const packageJson = require(
+			join(
+				__dirname,
+				'..',
+				'..',
+				'packages',
+				folderName,
+				'package.json'
+			)
+		);
 
 		// First add any README files to the TOC
 		manifest.push( {
-			title: `@wordpress/${ folderName }`,
+			title: packageJson.name,
 			slug: `packages-${ folderName }`,
 			markdown_source: path,
 			parent: 'packages',

@@ -847,6 +847,29 @@ function gutenberg_render_layout_support_flag( $block_content, $block ) {
 
 		$gap_value = $block['attrs']['style']['spacing']['blockGap'] ?? null;
 
+		/*
+		 * Check for style variation blockGap first.
+		 * Style variations should override block-level and global blockGap values.
+		 */
+		$classes = $block['attrs']['className'] ?? '';
+		if ( ! empty( $classes ) && function_exists( 'gutenberg_get_block_style_variation_name_from_class' ) ) {
+			$variations = gutenberg_get_block_style_variation_name_from_class( $classes );
+
+			if ( $variations ) {
+				$tree       = WP_Theme_JSON_Resolver_Gutenberg::get_merged_data();
+				$theme_json = $tree->get_raw_data();
+
+				foreach ( $variations as $variation ) {
+					$variation_data = $theme_json['styles']['blocks'][ $block['blockName'] ]['variations'][ $variation ] ?? array();
+
+					if ( isset( $variation_data['spacing']['blockGap'] ) ) {
+						$gap_value = $variation_data['spacing']['blockGap'];
+						break; // Use first matching variation with blockGap.
+					}
+				}
+			}
+		}
+
 		/*
 		 * Skip if gap value contains unsupported characters.
 		 * Regex for CSS value borrowed from `safecss_filter_attr`, and used here

@@ -171,6 +171,8 @@ private static function handle_read_pending_messages( $subscriber_to_messages_pa
 		list( $fd, $subscriber_to_messages ) = static::get_contents_and_lock_file( $subscriber_to_messages_path );
 		if ( ! $fd ) {
 			$retries = isset( $_COOKIE['signaling_server_retries'] ) ? intval( $_COOKIE['signaling_server_retries'] ) : 0;
+			// Clamp retries to avoid unbounded exponential backoff.
+			$retries = max( 0, min( $retries, 10 ) );
 			$secure  = ( 'https' === parse_url( home_url(), PHP_URL_SCHEME ) );
 			setcookie( 'signaling_server_retries', (string) ( $retries + 1 ), time() + DAY_IN_SECONDS, SITECOOKIEPATH, '', $secure );
 			echo 'id: ' . time() . PHP_EOL;

diff --git a/package-lock.json b/package-lock.json
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import fastDeepEqual from 'fast-deep-equal/es6';
+import fastDeepEqual from 'fast-deep-equal/es6/index.js';
 
 /**
  * WordPress dependencies

@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import fastDeepEqual from 'fast-deep-equal/es6';
+import fastDeepEqual from 'fast-deep-equal/es6/index.js';
 
 /**
  * WordPress dependencies

@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import fastDeepEqual from 'fast-deep-equal/es6';
+import fastDeepEqual from 'fast-deep-equal/es6/index.js';
 
 /**
  * WordPress dependencies

@@ -2,7 +2,7 @@
  * External dependencies
  */
 import clsx from 'clsx';
-import fastDeepEqual from 'fast-deep-equal/es6';
+import fastDeepEqual from 'fast-deep-equal/es6/index.js';
 
 /**
  * WordPress dependencies