8000 make sure that our configuration is an ES module · activeadmin/activeadmin@28d68a6 · GitHub
[go: up one dir, main page]

Skip to content

Commit 28d68a6

Browse files
committed
make sure that our configuration is an ES module
1 parent c7620f8 commit 28d68a6

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

lib/generators/active_admin/assets/assets_generator.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ def install_assets
88
remove_file "app/assets/stylesheets/active_admin.scss"
99
remove_file "app/assets/javascripts/active_admin.js"
1010
template "active_admin.css", "app/assets/stylesheets/active_admin.css"
11-
template "tailwind.config.js", "tailwind-active_admin.config.js"
11+
template "tailwind.config.js", "tailwind-active_admin.config.mjs"
1212
end
1313
end
1414
end
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
@import "tailwindcss";
22

33
/* FIXME: convert this into CSS */
4-
@config "../../../tailwind-active_admin.config.js";
4+
@config "../../../tailwind-active_admin.config.mjs";

spec/support/rails_template.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,10 @@ def self.ransackable_associations(auth_object=nil)
9898
# Setup Active Admin
9999
generate "active_admin:install"
100100

101-
gsub_file "tailwind-active_admin.config.js", /^.*const activeAdminPath.*$/, <<~JS
101+
gsub_file "tailwind-active_admin.config.mjs", /^.*const activeAdminPath.*$/, <<~JS
102102
const activeAdminPath = '../../../';
103103
JS
104-
gsub_file "tailwind-active_admin.config.js", Regexp.new("@activeadmin/activeadmin/plugin"), "../../../plugin"
104+
gsub_file "tailwind-active_admin.config.mjs", Regexp.new("@activeadmin/activeadmin/plugin"), "../../../plugin"
105105

106106
# Force strong parameters to raise exceptions
107107
inject_into_file "config/application.rb", after: "class Application < Rails::Application" do

0 commit comments

Comments
 (0)
0