diff --git a/go.mod b/go.mod index 80be01a0ba..63544fe35c 100644 --- a/go.mod +++ b/go.mod @@ -2,10 +2,10 @@ module github.com/google/docsy go 1.12 -replace github.com/google/docsy/module v0.1.1-0.20220124145409-3e2cfeba3ad1e => 03eede2c51f62 +//replace github.com/google/docsy/module v0.0.0-20220129185551-e4b42eecdf1d => e4b42eecdf1d require ( - github.com/google/docsy/module v0.1.1-0.20220124145409-3e2cfeba3ad1 // indirect github.com/FortAwesome/Font-Awesome v0.0.0-20210804190922-7d3d774145ac // indirect + github.com/google/docsy/module v0.2.0-pre // indirect github.com/twbs/bootstrap v4.6.1+incompatible // indirect ) diff --git a/go.sum b/go.sum index 7b9a0c9cc6..54d7ffa3e7 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,6 @@ github.com/FortAwesome/Font-Awesome v0.0.0-20210804190922-7d3d774145ac h1:AjwgwoaDsNEA1Wtc8pgw/BqG7SEk9bKxXPjEPQQ42vY= github.com/FortAwesome/Font-Awesome v0.0.0-20210804190922-7d3d774145ac/go.mod h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo= +github.com/google/docsy/module v0.0.0-20220129185551-e4b42eecdf1d h1:5f3AMLwAG2RrZrafxbbv1NE6EpGQkJCiSvJUkJVLYWc= +github.com/google/docsy/module v0.0.0-20220129185551-e4b42eecdf1d/go.mod h1:XSdPwCDtX3JK1d+wwDwQTSYQ2ZEHzghf/uhGIPoeDjw= github.com/twbs/bootstrap v4.6.1+incompatible h1:75PsBfPU1SS65ag0Z3Cq6JNXVAfUNfB0oCLHh9k9Fu8= github.com/twbs/bootstrap v4.6.1+incompatible/go.mod h1:fZTSrkpSf0/HkL0IIJzvVspTt1r9zuf7XlZau8kpcY0= diff --git a/assets/bootstrap/README.txt b/module/assets/bootstrap/README.txt similarity index 100% rename from assets/bootstrap/README.txt rename to module/assets/bootstrap/README.txt diff --git a/assets/bootstrap/scss/_vendor/README.txt b/module/assets/bootstrap/scss/_vendor/README.txt similarity index 100% rename from assets/bootstrap/scss/_vendor/README.txt rename to module/assets/bootstrap/scss/_vendor/README.txt diff --git a/assets/bootstrap/scss/_vendor/_rfs.scss b/module/assets/bootstrap/scss/_vendor/_rfs.scss similarity index 100% rename from assets/bootstrap/scss/_vendor/_rfs.scss rename to module/assets/bootstrap/scss/_vendor/_rfs.scss diff --git a/module/config.toml b/module/config.toml index 17abfaf9f7..3aa828a12c 100644 --- a/module/config.toml +++ b/module/config.toml @@ -37,4 +37,4 @@ _merge = "deep" disable = false [[module.imports.mounts]] source = "scss" - target = "assets/vendor/Font-Awesome/scss" \ No newline at end of file + target = "assets/vendor/Font-Awesome/scss" diff --git a/module/module.go b/module/module.go new file mode 100644 index 0000000000..d0c47a6fc0 --- /dev/null +++ b/module/module.go @@ -0,0 +1 @@ +package module diff --git a/userguide/config.toml b/userguide/config.toml index 9747e63838..b510f8f246 100644 --- a/userguide/config.toml +++ b/userguide/config.toml @@ -5,8 +5,9 @@ enableRobotsTXT = true # set docsy as theme, either locally or as module [module] - # uncomment line below for temporary local development of module + # uncomment lines below for temporary local development of module # replacements = "github.com/google/docsy -> ../../docsy" + # replacements = "github.com/google/docsy/module -> ../../docsy" [module.hugoVersion] extended = true min = "0.73.0" @@ -15,6 +16,9 @@ enableRobotsTXT = true path = "docsy" # or pull it in as hugo module # path = "github.com/google/docsy" + # uncomment import below when pulling in as hugo module + # [[module.imports]] + # path = "github.com/google/docsy/module" # Will give values to .Lastmod etc. enableGitInfo = true diff --git a/userguide/go.mod b/userguide/go.mod deleted file mode 100644 index 3205870c19..0000000000 --- a/userguide/go.mod +++ /dev/null @@ -1,5 +0,0 @@ -module github.com/google/docsy/userguide - -go 1.12 - -require github.com/google/docsy v0.1.1-0.20220124145409-3e2cfeba3ad1 // indirect diff --git a/userguide/go.sum b/userguide/go.sum deleted file mode 100644 index 220b3abbd2..0000000000 --- a/userguide/go.sum +++ /dev/null @@ -1,2 +0,0 @@ -github.com/google/docsy v0.1.1-0.20220124145409-3e2cfeba3ad1 h1:GFZN0DfvT05pu5t799Mv0NO/XE4iW2h0fX8VxukM8Kg= -github.com/google/docsy v0.1.1-0.20220124145409-3e2cfeba3ad1/go.mod h1:alhAPKceHP14eqO+nJEhYehHeNcPKV8QnduoauTBZhs=