Revert "common/hugo: Deprecate extended and extended_withdeploy editions"

This reverts commit a17bdbc5face02ed2470895bcbfe67db7749dc73.

Close #14771

diff --git a/commands/commandeer.go b/commands/commandeer.go
index ce86d10824b2162abfb55556633e3418be81d79f..77ae0e66f385c53875a2f7f564c195dde9490c15 100644 (file)
--- a/commands/commandeer.go
+++ b/commands/commandeer.go
@@ -39,7 +39,6 @@ import (
 
        "github.com/gohugoio/hugo/common/hstrings"
        "github.com/gohugoio/hugo/common/htime"
-       "github.com/gohugoio/hugo/common/hugo"
        "github.com/gohugoio/hugo/common/loggers"
        "github.com/gohugoio/hugo/common/paths"
        "github.com/gohugoio/hugo/common/types"
@@ -473,7 +472,6 @@ func (r *rootCommand) PreRun(cd, runner *simplecobra.Commandeer) error {
        }
        // Set up the global logger early to allow info deprecations during config load.
        loggers.SetGlobalLogger(r.logger)
-       hugo.WarnDeprecatedEdition()
 
        r.changesFromBuild = make(chan []identity.Identity, 10)
 

diff --git a/common/hugo/hugo.go b/common/hugo/hugo.go
index 2c42b2b3f92c2a504e04b6537c03f47e79f8ae77..fbb1e53a44751c5f63e0369145053d21ab42745f 100644 (file)
--- a/common/hugo/hugo.go
+++ b/common/hugo/hugo.go
@@ -304,18 +304,6 @@ func IsDartSassGeV2() bool {
        return !strings.Contains(DartSassBinaryName, "embedded")
 }
 
-// WarnDeprecatedEdition emits a deprecation warning if the running binary is
-// the extended or extended_withdeploy edition.
-func WarnDeprecatedEdition() {
-       if IsExtended {
-               if IsWithdeploy {
-                       Deprecate("the extended_withdeploy edition of the Hugo executable", "Use the withdeploy edition instead.", "v0.161.0")
-               } else {
-                       Deprecate("the extended edition of the Hugo executable", "Use the standard edition instead.", "v0.161.0")
-               }
-       }
-}
-
 // Deprecate informs about a deprecation starting at the given version.
 //
 // A deprecation typically needs a simple change in the template, but doing so will make the template incompatible with older versions.

diff --git a/common/hugo/hugo_test.go b/common/hugo/hugo_test.go
index 934a846dd4d13c20771f2a611c6357bcc3b1c260..a572f74d4583252e1803593438d5d7fe3f026875 100644 (file)
--- a/common/hugo/hugo_test.go
+++ b/common/hugo/hugo_test.go
@@ -14,13 +14,11 @@
 package hugo
 
 import (
-       "bytes"
        "context"
        "testing"
 
        "github.com/bep/logg"
        qt "github.com/frankban/quicktest"
-       "github.com/gohugoio/hugo/common/loggers"
 )
 
 func TestDeprecationLogLevelFromVersion(t *testing.T) {
@@ -61,38 +59,3 @@ func TestGetBuildInfo(t *testing.T) {
                c.Assert(bi.GoVersion, qt.Not(qt.Equals), "")
        }
 }
-
-func TestWarnDeprecatedEdition(t *testing.T) {
-       c := qt.New(t)
-
-       origExtended, origWithdeploy := IsExtended, IsWithdeploy
-       t.Cleanup(func() {
-               IsExtended = origExtended
-               IsWithdeploy = origWithdeploy
-               loggers.SetGlobalLogger(nil)
-       })
-
-       var buf bytes.Buffer
-       loggers.SetGlobalLogger(loggers.New(loggers.Options{Level: logg.LevelInfo, StdErr: &buf}))
-
-       IsExtended = true
-       IsWithdeploy = false
-       WarnDeprecatedEdition()
-       c.Assert(buf.String(), qt.Contains, "the extended edition of the Hugo executable")
-       c.Assert(buf.String(), qt.Contains, "Use the standard edition instead")
-
-       buf.Reset()
-
-       IsExtended = true
-       IsWithdeploy = true
-       WarnDeprecatedEdition()
-       c.Assert(buf.String(), qt.Contains, "the extended_withdeploy edition of the Hugo executable")
-       c.Assert(buf.String(), qt.Contains, "Use the withdeploy edition instead")
-
-       buf.Reset()
-
-       IsExtended = false
-       IsWithdeploy = false
-       WarnDeprecatedEdition()
-       c.Assert(buf.String(), qt.Equals, "")
-}

diff --git a/testscripts/commands/hugo__minify_issue13988.txt b/testscripts/commands/hugo__minify_issue13988.txt
index d20e746af93f500a01b77dc6c538d6464fa5c5b0..122494ce3c6e2ffb61c1a53755316562e3043dad 100644 (file)
--- a/testscripts/commands/hugo__minify_issue13988.txt
+++ b/testscripts/commands/hugo__minify_issue13988.txt
@@ -1,6 +1,6 @@
 hugo --minify --logLevel=info
 
-! stderr 'deprecated.*minifyOutput'
+! stderr 'deprecated'
 grep '<p>one</p><p>two</p>'  public/index.html
 
 -- hugo.toml --