diff --git a/cursor/cursor.go b/cursor/cursor.go index cc928f0..662ad18 100644 --- a/cursor/cursor.go +++ b/cursor/cursor.go @@ -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 diff --git a/filepicker/filepicker.go b/filepicker/filepicker.go index ed8c5d3..a26c611 100644 --- a/filepicker/filepicker.go +++ b/filepicker/filepicker.go @@ -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" ) diff --git a/go.mod b/go.mod index 824e6d8..9a65cfe 100644 --- a/go.mod +++ b/go.mod @@ -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 ) diff --git a/go.sum b/go.sum index e993cd9..2ec7c44 100644 --- a/go.sum +++ b/go.sum @@ -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= diff --git a/help/help.go b/help/help.go index 3e69faf..c26f046 100644 --- a/help/help.go +++ b/help/help.go @@ -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 diff --git a/list/defaultitem.go b/list/defaultitem.go index e553dab..e116dfd 100644 --- a/list/defaultitem.go +++ b/list/defaultitem.go @@ -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" ) diff --git a/list/list.go b/list/list.go index 76351bc..fb87b0f 100644 --- a/list/list.go +++ b/list/list.go @@ -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" diff --git a/list/style.go b/list/style.go index d05062f..4f7b027 100644 --- a/list/style.go +++ b/list/style.go @@ -2,7 +2,7 @@ package list import ( "charm.land/bubbles/v2/textinput" - "github.com/charmbracelet/lipgloss/v2" + "charm.land/lipgloss/v2" ) const ( diff --git a/progress/progress.go b/progress/progress.go index e8ecb0e..b5730bb 100644 --- a/progress/progress.go +++ b/progress/progress.go @@ -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" ) diff --git a/progress/progress_test.go b/progress/progress_test.go index 08bd52b..82dbaf4 100644 --- a/progress/progress_test.go +++ b/progress/progress_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/charmbracelet/lipgloss/v2" + "charm.land/lipgloss/v2" ) const ( diff --git a/spinner/spinner.go b/spinner/spinner.go index 5886e32..bf56603 100644 --- a/spinner/spinner.go +++ b/spinner/spinner.go @@ -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 diff --git a/table/table.go b/table/table.go index 9789585..793b415 100644 --- a/table/table.go +++ b/table/table.go @@ -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" ) diff --git a/table/table_test.go b/table/table_test.go index 470474a..8547bce 100644 --- a/table/table_test.go +++ b/table/table_test.go @@ -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" ) diff --git a/textarea/textarea.go b/textarea/textarea.go index 7d2ebec..463181a 100644 --- a/textarea/textarea.go +++ b/textarea/textarea.go @@ -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" diff --git a/textarea/textarea_test.go b/textarea/textarea_test.go index e85be42..e01ac5a 100644 --- a/textarea/textarea_test.go +++ b/textarea/textarea_test.go @@ -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" ) diff --git a/textinput/styles.go b/textinput/styles.go index 545b926..3e53a4a 100644 --- a/textinput/styles.go +++ b/textinput/styles.go @@ -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 diff --git a/textinput/textinput.go b/textinput/textinput.go index 30e4abf..56306d6 100644 --- a/textinput/textinput.go +++ b/textinput/textinput.go @@ -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" ) diff --git a/viewport/highlight.go b/viewport/highlight.go index ec0ffda..7bb5025 100644 --- a/viewport/highlight.go +++ b/viewport/highlight.go @@ -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" ) diff --git a/viewport/viewport.go b/viewport/viewport.go index 1cf25e5..0bf1217 100644 --- a/viewport/viewport.go +++ b/viewport/viewport.go @@ -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" ) diff --git a/viewport/viewport_test.go b/viewport/viewport_test.go index 7af40a4..406c8a9 100644 --- a/viewport/viewport_test.go +++ b/viewport/viewport_test.go @@ -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" )