Offer Docsy as a single Hugo module (google#1120)

deining · Dec 27, 2022 · 31ed227 · 31ed227
1 parent 324942a
commit 31ed227
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 59 deletions.
diff --git a/dependencies/assets/bootstrap/README.txt → assets/bootstrap/README.txt b/dependencies/assets/bootstrap/README.txt → assets/bootstrap/README.txt
diff --git a/.../assets/bootstrap/scss/_vendor/README.txt → assets/bootstrap/scss/_vendor/README.txt b/.../assets/bootstrap/scss/_vendor/README.txt → assets/bootstrap/scss/_vendor/README.txt
diff --git a/...s/assets/bootstrap/scss/_vendor/_rfs.scss → assets/bootstrap/scss/_vendor/_rfs.scss b/...s/assets/bootstrap/scss/_vendor/_rfs.scss → assets/bootstrap/scss/_vendor/_rfs.scss
diff --git a/config.yaml b/config.yaml
@@ -44,3 +44,22 @@ module:
       target: assets/vendor/Font-Awesome
     - source: ../../node_modules/@fortawesome/fontawesome-free/webfonts
       target: static/webfonts
+    # Mounts for module installations,
+    # needed to work around a known bug in Go’s module management.
+    - source: assets/bootstrap/scss/_vendor
+      target: assets/vendor/bootstrap/scss/vendor
+  imports:
+    - path: github.com/twbs/bootstrap
+      disable: false
+      mounts:
+        - source: scss
+          target: assets/vendor/bootstrap/scss
+        - source: dist/js
+          target: assets/vendor/bootstrap/dist/js
+    - path: github.com/FortAwesome/Font-Awesome
+      disable: false
+      mounts:
+        - source: scss
+          target: assets/vendor/Font-Awesome/scss
+        - source: webfonts
+          target: static/webfonts
diff --git a/dependencies/config.toml b/dependencies/config.toml
diff --git a/dependencies/go.mod b/dependencies/go.mod
diff --git a/go.mod b/go.mod
@@ -4,6 +4,5 @@ go 1.12
 
 require (
 	github.com/FortAwesome/Font-Awesome v0.0.0-20221115183454-96cafbd73ec4 // indirect
-	github.com/google/docsy/dependencies v0.6.0 // indirect
 	github.com/twbs/bootstrap v4.6.2+incompatible // indirect
 )
diff --git a/go.sum b/go.sum
@@ -2,11 +2,5 @@ github.com/FortAwesome/Font-Awesome v0.0.0-20220831210243-d3a7818c253f h1:bvkUpt
 github.com/FortAwesome/Font-Awesome v0.0.0-20220831210243-d3a7818c253f/go.mod h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo=
 github.com/FortAwesome/Font-Awesome v0.0.0-20221115183454-96cafbd73ec4 h1:xfr9SidRCMEh4A8fdkLhFPcHAVbrdv3Ua0Jp/nSmhhQ=
 github.com/FortAwesome/Font-Awesome v0.0.0-20221115183454-96cafbd73ec4/go.mod h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo=
-github.com/google/docsy/dependencies v0.4.0/go.mod h1:2zZxHF+2qvkyXhLZtsbnqMotxMukJXLaf8fAZER48oo=
-github.com/google/docsy/dependencies v0.4.1-0.20220905171817-ae8b8117ed16 h1:6Ju+wn/ReUk9qmvKU68JlYhnWe48Tq+2HZ4vyeSpNMk=
-github.com/google/docsy/dependencies v0.4.1-0.20220905171817-ae8b8117ed16/go.mod h1:2zZxHF+2qvkyXhLZtsbnqMotxMukJXLaf8fAZER48oo=
-github.com/google/docsy/dependencies v0.5.1-0.20221014161617-be5da07ecff1 h1:DH0NbaXJjODFImfRJGCSXDhnRO/IaD2VTGVlRjULUtc=
-github.com/google/docsy/dependencies v0.5.1-0.20221014161617-be5da07ecff1/go.mod h1:EDGc2znMbGUw0RW5kWwy2oGgLt0iVXBmoq4UOqstuNE=
-github.com/google/docsy/dependencies v0.5.1/go.mod h1:EDGc2znMbGUw0RW5kWwy2oGgLt0iVXBmoq4UOqstuNE=
 github.com/twbs/bootstrap v4.6.2+incompatible h1:TDa+R51BTiy1wEHSYjmqDb8LxNl/zaEjAOpRE9Hwh/o=
 github.com/twbs/bootstrap v4.6.2+incompatible/go.mod h1:fZTSrkpSf0/HkL0IIJzvVspTt1r9zuf7XlZau8kpcY0=
diff --git a/netlify.toml b/netlify.toml
@@ -6,7 +6,7 @@ publish = "userguide/public"
 command = "npm run docs-install && npm run build:preview"
 
 [build.environment]
-GO_VERSION = "1.19.2"
+GO_VERSION = "1.19.4"
 HUGO_THEME = "repo"
 
 [context.production]

diff --git a/package.json b/package.json
@@ -12,6 +12,7 @@
     "check-links": "npm run cd:docs check-links",
     "docs-install": "npm run _cd:docs -- npm install",
     "get:submodule": "set -x && git submodule update --init ${DEPTH:- --depth 1}",
+    "postinstall": "cd .. && npx mkdirp github.com/FortAwesome/Font-Awesome && npx mkdirp github.com/twbs/bootstrap",
     "serve": "npm run cd:docs serve",
     "update:pkg:hugo": "npm install --save-exact -D hugo-extended@latest",
     "update:pkg:dep": "npm install --save-exact @fortawesome/fontawesome-free@6 bootstrap@4"
@@ -25,6 +26,7 @@
     "bootstrap": "4.6.2"
   },
   "devDependencies": {
-    "hugo-extended": "0.107.0"
+    "mkdirp" : "1.0.4",
+    "hugo-extended": "0.109.0"
   }
 }