2016-03-17 14:30:33 -04: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 create_test
|
|
|
|
|
|
|
|
import (
|
2020-12-02 07:23:25 -05:00
|
|
|
"fmt"
|
2016-03-17 14:30:33 -04:00
|
|
|
"os"
|
|
|
|
"path/filepath"
|
2016-11-29 14:18:09 -05:00
|
|
|
"strings"
|
2016-03-17 14:30:33 -04:00
|
|
|
"testing"
|
|
|
|
|
2021-06-09 04:58:18 -04:00
|
|
|
"github.com/gohugoio/hugo/config"
|
2023-01-04 12:24:36 -05:00
|
|
|
"github.com/gohugoio/hugo/config/allconfig"
|
|
|
|
"github.com/gohugoio/hugo/config/testconfig"
|
2021-06-09 04:58:18 -04:00
|
|
|
|
2017-06-13 12:42:45 -04:00
|
|
|
"github.com/gohugoio/hugo/deps"
|
2017-02-04 22:20:06 -05:00
|
|
|
|
2017-06-13 12:42:45 -04:00
|
|
|
"github.com/gohugoio/hugo/hugolib"
|
2017-01-10 04:55:03 -05:00
|
|
|
|
2017-06-13 12:42:45 -04:00
|
|
|
"github.com/gohugoio/hugo/hugofs"
|
2017-01-10 04:55:03 -05:00
|
|
|
|
2019-08-10 15:05:17 -04:00
|
|
|
qt "github.com/frankban/quicktest"
|
2017-06-13 12:42:45 -04:00
|
|
|
"github.com/gohugoio/hugo/create"
|
|
|
|
"github.com/gohugoio/hugo/helpers"
|
2017-06-13 13:07:35 -04:00
|
|
|
"github.com/spf13/afero"
|
2016-03-17 14:30:33 -04:00
|
|
|
)
|
|
|
|
|
2021-10-13 02:12:06 -04:00
|
|
|
// TODO(bep) clean this up. Export the test site builder in Hugolib or something.
|
2021-11-08 05:50:51 -05:00
|
|
|
func TestNewContentFromFile(t *testing.T) {
|
2016-03-17 14:30:33 -04:00
|
|
|
cases := []struct {
|
2021-10-13 02:12:06 -04:00
|
|
|
name string
|
2016-11-29 14:18:09 -05:00
|
|
|
kind string
|
|
|
|
path string
|
2022-03-17 17:03:27 -04:00
|
|
|
expected any
|
2016-03-17 14:30:33 -04:00
|
|
|
}{
|
2021-10-13 02:12:06 -04:00
|
|
|
{"Post", "post", "post/sample-1.md", []string{`title = "Post Arch title"`, `test = "test1"`, "date = \"2015-01-12T19:20:04-07:00\""}},
|
|
|
|
{"Post org-mode", "post", "post/org-1.org", []string{`#+title: ORG-1`}},
|
2021-10-25 06:28:12 -04:00
|
|
|
{"Post, unknown content filetype", "post", "post/sample-1.pdoc", false},
|
2021-10-13 02:12:06 -04:00
|
|
|
{"Empty date", "emptydate", "post/sample-ed.md", []string{`title = "Empty Date Arch title"`, `test = "test1"`}},
|
|
|
|
{"Archetype file not found", "stump", "stump/sample-2.md", []string{`title: "Sample 2"`}}, // no archetype file
|
|
|
|
{"No archetype", "", "sample-3.md", []string{`title: "Sample 3"`}}, // no archetype
|
|
|
|
{"Empty archetype", "product", "product/sample-4.md", []string{`title = "SAMPLE-4"`}}, // empty archetype front matter
|
|
|
|
{"Filenames", "filenames", "content/mypage/index.md", []string{"title = \"INDEX\"\n+++\n\n\nContentBaseName: mypage"}},
|
2021-11-01 15:30:34 -04:00
|
|
|
{"Branch Name", "name", "content/tags/tag-a/_index.md", []string{"+++\ntitle = 'Tag A'\n+++"}},
|
|
|
|
|
2021-10-13 02:12:06 -04:00
|
|
|
{"Lang 1", "lang", "post/lang-1.md", []string{`Site Lang: en|Name: Lang 1|i18n: Hugo Rocks!`}},
|
|
|
|
{"Lang 2", "lang", "post/lang-2.en.md", []string{`Site Lang: en|Name: Lang 2|i18n: Hugo Rocks!`}},
|
|
|
|
{"Lang nn file", "lang", "content/post/lang-3.nn.md", []string{`Site Lang: nn|Name: Lang 3|i18n: Hugo Rokkar!`}},
|
|
|
|
{"Lang nn dir", "lang", "content_nn/post/lang-4.md", []string{`Site Lang: nn|Name: Lang 4|i18n: Hugo Rokkar!`}},
|
|
|
|
{"Lang en in nn dir", "lang", "content_nn/post/lang-5.en.md", []string{`Site Lang: en|Name: Lang 5|i18n: Hugo Rocks!`}},
|
|
|
|
{"Lang en default", "lang", "post/my-bundle/index.md", []string{`Site Lang: en|Name: My Bundle|i18n: Hugo Rocks!`}},
|
|
|
|
{"Lang en file", "lang", "post/my-bundle/index.en.md", []string{`Site Lang: en|Name: My Bundle|i18n: Hugo Rocks!`}},
|
|
|
|
{"Lang nn bundle", "lang", "content/post/my-bundle/index.nn.md", []string{`Site Lang: nn|Name: My Bundle|i18n: Hugo Rokkar!`}},
|
|
|
|
{"Site", "site", "content/mypage/index.md", []string{"RegularPages .Site: 10", "RegularPages site: 10"}},
|
|
|
|
{"Shortcodes", "shortcodes", "shortcodes/go.md", []string{
|
2017-06-23 03:29:59 -04:00
|
|
|
`title = "GO"`,
|
|
|
|
"{{< myshortcode >}}",
|
|
|
|
"{{% myshortcode %}}",
|
2020-12-02 07:23:25 -05:00
|
|
|
"{{</* comment */>}}\n{{%/* comment */%}}",
|
|
|
|
}}, // shortcodes
|
2016-03-17 14:30:33 -04:00
|
|
|
}
|
|
|
|
|
2021-10-13 02:12:06 -04:00
|
|
|
c := qt.New(t)
|
|
|
|
|
2019-08-10 15:05:17 -04:00
|
|
|
for i, cas := range cases {
|
|
|
|
cas := cas
|
2021-10-13 02:12:06 -04:00
|
|
|
|
|
|
|
c.Run(cas.name, func(c *qt.C) {
|
|
|
|
c.Parallel()
|
|
|
|
|
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
|
|
|
mm := afero.NewMemMapFs()
|
2019-08-10 15:05:17 -04:00
|
|
|
c.Assert(initFs(mm), qt.IsNil)
|
|
|
|
cfg, fs := newTestCfg(c, mm)
|
2023-01-04 12:24:36 -05:00
|
|
|
conf := testconfig.GetTestConfigs(fs.Source, cfg)
|
|
|
|
h, err := hugolib.NewHugoSites(deps.DepsCfg{Configs: conf, Fs: fs})
|
2019-08-10 15:05:17 -04:00
|
|
|
c.Assert(err, qt.IsNil)
|
2022-08-31 11:23:31 -04:00
|
|
|
err = create.NewContent(h, cas.kind, cas.path, false)
|
2021-10-25 06:28:12 -04:00
|
|
|
|
|
|
|
if b, ok := cas.expected.(bool); ok && !b {
|
|
|
|
if !b {
|
|
|
|
c.Assert(err, qt.Not(qt.IsNil))
|
|
|
|
}
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
c.Assert(err, qt.IsNil)
|
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
|
|
|
|
2019-08-10 15:05:17 -04:00
|
|
|
fname := filepath.FromSlash(cas.path)
|
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
|
|
|
if !strings.HasPrefix(fname, "content") {
|
|
|
|
fname = filepath.Join("content", fname)
|
2016-03-17 14:30:33 -04:00
|
|
|
}
|
2022-04-08 09:15:26 -04:00
|
|
|
|
2021-10-13 02:12:06 -04:00
|
|
|
content := readFileFromFs(c, fs.Source, fname)
|
2021-10-25 06:28:12 -04:00
|
|
|
|
|
|
|
for _, v := range cas.expected.([]string) {
|
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
|
|
|
found := strings.Contains(content, v)
|
|
|
|
if !found {
|
2021-10-13 02:12:06 -04:00
|
|
|
c.Fatalf("[%d] %q missing from output:\n%q", i, v, content)
|
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
})
|
|
|
|
|
2016-03-17 14:30:33 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-10-13 02:12:06 -04:00
|
|
|
func TestNewContentFromDirSiteFunction(t *testing.T) {
|
|
|
|
mm := afero.NewMemMapFs()
|
|
|
|
c := qt.New(t)
|
|
|
|
|
|
|
|
archetypeDir := filepath.Join("archetypes", "my-bundle")
|
2021-11-12 04:29:13 -05:00
|
|
|
defaultArchetypeDir := filepath.Join("archetypes", "default")
|
2021-10-13 02:12:06 -04:00
|
|
|
c.Assert(mm.MkdirAll(archetypeDir, 0o755), qt.IsNil)
|
2021-11-12 04:29:13 -05:00
|
|
|
c.Assert(mm.MkdirAll(defaultArchetypeDir, 0o755), qt.IsNil)
|
2021-10-13 02:12:06 -04:00
|
|
|
|
|
|
|
contentFile := `
|
|
|
|
File: %s
|
|
|
|
site RegularPages: {{ len site.RegularPages }}
|
|
|
|
|
|
|
|
`
|
|
|
|
|
|
|
|
c.Assert(afero.WriteFile(mm, filepath.Join(archetypeDir, "index.md"), []byte(fmt.Sprintf(contentFile, "index.md")), 0o755), qt.IsNil)
|
2021-11-12 04:29:13 -05:00
|
|
|
c.Assert(afero.WriteFile(mm, filepath.Join(defaultArchetypeDir, "index.md"), []byte("default archetype index.md"), 0o755), qt.IsNil)
|
2021-10-13 02:12:06 -04:00
|
|
|
|
|
|
|
c.Assert(initFs(mm), qt.IsNil)
|
|
|
|
cfg, fs := newTestCfg(c, mm)
|
|
|
|
|
2023-01-04 12:24:36 -05:00
|
|
|
conf := testconfig.GetTestConfigs(fs.Source, cfg)
|
|
|
|
h, err := hugolib.NewHugoSites(deps.DepsCfg{Configs: conf, Fs: fs})
|
2021-10-13 02:12:06 -04:00
|
|
|
c.Assert(err, qt.IsNil)
|
|
|
|
c.Assert(len(h.Sites), qt.Equals, 2)
|
|
|
|
|
2022-08-31 11:23:31 -04:00
|
|
|
c.Assert(create.NewContent(h, "my-bundle", "post/my-post", false), qt.IsNil)
|
2021-10-13 02:12:06 -04:00
|
|
|
cContains(c, readFileFromFs(t, fs.Source, filepath.Join("content", "post/my-post/index.md")), `site RegularPages: 10`)
|
2021-11-12 04:29:13 -05:00
|
|
|
|
|
|
|
// Default bundle archetype
|
2022-08-31 11:23:31 -04:00
|
|
|
c.Assert(create.NewContent(h, "", "post/my-post2", false), qt.IsNil)
|
2021-11-12 04:29:13 -05:00
|
|
|
cContains(c, readFileFromFs(t, fs.Source, filepath.Join("content", "post/my-post2/index.md")), `default archetype index.md`)
|
|
|
|
|
|
|
|
// Regular file with bundle kind.
|
2022-08-31 11:23:31 -04:00
|
|
|
c.Assert(create.NewContent(h, "my-bundle", "post/foo.md", false), qt.IsNil)
|
2021-11-12 04:29:13 -05:00
|
|
|
cContains(c, readFileFromFs(t, fs.Source, filepath.Join("content", "post/foo.md")), `draft: true`)
|
|
|
|
|
|
|
|
// Regular files should fall back to the default archetype (we have no regular file archetype).
|
2022-08-31 11:23:31 -04:00
|
|
|
c.Assert(create.NewContent(h, "my-bundle", "mypage.md", false), qt.IsNil)
|
2021-11-12 04:29:13 -05:00
|
|
|
cContains(c, readFileFromFs(t, fs.Source, filepath.Join("content", "mypage.md")), `draft: true`)
|
2022-08-31 11:23:31 -04:00
|
|
|
}
|
|
|
|
|
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
|
|
|
func initFs(fs afero.Fs) error {
|
2021-10-13 02:12:06 -04:00
|
|
|
perm := os.FileMode(0o755)
|
2016-03-17 14:30:33 -04:00
|
|
|
var err error
|
|
|
|
|
|
|
|
// create directories
|
|
|
|
dirs := []string{
|
|
|
|
"archetypes",
|
|
|
|
"content",
|
|
|
|
filepath.Join("themes", "sample", "archetypes"),
|
|
|
|
}
|
|
|
|
for _, dir := range dirs {
|
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
|
|
|
err = fs.Mkdir(dir, perm)
|
|
|
|
if err != nil && !os.IsExist(err) {
|
2016-03-17 14:30:33 -04:00
|
|
|
return err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-10-13 02:12:06 -04:00
|
|
|
// create some dummy content
|
|
|
|
for i := 1; i <= 10; i++ {
|
|
|
|
filename := filepath.Join("content", fmt.Sprintf("page%d.md", i))
|
|
|
|
afero.WriteFile(fs, filename, []byte(`---
|
|
|
|
title: Test
|
|
|
|
---
|
all: Rework page store, add a dynacache, improve partial rebuilds, and some general spring cleaning
There are some breaking changes in this commit, see #11455.
Closes #11455
Closes #11549
This fixes a set of bugs (see issue list) and it is also paying some technical debt accumulated over the years. We now build with Staticcheck enabled in the CI build.
The performance should be about the same as before for regular sized Hugo sites, but it should perform and scale much better to larger data sets, as objects that uses lots of memory (e.g. rendered Markdown, big JSON files read into maps with transform.Unmarshal etc.) will now get automatically garbage collected if needed. Performance on partial rebuilds when running the server in fast render mode should be the same, but the change detection should be much more accurate.
A list of the notable new features:
* A new dependency tracker that covers (almost) all of Hugo's API and is used to do fine grained partial rebuilds when running the server.
* A new and simpler tree document store which allows fast lookups and prefix-walking in all dimensions (e.g. language) concurrently.
* You can now configure an upper memory limit allowing for much larger data sets and/or running on lower specced PCs.
We have lifted the "no resources in sub folders" restriction for branch bundles (e.g. sections).
Memory Limit
* Hugos will, by default, set aside a quarter of the total system memory, but you can set this via the OS environment variable HUGO_MEMORYLIMIT (in gigabytes). This is backed by a partitioned LRU cache used throughout Hugo. A cache that gets dynamically resized in low memory situations, allowing Go's Garbage Collector to free the memory.
New Dependency Tracker: Hugo has had a rule based coarse grained approach to server rebuilds that has worked mostly pretty well, but there have been some surprises (e.g. stale content). This is now revamped with a new dependency tracker that can quickly calculate the delta given a changed resource (e.g. a content file, template, JS file etc.). This handles transitive relations, e.g. $page -> js.Build -> JS import, or $page1.Content -> render hook -> site.GetPage -> $page2.Title, or $page1.Content -> shortcode -> partial -> site.RegularPages -> $page2.Content -> shortcode ..., and should also handle changes to aggregated values (e.g. site.Lastmod) effectively.
This covers all of Hugo's API with 2 known exceptions (a list that may not be fully exhaustive):
Changes to files loaded with template func os.ReadFile may not be handled correctly. We recommend loading resources with resources.Get
Changes to Hugo objects (e.g. Page) passed in the template context to lang.Translate may not be detected correctly. We recommend having simple i18n templates without too much data context passed in other than simple types such as strings and numbers.
Note that the cachebuster configuration (when A changes then rebuild B) works well with the above, but we recommend that you revise that configuration, as it in most situations should not be needed. One example where it is still needed is with TailwindCSS and using changes to hugo_stats.json to trigger new CSS rebuilds.
Document Store: Previously, a little simplified, we split the document store (where we store pages and resources) in a tree per language. This worked pretty well, but the structure made some operations harder than they needed to be. We have now restructured it into one Radix tree for all languages. Internally the language is considered to be a dimension of that tree, and the tree can be viewed in all dimensions concurrently. This makes some operations re. language simpler (e.g. finding translations is just a slice range), but the idea is that it should also be relatively inexpensive to add more dimensions if needed (e.g. role).
Fixes #10169
Fixes #10364
Fixes #10482
Fixes #10630
Fixes #10656
Fixes #10694
Fixes #10918
Fixes #11262
Fixes #11439
Fixes #11453
Fixes #11457
Fixes #11466
Fixes #11540
Fixes #11551
Fixes #11556
Fixes #11654
Fixes #11661
Fixes #11663
Fixes #11664
Fixes #11669
Fixes #11671
Fixes #11807
Fixes #11808
Fixes #11809
Fixes #11815
Fixes #11840
Fixes #11853
Fixes #11860
Fixes #11883
Fixes #11904
Fixes #7388
Fixes #7425
Fixes #7436
Fixes #7544
Fixes #7882
Fixes #7960
Fixes #8255
Fixes #8307
Fixes #8863
Fixes #8927
Fixes #9192
Fixes #9324
2023-12-24 13:11:05 -05:00
|
|
|
`), 0o666)
|
2021-10-13 02:12:06 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
// create archetype files
|
2016-03-17 14:30:33 -04:00
|
|
|
for _, v := range []struct {
|
|
|
|
path string
|
|
|
|
content string
|
|
|
|
}{
|
|
|
|
{
|
2016-11-29 14:18:09 -05:00
|
|
|
path: filepath.Join("archetypes", "post.md"),
|
|
|
|
content: "+++\ndate = \"2015-01-12T19:20:04-07:00\"\ntitle = \"Post Arch title\"\ntest = \"test1\"\n+++\n",
|
2016-03-17 14:30:33 -04:00
|
|
|
},
|
2017-06-20 06:46:03 -04:00
|
|
|
{
|
|
|
|
path: filepath.Join("archetypes", "post.org"),
|
|
|
|
content: "#+title: {{ .BaseFileName | upper }}",
|
|
|
|
},
|
2021-11-01 15:30:34 -04:00
|
|
|
{
|
|
|
|
path: filepath.Join("archetypes", "name.md"),
|
|
|
|
content: `+++
|
|
|
|
title = '{{ replace .Name "-" " " | title }}'
|
|
|
|
+++`,
|
|
|
|
},
|
2016-03-17 14:30:33 -04:00
|
|
|
{
|
2017-06-18 13:06:28 -04:00
|
|
|
path: filepath.Join("archetypes", "product.md"),
|
|
|
|
content: `+++
|
|
|
|
title = "{{ .BaseFileName | upper }}"
|
|
|
|
+++`,
|
2021-10-13 02:12:06 -04:00
|
|
|
},
|
|
|
|
{
|
|
|
|
path: filepath.Join("archetypes", "filenames.md"),
|
|
|
|
content: `...
|
|
|
|
title = "{{ .BaseFileName | upper }}"
|
|
|
|
+++
|
|
|
|
|
|
|
|
|
|
|
|
ContentBaseName: {{ .File.ContentBaseName }}
|
|
|
|
|
|
|
|
`,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
path: filepath.Join("archetypes", "site.md"),
|
|
|
|
content: `...
|
|
|
|
title = "{{ .BaseFileName | upper }}"
|
|
|
|
+++
|
|
|
|
|
|
|
|
Len RegularPages .Site: {{ len .Site.RegularPages }}
|
|
|
|
Len RegularPages site: {{ len site.RegularPages }}
|
|
|
|
|
|
|
|
|
|
|
|
`,
|
2016-03-17 14:30:33 -04:00
|
|
|
},
|
2016-12-15 03:27:30 -05:00
|
|
|
{
|
|
|
|
path: filepath.Join("archetypes", "emptydate.md"),
|
|
|
|
content: "+++\ndate =\"\"\ntitle = \"Empty Date Arch title\"\ntest = \"test1\"\n+++\n",
|
|
|
|
},
|
2018-09-19 01:48:17 -04:00
|
|
|
{
|
|
|
|
path: filepath.Join("archetypes", "lang.md"),
|
2021-10-13 02:12:06 -04:00
|
|
|
content: `Site Lang: {{ site.Language.Lang }}|Name: {{ replace .Name "-" " " | title }}|i18n: {{ T "hugo" }}`,
|
2018-09-19 01:48:17 -04:00
|
|
|
},
|
2017-06-23 03:29:59 -04:00
|
|
|
// #3623x
|
|
|
|
{
|
|
|
|
path: filepath.Join("archetypes", "shortcodes.md"),
|
|
|
|
content: `+++
|
|
|
|
title = "{{ .BaseFileName | upper }}"
|
|
|
|
+++
|
|
|
|
|
|
|
|
{{< myshortcode >}}
|
|
|
|
|
|
|
|
Some text.
|
|
|
|
|
|
|
|
{{% myshortcode %}}
|
|
|
|
{{</* comment */>}}
|
|
|
|
{{%/* comment */%}}
|
|
|
|
|
|
|
|
|
|
|
|
`,
|
|
|
|
},
|
2016-03-17 14:30:33 -04:00
|
|
|
} {
|
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
|
|
|
f, err := fs.Create(v.path)
|
2016-03-17 14:30:33 -04:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
defer f.Close()
|
|
|
|
|
|
|
|
_, err = f.Write([]byte(v.content))
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
2016-11-29 14:18:09 -05:00
|
|
|
|
2022-03-17 17:03:27 -04:00
|
|
|
func cContains(c *qt.C, v any, matches ...string) {
|
2018-09-19 01:48:17 -04:00
|
|
|
for _, m := range matches {
|
2019-08-10 15:05:17 -04:00
|
|
|
c.Assert(v, qt.Contains, m)
|
2018-09-19 01:48:17 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-11-29 14:18:09 -05:00
|
|
|
// TODO(bep) extract common testing package with this and some others
|
2021-10-13 02:12:06 -04:00
|
|
|
func readFileFromFs(t testing.TB, fs afero.Fs, filename string) string {
|
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
|
|
|
t.Helper()
|
2016-11-29 14:18:09 -05:00
|
|
|
filename = filepath.FromSlash(filename)
|
|
|
|
b, err := afero.ReadFile(fs, filename)
|
|
|
|
if err != nil {
|
|
|
|
// Print some debug info
|
|
|
|
root := strings.Split(filename, helpers.FilePathSeparator)[0]
|
|
|
|
afero.Walk(fs, root, func(path string, info os.FileInfo, err error) error {
|
|
|
|
if info != nil && !info.IsDir() {
|
|
|
|
fmt.Println(" ", path)
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
})
|
|
|
|
t.Fatalf("Failed to read file: %s", err)
|
|
|
|
}
|
|
|
|
return string(b)
|
|
|
|
}
|
2017-02-04 22:20:06 -05:00
|
|
|
|
2021-06-09 04:58:18 -04:00
|
|
|
func newTestCfg(c *qt.C, mm afero.Fs) (config.Provider, *hugofs.Fs) {
|
2018-09-19 01:48:17 -04:00
|
|
|
cfg := `
|
2018-10-26 03:41:24 -04:00
|
|
|
|
|
|
|
theme = "mytheme"
|
2018-09-19 01:48:17 -04:00
|
|
|
[languages]
|
|
|
|
[languages.en]
|
|
|
|
weight = 1
|
|
|
|
languageName = "English"
|
|
|
|
[languages.nn]
|
|
|
|
weight = 2
|
|
|
|
languageName = "Nynorsk"
|
|
|
|
|
2021-10-13 02:12:06 -04:00
|
|
|
[module]
|
|
|
|
[[module.mounts]]
|
|
|
|
source = 'archetypes'
|
|
|
|
target = 'archetypes'
|
|
|
|
[[module.mounts]]
|
|
|
|
source = 'content'
|
|
|
|
target = 'content'
|
|
|
|
lang = 'en'
|
|
|
|
[[module.mounts]]
|
|
|
|
source = 'content_nn'
|
|
|
|
target = 'content'
|
|
|
|
lang = 'nn'
|
2018-09-19 01:48:17 -04:00
|
|
|
`
|
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
|
|
|
if mm == nil {
|
|
|
|
mm = afero.NewMemMapFs()
|
|
|
|
}
|
2017-02-04 22:20:06 -05:00
|
|
|
|
2021-10-13 02:12:06 -04:00
|
|
|
mm.MkdirAll(filepath.FromSlash("content_nn"), 0o777)
|
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
|
|
|
|
2021-10-13 02:12:06 -04:00
|
|
|
mm.MkdirAll(filepath.FromSlash("themes/mytheme"), 0o777)
|
Add support for theme composition and inheritance
This commit adds support for theme composition and inheritance in Hugo.
With this, it helps thinking about a theme as a set of ordered components:
```toml
theme = ["my-shortcodes", "base-theme", "hyde"]
```
The theme definition example above in `config.toml` creates a theme with the 3 components with presedence from left to right.
So, Hugo will, for any given file, data entry etc., look first in the project, and then in `my-shortcode`, `base-theme` and lastly `hyde`.
Hugo uses two different algorithms to merge the filesystems, depending on the file type:
* For `i18n` and `data` files, Hugo merges deeply using the translation id and data key inside the files.
* For `static`, `layouts` (templates) and `archetypes` files, these are merged on file level. So the left-most file will be chosen.
The name used in the `theme` definition above must match a folder in `/your-site/themes`, e.g. `/your-site/themes/my-shortcodes`. There are plans to improve on this and get a URL scheme so this can be resolved automatically.
Also note that a component that is part of a theme can have its own configuration file, e.g. `config.toml`. There are currently some restrictions to what a theme component can configure:
* `params` (global and per language)
* `menu` (global and per language)
* `outputformats` and `mediatypes`
The same rules apply here: The left-most param/menu etc. with the same ID will win. There are some hidden and experimental namespace support in the above, which we will work to improve in the future, but theme authors are encouraged to create their own namespaces to avoid naming conflicts.
A final note: Themes/components can also have a `theme` definition in their `config.toml` and similar, which is the "inheritance" part of this commit's title. This is currently not supported by the Hugo theme site. We will have to wait for some "auto dependency" feature to be implemented for that to happen, but this can be a powerful feature if you want to create your own theme-variant based on others.
Fixes #4460
Fixes #4450
2018-03-01 09:01:25 -05:00
|
|
|
|
2019-08-10 15:05:17 -04:00
|
|
|
c.Assert(afero.WriteFile(mm, filepath.Join("i18n", "en.toml"), []byte(`[hugo]
|
2021-10-13 02:12:06 -04:00
|
|
|
other = "Hugo Rocks!"`), 0o755), qt.IsNil)
|
2019-08-10 15:05:17 -04:00
|
|
|
c.Assert(afero.WriteFile(mm, filepath.Join("i18n", "nn.toml"), []byte(`[hugo]
|
2021-10-13 02:12:06 -04:00
|
|
|
other = "Hugo Rokkar!"`), 0o755), qt.IsNil)
|
2017-02-04 22:20:06 -05:00
|
|
|
|
2021-10-13 02:12:06 -04:00
|
|
|
c.Assert(afero.WriteFile(mm, "config.toml", []byte(cfg), 0o755), qt.IsNil)
|
2017-02-04 22:20:06 -05:00
|
|
|
|
2023-01-04 12:24:36 -05:00
|
|
|
res, err := allconfig.LoadConfig(allconfig.ConfigSourceDescriptor{Fs: mm, Filename: "config.toml"})
|
2019-08-10 15:05:17 -04:00
|
|
|
c.Assert(err, qt.IsNil)
|
2017-02-04 22:20:06 -05:00
|
|
|
|
2023-01-04 12:24:36 -05:00
|
|
|
return res.LoadingInfo.Cfg, hugofs.NewFrom(mm, res.LoadingInfo.BaseConfig)
|
2017-02-04 22:20:06 -05:00
|
|
|
}
|