From 3d3fa5c3fe5ee0c9df59d682ee0acaba71a06ae1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?=
 <bjorn.erik.pedersen@gmail.com>
Date: Tue, 3 Mar 2020 08:32:02 +0100
Subject: Add build.UseResourceCacheWhen

Fixes #6993
---
 hugolib/resource_chain_test.go | 83 +++++++++++++++++++++++++++++++++---------
 hugolib/site_render.go         |  1 -
 2 files changed, 66 insertions(+), 18 deletions(-)

(limited to 'hugolib')

diff --git a/hugolib/resource_chain_test.go b/hugolib/resource_chain_test.go
index 71f57f699..d3d93b1af 100644
--- a/hugolib/resource_chain_test.go
+++ b/hugolib/resource_chain_test.go
@@ -753,20 +753,17 @@ h1 {
 	c.Assert(err, qt.IsNil)
 	defer clean()
 
-	v := viper.New()
-	v.Set("workingDir", workDir)
-	v.Set("disableKinds", []string{"taxonomyTerm", "taxonomy", "page"})
-	b := newTestSitesBuilder(t).WithLogger(loggers.NewWarningLogger())
-	// Need to use OS fs for this.
-	b.Fs = hugofs.NewDefault(v)
-	b.WithWorkingDir(workDir)
-	b.WithViper(v)
-
-	cssDir := filepath.Join(workDir, "assets", "css", "components")
-	b.Assert(os.MkdirAll(cssDir, 0777), qt.IsNil)
-
-	b.WithContent("p1.md", "")
-	b.WithTemplates("index.html", `
+	newTestBuilder := func(v *viper.Viper) *sitesBuilder {
+		v.Set("workingDir", workDir)
+		v.Set("disableKinds", []string{"taxonomyTerm", "taxonomy", "page"})
+		b := newTestSitesBuilder(t).WithLogger(loggers.NewWarningLogger())
+		// Need to use OS fs for this.
+		b.Fs = hugofs.NewDefault(v)
+		b.WithWorkingDir(workDir)
+		b.WithViper(v)
+
+		b.WithContent("p1.md", "")
+		b.WithTemplates("index.html", `
 {{ $options := dict "inlineImports" true }}
 {{ $styles := resources.Get "css/styles.css" | resources.PostCSS $options }}
 Styles RelPermalink: {{ $styles.RelPermalink }}
@@ -774,6 +771,15 @@ Styles RelPermalink: {{ $styles.RelPermalink }}
 Styles Content: Len: {{ len $styles.Content }}|
 
 `)
+
+		return b
+	}
+
+	b := newTestBuilder(viper.New())
+
+	cssDir := filepath.Join(workDir, "assets", "css", "components")
+	b.Assert(os.MkdirAll(cssDir, 0777), qt.IsNil)
+
 	b.WithSourceFile("assets/css/styles.css", tailwindCss)
 	b.WithSourceFile("assets/css/components/all.css", `
 @import "a.css";
@@ -810,9 +816,52 @@ Styles RelPermalink: /css/styles.css
 Styles Content: Len: 770878|
 `)
 
-	content := b.FileContent("public/css/styles.css")
+	assertCss := func(b *sitesBuilder) {
+		content := b.FileContent("public/css/styles.css")
+
+		b.Assert(strings.Contains(content, "class-in-a"), qt.Equals, true)
+		b.Assert(strings.Contains(content, "class-in-b"), qt.Equals, true)
+
+	}
+
+	assertCss(b)
+
+	build := func(s string, shouldFail bool) {
+		b.Assert(os.RemoveAll(filepath.Join(workDir, "public")), qt.IsNil)
+
+		v := viper.New()
+		v.Set("build", map[string]interface{}{
+			"useResourceCacheWhen": s,
+		})
+
+		b = newTestBuilder(v)
+
+		b.Assert(os.RemoveAll(filepath.Join(workDir, "public")), qt.IsNil)
+		b.Assert(os.RemoveAll(filepath.Join(workDir, "node_modules")), qt.IsNil)
+
+		if shouldFail {
+			b.BuildFail(BuildCfg{})
+		} else {
+			b.Build(BuildCfg{})
+			assertCss(b)
+		}
+	}
+
+	build("always", false)
+	build("fallback", false)
+
+	// Remove PostCSS
+	b.Assert(os.RemoveAll(filepath.Join(workDir, "node_modules")), qt.IsNil)
+
+	build("always", false)
+	build("fallback", false)
+	build("never", true)
+
+	// Remove cache
+	b.Assert(os.RemoveAll(filepath.Join(workDir, "resources")), qt.IsNil)
 
-	b.Assert(strings.Contains(content, "class-in-a"), qt.Equals, true)
-	b.Assert(strings.Contains(content, "class-in-b"), qt.Equals, true)
+	build("always", true)
+	build("fallback", true)
+	build("never", true)
 
 }
diff --git a/hugolib/site_render.go b/hugolib/site_render.go
index 5327cbfc9..1debcbef6 100644
--- a/hugolib/site_render.go
+++ b/hugolib/site_render.go
@@ -59,7 +59,6 @@ func (s siteRenderContext) renderSingletonPages() bool {
 // renderPages renders pages each corresponding to a markdown file.
 // TODO(bep np doc
 func (s *Site) renderPages(ctx *siteRenderContext) error {
-
 	numWorkers := config.GetNumWorkerMultiplier()
 
 	results := make(chan error)
-- 
cgit v1.2.3