refactor: migrate imports to charm.land/lipgloss

This commit is contained in:
Ayman Bagabas
2025-11-04 15:02:23 -05:00
parent a10cfddef9
commit da0b892d17
20 changed files with 23 additions and 33 deletions
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"time"
tea "charm.land/bubbletea/v2"
"github.com/charmbracelet/lipgloss/v2"
"charm.land/lipgloss/v2"
)
const defaultBlinkSpeed = time.Millisecond * 530
+1 -1
View File
@@ -13,7 +13,7 @@ import (
"charm.land/bubbles/v2/key"
tea "charm.land/bubbletea/v2"
"github.com/charmbracelet/lipgloss/v2"
"charm.land/lipgloss/v2"
"github.com/dustin/go-humanize"
)
+3 -5
View File
@@ -4,11 +4,10 @@ go 1.24.2
require (
charm.land/bubbletea/v2 v2.0.0-beta.6.0.20251104195021-b8645799fe45
charm.land/lipgloss/v2 v2.0.0-beta.3.0.20251104200114-3aae28661422
github.com/MakeNowJust/heredoc v1.0.0
github.com/atotto/clipboard v0.1.4
github.com/charmbracelet/bubbles/v2 v2.0.0-beta.1
github.com/charmbracelet/harmonica v0.2.0
github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.3.0.20251103214348-d3032608aa74
github.com/charmbracelet/x/ansi v0.10.3
github.com/charmbracelet/x/exp/golden v0.0.0-20250806222409-83e3a29d542f
github.com/dustin/go-humanize v1.0.1
@@ -20,19 +19,18 @@ require (
require (
github.com/aymanbagabas/go-udiff v0.3.1 // indirect
github.com/charmbracelet/bubbletea/v2 v2.0.0-beta.1 // indirect
github.com/charmbracelet/colorprofile v0.3.2 // indirect
github.com/charmbracelet/ultraviolet v0.0.0-20251104185819-20e68c88fe84 // indirect
github.com/charmbracelet/x/cellbuf v0.0.13 // indirect
github.com/charmbracelet/x/input v0.3.4 // indirect
github.com/charmbracelet/x/term v0.2.2 // indirect
github.com/charmbracelet/x/termios v0.1.1 // indirect
github.com/charmbracelet/x/windows v0.2.2 // indirect
github.com/clipperhouse/displaywidth v0.4.1 // indirect
github.com/clipperhouse/stringish v0.1.1 // indirect
github.com/clipperhouse/uax29/v2 v2.3.0 // indirect
github.com/kylelemons/godebug v1.1.0 // indirect
github.com/muesli/cancelreader v0.2.2 // indirect
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
golang.org/x/sync v0.17.0 // indirect
golang.org/x/sys v0.37.0 // indirect
)
+2 -10
View File
@@ -1,31 +1,23 @@
charm.land/bubbletea/v2 v2.0.0-beta.6.0.20251104195021-b8645799fe45 h1:fTulbdntGS0fp4xLeDO1+myFIwJNBNXO0pZ6SHs1oM0=
charm.land/bubbletea/v2 v2.0.0-beta.6.0.20251104195021-b8645799fe45/go.mod h1:001PaYn0OSAHMEEZ5d2Oh3E6hA6vs5LtYvQOAZgIiao=
charm.land/lipgloss/v2 v2.0.0-beta.3.0.20251104200114-3aae28661422 h1:LcW3SSv1EZvlb9pfaVZIZyHrPVRJdb0adgX+tWPYl0k=
charm.land/lipgloss/v2 v2.0.0-beta.3.0.20251104200114-3aae28661422/go.mod h1:0EJAlA1PDGb+2RyyC02yDSPDwvpegDefu74HC9Blg5o=
github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ=
github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE=
github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4=
github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
github.com/aymanbagabas/go-udiff v0.3.1 h1:LV+qyBQ2pqe0u42ZsUEtPiCaUoqgA9gYRDs3vj1nolY=
github.com/aymanbagabas/go-udiff v0.3.1/go.mod h1:G0fsKmG+P6ylD0r6N/KgQD/nWzgfnl8ZBcNLgcbrw8E=
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.2 h1:9J27WdztfJQVAQKX2WOlSSRB+5gaKqqITmrvb1uTIiI=
github.com/charmbracelet/colorprofile v0.3.2/go.mod h1:mTD5XzNeWHj8oqHb+S1bssQb7vIHbepiebQ2kPKVKbI=
github.com/charmbracelet/harmonica v0.2.0 h1:8NxJWRWg/bzKqqEaaeFNipOu77YR5t8aSwG4pgaUBiQ=
github.com/charmbracelet/harmonica v0.2.0/go.mod h1:KSri/1RMQOZLbw7AHqgcBycp8pgJnQMYYT8QZRqZ1Ao=
github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.3.0.20251103214348-d3032608aa74 h1:2N+CxpUFM6Rrx+xT7XaqM9pp/psOFlxKWa5R7rP/lck=
github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.3.0.20251103214348-d3032608aa74/go.mod h1:RfXmCdNs2F4MVJjBVQp5RZYXR05MiRAHN4GHwWmsNIA=
github.com/charmbracelet/ultraviolet v0.0.0-20251104185819-20e68c88fe84 h1:v0Lpf/xY3wsJ3WQw0hrX4tbR5T2v79U177XublKL2sU=
github.com/charmbracelet/ultraviolet v0.0.0-20251104185819-20e68c88fe84/go.mod h1:v1E3tTRQE3uaU0K1BrF/kgjAMGEPhkIYebanPBZ6Sdo=
github.com/charmbracelet/x/ansi v0.10.3 h1:3WoV9XN8uMEnFRZZ+vBPRy59TaIWa+gJodS4Vg5Fut0=
github.com/charmbracelet/x/ansi v0.10.3/go.mod h1:uQt8bOrq/xgXjlGcFMc8U2WYbnxyjrKhnvTQluvfCaE=
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/exp/golden v0.0.0-20250806222409-83e3a29d542f h1:pk6gmGpCE7F3FcjaOEKYriCvpmIN4+6OS/RD0vm4uIA=
github.com/charmbracelet/x/exp/golden v0.0.0-20250806222409-83e3a29d542f/go.mod h1:IfZAMTHB6XkZSeXUqriemErjAWCCzT0LwjKFYCZyw0I=
github.com/charmbracelet/x/input v0.3.4 h1:Mujmnv/4DaitU0p+kIsrlfZl/UlmeLKw1wAP3e1fMN0=
github.com/charmbracelet/x/input v0.3.4/go.mod h1:JI8RcvdZWQIhn09VzeK3hdp4lTz7+yhiEdpEQtZN+2c=
github.com/charmbracelet/x/term v0.2.2 h1:xVRT/S2ZcKdhhOuSP4t5cLi5o+JxklsoEObBSgfgZRk=
github.com/charmbracelet/x/term v0.2.2/go.mod h1:kF8CY5RddLWrsgVwpw4kAa6TESp6EB5y3uxGLeCqzAI=
github.com/charmbracelet/x/termios v0.1.1 h1:o3Q2bT8eqzGnGPOYheoYS8eEleT5ZVNYNy8JawjaNZY=
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"charm.land/bubbles/v2/key"
tea "charm.land/bubbletea/v2"
"github.com/charmbracelet/lipgloss/v2"
"charm.land/lipgloss/v2"
)
// KeyMap is a map of keybindings used to generate help. Since it's an
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"charm.land/bubbles/v2/key"
tea "charm.land/bubbletea/v2"
"github.com/charmbracelet/lipgloss/v2"
"charm.land/lipgloss/v2"
"github.com/charmbracelet/x/ansi"
)
+1 -1
View File
@@ -12,7 +12,7 @@ import (
"time"
tea "charm.land/bubbletea/v2"
"github.com/charmbracelet/lipgloss/v2"
"charm.land/lipgloss/v2"
"github.com/charmbracelet/x/ansi"
"github.com/sahilm/fuzzy"
+1 -1
View File
@@ -2,7 +2,7 @@ package list
import (
"charm.land/bubbles/v2/textinput"
"github.com/charmbracelet/lipgloss/v2"
"charm.land/lipgloss/v2"
)
const (
+1 -1
View File
@@ -11,7 +11,7 @@ import (
tea "charm.land/bubbletea/v2"
"github.com/charmbracelet/harmonica"
"github.com/charmbracelet/lipgloss/v2"
"charm.land/lipgloss/v2"
"github.com/charmbracelet/x/ansi"
"github.com/lucasb-eyer/go-colorful"
)
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"strings"
"testing"
"github.com/charmbracelet/lipgloss/v2"
"charm.land/lipgloss/v2"
)
const (
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"time"
tea "charm.land/bubbletea/v2"
"github.com/charmbracelet/lipgloss/v2"
"charm.land/lipgloss/v2"
)
// Internal ID management. Used during animating to ensure that frame messages
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"charm.land/bubbles/v2/key"
"charm.land/bubbles/v2/viewport"
tea "charm.land/bubbletea/v2"
"github.com/charmbracelet/lipgloss/v2"
"charm.land/lipgloss/v2"
"github.com/mattn/go-runewidth"
)
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"charm.land/bubbles/v2/help"
"charm.land/bubbles/v2/viewport"
"github.com/charmbracelet/lipgloss/v2"
"charm.land/lipgloss/v2"
"github.com/charmbracelet/x/ansi"
"github.com/charmbracelet/x/exp/golden"
)
+1 -1
View File
@@ -19,7 +19,7 @@ import (
"charm.land/bubbles/v2/viewport"
tea "charm.land/bubbletea/v2"
"github.com/atotto/clipboard"
"github.com/charmbracelet/lipgloss/v2"
"charm.land/lipgloss/v2"
"github.com/charmbracelet/x/ansi"
rw "github.com/mattn/go-runewidth"
"github.com/rivo/uniseg"
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"github.com/MakeNowJust/heredoc"
tea "charm.land/bubbletea/v2"
"github.com/charmbracelet/lipgloss/v2"
"charm.land/lipgloss/v2"
"github.com/charmbracelet/x/ansi"
)
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"time"
tea "charm.land/bubbletea/v2"
"github.com/charmbracelet/lipgloss/v2"
"charm.land/lipgloss/v2"
)
// DefaultStyles returns the default styles for focused and blurred states for
+1 -1
View File
@@ -13,7 +13,7 @@ import (
"charm.land/bubbles/v2/internal/runeutil"
"charm.land/bubbles/v2/key"
tea "charm.land/bubbletea/v2"
"github.com/charmbracelet/lipgloss/v2"
"charm.land/lipgloss/v2"
rw "github.com/mattn/go-runewidth"
"github.com/rivo/uniseg"
)
+1 -1
View File
@@ -1,7 +1,7 @@
package viewport
import (
"github.com/charmbracelet/lipgloss/v2"
"charm.land/lipgloss/v2"
"github.com/charmbracelet/x/ansi"
"github.com/rivo/uniseg"
)
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"charm.land/bubbles/v2/key"
tea "charm.land/bubbletea/v2"
"github.com/charmbracelet/lipgloss/v2"
"charm.land/lipgloss/v2"
"github.com/charmbracelet/x/ansi"
)
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"strings"
"testing"
"github.com/charmbracelet/lipgloss/v2"
"charm.land/lipgloss/v2"
"github.com/charmbracelet/x/ansi"
"github.com/charmbracelet/x/exp/golden"
)