From de84f71b29e13a7835e484891ed15d1f9b227d4b Mon Sep 17 00:00:00 2001 From: Taco de Wolff Date: Mon, 31 Jul 2023 10:46:14 +0200 Subject: [PATCH] JS: keep bang comments, fixes #552 --- go.mod | 2 +- go.sum | 7 ++----- js/js.go | 18 ++++++------------ 3 files changed, 9 insertions(+), 18 deletions(-) diff --git a/go.mod b/go.mod index 64cc1b5f75..17a72961b4 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/fsnotify/fsnotify v1.6.0 github.com/matryer/try v0.0.0-20161228173917-9ac251b645a2 github.com/spf13/pflag v1.0.5 - github.com/tdewolff/parse/v2 v2.6.6 + github.com/tdewolff/parse/v2 v2.6.7 github.com/tdewolff/test v1.0.9 ) diff --git a/go.sum b/go.sum index 48d893dfff..cbb8593f2e 100644 --- a/go.sum +++ b/go.sum @@ -10,13 +10,10 @@ github.com/matryer/try v0.0.0-20161228173917-9ac251b645a2 h1:JAEbJn3j/FrhdWA9jW8 github.com/matryer/try v0.0.0-20161228173917-9ac251b645a2/go.mod h1:0KeJpeMD6o+O4hW7qJOT7vyQPKrWmj26uf5wMc/IiIs= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/tdewolff/parse/v2 v2.6.6 h1:Yld+0CrKUJaCV78DL1G2nk3C9lKrxyRTux5aaK/AkDo= -github.com/tdewolff/parse/v2 v2.6.6/go.mod h1:woz0cgbLwFdtbjJu8PIKxhW05KplTFQkOdX78o+Jgrs= -github.com/tdewolff/test v1.0.7/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= +github.com/tdewolff/parse/v2 v2.6.7 h1:WrFllrqmzAcrKHzoYgMupqgUBIfBVOb0yscFzDf8bBg= +github.com/tdewolff/parse/v2 v2.6.7/go.mod h1:XHDhaU6IBgsryfdnpzUXBlT6leW/l25yrFBTEb4eIyM= github.com/tdewolff/test v1.0.9 h1:SswqJCmeN4B+9gEAi/5uqT0qpi1y2/2O47V/1hhGZT0= github.com/tdewolff/test v1.0.9/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= -golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= diff --git a/js/js.go b/js/js.go index 1f6cefeff4..e9289bdb17 100644 --- a/js/js.go +++ b/js/js.go @@ -43,18 +43,6 @@ func (o *Minifier) Minify(_ *minify.M, w io.Writer, r io.Reader, _ map[string]st return err } - // license comments - for _, comment := range ast.Comments { - if 3 < len(comment) && comment[2] == '!' { - w.Write(comment) - if comment[1] == '/' { - w.Write(newlineBytes) - } - } else if 2 < len(comment) && comment[0] == '#' && comment[1] == '!' { - w.Write(comment) - } - } - m := &jsMinifier{ o: o, w: w, @@ -409,6 +397,12 @@ func (m *jsMinifier) minifyStmt(i js.IStmt) { stmt.Value[len(stmt.Value)-1] = '"' m.write(stmt.Value) m.requireSemicolon() + case *js.Comment: + // bang comment + m.write(stmt.Value) + if stmt.Value[1] == '/' { + m.write(newlineBytes) + } } }