diff options
author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2020-11-13 08:54:29 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-13 08:54:29 +0100 |
commit | 78f227b664d86c30fbb25f7a953b7ef8f2dacf13 (patch) | |
tree | 20c298b724513402830072a4d6768e6642851689 /hugolib/filesystems/basefs_test.go | |
parent | 5e03f644a4507f51bdbcdb42b65ce4e99095374f (diff) |
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
Diffstat (limited to 'hugolib/filesystems/basefs_test.go')
-rw-r--r-- | hugolib/filesystems/basefs_test.go | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/hugolib/filesystems/basefs_test.go b/hugolib/filesystems/basefs_test.go index 633c8fe08..2d273ae88 100644 --- a/hugolib/filesystems/basefs_test.go +++ b/hugolib/filesystems/basefs_test.go @@ -394,9 +394,14 @@ func TestMakePathRelative(t *testing.T) { sfs := bfs.Static[""] c.Assert(sfs, qt.Not(qt.IsNil)) - c.Assert(sfs.MakePathRelative(filepath.Join(workDir, "dist", "d1", "foo.txt")), qt.Equals, filepath.FromSlash("mydist/d1/foo.txt")) - c.Assert(sfs.MakePathRelative(filepath.Join(workDir, "static", "d2", "foo.txt")), qt.Equals, filepath.FromSlash("d2/foo.txt")) - c.Assert(sfs.MakePathRelative(filepath.Join(workDir, "dust", "d3", "foo.txt")), qt.Equals, filepath.FromSlash("foo/bar/d3/foo.txt")) + makeRel := func(s string) string { + r, _ := sfs.MakePathRelative(s) + return r + } + + c.Assert(makeRel(filepath.Join(workDir, "dist", "d1", "foo.txt")), qt.Equals, filepath.FromSlash("mydist/d1/foo.txt")) + c.Assert(makeRel(filepath.Join(workDir, "static", "d2", "foo.txt")), qt.Equals, filepath.FromSlash("d2/foo.txt")) + c.Assert(makeRel(filepath.Join(workDir, "dust", "d3", "foo.txt")), qt.Equals, filepath.FromSlash("foo/bar/d3/foo.txt")) } |