From 8505d5e93a421d540826cd81f934d65c3a358d87 Mon Sep 17 00:00:00 2001
From: FreneticScribbler <aj@aronajones.com>
Date: Mon, 22 Feb 2021 23:41:42 +0000
Subject: [PATCH] Squash jquery and popper together

---
 gulpfile.js         | 6 ++++--
 templates/base.html | 3 +--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index 72dd0626..73200aaa 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -44,9 +44,10 @@ function scripts() {
     const base_scripts = ["src.js", "util.js", "alert.js", "collapse.js", "dropdown.js", "modal.js", "konami.js"];
     const bs_select = ["bootstrap-select.js", "ajax-bootstrap-select.js"]
     const interaction = ["html5sortable.min.js", "interaction.js"]
-    return gulp.src(['node_modules/jquery/dist/jquery.js',
+    const jpop = ["jquery.min.js", "popper.min.js"]
+    return gulp.src(['node_modules/jquery/dist/jquery.min.js',
                     /* JQuery Plugins */
-                    'node_modules/popper.js/dist/umd/popper.js',
+                    'node_modules/popper.js/dist/umd/popper.min.js',
                     /* Bootstrap Plugins */
                     'node_modules/bootstrap/js/dist/util.js',
                     'node_modules/bootstrap/js/dist/tooltip.js',
@@ -68,6 +69,7 @@ function scripts() {
     .pipe(gulpif(function(file) { return base_scripts.includes(file.relative);}, con('base.js')))
     .pipe(gulpif(function(file) { return bs_select.includes(file.relative);}, con('selects.js')))
     .pipe(gulpif(function(file) { return interaction.includes(file.relative);}, con('interaction.js')))
+    .pipe(gulpif(function(file) { return jpop.includes(file.relative);}, con('jpop.js')))
     .pipe(flatten())
     .pipe(terser())
     .pipe(gulp.dest(dest))
diff --git a/templates/base.html b/templates/base.html
index 96da41d1..30b867eb 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -21,8 +21,7 @@
     {% block css %}
     {% endblock %}
 
-    <script src="{% static 'js/jquery.js' %}"></script>
-    <script src="{% static 'js/popper.js' %}"></script>
+    <script src="{% static 'js/jpop.js' %}" async></script>
     {% block preload_js %}
     {% endblock %}