From 770a118801264e06ca2f216be1b539458bbd725b Mon Sep 17 00:00:00 2001 From: Andreas Deininger Date: Tue, 7 Dec 2021 18:02:42 +0100 Subject: [PATCH] Turning docsy theme into a hugo module --- config.toml | 17 +++++++++++++++++ go.mod | 8 ++++++++ go.sum | 4 ++++ netlify.toml | 3 ++- userguide/config.toml | 11 +++++++++++ userguide/go.mod | 8 ++++++++ userguide/go.sum | 2 ++ 7 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 go.mod create mode 100644 go.sum create mode 100644 userguide/go.mod create mode 100644 userguide/go.sum diff --git a/config.toml b/config.toml index 4f56aa5179..799d10b67a 100644 --- a/config.toml +++ b/config.toml @@ -25,3 +25,20 @@ isHTML = true mediaType = "text/html" path = "_print" permalinkable = false + + +# Dependencies are brought in as modules +# and mount points are declared +[[module.imports]] + path = "github.com/twbs/bootstrap" + disable = true +[[module.imports.mounts]] + source = "scss" + target = "assets/vendor/bootstrap/scss" + +[[module.imports]] + path = "github.com/FortAwesome/Font-Awesome" + disable = true +[[module.imports.mounts]] + source = "scss" + target = "assets/vendor/Font-Awesome/scss" diff --git a/go.mod b/go.mod new file mode 100644 index 0000000000..774e9b5f59 --- /dev/null +++ b/go.mod @@ -0,0 +1,8 @@ +module github.com/google/docsy + +go 1.17 + +require ( + github.com/FortAwesome/Font-Awesome v0.0.0-20210804190922-7d3d774145ac // indirect + github.com/twbs/bootstrap v4.6.1+incompatible // indirect +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000000..7b9a0c9cc6 --- /dev/null +++ b/go.sum @@ -0,0 +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/twbs/bootstrap v4.6.1+incompatible h1:75PsBfPU1SS65ag0Z3Cq6JNXVAfUNfB0oCLHh9k9Fu8= +github.com/twbs/bootstrap v4.6.1+incompatible/go.mod h1:fZTSrkpSf0/HkL0IIJzvVspTt1r9zuf7XlZau8kpcY0= diff --git a/netlify.toml b/netlify.toml index c3ca6668fb..ff26007fca 100644 --- a/netlify.toml +++ b/netlify.toml @@ -6,7 +6,8 @@ publish = "userguide/public" command = "npm install && npm run build:preview" [build.environment] -HUGO_VERSION = "0.89.4" +HUGO_VERSION = "0.92.0" +GO_VERSION = "1.17.6" HUGO_THEME = "repo" [context.production] diff --git a/userguide/config.toml b/userguide/config.toml index df76c4fdff..90c1003f55 100644 --- a/userguide/config.toml +++ b/userguide/config.toml @@ -242,3 +242,14 @@ enable = true [taxonomies] tag = "tags" category = "categories" + +[module] + # uncomment line below for temporary local development of module + # replacements = "github.com/google/docsy -> ../../docsy" + [module.hugoVersion] + extended = true + min = "0.75.0" + [[module.imports]] + path = "github.com/google/docsy" + # set disable to false to use theme as module + disable = true diff --git a/userguide/go.mod b/userguide/go.mod new file mode 100644 index 0000000000..3795aedc32 --- /dev/null +++ b/userguide/go.mod @@ -0,0 +1,8 @@ +module github.com/google/docsy-userguide + +go 1.17 + +require github.com/google/docsy v0.0.0-20211206150914-7dc708374618 // indirect + +// uncomment line below for temporary local development of module +// replace github.com/google/docsy => ../../docsy diff --git a/userguide/go.sum b/userguide/go.sum new file mode 100644 index 0000000000..35f1978227 --- /dev/null +++ b/userguide/go.sum @@ -0,0 +1,2 @@ +github.com/google/docsy v0.0.0-20211206150914-7dc708374618 h1:lOpL17zTK4KRHnqHL7h+wHZNzmp/EJQ96a4ctmbSCC0= +github.com/google/docsy v0.0.0-20211206150914-7dc708374618/go.mod h1:alhAPKceHP14eqO+nJEhYehHeNcPKV8QnduoauTBZhs=