Skip to content

Commit aa6f9d8

Browse files
committed
♻️ Move application.ts rename to install_vite logic
1 parent 6463fba commit aa6f9d8

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

lib/generators/inertia/install/install_generator.rb

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -125,13 +125,6 @@ def install_typescript
125125
return
126126
end
127127

128-
if File.exist?(application_js_path) && application_layout.read.include?("<%= vite_javascript_tag 'application' %>")
129-
say 'Renaming application.js to application.ts'
130-
FileUtils.mv(application_js_path, application_ts_path)
131-
say 'Updating Vite tag on application layout to use TypeScript'
132-
gsub_file application_layout.to_s, /<%= vite_javascript_tag 'application' %>/, "<%= vite_typescript_tag 'application' %>"
133-
end
134-
135128
add_dependencies(*FRAMEWORKS[framework]['packages_ts'])
136129

137130
say 'Copying adding scripts to package.json'
@@ -190,6 +183,7 @@ def install_vite
190183
end
191184
if (capture = run('bundle exec vite install', capture: !verbose?))
192185
say 'Vite Rails successfully installed', :green
186+
rename_application_js_to_ts
193187
else
194188
say capture
195189
say_error 'Failed to install Vite Rails', :red
@@ -199,6 +193,15 @@ def install_vite
199193
end
200194
end
201195

196+
def rename_application_js_to_ts
197+
return unless File.exist?(application_js_path) && application_layout.read.include?("<%= vite_javascript_tag 'application' %>")
198+
199+
say 'Renaming application.js to application.ts'
200+
FileUtils.mv(application_js_path, application_ts_path)
201+
say 'Updating Vite tag on application layout to use TypeScript'
202+
gsub_file application_layout.to_s, /<%= vite_javascript_tag 'application' %>/, "<%= vite_typescript_tag 'application' %>"
203+
end
204+
202205
def ruby_vite_installed?
203206
return true if package_manager.present? && ruby_vite?
204207

0 commit comments

Comments
 (0)