🔦 move utils to internal

app.go

@@ -23,9 +23,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/gofiber/fiber/v2/utils"
-	"github.com/gofiber/fiber/v2/utils/colorable"
-	"github.com/gofiber/fiber/v2/utils/isatty"
+	"github.com/gofiber/fiber/v2/internal/utils"
+	"github.com/gofiber/fiber/v2/internal/utils/colorable"
+	"github.com/gofiber/fiber/v2/internal/utils/isatty"
+
 	"github.com/valyala/fasthttp"
 )
 

app_test.go

@@ -20,7 +20,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gofiber/fiber/v2/utils"
+	"github.com/gofiber/fiber/v2/internal/utils"
 	"github.com/valyala/fasthttp"
 	"github.com/valyala/fasthttp/fasthttputil"
 )

ctx.go

@@ -19,10 +19,10 @@ import (
 	"text/template"
 	"time"
 
-	"github.com/gofiber/fiber/v2/utils"
-	"github.com/gofiber/fiber/v2/utils/bytebufferpool"
-	"github.com/gofiber/fiber/v2/utils/encoding/json"
-	"github.com/gofiber/fiber/v2/utils/schema"
+	"github.com/gofiber/fiber/v2/internal/utils"
+	"github.com/gofiber/fiber/v2/internal/utils/bytebufferpool"
+	"github.com/gofiber/fiber/v2/internal/utils/encoding/json"
+	"github.com/gofiber/fiber/v2/internal/utils/schema"
 	"github.com/valyala/fasthttp"
 )
 
@@ -612,7 +612,7 @@ func (c *Ctx) Next() (err error) {
 	return
 }
 
-// OriginalURL contains the original request URL.
+// OriginalURL contains the original request URL. URI without scheme and host
 // Returned value is only valid within the handler. Do not store any references.
 // Make copies or use the Immutable setting to use the value outside the Handler.
 func (c *Ctx) OriginalURL() string {

ctx_test.go

@@ -24,8 +24,8 @@ import (
 	"text/template"
 	"time"
 
-	"github.com/gofiber/fiber/v2/utils"
-	"github.com/gofiber/fiber/v2/utils/bytebufferpool"
+	"github.com/gofiber/fiber/v2/internal/bytebufferpool"
+	"github.com/gofiber/fiber/v2/internal/utils"
 	"github.com/valyala/fasthttp"
 )
 

go.sum

@@ -1,5 +1,6 @@
 github.com/andybalholm/brotli v1.0.0 h1:7UCwP93aiSfvWpapti8g88vVVGp2qqtGyePsSuDafo4=
 github.com/andybalholm/brotli v1.0.0/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y=
+github.com/gofiber/fiber v1.14.6 h1:QRUPvPmr8ijQuGo1MgupHBn8E+wW0IKqiOvIZPtV70o=
 github.com/klauspost/compress v1.10.7 h1:7rix8v8GpI3ZBb0nSozFRgbtXKv+hOe+qfEpZqybrAg=
 github.com/klauspost/compress v1.10.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=

internal/colorable/colorable_appengine.go

@@ -6,7 +6,7 @@ import (
 	"io"
 	"os"
 
-	_ "github.com/gofiber/fiber/v2/utils/isatty"
+	_ "github.com/gofiber/fiber/v2/internal/utils/isatty"
 )
 
 // NewColorable returns new instance of Writer which handles escape sequence.

internal/colorable/colorable_others.go

@@ -7,7 +7,7 @@ import (
 	"io"
 	"os"
 
-	_ "github.com/gofiber/fiber/v2/utils/isatty"
+	_ "github.com/gofiber/fiber/v2/internal/utils/isatty"
 )
 
 // NewColorable returns new instance of Writer which handles escape sequence.

internal/colorable/colorable_windows.go

@@ -14,7 +14,7 @@ import (
 	"syscall"
 	"unsafe"
 
-	"github.com/gofiber/fiber/v2/utils/isatty"
+	"github.com/gofiber/fiber/v2/internal/utils/isatty"
 )
 
 const (

internal/encoding/json/parse.go

@@ -8,7 +8,7 @@ import (
 	"unicode/utf16"
 	"unicode/utf8"
 
-	"github.com/gofiber/fiber/v2/utils/encoding/ascii"
+	"github.com/gofiber/fiber/v2/internal/utils/encoding/ascii"
 )
 
 // All spaces characters defined in the json specification.

middleware/basicauth/basicauth.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 
 	"github.com/gofiber/fiber/v2"
-	"github.com/gofiber/fiber/v2/utils"
+	"github.com/gofiber/fiber/v2/internal/utils"
 )
 
 // Config defines the config for middleware.

middleware/basicauth/basicauth_test.go

@@ -9,7 +9,7 @@ import (
 	b64 "encoding/base64"
 
 	"github.com/gofiber/fiber/v2"
-	"github.com/gofiber/fiber/v2/utils"
+	"github.com/gofiber/fiber/v2/internal/utils"
 )
 
 func Test_Middleware_BasicAuth(t *testing.T) {

middleware/compress/compress_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/gofiber/fiber/v2"
-	"github.com/gofiber/fiber/v2/utils"
+	"github.com/gofiber/fiber/v2/internal/utils"
 )
 
 var filedata []byte

middleware/cors/cors_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/gofiber/fiber/v2"
-	"github.com/gofiber/fiber/v2/utils"
+	"github.com/gofiber/fiber/v2/internal/utils"
 	"github.com/valyala/fasthttp"
 )
 

middleware/csrf/csrf.go

@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/gofiber/fiber/v2"
-	"github.com/gofiber/fiber/v2/utils"
+	"github.com/gofiber/fiber/v2/internal/utils"
 )
 
 // Config defines the config for middleware.

middleware/csrf/csrf_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/gofiber/fiber/v2"
-	"github.com/gofiber/fiber/v2/utils"
+	"github.com/gofiber/fiber/v2/internal/utils"
 	"github.com/valyala/fasthttp"
 )
 

middleware/favicon/favicon_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/gofiber/fiber/v2"
-	"github.com/gofiber/fiber/v2/utils"
+	"github.com/gofiber/fiber/v2/internal/utils"
 	"github.com/valyala/fasthttp"
 )
 

middleware/filesystem/filesystem_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/gofiber/fiber/v2"
-	"github.com/gofiber/fiber/v2/utils"
+	"github.com/gofiber/fiber/v2/internal/utils"
 )
 
 // go test -run Test_FileSystem

middleware/limiter/limiter_test.go

@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gofiber/fiber/v2/utils"
+	"github.com/gofiber/fiber/v2/internal/utils"
 
 	"github.com/gofiber/fiber/v2"
 	"github.com/valyala/fasthttp"

middleware/logger/logger.go

@@ -9,8 +9,8 @@ import (
 	"time"
 
 	"github.com/gofiber/fiber/v2"
-	"github.com/gofiber/fiber/v2/utils/bytebufferpool"
-	"github.com/gofiber/fiber/v2/utils/fasttemplate"
+	"github.com/gofiber/fiber/v2/internal/utils/bytebufferpool"
+	"github.com/gofiber/fiber/v2/internal/utils/fasttemplate"
 )
 
 // Config defines the config for middleware.

middleware/logger/logger__test.go

@@ -6,8 +6,8 @@ import (
 	"testing"
 
 	"github.com/gofiber/fiber/v2"
-	"github.com/gofiber/fiber/v2/utils"
-	"github.com/gofiber/fiber/v2/utils/bytebufferpool"
+	"github.com/gofiber/fiber/v2/internal/utils"
+	"github.com/gofiber/fiber/v2/internal/utils/bytebufferpool"
 )
 
 // go test -run Test_Logger

middleware/proxy/proxy_test.go

@@ -8,7 +8,7 @@ import (
 	"testing"
 
 	"github.com/gofiber/fiber/v2"
-	"github.com/gofiber/fiber/v2/utils"
+	"github.com/gofiber/fiber/v2/internal/utils"
 )
 
 // go test -run Test_Proxy_Empty_Host

middleware/recover/recover_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/gofiber/fiber/v2"
-	"github.com/gofiber/fiber/v2/utils"
+	"github.com/gofiber/fiber/v2/internal/utils"
 )
 
 // go test -run Test_Recover

middleware/requestid/requestid.go

@@ -2,7 +2,7 @@ package requestid
 
 import (
 	"github.com/gofiber/fiber/v2"
-	"github.com/gofiber/fiber/v2/utils"
+	"github.com/gofiber/fiber/v2/internal/utils"
 )
 
 // Config defines the config for middleware.

middleware/requestid/requestid_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/gofiber/fiber/v2"
-	"github.com/gofiber/fiber/v2/utils"
+	"github.com/gofiber/fiber/v2/internal/utils"
 )
 
 // go test -run Test_RequestID

path.go

@@ -10,7 +10,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/gofiber/fiber/v2/utils"
+	"github.com/gofiber/fiber/v2/internal/utils"
 )
 
 // routeParser holds the path segments and param names

path_test.go

@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/gofiber/fiber/v2/utils"
+	"github.com/gofiber/fiber/v2/internal/utils"
 )
 
 // go test -race -run Test_Path_parseRoute

prefork_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gofiber/fiber/v2/utils"
+	"github.com/gofiber/fiber/v2/internal/utils"
 )
 
 func Test_App_Prefork_Child_Process(t *testing.T) {

router.go

@@ -10,7 +10,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/gofiber/fiber/v2/utils"
+	"github.com/gofiber/fiber/v2/internal/utils"
 	"github.com/valyala/fasthttp"
 )
 

router_test.go

@@ -13,7 +13,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/gofiber/fiber/v2/utils"
+	"github.com/gofiber/fiber/v2/internal/utils"
 	"github.com/valyala/fasthttp"
 )
 

utils.go

@@ -18,8 +18,8 @@ import (
 	"time"
 	"unsafe"
 
-	"github.com/gofiber/fiber/v2/utils"
-	"github.com/gofiber/fiber/v2/utils/bytebufferpool"
+	"github.com/gofiber/fiber/v2/internal/utils"
+	"github.com/gofiber/fiber/v2/internal/utils/bytebufferpool"
 	"github.com/valyala/fasthttp"
 )
 

utils_test.go

@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gofiber/fiber/v2/utils"
+	"github.com/gofiber/fiber/v2/internal/utils"
 	"github.com/valyala/fasthttp"
 )