Fix self-mounts on the main project

Fixes #6143

diff --git a/hugolib/hugo_modules_test.go b/hugolib/hugo_modules_test.go
index 73a3d2db0d45d184ec02205fab5066f27abaeb56..66b3609afed1acee085e3c826fb2eefca2a4243f 100644 (file)
--- a/hugolib/hugo_modules_test.go
+++ b/hugolib/hugo_modules_test.go
@@ -506,3 +506,31 @@ weight = 2
                }
        }
 }
+
+func TestMountsProject(t *testing.T) {
+
+       config := `
+
+baseURL="https://example.org"
+
+[module]
+[[module.mounts]]
+source="mycontent"
+target="content"
+
+`
+       b := newTestSitesBuilder(t).
+               WithConfigFile("toml", config).
+               WithSourceFile(filepath.Join("mycontent", "mypage.md"), `
+---
+title: "My Page"
+---
+
+`)
+
+       b.Build(BuildCfg{})
+
+       //helpers.PrintFs(b.H.Fs.Source, "public", os.Stdout)
+
+       b.AssertFileContent("public/mypage/index.html", "Permalink: https://example.org/mypage/")
+}

diff --git a/modules/collect.go b/modules/collect.go
index 9f3eb99f10ffebc164c789fbb31568ad7e7519ab..5ba7f74e2d4df839f4e4ed5dd41c316c24b8954e 100644 (file)
--- a/modules/collect.go
+++ b/modules/collect.go
@@ -305,21 +305,25 @@ func (c *collector) addAndRecurse(owner *moduleAdapter, disabled bool) error {
 func (c *collector) applyMounts(moduleImport Import, mod *moduleAdapter) error {
        mounts := moduleImport.Mounts
 
-       if !mod.projectMod && len(mounts) == 0 {
-               modConfig := mod.Config()
+       modConfig := mod.Config()
+
+       if len(mounts) == 0 {
+               // Mounts not defined by the import.
                mounts = modConfig.Mounts
-               if len(mounts) == 0 {
-                       // Create default mount points for every component folder that
-                       // exists in the module.
-                       for _, componentFolder := range files.ComponentFolders {
-                               sourceDir := filepath.Join(mod.Dir(), componentFolder)
-                               _, err := c.fs.Stat(sourceDir)
-                               if err == nil {
-                                       mounts = append(mounts, Mount{
-                                               Source: componentFolder,
-                                               Target: componentFolder,
-                                       })
-                               }
+
+       }
+
+       if !mod.projectMod && len(mounts) == 0 {
+               // Create default mount points for every component folder that
+               // exists in the module.
+               for _, componentFolder := range files.ComponentFolders {
+                       sourceDir := filepath.Join(mod.Dir(), componentFolder)
+                       _, err := c.fs.Stat(sourceDir)
+                       if err == nil {
+                               mounts = append(mounts, Mount{
+                                       Source: componentFolder,
+                                       Target: componentFolder,
+                               })
                        }
                }
        }

diff --git a/modules/config.go b/modules/config.go
index 122fd6c55c95030077fd0ad8c1848364e779eb94..163bc70493915c883d817e4c37c9a5b4d135a9dc 100644 (file)
--- a/modules/config.go
+++ b/modules/config.go
@@ -171,6 +171,9 @@ func ApplyProjectConfigDefaults(cfg config.Provider, mod Module) error {
                mounts = append(mounts, Mount{Source: dirKey.component, Target: dirKey.component})
        }
 
+       // Prepend the mounts from configuration.
+       mounts = append(moda.mounts, mounts...)
+
        // Remove duplicates
        seen := make(map[string]bool)
        tmp := mounts[:0]