diff --git a/module/assets/bootstrap/README.txt b/dependencies/assets/bootstrap/README.txt similarity index 100% rename from module/assets/bootstrap/README.txt rename to dependencies/assets/bootstrap/README.txt diff --git a/module/assets/bootstrap/scss/_vendor/README.txt b/dependencies/assets/bootstrap/scss/_vendor/README.txt similarity index 100% rename from module/assets/bootstrap/scss/_vendor/README.txt rename to dependencies/assets/bootstrap/scss/_vendor/README.txt diff --git a/module/assets/bootstrap/scss/_vendor/_rfs.scss b/dependencies/assets/bootstrap/scss/_vendor/_rfs.scss similarity index 100% rename from module/assets/bootstrap/scss/_vendor/_rfs.scss rename to dependencies/assets/bootstrap/scss/_vendor/_rfs.scss diff --git a/module/config.toml b/dependencies/config.toml similarity index 84% rename from module/config.toml rename to dependencies/config.toml index 3aa828a12c..fced225788 100644 --- a/module/config.toml +++ b/dependencies/config.toml @@ -4,10 +4,6 @@ _merge = "deep" [[module.mounts]] source = "assets/bootstrap/scss/_vendor" target = "assets/vendor/bootstrap/scss/vendor" -# mount user guide so that we can copy it to skeleton site -[[module.mounts]] - source = "userguide" - target = "assets/userguide" # mount asserts directory [[module.mounts]] source = "assets" diff --git a/dependencies/go.mod b/dependencies/go.mod new file mode 100644 index 0000000000..f151fcb953 --- /dev/null +++ b/dependencies/go.mod @@ -0,0 +1,3 @@ +module github.com/google/docsy/dependencies + +go 1.12 diff --git a/go.mod b/go.mod index 63544fe35c..72a37f6811 100644 --- a/go.mod +++ b/go.mod @@ -2,10 +2,8 @@ module github.com/google/docsy go 1.12 -//replace github.com/google/docsy/module v0.0.0-20220129185551-e4b42eecdf1d => e4b42eecdf1d - require ( github.com/FortAwesome/Font-Awesome v0.0.0-20210804190922-7d3d774145ac // indirect - github.com/google/docsy/module v0.2.0-pre // indirect + github.com/google/docsy/dependencies v0.2.0-pre // indirect github.com/twbs/bootstrap v4.6.1+incompatible // indirect ) diff --git a/go.sum b/go.sum index 54d7ffa3e7..7b9a0c9cc6 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,4 @@ github.com/FortAwesome/Font-Awesome v0.0.0-20210804190922-7d3d774145ac h1:AjwgwoaDsNEA1Wtc8pgw/BqG7SEk9bKxXPjEPQQ42vY= github.com/FortAwesome/Font-Awesome v0.0.0-20210804190922-7d3d774145ac/go.mod h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo= -github.com/google/docsy/module v0.0.0-20220129185551-e4b42eecdf1d h1:5f3AMLwAG2RrZrafxbbv1NE6EpGQkJCiSvJUkJVLYWc= -github.com/google/docsy/module v0.0.0-20220129185551-e4b42eecdf1d/go.mod h1:XSdPwCDtX3JK1d+wwDwQTSYQ2ZEHzghf/uhGIPoeDjw= github.com/twbs/bootstrap v4.6.1+incompatible h1:75PsBfPU1SS65ag0Z3Cq6JNXVAfUNfB0oCLHh9k9Fu8= github.com/twbs/bootstrap v4.6.1+incompatible/go.mod h1:fZTSrkpSf0/HkL0IIJzvVspTt1r9zuf7XlZau8kpcY0= diff --git a/module/go.mod b/module/go.mod deleted file mode 100644 index 5f3160bdcc..0000000000 --- a/module/go.mod +++ /dev/null @@ -1,3 +0,0 @@ -module github.com/google/docsy/module - -go 1.12 diff --git a/module/module.go b/module/module.go deleted file mode 100644 index d0c47a6fc0..0000000000 --- a/module/module.go +++ /dev/null @@ -1 +0,0 @@ -package module diff --git a/userguide/config.toml b/userguide/config.toml index 828f264d64..08e9f99617 100644 --- a/userguide/config.toml +++ b/userguide/config.toml @@ -1,32 +1,6 @@ baseURL = "/" title = "Docsy Example" -enableRobotsTXT = true - -# set docsy as theme, either locally or as module -theme = ["docsy"] -# theme = ["github.com/google/docsy", "github.com/google/docsy/module"] - -# when using docsy as module, instead of using -# theme = ["github.com/google/docsy", "github.com/google/docsy/module"] -# you may alternatively use the declaration given below: -#[module] -# # uncomment lines below for temporary local development of module -# # replacements = "github.com/google/docsy -> ../../docsy" -# # replacements = "github.com/google/docsy/module -> ../../docsy" -# [module.hugoVersion] -# extended = true -# min = "0.73.0" -# [[module.imports]] -# # pull in docsy as hugo module -# path = "github.com/google/docsy" -# [[module.imports]] -# # pull in workaround and dependencies -# path = "github.com/google/docsy/module" - -# Will give values to .Lastmod etc. -enableGitInfo = true - # Language settings contentDir = "content/en" defaultContentLanguage = "en" @@ -34,6 +8,15 @@ defaultContentLanguageInSubdir = false # Useful when translating. enableMissingTranslationPlaceholders = true +enableRobotsTXT = true + +# set docsy as theme, either locally or as hugo module +theme = ["docsy"] +# theme = ["github.com/google/docsy", "github.com/google/docsy/dependencies"] + +# Will give values to .Lastmod etc. +enableGitInfo = true + # disableKinds = ["taxonomy", "taxonomyTerm"] # Highlighting config