dartsass: Fix nilpointer on Close when Dart Sass isn't installed

Fixes #13076
gohugoio · Nov 21, 2024 · 8d017a6 · 8d017a6
1 parent 8fcd3c1
commit 8d017a6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/resources/resource_transformers/cssjs/postcss_integration_test.go b/resources/resource_transformers/cssjs/postcss_integration_test.go
@@ -70,7 +70,7 @@ hello:
    other: "Bonjour"
 -- layouts/index.html --
 {{ $options := dict "inlineImports" true }}
-{{ $styles := resources.Get "css/styles.css" | resources.PostCSS $options }}
+{{ $styles := resources.Get "css/styles.css" | css.PostCSS $options }}
 Styles RelPermalink: {{ $styles.RelPermalink }}
 {{ $cssContent := $styles.Content }}
 Styles Content: Len: {{ len $styles.Content }}|

diff --git a/resources/resource_transformers/tocss/dartsass/client.go b/resources/resource_transformers/tocss/dartsass/client.go
@@ -44,7 +44,7 @@ const dartSassStdinPrefix = "hugostdin:"
 
 func New(fs *filesystems.SourceFilesystem, rs *resources.Spec) (*Client, error) {
 	if !Supports() {
-		return &Client{dartSassNotAvailable: true}, nil
+		return &Client{}, nil
 	}
 
 	if hugo.DartSassBinaryName == "" {
@@ -89,22 +89,25 @@ func New(fs *filesystems.SourceFilesystem, rs *resources.Spec) (*Client, error)
 }
 
 type Client struct {
-	dartSassNotAvailable bool
-	rs                   *resources.Spec
-	sfs                  *filesystems.SourceFilesystem
-	workFs               afero.Fs
+	rs     *resources.Spec
+	sfs    *filesystems.SourceFilesystem
+	workFs afero.Fs
 
+	// This may be nil if Dart Sass is not available.
 	transpiler *godartsass.Transpiler
 }
 
 func (c *Client) ToCSS(res resources.ResourceTransformer, args map[string]any) (resource.Resource, error) {
-	if c.dartSassNotAvailable {
+	if c.transpiler == nil {
 		return res.Transform(resources.NewFeatureNotAvailableTransformer(transformationName, args))
 	}
 	return res.Transform(&transform{c: c, optsm: args})
 }
 
 func (c *Client) Close() error {
+	if c.transpiler == nil {
+		return nil
+	}
 	return c.transpiler.Close()
 }