diff options
90 files changed, 4686 insertions, 1126 deletions
diff --git a/.gitignore b/.gitignore index 08e830c87..032a643c9 100644 --- a/.gitignore +++ b/.gitignore @@ -15,5 +15,7 @@ vendor/*/ *.debug coverage*.out +dock.sh + GoBuilds dist diff --git a/.travis.yml b/.travis.yml index b04528203..f398f2015 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,8 @@ language: go sudo: false dist: trusty +env: + HUGO_BUILD_TAGS="extended" git: depth: false go: @@ -18,8 +20,9 @@ install: - go get github.com/magefile/mage - mage -v vendor script: - - mage -v hugoRace + - mage -v test - mage -v check + - mage -v hugo - ./hugo -s docs/ - ./hugo --renderToMemory -s docs/ before_install: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ad33414b5..87199a411 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -192,6 +192,12 @@ To list all available commands along with descriptions: mage -l ``` +**Note:** From Hugo 0.43 we have added a build tag, `extended` that adds **SCSS support**. This needs a C compiler installed to build. You can enable this when building by: + +```bash +HUGO_BUILD_TAGS=extended mage install +```` + ### Updating the Hugo Sources If you want to stay in sync with the Hugo repository, you can easily pull down diff --git a/Dockerfile b/Dockerfile index 919b02237..919b02237 100644..100755 --- a/Dockerfile +++ b/Dockerfile diff --git a/Gopkg.lock b/Gopkg.lock index 51fb96c52..8d07f2390 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -3,6 +3,12 @@ [[projects]] branch = "master" + name = "github.com/BurntSushi/locker" + packages = ["."] + revision = "a6e239ea1c69bff1cfdb20c4b73dadf52f784b6a" + +[[projects]] + branch = "master" name = "github.com/BurntSushi/toml" packages = ["."] revision = "a368813c5e648fee92e5f6c30e3944ff9d5e8895" @@ -69,6 +75,16 @@ revision = "012701e8669671499fc43e9792335a1dcbfe2afb" [[projects]] + branch = "master" + name = "github.com/bep/go-tocss" + packages = [ + "scss", + "scss/libsass", + "tocss" + ] + revision = "2abb118dc8688b6c7df44e12f4152c2bded9b19c" + +[[projects]] name = "github.com/chaseadamsio/goorgeous" packages = ["."] revision = "dcf1ef873b8987bf12596fe6951c48347986eb2f" @@ -109,6 +125,12 @@ [[projects]] branch = "master" + name = "github.com/dsnet/golib" + packages = ["memfile"] + revision = "1ea1667757804fdcccc5a1810e09aba618885ac2" + +[[projects]] + branch = "master" name = "github.com/eknkc/amber" packages = [ ".", @@ -233,6 +255,12 @@ [[projects]] branch = "master" + name = "github.com/mitchellh/hashstructure" + packages = ["."] + revision = "2bca23e0e452137f789efbc8610126fd8b94f73b" + +[[projects]] + branch = "master" name = "github.com/mitchellh/mapstructure" packages = ["."] revision = "00c29f56e2386353d58c599509e8dc3801b0d716" @@ -356,6 +384,42 @@ version = "v1.2.1" [[projects]] + name = "github.com/tdewolff/minify" + packages = [ + ".", + "css", + "html", + "js", + "json", + "svg", + "xml" + ] + revision = "8d72a4127ae33b755e95bffede9b92e396267ce2" + version = "v2.3.5" + +[[projects]] + name = "github.com/tdewolff/parse" + packages = [ + ".", + "buffer", + "css", + "html", + "js", + "json", + "strconv", + "svg", + "xml" + ] + revision = "d739d6fccb0971177e06352fea02d3552625efb1" + version = "v2.3.3" + +[[projects]] + branch = "master" + name = "github.com/wellington/go-libsass" + packages = ["libs"] + revision = "615eaa47ef794d037c1906a0eb7bf85375a5decf" + +[[projects]] name = "github.com/yosssi/ace" packages = ["."] revision = "ea038f4770b6746c3f8f84f14fa60d9fe1205b56" @@ -431,6 +495,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "78b19539f7321429f217fc482de9e7cb4e2edd9b054ba8ec36b1e62bc4281b4f" + inputs-digest = "aaf909f54ae33c5a70f692e19e59834106bcbbe5d16724ff3998907734e32c0b" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index c87b82823..8e6a614f2 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -17,6 +17,14 @@ name = "github.com/bep/gitmap" [[constraint]] + branch = "master" + name = "github.com/bep/go-tocss" + +[[override]] + branch = "master" + name = "github.com/wellington/go-libsass" + +[[constraint]] name = "github.com/chaseadamsio/goorgeous" version = "^1.1.0" @@ -149,3 +157,15 @@ [[constraint]] name = "github.com/bep/debounce" version = "^1.1.0" + +[[constraint]] + name = "github.com/tdewolff/minify" + version = "^2.3.5" + +[[constraint]] + branch = "master" + name = "github.com/BurntSushi/locker" + +[[constraint]] + branch = "master" + name = "github.com/mitchellh/hashstructure" diff --git a/appveyor.yml b/appveyor.yml index d6fbaba1a..3feb4819f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,8 +1,14 @@ +image: Visual Studio 2015 + init: - - set PATH=%PATH%;C:\MinGW\bin;%GOPATH%\bin + - set PATH=%PATH%;C:\mingw-w64\x86_64-7.3.0-posix-seh-rt_v5-rev0\mingw64\bin;%GOPATH%\bin - go version - go env +environment: + GOPATH: C:\GOPATH\ + HUGO_BUILD_TAGS: extended + # clones and cd's to path clone_folder: C:\GOPATH\src\github.com\gohugoio\hugo diff --git a/commands/commandeer.go b/commands/commandeer.go index 4ca0c4be9..051787f6e 100644 --- a/commands/commandeer.go +++ b/commands/commandeer.go @@ -16,6 +16,7 @@ package commands import ( "os" "path/filepath" + "regexp" "sync" "time" @@ -46,6 +47,10 @@ type commandeerHugoState struct { type commandeer struct { *commandeerHugoState + // Currently only set when in "fast render mode". But it seems to + // be fast enough that we could maybe just add it for all server modes. + changeDetector *fileChangeDetector + // We need to reuse this on server rebuilds. destinationFs afero.Fs @@ -105,6 +110,68 @@ func newCommandeer(mustHaveConfigFile, running bool, h *hugoBuilderCommon, f fla return c, c.loadConfig(mustHaveConfigFile, running) } +type fileChangeDetector struct { + sync.Mutex + current map[string]string + prev map[string]string + + irrelevantRe *regexp.Regexp +} + +func (f *fileChangeDetector) OnFileClose(name, md5sum string) { + f.Lock() + defer f.Unlock() + f.current[name] = md5sum +} + +func (f *fileChangeDetector) changed() []string { + if f == nil { + return nil + } + f.Lock() + defer f.Unlock() + var c []string + for k, v := range f.current { + vv, found := f.prev[k] + if !found || v != vv { + c = append(c, k) + } + } + + return f.filterIrrelevant(c) +} + +func (f *fileChangeDetector) filterIrrelevant(in []string) []string { + var filtered []string + for _, v := range in { + if !f.irrelevantRe.MatchString(v) { + filtered = append(filtered, v) + } + } |