Skip to content

Commit

Permalink
Merge branch 'main' into match-prc-label
Browse files Browse the repository at this point in the history
  • Loading branch information
keithamus authored Sep 5, 2024
2 parents 88ee224 + 14602d0 commit 9ff541e
Show file tree
Hide file tree
Showing 7 changed files with 63 additions and 63 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
run: |
npm ci
bundle config unset deployment
bundle update
bundle install --jobs 4 --retry 3
env:
RUBY_VERSION: ${{ matrix.ruby_version }}
RAILS_VERSION: ${{ matrix.rails_version }}
Expand Down Expand Up @@ -124,7 +124,7 @@ jobs:
run: |
npm ci
bundle config unset deployment
bundle update
bundle install --jobs 4 --retry 3
env:
RUBY_VERSION: ${{ matrix.ruby_version }}
RAILS_VERSION: ${{ matrix.rails_version }}
Expand Down Expand Up @@ -167,7 +167,7 @@ jobs:
- name: Build
run: |
bundle config unset deployment
bundle update
bundle install --jobs 4 --retry 3
env:
RUBY_VERSION: ${{ matrix.ruby_version }}
RAILS_VERSION: ${{ matrix.rails_version }}
Expand Down
28 changes: 14 additions & 14 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ GEM
bigdecimal (3.1.8)
bootsnap (1.18.3)
msgpack (~> 1.2)
builder (3.2.4)
builder (3.3.0)
capybara (3.40.0)
addressable
matrix
Expand All @@ -66,7 +66,7 @@ GEM
regexp_parser (>= 1.5, < 3.0)
xpath (~> 3.2)
coderay (1.1.3)
concurrent-ruby (1.2.3)
concurrent-ruby (1.3.4)
connection_pool (2.4.1)
crack (1.0.0)
bigdecimal
Expand All @@ -93,7 +93,7 @@ GEM
rubocop
smart_properties
erblint-github (0.5.1)
erubi (1.12.0)
erubi (1.13.0)
ferrum (0.14)
addressable (~> 2.5)
concurrent-ruby (~> 1.1)
Expand All @@ -106,7 +106,7 @@ GEM
i18n (1.14.5)
concurrent-ruby (~> 1.0)
io-console (0.7.2)
irb (1.13.1)
irb (1.14.0)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
json (2.7.2)
Expand Down Expand Up @@ -136,16 +136,16 @@ GEM
method_source (1.1.0)
mini_mime (1.1.5)
mini_portile2 (2.8.7)
minitest (5.23.1)
minitest (5.25.1)
mocha (2.3.0)
ruby2_keywords (>= 0.0.5)
msgpack (1.7.2)
mutex_m (0.2.0)
nio4r (2.7.3)
nokogiri (1.16.6)
nokogiri (1.16.7)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
nokogiri (1.16.6-x86_64-linux)
nokogiri (1.16.7-x86_64-linux)
racc (~> 1.4)
octicons (19.9.0)
parallel (1.24.0)
Expand All @@ -160,8 +160,8 @@ GEM
public_suffix (5.0.5)
puma (6.4.2)
nio4r (~> 2.0)
racc (1.8.0)
rack (3.0.11)
racc (1.8.1)
rack (3.1.7)
rack-cors (2.0.2)
rack (>= 2.0.0)
rack-proxy (0.7.7)
Expand Down Expand Up @@ -197,7 +197,7 @@ GEM
psych (>= 4.0.0)
redcarpet (3.6.0)
regexp_parser (2.9.2)
reline (0.5.7)
reline (0.5.10)
io-console (~> 0.5)
rexml (3.2.8)
strscan (>= 3.0.9)
Expand Down Expand Up @@ -257,11 +257,11 @@ GEM
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets (>= 3.0.0)
stringio (3.1.0)
stringio (3.1.1)
strscan (3.1.0)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
thor (1.3.1)
thor (1.3.2)
timecop (0.9.9)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
Expand All @@ -273,7 +273,7 @@ GEM
vite_rails (3.0.17)
railties (>= 5.1, < 8)
vite_ruby (~> 3.0, >= 3.2.2)
vite_ruby (3.8.0)
vite_ruby (3.8.2)
dry-cli (>= 0.7, < 2)
rack-proxy (~> 0.6, >= 0.6.1)
zeitwerk (~> 2.2)
Expand All @@ -294,7 +294,7 @@ GEM
xpath (3.2.0)
nokogiri (~> 1.8)
yard (0.9.36)
zeitwerk (2.6.15)
zeitwerk (2.6.18)

PLATFORMS
ruby
Expand Down
8 changes: 4 additions & 4 deletions demo/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ GEM
psych (>= 4.0.0)
recursive-open-struct (1.1.3)
redcarpet (3.6.0)
reline (0.5.9)
reline (0.5.10)
io-console (~> 0.5)
rest-client (2.1.0)
http-accept (>= 1.7.0, < 2.0)
Expand Down Expand Up @@ -328,7 +328,7 @@ GEM
stimulus-rails (1.3.4)
railties (>= 6.0.0)
stringio (3.1.1)
thor (1.3.1)
thor (1.3.2)
timeliness (0.3.10)
turbo-rails (2.0.6)
actionpack (>= 6.0.0)
Expand All @@ -343,7 +343,7 @@ GEM
vite_rails (3.0.17)
railties (>= 5.1, < 8)
vite_ruby (~> 3.0, >= 3.2.2)
vite_ruby (3.7.0)
vite_ruby (3.8.2)
dry-cli (>= 0.7, < 2)
rack-proxy (~> 0.6, >= 0.6.1)
zeitwerk (~> 2.2)
Expand All @@ -352,7 +352,7 @@ GEM
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
yard (0.9.36)
zeitwerk (2.6.17)
zeitwerk (2.6.18)

PLATFORMS
arm64-darwin-21
Expand Down
44 changes: 22 additions & 22 deletions demo/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"webpack-dev-server": "^5.0.4"
},
"devDependencies": {
"vite": "^5.4.2",
"vite-plugin-ruby": "^5.0.0"
"vite": "^5.4.3",
"vite-plugin-ruby": "^5.1.0"
},
"scripts": {
"build:css": "postcss --config ../ ./app/assets/stylesheets/application.postcss.css -o ./app/assets/builds/application.css"
Expand Down
32 changes: 16 additions & 16 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@
"stylelint-config-standard": "^36.0.0",
"tslib": "^2.4.0",
"typescript": "^5.2.2",
"vite": "^5.3.5",
"vite-plugin-ruby": "^5.0.0"
"vite": "^5.4.3",
"vite-plugin-ruby": "^5.1.0"
},
"prettier": "@github/prettier-config",
"browserslist": "extends @github/browserslist-config"
Expand Down

0 comments on commit 9ff541e

Please sign in to comment.