diff options
52 files changed, 67 insertions, 67 deletions
diff --git a/commands/convert.go b/commands/convert.go index e40f5fa40..298ff6019 100644 --- a/commands/convert.go +++ b/commands/convert.go @@ -19,10 +19,10 @@ import ( "path/filepath" "time" - "github.com/spf13/cast" - "github.com/spf13/cobra" "github.com/gohugoio/hugo/hugolib" "github.com/gohugoio/hugo/parser" + "github.com/spf13/cast" + "github.com/spf13/cobra" ) var outputDir string diff --git a/commands/gendoc.go b/commands/gendoc.go index 70e87dd6f..c4840050b 100644 --- a/commands/gendoc.go +++ b/commands/gendoc.go @@ -20,10 +20,10 @@ import ( "strings" "time" - "github.com/spf13/cobra" - "github.com/spf13/cobra/doc" "github.com/gohugoio/hugo/helpers" "github.com/gohugoio/hugo/hugofs" + "github.com/spf13/cobra" + "github.com/spf13/cobra/doc" jww "github.com/spf13/jwalterweatherman" ) diff --git a/commands/gendocshelper.go b/commands/gendocshelper.go index 1d83232ec..ca781242e 100644 --- a/commands/gendocshelper.go +++ b/commands/gendocshelper.go @@ -19,8 +19,8 @@ import ( "os" "path/filepath" - "github.com/spf13/cobra" "github.com/gohugoio/hugo/docshelper" + "github.com/spf13/cobra" ) type genDocsHelper struct { diff --git a/commands/genman.go b/commands/genman.go index dd85a6e6a..004e669e7 100644 --- a/commands/genman.go +++ b/commands/genman.go @@ -17,10 +17,10 @@ import ( "fmt" "strings" - "github.com/spf13/cobra" - "github.com/spf13/cobra/doc" "github.com/gohugoio/hugo/helpers" "github.com/gohugoio/hugo/hugofs" + "github.com/spf13/cobra" + "github.com/spf13/cobra/doc" jww "github.com/spf13/jwalterweatherman" ) diff --git a/commands/hugo.go b/commands/hugo.go index 918e76474..b965ba167 100644 --- a/commands/hugo.go +++ b/commands/hugo.go @@ -38,15 +38,15 @@ import ( "regexp" "github.com/fsnotify/fsnotify" - "github.com/spf13/afero" - "github.com/spf13/cobra" - "github.com/spf13/fsync" "github.com/gohugoio/hugo/deps" "github.com/gohugoio/hugo/helpers" "github.com/gohugoio/hugo/hugolib" "github.com/gohugoio/hugo/livereload" "github.com/gohugoio/hugo/utils" "github.com/gohugoio/hugo/watcher" + "github.com/spf13/afero" + "github.com/spf13/cobra" + "github.com/spf13/fsync" jww "github.com/spf13/jwalterweatherman" "github.com/spf13/nitro" "github.com/spf13/viper" diff --git a/commands/import_jekyll.go b/commands/import_jekyll.go index 37f06bb2f..26a41c82a 100644 --- a/commands/import_jekyll.go +++ b/commands/import_jekyll.go @@ -25,13 +25,13 @@ import ( "strings" "time" - "github.com/spf13/afero" - "github.com/spf13/cast" - "github.com/spf13/cobra" "github.com/gohugoio/hugo/helpers" "github.com/gohugoio/hugo/hugofs" "github.com/gohugoio/hugo/hugolib" "github.com/gohugoio/hugo/parser" + "github.com/spf13/afero" + "github.com/spf13/cast" + "github.com/spf13/cobra" jww "github.com/spf13/jwalterweatherman" ) diff --git a/commands/list.go b/commands/list.go index 4f3319c57..b2a6b5395 100644 --- a/commands/list.go +++ b/commands/list.go @@ -16,8 +16,8 @@ package commands import ( "path/filepath" - "github.com/spf13/cobra" "github.com/gohugoio/hugo/hugolib" + "github.com/spf13/cobra" jww "github.com/spf13/jwalterweatherman" ) diff --git a/commands/new.go b/commands/new.go index 5b48abaf1..24f34b549 100644 --- a/commands/new.go +++ b/commands/new.go @@ -22,13 +22,13 @@ import ( "strings" "time" - "github.com/spf13/afero" - "github.com/spf13/cobra" "github.com/gohugoio/hugo/create" "github.com/gohugoio/hugo/helpers" "github.com/gohugoio/hugo/hugofs" "github.com/gohugoio/hugo/hugolib" "github.com/gohugoio/hugo/parser" + "github.com/spf13/afero" + "github.com/spf13/cobra" jww "github.com/spf13/jwalterweatherman" "github.com/spf13/viper" ) diff --git a/commands/release.go b/commands/release.go index c306b2c2b..c9275a0f0 100644 --- a/commands/release.go +++ b/commands/release.go @@ -16,8 +16,8 @@ package commands import ( - "github.com/spf13/cobra" "github.com/gohugoio/hugo/releaser" + "github.com/spf13/cobra" ) func init() { diff --git a/commands/server.go b/commands/server.go index 0c16b959f..32a94f9c8 100644 --- a/commands/server.go +++ b/commands/server.go @@ -24,10 +24,10 @@ import ( "strings" "time" - "github.com/spf13/afero" - "github.com/spf13/cobra" "github.com/gohugoio/hugo/config" "github.com/gohugoio/hugo/helpers" + "github.com/spf13/afero" + "github.com/spf13/cobra" jww "github.com/spf13/jwalterweatherman" ) diff --git a/commands/undraft.go b/commands/undraft.go index ae17ab34d..2a3b85360 100644 --- a/commands/undraft.go +++ b/commands/undraft.go @@ -19,8 +19,8 @@ import ( "os" "time" - "github.com/spf13/cobra" "github.com/gohugoio/hugo/parser" + "github.com/spf13/cobra" ) var undraftCmd = &cobra.Command{ diff --git a/commands/version.go b/commands/version.go index a05967d21..5cd398b2b 100644 --- a/commands/version.go +++ b/commands/version.go @@ -20,10 +20,10 @@ import ( "strings" "time" - "github.com/kardianos/osext" - "github.com/spf13/cobra" "github.com/gohugoio/hugo/helpers" "github.com/gohugoio/hugo/hugolib" + "github.com/kardianos/osext" + "github.com/spf13/cobra" jww "github.com/spf13/jwalterweatherman" ) diff --git a/create/content.go b/create/content.go index 29c99d471..a62227176 100644 --- a/create/content.go +++ b/create/content.go @@ -22,11 +22,11 @@ import ( "strings" "time" - "github.com/spf13/afero" - "github.com/spf13/cast" "github.com/gohugoio/hugo/helpers" "github.com/gohugoio/hugo/hugolib" "github.com/gohugoio/hugo/parser" + "github.com/spf13/afero" + "github.com/spf13/cast" jww "github.com/spf13/jwalterweatherman" ) diff --git a/create/content_test.go b/create/content_test.go index 9728c1c96..8eaaf7bf5 100644 --- a/create/content_test.go +++ b/create/content_test.go @@ -27,9 +27,9 @@ import ( "github.com/gohugoio/hugo/hugofs" - "github.com/spf13/afero" "github.com/gohugoio/hugo/create" "github.com/gohugoio/hugo/helpers" + "github.com/spf13/afero" "github.com/spf13/viper" "github.com/stretchr/testify/require" ) diff --git a/helpers/content.go b/helpers/content.go index afd8c7c37..bb547de25 100644 --- a/helpers/content.go +++ b/helpers/content.go @@ -26,11 +26,11 @@ import ( "unicode/utf8" "github.com/chaseadamsio/goorgeous" + bp "github.com/gohugoio/hugo/bufferpool" + "github.com/gohugoio/hugo/config" "github.com/miekg/mmark" "github.com/mitchellh/mapstructure" "github.com/russross/blackfriday" - bp "github.com/gohugoio/hugo/bufferpool" - "github.com/gohugoio/hugo/config" jww "github.com/spf13/jwalterweatherman" "strings" diff --git a/helpers/content_renderer.go b/helpers/content_renderer.go index 49f11bc84..f0d8cda12 100644 --- a/helpers/content_renderer.go +++ b/helpers/content_renderer.go @@ -17,9 +17,9 @@ import ( "bytes" "html" + "github.com/gohugoio/hugo/config" "github.com/miekg/mmark" "github.com/russross/blackfriday" - "github.com/gohugoio/hugo/config" jww "github.com/spf13/jwalterweatherman" ) diff --git a/helpers/emoji_test.go b/helpers/emoji_test.go index 311ff644f..f9189eb43 100644 --- a/helpers/emoji_test.go +++ b/helpers/emoji_test.go @@ -18,8 +18,8 @@ import ( "strings" "testing" - "github.com/kyokomi/emoji" "github.com/gohugoio/hugo/bufferpool" + "github.com/kyokomi/emoji" ) func TestEmojiCustom(t *testing.T) { diff --git a/helpers/general.go b/helpers/general.go index d3dedc774..7901be654 100644 --- a/helpers/general.go +++ b/helpers/general.go @@ -26,8 +26,8 @@ import ( "unicode" "unicode/utf8" - "github.com/spf13/cast" bp "github.com/gohugoio/hugo/bufferpool" + "github.com/spf13/cast" jww "github.com/spf13/jwalterweatherman" "github.com/spf13/pflag" ) diff --git a/helpers/language.go b/helpers/language.go index ba2eeb8f6..67db59d25 100644 --- a/helpers/language.go +++ b/helpers/language.go @@ -18,8 +18,8 @@ import ( "strings" "sync" - "github.com/spf13/cast" "github.com/gohugoio/hugo/config" + "github.com/spf13/cast" ) // These are the settings that should only be looked up in the global Viper diff --git a/helpers/path_test.go b/helpers/path_test.go index b2e5f65a3..5c0ae10ea 100644 --- a/helpers/path_test.go +++ b/helpers/path_test.go @@ -29,8 +29,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/spf13/afero" "github.com/gohugoio/hugo/hugofs" + "github.com/spf13/afero" "github.com/spf13/viper" ) diff --git a/hugofs/fs.go b/hugofs/fs.go index 92e89d4cc..71c0dade0 100644 --- a/hugofs/fs.go +++ b/hugofs/fs.go @@ -15,8 +15,8 @@ package hugofs import ( - "github.com/spf13/afero" "github.com/gohugoio/hugo/config" + "github.com/spf13/afero" ) // Os points to an Os Afero file system. diff --git a/hugolib/case_insensitive_test.go b/hugolib/case_insensitive_test.go index d065a6923..ca63196b3 100644 --- a/hugolib/case_insensitive_test.go +++ b/hugolib/case_insensitive_test.go @@ -19,9 +19,9 @@ import ( "strings" "testing" - "github.com/spf13/afero" "github.com/gohugoio/hugo/deps" "github.com/gohugoio/hugo/hugofs" + "github.com/spf13/afero" "github.com/stretchr/testify/require" ) diff --git a/hugolib/config.go b/hugolib/config.go index 80b7bff39..62cdea952 100644 --- a/hugolib/config.go +++ b/hugolib/config.go @@ -16,8 +16,8 @@ package hugolib import ( "fmt" - "github.com/spf13/afero" "github.com/gohugoio/hugo/helpers" + "github.com/spf13/afero" "github.com/spf13/viper" ) diff --git a/hugolib/disableKinds_test.go b/hugolib/disableKinds_test.go index 81f277c72..736d461db 100644 --- a/hugolib/disableKinds_test.go +++ b/hugolib/disableKinds_test.go @@ -18,8 +18,8 @@ import ( "fmt" - "github.com/spf13/afero" "github.com/gohugoio/hugo/deps" + "github.com/spf13/afero" "github.com/gohugoio/hugo/helpers" "github.com/gohugoio/hugo/hugofs" diff --git a/hugolib/hugo_sites_build_test.go b/hugolib/hugo_sites_build_test.go index 06867ab3d..988a36916 100644 --- a/hugolib/hugo_sites_build_test.go +++ b/hugolib/hugo_sites_build_test.go @@ -13,11 +13,11 @@ import ( "github.com/fortytw2/leaktest" "github.com/fsnotify/fsnotify" - "github.com/spf13/afero" "github.com/gohugoio/hugo/deps" "github.com/gohugoio/hugo/helpers" "github.com/gohugoio/hugo/hugofs" "github.com/gohugoio/hugo/source" + "github.com/spf13/afero" "github.com/spf13/viper" "github.com/stretchr/testify/require" ) diff --git a/hugolib/multilingual.go b/hugolib/multilingual.go index 04efe6386..575be1396 100644 --- a/hugolib/multilingual.go +++ b/hugolib/multilingual.go @@ -21,9 +21,9 @@ import ( "errors" "fmt" - "github.com/spf13/cast" "github.com/gohugoio/hugo/config" "github.com/gohugoio/hugo/helpers" + "github.com/spf13/cast" ) type Multilingual struct { diff --git a/hugolib/page.go b/hugolib/page.go index a0ea7183c..d4aca37a4 100644 --- a/hugolib/page.go +++ b/hugolib/page.go @@ -21,10 +21,10 @@ import ( "github.com/bep/gitmap" - "github.com/mitchellh/mapstructure" "github.com/gohugoio/hugo/helpers" "github.com/gohugoio/hugo/output" "github.com/gohugoio/hugo/parser" + "github.com/mitchellh/mapstructure" "html/template" "io" @@ -36,9 +36,9 @@ import ( "time" "unicode/utf8" - "github.com/spf13/cast" bp "github.com/gohugoio/hugo/bufferpool" "github.com/gohugoio/hugo/source" + "github.com/spf13/cast" ) var ( diff --git a/hugolib/page_test.go b/hugolib/page_test.go index dbb7e38ee..352c7dd41 100644 --- a/hugolib/page_test.go +++ b/hugolib/page_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/spf13/cast" "github.com/gohugoio/hugo/deps" "github.com/gohugoio/hugo/helpers" + "github.com/spf13/cast" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/hugolib/site.go b/hugolib/site.go index 78f02ff80..829023d15 100644 --- a/hugolib/site.go +++ b/hugolib/site.go @@ -37,8 +37,6 @@ import ( "sync/atomic" "github.com/fsnotify/fsnotify" - "github.com/spf13/afero" - "github.com/spf13/cast" bp "github.com/gohugoio/hugo/bufferpool" "github.com/gohugoio/hugo/deps" "github.com/gohugoio/hugo/helpers" @@ -47,6 +45,8 @@ import ( "github.com/gohugoio/hugo/source" "github.com/gohugoio/hugo/tpl" "github.com/gohugoio/hugo/transform" + "github.com/spf13/afero" + "github.com/spf13/cast" "github.com/spf13/nitro" "github.com/spf13/viper" ) diff --git a/hugolib/site_output.go b/hugolib/site_output.go index cbd85f35b..f5eb2ba57 100644 --- a/hugolib/site_output.go +++ b/hugolib/site_output.go @@ -18,10 +18,10 @@ import ( "path" "strings" - "github.com/spf13/cast" "github.com/gohugoio/hugo/config" "github.com/gohugoio/hugo/helpers" "github.com/gohugoio/hugo/output" + "github.com/spf13/cast" ) func createSiteOutputFormats(allFormats output.Formats, cfg config.Provider) (map[string]output.Formats, error) { diff --git a/hugolib/site_sections.go b/hugolib/site_sections.go index 0e4370118..f8d9c9d1f 100644 --- a/hugolib/site_sections.go +++ b/hugolib/site_sections.go @@ -19,8 +19,8 @@ import ( "strconv" "strings" - radix "github.com/hashicorp/go-immutable-radix" "github.com/gohugoio/hugo/helpers" + radix "github.com/hashicorp/go-immutable-radix" ) // Deprecated: Use .Site.Home.Sections. diff --git a/hugolib/testhelpers_test.go b/hugolib/testhelpers_test.go index 6439efb09..c386e6203 100644 --- a/hugolib/testhelpers_test.go +++ b/hugolib/testhelpers_test.go @@ -9,9 +9,9 @@ import ( "fmt" "strings" - "github.com/spf13/afero" "github.com/gohugoio/hugo/config" "github.com/gohugoio/hugo/deps" + "github.com/spf13/afero" "github.com/gohugoio/hugo/helpers" "github.com/gohugoio/hugo/source" diff --git a/i18n/i18n.go b/i18n/i18n.go index c7f8b5827..73417fb32 100644 --- a/ |