Merge branch 'master' into googlegh-827-sidebar-height

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"

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
+)

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=

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]

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

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

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=