github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-21 20:46:30 -05:00
Code Issues Projects Releases Packages Wiki Activity

modules: Add modules.Workspace config for Go 1.18

Browse source 
Sets `GOWORK` env var for Go 1.18.

Fixes #9525
This commit is contained in:
Bjørn Erik Pedersen 2022-02-18 12:43:59 +01:00
parent b0eea00756
commit a87be597af
3 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docs/content/en/hugo-modules/configuration.md
View file

@ -23,6 +23,7 @@ proxy = "direct"
noProxy = "none" noProxy = "none"
private = "*.*" private = "*.*"
replacements = "" replacements = ""
workspace = ""
{{< /code-toggle >}} {{< /code-toggle >}}
@ -41,6 +42,9 @@ noProxy
private private
: Comma separated glob list matching paths that should be treated as private. : Comma separated glob list matching paths that should be treated as private.
workspace {{< new-in "0.83.0" >}}
The workspace file to use. This enables Go workspace mode. Note that this can also be set via OS env, e.g. `export HUGO_MODULE_WORKSPACE=/my/hugo.work` This only works with Go 1.18+.
replacements {{< new-in "0.77.0" >}} replacements {{< new-in "0.77.0" >}}
: A comma separated (or a slice) list of module path to directory replacement mapping, e.g. `github.com/bep/myprettytheme -> ../..,github.com/bep/shortcodes -> /some/path`. This is mostly useful for temporary locally development of a module, and then it makes sense to set it as an OS environment variable, e.g: `env HUGO_MODULE_REPLACEMENTS="github.com/bep/myprettytheme -> ../.."`. Any relative path is relate to [themesDir](https://gohugo.io/getting-started/configuration/#all-configuration-settings), and absolute paths are allowed. : A comma separated (or a slice) list of module path to directory replacement mapping, e.g. `github.com/bep/myprettytheme -> ../..,github.com/bep/shortcodes -> /some/path`. This is mostly useful for temporary locally development of a module, and then it makes sense to set it as an OS environment variable, e.g: `env HUGO_MODULE_REPLACEMENTS="github.com/bep/myprettytheme -> ../.."`. Any relative path is relate to [themesDir](https://gohugo.io/getting-started/configuration/#all-configuration-settings), and absolute paths are allowed.

1
modules/client.go
View file

@ -90,6 +90,7 @@ func NewClient(cfg ClientConfig) *Client {
"GOPRIVATE", mcfg.Private, "GOPRIVATE", mcfg.Private,
"GONOPROXY", mcfg.NoProxy, "GONOPROXY", mcfg.NoProxy,
"GOPATH", cfg.CacheDir, "GOPATH", cfg.CacheDir,
"GOWORK", mcfg.Workspace, // Requires Go 1.18, see https://tip.golang.org/doc/go1.18
// GOCACHE was introduced in Go 1.15. This matches the location derived from GOPATH above. // GOCACHE was introduced in Go 1.15. This matches the location derived from GOPATH above.
"GOCACHE", filepath.Join(cfg.CacheDir, "pkg", "mod"), "GOCACHE", filepath.Join(cfg.CacheDir, "pkg", "mod"),
) )

6
modules/config.go
View file

@ -295,6 +295,12 @@ type Config struct {
NoProxy string NoProxy string
// Configures GOPRIVATE. // Configures GOPRIVATE.
Private string Private string
// Set the workspace file to use, e.g. hugo.work.
// Enables Go "Workspace" mode.
// Requires Go 1.18+
// See https://tip.golang.org/doc/go1.18
Workspace string
} }
// hasModuleImport reports whether the project config have one or more // hasModuleImport reports whether the project config have one or more