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
206 lines
5 KiB
Go
206 lines
5 KiB
Go
// Copyright 2016 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 create_test
|
|
|
|
import (
|
|
"os"
|
|
"path/filepath"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/gohugoio/hugo/deps"
|
|
|
|
"github.com/gohugoio/hugo/hugolib"
|
|
|
|
"fmt"
|
|
|
|
"github.com/gohugoio/hugo/hugofs"
|
|
|
|
"github.com/gohugoio/hugo/create"
|
|
"github.com/gohugoio/hugo/helpers"
|
|
"github.com/spf13/afero"
|
|
"github.com/spf13/viper"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestNewContent(t *testing.T) {
|
|
v := viper.New()
|
|
initViper(v)
|
|
|
|
cases := []struct {
|
|
kind string
|
|
path string
|
|
expected []string
|
|
}{
|
|
{"post", "post/sample-1.md", []string{`title = "Post Arch title"`, `test = "test1"`, "date = \"2015-01-12T19:20:04-07:00\""}},
|
|
{"post", "post/org-1.org", []string{`#+title: ORG-1`}},
|
|
{"emptydate", "post/sample-ed.md", []string{`title = "Empty Date Arch title"`, `test = "test1"`}},
|
|
{"stump", "stump/sample-2.md", []string{`title: "Sample 2"`}}, // no archetype file
|
|
{"", "sample-3.md", []string{`title: "Sample 3"`}}, // no archetype
|
|
{"product", "product/sample-4.md", []string{`title = "SAMPLE-4"`}}, // empty archetype front matter
|
|
{"shortcodes", "shortcodes/go.md", []string{
|
|
`title = "GO"`,
|
|
"{{< myshortcode >}}",
|
|
"{{% myshortcode %}}",
|
|
"{{</* comment */>}}\n{{%/* comment */%}}"}}, // shortcodes
|
|
}
|
|
|
|
for _, c := range cases {
|
|
cfg, fs := newTestCfg()
|
|
require.NoError(t, initFs(fs))
|
|
h, err := hugolib.NewHugoSites(deps.DepsCfg{Cfg: cfg, Fs: fs})
|
|
require.NoError(t, err)
|
|
|
|
siteFactory := func(filename string, siteUsed bool) (*hugolib.Site, error) {
|
|
return h.Sites[0], nil
|
|
}
|
|
|
|
require.NoError(t, create.NewContent(h.PathSpec, siteFactory, c.kind, c.path))
|
|
|
|
fname := filepath.Join("content", filepath.FromSlash(c.path))
|
|
content := readFileFromFs(t, fs.Source, fname)
|
|
for i, v := range c.expected {
|
|
found := strings.Contains(content, v)
|
|
if !found {
|
|
t.Fatalf("[%d] %q missing from output:\n%q", i, v, content)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
func initViper(v *viper.Viper) {
|
|
v.Set("metaDataFormat", "toml")
|
|
v.Set("archetypeDir", "archetypes")
|
|
v.Set("contentDir", "content")
|
|
v.Set("themesDir", "themes")
|
|
v.Set("layoutDir", "layouts")
|
|
v.Set("i18nDir", "i18n")
|
|
v.Set("theme", "sample")
|
|
v.Set("archetypeDir", "archetypes")
|
|
v.Set("resourceDir", "resources")
|
|
v.Set("publishDir", "public")
|
|
}
|
|
|
|
func initFs(fs *hugofs.Fs) error {
|
|
perm := os.FileMode(0755)
|
|
var err error
|
|
|
|
// create directories
|
|
dirs := []string{
|
|
"archetypes",
|
|
"content",
|
|
filepath.Join("themes", "sample", "archetypes"),
|
|
}
|
|
for _, dir := range dirs {
|
|
err = fs.Source.Mkdir(dir, perm)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
// create files
|
|
for _, v := range []struct {
|
|
path string
|
|
content string
|
|
}{
|
|
{
|
|
path: filepath.Join("archetypes", "post.md"),
|
|
content: "+++\ndate = \"2015-01-12T19:20:04-07:00\"\ntitle = \"Post Arch title\"\ntest = \"test1\"\n+++\n",
|
|
},
|
|
{
|
|
path: filepath.Join("archetypes", "post.org"),
|
|
content: "#+title: {{ .BaseFileName | upper }}",
|
|
},
|
|
{
|
|
path: filepath.Join("archetypes", "product.md"),
|
|
content: `+++
|
|
title = "{{ .BaseFileName | upper }}"
|
|
+++`,
|
|
},
|
|
{
|
|
path: filepath.Join("archetypes", "emptydate.md"),
|
|
content: "+++\ndate =\"\"\ntitle = \"Empty Date Arch title\"\ntest = \"test1\"\n+++\n",
|
|
},
|
|
// #3623x
|
|
{
|
|
path: filepath.Join("archetypes", "shortcodes.md"),
|
|
content: `+++
|
|
title = "{{ .BaseFileName | upper }}"
|
|
+++
|
|
|
|
{{< myshortcode >}}
|
|
|
|
Some text.
|
|
|
|
{{% myshortcode %}}
|
|
{{</* comment */>}}
|
|
{{%/* comment */%}}
|
|
|
|
|
|
`,
|
|
},
|
|
} {
|
|
f, err := fs.Source.Create(v.path)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer f.Close()
|
|
|
|
_, err = f.Write([]byte(v.content))
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// TODO(bep) extract common testing package with this and some others
|
|
func readFileFromFs(t *testing.T, fs afero.Fs, filename string) string {
|
|
filename = filepath.FromSlash(filename)
|
|
b, err := afero.ReadFile(fs, filename)
|
|
if err != nil {
|
|
// Print some debug info
|
|
root := strings.Split(filename, helpers.FilePathSeparator)[0]
|
|
afero.Walk(fs, root, func(path string, info os.FileInfo, err error) error {
|
|
if info != nil && !info.IsDir() {
|
|
fmt.Println(" ", path)
|
|
}
|
|
|
|
return nil
|
|
})
|
|
t.Fatalf("Failed to read file: %s", err)
|
|
}
|
|
return string(b)
|
|
}
|
|
|
|
func newTestCfg() (*viper.Viper, *hugofs.Fs) {
|
|
|
|
v := viper.New()
|
|
v.Set("contentDir", "content")
|
|
v.Set("dataDir", "data")
|
|
v.Set("i18nDir", "i18n")
|
|
v.Set("layoutDir", "layouts")
|
|
v.Set("archetypeDir", "archetypes")
|
|
v.Set("assetDir", "assets")
|
|
|
|
fs := hugofs.NewMem(v)
|
|
|
|
v.SetFs(fs.Source)
|
|
|
|
initViper(v)
|
|
|
|
return v, fs
|
|
|
|
}
|