Keep nonces (#883)

Disable RemoveNonce transformer as they're now supported by the AMP Validator. See ampproject/amphtml#26418
ampproject · Aug 17, 2020 · 3cd2396 · 3cd2396
1 parent da31412
commit 3cd2396
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/packages/optimizer/lib/DomTransformer.js b/packages/optimizer/lib/DomTransformer.js
@@ -51,8 +51,6 @@ const TRANSFORMATIONS_AMP_FIRST = [
   // Move keyframes into a separate style tag
   'SeparateKeyframes',
   'AddTransformedFlag',
-  // Removes unsupported nonce attribute from scripts
-  'RemoveCspNonce',
   // Minifies HTML, JSON, inline amp-script
   'MinifyHtml',
   // Inject CSP script has required for inline amp-script

diff --git a/packages/optimizer/spec/end-to-end/hello-world/expected_output.default.html b/packages/optimizer/spec/end-to-end/hello-world/expected_output.default.html
@@ -7,7 +7,7 @@
   <script async src="https://cdn.ampproject.org/v0.js"></script>
   <script async custom-element="amp-experiment" src="https://cdn.ampproject.org/v0/amp-experiment-0.1.js"></script>
   <script async src="https://cdn.ampproject.org/v0/amp-video-0.1.js" custom-element="amp-video"></script>
-  <script async custom-template="amp-mustache" src="https://cdn.ampproject.org/v0/amp-mustache-0.1.js"></script>
+  <script async custom-template="amp-analytics" src="https://cdn.ampproject.org/v0/amp-analytics-0.1.js"></script>
   <link rel="preload" href="https://amp.dev/static/samples/img/amp.jpg" as="image" data-hero>
   <link rel="canonical" href="self.html"><style amp-custom>h1{margin:16px}</style>
 </head>

diff --git a/packages/optimizer/spec/end-to-end/hello-world/expected_output.lts.html b/packages/optimizer/spec/end-to-end/hello-world/expected_output.lts.html
@@ -7,7 +7,7 @@
   <script async src="https://cdn.ampproject.org/lts/v0.js"></script>
   <script async custom-element="amp-experiment" src="https://cdn.ampproject.org/lts/v0/amp-experiment-0.1.js"></script>
   <script async src="https://cdn.ampproject.org/lts/v0/amp-video-0.1.js" custom-element="amp-video"></script>
-  <script async custom-template="amp-mustache" src="https://cdn.ampproject.org/lts/v0/amp-mustache-0.1.js"></script>
+  <script async custom-template="amp-analytics" src="https://cdn.ampproject.org/lts/v0/amp-analytics-0.1.js"></script>
   <link rel="preload" href="https://amp.dev/static/samples/img/amp.jpg" as="image" data-hero>
   <link rel="canonical" href="self.html"><style amp-custom>h1{margin:16px}</style>
 </head>

diff --git a/packages/optimizer/spec/end-to-end/hello-world/expected_output.paired.html b/packages/optimizer/spec/end-to-end/hello-world/expected_output.paired.html
@@ -9,7 +9,7 @@
   <script async src="https://example.com/amp/rtv/123456789000000/v0.js"></script>
   <script async custom-element="amp-experiment" src="https://example.com/amp/rtv/123456789000000/v0/amp-experiment-0.1.js"></script>
   <script async src="https://example.com/amp/rtv/123456789000000/v0/amp-video-0.1.js" custom-element="amp-video"></script>
-  <script async custom-template="amp-mustache" src="https://example.com/amp/rtv/123456789000000/v0/amp-mustache-0.1.js"></script>
+  <script async custom-template="amp-analytics" src="https://example.com/amp/rtv/123456789000000/v0/amp-analytics-0.1.js"></script>
   <link rel="preload" href="https://amp.dev/static/samples/img/amp.jpg" as="image" data-hero>
   <link rel="canonical" href="self.html"><style amp-custom>h1{margin:16px}</style>
   <link rel="amphtml" href="/amp-version.html">

diff --git a/packages/optimizer/spec/end-to-end/hello-world/input.html b/packages/optimizer/spec/end-to-end/hello-world/input.html
@@ -15,8 +15,9 @@
   <meta name="viewport" content="width=device-width,minimum-scale=1">
   <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
   <script async src="https://cdn.ampproject.org/v0.js"></script>
+  <script async nonce="484fee01e48047fa23773ddcbc3feb0a" custom-element="amp-analytics" src="https://cdn.ampproject.org/v0/amp-analytics-0.1.js"></script>
   <script async custom-element="amp-experiment" src="https://cdn.ampproject.org/v0/amp-experiment-0.1.js"></script>
-  <script async custom-template="amp-mustache" src="https://cdn.ampproject.org/v0/amp-mustache-0.1.js"></script>
+  <script async custom-template="amp-analytics" src="https://cdn.ampproject.org/v0/amp-analytics-0.1.js"></script>
   <style amp-custom>h1 { margin: 16px; }</style>
 </head>
 <body>

diff --git a/packages/optimizer/spec/valid-amp/files/_Hello_World.html b/packages/optimizer/spec/valid-amp/files/_Hello_World.html
@@ -12,6 +12,7 @@
   <title> Hello World</title>
 
   <script async src="https://cdn.ampproject.org/v0.js"></script>
+  <script async nonce="484fee01e48047fa23773ddcbc3feb0a" custom-element="amp-analytics" src="https://cdn.ampproject.org/v0/amp-analytics-0.1.js"></script>
 
   <link rel="canonical" href="https://example.com/introduction/hello_world/">