Add Hugo Modules
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
2019-05-03 03:16:58 -04:00
|
|
|
// Copyright 2019 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 modules
|
|
|
|
|
|
|
|
import (
|
|
|
|
"bufio"
|
|
|
|
"fmt"
|
|
|
|
"os"
|
|
|
|
"path/filepath"
|
|
|
|
"strings"
|
|
|
|
|
2019-07-31 02:21:17 -04:00
|
|
|
"github.com/gohugoio/hugo/common/loggers"
|
|
|
|
|
Add Hugo Modules
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
2019-05-03 03:16:58 -04:00
|
|
|
"github.com/spf13/cast"
|
|
|
|
|
|
|
|
"github.com/gohugoio/hugo/common/maps"
|
|
|
|
|
|
|
|
"github.com/gohugoio/hugo/common/hugo"
|
|
|
|
"github.com/gohugoio/hugo/parser/metadecoders"
|
|
|
|
|
|
|
|
"github.com/gohugoio/hugo/hugofs/files"
|
|
|
|
|
|
|
|
"github.com/rogpeppe/go-internal/module"
|
|
|
|
|
|
|
|
"github.com/pkg/errors"
|
|
|
|
|
|
|
|
"github.com/gohugoio/hugo/config"
|
|
|
|
"github.com/spf13/afero"
|
|
|
|
)
|
|
|
|
|
|
|
|
var ErrNotExist = errors.New("module does not exist")
|
|
|
|
|
|
|
|
const vendorModulesFilename = "modules.txt"
|
|
|
|
|
|
|
|
// IsNotExist returns whether an error means that a module could not be found.
|
|
|
|
func IsNotExist(err error) bool {
|
|
|
|
return errors.Cause(err) == ErrNotExist
|
|
|
|
}
|
|
|
|
|
|
|
|
// CreateProjectModule creates modules from the given config.
|
|
|
|
// This is used in tests only.
|
|
|
|
func CreateProjectModule(cfg config.Provider) (Module, error) {
|
|
|
|
workingDir := cfg.GetString("workingDir")
|
|
|
|
var modConfig Config
|
|
|
|
|
|
|
|
mod := createProjectModule(nil, workingDir, modConfig)
|
|
|
|
if err := ApplyProjectConfigDefaults(cfg, mod); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
return mod, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (h *Client) Collect() (ModulesConfig, error) {
|
|
|
|
mc, coll := h.collect(true)
|
2019-07-31 02:21:17 -04:00
|
|
|
if coll.err != nil {
|
|
|
|
return mc, coll.err
|
|
|
|
}
|
|
|
|
|
|
|
|
if err := (&mc).setActiveMods(h.logger); err != nil {
|
|
|
|
return mc, err
|
|
|
|
}
|
|
|
|
|
|
|
|
if h.ccfg.HookBeforeFinalize != nil {
|
|
|
|
if err := h.ccfg.HookBeforeFinalize(&mc); err != nil {
|
|
|
|
return mc, err
|
|
|
|
}
|
|
|
|
}
|
Add Hugo Modules
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
2019-05-03 03:16:58 -04:00
|
|
|
|
2019-07-31 02:21:17 -04:00
|
|
|
if err := (&mc).finalize(h.logger); err != nil {
|
|
|
|
return mc, err
|
|
|
|
}
|
|
|
|
|
|
|
|
return mc, nil
|
Add Hugo Modules
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
2019-05-03 03:16:58 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
func (h *Client) collect(tidy bool) (ModulesConfig, *collector) {
|
|
|
|
c := &collector{
|
|
|
|
Client: h,
|
|
|
|
}
|
|
|
|
|
|
|
|
c.collect()
|
|
|
|
if c.err != nil {
|
|
|
|
return ModulesConfig{}, c
|
|
|
|
}
|
|
|
|
|
2019-08-15 10:50:02 -04:00
|
|
|
// https://github.com/gohugoio/hugo/issues/6115
|
|
|
|
/*if !c.skipTidy && tidy {
|
Add Hugo Modules
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
2019-05-03 03:16:58 -04:00
|
|
|
if err := h.tidy(c.modules, true); err != nil {
|
|
|
|
c.err = err
|
|
|
|
return ModulesConfig{}, c
|
|
|
|
}
|
2019-08-15 10:50:02 -04:00
|
|
|
}*/
|
Add Hugo Modules
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
2019-05-03 03:16:58 -04:00
|
|
|
|
|
|
|
return ModulesConfig{
|
|
|
|
AllModules: c.modules,
|
|
|
|
GoModulesFilename: c.GoModulesFilename,
|
|
|
|
}, c
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
type ModulesConfig struct {
|
|
|
|
// All modules, including any disabled.
|
|
|
|
AllModules Modules
|
|
|
|
|
|
|
|
// All active modules.
|
|
|
|
ActiveModules Modules
|
|
|
|
|
|
|
|
// Set if this is a Go modules enabled project.
|
|
|
|
GoModulesFilename string
|
|
|
|
}
|
|
|
|
|
2019-07-31 02:21:17 -04:00
|
|
|
func (m *ModulesConfig) setActiveMods(logger *loggers.Logger) error {
|
|
|
|
var activeMods Modules
|
|
|
|
for _, mod := range m.AllModules {
|
|
|
|
if !mod.Config().HugoVersion.IsValid() {
|
|
|
|
logger.WARN.Printf(`Module %q is not compatible with this Hugo version; run "hugo mod graph" for more information.`, mod.Path())
|
|
|
|
}
|
|
|
|
if !mod.Disabled() {
|
|
|
|
activeMods = append(activeMods, mod)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
m.ActiveModules = activeMods
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (m *ModulesConfig) finalize(logger *loggers.Logger) error {
|
|
|
|
for _, mod := range m.AllModules {
|
|
|
|
m := mod.(*moduleAdapter)
|
|
|
|
m.mounts = filterUnwantedMounts(m.mounts)
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func filterUnwantedMounts(mounts []Mount) []Mount {
|
|
|
|
// Remove duplicates
|
|
|
|
seen := make(map[Mount]bool)
|
|
|
|
tmp := mounts[:0]
|
|
|
|
for _, m := range mounts {
|
|
|
|
if !seen[m] {
|
|
|
|
tmp = append(tmp, m)
|
|
|
|
}
|
|
|
|
seen[m] = true
|
|
|
|
}
|
|
|
|
return tmp
|
|
|
|
}
|
|
|
|
|
Add Hugo Modules
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
2019-05-03 03:16:58 -04:00
|
|
|
type collected struct {
|
|
|
|
// Pick the first and prevent circular loops.
|
|
|
|
seen map[string]bool
|
|
|
|
|
|
|
|
// Maps module path to a _vendor dir. These values are fetched from
|
|
|
|
// _vendor/modules.txt, and the first (top-most) will win.
|
|
|
|
vendored map[string]vendoredModule
|
|
|
|
|
|
|
|
// Set if a Go modules enabled project.
|
|
|
|
gomods goModules
|
|
|
|
|
|
|
|
// Ordered list of collected modules, including Go Modules and theme
|
|
|
|
// components stored below /themes.
|
|
|
|
modules Modules
|
|
|
|
}
|
|
|
|
|
|
|
|
// Collects and creates a module tree.
|
|
|
|
type collector struct {
|
|
|
|
*Client
|
|
|
|
|
|
|
|
// Store away any non-fatal error and return at the end.
|
|
|
|
err error
|
|
|
|
|
|
|
|
// Set to disable any Tidy operation in the end.
|
|
|
|
skipTidy bool
|
|
|
|
|
|
|
|
*collected
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *collector) initModules() error {
|
|
|
|
c.collected = &collected{
|
|
|
|
seen: make(map[string]bool),
|
|
|
|
vendored: make(map[string]vendoredModule),
|
|
|
|
}
|
|
|
|
|
|
|
|
// We may fail later if we don't find the mods.
|
|
|
|
return c.loadModules()
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *collector) isSeen(path string) bool {
|
|
|
|
key := pathKey(path)
|
|
|
|
if c.seen[key] {
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
c.seen[key] = true
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *collector) getVendoredDir(path string) (vendoredModule, bool) {
|
|
|
|
v, found := c.vendored[path]
|
|
|
|
return v, found
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *collector) add(owner *moduleAdapter, moduleImport Import, disabled bool) (*moduleAdapter, error) {
|
|
|
|
var (
|
|
|
|
mod *goModule
|
|
|
|
moduleDir string
|
|
|
|
version string
|
|
|
|
vendored bool
|
|
|
|
)
|
|
|
|
|
|
|
|
modulePath := moduleImport.Path
|
|
|
|
var realOwner Module = owner
|
|
|
|
|
2019-07-31 02:21:17 -04:00
|
|
|
if !c.ccfg.IgnoreVendor {
|
Add Hugo Modules
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
2019-05-03 03:16:58 -04:00
|
|
|
if err := c.collectModulesTXT(owner); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
// Try _vendor first.
|
|
|
|
var vm vendoredModule
|
|
|
|
vm, vendored = c.getVendoredDir(modulePath)
|
|
|
|
if vendored {
|
|
|
|
moduleDir = vm.Dir
|
|
|
|
realOwner = vm.Owner
|
|
|
|
version = vm.Version
|
|
|
|
|
|
|
|
if owner.projectMod {
|
|
|
|
// We want to keep the go.mod intact with the versions and all.
|
|
|
|
c.skipTidy = true
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if moduleDir == "" {
|
|
|
|
mod = c.gomods.GetByPath(modulePath)
|
|
|
|
if mod != nil {
|
|
|
|
moduleDir = mod.Dir
|
|
|
|
}
|
|
|
|
|
|
|
|
if moduleDir == "" {
|
2019-09-03 06:58:02 -04:00
|
|
|
if c.GoModulesFilename != "" && isProbablyModule(modulePath) {
|
Add Hugo Modules
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
2019-05-03 03:16:58 -04:00
|
|
|
// Try to "go get" it and reload the module configuration.
|
|
|
|
if err := c.Get(modulePath); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
if err := c.loadModules(); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
mod = c.gomods.GetByPath(modulePath)
|
|
|
|
if mod != nil {
|
|
|
|
moduleDir = mod.Dir
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Fall back to /themes/<mymodule>
|
|
|
|
if moduleDir == "" {
|
2019-07-31 02:21:17 -04:00
|
|
|
moduleDir = filepath.Join(c.ccfg.ThemesDir, modulePath)
|
Add Hugo Modules
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
2019-05-03 03:16:58 -04:00
|
|
|
|
|
|
|
if found, _ := afero.Exists(c.fs, moduleDir); !found {
|
2019-07-31 02:21:17 -04:00
|
|
|
c.err = c.wrapModuleNotFound(errors.Errorf(`module %q not found; either add it as a Hugo Module or store it in %q.`, modulePath, c.ccfg.ThemesDir))
|
Add Hugo Modules
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
2019-05-03 03:16:58 -04:00
|
|
|
return nil, nil
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if found, _ := afero.Exists(c.fs, moduleDir); !found {
|
|
|
|
c.err = c.wrapModuleNotFound(errors.Errorf("%q not found", moduleDir))
|
|
|
|
return nil, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
if !strings.HasSuffix(moduleDir, fileSeparator) {
|
|
|
|
moduleDir += fileSeparator
|
|
|
|
}
|
|
|
|
|
|
|
|
ma := &moduleAdapter{
|
|
|
|
dir: moduleDir,
|
|
|
|
vendor: vendored,
|
|
|
|
disabled: disabled,
|
|
|
|
gomod: mod,
|
|
|
|
version: version,
|
|
|
|
// This may be the owner of the _vendor dir
|
|
|
|
owner: realOwner,
|
|
|
|
}
|
|
|
|
|
|
|
|
if mod == nil {
|
|
|
|
ma.path = modulePath
|
|
|
|
}
|
|
|
|
|
|
|
|
if !moduleImport.IgnoreConfig {
|
|
|
|
if err := c.applyThemeConfig(ma); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if err := c.applyMounts(moduleImport, ma); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
c.modules = append(c.modules, ma)
|
|
|
|
return ma, nil
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *collector) addAndRecurse(owner *moduleAdapter, disabled bool) error {
|
|
|
|
moduleConfig := owner.Config()
|
|
|
|
if owner.projectMod {
|
|
|
|
if err := c.applyMounts(Import{}, owner); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, moduleImport := range moduleConfig.Imports {
|
2019-07-24 15:46:24 -04:00
|
|
|
disabled := disabled || moduleImport.Disable
|
Add Hugo Modules
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
2019-05-03 03:16:58 -04:00
|
|
|
|
|
|
|
if !c.isSeen(moduleImport.Path) {
|
|
|
|
tc, err := c.add(owner, moduleImport, disabled)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
if tc == nil {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
if err := c.addAndRecurse(tc, disabled); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *collector) applyMounts(moduleImport Import, mod *moduleAdapter) error {
|
|
|
|
mounts := moduleImport.Mounts
|
|
|
|
|
2019-07-30 07:35:16 -04:00
|
|
|
modConfig := mod.Config()
|
|
|
|
|
|
|
|
if len(mounts) == 0 {
|
|
|
|
// Mounts not defined by the import.
|
Add Hugo Modules
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
2019-05-03 03:16:58 -04:00
|
|
|
mounts = modConfig.Mounts
|
2019-07-30 07:35:16 -04:00
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if !mod.projectMod && len(mounts) == 0 {
|
|
|
|
// Create default mount points for every component folder that
|
|
|
|
// exists in the module.
|
|
|
|
for _, componentFolder := range files.ComponentFolders {
|
|
|
|
sourceDir := filepath.Join(mod.Dir(), componentFolder)
|
|
|
|
_, err := c.fs.Stat(sourceDir)
|
|
|
|
if err == nil {
|
|
|
|
mounts = append(mounts, Mount{
|
|
|
|
Source: componentFolder,
|
|
|
|
Target: componentFolder,
|
|
|
|
})
|
Add Hugo Modules
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
2019-05-03 03:16:58 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
var err error
|
|
|
|
mounts, err = c.normalizeMounts(mod, mounts)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
mod.mounts = mounts
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *collector) applyThemeConfig(tc *moduleAdapter) error {
|
|
|
|
|
|
|
|
var (
|
|
|
|
configFilename string
|
|
|
|
cfg config.Provider
|
|
|
|
themeCfg map[string]interface{}
|
|
|
|
hasConfig bool
|
|
|
|
err error
|
|
|
|
)
|
|
|
|
|
|
|
|
// Viper supports more, but this is the sub-set supported by Hugo.
|
|
|
|
for _, configFormats := range config.ValidConfigFileExtensions {
|
|
|
|
configFilename = filepath.Join(tc.Dir(), "config."+configFormats)
|
|
|
|
hasConfig, _ = afero.Exists(c.fs, configFilename)
|
|
|
|
if hasConfig {
|
|
|
|
break
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// The old theme information file.
|
|
|
|
themeTOML := filepath.Join(tc.Dir(), "theme.toml")
|
|
|
|
|
|
|
|
hasThemeTOML, _ := afero.Exists(c.fs, themeTOML)
|
|
|
|
if hasThemeTOML {
|
|
|
|
data, err := afero.ReadFile(c.fs, themeTOML)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
themeCfg, err = metadecoders.Default.UnmarshalToMap(data, metadecoders.TOML)
|
|
|
|
if err != nil {
|
2019-08-13 11:15:52 -04:00
|
|
|
c.logger.WARN.Printf("Failed to read module config for %q in %q: %s", tc.Path(), themeTOML, err)
|
|
|
|
} else {
|
|
|
|
maps.ToLower(themeCfg)
|
Add Hugo Modules
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
2019-05-03 03:16:58 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if hasConfig {
|
|
|
|
if configFilename != "" {
|
|
|
|
var err error
|
|
|
|
cfg, err = config.FromFile(c.fs, configFilename)
|
|
|
|
if err != nil {
|
|
|
|
return errors.Wrapf(err, "failed to read module config for %q in %q", tc.Path(), configFilename)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
tc.configFilename = configFilename
|
|
|
|
tc.cfg = cfg
|
|
|
|
}
|
|
|
|
|
|
|
|
config, err := DecodeConfig(cfg)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
const oldVersionKey = "min_version"
|
|
|
|
|
|
|
|
if hasThemeTOML {
|
|
|
|
|
|
|
|
// Merge old with new
|
|
|
|
if minVersion, found := themeCfg[oldVersionKey]; found {
|
|
|
|
if config.HugoVersion.Min == "" {
|
|
|
|
config.HugoVersion.Min = hugo.VersionString(cast.ToString(minVersion))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if config.Params == nil {
|
|
|
|
config.Params = make(map[string]interface{})
|
|
|
|
}
|
|
|
|
|
|
|
|
for k, v := range themeCfg {
|
|
|
|
if k == oldVersionKey {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
config.Params[k] = v
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
tc.config = config
|
|
|
|
|
|
|
|
return nil
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *collector) collect() {
|
|
|
|
if err := c.initModules(); err != nil {
|
|
|
|
c.err = err
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2019-07-31 02:21:17 -04:00
|
|
|
projectMod := createProjectModule(c.gomods.GetMain(), c.ccfg.WorkingDir, c.moduleConfig)
|
Add Hugo Modules
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
2019-05-03 03:16:58 -04:00
|
|
|
|
|
|
|
if err := c.addAndRecurse(projectMod, false); err != nil {
|
|
|
|
c.err = err
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2019-07-31 04:31:26 -04:00
|
|
|
// Add the project mod on top.
|
|
|
|
c.modules = append(Modules{projectMod}, c.modules...)
|
Add Hugo Modules
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
2019-05-03 03:16:58 -04:00
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *collector) collectModulesTXT(owner Module) error {
|
|
|
|
vendorDir := filepath.Join(owner.Dir(), vendord)
|
|
|
|
filename := filepath.Join(vendorDir, vendorModulesFilename)
|
|
|
|
|
|
|
|
f, err := c.fs.Open(filename)
|
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
if os.IsNotExist(err) {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
defer f.Close()
|
|
|
|
|
|
|
|
scanner := bufio.NewScanner(f)
|
|
|
|
|
|
|
|
for scanner.Scan() {
|
|
|
|
// # github.com/alecthomas/chroma v0.6.3
|
|
|
|
line := scanner.Text()
|
|
|
|
line = strings.Trim(line, "# ")
|
|
|
|
line = strings.TrimSpace(line)
|
|
|
|
parts := strings.Fields(line)
|
|
|
|
if len(parts) != 2 {
|
|
|
|
return errors.Errorf("invalid modules list: %q", filename)
|
|
|
|
}
|
|
|
|
path := parts[0]
|
|
|
|
if _, found := c.vendored[path]; !found {
|
|
|
|
c.vendored[path] = vendoredModule{
|
|
|
|
Owner: owner,
|
|
|
|
Dir: filepath.Join(vendorDir, path),
|
|
|
|
Version: parts[1],
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *collector) loadModules() error {
|
|
|
|
modules, err := c.listGoMods()
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
c.gomods = modules
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *collector) normalizeMounts(owner Module, mounts []Mount) ([]Mount, error) {
|
|
|
|
var out []Mount
|
|
|
|
dir := owner.Dir()
|
|
|
|
|
|
|
|
for _, mnt := range mounts {
|
|
|
|
errMsg := fmt.Sprintf("invalid module config for %q", owner.Path())
|
|
|
|
|
|
|
|
if mnt.Source == "" || mnt.Target == "" {
|
|
|
|
return nil, errors.New(errMsg + ": both source and target must be set")
|
|
|
|
}
|
|
|
|
|
|
|
|
mnt.Source = filepath.Clean(mnt.Source)
|
|
|
|
mnt.Target = filepath.Clean(mnt.Target)
|
|
|
|
|
|
|
|
// Verify that Source exists
|
|
|
|
sourceDir := filepath.Join(dir, mnt.Source)
|
|
|
|
_, err := c.fs.Stat(sourceDir)
|
|
|
|
if err != nil {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
|
|
|
// Verify that target points to one of the predefined component dirs
|
|
|
|
targetBase := mnt.Target
|
|
|
|
idxPathSep := strings.Index(mnt.Target, string(os.PathSeparator))
|
|
|
|
if idxPathSep != -1 {
|
|
|
|
targetBase = mnt.Target[0:idxPathSep]
|
|
|
|
}
|
|
|
|
if !files.IsComponentFolder(targetBase) {
|
|
|
|
return nil, errors.Errorf("%s: mount target must be one of: %v", errMsg, files.ComponentFolders)
|
|
|
|
}
|
|
|
|
|
|
|
|
out = append(out, mnt)
|
|
|
|
}
|
|
|
|
|
|
|
|
return out, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *collector) wrapModuleNotFound(err error) error {
|
|
|
|
err = errors.Wrap(ErrNotExist, err.Error())
|
|
|
|
if c.GoModulesFilename == "" {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
baseMsg := "we found a go.mod file in your project, but"
|
|
|
|
|
|
|
|
switch c.goBinaryStatus {
|
|
|
|
case goBinaryStatusNotFound:
|
|
|
|
return errors.Wrap(err, baseMsg+" you need to install Go to use it. See https://golang.org/dl/.")
|
|
|
|
case goBinaryStatusTooOld:
|
|
|
|
return errors.Wrap(err, baseMsg+" you need to a newer version of Go to use it. See https://golang.org/dl/.")
|
|
|
|
}
|
|
|
|
|
|
|
|
return err
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
type vendoredModule struct {
|
|
|
|
Owner Module
|
|
|
|
Dir string
|
|
|
|
Version string
|
|
|
|
}
|
|
|
|
|
|
|
|
func createProjectModule(gomod *goModule, workingDir string, conf Config) *moduleAdapter {
|
|
|
|
// Create a pseudo module for the main project.
|
|
|
|
var path string
|
|
|
|
if gomod == nil {
|
|
|
|
path = "project"
|
|
|
|
}
|
|
|
|
|
|
|
|
return &moduleAdapter{
|
|
|
|
path: path,
|
|
|
|
dir: workingDir,
|
|
|
|
gomod: gomod,
|
|
|
|
projectMod: true,
|
|
|
|
config: conf,
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
// In the first iteration of Hugo Modules, we do not support multiple
|
|
|
|
// major versions running at the same time, so we pick the first (upper most).
|
|
|
|
// We will investigate namespaces in future versions.
|
|
|
|
// TODO(bep) add a warning when the above happens.
|
|
|
|
func pathKey(p string) string {
|
|
|
|
prefix, _, _ := module.SplitPathVersion(p)
|
|
|
|
|
|
|
|
return strings.ToLower(prefix)
|
|
|
|
}
|