Go crazy and try bumping jquery and select2

Full yolo here.

admin/package.json

@@ -14,13 +14,8 @@
     "bikram-sambat-bootstrap": "^1.6.0",
     "bootstrap": "^3.4.1",
     "font-awesome": "^4.7.0",
-    "jquery": "^3.6.3",
     "ng-redux": "^4.4.5",
-    "redux": "^4.2.1",
-    "select2": "^4.0.13"
-  },
-  "resolutions": {
-    "**/jquery": "3.2.x"
+    "redux": "^4.2.1"
   },
   "devDependencies": {
     "angular-jsdoc": "^1.5.1",

admin/src/css/main.less

@@ -1,5 +1,5 @@
 @import "admin/node_modules/bootstrap/less/bootstrap";
-@import (inline) "admin/node_modules/select2/dist/css/select2.css";
+@import (inline) "node_modules/select2/dist/css/select2.css";
 @import "admin/node_modules/font-awesome/less/font-awesome";
 @import "webapp/src/css/variables";
 @import "webapp/src/css/font";

admin/src/js/main.js

@@ -1,6 +1,6 @@
 window.PouchDB = require('pouchdb-browser');
 window.$ = window.jQuery = require('jquery');
-require('../../node_modules/select2/dist/js/select2.full')(window.jQuery);
+require('../../../node_modules/select2/dist/js/select2.full')(window.jQuery);
 
 require('bootstrap');
 require('angular');

package.json

@@ -188,6 +188,7 @@
     "gsm": "^0.1.4",
     "helmet": "^3.23.3",
     "http-proxy": "^1.18.1",
+    "jquery": "^3.7.1",
     "later": "^1.2.0",
     "locale": "^0.1.0",
     "lodash": "^4.17.21",
@@ -215,6 +216,7 @@
     "properties": "^1.2.1",
     "rate-limiter-flexible": "^5.0.5",
     "sanitize-html": "^2.14.0",
+    "select2": "^4.0.13",
     "semver": "^7.7.0",
     "simple-password-tester": "^1.0.0",
     "url": "^0.11.1",

webapp/angular.json

@@ -37,8 +37,8 @@
               ]
             },
             "scripts": [
-              "node_modules/jquery/dist/jquery.min.js",
-              "node_modules/select2/dist/js/select2.min.js"
+              "../node_modules/jquery/dist/jquery.min.js",
+              "../node_modules/select2/dist/js/select2.min.js"
             ],
             "customWebpackConfig": {
               "path": "./custom-webpack.config.js"
@@ -121,8 +121,8 @@
               ]
             },
             "scripts": [
-              "node_modules/jquery/dist/jquery.min.js",
-              "node_modules/select2/dist/js/select2.min.js"
+              "../node_modules/jquery/dist/jquery.min.js",
+              "../node_modules/select2/dist/js/select2.min.js"
             ],
             "customWebpackConfig": {
               "path": "./custom-webpack.config.js"
@@ -172,8 +172,8 @@
               ]
             },
             "scripts": [
-              "node_modules/jquery/dist/jquery.min.js",
-              "node_modules/select2/dist/js/select2.min.js"
+              "../node_modules/jquery/dist/jquery.min.js",
+              "../node_modules/select2/dist/js/select2.min.js"
             ],
 
             "customWebpackConfig": {
@@ -255,8 +255,8 @@
               ]
             },
             "scripts": [
-              "node_modules/jquery/dist/jquery.min.js",
-              "node_modules/select2/dist/js/select2.min.js"
+              "../node_modules/jquery/dist/jquery.min.js",
+              "../node_modules/select2/dist/js/select2.min.js"
             ],
             "customWebpackConfig": {
               "path": "./custom-webpack.config.js"

webapp/custom-webpack.config.js

@@ -34,10 +34,6 @@ module.exports = {
       // openrosa-xpath-evaluator, but keeping it in adds 72.51KB to the bundle size.
       // https://github.com/medic/cht-core/issues/7324
       'node-forge': false,
-      // Only include the jquery version from the package.json (and not any different versions pulled in transitively).
-      // Once https://github.com/select2/select2/issues/5993 is resolved, we should try to coalesce back on one version
-      // of jquery and remove this alias.
-      'jquery': __dirname + '/node_modules/jquery',
     },
     fallback: {
       path: false,

webapp/package.json

@@ -47,7 +47,6 @@
     "enketo-core": "^7.2.5",
     "eurodigit": "^3.1.3",
     "font-awesome": "^4.7.0",
-    "jquery": "3.6.3",
     "lodash-es": "^4.17.21",
     "moment-locales-webpack-plugin": "^1.2.0",
     "ngrx-store-logger": "^0.2.4",
@@ -58,17 +57,13 @@
     "partial-json-parser": "^1.2.2",
     "pojo2xml": "^1.7.2",
     "rxjs": "^7.8.1",
-    "select2": "4.0.3",
     "signature_pad": "2.3.x",
     "tslib": "^2.8.1",
     "zone.js": "^0.14.10"
   },
   "overrides": {
     "minimist": ">=1.2.6"
   },
-  "resolutions": {
-    "**/jquery": "3.2.x"
-  },
   "devDependencies": {
     "@angular-builders/custom-webpack": "^18.0.0",
     "@angular-devkit/build-angular": "^18.2.14",

webapp/src/css/inbox.less

@@ -1,7 +1,7 @@
 @import (inline) 'reset.css';
 @import '../../node_modules/bootstrap/less/bootstrap';
 @import '../../node_modules/font-awesome/less/font-awesome';
-@import (inline) '../../node_modules/select2/dist/css/select2.css';
+@import (inline) '../../../node_modules/select2/dist/css/select2.css';
 @import (inline) '../../node_modules/bootstrap-daterangepicker/daterangepicker.css';
 
 @import 'variables';