Ayman Bagabas created
cmd/soft/hook/hook.go | 2
cmd/soft/main.go | 2
cmd/soft/serve/server.go | 2
go.mod | 21 +++++--------
go.sum | 36 +++++++++--------------
pkg/backend/auth.go | 2
pkg/backend/backend.go | 2
pkg/backend/webhooks.go | 2
pkg/cron/cron.go | 2
pkg/cron/cron_test.go | 2
pkg/daemon/daemon.go | 2
pkg/db/db.go | 2
pkg/db/logger.go | 2
pkg/db/migrate/0003_migrate_lfs_objects.go | 2
pkg/db/migrate/migrate.go | 2
pkg/git/git.go | 2
pkg/git/lfs.go | 2
pkg/git/lfs_auth.go | 2
pkg/git/lfs_log.go | 2
pkg/git/service.go | 2
pkg/hooks/gen.go | 2
pkg/jobs/mirror.go | 2
pkg/lfs/basic_transfer.go | 2
pkg/lfs/http_client.go | 2
pkg/log/log.go | 2
pkg/ssh/cmd/commit.go | 2
pkg/ssh/cmd/git.go | 2
pkg/ssh/cmd/tag.go | 2
pkg/ssh/middleware.go | 2
pkg/ssh/session_test.go | 5 +--
pkg/ssh/ssh.go | 2
pkg/store/database/database.go | 2
pkg/ui/common/common.go | 2
pkg/ui/common/format.go | 2
pkg/ui/common/style.go | 8 ++---
pkg/ui/components/code/code.go | 8 ++---
pkg/ui/pages/repo/log.go | 2
pkg/web/auth.go | 2
pkg/web/context.go | 2
pkg/web/git.go | 2
pkg/web/git_lfs.go | 2
pkg/web/goget.go | 2
pkg/web/http.go | 2
pkg/web/logging.go | 2
pkg/web/server.go | 2
45 files changed, 70 insertions(+), 88 deletions(-)
@@ -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"
@@ -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"
@@ -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"
@@ -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
@@ -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=
@@ -5,7 +5,7 @@ import (
"crypto/sha256"
"encoding/hex"
- "github.com/charmbracelet/log"
+ "github.com/charmbracelet/log/v2"
"golang.org/x/crypto/bcrypt"
)
@@ -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"
@@ -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"
@@ -4,7 +4,7 @@ import (
"context"
"time"
- "github.com/charmbracelet/log"
+ "github.com/charmbracelet/log/v2"
"github.com/robfig/cron/v3"
)
@@ -6,7 +6,7 @@ import (
"fmt"
"testing"
- "github.com/charmbracelet/log"
+ "github.com/charmbracelet/log/v2"
)
func TestCronLogger(t *testing.T) {
@@ -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"
@@ -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
@@ -5,7 +5,7 @@ import (
"database/sql"
"strings"
- "github.com/charmbracelet/log"
+ "github.com/charmbracelet/log/v2"
"github.com/jmoiron/sqlx"
)
@@ -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"
@@ -6,7 +6,7 @@ import (
"errors"
"fmt"
- "github.com/charmbracelet/log"
+ "github.com/charmbracelet/log/v2"
"github.com/charmbracelet/soft-serve/pkg/db"
)
@@ -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"
)
@@ -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"
@@ -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"
@@ -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 {
@@ -10,7 +10,7 @@ import (
"strings"
"sync"
- "github.com/charmbracelet/log"
+ "github.com/charmbracelet/log/v2"
)
// Service is a Git daemon service.
@@ -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"
)
@@ -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"
@@ -9,7 +9,7 @@ import (
"io"
"net/http"
- "github.com/charmbracelet/log"
+ "github.com/charmbracelet/log/v2"
)
// BasicTransferAdapter implements the "basic" adapter
@@ -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.
@@ -5,7 +5,7 @@ import (
"strings"
"time"
- "github.com/charmbracelet/log"
+ "github.com/charmbracelet/log/v2"
"github.com/charmbracelet/soft-serve/pkg/config"
)
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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)
@@ -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"
@@ -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"
@@ -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"
@@ -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"
)
@@ -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,
})
}
@@ -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)
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -5,7 +5,7 @@ import (
"net/http"
"time"
- "github.com/charmbracelet/log"
+ "github.com/charmbracelet/log/v2"
"github.com/charmbracelet/soft-serve/pkg/config"
)
@@ -7,7 +7,7 @@ import (
"net/http"
"time"
- "github.com/charmbracelet/log"
+ "github.com/charmbracelet/log/v2"
"github.com/dustin/go-humanize"
)
@@ -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"
)