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 Shakapacker to 7.1 and ROR to 13.4 #572

Merged
merged 1 commit into from
Nov 23, 2023
Merged
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
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ ruby "3.1.2"

gem "cpl", "~>1.1.2"

gem "react_on_rails", "13.2.0"
gem "shakapacker", "7.0.3"
gem "react_on_rails", "13.4.0"
gem "shakapacker", "7.1.0"

# Bundle edge Rails instead: gem "rails", github: "rails/rails"
gem "listen"
Expand Down
8 changes: 4 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ GEM
ffi (~> 1.0)
rdoc (6.5.0)
psych (>= 4.0.0)
react_on_rails (13.2.0)
react_on_rails (13.4.0)
addressable
connection_pool
execjs (~> 2.5)
Expand Down Expand Up @@ -361,7 +361,7 @@ GEM
websocket (~> 1.0)
semantic_range (3.0.0)
sexp_processor (4.17.0)
shakapacker (7.0.3)
shakapacker (7.1.0)
activesupport (>= 5.2)
rack-proxy (>= 0.6.1)
railties (>= 5.2)
Expand Down Expand Up @@ -453,7 +453,7 @@ DEPENDENCIES
rails-html-sanitizer
rails_best_practices
rainbow
react_on_rails (= 13.2.0)
react_on_rails (= 13.4.0)
redcarpet
redis (~> 4.0)
rspec-rails (~> 6.0.0)
Expand All @@ -465,7 +465,7 @@ DEPENDENCIES
scss_lint
sdoc
selenium-webdriver (~> 4)
shakapacker (= 7.0.3)
shakapacker (= 7.1.0)
spring
spring-commands-rspec
stimulus-rails (~> 1.2)
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-intl": "^6.4.4",
"react-on-rails": "13.3.5",
"react-on-rails": "13.4.0",
"react-redux": "^8.1.0",
"react-router": "^6.13.0",
"react-router-dom": "^6.13.0",
Expand All @@ -94,7 +94,7 @@
"sass": "^1.58.3",
"sass-loader": "^13.3.2",
"sass-resources-loader": "^2.2.5",
"shakapacker": "7.0.3",
"shakapacker": "7.1.0",
"stimulus": "^3.0.1",
"style-loader": "^3.3.1",
"tailwindcss": "^3.3.3",
Expand Down
16 changes: 8 additions & 8 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7966,10 +7966,10 @@ react-is@^18.0.0:
resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b"
integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==

react-on-rails@13.3.5:
version "13.3.5"
resolved "https://registry.yarnpkg.com/react-on-rails/-/react-on-rails-13.3.5.tgz#7ad06ed1343861927338f77634ce757b683c6a68"
integrity sha512-3aAfuRaeEfPba0BpuoYv8KFczlWPUuLPXl8lvdZeVF9Y83gofsll5UPKRLk74y5fWK3a6H/3WUlOkjF4zQz+LQ==
react-on-rails@13.4.0:
version "13.4.0"
resolved "https://registry.yarnpkg.com/react-on-rails/-/react-on-rails-13.4.0.tgz#2dcae18413d3982e18fb6f53b950788abf337bf9"
integrity sha512-BsBUYnA8759h9mH8QIbLcd2N5MqfcQ/k4PJ60sVm0dJZTxAv8fXt2cvphS7bdr1CWdBbvg5/wFdio3vvQ+q4NQ==
dependencies:
"@babel/runtime-corejs3" "^7.12.5"
concurrently "^5.1.0"
Expand Down Expand Up @@ -8578,10 +8578,10 @@ [email protected]:
resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==

shakapacker@7.0.3:
version "7.0.3"
resolved "https://registry.yarnpkg.com/shakapacker/-/shakapacker-7.0.3.tgz#e67fca4e74c3ef380e1acf53a1d51ab4784ca01c"
integrity sha512-2kwNP8kadkmGOqb7Bp/iNzF3bV31zni8b35Uzst2DZHjnFcnDbW96MERXHc7lS3p3AmKJVbUBmHAFCPsLT9tcw==
shakapacker@7.1.0:
version "7.1.0"
resolved "https://registry.yarnpkg.com/shakapacker/-/shakapacker-7.1.0.tgz#95bd37db60702ffa21f9ea29a88f438de3db25b2"
integrity sha512-xKfF4LKrFQdMLYeIi/uBV6pfkPTO4lgCAIMx3W5+MHW61ENOXu4WeQ50qVR9u5hV6XXzi7AiS7C6dWO2GFnYAg==
dependencies:
glob "^7.2.0"
js-yaml "^4.1.0"
Expand Down