From db64e3cd782c69f89e3404295d8c1f9cdd780513 Mon Sep 17 00:00:00 2001 From: Ayman Bagabas Date: Tue, 29 Oct 2024 15:54:24 -0400 Subject: [PATCH] feat: update lipgloss to v2 --- cursor/cursor.go | 2 +- filepicker/filepicker.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- help/help.go | 2 +- list/defaultitem.go | 2 +- list/list.go | 2 +- list/style.go | 2 +- progress/progress.go | 2 +- spinner/spinner.go | 2 +- table/table.go | 2 +- table/table_test.go | 2 +- textarea/textarea.go | 2 +- textarea/textarea_test.go | 2 +- textinput/textinput.go | 2 +- viewport/viewport.go | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) diff --git a/cursor/cursor.go b/cursor/cursor.go index 2f69eeea8..c49781edd 100644 --- a/cursor/cursor.go +++ b/cursor/cursor.go @@ -5,7 +5,7 @@ import ( "time" tea "github.com/charmbracelet/bubbletea/v2" - "github.com/charmbracelet/lipgloss" + "github.com/charmbracelet/lipgloss/v2" ) const defaultBlinkSpeed = time.Millisecond * 530 diff --git a/filepicker/filepicker.go b/filepicker/filepicker.go index 5becaeb34..7966fc966 100644 --- a/filepicker/filepicker.go +++ b/filepicker/filepicker.go @@ -11,7 +11,7 @@ import ( "github.com/charmbracelet/bubbles/v2/key" tea "github.com/charmbracelet/bubbletea/v2" - "github.com/charmbracelet/lipgloss" + "github.com/charmbracelet/lipgloss/v2" "github.com/dustin/go-humanize" ) diff --git a/go.mod b/go.mod index e957b6e32..8cef63ae0 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/atotto/clipboard v0.1.4 github.com/charmbracelet/bubbletea/v2 v2.0.0-alpha.1.0.20241024164833-a31857d07198 github.com/charmbracelet/harmonica v0.2.0 - github.com/charmbracelet/lipgloss v0.13.2-0.20241023173701-23b08d1d3588 + github.com/charmbracelet/lipgloss/v2 v2.0.0-20241029194924-049a2d260c67 github.com/charmbracelet/x/ansi v0.4.0 github.com/charmbracelet/x/exp/golden v0.0.0-20241011142426-46044092ad91 github.com/dustin/go-humanize v1.0.1 diff --git a/go.sum b/go.sum index 34acff053..75be17713 100644 --- a/go.sum +++ b/go.sum @@ -12,8 +12,8 @@ github.com/charmbracelet/colorprofile v0.1.2 h1:nuB1bd/yAExT4fkcZvpqtQ2N5/8cJHSR github.com/charmbracelet/colorprofile v0.1.2/go.mod h1:1htIKZYeI4TQs+OykPvpuBTUbUJxBYeSYBDIZuejMj0= 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 v0.13.2-0.20241023173701-23b08d1d3588 h1:P0eMGSpqhHhVEN9HRD9Dl0ZaXIJWHINkW4DjPC/0EIQ= -github.com/charmbracelet/lipgloss v0.13.2-0.20241023173701-23b08d1d3588/go.mod h1:S+zi6HCChYq08TKQZpf3KEi7D/RO62JjxwNXbv6KVxA= +github.com/charmbracelet/lipgloss/v2 v2.0.0-20241029194924-049a2d260c67 h1:t/4KovO/31pdh9e74EVGVSbIlcY3bG4lmtrL3pD4fgU= +github.com/charmbracelet/lipgloss/v2 v2.0.0-20241029194924-049a2d260c67/go.mod h1:EcAf9+4/UeilG4rNQmiRzrou258LAVjVK4YUh+BvfqQ= github.com/charmbracelet/x/ansi v0.4.0 h1:NqwHA4B23VwsDn4H3VcNX1W1tOmgnvY1NDx5tOXdnOU= github.com/charmbracelet/x/ansi v0.4.0/go.mod h1:dk73KoMTT5AX5BsX0KrqhsTqAnhZZoCBjs7dGWp4Ktw= github.com/charmbracelet/x/exp/golden v0.0.0-20241011142426-46044092ad91 h1:payRxjMjKgx2PaCWLZ4p3ro9y97+TVLZNaRZgJwSVDQ= diff --git a/help/help.go b/help/help.go index 6dade0c33..d9e814bea 100644 --- a/help/help.go +++ b/help/help.go @@ -5,7 +5,7 @@ import ( "github.com/charmbracelet/bubbles/v2/key" tea "github.com/charmbracelet/bubbletea/v2" - "github.com/charmbracelet/lipgloss" + "github.com/charmbracelet/lipgloss/v2" ) // KeyMap is a map of keybindings used to generate help. Since it's an diff --git a/list/defaultitem.go b/list/defaultitem.go index 9c8ab260a..e28d1a02c 100644 --- a/list/defaultitem.go +++ b/list/defaultitem.go @@ -7,7 +7,7 @@ import ( "github.com/charmbracelet/bubbles/v2/key" tea "github.com/charmbracelet/bubbletea/v2" - "github.com/charmbracelet/lipgloss" + "github.com/charmbracelet/lipgloss/v2" "github.com/charmbracelet/x/ansi" ) diff --git a/list/list.go b/list/list.go index 980c74a48..671e1532e 100644 --- a/list/list.go +++ b/list/list.go @@ -11,7 +11,7 @@ import ( "time" tea "github.com/charmbracelet/bubbletea/v2" - "github.com/charmbracelet/lipgloss" + "github.com/charmbracelet/lipgloss/v2" "github.com/charmbracelet/x/ansi" "github.com/sahilm/fuzzy" diff --git a/list/style.go b/list/style.go index 1892022e3..208439037 100644 --- a/list/style.go +++ b/list/style.go @@ -1,7 +1,7 @@ package list import ( - "github.com/charmbracelet/lipgloss" + "github.com/charmbracelet/lipgloss/v2" ) const ( diff --git a/progress/progress.go b/progress/progress.go index 70b4f246a..4b066b9eb 100644 --- a/progress/progress.go +++ b/progress/progress.go @@ -9,7 +9,7 @@ import ( tea "github.com/charmbracelet/bubbletea/v2" "github.com/charmbracelet/harmonica" - "github.com/charmbracelet/lipgloss" + "github.com/charmbracelet/lipgloss/v2" "github.com/charmbracelet/x/ansi" "github.com/lucasb-eyer/go-colorful" "github.com/muesli/termenv" diff --git a/spinner/spinner.go b/spinner/spinner.go index bee084dc8..6e755403f 100644 --- a/spinner/spinner.go +++ b/spinner/spinner.go @@ -5,7 +5,7 @@ import ( "time" tea "github.com/charmbracelet/bubbletea/v2" - "github.com/charmbracelet/lipgloss" + "github.com/charmbracelet/lipgloss/v2" ) // Internal ID management. Used during animating to ensure that frame messages diff --git a/table/table.go b/table/table.go index bed0fd26e..c5482c3ee 100644 --- a/table/table.go +++ b/table/table.go @@ -7,7 +7,7 @@ import ( "github.com/charmbracelet/bubbles/v2/key" "github.com/charmbracelet/bubbles/v2/viewport" tea "github.com/charmbracelet/bubbletea/v2" - "github.com/charmbracelet/lipgloss" + "github.com/charmbracelet/lipgloss/v2" "github.com/mattn/go-runewidth" ) diff --git a/table/table_test.go b/table/table_test.go index cc49f0d3c..8c6da3720 100644 --- a/table/table_test.go +++ b/table/table_test.go @@ -3,7 +3,7 @@ package table import ( "testing" - "github.com/charmbracelet/lipgloss" + "github.com/charmbracelet/lipgloss/v2" "github.com/charmbracelet/x/ansi" "github.com/charmbracelet/x/exp/golden" ) diff --git a/textarea/textarea.go b/textarea/textarea.go index ad1271a8e..71694a329 100644 --- a/textarea/textarea.go +++ b/textarea/textarea.go @@ -14,7 +14,7 @@ import ( "github.com/charmbracelet/bubbles/v2/key" "github.com/charmbracelet/bubbles/v2/viewport" tea "github.com/charmbracelet/bubbletea/v2" - "github.com/charmbracelet/lipgloss" + "github.com/charmbracelet/lipgloss/v2" "github.com/charmbracelet/x/ansi" rw "github.com/mattn/go-runewidth" "github.com/rivo/uniseg" diff --git a/textarea/textarea_test.go b/textarea/textarea_test.go index cdc4edc76..157226536 100644 --- a/textarea/textarea_test.go +++ b/textarea/textarea_test.go @@ -7,7 +7,7 @@ import ( "github.com/MakeNowJust/heredoc" tea "github.com/charmbracelet/bubbletea/v2" - "github.com/charmbracelet/lipgloss" + "github.com/charmbracelet/lipgloss/v2" "github.com/charmbracelet/x/ansi" ) diff --git a/textinput/textinput.go b/textinput/textinput.go index 340445d00..3073a05fa 100644 --- a/textinput/textinput.go +++ b/textinput/textinput.go @@ -10,7 +10,7 @@ import ( "github.com/charmbracelet/bubbles/v2/internal/runeutil" "github.com/charmbracelet/bubbles/v2/key" tea "github.com/charmbracelet/bubbletea/v2" - "github.com/charmbracelet/lipgloss" + "github.com/charmbracelet/lipgloss/v2" rw "github.com/mattn/go-runewidth" "github.com/rivo/uniseg" ) diff --git a/viewport/viewport.go b/viewport/viewport.go index 949e2ebe8..5d602a5cb 100644 --- a/viewport/viewport.go +++ b/viewport/viewport.go @@ -6,7 +6,7 @@ import ( "github.com/charmbracelet/bubbles/v2/key" tea "github.com/charmbracelet/bubbletea/v2" - "github.com/charmbracelet/lipgloss" + "github.com/charmbracelet/lipgloss/v2" ) // New returns a new model with the given width and height as well as default