Merge pull request #516 from ampproject/fix/find-hero-images

Author: schlessera

src/Optimizer/Transformer/OptimizeHeroImages.php

@@ -202,7 +202,11 @@ private function findHeroImages(Document $document, $maxHeroImageCount)
         $node                = $document->body;
 
         while ($node !== null) {
-            if (! $node instanceof Element) {
+            if (
+                ! $node instanceof Element
+                ||
+                ( $node->parentNode instanceof Element && $node->parentNode->tagName === Tag::NOSCRIPT )
+            ) {
                 $node = NodeWalker::nextNode($node);
                 continue;
             }

tests/Optimizer/Transformer/OptimizeHeroImagesTest.php

@@ -249,6 +249,15 @@ public function dataTransform()
                 ),
             ],
 
+            'hero image with noscript fallback' => [
+                $input(
+                    '<amp-img data-hero width="500" height="400" src="/img1.png"><noscript><img data-hero width="500" height="400" src="/img1.png"></noscript></amp-img>'
+                ),
+                $output(
+                    '<amp-img data-hero height="400" i-amphtml-ssr src="/img1.png" width="500"><img class="i-amphtml-fill-content i-amphtml-replaced-content" decoding="async" src="/img1.png"></amp-img>'
+                ),
+            ],
+
             'superfluous candidates are ignored without throwing an error' => [
                 $input(
                     '<amp-img width="500" height="400" src="/foo.png"></amp-img>'