From 3117e5859509e909298153972ab6f700af577f92 Mon Sep 17 00:00:00 2001 From: Joe Mooring Date: Fri, 8 Apr 2022 11:38:37 -0700 Subject: [PATCH] deps: Update github.com/tdewolff/minify/v2 v2.10.0 => v2.11.0 Fixes #9713 Fixes #9740 Adds support for minify.tdewolff.svg.keepComments (bool) --- docs/data/docs.json | 15 ++++++++++++++- go.mod | 6 +++--- go.sum | 10 ++++------ minifiers/config.go | 3 ++- 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/docs/data/docs.json b/docs/data/docs.json index 2440fc930..ddd9e1246 100644 --- a/docs/data/docs.json +++ b/docs/data/docs.json @@ -1860,6 +1860,7 @@ "keepNumbers": false }, "svg": { + "keepComments": false, "precision": 0 }, "xml": { @@ -4665,6 +4666,12 @@ ], "Examples": [] }, + "ByType": { + "Description": "", + "Args": null, + "Aliases": null, + "Examples": null + }, "Concat": { "Description": "", "Args": null, @@ -4694,7 +4701,7 @@ "Examples": null }, "Get": { - "Description": "Get locates the filename given in Hugo's assets filesystem and\ncreates a Resource object that can be used for\nfurther transformations.", + "Description": "Get locates the filename given in Hugo's assets filesystem\nand creates a Resource object that can be used for further transformations.", "Args": [ "filename" ], @@ -4862,6 +4869,12 @@ "Aliases": null, "Examples": null }, + "Current": { + "Description": "", + "Args": null, + "Aliases": null, + "Examples": null + }, "Data": { "Description": "", "Args": null, diff --git a/go.mod b/go.mod index a4308ae69..b7202f686 100644 --- a/go.mod +++ b/go.mod @@ -12,6 +12,7 @@ require ( github.com/bep/godartsass v0.14.0 github.com/bep/golibsass v1.0.0 github.com/bep/gowebp v0.1.0 + github.com/bep/overlayfs v0.1.0 github.com/bep/tmc v0.5.1 github.com/clbanning/mxj/v2 v2.5.5 github.com/cli/safeexec v1.0.0 @@ -54,7 +55,7 @@ require ( github.com/spf13/fsync v0.9.0 github.com/spf13/jwalterweatherman v1.1.0 github.com/spf13/pflag v1.0.5 - github.com/tdewolff/minify/v2 v2.10.0 + github.com/tdewolff/minify/v2 v2.11.0 github.com/yuin/goldmark v1.4.11 go.uber.org/atomic v1.9.0 gocloud.dev v0.25.0 @@ -98,7 +99,6 @@ require ( github.com/aws/aws-sdk-go-v2/service/sso v1.11.3 // indirect github.com/aws/aws-sdk-go-v2/service/sts v1.16.3 // indirect github.com/aws/smithy-go v1.11.2 // indirect - github.com/bep/overlayfs v0.1.0 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect github.com/dlclark/regexp2 v1.4.0 // indirect github.com/go-openapi/jsonpointer v0.19.5 // indirect @@ -118,7 +118,7 @@ require ( github.com/mattn/go-runewidth v0.0.9 // indirect github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect - github.com/tdewolff/parse/v2 v2.5.27 // indirect + github.com/tdewolff/parse/v2 v2.5.28 // indirect go.opencensus.io v0.23.0 // indirect golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29 // indirect golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a // indirect diff --git a/go.sum b/go.sum index 0caef4d66..59f3b1365 100644 --- a/go.sum +++ b/go.sum @@ -564,8 +564,6 @@ github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMB github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= -github.com/spf13/afero v1.8.1 h1:izYHOT71f9iZ7iq37Uqjael60/vYC6vMtzedudZ0zEk= -github.com/spf13/afero v1.8.1/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo= github.com/spf13/afero v1.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo= github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo= github.com/spf13/cast v1.4.1 h1:s0hze+J0196ZfEMTs80N7UlFt0BDuQ7Q+JDnHiMWKdA= @@ -590,10 +588,10 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1-0.20210427113832-6241f9ab9942 h1:t0lM6y/M5IiUZyvbBTcngso8SZEZICH7is9B6g/obVU= github.com/stretchr/testify v1.7.1-0.20210427113832-6241f9ab9942/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/tdewolff/minify/v2 v2.10.0 h1:ovVAHUcjfGrBDf1EIvsodRUVJiZK/28mMose08B7k14= -github.com/tdewolff/minify/v2 v2.10.0/go.mod h1:6XAjcHM46pFcRE0eztigFPm0Q+Cxsw8YhEWT+rDkcZM= -github.com/tdewolff/parse/v2 v2.5.27 h1:PL3LzzXaOpmdrknnOlIeO2muIBHAwiKp6TxN1RbU5gI= -github.com/tdewolff/parse/v2 v2.5.27/go.mod h1:WzaJpRSbwq++EIQHYIRTpbYKNA3gn9it1Ik++q4zyho= +github.com/tdewolff/minify/v2 v2.11.0 h1:cl7b3a1N3v1I+gQThz6sTDKkkODWNblcEy3DGhVhZrM= +github.com/tdewolff/minify/v2 v2.11.0/go.mod h1:UkCTT2Sa8N7XNU0Z9Q+De6NvaxPlC7DGfSWDRowwXqY= +github.com/tdewolff/parse/v2 v2.5.28 h1:QziFVLe+bfFIwnCWAJzMrzwltQXPT21Evl9Z4x25D+U= +github.com/tdewolff/parse/v2 v2.5.28/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/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= diff --git a/minifiers/config.go b/minifiers/config.go index 135e39b86..233f53c27 100644 --- a/minifiers/config.go +++ b/minifiers/config.go @@ -44,7 +44,8 @@ var defaultTdewolffConfig = tdewolffConfig{ JS: js.Minifier{}, JSON: json.Minifier{}, SVG: svg.Minifier{ - Precision: 0, + KeepComments: false, + Precision: 0, }, XML: xml.Minifier{ KeepWhitespace: false,