From dc71bfbedd64873d002eba4a3a7e1d3480cf3a14 Mon Sep 17 00:00:00 2001
From: Devin Mullins <twifkak@google.com>
Date: Wed, 18 Dec 2019 13:09:31 -0800
Subject: [PATCH] Don't strip <script type=text/plain>. The original purpose of
 this transformer was #148, and text/plain scripts should not be relevant to
 that aim. Note that the text/plain scripts used by the amp-script component
 are further guarded by computeMaxAgeSeconds in transformer.go.

PiperOrigin-RevId: 286250297
---
 transformer/transformers/stripjs.go      | 13 ++-----------
 transformer/transformers/stripjs_test.go | 11 +++--------
 2 files changed, 5 insertions(+), 19 deletions(-)
diff --git a/transformer/transformers/stripjs.go b/transformer/transformers/stripjs.go
index 476a07929..e4e91081d 100644
--- a/transformer/transformers/stripjs.go
+++ b/transformer/transformers/stripjs.go
@@ -34,8 +34,7 @@ var eventRE = func() *regexp.Regexp {
 // - For <script> elements, remove where any of the following is true:
 //     - It has a src attribute whose value is not prefixed by https://cdn.ampproject.org/ (case-insensitive match).
 //     - It has no src attribute and no type attribute (case-insensitive match).
-//     - It has a type attribute whose value is neither application/json nor application/ld+json (case-insensitive match on both name and value).
-//       - Unless it is a child of template (amp-mustache) and has type=text/plain.
+//     - It has a type attribute whose value is not application/json, application/ld+json, or text/plain (case-insensitive match on both name and value).
 //
 // - For all other elements, remove any event attribute that matches "on[A-Za-z].*".
 func StripJS(e *Context) error {
@@ -61,21 +60,13 @@ func StripJS(e *Context) error {
 			}
 			if typeOk {
 				switch strings.ToLower(typeVal) {
-				case "application/json", "application/ld+json":
+				case "application/json", "application/ld+json", "text/plain":
 					// ok to keep
 				case "text/javascript":
 					// ok to keep only for AMP Cache scripts
 					if !isCacheSrc {
 						htmlnode.RemoveNode(&n)
 					}
-				case "text/plain":
-					// ok to keep only when attribute template=amp-mustache is present
-					if t, ok := htmlnode.GetAttributeVal(n, "", "template"); ok {
-						if t == "amp-mustache" {
-							continue
-						}
-					}
-					htmlnode.RemoveNode(&n)
 				default:
 					htmlnode.RemoveNode(&n)
 				}
diff --git a/transformer/transformers/stripjs_test.go b/transformer/transformers/stripjs_test.go
index 5d0476e96..2985961f4 100644
--- a/transformer/transformers/stripjs_test.go
+++ b/transformer/transformers/stripjs_test.go
@@ -62,14 +62,9 @@ func TestStripJS(t *testing.T) {
 			Expected: "<head><script type=application/json>foo</script></head><body></body>",
 		},
 		{
-			Desc:     "keep type=text/plain when attribute template=amp-mustache",
-			Input:    "<body><script template=amp-mustache type=text/plain></script></template></body>",
-			Expected: "<body><script template=amp-mustache type=text/plain></script></template></body>",
-		},
-		{
-			Desc:     "strips type=text/plain when attribute template=amp-mustache is not present",
-			Input:    "<body><script type=text/plain></script></body>",
-			Expected: "<body></body>",
+			Desc:     "keep type=text/plain",
+			Input:    "<body><script type=text/plain></script></template></body>",
+			Expected: "<body><script type=text/plain></script></template></body>",
 		},
 		{
 			Desc:     "strip tag attr ona",
