fix #3452: insert space in font when minifying

evanw · evanw · commit a579bd80c24d · 2023-10-16T18:49:12.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,10 +2,27 @@
 
 ## Unreleased
 
+* Fix a CSS `font` property minification bug ([#3452](https://github.com/evanw/esbuild/issues/3452))
+
+    This release fixes a bug where esbuild's CSS minifier didn't insert a space between the font size and the font family in the `font` CSS shorthand property in the edge case where the original source code didn't already have a space and the leading string token was shortened to an identifier:
+
+    ```css
+    /* Original code */
+    .foo { font: 16px"Menlo"; }
+
+    /* Old output (with --minify) */
+    .foo{font:16pxMenlo}
+
+    /* New output (with --minify) */
+    .foo{font:16px Menlo}
+    ```
+
 * Update to Unicode 15.1.0
 
     The character tables that determine which characters form valid JavaScript identifiers have been updated from Unicode version 15.0.0 to the newly-released Unicode version 15.1.0. I'm not putting an example in the release notes because all of the new characters will likely just show up as little squares since fonts haven't been updated yet. But you can read https://www.unicode.org/versions/Unicode15.1.0/#Summary for more information about the changes.
 
+    This upgrade was contributed by [@JLHwung](https://github.com/JLHwung).
+
 ## 0.19.4
 
 * Fix printing of JavaScript decorators in tricky cases ([#3396](https://github.com/evanw/esbuild/issues/3396))
diff --git a/internal/css_parser/css_decls_font.go b/internal/css_parser/css_decls_font.go
@@ -97,6 +97,9 @@ func (p *parser) mangleFont(tokens []css_ast.Token) []css_ast.Token {
 
 	// <font-family>
 	if family, ok := p.mangleFontFamily(tokens[pos:]); ok {
+		if len(result) > 0 && len(family) > 0 && family[0].Kind != css_lexer.TString {
+			family[0].Whitespace |= css_ast.WhitespaceBefore
+		}
 		return append(result, family...)
 	}
 	return tokens
diff --git a/internal/css_parser/css_parser_test.go b/internal/css_parser/css_parser_test.go
@@ -2215,6 +2215,14 @@ func TestFont(t *testing.T) {
 
 	expectPrintedMangleMinify(t, "a { font: italic small-caps bold ultra-condensed 1rem/1.2 'aaa bbb' }", "a{font:italic small-caps 700 ultra-condensed 1rem/1.2 aaa bbb}", "")
 	expectPrintedMangleMinify(t, "a { font: italic small-caps bold ultra-condensed 1rem / 1.2 'aaa bbb' }", "a{font:italic small-caps 700 ultra-condensed 1rem/1.2 aaa bbb}", "")
+
+	// See: https://github.com/evanw/esbuild/issues/3452
+	expectPrinted(t, "a { font: 10px'foo' }", "a {\n  font: 10px\"foo\";\n}\n", "")
+	expectPrinted(t, "a { font: 10px'123' }", "a {\n  font: 10px\"123\";\n}\n", "")
+	expectPrintedMangle(t, "a { font: 10px'foo' }", "a {\n  font: 10px foo;\n}\n", "")
+	expectPrintedMangle(t, "a { font: 10px'123' }", "a {\n  font: 10px\"123\";\n}\n", "")
+	expectPrintedMangleMinify(t, "a { font: 10px'foo' }", "a{font:10px foo}", "")
+	expectPrintedMangleMinify(t, "a { font: 10px'123' }", "a{font:10px\"123\"}", "")
 }
 
 func TestWarningUnexpectedCloseBrace(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,9 @@ func (p *parser) mangleFont(tokens []css_ast.Token) []css_ast.Token {`
`97`	`97`
`98`	`98`	`// <font-family>`
`99`	`99`	`if family, ok := p.mangleFontFamily(tokens[pos:]); ok {`
	`100`	`+ if len(result) > 0 && len(family) > 0 && family[0].Kind != css_lexer.TString {`
	`101`	`+ family[0].Whitespace \|= css_ast.WhitespaceBefore`
	`102`	`+ }`
`100`	`103`	`return append(result, family...)`
`101`	`104`	`}`
`102`	`105`	`return tokens`