From 0c0a0359fbcc57f7fa100c923e1bd7d738e72cae Mon Sep 17 00:00:00 2001
From: Andreas Deininger <adeininger@urbanonline.de>
Date: Fri, 2 Sep 2022 11:07:25 +0200
Subject: [PATCH] Offer Docsy as a single Hugo module (#1120)

---
 .../assets => assets}/bootstrap/README.txt    |  0
 .../bootstrap/scss/_vendor/README.txt         |  0
 .../bootstrap/scss/_vendor/_rfs.scss          |  0
 dependencies/config.toml                      | 43 -------------------
 dependencies/go.mod                           |  8 ----
 hugo.yaml                                     | 19 ++++++++
 netlify.toml                                  |  2 +-
 package.json                                  |  1 +
 8 files changed, 21 insertions(+), 52 deletions(-)
 rename {dependencies/assets => assets}/bootstrap/README.txt (100%)
 rename {dependencies/assets => assets}/bootstrap/scss/_vendor/README.txt (100%)
 rename {dependencies/assets => assets}/bootstrap/scss/_vendor/_rfs.scss (100%)
 delete mode 100644 dependencies/config.toml
 delete mode 100644 dependencies/go.mod

diff --git a/dependencies/assets/bootstrap/README.txt b/assets/bootstrap/README.txt
similarity index 100%
rename from dependencies/assets/bootstrap/README.txt
rename to assets/bootstrap/README.txt
diff --git a/dependencies/assets/bootstrap/scss/_vendor/README.txt b/assets/bootstrap/scss/_vendor/README.txt
similarity index 100%
rename from dependencies/assets/bootstrap/scss/_vendor/README.txt
rename to assets/bootstrap/scss/_vendor/README.txt
diff --git a/dependencies/assets/bootstrap/scss/_vendor/_rfs.scss b/assets/bootstrap/scss/_vendor/_rfs.scss
similarity index 100%
rename from dependencies/assets/bootstrap/scss/_vendor/_rfs.scss
rename to assets/bootstrap/scss/_vendor/_rfs.scss
diff --git a/dependencies/config.toml b/dependencies/config.toml
deleted file mode 100644
index a701110574..0000000000
--- a/dependencies/config.toml
+++ /dev/null
@@ -1,43 +0,0 @@
-[module]
-_merge = "deep"
-# work around https://github.com/golang/go/issues/37397
-[[module.mounts]]
-  source = "assets/bootstrap/scss/_vendor"
-  target = "assets/vendor/bootstrap/scss/vendor"
-# mount asserts directory
-[[module.mounts]]
-  source = "assets"
-  target = "assets"
-# mount i18n directory
-[[module.mounts]]
-  source = "i18n"
-  target = "i18n"
-# mount layouts directory
-[[module.mounts]]
-  source = "layouts"
-  target = "layouts"
-# mount static directory
-[[module.mounts]]
-  source = "static"
-  target = "static"
-# Dependencies are brought in as modules
-# and mount points are declared
-[[module.imports]]
-  path = "github.com/twbs/bootstrap"
-  disable = false
-  ignoreConfig = true
-[[module.imports.mounts]]
-  source = "scss"
-  target = "assets/vendor/bootstrap/scss"
-[[module.imports.mounts]]
-  source = "dist/js"
-  target = "assets/vendor/bootstrap/dist/js"
-[[module.imports]]
-  path = "github.com/FortAwesome/Font-Awesome"
-  disable = false
-[[module.imports.mounts]]
-  source = "scss"
-  target = "assets/vendor/Font-Awesome/scss"
-[[module.imports.mounts]]
-  source = "webfonts"
-  target = "static/webfonts"
diff --git a/dependencies/go.mod b/dependencies/go.mod
deleted file mode 100644
index 23c33c76de..0000000000
--- a/dependencies/go.mod
+++ /dev/null
@@ -1,8 +0,0 @@
-module github.com/google/docsy/dependencies
-
-go 1.12
-
-require (
-	github.com/FortAwesome/Font-Awesome v0.0.0-20230327165841-0698449d50f2 // indirect
-	github.com/twbs/bootstrap v5.2.3+incompatible // indirect
-)
diff --git a/hugo.yaml b/hugo.yaml
index a6581d8161..f92c273bb5 100644
--- a/hugo.yaml
+++ b/hugo.yaml
@@ -42,3 +42,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/netlify.toml b/netlify.toml
index a5ed464f48..cb0b5781e1 100644
--- 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.5"
+GO_VERSION = "1.21.4"
 HUGO_THEME = "repo"
 
 [context.production]
diff --git a/package.json b/package.json
index ea54544d44..852c84e930 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,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",
     "test": "npm run cd:docs test",
     "update:pkg:hugo": "npm install --save-exact -D hugo-extended@latest",