mirror of
				https://github.com/gohugoio/hugo.git
				synced 2024-05-11 05:54:58 +00:00 
			
		
		
		
	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
		
	
		
			
				
	
	
		
			280 lines
		
	
	
		
			6.4 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			280 lines
		
	
	
		
			6.4 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
// +build mage
 | 
						|
 | 
						|
package main
 | 
						|
 | 
						|
import (
 | 
						|
	"bytes"
 | 
						|
	"errors"
 | 
						|
	"fmt"
 | 
						|
	"io/ioutil"
 | 
						|
	"os"
 | 
						|
	"path"
 | 
						|
	"path/filepath"
 | 
						|
	"runtime"
 | 
						|
	"strings"
 | 
						|
	"time"
 | 
						|
 | 
						|
	"github.com/magefile/mage/mg"
 | 
						|
	"github.com/magefile/mage/sh"
 | 
						|
)
 | 
						|
 | 
						|
const (
 | 
						|
	packageName  = "github.com/gohugoio/hugo"
 | 
						|
	noGitLdflags = "-X $PACKAGE/hugolib.BuildDate=$BUILD_DATE"
 | 
						|
)
 | 
						|
 | 
						|
var ldflags = "-X $PACKAGE/hugolib.CommitHash=$COMMIT_HASH -X $PACKAGE/hugolib.BuildDate=$BUILD_DATE"
 | 
						|
 | 
						|
// allow user to override go executable by running as GOEXE=xxx make ... on unix-like systems
 | 
						|
var goexe = "go"
 | 
						|
 | 
						|
func init() {
 | 
						|
	if exe := os.Getenv("GOEXE"); exe != "" {
 | 
						|
		goexe = exe
 | 
						|
	}
 | 
						|
}
 | 
						|
 | 
						|
func getDep() error {
 | 
						|
	return sh.Run(goexe, "get", "-u", "github.com/golang/dep/cmd/dep")
 | 
						|
}
 | 
						|
 | 
						|
// Install Go Dep and sync Hugo's vendored dependencies
 | 
						|
func Vendor() error {
 | 
						|
	mg.Deps(getDep)
 | 
						|
	return sh.Run("dep", "ensure")
 | 
						|
}
 | 
						|
 | 
						|
// Build hugo binary
 | 
						|
func Hugo() error {
 | 
						|
	return sh.RunWith(flagEnv(), goexe, "build", "-ldflags", ldflags, "-tags", buildTags(), packageName)
 | 
						|
}
 | 
						|
 | 
						|
// Build hugo binary with race detector enabled
 | 
						|
func HugoRace() error {
 | 
						|
	return sh.RunWith(flagEnv(), goexe, "build", "-race", "-ldflags", ldflags, "-tags", buildTags(), packageName)
 | 
						|
}
 | 
						|
 | 
						|
// Install hugo binary
 | 
						|
func Install() error {
 | 
						|
	return sh.RunWith(flagEnv(), goexe, "install", "-ldflags", ldflags, "-tags", buildTags(), packageName)
 | 
						|
}
 | 
						|
 | 
						|
func flagEnv() map[string]string {
 | 
						|
	hash, _ := sh.Output("git", "rev-parse", "--short", "HEAD")
 | 
						|
	return map[string]string{
 | 
						|
		"PACKAGE":     packageName,
 | 
						|
		"COMMIT_HASH": hash,
 | 
						|
		"BUILD_DATE":  time.Now().Format("2006-01-02T15:04:05Z0700"),
 | 
						|
	}
 | 
						|
}
 | 
						|
 | 
						|
func Generate() error {
 | 
						|
	return sh.RunWith(flagEnv(), goexe, "generate", path.Join(packageName, "tpl/tplimpl/embedded/generate"))
 | 
						|
}
 | 
						|
 | 
						|
// Build hugo without git info
 | 
						|
func HugoNoGitInfo() error {
 | 
						|
	ldflags = noGitLdflags
 | 
						|
	return Hugo()
 | 
						|
}
 | 
						|
 | 
						|
var docker = sh.RunCmd("docker")
 | 
						|
 | 
						|
// Build hugo Docker container
 | 
						|
func Docker() error {
 | 
						|
	if err := docker("build", "-t", "hugo", "."); err != nil {
 | 
						|
		return err
 | 
						|
	}
 | 
						|
	// yes ignore errors here
 | 
						|
	docker("rm", "-f", "hugo-build")
 | 
						|
	if err := docker("run", "--name", "hugo-build", "hugo ls /go/bin"); err != nil {
 | 
						|
		return err
 | 
						|
	}
 | 
						|
	if err := docker("cp", "hugo-build:/go/bin/hugo", "."); err != nil {
 | 
						|
		return err
 | 
						|
	}
 | 
						|
	return docker("rm", "hugo-build")
 | 
						|
}
 | 
						|
 | 
						|
// Run tests and linters
 | 
						|
func Check() {
 | 
						|
	if strings.Contains(runtime.Version(), "1.8") {
 | 
						|
		// Go 1.8 doesn't play along with go test ./... and /vendor.
 | 
						|
		// We could fix that, but that would take time.
 | 
						|
		fmt.Printf("Skip Check on %s\n", runtime.Version())
 | 
						|
		return
 | 
						|
	}
 | 
						|
	mg.Deps(Test386, Fmt, Vet)
 | 
						|
	// don't run two tests in parallel, they saturate the CPUs anyway, and running two
 | 
						|
	// causes memory issues in CI.
 | 
						|
	mg.Deps(TestRace)
 | 
						|
}
 | 
						|
 | 
						|
// Run tests in 32-bit mode
 | 
						|
// Note that we don't run with the extended tag. Currently not supported in 32 bit.
 | 
						|
func Test386() error {
 | 
						|
	return sh.RunWith(map[string]string{"GOARCH": "386"}, goexe, "test", "./...")
 | 
						|
}
 | 
						|
 | 
						|
// Run tests
 | 
						|
func Test() error {
 | 
						|
	return sh.Run(goexe, "test", "./...", "-tags", buildTags())
 | 
						|
}
 | 
						|
 | 
						|
// Run tests with race detector
 | 
						|
func TestRace() error {
 | 
						|
	return sh.Run(goexe, "test", "-race", "./...", "-tags", buildTags())
 | 
						|
}
 | 
						|
 | 
						|
// Run gofmt linter
 | 
						|
func Fmt() error {
 | 
						|
	if !isGoLatest() {
 | 
						|
		return nil
 | 
						|
	}
 | 
						|
	pkgs, err := hugoPackages()
 | 
						|
	if err != nil {
 | 
						|
		return err
 | 
						|
	}
 | 
						|
	failed := false
 | 
						|
	first := true
 | 
						|
	for _, pkg := range pkgs {
 | 
						|
		files, err := filepath.Glob(filepath.Join(pkg, "*.go"))
 | 
						|
		if err != nil {
 | 
						|
			return nil
 | 
						|
		}
 | 
						|
		for _, f := range files {
 | 
						|
			// gofmt doesn't exit with non-zero when it finds unformatted code
 | 
						|
			// so we have to explicitly look for output, and if we find any, we
 | 
						|
			// should fail this target.
 | 
						|
			s, err := sh.Output("gofmt", "-l", f)
 | 
						|
			if err != nil {
 | 
						|
				fmt.Printf("ERROR: running gofmt on %q: %v\n", f, err)
 | 
						|
				failed = true
 | 
						|
			}
 | 
						|
			if s != "" {
 | 
						|
				if first {
 | 
						|
					fmt.Println("The following files are not gofmt'ed:")
 | 
						|
					first = false
 | 
						|
				}
 | 
						|
				failed = true
 | 
						|
				fmt.Println(s)
 | 
						|
			}
 | 
						|
		}
 | 
						|
	}
 | 
						|
	if failed {
 | 
						|
		return errors.New("improperly formatted go files")
 | 
						|
	}
 | 
						|
	return nil
 | 
						|
}
 | 
						|
 | 
						|
var pkgPrefixLen = len("github.com/gohugoio/hugo")
 | 
						|
 | 
						|
func hugoPackages() ([]string, error) {
 | 
						|
	mg.Deps(getDep)
 | 
						|
	s, err := sh.Output(goexe, "list", "./...")
 | 
						|
	if err != nil {
 | 
						|
		return nil, err
 | 
						|
	}
 | 
						|
	pkgs := strings.Split(s, "\n")
 | 
						|
	for i := range pkgs {
 | 
						|
		pkgs[i] = "." + pkgs[i][pkgPrefixLen:]
 | 
						|
	}
 | 
						|
	return pkgs, nil
 | 
						|
}
 | 
						|
 | 
						|
// Run golint linter
 | 
						|
func Lint() error {
 | 
						|
	pkgs, err := hugoPackages()
 | 
						|
	if err != nil {
 | 
						|
		return err
 | 
						|
	}
 | 
						|
	failed := false
 | 
						|
	for _, pkg := range pkgs {
 | 
						|
		// We don't actually want to fail this target if we find golint errors,
 | 
						|
		// so we don't pass -set_exit_status, but we still print out any failures.
 | 
						|
		if _, err := sh.Exec(nil, os.Stderr, nil, "golint", pkg); err != nil {
 | 
						|
			fmt.Printf("ERROR: running go lint on %q: %v\n", pkg, err)
 | 
						|
			failed = true
 | 
						|
		}
 | 
						|
	}
 | 
						|
	if failed {
 | 
						|
		return errors.New("errors running golint")
 | 
						|
	}
 | 
						|
	return nil
 | 
						|
}
 | 
						|
 | 
						|
//  Run go vet linter
 | 
						|
func Vet() error {
 | 
						|
	mg.Deps(getDep)
 | 
						|
	if err := sh.Run(goexe, "vet", "./..."); err != nil {
 | 
						|
		return fmt.Errorf("error running govendor: %v", err)
 | 
						|
	}
 | 
						|
	return nil
 | 
						|
}
 | 
						|
 | 
						|
// Generate test coverage report
 | 
						|
func TestCoverHTML() error {
 | 
						|
	mg.Deps(getDep)
 | 
						|
	const (
 | 
						|
		coverAll = "coverage-all.out"
 | 
						|
		cover    = "coverage.out"
 | 
						|
	)
 | 
						|
	f, err := os.Create(coverAll)
 | 
						|
	if err != nil {
 | 
						|
		return err
 | 
						|
	}
 | 
						|
	defer f.Close()
 | 
						|
	if _, err := f.Write([]byte("mode: count")); err != nil {
 | 
						|
		return err
 | 
						|
	}
 | 
						|
	pkgs, err := hugoPackages()
 | 
						|
	if err != nil {
 | 
						|
		return err
 | 
						|
	}
 | 
						|
	for _, pkg := range pkgs {
 | 
						|
		if err := sh.Run(goexe, "test", "-coverprofile="+cover, "-covermode=count", pkg); err != nil {
 | 
						|
			return err
 | 
						|
		}
 | 
						|
		b, err := ioutil.ReadFile(cover)
 | 
						|
		if err != nil {
 | 
						|
			if os.IsNotExist(err) {
 | 
						|
				continue
 | 
						|
			}
 | 
						|
			return err
 | 
						|
		}
 | 
						|
		idx := bytes.Index(b, []byte{'\n'})
 | 
						|
		b = b[idx+1:]
 | 
						|
		if _, err := f.Write(b); err != nil {
 | 
						|
			return err
 | 
						|
		}
 | 
						|
	}
 | 
						|
	if err := f.Close(); err != nil {
 | 
						|
		return err
 | 
						|
	}
 | 
						|
	return sh.Run(goexe, "tool", "cover", "-html="+coverAll)
 | 
						|
}
 | 
						|
 | 
						|
// Verify that vendored packages match git HEAD
 | 
						|
func CheckVendor() error {
 | 
						|
	if err := sh.Run("git", "diff-index", "--quiet", "HEAD", "vendor/"); err != nil {
 | 
						|
		// yes, ignore errors from this, not much we can do.
 | 
						|
		sh.Exec(nil, os.Stdout, os.Stderr, "git", "diff", "vendor/")
 | 
						|
		return errors.New("check-vendor target failed: vendored packages out of sync")
 | 
						|
	}
 | 
						|
	return nil
 | 
						|
}
 | 
						|
 | 
						|
func isGoLatest() bool {
 | 
						|
	return strings.Contains(runtime.Version(), "1.10")
 | 
						|
}
 | 
						|
 | 
						|
func buildTags() string {
 | 
						|
	// To build the extended Hugo SCSS/SASS enabled version, build with
 | 
						|
	// HUGO_BUILD_TAGS=extended mage install etc.
 | 
						|
	if envtags := os.Getenv("HUGO_BUILD_TAGS"); envtags != "" {
 | 
						|
		return envtags
 | 
						|
	}
 | 
						|
	return "none"
 | 
						|
 | 
						|
}
 |