diff --git a/.ruby-version b/.ruby-version index aed7acb..4a85a55 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -ruby-3.2.4 +ruby-3.3.1 diff --git a/.tool-versions b/.tool-versions index 92027a1..f21ccf6 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,2 +1,2 @@ -ruby 3.2.4 +ruby 3.3.1 nodejs 18.15.0 diff --git a/Gemfile b/Gemfile index e00245d..fcbc71e 100644 --- a/Gemfile +++ b/Gemfile @@ -51,7 +51,7 @@ gem "vite_rails" gem "vite_ruby" gem "name_of_person" gem "litestack" -gem "phlex-rails" +gem "phlex-rails", "~>2.0.0.rc" gem "friendly_id" gem "factory_bot_rails" gem "faker" diff --git a/Gemfile.lock b/Gemfile.lock index bb440ca..dcb3a93 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,10 +1,10 @@ GIT remote: https://github.com/PhlexyUI/phlexy_ui.git - revision: 53f53587886bac0f423f0a92e3af74823290f128 + revision: eaeaba8b937cb8adf0e5fbda81c9d807c685d7e8 branch: main specs: - phlexy_ui (0.1.22) - phlex (>= 1.10) + phlexy_ui (0.2.0) + phlex (>= 2.0.0.rc1) zeitwerk (~> 2.6) GEM @@ -205,10 +205,10 @@ GEM racc pg_query (5.1.0) google-protobuf (>= 3.22.3) - phlex (1.10.3) - phlex-rails (1.2.1) - phlex (~> 1.10.0) - railties (>= 6.1, < 8) + phlex (2.0.0.rc1) + phlex-rails (2.0.0.rc1) + phlex (= 2.0.0.rc1) + railties (>= 6.1, < 9) prosopite (1.4.2) psych (5.1.2) stringio @@ -370,6 +370,7 @@ GEM PLATFORMS aarch64-linux arm64-darwin-23 + arm64-darwin-24 x86_64-darwin-18 x86_64-linux @@ -389,7 +390,7 @@ DEPENDENCIES method_source name_of_person pg_query - phlex-rails + phlex-rails (~> 2.0.0.rc) phlexy_ui! prosopite puma (>= 5.0) diff --git a/app/views/layouts/application_layout.rb b/app/views/layouts/application_layout.rb index 86ce6c5..670458e 100644 --- a/app/views/layouts/application_layout.rb +++ b/app/views/layouts/application_layout.rb @@ -21,9 +21,9 @@ def view_template(&block) csp_meta_tag csrf_meta_tags - plain helpers.vite_client_tag - plain helpers.vite_stylesheet_tag("application", data_turbo_track: "reload") - plain helpers.vite_javascript_tag("application", data_turbo_track: "reload", type: "module") + raw helpers.vite_client_tag + raw helpers.vite_stylesheet_tag("application", data_turbo_track: "reload") + raw helpers.vite_javascript_tag("application", data_turbo_track: "reload", type: "module") turbo_refreshes_with method: :morph, scroll: :preserve