mirror of
https://github.com/gohugoio/hugo.git
synced 2024-12-25 04:52:31 +00:00
e03f82eef2
Previously, *minifyTransformation.Transform suppressed the error returned by t.m.Minify. This meant that when minification returned an error, the error would not reach the user. Instead, minification would silently fail. For example, if a JavaScript file included a call to the Date constructor with: new Date(2020, 04, 02) The package that the minification library uses to parse JS files, github.com/tdewolff/parse would return an error, since "04" would be parsed as a legacy octal. However, the JS file would remain un-minified with no error. Fixing this is not as simple as replacing "_" with an "err" in *minifyTransformation.Transform, however (though this is necessary). If we only returned this error from Transform, then hugolib.TestResourceMinifyDisabled would fail. Instead of being a no-op, as TestResourceMinifyDisabled expects, using the "minify" template function with a "disableXML=true" config setting instead returns the error, "minifier does not exist for mimetype." The "minifier does not exist" error is returned because of the way minifiers.New works. If the user's config disables minification for a particular MIME type, minifiers.New does not add it to the resulting Client's *minify.M. However, this also means that when the "minify" template function is executed, a *resourceAdapter's transformations still add a minification. When it comes time to call the minify.Minifier for a specific MIME type via *M.MinifyMimetype, the github.com/tdewolff/minify library throws the "does not exist" error for the missing MIME type. The solution was to change minifiers.New so, instead of skipping a minifier for each disabled MIME type, it adds a NoOpMinifier, which simply copies the source to the destination without minification. This means that when the "minify" template function is used for a particular resource, and that resource's MIME type has minification disabled, minification is genuinely skipped, and does not result in an error. In order to add this, I've fixed a possibly unwanted interaction between minifiers.TestConfigureMinify and hugolib.TestResourceMinifyDisabled. The latter disables minification and expects minification to be a no-op. The former disables minification and expects it to result in an error. The only reason hugolib.TestResourceMinifyDisabled passes in the original code is that the "does not exist" error is suppressed. However, we shouldn't suppress minification errors, since they can leave users perplexed. I've changed the test assertion in minifiers.TestConfigureMinify to expect no errors and a no-op if minification is disabled for a particular MIME type. Fixes #8954
59 lines
1.8 KiB
Go
59 lines
1.8 KiB
Go
// Copyright 2018 The Hugo Authors. All rights reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package minifier
|
|
|
|
import (
|
|
"github.com/gohugoio/hugo/minifiers"
|
|
"github.com/gohugoio/hugo/resources"
|
|
"github.com/gohugoio/hugo/resources/internal"
|
|
"github.com/gohugoio/hugo/resources/resource"
|
|
)
|
|
|
|
// Client for minification of Resource objects. Supported minifiers are:
|
|
// css, html, js, json, svg and xml.
|
|
type Client struct {
|
|
rs *resources.Spec
|
|
m minifiers.Client
|
|
}
|
|
|
|
// New creates a new Client given a specification. Note that it is the media types
|
|
// configured for the site that is used to match files to the correct minifier.
|
|
func New(rs *resources.Spec) (*Client, error) {
|
|
m, err := minifiers.New(rs.MediaTypes, rs.OutputFormats, rs.Cfg)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &Client{rs: rs, m: m}, nil
|
|
}
|
|
|
|
type minifyTransformation struct {
|
|
rs *resources.Spec
|
|
m minifiers.Client
|
|
}
|
|
|
|
func (t *minifyTransformation) Key() internal.ResourceTransformationKey {
|
|
return internal.NewResourceTransformationKey("minify")
|
|
}
|
|
|
|
func (t *minifyTransformation) Transform(ctx *resources.ResourceTransformationCtx) error {
|
|
ctx.AddOutPathIdentifier(".min")
|
|
return t.m.Minify(ctx.InMediaType, ctx.To, ctx.From)
|
|
}
|
|
|
|
func (c *Client) Minify(res resources.ResourceTransformer) (resource.Resource, error) {
|
|
return res.Transform(&minifyTransformation{
|
|
rs: c.rs,
|
|
m: c.m,
|
|
})
|
|
}
|