From 230faebf8bcc5a24605cf9ded5f8e5cb4cb70da2 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
 config.yaml                                   | 19 +++++++++
 dependencies/config.toml                      | 42 -------------------
 dependencies/go.mod                           |  8 ----
 go.sum                                        |  2 -
 7 files changed, 19 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/config.yaml b/config.yaml
index 8a4d145dc3..f4c18aee8f 100644
--- 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
deleted file mode 100644
index 3ba31f38f9..0000000000
--- a/dependencies/config.toml
+++ /dev/null
@@ -1,42 +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
-[[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 b13ddabad5..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-20220831210243-d3a7818c253f // indirect
-	github.com/twbs/bootstrap v4.6.2+incompatible // indirect
-)
diff --git a/go.sum b/go.sum
index d3216e658b..6a32c36550 100644
--- a/go.sum
+++ b/go.sum
@@ -1,8 +1,6 @@
 github.com/FortAwesome/Font-Awesome v0.0.0-20220831210243-d3a7818c253f h1:bvkUptSRPZBr3Kxuk+bnWCEmQ5MtEJX5fjezyV0bC3g=
 github.com/FortAwesome/Font-Awesome v0.0.0-20220831210243-d3a7818c253f/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/twbs/bootstrap v4.6.2+incompatible h1:TDa+R51BTiy1wEHSYjmqDb8LxNl/zaEjAOpRE9Hwh/o=