2016-10-31 18:53:33 +00:00
|
|
|
// 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 hugolib
|
|
|
|
|
|
|
|
import (
|
|
|
|
"fmt"
|
|
|
|
"path"
|
2017-11-20 09:34:30 +00:00
|
|
|
"strings"
|
2016-10-31 18:53:33 +00:00
|
|
|
"sync"
|
|
|
|
|
2018-10-03 12:58:09 +00:00
|
|
|
"github.com/pkg/errors"
|
|
|
|
|
2017-06-13 16:42:45 +00:00
|
|
|
"github.com/gohugoio/hugo/output"
|
2016-10-31 18:53:33 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
// renderPages renders pages each corresponding to a markdown file.
|
|
|
|
// TODO(bep np doc
|
2018-01-30 09:33:57 +00:00
|
|
|
func (s *Site) renderPages(cfg *BuildCfg) error {
|
2016-10-31 18:53:33 +00:00
|
|
|
|
|
|
|
results := make(chan error)
|
2017-03-07 08:55:17 +00:00
|
|
|
pages := make(chan *Page)
|
2016-10-31 18:53:33 +00:00
|
|
|
errs := make(chan error)
|
|
|
|
|
2018-10-03 12:58:09 +00:00
|
|
|
go s.errorCollator(results, errs)
|
2016-10-31 18:53:33 +00:00
|
|
|
|
2017-02-21 17:56:56 +00:00
|
|
|
numWorkers := getGoMaxProcs() * 4
|
2016-10-31 18:53:33 +00:00
|
|
|
|
|
|
|
wg := &sync.WaitGroup{}
|
|
|
|
|
2017-02-21 17:56:56 +00:00
|
|
|
for i := 0; i < numWorkers; i++ {
|
2016-10-31 18:53:33 +00:00
|
|
|
wg.Add(1)
|
|
|
|
go pageRenderer(s, pages, results, wg)
|
|
|
|
}
|
|
|
|
|
2018-10-17 07:28:04 +00:00
|
|
|
if !cfg.PartialReRender && len(s.headlessPages) > 0 {
|
2018-01-23 13:02:54 +00:00
|
|
|
wg.Add(1)
|
|
|
|
go headlessPagesPublisher(s, wg)
|
|
|
|
}
|
|
|
|
|
2016-11-11 08:01:47 +00:00
|
|
|
for _, page := range s.Pages {
|
2018-01-30 09:33:57 +00:00
|
|
|
if cfg.shouldRender(page) {
|
|
|
|
pages <- page
|
Only re-render the view(s) you're working on
Hugo already, in its server mode, support partial rebuilds. To put it simply: If you change `about.md`, only that content page is read and processed, then Hugo does some processing (taxonomies etc.) and the full site is rendered.
This commit covers the rendering part: We now only re-render the pages you work on, i.e. the last n pages you watched in the browser (which obviously also includes the page in the example above).
To be more specific: When you are running the hugo server in watch (aka. livereload) mode, and change a template or a content file, then we do a partial re-rendering of the following:
* The current content page (if it is a content change)
* The home page
* Up to the last 10 pages you visited on the site.
This should in most cases be enough, but if you navigate to something completely different, you may see stale content. Doing an edit will then refresh that page.
Note that this feature is enabled by default. To turn it off, run `hugo server --disableFastRender`.
Fixes #3962
See #1643
2017-10-14 11:40:43 +00:00
|
|
|
}
|
2016-10-31 18:53:33 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
close(pages)
|
|
|
|
|
|
|
|
wg.Wait()
|
|
|
|
|
|
|
|
close(results)
|
|
|
|
|
|
|
|
err := <-errs
|
|
|
|
if err != nil {
|
2018-10-03 12:58:09 +00:00
|
|
|
return errors.Wrap(err, "failed to render pages")
|
2016-10-31 18:53:33 +00:00
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2018-01-23 13:02:54 +00:00
|
|
|
func headlessPagesPublisher(s *Site, wg *sync.WaitGroup) {
|
|
|
|
defer wg.Done()
|
|
|
|
for _, page := range s.headlessPages {
|
|
|
|
outFormat := page.outputFormats[0] // There is only one
|
2018-07-10 09:55:22 +00:00
|
|
|
if outFormat.Name != s.rc.Format.Name {
|
2018-04-19 16:06:40 +00:00
|
|
|
// Avoid double work.
|
|
|
|
continue
|
|
|
|
}
|
2018-05-08 08:10:13 +00:00
|
|
|
pageOutput, err := newPageOutput(page, false, false, outFormat)
|
2018-01-23 13:02:54 +00:00
|
|
|
if err == nil {
|
|
|
|
page.mainPageOutput = pageOutput
|
|
|
|
err = pageOutput.renderResources()
|
|
|
|
}
|
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
s.Log.ERROR.Printf("Failed to render resources for headless page %q: %s", page, err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-03-07 08:55:17 +00:00
|
|
|
func pageRenderer(s *Site, pages <-chan *Page, results chan<- error, wg *sync.WaitGroup) {
|
2016-10-31 18:53:33 +00:00
|
|
|
defer wg.Done()
|
2017-03-09 18:19:29 +00:00
|
|
|
|
2017-03-07 08:55:17 +00:00
|
|
|
for page := range pages {
|
2017-03-19 20:09:31 +00:00
|
|
|
|
2017-03-16 07:32:14 +00:00
|
|
|
for i, outFormat := range page.outputFormats {
|
2017-03-19 20:09:31 +00:00
|
|
|
|
2018-07-10 09:55:22 +00:00
|
|
|
if outFormat.Name != page.s.rc.Format.Name {
|
2018-05-08 08:10:13 +00:00
|
|
|
// Will be rendered ... later.
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
2017-03-26 09:45:12 +00:00
|
|
|
var (
|
|
|
|
pageOutput *PageOutput
|
|
|
|
err error
|
|
|
|
)
|
|
|
|
|
|
|
|
if i == 0 {
|
2018-05-08 08:10:13 +00:00
|
|
|
pageOutput = page.mainPageOutput
|
|
|
|
} else {
|
|
|
|
pageOutput, err = page.mainPageOutput.copyWithFormat(outFormat, true)
|
2017-03-26 09:45:12 +00:00
|
|
|
}
|
2017-03-17 15:35:09 +00:00
|
|
|
|
2018-05-08 08:10:13 +00:00
|
|
|
if err != nil {
|
|
|
|
s.Log.ERROR.Printf("Failed to create output page for type %q for page %q: %s", outFormat.Name, page, err)
|
2017-04-28 07:40:50 +00:00
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
2017-05-06 18:15:28 +00:00
|
|
|
if pageOutput == nil {
|
2018-05-08 08:10:13 +00:00
|
|
|
panic("no pageOutput")
|
2017-03-09 18:19:29 +00:00
|
|
|
}
|
2017-03-02 14:35:25 +00:00
|
|
|
|
:sparkles: Implement Page bundling and image handling
This commit is not the smallest in Hugo's history.
Some hightlights include:
* Page bundles (for complete articles, keeping images and content together etc.).
* Bundled images can be processed in as many versions/sizes as you need with the three methods `Resize`, `Fill` and `Fit`.
* Processed images are cached inside `resources/_gen/images` (default) in your project.
* Symbolic links (both files and dirs) are now allowed anywhere inside /content
* A new table based build summary
* The "Total in nn ms" now reports the total including the handling of the files inside /static. So if it now reports more than you're used to, it is just **more real** and probably faster than before (see below).
A site building benchmark run compared to `v0.31.1` shows that this should be slightly faster and use less memory:
```bash
▶ ./benchSite.sh "TOML,num_langs=.*,num_root_sections=5,num_pages=(500|1000),tags_per_page=5,shortcodes,render"
benchmark old ns/op new ns/op delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 101785785 78067944 -23.30%
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 185481057 149159919 -19.58%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 103149918 85679409 -16.94%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 203515478 169208775 -16.86%
benchmark old allocs new allocs delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 532464 391539 -26.47%
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 1056549 772702 -26.87%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 555974 406630 -26.86%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 1086545 789922 -27.30%
benchmark old bytes new bytes delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 53243246 43598155 -18.12%
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 105811617 86087116 -18.64%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 54558852 44545097 -18.35%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 106903858 86978413 -18.64%
```
Fixes #3651
Closes #3158
Fixes #1014
Closes #2021
Fixes #1240
Updates #3757
2017-07-24 07:00:23 +00:00
|
|
|
// We only need to re-publish the resources if the output format is different
|
|
|
|
// from all of the previous (e.g. the "amp" use case).
|
|
|
|
shouldRender := i == 0
|
|
|
|
if i > 0 {
|
|
|
|
for j := i; j >= 0; j-- {
|
|
|
|
if outFormat.Path != page.outputFormats[j].Path {
|
|
|
|
shouldRender = true
|
|
|
|
} else {
|
|
|
|
shouldRender = false
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if shouldRender {
|
|
|
|
if err := pageOutput.renderResources(); err != nil {
|
2018-10-23 12:37:09 +00:00
|
|
|
s.SendError(page.errorf(err, "failed to render page resources"))
|
:sparkles: Implement Page bundling and image handling
This commit is not the smallest in Hugo's history.
Some hightlights include:
* Page bundles (for complete articles, keeping images and content together etc.).
* Bundled images can be processed in as many versions/sizes as you need with the three methods `Resize`, `Fill` and `Fit`.
* Processed images are cached inside `resources/_gen/images` (default) in your project.
* Symbolic links (both files and dirs) are now allowed anywhere inside /content
* A new table based build summary
* The "Total in nn ms" now reports the total including the handling of the files inside /static. So if it now reports more than you're used to, it is just **more real** and probably faster than before (see below).
A site building benchmark run compared to `v0.31.1` shows that this should be slightly faster and use less memory:
```bash
▶ ./benchSite.sh "TOML,num_langs=.*,num_root_sections=5,num_pages=(500|1000),tags_per_page=5,shortcodes,render"
benchmark old ns/op new ns/op delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 101785785 78067944 -23.30%
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 185481057 149159919 -19.58%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 103149918 85679409 -16.94%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 203515478 169208775 -16.86%
benchmark old allocs new allocs delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 532464 391539 -26.47%
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 1056549 772702 -26.87%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 555974 406630 -26.86%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 1086545 789922 -27.30%
benchmark old bytes new bytes delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 53243246 43598155 -18.12%
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 105811617 86087116 -18.64%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 54558852 44545097 -18.35%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 106903858 86978413 -18.64%
```
Fixes #3651
Closes #3158
Fixes #1014
Closes #2021
Fixes #1240
Updates #3757
2017-07-24 07:00:23 +00:00
|
|
|
continue
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-03-07 08:55:17 +00:00
|
|
|
var layouts []string
|
2017-03-02 14:35:25 +00:00
|
|
|
|
2017-03-25 17:28:38 +00:00
|
|
|
if page.selfLayout != "" {
|
|
|
|
layouts = []string{page.selfLayout}
|
2017-03-07 08:55:17 +00:00
|
|
|
} else {
|
2017-03-26 17:34:30 +00:00
|
|
|
layouts, err = s.layouts(pageOutput)
|
|
|
|
if err != nil {
|
2018-10-23 12:37:09 +00:00
|
|
|
s.Log.ERROR.Printf("Failed to resolve layout for output %q for page %q: %s", outFormat.Name, page, err)
|
2017-03-26 17:34:30 +00:00
|
|
|
continue
|
|
|
|
}
|
2017-03-07 08:55:17 +00:00
|
|
|
}
|
2017-03-02 14:35:25 +00:00
|
|
|
|
2017-03-16 07:32:14 +00:00
|
|
|
switch pageOutput.outputFormat.Name {
|
2017-03-02 14:35:25 +00:00
|
|
|
|
2017-03-09 18:19:29 +00:00
|
|
|
case "RSS":
|
2017-03-08 12:45:33 +00:00
|
|
|
if err := s.renderRSS(pageOutput); err != nil {
|
|
|
|
results <- err
|
|
|
|
}
|
|
|
|
default:
|
2017-03-09 18:19:29 +00:00
|
|
|
targetPath, err := pageOutput.targetPath()
|
|
|
|
if err != nil {
|
2017-03-16 07:32:14 +00:00
|
|
|
s.Log.ERROR.Printf("Failed to create target path for output %q for page %q: %s", outFormat.Name, page, err)
|
2017-03-09 18:19:29 +00:00
|
|
|
continue
|
|
|
|
}
|
2017-03-02 14:35:25 +00:00
|
|
|
|
2017-03-07 08:55:17 +00:00
|
|
|
s.Log.DEBUG.Printf("Render %s to %q with layouts %q", pageOutput.Kind, targetPath, layouts)
|
|
|
|
|
:sparkles: Implement Page bundling and image handling
This commit is not the smallest in Hugo's history.
Some hightlights include:
* Page bundles (for complete articles, keeping images and content together etc.).
* Bundled images can be processed in as many versions/sizes as you need with the three methods `Resize`, `Fill` and `Fit`.
* Processed images are cached inside `resources/_gen/images` (default) in your project.
* Symbolic links (both files and dirs) are now allowed anywhere inside /content
* A new table based build summary
* The "Total in nn ms" now reports the total including the handling of the files inside /static. So if it now reports more than you're used to, it is just **more real** and probably faster than before (see below).
A site building benchmark run compared to `v0.31.1` shows that this should be slightly faster and use less memory:
```bash
▶ ./benchSite.sh "TOML,num_langs=.*,num_root_sections=5,num_pages=(500|1000),tags_per_page=5,shortcodes,render"
benchmark old ns/op new ns/op delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 101785785 78067944 -23.30%
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 185481057 149159919 -19.58%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 103149918 85679409 -16.94%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 203515478 169208775 -16.86%
benchmark old allocs new allocs delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 532464 391539 -26.47%
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 1056549 772702 -26.87%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 555974 406630 -26.86%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 1086545 789922 -27.30%
benchmark old bytes new bytes delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 53243246 43598155 -18.12%
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 105811617 86087116 -18.64%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 54558852 44545097 -18.35%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 106903858 86978413 -18.64%
```
Fixes #3651
Closes #3158
Fixes #1014
Closes #2021
Fixes #1240
Updates #3757
2017-07-24 07:00:23 +00:00
|
|
|
if err := s.renderAndWritePage(&s.PathSpec.ProcessingStats.Pages, "page "+pageOutput.FullFilePath(), targetPath, pageOutput, layouts...); err != nil {
|
2017-03-02 14:35:25 +00:00
|
|
|
results <- err
|
|
|
|
}
|
2017-03-06 18:16:31 +00:00
|
|
|
|
2018-07-06 11:33:43 +00:00
|
|
|
// Only render paginators for the main output format
|
|
|
|
if i == 0 && pageOutput.IsNode() {
|
2017-03-07 08:55:17 +00:00
|
|
|
if err := s.renderPaginator(pageOutput); err != nil {
|
|
|
|
results <- err
|
|
|
|
}
|
|
|
|
}
|
2017-03-06 18:16:31 +00:00
|
|
|
}
|
2017-03-08 12:45:33 +00:00
|
|
|
|
2016-10-31 18:53:33 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// renderPaginator must be run after the owning Page has been rendered.
|
2017-03-06 18:16:31 +00:00
|
|
|
func (s *Site) renderPaginator(p *PageOutput) error {
|
2016-10-31 18:53:33 +00:00
|
|
|
if p.paginator != nil {
|
2017-01-10 09:55:03 +00:00
|
|
|
s.Log.DEBUG.Printf("Render paginator for page %q", p.Path())
|
2017-02-05 03:20:06 +00:00
|
|
|
paginatePath := s.Cfg.GetString("paginatePath")
|
2016-10-31 18:53:33 +00:00
|
|
|
|
|
|
|
// write alias for page 1
|
2017-03-25 18:21:19 +00:00
|
|
|
addend := fmt.Sprintf("/%s/%d", paginatePath, 1)
|
2017-11-12 09:03:56 +00:00
|
|
|
target, err := p.createTargetPath(p.outputFormat, false, addend)
|
2017-03-25 18:21:19 +00:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2016-11-07 19:24:37 +00:00
|
|
|
|
2017-04-08 08:45:11 +00:00
|
|
|
// TODO(bep) do better
|
2017-03-25 18:21:19 +00:00
|
|
|
link := newOutputFormat(p.Page, p.outputFormat).Permalink()
|
2018-08-05 09:13:49 +00:00
|
|
|
if err := s.writeDestAlias(target, link, p.outputFormat, nil); err != nil {
|
2017-04-06 15:39:20 +00:00
|
|
|
return err
|
|
|
|
}
|
2016-10-31 18:53:33 +00:00
|
|
|
|
|
|
|
pagers := p.paginator.Pagers()
|
|
|
|
|
|
|
|
for i, pager := range pagers {
|
|
|
|
if i == 0 {
|
|
|
|
// already created
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
2017-04-12 16:11:37 +00:00
|
|
|
pagerNode, err := p.copy()
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2016-10-31 18:53:33 +00:00
|
|
|
|
2017-04-09 08:33:04 +00:00
|
|
|
pagerNode.origOnCopy = p.Page
|
|
|
|
|
2016-10-31 18:53:33 +00:00
|
|
|
pagerNode.paginator = pager
|
|
|
|
if pager.TotalPages() > 0 {
|
|
|
|
first, _ := pager.page(0)
|
|
|
|
pagerNode.Date = first.Date
|
|
|
|
pagerNode.Lastmod = first.Lastmod
|
|
|
|
}
|
|
|
|
|
|
|
|
pageNumber := i + 1
|
2017-03-09 18:19:29 +00:00
|
|
|
addend := fmt.Sprintf("/%s/%d", paginatePath, pageNumber)
|
|
|
|
targetPath, _ := p.targetPath(addend)
|
2017-03-26 17:34:30 +00:00
|
|
|
layouts, err := p.layouts()
|
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2016-11-07 19:24:37 +00:00
|
|
|
|
2017-03-16 09:04:30 +00:00
|
|
|
if err := s.renderAndWritePage(
|
:sparkles: Implement Page bundling and image handling
This commit is not the smallest in Hugo's history.
Some hightlights include:
* Page bundles (for complete articles, keeping images and content together etc.).
* Bundled images can be processed in as many versions/sizes as you need with the three methods `Resize`, `Fill` and `Fit`.
* Processed images are cached inside `resources/_gen/images` (default) in your project.
* Symbolic links (both files and dirs) are now allowed anywhere inside /content
* A new table based build summary
* The "Total in nn ms" now reports the total including the handling of the files inside /static. So if it now reports more than you're used to, it is just **more real** and probably faster than before (see below).
A site building benchmark run compared to `v0.31.1` shows that this should be slightly faster and use less memory:
```bash
▶ ./benchSite.sh "TOML,num_langs=.*,num_root_sections=5,num_pages=(500|1000),tags_per_page=5,shortcodes,render"
benchmark old ns/op new ns/op delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 101785785 78067944 -23.30%
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 185481057 149159919 -19.58%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 103149918 85679409 -16.94%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 203515478 169208775 -16.86%
benchmark old allocs new allocs delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 532464 391539 -26.47%
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 1056549 772702 -26.87%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 555974 406630 -26.86%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 1086545 789922 -27.30%
benchmark old bytes new bytes delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 53243246 43598155 -18.12%
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 105811617 86087116 -18.64%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 54558852 44545097 -18.35%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 106903858 86978413 -18.64%
```
Fixes #3651
Closes #3158
Fixes #1014
Closes #2021
Fixes #1240
Updates #3757
2017-07-24 07:00:23 +00:00
|
|
|
&s.PathSpec.ProcessingStats.PaginatorPages,
|
2018-01-15 19:40:39 +00:00
|
|
|
pagerNode.title,
|
2017-03-19 14:25:32 +00:00
|
|
|
targetPath, pagerNode, layouts...); err != nil {
|
2016-10-31 18:53:33 +00:00
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
2016-11-02 20:34:19 +00:00
|
|
|
|
2017-03-06 18:16:31 +00:00
|
|
|
func (s *Site) renderRSS(p *PageOutput) error {
|
2016-12-06 08:32:14 +00:00
|
|
|
|
2017-02-18 09:02:12 +00:00
|
|
|
if !s.isEnabled(kindRSS) {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2017-02-13 16:11:22 +00:00
|
|
|
limit := s.Cfg.GetInt("rssLimit")
|
2017-03-07 00:01:51 +00:00
|
|
|
if limit >= 0 && len(p.Pages) > limit {
|
|
|
|
p.Pages = p.Pages[:limit]
|
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 09:02:14 +00:00
|
|
|
p.data["Pages"] = p.Pages
|
2016-11-16 20:06:10 +00:00
|
|
|
}
|
2016-11-26 14:50:32 +00:00
|
|
|
|
2017-03-26 17:34:30 +00:00
|
|
|
layouts, err := s.layoutHandler.For(
|
2017-03-25 16:46:09 +00:00
|
|
|
p.layoutDescriptor,
|
|
|
|
p.outputFormat)
|
2017-03-26 17:34:30 +00:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2017-03-25 16:46:09 +00:00
|
|
|
|
2017-03-09 18:19:29 +00:00
|
|
|
targetPath, err := p.targetPath()
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2016-11-02 20:34:19 +00:00
|
|
|
|
2018-01-15 19:40:39 +00:00
|
|
|
return s.renderAndWriteXML(&s.PathSpec.ProcessingStats.Pages, p.title,
|
2017-03-25 16:46:09 +00:00
|
|
|
targetPath, p, layouts...)
|
2016-11-02 20:34:19 +00:00
|
|
|
}
|
2016-11-08 22:34:52 +00:00
|
|
|
|
|
|
|
func (s *Site) render404() error {
|
2017-02-18 09:02:12 +00:00
|
|
|
if !s.isEnabled(kind404) {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2016-11-13 10:43:23 +00:00
|
|
|
p := s.newNodePage(kind404)
|
2017-03-25 19:31:43 +00:00
|
|
|
|
2018-01-15 19:40:39 +00:00
|
|
|
p.title = "404 Page not found"
|
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 09:02:14 +00:00
|
|
|
p.data["Pages"] = s.Pages
|
2016-11-11 08:19:16 +00:00
|
|
|
p.Pages = s.Pages
|
2017-03-24 15:54:37 +00:00
|
|
|
p.URLPath.URL = "404.html"
|
2016-11-08 22:34:52 +00:00
|
|
|
|
2017-03-25 19:31:43 +00:00
|
|
|
if err := p.initTargetPathDescriptor(); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
2016-11-08 22:34:52 +00:00
|
|
|
nfLayouts := []string{"404.html"}
|
|
|
|
|
2017-07-01 20:58:52 +00:00
|
|
|
htmlOut := output.HTMLFormat
|
|
|
|
htmlOut.BaseName = "404"
|
|
|
|
|
2018-05-08 08:10:13 +00:00
|
|
|
pageOutput, err := newPageOutput(p, false, false, htmlOut)
|
2017-04-02 10:22:54 +00:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
2017-07-01 20:58:52 +00:00
|
|
|
targetPath, err := pageOutput.targetPath()
|
|
|
|
if err != nil {
|
|
|
|
s.Log.ERROR.Printf("Failed to create target path for page %q: %s", p, err)
|
|
|
|
}
|
2016-11-23 17:28:14 +00:00
|
|
|
|
:sparkles: Implement Page bundling and image handling
This commit is not the smallest in Hugo's history.
Some hightlights include:
* Page bundles (for complete articles, keeping images and content together etc.).
* Bundled images can be processed in as many versions/sizes as you need with the three methods `Resize`, `Fill` and `Fit`.
* Processed images are cached inside `resources/_gen/images` (default) in your project.
* Symbolic links (both files and dirs) are now allowed anywhere inside /content
* A new table based build summary
* The "Total in nn ms" now reports the total including the handling of the files inside /static. So if it now reports more than you're used to, it is just **more real** and probably faster than before (see below).
A site building benchmark run compared to `v0.31.1` shows that this should be slightly faster and use less memory:
```bash
▶ ./benchSite.sh "TOML,num_langs=.*,num_root_sections=5,num_pages=(500|1000),tags_per_page=5,shortcodes,render"
benchmark old ns/op new ns/op delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 101785785 78067944 -23.30%
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 185481057 149159919 -19.58%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 103149918 85679409 -16.94%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 203515478 169208775 -16.86%
benchmark old allocs new allocs delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 532464 391539 -26.47%
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 1056549 772702 -26.87%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 555974 406630 -26.86%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 1086545 789922 -27.30%
benchmark old bytes new bytes delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 53243246 43598155 -18.12%
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 105811617 86087116 -18.64%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 54558852 44545097 -18.35%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 106903858 86978413 -18.64%
```
Fixes #3651
Closes #3158
Fixes #1014
Closes #2021
Fixes #1240
Updates #3757
2017-07-24 07:00:23 +00:00
|
|
|
return s.renderAndWritePage(&s.PathSpec.ProcessingStats.Pages, "404 page", targetPath, pageOutput, s.appendThemeTemplates(nfLayouts)...)
|
2016-11-08 22:34:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
func (s *Site) renderSitemap() error {
|
2017-02-18 09:02:12 +00:00
|
|
|
if !s.isEnabled(kindSitemap) {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2017-02-05 03:20:06 +00:00
|
|
|
sitemapDefault := parseSitemap(s.Cfg.GetStringMap("sitemap"))
|
2016-11-08 22:34:52 +00:00
|
|
|
|
2016-11-13 10:43:23 +00:00
|
|
|
n := s.newNodePage(kindSitemap)
|
2016-11-08 22:34:52 +00:00
|
|
|
|
2016-11-09 18:59:28 +00:00
|
|
|
// Include all pages (regular, home page, taxonomies etc.)
|
2016-11-11 08:01:47 +00:00
|
|
|
pages := s.Pages
|
2016-11-08 22:34:52 +00:00
|
|
|
|
2016-11-13 10:43:23 +00:00
|
|
|
page := s.newNodePage(kindSitemap)
|
2016-11-08 22:34:52 +00:00
|
|
|
page.URLPath.URL = ""
|
2017-03-25 19:31:43 +00:00
|
|
|
if err := page.initTargetPathDescriptor(); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2016-11-08 22:34:52 +00:00
|
|
|
page.Sitemap.ChangeFreq = sitemapDefault.ChangeFreq
|
|
|
|
page.Sitemap.Priority = sitemapDefault.Priority
|
2016-11-09 18:59:28 +00:00
|
|
|
page.Sitemap.Filename = sitemapDefault.Filename
|
2016-11-08 22:34:52 +00: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
2018-02-20 09:02:14 +00:00
|
|
|
n.data["Pages"] = pages
|
2016-11-11 08:19:16 +00:00
|
|
|
n.Pages = pages
|
2016-11-08 22:34:52 +00:00
|
|
|
|
2017-04-08 09:15:28 +00:00
|
|
|
// TODO(bep) we have several of these
|
2017-03-25 19:31:43 +00:00
|
|
|
if err := page.initTargetPathDescriptor(); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
2016-11-09 18:59:28 +00:00
|
|
|
// TODO(bep) this should be done somewhere else
|
2016-11-08 22:34:52 +00:00
|
|
|
for _, page := range pages {
|
|
|
|
if page.Sitemap.ChangeFreq == "" {
|
|
|
|
page.Sitemap.ChangeFreq = sitemapDefault.ChangeFreq
|
|
|
|
}
|
|
|
|
|
|
|
|
if page.Sitemap.Priority == -1 {
|
|
|
|
page.Sitemap.Priority = sitemapDefault.Priority
|
|
|
|
}
|
|
|
|
|
|
|
|
if page.Sitemap.Filename == "" {
|
|
|
|
page.Sitemap.Filename = sitemapDefault.Filename
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
smLayouts := []string{"sitemap.xml", "_default/sitemap.xml", "_internal/_default/sitemap.xml"}
|
|
|
|
addLanguagePrefix := n.Site.IsMultiLingual()
|
|
|
|
|
:sparkles: Implement Page bundling and image handling
This commit is not the smallest in Hugo's history.
Some hightlights include:
* Page bundles (for complete articles, keeping images and content together etc.).
* Bundled images can be processed in as many versions/sizes as you need with the three methods `Resize`, `Fill` and `Fit`.
* Processed images are cached inside `resources/_gen/images` (default) in your project.
* Symbolic links (both files and dirs) are now allowed anywhere inside /content
* A new table based build summary
* The "Total in nn ms" now reports the total including the handling of the files inside /static. So if it now reports more than you're used to, it is just **more real** and probably faster than before (see below).
A site building benchmark run compared to `v0.31.1` shows that this should be slightly faster and use less memory:
```bash
▶ ./benchSite.sh "TOML,num_langs=.*,num_root_sections=5,num_pages=(500|1000),tags_per_page=5,shortcodes,render"
benchmark old ns/op new ns/op delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 101785785 78067944 -23.30%
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 185481057 149159919 -19.58%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 103149918 85679409 -16.94%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 203515478 169208775 -16.86%
benchmark old allocs new allocs delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 532464 391539 -26.47%
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 1056549 772702 -26.87%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 555974 406630 -26.86%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 1086545 789922 -27.30%
benchmark old bytes new bytes delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 53243246 43598155 -18.12%
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 105811617 86087116 -18.64%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 54558852 44545097 -18.35%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 106903858 86978413 -18.64%
```
Fixes #3651
Closes #3158
Fixes #1014
Closes #2021
Fixes #1240
Updates #3757
2017-07-24 07:00:23 +00:00
|
|
|
return s.renderAndWriteXML(&s.PathSpec.ProcessingStats.Sitemaps, "sitemap",
|
2016-11-23 17:28:14 +00:00
|
|
|
n.addLangPathPrefixIfFlagSet(page.Sitemap.Filename, addLanguagePrefix), n, s.appendThemeTemplates(smLayouts)...)
|
2016-11-08 22:34:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
func (s *Site) renderRobotsTXT() error {
|
2017-02-18 09:02:12 +00:00
|
|
|
if !s.isEnabled(kindRobotsTXT) {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2017-02-05 03:20:06 +00:00
|
|
|
if !s.Cfg.GetBool("enableRobotsTXT") {
|
2016-11-08 22:34:52 +00:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2018-01-25 09:36:53 +00:00
|
|
|
p := s.newNodePage(kindRobotsTXT)
|
|
|
|
if err := p.initTargetPathDescriptor(); err != nil {
|
2017-03-25 19:31:43 +00:00
|
|
|
return err
|
|
|
|
}
|
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 09:02:14 +00:00
|
|
|
p.data["Pages"] = s.Pages
|
2018-01-25 09:36:53 +00:00
|
|
|
p.Pages = s.Pages
|
2016-11-08 22:34:52 +00:00
|
|
|
|
|
|
|
rLayouts := []string{"robots.txt", "_default/robots.txt", "_internal/_default/robots.txt"}
|
2018-01-25 09:36:53 +00:00
|
|
|
|
2018-05-08 08:10:13 +00:00
|
|
|
pageOutput, err := newPageOutput(p, false, false, output.RobotsTxtFormat)
|
2018-01-25 09:36:53 +00:00
|
|
|
if err != nil {
|
|
|
|
return err
|
2016-11-08 22:34:52 +00:00
|
|
|
}
|
|
|
|
|
2018-01-25 09:36:53 +00:00
|
|
|
targetPath, err := pageOutput.targetPath()
|
|
|
|
if err != nil {
|
|
|
|
s.Log.ERROR.Printf("Failed to create target path for page %q: %s", p, err)
|
2017-04-23 20:03:25 +00:00
|
|
|
}
|
|
|
|
|
2018-01-25 09:36:53 +00:00
|
|
|
return s.renderAndWritePage(&s.PathSpec.ProcessingStats.Pages, "Robots Txt", targetPath, pageOutput, s.appendThemeTemplates(rLayouts)...)
|
|
|
|
|
2016-11-08 22:34:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// renderAliases renders shell pages that simply have a redirect in the header.
|
|
|
|
func (s *Site) renderAliases() error {
|
2016-11-11 08:01:47 +00:00
|
|
|
for _, p := range s.Pages {
|
2016-11-08 22:34:52 +00:00
|
|
|
if len(p.Aliases) == 0 {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
2017-03-24 10:25:25 +00:00
|
|
|
for _, f := range p.outputFormats {
|
|
|
|
if !f.IsHTML {
|
|
|
|
continue
|
|
|
|
}
|
2016-11-15 09:43:49 +00:00
|
|
|
|
2017-03-24 10:25:25 +00:00
|
|
|
o := newOutputFormat(p, f)
|
|
|
|
plink := o.Permalink()
|
|
|
|
|
|
|
|
for _, a := range p.Aliases {
|
|
|
|
if f.Path != "" {
|
|
|
|
// Make sure AMP and similar doesn't clash with regular aliases.
|
|
|
|
a = path.Join(a, f.Path)
|
|
|
|
}
|
|
|
|
|
2017-11-20 09:34:30 +00:00
|
|
|
lang := p.Lang()
|
|
|
|
|
|
|
|
if s.owner.multihost && !strings.HasPrefix(a, "/"+lang) {
|
|
|
|
// These need to be in its language root.
|
|
|
|
a = path.Join(lang, a)
|
|
|
|
}
|
|
|
|
|
2018-08-05 09:13:49 +00:00
|
|
|
if err := s.writeDestAlias(a, plink, f, p); err != nil {
|
2017-03-24 10:25:25 +00:00
|
|
|
return err
|
|
|
|
}
|
2016-11-08 22:34:52 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-11-02 07:25:20 +00:00
|
|
|
if s.owner.multilingual.enabled() && !s.owner.IsMultihost() {
|
2018-08-05 09:13:49 +00:00
|
|
|
html, found := s.outputFormatsConfig.GetByName("HTML")
|
|
|
|
if found {
|
|
|
|
mainLang := s.owner.multilingual.DefaultLang
|
|
|
|
if s.Info.defaultContentLanguageInSubdir {
|
|
|
|
mainLangURL := s.PathSpec.AbsURL(mainLang.Lang, false)
|
|
|
|
s.Log.DEBUG.Printf("Write redirect to main language %s: %s", mainLang, mainLangURL)
|
|
|
|
if err := s.publishDestAlias(true, "/", mainLangURL, html, nil); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
mainLangURL := s.PathSpec.AbsURL("", false)
|
|
|
|
s.Log.DEBUG.Printf("Write redirect to main language %s: %s", mainLang, mainLangURL)
|
|
|
|
if err := s.publishDestAlias(true, mainLang.Lang, mainLangURL, html, nil); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2016-11-08 22:34:52 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|