From 74206b285f350f023fa9c0a88b49f372ba9d193b Mon Sep 17 00:00:00 2001
From: Mitsuhiro Shibuya <mit.shibuya@gmail.com>
Date: Sun, 27 Feb 2022 15:11:55 +0900
Subject: [PATCH] Align asset filenames across all asset sources

While taking care of #3466 by moving custom stylesheets under vendor/
---
 .../{rails_admin/application.js => rails_admin.js}            | 0
 .../{rails_admin/application.scss => rails_admin.scss}        | 0
 app/views/layouts/rails_admin/_head.html.erb                  | 4 ++--
 lib/rails_admin/engine.rb                                     | 4 ++--
 .../assets/stylesheets/rails_admin/custom/mixins.scss         | 0
 .../assets/stylesheets/rails_admin/custom/theming.scss        | 0
 .../assets/stylesheets/rails_admin/custom/variables.scss      | 0
 7 files changed, 4 insertions(+), 4 deletions(-)
 rename app/assets/javascripts/{rails_admin/application.js => rails_admin.js} (100%)
 rename app/assets/stylesheets/{rails_admin/application.scss => rails_admin.scss} (100%)
 rename {app => vendor}/assets/stylesheets/rails_admin/custom/mixins.scss (100%)
 rename {app => vendor}/assets/stylesheets/rails_admin/custom/theming.scss (100%)
 rename {app => vendor}/assets/stylesheets/rails_admin/custom/variables.scss (100%)

diff --git a/app/assets/javascripts/rails_admin/application.js b/app/assets/javascripts/rails_admin.js
similarity index 100%
rename from app/assets/javascripts/rails_admin/application.js
rename to app/assets/javascripts/rails_admin.js
diff --git a/app/assets/stylesheets/rails_admin/application.scss b/app/assets/stylesheets/rails_admin.scss
similarity index 100%
rename from app/assets/stylesheets/rails_admin/application.scss
rename to app/assets/stylesheets/rails_admin.scss
diff --git a/app/views/layouts/rails_admin/_head.html.erb b/app/views/layouts/rails_admin/_head.html.erb
index 49f0751745..1f6af614ed 100644
--- a/app/views/layouts/rails_admin/_head.html.erb
+++ b/app/views/layouts/rails_admin/_head.html.erb
@@ -9,8 +9,8 @@
   <%= javascript_pack_tag "rails_admin", async: true %>
 <% when :webpack, :sprockets %>
   <% handle_asset_dependency_error do %>
-    <%= stylesheet_link_tag "rails_admin/application.css", media: :all %>
-    <%= javascript_include_tag "rails_admin/application.js", async: true %>
+    <%= stylesheet_link_tag "rails_admin.css", media: :all %>
+    <%= javascript_include_tag "rails_admin.js", async: true %>
   <% end %>
 <% else
      raise "Unknown asset_source: #{RailsAdmin::config.asset_source}"
diff --git a/lib/rails_admin/engine.rb b/lib/rails_admin/engine.rb
index ad21108036..976c68f889 100644
--- a/lib/rails_admin/engine.rb
+++ b/lib/rails_admin/engine.rb
@@ -13,8 +13,8 @@ class Engine < Rails::Engine
     initializer 'RailsAdmin precompile hook', group: :all do |app|
       if app.config.respond_to?(:assets)
         app.config.assets.precompile += %w[
-          rails_admin/application.js
-          rails_admin/application.css
+          rails_admin.js
+          rails_admin.css
         ]
         app.config.assets.paths << RailsAdmin::Engine.root.join('src')
         require 'rails_admin/support/esmodule_preprocessor'
diff --git a/app/assets/stylesheets/rails_admin/custom/mixins.scss b/vendor/assets/stylesheets/rails_admin/custom/mixins.scss
similarity index 100%
rename from app/assets/stylesheets/rails_admin/custom/mixins.scss
rename to vendor/assets/stylesheets/rails_admin/custom/mixins.scss
diff --git a/app/assets/stylesheets/rails_admin/custom/theming.scss b/vendor/assets/stylesheets/rails_admin/custom/theming.scss
similarity index 100%
rename from app/assets/stylesheets/rails_admin/custom/theming.scss
rename to vendor/assets/stylesheets/rails_admin/custom/theming.scss
diff --git a/app/assets/stylesheets/rails_admin/custom/variables.scss b/vendor/assets/stylesheets/rails_admin/custom/variables.scss
similarity index 100%
rename from app/assets/stylesheets/rails_admin/custom/variables.scss
rename to vendor/assets/stylesheets/rails_admin/custom/variables.scss