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 07:16:58 +00: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 files
|
|
|
|
|
|
|
|
import (
|
2020-03-09 11:04:33 +00:00
|
|
|
"bufio"
|
|
|
|
"fmt"
|
|
|
|
"io"
|
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 07:16:58 +00:00
|
|
|
"os"
|
|
|
|
"path/filepath"
|
|
|
|
"sort"
|
|
|
|
"strings"
|
2020-03-09 11:04:33 +00:00
|
|
|
"unicode"
|
|
|
|
|
|
|
|
"github.com/spf13/afero"
|
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 07:16:58 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
var (
|
|
|
|
// This should be the only list of valid extensions for content files.
|
|
|
|
contentFileExtensions = []string{
|
|
|
|
"html", "htm",
|
|
|
|
"mdown", "markdown", "md",
|
|
|
|
"asciidoc", "adoc", "ad",
|
|
|
|
"rest", "rst",
|
|
|
|
"mmark",
|
|
|
|
"org",
|
|
|
|
"pandoc", "pdc"}
|
|
|
|
|
|
|
|
contentFileExtensionsSet map[string]bool
|
2020-03-09 11:04:33 +00:00
|
|
|
|
|
|
|
htmlFileExtensions = []string{
|
|
|
|
"html", "htm"}
|
|
|
|
|
|
|
|
htmlFileExtensionsSet map[string]bool
|
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 07:16:58 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
func init() {
|
|
|
|
contentFileExtensionsSet = make(map[string]bool)
|
|
|
|
for _, ext := range contentFileExtensions {
|
|
|
|
contentFileExtensionsSet[ext] = true
|
|
|
|
}
|
2020-03-09 11:04:33 +00:00
|
|
|
htmlFileExtensionsSet = make(map[string]bool)
|
|
|
|
for _, ext := range htmlFileExtensions {
|
|
|
|
htmlFileExtensionsSet[ext] = true
|
|
|
|
}
|
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 07:16:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
func IsContentFile(filename string) bool {
|
|
|
|
return contentFileExtensionsSet[strings.TrimPrefix(filepath.Ext(filename), ".")]
|
|
|
|
}
|
|
|
|
|
2020-03-09 11:04:33 +00:00
|
|
|
func IsHTMLFile(filename string) bool {
|
|
|
|
return htmlFileExtensionsSet[strings.TrimPrefix(filepath.Ext(filename), ".")]
|
|
|
|
}
|
|
|
|
|
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 07:16:58 +00:00
|
|
|
func IsContentExt(ext string) bool {
|
|
|
|
return contentFileExtensionsSet[ext]
|
|
|
|
}
|
|
|
|
|
2019-09-10 09:26:34 +00:00
|
|
|
type ContentClass string
|
|
|
|
|
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 07:16:58 +00:00
|
|
|
const (
|
2019-09-10 09:26:34 +00:00
|
|
|
ContentClassLeaf ContentClass = "leaf"
|
|
|
|
ContentClassBranch ContentClass = "branch"
|
|
|
|
ContentClassFile ContentClass = "zfile" // Sort below
|
|
|
|
ContentClassContent ContentClass = "zcontent"
|
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 07:16:58 +00:00
|
|
|
)
|
|
|
|
|
2019-09-10 09:26:34 +00:00
|
|
|
func (c ContentClass) IsBundle() bool {
|
|
|
|
return c == ContentClassLeaf || c == ContentClassBranch
|
|
|
|
}
|
|
|
|
|
2020-03-09 11:04:33 +00:00
|
|
|
func ClassifyContentFile(filename string, open func() (afero.File, error)) ContentClass {
|
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 07:16:58 +00:00
|
|
|
if !IsContentFile(filename) {
|
|
|
|
return ContentClassFile
|
|
|
|
}
|
2020-03-09 11:04:33 +00:00
|
|
|
|
|
|
|
if IsHTMLFile(filename) {
|
|
|
|
// We need to look inside the file. If the first non-whitespace
|
|
|
|
// character is a "<", then we treat it as a regular file.
|
|
|
|
// Eearlier we created pages for these files, but that had all sorts
|
|
|
|
// of troubles, and isn't what it says in the documentation.
|
|
|
|
// See https://github.com/gohugoio/hugo/issues/7030
|
|
|
|
if open == nil {
|
|
|
|
panic(fmt.Sprintf("no file opener provided for %q", filename))
|
|
|
|
}
|
|
|
|
|
|
|
|
f, err := open()
|
|
|
|
if err != nil {
|
|
|
|
return ContentClassFile
|
|
|
|
}
|
|
|
|
ishtml := isHTMLContent(f)
|
|
|
|
f.Close()
|
|
|
|
if ishtml {
|
|
|
|
return ContentClassFile
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
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 07:16:58 +00:00
|
|
|
if strings.HasPrefix(filename, "_index.") {
|
|
|
|
return ContentClassBranch
|
|
|
|
}
|
|
|
|
|
|
|
|
if strings.HasPrefix(filename, "index.") {
|
|
|
|
return ContentClassLeaf
|
|
|
|
}
|
|
|
|
|
|
|
|
return ContentClassContent
|
|
|
|
}
|
|
|
|
|
2020-03-09 11:04:33 +00:00
|
|
|
var htmlComment = []rune{'<', '!', '-', '-'}
|
|
|
|
|
|
|
|
func isHTMLContent(r io.Reader) bool {
|
|
|
|
br := bufio.NewReader(r)
|
|
|
|
i := 0
|
|
|
|
for {
|
|
|
|
c, _, err := br.ReadRune()
|
|
|
|
if err != nil {
|
|
|
|
break
|
|
|
|
}
|
|
|
|
|
|
|
|
if i > 0 {
|
|
|
|
if i >= len(htmlComment) {
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
|
|
|
if c != htmlComment[i] {
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
|
|
|
|
i++
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
|
|
|
if !unicode.IsSpace(c) {
|
|
|
|
if i == 0 && c != '<' {
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
i++
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
|
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 07:16:58 +00:00
|
|
|
const (
|
|
|
|
ComponentFolderArchetypes = "archetypes"
|
|
|
|
ComponentFolderStatic = "static"
|
|
|
|
ComponentFolderLayouts = "layouts"
|
|
|
|
ComponentFolderContent = "content"
|
|
|
|
ComponentFolderData = "data"
|
|
|
|
ComponentFolderAssets = "assets"
|
|
|
|
ComponentFolderI18n = "i18n"
|
|
|
|
|
|
|
|
FolderResources = "resources"
|
|
|
|
)
|
|
|
|
|
|
|
|
var (
|
|
|
|
ComponentFolders = []string{
|
|
|
|
ComponentFolderArchetypes,
|
|
|
|
ComponentFolderStatic,
|
|
|
|
ComponentFolderLayouts,
|
|
|
|
ComponentFolderContent,
|
|
|
|
ComponentFolderData,
|
|
|
|
ComponentFolderAssets,
|
|
|
|
ComponentFolderI18n,
|
|
|
|
}
|
|
|
|
|
|
|
|
componentFoldersSet = make(map[string]bool)
|
|
|
|
)
|
|
|
|
|
|
|
|
func init() {
|
|
|
|
sort.Strings(ComponentFolders)
|
|
|
|
for _, f := range ComponentFolders {
|
|
|
|
componentFoldersSet[f] = true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// ResolveComponentFolder returns "content" from "content/blog/foo.md" etc.
|
|
|
|
func ResolveComponentFolder(filename string) string {
|
|
|
|
filename = strings.TrimPrefix(filename, string(os.PathSeparator))
|
|
|
|
for _, cf := range ComponentFolders {
|
|
|
|
if strings.HasPrefix(filename, cf) {
|
|
|
|
return cf
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return ""
|
|
|
|
}
|
|
|
|
|
|
|
|
func IsComponentFolder(name string) bool {
|
|
|
|
return componentFoldersSet[name]
|
|
|
|
}
|