mirror of
https://github.com/gohugoio/hugo.git
synced 2024-11-21 20:46:30 -05:00
9f5a92078a
This commit implements Hugo Modules. This is a broad subject, but some keywords include: * A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project. * A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects. * Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running. * Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions. * A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`. All of the above is backed by Go Modules. Fixes #5973 Fixes #5996 Fixes #6010 Fixes #5911 Fixes #5940 Fixes #6074 Fixes #6082 Fixes #6092
230 lines
5.6 KiB
Go
230 lines
5.6 KiB
Go
// Copyright 2018 The Hugo Authors. All rights reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package filecache
|
|
|
|
import (
|
|
"path"
|
|
"path/filepath"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/gohugoio/hugo/config"
|
|
|
|
"github.com/gohugoio/hugo/helpers"
|
|
|
|
"github.com/mitchellh/mapstructure"
|
|
"github.com/pkg/errors"
|
|
"github.com/spf13/afero"
|
|
)
|
|
|
|
const (
|
|
cachesConfigKey = "caches"
|
|
|
|
resourcesGenDir = ":resourceDir/_gen"
|
|
)
|
|
|
|
var defaultCacheConfig = Config{
|
|
MaxAge: -1, // Never expire
|
|
Dir: ":cacheDir/:project",
|
|
}
|
|
|
|
const (
|
|
cacheKeyGetJSON = "getjson"
|
|
cacheKeyGetCSV = "getcsv"
|
|
cacheKeyImages = "images"
|
|
cacheKeyAssets = "assets"
|
|
cacheKeyModules = "modules"
|
|
)
|
|
|
|
type Configs map[string]Config
|
|
|
|
func (c Configs) CacheDirModules() string {
|
|
return c[cacheKeyModules].Dir
|
|
}
|
|
|
|
var defaultCacheConfigs = Configs{
|
|
cacheKeyModules: {
|
|
MaxAge: -1,
|
|
Dir: ":cacheDir/modules",
|
|
},
|
|
cacheKeyGetJSON: defaultCacheConfig,
|
|
cacheKeyGetCSV: defaultCacheConfig,
|
|
cacheKeyImages: {
|
|
MaxAge: -1,
|
|
Dir: resourcesGenDir,
|
|
},
|
|
cacheKeyAssets: {
|
|
MaxAge: -1,
|
|
Dir: resourcesGenDir,
|
|
},
|
|
}
|
|
|
|
type Config struct {
|
|
// Max age of cache entries in this cache. Any items older than this will
|
|
// be removed and not returned from the cache.
|
|
// a negative value means forever, 0 means cache is disabled.
|
|
MaxAge time.Duration
|
|
|
|
// The directory where files are stored.
|
|
Dir string
|
|
|
|
// Will resources/_gen will get its own composite filesystem that
|
|
// also checks any theme.
|
|
isResourceDir bool
|
|
}
|
|
|
|
// GetJSONCache gets the file cache for getJSON.
|
|
func (f Caches) GetJSONCache() *Cache {
|
|
return f[cacheKeyGetJSON]
|
|
}
|
|
|
|
// GetCSVCache gets the file cache for getCSV.
|
|
func (f Caches) GetCSVCache() *Cache {
|
|
return f[cacheKeyGetCSV]
|
|
}
|
|
|
|
// ImageCache gets the file cache for processed images.
|
|
func (f Caches) ImageCache() *Cache {
|
|
return f[cacheKeyImages]
|
|
}
|
|
|
|
// ModulesCache gets the file cache for Hugo Modules.
|
|
func (f Caches) ModulesCache() *Cache {
|
|
return f[cacheKeyModules]
|
|
}
|
|
|
|
// AssetsCache gets the file cache for assets (processed resources, SCSS etc.).
|
|
func (f Caches) AssetsCache() *Cache {
|
|
return f[cacheKeyAssets]
|
|
}
|
|
|
|
func DecodeConfig(fs afero.Fs, cfg config.Provider) (Configs, error) {
|
|
c := make(Configs)
|
|
valid := make(map[string]bool)
|
|
// Add defaults
|
|
for k, v := range defaultCacheConfigs {
|
|
c[k] = v
|
|
valid[k] = true
|
|
}
|
|
|
|
m := cfg.GetStringMap(cachesConfigKey)
|
|
|
|
_, isOsFs := fs.(*afero.OsFs)
|
|
|
|
for k, v := range m {
|
|
cc := defaultCacheConfig
|
|
|
|
dc := &mapstructure.DecoderConfig{
|
|
Result: &cc,
|
|
DecodeHook: mapstructure.StringToTimeDurationHookFunc(),
|
|
WeaklyTypedInput: true,
|
|
}
|
|
|
|
decoder, err := mapstructure.NewDecoder(dc)
|
|
if err != nil {
|
|
return c, err
|
|
}
|
|
|
|
if err := decoder.Decode(v); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if cc.Dir == "" {
|
|
return c, errors.New("must provide cache Dir")
|
|
}
|
|
|
|
name := strings.ToLower(k)
|
|
if !valid[name] {
|
|
return nil, errors.Errorf("%q is not a valid cache name", name)
|
|
}
|
|
|
|
c[name] = cc
|
|
}
|
|
|
|
// This is a very old flag in Hugo, but we need to respect it.
|
|
disabled := cfg.GetBool("ignoreCache")
|
|
|
|
for k, v := range c {
|
|
dir := filepath.ToSlash(filepath.Clean(v.Dir))
|
|
hadSlash := strings.HasPrefix(dir, "/")
|
|
parts := strings.Split(dir, "/")
|
|
|
|
for i, part := range parts {
|
|
if strings.HasPrefix(part, ":") {
|
|
resolved, isResource, err := resolveDirPlaceholder(fs, cfg, part)
|
|
if err != nil {
|
|
return c, err
|
|
}
|
|
if isResource {
|
|
v.isResourceDir = true
|
|
}
|
|
parts[i] = resolved
|
|
}
|
|
}
|
|
|
|
dir = path.Join(parts...)
|
|
if hadSlash {
|
|
dir = "/" + dir
|
|
}
|
|
v.Dir = filepath.Clean(filepath.FromSlash(dir))
|
|
|
|
if !v.isResourceDir {
|
|
if isOsFs && !filepath.IsAbs(v.Dir) {
|
|
return c, errors.Errorf("%q must resolve to an absolute directory", v.Dir)
|
|
}
|
|
|
|
// Avoid cache in root, e.g. / (Unix) or c:\ (Windows)
|
|
if len(strings.TrimPrefix(v.Dir, filepath.VolumeName(v.Dir))) == 1 {
|
|
return c, errors.Errorf("%q is a root folder and not allowed as cache dir", v.Dir)
|
|
}
|
|
}
|
|
|
|
if !strings.HasPrefix(v.Dir, "_gen") {
|
|
// We do cache eviction (file removes) and since the user can set
|
|
// his/hers own cache directory, we really want to make sure
|
|
// we do not delete any files that do not belong to this cache.
|
|
// We do add the cache name as the root, but this is an extra safe
|
|
// guard. We skip the files inside /resources/_gen/ because
|
|
// that would be breaking.
|
|
v.Dir = filepath.Join(v.Dir, filecacheRootDirname, k)
|
|
} else {
|
|
v.Dir = filepath.Join(v.Dir, k)
|
|
}
|
|
|
|
if disabled {
|
|
v.MaxAge = 0
|
|
}
|
|
|
|
c[k] = v
|
|
}
|
|
|
|
return c, nil
|
|
}
|
|
|
|
// Resolves :resourceDir => /myproject/resources etc., :cacheDir => ...
|
|
func resolveDirPlaceholder(fs afero.Fs, cfg config.Provider, placeholder string) (cacheDir string, isResource bool, err error) {
|
|
workingDir := cfg.GetString("workingDir")
|
|
|
|
switch strings.ToLower(placeholder) {
|
|
case ":resourcedir":
|
|
return "", true, nil
|
|
case ":cachedir":
|
|
d, err := helpers.GetCacheDir(fs, cfg)
|
|
return d, false, err
|
|
case ":project":
|
|
return filepath.Base(workingDir), false, nil
|
|
}
|
|
|
|
return "", false, errors.Errorf("%q is not a valid placeholder (valid values are :cacheDir or :resourceDir)", placeholder)
|
|
}
|