Skip to content

Commit adeda38

Browse files
authored
Merge branch 'main' into dependabot/npm_and_yarn/github/relative-time-element-5.0.0
2 parents 537cf74 + e18a189 commit adeda38

39 files changed

Lines changed: 921 additions & 72 deletions

.changeset/plenty-regions-warn.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@primer/view-components': minor
3+
---
4+
5+
Adds character_limit option to TextArea and TextField components

.github/workflows/demo-production-deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
with:
7373
ruby-version: '3.3'
7474
bundler-cache: true
75-
- uses: actions/cache@v4.3.0
75+
- uses: actions/cache@v5.0.1
7676
with:
7777
path: demo/gemfiles/vendor/bundle
7878
key: gems-build-kuby-main-ruby-3.3.x-${{ hashFiles('demo/gemfiles/kuby.gemfile.lock') }}

.github/workflows/lint.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- uses: actions/checkout@v6
1717
- name: Get specific changed files
1818
id: changed-files
19-
uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c
19+
uses: tj-actions/changed-files@e0021407031f5be11a464abee9a0776171c79891
2020
with:
2121
files: |
2222
docs/**/*.md
@@ -42,7 +42,7 @@ jobs:
4242
- uses: actions/checkout@v6
4343
- name: Get specific changed files
4444
id: changed-files
45-
uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c
45+
uses: tj-actions/changed-files@e0021407031f5be11a464abee9a0776171c79891
4646
with:
4747
files: |
4848
app/**/*.rb
@@ -62,7 +62,7 @@ jobs:
6262
- uses: actions/checkout@v6
6363
- name: Get changed files
6464
id: changed-files
65-
uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c
65+
uses: tj-actions/changed-files@e0021407031f5be11a464abee9a0776171c79891
6666
with:
6767
files: |
6868
app/components/**/*.erb
@@ -79,7 +79,7 @@ jobs:
7979
- uses: actions/checkout@v6
8080
- name: Get changed files
8181
id: changed-files
82-
uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c
82+
uses: tj-actions/changed-files@e0021407031f5be11a464abee9a0776171c79891
8383
with:
8484
files: |
8585
app/components/**/*.ts
@@ -99,7 +99,7 @@ jobs:
9999
- uses: actions/checkout@v6
100100
- name: Get changed files
101101
id: changed-files
102-
uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c
102+
uses: tj-actions/changed-files@e0021407031f5be11a464abee9a0776171c79891
103103
with:
104104
files: |
105105
app/components/**/*.pcss

.github/workflows/static-files.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ name: Generate static files
22

33
on:
44
push:
5+
branches-ignore:
6+
- 'dependabot/**'
57

68
jobs:
79
static:

.github/workflows/test-visual.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
[Review differences](https://github.com/primer/view_components/pull/${{ github.event.number }}/files?file-filters%5B%5D=.png&file-filters%5B%5D=.yml&show-viewed-files=false)
8888
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8989
COMMENT_IDENTIFIER: "visual-comparison-diff"
90-
- uses: actions/upload-artifact@v4
90+
- uses: actions/upload-artifact@v6
9191
with:
9292
name: playwright-report
9393
path: .playwright/report/

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ gem "lookbook", "~> 2.3.13"
3939
if ENV["VIEW_COMPONENT_PATH"]
4040
gem "view_component", path: ENV["VIEW_COMPONENT_PATH"]
4141
else
42-
gem "view_component", "4.0.2"
42+
gem "view_component", "4.1.1"
4343
end
4444

4545
gem "kramdown", "~> 2.5"

Gemfile.lock

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ GEM
5656
erubi (~> 1.4)
5757
parser (>= 2.4)
5858
smart_properties
59-
bigdecimal (3.2.3)
60-
bootsnap (1.18.6)
59+
bigdecimal (4.0.0)
60+
bootsnap (1.19.0)
6161
msgpack (~> 1.2)
6262
builder (3.3.0)
6363
capybara (3.40.0)
@@ -69,8 +69,8 @@ GEM
6969
rack-test (>= 0.6.3)
7070
regexp_parser (>= 1.5, < 3.0)
7171
xpath (~> 3.2)
72-
concurrent-ruby (1.3.5)
73-
connection_pool (2.5.4)
72+
concurrent-ruby (1.3.6)
73+
connection_pool (3.0.2)
7474
crack (1.0.0)
7575
bigdecimal
7676
rexml
@@ -143,7 +143,7 @@ GEM
143143
matrix (0.4.3)
144144
mini_mime (1.1.5)
145145
mini_portile2 (2.8.9)
146-
minitest (5.25.5)
146+
minitest (5.27.0)
147147
mocha (2.7.1)
148148
ruby2_keywords (>= 0.0.5)
149149
msgpack (1.8.0)
@@ -282,10 +282,11 @@ GEM
282282
unicode-display_width (3.2.0)
283283
unicode-emoji (~> 4.1)
284284
unicode-emoji (4.1.0)
285-
uri (1.0.3)
285+
uri (1.1.1)
286286
useragent (0.16.11)
287-
view_component (4.0.2)
288-
activesupport (>= 7.1.0, < 8.1)
287+
view_component (4.1.1)
288+
actionview (>= 7.1.0, < 8.2)
289+
activesupport (>= 7.1.0, < 8.2)
289290
concurrent-ruby (~> 1)
290291
vite_rails (3.0.19)
291292
railties (>= 5.1, < 9)
@@ -351,7 +352,7 @@ DEPENDENCIES
351352
sprockets-rails
352353
thor
353354
timecop
354-
view_component (= 4.0.2)
355+
view_component (= 4.1.1)
355356
vite_rails (~> 3.0)
356357
webmock
357358
yard (~> 0.9.37)

app/components/primer/alpha/text_area.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ class TextArea < Primer::Component
1818
# @!method initialize
1919
#
2020
# @macro form_full_width_arguments
21+
# @macro form_input_character_limit_arguments
2122
# @macro form_input_arguments
2223
end
2324
end

app/components/primer/alpha/text_field.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ class TextField < Primer::Component
1919
#
2020
# @macro form_size_arguments
2121
# @macro form_full_width_arguments
22+
# @macro form_input_character_limit_arguments
2223
# @macro form_input_arguments
2324
#
2425
# @param placeholder [String] Placeholder text.

app/components/primer/primer.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import './beta/relative_time'
2222
import './alpha/tab_container'
2323
import '../../lib/primer/forms/primer_multi_input'
2424
import '../../lib/primer/forms/primer_text_field'
25+
import '../../lib/primer/forms/primer_text_area'
2526
import '../../lib/primer/forms/toggle_switch_input'
2627
import './alpha/action_menu/action_menu_element'
2728
import './alpha/select_panel_element'

0 commit comments

Comments
 (0)