mirrors/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-04-30 15:40:05 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

js: Resolve index.esm.js

Browse source 
Same logic as for `index.{js,ts...}` files applies; if both `index.esm.js` and `index.js` exists (unlikely), you need to use the name
with extension when importing, else the `index.js` will win.

Fixes #8631
This commit is contained in:
Bjørn Erik Pedersen 2022-06-12 18:42:53 +02:00
parent cf12fa6161
commit 617e094482
2 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
resources/resource_transformers/js/options.go
View file

@ -176,6 +176,12 @@ func resolveComponentInAssets(fs afero.Fs, impPath string) *hugofs.FileMeta {
if m != nil { if m != nil {
return m return m
} }
if filepath.Base(impPath) == "index" {
m = findFirst(impPath + ".esm")
if m != nil {
return m
}
}
// Finally check the path as is. // Finally check the path as is.
fi, err := fs.Stat(impPath) fi, err := fs.Stat(impPath)
@ -183,6 +189,9 @@ func resolveComponentInAssets(fs afero.Fs, impPath string) *hugofs.FileMeta {
if err == nil { if err == nil {
if fi.IsDir() { if fi.IsDir() {
m = findFirst(filepath.Join(impPath, "index")) m = findFirst(filepath.Join(impPath, "index"))
if m == nil {
m = findFirst(filepath.Join(impPath, "index.esm"))
}
} else { } else {
m = fi.(hugofs.FileMetaInfo).Meta() m = fi.(hugofs.FileMetaInfo).Meta()
} }

7
resources/resource_transformers/js/options_test.go
View file

@ -150,11 +150,16 @@ func TestResolveComponentInAssets(t *testing.T) {
{"Index file, folder only", []string{"foo/index.js", "bar.js"}, "foo", "foo/index.js"}, {"Index file, folder only", []string{"foo/index.js", "bar.js"}, "foo", "foo/index.js"},
{"Index file, folder and index", []string{"foo/index.js", "bar.js"}, "foo/index", "foo/index.js"}, {"Index file, folder and index", []string{"foo/index.js", "bar.js"}, "foo/index", "foo/index.js"},
{"Index file, folder and index and suffix", []string{"foo/index.js", "bar.js"}, "foo/index.js", "foo/index.js"}, {"Index file, folder and index and suffix", []string{"foo/index.js", "bar.js"}, "foo/index.js", "foo/index.js"},
{"Index ESM file, folder only", []string{"foo/index.esm.js", "bar.js"}, "foo", "foo/index.esm.js"},
{"Index ESM file, folder and index", []string{"foo/index.esm.js", "bar.js"}, "foo/index", "foo/index.esm.js"},
{"Index ESM file, folder and index and suffix", []string{"foo/index.esm.js", "bar.js"}, "foo/index.esm.js", "foo/index.esm.js"},
// We added these index.esm.js cases in v0.101.0. The case below is unlikely to happen in the wild, but add a test
// to document Hugo's behavior. We pick the file with the name index.js; anything else would be breaking.
{"Index and Index ESM file, folder only", []string{"foo/index.esm.js", "foo/index.js", "bar.js"}, "foo", "foo/index.js"},
// Issue #8949 // Issue #8949
{"Check file before directory", []string{"foo.js", "foo/index.js"}, "foo", "foo.js"}, {"Check file before directory", []string{"foo.js", "foo/index.js"}, "foo", "foo.js"},
} { } {
c.Run(test.name, func(c *qt.C) { c.Run(test.name, func(c *qt.C) {
baseDir := "assets" baseDir := "assets"
mfs := afero.NewMemMapFs() mfs := afero.NewMemMapFs()