mirror/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-08-27 22:09:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix dart sass import regression

Browse Source 
Fixes #12072
This commit is contained in:
Bjørn Erik Pedersen
2024-02-20 14:46:03 +01:00
parent 48eec2a4e6
commit 621194a319
7 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/resource_transformers/js/options.go
View File

@@ -218,7 +218,7 @@ func createBuildPlugins(depsManager identity.Manager, c *Client, opts Options) (
isStdin := args.Importer == stdinImporter
var relDir string
if !isStdin {
rel, found := fs.MakePathRelative(args.Importer)
rel, found := fs.MakePathRelative(args.Importer, true)
if !found {
// Not in any of the /assets folders.
// This is an import from a node_modules, let

3
resources/resource_transformers/tocss/dartsass/transform.go
View File

@@ -138,12 +138,13 @@ func (t importResolver) CanonicalizeURL(url string) (string, error) {
if url == sass.HugoVarsNamespace {
return url, nil
}
filePath, isURL := paths.UrlToFilename(url)
var prevDir string
var pathDir string
if isURL {
var found bool
prevDir, found = t.c.sfs.MakePathRelative(filepath.Dir(filePath))
prevDir, found = t.c.sfs.MakePathRelative(filepath.Dir(filePath), false)
if !found {
// Not a member of this filesystem, let Dart Sass handle it.

2
resources/resource_transformers/tocss/scss/tocss.go
View File

@@ -86,7 +86,7 @@ func (t *toCSSTransformation) Transform(ctx *resources.ResourceTransformationCtx
if prev == "stdin" {
prevDir = baseDir
} else {
prevDir, _ = t.c.sfs.MakePathRelative(filepath.Dir(prev))
prevDir, _ = t.c.sfs.MakePathRelative(filepath.Dir(prev), false)
if prevDir == "" {
// Not a member of this filesystem. Let LibSASS handle it.