ultimate_turbo_modal 2.1.2 → 2.2.2

data/lib/generators/ultimate_turbo_modal/install_generator.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 require "rails/generators"
-require "pathname" # Needed for Pathname helper
+require_relative "base"
 
 module UltimateTurboModal
   module Generators
-    class InstallGenerator < Rails::Generators::Base
+    class InstallGenerator < UltimateTurboModal::Generators::Base
       source_root File.expand_path("templates", __dir__)
 
       desc "Installs UltimateTurboModal: copies initializer/flavor, sets up JS, registers Stimulus controller, adds Turbo Frame."
@@ -17,99 +17,61 @@ module UltimateTurboModal
 
       # Step 2: Setup Javascript Dependencies (Yarn/npm/Bun or Importmap)
       def setup_javascript_dependencies
-        package_name = "ultimate_turbo_modal" # Or the actual npm package name if different
-
-        say "\nAttempting to set up JavaScript dependencies...", :yellow
-
-        if uses_importmaps?
-          say "Detected Importmaps. Pinning #{package_name}...", :green
-          run "bin/importmap pin #{package_name}"
-
-          say "\n✅ Pinned '#{package_name}' via importmap.", :green
-
-        elsif uses_javascript_bundler?
-          say "Detected jsbundling-rails (Yarn/npm/Bun). Adding #{package_name} package...", :green
-          if uses_yarn?
-             run "yarn add #{package_name}"
-             say "\n✅ Added '#{package_name}' using Yarn.", :green
-          elsif uses_npm?
-             run "npm install --save #{package_name}"
-             say "\n✅ Added '#{package_name}' using npm.", :green
-          elsif uses_bun?
-             run "bun add #{package_name}"
-             say "\n✅ Added '#{package_name}' using Bun.", :green
-          else
-             # Default or fallback: Try yarn, but provide instructions for others
-             say "Attempting to add with Yarn. If you use npm or Bun, please add manually.", :yellow
-             run "yarn add #{package_name}"
-             say "\n✅ Attempted to add '#{package_name}' using Yarn.", :green
-             say "   If this failed or you use npm/bun, please run:", :yellow
-             say "   npm install --save #{package_name}", :cyan
-             say "   # or", :cyan
-             say "   bun add #{package_name}\n", :cyan
-          end
-        else
-          # Fallback instructions if neither is clearly detected
-          say "\nCould not automatically detect Importmaps or jsbundling-rails.", :yellow
-          say "Please manually add the '#{package_name}' JavaScript package.", :yellow
-          say "If using Importmaps: bin/importmap pin #{package_name}", :cyan
-          say "If using Yarn: yarn add #{package_name}", :cyan
-          say "If using npm: npm install --save #{package_name}", :cyan
-          say "If using Bun: bun add #{package_name}", :cyan
-          say "Then, import it in your app/javascript/application.js:", :yellow
-          say "import '#{package_name}'\n", :cyan
-        end
+        add_js_dependency
       end
 
       # Step 3: Register Stimulus Controller
       def setup_stimulus_controller
-        stimulus_controller_path = rails_root_join("app", "javascript", "controllers", "index.js")
-        controller_package = "ultimate_turbo_modal" # Package name where the controller is defined
-        controller_name = "UltimateTurboModalController" # The exported controller class name
-        stimulus_identifier = "modal" # The identifier for application.register
+        index_path = rails_root_join("app", "javascript", "controllers", "index.js")
+        application_path = rails_root_join("app", "javascript", "controllers", "application.js")
+        controller_name = "UltimateTurboModalController"
+        stimulus_identifier = "modal"
 
-        import_line = "import { #{controller_name} } from \"#{controller_package}\"\n"
+        import_line = "import { #{controller_name} } from \"#{package_name}\"\n"
         register_line = "application.register(\"#{stimulus_identifier}\", #{controller_name})\n"
 
-        say "\nAttempting to register Stimulus controller in #{stimulus_controller_path}...", :yellow
+        # Determine which file contains Application.start() — it may be index.js or application.js
+        target_path, file_content = find_stimulus_target(index_path, application_path)
+
+        say "\nAttempting to register Stimulus controller...", :yellow
 
-        unless File.exist?(stimulus_controller_path)
-          say "❌ Stimulus controllers index file not found at #{stimulus_controller_path}.", :red
+        unless target_path
+          say "❌ Stimulus controllers file not found.", :red
           say "   Please manually add the following lines to your Stimulus setup:", :yellow
           say "   #{import_line.strip}", :cyan
           say "   #{register_line.strip}\n", :cyan
-          return # Exit this method if the file doesn't exist
+          return
         end
 
-        # Read the file content to check if lines already exist
-        file_content = File.read(stimulus_controller_path)
+        say "  Target file: #{target_path}", :yellow
 
-        # Insert the import statement after the last existing import or a common marker
-        # Using a regex to find the Stimulus import is often reliable
-        import_anchor = /import .* from "@hotwired\/stimulus"\n/
-        if file_content.match?(import_anchor) && !file_content.include?(import_line)
-          insert_into_file stimulus_controller_path, import_line, after: import_anchor
+        # Insert the import statement after an existing import from @hotwired/stimulus or ./application
+        import_anchor = /import .* from ["'](?:@hotwired\/stimulus|\.\/application)["']\n/
+        if file_content.include?(import_line)
+          say "⏩ Import statement already exists.", :blue
+        elsif file_content.match?(import_anchor)
+          insert_into_file target_path, import_line, after: import_anchor
           say "✅ Added import statement.", :green
-        elsif !file_content.include?(import_line)
-          # Fallback: insert at the beginning if Stimulus import wasn't found (less ideal)
-          insert_into_file stimulus_controller_path, import_line, before: /import/
+        elsif file_content.match?(/import/)
+          insert_into_file target_path, import_line, before: /import/
           say "✅ Added import statement (fallback position).", :green
         else
-           say "⏩ Import statement already exists.", :blue
+          prepend_to_file target_path, import_line
+          say "✅ Added import statement (prepended to file).", :green
         end
 
-
         # Insert the register statement after Application.start()
-        register_anchor = /Application\.start$$$$\n/
-        if file_content.match?(register_anchor) && !file_content.include?(register_line)
-           insert_into_file stimulus_controller_path, register_line, after: register_anchor
-           say "✅ Added controller registration.", :green
-        elsif !file_content.include?(register_line)
-          say "❌ Could not find `Application.start()` line to insert registration after.", :red
-          say "   Please manually add this line after your Stimulus application starts:", :yellow
-          say "   #{register_line.strip}\n", :cyan
+        register_anchor = /Application\.start\(\)\n/
+        if file_content.include?(register_line)
+          say "⏩ Controller registration already exists.", :blue
+        elsif file_content.match?(register_anchor)
+          insert_into_file target_path, register_line, after: register_anchor
+          say "✅ Added controller registration.", :green
         else
-           say "⏩ Controller registration already exists.", :blue
+          say "❌ Could not find `Application.start()` line in #{target_path}.", :red
+          say "   Please manually add these lines to your Stimulus setup:", :yellow
+          say "   #{import_line.strip}", :cyan
+          say "   #{register_line.strip}\n", :cyan
         end
       end
 
@@ -196,28 +158,17 @@ module UltimateTurboModal
         end
       end
 
-      def uses_importmaps?
-        File.exist?(rails_root_join("config", "importmap.rb"))
-      end
-
-      def uses_javascript_bundler?
-        File.exist?(rails_root_join("package.json"))
-      end
-
-      def uses_yarn?
-        File.exist?(rails_root_join("yarn.lock"))
-      end
-
-      def uses_npm?
-        File.exist?(rails_root_join("package-lock.json")) && !uses_yarn? && !uses_bun?
-      end
-
-       def uses_bun?
-        File.exist?(rails_root_join("bun.lockb"))
-      end
+      def find_stimulus_target(index_path, application_path)
+        [index_path, application_path].each do |path|
+          next unless File.exist?(path)
+          content = File.read(path)
+          return [path, content] if content.match?(/Application\.start\(\)/)
+        end
 
-      def rails_root_join(*args)
-         Pathname.new(destination_root).join(*args)
+        # Fall back to index.js even without Application.start()
+        if File.exist?(index_path)
+          [index_path, File.read(index_path)]
+        end
       end
     end
   end

data/lib/generators/ultimate_turbo_modal/templates/flavors/custom.rb

@@ -4,9 +4,9 @@
 # TODO: define the classes for each HTML element.
 module UltimateTurboModal::Flavors
   class Custom < UltimateTurboModal::Base
-    DIV_DIALOG_CLASSES = ""
+    DIV_MODAL_CONTAINER_CLASSES = ""
     DIV_OVERLAY_CLASSES = ""
-    DIV_OUTER_CLASSES = ""
+    DIV_DIALOG_CLASSES = ""
     DIV_INNER_CLASSES = ""
     DIV_CONTENT_CLASSES = ""
     DIV_MAIN_CLASSES = ""
@@ -18,5 +18,32 @@ module UltimateTurboModal::Flavors
     BUTTON_CLOSE_SR_ONLY_CLASSES = ""
     CLOSE_BUTTON_TAG_CLASSES = ""
     ICON_CLOSE_CLASSES = ""
+
+    TRANSITIONS = {
+      overlay: {
+        enter: {
+          animation: "",
+          start: "",
+          end: ""
+        },
+        leave: {
+          animation: "",
+          start: "",
+          end: ""
+        }
+      },
+      dialog: {
+        enter: {
+          animation: "",
+          start: "",
+          end: ""
+        },
+        leave: {
+          animation: "",
+          start: "",
+          end: ""
+        }
+      }
+    }
   end
 end

data/lib/generators/ultimate_turbo_modal/templates/flavors/tailwind.rb

@@ -3,9 +3,9 @@
 # Tailwind CSS v4
 module UltimateTurboModal::Flavors
   class Tailwind < UltimateTurboModal::Base
-    DIV_DIALOG_CLASSES = "relative group z-50"
-    DIV_OVERLAY_CLASSES = "fixed inset-0 bg-gray-900/70 transition-opacity dark:bg-gray-900/80"
-    DIV_OUTER_CLASSES = "fixed inset-0 overflow-y-auto sm:max-w-[80%] md:max-w-3xl sm:mx-auto m-4"
+    DIV_MODAL_CONTAINER_CLASSES = "relative group z-50"
+    DIV_OVERLAY_CLASSES = "fixed inset-0 bg-gray-900/70 transition-opacity dark:bg-gray-900/80 opacity-0"
+    DIV_DIALOG_CLASSES = "fixed inset-0 overflow-y-auto sm:max-w-[80%] md:max-w-3xl sm:mx-auto m-4 opacity-0"
     DIV_INNER_CLASSES = "flex min-h-full items-start justify-center pt-[10vh] sm:p-4"
     DIV_CONTENT_CLASSES = "relative transform max-h-screen overflow-hidden rounded-lg bg-white text-left shadow-lg transition-all sm:my-8 sm:max-w-3xl dark:bg-gray-800 dark:text-white"
     DIV_MAIN_CLASSES = "group-data-[padding=true]:p-4 group-data-[padding=true]:pt-2 overflow-y-auto max-h-[75vh]"
@@ -17,5 +17,32 @@ module UltimateTurboModal::Flavors
     BUTTON_CLOSE_SR_ONLY_CLASSES = "sr-only"
     CLOSE_BUTTON_TAG_CLASSES = "text-gray-400 bg-transparent hover:bg-gray-200 hover:text-gray-900 rounded-lg text-sm p-1.5 ml-auto inline-flex items-center dark:hover:bg-gray-600 dark:hover:text-white"
     ICON_CLOSE_CLASSES = "w-5 h-5"
+
+    TRANSITIONS = {
+      overlay: {
+        enter: {
+          animation: "ease-out duration-300",
+          start: "opacity-0",
+          end: "opacity-100"
+        },
+        leave: {
+          animation: "ease-in duration-200",
+          start: "opacity-100",
+          end: "opacity-0"
+        }
+      },
+      dialog: {
+        enter: {
+          animation: "ease-out duration-300",
+          start: "opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95",
+          end: "opacity-100 translate-y-0 sm:scale-100"
+        },
+        leave: {
+          animation: "ease-in duration-200",
+          start: "opacity-100 translate-y-0 sm:scale-100",
+          end: "opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
+        }
+      }
+    }
   end
 end

data/lib/generators/ultimate_turbo_modal/templates/flavors/tailwind3.rb

@@ -3,9 +3,9 @@
 # Tailwind CSS v3
 module UltimateTurboModal::Flavors
   class Tailwind3 < UltimateTurboModal::Base
-    DIV_DIALOG_CLASSES = "relative z-50"
+    DIV_MODAL_CONTAINER_CLASSES = "relative z-50"
     DIV_OVERLAY_CLASSES = "fixed inset-0 bg-gray-900 bg-opacity-70 transition-opacity dark:bg-gray-900 dark:bg-opacity-80"
-    DIV_OUTER_CLASSES = "fixed inset-0 overflow-y-auto sm:max-w-[80%] md:max-w-3xl sm:mx-auto m-4"
+    DIV_DIALOG_CLASSES = "fixed inset-0 overflow-y-auto sm:max-w-[80%] md:max-w-3xl sm:mx-auto m-4"
     DIV_INNER_CLASSES = "flex min-h-full items-start justify-center pt-[10vh] sm:p-4"
     DIV_CONTENT_CLASSES = "relative transform max-h-screen overflow-hidden rounded-lg bg-white text-left shadow-xl transition-all sm:my-8 sm:max-w-3xl dark:bg-gray-800 dark:text-white"
     DIV_MAIN_CLASSES = "p-4 pt-2 overflow-y-auto max-h-[75vh]"
@@ -17,5 +17,32 @@ module UltimateTurboModal::Flavors
     BUTTON_CLOSE_SR_ONLY_CLASSES = "sr-only"
     CLOSE_BUTTON_TAG_CLASSES = "text-gray-400 bg-transparent hover:bg-gray-200 hover:text-gray-900 rounded-lg text-sm p-1.5 ml-auto inline-flex items-center dark:hover:bg-gray-600 dark:hover:text-white"
     ICON_CLOSE_CLASSES = "w-5 h-5"
+
+    TRANSITIONS = {
+      overlay: {
+        enter: {
+          animation: "ease-out duration-300",
+          start: "opacity-0",
+          end: "opacity-100"
+        },
+        leave: {
+          animation: "ease-in duration-200",
+          start: "opacity-100",
+          end: "opacity-0"
+        }
+      },
+      dialog: {
+        enter: {
+          animation: "ease-out duration-300",
+          start: "opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95",
+          end: "opacity-100 translate-y-0 sm:scale-100"
+        },
+        leave: {
+          animation: "ease-in duration-200",
+          start: "opacity-100 translate-y-0 sm:scale-100",
+          end: "opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
+        }
+      }
+    }
   end
 end

data/lib/generators/ultimate_turbo_modal/templates/flavors/vanilla.rb

@@ -3,9 +3,10 @@
 # Vanilla CSS
 module UltimateTurboModal::Flavors
   class Vanilla < UltimateTurboModal::Base
-    DIV_DIALOG_CLASSES = "modal-container"
-    DIV_OVERLAY_CLASSES = "modal-overlay"
-    DIV_OUTER_CLASSES = "modal-outer"
+    DIV_MODAL_CONTAINER_CLASSES = "modal-container"
+    # Include enter-start classes so initial paint is hidden and transitions can animate smoothly
+    DIV_OVERLAY_CLASSES = "modal-overlay modal-transition-overlay-enter-start"
+    DIV_DIALOG_CLASSES = "modal-outer modal-transition-dialog-enter-start"
     DIV_INNER_CLASSES = "modal-inner"
     DIV_CONTENT_CLASSES = "modal-content"
     DIV_MAIN_CLASSES = "modal-main"
@@ -17,5 +18,32 @@ module UltimateTurboModal::Flavors
     BUTTON_CLOSE_SR_ONLY_CLASSES = "sr-only"
     CLOSE_BUTTON_TAG_CLASSES = "modal-close-button"
     ICON_CLOSE_CLASSES = "modal-close-icon"
+    
+    TRANSITIONS = {
+      overlay: {
+        enter: {
+          animation: "modal-transition-overlay-enter-animation",
+          start: "modal-transition-overlay-enter-start",
+          end: "modal-transition-overlay-enter-end"
+        },
+        leave: {
+          animation: "modal-transition-overlay-leave-animation",
+          start: "modal-transition-overlay-leave-start",
+          end: "modal-transition-overlay-leave-end"
+        }
+      },
+      dialog: {
+        enter: {
+          animation: "modal-transition-dialog-enter-animation",
+          start: "modal-transition-dialog-enter-start",
+          end: "modal-transition-dialog-enter-end"
+        },
+        leave: {
+          animation: "modal-transition-dialog-leave-animation",
+          start: "modal-transition-dialog-leave-start",
+          end: "modal-transition-dialog-leave-end"
+        }
+      }
+    }
   end
 end

data/lib/generators/ultimate_turbo_modal/update_generator.rb

@@ -0,0 +1,109 @@
+# frozen_string_literal: true
+
+require "rails/generators"
+require "json"
+require "pathname"
+require_relative "base"
+
+module UltimateTurboModal
+  module Generators
+    class UpdateGenerator < UltimateTurboModal::Generators::Base
+      source_root File.expand_path("templates", __dir__)
+
+      desc "Updates UltimateTurboModal: aligns npm package version to gem version and refreshes the configured flavor initializer."
+
+      def update_npm_package_version
+        package_json_path = rails_root_join("package.json")
+
+        unless File.exist?(package_json_path)
+          say "No package.json found. Skipping npm package version update.", :yellow
+          return
+        end
+
+        begin
+          json = JSON.parse(File.read(package_json_path))
+        rescue JSON::ParserError => e
+          say "Unable to parse package.json: #{e.message}", :red
+          return
+        end
+
+        package_name = "ultimate_turbo_modal"
+        new_version = UltimateTurboModal::VERSION.to_s
+
+        # Special case: demo app links to local JS package; never update its version
+        if json.dig("dependencies", package_name) == "link:../javascript" ||
+           json.dig("devDependencies", package_name) == "link:../javascript"
+          say "Detected local link for '#{package_name}' (link:../javascript). Skipping version update.", :blue
+          return
+        end
+
+        updated = false
+
+        %w[dependencies devDependencies].each do |section|
+          next unless json.key?(section) && json[section].is_a?(Hash)
+
+          if json[section].key?(package_name)
+            old = json[section][package_name]
+            json[section][package_name] = new_version
+            updated = true if old != new_version
+          end
+        end
+
+        if updated
+          File.write(package_json_path, JSON.pretty_generate(json) + "\n")
+          say "Updated #{package_name} version in package.json to #{new_version}.", :green
+        else
+          say "Did not find #{package_name} in package.json dependencies. Nothing to update.", :blue
+        end
+      end
+
+      def install_js_dependencies
+        install_all_js_dependencies
+      end
+
+      def copy_flavor_file
+        flavor = detect_flavor
+        unless flavor
+          say "Could not determine UTMR flavor. Skipping flavor file copy.", :yellow
+          return
+        end
+
+        template_rel = "flavors/#{flavor}.rb"
+        template_abs = File.join(self.class.source_root, template_rel)
+
+        unless File.exist?(template_abs)
+          say "Flavor template not found for '#{flavor}' at #{template_abs}.", :red
+          return
+        end
+
+        target_path = "config/initializers/ultimate_turbo_modal_#{flavor}.rb"
+        copy_file template_rel, target_path, force: true
+        say "Copied flavor initializer to #{target_path}.", :green
+      end
+
+      private
+
+      def detect_flavor
+        command = nil
+        if File.exist?(rails_root_join("bin", "rails"))
+          command = "#{rails_root_join("bin", "rails")} runner \"puts UltimateTurboModal.configuration.flavor\""
+        else
+          command = "bundle exec rails runner \"puts UltimateTurboModal.configuration.flavor\""
+        end
+
+        output = `#{command}`
+        flavor = output.to_s.strip
+        flavor.empty? ? nil : flavor
+      rescue StandardError => e
+        say "Error determining flavor via rails runner: #{e.message}", :red
+        nil
+      end
+
+      def rails_root_join(*args)
+        Pathname.new(destination_root).join(*args)
+      end
+    end
+  end
+end
+
+

data/lib/ultimate_turbo_modal/base.rb

@@ -55,7 +55,7 @@ class UltimateTurboModal::Base < Phlex::HTML
         modal(&block)
       end
     elsif turbo_stream?
-      Turbo::StreamsHelper.turbo_stream_action_tag("update", target: "modal") do
+      turbo_stream_action_tag("update", target: "modal") do
         modal(&block)
       end
     else
@@ -104,6 +104,15 @@ class UltimateTurboModal::Base < Phlex::HTML
     @advance_url || request&.original_url
   end
 
+  # Wraps yielded content in a Turbo Frame if the current request originated from a Turbo Frame
+  def maybe_turbo_frame(frame_id, &block)
+    if turbo_frame?
+      turbo_frame_tag(frame_id, &block)
+    else
+      yield
+    end
+  end
+
   def respond_to_missing?(method, include_private = false)
     self.class.included_modules.any? { |mod| mod.instance_methods.include?(method) } || super
   end
@@ -131,7 +140,7 @@ class UltimateTurboModal::Base < Phlex::HTML
   def outer_divs(&block)
     div_dialog do
       div_overlay
-      div_outer do
+      div_outer_dialog do
         div_inner(&block)
       end
     end
@@ -144,12 +153,6 @@ class UltimateTurboModal::Base < Phlex::HTML
       modal_advance_url_value: advance_url,
       modal_allowed_click_outside_selector_value: allowed_click_outside_selector,
       action: "turbo:submit-end->modal#submitEnd keyup@window->modal#closeWithKeyboard click@window->modal#outsideModalClicked click->modal#outsideModalClicked",
-      transition_enter: "ease-out duration-100",
-      transition_enter_start: "opacity-0",
-      transition_enter_end: "opacity-100",
-      transition_leave: "ease-in duration-50",
-      transition_leave_start: "opacity-100",
-      transition_leave_end: "opacity-0",
       padding: padding?.to_s,
       title: title?.to_s,
       header: header?.to_s,
@@ -163,7 +166,7 @@ class UltimateTurboModal::Base < Phlex::HTML
     end
 
     div(id: "modal-container",
-      class: self.class::DIV_DIALOG_CLASSES,
+      class: self.class::DIV_MODAL_CONTAINER_CLASSES,
       role: "dialog",
       aria: {
         modal: true,
@@ -173,20 +176,38 @@ class UltimateTurboModal::Base < Phlex::HTML
   end
 
   def div_overlay
-    div(id: "modal-overlay", class: self.class::DIV_OVERLAY_CLASSES)
+    div(id: "modal-overlay", class: self.class::DIV_OVERLAY_CLASSES, data: {
+      modal_target: "overlay",
+      transition_enter: self.class::TRANSITIONS[:overlay][:enter][:animation],
+      transition_enter_start: self.class::TRANSITIONS[:overlay][:enter][:start],
+      transition_enter_end: self.class::TRANSITIONS[:overlay][:enter][:end],
+      transition_leave: self.class::TRANSITIONS[:overlay][:leave][:animation],
+      transition_leave_start: self.class::TRANSITIONS[:overlay][:leave][:start],
+      transition_leave_end: self.class::TRANSITIONS[:overlay][:leave][:end]
+    })
   end
 
-  def div_outer(&block)
-    div(id: "modal-outer", class: self.class::DIV_OUTER_CLASSES, &block)
+  def div_outer_dialog(&block)
+    div(id: "modal-outer", class: self.class::DIV_DIALOG_CLASSES, data: {
+      modal_target: "outer",
+      transition_enter: self.class::TRANSITIONS[:dialog][:enter][:animation],
+      transition_enter_start: self.class::TRANSITIONS[:dialog][:enter][:start],
+      transition_enter_end: self.class::TRANSITIONS[:dialog][:enter][:end],
+      transition_leave: self.class::TRANSITIONS[:dialog][:leave][:animation],
+      transition_leave_start: self.class::TRANSITIONS[:dialog][:leave][:start],
+      transition_leave_end: self.class::TRANSITIONS[:dialog][:leave][:end]
+    }, &block)
   end
 
   def div_inner(&block)
-    div(id: "modal-inner", class: self.class::DIV_INNER_CLASSES, data: content_div_data, &block)
+    maybe_turbo_frame("modal-inner") do
+      div(id: "modal-inner", class: self.class::DIV_INNER_CLASSES, data: content_div_data, &block)
+    end
   end
 
   def div_content(&block)
     data = (content_div_data || {}).merge({modal_target: "content"})
-    div(id: "modal-content", class: self.class::DIV_CONTENT_CLASSES, data:, &block)
+    div(id: "modal-content", class: self.class::DIV_CONTENT_CLASSES, data: data, &block)
   end
 
   def div_main(&block)

data/lib/ultimate_turbo_modal.rb

@@ -5,7 +5,9 @@ require "phlex/deferred_render_with_main_content"
 require "ultimate_turbo_modal/configuration"
 require "ultimate_turbo_modal/railtie"
 require "ultimate_turbo_modal/base"
+require "generators/ultimate_turbo_modal/base"
 require "generators/ultimate_turbo_modal/install_generator"
+require "generators/ultimate_turbo_modal/update_generator"
 
 module UltimateTurboModal
   extend self

data/script/build_and_release.sh

@@ -23,14 +23,28 @@ if [ "$1" != "--skip-gem" ]; then
   echo "Building and releasing gem..."
   bundle exec rake build
 
-  # Check if Gemfile.lock is git dirty
-  if ! git diff --quiet Gemfile.lock; then
-    echo "Gemfile.lock is dirty. Adding, committing, and pushing."
-    git add Gemfile.lock
-    git commit -m "Update Gemfile.lock"
-    bundle exec rake build
+  # Update demo app with latest gem and JavaScript
+  echo "Updating demo app with latest code..."
+  SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+  DEMO_APP_DIR="$SCRIPT_DIR/../demo-app"
+
+  # Build JavaScript package first
+  echo "Building ultimate_turbo_modal JavaScript package..."
+  (cd "$SCRIPT_DIR/../javascript" && yarn build)
+
+  # Update demo app dependencies
+  echo "Installing latest ultimate_turbo_modal in demo app..."
+  (cd "$DEMO_APP_DIR" && bundle install)
+  (cd "$DEMO_APP_DIR" && yarn install --force)
+
+  # Check if Gemfile.lock or demo-app files are git dirty
+  if ! git diff --quiet Gemfile.lock demo-app/Gemfile.lock demo-app/yarn.lock; then
+    echo "Lock files are dirty. Adding, committing, and pushing."
+    git add Gemfile.lock demo-app/Gemfile.lock demo-app/yarn.lock
+    git commit -m "Update lock files for demo app"
   fi
 
+  bundle exec rake build
   bundle exec rake release
 else
   echo "Skipping gem build and release..."
@@ -45,4 +59,3 @@ else
 fi
 
 echo "Done!"
-