diff --git a/app/javascript/packs/alpine.js b/app/javascript/packs/alpine.js new file mode 100644 index 000000000..ad97b23a3 --- /dev/null +++ b/app/javascript/packs/alpine.js @@ -0,0 +1,6 @@ +import Alpine from 'alpinejs'; +import morph from '@alpinejs/morph'; + +window.Alpine = Alpine; +Alpine.plugin(morph); +Alpine.start(); diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js index b4e1cc6a0..0edbd8fb3 100644 --- a/app/javascript/packs/application.js +++ b/app/javascript/packs/application.js @@ -10,8 +10,6 @@ require('@rails/ujs').start(); require('hammerjs'); require('jquery-hotkeys'); import morphdom from 'morphdom'; -import Alpine from 'alpinejs'; -import morph from '@alpinejs/morph'; // should start looking for nodejs replacements importAll(require.context('../vendor', true, /\.js$/)); @@ -95,8 +93,4 @@ Danbooru.error = Utility.error; window.$ = jQuery; window.jQuery = jQuery; window.morphdom = morphdom; -window.Alpine = Alpine; window.Danbooru = Danbooru; - -Alpine.plugin(morph); -Alpine.start(); diff --git a/app/views/layouts/default.html.erb b/app/views/layouts/default.html.erb index 6b9e08b43..fe035f1fb 100644 --- a/app/views/layouts/default.html.erb +++ b/app/views/layouts/default.html.erb @@ -23,9 +23,9 @@ <%# XXX hack to only load Ruffle on Flash posts %> <% if controller_name == "posts" && action_name == "show" && @post&.is_flash? %> - <%= javascript_pack_tag "application", "flash", defer: false %> + <%= javascript_pack_tag "application", "alpine", "flash", defer: false %> <% else %> - <%= javascript_pack_tag "application", defer: false %> + <%= javascript_pack_tag "application", "alpine", defer: false %> <% end %> <%= stylesheet_pack_tag "application" %>