rails_admin 3.3.1 → 4.0.0.beta

data/app/controllers/rails_admin/main_controller.rb

@@ -17,8 +17,8 @@ module RailsAdmin
       scope = model_config.scope
       auth_scope = @authorization_adapter&.query(auth_scope_key, model_config.abstract_model)
       scope = scope.merge(auth_scope) if auth_scope
-      scope = scope.instance_eval(&additional_scope) if additional_scope
-      get_collection(model_config, scope, pagination)
+      scope = get_collection(model_config, scope, pagination)
+      additional_scope ? scope.instance_eval(&additional_scope) : scope
     end
 
   private
@@ -72,7 +72,7 @@ module RailsAdmin
         if field.nil? || field.sortable == false # use default sort, asked field does not exist or is not sortable
           model_config.list.sort_by
         else
-          field.sort_column
+          field.sort_order
         end
 
       params[:sort_reverse] ||= 'false'
@@ -94,17 +94,6 @@ module RailsAdmin
       model_config.send(action).with(controller: self, view: view_context, object: @object).visible_fields
     end
 
-    # Memoized, as export renders through index, which switches @action
-    def serialization_schema
-      @serialization_schema ||= begin
-        section = %i[export show].include?(@action.key) ? @model_config.send(@action.key) : @model_config.list
-        RailsAdmin::SerializationSchema.new(
-          section.with(controller: self, view: view_context, object: @object || @abstract_model.model.new),
-          include_associations: @action.key == :export,
-        )
-      end
-    end
-
     def sanitize_params_for!(action, model_config = @model_config, target_params = params[@abstract_model.param_key])
       return unless target_params.present?
 

data/app/helpers/rails_admin/application_helper.rb

@@ -75,7 +75,7 @@ module RailsAdmin
         "admin.actions.#{action.i18n_key}.#{label}",
         model_label: model_config&.label,
         model_label_plural: model_config&.label_plural,
-        object_label: model_config && object.try(model_config.object_label_method),
+        object_label: object && model_config&.object_label(object),
       )
     end
 
@@ -147,7 +147,7 @@ module RailsAdmin
           content_tag(:li, class: ['breadcrumb-item', current_action?(a, am, o) && 'active']) do
             if current_action?(a, am, o)
               wording_for(:breadcrumb, a, am, o)
-            elsif a.http_methods.include?(:get)
+            elsif a.linkable?
               link_to rails_admin.url_for(action: a.action_name, controller: 'rails_admin/main', model_name: am.try(:to_param), id: (o.try(:persisted?) && o.try(:id) || nil)) do
                 wording_for(:breadcrumb, a, am, o)
               end
@@ -162,7 +162,7 @@ module RailsAdmin
     # parent => :root, :collection, :member
     # perf matters here (no action view trickery)
     def menu_for(parent, abstract_model = nil, object = nil, only_icon = false)
-      actions = actions(parent, abstract_model, object).select { |a| a.http_methods.include?(:get) && a.show_in_menu }
+      actions = actions(parent, abstract_model, object).select { |a| a.linkable? && a.show_in_menu }
       actions.collect do |action|
         wording = wording_for(:menu, action)
         li_class = ['nav-item', 'icon', "#{action.key}_#{parent}_link"].
@@ -209,18 +209,6 @@ module RailsAdmin
       end
     end
 
-    def handle_asset_dependency_error
-      yield
-    rescue LoadError => e
-      if /sassc/.match?(e.message)
-        e = e.exception <<~MSG
-          #{e.message}
-          RailsAdmin requires the gem sassc-rails, make sure to put `gem 'sassc-rails'` to Gemfile.
-        MSG
-      end
-      raise e
-    end
-
     # Workaround for https://github.com/rails/rails/issues/31325
     def image_tag(source, options = {})
       if %w[ActiveStorage::Variant ActiveStorage::VariantWithRecord ActiveStorage::Preview].include? source.class.to_s

data/app/helpers/rails_admin/form_builder.rb

@@ -84,7 +84,9 @@ module RailsAdmin
         if object.new_record?
           I18n.t('admin.form.new_model', name: model_label)
         else
-          object.send(model_config.object_label_method).presence || "#{model_config.label} ##{object.id}"
+          # A record whose label method has nothing to say is named after the
+          # model label here, where the rest of the admin uses the class name.
+          model_config.object_label(object, "#{model_label} ##{object.id}")
         end
 
       %(<span style="display:none" class="object-infos" data-model-label="#{model_label}" data-object-label="#{CGI.escapeHTML(object_label.to_s)}"></span>).html_safe
@@ -108,11 +110,9 @@ module RailsAdmin
     end
 
     def hidden_field(method, options = {})
-      if method == :id && object.id.is_a?(Array)
-        super method, {value: RailsAdmin.config.composite_keys_serializer.serialize(object.id)}
-      else
-        super
-      end
+      return super unless method == :id && object.id.is_a?(Array)
+
+      super method, {value: RailsAdmin.config(object.class).abstract_model.format_id(object.id)}
     end
 
   protected

data/app/views/layouts/rails_admin/_head.html.erb

@@ -1,32 +1,15 @@
 <meta content="IE=edge" http-equiv="X-UA-Compatible">
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
-<meta content="width=device-width, initial-scale=1" name="viewport; charset=utf-8">
+<meta content="width=device-width, initial-scale=1" name="viewport">
 <meta content="NONE,NOARCHIVE" name="robots">
 <meta content="false" name="turbo-prefetch">
 <%= csrf_meta_tag %>
-<% case RailsAdmin::config.asset_source
-   when :webpacker %>
-  <%= stylesheet_pack_tag "rails_admin", data: {'turbo-track': 'reload'} %>
-  <%= javascript_pack_tag "rails_admin", defer: true, data: {'turbo-track': 'reload'} %>
-<% when :sprockets %>
-  <% handle_asset_dependency_error do %>
-    <%= stylesheet_link_tag "rails_admin/application.css", media: :all, data: {'turbo-track': 'reload'} %>
-    <%= javascript_include_tag "rails_admin/application.js", defer: true, data: {'turbo-track': 'reload'} %>
-  <% end %>
-<% when :vite %>
-  <%= vite_javascript_tag "rails_admin", defer: true, data: {'turbo-track': 'reload'} %>
-<% when :webpack %>
-  <%= stylesheet_link_tag "rails_admin.css", media: :all, data: {'turbo-track': 'reload'} %>
-  <%= javascript_include_tag "rails_admin.js", defer: true, data: {'turbo-track': 'reload'} %>
-<% when :importmap %>
-  <%= stylesheet_link_tag "rails_admin.css", media: :all, data: {'turbo-track': 'reload'} %>
-  <%= javascript_inline_importmap_tag(RailsAdmin::Engine.importmap.to_json(resolver: self)) %>
-  <%= javascript_importmap_module_preload_tags(RailsAdmin::Engine.importmap) %>
-  <%= javascript_importmap_shim_nonce_configuration_tag if respond_to? :javascript_importmap_shim_nonce_configuration_tag %>
-  <%= javascript_importmap_shim_tag if respond_to? :javascript_importmap_shim_tag %>
-  <%= # Preload jQuery and make it global, unless jQuery UI fails to initialize
-      tag.script "import jQuery from 'jquery'; window.jQuery = jQuery;".html_safe, type: "module" %>
-  <%= javascript_import_module_tag 'rails_admin' %>
-<% else
-     raise "Unknown asset_source: #{RailsAdmin::config.asset_source}"
-   end %>
+<%= csp_meta_tag %>
+<% asset_source = RailsAdmin.config.asset_source %>
+<% if asset_source.respond_to?(:call) %>
+  <%= asset_source.call(self) %>
+<% else %>
+  <%= stylesheet_link_tag "rails_admin", media: :all, data: {'turbo-track': 'reload'}, nonce: true %>
+  <%= javascript_include_tag "rails_admin", defer: true, data: {'turbo-track': 'reload'}, nonce: true %>
+<% end %>
+<%= render "layouts/rails_admin/head_custom" %>

data/app/views/layouts/rails_admin/_head_custom.html.erb

@@ -0,0 +1,3 @@
+<%# Override this partial in your application to add your own <link>/<script>
+    tags (or inline styles/scripts) to the RailsAdmin <head>. It is rendered
+    right after the bundled RailsAdmin assets, regardless of asset_source. %>

data/app/views/layouts/rails_admin/_secondary_navigation.html.erb

@@ -17,7 +17,7 @@
     <% end %>
     <% if logout_path.present? %>
       <li class="nav-item">
-        <%= link_to logout_path, method: logout_method, class: 'nav-link', data: {turbo: 'false'} do %>
+        <%= link_to logout_path, class: 'nav-link', data: {turbo_method: logout_method} do %>
           <span class="badge bg-danger"><%= t('admin.misc.log_out') %></span>
         <% end %>
       </li>

data/app/views/rails_admin/main/_dashboard_history.html.erb

@@ -20,7 +20,7 @@
           <%= t.try :username %>
         </td>
         <% if o = abstract_model.try(:get, t.item) %>
-          <% label = o.send(abstract_model.config.object_label_method) %>
+          <% label = abstract_model.config.object_label(o) %>
           <% if show_action = action(:show, abstract_model, o) %>
             <td>
               <%= link_to(label, url_for(action: show_action.action_name, model_name: abstract_model.to_param, id: o.id)) %>

data/app/views/rails_admin/main/_delete_notice.html.erb

@@ -3,7 +3,7 @@
   <span class="label label-default">
     <%= @abstract_model.pretty_name %>
   </span>
-  <% wording = object.send(@model_config.object_label_method) %>
+  <% wording = @model_config.object_label(object) %>
   <% if show_action = action(:show, @abstract_model, object) %>
     <%= link_to(wording, url_for(action: show_action.action_name, model_name: @abstract_model.to_param, id: object.id)) %>
   <% else %>
@@ -11,13 +11,13 @@
   <% end %>
   <ul>
     <% @abstract_model.each_associated_children(object) do |association, children| %>
-      <% humanized_association = @abstract_model.model.human_attribute_name association.name %>
+      <% humanized_association = @abstract_model.human_attribute_name association.name %>
       <% limit = children.count > 12 ? 10 : children.count %>
       <% children.first(limit).each do |child| %>
         <%= content_tag :li, class: dom_class(child) do %>
           <% child_config = RailsAdmin.config(child) %>
           <%= humanized_association.singularize %>
-          <% wording = child.send(child_config.object_label_method) %>
+          <% wording = child_config.object_label(child) %>
           <% if child.id && (show_action = action(:show, child_config.abstract_model, child)) %>
             <%= link_to(wording, url_for(action: show_action.action_name, model_name: child_config.abstract_model.to_param, id: child.id)) %>
           <% else %>

data/app/views/rails_admin/main/_form_boolean.html.erb

@@ -1,14 +1,10 @@
-<% if field.nullable? %>
-  <div class="btn-group" role="group">
-    <% {'1': [true, 'btn-outline-success'], '0': [false, 'btn-outline-danger'], '': [nil, 'btn-outline-secondary']}.each do |text, (value, btn_class)| %>
-      <%= form.radio_button field.method_name, text, field.html_attributes.reverse_merge({ checked: field.form_value == value, required: field.required, class: 'btn-check' }) %>
-      <%= form.label "#{field.method_name}_#{text}", class: "#{field.css_classes[value]} btn #{btn_class}" do %>
-        <%= field.labels[value].html_safe %>
-      <% end %>
+<% cases = {'1': [true, 'btn-outline-success'], '0': [false, 'btn-outline-danger']} %>
+<% cases[:''] = [nil, 'btn-outline-secondary'] if field.nullable? %>
+<div class="btn-group" role="group">
+  <% cases.each do |text, (value, btn_class)| %>
+    <%= form.radio_button field.method_name, text, field.html_attributes.reverse_merge({ checked: field.form_value == value, required: field.required, class: 'btn-check' }) %>
+    <%= form.label "#{field.method_name}_#{text}", class: "#{field.css_classes[value]} btn #{btn_class}" do %>
+      <%= field.labels[value].html_safe %>
     <% end %>
-  </div>
-<% else %>
-  <div class="col-form-label">
-    <%= form.send field.view_helper, field.method_name, field.html_attributes.reverse_merge({ value: field.form_value, checked: field.form_value.in?([true, '1']), required: field.required, class: 'form-check-input' }) %>
-  </div>
-<% end %>
+  <% end %>
+</div>

data/app/views/rails_admin/main/_submit_buttons.html.erb

@@ -1,22 +1,22 @@
 <div class="form-actions row justify-content-end my-3">
   <div class="col-sm-10">
     <input name="return_to" type="<%= :hidden %>" value="<%= (params[:return_to].presence || request.referer) %>" />
-    <button class="btn btn-primary" data-disable-with="<%= t("admin.form.save") %>" name="_save" type="submit"<%= ' disabled' unless @action.enabled? %>>
+    <button class="btn btn-primary" data-turbo-submits-with="<%= t("admin.form.save") %>" name="_save" type="submit"<%= ' disabled' unless @action.enabled? %>>
       <i class="fas fa-check"></i>
       <%= t("admin.form.save") %>
     </button>
     <span class="extra_buttons">
       <% if @action.enabled? && authorized?(:new, @abstract_model) %>
-        <button class="btn btn-info" data-disable-with="<%= t("admin.form.save_and_add_another") %>" name="_add_another" type="submit">
+        <button class="btn btn-info" data-turbo-submits-with="<%= t("admin.form.save_and_add_another") %>" name="_add_another" type="submit">
           <%= t("admin.form.save_and_add_another") %>
         </button>
       <% end %>
       <% if @action.enabled? && authorized?(:edit, @abstract_model) %>
-        <button class="btn btn-info" data-disable-with="<%= t("admin.form.save_and_edit") %>" name="_add_edit" type="submit"<%= ' disabled' unless @action.enabled? %>>
+        <button class="btn btn-info" data-turbo-submits-with="<%= t("admin.form.save_and_edit") %>" name="_add_edit" type="submit"<%= ' disabled' unless @action.enabled? %>>
           <%= t("admin.form.save_and_edit") %>
         </button>
       <% end %>
-      <button class="btn btn-light" data-disable-with="<%= t("admin.form.cancel") %>" formnovalidate="<%= true %>" name="_continue" type="submit">
+      <button class="btn btn-light" data-turbo-submits-with="<%= t("admin.form.cancel") %>" formnovalidate="<%= true %>" name="_continue" type="submit">
         <i class="fas fa-times"></i>
         <%= t("admin.form.cancel") %>
       </button>

data/app/views/rails_admin/main/bulk_delete.html.erb

@@ -7,11 +7,11 @@
 <%= form_tag bulk_delete_path(model_name: @abstract_model.to_param, bulk_ids: @objects.map(&:id)), method: :delete do %>
   <div class="form-actions">
     <input name="return_to" type="<%= :hidden %>" value="<%= (params[:return_to].presence || request.referer) %>" />
-    <button class="btn btn-danger" data-disable-with="<%= t("admin.form.confirmation") %>" type="submit">
+    <button class="btn btn-danger" data-turbo-submits-with="<%= t("admin.form.confirmation") %>" type="submit">
       <i class="fas fa-check"></i>
       <%= t("admin.form.confirmation") %>
     </button>
-    <button class="btn" data-disable-with="<%= t("admin.form.cancel") %>" name="_continue" type="submit">
+    <button class="btn" data-turbo-submits-with="<%= t("admin.form.cancel") %>" name="_continue" type="submit">
       <i class="fas fa-times"></i>
       <%= t("admin.form.cancel") %>
     </button>

data/app/views/rails_admin/main/dashboard.html.erb

@@ -20,7 +20,7 @@
           <% index_path = index_path(model_name: abstract_model.to_param) %>
           <% row_class = "#{cycle("odd", "even")}#{" link" if index_path} #{abstract_model.param_key}_links" %>
           <tr class="<%= row_class %>" data-link="<%= index_path %>">
-            <% last_created = @most_recent_created[abstract_model.model.name] %>
+            <% last_created = @most_recent_created[abstract_model.model_name] %>
             <% active = last_created.try(:today?) %>
             <td>
               <span class="show">
@@ -33,11 +33,11 @@
               <% end %>
             </td>
             <td>
-              <% count = @count[abstract_model.model.name] %>
+              <% count = @count[abstract_model.model_name] %>
               <% percent = count > 0 ? (@max <= 1 ? count : ((Math.log(count+1) * 100.0) / Math.log(@max+1)).to_i) : -1 %>
               <div class="<%= active ? 'active progress-bar-striped ' : '' %>progress" style="margin-bottom:0px">
                 <div class="bg-<%= get_indicator(percent) %> progress-bar animate-width-to" data-animate-length="<%= ([1.0, percent].max.to_i * 20) %>" data-animate-width-to="<%= [2.0, percent].max.to_i %>%" style="width:2%">
-                  <%= @count[abstract_model.model.name] %>
+                  <%= @count[abstract_model.model_name] %>
                 </div>
               </div>
             </td>

data/app/views/rails_admin/main/delete.html.erb

@@ -9,11 +9,11 @@
 <%= form_for(@object, url: delete_path(model_name: @abstract_model.to_param, id: @object.id), html: {method: "delete"}) do %>
   <input name="return_to" type="<%= :hidden %>" value="<%= (params[:return_to].presence || request.referer) %>" />
   <div class="form-actions">
-    <button class="btn btn-danger" data-disable-with="<%= t("admin.form.confirmation") %>" type="submit">
+    <button class="btn btn-danger" data-turbo-submits-with="<%= t("admin.form.confirmation") %>" type="submit">
       <i class="fas fa-check"></i>
       <%= t("admin.form.confirmation") %>
     </button>
-    <button class="btn" data-disable-with="<%= t("admin.form.cancel") %>" name="_continue" type="submit">
+    <button class="btn" data-turbo-submits-with="<%= t("admin.form.cancel") %>" name="_continue" type="submit">
       <i class="fas fa-times"></i>
       <%= t("admin.form.cancel") %>
     </button>

data/app/views/rails_admin/main/export.html.erb

@@ -1,5 +1,5 @@
 <% params = request.params.except(:action, :controller, :utf8, :page, :per_page, :format, :authenticity_token) %>
-<% visible_fields = @model_config.export.with(view: self, object: @abstract_model.model.new, controller: self.controller).visible_fields %>
+<% visible_fields = @model_config.export.with(view: self, object: @abstract_model.dummy_record, controller: self.controller).visible_fields %>
 <%= form_tag export_path(params.merge(all: true)), method: 'post', class: "main", data: {turbo: false} do %>
   <input name="send_data" type="hidden" value="true" />
   <fieldset id="fields_to_export" class="mb-3">
@@ -54,7 +54,7 @@
       </div>
     </div>
     <% visible_fields.select{ |f| f.association? && !f.association.polymorphic? }.each do |field| %>
-      <% fields = field.associated_model_config.export.with(controller: self.controller, view: self, object: (associated_model = field.associated_model_config.abstract_model.model).new).visible_fields.select{ |f| !f.association? } %>
+      <% fields = field.associated_model_config.export.with(controller: self.controller, view: self, object: field.associated_model_config.abstract_model.dummy_record).visible_fields.select{ |f| !f.association? } %>
       <div class="control-group row">
         <div class="col-sm-12">
           <div class="card bg-light my-2 reverse-selection" rel="tooltip" role="button" title="<%= t('admin.export.click_to_reverse_selection') %>">

data/app/views/rails_admin/main/history.html.erb

@@ -10,7 +10,7 @@
       <div class="col-sm-6">
         <div class="input-group">
           <input class="form-control" name="query" placeholder="<%= t("admin.misc.filter") %>" type="search" value="<%= query %>" />
-          <button class="btn btn-primary" data-disable-with="<%= '<i class="fas fa-sync"></i> ' + t('admin.misc.refresh') %>" type="submit">
+          <button class="btn btn-primary" data-turbo-submits-with="<%= '<i class="fas fa-sync"></i> ' + t('admin.misc.refresh') %>" type="submit">
             <i class="fas fa-sync"></i>
             <%= t("admin.misc.refresh") %>
           </button>
@@ -51,7 +51,7 @@
         </td>
         <% if @general %>
           <% if o = @abstract_model.get(object.item) %>
-            <% label = o.send(@abstract_model.config.object_label_method) %>
+            <% label = @abstract_model.config.object_label(o) %>
             <% if show_action = action(:show, @abstract_model, o) %>
               <td>
                 <%= link_to(label, url_for(action: show_action.action_name, model_name: @abstract_model.to_param, id: o.id)) %>

data/app/views/rails_admin/main/index.html.erb

@@ -9,7 +9,7 @@
   export_action = RailsAdmin::Config::Actions.find(:export, { controller: self.controller, abstract_model: @abstract_model })
   export_action = nil unless export_action && authorized?(export_action.authorization_key, @abstract_model)
   description = RailsAdmin.config(@abstract_model.model_name).description
-  properties = @model_config.list.with(controller: self.controller, view: self, object: @abstract_model.model.new).fields_for_table
+  properties = @model_config.list.with(controller: self.controller, view: self, object: @abstract_model.dummy_record).fields_for_table
   checkboxes = @model_config.list.checkboxes?
   table_table_header_count = begin
     count = checkboxes ? 1 : 0
@@ -44,7 +44,7 @@
   <% end %>
 <% end %>
 
-<style>
+<style nonce="<%= content_security_policy_nonce %>">
   <% properties.select{ |p| p.column_width.present? }.each do |property| %>
     <%= "#list th.#{property.css_class} { width: #{property.column_width}px; min-width: #{property.column_width}px; }" %>
     <%= "#list td.#{property.css_class} { max-width: #{property.column_width}px;}" %>
@@ -60,7 +60,7 @@
         <div class="col-sm-6">
           <div class="input-group">
             <input class="form-control" name="query" placeholder="<%= t("admin.misc.filter") %>" type="search" value="<%= query %>" />
-            <button class="btn btn-primary" data-disable-with="<%= '<i class="fas fa-sync"></i>' + t('admin.misc.refresh') %>" type="submit">
+            <button class="btn btn-primary" data-turbo-submits-with="<%= '<i class="fas fa-sync"></i>' + t('admin.misc.refresh') %>" type="submit">
               <i class="fas fa-sync"></i>
               <%= t('admin.misc.refresh') %>
             </button>

data/config/initializers/active_record_extensions.rb

@@ -7,11 +7,8 @@ ActiveSupport.on_load(:active_record) do
         RailsAdmin.config(self, &block)
       end
 
-      def rails_admin_default_object_label_method
-        new_record? ? "new #{self.class}" : "#{self.class} ##{id}"
-      end
-
       def safe_send(value)
+        RailsAdmin.deprecator.warn('#safe_send is deprecated, please use RailsAdmin::AbstractModel#read.')
         if has_attribute?(value)
           read_attribute(value)
         else

data/lib/generators/rails_admin/install_generator.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'rails/generators'
-require 'rails_admin/version'
 require File.expand_path('utils', __dir__)
 
 module RailsAdmin
@@ -10,7 +9,7 @@ module RailsAdmin
     include Generators::Utils::InstanceMethods
 
     argument :_namespace, type: :string, required: false, desc: 'RailsAdmin url namespace'
-    class_option :asset, type: :string, required: false, default: nil, desc: 'Asset delivery method [options: webpacker, webpack, sprockets, importmap, vite]'
+    class_option :asset, type: :string, required: false, default: nil, desc: 'Asset delivery method [options: propshaft, sprockets, external]'
     desc 'RailsAdmin installation generator'
 
     def install
@@ -27,116 +26,62 @@ module RailsAdmin
       end
       display "Using [#{asset}] for asset delivery method"
       case asset
-      when 'webpack'
-        configure_for_webpack
-      when 'importmap'
-        configure_for_importmap
-      when 'webpacker'
-        configure_for_webpacker5
-      when 'vite'
-        configure_for_vite
-      when 'sprockets'
-        configure_for_sprockets
+      when 'sprockets', 'propshaft'
+        # RailsAdmin serves the bundle shipped in the gem; nothing to configure.
+      when 'external'
+        configure_for_external
       else
-        raise "Unknown asset source: #{asset}"
+        raise "Unknown asset source: #{asset.inspect}. Use propshaft, sprockets or external."
       end
     end
 
   private
 
     def asset
-      return options['asset'] if options['asset']
+      @asset ||= normalize_asset(options['asset'] || detect_asset)
+    end
 
-      if defined?(Webpacker)
-        'webpacker'
-      elsif Rails.root.join('webpack.config.js').exist?
-        'webpack'
-      elsif Rails.root.join('config/importmap.rb').exist?
-        'importmap'
-      elsif defined?(ViteRuby)
-        'vite'
+    def normalize_asset(value)
+      case value.to_s
+      when 'webpack', 'vite', 'shakapacker', 'jsbundling', 'cssbundling'
+        display "[#{value}] builds its own assets; configuring :external", :yellow
+        'external'
+      when 'webpacker', 'importmap'
+        display "[#{value}] is no longer supported; RailsAdmin ships a prebuilt bundle", :yellow
+        detect_asset
       else
-        'sprockets'
+        value.to_s
       end
     end
 
-    def configure_for_sprockets
-      gem 'sassc-rails'
-    end
-
-    def configure_for_webpacker5
-      run "yarn add rails_admin@#{RailsAdmin::Version.js}"
-      template 'rails_admin.webpacker.js', 'app/javascript/packs/rails_admin.js'
-      template 'rails_admin.scss.erb', 'app/javascript/stylesheets/rails_admin.scss'
-      # To work around https://github.com/railsadminteam/rails_admin/issues/3565
-      add_package_json_field('resolutions', {'rails_admin/@fortawesome/fontawesome-free' => '^5.15.0'})
-    end
-
-    def configure_for_vite
-      vite_source_code_dir = ViteRuby.config.source_code_dir
-      run "yarn add rails_admin@#{RailsAdmin::Version.js} sass"
-      template('rails_admin.vite.js', File.join(vite_source_code_dir, 'entrypoints', 'rails_admin.js'))
-      @fa_font_path = '@fortawesome/fontawesome-free/webfonts'
-      template('rails_admin.scss.erb', File.join(vite_source_code_dir, 'stylesheets', 'rails_admin.scss'))
-    end
-
-    def configure_for_webpack
-      run "yarn add rails_admin@#{RailsAdmin::Version.js}"
-      template 'rails_admin.js', 'app/javascript/rails_admin.js'
-      webpack_config = File.join(destination_root, 'webpack.config.js')
-      marker = %r{application: ["']./app/javascript/application.js["']}
-      if File.exist?(webpack_config) && File.read(webpack_config) =~ marker
-        insert_into_file 'webpack.config.js', %(,\n    rails_admin: "./app/javascript/rails_admin.js"), after: marker
+    def detect_asset
+      if defined?(Propshaft)
+        'propshaft'
+      elsif Rails.root.join('webpack.config.js').exist? || defined?(ViteRuby)
+        'external'
       else
-        say 'Add `rails_admin: "./app/javascript/rails_admin.js"` to the entry section in your webpack.config.js.', :red
+        'sprockets'
       end
-      setup_css({'build' => 'webpack --config webpack.config.js'})
     end
 
-    def configure_for_importmap
-      run "yarn add rails_admin@#{RailsAdmin::Version.js}"
+    def configure_for_external
       template 'rails_admin.js', 'app/javascript/rails_admin.js'
-      require_relative 'importmap_formatter'
-      add_file 'config/importmap.rails_admin.rb', ImportmapFormatter.new.format
-      setup_css
-    end
+      @fa_font_path = 'rails_admin'
+      # Not app/javascript: jsbundling builds that whole directory as JavaScript.
+      template 'rails_admin.scss.erb', 'app/assets/stylesheets/rails_admin.scss'
+      say <<~INSTRUCTIONS, :yellow
+        Add the `rails_admin` npm package, then wire the two entrypoints into the
+        build scripts your bundler runs, so they output app/assets/builds/rails_admin.js
+        and app/assets/builds/rails_admin.css. Going through the scripts matters:
+        that is what `rails assets:precompile` runs on deploy.
 
-    def setup_css(additional_script_entries = {})
-      gem 'cssbundling-rails'
-      rake 'css:install:sass'
+        With the esbuild and sass setup jsbundling-rails and cssbundling-rails
+        generate, app/javascript/rails_admin.js is already covered by the "build"
+        script's app/javascript/*.* glob, and the stylesheet needs one more pair in
+        "build:css" - adapt it if you build your CSS some other way:
 
-      @fa_font_path = '.'
-      template 'rails_admin.scss.erb', 'app/assets/stylesheets/rails_admin.scss'
-      asset_config = %{Rails.application.config.assets.paths << Rails.root.join("node_modules/@fortawesome/fontawesome-free/webfonts")\n}
-      if File.exist? File.join(destination_root, 'config/initializers/assets.rb')
-        append_to_file 'config/initializers/assets.rb', asset_config
-      else
-        add_file 'config/initializers/assets.rb', asset_config
-      end
-      add_package_json_field('scripts', additional_script_entries.merge({'build:css' => 'sass ./app/assets/stylesheets/rails_admin.scss:./app/assets/builds/rails_admin.css --no-source-map --load-path=node_modules'}), <<~INSTRUCTION)
-        Taking 'build:css' as an example, if you're already have application.sass.css for the sass build, the resulting script would look like:
           sass ./app/assets/stylesheets/application.sass.scss:./app/assets/builds/application.css ./app/assets/stylesheets/rails_admin.scss:./app/assets/builds/rails_admin.css --no-source-map --load-path=node_modules
-      INSTRUCTION
-    end
-
-    def add_package_json_field(name, entries, instruction = nil)
-      display "Add #{name} to package.json"
-      package = begin
-        JSON.parse(File.read(File.join(destination_root, 'package.json')))
-      rescue Errno::ENOENT, JSON::ParserError
-        {}
-      end
-      if package[name] && (package[name].keys & entries.keys).any?
-        say <<~MESSAGE, :red
-          You need to merge "#{name}": #{JSON.pretty_generate(entries)} into the existing #{name} in your package.json.#{instruction && "\n#{instruction}"}
-        MESSAGE
-      else
-        package[name] ||= {}
-        entries.each do |entry, value|
-          package[name][entry] = value
-        end
-        add_file 'package.json', "#{JSON.pretty_generate(package)}\n"
-      end
+      INSTRUCTIONS
     end
   end
 end

data/lib/generators/rails_admin/templates/rails_admin.scss.erb

@@ -1 +1 @@
-<%= @fa_font_path ? %{$fa-font-path: "#{@fa_font_path}";\n} : '' %>@import "rails_admin/src/rails_admin/styles/base";
+<%= @fa_font_path ? %($fa-font-path: "#{@fa_font_path}";\n) : '' %>@import "rails_admin/src/rails_admin/styles/base";