commands: Support Fast Render mode with sub-path in baseURL

Fixes #3981

diff --git a/commands/hugo.go b/commands/hugo.go
index a86d92acd9b2c1ccbb84f23a9c54a4fbd8b1c3d2..5961ede3bfdec7c4924592f56aeafb896ebb6d05 100644 (file)
--- a/commands/hugo.go
+++ b/commands/hugo.go
@@ -771,8 +771,9 @@ func (c *commandeer) rebuildSites(events []fsnotify.Event) error {
        visited := c.visitedURLs.PeekAllSet()
        doLiveReload := !buildWatch && !c.Cfg.GetBool("disableLiveReload")
        if doLiveReload && !c.Cfg.GetBool("disableFastRender") {
+               home := c.pathSpec.PrependBasePath("/")
                // Make sure we always render the home page
-               visited["/"] = true
+               visited[home] = true
        }
        return Hugo.Build(hugolib.BuildCfg{PrintStats: !quiet, Watching: true, RecentlyVisited: visited}, events...)
 }

diff --git a/commands/server.go b/commands/server.go
index 8c22d1d97954c788409cf181b8889757346a5f10..e2d37f1659c89d74165ebaa7763f2218a0af162a 100644 (file)
--- a/commands/server.go
+++ b/commands/server.go
@@ -238,7 +238,7 @@ func (c *commandeer) serve(port int) {
                        }
 
                        if fastRenderMode {
-                               p := r.URL.Path
+                               p := r.RequestURI
                                if strings.HasSuffix(p, "/") || strings.HasSuffix(p, "html") || strings.HasSuffix(p, "htm") {
                                        c.visitedURLs.Add(p)
                                }