Skip to content

Fix #4395: CSS minifier drops parentheses around nested or in @media rules #4405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cobyfrombrooklyn-bot wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −1
Open

Fix #4395: CSS minifier drops parentheses around nested or in @media rules #4405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion internal/css_printer/css_printer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,14 @@ func (p *printer) printMediaQuery(query css_ast.MediaQuery, flags mqFlags) {
p.printIdent(q.Type, identNormal, 0)
if q.AndOrNull.Data != nil {
p.print(" and ")
p.printMediaQuery(q.AndOrNull, 0)
// An "or" condition after a media type must be wrapped in parentheses
// to preserve grouping, e.g. "screen and ((a) or (b))" must keep the
// outer parentheses since "screen and (a) or (b)" is invalid CSS.
andFlags := mqFlags(0)
if binary, ok := q.AndOrNull.Data.(*css_ast.MQBinary); ok && binary.Op == css_ast.MQBinaryOpOr {
andFlags = mqNeedsParens
}
p.printMediaQuery(q.AndOrNull, andFlags)
}

case *css_ast.MQNot:
Expand Down
5 changes: 5 additions & 0 deletions internal/css_printer/css_printer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,11 @@ func TestAtMedia(t *testing.T) {
expectPrintedMinify(t, "@media not ( (a) or (b) ) {div{color:red}}", "@media not ((a)or (b)){div{color:red}}")
expectPrintedMinify(t, "@media not ( (a) and (b) ) {div{color:red}}", "@media not ((a)and (b)){div{color:red}}")

// Nested "or" inside a media type must preserve outer parentheses (https://github.com/evanw/esbuild/issues/4395)
expectPrintedMinify(t, "@media only screen and ((min-width: 10px) or (min-height: 10px)) {div{color:red}}", "@media only screen and ((min-width:10px)or (min-height:10px)){div{color:red}}")
expectPrintedMinify(t, "@media screen and ((a) or (b)) {div{color:red}}", "@media screen and ((a)or (b)){div{color:red}}")
expectPrinted(t, "@media only screen and ((min-width: 10px) or (min-height: 10px)) { div { color: red } }", "@media only screen and ((min-width: 10px) or (min-height: 10px)) {\n div {\n color: red;\n }\n}\n")

expectPrintedMinify(t, "@media (width < 2px) {div{color:red}}", "@media(width<2px){div{color:red}}")
expectPrintedMinify(t, "@media (1px < width) {div{color:red}}", "@media(1px<width){div{color:red}}")
expectPrintedMinify(t, "@media (1px < width < 2px) {div{color:red}}", "@media(1px<width<2px){div{color:red}}")
Expand Down