Merge pull request #5944 from aignatov-bio/ai-test-jquery-pr

Movinf jQuery to asset pipeline

app/assets/javascripts/application.js.erb

@@ -11,6 +11,9 @@
 //= require_directory ./repository_columns/columns_initializers
 //= require datatables
 //= require jquery.dataTables.colResize
+//= require jquery.ui.touch-punch.min
+//= require jquery.caret.min
+//= require jquery.atwho.min
 //= require clndr.min
 //= require ajax-bootstrap-select.min
 //= require underscore

app/assets/javascripts/jquery_bundle.js

@@ -1,4 +1,2 @@
 
-//= require jquery.ui.touch-punch.min
+//= require jquery.min
-//= require jquery.caret.min
-//= require jquery.atwho.min

app/javascript/packs/application.js

@@ -1,5 +1,3 @@
-window.$ = window.jQuery = require('jquery');
-
 require('jquery-ujs');
 require('jquery-mousewheel');
 require('jquery-autosize');
@@ -10,7 +8,6 @@ require('jquery-ui/ui/widgets/draggable');
 require('jquery-ui/ui/widgets/droppable');
 require('jquery-ui/ui/effects/effect-slide');
 require('hammerjs');
-
 import 'bootstrap';
 window.moment = require('moment');
 require('bootstrap-select/js/bootstrap-select');
@@ -18,7 +15,6 @@ require('bootstrap-select/js/bootstrap-select');
 window.bwipjs = require('bwip-js');
 window.Decimal = require('decimal.js');
 
-
 $(document).on('click', '.sci--layout--menu-item[data-submenu=true]', (e) => {
   const item = $(e.currentTarget);
   const caret = item.find('.show-submenu');

app/views/layouts/application.html.erb

@@ -18,8 +18,9 @@
     <% if ::NewRelic::Agent.instance.started? %>
       <%= ::NewRelic::Agent.browser_timing_header(controller.request.content_security_policy_nonce) %>
     <% end %>
-    <%= javascript_include_tag 'application_pack', "data-turbolinks-track": :reload %>
     <%= javascript_include_tag 'jquery_bundle' %>
+    <%= javascript_include_tag 'application_pack' %>
+
     <%= javascript_include_tag 'application' %>
     <%= javascript_include_tag 'session_end' %>
     <%= javascript_include_tag 'sidebar_toggle' %>

config/webpack/webpack.config.js

@@ -86,6 +86,10 @@ module.exports = {
     sourceMapFilename: '[file].map',
     path: path.resolve(__dirname, '..', '..', 'app/assets/builds')
   },
+  externals: {
+    $: 'jquery',
+    jquery: 'jQuery'
+  },
   module: {
     rules: [
       {
@@ -118,10 +122,6 @@ module.exports = {
     new VueLoaderPlugin(),
     new RemoveEmptyScriptsPlugin(),
     new MiniCssExtractPlugin(),
-    new NodePolyfillPlugin(),
+    new NodePolyfillPlugin()
-    new webpack.ProvidePlugin({
-      $: 'jquery',
-      jQuery: 'jquery',
-    })
   ]
 };