diff --git a/cmd/soft/hook/hook.go b/cmd/soft/hook/hook.go index e9b3f1f5c1ff6c3ebf40cbf3f5d5160c53ed8953..8a6fb87dc4ca64a9eaf0da1a1ef7fdaf5a8c7faa 100644 --- a/cmd/soft/hook/hook.go +++ b/cmd/soft/hook/hook.go @@ -12,7 +12,7 @@ import ( "path/filepath" "strings" - "github.com/charmbracelet/log" + "github.com/charmbracelet/log/v2" "github.com/charmbracelet/soft-serve/cmd" "github.com/charmbracelet/soft-serve/pkg/backend" "github.com/charmbracelet/soft-serve/pkg/config" diff --git a/cmd/soft/main.go b/cmd/soft/main.go index 1abf8c2f8572476f0b0dd07deb8576f4395188b2..9b248fd37aa641d6d0707004413bf53ad959b4aa 100644 --- a/cmd/soft/main.go +++ b/cmd/soft/main.go @@ -8,7 +8,7 @@ import ( "strconv" "github.com/charmbracelet/colorprofile" - "github.com/charmbracelet/log" + "github.com/charmbracelet/log/v2" "github.com/charmbracelet/soft-serve/cmd/soft/admin" "github.com/charmbracelet/soft-serve/cmd/soft/browse" "github.com/charmbracelet/soft-serve/cmd/soft/hook" diff --git a/cmd/soft/serve/server.go b/cmd/soft/serve/server.go index 76e55f581234203600edebb4f7b7bcb5d1d155f7..56402f13e0182a0a5e9c0b089727cd398174a731 100644 --- a/cmd/soft/serve/server.go +++ b/cmd/soft/serve/server.go @@ -6,7 +6,7 @@ import ( "fmt" "net/http" - "github.com/charmbracelet/log" + "github.com/charmbracelet/log/v2" "github.com/charmbracelet/soft-serve/pkg/backend" "github.com/charmbracelet/soft-serve/pkg/config" diff --git a/go.mod b/go.mod index ffd590990293616db03614748deade271399e236..c42aba922584329e82b66a857199447281e6da3b 100644 --- a/go.mod +++ b/go.mod @@ -3,13 +3,10 @@ module github.com/charmbracelet/soft-serve go 1.23.0 require ( - github.com/charmbracelet/glamour v0.9.1 - github.com/charmbracelet/lipgloss v1.1.0 // indirect github.com/dustin/go-humanize v1.0.1 github.com/go-git/go-git/v5 v5.14.0 github.com/matryer/is v1.4.1 github.com/muesli/reflow v0.3.0 - github.com/muesli/termenv v0.16.0 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 ) @@ -19,15 +16,16 @@ require ( github.com/aymanbagabas/git-module v1.8.4-0.20231101154130-8d27204ac6d2 github.com/caarlos0/duration v0.0.0-20240108180406-5d492514f3c7 github.com/caarlos0/env/v11 v11.2.2 - github.com/charmbracelet/bubbles/v2 v2.0.0-alpha.2.0.20250318132216-bd20b89a3e80 - github.com/charmbracelet/bubbletea/v2 v2.0.0-alpha.2.0.20250318133619-2ce107c85fed - github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc + github.com/charmbracelet/bubbles/v2 v2.0.0-beta.1 + github.com/charmbracelet/bubbletea/v2 v2.0.0-beta.1 + github.com/charmbracelet/colorprofile v0.3.0 github.com/charmbracelet/git-lfs-transfer v0.1.1-0.20240708204110-bacbfdb68d92 + github.com/charmbracelet/glamour/v2 v2.0.0-20250327182525-cd9a02a87169 github.com/charmbracelet/keygen v0.5.3 - github.com/charmbracelet/lipgloss/v2 v2.0.0-alpha.2.0.20250313133401-58331b1fff40 - github.com/charmbracelet/log v0.4.1 + github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.1 + github.com/charmbracelet/log/v2 v2.0.0-20250226163916-c379e29ff706 github.com/charmbracelet/ssh v0.0.0-20250128164007-98fd5ae11894 - github.com/charmbracelet/wish/v2 v2.0.0-20250319172925-3ae4bfe9c24e + github.com/charmbracelet/wish/v2 v2.0.0-20250328000358-93bac50f7f6a github.com/charmbracelet/x/ansi v0.8.0 github.com/go-jose/go-jose/v3 v3.0.3 github.com/gobwas/glob v0.2.3 @@ -55,12 +53,10 @@ require ( require ( github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect github.com/atotto/clipboard v0.1.4 // indirect - github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect github.com/aymerick/douceur v0.2.0 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect - github.com/charmbracelet/log/v2 v2.0.0-20250226163916-c379e29ff706 // indirect - github.com/charmbracelet/x/cellbuf v0.0.13 // indirect + github.com/charmbracelet/x/cellbuf v0.0.14-0.20250326144200-0875329e71da // indirect github.com/charmbracelet/x/conpty v0.1.0 // indirect github.com/charmbracelet/x/errors v0.0.0-20240725160154-f9f6568126ec // indirect github.com/charmbracelet/x/input v0.3.4 // indirect @@ -99,7 +95,6 @@ require ( golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect golang.org/x/net v0.36.0 // indirect golang.org/x/sys v0.31.0 // indirect - golang.org/x/term v0.30.0 // indirect golang.org/x/text v0.23.0 // indirect golang.org/x/tools v0.26.0 // indirect google.golang.org/protobuf v1.36.1 // indirect diff --git a/go.sum b/go.sum index 91a8baea2b45cb5fff2f52414d7b68c5819af1d7..fb492a5f1685be3e89f598a9725c7d3a7389283e 100644 --- a/go.sum +++ b/go.sum @@ -14,8 +14,6 @@ github.com/aymanbagabas/bubblezone/v2 v2.0.0-20250319214444-bb232f16d5e3 h1:1z2i github.com/aymanbagabas/bubblezone/v2 v2.0.0-20250319214444-bb232f16d5e3/go.mod h1:sJwqZoo/BSKSizmr0pSJ758RuRsnjlkrOaxPtwlWtOs= github.com/aymanbagabas/git-module v1.8.4-0.20231101154130-8d27204ac6d2 h1:3w5KT+shE3hzWhORGiu2liVjEoaCEXm9uZP47+Gw4So= github.com/aymanbagabas/git-module v1.8.4-0.20231101154130-8d27204ac6d2/go.mod h1:d4gQ7/3/S2sPq4NnKdtAgUOVr6XtLpWFtxyVV5/+76U= -github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k= -github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8= github.com/aymanbagabas/go-udiff v0.2.0 h1:TK0fH4MteXUDspT88n8CKzvK0X9O2xu9yQjWpi6yML8= github.com/aymanbagabas/go-udiff v0.2.0/go.mod h1:RE4Ex0qsGkTAJoQdQQCA0uG+nAzJO/pI/QwceO5fgrA= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= @@ -28,34 +26,30 @@ github.com/caarlos0/env/v11 v11.2.2 h1:95fApNrUyueipoZN/EhA8mMxiNxrBwDa+oAZrMWl3 github.com/caarlos0/env/v11 v11.2.2/go.mod h1:JBfcdeQiBoI3Zh1QRAWfe+tpiNTmDtcCj/hHHHMx0vc= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/charmbracelet/bubbles/v2 v2.0.0-alpha.2.0.20250318132216-bd20b89a3e80 h1:RlfUmUVZpshOB7YP4sdnIymgXb6tXhHeQ2854afgKoU= -github.com/charmbracelet/bubbles/v2 v2.0.0-alpha.2.0.20250318132216-bd20b89a3e80/go.mod h1:OQsv1nZAu5v8GtZqNTqS4yY5mfR0VgImkpe2F0QYEfs= -github.com/charmbracelet/bubbletea/v2 v2.0.0-alpha.2.0.20250318133619-2ce107c85fed h1:Fsn31oc6fmX7YgfZ1Am+19HVorJ8Bf6wJTebVNLcQP0= -github.com/charmbracelet/bubbletea/v2 v2.0.0-alpha.2.0.20250318133619-2ce107c85fed/go.mod h1:ks5r0VCpADtYFlNU15krnFIbMn545yV3U6ee6UJrlto= -github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc h1:4pZI35227imm7yK2bGPcfpFEmuY1gc2YSTShr4iJBfs= -github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc/go.mod h1:X4/0JoqgTIPSFcRA/P6INZzIuyqdFY5rm8tb41s9okk= +github.com/charmbracelet/bubbles/v2 v2.0.0-beta.1 h1:swACzss0FjnyPz1enfX56GKkLiuKg5FlyVmOLIlU2kE= +github.com/charmbracelet/bubbles/v2 v2.0.0-beta.1/go.mod h1:6HamsBKWqEC/FVHuQMHgQL+knPyvHH55HwJDHl/adMw= +github.com/charmbracelet/bubbletea/v2 v2.0.0-beta.1 h1:RvpXiXuPAuaKCHPCsE/lK5+zztnNDTSCa0CpeeIKdDU= +github.com/charmbracelet/bubbletea/v2 v2.0.0-beta.1/go.mod h1:qbcZLI5z8R49v9xBdU5V5Dh5D2uccx8wSwBqxQyErqc= +github.com/charmbracelet/colorprofile v0.3.0 h1:KtLh9uuu1RCt+Hml4s6Hz+kB1PfV3wi++1h5ia65yKQ= +github.com/charmbracelet/colorprofile v0.3.0/go.mod h1:oHJ340RS2nmG1zRGPmhJKJ/jf4FPNNk0P39/wBPA1G0= github.com/charmbracelet/git-lfs-transfer v0.1.1-0.20240708204110-bacbfdb68d92 h1:KtQlsiHfY3K4AoIEh0yUE/wCLHteZ9EzV1hKmx+p7U8= github.com/charmbracelet/git-lfs-transfer v0.1.1-0.20240708204110-bacbfdb68d92/go.mod h1:UrXUCm3xLQkq15fu7qlXHUMlrhdlXHoi13KH2Dfiits= -github.com/charmbracelet/glamour v0.9.1 h1:Q7PdJLOx8EoepsXUvW6Puz5WQ3YUElIGQdYKrIpiGLA= -github.com/charmbracelet/glamour v0.9.1/go.mod h1:+SHvIS8qnwhgTpVMiXwn7OfGomSqff1cHBCI8jLOetk= +github.com/charmbracelet/glamour/v2 v2.0.0-20250327182525-cd9a02a87169 h1:e7EonUlg7tnyBROD7J+C6bI3ndLF7Zh62UGd7d60ORM= +github.com/charmbracelet/glamour/v2 v2.0.0-20250327182525-cd9a02a87169/go.mod h1:4iwRPRwCj2jWI3odZnAPqc1nyCXDuBlnfkGavmjl9NI= github.com/charmbracelet/keygen v0.5.3 h1:2MSDC62OUbDy6VmjIE2jM24LuXUvKywLCmaJDmr/Z/4= github.com/charmbracelet/keygen v0.5.3/go.mod h1:TcpNoMAO5GSmhx3SgcEMqCrtn8BahKhB8AlwnLjRUpk= -github.com/charmbracelet/lipgloss v1.1.0 h1:vYXsiLHVkK7fp74RkV7b2kq9+zDLoEU4MZoFqR/noCY= -github.com/charmbracelet/lipgloss v1.1.0/go.mod h1:/6Q8FR2o+kj8rz4Dq0zQc3vYf7X+B0binUUBwA0aL30= -github.com/charmbracelet/lipgloss/v2 v2.0.0-alpha.2.0.20250313133401-58331b1fff40 h1:9IxBdCOOJoJ1PYXgxWXJCk3Fkl7h2n+b7VtY+5BbIuQ= -github.com/charmbracelet/lipgloss/v2 v2.0.0-alpha.2.0.20250313133401-58331b1fff40/go.mod h1:XhU7tcZRWVGzkjWQ6XYRH7tIVqYuWLx6XLjVqAz+7FU= -github.com/charmbracelet/log v0.4.1 h1:6AYnoHKADkghm/vt4neaNEXkxcXLSV2g1rdyFDOpTyk= -github.com/charmbracelet/log v0.4.1/go.mod h1:pXgyTsqsVu4N9hGdHmQ0xEA4RsXof402LX9ZgiITn2I= +github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.1 h1:D9AJJuYTN5pvz6mpIGO1ijLKpfTYSHOtKGgwoTQ4Gog= +github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.1/go.mod h1:tRlx/Hu0lo/j9viunCN2H+Ze6JrmdjQlXUQvvArgaOc= github.com/charmbracelet/log/v2 v2.0.0-20250226163916-c379e29ff706 h1:WkwO6Ks3mSIGnGuSdKl9qDSyfbYK50z2wc2gGMggegE= github.com/charmbracelet/log/v2 v2.0.0-20250226163916-c379e29ff706/go.mod h1:mjJGp00cxcfvD5xdCa+bso251Jt4owrQvuimJtVmEmM= github.com/charmbracelet/ssh v0.0.0-20250128164007-98fd5ae11894 h1:Ffon9TbltLGBsT6XE//YvNuu4OAaThXioqalhH11xEw= github.com/charmbracelet/ssh v0.0.0-20250128164007-98fd5ae11894/go.mod h1:hg+I6gvlMl16nS9ZzQNgBIrrCasGwEw0QiLsDcP01Ko= -github.com/charmbracelet/wish/v2 v2.0.0-20250319172925-3ae4bfe9c24e h1:WjrZFTFMjmm9dyc+KzXpY8z2viWdwShU6Qqqu3ixAss= -github.com/charmbracelet/wish/v2 v2.0.0-20250319172925-3ae4bfe9c24e/go.mod h1:olUvE0hW+a8zFU1vNvlEm6PJS+ElY1V5pcaV5pjzaGI= +github.com/charmbracelet/wish/v2 v2.0.0-20250328000358-93bac50f7f6a h1:K+X0iNqDhVbjbPsXIh/HFfa5rBbhaH0aQQGzfMhGh8Q= +github.com/charmbracelet/wish/v2 v2.0.0-20250328000358-93bac50f7f6a/go.mod h1:sa+xyPJGyNn2g9WTIMGVhwHniS92FWjcfPPYROIq80c= github.com/charmbracelet/x/ansi v0.8.0 h1:9GTq3xq9caJW8ZrBTe0LIe2fvfLR/bYXKTx2llXn7xE= github.com/charmbracelet/x/ansi v0.8.0/go.mod h1:wdYl/ONOLHLIVmQaxbIYEC/cRKOQyjTkowiI4blgS9Q= -github.com/charmbracelet/x/cellbuf v0.0.13 h1:/KBBKHuVRbq1lYx5BzEHBAFBP8VcQzJejZ/IA3iR28k= -github.com/charmbracelet/x/cellbuf v0.0.13/go.mod h1:xe0nKWGd3eJgtqZRaN9RjMtK7xUYchjzPr7q6kcvCCs= +github.com/charmbracelet/x/cellbuf v0.0.14-0.20250326144200-0875329e71da h1:8MGKD5WBtuzfXglq0CnyzVSwGojv57X+H46OL9OUyRA= +github.com/charmbracelet/x/cellbuf v0.0.14-0.20250326144200-0875329e71da/go.mod h1:xe0nKWGd3eJgtqZRaN9RjMtK7xUYchjzPr7q6kcvCCs= github.com/charmbracelet/x/conpty v0.1.0 h1:4zc8KaIcbiL4mghEON8D72agYtSeIgq8FSThSPQIb+U= github.com/charmbracelet/x/conpty v0.1.0/go.mod h1:rMFsDJoDwVmiYM10aD4bH2XiRgwI7NYJtQgl5yskjEQ= github.com/charmbracelet/x/errors v0.0.0-20240725160154-f9f6568126ec h1:O8c7pFFK0imuHH5JBqv5smlbVoFn4CZKGjtvCQKu1WE= @@ -163,8 +157,6 @@ github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s= github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8= github.com/muesli/roff v0.1.0 h1:YD0lalCotmYuF5HhZliKWlIx7IEhiXeSfq7hNjFqGF8= github.com/muesli/roff v0.1.0/go.mod h1:pjAHQM9hdUUwm/krAfrLGgJkXJ+YuhtsfZ42kieB2Ig= -github.com/muesli/termenv v0.16.0 h1:S5AlUN9dENB57rsbnkPyfdGuWIlkmzJjbFf0Tf5FWUc= -github.com/muesli/termenv v0.16.0/go.mod h1:ZRfOIKPFDYQoDFF4Olj7/QJbW60Ol/kL1pU3VfY/Cnk= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4= diff --git a/pkg/backend/auth.go b/pkg/backend/auth.go index 23713347883ddff6c9a2112d27db740f127052c2..7c8158f6d1ad67a580c2f6216b4ad02664f3a94b 100644 --- a/pkg/backend/auth.go +++ b/pkg/backend/auth.go @@ -5,7 +5,7 @@ import ( "crypto/sha256" "encoding/hex" - "github.com/charmbracelet/log" + "github.com/charmbracelet/log/v2" "golang.org/x/crypto/bcrypt" ) diff --git a/pkg/backend/backend.go b/pkg/backend/backend.go index ba8796b54546620df6b8377704ee5d76b1c10283..579d4cecbbc95118b8af451fdd8c9069d3c29e63 100644 --- a/pkg/backend/backend.go +++ b/pkg/backend/backend.go @@ -3,7 +3,7 @@ package backend import ( "context" - "github.com/charmbracelet/log" + "github.com/charmbracelet/log/v2" "github.com/charmbracelet/soft-serve/pkg/config" "github.com/charmbracelet/soft-serve/pkg/db" "github.com/charmbracelet/soft-serve/pkg/store" diff --git a/pkg/backend/webhooks.go b/pkg/backend/webhooks.go index e8e1fe9224f5b2bde6e7cae237599b7912fbcee4..cd3eb07e78ce3016c835c6ae00976f5b33fd427c 100644 --- a/pkg/backend/webhooks.go +++ b/pkg/backend/webhooks.go @@ -4,7 +4,7 @@ import ( "context" "encoding/json" - "github.com/charmbracelet/log" + "github.com/charmbracelet/log/v2" "github.com/charmbracelet/soft-serve/pkg/db" "github.com/charmbracelet/soft-serve/pkg/db/models" "github.com/charmbracelet/soft-serve/pkg/proto" diff --git a/pkg/cron/cron.go b/pkg/cron/cron.go index 6fed17b6a15ae6a954e9d6aa8d2418521231b4be..fa290a33e1e826515aeae2fbcd24e78b5a68e95d 100644 --- a/pkg/cron/cron.go +++ b/pkg/cron/cron.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/charmbracelet/log" + "github.com/charmbracelet/log/v2" "github.com/robfig/cron/v3" ) diff --git a/pkg/cron/cron_test.go b/pkg/cron/cron_test.go index c254191b2e45e889b5d2ce3f10fc1c7f16949c83..b8151db55fbbacb7444a87ad67e3f83ba87e6343 100644 --- a/pkg/cron/cron_test.go +++ b/pkg/cron/cron_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/charmbracelet/log" + "github.com/charmbracelet/log/v2" ) func TestCronLogger(t *testing.T) { diff --git a/pkg/daemon/daemon.go b/pkg/daemon/daemon.go index a5156355e3362162ca8f958b232a4e5709c79751..3fe241cd65cddaf8aae540f014f6c4dd3ee0a976 100644 --- a/pkg/daemon/daemon.go +++ b/pkg/daemon/daemon.go @@ -11,7 +11,7 @@ import ( "sync/atomic" "time" - "github.com/charmbracelet/log" + "github.com/charmbracelet/log/v2" "github.com/charmbracelet/soft-serve/pkg/access" "github.com/charmbracelet/soft-serve/pkg/backend" "github.com/charmbracelet/soft-serve/pkg/config" diff --git a/pkg/db/db.go b/pkg/db/db.go index 968d0425afeb65cf7a62d6ebc6c406922178f692..7d5fc2ebea59141c5f40ff83341303792709eebf 100644 --- a/pkg/db/db.go +++ b/pkg/db/db.go @@ -6,7 +6,7 @@ import ( "errors" "fmt" - "github.com/charmbracelet/log" + "github.com/charmbracelet/log/v2" "github.com/charmbracelet/soft-serve/pkg/config" "github.com/jmoiron/sqlx" _ "github.com/lib/pq" // postgres driver diff --git a/pkg/db/logger.go b/pkg/db/logger.go index 821576d11990ebb4b14f76c2015d2a6a8c794f5d..605ec133a82c7676c3a7315904bb09a5fb219e5b 100644 --- a/pkg/db/logger.go +++ b/pkg/db/logger.go @@ -5,7 +5,7 @@ import ( "database/sql" "strings" - "github.com/charmbracelet/log" + "github.com/charmbracelet/log/v2" "github.com/jmoiron/sqlx" ) diff --git a/pkg/db/migrate/0003_migrate_lfs_objects.go b/pkg/db/migrate/0003_migrate_lfs_objects.go index d7acd7be715be008c6ad8d261de0af622a6a4496..c89775d8ed0b5fc0f0d414179ff6c3c8f6fc4d4c 100644 --- a/pkg/db/migrate/0003_migrate_lfs_objects.go +++ b/pkg/db/migrate/0003_migrate_lfs_objects.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strconv" - "github.com/charmbracelet/log" + "github.com/charmbracelet/log/v2" "github.com/charmbracelet/soft-serve/pkg/config" "github.com/charmbracelet/soft-serve/pkg/db" "github.com/charmbracelet/soft-serve/pkg/db/models" diff --git a/pkg/db/migrate/migrate.go b/pkg/db/migrate/migrate.go index 18bc1780d488d13363e0be7b73768e337a1358e6..8273e454c9b5a8b1ac28edef580147be04dcafee 100644 --- a/pkg/db/migrate/migrate.go +++ b/pkg/db/migrate/migrate.go @@ -6,7 +6,7 @@ import ( "errors" "fmt" - "github.com/charmbracelet/log" + "github.com/charmbracelet/log/v2" "github.com/charmbracelet/soft-serve/pkg/db" ) diff --git a/pkg/git/git.go b/pkg/git/git.go index ed922e2649bf8c072a6197315507f465c676b85a..7b18cf22d562ebb638520501309a196a04a86cdb 100644 --- a/pkg/git/git.go +++ b/pkg/git/git.go @@ -9,7 +9,7 @@ import ( "strings" gitm "github.com/aymanbagabas/git-module" - "github.com/charmbracelet/log" + "github.com/charmbracelet/log/v2" "github.com/charmbracelet/soft-serve/git" "github.com/go-git/go-git/v5/plumbing/format/pktline" ) diff --git a/pkg/git/lfs.go b/pkg/git/lfs.go index 3d3ae6f7e78f828360ccc11c3ff010e4f59a8438..212ad08041a14b20d54acbd50bf8da942f3e4c9a 100644 --- a/pkg/git/lfs.go +++ b/pkg/git/lfs.go @@ -12,7 +12,7 @@ import ( "time" "github.com/charmbracelet/git-lfs-transfer/transfer" - "github.com/charmbracelet/log" + "github.com/charmbracelet/log/v2" "github.com/charmbracelet/soft-serve/pkg/config" "github.com/charmbracelet/soft-serve/pkg/db" "github.com/charmbracelet/soft-serve/pkg/db/models" diff --git a/pkg/git/lfs_auth.go b/pkg/git/lfs_auth.go index edf0785d45e60c20dea26bb998276ec3a67581ac..32a8e6cba7abbc50d7499ba858bdb4ddffc9e83b 100644 --- a/pkg/git/lfs_auth.go +++ b/pkg/git/lfs_auth.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "github.com/charmbracelet/log" + "github.com/charmbracelet/log/v2" "github.com/charmbracelet/soft-serve/pkg/config" "github.com/charmbracelet/soft-serve/pkg/jwk" "github.com/charmbracelet/soft-serve/pkg/lfs" diff --git a/pkg/git/lfs_log.go b/pkg/git/lfs_log.go index 979932d51df6a5cfd9700c12f7d103d2d2a8aed3..fed14ba440aacc986c99e646fbef90e455c266b2 100644 --- a/pkg/git/lfs_log.go +++ b/pkg/git/lfs_log.go @@ -2,7 +2,7 @@ package git import ( "github.com/charmbracelet/git-lfs-transfer/transfer" - "github.com/charmbracelet/log" + "github.com/charmbracelet/log/v2" ) type lfsLogger struct { diff --git a/pkg/git/service.go b/pkg/git/service.go index 24576421d4b9a0850501a34143ae6482d4358391..af589c25719320f4c2d8581fe375de32158346b9 100644 --- a/pkg/git/service.go +++ b/pkg/git/service.go @@ -10,7 +10,7 @@ import ( "strings" "sync" - "github.com/charmbracelet/log" + "github.com/charmbracelet/log/v2" ) // Service is a Git daemon service. diff --git a/pkg/hooks/gen.go b/pkg/hooks/gen.go index 245e5eb69fe4844c19c721cd7573ff723b9b0aab..d06661be6010efa7ae6acc94e296fd072bae50b1 100644 --- a/pkg/hooks/gen.go +++ b/pkg/hooks/gen.go @@ -7,7 +7,7 @@ import ( "path/filepath" "text/template" - "github.com/charmbracelet/log" + "github.com/charmbracelet/log/v2" "github.com/charmbracelet/soft-serve/pkg/config" "github.com/charmbracelet/soft-serve/pkg/utils" ) diff --git a/pkg/jobs/mirror.go b/pkg/jobs/mirror.go index 16ea923418ea49d4a24bf7892257d8a93688e3a6..9ebfdd864e76494b5081bb9ba244947989b591ee 100644 --- a/pkg/jobs/mirror.go +++ b/pkg/jobs/mirror.go @@ -7,7 +7,7 @@ import ( "runtime" "strings" - "github.com/charmbracelet/log" + "github.com/charmbracelet/log/v2" "github.com/charmbracelet/soft-serve/git" "github.com/charmbracelet/soft-serve/pkg/backend" "github.com/charmbracelet/soft-serve/pkg/config" diff --git a/pkg/lfs/basic_transfer.go b/pkg/lfs/basic_transfer.go index 609197c1035c176f6d31495d3a8cf57de7f5830c..d3e4100cd3477d77b3fe8a5953882f847336fd53 100644 --- a/pkg/lfs/basic_transfer.go +++ b/pkg/lfs/basic_transfer.go @@ -9,7 +9,7 @@ import ( "io" "net/http" - "github.com/charmbracelet/log" + "github.com/charmbracelet/log/v2" ) // BasicTransferAdapter implements the "basic" adapter diff --git a/pkg/lfs/http_client.go b/pkg/lfs/http_client.go index a8b55031f083d1fd5e4b9aaccd896fb50013f41c..c78a2e4b2e061a3f8b9c4a675b4f97226ee209bb 100644 --- a/pkg/lfs/http_client.go +++ b/pkg/lfs/http_client.go @@ -8,7 +8,7 @@ import ( "fmt" "net/http" - "github.com/charmbracelet/log" + "github.com/charmbracelet/log/v2" ) // httpClient is a Git LFS client to communicate with a LFS source API. diff --git a/pkg/log/log.go b/pkg/log/log.go index b9134ead76d6d5a96a413cfea5d2202647054374..0c1552589506a2cd82ae11aa77e300218e47d4d6 100644 --- a/pkg/log/log.go +++ b/pkg/log/log.go @@ -5,7 +5,7 @@ import ( "strings" "time" - "github.com/charmbracelet/log" + "github.com/charmbracelet/log/v2" "github.com/charmbracelet/soft-serve/pkg/config" ) diff --git a/pkg/ssh/cmd/commit.go b/pkg/ssh/cmd/commit.go index 4f91b2fed9ef2ca334d266ee4c43b8770ac73a06..88fb1b2c8bd310a3b30492c8e67a02d3c37df72d 100644 --- a/pkg/ssh/cmd/commit.go +++ b/pkg/ssh/cmd/commit.go @@ -5,7 +5,7 @@ import ( "strings" "time" - gansi "github.com/charmbracelet/glamour/ansi" + gansi "github.com/charmbracelet/glamour/v2/ansi" "github.com/charmbracelet/soft-serve/git" "github.com/charmbracelet/soft-serve/pkg/backend" "github.com/charmbracelet/soft-serve/pkg/ui/common" diff --git a/pkg/ssh/cmd/git.go b/pkg/ssh/cmd/git.go index 7265c9a762dd57ec62348b2da960d1ef7cca3651..620b9f0890e2ee4c19b202f9e97eee7ecab325b2 100644 --- a/pkg/ssh/cmd/git.go +++ b/pkg/ssh/cmd/git.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/charmbracelet/log" + "github.com/charmbracelet/log/v2" "github.com/charmbracelet/soft-serve/pkg/access" "github.com/charmbracelet/soft-serve/pkg/backend" "github.com/charmbracelet/soft-serve/pkg/config" diff --git a/pkg/ssh/cmd/tag.go b/pkg/ssh/cmd/tag.go index 009ac03083a90c6809b61d2c904ae398a59572fe..fc21ce0e4f73a2a340d61ade327ecfd157c1af0e 100644 --- a/pkg/ssh/cmd/tag.go +++ b/pkg/ssh/cmd/tag.go @@ -3,7 +3,7 @@ package cmd import ( "strings" - "github.com/charmbracelet/log" + "github.com/charmbracelet/log/v2" "github.com/charmbracelet/soft-serve/git" "github.com/charmbracelet/soft-serve/pkg/backend" "github.com/charmbracelet/soft-serve/pkg/proto" diff --git a/pkg/ssh/middleware.go b/pkg/ssh/middleware.go index 0bfb4c483a9bd5dfeadc23686841f0343a3e6110..32c31af933a807bef2de20dd37e53778a7cb91aa 100644 --- a/pkg/ssh/middleware.go +++ b/pkg/ssh/middleware.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/charmbracelet/log" + "github.com/charmbracelet/log/v2" "github.com/charmbracelet/soft-serve/pkg/backend" "github.com/charmbracelet/soft-serve/pkg/config" "github.com/charmbracelet/soft-serve/pkg/db" diff --git a/pkg/ssh/session_test.go b/pkg/ssh/session_test.go index d8d8bab850790ff76602bc8abbb257dac423b8b7..f831327450cf92c32188bde1096473274c57e78e 100644 --- a/pkg/ssh/session_test.go +++ b/pkg/ssh/session_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/charmbracelet/log" + "github.com/charmbracelet/log/v2" "github.com/charmbracelet/soft-serve/pkg/backend" "github.com/charmbracelet/soft-serve/pkg/config" "github.com/charmbracelet/soft-serve/pkg/db" @@ -20,7 +20,6 @@ import ( bm "github.com/charmbracelet/wish/v2/bubbletea" "github.com/charmbracelet/wish/v2/testsession" "github.com/matryer/is" - "github.com/muesli/termenv" gossh "golang.org/x/crypto/ssh" _ "modernc.org/sqlite" // sqlite driver ) @@ -79,7 +78,7 @@ func setup(tb testing.TB) (*gossh.Session, func() error) { be := backend.New(ctx, cfg, dbx, dbstore) ctx = backend.WithContext(ctx, be) return testsession.New(tb, &ssh.Server{ - Handler: ContextMiddleware(cfg, dbx, dbstore, be, log.Default())(bm.MiddlewareWithProgramHandler(SessionHandler, termenv.ANSI256)(func(s ssh.Session) { + Handler: ContextMiddleware(cfg, dbx, dbstore, be, log.Default())(bm.MiddlewareWithProgramHandler(SessionHandler)(func(s ssh.Session) { _, _, active := s.Pty() if !active { os.Exit(1) diff --git a/pkg/ssh/ssh.go b/pkg/ssh/ssh.go index 6ce1f7d113a8066db3c6960a0fb4ea2de37a570f..bd6dd2cf0cee82618c1d8421ce8e0037f42b0a8f 100644 --- a/pkg/ssh/ssh.go +++ b/pkg/ssh/ssh.go @@ -10,7 +10,7 @@ import ( "time" "github.com/charmbracelet/keygen" - "github.com/charmbracelet/log" + "github.com/charmbracelet/log/v2" "github.com/charmbracelet/soft-serve/pkg/backend" "github.com/charmbracelet/soft-serve/pkg/config" "github.com/charmbracelet/soft-serve/pkg/db" diff --git a/pkg/store/database/database.go b/pkg/store/database/database.go index 02c4bd19cf25e2c3dccd59829eeb71d1947e59af..e41087c7a8dfaa8f14da34715425c0f761d380ba 100644 --- a/pkg/store/database/database.go +++ b/pkg/store/database/database.go @@ -3,7 +3,7 @@ package database import ( "context" - "github.com/charmbracelet/log" + "github.com/charmbracelet/log/v2" "github.com/charmbracelet/soft-serve/pkg/config" "github.com/charmbracelet/soft-serve/pkg/db" "github.com/charmbracelet/soft-serve/pkg/store" diff --git a/pkg/ui/common/common.go b/pkg/ui/common/common.go index 76b6ac488e8f71f21b5fb94c054f137331146bd7..687939407f8af05cc703dbf0ef1a60cd01302836 100644 --- a/pkg/ui/common/common.go +++ b/pkg/ui/common/common.go @@ -6,7 +6,7 @@ import ( "github.com/alecthomas/chroma/v2/lexers" zone "github.com/aymanbagabas/bubblezone/v2" - "github.com/charmbracelet/log" + "github.com/charmbracelet/log/v2" "github.com/charmbracelet/soft-serve/git" "github.com/charmbracelet/soft-serve/pkg/backend" "github.com/charmbracelet/soft-serve/pkg/config" diff --git a/pkg/ui/common/format.go b/pkg/ui/common/format.go index 4344e057d8cfba2478b977a34f01a1d28c1cc6d2..f82c71aec65d6366f3f4d6da770979c94a4d18e4 100644 --- a/pkg/ui/common/format.go +++ b/pkg/ui/common/format.go @@ -6,7 +6,7 @@ import ( "strings" "github.com/alecthomas/chroma/v2/lexers" - gansi "github.com/charmbracelet/glamour/ansi" + gansi "github.com/charmbracelet/glamour/v2/ansi" "github.com/charmbracelet/soft-serve/pkg/ui/styles" ) diff --git a/pkg/ui/common/style.go b/pkg/ui/common/style.go index 62239d0a5c9a122679362e17f6942b834eec4690..01000da16591fe143f73ff9cc97c831691f47892 100644 --- a/pkg/ui/common/style.go +++ b/pkg/ui/common/style.go @@ -2,9 +2,8 @@ package common import ( "github.com/charmbracelet/colorprofile" - gansi "github.com/charmbracelet/glamour/ansi" - "github.com/charmbracelet/glamour/styles" - "github.com/muesli/termenv" + gansi "github.com/charmbracelet/glamour/v2/ansi" + "github.com/charmbracelet/glamour/v2/styles" ) // DefaultColorProfile is the default color profile used by the SSH server. @@ -40,7 +39,6 @@ func StyleRenderer() gansi.RenderContext { // DefaultColorProfile and styles. func StyleRendererWithStyles(styles gansi.StyleConfig) gansi.RenderContext { return gansi.NewRenderContext(gansi.Options{ - ColorProfile: termenv.ANSI256, - Styles: styles, + Styles: styles, }) } diff --git a/pkg/ui/components/code/code.go b/pkg/ui/components/code/code.go index 416cd85d0a0066396f506f595592e74524b6c76b..6da77c65fe8040f9bf21c266eafbcf78328613c5 100644 --- a/pkg/ui/components/code/code.go +++ b/pkg/ui/components/code/code.go @@ -7,12 +7,11 @@ import ( "github.com/alecthomas/chroma/v2/lexers" tea "github.com/charmbracelet/bubbletea/v2" - "github.com/charmbracelet/glamour" - gansi "github.com/charmbracelet/glamour/ansi" + "github.com/charmbracelet/glamour/v2" + gansi "github.com/charmbracelet/glamour/v2/ansi" "github.com/charmbracelet/lipgloss/v2" "github.com/charmbracelet/soft-serve/pkg/ui/common" vp "github.com/charmbracelet/soft-serve/pkg/ui/components/viewport" - "github.com/muesli/termenv" ) const ( @@ -228,8 +227,7 @@ func (r *Code) renderFile(path, content string) (string, error) { var m uint st.CodeBlock.Margin = &m rc = gansi.NewRenderContext(gansi.Options{ - ColorProfile: termenv.TrueColor, - Styles: st, + Styles: st, }) } err := formatter.Render(&s, rc) diff --git a/pkg/ui/pages/repo/log.go b/pkg/ui/pages/repo/log.go index 1caabb4d6ba4ff42d6f91df56c723809c97bb8d4..bb8caa34c4d4b2d6f915ae0a5411d4388b6f24bf 100644 --- a/pkg/ui/pages/repo/log.go +++ b/pkg/ui/pages/repo/log.go @@ -8,7 +8,7 @@ import ( "github.com/charmbracelet/bubbles/v2/key" "github.com/charmbracelet/bubbles/v2/spinner" tea "github.com/charmbracelet/bubbletea/v2" - gansi "github.com/charmbracelet/glamour/ansi" + gansi "github.com/charmbracelet/glamour/v2/ansi" "github.com/charmbracelet/lipgloss/v2" "github.com/charmbracelet/soft-serve/git" "github.com/charmbracelet/soft-serve/pkg/proto" diff --git a/pkg/web/auth.go b/pkg/web/auth.go index 96b2bab85fcc94200525088d0bf37bac31942bf8..0d8f6d49737b2585cda0720c1567f5e4470cd229 100644 --- a/pkg/web/auth.go +++ b/pkg/web/auth.go @@ -7,7 +7,7 @@ import ( "net/http" "strings" - "github.com/charmbracelet/log" + "github.com/charmbracelet/log/v2" "github.com/charmbracelet/soft-serve/pkg/backend" "github.com/charmbracelet/soft-serve/pkg/config" "github.com/charmbracelet/soft-serve/pkg/proto" diff --git a/pkg/web/context.go b/pkg/web/context.go index ccba92776861ac7108851c0ace1845b7a1311936..725e80b201b71ececfd0edc85515d22da1ac4464 100644 --- a/pkg/web/context.go +++ b/pkg/web/context.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "github.com/charmbracelet/log" + "github.com/charmbracelet/log/v2" "github.com/charmbracelet/soft-serve/pkg/backend" "github.com/charmbracelet/soft-serve/pkg/config" "github.com/charmbracelet/soft-serve/pkg/db" diff --git a/pkg/web/git.go b/pkg/web/git.go index 1980f73af53cda7ff1b594fd4581d7397de0b0f2..df307d41f0d5e5b367362549ff8608efd6f54b55 100644 --- a/pkg/web/git.go +++ b/pkg/web/git.go @@ -14,7 +14,7 @@ import ( "strings" "time" - "github.com/charmbracelet/log" + "github.com/charmbracelet/log/v2" gitb "github.com/charmbracelet/soft-serve/git" "github.com/charmbracelet/soft-serve/pkg/access" "github.com/charmbracelet/soft-serve/pkg/backend" diff --git a/pkg/web/git_lfs.go b/pkg/web/git_lfs.go index dccd87f95ea9d0a9d37ea1f1bf62e1c3c8ee3023..9149d4f8ee7a56290b33daf53cec104f4e94c6ab 100644 --- a/pkg/web/git_lfs.go +++ b/pkg/web/git_lfs.go @@ -13,7 +13,7 @@ import ( "strconv" "strings" - "github.com/charmbracelet/log" + "github.com/charmbracelet/log/v2" "github.com/charmbracelet/soft-serve/pkg/access" "github.com/charmbracelet/soft-serve/pkg/backend" "github.com/charmbracelet/soft-serve/pkg/config" diff --git a/pkg/web/goget.go b/pkg/web/goget.go index 3c9c49719c0d44ad30fdef5dc9a44492d9e15497..b6678ff9184dd323a232a02d0ee41eb37feffa7e 100644 --- a/pkg/web/goget.go +++ b/pkg/web/goget.go @@ -6,7 +6,7 @@ import ( "path" "text/template" - "github.com/charmbracelet/log" + "github.com/charmbracelet/log/v2" "github.com/charmbracelet/soft-serve/pkg/backend" "github.com/charmbracelet/soft-serve/pkg/config" "github.com/charmbracelet/soft-serve/pkg/utils" diff --git a/pkg/web/http.go b/pkg/web/http.go index 20fae6bd176edff577947b56e14722f8f53d8819..0cdc57b1bb087d395b577441d5659b93adbb580b 100644 --- a/pkg/web/http.go +++ b/pkg/web/http.go @@ -5,7 +5,7 @@ import ( "net/http" "time" - "github.com/charmbracelet/log" + "github.com/charmbracelet/log/v2" "github.com/charmbracelet/soft-serve/pkg/config" ) diff --git a/pkg/web/logging.go b/pkg/web/logging.go index 63b6d35e5b5fcf22308fffc7caefe729832d90d5..b9a264f55988d5b6697bae25e38afba276033ca9 100644 --- a/pkg/web/logging.go +++ b/pkg/web/logging.go @@ -7,7 +7,7 @@ import ( "net/http" "time" - "github.com/charmbracelet/log" + "github.com/charmbracelet/log/v2" "github.com/dustin/go-humanize" ) diff --git a/pkg/web/server.go b/pkg/web/server.go index 74a04f5b176bee7d1710f023643436119b181c97..a5cb490ed4b20f54c49f93775affc640594a6970 100644 --- a/pkg/web/server.go +++ b/pkg/web/server.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "github.com/charmbracelet/log" + "github.com/charmbracelet/log/v2" "github.com/gorilla/handlers" "github.com/gorilla/mux" )