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.mod b/go.mod index 7ab286c9ee..371b465152 100644 --- a/go.mod +++ b/go.mod @@ -4,6 +4,5 @@ go 1.12 require ( github.com/FortAwesome/Font-Awesome v0.0.0-20220831210243-d3a7818c253f // indirect - github.com/google/docsy/dependencies v0.5.0 // indirect github.com/twbs/bootstrap v4.6.2+incompatible // indirect ) diff --git a/go.sum b/go.sum index 62a2389f7d..5f5fa45f33 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,4 @@ 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.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.4.0/go.mod h1:2zZxHF+2qvkyXhLZtsbnqMotxMukJXLaf8fAZER48oo= 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=