Skip to content

Commit e11807d

Browse files
Update react-on-rails to version 15.0.0-alpha.2
- Remove GitHub branch reference for react-on-rails - Update react-on-rails to version 15.0.0-alpha.2 in Gemfile, package.json, and related lock files - Clean up spec helper by removing temporary development path configuration
1 parent 043fc25 commit e11807d

File tree

9 files changed

+25
-40
lines changed

9 files changed

+25
-40
lines changed

Gemfile.ci

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +0,0 @@
1-
gem "react_on_rails", github: "shakacode/react_on_rails", branch: "abanoubghadban/pro362-add-support-for-RSC"

Gemfile.development_dependencies

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
55

66
ruby '3.3.0'
77

8-
gem "react_on_rails", "14.1.1" # keep in sync with package.json files
8+
gem "react_on_rails", "15.0.0.alpha.2" # keep in sync with package.json files
99

1010
# For local development
1111
# Add the following line to the Gemfile.local file

Gemfile.lock

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,6 @@ GIT
66
byebug (~> 11.0)
77
pry (>= 0.13, < 0.15)
88

9-
GIT
10-
remote: https://github.com/shakacode/react_on_rails.git
11-
revision: 4c5a0f27e3ce77d7bdcd9858cc3564a49b03a8ff
12-
branch: abanoubghadban/pro362-add-support-for-RSC
13-
specs:
14-
react_on_rails (14.2.0)
15-
addressable
16-
connection_pool
17-
execjs (~> 2.5)
18-
rails (>= 5.2)
19-
rainbow (~> 3.0)
20-
219
PATH
2210
remote: .
2311
specs:
@@ -292,6 +280,12 @@ GEM
292280
ffi (~> 1.0)
293281
rdoc (6.12.0)
294282
psych (>= 4.0.0)
283+
react_on_rails (15.0.0.alpha.2)
284+
addressable
285+
connection_pool
286+
execjs (~> 2.5)
287+
rails (>= 5.2)
288+
rainbow (~> 3.0)
295289
regexp_parser (2.9.2)
296290
reline (0.6.0)
297291
io-console (~> 0.5)
@@ -462,7 +456,7 @@ DEPENDENCIES
462456
pry-theme
463457
puma (~> 6)
464458
rails (~> 7.1)
465-
react_on_rails!
459+
react_on_rails (= 15.0.0.alpha.2)
466460
react_on_rails_pro!
467461
rspec-rails
468462
rspec-retry

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
"nps": "^5.9.12",
8181
"pino-pretty": "^13.0.0",
8282
"prettier": "^3.2.5",
83-
"react-on-rails": "git+https://github.com/shakacode/react_on_rails.git#abanoubghadban/pro362-add-support-for-RSC",
83+
"react-on-rails": "15.0.0-alpha.2",
8484
"release-it": "^17.6.0",
8585
"sentry-testkit": "^5.0.6",
8686
"touch": "^3.1.0",

spec/dummy/Gemfile.lock

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,6 @@ GIT
66
byebug (~> 11.0)
77
pry (>= 0.13, < 0.15)
88

9-
GIT
10-
remote: https://github.com/shakacode/react_on_rails.git
11-
revision: 4c5a0f27e3ce77d7bdcd9858cc3564a49b03a8ff
12-
branch: abanoubghadban/pro362-add-support-for-RSC
13-
specs:
14-
react_on_rails (14.2.0)
15-
addressable
16-
connection_pool
17-
execjs (~> 2.5)
18-
rails (>= 5.2)
19-
rainbow (~> 3.0)
20-
219
PATH
2210
remote: ../..
2311
specs:
@@ -324,6 +312,12 @@ GEM
324312
ffi (~> 1.0)
325313
rdoc (6.12.0)
326314
psych (>= 4.0.0)
315+
react_on_rails (15.0.0.alpha.2)
316+
addressable
317+
connection_pool
318+
execjs (~> 2.5)
319+
rails (>= 5.2)
320+
rainbow (~> 3.0)
327321
regexp_parser (2.9.2)
328322
reline (0.6.0)
329323
io-console (~> 0.5)
@@ -515,7 +509,7 @@ DEPENDENCIES
515509
pry-theme
516510
puma (~> 6)
517511
rails (~> 7.1)
518-
react_on_rails!
512+
react_on_rails (= 15.0.0.alpha.2)
519513
react_on_rails_pro!
520514
rspec-rails
521515
rspec-retry

spec/dummy/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"react-dom": "19.0.0",
5252
"react-error-boundary": "^4.1.2",
5353
"react-helmet": "^6.0.0-beta.2",
54-
"react-on-rails": "git+https://github.com/shakacode/react_on_rails.git#abanoubghadban/pro362-add-support-for-RSC",
54+
"react-on-rails": "15.0.0-alpha.2",
5555
"react-on-rails-rsc": "19.0.0",
5656
"react-proptypes": "^1.0.0",
5757
"react-redux": "^9.2.0",

spec/dummy/yarn.lock

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5608,9 +5608,10 @@ react-on-rails-rsc@19.0.0:
56085608
dependencies:
56095609
react-server-dom-webpack "19.0.0"
56105610

5611-
"react-on-rails@git+https://github.com/shakacode/react_on_rails.git#abanoubghadban/pro362-add-support-for-RSC":
5612-
version "14.2.0"
5613-
resolved "git+https://github.com/shakacode/react_on_rails.git#4c5a0f27e3ce77d7bdcd9858cc3564a49b03a8ff"
5611+
react-on-rails@15.0.0-alpha.2:
5612+
version "15.0.0-alpha.2"
5613+
resolved "https://registry.yarnpkg.com/react-on-rails/-/react-on-rails-15.0.0-alpha.2.tgz#57c5e34f8d2fcbd2789deabf8dd126e8da15c663"
5614+
integrity sha512-0T05V9thaVV1k0VINLcjeBU67m+MMLC7pZuqijYZW6fm90n1rMYj+HVCYDhfWXx90jh/wuF744Futilll4NEoA==
56145615

56155616
react-proptypes@^1.0.0:
56165617
version "1.0.0"

spec/react_on_rails_pro/spec_helper.rb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
# frozen_string_literal: true
22

33
$LOAD_PATH.unshift File.expand_path("../../lib", __dir__)
4-
# TODO: revert before merging
5-
if File.exist?(File.expand_path("../../../react_on_rails/lib", __dir__))
6-
$LOAD_PATH.unshift File.expand_path("../../../react_on_rails/lib", __dir__)
7-
end
84

95
require "react_on_rails"
106
require "react_on_rails/packer_utils"

yarn.lock

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6909,9 +6909,10 @@ react-is@^18.0.0:
69096909
resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.3.1.tgz#e83557dc12eae63a99e003a46388b1dcbb44db7e"
69106910
integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==
69116911

6912-
"react-on-rails@git+https://github.com/shakacode/react_on_rails.git#abanoubghadban/pro362-add-support-for-RSC":
6913-
version "14.2.0"
6914-
resolved "git+https://github.com/shakacode/react_on_rails.git#4c5a0f27e3ce77d7bdcd9858cc3564a49b03a8ff"
6912+
react-on-rails@15.0.0-alpha.2:
6913+
version "15.0.0-alpha.2"
6914+
resolved "https://registry.yarnpkg.com/react-on-rails/-/react-on-rails-15.0.0-alpha.2.tgz#57c5e34f8d2fcbd2789deabf8dd126e8da15c663"
6915+
integrity sha512-0T05V9thaVV1k0VINLcjeBU67m+MMLC7pZuqijYZW6fm90n1rMYj+HVCYDhfWXx90jh/wuF744Futilll4NEoA==
69156916

69166917
readable-stream@^2.2.2:
69176918
version "2.3.8"

0 commit comments

Comments
 (0)