From f27f4643582decbd90c6e6919c5a90771e1a8436 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 27 Nov 2024 14:10:32 +0000 Subject: [PATCH 1/3] chore(deps): Update all dependencies --- go.mod | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 5f299df78..5a67f6546 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/RichardKnop/machinery/v2 v2.0.13 github.com/brianvoe/gofakeit/v7 v7.1.2 github.com/charmbracelet/huh v0.6.0 - github.com/charmbracelet/huh/spinner v0.0.0-20241119235641-e7e76ffbce9f + github.com/charmbracelet/huh/spinner aad810dfbce6 github.com/charmbracelet/lipgloss v1.0.0 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc github.com/gabriel-vasile/mimetype v1.4.7 @@ -16,13 +16,13 @@ require ( github.com/glebarez/sqlite v1.11.0 github.com/golang-jwt/jwt/v5 v5.2.1 github.com/golang-migrate/migrate/v4 v4.18.1 - github.com/golang-module/carbon/v2 v2.4.1 + github.com/golang-module/carbon/v2 v2.5.0 github.com/golang/protobuf v1.5.4 github.com/google/uuid v1.6.0 github.com/gookit/validate v1.5.2 github.com/goravel/file-rotatelogs/v2 v2.4.2 github.com/hashicorp/go-multierror v1.1.1 - github.com/pterm/pterm v0.12.79 + github.com/pterm/pterm v0.12.80 github.com/redis/go-redis/v9 v9.7.0 github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5 github.com/robfig/cron/v3 v3.0.1 From faac42eb27afd8f409204a2949277a5d490abd78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=97=E5=AD=90?= Date: Thu, 28 Nov 2024 17:41:30 +0800 Subject: [PATCH 2/3] chore: update dependences --- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- support/carbon/carbon.go | 2 +- support/carbon/carbon_test.go | 2 +- support/carbon/constants.go | 2 +- support/carbon/json.go | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/go.mod b/go.mod index 5a67f6546..8cf5fe118 100644 --- a/go.mod +++ b/go.mod @@ -2,21 +2,21 @@ module github.com/goravel/framework go 1.22.7 -toolchain go1.23.3 +toolchain go1.23.2 require ( github.com/RichardKnop/machinery/v2 v2.0.13 github.com/brianvoe/gofakeit/v7 v7.1.2 github.com/charmbracelet/huh v0.6.0 - github.com/charmbracelet/huh/spinner aad810dfbce6 + github.com/charmbracelet/huh/spinner v0.0.0-20241127125741-aad810dfbce6 github.com/charmbracelet/lipgloss v1.0.0 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc + github.com/dromara/carbon/v2 v2.5.0 github.com/gabriel-vasile/mimetype v1.4.7 github.com/glebarez/go-sqlite v1.22.0 github.com/glebarez/sqlite v1.11.0 github.com/golang-jwt/jwt/v5 v5.2.1 github.com/golang-migrate/migrate/v4 v4.18.1 - github.com/golang-module/carbon/v2 v2.5.0 github.com/golang/protobuf v1.5.4 github.com/google/uuid v1.6.0 github.com/gookit/validate v1.5.2 @@ -82,7 +82,7 @@ require ( github.com/go-redsync/redsync/v4 v4.8.1 // indirect github.com/go-sql-driver/mysql v1.8.1 // indirect github.com/go-stack/stack v1.8.0 // indirect - github.com/golang-jwt/jwt/v4 v4.5.0 // indirect + github.com/golang-jwt/jwt/v4 v4.5.1 // indirect github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect github.com/golang-sql/sqlexp v0.1.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect diff --git a/go.sum b/go.sum index 6a90f1a8f..15c0e3eb8 100644 --- a/go.sum +++ b/go.sum @@ -138,8 +138,8 @@ github.com/charmbracelet/bubbletea v1.2.3 h1:d9MdMsANIYZB5pE1KkRqaUV6GfsiWm+/9z4 github.com/charmbracelet/bubbletea v1.2.3/go.mod h1:Qr6fVQw+wX7JkWWkVyXYk/ZUQ92a6XNekLXa3rR18MM= github.com/charmbracelet/huh v0.6.0 h1:mZM8VvZGuE0hoDXq6XLxRtgfWyTI3b2jZNKh0xWmax8= github.com/charmbracelet/huh v0.6.0/go.mod h1:GGNKeWCeNzKpEOh/OJD8WBwTQjV3prFAtQPpLv+AVwU= -github.com/charmbracelet/huh/spinner v0.0.0-20241119235641-e7e76ffbce9f h1:ZTsY2rOyry0z683EoWqecJvvxibhaMSlceTMvMNyp/A= -github.com/charmbracelet/huh/spinner v0.0.0-20241119235641-e7e76ffbce9f/go.mod h1:3/xTBdgqRzAb+eUKRAGi9ix/K6QxsS0nGtd4zp+/tJs= +github.com/charmbracelet/huh/spinner v0.0.0-20241127125741-aad810dfbce6 h1:btKBXcuvUcXRT0VVk850BOpov6wjCLAPoJuaPm+sCKU= +github.com/charmbracelet/huh/spinner v0.0.0-20241127125741-aad810dfbce6/go.mod h1:3/xTBdgqRzAb+eUKRAGi9ix/K6QxsS0nGtd4zp+/tJs= github.com/charmbracelet/lipgloss v1.0.0 h1:O7VkGDvqEdGi93X+DeqsQ7PKHDgtQfF8j8/O2qFMQNg= github.com/charmbracelet/lipgloss v1.0.0/go.mod h1:U5fy9Z+C38obMs+T+tJqst9VGzlOYGj4ri9reL3qUlo= github.com/charmbracelet/x/ansi v0.4.5 h1:LqK4vwBNaXw2AyGIICa5/29Sbdq58GbGdFngSexTdRM= @@ -179,6 +179,8 @@ github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= +github.com/dromara/carbon/v2 v2.5.0 h1:OTLFslk6v2MjQbTM+PoKOzJtFHOjMLiQMfk7fwboJHs= +github.com/dromara/carbon/v2 v2.5.0/go.mod h1:4dSZ7OAOY28kDyUrVrLbr2aN90AIBV3zCY0HHV13B+0= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= @@ -254,16 +256,14 @@ github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY9 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= -github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg= -github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= +github.com/golang-jwt/jwt/v4 v4.5.1 h1:JdqV9zKUdtaa9gdPlywC3aeoEsR681PlKC+4F5gQgeo= +github.com/golang-jwt/jwt/v4 v4.5.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang-jwt/jwt/v5 v5.0.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= github.com/golang-jwt/jwt/v5 v5.2.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk= github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= github.com/golang-migrate/migrate/v4 v4.18.1 h1:JML/k+t4tpHCpQTCAD62Nu43NUFzHY4CV3uAuvHGC+Y= github.com/golang-migrate/migrate/v4 v4.18.1/go.mod h1:HAX6m3sQgcdO81tdjn5exv20+3Kb13cmGli1hrD6hks= -github.com/golang-module/carbon/v2 v2.4.1 h1:cYUD8T+rHeX+qIybGYpnJ8I90F10dvyEF67VNOO+zZM= -github.com/golang-module/carbon/v2 v2.4.1/go.mod h1:1jP9AZ4k2+lmfgY/wZgmtsN52VcHC5YuPM6varKDTkM= github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 h1:au07oEsX2xN0ktxqI+Sida1w446QrXBRJ0nee3SNZlA= github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A= @@ -508,8 +508,8 @@ github.com/pterm/pterm v0.12.31/go.mod h1:32ZAWZVXD7ZfG0s8qqHXePte42kdz8ECtRyEej github.com/pterm/pterm v0.12.33/go.mod h1:x+h2uL+n7CP/rel9+bImHD5lF3nM9vJj80k9ybiiTTE= github.com/pterm/pterm v0.12.36/go.mod h1:NjiL09hFhT/vWjQHSj1athJpx6H8cjpHXNAK5bUw8T8= github.com/pterm/pterm v0.12.40/go.mod h1:ffwPLwlbXxP+rxT0GsgDTzS3y3rmpAO1NMjUkGTYf8s= -github.com/pterm/pterm v0.12.79 h1:lH3yrYMhdpeqX9y5Ep1u7DejyHy7NSQg9qrBjF9dFT4= -github.com/pterm/pterm v0.12.79/go.mod h1:1v/gzOF1N0FsjbgTHZ1wVycRkKiatFvJSJC4IGaQAAo= +github.com/pterm/pterm v0.12.80 h1:mM55B+GnKUnLMUSqhdINe4s6tOuVQIetQ3my8JGyAIg= +github.com/pterm/pterm v0.12.80/go.mod h1:c6DeF9bSnOSeFPZlfs4ZRAFcf5SCoTwvwQ5xaKGQlHo= github.com/rabbitmq/amqp091-go v1.9.0 h1:qrQtyzB4H8BQgEuJwhmVQqVHB9O4+MNDJCCAcpc3Aoo= github.com/rabbitmq/amqp091-go v1.9.0/go.mod h1:+jPrT9iY2eLjRaMSRHUhc3z14E/l85kv/f+6luSD3pc= github.com/redis/go-redis/v9 v9.0.2/go.mod h1:/xDTe9EF1LM61hek62Poq2nzQSGj0xSrEtEHbBQevps= diff --git a/support/carbon/carbon.go b/support/carbon/carbon.go index f3fdbc5d6..8f04b62d8 100644 --- a/support/carbon/carbon.go +++ b/support/carbon/carbon.go @@ -3,7 +3,7 @@ package carbon import ( stdtime "time" - "github.com/golang-module/carbon/v2" + "github.com/dromara/carbon/v2" ) type Clock struct { diff --git a/support/carbon/carbon_test.go b/support/carbon/carbon_test.go index 8dd66375e..23ddaa088 100644 --- a/support/carbon/carbon_test.go +++ b/support/carbon/carbon_test.go @@ -4,7 +4,7 @@ import ( "testing" stdtime "time" - "github.com/golang-module/carbon/v2" + "github.com/dromara/carbon/v2" "github.com/stretchr/testify/assert" ) diff --git a/support/carbon/constants.go b/support/carbon/constants.go index 3ff5aca63..bbee1ed8d 100644 --- a/support/carbon/constants.go +++ b/support/carbon/constants.go @@ -3,7 +3,7 @@ package carbon import ( stdtime "time" - "github.com/golang-module/carbon/v2" + "github.com/dromara/carbon/v2" ) type Carbon = carbon.Carbon diff --git a/support/carbon/json.go b/support/carbon/json.go index 38af2a274..c3d6b254a 100644 --- a/support/carbon/json.go +++ b/support/carbon/json.go @@ -5,7 +5,7 @@ import ( "fmt" "strconv" - "github.com/golang-module/carbon/v2" + "github.com/dromara/carbon/v2" ) // DateTime defines a DateTime struct. From b1a7a4458c323c3d1e2705423c6f25e17aaa26ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=97=E5=AD=90?= Date: Fri, 29 Nov 2024 21:07:55 +0800 Subject: [PATCH 3/3] chore: temporarily fix output --- support/color/color.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/support/color/color.go b/support/color/color.go index 7d7061da2..7f9b6c058 100644 --- a/support/color/color.go +++ b/support/color/color.go @@ -2,6 +2,7 @@ package color import ( "bytes" + "github.com/goravel/framework/support/env" "io" "github.com/pterm/pterm" @@ -46,6 +47,14 @@ var ( func init() { pterm.EnableDebugMessages() + // Temporarily fix output issue including by https://github.com/pterm/pterm/commit/825931aa7ab264074e6c4045c3bdbca5482c758c + if env.IsTesting() { + info.Writer = nil + warning.Writer = nil + err.Writer = nil + debug.Writer = nil + success.Writer = nil + } } // New Functions to create Printer with specific color