+
{{- $hCode := $code | transform.Remarshal . }}
{{- if and $fm (in (slice "toml" "yaml") .) }}
{{- $hCode = printf "%s\n%s\n%s" $placeHolder $hCode $placeHolder }}
@@ -79,7 +89,11 @@ Renders syntax-highlighted configuration data in JSON, TOML, and YAML formats.
{{ highlight $hCode . "" | replaceRE $placeHolder (index $delimiters .) | safeHTML }}
{{- if $copy }}
-
+
{{- /* Functionality located within filesaver.js The copy here is located in the css with .copy class so it can be replaced with JS on success */}}
{{- end }}
{{- end }}
diff --git a/docs/layouts/shortcodes/datatable.html b/docs/layouts/shortcodes/datatable.html
index 4e2814f5a..12054f89d 100644
--- a/docs/layouts/shortcodes/datatable.html
+++ b/docs/layouts/shortcodes/datatable.html
@@ -3,20 +3,31 @@
{{ $list := (index (index .Site.Data.docs $package) $listname) }}
{{ $fields := after 2 .Params }}
+
-
- {{ range $fields }}
- {{ . }}
- {{ end }}
-
- {{ range $list }}
-
- {{ range $k, $v := . }}
- {{ $.Scratch.Set $k $v }}
- {{ end }}
- {{ range $fields }}
- {{ $.Scratch.Get . }}
- {{ end }}
-
- {{ end }}
+
+ {{ range $fields }}
+ {{ $s := . }}
+ {{ if eq $s "_key" }}
+ {{ $s = "Type" }}
+ {{ end }}
+ {{ $s }}
+ {{ end }}
+
+ {{ range $k1, $v1 := $list }}
+
+ {{ range $k2, $v2 := . }}
+ {{ $.Scratch.Set $k2 $v2 }}
+ {{ end }}
+ {{ range $fields }}
+ {{ $s := "" }}
+ {{ if eq . "_key" }}
+ {{ $s = $k1 }}
+ {{ else }}
+ {{ $s = $.Scratch.Get . }}
+ {{ end }}
+ {{ $s }}
+ {{ end }}
+
+ {{ end }}
diff --git a/docshelper/docs.go b/docshelper/docs.go
index 1e1594120..b138ff81e 100644
--- a/docshelper/docs.go
+++ b/docshelper/docs.go
@@ -15,9 +15,11 @@
// is of limited interest for the general Hugo user.
package docshelper
+import "fmt"
+
type (
DocProviderFunc = func() DocProvider
- DocProvider map[string]map[string]any
+ DocProvider map[string]any
)
var docProviderFuncs []DocProviderFunc
@@ -32,20 +34,14 @@ func GetDocProvider() DocProvider {
for _, fn := range docProviderFuncs {
p := fn()
for k, v := range p {
- if prev, found := provider[k]; !found {
- provider[k] = v
- } else {
- merge(prev, v)
+ if _, found := provider[k]; found {
+ // We use to merge config, but not anymore.
+ // These constructs will eventually go away, so just make it simple.
+ panic(fmt.Sprintf("Duplicate doc provider key: %q", k))
}
+ provider[k] = v
}
}
return provider
}
-
-// Shallow merge
-func merge(dst, src map[string]any) {
- for k, v := range src {
- dst[k] = v
- }
-}
diff --git a/markup/markup_config/config.go b/markup/markup_config/config.go
index 0793669a7..0350a78a2 100644
--- a/markup/markup_config/config.go
+++ b/markup/markup_config/config.go
@@ -16,12 +16,10 @@ package markup_config
import (
"github.com/gohugoio/hugo/common/maps"
"github.com/gohugoio/hugo/config"
- "github.com/gohugoio/hugo/docshelper"
"github.com/gohugoio/hugo/markup/asciidocext/asciidocext_config"
"github.com/gohugoio/hugo/markup/goldmark/goldmark_config"
"github.com/gohugoio/hugo/markup/highlight"
"github.com/gohugoio/hugo/markup/tableofcontents"
- "github.com/gohugoio/hugo/parser"
"github.com/mitchellh/mapstructure"
)
@@ -108,10 +106,3 @@ var Default = Config{
Goldmark: goldmark_config.Default,
AsciidocExt: asciidocext_config.Default,
}
-
-func init() {
- docsProvider := func() docshelper.DocProvider {
- return docshelper.DocProvider{"config": map[string]any{"markup": parser.LowerCaseCamelJSONMarshaller{Value: Default}}}
- }
- docshelper.AddDocProviderFunc(docsProvider)
-}
diff --git a/media/docshelper.go b/media/docshelper.go
deleted file mode 100644
index d37c08eb3..000000000
--- a/media/docshelper.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package media
-
-import (
- "github.com/gohugoio/hugo/docshelper"
-)
-
-// This is is just some helpers used to create some JSON used in the Hugo docs.
-func init() {
- docsProvider := func() docshelper.DocProvider {
- return docshelper.DocProvider{"media": map[string]any{"types": DefaultTypes}}
- }
- docshelper.AddDocProviderFunc(docsProvider)
-}
diff --git a/minifiers/config.go b/minifiers/config.go
index 58271362d..8ebcaa5c9 100644
--- a/minifiers/config.go
+++ b/minifiers/config.go
@@ -15,8 +15,6 @@ package minifiers
import (
"github.com/gohugoio/hugo/common/maps"
- "github.com/gohugoio/hugo/docshelper"
- "github.com/gohugoio/hugo/parser"
"github.com/spf13/cast"
"github.com/mitchellh/mapstructure"
@@ -113,10 +111,3 @@ func DecodeConfig(v any) (conf MinifyConfig, err error) {
return
}
-
-func init() {
- docsProvider := func() docshelper.DocProvider {
- return docshelper.DocProvider{"config": map[string]any{"minify": parser.LowerCaseCamelJSONMarshaller{Value: defaultConfig}}}
- }
- docshelper.AddDocProviderFunc(docsProvider)
-}
diff --git a/output/docshelper.go b/output/docshelper.go
index 1275c5979..0436a10be 100644
--- a/output/docshelper.go
+++ b/output/docshelper.go
@@ -14,7 +14,6 @@ func init() {
docsProvider := func() docshelper.DocProvider {
return docshelper.DocProvider{
"output": map[string]any{
- "formats": DefaultFormats,
"layouts": createLayoutExamples(),
},
}