shithub: hugo

Info  •  Files  •  Log  •  Branches

resources: Fix scss vs css import regexp

Fixes #7063

--- a/resources/resource_transformers/tocss/scss/client.go

+++ b/resources/resource_transformers/tocss/scss/client.go

@@ -76,7 +76,7 @@

 }

 var (

-	regularCSSImportTo   = regexp.MustCompile(`.*(@import "(.*.css)";).*`)

+	regularCSSImportTo   = regexp.MustCompile(`.*(@import "(.*\.css)";).*`)

 	regularCSSImportFrom = regexp.MustCompile(`.*(\/\* HUGO_IMPORT_START (.*) HUGO_IMPORT_END \*\/).*`)

 )

--- a/resources/resource_transformers/tocss/scss/client_test.go

+++ b/resources/resource_transformers/tocss/scss/client_test.go

@@ -28,6 +28,7 @@

 @import "regular.css";

 @import "moo";

 @import "another.css";

+@import "foo.scss";

 /* foo */`

@@ -37,7 +38,7 @@

 	res, replaced := replaceRegularImportsIn(scssWithImport)

 	c.Assert(replaced, qt.Equals, true)

-	c.Assert(res, qt.Equals, "\n\t\n@import \"moo\";\n/* HUGO_IMPORT_START regular.css HUGO_IMPORT_END */\n@import \"moo\";\n/* HUGO_IMPORT_START another.css HUGO_IMPORT_END */\n\n/* foo */")

+	c.Assert(res, qt.Equals, "\n\t\n@import \"moo\";\n/* HUGO_IMPORT_START regular.css HUGO_IMPORT_END */\n@import \"moo\";\n/* HUGO_IMPORT_START another.css HUGO_IMPORT_END */\n@import \"foo.scss\";\n\n/* foo */")

 	res2, replaced2 := replaceRegularImportsIn(scssWithoutImport)

 	c.Assert(replaced2, qt.Equals, false)