mirror of
https://github.com/gohugoio/hugo.git
synced 2024-11-21 20:46:30 -05:00
c6d650c8c8
This more or less completes the simplification of the template handling code in Hugo started in v0.62.
The main motivation was to fix a long lasting issue about a crash in HTML content files without front matter.
But this commit also comes with a big functional improvement.
As we now have moved the base template evaluation to the build stage we now use the same lookup rules for `baseof` as for `list` etc. type of templates.
This means that in this simple example you can have a `baseof` template for the `blog` section without having to duplicate the others:
```
layouts
├── _default
│ ├── baseof.html
│ ├── list.html
│ └── single.html
└── blog
└── baseof.html
```
Also, when simplifying code, you often get rid of some double work, as shown in the "site building" benchmarks below.
These benchmarks looks suspiciously good, but I have repeated the below with ca. the same result. Compared to master:
```
name old time/op new time/op delta
SiteNew/Bundle_with_image-16 13.1ms ± 1% 10.5ms ± 1% -19.34% (p=0.029 n=4+4)
SiteNew/Bundle_with_JSON_file-16 13.0ms ± 0% 10.7ms ± 1% -18.05% (p=0.029 n=4+4)
SiteNew/Tags_and_categories-16 46.4ms ± 2% 43.1ms ± 1% -7.15% (p=0.029 n=4+4)
SiteNew/Canonify_URLs-16 52.2ms ± 2% 47.8ms ± 1% -8.30% (p=0.029 n=4+4)
SiteNew/Deep_content_tree-16 77.9ms ± 1% 70.9ms ± 1% -9.01% (p=0.029 n=4+4)
SiteNew/Many_HTML_templates-16 43.0ms ± 0% 37.2ms ± 1% -13.54% (p=0.029 n=4+4)
SiteNew/Page_collections-16 58.2ms ± 1% 52.4ms ± 1% -9.95% (p=0.029 n=4+4)
name old alloc/op new alloc/op delta
SiteNew/Bundle_with_image-16 3.81MB ± 0% 2.22MB ± 0% -41.70% (p=0.029 n=4+4)
SiteNew/Bundle_with_JSON_file-16 3.60MB ± 0% 2.01MB ± 0% -44.20% (p=0.029 n=4+4)
SiteNew/Tags_and_categories-16 19.3MB ± 1% 14.1MB ± 0% -26.91% (p=0.029 n=4+4)
SiteNew/Canonify_URLs-16 70.7MB ± 0% 69.0MB ± 0% -2.40% (p=0.029 n=4+4)
SiteNew/Deep_content_tree-16 37.1MB ± 0% 31.2MB ± 0% -15.94% (p=0.029 n=4+4)
SiteNew/Many_HTML_templates-16 17.6MB ± 0% 10.6MB ± 0% -39.92% (p=0.029 n=4+4)
SiteNew/Page_collections-16 25.9MB ± 0% 21.2MB ± 0% -17.99% (p=0.029 n=4+4)
name old allocs/op new allocs/op delta
SiteNew/Bundle_with_image-16 52.3k ± 0% 26.1k ± 0% -50.18% (p=0.029 n=4+4)
SiteNew/Bundle_with_JSON_file-16 52.3k ± 0% 26.1k ± 0% -50.16% (p=0.029 n=4+4)
SiteNew/Tags_and_categories-16 336k ± 1% 269k ± 0% -19.90% (p=0.029 n=4+4)
SiteNew/Canonify_URLs-16 422k ± 0% 395k ± 0% -6.43% (p=0.029 n=4+4)
SiteNew/Deep_content_tree-16 401k ± 0% 313k ± 0% -21.79% (p=0.029 n=4+4)
SiteNew/Many_HTML_templates-16 247k ± 0% 143k ± 0% -42.17% (p=0.029 n=4+4)
SiteNew/Page_collections-16 282k ± 0% 207k ± 0% -26.55% (p=0.029 n=4+4)
```
Fixes #6716
Fixes #6760
Fixes #6768
Fixes #6778
|
||
|---|---|---|
| .. | ||
| assets/images | ||
| filesystems | ||
| paths | ||
| testdata | ||
| testsite | ||
| 404_test.go | ||
| alias.go | ||
| alias_test.go | ||
| cascade_test.go | ||
| case_insensitive_test.go | ||
| collections.go | ||
| collections_test.go | ||
| config.go | ||
| config_test.go | ||
| configdir_test.go | ||
| content_render_hooks_test.go | ||
| datafiles_test.go | ||
| disableKinds_test.go | ||
| embedded_shortcodes_test.go | ||
| embedded_templates_test.go | ||
| fileInfo.go | ||
| fileInfo_test.go | ||
| gitinfo.go | ||
| hugo_modules_test.go | ||
| hugo_sites.go | ||
| hugo_sites_build.go | ||
| hugo_sites_build_errors_test.go | ||
| hugo_sites_build_test.go | ||
| hugo_sites_multihost_test.go | ||
| hugo_sites_rebuild_test.go | ||
| hugo_smoke_test.go | ||
| image_test.go | ||
| language_content_dir_test.go | ||
| menu_test.go | ||
| minify_publisher_test.go | ||
| multilingual.go | ||
| page.go | ||
| page__common.go | ||
| page__content.go | ||
| page__data.go | ||
| page__menus.go | ||
| page__meta.go | ||
| page__new.go | ||
| page__output.go | ||
| page__paginator.go | ||
| page__paths.go | ||
| page__per_output.go | ||
| page__position.go | ||
| page__ref.go | ||
| page__tree.go | ||
| page_kinds.go | ||
| page_permalink_test.go | ||
| page_test.go | ||
| page_unwrap.go | ||
| page_unwrap_test.go | ||
| pagebundler_test.go | ||
| pagecollections.go | ||
| pagecollections_test.go | ||
| pages_capture.go | ||
| pages_capture_test.go | ||
| pages_language_merge_test.go | ||
| pages_map.go | ||
| pages_test.go | ||
| paginator_test.go | ||
| permalinker.go | ||
| prune_resources.go | ||
| resource_chain_test.go | ||
| robotstxt_test.go | ||
| rss_test.go | ||
| shortcode.go | ||
| shortcode_page.go | ||
| shortcode_test.go | ||
| site.go | ||
| site_benchmark_new_test.go | ||
| site_output.go | ||
| site_output_test.go | ||
| site_render.go | ||
| site_sections.go | ||
| site_sections_test.go | ||
| site_stats_test.go | ||
| site_test.go | ||
| site_url_test.go | ||
| siteJSONEncode_test.go | ||
| sitemap_test.go | ||
| taxonomy.go | ||
| taxonomy_test.go | ||
| template_test.go | ||
| testhelpers_test.go | ||
| translations.go | ||