2017-03-02 09:35:25 -05:00
|
|
|
// Copyright 2017-present 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 media
|
|
|
|
|
|
|
|
import (
|
2017-04-05 10:18:53 -04:00
|
|
|
"encoding/json"
|
2017-03-02 09:35:25 -05:00
|
|
|
"fmt"
|
2017-04-03 16:39:37 -04:00
|
|
|
"sort"
|
2017-04-03 11:00:23 -04:00
|
|
|
"strings"
|
2017-03-02 09:35:25 -05:00
|
|
|
|
2018-07-10 05:55:22 -04:00
|
|
|
"github.com/gohugoio/hugo/helpers"
|
2017-04-03 16:39:37 -04:00
|
|
|
"github.com/mitchellh/mapstructure"
|
|
|
|
)
|
2017-04-03 11:00:23 -04:00
|
|
|
|
2017-06-20 02:45:52 -04:00
|
|
|
const (
|
|
|
|
defaultDelimiter = "."
|
|
|
|
)
|
|
|
|
|
2017-08-02 08:25:05 -04:00
|
|
|
// Type (also known as MIME type and content type) is a two-part identifier for
|
2017-03-02 09:35:25 -05:00
|
|
|
// file formats and format contents transmitted on the Internet.
|
|
|
|
// For Hugo's use case, we use the top-level type name / subtype name + suffix.
|
2018-07-10 05:55:22 -04:00
|
|
|
// One example would be application/svg+xml
|
2017-03-02 09:35:25 -05:00
|
|
|
// If suffix is not provided, the sub type will be used.
|
|
|
|
// See // https://en.wikipedia.org/wiki/Media_type
|
|
|
|
type Type struct {
|
2018-07-10 05:55:22 -04:00
|
|
|
MainType string `json:"mainType"` // i.e. text
|
|
|
|
SubType string `json:"subType"` // i.e. html
|
|
|
|
|
|
|
|
// Deprecated in Hugo 0.44. To be renamed and unexported.
|
|
|
|
// Was earlier used both to set file suffix and to augment the MIME type.
|
|
|
|
// This had its limitations and issues.
|
|
|
|
OldSuffix string `json:"-" mapstructure:"suffix"`
|
|
|
|
|
|
|
|
Delimiter string `json:"delimiter"` // e.g. "."
|
|
|
|
|
|
|
|
Suffixes []string `json:"suffixes"`
|
|
|
|
|
|
|
|
// Set when doing lookup by suffix.
|
|
|
|
fileSuffix string
|
2017-03-02 09:35:25 -05:00
|
|
|
}
|
|
|
|
|
2018-07-10 05:55:22 -04:00
|
|
|
// FromStringAndExt is same as FromString, but adds the file extension to the type.
|
|
|
|
func FromStringAndExt(t, ext string) (Type, error) {
|
|
|
|
tp, err := fromString(t)
|
|
|
|
if err != nil {
|
|
|
|
return tp, err
|
|
|
|
}
|
|
|
|
tp.Suffixes = []string{strings.TrimPrefix(ext, ".")}
|
|
|
|
return tp, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// FromString creates a new Type given a type string on the form MainType/SubType and
|
2017-04-03 16:39:37 -04:00
|
|
|
// an optional suffix, e.g. "text/html" or "text/html+html".
|
2018-07-10 05:55:22 -04:00
|
|
|
func fromString(t string) (Type, error) {
|
2017-04-03 16:39:37 -04:00
|
|
|
t = strings.ToLower(t)
|
|
|
|
parts := strings.Split(t, "/")
|
|
|
|
if len(parts) != 2 {
|
|
|
|
return Type{}, fmt.Errorf("cannot parse %q as a media type", t)
|
|
|
|
}
|
|
|
|
mainType := parts[0]
|
|
|
|
subParts := strings.Split(parts[1], "+")
|
|
|
|
|
Add Hugo Piper with SCSS support and much more
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
2018-02-20 04:02:14 -05:00
|
|
|
subType := strings.Split(subParts[0], ";")[0]
|
|
|
|
|
2017-04-03 16:39:37 -04:00
|
|
|
var suffix string
|
|
|
|
|
2018-07-10 05:55:22 -04:00
|
|
|
if len(subParts) > 1 {
|
2017-04-03 16:39:37 -04:00
|
|
|
suffix = subParts[1]
|
|
|
|
}
|
|
|
|
|
2018-07-10 05:55:22 -04:00
|
|
|
return Type{MainType: mainType, SubType: subType, OldSuffix: suffix}, nil
|
2017-04-03 16:39:37 -04:00
|
|
|
}
|
|
|
|
|
2018-07-10 05:55:22 -04:00
|
|
|
// Type returns a string representing the main- and sub-type of a media type, e.g. "text/css".
|
|
|
|
// A suffix identifier will be appended after a "+" if set, e.g. "image/svg+xml".
|
2017-03-22 06:03:42 -04:00
|
|
|
// Hugo will register a set of default media types.
|
|
|
|
// These can be overridden by the user in the configuration,
|
|
|
|
// by defining a media type with the same Type.
|
|
|
|
func (m Type) Type() string {
|
2018-07-10 05:55:22 -04:00
|
|
|
// Examples are
|
|
|
|
// image/svg+xml
|
|
|
|
// text/css
|
|
|
|
if m.OldSuffix != "" {
|
|
|
|
return fmt.Sprintf("%s/%s+%s", m.MainType, m.SubType, m.OldSuffix)
|
|
|
|
}
|
2017-03-22 06:03:42 -04:00
|
|
|
return fmt.Sprintf("%s/%s", m.MainType, m.SubType)
|
2018-07-10 05:55:22 -04:00
|
|
|
|
2017-03-02 09:35:25 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
func (m Type) String() string {
|
2018-07-10 05:55:22 -04:00
|
|
|
return m.Type()
|
2017-03-02 09:35:25 -05:00
|
|
|
}
|
|
|
|
|
2017-06-20 02:45:52 -04:00
|
|
|
// FullSuffix returns the file suffix with any delimiter prepended.
|
|
|
|
func (m Type) FullSuffix() string {
|
2018-07-10 05:55:22 -04:00
|
|
|
return m.Delimiter + m.Suffix()
|
|
|
|
}
|
|
|
|
|
|
|
|
// Suffix returns the file suffix without any delmiter prepended.
|
|
|
|
func (m Type) Suffix() string {
|
|
|
|
if m.fileSuffix != "" {
|
|
|
|
return m.fileSuffix
|
|
|
|
}
|
|
|
|
if len(m.Suffixes) > 0 {
|
|
|
|
return m.Suffixes[0]
|
|
|
|
}
|
|
|
|
// There are MIME types without file suffixes.
|
|
|
|
return ""
|
2017-06-20 02:45:52 -04:00
|
|
|
}
|
|
|
|
|
2017-03-02 09:35:25 -05:00
|
|
|
var (
|
2018-07-10 05:55:22 -04:00
|
|
|
// Definitions from https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types etc.
|
|
|
|
// Note that from Hugo 0.44 we only set Suffix if it is part of the MIME type.
|
|
|
|
CalendarType = Type{MainType: "text", SubType: "calendar", Suffixes: []string{"ics"}, Delimiter: defaultDelimiter}
|
|
|
|
CSSType = Type{MainType: "text", SubType: "css", Suffixes: []string{"css"}, Delimiter: defaultDelimiter}
|
|
|
|
SCSSType = Type{MainType: "text", SubType: "x-scss", Suffixes: []string{"scss"}, Delimiter: defaultDelimiter}
|
|
|
|
SASSType = Type{MainType: "text", SubType: "x-sass", Suffixes: []string{"sass"}, Delimiter: defaultDelimiter}
|
|
|
|
CSVType = Type{MainType: "text", SubType: "csv", Suffixes: []string{"csv"}, Delimiter: defaultDelimiter}
|
|
|
|
HTMLType = Type{MainType: "text", SubType: "html", Suffixes: []string{"html"}, Delimiter: defaultDelimiter}
|
|
|
|
JavascriptType = Type{MainType: "application", SubType: "javascript", Suffixes: []string{"js"}, Delimiter: defaultDelimiter}
|
|
|
|
JSONType = Type{MainType: "application", SubType: "json", Suffixes: []string{"json"}, Delimiter: defaultDelimiter}
|
|
|
|
RSSType = Type{MainType: "application", SubType: "rss", OldSuffix: "xml", Suffixes: []string{"xml"}, Delimiter: defaultDelimiter}
|
|
|
|
XMLType = Type{MainType: "application", SubType: "xml", Suffixes: []string{"xml"}, Delimiter: defaultDelimiter}
|
|
|
|
SVGType = Type{MainType: "image", SubType: "svg", OldSuffix: "xml", Suffixes: []string{"svg"}, Delimiter: defaultDelimiter}
|
|
|
|
TextType = Type{MainType: "text", SubType: "plain", Suffixes: []string{"txt"}, Delimiter: defaultDelimiter}
|
|
|
|
|
|
|
|
OctetType = Type{MainType: "application", SubType: "octet-stream"}
|
2017-03-02 09:35:25 -05:00
|
|
|
)
|
|
|
|
|
2017-04-03 16:39:37 -04:00
|
|
|
var DefaultTypes = Types{
|
|
|
|
CalendarType,
|
|
|
|
CSSType,
|
|
|
|
CSVType,
|
Add Hugo Piper with SCSS support and much more
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
2018-02-20 04:02:14 -05:00
|
|
|
SCSSType,
|
|
|
|
SASSType,
|
2017-04-03 16:39:37 -04:00
|
|
|
HTMLType,
|
|
|
|
JavascriptType,
|
|
|
|
JSONType,
|
|
|
|
RSSType,
|
|
|
|
XMLType,
|
Add Hugo Piper with SCSS support and much more
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
2018-02-20 04:02:14 -05:00
|
|
|
SVGType,
|
2017-04-03 16:39:37 -04:00
|
|
|
TextType,
|
Add Hugo Piper with SCSS support and much more
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
2018-02-20 04:02:14 -05:00
|
|
|
OctetType,
|
2017-04-03 16:39:37 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
func init() {
|
|
|
|
sort.Sort(DefaultTypes)
|
|
|
|
}
|
|
|
|
|
|
|
|
type Types []Type
|
|
|
|
|
|
|
|
func (t Types) Len() int { return len(t) }
|
|
|
|
func (t Types) Swap(i, j int) { t[i], t[j] = t[j], t[i] }
|
|
|
|
func (t Types) Less(i, j int) bool { return t[i].Type() < t[j].Type() }
|
|
|
|
|
|
|
|
func (t Types) GetByType(tp string) (Type, bool) {
|
|
|
|
for _, tt := range t {
|
|
|
|
if strings.EqualFold(tt.Type(), tp) {
|
|
|
|
return tt, true
|
|
|
|
}
|
|
|
|
}
|
2018-07-10 05:55:22 -04:00
|
|
|
|
|
|
|
if !strings.Contains(tp, "+") {
|
|
|
|
// Try with the main and sub type
|
|
|
|
parts := strings.Split(tp, "/")
|
|
|
|
if len(parts) == 2 {
|
|
|
|
return t.GetByMainSubType(parts[0], parts[1])
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-04-03 16:39:37 -04:00
|
|
|
return Type{}, false
|
|
|
|
}
|
|
|
|
|
Add Hugo Piper with SCSS support and much more
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
2018-02-20 04:02:14 -05:00
|
|
|
// GetFirstBySuffix will return the first media type matching the given suffix.
|
|
|
|
func (t Types) GetFirstBySuffix(suffix string) (Type, bool) {
|
|
|
|
for _, tt := range t {
|
2018-07-10 05:55:22 -04:00
|
|
|
if match := tt.matchSuffix(suffix); match != "" {
|
|
|
|
tt.fileSuffix = match
|
Add Hugo Piper with SCSS support and much more
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
2018-02-20 04:02:14 -05:00
|
|
|
return tt, true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return Type{}, false
|
|
|
|
}
|
|
|
|
|
2017-04-03 16:39:37 -04:00
|
|
|
// GetBySuffix gets a media type given as suffix, e.g. "html".
|
|
|
|
// It will return false if no format could be found, or if the suffix given
|
|
|
|
// is ambiguous.
|
|
|
|
// The lookup is case insensitive.
|
|
|
|
func (t Types) GetBySuffix(suffix string) (tp Type, found bool) {
|
|
|
|
for _, tt := range t {
|
2018-07-10 05:55:22 -04:00
|
|
|
if match := tt.matchSuffix(suffix); match != "" {
|
2017-04-03 16:39:37 -04:00
|
|
|
if found {
|
|
|
|
// ambiguous
|
|
|
|
found = false
|
|
|
|
return
|
|
|
|
}
|
|
|
|
tp = tt
|
2018-07-10 05:55:22 -04:00
|
|
|
tp.fileSuffix = match
|
2017-04-03 16:39:37 -04:00
|
|
|
found = true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2018-07-10 05:55:22 -04:00
|
|
|
func (t Type) matchSuffix(suffix string) string {
|
|
|
|
if strings.EqualFold(suffix, t.OldSuffix) {
|
|
|
|
return t.OldSuffix
|
|
|
|
}
|
|
|
|
for _, s := range t.Suffixes {
|
|
|
|
if strings.EqualFold(suffix, s) {
|
|
|
|
return s
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return ""
|
|
|
|
}
|
|
|
|
|
|
|
|
// GetMainSubType gets a media type given a main and a sub type e.g. "text" and "plain".
|
|
|
|
// It will return false if no format could be found, or if the combination given
|
|
|
|
// is ambiguous.
|
|
|
|
// The lookup is case insensitive.
|
|
|
|
func (t Types) GetByMainSubType(mainType, subType string) (tp Type, found bool) {
|
|
|
|
for _, tt := range t {
|
|
|
|
if strings.EqualFold(mainType, tt.MainType) && strings.EqualFold(subType, tt.SubType) {
|
|
|
|
if found {
|
|
|
|
// ambiguous
|
|
|
|
found = false
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
tp = tt
|
|
|
|
found = true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
func suffixIsDeprecated() {
|
|
|
|
helpers.Deprecated("MediaType", "Suffix in config.toml", `
|
|
|
|
Before Hugo 0.44 this was used both to set a custom file suffix and as way
|
|
|
|
to augment the mediatype definition (what you see after the "+", e.g. "image/svg+xml").
|
|
|
|
|
|
|
|
This had its limitations. For one, it was only possible with one file extension per MIME type.
|
|
|
|
|
|
|
|
Now you can specify multiple file suffixes using "suffixes", but you need to specify the full MIME type
|
|
|
|
identifier:
|
|
|
|
|
|
|
|
[mediaTypes]
|
|
|
|
[mediaTypes."image/svg+xml"]
|
|
|
|
suffixes = ["svg", "abc" ]
|
|
|
|
|
|
|
|
In most cases, it will be enough to just change:
|
|
|
|
|
|
|
|
[mediaTypes]
|
|
|
|
[mediaTypes."my/custom-mediatype"]
|
|
|
|
suffix = "txt"
|
|
|
|
|
|
|
|
To:
|
|
|
|
|
|
|
|
[mediaTypes]
|
|
|
|
[mediaTypes."my/custom-mediatype"]
|
|
|
|
suffixes = ["txt"]
|
|
|
|
|
|
|
|
Hugo will still respect values set in "suffix" if no value for "suffixes" is provided, but this will be removed
|
|
|
|
in a future release.
|
|
|
|
|
|
|
|
Note that you can still get the Media Type's suffix from a template: {{ $mediaType.Suffix }}. But this will now map to the MIME type filename.
|
|
|
|
`, false)
|
|
|
|
}
|
|
|
|
|
2017-04-03 16:39:37 -04:00
|
|
|
// DecodeTypes takes a list of media type configurations and merges those,
|
2017-04-06 09:28:56 -04:00
|
|
|
// in the order given, with the Hugo defaults as the last resort.
|
2017-04-03 16:39:37 -04:00
|
|
|
func DecodeTypes(maps ...map[string]interface{}) (Types, error) {
|
2018-07-10 05:55:22 -04:00
|
|
|
var m Types
|
|
|
|
|
|
|
|
// Maps type string to Type. Type string is the full application/svg+xml.
|
|
|
|
mmm := make(map[string]Type)
|
|
|
|
for _, dt := range DefaultTypes {
|
|
|
|
suffixes := make([]string, len(dt.Suffixes))
|
|
|
|
copy(suffixes, dt.Suffixes)
|
|
|
|
dt.Suffixes = suffixes
|
|
|
|
mmm[dt.Type()] = dt
|
|
|
|
}
|
2017-04-03 16:39:37 -04:00
|
|
|
|
|
|
|
for _, mm := range maps {
|
|
|
|
for k, v := range mm {
|
2018-07-10 05:55:22 -04:00
|
|
|
var mediaType Type
|
2017-04-03 16:39:37 -04:00
|
|
|
|
2018-07-10 05:55:22 -04:00
|
|
|
mediaType, found := mmm[k]
|
2017-04-03 16:39:37 -04:00
|
|
|
if !found {
|
2018-07-10 05:55:22 -04:00
|
|
|
var err error
|
|
|
|
mediaType, err = fromString(k)
|
2017-04-03 16:39:37 -04:00
|
|
|
if err != nil {
|
|
|
|
return m, err
|
|
|
|
}
|
2018-07-10 05:55:22 -04:00
|
|
|
}
|
2017-04-03 16:39:37 -04:00
|
|
|
|
2018-07-10 05:55:22 -04:00
|
|
|
if err := mapstructure.WeakDecode(v, &mediaType); err != nil {
|
|
|
|
return m, err
|
|
|
|
}
|
|
|
|
|
|
|
|
vm := v.(map[string]interface{})
|
|
|
|
_, delimiterSet := vm["delimiter"]
|
|
|
|
_, suffixSet := vm["suffix"]
|
|
|
|
|
2018-07-10 17:21:48 -04:00
|
|
|
if suffixSet {
|
2018-07-10 05:55:22 -04:00
|
|
|
suffixIsDeprecated()
|
|
|
|
}
|
2017-04-03 16:39:37 -04:00
|
|
|
|
2018-07-10 05:55:22 -04:00
|
|
|
// Before Hugo 0.44 we had a non-standard use of the Suffix
|
|
|
|
// attribute, and this is now deprecated (use Suffixes for file suffixes).
|
|
|
|
// But we need to keep old configurations working for a while.
|
|
|
|
if len(mediaType.Suffixes) == 0 && mediaType.OldSuffix != "" {
|
|
|
|
mediaType.Suffixes = []string{mediaType.OldSuffix}
|
2017-04-03 16:39:37 -04:00
|
|
|
}
|
2018-07-10 05:55:22 -04:00
|
|
|
// The user may set the delimiter as an empty string.
|
|
|
|
if !delimiterSet && len(mediaType.Suffixes) != 0 {
|
|
|
|
mediaType.Delimiter = defaultDelimiter
|
|
|
|
} else if suffixSet && !delimiterSet {
|
|
|
|
mediaType.Delimiter = defaultDelimiter
|
|
|
|
}
|
|
|
|
|
|
|
|
mmm[k] = mediaType
|
|
|
|
|
2017-04-03 16:39:37 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-07-10 05:55:22 -04:00
|
|
|
for _, v := range mmm {
|
|
|
|
m = append(m, v)
|
|
|
|
}
|
2017-04-03 16:39:37 -04:00
|
|
|
sort.Sort(m)
|
|
|
|
|
|
|
|
return m, nil
|
|
|
|
}
|
2017-04-05 10:18:53 -04:00
|
|
|
|
2017-09-25 22:25:33 -04:00
|
|
|
func (m Type) MarshalJSON() ([]byte, error) {
|
2017-04-05 10:18:53 -04:00
|
|
|
type Alias Type
|
|
|
|
return json.Marshal(&struct {
|
2017-07-31 10:53:13 -04:00
|
|
|
Type string `json:"type"`
|
|
|
|
String string `json:"string"`
|
2017-04-05 10:18:53 -04:00
|
|
|
Alias
|
|
|
|
}{
|
2017-09-25 22:25:33 -04:00
|
|
|
Type: m.Type(),
|
|
|
|
String: m.String(),
|
|
|
|
Alias: (Alias)(m),
|
2017-04-05 10:18:53 -04:00
|
|
|
})
|
|
|
|
}
|