next_rails_scaffold 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 290814ff4b89e5daa4c89b5582625700486c2388b00e75b7cb0fb86bcad793ba
-  data.tar.gz: 7e348321d3d3993b7ba59c1f510c8e617877406d421a0cc14f0649e79a56ce09
+  metadata.gz: 35a1af872af2ffdab09af7df8cf1e5f337554642acd6e9325b9cf112ac4ff76c
+  data.tar.gz: 811159cc9f59924938ebeacfab6ce6ab39fd225c563f5f75babaf2d64ee0b418
 SHA512:
-  metadata.gz: 81ca951de2a7f4acd112c7e8db80401f422975581b2de334633cff4bc9c0c26b37b5e5036bdb2d415e78339db1b196931bf3c39966c8040653cebb94ee20de1c
-  data.tar.gz: fbd1ac9e2b34d059850ca59e50d6301c3aecf536df62c6f399e1644d0c0553e034cbe104b62ca68795a181a9c22d0c73f31704f662f1688e999519625cd4b5e7
+  metadata.gz: 8904f7044947b2f53e55f71f37d7f47afe51b887f46fff09efb2b62e999aa5361d2f931c7601e27a35f5d4d3b51cf185cc0e63542e77b84665cfafd5d5d82d27
+  data.tar.gz: 1202d6c99bc7bc359796e76d1367379b08f6e458f179ae43bf6238cdb8f486560ce0fa6c78b173ec4ca2c1d2b5fc830cda475a5232172b7b02e07a2ace8feb6f

data/lib/generators/rails/next_rails_scaffold/next_rails_scaffold_generator.rb

@@ -1,20 +1,46 @@
 # frozen_string_literal: true
 
+PackageManager = Struct.new(:fetch, :run, :add, :lock_file) do
+  def to_s = fetch
+end
+
 module Rails
   class NextRailsScaffoldGenerator < Rails::Generators::NamedBase
     include ::NextRailsScaffold::Actions
 
     source_root File.expand_path("templates", __dir__)
 
-    NODE_REQUIRED_VERSION = ENV.fetch("NODE_REQUIRED_VERSION", ">= 18.18.0")
-    YARN_VERSION = ENV.fetch("YARN_VERSION", "4.5.3")
-    NEXT_VERSION = ENV.fetch("NEXT_VERSION", "15.0.3")
+    PACKAGE_MANAGERS = {
+      "npm" => PackageManager.new("npx", "npm run", "npm install", "package-lock.json"),
+      "yarn" => PackageManager.new("yarn dlx", "yarn", "yarn add", "yarn.lock"),
+      "pnpm" => PackageManager.new("pnpm dlx", "pnpm", "pnpm add", "pnpm-lock.yaml"),
+      "bun" => PackageManager.new("bunx", "bun run", "bun add", "bun.lock.json")
+    }.freeze
+    NODE_REQUIRED_VERSION = ENV.fetch("NODE_REQUIRED_VERSION", ">= 18.20")
+    NEXT_VERSION = ENV.fetch("NEXT_VERSION", "15.1.6")
 
     argument :attributes, type: :array, default: [], banner: "field:type field:type"
+    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"
+
+    attr_accessor :selected_package_manager
 
     def initialize(args, *options) # :nodoc:
       super
+
       self.attributes = shell.base.attributes
+
+      package_manager = shell.base.options[:package_manager]
+      until PACKAGE_MANAGERS.keys.include?(package_manager)
+        puts "Invalid package manager" unless package_manager.nil?
+        package_manager = ask(
+          "Which package manager do you want to use? " \
+          "(#{PACKAGE_MANAGERS.keys.to_sentence(words_connector: " or ")}): "
+        )
+      end
+
+      self.selected_package_manager = PACKAGE_MANAGERS[package_manager]
     end
 
     # Properly nests namespaces passed into a generator
@@ -31,12 +57,12 @@ module Rails
     #     end
     #   end
     def add_resource_route
-      return if options[:actions].present?
+      return if options[:actions].present? || options[:skip_routes]
 
       route "resources :#{file_name.pluralize}", namespace: regular_class_path, scope: "/api"
     end
 
-    # Check Javascript depencies and create a new Next.js project. Install the the usefull packages and create the
+    # Check Javascript dependencies and create a new Next.js project. Install the the useful packages and create the
     # scaffold code for frontend application.
     def create_frontend_project
       return say_status :remove, "skip frontend folder", :yellow if shell.base.behavior == :revoke
@@ -52,8 +78,10 @@ module Rails
 
         language = File.exist?("tsconfig.json") ? "typescript" : "javascript"
 
-        run("npx hygen scaffold #{language} #{name} #{mapped_attributes.join(" ")}")
-        run("yarn build")
+        run("#{selected_package_manager} hygen scaffold #{language} #{name} #{mapped_attributes.join(" ")}")
+        if !options[:skip_build] && yes?("Do you want to build your Next.js project? (y/N)")
+          run("#{selected_package_manager.run} build")
+        end
       end
     end
 
@@ -83,16 +111,17 @@ module Rails
     def create_next_app!
       return if File.exist?("package.json")
 
-      run("npm install --global yarn@#{YARN_VERSION}")
-      run("yarn global add create-next-app@#{NEXT_VERSION}")
-      run("yarn create next-app . --no-app --src-dir --import-alias \"@/*\"")
+      run(
+        "#{selected_package_manager.fetch} create-next-app@#{NEXT_VERSION} . " \
+        "--no-app --src-dir --import-alias \"@/*\""
+      )
     end
 
     def install_hygen!
       return if Dir.exist?("_templates")
 
-      run("yarn add -D hygen hygen-add")
-      run("npx hygen-add next-rails-scaffold")
+      run("#{selected_package_manager.add} -D hygen hygen-add")
+      run("#{selected_package_manager} hygen-add next-rails-scaffold")
     end
 
     def mapped_attributes

data/lib/next_rails_scaffold/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NextRailsScaffold
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: next_rails_scaffold
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Raphael Araújo
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-23 00:00:00.000000000 Z
+date: 2025-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails