config.go (hugo-0.80.0) | : | config.go (hugo-0.81.0) | ||
---|---|---|---|---|
skipping to change at line 240 | skipping to change at line 240 | |||
} | } | |||
c.replacementsMap[strings.TrimSpace(parts[0])] = strings.TrimSpace(parts[1]) | c.replacementsMap[strings.TrimSpace(parts[0])] = strings.TrimSpace(parts[1]) | |||
} | } | |||
} | } | |||
if c.replacementsMap != nil && c.Imports != nil { | if c.replacementsMap != nil && c.Imports != nil { | |||
for i, imp := range c.Imports { | for i, imp := range c.Imports { | |||
if newImp, found := c.replacementsMap[imp.Path]; found { | if newImp, found := c.replacementsMap[imp.Path]; found { | |||
imp.Path = newImp | imp.Path = newImp | |||
imp.pathProjectReplaced = true | ||||
c.Imports[i] = imp | c.Imports[i] = imp | |||
} | } | |||
} | } | |||
} | } | |||
for i, mnt := range c.Mounts { | for i, mnt := range c.Mounts { | |||
mnt.Source = filepath.Clean(mnt.Source) | mnt.Source = filepath.Clean(mnt.Source) | |||
mnt.Target = filepath.Clean(mnt.Target) | mnt.Target = filepath.Clean(mnt.Target) | |||
c.Mounts[i] = mnt | c.Mounts[i] = mnt | |||
} | } | |||
skipping to change at line 281 | skipping to change at line 282 | |||
// Meta info about this module (license information etc.). | // Meta info about this module (license information etc.). | |||
Params map[string]interface{} | Params map[string]interface{} | |||
// Will be validated against the running Hugo version. | // Will be validated against the running Hugo version. | |||
HugoVersion HugoVersion | HugoVersion HugoVersion | |||
// A optional Glob pattern matching module paths to skip when vendoring, e.g. | // A optional Glob pattern matching module paths to skip when vendoring, e.g. | |||
// "github.com/**". | // "github.com/**". | |||
NoVendor string | NoVendor string | |||
// When enabled, we will pick the vendored module closest to the module | ||||
// using it. | ||||
// The default behaviour is to pick the first. | ||||
// Note that there can still be only one dependency of a given module pat | ||||
h, | ||||
// so once it is in use it cannot be redefined. | ||||
VendorClosest bool | ||||
Replacements []string | Replacements []string | |||
replacementsMap map[string]string | replacementsMap map[string]string | |||
// Configures GOPROXY. | // Configures GOPROXY. | |||
Proxy string | Proxy string | |||
// Configures GONOPROXY. | // Configures GONOPROXY. | |||
NoProxy string | NoProxy string | |||
// Configures GOPRIVATE. | // Configures GOPRIVATE. | |||
Private string | Private string | |||
} | } | |||
skipping to change at line 358 | skipping to change at line 366 | |||
} | } | |||
if v.Max != "" && current.Compare(v.Max) < 0 { | if v.Max != "" && current.Compare(v.Max) < 0 { | |||
isValid = false | isValid = false | |||
} | } | |||
return isValid | return isValid | |||
} | } | |||
type Import struct { | type Import struct { | |||
Path string // Module path | Path string // Module path | |||
IgnoreConfig bool // Ignore any config in config.toml (will still folo | pathProjectReplaced bool // Set when Path is replaced in project config | |||
w imports). | . | |||
IgnoreImports bool // Do not follow any configured imports. | IgnoreConfig bool // Ignore any config in config.toml (will stil | |||
NoVendor bool // Never vendor this import (only allowed in main pr | l folow imports). | |||
oject). | IgnoreImports bool // Do not follow any configured imports. | |||
Disable bool // Turn off this module. | NoVendor bool // Never vendor this import (only allowed in m | |||
Mounts []Mount | ain project). | |||
Disable bool // Turn off this module. | ||||
Mounts []Mount | ||||
} | } | |||
type Mount struct { | type Mount struct { | |||
Source string // relative path in source repo, e.g. "scss" | Source string // relative path in source repo, e.g. "scss" | |||
Target string // relative target path, e.g. "assets/bootstrap/scss" | Target string // relative target path, e.g. "assets/bootstrap/scss" | |||
Lang string // any language code associated with this mount. | Lang string // any language code associated with this mount. | |||
} | } | |||
End of changes. 3 change blocks. | ||||
8 lines changed or deleted | 19 lines changed or added |