css: Support nested hugo:vars/<name> imports

Allow CSS variables to be grouped under sub-paths and imported via
@import "hugo:vars/mobile" (or @use for Dart Sass), so callers can pass
nested dicts like:

    {{ dict "primary-color" "blue" "mobile" (dict "primary-color" "red") }}

Top-level "hugo:vars" now skips nested map entries instead of emitting
garbage for them.

Fixes #14705

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Bjørn Erik Pedersen
2026-04-26 14:03:39 +02:00
parent 0814059bb6
commit 7622dd86ce
9 changed files with 266 additions and 12 deletions
+3
View File
@@ -24,6 +24,7 @@ import (
"github.com/gohugoio/hugo/common/hugio"
"github.com/gohugoio/hugo/common/paths"
"github.com/gohugoio/hugo/identity"
"github.com/gohugoio/hugo/resources/resource_transformers/tocss/sass"
"github.com/evanw/esbuild/pkg/api"
@@ -420,6 +421,8 @@ OUTER:
opts.MainFields = []string{"style", "main"}
}
opts.Vars = sass.PrepareVars(opts.Vars)
opts.compiled = api.BuildOptions{
Outfile: outFile,
Bundle: true,
+11 -6
View File
@@ -29,6 +29,7 @@ import (
"github.com/gohugoio/hugo/identity"
"github.com/gohugoio/hugo/resources"
"github.com/gohugoio/hugo/resources/resource"
"github.com/gohugoio/hugo/resources/resource_transformers/tocss/sass"
"github.com/spf13/afero"
)
@@ -377,7 +378,7 @@ func createBuildPlugins(rs *resources.Spec, assetsResolver *fsResolver, depsMana
varsPlugin := api.Plugin{
Name: "hugo-vars-plugin",
Setup: func(build api.PluginBuild) {
build.OnResolve(api.OnResolveOptions{Filter: `^hugo:vars$`},
build.OnResolve(api.OnResolveOptions{Filter: `^hugo:vars(/|$)`},
func(args api.OnResolveArgs) (api.OnResolveResult, error) {
return api.OnResolveResult{
Path: args.Path,
@@ -386,8 +387,9 @@ func createBuildPlugins(rs *resources.Spec, assetsResolver *fsResolver, depsMana
})
build.OnLoad(api.OnLoadOptions{Filter: `.*`, Namespace: nsHugoVars},
func(args api.OnLoadArgs) (api.OnLoadResult, error) {
subPath, _ := sass.HugoVarsSubPath(args.Path)
return api.OnLoadResult{
Contents: createCSSVarsStyleSheet(opts.Vars),
Contents: createCSSVarsStyleSheet(opts.Vars, subPath),
Loader: api.LoaderCSS,
}, nil
})
@@ -398,16 +400,19 @@ func createBuildPlugins(rs *resources.Spec, assetsResolver *fsResolver, depsMana
}
// createCSSVarsStyleSheet creates a CSS custom properties stylesheet from the given vars.
// The result is a :root block with CSS custom properties.
func createCSSVarsStyleSheet(vars map[string]any) *string {
if len(vars) == 0 {
// The result is a :root block with CSS custom properties. If subPath is non-empty,
// vars is navigated using the slash-separated path before emitting properties; nested
// map values are skipped at the resolved level.
func createCSSVarsStyleSheet(vars map[string]any, subPath string) *string {
resolved := sass.ResolveVars(vars, subPath)
if len(resolved) == 0 {
// We need to return a non-nil pointer to an empty string to avoid ESBuild treating this as a missing file.
s := ""
return &s
}
var varsSlice []string
for k, v := range vars {
for k, v := range resolved {
if !strings.HasPrefix(k, "--") {
k = "--" + k
}