Merge branch 'main' into feature/add-copy-to-clipboard

Author: AlejandroSuero

.github/dependabot.yml

@@ -1,29 +1,41 @@
 version: 2
+
 updates:
   - package-ecosystem: "gomod"
     directory: "/"
     schedule:
-      interval: "daily"
+      interval: "weekly"
+      day: "monday"
+      time: "05:00"
+      timezone: "America/New_York"
     labels:
       - "dependencies"
     commit-message:
       prefix: "chore"
       include: "scope"
+
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      interval: "daily"
+      interval: "weekly"
+      day: "monday"
+      time: "05:00"
+      timezone: "America/New_York"
     labels:
       - "dependencies"
     commit-message:
       prefix: "chore"
       include: "scope"
+
   - package-ecosystem: "docker"
     directory: "/"
     schedule:
-      interval: "daily"
+      interval: "weekly"
+      day: "monday"
+      time: "05:00"
+      timezone: "America/New_York"
     labels:
       - "dependencies"
     commit-message:
-      prefix: "chore"
+      prefix: "feat"
       include: "scope"

.github/workflows/dependabot-sync.yml

@@ -0,0 +1,17 @@
+name: dependabot-sync
+on:
+  schedule:
+    - cron: "0 0 * * 0" # every Sunday at midnight
+  workflow_dispatch: # allows manual triggering
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  dependabot-sync:
+    uses: charmbracelet/meta/.github/workflows/dependabot-sync.yml@main
+    with:
+      repo_name: ${{ github.event.repository.name }}
+    secrets:
+      gh_token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}

.github/workflows/goreleaser.yml

@@ -14,6 +14,8 @@ concurrency:
 jobs:
   goreleaser:
     uses: charmbracelet/meta/.github/workflows/goreleaser.yml@main
+    with:
+      macos_sign_entitlements: "./release/entitlements.plist"
     secrets:
       docker_username: ${{ secrets.DOCKERHUB_USERNAME }}
       docker_token: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -28,13 +30,3 @@ jobs:
       macos_notary_issuer_id: ${{ secrets.MACOS_NOTARY_ISSUER_ID }}
       macos_notary_key_id: ${{ secrets.MACOS_NOTARY_KEY_ID }}
       macos_notary_key: ${{ secrets.MACOS_NOTARY_KEY }}
-  homebrew:
-    name: Bump Homebrew formula
-    runs-on: ubuntu-latest
-    steps:
-      - uses: mislav/bump-homebrew-formula-action@v3
-        with:
-          # A PR will be sent to github.com/Homebrew/homebrew-core to update this formula:
-          formula-name: freeze
-        env:
-          COMMITTER_TOKEN: ${{ secrets.COMMITTER_TOKEN }}

.github/workflows/lint-soft.yml

@@ -20,7 +20,7 @@ jobs:
 
       - uses: actions/checkout@v4
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v7
         with:
           # Optional: golangci-lint command line arguments.
           #args:

.github/workflows/lint.yml

@@ -4,3 +4,4 @@
 !test/golden/**/*.png
 !examples/*.svg
 /result
+dist/

.gitignore

@@ -1,21 +1,9 @@
+version: "2"
 run:
   tests: false
-
-issues:
-  include:
-    - EXC0001
-    - EXC0005
-    - EXC0011
-    - EXC0012
-    - EXC0013
-
-  max-issues-per-linter: 0
-  max-same-issues: 0
-
 linters:
   enable:
     - bodyclose
-    - goimports
     - gosec
     - nilerr
     - predeclared
@@ -26,3 +14,23 @@ linters:
     - unconvert
     - unparam
     - whitespace
+  exclusions:
+    generated: lax
+    presets:
+      - common-false-positives
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+issues:
+  max-issues-per-linter: 0
+  max-same-issues: 0
+formatters:
+  enable:
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

.golangci-soft.yml

@@ -1,7 +1,8 @@
+# yaml-language-server: $schema=https://goreleaser.com/static/schema-pro.json
+version: 2
 includes:
   - from_url:
       url: charmbracelet/meta/main/goreleaser-simple.yaml
-
 variables:
   main: "."
   description: "Generate images of code and terminal output."

.golangci.yml

@@ -1,4 +1,4 @@
-package main
+package main //nolint:revive
 
 import (
 	"fmt"
@@ -19,17 +19,6 @@ type dispatcher struct {
 	bgWidth int
 }
 
-func (p *dispatcher) dispatch(s ansi.Sequence) {
-	switch s := s.(type) {
-	case ansi.Rune:
-		p.Print(rune(s))
-	case ansi.ControlCode:
-		p.Execute(byte(s))
-	case ansi.CsiSequence:
-		p.CsiDispatch(s)
-	}
-}
-
 func (p *dispatcher) Print(r rune) {
 	p.row = clamp(p.row, 0, len(p.lines)-1)
 	// insert the rune in the last tspan
@@ -109,8 +98,8 @@ func (p *dispatcher) endBackground() {
 	p.bgWidth = 0
 }
 
-func (p *dispatcher) CsiDispatch(s ansi.CsiSequence) {
-	if s.Cmd != 'm' {
+func (p *dispatcher) CsiDispatch(cmd ansi.Cmd, params ansi.Params) {
+	if cmd != 'm' {
 		// ignore incomplete or non Style (SGR) sequences
 		return
 	}
@@ -121,19 +110,21 @@ func (p *dispatcher) CsiDispatch(s ansi.CsiSequence) {
 		// reset ANSI, this is done by creating a new empty tspan,
 		// which would reset all the styles such that when text is appended to the last
 		// child of this line there is no styling applied.
-		p.lines[p.row].AddChild(span)
+		if p.row < len(p.lines) {
+			p.lines[p.row].AddChild(span)
+		}
 		p.endBackground()
 	}
 
-	if len(s.Params) == 0 {
+	if len(params) == 0 {
 		// zero params means reset
 		reset()
 		return
 	}
 
 	var i int
-	for i < len(s.Params) {
-		v := s.Param(i)
+	for i < len(params) {
+		v := params[i].Param(0)
 		switch v {
 		case 0:
 			reset()
@@ -154,29 +145,29 @@ func (p *dispatcher) CsiDispatch(s ansi.CsiSequence) {
 			p.lines[p.row].AddChild(span)
 		case 38:
 			i++
-			switch s.Param(i) {
+			switch params[i] {
 			case 5:
-				n := s.Param(i + 1)
+				n := params[i+1]
 				i++
 				fill := palette[n]
 				span.CreateAttr("fill", fill)
 				p.lines[p.row].AddChild(span)
 			case 2:
-				span.CreateAttr("fill", fmt.Sprintf("#%02x%02x%02x", s.Param(i+1), s.Param(i+2), s.Param(i+3)))
+				span.CreateAttr("fill", fmt.Sprintf("#%02x%02x%02x", params[i+1], params[i+2], params[i+3]))
 				p.lines[p.row].AddChild(span)
 				i += 3
 			}
 		case 48:
 			p.endBackground()
 			i++
-			switch s.Param(i) {
+			switch params[i] {
 			case 5:
-				n := s.Param(i + 1)
+				n := params[i+1]
 				i++
 				fill := palette[n]
 				p.beginBackground(fill)
 			case 2:
-				fill := fmt.Sprintf("#%02x%02x%02x", s.Param(i+1), s.Param(i+2), s.Param(i+3))
+				fill := fmt.Sprintf("#%02x%02x%02x", params[i+1], params[i+2], params[i+3])
 				p.beginBackground(fill)
 				i += 3
 			}