From 78f227b664d86c30fbb25f7a953b7ef8f2dacf13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Fri, 13 Nov 2020 08:54:29 +0100 Subject: js: Let ESBuild handle all imports from node_modules This commit fixes some issues where modules in /assets share the same name as in node_modules. This was not intended, and with this commit the node_modules-components should be isolated. If you want to redefine something inside node_modules, use the `defines` option. Fixes #7948 --- resources/resource_transformers/tocss/scss/tocss.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'resources/resource_transformers/tocss') diff --git a/resources/resource_transformers/tocss/scss/tocss.go b/resources/resource_transformers/tocss/scss/tocss.go index 20f0efbb9..fc7a19f33 100644 --- a/resources/resource_transformers/tocss/scss/tocss.go +++ b/resources/resource_transformers/tocss/scss/tocss.go @@ -76,7 +76,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)) if prevDir == "" { // Not a member of this filesystem. Let LibSASS handle it. -- cgit v1.2.3