Fix module config watch regression

Fixes #11313

diff --git a/config/allconfig/load.go b/config/allconfig/load.go
index 91cf1eb056b08921edb28a8da2018e57eccd98d0..b997c28969d35152dd676353822cdb7d55d09720 100644 (file)
--- 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 (file)
index 0000000..8676697
--- /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"