From a7d13872fe1ba8b6b3c8b1690583dbc74281e338 Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Sat, 13 Dec 2025 13:10:06 -0300 Subject: [PATCH] fix(deps): use charm.land glamour and log (#1469) Signed-off-by: Carlos Alexandro Becker --- go.mod | 4 ++-- go.sum | 8 ++++---- internal/cmd/logs.go | 2 +- internal/tui/styles/chroma.go | 2 +- internal/tui/styles/markdown.go | 4 ++-- internal/tui/styles/theme.go | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index 994b45cec0f5c5805936018d01ebd3299aca30d8..74c41b4ff56529d57f4bb09d2ea9f880e0f5399c 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,9 @@ require ( charm.land/bubbles/v2 v2.0.0-rc.1 charm.land/bubbletea/v2 v2.0.0-rc.2.0.20251212194116-6348bd4b7475 charm.land/fantasy v0.5.2 + charm.land/glamour/v2 v2.0.0-20251110203732-69649f93d3b1 charm.land/lipgloss/v2 v2.0.0-beta.3.0.20251205162909-7869489d8971 + charm.land/log/v2 v2.0.0-20251110204020-529bb77f35da charm.land/x/vcr v0.1.1 github.com/JohannesKaufmann/html-to-markdown v1.6.0 github.com/MakeNowJust/heredoc v1.0.0 @@ -19,8 +21,6 @@ require ( github.com/charmbracelet/catwalk v0.10.1 github.com/charmbracelet/colorprofile v0.4.1 github.com/charmbracelet/fang v0.4.4 - github.com/charmbracelet/glamour/v2 v2.0.0-20251106195642-800eb8175930 - github.com/charmbracelet/log/v2 v2.0.0-20251106192421-eb64aaa963a0 github.com/charmbracelet/ultraviolet v0.0.0-20251212194010-b927aa605560 github.com/charmbracelet/x/ansi v0.11.3 github.com/charmbracelet/x/exp/charmtone v0.0.0-20250708181618-a60a724ba6c3 diff --git a/go.sum b/go.sum index 00f0580d744e4524a6948ae4881ab6a01f9c9a90..7b3d8cfd5fc76a63ed0c105e9a5dba9972031135 100644 --- a/go.sum +++ b/go.sum @@ -4,8 +4,12 @@ charm.land/bubbletea/v2 v2.0.0-rc.2.0.20251212194116-6348bd4b7475 h1:73ohAau8fvq charm.land/bubbletea/v2 v2.0.0-rc.2.0.20251212194116-6348bd4b7475/go.mod h1:pDM18flq3Z4njKZPA3zCvyVSSIJbMcoqlE82BdGUtL8= charm.land/fantasy v0.5.2 h1:4zlNsIcsyF3Jr+1onEuhHqZRzuH1LlxBle/gInS00QY= charm.land/fantasy v0.5.2/go.mod h1:SPOsnIlkBKnhw2Wnasv+wZ82EmCMIGesx0je3tgR6+M= +charm.land/glamour/v2 v2.0.0-20251110203732-69649f93d3b1 h1:9q4+yyU7105T3OrOx0csMyKnw89yMSijJ+rVld/Z2ek= +charm.land/glamour/v2 v2.0.0-20251110203732-69649f93d3b1/go.mod h1:J3kVhY6oHXZq5f+8vC3hmDO95fEvbqj3z7xDwxrfzU8= charm.land/lipgloss/v2 v2.0.0-beta.3.0.20251205162909-7869489d8971 h1:xZFcNsJMiIDbFtWRyDmkKNk1sjojfaom4Zoe0cyH/8c= charm.land/lipgloss/v2 v2.0.0-beta.3.0.20251205162909-7869489d8971/go.mod h1:i61Y3FmdbcBNSKa+pKB3DaE4uVQmBLMs/xlvRyHcXAE= +charm.land/log/v2 v2.0.0-20251110204020-529bb77f35da h1:vZa/Ow0uLclpfaDY0ubjzE+B0eLQqi2zanmpeALanow= +charm.land/log/v2 v2.0.0-20251110204020-529bb77f35da/go.mod h1:Tj12StbPc4GwksDF6XwhC9wdXouinIVxRGKKmmmzdSU= charm.land/x/vcr v0.1.1 h1:PXCFMUG0rPtyk35rhfzYCJEduOzWXCIbrXTFq4OF/9Q= charm.land/x/vcr v0.1.1/go.mod h1:eByq2gqzWvcct/8XE2XO5KznoWEBiXH56+y2gphbltM= cloud.google.com/go v0.116.0 h1:B3fRrSDkLRt5qSHWe40ERJvhvnQwdZiHu0bJOpldweE= @@ -94,10 +98,6 @@ github.com/charmbracelet/colorprofile v0.4.1 h1:a1lO03qTrSIRaK8c3JRxJDZOvhvIeSco github.com/charmbracelet/colorprofile v0.4.1/go.mod h1:U1d9Dljmdf9DLegaJ0nGZNJvoXAhayhmidOdcBwAvKk= github.com/charmbracelet/fang v0.4.4 h1:G4qKxF6or/eTPgmAolwPuRNyuci3hTUGGX1rj1YkHJY= github.com/charmbracelet/fang v0.4.4/go.mod h1:P5/DNb9DddQ0Z0dbc0P3ol4/ix5Po7Ofr2KMBfAqoCo= -github.com/charmbracelet/glamour/v2 v2.0.0-20251106195642-800eb8175930 h1:+47Z2jVAWPSLGjPRbfZizW3OpcAYsu7EUk2DR+66FyM= -github.com/charmbracelet/glamour/v2 v2.0.0-20251106195642-800eb8175930/go.mod h1:izs11tnkYaT3DTEH2E0V/lCb18VGZ7k9HLYEGuvgXGA= -github.com/charmbracelet/log/v2 v2.0.0-20251106192421-eb64aaa963a0 h1:lxHzxsHd4P7o7+5D5OcEItYkQ1xY3ovNg8Dc5ftd3rI= -github.com/charmbracelet/log/v2 v2.0.0-20251106192421-eb64aaa963a0/go.mod h1:Q7oMtlboDPnnrYiJDXNwdWmJblOmuOnycPKczlVju6I= github.com/charmbracelet/ultraviolet v0.0.0-20251212194010-b927aa605560 h1:j3PW2hypGoPKBy3ooKzW0TFxaxhyHK3NbkLLn4KeRFc= github.com/charmbracelet/ultraviolet v0.0.0-20251212194010-b927aa605560/go.mod h1:VWATWLRwYP06VYCEur7FsNR2B1xAo7Y+xl1PTbd1ePc= github.com/charmbracelet/x/ansi v0.11.3 h1:6DcVaqWI82BBVM/atTyq6yBoRLZFBsnoDoX9GCu2YOI= diff --git a/internal/cmd/logs.go b/internal/cmd/logs.go index 4372083189701e1410c83690c18fbd371f778169..4c66d499a08393972ec1ad740ddb4c29293b88d9 100644 --- a/internal/cmd/logs.go +++ b/internal/cmd/logs.go @@ -10,9 +10,9 @@ import ( "slices" "time" + "charm.land/log/v2" "github.com/charmbracelet/colorprofile" "github.com/charmbracelet/crush/internal/config" - "github.com/charmbracelet/log/v2" "github.com/charmbracelet/x/term" "github.com/nxadm/tail" "github.com/spf13/cobra" diff --git a/internal/tui/styles/chroma.go b/internal/tui/styles/chroma.go index b6521bea45ea4972cc25711116ff69f2588dd68f..bd656336a8236f5f9aa57fc2d7b98a1e84d4c932 100644 --- a/internal/tui/styles/chroma.go +++ b/internal/tui/styles/chroma.go @@ -1,8 +1,8 @@ package styles import ( + "charm.land/glamour/v2/ansi" "github.com/alecthomas/chroma/v2" - "github.com/charmbracelet/glamour/v2/ansi" ) func chromaStyle(style ansi.StylePrimitive) string { diff --git a/internal/tui/styles/markdown.go b/internal/tui/styles/markdown.go index 549ac87ff7c1c59c4a26fa4a8afd3a2dea35802b..fd857703ee21912ee3ddc7d6112798317c34fa59 100644 --- a/internal/tui/styles/markdown.go +++ b/internal/tui/styles/markdown.go @@ -4,8 +4,8 @@ import ( "fmt" "image/color" - "github.com/charmbracelet/glamour/v2" - "github.com/charmbracelet/glamour/v2/ansi" + "charm.land/glamour/v2" + "charm.land/glamour/v2/ansi" ) // lipglossColorToHex converts a color.Color to hex string diff --git a/internal/tui/styles/theme.go b/internal/tui/styles/theme.go index 9605dd2d4ed8ffcdf35a2b8e524747d0cc983bc9..f87ffd9de8b324cec4dcfd8b7cee61f71e0390eb 100644 --- a/internal/tui/styles/theme.go +++ b/internal/tui/styles/theme.go @@ -10,9 +10,9 @@ import ( "charm.land/bubbles/v2/textarea" "charm.land/bubbles/v2/textinput" tea "charm.land/bubbletea/v2" + "charm.land/glamour/v2/ansi" "charm.land/lipgloss/v2" "github.com/charmbracelet/crush/internal/tui/exp/diffview" - "github.com/charmbracelet/glamour/v2/ansi" "github.com/charmbracelet/x/exp/charmtone" "github.com/lucasb-eyer/go-colorful" "github.com/rivo/uniseg"