feat: update deps, fix lint issues (#526)

* ci(lint): fix golangcilint config Signed-off-by: Carlos Alexandro Becker <caarlos0@users.noreply.github.com> * chore(deps): update many dependencies Signed-off-by: Carlos Alexandro Becker <caarlos0@users.noreply.github.com> * fix(lint): fixed some lint errors Signed-off-by: Carlos Alexandro Becker <caarlos0@users.noreply.github.com> --------- Signed-off-by: Carlos Alexandro Becker <caarlos0@users.noreply.github.com>
charmbracelet · Sep 6, 2024 · 41ce6be · 41ce6be
1 parent f6a3e29
commit 41ce6be
Show file tree

Hide file tree

Showing 10 changed files with 128 additions and 115 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -15,7 +15,6 @@ issues:
 linters:
   enable:
     - bodyclose
-    - exportloopref
     - goimports
     - gosec
     - nilerr

diff --git a/command.go b/command.go
@@ -654,7 +654,7 @@ func ExecuteSourceTape(c parser.Command, v *VHS) error {
 			cmd.Type == token.OUTPUT {
 			continue
 		}
-		fmt.Fprintf(out, "%s %s\n", GrayStyle.Render(displayPath+":"), Highlight(cmd, false))
+		_, _ = fmt.Fprintf(out, "%s %s\n", GrayStyle.Render(displayPath+":"), Highlight(cmd, false))
 		err := CommandFuncs[cmd.Type](cmd, v)
 		if err != nil {
 			return fmt.Errorf("failed to execute command %s: %w", cmd.Type.String(), err)

diff --git a/error.go b/error.go
@@ -35,11 +35,11 @@ func LineNumber(line int) string {
 func printError(out io.Writer, tape string, err parser.Error) {
 	lines := strings.Split(tape, "\n")
 
-	fmt.Fprint(out, LineNumber(err.Token.Line))
-	fmt.Fprintln(out, lines[err.Token.Line-1])
-	fmt.Fprint(out, strings.Repeat(" ", err.Token.Column+ErrorColumnOffset))
-	fmt.Fprintln(out, Underline(len(err.Token.Literal)), err.Msg)
-	fmt.Fprintln(out)
+	_, _ = fmt.Fprint(out, LineNumber(err.Token.Line))
+	_, _ = fmt.Fprintln(out, lines[err.Token.Line-1])
+	_, _ = fmt.Fprint(out, strings.Repeat(" ", err.Token.Column+ErrorColumnOffset))
+	_, _ = fmt.Fprintln(out, Underline(len(err.Token.Literal)), err.Msg)
+	_, _ = fmt.Fprintln(out)
 }
 
 func printErrors(out io.Writer, tape string, errs []error) {
@@ -49,10 +49,10 @@ func printErrors(out io.Writer, tape string, errs []error) {
 			for _, v := range err.Errors {
 				printError(out, tape, v)
 			}
-			fmt.Fprintln(out, ErrorStyle.Render(err.Error()))
+			_, _ = fmt.Fprintln(out, ErrorStyle.Render(err.Error()))
 
 		default:
-			fmt.Fprintln(out, ErrorStyle.Render(err.Error()))
+			_, _ = fmt.Fprintln(out, ErrorStyle.Render(err.Error()))
 		}
 	}
 }
diff --git a/evaluator.go b/evaluator.go
@@ -55,7 +55,7 @@ func Evaluate(ctx context.Context, tape string, out io.Writer, opts ...Evaluator
 	var offset int
 	for i, cmd := range cmds {
 		if cmd.Type == token.SET || cmd.Type == token.OUTPUT || cmd.Type == token.REQUIRE {
-			fmt.Fprintln(out, Highlight(cmd, false))
+			_, _ = fmt.Fprintln(out, Highlight(cmd, false))
 			if cmd.Options != "Shell" {
 				err := Execute(cmd, &v)
 				if err != nil {
@@ -101,7 +101,7 @@ func Evaluate(ctx context.Context, tape string, out io.Writer, opts ...Evaluator
 				offset += i
 				break
 			}
-			fmt.Fprintln(out, Highlight(cmd, true))
+			_, _ = fmt.Fprintln(out, Highlight(cmd, true))
 			err := Execute(cmd, &v)
 			if err != nil {
 				return []error{err}
@@ -153,10 +153,10 @@ func Evaluate(ctx context.Context, tape string, out io.Writer, opts ...Evaluator
 		// We should remove if isSetting statement.
 		isSetting := cmd.Type == token.SET && cmd.Options != "TypingSpeed"
 		if isSetting || cmd.Type == token.REQUIRE {
-			fmt.Fprintln(out, Highlight(cmd, true))
+			_, _ = fmt.Fprintln(out, Highlight(cmd, true))
 			continue
 		}
-		fmt.Fprintln(out, Highlight(cmd, !v.recording || cmd.Type == token.SHOW || cmd.Type == token.HIDE || isSetting))
+		_, _ = fmt.Fprintln(out, Highlight(cmd, !v.recording || cmd.Type == token.SHOW || cmd.Type == token.HIDE || isSetting))
 		err := Execute(cmd, &v)
 		if err != nil {
 			teardown()

diff --git a/go.mod b/go.mod
@@ -1,67 +1,70 @@
 module github.com/charmbracelet/vhs
 
-go 1.18
+go 1.21
+
+toolchain go1.22.5
 
 require (
 	github.com/agnivade/levenshtein v1.1.1
 	github.com/atotto/clipboard v0.1.4
-	github.com/caarlos0/env/v6 v6.10.1
-	github.com/charmbracelet/glamour v0.7.0
-	github.com/charmbracelet/keygen v0.5.0
-	github.com/charmbracelet/lipgloss v0.11.0
-	github.com/charmbracelet/ssh v0.0.0-20240401141849-854cddfa2917
-	github.com/charmbracelet/wish v1.4.0
+	github.com/caarlos0/env/v11 v11.2.2
+	github.com/charmbracelet/glamour v0.8.0
+	github.com/charmbracelet/keygen v0.5.1
+	github.com/charmbracelet/lipgloss v0.13.0
+	github.com/charmbracelet/ssh v0.0.0-20240725163421-eb71b85b27aa
+	github.com/charmbracelet/wish v1.4.3
 	github.com/creack/pty v1.1.21
-	github.com/go-rod/rod v0.116.0
+	github.com/go-rod/rod v0.116.2
 	github.com/hashicorp/go-version v1.7.0
 	github.com/mattn/go-isatty v0.0.20
 	github.com/mattn/go-runewidth v0.0.15
 	github.com/muesli/go-app-paths v0.2.2
 	github.com/muesli/mango-cobra v1.2.0
 	github.com/muesli/roff v0.1.0
-	github.com/muesli/termenv v0.15.2
+	github.com/muesli/termenv v0.15.3-0.20240618155329-98d742f6907a
 	github.com/spf13/cobra v1.8.0
-	golang.org/x/crypto v0.23.0
-	golang.org/x/term v0.20.0
+	golang.org/x/crypto v0.26.0
+	golang.org/x/term v0.23.0
 )
 
 require (
-	github.com/alecthomas/chroma/v2 v2.8.0 // indirect
+	github.com/alecthomas/chroma/v2 v2.14.0 // indirect
 	github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect
 	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
 	github.com/aymerick/douceur v0.2.0 // indirect
-	github.com/charmbracelet/bubbletea v0.25.0 // indirect
+	github.com/charmbracelet/bubbletea v1.0.0 // indirect
 	github.com/charmbracelet/log v0.4.0 // indirect
-	github.com/charmbracelet/x/ansi v0.1.1 // indirect
-	github.com/charmbracelet/x/errors v0.0.0-20240117030013-d31dba354651 // indirect
-	github.com/charmbracelet/x/exp/term v0.0.0-20240328150354-ab9afc214dfd // indirect
-	github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 // indirect
-	github.com/dlclark/regexp2 v1.8.1 // indirect
+	github.com/charmbracelet/x/ansi v0.2.3 // indirect
+	github.com/charmbracelet/x/conpty v0.1.0 // indirect
+	github.com/charmbracelet/x/errors v0.0.0-20240904165849-e8e43e13f84b // indirect
+	github.com/charmbracelet/x/term v0.2.0 // indirect
+	github.com/charmbracelet/x/termios v0.1.0 // indirect
+	github.com/dlclark/regexp2 v1.11.0 // indirect
+	github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
 	github.com/go-logfmt/logfmt v0.6.0 // indirect
-	github.com/gorilla/css v1.0.0 // indirect
+	github.com/gorilla/css v1.0.1 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
 	github.com/mattn/go-localereader v0.0.1 // indirect
-	github.com/microcosm-cc/bluemonday v1.0.25 // indirect
+	github.com/microcosm-cc/bluemonday v1.0.27 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
-	github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b // indirect
+	github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
 	github.com/muesli/cancelreader v0.2.2 // indirect
 	github.com/muesli/mango v0.2.0 // indirect
 	github.com/muesli/mango-pflag v0.1.0 // indirect
 	github.com/muesli/reflow v0.3.0 // indirect
-	github.com/olekukonko/tablewriter v0.0.5 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/ysmood/fetchup v0.2.3 // indirect
 	github.com/ysmood/goob v0.4.0 // indirect
-	github.com/ysmood/got v0.34.1 // indirect
+	github.com/ysmood/got v0.40.0 // indirect
 	github.com/ysmood/gson v0.7.3 // indirect
-	github.com/ysmood/leakless v0.8.0 // indirect
-	github.com/yuin/goldmark v1.5.4 // indirect
-	github.com/yuin/goldmark-emoji v1.0.2 // indirect
+	github.com/ysmood/leakless v0.9.0 // indirect
+	github.com/yuin/goldmark v1.7.4 // indirect
+	github.com/yuin/goldmark-emoji v1.0.3 // indirect
 	golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
-	golang.org/x/net v0.22.0 // indirect
-	golang.org/x/sync v0.6.0 // indirect
-	golang.org/x/sys v0.20.0 // indirect
-	golang.org/x/text v0.15.0 // indirect
+	golang.org/x/net v0.27.0 // indirect
+	golang.org/x/sync v0.8.0 // indirect
+	golang.org/x/sys v0.24.0 // indirect
+	golang.org/x/text v0.17.0 // indirect
 )