diff options
| author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2021-06-09 10:58:18 +0200 |
|---|---|---|
| committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2021-06-14 17:00:32 +0200 |
| commit | d392893cd73dc00c927f342778f6dca9628d328e (patch) | |
| tree | e2ea3eec09f36b7122ecdbc498c3c130e240e85c /modules | |
| parent | a886dd53b80322e1edf924f2ede4d4ea037c5baf (diff) | |
Misc config loading fixes
The main motivation behind this is simplicity and correctnes, but the new small config library is also faster:
```
BenchmarkDefaultConfigProvider/Viper-16 252418 4546 ns/op 2720 B/op 30 allocs/op
BenchmarkDefaultConfigProvider/Custom-16 450756 2651 ns/op 1008 B/op 6 allocs/op
```
Fixes #8633
Fixes #8618
Fixes #8630
Updates #8591
Closes #6680
Closes #5192
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/collect.go | 2 | ||||
| -rw-r--r-- | modules/npm/package_builder.go | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/modules/collect.go b/modules/collect.go index db79f434e..163eda74a 100644 --- a/modules/collect.go +++ b/modules/collect.go @@ -424,7 +424,7 @@ func (c *collector) applyThemeConfig(tc *moduleAdapter) error { if err != nil { c.logger.Warnf("Failed to read module config for %q in %q: %s", tc.Path(), themeTOML, err) } else { - maps.ToLower(themeCfg) + maps.PrepareParams(themeCfg) } } diff --git a/modules/npm/package_builder.go b/modules/npm/package_builder.go index fe5d19832..a073b3d8f 100644 --- a/modules/npm/package_builder.go +++ b/modules/npm/package_builder.go @@ -29,7 +29,7 @@ import ( "github.com/gohugoio/hugo/hugofs" "github.com/spf13/afero" - "github.com/spf13/cast" + "github.com/gohugoio/hugo/common/maps" "github.com/gohugoio/hugo/helpers" ) @@ -122,7 +122,7 @@ func Pack(fs afero.Fs, fis []hugofs.FileMetaInfo) error { var commentsm map[string]interface{} comments, found := b.originalPackageJSON["comments"] if found { - commentsm = cast.ToStringMap(comments) + commentsm = maps.ToStringMap(comments) } else { commentsm = make(map[string]interface{}) } @@ -205,7 +205,7 @@ func (b *packageBuilder) addm(source string, m map[string]interface{}) { // These packages will be added by order of import (project, module1, module2...), // so that should at least give the project control over the situation. if devDeps, found := m[devDependenciesKey]; found { - mm := cast.ToStringMapString(devDeps) + mm := maps.ToStringMapString(devDeps) for k, v := range mm { if _, added := b.devDependencies[k]; !added { b.devDependencies[k] = v @@ -215,7 +215,7 @@ func (b *packageBuilder) addm(source string, m map[string]interface{}) { } if deps, found := m[dependenciesKey]; found { - mm := cast.ToStringMapString(deps) + mm := maps.ToStringMapString(deps) for k, v := range mm { if _, added := b.dependencies[k]; !added { b.dependencies[k] = v |