From 812c7bbb663c85aa56d23150609247c6a9bf062e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20H=C3=B8rl=C3=BCck=20Berg?=
 <36937807+henrikhorluck@users.noreply.github.com>
Date: Tue, 17 Oct 2023 01:23:11 +0200
Subject: [PATCH] We can't have nice things and bs3

The `$(this).tab('show');` in `assets/frontpage/initFrontpage.js` was
broken, since `.tab` was not defined. `.tab` is a bootstrap3-extension
to jQuery https://getbootstrap.com/docs/3.4/javascript/#tabs. To make
that extension method available you need to rely on the side-effects
of `import 'bootstrap'`, which only applies it to the _global_ $/jQuery.

When you `import $ from 'jquery'`, that creates a local and specifically
non-global `$`. Generally speaking you would then immediately set your
`$` to be the global `$` by using `globalThis.jQuery = globalThis.$ =
$`. We import and thus define the global `$` from a `<script>`-element
in the base HTML template, and thus this causes a "conflict" between the
esm/esbuild `$` and the already imported one.

In particular `import 'bootstrap'` only applies the extensions to the
global one. Ideally we would just get rid of this use of global
variables (and jQuery as a whole). For now just give up on attempting to
use jQuery from npm, and go back to jQuery 2.X from the Django template.

The strange thing here is probably rather that there were imports in the
webpack setup, since it was actually threated as a global variable, thus
the imports previously did "nothing".
---
 assets/article/archive/Article-archive.js      | 2 +-
 assets/article/archive/ArticleArchiveWidget.js | 2 +-
 assets/article/archive/TagCloud.js             | 2 +-
 assets/article/details/articleRelated.js       | 2 +-
 assets/authentication/login.js                 | 2 +-
 assets/common/utils/alert.js                   | 2 +-
 assets/common/utils/dom.js                     | 2 +-
 assets/common/utils/request.js                 | 2 +-
 assets/core/init.js                            | 2 +-
 assets/dashboard/approval/index.js             | 2 +-
 assets/dashboard/article/article.js            | 2 +-
 assets/dashboard/chunks/index.js               | 2 +-
 assets/dashboard/core/Gallery.js               | 2 +-
 assets/dashboard/core/GalleryCrop.js           | 2 +-
 assets/dashboard/core/GalleryUpload.js         | 2 +-
 assets/dashboard/core/dashboard.js             | 2 +-
 assets/dashboard/events/events.js              | 2 +-
 assets/dashboard/gallery/galleryDashboard.js   | 2 +-
 assets/dashboard/groups/group.js               | 2 +-
 assets/dashboard/inventory/Inventory.js        | 2 +-
 assets/dashboard/inventory/InventoryStats.js   | 2 +-
 assets/dashboard/marks/marks.js                | 2 +-
 assets/dashboard/photoalbum/index.js           | 2 +-
 assets/dashboard/posters/assignToJob.js        | 2 +-
 assets/dashboard/posters/index.js              | 2 +-
 assets/dashboard/webshop/Webshop.js            | 2 +-
 assets/dashboard/webshop/WebshopGallery.js     | 2 +-
 assets/dashboard/webshop/index.js              | 2 +-
 assets/events/archive/filters.js               | 2 +-
 assets/events/details/events.js                | 2 +-
 assets/feedback/answerRating.js                | 2 +-
 assets/feedback/feedbackResults.js             | 2 +-
 assets/frontpage/initFrontpage.js              | 2 +-
 assets/profiles/dependent_fields.js            | 2 +-
 assets/profiles/profiles.js                    | 2 +-
 assets/profiles/userSearch.js                  | 2 +-
 36 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/assets/article/archive/Article-archive.js b/assets/article/archive/Article-archive.js
index 907ea553a..312d40fc9 100644
--- a/assets/article/archive/Article-archive.js
+++ b/assets/article/archive/Article-archive.js
@@ -1,4 +1,4 @@
-import $ from 'jquery';
+/// import $ from 'jquery';
 import ArticleArchiveWidget from './ArticleArchiveWidget';
 
 let isLoadingNewContent = false; // Indicating if we are currently loading something
diff --git a/assets/article/archive/ArticleArchiveWidget.js b/assets/article/archive/ArticleArchiveWidget.js
index f3466dc9c..2585a3f92 100644
--- a/assets/article/archive/ArticleArchiveWidget.js
+++ b/assets/article/archive/ArticleArchiveWidget.js
@@ -1,5 +1,5 @@
 import moment from 'moment';
-import $ from 'jquery';
+// import $ from 'jquery';
 import { makeApiRequest } from 'common/utils';
 
 function ArticleArchiveWidget() {
diff --git a/assets/article/archive/TagCloud.js b/assets/article/archive/TagCloud.js
index 6723ddcbb..ec9aaf65b 100644
--- a/assets/article/archive/TagCloud.js
+++ b/assets/article/archive/TagCloud.js
@@ -1,4 +1,4 @@
-import $ from 'jquery';
+// import $ from 'jquery';
 
 $('div.tagcloud span').each(function tagCloud() {
   const max = $('div.tagcloud').data('max_frequency');
diff --git a/assets/article/details/articleRelated.js b/assets/article/details/articleRelated.js
index 318816cc7..09f361c11 100644
--- a/assets/article/details/articleRelated.js
+++ b/assets/article/details/articleRelated.js
@@ -1,4 +1,4 @@
-import $ from 'jquery';
+// import $ from 'jquery';
 
 const addRelatedArticles = (data) => {
   let output = '';
diff --git a/assets/authentication/login.js b/assets/authentication/login.js
index b9b14407c..2eb636c4e 100755
--- a/assets/authentication/login.js
+++ b/assets/authentication/login.js
@@ -1,4 +1,4 @@
-import $ from 'jquery';
+// import $ from 'jquery';
 
 export default () => {
   // Setting focus on either username or password if errortext is presented
diff --git a/assets/common/utils/alert.js b/assets/common/utils/alert.js
index eb378905e..6812679ad 100644
--- a/assets/common/utils/alert.js
+++ b/assets/common/utils/alert.js
@@ -1,4 +1,4 @@
-import $ from 'jquery';
+// import $ from 'jquery';
 
 // Fadeout alerts if they have the data-dismiss property
 export const timeOutAlerts = () => {
diff --git a/assets/common/utils/dom.js b/assets/common/utils/dom.js
index 7f30099b3..3bdca62b4 100644
--- a/assets/common/utils/dom.js
+++ b/assets/common/utils/dom.js
@@ -1,4 +1,4 @@
-import $ from 'jquery';
+// import $ from 'jquery';
 import { template } from 'underscore';
 import { cityFromZipCode } from './request';
 
diff --git a/assets/common/utils/request.js b/assets/common/utils/request.js
index 073fb1a64..4df4b667c 100644
--- a/assets/common/utils/request.js
+++ b/assets/common/utils/request.js
@@ -1,4 +1,4 @@
-import $ from 'jquery';
+// import $ from 'jquery';
 import Cookies from 'js-cookie';
 
 /**
diff --git a/assets/core/init.js b/assets/core/init.js
index 5557fb4d5..4cfe32b61 100755
--- a/assets/core/init.js
+++ b/assets/core/init.js
@@ -1,4 +1,4 @@
-import $ from 'jquery';
+// import $ from 'jquery';
 
 const addAnimation = () => {
   const svg = document.querySelectorAll('.mn-svg');
diff --git a/assets/dashboard/approval/index.js b/assets/dashboard/approval/index.js
index c38dd0cbc..b366cf2e8 100644
--- a/assets/dashboard/approval/index.js
+++ b/assets/dashboard/approval/index.js
@@ -1,4 +1,4 @@
-import $ from 'jquery';
+// import $ from 'jquery';
 import { showStatusMessage } from 'common/utils';
 import './less/approval.less';
 
diff --git a/assets/dashboard/article/article.js b/assets/dashboard/article/article.js
index 98fcbda17..0ba849c18 100644
--- a/assets/dashboard/article/article.js
+++ b/assets/dashboard/article/article.js
@@ -1,5 +1,5 @@
 import moment from 'moment';
-import jQuery from 'jquery';
+// import jQuery from 'jquery';
 import { ajax, showStatusMessage } from 'common/utils';
 /**
  * Created by myth on 10/18/15.
diff --git a/assets/dashboard/chunks/index.js b/assets/dashboard/chunks/index.js
index 28b463b99..c3ed29a46 100644
--- a/assets/dashboard/chunks/index.js
+++ b/assets/dashboard/chunks/index.js
@@ -1,5 +1,5 @@
 import showdown from 'showdown';
-import $ from 'jquery';
+// import $ from 'jquery';
 
 let sourceText = '';
 let previousSourceText;
diff --git a/assets/dashboard/core/Gallery.js b/assets/dashboard/core/Gallery.js
index 2cf4860d6..0735fd189 100644
--- a/assets/dashboard/core/Gallery.js
+++ b/assets/dashboard/core/Gallery.js
@@ -1,4 +1,4 @@
-import jQuery from 'jquery';
+// import jQuery from 'jquery';
 import MicroEvent from 'common/utils/MicroEvent';
 import { ajaxEnableCSRF, format, render } from 'common/utils';
 import moment from 'moment';
diff --git a/assets/dashboard/core/GalleryCrop.js b/assets/dashboard/core/GalleryCrop.js
index 38a0a0c4c..45d9ab88b 100644
--- a/assets/dashboard/core/GalleryCrop.js
+++ b/assets/dashboard/core/GalleryCrop.js
@@ -1,4 +1,4 @@
-import jQuery from 'jquery';
+// import jQuery from 'jquery';
 import Cropper from 'cropperjs';
 import 'cropperjs/dist/cropper.css';
 import { format, render } from 'common/utils';
diff --git a/assets/dashboard/core/GalleryUpload.js b/assets/dashboard/core/GalleryUpload.js
index 687881a9e..b8fedb1e6 100644
--- a/assets/dashboard/core/GalleryUpload.js
+++ b/assets/dashboard/core/GalleryUpload.js
@@ -1,4 +1,4 @@
-import jQuery from 'jquery';
+// import jQuery from 'jquery';
 import Dropzone from 'dropzone';
 import 'dropzone/dist/dropzone.css';
 import './less/dropzone.less';
diff --git a/assets/dashboard/core/dashboard.js b/assets/dashboard/core/dashboard.js
index 7f54e00a1..4d3338519 100644
--- a/assets/dashboard/core/dashboard.js
+++ b/assets/dashboard/core/dashboard.js
@@ -1,4 +1,4 @@
-import jQuery from 'jquery';
+// import jQuery from 'jquery';
 import 'common/datetimepicker';
 import 'common/tablesorter';
 import { ajaxEnableCSRF } from 'common/utils';
diff --git a/assets/dashboard/events/events.js b/assets/dashboard/events/events.js
index 0aea71ca1..511c0a8b8 100644
--- a/assets/dashboard/events/events.js
+++ b/assets/dashboard/events/events.js
@@ -1,4 +1,4 @@
-import jQuery from 'jquery';
+// import jQuery from 'jquery';
 import { plainUserTypeahead } from 'common/typeahead';
 import { ajax, showStatusMessage, toggleChecked } from 'common/utils';
 
diff --git a/assets/dashboard/gallery/galleryDashboard.js b/assets/dashboard/gallery/galleryDashboard.js
index 75567fc19..b579d8ac0 100644
--- a/assets/dashboard/gallery/galleryDashboard.js
+++ b/assets/dashboard/gallery/galleryDashboard.js
@@ -1,4 +1,4 @@
-import jQuery from 'jquery';
+// import jQuery from 'jquery';
 import moment from 'moment';
 import { ajax, showStatusMessage } from 'common/utils';
 
diff --git a/assets/dashboard/groups/group.js b/assets/dashboard/groups/group.js
index 5d57ae50d..afc843b5b 100644
--- a/assets/dashboard/groups/group.js
+++ b/assets/dashboard/groups/group.js
@@ -1,4 +1,4 @@
-import jQuery from 'jquery';
+// import jQuery from 'jquery';
 import { plainUserTypeahead } from 'common/typeahead';
 import { ajax, showStatusMessage } from 'common/utils';
 
diff --git a/assets/dashboard/inventory/Inventory.js b/assets/dashboard/inventory/Inventory.js
index 8226214d8..50c046a9e 100644
--- a/assets/dashboard/inventory/Inventory.js
+++ b/assets/dashboard/inventory/Inventory.js
@@ -1,4 +1,4 @@
-import jQuery from 'jquery';
+// import jQuery from 'jquery';
 import { ajax, showStatusMessage, toggleChecked } from 'common/utils';
 import './index.less';
 
diff --git a/assets/dashboard/inventory/InventoryStats.js b/assets/dashboard/inventory/InventoryStats.js
index 601b41e83..4518c5110 100644
--- a/assets/dashboard/inventory/InventoryStats.js
+++ b/assets/dashboard/inventory/InventoryStats.js
@@ -1,4 +1,4 @@
-import $ from 'jquery';
+// import $ from 'jquery';
 
 const google = window.google;
 
diff --git a/assets/dashboard/marks/marks.js b/assets/dashboard/marks/marks.js
index afd643243..b235b84ac 100644
--- a/assets/dashboard/marks/marks.js
+++ b/assets/dashboard/marks/marks.js
@@ -1,4 +1,4 @@
-import jQuery from 'jquery';
+// import jQuery from 'jquery';
 import { plainUserTypeahead } from 'common/typeahead';
 import { ajax, showStatusMessage } from 'common/utils';
 
diff --git a/assets/dashboard/photoalbum/index.js b/assets/dashboard/photoalbum/index.js
index beaf40fc1..316f17d5c 100644
--- a/assets/dashboard/photoalbum/index.js
+++ b/assets/dashboard/photoalbum/index.js
@@ -1,5 +1,5 @@
 import Urls from 'common/utils/django_reverse';
-import $ from 'jquery';
+// import $ from 'jquery';
 import { plainUserTypeahead } from 'common/typeahead';
 import Cookies from 'js-cookie';
 
diff --git a/assets/dashboard/posters/assignToJob.js b/assets/dashboard/posters/assignToJob.js
index a02173800..235f4e68d 100644
--- a/assets/dashboard/posters/assignToJob.js
+++ b/assets/dashboard/posters/assignToJob.js
@@ -1,4 +1,4 @@
-import $ from 'jquery';
+// import $ from 'jquery';
 import { setStatusMessage } from 'common/utils/';
 
 const assignToJob = (orderId, row) => {
diff --git a/assets/dashboard/posters/index.js b/assets/dashboard/posters/index.js
index 8219f8d21..0ce951e9c 100644
--- a/assets/dashboard/posters/index.js
+++ b/assets/dashboard/posters/index.js
@@ -1,4 +1,4 @@
-import $ from 'jquery';
+// import $ from 'jquery';
 import assignToJob from './assignToJob';
 import './less/posters.less';
 
diff --git a/assets/dashboard/webshop/Webshop.js b/assets/dashboard/webshop/Webshop.js
index f98afafda..5cbf08a08 100644
--- a/assets/dashboard/webshop/Webshop.js
+++ b/assets/dashboard/webshop/Webshop.js
@@ -1,4 +1,4 @@
-import $ from 'jquery';
+// import $ from 'jquery';
 
 const postDeleteForm = (url) => {
   $(`<form method="POST" action="${url}">` +
diff --git a/assets/dashboard/webshop/WebshopGallery.js b/assets/dashboard/webshop/WebshopGallery.js
index e024992ab..4dae0affa 100644
--- a/assets/dashboard/webshop/WebshopGallery.js
+++ b/assets/dashboard/webshop/WebshopGallery.js
@@ -1,4 +1,4 @@
-import jQuery from 'jquery';
+// import jQuery from 'jquery';
 
 const WebshopGallery = (function PrivateWebshopGallery($) {
   const images = [];
diff --git a/assets/dashboard/webshop/index.js b/assets/dashboard/webshop/index.js
index 3e1256926..2ba9c43a7 100644
--- a/assets/dashboard/webshop/index.js
+++ b/assets/dashboard/webshop/index.js
@@ -1,4 +1,4 @@
-import $ from 'jquery';
+// import $ from 'jquery';
 import Webshop from './Webshop';
 import WebshopGallery from './WebshopGallery';
 
diff --git a/assets/events/archive/filters.js b/assets/events/archive/filters.js
index 8948afd08..8c490c4f6 100644
--- a/assets/events/archive/filters.js
+++ b/assets/events/archive/filters.js
@@ -1,5 +1,5 @@
 import Urls from 'common/utils/django_reverse';
-import $ from 'jquery';
+// import $ from 'jquery';
 
 class Filters {
   constructor() {
diff --git a/assets/events/details/events.js b/assets/events/details/events.js
index d7cc919bc..85f97102f 100644
--- a/assets/events/details/events.js
+++ b/assets/events/details/events.js
@@ -1,4 +1,4 @@
-import $ from 'jquery';
+// import $ from 'jquery';
 import Cookies from 'js-cookie';
 import { makeApiRequest, showFlashMessage } from 'common/utils/';
 
diff --git a/assets/feedback/answerRating.js b/assets/feedback/answerRating.js
index 47e0147e1..fd798d5bd 100644
--- a/assets/feedback/answerRating.js
+++ b/assets/feedback/answerRating.js
@@ -1,4 +1,4 @@
-import $ from 'jquery';
+// import $ from 'jquery';
 import 'jquery-bar-rating';
 
 export default () => {
diff --git a/assets/feedback/feedbackResults.js b/assets/feedback/feedbackResults.js
index 3b6720d5f..20f363270 100644
--- a/assets/feedback/feedbackResults.js
+++ b/assets/feedback/feedbackResults.js
@@ -1,4 +1,4 @@
-import $ from 'jquery';
+// import $ from 'jquery';
 import 'common/jqplot';
 import { ajaxEnableCSRF, debouncedResize, setStatusMessage } from 'common/utils/';
 
diff --git a/assets/frontpage/initFrontpage.js b/assets/frontpage/initFrontpage.js
index f9fb91361..4dadfe706 100755
--- a/assets/frontpage/initFrontpage.js
+++ b/assets/frontpage/initFrontpage.js
@@ -1,4 +1,4 @@
-import $ from 'jquery';
+// // import $ from 'jquery';
 
 const TOP_OFFSET_ADJUST = 65;
 
diff --git a/assets/profiles/dependent_fields.js b/assets/profiles/dependent_fields.js
index f970db516..02ea714ac 100644
--- a/assets/profiles/dependent_fields.js
+++ b/assets/profiles/dependent_fields.js
@@ -1,4 +1,4 @@
-import $ from 'jquery';
+// import $ from 'jquery';
 
 export default () => {
   $('#social-membership-application').hide();
diff --git a/assets/profiles/profiles.js b/assets/profiles/profiles.js
index d04f46db9..d775e92a9 100755
--- a/assets/profiles/profiles.js
+++ b/assets/profiles/profiles.js
@@ -1,4 +1,4 @@
-import $ from 'jquery';
+// import $ from 'jquery';
 import { ajaxEnableCSRF, setStatusMessage } from 'common/utils/';
 
 ajaxEnableCSRF($);
diff --git a/assets/profiles/userSearch.js b/assets/profiles/userSearch.js
index 7bef9215c..1a0b430b3 100644
--- a/assets/profiles/userSearch.js
+++ b/assets/profiles/userSearch.js
@@ -1,4 +1,4 @@
-import $ from 'jquery';
+// import $ from 'jquery';
 import { userTypeahead } from 'common/typeahead';
 import Spinner from 'spin.js';
 import './less/typeahead.less';