Offer Docsy as a single Hugo Module (#1217)

google · Nov 10, 2023 · 580fee0 · 580fee0
1 parent fe443d3
commit 580fee0
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 65 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/dependencies/config.toml b/dependencies/config.toml
diff --git a/dependencies/go.mod b/dependencies/go.mod
diff --git a/dependencies/go.sum b/dependencies/go.sum
diff --git a/go.mod b/go.mod
@@ -4,6 +4,5 @@ go 1.12
 
 require (
 	github.com/FortAwesome/Font-Awesome v0.0.0-20230327165841-0698449d50f2 // indirect
-	github.com/google/docsy/dependencies v0.7.2 // indirect
 	github.com/twbs/bootstrap v5.2.3+incompatible // indirect
 )
diff --git a/go.sum b/go.sum
@@ -1,10 +1,4 @@
-github.com/FortAwesome/Font-Awesome v0.0.0-20230207192303-d02961b01815 h1:IgbtROhk8s9GkcNxrqFKAzR5rmDwV/QQ4Y31pb6crM8=
-github.com/FortAwesome/Font-Awesome v0.0.0-20230207192303-d02961b01815/go.mod h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo=
 github.com/FortAwesome/Font-Awesome v0.0.0-20230327165841-0698449d50f2 h1:Uv1z5EqCfmiK4IHUwT0m3h/u/WCk+kpRfxvAZhpC7Gc=
 github.com/FortAwesome/Font-Awesome v0.0.0-20230327165841-0698449d50f2/go.mod h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo=
-github.com/google/docsy/dependencies v0.6.1-0.20230125095517-798c2504905e h1:lfvr9ByCkuIz/ARoEDC/6gucVRjkooYTts5P+0yq5Qk=
-github.com/google/docsy/dependencies v0.6.1-0.20230125095517-798c2504905e/go.mod h1:qhtpynRkDn1FOmD1gj0a5n6ptDjDw0O4Zmb+6pfYUKU=
-github.com/google/docsy/dependencies v0.6.1-0.20230601182954-ff1818261e64 h1:ZBeOh/qGThEUn/r4vPXyfKXYKvMPmHgGS1BgQI8Xf2E=
-github.com/google/docsy/dependencies v0.6.1-0.20230601182954-ff1818261e64/go.mod h1:gihhs5gmgeO+wuoay4FwOzob+jYJVyQbNaQOh788lD4=
 github.com/twbs/bootstrap v5.2.3+incompatible h1:lOmsJx587qfF7/gE7Vv4FxEofegyJlEACeVV+Mt7cgc=
 github.com/twbs/bootstrap v5.2.3+incompatible/go.mod h1:fZTSrkpSf0/HkL0IIJzvVspTt1r9zuf7XlZau8kpcY0=
diff --git 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
@@ -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
@@ -18,6 +18,7 @@
     "docs-install": "npm run _cd:docs -- npm install",
     "fix:format": "npm run _check:format -- --write",
     "get:submodule": "set -x && git submodule update --init ${DEPTH:- --depth 1}",
+    "postinstall": "npx mkdirp ../github.com/FortAwesome/Font-Awesome ../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",
@@ -31,6 +32,7 @@
   "devDependencies": {
     "hugo-extended": "0.120.4",
     "markdown-link-check": "^3.11.2",
+    "mkdirp": "^3.0.1",
     "prettier": "^3.0.3"
   },
   "engines": {