Skip to content

Commit 14192ae

Browse files
committed
Update TypeScript support and bump version to 0.4.4
1 parent 9a420c0 commit 14192ae

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

lib/generators/next_rails_scaffold/node_package_manager.rb

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ def create_next_app!
7878

7979
system(
8080
"#{selected_package_manager.fetch} create-next-app@#{NEXT_VERSION} . --use-#{selected_package_manager} " \
81-
"--no-app --src-dir --import-alias \"@/*\" #{Rails.env.test? ? "--yes" : ""}"
81+
"--no-app --src-dir --import-alias \"@/*\" #{@shell.base.options[:typescript] ? "--ts" : ""} #{Rails.env.test? ? "--yes" : ""}"
8282
)
8383

8484
if selected_package_manager.to_s == "yarn" &&
@@ -90,8 +90,10 @@ def create_next_app!
9090
def install_hygen!
9191
return if Dir.exist?("_templates")
9292

93-
system("#{selected_package_manager.add} -D hygen hygen-add")
94-
system("#{selected_package_manager.fetch} hygen-add next-rails-scaffold")
93+
hygen_add = "hygen-add@https://github.com/raphox/hygen-add"
94+
95+
system("#{selected_package_manager.add} -D hygen #{hygen_add}")
96+
system("#{selected_package_manager.fetch} #{hygen_add} next-rails-scaffold --pm #{selected_package_manager}")
9597
end
9698
end
9799
end

lib/generators/next_rails_scaffold/scaffold_generator.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ class ScaffoldGenerator < Rails::Generators::ScaffoldGenerator
1414
class_option :package_manager, type: :string, desc: "Package manager to use for frontend project"
1515
class_option :skip_build, type: :boolean, default: false, desc: "Skip running Next.js build"
1616
class_option :skip_routes, type: :boolean, default: false, desc: "Skip adding resources to routes.rb"
17+
class_option :typescript, type: :boolean, default: true, desc: "Generate TypeScript scaffold"
1718

1819
attr_accessor :selected_package_manager
1920

lib/next_rails_scaffold/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# frozen_string_literal: true
22

33
module NextRailsScaffold
4-
VERSION = "0.4.3"
4+
VERSION = "0.4.4"
55
end

test/lib/generators/next_rails_scaffold/test_scaffold_generator.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def create_rails_app_structure
1919

2020
test "generates view templates" do
2121
create_rails_app_structure
22-
run_generator %w[message title:string content:text --package_manager=yarn --skip_build]
22+
run_generator %w[message title:string content:text --package_manager=npm --skip_build]
2323

2424
%w[index edit new show _form _message].each do |view|
2525
assert_file "app/views/messages/#{view}.html.erb"

0 commit comments

Comments
 (0)