hugolib: Prepare render per output format

See #3220

1 files changed, 16 insertions, 11 deletions

diff --git a/hugolib/hugo_sites_build.go b/hugolib/hugo_sites_build.go
index 58088fd7c..12689f6de 100644
--- a/hugolib/hugo_sites_build.go
+++ b/hugolib/hugo_sites_build.go
@@ -203,26 +203,31 @@ func (h *HugoSites) assemble(config *BuildCfg) error {
 		return err
 	}
 
-	for _, s := range h.Sites {
-		s.preparePagesForRender(config)
-	}
-
 	return nil
 
 }
 
 func (h *HugoSites) render(config *BuildCfg) error {
-	if !config.SkipRender {
-		for _, s := range h.Sites {
-			if err := s.render(); err != nil {
-				return err
-			}
 
-			if config.PrintStats {
-				s.Stats()
+	for _, s := range h.Sites {
+		s.initRenderFormats()
+		for i, rf := range s.renderFormats {
+			s.rc = &siteRenderingContext{Format: rf}
+			s.preparePagesForRender(i, config)
+
+			if !config.SkipRender {
+				if err := s.render(i); err != nil {
+					return err
+				}
 			}
 		}
 
+		if !config.SkipRender && config.PrintStats {
+			s.Stats()
+		}
+	}
+
+	if !config.SkipRender {
 		if err := h.renderCrossSitesArtifacts(); err != nil {
 			return err
 		}