mirror of
https://github.com/gohugoio/hugo.git
synced 2025-08-25 22:00:58 +02:00
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
This commit is contained in:
@@ -21,6 +21,8 @@ import (
|
||||
"reflect"
|
||||
"unicode"
|
||||
|
||||
"github.com/gohugoio/hugo/media"
|
||||
|
||||
"github.com/gohugoio/hugo/common/maps"
|
||||
|
||||
"github.com/gohugoio/hugo/langs"
|
||||
@@ -228,7 +230,7 @@ type Page struct {
|
||||
title string
|
||||
Description string
|
||||
Keywords []string
|
||||
Data map[string]interface{}
|
||||
data map[string]interface{}
|
||||
|
||||
pagemeta.PageDates
|
||||
|
||||
@@ -239,7 +241,8 @@ type Page struct {
|
||||
permalink string
|
||||
relPermalink string
|
||||
|
||||
// relative target path without extension and any base path element from the baseURL.
|
||||
// relative target path without extension and any base path element
|
||||
// from the baseURL or the language code.
|
||||
// This is used to construct paths in the page resources.
|
||||
relTargetPathBase string
|
||||
// Is set to a forward slashed path if this is a Page resources living in a folder below its owner.
|
||||
@@ -272,12 +275,16 @@ type Page struct {
|
||||
targetPathDescriptorPrototype *targetPathDescriptor
|
||||
}
|
||||
|
||||
func stackTrace() string {
|
||||
trace := make([]byte, 2000)
|
||||
func stackTrace(lenght int) string {
|
||||
trace := make([]byte, lenght)
|
||||
runtime.Stack(trace, true)
|
||||
return string(trace)
|
||||
}
|
||||
|
||||
func (p *Page) Data() interface{} {
|
||||
return p.data
|
||||
}
|
||||
|
||||
func (p *Page) initContent() {
|
||||
|
||||
p.contentInit.Do(func() {
|
||||
@@ -492,6 +499,10 @@ func (p *Page) BundleType() string {
|
||||
return ""
|
||||
}
|
||||
|
||||
func (p *Page) MediaType() media.Type {
|
||||
return media.OctetType
|
||||
}
|
||||
|
||||
type Source struct {
|
||||
Frontmatter []byte
|
||||
Content []byte
|
||||
@@ -1900,7 +1911,7 @@ func (p *Page) prepareLayouts() error {
|
||||
func (p *Page) prepareData(s *Site) error {
|
||||
if p.Kind != KindSection {
|
||||
var pages Pages
|
||||
p.Data = make(map[string]interface{})
|
||||
p.data = make(map[string]interface{})
|
||||
|
||||
switch p.Kind {
|
||||
case KindPage:
|
||||
@@ -1919,21 +1930,21 @@ func (p *Page) prepareData(s *Site) error {
|
||||
singular := s.taxonomiesPluralSingular[plural]
|
||||
taxonomy := s.Taxonomies[plural].Get(term)
|
||||
|
||||
p.Data[singular] = taxonomy
|
||||
p.Data["Singular"] = singular
|
||||
p.Data["Plural"] = plural
|
||||
p.Data["Term"] = term
|
||||
p.data[singular] = taxonomy
|
||||
p.data["Singular"] = singular
|
||||
p.data["Plural"] = plural
|
||||
p.data["Term"] = term
|
||||
pages = taxonomy.Pages()
|
||||
case KindTaxonomyTerm:
|
||||
plural := p.sections[0]
|
||||
singular := s.taxonomiesPluralSingular[plural]
|
||||
|
||||
p.Data["Singular"] = singular
|
||||
p.Data["Plural"] = plural
|
||||
p.Data["Terms"] = s.Taxonomies[plural]
|
||||
p.data["Singular"] = singular
|
||||
p.data["Plural"] = plural
|
||||
p.data["Terms"] = s.Taxonomies[plural]
|
||||
// keep the following just for legacy reasons
|
||||
p.Data["OrderedIndex"] = p.Data["Terms"]
|
||||
p.Data["Index"] = p.Data["Terms"]
|
||||
p.data["OrderedIndex"] = p.data["Terms"]
|
||||
p.data["Index"] = p.data["Terms"]
|
||||
|
||||
// A list of all KindTaxonomy pages with matching plural
|
||||
for _, p := range s.findPagesByKind(KindTaxonomy) {
|
||||
@@ -1943,7 +1954,7 @@ func (p *Page) prepareData(s *Site) error {
|
||||
}
|
||||
}
|
||||
|
||||
p.Data["Pages"] = pages
|
||||
p.data["Pages"] = pages
|
||||
p.Pages = pages
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user