option to not escape </script> and </style>

evanw · Dec 19, 2022 · 4cc9999 · 4cc9999
1 parent 47dd4de
commit 4cc9999
Show file tree

Hide file tree

Showing 4 changed files with 175 additions and 2 deletions.
diff --git a/internal/bundler_tests/bundler_default_test.go b/internal/bundler_tests/bundler_default_test.go
@@ -3549,6 +3549,84 @@ func TestLegalCommentsManyEndOfFile(t *testing.T) {
 	})
 }
 
+func TestLegalCommentsEscapeSlashScriptAndStyleEndOfFile(t *testing.T) {
+	default_suite.expectBundled(t, bundled{
+		files: map[string]string{
+			"/project/entry.js":                     `import "js-pkg"; a /*! </script> */`,
+			"/project/node_modules/js-pkg/index.js": `x /*! </script> */`,
+
+			"/project/entry.css":                      `@import "css-pkg"; a { b: c } /*! </style> */`,
+			"/project/node_modules/css-pkg/index.css": `x { y: z } /*! </style> */`,
+		},
+		entryPaths: []string{"/project/entry.js", "/project/entry.css"},
+		options: config.Options{
+			Mode:             config.ModeBundle,
+			AbsOutputDir:     "/out",
+			MinifyWhitespace: true,
+			LegalComments:    config.LegalCommentsEndOfFile,
+		},
+	})
+}
+
+func TestLegalCommentsEscapeSlashScriptAndStyleExternal(t *testing.T) {
+	default_suite.expectBundled(t, bundled{
+		files: map[string]string{
+			"/project/entry.js":                     `import "js-pkg"; a /*! </script> */`,
+			"/project/node_modules/js-pkg/index.js": `x /*! </script> */`,
+
+			"/project/entry.css":                      `@import "css-pkg"; a { b: c } /*! </style> */`,
+			"/project/node_modules/css-pkg/index.css": `x { y: z } /*! </style> */`,
+		},
+		entryPaths: []string{"/project/entry.js", "/project/entry.css"},
+		options: config.Options{
+			Mode:             config.ModeBundle,
+			AbsOutputDir:     "/out",
+			MinifyWhitespace: true,
+			LegalComments:    config.LegalCommentsExternalWithoutComment,
+		},
+	})
+}
+
+func TestLegalCommentsNoEscapeSlashScriptEndOfFile(t *testing.T) {
+	default_suite.expectBundled(t, bundled{
+		files: map[string]string{
+			"/project/entry.js":                     `import "js-pkg"; a /*! </script> */`,
+			"/project/node_modules/js-pkg/index.js": `x /*! </script> */`,
+
+			"/project/entry.css":                      `@import "css-pkg"; a { b: c } /*! </style> */`,
+			"/project/node_modules/css-pkg/index.css": `x { y: z } /*! </style> */`,
+		},
+		entryPaths: []string{"/project/entry.js", "/project/entry.css"},
+		options: config.Options{
+			Mode:                  config.ModeBundle,
+			AbsOutputDir:          "/out",
+			MinifyWhitespace:      true,
+			LegalComments:         config.LegalCommentsEndOfFile,
+			UnsupportedJSFeatures: compat.InlineScript,
+		},
+	})
+}
+
+func TestLegalCommentsNoEscapeSlashStyleEndOfFile(t *testing.T) {
+	default_suite.expectBundled(t, bundled{
+		files: map[string]string{
+			"/project/entry.js":                     `import "js-pkg"; a /*! </script> */`,
+			"/project/node_modules/js-pkg/index.js": `x /*! </script> */`,
+
+			"/project/entry.css":                      `@import "css-pkg"; a { b: c } /*! </style> */`,
+			"/project/node_modules/css-pkg/index.css": `x { y: z } /*! </style> */`,
+		},
+		entryPaths: []string{"/project/entry.js", "/project/entry.css"},
+		options: config.Options{
+			Mode:                   config.ModeBundle,
+			AbsOutputDir:           "/out",
+			MinifyWhitespace:       true,
+			LegalComments:          config.LegalCommentsEndOfFile,
+			UnsupportedCSSFeatures: compat.InlineStyle,
+		},
+	})
+}
+
 func TestLegalCommentsManyLinked(t *testing.T) {
 	default_suite.expectBundled(t, bundled{
 		files: map[string]string{

diff --git a/internal/bundler_tests/snapshots/snapshots_default.txt b/internal/bundler_tests/snapshots/snapshots_default.txt
@@ -1982,6 +1982,50 @@ c {
 /*! Copyright notice 1 */
 /*! Copyright notice 2 */
 
+================================================================================
+TestLegalCommentsEscapeSlashScriptAndStyleEndOfFile
+---------- /out/entry.js ----------
+x;a;
+/*! <\/script> */
+/*! Bundled license information:
+
+js-pkg/index.js:
+  (*! <\/script> *)
+*/
+
+---------- /out/entry.css ----------
+x{y:z}a{b:c}
+/*! <\/style> */
+/*! Bundled license information:
+
+css-pkg/index.css:
+  (*! <\/style> *)
+*/
+
+================================================================================
+TestLegalCommentsEscapeSlashScriptAndStyleExternal
+---------- /out/entry.js.LEGAL.txt ----------
+/*! </script> */
+
+Bundled license information:
+
+js-pkg/index.js:
+  /*! </script> */
+
+---------- /out/entry.js ----------
+x;a;
+
+---------- /out/entry.css.LEGAL.txt ----------
+/*! </style> */
+
+Bundled license information:
+
+css-pkg/index.css:
+  /*! </style> */
+
+---------- /out/entry.css ----------
+x{y:z}a{b:c}
+
 ================================================================================
 TestLegalCommentsExternal
 ---------- /out/entry.js.LEGAL.txt ----------
@@ -2208,6 +2252,46 @@ export {
   }
 }
 
+================================================================================
+TestLegalCommentsNoEscapeSlashScriptEndOfFile
+---------- /out/entry.js ----------
+x;a;
+/*! </script> */
+/*! Bundled license information:
+
+js-pkg/index.js:
+  (*! </script> *)
+*/
+
+---------- /out/entry.css ----------
+x{y:z}a{b:c}
+/*! <\/style> */
+/*! Bundled license information:
+
+css-pkg/index.css:
+  (*! <\/style> *)
+*/
+
+================================================================================
+TestLegalCommentsNoEscapeSlashStyleEndOfFile
+---------- /out/entry.js ----------
+x;a;
+/*! <\/script> */
+/*! Bundled license information:
+
+js-pkg/index.js:
+  (*! <\/script> *)
+*/
+
+---------- /out/entry.css ----------
+x{y:z}a{b:c}
+/*! </style> */
+/*! Bundled license information:
+
+css-pkg/index.css:
+  (*! </style> *)
+*/
+
 ================================================================================
 TestLegalCommentsNone
 ---------- /out/entry.js ----------

diff --git a/internal/helpers/comment.go b/internal/helpers/comment.go
@@ -68,6 +68,9 @@ seekBackwardToNewline:
 }
 
 func EscapeClosingTag(text string, slashTag string) string {
+	if slashTag == "" {
+		return text
+	}
 	i := strings.Index(text, "</")
 	if i < 0 {
 		return text

diff --git a/internal/linker/linker.go b/internal/linker/linker.go
@@ -5041,7 +5041,11 @@ func (c *linkerContext) generateChunkJS(chunkIndex int, chunkWaitGroup *sync.Wai
 
 	// Make sure the file ends with a newline
 	j.EnsureNewlineAtEnd()
-	c.maybeAppendLegalComments(c.options.LegalComments, legalCommentList, chunk, &j, "/script")
+	slashTag := "/script"
+	if c.options.UnsupportedJSFeatures.Has(compat.InlineScript) {
+		slashTag = ""
+	}
+	c.maybeAppendLegalComments(c.options.LegalComments, legalCommentList, chunk, &j, slashTag)
 
 	if len(c.options.JSFooter) > 0 {
 		j.AddString(c.options.JSFooter)
@@ -5420,7 +5424,11 @@ func (c *linkerContext) generateChunkCSS(chunkIndex int, chunkWaitGroup *sync.Wa
 
 	// Make sure the file ends with a newline
 	j.EnsureNewlineAtEnd()
-	c.maybeAppendLegalComments(c.options.LegalComments, legalCommentList, chunk, &j, "/style")
+	slashTag := "/style"
+	if c.options.UnsupportedCSSFeatures.Has(compat.InlineStyle) {
+		slashTag = ""
+	}
+	c.maybeAppendLegalComments(c.options.LegalComments, legalCommentList, chunk, &j, slashTag)
 
 	if len(c.options.CSSFooter) > 0 {
 		j.AddString(c.options.CSSFooter)