Merge pull request #2380 from tchak/explicit-jquery

Explicitly import jQuery

.eslintrc.js

@@ -5,7 +5,6 @@ module.exports = {
     sourceType: 'module'
   },
   globals: {
-    '$': true,
     'process': true
   },
   plugins: ['prettier'],

app/javascript/manager/fields/features.js

@@ -1,6 +1,5 @@
-// Administrate injects its own copy of jQuery, and it is the one
+// Administrate injects its own copy of jQuery
-// configured by rails to send csrf-token
+/* globals $ */
-const $ = window.$;
 
 $(document).on('change', '#features input[type=checkbox]', ({ target }) => {
   target = $(target);

app/javascript/new_design/avis.js

@@ -1,3 +1,5 @@
+import $ from 'jquery';
+
 export function toggleCondidentielExplanation() {
   $('.confidentiel-explanation').toggle();
 }

app/javascript/new_design/buttons.js

@@ -1,3 +1,5 @@
+import $ from 'jquery';
+
 $(document).on('click', 'body', () => {
   $('.button.dropdown').removeClass('open');
 });

app/javascript/new_design/carto.js

@@ -1,3 +1,4 @@
+import $ from 'jquery';
 import L from 'leaflet';
 
 import { getData } from '../shared/data';

app/javascript/new_design/champs/address.js

@@ -1,3 +1,4 @@
+import $ from 'jquery';
 import Bloodhound from 'bloodhound-js';
 
 const display = 'label';

app/javascript/new_design/champs/dossier-link.js

@@ -1,3 +1,5 @@
+import $ from 'jquery';
+
 function showNotFound() {
   $('.dossier-link .text-info').hide();
   $('.dossier-link .text-warning').show();

app/javascript/new_design/champs/multiple-drop-down-list.js

@@ -1,3 +1,5 @@
+import $ from 'jquery';
+
 addEventListener('turbolinks:load', () => {
   $('select.select2').select2({
     language: 'fr',

app/javascript/new_design/champs/siret.js

@@ -1,3 +1,5 @@
+import $ from 'jquery';
+
 addEventListener('turbolinks:load', () => {
   $('[data-siret]').on('input', evt => {
     const input = $(evt.target);

app/javascript/new_design/dossier.js

@@ -1,3 +1,5 @@
+import $ from 'jquery';
+
 $(document).on('click', 'body', () => {
   $('.print-menu').removeClass('open fade-in-down');
 });

app/javascript/new_design/form-validation.js

@@ -1,3 +1,5 @@
+import $ from 'jquery';
+
 $(document).on('blur keydown', 'input, textarea', () => {
   $(this).addClass('touched');
 });

app/javascript/new_design/header.js

@@ -1,3 +1,5 @@
+import $ from 'jquery';
+
 $(document).on('click', 'body', () => {
   $('.header-menu').removeClass('open fade-in-down');
 });

app/javascript/new_design/messagerie.js

@@ -1,3 +1,5 @@
+import $ from 'jquery';
+
 export function scrollMessagerie() {
   const $ul = $('.messagerie ul').first();
 

app/javascript/new_design/state-button.js

@@ -1,3 +1,5 @@
+import $ from 'jquery';
+
 export function showMotivation(state) {
   $(`.motivation.${state}`).show();
   $('.dropdown-items').hide();

app/javascript/new_design/toggle-chart.js

@@ -1,3 +1,4 @@
+import $ from 'jquery';
 import Chartkick from 'chartkick';
 
 export function toggleChart(event, chartClass) {

app/javascript/packs/application-old.js

@@ -31,5 +31,6 @@ if (process.env['RAILS_ENV'] === 'test') {
 window.Bloodhound = Bloodhound;
 window.Chartkick = Chartkick;
 // Export jQuery globally for legacy Javascript files used in the old design
+jQuery.rails = Rails;
 window.$ = jQuery;
 window.jQuery = jQuery;

app/javascript/shared/rails-ujs-fix.js

@@ -19,8 +19,8 @@ Rails.delegate(document, '[data-remote]', 'ajax:send', ({ target }) => {
 // jQuery-less version of rails-ujs it breaks.
 // https://github.com/Sology/smart_listing/blob/master/app/assets/javascripts/smart_listing.coffee.erb#L9
 addEventListener('load', () => {
-  const { href } = $.rails;
+  const { href } = Rails;
-  $.rails.href = function(element) {
+  Rails.href = function(element) {
     return element.href || href(element);
   };
 });

config/webpack/environment.js

@@ -1,9 +1,3 @@
 const { environment } = require('@rails/webpacker')
 
-const webpack = require('webpack');
-environment.plugins.append('Provide', new webpack.ProvidePlugin({
-  $: 'jquery',
-  jQuery: 'jquery'
-}));
-
 module.exports = environment