From d3bc42c936d40019a6b878a4523078707ce02625 Mon Sep 17 00:00:00 2001
From: Peter Cottle <pcottle@instagram.com>
Date: Thu, 23 Apr 2020 09:06:03 -0700
Subject: [PATCH] Woohoo, fix jquery UI

---
 gulpfile.js                |  2 +-
 package.json               |  4 +++-
 src/js/views/rebaseView.js |  7 +++++++
 yarn.lock                  | 18 ++++++++++++++----
 4 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index 2380423e..0c35630c 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -92,7 +92,7 @@ var buildIndex = function(done) {
 
 var getBundle = function() {
   return browserify({
-    entries: [...glob.sync('src/**/*.js'), ...glob.sync('src/**/*.jsx'), 'lib/jquery-ui-1.9.0.custom.min.js'],
+    entries: [...glob.sync('src/**/*.js'), ...glob.sync('src/**/*.jsx')],
     debug: true,
   })
   .transform(babelify, { presets: ['@babel/preset-react'] })
diff --git a/package.json b/package.json
index e33e4303..f6c96cb1 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,9 @@
   "dependencies": {
     "backbone": "^1.4.0",
     "flux": "^3.1.3",
-    "jquery": "^1.8.0",
+    "jquery": "^3.4.0",
+    "jquery-ui": "^1.12.1",
+    "jquery-ui-sortable-npm": "^1.0.0",
     "markdown": "^0.5.0",
     "prop-types": "^15.7.2",
     "q": "^1.5.1",
diff --git a/src/js/views/rebaseView.js b/src/js/views/rebaseView.js
index b79e0b64..32b3674f 100644
--- a/src/js/views/rebaseView.js
+++ b/src/js/views/rebaseView.js
@@ -7,6 +7,13 @@ var ModalTerminal = require('../views').ModalTerminal;
 var ContainedBase = require('../views').ContainedBase;
 var ConfirmCancelView = require('../views').ConfirmCancelView;
 
+require('jquery-ui/ui/widget');
+require('jquery-ui/ui/scroll-parent');
+require('jquery-ui/ui/data');
+require('jquery-ui/ui/widgets/mouse');
+require('jquery-ui/ui/ie');
+require('jquery-ui/ui/widgets/sortable');
+
 var InteractiveRebaseView = ContainedBase.extend({
   tagName: 'div',
   template: _.template($('#interactive-rebase-template').html()),
diff --git a/yarn.lock b/yarn.lock
index cca3d6d2..85de6f11 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2563,10 +2563,20 @@ jasmine@^3.1.0:
     glob "^7.1.4"
     jasmine-core "~3.5.0"
 
-jquery@^1.8.0:
-  version "1.12.4"
-  resolved "https://registry.yarnpkg.com/jquery/-/jquery-1.12.4.tgz#01e1dfba290fe73deba77ceeacb0f9ba2fec9e0c"
-  integrity sha1-AeHfuikP5z3rp3zurLD5ui/sngw=
+jquery-ui-sortable-npm@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/jquery-ui-sortable-npm/-/jquery-ui-sortable-npm-1.0.0.tgz#5fa27c36b76d1fbd45de9e24a0c940c19ba1f6ce"
+  integrity sha1-X6J8NrdtH71F3p4koMlAwZuh9s4=
+
+jquery-ui@^1.12.1:
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.12.1.tgz#bcb4045c8dd0539c134bc1488cdd3e768a7a9e51"
+  integrity sha1-vLQEXI3QU5wTS8FIjN0+dop6nlE=
+
+jquery@^3.4.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.0.tgz#9980b97d9e4194611c36530e7dc46a58d7340fc9"
+  integrity sha512-Xb7SVYMvygPxbFMpTFQiHh1J7HClEaThguL15N/Gg37Lri/qKyhRGZYzHRyLH8Stq3Aow0LsHO2O2ci86fCrNQ==
 
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"