Update TypeScript support and bump version to 0.4.4

raphox · Feb 5, 2025 · 14192ae · 14192ae
1 parent 9a420c0
commit 14192ae
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/lib/generators/next_rails_scaffold/node_package_manager.rb b/lib/generators/next_rails_scaffold/node_package_manager.rb
@@ -78,7 +78,7 @@ def create_next_app!
 
         system(
           "#{selected_package_manager.fetch} create-next-app@#{NEXT_VERSION} . --use-#{selected_package_manager} " \
-          "--no-app --src-dir --import-alias \"@/*\" #{Rails.env.test? ? "--yes" : ""}"
+          "--no-app --src-dir --import-alias \"@/*\" #{@shell.base.options[:typescript] ? "--ts" : ""} #{Rails.env.test? ? "--yes" : ""}"
         )
 
         if selected_package_manager.to_s == "yarn" &&
@@ -90,8 +90,10 @@ def create_next_app!
       def install_hygen!
         return if Dir.exist?("_templates")
 
-        system("#{selected_package_manager.add} -D hygen hygen-add")
-        system("#{selected_package_manager.fetch} hygen-add next-rails-scaffold")
+        hygen_add = "hygen-add@https://github.com/raphox/hygen-add"
+
+        system("#{selected_package_manager.add} -D hygen #{hygen_add}")
+        system("#{selected_package_manager.fetch} #{hygen_add} next-rails-scaffold --pm #{selected_package_manager}")
       end
     end
   end

diff --git a/lib/generators/next_rails_scaffold/scaffold_generator.rb b/lib/generators/next_rails_scaffold/scaffold_generator.rb
@@ -14,6 +14,7 @@ class ScaffoldGenerator < Rails::Generators::ScaffoldGenerator
       class_option :package_manager, type: :string, desc: "Package manager to use for frontend project"
       class_option :skip_build, type: :boolean, default: false, desc: "Skip running Next.js build"
       class_option :skip_routes, type: :boolean, default: false, desc: "Skip adding resources to routes.rb"
+      class_option :typescript, type: :boolean, default: true, desc: "Generate TypeScript scaffold"
 
       attr_accessor :selected_package_manager
 

diff --git a/lib/next_rails_scaffold/version.rb b/lib/next_rails_scaffold/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NextRailsScaffold
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end
diff --git a/test/lib/generators/next_rails_scaffold/test_scaffold_generator.rb b/test/lib/generators/next_rails_scaffold/test_scaffold_generator.rb
@@ -19,7 +19,7 @@ def create_rails_app_structure
 
       test "generates view templates" do
         create_rails_app_structure
-        run_generator %w[message title:string content:text --package_manager=yarn --skip_build]
+        run_generator %w[message title:string content:text --package_manager=npm --skip_build]
 
         %w[index edit new show _form _message].each do |view|
           assert_file "app/views/messages/#{view}.html.erb"