mirrors/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-05-08 11:47:34 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

resources/js: Fix some import discrepancies between Hugo and ESBuild

Browse source 
This fixes the cases where

```js
import 'imp2/index.js';
import 'imp3/foo.js';
```

And these files lives in `assets` as:

```
imp2/index.ts
imp3/foo.ts
```

Fixes #10527
This commit is contained in:
Bjørn Erik Pedersen 2022-12-13 14:58:55 +01:00
parent c9354d5463
commit b54de1bd9b
2 changed files with 52 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -150,7 +150,7 @@ func resolveComponentInAssets(fs afero.Fs, impPath string) *hugofs.FileMeta {
for _, ext := range []string{".js", ".ts", ".tsx", ".jsx"} {
if strings.HasSuffix(impPath, ext) {
// Import of foo.js.js need the full name.
return nil
continue
}
if fi, err := fs.Stat(base + ext); err == nil {
return fi.(hugofs.FileMetaInfo).Meta()
@ -163,12 +163,10 @@ func resolveComponentInAssets(fs afero.Fs, impPath string) *hugofs.FileMeta {
var m *hugofs.FileMeta
// See issue #8949.
// We need to check if this is a regular file imported without an extension.
// There may be ambigous situations where both foo.js and foo/index.js exists.
// This import order is in line with both how Node and ESBuild's native
// import resolver works.
// This was fixed in Hugo 0.88.
// It may be a regular file imported without an extension, e.g.
// foo or foo/index.
@ -176,14 +174,17 @@ func resolveComponentInAssets(fs afero.Fs, impPath string) *hugofs.FileMeta {
if m != nil {
return m
}
if filepath.Base(impPath) == "index" {
base := filepath.Base(impPath)
if base == "index" {
// try index.esm.js etc.
m = findFirst(impPath + ".esm")
if m != nil {
return m
}
}
// Finally check the path as is.
// Check the path as is.
fi, err := fs.Stat(impPath)
if err == nil {
@ -195,6 +196,8 @@ func resolveComponentInAssets(fs afero.Fs, impPath string) *hugofs.FileMeta {
} else {
m = fi.(hugofs.FileMetaInfo).Meta()
}
} else if strings.HasSuffix(base, ".js") {
m = findFirst(strings.TrimSuffix(impPath, ".js"))
}
return m