Update/image block

.eslintrc.js

@@ -181,6 +181,8 @@ module.exports = {
 				};
 			} ),
 		} ],
+		// TODO: removeme, maybe? Without this linting fails horribly on Windows, many thousands of false positives :)
+		// 'linebreak-style': 'off',
 	},
 	overrides: [
 		{

lib/blocks.php

@@ -120,27 +120,20 @@ function get_dynamic_block_names() {
 	 */
 	function get_dynamic_blocks_regex() {
 		$dynamic_block_names   = get_dynamic_block_names();
-		$dynamic_block_pattern = (
-			'/<!--\s+wp:(' .
-			str_replace(
-				'/',
-				'\/',                 // Escape namespace, not handled by preg_quote.
-				str_replace(
-					'core/',
-					'(?:core/)?', // Allow implicit core namespace, but don't capture.
-					implode(
-						'|',                   // Join block names into capture group alternation.
-						array_map(
-							'preg_quote',    // Escape block name for regular expression.
-							$dynamic_block_names
-						)
-					)
-				)
-			) .
-			')(\s+(\{.*?\}))?\s+(\/)?-->/'
-		);
-
-		return $dynamic_block_pattern;
+
+		// Escape block name for regular expression.
+		$dynamic_block_names = array_map( 'preg_quote', $dynamic_block_names );
+
+		// Join block names into capture group alternation.
+		$dynamic_block_names = implode( '|', $dynamic_block_names );
+
+		// Allow implicit core namespace, but don't capture.
+		$dynamic_block_names = str_replace( 'core/', '(?:core/)?', $dynamic_block_names );
+
+		// Escape namespace, not handled by preg_quote.
+		$dynamic_block_names = str_replace( '/', '\/', $dynamic_block_names );
+
+		return '/<!--\s+wp:(' . $dynamic_block_names . ')(\s+(\{.*?\}))?\s+(\/)?-->/';
 	}
 }
 

lib/compat.php

@@ -116,6 +116,66 @@ function gutenberg_wpautop( $content ) {
 remove_filter( 'the_content', 'wpautop' );
 add_filter( 'the_content', 'gutenberg_wpautop', 6 );
 
+/**
+ * Add `srcset` to the image meta `sizes` array in the REST API response.
+ *
+ * @param WP_REST_Response $response Response object.
+ * @param WP_Post $attachment Attachment post object.
+ * @return WP_REST_Response Response object.
+ */
+function gutenberg_rest_prepare_attachment( $response, $attachment ) {
+	if ( ! isset( $response->data['media_type'] ) ) {
+		return $response;
+	}
+
+	if ( $response->data['media_type'] === 'image' && ! empty( $response->data['media_details']['sizes'] ) ) {
+		$meta = wp_get_attachment_metadata( $attachment->ID );
+		$sizes = $response->data['media_details']['sizes'];
+
+		foreach ( $sizes as $size_name => $size ) {
+			$srcset = wp_calculate_image_srcset( array( $size['width'], $size['height'] ), $size['source_url'], $meta, $attachment->ID );
+
+			if ( $srcset ) {
+				$sizes[ $size_name ]['srcset'] = $srcset;
+			}
+		}
+
+		$response->data['media_details']['sizes'] = $sizes;
+	}
+
+	return $response;
+}
+add_filter( 'rest_prepare_attachment', 'gutenberg_rest_prepare_attachment', 10, 2 );
+
+/**
+ * Add `srcset` to the prepared attachment data for the Media Library.
+ *
+ * @param array   $response   Array of prepared attachment data.
+ * @param WP_Post $attachment Attachment object.
+ * @param array   $meta       Array of attachment meta data.
+ * @return array Array of prepared attachment data.
+ */
+function gutenberg_prepare_attachment_for_js( $response, $attachment, $meta ) {
+	if ( ! empty( $response['type'] ) && $response['type'] === 'image' && ! empty( $response['sizes'] ) ) {
+		foreach ( $response['sizes'] as $size_name => $size ) {
+			$srcset = wp_calculate_image_srcset( array( $size['width'], $size['height'] ), $size['url'], $meta, $attachment->ID );
+
+			if ( $srcset ) {
+				$response['sizes'][ $size_name ]['srcset'] = $srcset;
+			}
+
+			if ( array_key_exists( $size_name, $meta['sizes'] ) ) {
+				$response['sizes'][ $size_name ]['actual_size'] = array(
+					'width' => (int) $meta['sizes'][ $size_name ]['width'],
+					'height' => (int) $meta['sizes'][ $size_name ]['height'],
+				);
+			}
+		}
+	}
+
+	return $response;
+}
+add_filter( 'wp_prepare_attachment_for_js', 'gutenberg_prepare_attachment_for_js', 10, 3 );
 
 /**
  * Check if we need to load the block warning in the Classic Editor.

lib/load.php

@@ -51,7 +51,6 @@
 require dirname( __FILE__ ) . '/i18n.php';
 require dirname( __FILE__ ) . '/register.php';
 
-
 // Register server-side code for individual blocks.
 if ( ! function_exists( 'render_block_core_archives' ) ) {
 	require dirname( __FILE__ ) . '/../packages/block-library/src/archives/index.php';
@@ -74,3 +73,6 @@
 if ( ! function_exists( 'render_block_core_shortcode' ) ) {
 	require dirname( __FILE__ ) . '/../packages/block-library/src/shortcode/index.php';
 }
+if ( ! function_exists( 'render_block_core_image' ) ) {
+	require dirname( __FILE__ ) . '/../packages/block-library/src/image/index.php';
+}