- commit
- 0068695
- parent
- e053233
- author
- Antonio Mika
- date
- 2024-05-31 14:27:34 +0000 UTC
Merge pull request #136 from picosh/am/update-deps Update dependencies (for chroma)
10 files changed,
+82,
-66
M
go.mod
+21,
-14
1@@ -12,16 +12,19 @@ replace git.sr.ht/~delthas/senpai => github.com/picosh/senpai v0.0.0-20240503200
2
3 replace github.com/gdamore/tcell/v2 => github.com/delthas/tcell/v2 v2.4.1-0.20230710100648-1489e78d90fb
4
5+// Until https://github.com/charmbracelet/ssh/issues/28 is solved
6+replace github.com/charmbracelet/x/exp/term v0.0.0-20240529170602-5872190e21dd => github.com/charmbracelet/x/exp/term v0.0.0-20240328150354-ab9afc214dfd
7+
8 require (
9 git.sr.ht/~delthas/senpai v0.3.1-0.20240425235039-206be659439e
10- github.com/alecthomas/chroma v0.10.0
11+ github.com/alecthomas/chroma/v2 v2.14.0
12 github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de
13 github.com/charmbracelet/bubbles v0.18.0
14- github.com/charmbracelet/bubbletea v0.26.1
15+ github.com/charmbracelet/bubbletea v0.26.4
16 github.com/charmbracelet/glamour v0.7.0
17- github.com/charmbracelet/lipgloss v0.10.0
18+ github.com/charmbracelet/lipgloss v0.11.0
19 github.com/charmbracelet/promwish v0.7.0
20- github.com/charmbracelet/ssh v0.0.0-20240507011153-ec70bd03034c
21+ github.com/charmbracelet/ssh v0.0.0-20240515141028-546b2ee33a4d
22 github.com/charmbracelet/wish v1.4.0
23 github.com/google/go-cmp v0.6.0
24 github.com/gorilla/feeds v1.1.2
25@@ -39,7 +42,7 @@ require (
26 github.com/simplesurance/go-ip-anonymizer v0.0.0-20200429124537-35a880f8e87d
27 github.com/x-way/crawlerdetect v0.2.21
28 github.com/yuin/goldmark v1.7.1
29- github.com/yuin/goldmark-highlighting v0.0.0-20220208100518-594be1970594
30+ github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc
31 github.com/yuin/goldmark-meta v1.1.0
32 go.abhg.dev/goldmark/anchor v0.1.1
33 go.abhg.dev/goldmark/hashtag v0.3.1
34@@ -52,7 +55,6 @@ require (
35 git.sr.ht/~emersion/go-scfg v0.0.0-20240128091534-2ae16e782082 // indirect
36 github.com/DavidGamba/go-getoptions v0.30.0 // indirect
37 github.com/PuerkitoBio/goquery v1.9.2 // indirect
38- github.com/alecthomas/chroma/v2 v2.8.0 // indirect
39 github.com/andybalholm/cascadia v1.3.2 // indirect
40 github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect
41 github.com/antoniomika/go-rsync-receiver v0.0.0-20231110145728-c94949e1ab7d // indirect
42@@ -63,8 +65,12 @@ require (
43 github.com/cespare/xxhash/v2 v2.3.0 // indirect
44 github.com/charmbracelet/keygen v0.5.0 // indirect
45 github.com/charmbracelet/log v0.4.0 // indirect
46- github.com/charmbracelet/x/errors v0.0.0-20240507171223-71e9351b56e7 // indirect
47- github.com/charmbracelet/x/exp/term v0.0.0-20240507171223-71e9351b56e7 // indirect
48+ github.com/charmbracelet/x/ansi v0.1.2 // indirect
49+ github.com/charmbracelet/x/errors v0.0.0-20240529170602-5872190e21dd // indirect
50+ github.com/charmbracelet/x/exp/term v0.0.0-20240529170602-5872190e21dd // indirect
51+ github.com/charmbracelet/x/input v0.1.1 // indirect
52+ github.com/charmbracelet/x/term v0.1.1 // indirect
53+ github.com/charmbracelet/x/windows v0.1.2 // indirect
54 github.com/creack/pty v1.1.21 // indirect
55 github.com/delthas/go-libnp v0.0.0-20221222161248-0e45ece1f878 // indirect
56 github.com/delthas/go-localeinfo v0.0.0-20221116001557-686a1e185118 // indirect
57@@ -85,7 +91,7 @@ require (
58 github.com/go-logfmt/logfmt v0.6.0 // indirect
59 github.com/go-ole/go-ole v1.3.0 // indirect
60 github.com/go-xmlfmt/xmlfmt v1.1.2 // indirect
61- github.com/goccy/go-json v0.10.2 // indirect
62+ github.com/goccy/go-json v0.10.3 // indirect
63 github.com/godbus/dbus/v5 v5.1.0 // indirect
64 github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
65 github.com/golang/geo v0.0.0-20230421003525-6adc56603217 // indirect
66@@ -98,12 +104,12 @@ require (
67 github.com/klauspost/cpuid/v2 v2.2.7 // indirect
68 github.com/kr/fs v0.1.0 // indirect
69 github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
70- github.com/lufia/plan9stats v0.0.0-20240408141607-282e7b5d6b74 // indirect
71+ github.com/lufia/plan9stats v0.0.0-20240513124658-fba389f38bae // indirect
72 github.com/mattn/go-isatty v0.0.20 // indirect
73 github.com/mattn/go-localereader v0.0.1 // indirect
74 github.com/mattn/go-runewidth v0.0.15 // indirect
75 github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
76- github.com/minio/madmin-go/v3 v3.0.51 // indirect
77+ github.com/minio/madmin-go/v3 v3.0.53 // indirect
78 github.com/minio/md5-simd v1.1.2 // indirect
79 github.com/mmcdole/goxpp v1.1.1 // indirect
80 github.com/mmcloughlin/md4 v0.1.2 // indirect
81@@ -117,10 +123,10 @@ require (
82 github.com/philhofer/fwd v1.1.2 // indirect
83 github.com/pkg/sftp v1.13.6 // indirect
84 github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
85- github.com/prometheus/client_golang v1.19.0 // indirect
86+ github.com/prometheus/client_golang v1.19.1 // indirect
87 github.com/prometheus/client_model v0.6.1 // indirect
88 github.com/prometheus/common v0.53.0 // indirect
89- github.com/prometheus/procfs v0.14.0 // indirect
90+ github.com/prometheus/procfs v0.15.1 // indirect
91 github.com/prometheus/prom2json v1.3.3 // indirect
92 github.com/rivo/uniseg v0.4.7 // indirect
93 github.com/rogpeppe/go-internal v1.11.0 // indirect
94@@ -133,9 +139,10 @@ require (
95 github.com/tinylib/msgp v1.1.9 // indirect
96 github.com/tklauser/go-sysconf v0.3.14 // indirect
97 github.com/tklauser/numcpus v0.8.0 // indirect
98+ github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
99 github.com/yuin/goldmark-emoji v1.0.2 // indirect
100 github.com/yusufpapurcu/wmi v1.2.4 // indirect
101- golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
102+ golang.org/x/exp v0.0.0-20240530194437-404ba88c7ed0 // indirect
103 golang.org/x/net v0.25.0 // indirect
104 golang.org/x/sync v0.7.0 // indirect
105 golang.org/x/sys v0.20.0 // indirect
M
go.sum
+44,
-35
1@@ -5,16 +5,14 @@ github.com/DavidGamba/go-getoptions v0.30.0 h1:8x69Fc8k/mEWVE0GknpwQ3uGj56MXOUp1
2 github.com/DavidGamba/go-getoptions v0.30.0/go.mod h1:zE97E3PR9P3BI/HKyNYgdMlYxodcuiC6W68KIgeYT84=
3 github.com/PuerkitoBio/goquery v1.9.2 h1:4/wZksC3KgkQw7SQgkKotmKljk0M6V8TUvA8Wb4yPeE=
4 github.com/PuerkitoBio/goquery v1.9.2/go.mod h1:GHPCaP0ODyyxqcNoFGYlAprUFH81NuRPd0GX3Zu2Mvk=
5-github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d h1:licZJFw2RwpHMqeKTCYkitsPqHNxTmd4SNR5r94FGM8=
6-github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d/go.mod h1:asat636LX7Bqt5lYEZ27JNDcqxfjdBQuJ/MM4CN/Lzo=
7-github.com/alecthomas/assert/v2 v2.2.1 h1:XivOgYcduV98QCahG8T5XTezV5bylXe+lBxLG2K2ink=
8-github.com/alecthomas/assert/v2 v2.2.1/go.mod h1:pXcQ2Asjp247dahGEmsZ6ru0UVwnkhktn7S0bBDLxvQ=
9-github.com/alecthomas/chroma v0.10.0 h1:7XDcGkCQopCNKjZHfYrNLraA+M7e0fMiJ/Mfikbfjek=
10-github.com/alecthomas/chroma v0.10.0/go.mod h1:jtJATyUxlIORhUOFNA9NZDWGAQ8wpxQQqNSB4rjA/1s=
11-github.com/alecthomas/chroma/v2 v2.8.0 h1:w9WJUjFFmHHB2e8mRpL9jjy3alYDlU0QLDezj1xE264=
12-github.com/alecthomas/chroma/v2 v2.8.0/go.mod h1:yrkMI9807G1ROx13fhe1v6PN2DDeaR73L3d+1nmYQtw=
13-github.com/alecthomas/repr v0.2.0 h1:HAzS41CIzNW5syS8Mf9UwXhNH1J9aix/BvDRf1Ml2Yk=
14-github.com/alecthomas/repr v0.2.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
15+github.com/alecthomas/assert/v2 v2.7.0 h1:QtqSACNS3tF7oasA8CU6A6sXZSBDqnm7RfpLl9bZqbE=
16+github.com/alecthomas/assert/v2 v2.7.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k=
17+github.com/alecthomas/chroma/v2 v2.2.0/go.mod h1:vf4zrexSH54oEjJ7EdB65tGNHmH3pGZmVkgTP5RHvAs=
18+github.com/alecthomas/chroma/v2 v2.14.0 h1:R3+wzpnUArGcQz7fCETQBzO5n9IMNi13iIs46aU4V9E=
19+github.com/alecthomas/chroma/v2 v2.14.0/go.mod h1:QolEbTfmUHIMVpBqxeDnNBj2uoeI4EbYP4i6n68SG4I=
20+github.com/alecthomas/repr v0.0.0-20220113201626-b1b626ac65ae/go.mod h1:2kn6fqh/zIyPLmm3ugklbEi5hg5wS435eygvNfaDQL8=
21+github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc=
22+github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
23 github.com/andybalholm/cascadia v1.3.2 h1:3Xi6Dw5lHF15JtdcmAHD3i1+T8plmv7BQ/nsViSLyss=
24 github.com/andybalholm/cascadia v1.3.2/go.mod h1:7gtRlve5FxPPgIgX36uWBX58OdBsSS6lUvCFb+h7KvU=
25 github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8=
26@@ -35,26 +33,34 @@ github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UF
27 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
28 github.com/charmbracelet/bubbles v0.18.0 h1:PYv1A036luoBGroX6VWjQIE9Syf2Wby2oOl/39KLfy0=
29 github.com/charmbracelet/bubbles v0.18.0/go.mod h1:08qhZhtIwzgrtBjAcJnij1t1H0ZRjwHyGsy6AL11PSw=
30-github.com/charmbracelet/bubbletea v0.26.1 h1:xujcQeF73rh4jwu3+zhfQsvV18x+7zIjlw7/CYbzGJ0=
31-github.com/charmbracelet/bubbletea v0.26.1/go.mod h1:FzKr7sKoO8iFVcdIBM9J0sJOcQv5nDQaYwsee3kpbgo=
32+github.com/charmbracelet/bubbletea v0.26.4 h1:2gDkkzLZaTjMl/dQBpNVtnvcCxsh/FCkimep7FC9c40=
33+github.com/charmbracelet/bubbletea v0.26.4/go.mod h1:P+r+RRA5qtI1DOHNFn0otoNwB4rn+zNAzSj/EXz6xU0=
34 github.com/charmbracelet/glamour v0.7.0 h1:2BtKGZ4iVJCDfMF229EzbeR1QRKLWztO9dMtjmqZSng=
35 github.com/charmbracelet/glamour v0.7.0/go.mod h1:jUMh5MeihljJPQbJ/wf4ldw2+yBP59+ctV36jASy7ps=
36 github.com/charmbracelet/keygen v0.5.0 h1:XY0fsoYiCSM9axkrU+2ziE6u6YjJulo/b9Dghnw6MZc=
37 github.com/charmbracelet/keygen v0.5.0/go.mod h1:DfvCgLHxZ9rJxdK0DGw3C/LkV4SgdGbnliHcObV3L+8=
38-github.com/charmbracelet/lipgloss v0.10.0 h1:KWeXFSexGcfahHX+54URiZGkBFazf70JNMtwg/AFW3s=
39-github.com/charmbracelet/lipgloss v0.10.0/go.mod h1:Wig9DSfvANsxqkRsqj6x87irdy123SR4dOXlKa91ciE=
40+github.com/charmbracelet/lipgloss v0.11.0 h1:UoAcbQ6Qml8hDwSWs0Y1cB5TEQuZkDPH/ZqwWWYTG4g=
41+github.com/charmbracelet/lipgloss v0.11.0/go.mod h1:1UdRTH9gYgpcdNN5oBtjbu/IzNKtzVtb7sqN1t9LNn8=
42 github.com/charmbracelet/log v0.4.0 h1:G9bQAcx8rWA2T3pWvx7YtPTPwgqpk7D68BX21IRW8ZM=
43 github.com/charmbracelet/log v0.4.0/go.mod h1:63bXt/djrizTec0l11H20t8FDSvA4CRZJ1KH22MdptM=
44 github.com/charmbracelet/promwish v0.7.0 h1:oaMH+ey6W4DDIv1xucS8jL1ik/Q46qxjNXlh6XxEm+s=
45 github.com/charmbracelet/promwish v0.7.0/go.mod h1:WbRJN9irg8LmsBU8G2rFF8md9O3rSg63qrnqquP/+cs=
46-github.com/charmbracelet/ssh v0.0.0-20240507011153-ec70bd03034c h1:nsxEhgGnHTGPh5qXr7EBHOKaaJ1nmQWIcI5TLRPYDqo=
47-github.com/charmbracelet/ssh v0.0.0-20240507011153-ec70bd03034c/go.mod h1:8/Ve8iGRRIGFM1kepYfRF2pEOF5Y3TEZYoJaA54228U=
48+github.com/charmbracelet/ssh v0.0.0-20240515141028-546b2ee33a4d h1:u9HPsRc4wlU2mGLEX180ZeP4UIutqT2nQ7LVVgejP2E=
49+github.com/charmbracelet/ssh v0.0.0-20240515141028-546b2ee33a4d/go.mod h1:8/Ve8iGRRIGFM1kepYfRF2pEOF5Y3TEZYoJaA54228U=
50 github.com/charmbracelet/wish v1.4.0 h1:pL1uVP/YuYgJheHEj98teZ/n6pMYnmlZq/fcHvomrfc=
51 github.com/charmbracelet/wish v1.4.0/go.mod h1:ew4/MjJVfW/akEO9KmrQHQv1F7bQRGscRMrA+KtovTk=
52-github.com/charmbracelet/x/errors v0.0.0-20240507171223-71e9351b56e7 h1:kYsUiL7ZLANRSNhjcq6nNZ9dprccC+qmxGDOe8k+pMM=
53-github.com/charmbracelet/x/errors v0.0.0-20240507171223-71e9351b56e7/go.mod h1:2P0UgXMEa6TsToMSuFqKFQR+fZTO9CNGUNokkPatT/0=
54-github.com/charmbracelet/x/exp/term v0.0.0-20240507171223-71e9351b56e7 h1:ATeHxDzJnkCWPCNhTPZUMxyD7AE94ATJDKHN3wZNRUY=
55-github.com/charmbracelet/x/exp/term v0.0.0-20240507171223-71e9351b56e7/go.mod h1:qeR6w1zITbkF7vEhcx0CqX5GfnIiQloJWQghN6HfP+c=
56+github.com/charmbracelet/x/ansi v0.1.2 h1:6+LR39uG8DE6zAmbu023YlqjJHkYXDF1z36ZwzO4xZY=
57+github.com/charmbracelet/x/ansi v0.1.2/go.mod h1:dk73KoMTT5AX5BsX0KrqhsTqAnhZZoCBjs7dGWp4Ktw=
58+github.com/charmbracelet/x/errors v0.0.0-20240529170602-5872190e21dd h1:wFZxW4Lk57PuVj4Cg/dJt43hu4WvkRnnW1JrVB9khS4=
59+github.com/charmbracelet/x/errors v0.0.0-20240529170602-5872190e21dd/go.mod h1:2P0UgXMEa6TsToMSuFqKFQR+fZTO9CNGUNokkPatT/0=
60+github.com/charmbracelet/x/exp/term v0.0.0-20240328150354-ab9afc214dfd h1:HqBjkSFXXfW4IgX3TMKipWoPEN08T3Pi4SA/3DLss/U=
61+github.com/charmbracelet/x/exp/term v0.0.0-20240328150354-ab9afc214dfd/go.mod h1:6GZ13FjIP6eOCqWU4lqgveGnYxQo9c3qBzHPeFu4HBE=
62+github.com/charmbracelet/x/input v0.1.1 h1:YDOJaTUKCqtGnq9PHzx3pkkl4pXDOANUHmhH3DqMtM4=
63+github.com/charmbracelet/x/input v0.1.1/go.mod h1:jvdTVUnNWj/RD6hjC4FsoB0SeZCJ2ZBkiuFP9zXvZI0=
64+github.com/charmbracelet/x/term v0.1.1 h1:3cosVAiPOig+EV4X9U+3LDgtwwAoEzJjNdwbXDjF6yI=
65+github.com/charmbracelet/x/term v0.1.1/go.mod h1:wB1fHt5ECsu3mXYusyzcngVWWlu1KKUmmLhfgr/Flxw=
66+github.com/charmbracelet/x/windows v0.1.2 h1:Iumiwq2G+BRmgoayww/qfcvof7W/3uLoelhxojXlRWg=
67+github.com/charmbracelet/x/windows v0.1.2/go.mod h1:GLEO/l+lizvFDBPLIOk+49gdX49L9YWMB5t+DZd0jkQ=
68 github.com/creack/pty v1.1.21 h1:1/QdRyBaHHJP61QkWMXlOIBfsgdDeeKfK8SYVUWJKf0=
69 github.com/creack/pty v1.1.21/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
70 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
71@@ -67,6 +73,7 @@ github.com/delthas/go-localeinfo v0.0.0-20221116001557-686a1e185118/go.mod h1:sG
72 github.com/delthas/tcell/v2 v2.4.1-0.20230710100648-1489e78d90fb h1:x0hrYPzXpmn3L/4QnW0UXJnHX9oz0OcZNcsSgregusw=
73 github.com/delthas/tcell/v2 v2.4.1-0.20230710100648-1489e78d90fb/go.mod h1:be9omFATkdr0D9qewWW3d+MEvl5dha+Etb5y65J2H8Y=
74 github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
75+github.com/dlclark/regexp2 v1.7.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
76 github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI=
77 github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
78 github.com/dsoprea/go-exif v0.0.0-20230826092837-6579e82b732d h1:ygcRCGNKuEiA98k7X35hknEN8RIRUF1jrz7k1rZCvsk=
79@@ -115,8 +122,8 @@ github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW
80 github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b/go.mod h1:aUCEOzzezBEjDBbFBoSiya/gduyIiWYRP6CnSFIV8AM=
81 github.com/go-xmlfmt/xmlfmt v1.1.2 h1:Nea7b4icn8s57fTx1M5AI4qQT5HEM3rVUO8MuE6g80U=
82 github.com/go-xmlfmt/xmlfmt v1.1.2/go.mod h1:aUCEOzzezBEjDBbFBoSiya/gduyIiWYRP6CnSFIV8AM=
83-github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
84-github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
85+github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA=
86+github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
87 github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
88 github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
89 github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=
90@@ -162,8 +169,8 @@ github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
91 github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
92 github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
93 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
94-github.com/lufia/plan9stats v0.0.0-20240408141607-282e7b5d6b74 h1:1KuuSOy4ZNgW0KA2oYIngXVFhQcXxhLqCVK7cBcldkk=
95-github.com/lufia/plan9stats v0.0.0-20240408141607-282e7b5d6b74/go.mod h1:ilwx/Dta8jXAgpFYFvSWEMwxmbWXyiUHkd5FwyKhb5k=
96+github.com/lufia/plan9stats v0.0.0-20240513124658-fba389f38bae h1:dIZY4ULFcto4tAFlj1FYZl8ztUZ13bdq+PLY+NOfbyI=
97+github.com/lufia/plan9stats v0.0.0-20240513124658-fba389f38bae/go.mod h1:ilwx/Dta8jXAgpFYFvSWEMwxmbWXyiUHkd5FwyKhb5k=
98 github.com/matryer/is v1.4.1 h1:55ehd8zaGABKLXQUe2awZ99BD/PTc2ls+KV/dXphgEQ=
99 github.com/matryer/is v1.4.1/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU=
100 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
101@@ -180,8 +187,8 @@ github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zk
102 github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
103 github.com/microcosm-cc/bluemonday v1.0.26 h1:xbqSvqzQMeEHCqMi64VAs4d8uy6Mequs3rQ0k/Khz58=
104 github.com/microcosm-cc/bluemonday v1.0.26/go.mod h1:JyzOCs9gkyQyjs+6h10UEVSe02CGwkhd72Xdqh78TWs=
105-github.com/minio/madmin-go/v3 v3.0.51 h1:brGOvDP8KvoHb/bdzCHUPFCbTtrN8o507uPHZpyuinM=
106-github.com/minio/madmin-go/v3 v3.0.51/go.mod h1:IFAwr0XMrdsLovxAdCcuq/eoL4nRuMVQQv0iubJANQw=
107+github.com/minio/madmin-go/v3 v3.0.53 h1:2Y9yJZQgqxnOUzkBtGx202iYSNS3zfqE+c7r44oOXSM=
108+github.com/minio/madmin-go/v3 v3.0.53/go.mod h1:IFAwr0XMrdsLovxAdCcuq/eoL4nRuMVQQv0iubJANQw=
109 github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
110 github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM=
111 github.com/minio/minio-go/v7 v7.0.70 h1:1u9NtMgfK1U42kUxcsl5v0yj6TEOPR497OAQxpJnn2g=
112@@ -229,14 +236,14 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH
113 github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
114 github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 h1:o4JXh1EVt9k/+g42oCprj/FisM4qX9L3sZB3upGN2ZU=
115 github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
116-github.com/prometheus/client_golang v1.19.0 h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7kmXYlnfbA6JU=
117-github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdURP+DABIEIjnmDdp+k=
118+github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE=
119+github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho=
120 github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
121 github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
122 github.com/prometheus/common v0.53.0 h1:U2pL9w9nmJwJDa4qqLQ3ZaePJ6ZTwt7cMD3AG3+aLCE=
123 github.com/prometheus/common v0.53.0/go.mod h1:BrxBKv3FWBIGXw89Mg1AeBq7FSyRzXWI3l3e7W3RN5U=
124-github.com/prometheus/procfs v0.14.0 h1:Lw4VdGGoKEZilJsayHf0B+9YgLGREba2C6xr+Fdfq6s=
125-github.com/prometheus/procfs v0.14.0/go.mod h1:XL+Iwz8k8ZabyZfMFHPiilCniixqQarAy5Mu67pHlNQ=
126+github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
127+github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
128 github.com/prometheus/prom2json v1.3.3 h1:IYfSMiZ7sSOfliBoo89PcufjWO4eAR0gznGcETyaUgo=
129 github.com/prometheus/prom2json v1.3.3/go.mod h1:Pv4yIPktEkK7btWsrUTWDDDrnpUrAELaOCj+oFwlgmc=
130 github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
131@@ -290,15 +297,17 @@ github.com/tklauser/numcpus v0.8.0 h1:Mx4Wwe/FjZLeQsK/6kt2EOepwwSl7SmJrK5bV/dXYg
132 github.com/tklauser/numcpus v0.8.0/go.mod h1:ZJZlAY+dmR4eut8epnzf0u/VwodKmryxR8txiloSqBE=
133 github.com/x-way/crawlerdetect v0.2.21 h1:LORs0nEy+MWUsC3XvKf00hXyO7drB5w/hlGB8bztXbI=
134 github.com/x-way/crawlerdetect v0.2.21/go.mod h1:DVupfue81iupuoUmFjIyDUqPqGaJhtZfYQDWoP1ZUR4=
135+github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
136+github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
137 github.com/yuin/goldmark v1.3.7/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
138-github.com/yuin/goldmark v1.4.5/go.mod h1:rmuwmfZ0+bvzB24eSC//bk1R1Zp3hM0OXYv/G2LIilg=
139 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
140+github.com/yuin/goldmark v1.4.15/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
141 github.com/yuin/goldmark v1.7.1 h1:3bajkSilaCbjdKVsKdZjZCLBNPL9pYzrCakKaf4U49U=
142 github.com/yuin/goldmark v1.7.1/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E=
143 github.com/yuin/goldmark-emoji v1.0.2 h1:c/RgTShNgHTtc6xdz2KKI74jJr6rWi7FPgnP9GAsO5s=
144 github.com/yuin/goldmark-emoji v1.0.2/go.mod h1:RhP/RWpexdp+KHs7ghKnifRoIs/Bq4nDS7tRbCkOwKY=
145-github.com/yuin/goldmark-highlighting v0.0.0-20220208100518-594be1970594 h1:yHfZyN55+5dp1wG7wDKv8HQ044moxkyGq12KFFMFDxg=
146-github.com/yuin/goldmark-highlighting v0.0.0-20220208100518-594be1970594/go.mod h1:U9ihbh+1ZN7fR5Se3daSPoz1CGF9IYtSvWwVQtnzGHU=
147+github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc h1:+IAOyRda+RLrxa1WC7umKOZRsGq4QrFFMYApOeHzQwQ=
148+github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc/go.mod h1:ovIvrum6DQJA4QsJSovrkC4saKHQVs7TvcaeO8AIl5I=
149 github.com/yuin/goldmark-meta v1.1.0 h1:pWw+JLHGZe8Rk0EGsMVssiNb/AaPMHfSRszZeUeiOUc=
150 github.com/yuin/goldmark-meta v1.1.0/go.mod h1:U4spWENafuA7Zyg+Lj5RqK/MF+ovMYtBvXi1lBb2VP0=
151 github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
152@@ -316,8 +325,8 @@ golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw
153 golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g=
154 golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
155 golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
156-golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 h1:vr/HnozRka3pE4EsMEg1lgkXJkTFJCVUX+S/ZT6wYzM=
157-golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc=
158+golang.org/x/exp v0.0.0-20240530194437-404ba88c7ed0 h1:Mi0bCswbz+9cXmwFAdxoo5GPFMKONUpua6iUdtQS7lk=
159+golang.org/x/exp v0.0.0-20240530194437-404ba88c7ed0/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc=
160 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
161 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
162 golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+5,
-5
1@@ -3,15 +3,15 @@ package pastes
2 import (
3 "bytes"
4
5- "github.com/alecthomas/chroma/formatters/html"
6- "github.com/alecthomas/chroma/lexers"
7- "github.com/alecthomas/chroma/styles"
8+ "github.com/alecthomas/chroma/v2/formatters/html"
9+ "github.com/alecthomas/chroma/v2/lexers"
10+ "github.com/alecthomas/chroma/v2/styles"
11 )
12
13 func ParseText(filename string, text string) (string, error) {
14 formatter := html.New(
15 html.WithLineNumbers(true),
16- html.LinkableLineNumbers(true, ""),
17+ html.WithLinkableLineNumbers(true, ""),
18 html.WithClasses(true),
19 )
20 lexer := lexers.Match(filename)
21@@ -26,7 +26,7 @@ func ParseText(filename string, text string) (string, error) {
22 return text, err
23 }
24 var buf bytes.Buffer
25- err = formatter.Format(&buf, styles.Dracula, iterator)
26+ err = formatter.Format(&buf, styles.Get("dracula"), iterator)
27 if err != nil {
28 return text, err
29 }
1@@ -6,11 +6,11 @@ import (
2 "strings"
3 "time"
4
5- "github.com/alecthomas/chroma/formatters/html"
6+ "github.com/alecthomas/chroma/v2/formatters/html"
7 "github.com/araddon/dateparse"
8 "github.com/microcosm-cc/bluemonday"
9 "github.com/yuin/goldmark"
10- highlighting "github.com/yuin/goldmark-highlighting"
11+ highlighting "github.com/yuin/goldmark-highlighting/v2"
12 meta "github.com/yuin/goldmark-meta"
13 "github.com/yuin/goldmark/ast"
14 "github.com/yuin/goldmark/extension"
+4,
-4
1@@ -51,7 +51,7 @@ func DefaultStyles(renderer *lipgloss.Renderer) Styles {
2
3 s.Cursor = renderer.NewStyle().Foreground(Fuschia)
4 s.Wrap = renderer.NewStyle().Width(58)
5- s.Paragraph = s.Wrap.Copy().Margin(1, 0, 0, 2)
6+ s.Paragraph = s.Wrap.Margin(1, 0, 0, 2)
7 s.Logo = renderer.NewStyle().
8 Foreground(Cream).
9 Background(Indigo).
10@@ -64,10 +64,10 @@ func DefaultStyles(renderer *lipgloss.Renderer) Styles {
11 Foreground(Grey)
12 s.Error = renderer.NewStyle().Foreground(Red)
13 s.Prompt = renderer.NewStyle().MarginRight(1).SetString(">")
14- s.FocusedPrompt = s.Prompt.Copy().Foreground(Fuschia)
15+ s.FocusedPrompt = s.Prompt.Foreground(Fuschia)
16 s.InputPlaceholder = renderer.NewStyle().Foreground(Grey)
17 s.Note = renderer.NewStyle().Foreground(Green)
18- s.Delete = s.Error.Copy()
19+ s.Delete = s.Error
20 s.Label = renderer.NewStyle().Foreground(Fuschia)
21 s.ListKey = renderer.NewStyle().Foreground(Indigo)
22 s.InactivePagination = renderer.NewStyle().
23@@ -81,7 +81,7 @@ func DefaultStyles(renderer *lipgloss.Renderer) Styles {
24 Foreground(Cream).
25 Background(GreyLight).
26 Padding(0, 3)
27- s.FocusedButtonStyle = s.BlurredButtonStyle.Copy().
28+ s.FocusedButtonStyle = s.BlurredButtonStyle.
29 Background(Fuschia)
30 s.HelpDivider = renderer.NewStyle().
31 Foreground(Grey).
+2,
-2
1@@ -72,9 +72,9 @@ func CancelButtonView(styles Styles, focused bool, defaultButton bool) string {
2 func styledButton(styles Styles, str string, underlined, focused bool) string {
3 var st lipgloss.Style
4 if focused {
5- st = styles.FocusedButtonStyle.Copy()
6+ st = styles.FocusedButtonStyle
7 } else {
8- st = styles.BlurredButtonStyle.Copy()
9+ st = styles.BlurredButtonStyle
10 }
11 if underlined {
12 st = st.Underline(true)
+1,
-1
1@@ -296,7 +296,7 @@ func (m *Model) helpView() string {
2 }
3
4 func (m *Model) promptView(prompt string) string {
5- st := m.shared.Styles.Delete.Copy().MarginTop(2).MarginRight(1)
6+ st := m.shared.Styles.Delete.MarginTop(2).MarginRight(1)
7 return st.Render(prompt) +
8 m.shared.Styles.Delete.Render("(y/N)")
9 }
+1,
-1
1@@ -113,7 +113,7 @@ We will only store usage statistics for 1 year from when the event was created.`
2 str += banner + "\n\n" + m.shared.Styles.Error.SetString("Analytics is only available to pico+ users.").String()
3 }
4
5- return m.shared.Styles.RoundedBorder.Copy().Width(maxWidth).SetString(str).String()
6+ return m.shared.Styles.RoundedBorder.Width(maxWidth).SetString(str).String()
7 }
8
9 func (m Model) featuresView() string {
+1,
-1
1@@ -260,7 +260,7 @@ func (m *Model) helpView() string {
2 }
3
4 func (m *Model) promptView(prompt string) string {
5- st := m.shared.Styles.Delete.Copy().MarginTop(2).MarginRight(1)
6+ st := m.shared.Styles.Delete.MarginTop(2).MarginRight(1)
7 return st.Render(prompt) +
8 m.shared.Styles.Delete.Render("(y/N)")
9 }
+1,
-1
1@@ -170,7 +170,7 @@ func (m *UI) header() string {
2 SetString(pages.ToTitle(m.activePage))
3 div := m.shared.
4 Styles.
5- HelpDivider.Copy().
6+ HelpDivider.
7 Foreground(common.Green)
8 s := fmt.Sprintf("%s%s%s\n\n", logo, div, title)
9 return s