mirror of
https://github.com/gohugoio/hugo.git
synced 2024-11-21 20:46:30 -05:00
dea71670c0
Before this commit, you would have to use page bundles to do image processing etc. in Hugo. This commit adds * A new `/assets` top-level project or theme dir (configurable via `assetDir`) * A new template func, `resources.Get` which can be used to "get a resource" that can be further processed. This means that you can now do this in your templates (or shortcodes): ```bash {{ $sunset := (resources.Get "images/sunset.jpg").Fill "300x200" }} ``` This also adds a new `extended` build tag that enables powerful SCSS/SASS support with source maps. To compile this from source, you will also need a C compiler installed: ``` HUGO_BUILD_TAGS=extended mage install ``` Note that you can use output of the SCSS processing later in a non-SCSSS-enabled Hugo. The `SCSS` processor is a _Resource transformation step_ and it can be chained with the many others in a pipeline: ```bash {{ $css := resources.Get "styles.scss" | resources.ToCSS | resources.PostCSS | resources.Minify | resources.Fingerprint }} <link rel="stylesheet" href="{{ $styles.RelPermalink }}" integrity="{{ $styles.Data.Digest }}" media="screen"> ``` The transformation funcs above have aliases, so it can be shortened to: ```bash {{ $css := resources.Get "styles.scss" | toCSS | postCSS | minify | fingerprint }} <link rel="stylesheet" href="{{ $styles.RelPermalink }}" integrity="{{ $styles.Data.Digest }}" media="screen"> ``` A quick tip would be to avoid the fingerprinting part, and possibly also the not-superfast `postCSS` when you're doing development, as it allows Hugo to be smarter about the rebuilding. Documentation will follow, but have a look at the demo repo in https://github.com/bep/hugo-sass-test New functions to create `Resource` objects: * `resources.Get` (see above) * `resources.FromString`: Create a Resource from a string. New `Resource` transformation funcs: * `resources.ToCSS`: Compile `SCSS` or `SASS` into `CSS`. * `resources.PostCSS`: Process your CSS with PostCSS. Config file support (project or theme or passed as an option). * `resources.Minify`: Currently supports `css`, `js`, `json`, `html`, `svg`, `xml`. * `resources.Fingerprint`: Creates a fingerprinted version of the given Resource with Subresource Integrity.. * `resources.Concat`: Concatenates a list of Resource objects. Think of this as a poor man's bundler. * `resources.ExecuteAsTemplate`: Parses and executes the given Resource and data context (e.g. .Site) as a Go template. Fixes #4381 Fixes #4903 Fixes #4858
115 lines
3.4 KiB
Go
115 lines
3.4 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 minifiers
|
|
|
|
import (
|
|
"github.com/gohugoio/hugo/helpers"
|
|
"github.com/gohugoio/hugo/media"
|
|
|
|
"github.com/gohugoio/hugo/resource"
|
|
"github.com/tdewolff/minify"
|
|
"github.com/tdewolff/minify/css"
|
|
"github.com/tdewolff/minify/html"
|
|
"github.com/tdewolff/minify/js"
|
|
"github.com/tdewolff/minify/json"
|
|
"github.com/tdewolff/minify/svg"
|
|
"github.com/tdewolff/minify/xml"
|
|
)
|
|
|
|
// Client for minification of Resource objects. Supported minfiers are:
|
|
// css, html, js, json, svg and xml.
|
|
type Client struct {
|
|
rs *resource.Spec
|
|
m *minify.M
|
|
}
|
|
|
|
// 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 *resource.Spec) *Client {
|
|
m := minify.New()
|
|
mt := rs.MediaTypes
|
|
|
|
// We use the Type definition of the media types defined in the site if found.
|
|
addMinifierFunc(m, mt, "text/css", "css", css.Minify)
|
|
addMinifierFunc(m, mt, "text/html", "html", html.Minify)
|
|
addMinifierFunc(m, mt, "application/javascript", "js", js.Minify)
|
|
addMinifierFunc(m, mt, "application/json", "json", json.Minify)
|
|
addMinifierFunc(m, mt, "image/svg", "xml", svg.Minify)
|
|
addMinifierFunc(m, mt, "application/xml", "xml", xml.Minify)
|
|
addMinifierFunc(m, mt, "application/rss", "xml", xml.Minify)
|
|
|
|
return &Client{rs: rs, m: m}
|
|
}
|
|
|
|
func addMinifierFunc(m *minify.M, mt media.Types, typeString, suffix string, fn minify.MinifierFunc) {
|
|
resolvedTypeStr := resolveMediaTypeString(mt, typeString, suffix)
|
|
m.AddFunc(resolvedTypeStr, fn)
|
|
if resolvedTypeStr != typeString {
|
|
m.AddFunc(typeString, fn)
|
|
}
|
|
}
|
|
|
|
type minifyTransformation struct {
|
|
rs *resource.Spec
|
|
m *minify.M
|
|
}
|
|
|
|
func (t *minifyTransformation) Key() resource.ResourceTransformationKey {
|
|
return resource.NewResourceTransformationKey("minify")
|
|
}
|
|
|
|
func (t *minifyTransformation) Transform(ctx *resource.ResourceTransformationCtx) error {
|
|
mtype := resolveMediaTypeString(
|
|
t.rs.MediaTypes,
|
|
ctx.InMediaType.Type(),
|
|
helpers.ExtNoDelimiter(ctx.InPath),
|
|
)
|
|
if err := t.m.Minify(mtype, ctx.To, ctx.From); err != nil {
|
|
return err
|
|
}
|
|
ctx.AddOutPathIdentifier(".min")
|
|
return nil
|
|
}
|
|
|
|
func (c *Client) Minify(res resource.Resource) (resource.Resource, error) {
|
|
return c.rs.Transform(
|
|
res,
|
|
&minifyTransformation{
|
|
rs: c.rs,
|
|
m: c.m},
|
|
)
|
|
}
|
|
|
|
func resolveMediaTypeString(types media.Types, typeStr, suffix string) string {
|
|
if m, found := resolveMediaType(types, typeStr, suffix); found {
|
|
return m.Type()
|
|
}
|
|
// Fall back to the default.
|
|
return typeStr
|
|
}
|
|
|
|
// Make sure we match the matching pattern with what the user have actually defined
|
|
// in his or hers media types configuration.
|
|
func resolveMediaType(types media.Types, typeStr, suffix string) (media.Type, bool) {
|
|
if m, found := types.GetByType(typeStr); found {
|
|
return m, true
|
|
}
|
|
|
|
if m, found := types.GetFirstBySuffix(suffix); found {
|
|
return m, true
|
|
}
|
|
|
|
return media.Type{}, false
|
|
|
|
}
|