From 9574cea6186bd9fcb2f994935b4cb9c46948dd6e Mon Sep 17 00:00:00 2001 From: ihabadham Date: Fri, 13 Mar 2026 16:00:50 +0200 Subject: [PATCH 1/3] Bump React on Rails and Shakapacker to latest releases Align the tutorial app with the latest published React on Rails and Shakapacker packages so CI validates against the current dependency set and picks up recent upstream fixes. --- Gemfile | 4 ++-- Gemfile.lock | 10 +++++----- package.json | 4 ++-- yarn.lock | 16 ++++++++-------- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Gemfile b/Gemfile index 7d8ea66b..39156510 100644 --- a/Gemfile +++ b/Gemfile @@ -5,8 +5,8 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } ruby "3.4.6" -gem "react_on_rails", "16.3.0.rc.2" -gem "shakapacker", "9.5.0" +gem "react_on_rails", "16.4.0.rc.9" +gem "shakapacker", "9.6.1" # Bundle edge Rails instead: gem "rails", github: "rails/rails" gem "listen" diff --git a/Gemfile.lock b/Gemfile.lock index 45fb01bf..cc994774 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -293,7 +293,7 @@ GEM erb psych (>= 4.0.0) tsort - react_on_rails (16.3.0.rc.2) + react_on_rails (16.4.0.rc.9) addressable connection_pool execjs (~> 2.5) @@ -382,9 +382,9 @@ GEM rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) - semantic_range (3.1.0) + semantic_range (3.1.1) sexp_processor (4.17.1) - shakapacker (9.5.0) + shakapacker (9.6.1) activesupport (>= 5.2) package_json rack-proxy (>= 0.6.1) @@ -483,7 +483,7 @@ DEPENDENCIES rails-html-sanitizer rails_best_practices rainbow - react_on_rails (= 16.3.0.rc.2) + react_on_rails (= 16.4.0.rc.9) redcarpet redis (~> 5.0) rspec-rails (~> 6.0.0) @@ -495,7 +495,7 @@ DEPENDENCIES scss_lint sdoc selenium-webdriver (~> 4) - shakapacker (= 9.5.0) + shakapacker (= 9.6.1) spring spring-commands-rspec stimulus-rails (~> 1.3) diff --git a/package.json b/package.json index f194b8af..f223da75 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "react": "^19.0.0", "react-dom": "^19.0.0", "react-intl": "^6.4.4", - "react-on-rails": "16.3.0-rc.2", + "react-on-rails": "16.4.0-rc.9", "react-redux": "^8.1.0", "react-router": "^6.13.0", "react-router-dom": "^6.13.0", @@ -93,7 +93,7 @@ "sass": "^1.58.3", "sass-loader": "^13.3.2", "sass-resources-loader": "^2.2.5", - "shakapacker": "9.5.0", + "shakapacker": "9.6.1", "stimulus": "^3.0.1", "style-loader": "^3.3.1", "swc-loader": "^0.2.6", diff --git a/yarn.lock b/yarn.lock index 08c62f4e..9e595815 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.3.0-rc.2: - version "16.3.0-rc.2" - resolved "https://registry.npmjs.org/react-on-rails/-/react-on-rails-16.3.0-rc.2.tgz#ae000a111f0024d344db70f35dc2a7a73740778b" - integrity sha512-hjw8QHKsM55MRdBrXoqVekbd/SajA/I9WPyaR3TmoVK+HJJlK/XhR3PXjldrRDDdvb9PlmZutGmXFJr28pPVzQ== +react-on-rails@16.4.0-rc.9: + version "16.4.0-rc.9" + resolved "https://registry.yarnpkg.com/react-on-rails/-/react-on-rails-16.4.0-rc.9.tgz#d8d0e7b01f2e276a8b10306e27487dc7bf455d9d" + integrity sha512-+JA41YxSmm43uIqaLzbyCoXPPpc4waGzcCY00jfINGqofA+YSiLhBQGojstpLlLnrCEGHfgf/b/TexvdqOSzeA== 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.5.0: - version "9.5.0" - resolved "https://registry.npmjs.org/shakapacker/-/shakapacker-9.5.0.tgz#761aee7f4c01d8a37b13d628968b6730897c967b" - integrity sha512-pTGHzHCc74CIoXeg8otCoBa8DjGWZUoYVKu9eyWwpdO9Jq6yHxSD9u5Qp36nXjC9jupd9gnfhCY5YHqkJHpfLA== +shakapacker@9.6.1: + version "9.6.1" + resolved "https://registry.yarnpkg.com/shakapacker/-/shakapacker-9.6.1.tgz#de307cf75b6bf13f3c7e09c966a38e7822dd9999" + integrity sha512-xE1RAm6c1C6o1Erj+8Iih/WqmauKpcGUiZ2t8NJRBlKmOypvWpyk+h2DQ3u02ii3aiOYlDDSboJMk/yzmaIOPA== dependencies: js-yaml "^4.1.0" path-complete-extname "^1.0.0" From 2c5fbc9d35689406dea0c7d9fd5b8ccd1dd1e5e9 Mon Sep 17 00:00:00 2001 From: ihabadham Date: Fri, 13 Mar 2026 16:33:12 +0200 Subject: [PATCH 2/3] Normalize Yarn registry host to npmjs Keep lockfile updates aligned with the repo's existing npmjs.org pattern by pinning the repo-local Yarn registry to npm's host and normalizing the two regenerated yarn.lock entries. --- .yarnrc | 1 + yarn.lock | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 .yarnrc diff --git a/.yarnrc b/.yarnrc new file mode 100644 index 00000000..142dad81 --- /dev/null +++ b/.yarnrc @@ -0,0 +1 @@ +registry "https://registry.npmjs.org" diff --git a/yarn.lock b/yarn.lock index 9e595815..ea83483c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8510,7 +8510,7 @@ react-is@^18.0.0, react-is@^18.3.1: react-on-rails@16.4.0-rc.9: version "16.4.0-rc.9" - resolved "https://registry.yarnpkg.com/react-on-rails/-/react-on-rails-16.4.0-rc.9.tgz#d8d0e7b01f2e276a8b10306e27487dc7bf455d9d" + resolved "https://registry.npmjs.org/react-on-rails/-/react-on-rails-16.4.0-rc.9.tgz#d8d0e7b01f2e276a8b10306e27487dc7bf455d9d" integrity sha512-+JA41YxSmm43uIqaLzbyCoXPPpc4waGzcCY00jfINGqofA+YSiLhBQGojstpLlLnrCEGHfgf/b/TexvdqOSzeA== react-proxy@^1.1.7: @@ -9137,7 +9137,7 @@ setprototypeof@1.2.0: shakapacker@9.6.1: version "9.6.1" - resolved "https://registry.yarnpkg.com/shakapacker/-/shakapacker-9.6.1.tgz#de307cf75b6bf13f3c7e09c966a38e7822dd9999" + resolved "https://registry.npmjs.org/shakapacker/-/shakapacker-9.6.1.tgz#de307cf75b6bf13f3c7e09c966a38e7822dd9999" integrity sha512-xE1RAm6c1C6o1Erj+8Iih/WqmauKpcGUiZ2t8NJRBlKmOypvWpyk+h2DQ3u02ii3aiOYlDDSboJMk/yzmaIOPA== dependencies: js-yaml "^4.1.0" From 1690dac6cf7aad48089458cad8e2e802a44d8a67 Mon Sep 17 00:00:00 2001 From: ihabadham Date: Fri, 13 Mar 2026 19:00:14 +0200 Subject: [PATCH 3/3] Remove repo-local Yarn registry override The registry host drift came from local Yarn configuration rather than a repo requirement. Keep the lockfile normalized to npmjs.org while moving the registry setting to user-level Yarn config instead of committing a project override. --- .yarnrc | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .yarnrc diff --git a/.yarnrc b/.yarnrc deleted file mode 100644 index 142dad81..00000000 --- a/.yarnrc +++ /dev/null @@ -1 +0,0 @@ -registry "https://registry.npmjs.org"