fix(image-ids): support image-attributes hook

Also include data-attachment-id-source to debug future problems.

libs/htmlpurifier-html5/library/HTMLPurifier/HTML5Definition.php

@@ -106,6 +106,7 @@ public static function setup(HTMLPurifier_HTMLDefinition $def)
         $def->addAttribute('img', 'srcset', 'Text');
         $def->addAttribute('img', 'sizes', 'Text');
         $def->addAttribute('img', 'data-attachment-id', 'Text');
+        $def->addAttribute('img', 'data-attachment-id-source', 'Text');
 
         // IFRAME
         $def->addAttribute('iframe', 'allowfullscreen', 'Bool');

wp-pwa.php

@@ -73,14 +73,21 @@ function __construct()
 		add_action('wp_head', array($this,'amp_add_canonical'));
 
 		add_filter('wp_get_attachment_link', array( $this, 'add_id_to_gallery_images'), 10, 2);
+		add_filter('wp_get_attachment_image_attributes', array( $this, 'add_id_to_gallery_image_attributes'), 10, 2);
+	}
+
+	function add_id_to_gallery_image_attributes($attrs, $attachment) {
+		$attrs['data-attachment-id'] = $attachment->ID;
+		$attrs['data-attachment-id-source'] = 'image-attributes-hook';
+		return $attrs;
 	}
 
 	function add_id_to_gallery_images($html, $attachment_id) {
 		$attachment_id = intval($attachment_id);
 		$html = str_replace(
 			'<img ',
 			sprintf(
-				'<img data-attachment-id="%1$d" ',
+				'<img data-attachment-id="%1$d" data-attachment-id-source="attachment-link-hook"',
 				$attachment_id
 			),
 			$html
@@ -260,11 +267,13 @@ function add_image_ids($data) {
 				$imgIds[] = intval($dataAttachmentId);
 			} elseif ($wpImage && isset($wpImage[1])) {
 				$image->setAttribute('data-attachment-id', $wpImage[1]);
+				$image->setAttribute('data-attachment-id-source', 'wp-image-class');
 				$imgIds[] = intval($wpImage[1]);
 			} else {
 				$id = $this->get_attachment_id($image->src);
 				if ($id !== 0) {
 					$image->setAttribute('data-attachment-id', $id);
+					$image->setAttribute('data-attachment-id-source', 'wp-query');
 					$imgIds[] = intval($id);
 				}
 			}