diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index bdd0b785fa..9d048c361d 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -10,4 +10,6 @@ // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details // about supported directives. // +//= require rails-ujs +//= require jquery2 //= require enju_leaf diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js index 7a3bd8080c..57e142aaee 100644 --- a/app/javascript/packs/application.js +++ b/app/javascript/packs/application.js @@ -17,13 +17,4 @@ //console.log('Hello World from Webpacker') -import Rails from "@rails/ujs" -import * as ActiveStorage from "@rails/activestorage" import "channels" -import "jquery" -import $ from 'jquery' -global.$ = $ -global.jQuery = $ - -Rails.start() -ActiveStorage.start() diff --git a/app/views/page/_include.html.erb b/app/views/page/_include.html.erb index 69a54f052a..833c863220 100644 --- a/app/views/page/_include.html.erb +++ b/app/views/page/_include.html.erb @@ -1,7 +1,7 @@ <%= stylesheet_link_tag 'application' %> <%= stylesheet_link_tag 'print', media: :print %> -<%= javascript_pack_tag 'application' %> <%= javascript_include_tag 'application' %> +<%= javascript_pack_tag 'application' %> <%= csrf_meta_tag %>