Skip to content

Commit 296f606

Browse files
committed
ci: fix redux generator still creates components in the old structure
1 parent 4a6ce8a commit 296f606

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed

lib/generators/react_on_rails/react_with_redux_generator.rb

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,19 @@ def create_redux_directories
1515

1616
def copy_base_files
1717
base_js_path = "redux/base"
18-
base_files = %w[app/javascript/bundles/HelloWorld/components/HelloWorld.jsx]
18+
base_files = %w[app/javascript/bundles/HelloWorld/components/HelloWorld.jsx
19+
app/javascript/bundles/HelloWorld/components/HelloWorld.module.css]
1920
base_files.each { |file| copy_file("#{base_js_path}/#{file}", file) }
21+
22+
# Also copy to new auto-registration structure for server-side rendering compatibility
23+
copy_file("#{base_js_path}/app/javascript/bundles/HelloWorld/components/HelloWorld.jsx",
24+
"app/javascript/src/HelloWorld/ror_components/HelloWorld.jsx")
25+
copy_file("#{base_js_path}/app/javascript/bundles/HelloWorld/components/HelloWorld.module.css",
26+
"app/javascript/src/HelloWorld/HelloWorld.module.css")
27+
28+
# Fix CSS import path in the ror_components version
29+
ror_component_file = "app/javascript/src/HelloWorld/ror_components/HelloWorld.jsx"
30+
gsub_file(ror_component_file, "./HelloWorld.module.css", "../HelloWorld.module.css")
2031
end
2132

2233
def copy_base_redux_files
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
.bright {
2+
color: green;
3+
font-weight: bold;
4+
}

0 commit comments

Comments
 (0)