mirror of
https://github.com/gohugoio/hugo.git
synced 2024-11-07 20:30:36 -05:00
Revert "postcss: Improve validation of option 'config'"
This reverts commit 9a0370e8eb
.
Closes #10990
This commit is contained in:
parent
85b13c105a
commit
bd38e35f97
3 changed files with 8 additions and 16 deletions
|
@ -188,19 +188,19 @@ func (b *BaseFs) AbsProjectContentDir(filename string) (string, string, error) {
|
|||
|
||||
// ResolveJSConfigFile resolves the JS-related config file to a absolute
|
||||
// filename. One example of such would be postcss.config.js.
|
||||
func (fs *BaseFs) ResolveJSConfigFile(name string) (string, bool) {
|
||||
func (fs *BaseFs) ResolveJSConfigFile(name string) string {
|
||||
// First look in assets/_jsconfig
|
||||
fi, err := fs.Assets.Fs.Stat(filepath.Join(files.FolderJSConfig, name))
|
||||
if err == nil {
|
||||
return fi.(hugofs.FileMetaInfo).Meta().Filename, fi.IsDir()
|
||||
return fi.(hugofs.FileMetaInfo).Meta().Filename
|
||||
}
|
||||
// Fall back to the work dir.
|
||||
fi, err = fs.Work.Stat(name)
|
||||
if err == nil {
|
||||
return fi.(hugofs.FileMetaInfo).Meta().Filename, fi.IsDir()
|
||||
return fi.(hugofs.FileMetaInfo).Meta().Filename
|
||||
}
|
||||
|
||||
return "", false
|
||||
return ""
|
||||
}
|
||||
|
||||
// MakePathRelative creates a relative path from the given filename.
|
||||
|
|
|
@ -134,17 +134,13 @@ func (t *babelTransformation) Transform(ctx *resources.ResourceTransformationCtx
|
|||
}
|
||||
|
||||
configFile = filepath.Clean(configFile)
|
||||
isConfigFileDir := false
|
||||
|
||||
// We need an absolute filename to the config file.
|
||||
if !filepath.IsAbs(configFile) {
|
||||
configFile, isConfigFileDir = t.rs.BaseFs.ResolveJSConfigFile(configFile)
|
||||
if isConfigFileDir {
|
||||
logger.Warnf("babel config %q must be a file, not a directory", configFile)
|
||||
}
|
||||
configFile = t.rs.BaseFs.ResolveJSConfigFile(configFile)
|
||||
if configFile == "" && t.options.Config != "" {
|
||||
// Only fail if the user specified config file is not found.
|
||||
return fmt.Errorf("babel config file %q not found", configFile)
|
||||
return fmt.Errorf("babel config %q not found:", configFile)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -172,17 +172,13 @@ func (t *postcssTransformation) Transform(ctx *resources.ResourceTransformationC
|
|||
}
|
||||
|
||||
configFile = filepath.Clean(configFile)
|
||||
isConfigFileDir := false
|
||||
|
||||
// We need an absolute filename to the config file.
|
||||
if !filepath.IsAbs(configFile) {
|
||||
configFile, isConfigFileDir = t.rs.BaseFs.ResolveJSConfigFile(configFile)
|
||||
configFile = t.rs.BaseFs.ResolveJSConfigFile(configFile)
|
||||
if configFile == "" && options.Config != "" {
|
||||
// Only fail if the user specified config file is not found.
|
||||
return fmt.Errorf("postcss config directory %q not found", options.Config)
|
||||
}
|
||||
if !isConfigFileDir {
|
||||
logger.Warnf("postcss config %q must be a directory", options.Config)
|
||||
return fmt.Errorf("postcss config %q not found:", options.Config)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue