From 31ed227df9093853240695135aabad97621009f9 Mon Sep 17 00:00:00 2001 From: Andreas Deininger 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.mod | 1 - go.sum | 6 --- netlify.toml | 2 +- package.json | 4 +- 10 files changed, 23 insertions(+), 59 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 29a0cb1729..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-20221115183454-96cafbd73ec4 // indirect - github.com/twbs/bootstrap v4.6.2+incompatible // indirect -) diff --git a/go.mod b/go.mod index 70b0dbf1d3..442238fe67 100644 --- 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 index ca3df92a6a..5306e1cdec 100644 --- 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 index c2b32f659c..589a962b99 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.2" +GO_VERSION = "1.19.4" HUGO_THEME = "repo" [context.production] diff --git a/package.json b/package.json index 39ecdc585b..d50ad96e03 100644 --- 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" } }