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>2021-02-18 11:32:34 +0300
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2021-02-18 12:19:22 +0300
commit66beac99c64b5e5fe7bec0bda437ba5858d49a36 (patch)
tree7bf9bdf40fae21cdd32f2c3a403eddbb99bf33b5 /minifiers/config.go
parent968dd7a711063934af84bd1c017c58a1e66f51bb (diff)
deps: Update github.com/tdewolff/minify/v2 v2.6.2 => v2.9.13
Fixes #8258
Diffstat (limited to 'minifiers/config.go')
-rw-r--r--minifiers/config.go26
1 files changed, 20 insertions, 6 deletions
diff --git a/minifiers/config.go b/minifiers/config.go
index 5ee3aa2f9..fc707ce37 100644
--- a/minifiers/config.go
+++ b/minifiers/config.go
@@ -18,6 +18,7 @@ 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"
@@ -35,18 +36,15 @@ var defaultTdewolffConfig = tdewolffConfig{
KeepEndTags: true,
KeepDefaultAttrVals: true,
KeepWhitespace: false,
- // KeepQuotes: false, >= v2.6.2
},
CSS: css.Minifier{
- Decimals: -1, // will be deprecated
- // Precision: 0, // use Precision with >= v2.7.0
- KeepCSS2: true,
+ Precision: 0,
+ KeepCSS2: true,
},
JS: js.Minifier{},
JSON: json.Minifier{},
SVG: svg.Minifier{
- Decimals: -1, // will be deprecated
- // Precision: 0, // use Precision with >= v2.7.0
+ Precision: 0,
},
XML: xml.Minifier{
KeepWhitespace: false,
@@ -99,6 +97,22 @@ 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 {