Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/gohugoio/hugo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2020-10-07 11:46:19 +0300
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2020-10-07 11:46:19 +0300
commit6dd60fca73ff96b48064bb8c6586631a2370ffc6 (patch)
tree60812553692edf926554e88c1402ed0ad37cb2d6 /minifiers
parent138a0259164d3fe417bb8911075cf6d13bc9cd89 (diff)
Revert "deps: Update to github.com/tdewolff/minify v2.9.4"
Closes #7792 This reverts commit b254532b52785954c98a473a635b9cea016d8565.
Diffstat (limited to 'minifiers')
-rw-r--r--minifiers/config.go27
-rw-r--r--minifiers/minifiers_test.go25
2 files changed, 7 insertions, 45 deletions
diff --git a/minifiers/config.go b/minifiers/config.go
index 0715344a7..5ee3aa2f9 100644
--- 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 cbd2f40ac..fb222fd6d 100644
--- 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)
-
-}