Skip to content

Commit 0c6cc5c

Browse files
Merge branch 'master' into fix-placeholder-rendering
2 parents 07af2e3 + dc61c1b commit 0c6cc5c

File tree

73 files changed

+3990
-1459
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+3990
-1459
lines changed

.github/dependabot.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ updates:
1313
commit-message:
1414
prefix: "chore"
1515
include: "scope"
16+
groups:
17+
all:
18+
patterns:
19+
- "*"
1620

1721
- package-ecosystem: "github-actions"
1822
directory: "/"
@@ -26,6 +30,10 @@ updates:
2630
commit-message:
2731
prefix: "chore"
2832
include: "scope"
33+
groups:
34+
all:
35+
patterns:
36+
- "*"
2937

3038
- package-ecosystem: "docker"
3139
directory: "/"
@@ -39,3 +47,7 @@ updates:
3947
commit-message:
4048
prefix: "chore"
4149
include: "scope"
50+
groups:
51+
all:
52+
patterns:
53+
- "*"

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ jobs:
1111
runs-on: ${{ matrix.os }}
1212
steps:
1313
- name: Install Go
14-
uses: actions/setup-go@v5
14+
uses: actions/setup-go@v6
1515
with:
1616
go-version: ${{ matrix.go-version }}
1717

1818
- name: Checkout code
19-
uses: actions/checkout@v4
19+
uses: actions/checkout@v6
2020

2121
- name: Download Go modules
2222
run: go mod download

.github/workflows/coverage.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@ jobs:
55
coverage:
66
strategy:
77
matrix:
8-
go-version: [^1.18]
8+
go-version: [^1.22]
99
os: [ubuntu-latest]
1010
runs-on: ${{ matrix.os }}
1111
env:
1212
GO111MODULE: "on"
1313
steps:
1414
- name: Install Go
15-
uses: actions/setup-go@v5
15+
uses: actions/setup-go@v6
1616
with:
1717
go-version: ${{ matrix.go-version }}
1818

1919
- name: Checkout code
20-
uses: actions/checkout@v4
20+
uses: actions/checkout@v6
2121

2222
- name: Coverage
2323
env:

.github/workflows/lint.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,7 @@ on:
66
jobs:
77
lint:
88
uses: charmbracelet/meta/.github/workflows/lint.yml@main
9+
with:
10+
golangci_path: .golangci.yml
11+
golangci_version: v2.9
12+
timeout: 10m

.golangci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ linters:
3030
generated: lax
3131
presets:
3232
- common-false-positives
33+
rules:
34+
- linters:
35+
- revive
36+
text: "var-naming"
3337
issues:
3438
max-issues-per-linter: 0
3539
max-same-issues: 0

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2020-2023 Charmbracelet, Inc
3+
Copyright (c) 2020-2026 Charmbracelet, Inc.
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
11
# Bubbles
22

3-
<p>
4-
<img src="https://stuff.charm.sh/bubbles/bubbles-github.png" width="233" alt="The Bubbles Logo">
5-
</p>
3+
<img src="https://github.com/user-attachments/assets/09d46497-9b4e-4de9-bb8e-685ef5c80c96" width="350" />
64

75
[![Latest Release](https://img.shields.io/github/release/charmbracelet/bubbles.svg)](https://github.com/charmbracelet/bubbles/releases)
86
[![GoDoc](https://godoc.org/github.com/golang/gddo?status.svg)](https://pkg.go.dev/github.com/charmbracelet/bubbles)
97
[![Build Status](https://github.com/charmbracelet/bubbles/workflows/build/badge.svg)](https://github.com/charmbracelet/bubbles/actions)
108
[![Go ReportCard](https://goreportcard.com/badge/charmbracelet/bubbles)](https://goreportcard.com/report/charmbracelet/bubbles)
119

1210
Some components for [Bubble Tea](https://github.com/charmbracelet/bubbletea)
13-
applications. These components are used in production in [Glow][glow], and [many other applications][otherstuff].
11+
applications. These components are used in production in [Crush][crush], and [many other applications][otherstuff].
1412

15-
[glow]: https://github.com/charmbracelet/glow
13+
> [!TIP]
14+
>
15+
> Upgrading from v1? Check out the [upgrade guide](./UPGRADE_GUIDE_V2.md), or
16+
> point your LLM at it and let it go to town.
17+
18+
[crush]: https://github.com/charmbracelet/crush
1619
[otherstuff]: https://github.com/charmbracelet/bubbletea/#bubble-tea-in-the-wild
1720

1821
## Spinner
@@ -174,7 +177,7 @@ var DefaultKeyMap = KeyMap{
174177

175178
func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
176179
switch msg := msg.(type) {
177-
case tea.KeyMsg:
180+
case tea.KeyPressMsg:
178181
switch {
179182
case key.Matches(msg, DefaultKeyMap.Up):
180183
// The user pressed up
@@ -188,11 +191,11 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
188191

189192
## There’s more where that came from
190193

191-
To check out community-maintained Bubbles see [Charm &
192-
Friends](https://github.com/charm-and-friends/additional-bubbles). Made a cool Bubble
193-
that you want to share?
194-
[PRs](https://github.com/charm-and-friends/additional-bubbles?tab=readme-ov-file#what-is-a-complete-project)
195-
are welcome!
194+
To check out community-maintained Bubbles see [Charm & Friends][charmandfriends].
195+
Made a cool Bubble that you want to share? [PRs][prs] are welcome!
196+
197+
[charmandfriends]:
198+
[prs]: https://github.com/charm-and-friends/additional-bubbles?tab=readme-ov-file#what-is-a-complete-project
196199

197200
## Contributing
198201

@@ -214,8 +217,8 @@ We’d love to hear your thoughts on this project. Feel free to drop us a note!
214217

215218
---
216219

217-
Part of [Charm](https://charm.sh).
220+
Part of [Charm](https://charm.land).
218221

219-
<a href="https://charm.sh/"><img alt="The Charm logo" src="https://stuff.charm.sh/charm-badge.jpg" width="400"></a>
222+
<a href="https://charm.sh/"><img alt="The Charm logo" src="https://stuff.charm.sh/charm-banner-next.jpg" width="400"></a>
220223

221224
Charm热爱开源 • Charm loves open source

0 commit comments

Comments
 (0)