ampproject
diff --git a/‎src/Optimizer/Transformer/RewriteAmpUrls.php
+9-4 b/‎src/Optimizer/Transformer/RewriteAmpUrls.php
+9-4
diff --git a/‎tests/Optimizer/Transformer/RewriteAmpUrlsTest.php
+2-3 b/‎tests/Optimizer/Transformer/RewriteAmpUrlsTest.php
+2-3
diff --git a/‎tests/spec/end-to-end/body-only/expected_output.full.html
+1-2 b/‎tests/spec/end-to-end/body-only/expected_output.full.html
+1-2
diff --git a/‎tests/spec/end-to-end/body-only/expected_output.lts.html
+1-2 b/‎tests/spec/end-to-end/body-only/expected_output.lts.html
+1-2
diff --git a/‎tests/spec/end-to-end/hello-world/expected_output.fast.html
+1-2 b/‎tests/spec/end-to-end/hello-world/expected_output.fast.html
+1-2
diff --git a/‎tests/spec/end-to-end/hello-world/expected_output.full.html
+2-3 b/‎tests/spec/end-to-end/hello-world/expected_output.full.html
+2-3
diff --git a/‎tests/spec/end-to-end/hello-world/expected_output.lts.html
+2-3 b/‎tests/spec/end-to-end/hello-world/expected_output.lts.html
+2-3
diff --git a/‎tests/spec/end-to-end/hello-world/expected_output.paired.html
-1 b/‎tests/spec/end-to-end/hello-world/expected_output.paired.html
-1
diff --git a/‎tests/spec/end-to-end/markdown/expected_output.full.html
+1-2 b/‎tests/spec/end-to-end/markdown/expected_output.full.html
+1-2
diff --git a/‎tests/spec/end-to-end/markdown/expected_output.lts.html
+1-2 b/‎tests/spec/end-to-end/markdown/expected_output.lts.html
+1-2
@@ -194,7 +194,7 @@ private function addEsm(Document $document, Element $scriptNode)
         $scriptUrl    = $scriptNode->getAttribute(Attribute::SRC);
         $esmScriptUrl = preg_replace('/\.js$/', '.mjs', $scriptUrl);
 
-        if ($this->shouldPreload($scriptUrl)) {
+        if ($this->shouldPreload($scriptUrl, $document)) {
             $document->links->addModulePreload($esmScriptUrl, Tag::SCRIPT, Attribute::CROSSORIGIN_ANONYMOUS);
         }
 
@@ -224,7 +224,7 @@ private function addEsm(Document $document, Element $scriptNode)
      */
     private function addPreload(Document $document, $href, $type)
     {
-        if (! $this->shouldPreload($href)) {
+        if (! $this->shouldPreload($href, $document)) {
             return;
         }
 
@@ -276,11 +276,16 @@ private function adaptForSelfHosting(Document $document, $host, $errors)
     /**
      * Check whether a given URL should be preloaded.
      *
-     * @param string $url Url to check.
+     * @param string   $url      Url to check.
+     * @param Document $document Document on which to check.
      * @return bool Whether the provided URL should be preloaded.
      */
-    private function shouldPreload($url)
+    private function shouldPreload($url, Document $document)
     {
+        if ($document->documentElement->hasAttribute(Amp::NO_BOILERPLATE_ATTRIBUTE)) {
+            return false;
+        }
+
         return substr_compare($url, 'v0.js', -5) === 0
                ||
                substr_compare($url, 'v0.css', -6) === 0;
 
@@ -40,7 +40,7 @@ public function testThrowsOnMutuallyExclusiveFlags()
     public function testOrderingOfScripts()
     {
         $document = Document::fromHtml(
-            TestMarkup::DOCTYPE . '<html amp><head>' . TestMarkup::META_CHARSET . TestMarkup::META_VIEWPORT
+            TestMarkup::DOCTYPE . '<html amp i-amphtml-no-boilerplate><head>' . TestMarkup::META_CHARSET . TestMarkup::META_VIEWPORT
             . TestMarkup::LINK_CANONICAL . TestMarkup::LINK_GOOGLE_FONT_PRECONNECT
             . TestMarkup::SCRIPT_AMPRUNTIME
             . '</head><body></body></html>'
@@ -53,8 +53,7 @@ public function testOrderingOfScripts()
 
         $this->assertCount(0, $errors);
         $this->assertSimilarMarkup(
-            TestMarkup::DOCTYPE . '<html amp><head>' . TestMarkup::META_CHARSET . TestMarkup::META_VIEWPORT
-            . '<link as="script" crossorigin="anonymous" href="https://cdn.ampproject.org/v0.mjs" rel="modulepreload">'
+            TestMarkup::DOCTYPE . '<html amp i-amphtml-no-boilerplate><head>' . TestMarkup::META_CHARSET . TestMarkup::META_VIEWPORT
             . TestMarkup::LINK_CANONICAL . TestMarkup::LINK_GOOGLE_FONT_PRECONNECT
             . '<script async crossorigin="anonymous" nomodule src="https://cdn.ampproject.org/v0.js"></script>'
             . '<script async crossorigin="anonymous" src="https://cdn.ampproject.org/v0.mjs" type="module"></script>'