♻️ Move application.ts rename to install_vite logic

Users may install Inertia on projects that already have Vite installed.
Now, the renaming only occurs when the Inertia generator is also installing Vite, ensuring
compatibility with existing Vite setups and preventing unnecessary file renaming.

Author: Andy9822

lib/generators/inertia/install/install_generator.rb

@@ -125,13 +125,6 @@ def install_typescript
           return
         end
 
-        if File.exist?(application_js_path) && application_layout.read.include?("<%= vite_javascript_tag 'application' %>")
-          say 'Renaming application.js to application.ts'
-          FileUtils.mv(application_js_path, application_ts_path)
-          say 'Updating Vite tag on application layout to use TypeScript'
-          gsub_file application_layout.to_s, /<%= vite_javascript_tag 'application' %>/, "<%= vite_typescript_tag 'application' %>"
-        end
-
         add_dependencies(*FRAMEWORKS[framework]['packages_ts'])
 
         say 'Copying adding scripts to package.json'
@@ -189,6 +182,7 @@ def install_vite
               exit(false)
             end
             if (capture = run('bundle exec vite install', capture: !verbose?))
+              rename_application_js_to_ts if typescript?
               say 'Vite Rails successfully installed', :green
             else
               say capture
@@ -199,6 +193,13 @@ def install_vite
         end
       end
 
+      def rename_application_js_to_ts
+        return unless File.exist?(application_js_path) && application_layout.read.include?("<%= vite_javascript_tag 'application' %>")
+
+        FileUtils.mv(application_js_path, application_ts_path)
+        gsub_file application_layout.to_s, /<%= vite_javascript_tag 'application' %>/, "<%= vite_typescript_tag 'application' %>"
+      end
+
       def ruby_vite_installed?
         return true if package_manager.present? && ruby_vite?
 

spec/generators/install/install_generator_spec.rb

@@ -32,38 +32,20 @@
       let(:ext) { 'ts' }
 
       include_context 'assert framework structure'
-      include_context 'assert application.js entrypoint renaming'
     end
   end
 
   shared_context 'assert application.js entrypoint renaming' do
-    context 'when application.js exists' do
-      before do
-        FileUtils.mkdir_p(File.join(destination_root, 'app/frontend/entrypoints'))
-        File.write(File.join(destination_root, 'app/frontend/entrypoints/application.js'), '// Application JS')
-      end
-
-      it 'renames application.js to application.ts when TypeScript is enabled' do
-        expect { generator }.not_to raise_error
-
-        if ext == 'ts'
-          expect(File.exist?(File.join(destination_root, 'app/frontend/entrypoints/application.ts'))).to be true
-          expect(File.exist?(File.join(destination_root, 'app/frontend/entrypoints/application.js'))).to be false
-        else
-          expect(File.exist?(File.join(destination_root, 'app/frontend/entrypoints/application.js'))).to be true
-          expect(File.exist?(File.join(destination_root, 'app/frontend/entrypoints/application.ts'))).to be false
-        end
-      end
-    end
-
-    context 'when application.js does not exist' do
-      before do
-        FileUtils.rm_f(File.join(destination_root, 'app/frontend/entrypoints/application.js'))
-      end
+    let(:typescript_enabled?) { args.include?('--typescript') }
 
-      it 'does not attempt to rename when TypeScript is enabled' do
-        expect { generator }.not_to raise_error
+    it 'renames application.js to application.ts if TypeScript flag is enabled' do
+      expect { generator }.not_to raise_error
 
+      if typescript_enabled?
+        expect(File.exist?(File.join(destination_root, 'app/frontend/entrypoints/application.ts'))).to be true
+        expect(File.exist?(File.join(destination_root, 'app/frontend/entrypoints/application.js'))).to be false
+      else
+        expect(File.exist?(File.join(destination_root, 'app/frontend/entrypoints/application.js'))).to be true
         expect(File.exist?(File.join(destination_root, 'app/frontend/entrypoints/application.ts'))).to be false
       end
     end
@@ -91,6 +73,14 @@
           end
         end)
       end
+
+      include_context 'assert application.js entrypoint renaming'
+
+      context 'with --typescript' do
+        let(:args) { super() + %w[--typescript] }
+
+        include_context 'assert application.js entrypoint renaming'
+      end
     end
   end
 
@@ -115,7 +105,6 @@
       let(:ext) { 'ts' }
 
       include_context 'assert framework structure'
-      include_context 'assert application.js entrypoint renaming'
 
       context 'with old Inertia version' do
         let(:inertia_version) { '1.2.0' }
@@ -136,7 +125,6 @@
       let(:ext) { 'ts' }
 
       include_context 'assert framework structure'
-      include_context 'assert application.js entrypoint renaming'
 
       context 'with old Inertia version' do
         let(:inertia_version) { '1.2.0' }