summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2023-07-31 19:18:36 +0200
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2023-08-01 09:05:53 +0200
commit30885a6c5f4083167ae81034bf6a656c07b5fc59 (patch)
treee51fdd570d9f87cab66e0cb42307da997d1e9a94
parent58da8554cb8e5a996f0a1429f23d4e9a59d61b77 (diff)
Fix module config watch regression
Fixes #11313
-rw-r--r--config/allconfig/load.go1
-rw-r--r--testscripts/commands/server__watch_moduleconfig.txt19
2 files changed, 20 insertions, 0 deletions
diff --git a/config/allconfig/load.go b/config/allconfig/load.go
index 91cf1eb05..b997c2896 100644
--- a/config/allconfig/load.go
+++ b/config/allconfig/load.go
@@ -79,6 +79,7 @@ func LoadConfig(d ConfigSourceDescriptor) (*Configs, error) {
if err := configs.transientErr(); err != nil {
return nil, fmt.Errorf("failed to create config from modules config: %w", err)
}
+ configs.LoadingInfo.ConfigFiles = append(configs.LoadingInfo.ConfigFiles, l.ModulesConfigFiles...)
} else if err := configs.transientErr(); err != nil {
return nil, fmt.Errorf("failed to create config: %w", err)
}
diff --git a/testscripts/commands/server__watch_moduleconfig.txt b/testscripts/commands/server__watch_moduleconfig.txt
new file mode 100644
index 000000000..867669754
--- /dev/null
+++ b/testscripts/commands/server__watch_moduleconfig.txt
@@ -0,0 +1,19 @@
+hugo server --disableLiveReload &
+
+waitServer
+stopServer
+wait
+! stderr .
+stdout 'Watching for config changes in.*mytheme'
+
+
+-- hugo.toml --
+title = "Hugo Server Test"
+baseURL = "https://example.org/"
+disableKinds = ["section", "page", "taxonomy", "term", "RSS", "sitemap", "robotsTXT", "404"]
+theme = "mytheme"
+-- layouts/index.html --
+foo: {{ .Site.Params.foo }}
+-- themes/mytheme/hugo.toml --
+[params]
+ foo = "bar"