From 4a98160166373d861c53b3027d214b0c3ab787d9 Mon Sep 17 00:00:00 2001
From: Clemens Wolff <clemens@ascoderu.ca>
Date: Fri, 8 May 2020 21:30:55 -0400
Subject: [PATCH] Update jQuery to 3.5.1 (#442)

* Fix TypeError in jQuery 3.5.0

* Ensure locally built files don't affect docker
---
 .dockerignore |  4 ++++
 package.json  |  2 +-
 yarn.lock     | 12 ++++++------
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 7c7d3363..2ce82de8 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -6,6 +6,10 @@
 !docker/
 !helm/
 !opwen_email_client/
+opwen_email_client/webapp/static/css/*.min.css
+opwen_email_client/webapp/static/flags/
+opwen_email_client/webapp/static/fonts/
+opwen_email_client/webapp/static/js/*.min.js
 !opwen_email_server/
 !opwen_statuspage/
 !tests/
diff --git a/package.json b/package.json
index eaf4f200..bd932933 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "@bower_components/flag-icon-css": "lipis/flag-icon-css#^2.4.0",
     "@bower_components/handlebars": "components/handlebars.js#~1.3.0",
     "@bower_components/html5shiv": "aFarkas/html5shiv#^3.7.3",
-    "@bower_components/jquery": "jquery/jquery-dist#^3.5.0",
+    "@bower_components/jquery": "jquery/jquery-dist#^3.5.1",
     "@bower_components/printThis": "jasonday/printThis#^1.9.0",
     "@bower_components/rangy-1.3": "noap/rangy-1.3#master",
     "@bower_components/respond": "scottjehl/Respond#^1.4.2",
diff --git a/yarn.lock b/yarn.lock
index f49e9588..7c994edc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -49,9 +49,9 @@
   version "3.7.3"
   resolved "https://codeload.github.com/aFarkas/html5shiv/tar.gz/ed28c56c071bddfe7d635ad88995674957a016be"
 
-"@bower_components/jquery@jquery/jquery-dist#^3.5.0":
-  version "3.5.0"
-  resolved "https://codeload.github.com/jquery/jquery-dist/tar.gz/1fd78cd729742aa26f64783f9188e169e41f194e"
+"@bower_components/jquery@jquery/jquery-dist#^3.5.1":
+  version "3.5.1"
+  resolved "https://codeload.github.com/jquery/jquery-dist/tar.gz/4c0e4becb8263bb5b3e6dadc448d8e7305ef8215"
 
 "@bower_components/printThis@jasonday/printThis#^1.9.0":
   version "1.15.0"
@@ -1158,9 +1158,9 @@ jquery-lazyload@^1.9.7:
   integrity sha1-mYKziMUzwLYRIUs8WqoLn+3gcfc=
 
 "jquery@>= 1.9.0", jquery@>=1.11:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.0.tgz#9980b97d9e4194611c36530e7dc46a58d7340fc9"
-  integrity sha512-Xb7SVYMvygPxbFMpTFQiHh1J7HClEaThguL15N/Gg37Lri/qKyhRGZYzHRyLH8Stq3Aow0LsHO2O2ci86fCrNQ==
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz#d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5"
+  integrity sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==
 
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"