Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Turbo 8 rc 2 #73

Closed
wants to merge 8 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,17 @@ jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
bundler: default
bundler-cache: true

- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: "18"
node-version: "20"
cache: yarn

- name: Install dependencies
Expand All @@ -44,18 +43,17 @@ jobs:
env:
RAILS_ENV: test
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
bundler: default
bundler-cache: true

- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: "18"
node-version: "20"
cache: yarn

- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
19.3.0
20.11.0
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN apt-get update -qq && \
apt-get install --no-install-recommends -y build-essential curl git libvips node-gyp pkg-config python-is-python3

# Install JavaScript dependencies
ARG NODE_VERSION=19.3.0
ARG NODE_VERSION=20.11.0
ARG YARN_VERSION=1.22.19
ENV PATH=/usr/local/node/bin:$PATH
RUN curl -sL https://github.com/nodenv/node-build/archive/master.tar.gz | tar xz -C /tmp/ && \
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ gem "jbuilder"
# gem "jsbundling-rails"

# Hotwire's SPA-like page accelerator [https://turbo.hotwired.dev]
gem "turbo-rails"
gem "turbo-rails", ">= 2.0.0.pre.rc2"

# Hotwire's modest JavaScript framework [https://stimulus.hotwired.dev]
# gem "stimulus-rails"
Expand Down
38 changes: 19 additions & 19 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ GEM
erubi (~> 1.4)
parser (>= 2.4)
smart_properties
bigdecimal (3.1.5)
bigdecimal (3.1.6)
bindex (0.8.1)
bootsnap (1.16.0)
msgpack (~> 1.2)
Expand All @@ -113,7 +113,7 @@ GEM
regexp_parser (>= 1.5, < 3.0)
xpath (~> 3.2)
chartkick (5.0.4)
concurrent-ruby (1.2.2)
concurrent-ruby (1.2.3)
connection_pool (2.4.1)
crack (0.4.5)
rexml
Expand Down Expand Up @@ -179,10 +179,10 @@ GEM
inline_svg (1.9.0)
activesupport (>= 3.0)
nokogiri (>= 1.6)
io-console (0.7.0)
irb (1.10.1)
io-console (0.7.2)
irb (1.11.1)
rdoc
reline (>= 0.3.8)
reline (>= 0.4.2)
jbuilder (2.11.5)
actionview (>= 5.0.0)
activesupport (>= 5.0.0)
Expand Down Expand Up @@ -214,7 +214,7 @@ GEM
actionpack (>= 3.2.0, < 7.2)
method_source (1.0.0)
mini_mime (1.1.5)
minitest (5.20.0)
minitest (5.21.2)
msgpack (1.7.2)
multi_xml (0.6.0)
mutex_m (0.2.0)
Expand All @@ -230,13 +230,13 @@ GEM
net-smtp (0.4.0)
net-protocol
nio4r (2.7.0)
nokogiri (1.15.5-aarch64-linux)
nokogiri (1.16.2-aarch64-linux)
racc (~> 1.4)
nokogiri (1.15.5-arm64-darwin)
nokogiri (1.16.2-arm64-darwin)
racc (~> 1.4)
nokogiri (1.15.5-x86_64-darwin)
nokogiri (1.16.2-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.15.5-x86_64-linux)
nokogiri (1.16.2-x86_64-linux)
racc (~> 1.4)
oj (3.16.1)
pagy (6.0.4)
Expand All @@ -250,13 +250,13 @@ GEM
activesupport (>= 7.0.0)
rack
railties (>= 7.0.0)
psych (5.1.1.1)
psych (5.1.2)
stringio
public_suffix (5.0.3)
puma (6.3.1)
nio4r (~> 2.0)
racc (1.7.3)
rack (3.0.8)
rack (3.0.9)
rack-mini-profiler (3.1.1)
rack (>= 1.2.0)
rack-proxy (0.7.7)
Expand Down Expand Up @@ -307,10 +307,10 @@ GEM
zeitwerk (~> 2.6)
rainbow (3.1.1)
rake (13.1.0)
rdoc (6.6.1)
rdoc (6.6.2)
psych (>= 4.0.0)
regexp_parser (2.8.1)
reline (0.4.1)
reline (0.4.2)
io-console (~> 0.5)
rexml (3.2.6)
rubocop (1.56.2)
Expand Down Expand Up @@ -374,7 +374,7 @@ GEM
thor (1.3.0)
tilt (2.3.0)
timeout (0.4.1)
turbo-rails (1.4.0)
turbo-rails (2.0.0.pre.rc.2)
actionpack (>= 6.0.0)
activejob (>= 6.0.0)
railties (>= 6.0.0)
Expand All @@ -389,10 +389,10 @@ GEM
activesupport (>= 5.2.0, < 8.0)
concurrent-ruby (~> 1.0)
method_source (~> 1.0)
vite_rails (3.0.15)
vite_rails (3.0.17)
railties (>= 5.1, < 8)
vite_ruby (~> 3.0, >= 3.2.2)
vite_ruby (3.3.4)
vite_ruby (3.5.0)
dry-cli (>= 0.7, < 2)
rack-proxy (~> 0.6, >= 0.6.1)
zeitwerk (~> 2.2)
Expand Down Expand Up @@ -456,7 +456,7 @@ DEPENDENCIES
selenium-webdriver
sitemap_generator (~> 6.3)
standardrb (~> 1.0)
turbo-rails
turbo-rails (>= 2.0.0.pre.rc2)
tzinfo-data
vcr (~> 6.1)
view_component (~> 3.7)
Expand All @@ -468,4 +468,4 @@ RUBY VERSION
ruby 3.2.0p0

BUNDLED WITH
2.4.12
2.5.5
2 changes: 1 addition & 1 deletion app/javascript/controllers/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { application } from './application'
import { registerControllers } from 'stimulus-vite-helpers'

const controllers = import.meta.globEager('./**/*_controller.js')
const controllers = import.meta.glob('../**/*_controller.js', { eager: true })
registerControllers(application, controllers)
1 change: 1 addition & 0 deletions app/views/layouts/application.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<meta name="viewport" content="width=device-width,initial-scale=1">
<%= csrf_meta_tags %>
<%= csp_meta_tag %>
<meta name="turbo-prefetch" content="true">

<%= display_meta_tags site: "Ruby Video" %>

Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"@appsignal/javascript": "^1.3.26",
"@domchristie/turn": "^3.0.0",
"@hotwired/stimulus": "^3.2.1",
"@hotwired/turbo-rails": "^7.3.0",
"@hotwired/turbo-rails": "8.0.0-rc.2",
"@tailwindcss/forms": "^0.5.3",
"autoprefixer": "^10.4.14",
"chart.js": "^4.3.0",
Expand All @@ -30,10 +30,10 @@
"prettier": "^2.8.8",
"prettier-plugin-tailwindcss": "^0.3.0",
"standard": "^17.1.0",
"stimulus-vite-helpers": "^3.0.1",
"vite": "^4.3.0",
"vite-plugin-full-reload": "^1.0.5",
"vite-plugin-ruby": "^3.2.0",
"stimulus-vite-helpers": "^3.1.0",
"vite": "^5.0.12",
"vite-plugin-full-reload": "^1.1.0",
"vite-plugin-ruby": "^5.0.0",
"vite-plugin-stimulus-hmr": "^3.0.0"
},
"standard": {
Expand Down
Loading
Loading