Skip to content

Commit 6992023

Browse files
committed
added support for shakapacker 8+
1 parent 36f342c commit 6992023

File tree

3 files changed

+12
-7
lines changed

3 files changed

+12
-7
lines changed

CHANGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@ Please follow the recommendations outlined at [keepachangelog.com](http://keepac
1818
### [Unreleased]
1919
Changes since the last non-beta release.
2020

21+
### [14.0.2] - 2024-06-11
22+
23+
#### Fixed
24+
- Project initialization with Shakapacker v8+ fixed [PR 1629](https://github.com/shakacode/react_on_rails/pull/1629) by [vaukalak](https://github.com/vaukalak)
25+
2126
### [14.0.1] - 2024-05-16
2227

2328
#### Fixed
@@ -1128,7 +1133,8 @@ Best done with Object destructing:
11281133
##### Fixed
11291134
- Fix several generator-related issues.
11301135

1131-
[Unreleased]: https://github.com/shakacode/react_on_rails/compare/14.0.1...master
1136+
[Unreleased]: https://github.com/shakacode/react_on_rails/compare/14.0.2...master
1137+
[14.0.2]: https://github.com/shakacode/react_on_rails/compare/14.0.1...14.0.2
11321138
[14.0.1]: https://github.com/shakacode/react_on_rails/compare/14.0.0...14.0.1
11331139
[14.0.0]: https://github.com/shakacode/react_on_rails/compare/13.4.0...14.0.0
11341140
[13.4.0]: https://github.com/shakacode/react_on_rails/compare/13.3.5...13.4.0

lib/generators/react_on_rails/base_generator.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@ def copy_base_files
4040
def copy_js_bundle_files
4141
base_path = "base/base/"
4242
base_files = %w[app/javascript/packs/server-bundle.js
43-
app/javascript/bundles/HelloWorld/components/HelloWorldServer.js
44-
app/javascript/bundles/HelloWorld/components/HelloWorld.module.css]
43+
app/javascript/bundles/HelloWorld/components/HelloWorldServer.js]
4544
base_files.each { |file| copy_file("#{base_path}#{file}", file) }
4645
end
4746

lib/generators/react_on_rails/install_generator.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def invoke_generators
5454
invoke "react_on_rails:react_no_redux"
5555
end
5656

57-
invoke "react_on_rails:adapt_for_older_shakapacker" unless using_shakapacker_7?
57+
invoke "react_on_rails:adapt_for_older_shakapacker" unless using_shakapacker_7_or_above?
5858
end
5959

6060
# NOTE: other requirements for existing files such as .gitignore or application.
@@ -95,17 +95,17 @@ def add_bin_scripts
9595

9696
def add_post_install_message
9797
message = GeneratorMessages.helpful_message_after_installation
98-
unless using_shakapacker_7?
98+
unless using_shakapacker_7_or_above?
9999
message = message.gsub("config/shakapacker", "config/webpacker")
100100
message = message.gsub("bin/shakapacker", "bin/webpacker")
101101
end
102102

103103
GeneratorMessages.add_info(message)
104104
end
105105

106-
def using_shakapacker_7?
106+
def using_shakapacker_7_or_above?
107107
shakapacker_gem = Gem::Specification.find_by_name("shakapacker")
108-
shakapacker_gem.version.segments.first == 7
108+
shakapacker_gem.version.segments.first >= 7
109109
rescue Gem::MissingSpecError
110110
# In case using Webpacker
111111
false

0 commit comments

Comments
 (0)