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

Re-instate disableLiveReload as a config option (and not just a flag)

Browse source 
Closes #11259
This commit is contained in:
Bjørn Erik Pedersen 2023-07-19 09:23:48 +02:00
parent 2f11e673c5
commit f1a061e9ed
5 changed files with 56 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
commands/helpers.go
View file

@ -86,13 +86,12 @@ func flagsToCfgWithAdditionalConfigBase(cd *simplecobra.Commandeer, cfg config.P
// Flags that we for some reason don't want to expose in the site config. // Flags that we for some reason don't want to expose in the site config.
internalKeySet := map[string]bool{ internalKeySet := map[string]bool{
"quiet": true, "quiet": true,
"verbose": true, "verbose": true,
"watch": true, "watch": true,
"disableLiveReload": true, "liveReloadPort": true,
"liveReloadPort": true, "renderToMemory": true,
"renderToMemory": true, "clock": true,
"clock": true,
} }
cmd := cd.CobraCommand cmd := cd.CobraCommand

14
config/allconfig/allconfig.go
View file

@ -57,12 +57,11 @@ type InternalConfig struct {
// Server mode? // Server mode?
Running bool Running bool
Quiet bool Quiet bool
Verbose bool Verbose bool
Clock string Clock string
Watch bool Watch bool
DisableLiveReload bool LiveReloadPort int
LiveReloadPort int
} }
// All non-params config keys for language. // All non-params config keys for language.
@ -454,6 +453,9 @@ type RootConfig struct {
// Disable the injection of the Hugo generator tag on the home page. // Disable the injection of the Hugo generator tag on the home page.
DisableHugoGeneratorInject bool DisableHugoGeneratorInject bool
// Disable live reloading in server mode.
DisableLiveReload bool
// Enable replacement in Pages' Content of Emoji shortcodes with their equivalent Unicode characters. // Enable replacement in Pages' Content of Emoji shortcodes with their equivalent Unicode characters.
// <docsmeta>{"identifiers": ["Content", "Unicode"] }</docsmeta> // <docsmeta>{"identifiers": ["Content", "Unicode"] }</docsmeta>
EnableEmoji bool EnableEmoji bool

2
hugolib/site.go
View file

@ -1058,7 +1058,7 @@ func (s *Site) renderAndWritePage(statCounter *uint64, name string, targetPath s
pd.AbsURLPath = s.absURLPath(targetPath) pd.AbsURLPath = s.absURLPath(targetPath)
} }
if s.watching() && s.conf.Internal.Running && !s.conf.Internal.DisableLiveReload { if s.watching() && s.conf.Internal.Running && !s.conf.DisableLiveReload {
pd.LiveReloadBaseURL = s.Conf.BaseURLLiveReload().URL() pd.LiveReloadBaseURL = s.Conf.BaseURLLiveReload().URL()
} }

20
testscripts/commands/server_disablelivereload.txt Normal file
View file

@ -0,0 +1,20 @@
hugo server --renderToDisk --disableLiveReload &
waitServer
! grep 'livereload' public/index.html
stopServer
! stderr .
-- hugo.toml --
baseURL = "http://example.org/"
disableKinds = ["RSS", "sitemap", "robotsTXT", "404", "taxonomy", "term"]
-- layouts/index.html --
<html>
<head>
</head>
<body>
Home.
</body>
</html>

21
testscripts/commands/server_disablelivereload__config.txt Normal file
View file

@ -0,0 +1,21 @@
hugo server --renderToDisk &
waitServer
! grep 'livereload' public/index.html
stopServer
! stderr .
-- hugo.toml --
baseURL = "http://example.org/"
disableKinds = ["RSS", "sitemap", "robotsTXT", "404", "taxonomy", "term"]
disableLiveReload = true
-- layouts/index.html --
<html>
<head>
</head>
<body>
Home.
</body>
</html>