diff options
| -rw-r--r-- | hugolib/resource_chain_test.go | 23 | ||||
| -rw-r--r-- | minifiers/minifiers.go | 78 | ||||
| -rw-r--r-- | minifiers/minifiers_test.go | 6 | ||||
| -rw-r--r-- | resources/resource_transformers/minifier/minify.go | 3 |
4 files changed, 76 insertions, 34 deletions
diff --git a/hugolib/resource_chain_test.go b/hugolib/resource_chain_test.go index d40d4c02e..dee2f2146 100644 --- a/hugolib/resource_chain_test.go +++ b/hugolib/resource_chain_test.go @@ -1148,3 +1148,26 @@ XML: {{ $xml.Content | safeHTML }}|{{ $xml.RelPermalink }} XML: <root> <foo> asdfasdf </foo> </root>|/xml/data.min.3be4fddd19aaebb18c48dd6645215b822df74701957d6d36e59f203f9c30fd9f.xml `) } + +// Issue 8954 +func TestMinifyWithError(t *testing.T) { + b := newTestSitesBuilder(t).WithSimpleConfigFile() + b.WithSourceFile( + "assets/js/test.js", ` +new Date(2002, 04, 11) +`, + ) + b.WithTemplates("index.html", ` +{{ $js := resources.Get "js/test.js" | minify | fingerprint }} +<script> +{{ $js.Content }} +</script> +`) + b.WithContent("page.md", "") + + err := b.BuildE(BuildCfg{}) + + if err == nil || !strings.Contains(err.Error(), "04") { + t.Fatalf("expected a message about a legacy octal number, but got: %v", err) + } +} diff --git a/minifiers/minifiers.go b/minifiers/minifiers.go index 3ac285ecb..5a5cec121 100644 --- a/minifiers/minifiers.go +++ b/minifiers/minifiers.go @@ -57,6 +57,20 @@ func (m Client) Minify(mediatype media.Type, dst io.Writer, src io.Reader) error return m.m.Minify(mediatype.Type(), dst, src) } +// noopMinifier implements minify.Minifier [1], but doesn't minify content. This means +// that we can avoid missing minifiers for any MIME types in our minify.M, which +// causes minify to return errors, while still allowing minification to be +// disabled for specific types. +// +// [1]: https://pkg.go.dev/github.com/tdewolff/minify#Minifier +type noopMinifier struct{} + +// Minify copies r into w without transformation. +func (m noopMinifier) Minify(_ *minify.M, w io.Writer, r io.Reader, _ map[string]string) error { + _, err := io.Copy(w, r) + return err +} + // New creates a new Client with the provided MIME types as the mapping foundation. // The HTML minifier is also registered for additional HTML types (AMP etc.) in the // provided list of output formats. @@ -69,47 +83,53 @@ func New(mediaTypes media.Types, outputFormats output.Formats, cfg config.Provid } // We use the Type definition of the media types defined in the site if found. - if !conf.DisableCSS { - addMinifier(m, mediaTypes, "css", &conf.Tdewolff.CSS) - } - if !conf.DisableJS { - addMinifier(m, mediaTypes, "js", &conf.Tdewolff.JS) - m.AddRegexp(regexp.MustCompile("^(application|text)/(x-)?(java|ecma)script$"), &conf.Tdewolff.JS) - } - if !conf.DisableJSON { - addMinifier(m, mediaTypes, "json", &conf.Tdewolff.JSON) - m.AddRegexp(regexp.MustCompile(`^(application|text)/(x-|(ld|manifest)\+)?json$`), &conf.Tdewolff.JSON) - } - if !conf.DisableSVG { - addMinifier(m, mediaTypes, "svg", &conf.Tdewolff.SVG) - } - if !conf.DisableXML { - addMinifier(m, mediaTypes, "xml", &conf.Tdewolff.XML) - } + addMinifier(m, mediaTypes, "css", getMinifier(conf, "css")) + + addMinifier(m, mediaTypes, "js", getMinifier(conf, "js")) + m.AddRegexp(regexp.MustCompile("^(application|text)/(x-)?(java|ecma)script$"), getMinifier(conf, "js")) + + addMinifier(m, mediaTypes, "json", getMinifier(conf, "json")) + m.AddRegexp(regexp.MustCompile(`^(application|text)/(x-|(ld|manifest)\+)?json$`), getMinifier(conf, "json")) + + addMinifier(m, mediaTypes, "svg", getMinifier(conf, "svg")) + + addMinifier(m, mediaTypes, "xml", getMinifier(conf, "xml")) // HTML - if !conf.DisableHTML { - addMinifier(m, mediaTypes, "html", &conf.Tdewolff.HTML) - for _, of := range outputFormats { - if of.IsHTML { - m.Add(of.MediaType.Type(), &conf.Tdewolff.HTML) - } + addMinifier(m, mediaTypes, "html", getMinifier(conf, "html")) + for _, of := range outputFormats { + if of.IsHTML { + m.Add(of.MediaType.Type(), getMinifier(conf, "html")) } } return Client{m: m, MinifyOutput: conf.MinifyOutput}, nil } -func addMinifier(m *minify.M, mt media.Types, suffix string, min minify.Minifier) { - types := mt.BySuffix(suffix) - for _, t := range types { - m.Add(t.Type(), min) +// getMinifier returns the appropriate minify.MinifierFunc for the MIME +// type suffix s, given the config c. +func getMinifier(c minifyConfig, s string) minify.Minifier { + switch { + case s == "css" && !c.DisableCSS: + return &c.Tdewolff.CSS + case s == "js" && !c.DisableJS: + return &c.Tdewolff.JS + case s == "json" && !c.DisableJSON: + return &c.Tdewolff.JSON + case s == "svg" && !c.DisableSVG: + return &c.Tdewolff.SVG + case s == "xml" && !c.DisableXML: + return &c.Tdewolff.XML + case s == "html" && !c.DisableHTML: + return &c.Tdewolff.HTML + default: + return noopMinifier{} } } -func addMinifierFunc(m *minify.M, mt media.Types, suffix string, min minify.MinifierFunc) { +func addMinifier(m *minify.M, mt media.Types, suffix string, min minify.Minifier) { types := mt.BySuffix(suffix) for _, t := range types { - m.AddFunc(t.Type(), min) + m.Add(t.Type(), min) } } diff --git a/minifiers/minifiers_test.go b/minifiers/minifiers_test.go index 81edba510..ece8cbd08 100644 --- a/minifiers/minifiers_test.go +++ b/minifiers/minifiers_test.go @@ -93,9 +93,9 @@ func TestConfigureMinify(t *testing.T) { expectedMinString string errorExpected bool }{ - {media.HTMLType, "<hello> Hugo! </hello>", "<hello> Hugo! </hello>", false}, // configured minifier - {media.CSSType, " body { color: blue; } ", "body{color:blue}", false}, // default minifier - {media.XMLType, " <hello> Hugo! </hello> ", "", true}, // disable Xml minification + {media.HTMLType, "<hello> Hugo! </hello>", "<hello> Hugo! </hello>", false}, // configured minifier + {media.CSSType, " body { color: blue; } ", "body{color:blue}", false}, // default minifier + {media.XMLType, " <hello> Hugo! </hello> ", " <hello> Hugo! </hello> ", false}, // disable Xml minification } { var b bytes.Buffer if !test.errorExpected { diff --git a/resources/resource_transformers/minifier/minify.go b/resources/resource_transformers/minifier/minify.go index 972461e0e..c00d478af 100644 --- a/resources/resource_transformers/minifier/minify.go +++ b/resources/resource_transformers/minifier/minify.go @@ -47,9 +47,8 @@ func (t *minifyTransformation) Key() internal.ResourceTransformationKey { } func (t *minifyTransformation) Transform(ctx *resources.ResourceTransformationCtx) error { - _ = t.m.Minify(ctx.InMediaType, ctx.To, ctx.From) ctx.AddOutPathIdentifier(".min") - return nil + return t.m.Minify(ctx.InMediaType, ctx.To, ctx.From) } func (c *Client) Minify(res resources.ResourceTransformer) (resource.Resource, error) { |