diff --git a/.controlplane/Dockerfile b/.controlplane/Dockerfile index deb89a37..912d1daa 100644 --- a/.controlplane/Dockerfile +++ b/.controlplane/Dockerfile @@ -1,5 +1,5 @@ # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile -ARG RUBY_VERSION=3.4.6 +ARG RUBY_VERSION=3.4.3 FROM registry.docker.com/library/ruby:$RUBY_VERSION-slim as base # Current commit hash environment variable diff --git a/.github/workflows/js_test.yml b/.github/workflows/js_test.yml index 46b6267c..bd2a55f4 100644 --- a/.github/workflows/js_test.yml +++ b/.github/workflows/js_test.yml @@ -14,7 +14,7 @@ jobs: fail-fast: false matrix: node: [22.x] - ruby: [3.4.6] + ruby: [3.4.3] env: RAILS_ENV: test diff --git a/.github/workflows/lint_test.yml b/.github/workflows/lint_test.yml index 9623e38e..a799f20d 100644 --- a/.github/workflows/lint_test.yml +++ b/.github/workflows/lint_test.yml @@ -14,7 +14,7 @@ jobs: fail-fast: false matrix: node: [22.x] - ruby: [3.4.6] + ruby: [3.4.3] env: RAILS_ENV: test diff --git a/.github/workflows/rspec_test.yml b/.github/workflows/rspec_test.yml index d117458a..5625cc83 100644 --- a/.github/workflows/rspec_test.yml +++ b/.github/workflows/rspec_test.yml @@ -14,7 +14,7 @@ jobs: fail-fast: false matrix: node: [22.x] - ruby: [3.4.6] + ruby: [3.4.3] services: postgres: diff --git a/.ruby-version b/.ruby-version index 1cf82530..6cb9d3dd 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.4.6 +3.4.3 diff --git a/Gemfile b/Gemfile index 19e347e2..ebb93286 100644 --- a/Gemfile +++ b/Gemfile @@ -3,10 +3,10 @@ source "https://rubygems.org" git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby "3.4.6" +ruby "3.4.3" -gem "react_on_rails", "16.1.1" -gem "shakapacker", "9.3.2" +gem "react_on_rails", "16.2.0.beta.10" +gem "shakapacker", "9.3.4.beta.0" # Bundle edge Rails instead: gem "rails", github: "rails/rails" gem "listen" diff --git a/Gemfile.lock b/Gemfile.lock index 00c47de2..fa247e69 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -295,7 +295,7 @@ GEM erb psych (>= 4.0.0) tsort - react_on_rails (16.1.1) + react_on_rails (16.2.0.beta.10) addressable connection_pool execjs (~> 2.5) @@ -386,7 +386,7 @@ GEM websocket (~> 1.0) semantic_range (3.1.0) sexp_processor (4.17.1) - shakapacker (9.3.2) + shakapacker (9.3.4.beta.0) activesupport (>= 5.2) package_json rack-proxy (>= 0.6.1) @@ -484,7 +484,7 @@ DEPENDENCIES rails-html-sanitizer rails_best_practices rainbow - react_on_rails (= 16.1.1) + react_on_rails (= 16.2.0.beta.10) redcarpet redis (~> 5.0) rspec-rails (~> 6.0.0) @@ -496,7 +496,7 @@ DEPENDENCIES scss_lint sdoc selenium-webdriver (~> 4) - shakapacker (= 9.3.2) + shakapacker (= 9.3.4.beta.0) spring spring-commands-rspec stimulus-rails (~> 1.3) diff --git a/package.json b/package.json index 4746b7b8..239d4a32 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "react": "^19.0.0", "react-dom": "^19.0.0", "react-intl": "^6.4.4", - "react-on-rails": "16.1.1", + "react-on-rails": "16.2.0-beta.10", "react-redux": "^8.1.0", "react-router": "^6.13.0", "react-router-dom": "^6.13.0", @@ -92,7 +92,7 @@ "sass": "^1.58.3", "sass-loader": "^13.3.2", "sass-resources-loader": "^2.2.5", - "shakapacker": "9.3.2", + "shakapacker": "9.3.4-beta.0", "stimulus": "^3.0.1", "style-loader": "^3.3.1", "swc-loader": "^0.2.6", diff --git a/yarn.lock b/yarn.lock index cb584e1c..a9b90f58 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8508,10 +8508,10 @@ react-is@^18.0.0, react-is@^18.3.1: resolved "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz" integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg== -react-on-rails@16.1.1: - version "16.1.1" - resolved "https://registry.npmjs.org/react-on-rails/-/react-on-rails-16.1.1.tgz" - integrity sha512-Ntw/4HSB/p9QJ1V2kc0aETzK0W0Vy0suSh0Ugs3Ctfso2ovIT2YUegJJyPtFzX9jUZSR6Q/tkmkgNgzASkO0pw== +react-on-rails@16.2.0-beta.10: + version "16.2.0-beta.10" + resolved "https://registry.npmjs.org/react-on-rails/-/react-on-rails-16.2.0-beta.10.tgz#d2476f3b473b037234edab4acf8643f27bd57427" + integrity sha512-mukoYgrw6yJJYPZLEGDn9/2RnNsU/0P4av6wrN2agoGbHpTuHRt3f9bHwKJXh1wuT3v05fiSt7YIAlH1+dRXvw== react-proxy@^1.1.7: version "1.1.8" @@ -9135,10 +9135,10 @@ setprototypeof@1.2.0: resolved "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz" integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw== -shakapacker@9.3.2: - version "9.3.2" - resolved "https://registry.npmjs.org/shakapacker/-/shakapacker-9.3.2.tgz#480b994dc160fe5daba8013b7c02caf807b3ce3b" - integrity sha512-pj+M+MCtUedhY2FxvPPH4j59TixHp3wioZkq95HMiHHvlQmkw5psfJz6840TaDEaNrDNFLYP+Zb9I87XjAdpOQ== +shakapacker@9.3.4-beta.0: + version "9.3.4-beta.0" + resolved "https://registry.npmjs.org/shakapacker/-/shakapacker-9.3.4-beta.0.tgz#bcfaec95e1011bfaf3068b687f28e0e1bc448d42" + integrity sha512-rKnrS41JNXZFVfQ0lLmMp5achNW7wEQowa3zJ2/v7p965k3si8BwRQbW81VeKts2tCdjuLMbn5jYZn/iV7eGEw== dependencies: js-yaml "^4.1.0" path-complete-extname "^1.0.0"