mirrors/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-04-26 21:51:02 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Misc config loading fixes

Browse source 
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
This commit is contained in:
Bjørn Erik Pedersen 2021-06-09 10:58:18 +02:00
parent a886dd53b8
commit d392893cd7
No known key found for this signature in database
GPG key ID: 330E6E2BD4859D8F
107 changed files with 2159 additions and 1060 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/collect.go
View file

@ -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)
}
}

8
modules/npm/package_builder.go
View file

@ -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