use coder fork

sreya · sreya · commit c0aeb14e28a0 · 2024-12-12T19:15:40.000Z
diff --git a/cmd/coder/main.go b/cmd/coder/main.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	_ "time/tzdata"
 
-	tea "github.com/sreya/bubbletea"
+	tea "github.com/charmbracelet/bubbletea"
 
 	"github.com/coder/coder/v2/agent/agentexec"
 	"github.com/coder/coder/v2/cli"
diff --git a/enterprise/cmd/coder/main.go b/enterprise/cmd/coder/main.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	_ "time/tzdata"
 
-	tea "github.com/sreya/bubbletea"
+	tea "github.com/charmbracelet/bubbletea"
 
 	"github.com/coder/coder/v2/agent/agentexec"
 	entcli "github.com/coder/coder/v2/enterprise/cli"
diff --git a/go.mod b/go.mod
@@ -67,7 +67,9 @@ replace github.com/pkg/sftp => github.com/mafredri/sftp v1.13.6-0.20231212144145
 // which we use in the awsiamrds package.
 replace github.com/lib/pq => github.com/coder/pq v1.10.5-0.20240813183442-0c420cb5a048
 
-replace github.com/charmbracelet/bubbletea => github.com/sreya/bubbletea v1.2.2-0.20241210232551-43ff5fc42edd
+// Removes an init() function that causes terminal sequences to be printed to the web terminal when
+// used in conjunction with agent-exec. See https://github.com/coder/coder/pull/15817
+replace github.com/charmbracelet/bubbletea => github.com/coder/bubbletea v1.2.2-0.20241212190825-007a1cdb2c41
 
 require (
 	cdr.dev/slog v1.6.2-0.20241112041820-0ec81e6e67bb
@@ -214,7 +216,6 @@ require (
 	github.com/google/go-github/v61 v61.0.0
 	github.com/mocktools/go-smtp-mock/v2 v2.4.0
 	github.com/natefinch/atomic v1.0.1
-	github.com/sreya/bubbletea v1.2.2-0.20241210232912-64577f67745d
 	kernel.org/pub/linux/libs/security/libcap/cap v1.2.73
 )
 
diff --git a/go.sum b/go.sum
@@ -207,6 +207,8 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
 github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
 github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
+github.com/coder/bubbletea v1.2.2-0.20241212190825-007a1cdb2c41 h1:SBN/DA63+ZHwuWwPHPYoCZ/KLAjHv5g4h2MS4f2/MTI=
+github.com/coder/bubbletea v1.2.2-0.20241212190825-007a1cdb2c41/go.mod h1:I9ULxr64UaOSUv7hcb3nX4kowodJCVS7vt7VVJk/kW4=
 github.com/coder/flog v1.1.0 h1:kbAes1ai8fIS5OeV+QAnKBQE22ty1jRF/mcAwHpLBa4=
 github.com/coder/flog v1.1.0/go.mod h1:UQlQvrkJBvnRGo69Le8E24Tcl5SJleAAR7gYEHzAmdQ=
 github.com/coder/glog v1.0.1-0.20220322161911-7365fe7f2cd1 h1:UqBrPWSYvRI2s5RtOul20JukUEpu4ip9u7biBL+ntgk=
@@ -873,10 +875,6 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/sqlc-dev/pqtype v0.3.0 h1:b09TewZ3cSnO5+M1Kqq05y0+OjqIptxELaSayg7bmqk=
 github.com/sqlc-dev/pqtype v0.3.0/go.mod h1:oyUjp5981ctiL9UYvj1bVvCKi8OXkCa0u645hce7CAs=
-github.com/sreya/bubbletea v1.2.2-0.20241210232551-43ff5fc42edd h1:xPRu22sr8KkxW77hDVI7+LtGzkvN4VIa2B9KguAtseY=
-github.com/sreya/bubbletea v1.2.2-0.20241210232551-43ff5fc42edd/go.mod h1:viLoDL7hG4njLJSKU2gw7kB3LSEmWsrM80rO1dBJWBI=
-github.com/sreya/bubbletea v1.2.2-0.20241210232912-64577f67745d h1:quKivcS5oKQqHJrQCuwcynyZIL277p+1eMs40dVjfyM=
-github.com/sreya/bubbletea v1.2.2-0.20241210232912-64577f67745d/go.mod h1:sjEM8Zl1LP776ZK9xhLVX6fC5bDWw0HryxT8bmBfcsY=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
