hanami-cli 2.1.0.beta2 → 2.1.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85a528645e9205c15ccdf4b81cc32a3fb0789a8a7f07c56554c1b8b0e66b9e91
-  data.tar.gz: 5937fd333d11a7f5131d0298dc609c8a92e233249bc0b2e9e8f28705977f20b4
+  metadata.gz: aa0dbea6bc97ed3a7d08b703e7fd9091def9a8326196d36c071fb8e3e9be654b
+  data.tar.gz: dc27646ce5d395932bd2fbddef1678cb5445959494270b8d5f149462a8648e90
 SHA512:
-  metadata.gz: df19a905d03fec4665ce80dd89730dee6337312e32e0e923e9424a387d66b8f9605e8392a5a73bd4627251b96c57b4a95f4df32062d8a53d42041d69841c10d6
-  data.tar.gz: e4931266c0517de1bb33bc0f862c73da58366d6d5707c0eacf48fd38b08b8d7ae767e8fd7c81f1f048b96ffda5977674e556e281c51ab1f2a4eb30c6ceaa7ade
+  metadata.gz: ac1ab34a920c7fea44106a75c8c7e8d1bb0e475ff1e48ce2ef9b87912e9da6c83aa847ddf56661db13a01551fd58e098245b6d8ac277ca7143c69681d97d5ece
+  data.tar.gz: 706d1bb79523ba8a7efd9281267de12a0f275be0b60374c619b132371e0339335e6a4112b7a53ed5951e57293799aea1b4a89ac5bf6f9ee718daec4e1c44ee45

data/CHANGELOG.md

@@ -2,6 +2,43 @@
 
 Hanami Command Line Interface
 
+## v2.1.0.rc2 - 2023-11-08
+
+### Added
+
+- [Tim Riley] Add `--skip-tests` for `hanami generate` commands. This CLI option will skip tests generation.
+
+### Changed
+
+- [Tim Riley] Set `"type": "module"` in package.json, enabling ES modules by default
+- [Tim Riley] Rename `config/assets.mjs` to `config/assets.js` (use a plain `.js` file extension)
+
+### Fixed
+
+- [Tim Riley] Use correct helper names in generated app layout
+- [Luca Guidi] Ensure to generate apps with correct pre-release version of `hanami-assets` NPM package
+- [Sean Collins] Print to stderr NPM installation errors when running `hanami install`
+- [Sean Collins] Ensure to install missing gems after `hanami install` is ran
+
+## v2.1.0.rc1 - 2023-11-01
+
+### Added
+
+- [Tim Riley] `hanami new` to generate `bin/dev` as configuration for `hanami dev`
+- [Luca Guidi] Introducing `hanami generate part` to generate view parts
+
+### Fixed
+
+- [Luca Guidi] `hanami new` generates a fully documented Puma configuration in `config/puma.rb`
+
+### Changed
+
+- [Tim Riley] `hanami new` generates a `config/assets.mjs` as Assets configuration
+- [Tim Riley] `hanami new` generates a leaner `package.json`
+- [Tim Riley] `hanami new` doesn't generate a default root route anymore
+- [Aaron Moodie & Tim Riley] `hanami new` to generate a redesigned 404 and 500 error pages
+- [Luca Guidi] When generating a RESTful action, skip `create`, if `new` is present, and `update`, if `edit` is present
+
 ## v2.1.0.beta2 - 2023-10-04
 
 ### Added

data/Gemfile

@@ -15,6 +15,8 @@ gem "hanami-controller", github: "hanami/controller", branch: "main"
 gem "hanami-router", github: "hanami/router", branch: "main"
 gem "hanami-utils", github: "hanami/utils", branch: "main"
 
+gem "dry-files", github: "dry-rb/dry-files", branch: "main"
+
 gem "rack"
 
 group :test do

data/lib/hanami/cli/commands/app/assets/command.rb

@@ -23,7 +23,7 @@ module Hanami
             def call(**)
               cmd, *args = cmd_with_args
 
-              system_call.call(cmd, *args, env: env)
+              system_call.call(cmd, *args)
             end
 
             private
@@ -39,34 +39,7 @@ module Hanami
             # @since 2.1.0
             # @api private
             def cmd_with_args
-              [
-                config.package_manager_executable,
-                config.package_manager_command,
-                config.executable
-              ]
-            end
-
-            # @since 2.1.0
-            # @api private
-            def env
-              ENV.to_h.merge(
-                "ESBUILD_ENTRY_POINTS" => entry_points,
-                "ESBUILD_OUTDIR" => destination
-              )
-            end
-
-            # @since 2.1.0
-            # @api private
-            def entry_points
-              config.entry_points.map do |entry_point|
-                escape(entry_point)
-              end.join(" ")
-            end
-
-            # @since 2.1.0
-            # @api private
-            def destination
-              escape(config.destination)
+              [config.package_manager_run_command, "assets"]
             end
 
             # @since 2.1.0

data/lib/hanami/cli/commands/app/assets/compile.rb

@@ -19,7 +19,7 @@ module Hanami
 
               if config.subresource_integrity.any?
                 result << "--"
-                result << "--sri=#{config.subresource_integrity.join(',')}"
+                result << "--sri=#{escape(config.subresource_integrity.join(','))}"
               end
 
               result

data/lib/hanami/cli/commands/app/assets/watch.rb

@@ -22,11 +22,7 @@ module Hanami
             # @since 2.1.0
             # @api private
             def cmd_with_args
-              super +
-                [
-                  "--",
-                  "--watch"
-                ]
+              super + ["--", "--watch"]
             end
           end
         end

data/lib/hanami/cli/commands/app/dev.rb

@@ -13,16 +13,6 @@ module Hanami
           # @api private
           desc "Start the application in development mode"
 
-          # @since 2.1.0
-          # @api private
-          option :procfile, type: :string, desc: "Path to Procfile", aliases: ["-f"]
-
-          # @since 2.1.0
-          # @api private
-          example [
-            "-f /path/to/Procfile",
-          ]
-
           # @since 2.1.0
           # @api private
           def initialize(interactive_system_call: InteractiveSystemCall.new, **)
@@ -32,8 +22,8 @@ module Hanami
 
           # @since 2.1.0
           # @api private
-          def call(procfile: nil, **)
-            bin, args = executable(procfile: procfile)
+          def call(**)
+            bin, args = executable
             interactive_system_call.call(bin, *args)
           end
 
@@ -45,10 +35,8 @@ module Hanami
 
           # @since 2.1.0
           # @api private
-          def executable(procfile: nil)
-            # TODO: support other implementations of Foreman
-            # See: https://github.com/ddollar/foreman#ports
-            ["foreman", ["start", "-f", procfile || "Procfile.dev"]]
+          def executable
+            [::File.join("bin", "dev")]
           end
         end
       end

data/lib/hanami/cli/commands/app/generate/action.rb

@@ -22,12 +22,25 @@ module Hanami
             DEFAULT_SKIP_VIEW = false
             private_constant :DEFAULT_SKIP_VIEW
 
+            DEFAULT_SKIP_TESTS = false
+            private_constant :DEFAULT_SKIP_TESTS
+
             argument :name, required: true, desc: "Action name"
             option :url, required: false, type: :string, desc: "Action URL"
             option :http, required: false, type: :string, desc: "Action HTTP method"
             # option :format, required: false, type: :string, default: DEFAULT_FORMAT, desc: "Template format"
-            option :skip_view, required: false, type: :boolean, default: DEFAULT_SKIP_VIEW,
-                               desc: "Skip view and template generation"
+            option \
+              :skip_view,
+              required: false,
+              type: :boolean,
+              default: DEFAULT_SKIP_VIEW,
+              desc: "Skip view and template generation"
+            option \
+              :skip_tests,
+              required: false,
+              type: :boolean,
+              default: DEFAULT_SKIP_TESTS,
+              desc: "Skip test generation"
             option :slice, required: false, desc: "Slice name"
 
             # rubocop:disable Layout/LineLength
@@ -60,8 +73,16 @@ module Hanami
 
             # @since 2.0.0
             # @api private
-            def call(name:, url: nil, http: nil, format: DEFAULT_FORMAT, skip_view: DEFAULT_SKIP_VIEW, slice: nil,
-                     context: nil, **)
+            def call(
+              name:,
+              url: nil,
+              http: nil,
+              format: DEFAULT_FORMAT,
+              skip_view: DEFAULT_SKIP_VIEW,
+              skip_tests: DEFAULT_SKIP_TESTS, # rubocop:disable Lint/UnusedMethodArgument
+              slice: nil,
+              context: nil, **
+            )
               slice = inflector.underscore(Shellwords.shellescape(slice)) if slice
               name = naming.action_name(name)
               *controller, action = name.split(ACTION_SEPARATOR)

data/lib/hanami/cli/commands/app/generate/part.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+require "dry/inflector"
+require "dry/files"
+require "shellwords"
+
+module Hanami
+  module CLI
+    module Commands
+      module App
+        module Generate
+          # @since 2.1.0
+          # @api private
+          class Part < App::Command
+            DEFAULT_SKIP_TESTS = false
+            private_constant :DEFAULT_SKIP_TESTS
+
+            argument :name, required: true, desc: "Part name"
+            option :slice, required: false, desc: "Slice name"
+            option \
+              :skip_tests,
+              required: false,
+              type: :boolean,
+              default: DEFAULT_SKIP_TESTS,
+              desc: "Skip test generation"
+
+            example [
+              %(book               (MyApp::Views::Parts::Book)),
+              %(book --slice=admin (Admin::Views::Parts::Book)),
+            ]
+            attr_reader :generator
+            private :generator
+
+            # @since 2.0.0
+            # @api private
+            def initialize(
+              fs: Hanami::CLI::Files.new,
+              inflector: Dry::Inflector.new,
+              generator: Generators::App::Part.new(fs: fs, inflector: inflector),
+              **
+            )
+              @generator = generator
+              super(fs: fs)
+            end
+
+            # @since 2.0.0
+            # @api private
+            def call(name:, slice: nil, skip_tests: DEFAULT_SKIP_TESTS, **) # rubocop:disable Lint/UnusedMethodArgument
+              slice = inflector.underscore(Shellwords.shellescape(slice)) if slice
+
+              generator.call(app.namespace, name, slice)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/hanami/cli/commands/app/install.rb

@@ -33,37 +33,9 @@ module Hanami
           # @api private
           option :head, type: :boolean, desc: "Install head deps", default: DEFAULT_HEAD
 
-          # @since 2.1.0
-          # @api private
-          def initialize(system_call: SystemCall.new, **)
-            @system_call = system_call
-            super()
-          end
-
           # @since 2.0.0
           # @api private
           def call(head: DEFAULT_HEAD, **)
-            install_hanami_assets!(head: head)
-          end
-
-          private
-
-          # @since 2.1.0
-          # @api private
-          attr_reader :system_call
-
-          # @since 2.1.0
-          # @api private
-          def install_hanami_assets!(head:)
-            return unless Hanami.bundled?("hanami-assets")
-
-            system_call.call("npm", ["init", "-y"])
-
-            if head
-              system_call.call("npm", %w[install https://github.com/hanami/assets-js])
-            else
-              system_call.call("npm", %w[install hanami-assets])
-            end
           end
         end
       end

data/lib/hanami/cli/commands/app.rb

@@ -31,6 +31,7 @@ module Hanami
               prefix.register "slice", Generate::Slice
               prefix.register "action", Generate::Action
               prefix.register "view", Generate::View
+              prefix.register "part", Generate::Part
             end
           end
         end

data/lib/hanami/cli/commands/gem/new.rb

@@ -58,6 +58,8 @@ module Hanami
           ]
           # rubocop:enable Layout/LineLength
 
+          # rubocop:disable Metrics/ParameterLists
+
           # @since 2.0.0
           # @api private
           def initialize(
@@ -65,13 +67,19 @@ module Hanami
             inflector: Dry::Inflector.new,
             bundler: CLI::Bundler.new(fs: fs),
             generator: Generators::Gem::App.new(fs: fs, inflector: inflector),
+            system_call: SystemCall.new,
             **other
           )
             @bundler = bundler
             @generator = generator
+            @system_call = system_call
             super(fs: fs, inflector: inflector, **other)
           end
 
+          # rubocop:enable Metrics/ParameterLists
+
+          # rubocop:disable Metrics/AbcSize
+
           # @since 2.0.0
           # @api private
           def call(app:, head: HEAD_DEFAULT, skip_install: SKIP_INSTALL_DEFAULT, skip_assets: SKIP_ASSETS_DEFAULT, **)
@@ -88,22 +96,39 @@ module Hanami
                 else
                   out.puts "Running Bundler install..."
                   bundler.install!
+
+                  unless skip_assets
+                    out.puts "Running npm install..."
+                    system_call.call("npm", ["install"]).tap do |result|
+                      unless result.successful?
+                        puts "NPM ERROR:"
+                        puts(result.err.lines.map { |line| line.prepend("    ") })
+                      end
+                    end
+                  end
+
                   out.puts "Running Hanami install..."
-                  run_install_commmand!(head: head)
+                  run_install_command!(head: head)
                 end
               end
             end
           end
+          # rubocop:enable Metrics/AbcSize
 
           private
 
           attr_reader :bundler
           attr_reader :generator
+          attr_reader :system_call
 
-          def run_install_commmand!(head:)
+          def run_install_command!(head:)
             head_flag = head ? " --head" : ""
             bundler.exec("hanami install#{head_flag}").tap do |result|
-              raise HanamiInstallError.new(result.err) unless result.successful?
+              if result.successful?
+                bundler.exec("check").successful? || bundler.exec("install")
+              else
+                raise HanamiInstallError.new(result.err)
+              end
             end
           end
         end

data/lib/hanami/cli/generators/app/action.rb

@@ -56,6 +56,14 @@ module Hanami
           }.freeze
           private_constant :ROUTE_RESTFUL_URL_SUFFIXES
 
+          # @api private
+          # @since 2.1.0
+          RESTFUL_COUNTERPART_VIEWS = {
+            "create" => "new",
+            "update" => "edit"
+          }.freeze
+          private_constant :RESTFUL_COUNTERPART_VIEWS
+
           PATH_SEPARATOR = "/"
           private_constant :PATH_SEPARATOR
 
@@ -77,7 +85,7 @@ module Hanami
             fs.mkdir(directory = fs.join(slice_directory, "actions", controller))
             fs.write(fs.join(directory, "#{action}.rb"), t("slice_action.erb", context))
 
-            unless skip_view
+            if generate_view?(skip_view, action, directory)
               fs.mkdir(directory = fs.join(slice_directory, "views", controller))
               fs.write(fs.join(directory, "#{action}.rb"), t("slice_view.erb", context))
 
@@ -97,12 +105,15 @@ module Hanami
             fs.mkdir(directory = fs.join("app", "actions", controller))
             fs.write(fs.join(directory, "#{action}.rb"), t("action.erb", context))
 
-            unless skip_view
-              fs.mkdir(directory = fs.join("app", "views", controller))
-              fs.write(fs.join(directory, "#{action}.rb"), t("view.erb", context))
+            view = action
+            view_directory = fs.join("app", "views", controller)
 
-              fs.mkdir(directory = fs.join("app", "templates", controller))
-              fs.write(fs.join(directory, "#{action}.#{format}.erb"),
+            if generate_view?(skip_view, view, view_directory)
+              fs.mkdir(view_directory)
+              fs.write(fs.join(view_directory, "#{view}.rb"), t("view.erb", context))
+
+              fs.mkdir(template_directory = fs.join("app", "templates", controller))
+              fs.write(fs.join(template_directory, "#{view}.#{format}.erb"),
                        t(template_with_format_ext("template", format), context))
             end
           end
@@ -117,6 +128,35 @@ module Hanami
                            http)} "#{route_url(controller, action, url)}", to: "#{controller.join('.')}.#{action}")
           end
 
+          # @api private
+          # @since 2.1.0
+          def generate_view?(skip_view, view, directory)
+            return false if skip_view
+            return generate_restful_view?(view, directory) if rest_view?(view)
+
+            true
+          end
+
+          # @api private
+          # @since 2.1.0
+          def generate_restful_view?(view, directory)
+            corresponding_action = corresponding_restful_view(view)
+
+            !fs.exist?(fs.join(directory, "#{corresponding_action}.rb"))
+          end
+
+          # @api private
+          # @since 2.1.0
+          def rest_view?(view)
+            RESTFUL_COUNTERPART_VIEWS.keys.include?(view)
+          end
+
+          # @api private
+          # @since 2.1.0
+          def corresponding_restful_view(view)
+            RESTFUL_COUNTERPART_VIEWS.fetch(view, nil)
+          end
+
           def template_with_format_ext(name, format)
             ext =
               case format.to_sym

data/lib/hanami/cli/generators/app/part/app_base_part.erb

@@ -0,0 +1,9 @@
+# auto_register: false
+# frozen_string_literal: true
+
+module <%= camelized_app_name %>
+  module Views
+    class Part < Hanami::View::Part
+    end
+  end
+end

data/lib/hanami/cli/generators/app/part/app_part.erb

@@ -0,0 +1,13 @@
+# auto_register: false
+# frozen_string_literal: true
+
+module <%= camelized_app_name %>
+  module Views
+    module Parts
+<%= module_namespace_declaration -%>
+  <%= module_namespace_offset %>class <%= camelized_name %> < <%= camelized_app_name %>::Views::Part
+  <%= module_namespace_offset %>end
+<%= module_namespace_end -%>
+    end
+  end
+end

data/lib/hanami/cli/generators/app/part/slice_base_part.erb

@@ -0,0 +1,9 @@
+# auto_register: false
+# frozen_string_literal: true
+
+module <%= camelized_slice_name %>
+  module Views
+    class Part < <%= camelized_app_name %>::Views::Part
+    end
+  end
+end

data/lib/hanami/cli/generators/app/part/slice_part.erb

@@ -0,0 +1,13 @@
+# auto_register: false
+# frozen_string_literal: true
+
+module <%= camelized_slice_name %>
+  module Views
+    module Parts
+<%= module_namespace_declaration -%>
+  <%= module_namespace_offset %>class <%= camelized_name %> < <%= camelized_slice_name %>::Views::Part
+  <%= module_namespace_offset %>end
+<%= module_namespace_end -%>
+    end
+  end
+end

data/lib/hanami/cli/generators/app/part.rb

@@ -0,0 +1,101 @@
+# frozen_string_literal: true
+
+require "erb"
+require "dry/files"
+require_relative "../../errors"
+
+module Hanami
+  module CLI
+    module Generators
+      module App
+        # @since 2.1.0
+        # @api private
+        class Part
+          # @since 2.1.0
+          # @api private
+          def initialize(fs:, inflector:)
+            @fs = fs
+            @inflector = inflector
+          end
+
+          # @since 2.1.0
+          # @api private
+          def call(app, key, slice)
+            context = PartContext.new(inflector, app, slice, key)
+
+            if slice
+              generate_for_slice(context, slice)
+            else
+              generate_for_app(context)
+            end
+          end
+
+          private
+
+          # @since 2.1.0
+          # @api private
+          attr_reader :fs
+
+          # @since 2.1.0
+          # @api private
+          attr_reader :inflector
+
+          # @since 2.1.0
+          # @api private
+          def generate_for_slice(context, slice)
+            slice_directory = fs.join("slices", slice)
+            raise MissingSliceError.new(slice) unless fs.directory?(slice_directory)
+
+            generate_base_part_for_app(context)
+            generate_base_part_for_slice(context, slice)
+
+            fs.mkdir(directory = fs.join(slice_directory, "views", "parts", *context.underscored_namespace))
+            fs.write(fs.join(directory, "#{context.underscored_name}.rb"), t("slice_part.erb", context))
+          end
+
+          # @since 2.1.0
+          # @api private
+          def generate_for_app(context)
+            generate_base_part_for_app(context)
+
+            fs.mkdir(directory = fs.join("app", "views", "parts", *context.underscored_namespace))
+            fs.write(fs.join(directory, "#{context.underscored_name}.rb"), t("app_part.erb", context))
+          end
+
+          # @since 2.1.0
+          # @api private
+          def generate_base_part_for_app(context)
+            path = fs.join("app", "views", "part.rb")
+            return if fs.exist?(path)
+
+            fs.write(path, t("app_base_part.erb", context))
+          end
+
+          # @since 2.1.0
+          # @api private
+          def generate_base_part_for_slice(context, slice)
+            path = fs.join("slices", slice, "views", "part.rb")
+            return if fs.exist?(path)
+
+            fs.write(path, t("slice_base_part.erb", context))
+          end
+
+          # @since 2.1.0
+          # @api private
+          def template(path, context)
+            require "erb"
+
+            ERB.new(
+              File.read(__dir__ + "/part/#{path}"),
+              trim_mode: "-"
+            ).result(context.ctx)
+          end
+
+          # @since 2.1.0
+          # @api private
+          alias_method :t, :template
+        end
+      end
+    end
+  end
+end

data/lib/hanami/cli/generators/app/part_context.rb

@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+require_relative "slice_context"
+require "dry/files/path"
+
+module Hanami
+  module CLI
+    module Generators
+      # @since 2.1.0
+      # @api private
+      module App
+        # @since 2.1.0
+        # @api private
+        class PartContext < SliceContext
+          # TODO: move these constants somewhere that will let us reuse them
+
+          # @since 2.1.0
+          # @api private
+          KEY_SEPARATOR = "."
+          private_constant :KEY_SEPARATOR
+
+          # @since 2.1.0
+          # @api private
+          INDENTATION = "  "
+          private_constant :INDENTATION
+
+          # @since 2.1.0
+          # @api private
+          OFFSET = INDENTATION * 2
+          private_constant :OFFSET
+
+          # @since 2.1.0
+          # @api private
+          attr_reader :key
+
+          # @since 2.1.0
+          # @api private
+          def initialize(inflector, app, slice, key)
+            @key = key
+            super(inflector, app, slice, nil)
+          end
+
+          # @since 2.1.0
+          # @api private
+          def namespaces
+            @namespaces ||= key.split(KEY_SEPARATOR)[..-2]
+          end
+
+          # @since 2.1.0
+          # @api private
+          def name
+            @name ||= key.split(KEY_SEPARATOR)[-1]
+          end
+
+          # @since 2.1.0
+          # @api private
+          def camelized_name
+            inflector.camelize(name)
+          end
+
+          # @since 2.1.0
+          # @api private
+          def underscored_namespace
+            namespaces.map { inflector.underscore(_1) }
+          end
+
+          # @since 2.1.0
+          # @api private
+          def underscored_name
+            inflector.underscore(name)
+          end
+
+          # @since 2.1.0
+          # @api private
+          def module_namespace_declaration
+            namespaces.each_with_index.map { |token, i|
+              "#{OFFSET}#{INDENTATION * i}module #{inflector.camelize(token)}"
+            }.join($/)
+          end
+
+          # @since 2.1.0
+          # @api private
+          def module_namespace_end
+            namespaces.each_with_index.map { |_, i|
+              "#{OFFSET}#{INDENTATION * i}end"
+            }.reverse.join($/)
+          end
+
+          # @since 2.1.0
+          # @api private
+          def module_namespace_offset
+            "#{OFFSET}#{INDENTATION * namespaces.count}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/hanami/cli/generators/app/slice/app_layout.erb

@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title><%= humanized_app_name %> - <%= humanized_slice_name %></title>
     <%- if bundled_assets? -%>
-    <%%= favicon %>
+    <%%= favicon_tag %>
     <%= stylesheet_erb_tag %>
     <%- end -%>
   </head>

data/lib/hanami/cli/generators/app/slice_context.rb

@@ -38,13 +38,13 @@ module Hanami
           # @since 2.1.0
           # @api private
           def stylesheet_erb_tag
-            %(<%= css "#{slice}/app" %>)
+            %(<%= stylesheet_tag "#{slice}/app" %>)
           end
 
           # @since 2.1.0
           # @api private
           def javascript_erb_tag
-            %(<%= js "#{slice}/app" %>)
+            %(<%= javascript_tag "#{slice}/app" %>)
           end
 
           private

data/lib/hanami/cli/generators/context.rb

@@ -27,12 +27,12 @@ module Hanami
         def hanami_gem(name)
           gem_name = name == "hanami" ? "hanami" : "hanami-#{name}"
 
-          %(gem "#{gem_name}", #{hanami_version(name)})
+          %(gem "#{gem_name}", #{hanami_gem_version(name)})
         end
 
         # @since 2.0.0
         # @api private
-        def hanami_version(gem_name)
+        def hanami_gem_version(gem_name)
           if hanami_head?
             %(github: "hanami/#{gem_name}", branch: "main")
           else
@@ -40,6 +40,16 @@ module Hanami
           end
         end
 
+        # @since 2.1.0
+        # @api private
+        def hanami_assets_npm_package
+          if hanami_head?
+            %("hanami-assets": "hanami/assets-js#main")
+          else
+            %("hanami-assets": "#{Version.npm_package_requirement}")
+          end
+        end
+
         # @since 2.0.0
         # @api private
         def camelized_app_name
@@ -82,6 +92,14 @@ module Hanami
           Hanami.bundled?("hanami-assets")
         end
 
+        # @since 2.1.0
+        # @api private
+        #
+        # @see https://rubyreferences.github.io/rubychanges/3.1.html#values-in-hash-literals-and-keyword-arguments-can-be-omitted
+        def ruby_omit_hash_values?
+          RUBY_VERSION >= "3.1"
+        end
+
         private
 
         # @since 2.0.0

data/lib/hanami/cli/generators/gem/app/404.html

@@ -1,11 +1,82 @@
 <!DOCTYPE html>
-<html>
-  <head>
-    <title>The page you were looking for doesn’t exist (404)</title>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>The page you were looking for doesn’t exist (404)</title>
+  <style>
+    :root {
+      --foreground-rgb: 0, 0, 0;
+      --background-rgb: 255, 255, 255;
+      --font-sans: ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji;
+    }
+
+    @media (prefers-color-scheme: dark) {
+      :root {
+        --foreground-rgb: 255, 255, 255;
+        --background-rgb: 0, 0, 0;
+      }
+    }
+
+    * {
+      box-sizing: border-box;
+      margin: 0;
+      padding: 0;
+    }
+
+    body,
+    html {
+      max-width: 100vw;
+      overflow-x: hidden;
+      font-size: 100%;
+    }
+
+    body {
+      color: rgb(var(--foreground-rgb));
+      background: rgb(var(--background-rgb));
+      font-family: var(--font-sans);
+      font-style: normal;
+    }
+
+    main {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
+      height: 100vh;
+      padding: 0 4vw;
+    }
+
+    .message {
+      display: flex;
+      gap: 1rem;
+      flex-direction: column;
+      text-align: center;
+    }
+
+    .message h1 {
+      font-size: 2rem;
+      font-weight: 500;
+    }
+
+    p {
+      line-height: 1.6;
+    }
+
+    @media (prefers-color-scheme: dark) {
+      html {
+        color-scheme: dark;
+      }
+    }
+  </style>
   </head>
   <body>
     <!-- This file lives in public/404.html -->
-    <h1>The page you were looking for doesn’t exist.</h1>
-    <p>You may have mistyped the address or the page may have moved.</p>
+    <main>
+      <div class="message">
+        <h1>404</h1>
+        <p>The page you were looking for doesn’t exist.</p>
+      </div>
+    </main>
   </body>
 </html>

data/lib/hanami/cli/generators/gem/app/500.html

@@ -1,11 +1,82 @@
 <!DOCTYPE html>
-<html>
-  <head>
-    <title>We’re sorry, but something went wrong (500)</title>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>We’re sorry, but something went wrong (500)</title>
+  <style>
+    :root {
+      --foreground-rgb: 0, 0, 0;
+      --background-rgb: 255, 255, 255;
+      --font-sans: ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji;
+    }
+
+    @media (prefers-color-scheme: dark) {
+      :root {
+        --foreground-rgb: 255, 255, 255;
+        --background-rgb: 0, 0, 0;
+      }
+    }
+
+    * {
+      box-sizing: border-box;
+      margin: 0;
+      padding: 0;
+    }
+
+    body,
+    html {
+      max-width: 100vw;
+      overflow-x: hidden;
+      font-size: 100%;
+    }
+
+    body {
+      color: rgb(var(--foreground-rgb));
+      background: rgb(var(--background-rgb));
+      font-family: var(--font-sans);
+      font-style: normal;
+    }
+
+    main {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
+      height: 100vh;
+      padding: 0 4vw;
+    }
+
+    .message {
+      display: flex;
+      gap: 1rem;
+      flex-direction: column;
+      text-align: center;
+    }
+
+    .message h1 {
+      font-size: 2rem;
+      font-weight: 500;
+    }
+
+    p {
+      line-height: 1.6;
+    }
+
+    @media (prefers-color-scheme: dark) {
+      html {
+        color-scheme: dark;
+      }
+    }
+  </style>
   </head>
   <body>
     <!-- This file lives in public/500.html -->
-    <h1>We’re sorry, but something went wrong.</h1>
-    <p>If you are the application owner, check the logs for more information.</p>
+    <main>
+      <div class="message">
+        <h1>500</h1>
+        <p>We’re sorry, but something went wrong.</p>
+      </div>
+    </main>
   </body>
 </html>

data/lib/hanami/cli/generators/gem/app/app_layout.erb

@@ -5,14 +5,14 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title><%= humanized_app_name %></title>
     <%- if generate_assets? -%>
-    <%%= favicon %>
-    <%%= css "app" %>
+    <%%= favicon_tag %>
+    <%%= stylesheet_tag "app" %>
     <%- end -%>
   </head>
   <body>
     <%%= yield %>
     <%- if generate_assets? -%>
-    <%%= js "app" %>
+    <%%= javascript_tag "app" %>
     <%- end -%>
   </body>
 </html>

data/lib/hanami/cli/generators/gem/app/assets.js

@@ -0,0 +1,14 @@
+import * as assets from "hanami-assets";
+
+await assets.run();
+
+// To provide additional esbuild (https://esbuild.github.io) options, use the following:
+//
+// await assets.run({
+//   esbuildOptionsFn: (args, esbuildOptions) => {
+//     // Add to esbuildOptions here. Use `args.watch` as a condition for different options for
+//     // compile vs watch.
+//
+//     return esbuildOptions;
+//   }
+// });

data/lib/hanami/cli/generators/gem/app/dev

@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+if ! gem list foreman -i --silent; then
+  echo "Installing foreman..."
+  gem install foreman
+fi
+
+exec foreman start -f Procfile.dev "$@"

data/lib/hanami/cli/generators/gem/app/package.json.erb

@@ -0,0 +1,11 @@
+{
+  "name": "<%= underscored_app_name %>",
+  "private": true,
+  "type": "module",
+  "scripts": {
+    "assets": "node config/assets.js"
+  },
+  "dependencies": {
+    <%= hanami_assets_npm_package %>
+  }
+}

data/lib/hanami/cli/generators/gem/app/puma.erb

@@ -1,17 +1,47 @@
 # frozen_string_literal: true
 
+#
+# Environment and port
+#
+port ENV.fetch("<%= Hanami::Port::ENV_VAR %>", <%= Hanami::Port::DEFAULT %>)
+environment ENV.fetch("HANAMI_ENV", "development")
+
+#
+# Threads within each Puma/Ruby process (aka worker)
+#
+
+# Configure the minimum and maximum number of threads to use to answer requests.
 max_threads_count = ENV.fetch("HANAMI_MAX_THREADS", 5)
 min_threads_count = ENV.fetch("HANAMI_MIN_THREADS") { max_threads_count }
+
 threads min_threads_count, max_threads_count
 
-port        ENV.fetch("<%= Hanami::Port::ENV_VAR %>", <%= Hanami::Port::DEFAULT %>)
-environment ENV.fetch("HANAMI_ENV", "development")
-workers     ENV.fetch("HANAMI_WEB_CONCURRENCY", 0)
+#
+# Workers (aka Puma/Ruby processes)
+#
 
-if ENV.fetch("HANAMI_WEB_CONCURRENCY", 0) > 0
-  on_worker_boot do
+puma_concurrency = Integer(ENV.fetch("HANAMI_WEB_CONCURRENCY", 0))
+puma_cluster_mode = puma_concurrency > 1
+
+# How many worker (Puma/Ruby) processes to run.
+# Typically this is set to the number of available cores.
+workers puma_concurrency
+
+#
+# Cluster mode (aka multiple workers)
+#
+
+if puma_cluster_mode
+  # Preload the application before starting the workers. Only in cluster mode.
+  preload_app!
+
+  # Code to run immediately before master process forks workers (once on boot).
+  #
+  # These hooks can block if necessary to wait for background operations unknown
+  # to puma to finish before the process terminates. This can be used to close
+  # any connections to remote servers (database, redis, …) that were opened when
+  # preloading the code.
+  before_fork do
     Hanami.shutdown
   end
 end
-
-preload_app!

data/lib/hanami/cli/generators/gem/app/routes.erb

@@ -2,6 +2,6 @@
 
 module <%= camelized_app_name %>
   class Routes < Hanami::Routes
-    root { "Hello from Hanami" }
+    # Add your routes here. See https://guides.hanamirb.org/routing/overview/ for details.
   end
 end

data/lib/hanami/cli/generators/gem/app.rb

@@ -43,6 +43,9 @@ module Hanami
             fs.write("Procfile.dev", t("procfile.erb", context))
             fs.write("config.ru", t("config_ru.erb", context))
 
+            fs.write("bin/dev", file("dev"))
+            fs.chmod("bin/dev", 0o755)
+
             fs.write("config/app.rb", t("app.erb", context))
             fs.write("config/settings.rb", t("settings.erb", context))
             fs.write("config/routes.rb", t("routes.erb", context))
@@ -58,13 +61,15 @@ module Hanami
             fs.write("app/templates/layouts/app.html.erb", t("app_layout.erb", context))
 
             if context.generate_assets?
+              fs.write("package.json", t("package.json.erb", context))
+              fs.write("config/assets.js", file("assets.js"))
               fs.write("app/assets/js/app.js", t("app_js.erb", context))
               fs.write("app/assets/css/app.css", t("app_css.erb", context))
-              fs.write("app/assets/images/favicon.ico", File.read(File.join(__dir__, "app", "favicon.ico")))
+              fs.write("app/assets/images/favicon.ico", file("favicon.ico"))
             end
 
-            fs.write("public/404.html", File.read(File.join(__dir__, "app", "404.html")))
-            fs.write("public/500.html", File.read(File.join(__dir__, "app", "500.html")))
+            fs.write("public/404.html", file("404.html"))
+            fs.write("public/500.html", file("500.html"))
           end
 
           def template(path, context)
@@ -77,6 +82,10 @@ module Hanami
           end
 
           alias_method :t, :template
+
+          def file(path)
+            File.read(File.join(__dir__, "app", path))
+          end
         end
       end
     end

data/lib/hanami/cli/generators/version.rb

@@ -9,7 +9,7 @@ module Hanami
         # @since 2.0.0
         # @api private
         def self.version
-          return Hanami::VERSION if defined?(Hanami::VERSION)
+          return Hanami::VERSION if Hanami.const_defined?(:VERSION)
 
           Hanami::CLI::VERSION
         end
@@ -26,10 +26,22 @@ module Hanami
           "~> #{result}"
         end
 
+        def self.npm_package_requirement
+          result = version
+          # Change "2.1.0.beta2.1" to "2.1.0-beta.2" (the only format tolerable by `npm install`)
+          if prerelease?
+            result = result
+              .sub(/\.(alpha|beta|rc)/, '-\1')
+              .sub(/(alpha|beta|rc)(\d+)(?:\.\d+)?\Z/, '\1.\2')
+          end
+
+          "^#{result}"
+        end
+
         # @since 2.0.0
         # @api private
         def self.prerelease?
-          version =~ /alpha|beta|rc/
+          version.match?(/alpha|beta|rc/)
         end
 
         # @example

data/lib/hanami/cli/version.rb

@@ -6,6 +6,6 @@ module Hanami
     #
     # @api public
     # @since 2.0.0
-    VERSION = "2.1.0.beta2"
+    VERSION = "2.1.0.rc2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-cli
 version: !ruby/object:Gem::Version
-  version: 2.1.0.beta2
+  version: 2.1.0.rc2
 platform: ruby
 authors:
 - Luca Guidi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-04 00:00:00.000000000 Z
+date: 2023-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -216,6 +216,7 @@ files:
 - lib/hanami/cli/commands/app/dev.rb
 - lib/hanami/cli/commands/app/generate.rb
 - lib/hanami/cli/commands/app/generate/action.rb
+- lib/hanami/cli/commands/app/generate/part.rb
 - lib/hanami/cli/commands/app/generate/slice.rb
 - lib/hanami/cli/commands/app/generate/view.rb
 - lib/hanami/cli/commands/app/install.rb
@@ -237,6 +238,12 @@ files:
 - lib/hanami/cli/generators/app/action/template.html.erb
 - lib/hanami/cli/generators/app/action/view.erb
 - lib/hanami/cli/generators/app/action_context.rb
+- lib/hanami/cli/generators/app/part.rb
+- lib/hanami/cli/generators/app/part/app_base_part.erb
+- lib/hanami/cli/generators/app/part/app_part.erb
+- lib/hanami/cli/generators/app/part/slice_base_part.erb
+- lib/hanami/cli/generators/app/part/slice_part.erb
+- lib/hanami/cli/generators/app/part_context.rb
 - lib/hanami/cli/generators/app/slice.rb
 - lib/hanami/cli/generators/app/slice/action.erb
 - lib/hanami/cli/generators/app/slice/app_css.erb
@@ -265,13 +272,16 @@ files:
 - lib/hanami/cli/generators/gem/app/app_css.erb
 - lib/hanami/cli/generators/gem/app/app_js.erb
 - lib/hanami/cli/generators/gem/app/app_layout.erb
+- lib/hanami/cli/generators/gem/app/assets.js
 - lib/hanami/cli/generators/gem/app/config_ru.erb
+- lib/hanami/cli/generators/gem/app/dev
 - lib/hanami/cli/generators/gem/app/env.erb
 - lib/hanami/cli/generators/gem/app/favicon.ico
 - lib/hanami/cli/generators/gem/app/gemfile.erb
 - lib/hanami/cli/generators/gem/app/gitignore.erb
 - lib/hanami/cli/generators/gem/app/helpers.erb
 - lib/hanami/cli/generators/gem/app/keep.erb
+- lib/hanami/cli/generators/gem/app/package.json.erb
 - lib/hanami/cli/generators/gem/app/procfile.erb
 - lib/hanami/cli/generators/gem/app/puma.erb
 - lib/hanami/cli/generators/gem/app/rakefile.erb
@@ -320,7 +330,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.4.13
+rubygems_version: 3.4.21
 signing_key:
 specification_version: 4
 summary: Hanami CLI