Revert "deps: Update to github.com/tdewolff/minify v2.9.4"

Closes #7792

This reverts commit b254532b52785954c98a473a635b9cea016d8565.

diff --git a/go.mod b/go.mod
index 43faceead50342a19d20fd89061bd4ff32b1e538..cf4c3386ce1e3fa6b85511afde19052b167a6507 100644 (file)
--- a/go.mod
+++ b/go.mod
@@ -51,7 +51,7 @@ require (
        github.com/spf13/jwalterweatherman v1.1.0
        github.com/spf13/pflag v1.0.5
        github.com/spf13/viper v1.7.1
-       github.com/tdewolff/minify/v2 v2.9.7
+       github.com/tdewolff/minify/v2 v2.6.2
        github.com/yuin/goldmark v1.2.1
        github.com/yuin/goldmark-highlighting v0.0.0-20200307114337-60d527fdb691
        gocloud.dev v0.15.0

diff --git a/go.sum b/go.sum
index b4dd83dfc1c9af35907d00cc35e92b38db06c172..cf428cb5f68f2bfd2927be7240501991ba2d6c52 100644 (file)
--- a/go.sum
+++ b/go.sum
@@ -484,20 +484,8 @@ github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/tdewolff/minify/v2 v2.6.2 h1:Jaod6aSABWmhftvnxvXogxcEoQt6yogfFeZgIQEMPOw=
 github.com/tdewolff/minify/v2 v2.6.2/go.mod h1:BkDSm8aMMT0ALGmpt7j3Ra7nLUgZL0qhyrAHXwxcy5w=
-github.com/tdewolff/minify/v2 v2.9.4 h1:sOqgmowmkZWmHZ0AqIFS300VvCCkgDNTw1eWw1tnNCY=
-github.com/tdewolff/minify/v2 v2.9.4/go.mod h1:4SrPavRSPLpv4U4jqV8jzSjiEuq2BH+BPgxorMkGrhc=
-github.com/tdewolff/minify/v2 v2.9.5 h1:+fHvqLencVdv14B+zgxQGhetF9qXl/nRTN/1mcyQwpM=
-github.com/tdewolff/minify/v2 v2.9.5/go.mod h1:jshtBj/uUJH6JX1fuxTLnnHOA1RVJhF5MM+leJzDKb4=
-github.com/tdewolff/minify/v2 v2.9.7 h1:r8ewdcX8VYUoNj+s9WSy4FtNNNqNPevWOkb/MksAtzQ=
-github.com/tdewolff/minify/v2 v2.9.7/go.mod h1:AcJ/ggtHex5N/QiafLI8rlIO3qwSlgbPNLi27VZSYz8=
 github.com/tdewolff/parse/v2 v2.4.2 h1:Bu2Qv6wepkc+Ou7iB/qHjAhEImlAP5vedzlQRUdj3BI=
 github.com/tdewolff/parse/v2 v2.4.2/go.mod h1:WzaJpRSbwq++EIQHYIRTpbYKNA3gn9it1Ik++q4zyho=
-github.com/tdewolff/parse/v2 v2.5.2 h1:OIUAejEkj9Oj6N1q18xg7ByYkpQ0xf4nA1aAH5nqxks=
-github.com/tdewolff/parse/v2 v2.5.2/go.mod h1:WzaJpRSbwq++EIQHYIRTpbYKNA3gn9it1Ik++q4zyho=
-github.com/tdewolff/parse/v2 v2.5.3 h1:fnPIstKgEfxd3+wwHnH73sAYydsR0o/jYhcQ6c5PkrA=
-github.com/tdewolff/parse/v2 v2.5.3/go.mod h1:WzaJpRSbwq++EIQHYIRTpbYKNA3gn9it1Ik++q4zyho=
-github.com/tdewolff/parse/v2 v2.5.4 h1:ggaQ1SVE8wErRrZwUs49I6iQ1zL/tFlb7KtYsk2I8Yk=
-github.com/tdewolff/parse/v2 v2.5.4/go.mod h1:WzaJpRSbwq++EIQHYIRTpbYKNA3gn9it1Ik++q4zyho=
 github.com/tdewolff/test v1.0.6 h1:76mzYJQ83Op284kMT+63iCNCI7NEERsIN8dLM+RiKr4=
 github.com/tdewolff/test v1.0.6/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE=
 github.com/tidwall/pretty v0.0.0-20190325153808-1166b9ac2b65/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
@@ -633,8 +621,6 @@ golang.org/x/sys v0.0.0-20200413165638-669c56c373c4 h1:opSr2sbRXk5X5/givKrrKj9HX
 golang.org/x/sys v0.0.0-20200413165638-669c56c373c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200501145240-bc7a7d42d5c3 h1:5B6i6EAiSYyejWfvc5Rc9BbI3rzIsrrXfAQBWnYfn+w=
 golang.org/x/sys v0.0.0-20200501145240-bc7a7d42d5c3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c h1:UIcGWL6/wpCfyGuJnRFJRurA+yj8RrW7Q6x2YMCXt6c=
-golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2 h1:z99zHgr7hKfrUcX/KsoJk5FJfjTceCKIp96+biqP4To=

diff --git a/hugolib/resource_chain_test.go b/hugolib/resource_chain_test.go
index 13d38bd7c6f585c439aef3d841a0b86411a8a467..7573199aacdaf0a4e4f3a76dac96ef4d4e02fc2b 100644 (file)
--- a/hugolib/resource_chain_test.go
+++ b/hugolib/resource_chain_test.go
@@ -489,7 +489,7 @@ Min HTML: {{ ( resources.Get "mydata/html1.html" | resources.Minify ).Content |
 `)
                }, func(b *sitesBuilder) {
                        b.AssertFileContent("public/index.html", `Min CSS: h1{font-style:bold}`)
-                       b.AssertFileContent("public/index.html", `Min JS: var x;x=5,document.getElementById("demo").innerHTML=x*10`)
+                       b.AssertFileContent("public/index.html", `Min JS: var x;x=5;document.getElementById("demo").innerHTML=x*10;`)
                        b.AssertFileContent("public/index.html", `Min JSON: {"employees":[{"firstName":"John","lastName":"Doe"},{"firstName":"Anna","lastName":"Smith"},{"firstName":"Peter","lastName":"Jones"}]}`)
                        b.AssertFileContent("public/index.html", `Min XML: <hello><world>Hugo Rocks!</<world></hello>`)
                        b.AssertFileContent("public/index.html", `Min SVG: <svg height="100" width="100"><path d="M1e2 1e2H3e2 2e2z"/></svg>`)

diff --git a/minifiers/config.go b/minifiers/config.go
index 0715344a738b6db6c02b58e9825494bed0d89dcd..5ee3aa2f9cbfe793a62acfdd3ba39e75b6cbdcb7 100644 (file)
--- a/minifiers/config.go
+++ b/minifiers/config.go
@@ -18,7 +18,6 @@ import (
        "github.com/gohugoio/hugo/config"
        "github.com/gohugoio/hugo/docshelper"
        "github.com/gohugoio/hugo/parser"
-       "github.com/spf13/cast"
 
        "github.com/mitchellh/mapstructure"
        "github.com/tdewolff/minify/v2/css"
@@ -36,16 +35,18 @@ var defaultTdewolffConfig = tdewolffConfig{
                KeepEndTags:             true,
                KeepDefaultAttrVals:     true,
                KeepWhitespace:          false,
-               KeepQuotes:              false,
+               // KeepQuotes:              false, >= v2.6.2
        },
        CSS: css.Minifier{
-               Precision: 0,
-               KeepCSS2:  true,
+               Decimals: -1, // will be deprecated
+               // Precision: 0,  // use Precision with >= v2.7.0
+               KeepCSS2: true,
        },
        JS:   js.Minifier{},
        JSON: json.Minifier{},
        SVG: svg.Minifier{
-               Precision: 0,
+               Decimals: -1, // will be deprecated
+               // Precision: 0,  // use Precision with >= v2.7.0
        },
        XML: xml.Minifier{
                KeepWhitespace: false,
@@ -98,22 +99,6 @@ func decodeConfig(cfg config.Provider) (conf minifyConfig, err error) {
 
        m := maps.ToStringMap(v)
 
-       // Handle upstream renames.
-       if td, found := m["tdewolff"]; found {
-               tdm := cast.ToStringMap(td)
-               for _, key := range []string{"css", "svg"} {
-                       if v, found := tdm[key]; found {
-                               vm := cast.ToStringMap(v)
-                               if vv, found := vm["decimal"]; found {
-                                       vvi := cast.ToInt(vv)
-                                       if vvi > 0 {
-                                               vm["precision"] = vvi
-                                       }
-                               }
-                       }
-               }
-       }
-
        err = mapstructure.WeakDecode(m, &conf)
 
        if err != nil {

diff --git a/minifiers/minifiers_test.go b/minifiers/minifiers_test.go
index cbd2f40ac7b0604017d0a912c7fdd82e8e6bba2f..fb222fd6da54957639c4b575688d35b2f97d5687 100644 (file)
--- a/minifiers/minifiers_test.go
+++ b/minifiers/minifiers_test.go
@@ -34,7 +34,7 @@ func TestNew(t *testing.T) {
        var rawJS string
        var minJS string
        rawJS = " var  foo =1 ;   foo ++  ;  "
-       minJS = "var foo=1;foo++"
+       minJS = "var foo=1;foo++;"
 
        var rawJSON string
        var minJSON string
@@ -168,26 +168,3 @@ func TestBugs(t *testing.T) {
        }
 
 }
-
-// Renamed to Precision in v2.7.0. Check that we support both.
-func TestDecodeConfigDecimalIsNowPrecision(t *testing.T) {
-       c := qt.New(t)
-       v := viper.New()
-       v.Set("minify", map[string]interface{}{
-               "disablexml": true,
-               "tdewolff": map[string]interface{}{
-                       "css": map[string]interface{}{
-                               "decimal": 3,
-                       },
-                       "svg": map[string]interface{}{
-                               "decimal": 3,
-                       },
-               },
-       })
-
-       conf, err := decodeConfig(v)
-
-       c.Assert(err, qt.IsNil)
-       c.Assert(conf.Tdewolff.CSS.Precision, qt.Equals, 3)
-
-}