@@ -88,53 +88,41 @@ def add_base_gems_to_gemfile
8888 end
8989
9090 def add_js_dependencies
91- puts "=== DEBUG: add_js_dependencies method called ==="
92-
93- begin
94- major_minor_patch_only = /\A \d +\. \d +\. \d +\z /
95- if ReactOnRails ::VERSION . match? ( major_minor_patch_only )
96- puts "Adding react-on-rails@#{ ReactOnRails ::VERSION } "
97- package_json . manager . add ( [ "react-on-rails@#{ ReactOnRails ::VERSION } " ] )
98- else
99- # otherwise add latest
100- puts "Adding the latest react-on-rails NPM module. Double check this is correct in package.json"
101- package_json . manager . add ( [ "react-on-rails" ] )
102- end
103-
104- puts "Adding React dependencies"
105- package_json . manager . add ( [
106- "react" ,
107- "react-dom" ,
108- "@babel/preset-react" ,
109- "prop-types" ,
110- "babel-plugin-transform-react-remove-prop-types" ,
111- "babel-plugin-macros"
112- ] )
113-
114- puts "Adding CSS handlers"
115- package_json . manager . add ( %w[
116- css-loader
117- css-minimizer-webpack-plugin
118- mini-css-extract-plugin
119- style-loader
120- ] )
121-
122- puts "Adding dev dependencies"
123- package_json . manager . add ( [
124- "@pmmmwh/react-refresh-webpack-plugin" ,
125- "react-refresh"
126- ] , type : :dev )
127- puts "=== DEBUG: add_js_dependencies completed successfully ==="
128- rescue => e
129- puts "=== ERROR in add_js_dependencies: #{ e . message } ==="
130- puts "=== ERROR backtrace: #{ e . backtrace . first ( 3 ) . join ( ', ' ) } ==="
131- raise
91+ major_minor_patch_only = /\A \d +\. \d +\. \d +\z /
92+ if ReactOnRails ::VERSION . match? ( major_minor_patch_only )
93+ package_json . manager . add ( [ "react-on-rails@#{ ReactOnRails ::VERSION } " ] )
94+ else
95+ # otherwise add latest
96+ puts "Adding the latest react-on-rails NPM module. Double check this is correct in package.json"
97+ package_json . manager . add ( [ "react-on-rails" ] )
13298 end
99+
100+ puts "Adding React dependencies"
101+ package_json . manager . add ( [
102+ "react" ,
103+ "react-dom" ,
104+ "@babel/preset-react" ,
105+ "prop-types" ,
106+ "babel-plugin-transform-react-remove-prop-types" ,
107+ "babel-plugin-macros"
108+ ] )
109+
110+ puts "Adding CSS handlers"
111+ package_json . manager . add ( %w[
112+ css-loader
113+ css-minimizer-webpack-plugin
114+ mini-css-extract-plugin
115+ style-loader
116+ ] )
117+
118+ puts "Adding dev dependencies"
119+ package_json . manager . add ( [
120+ "@pmmmwh/react-refresh-webpack-plugin" ,
121+ "react-refresh"
122+ ] , type : :dev )
133123 end
134124
135125 def install_js_dependencies
136- puts "Installing JavaScript dependencies"
137-
138126 # Detect which package manager to use
139127 if File . exist? ( File . join ( destination_root , "yarn.lock" ) )
140128 run "yarn install"
@@ -145,12 +133,7 @@ def install_js_dependencies
145133 elsif File . exist? ( File . join ( destination_root , "package.json" ) )
146134 # Default to npm if no lock file exists but package.json does
147135 run "npm install"
148- else
149- puts "No package.json found, skipping JavaScript dependency installation"
150136 end
151- rescue => e
152- puts "Error installing JavaScript dependencies: #{ e . message } "
153- raise
154137 end
155138
156139 def update_gitignore_for_auto_registration
0 commit comments