Skip to content

Commit c2afdea

Browse files
caarlos0caarlos0
authored
fix(deps): update bubbletea, remove x/exp/term (#311)
Signed-off-by: Carlos Alexandro Becker <[email protected]>
1 parent d5e24e8 commit c2afdea

File tree

5 files changed

+21
-29
lines changed

5 files changed

+21
-29
lines changed

‎bubbletea/tea_unix.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@ package bubbletea
55

66
import (
77
"image/color"
8+
"time"
89

910
tea "github.com/charmbracelet/bubbletea"
1011
"github.com/charmbracelet/lipgloss"
1112
"github.com/charmbracelet/ssh"
12-
"github.com/charmbracelet/x/exp/term"
13-
"github.com/charmbracelet/x/exp/term/ansi"
14-
"github.com/charmbracelet/x/exp/term/input"
13+
"github.com/charmbracelet/x/ansi"
14+
"github.com/charmbracelet/x/input"
15+
"github.com/charmbracelet/x/term"
1516
"github.com/lucasb-eyer/go-colorful"
1617
"github.com/muesli/termenv"
1718
)
@@ -45,7 +46,7 @@ func newRenderer(s ssh.Session) *lipgloss.Renderer {
4546
termenv.WithEnvironment(env),
4647
termenv.WithColorCache(true),
4748
)
48-
bg = term.BackgroundColor(pty.Slave, pty.Slave)
49+
bg, _ = term.QueryBackgroundColor(pty.Slave, pty.Slave)
4950
} else {
5051
r = lipgloss.NewRenderer(
5152
s,
@@ -67,7 +68,7 @@ func newRenderer(s ssh.Session) *lipgloss.Renderer {
6768

6869
// copied from x/exp/term.
6970
func queryBackgroundColor(s ssh.Session) (bg color.Color) {
70-
_ = term.QueryTerminal(s, s, func(events []input.Event) bool {
71+
_ = term.QueryTerminal(s, s, time.Second, func(events []input.Event) bool {
7172
for _, e := range events {
7273
switch e := e.(type) {
7374
case input.BackgroundColorEvent:

‎examples/go.mod‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.18
44

55
require (
66
github.com/charmbracelet/bubbles v0.18.0
7-
github.com/charmbracelet/bubbletea v0.26.6
7+
github.com/charmbracelet/bubbletea v0.27.0
88
github.com/charmbracelet/lipgloss v0.12.1
99
github.com/charmbracelet/log v0.4.0
1010
github.com/charmbracelet/ssh v0.0.0-20240725163421-eb71b85b27aa
@@ -23,11 +23,10 @@ require (
2323
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect
2424
github.com/atotto/clipboard v0.1.4 // indirect
2525
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
26-
github.com/charmbracelet/keygen v0.5.0 // indirect
26+
github.com/charmbracelet/keygen v0.5.1 // indirect
2727
github.com/charmbracelet/x/ansi v0.1.4 // indirect
2828
github.com/charmbracelet/x/conpty v0.1.0 // indirect
2929
github.com/charmbracelet/x/errors v0.0.0-20240508181413-e8d8b6e2de86 // indirect
30-
github.com/charmbracelet/x/exp/term v0.0.0-20240503143715-36ea203beff4 // indirect
3130
github.com/charmbracelet/x/input v0.1.0 // indirect
3231
github.com/charmbracelet/x/term v0.1.1 // indirect
3332
github.com/charmbracelet/x/termios v0.1.0 // indirect
@@ -63,7 +62,7 @@ require (
6362
golang.org/x/mod v0.17.0 // indirect
6463
golang.org/x/net v0.25.0 // indirect
6564
golang.org/x/sync v0.8.0 // indirect
66-
golang.org/x/sys v0.23.0 // indirect
65+
golang.org/x/sys v0.24.0 // indirect
6766
golang.org/x/text v0.17.0 // indirect
6867
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
6968
gopkg.in/warnings.v0 v0.1.2 // indirect

‎examples/go.sum‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,8 @@ github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ
1515
github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
1616
github.com/charmbracelet/bubbles v0.18.0 h1:PYv1A036luoBGroX6VWjQIE9Syf2Wby2oOl/39KLfy0=
1717
github.com/charmbracelet/bubbles v0.18.0/go.mod h1:08qhZhtIwzgrtBjAcJnij1t1H0ZRjwHyGsy6AL11PSw=
18-
github.com/charmbracelet/bubbletea v0.26.6 h1:zTCWSuST+3yZYZnVSvbXwKOPRSNZceVeqpzOLN2zq1s=
19-
github.com/charmbracelet/bubbletea v0.26.6/go.mod h1:dz8CWPlfCCGLFbBlTY4N7bjLiyOGDJEnd2Muu7pOWhk=
20-
github.com/charmbracelet/keygen v0.5.0 h1:XY0fsoYiCSM9axkrU+2ziE6u6YjJulo/b9Dghnw6MZc=
21-
github.com/charmbracelet/keygen v0.5.0/go.mod h1:DfvCgLHxZ9rJxdK0DGw3C/LkV4SgdGbnliHcObV3L+8=
18+
github.com/charmbracelet/bubbletea v0.27.0 h1:Mznj+vvYuYagD9Pn2mY7fuelGvP0HAXtZYGgRBCbHvU=
19+
github.com/charmbracelet/keygen v0.5.1 h1:zBkkYPtmKDVTw+cwUyY6ZwGDhRxXkEp0Oxs9sqMLqxI=
2220
github.com/charmbracelet/lipgloss v0.12.1 h1:/gmzszl+pedQpjCOH+wFkZr/N90Snz40J/NR7A0zQcs=
2321
github.com/charmbracelet/lipgloss v0.12.1/go.mod h1:V2CiwIuhx9S1S1ZlADfOj9HmxeMAORuz5izHb0zGbB8=
2422
github.com/charmbracelet/log v0.4.0 h1:G9bQAcx8rWA2T3pWvx7YtPTPwgqpk7D68BX21IRW8ZM=
@@ -33,8 +31,6 @@ github.com/charmbracelet/x/editor v0.1.0 h1:p69/dpvlwRTs9uYiPeAWruwsHqTFzHhTvQOd
3331
github.com/charmbracelet/x/editor v0.1.0/go.mod h1:oivrEbcP/AYt/Hpvk5pwDXXrQ933gQS6UzL6fxqAGSA=
3432
github.com/charmbracelet/x/errors v0.0.0-20240508181413-e8d8b6e2de86 h1:JSt3B+U9iqk37QUU2Rvb6DSBYRLtWqFqfxf8l5hOZUA=
3533
github.com/charmbracelet/x/errors v0.0.0-20240508181413-e8d8b6e2de86/go.mod h1:2P0UgXMEa6TsToMSuFqKFQR+fZTO9CNGUNokkPatT/0=
36-
github.com/charmbracelet/x/exp/term v0.0.0-20240503143715-36ea203beff4 h1:zHstno0DfHRoZ+R+kPEDYYl/X16I3z9CO6j0nhGDKxw=
37-
github.com/charmbracelet/x/exp/term v0.0.0-20240503143715-36ea203beff4/go.mod h1:yQqGHmheaQfkqiJWjklPHVAq1dKbk8uGbcoS/lcKCJ0=
3834
github.com/charmbracelet/x/input v0.1.0 h1:TEsGSfZYQyOtp+STIjyBq6tpRaorH0qpwZUj8DavAhQ=
3935
github.com/charmbracelet/x/input v0.1.0/go.mod h1:ZZwaBxPF7IG8gWWzPUVqHEtWhc1+HXJPNuerJGRGZ28=
4036
github.com/charmbracelet/x/term v0.1.1 h1:3cosVAiPOig+EV4X9U+3LDgtwwAoEzJjNdwbXDjF6yI=
@@ -179,8 +175,7 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
179175
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
180176
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
181177
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
182-
golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM=
183-
golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
178+
golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
184179
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
185180
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
186181
golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=

‎go.mod‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@ module github.com/charmbracelet/wish
33
go 1.19
44

55
require (
6-
github.com/charmbracelet/bubbletea v0.26.6
6+
github.com/charmbracelet/bubbletea v0.27.0
77
github.com/charmbracelet/keygen v0.5.1
88
github.com/charmbracelet/lipgloss v0.12.1
99
github.com/charmbracelet/log v0.4.0
1010
github.com/charmbracelet/ssh v0.0.0-20240725163421-eb71b85b27aa
11-
github.com/charmbracelet/x/exp/term v0.0.0-20240503143715-36ea203beff4
11+
github.com/charmbracelet/x/ansi v0.1.4
12+
github.com/charmbracelet/x/input v0.1.0
13+
github.com/charmbracelet/x/term v0.1.1
1214
github.com/go-git/go-git/v5 v5.12.0
1315
github.com/google/go-cmp v0.6.0
1416
github.com/hashicorp/golang-lru/v2 v2.0.7
@@ -26,11 +28,8 @@ require (
2628
github.com/ProtonMail/go-crypto v1.0.0 // indirect
2729
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect
2830
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
29-
github.com/charmbracelet/x/ansi v0.1.4 // indirect
3031
github.com/charmbracelet/x/conpty v0.1.0 // indirect
3132
github.com/charmbracelet/x/errors v0.0.0-20240508181413-e8d8b6e2de86 // indirect
32-
github.com/charmbracelet/x/input v0.1.0 // indirect
33-
github.com/charmbracelet/x/term v0.1.1 // indirect
3433
github.com/charmbracelet/x/termios v0.1.0 // indirect
3534
github.com/charmbracelet/x/windows v0.1.0 // indirect
3635
github.com/cloudflare/circl v1.3.7 // indirect
@@ -58,7 +57,7 @@ require (
5857
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
5958
golang.org/x/mod v0.17.0 // indirect
6059
golang.org/x/net v0.25.0 // indirect
61-
golang.org/x/sys v0.23.0 // indirect
60+
golang.org/x/sys v0.24.0 // indirect
6261
golang.org/x/text v0.17.0 // indirect
6362
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
6463
gopkg.in/warnings.v0 v0.1.2 // indirect

‎go.sum‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPd
1111
github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
1212
github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
1313
github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
14-
github.com/charmbracelet/bubbletea v0.26.6 h1:zTCWSuST+3yZYZnVSvbXwKOPRSNZceVeqpzOLN2zq1s=
15-
github.com/charmbracelet/bubbletea v0.26.6/go.mod h1:dz8CWPlfCCGLFbBlTY4N7bjLiyOGDJEnd2Muu7pOWhk=
14+
github.com/charmbracelet/bubbletea v0.27.0 h1:Mznj+vvYuYagD9Pn2mY7fuelGvP0HAXtZYGgRBCbHvU=
15+
github.com/charmbracelet/bubbletea v0.27.0/go.mod h1:5MdP9XH6MbQkgGhnlxUqCNmBXf9I74KRQ8HIidRxV1Y=
1616
github.com/charmbracelet/keygen v0.5.1 h1:zBkkYPtmKDVTw+cwUyY6ZwGDhRxXkEp0Oxs9sqMLqxI=
1717
github.com/charmbracelet/keygen v0.5.1/go.mod h1:zznJVmK/GWB6dAtjluqn2qsttiCBhA5MZSiwb80fcHw=
1818
github.com/charmbracelet/lipgloss v0.12.1 h1:/gmzszl+pedQpjCOH+wFkZr/N90Snz40J/NR7A0zQcs=
@@ -27,8 +27,6 @@ github.com/charmbracelet/x/conpty v0.1.0 h1:4zc8KaIcbiL4mghEON8D72agYtSeIgq8FSTh
2727
github.com/charmbracelet/x/conpty v0.1.0/go.mod h1:rMFsDJoDwVmiYM10aD4bH2XiRgwI7NYJtQgl5yskjEQ=
2828
github.com/charmbracelet/x/errors v0.0.0-20240508181413-e8d8b6e2de86 h1:JSt3B+U9iqk37QUU2Rvb6DSBYRLtWqFqfxf8l5hOZUA=
2929
github.com/charmbracelet/x/errors v0.0.0-20240508181413-e8d8b6e2de86/go.mod h1:2P0UgXMEa6TsToMSuFqKFQR+fZTO9CNGUNokkPatT/0=
30-
github.com/charmbracelet/x/exp/term v0.0.0-20240503143715-36ea203beff4 h1:zHstno0DfHRoZ+R+kPEDYYl/X16I3z9CO6j0nhGDKxw=
31-
github.com/charmbracelet/x/exp/term v0.0.0-20240503143715-36ea203beff4/go.mod h1:yQqGHmheaQfkqiJWjklPHVAq1dKbk8uGbcoS/lcKCJ0=
3230
github.com/charmbracelet/x/input v0.1.0 h1:TEsGSfZYQyOtp+STIjyBq6tpRaorH0qpwZUj8DavAhQ=
3331
github.com/charmbracelet/x/input v0.1.0/go.mod h1:ZZwaBxPF7IG8gWWzPUVqHEtWhc1+HXJPNuerJGRGZ28=
3432
github.com/charmbracelet/x/term v0.1.1 h1:3cosVAiPOig+EV4X9U+3LDgtwwAoEzJjNdwbXDjF6yI=
@@ -159,8 +157,8 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
159157
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
160158
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
161159
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
162-
golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM=
163-
golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
160+
golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
161+
golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
164162
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
165163
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
166164
golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=

0 commit comments

Comments
 (0)