diff options
| author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2022-05-14 16:51:04 +0300 |
|---|---|---|
| committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2022-05-15 21:25:25 +0300 |
| commit | 4b189d8fd93d3fa326b31d451d5594c917e6c714 (patch) | |
| tree | c3515876c474caab2df6d0a34291bcc3ca8e75df /hugolib | |
| parent | c2fa0a33209da7cfd9a09f8fc528415578a9edf8 (diff) | |
postcss: Fix import error handling
Note that we will now fail if `inlineImports` is enabled and we cannot resolve an import.
You can work around this by either:
* Use url imports or imports with media queries.
* Set `skipInlineImportsNotFound=true` in the options
Also get the argument order in the different NewFileError* funcs in line.
Fixes #9895
Diffstat (limited to 'hugolib')
| -rw-r--r-- | hugolib/config.go | 2 | ||||
| -rw-r--r-- | hugolib/hugo_sites.go | 2 | ||||
| -rw-r--r-- | hugolib/page.go | 4 | ||||
| -rw-r--r-- | hugolib/shortcode.go | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/hugolib/config.go b/hugolib/config.go index 1e7cf6b06..e63d6da4e 100644 --- a/hugolib/config.go +++ b/hugolib/config.go @@ -511,5 +511,5 @@ func (configLoader) loadSiteConfig(cfg config.Provider) (scfg SiteConfig, err er } func (l configLoader) wrapFileError(err error, filename string) error { - return herrors.NewFileErrorFromFile(err, filename, filename, l.Fs, nil) + return herrors.NewFileErrorFromFile(err, filename, l.Fs, nil) } diff --git a/hugolib/hugo_sites.go b/hugolib/hugo_sites.go index 4026f58d3..6be26d60e 100644 --- a/hugolib/hugo_sites.go +++ b/hugolib/hugo_sites.go @@ -968,7 +968,7 @@ func (h *HugoSites) errWithFileContext(err error, f source.File) error { } realFilename := fim.Meta().Filename - return herrors.NewFileErrorFromFile(err, realFilename, realFilename, h.SourceSpec.Fs.Source, nil) + return herrors.NewFileErrorFromFile(err, realFilename, h.SourceSpec.Fs.Source, nil) } diff --git a/hugolib/page.go b/hugolib/page.go index e9f937105..e6dd8fc2e 100644 --- a/hugolib/page.go +++ b/hugolib/page.go @@ -588,7 +588,7 @@ func (p *pageState) wrapError(err error) error { } } - return herrors.NewFileErrorFromFile(err, filename, filename, p.s.SourceSpec.Fs.Source, herrors.NopLineMatcher) + return herrors.NewFileErrorFromFile(err, filename, p.s.SourceSpec.Fs.Source, herrors.NopLineMatcher) } @@ -788,7 +788,7 @@ func (p *pageState) outputFormat() (f output.Format) { func (p *pageState) parseError(err error, input []byte, offset int) error { pos := p.posFromInput(input, offset) - return herrors.NewFileError(p.File().Filename(), err).UpdatePosition(pos) + return herrors.NewFileError(err, p.File().Filename()).UpdatePosition(pos) } func (p *pageState) pathOrTitle() string { diff --git a/hugolib/shortcode.go b/hugolib/shortcode.go index f8cda6b8d..41121700d 100644 --- a/hugolib/shortcode.go +++ b/hugolib/shortcode.go @@ -298,7 +298,7 @@ func renderShortcode( var err error tmpl, err = s.TextTmpl().Parse(templName, templStr) if err != nil { - fe := herrors.NewFileError(p.File().Filename(), err) + fe := herrors.NewFileError(err, p.File().Filename()) pos := fe.Position() pos.LineNumber += p.posOffset(sc.pos).LineNumber fe = fe.UpdatePosition(pos) @@ -391,7 +391,7 @@ func renderShortcode( result, err := renderShortcodeWithPage(s.Tmpl(), tmpl, data) if err != nil && sc.isInline { - fe := herrors.NewFileError(p.File().Filename(), err) + fe := herrors.NewFileError(err, p.File().Filename()) pos := fe.Position() pos.LineNumber += p.posOffset(sc.pos).LineNumber fe = fe.UpdatePosition(pos) |