mirror of
https://github.com/gohugoio/hugo.git
synced 2024-06-27 21:25:07 +00:00
3cdf19e9b7
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
102 lines
3.1 KiB
Go
102 lines
3.1 KiB
Go
package hugolib
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/spf13/afero"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestMultihosts(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
var multiSiteTOMLConfigTemplate = `
|
|
paginate = 1
|
|
disablePathToLower = true
|
|
defaultContentLanguage = "{{ .DefaultContentLanguage }}"
|
|
defaultContentLanguageInSubdir = {{ .DefaultContentLanguageInSubdir }}
|
|
staticDir = ["s1", "s2"]
|
|
|
|
[permalinks]
|
|
other = "/somewhere/else/:filename"
|
|
|
|
[Taxonomies]
|
|
tag = "tags"
|
|
|
|
[Languages]
|
|
[Languages.en]
|
|
staticDir2 = ["ens1", "ens2"]
|
|
baseURL = "https://example.com"
|
|
weight = 10
|
|
title = "In English"
|
|
languageName = "English"
|
|
|
|
[Languages.fr]
|
|
staticDir2 = ["frs1", "frs2"]
|
|
baseURL = "https://example.fr"
|
|
weight = 20
|
|
title = "Le Français"
|
|
languageName = "Français"
|
|
|
|
[Languages.nn]
|
|
staticDir2 = ["nns1", "nns2"]
|
|
baseURL = "https://example.no"
|
|
weight = 30
|
|
title = "På nynorsk"
|
|
languageName = "Nynorsk"
|
|
|
|
`
|
|
|
|
siteConfig := testSiteConfig{Running: true, Fs: afero.NewMemMapFs(), DefaultContentLanguage: "fr", DefaultContentLanguageInSubdir: false}
|
|
sites := createMultiTestSites(t, siteConfig, multiSiteTOMLConfigTemplate)
|
|
fs := sites.Fs
|
|
th := testHelper{sites.Cfg, fs, t}
|
|
assert := require.New(t)
|
|
cfg := BuildCfg{}
|
|
err := sites.Build(cfg)
|
|
assert.NoError(err)
|
|
|
|
th.assertFileContent("public/en/sect/doc1-slug/index.html", "Hello")
|
|
|
|
s1 := sites.Sites[0]
|
|
|
|
assert.Equal([]string{"s1", "s2", "ens1", "ens2"}, s1.StaticDirs())
|
|
|
|
s1h := s1.getPage(KindHome)
|
|
assert.True(s1h.IsTranslated())
|
|
assert.Len(s1h.Translations(), 2)
|
|
assert.Equal("https://example.com/", s1h.Permalink())
|
|
|
|
// For “regular multilingual” we kept the aliases pages with url in front matter
|
|
// as a literal value that we use as is.
|
|
// There is an ambiguity in the guessing.
|
|
// For multihost, we never want any content in the root.
|
|
//
|
|
// check url in front matter:
|
|
pageWithURLInFrontMatter := s1.getPage(KindPage, "sect/doc3.en.md")
|
|
assert.NotNil(pageWithURLInFrontMatter)
|
|
assert.Equal("/superbob", pageWithURLInFrontMatter.URL())
|
|
assert.Equal("/superbob/", pageWithURLInFrontMatter.RelPermalink())
|
|
th.assertFileContent("public/en/superbob/index.html", "doc3|Hello|en")
|
|
|
|
// check alias:
|
|
th.assertFileContent("public/en/al/alias1/index.html", `content="0; url=https://example.com/superbob/"`)
|
|
th.assertFileContent("public/en/al/alias2/index.html", `content="0; url=https://example.com/superbob/"`)
|
|
|
|
s2 := sites.Sites[1]
|
|
assert.Equal([]string{"s1", "s2", "frs1", "frs2"}, s2.StaticDirs())
|
|
|
|
s2h := s2.getPage(KindHome)
|
|
assert.Equal("https://example.fr/", s2h.Permalink())
|
|
|
|
th.assertFileContentStraight("public/fr/index.html", "French Home Page")
|
|
th.assertFileContentStraight("public/en/index.html", "Default Home Page")
|
|
|
|
// Check paginators
|
|
th.assertFileContent("public/en/page/1/index.html", `refresh" content="0; url=https://example.com/"`)
|
|
th.assertFileContent("public/nn/page/1/index.html", `refresh" content="0; url=https://example.no/"`)
|
|
th.assertFileContent("public/en/sect/page/2/index.html", "List Page 2", "Hello", "https://example.com/sect/", "\"/sect/page/3/")
|
|
th.assertFileContent("public/fr/sect/page/2/index.html", "List Page 2", "Bonjour", "https://example.fr/sect/")
|
|
|
|
}
|