Skip to content

Commit b23e8aa

Browse files
committed
Fix install generator for typescript setups
1 parent d1b3c2f commit b23e8aa

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

lib/generators/inertia/install/install_generator.rb

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

128+
if typescript? && application_layout.read.include?("<%= vite_javascript_tag 'application' %>")
129+
say 'Updating Vite tag on application layout to use TypeScript'
130+
gsub_file application_layout.to_s, /<%= vite_javascript_tag 'application' %>/, '<%= vite_typescript_tag "application" %>'
131+
end
132+
128133
add_dependencies(*FRAMEWORKS[framework]['packages_ts'])
129134

130135
say 'Copying adding scripts to package.json'

spec/generators/install/install_generator_spec.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,8 +232,10 @@ def expect_inertia_prepared_for(framework, ext: 'js')
232232
file('app/views/layouts/application.html.erb') do
233233
if ext == 'ts'
234234
contains('<%= vite_typescript_tag "inertia" %>')
235+
contains('<%= vite_typescript_tag "application" %>')
235236
else
236237
contains('<%= vite_javascript_tag "inertia" %>')
238+
contains("<%= vite_javascript_tag 'application' %>")
237239
end
238240
if framework == :react
239241
contains('<%= vite_react_refresh_tag %>')

0 commit comments

Comments
 (0)