From 19406fa48f96d282802f5ada83cca39261ec96ea Mon Sep 17 00:00:00 2001
From: Harry Rein <hrein@edx.org>
Date: Tue, 12 Dec 2017 11:07:11 -0500
Subject: [PATCH] Removing RequireJS imports of bootstrap and popper.

---
 lms/static/lms/js/require-config.js | 9 ---------
 lms/static/lms/js/spec/main.js      | 6 ------
 webpack.common.config.js            | 4 ----
 3 files changed, 19 deletions(-)

diff --git a/lms/static/lms/js/require-config.js b/lms/static/lms/js/require-config.js
index c438c2137c..ba785e1d51 100644
--- a/lms/static/lms/js/require-config.js
+++ b/lms/static/lms/js/require-config.js
@@ -100,8 +100,6 @@
             'string_utils': 'js/src/string_utils',
             'utility': 'js/src/utility',
             'draggabilly': 'js/vendor/draggabilly',
-            'popper': 'common/js/vendor/popper',
-            'bootstrap': 'common/js/vendor/bootstrap',
 
             // Files needed by OVA
             'annotator': 'js/vendor/ova/annotator-full',
@@ -208,13 +206,6 @@
             'grouping-annotator': {
                 deps: ['annotator']
             },
-            'popper': {
-                exports: 'Popper'
-            },
-            'bootstrap': {
-                deps: ['jquery', 'popper'],
-                exports: 'bootstrap'
-            },
             'ova': {
                 exports: 'ova',
                 deps: [
diff --git a/lms/static/lms/js/spec/main.js b/lms/static/lms/js/spec/main.js
index 11145c5f08..0ac5f80d62 100644
--- a/lms/static/lms/js/spec/main.js
+++ b/lms/static/lms/js/spec/main.js
@@ -46,8 +46,6 @@
             'backbone.associations': 'xmodule_js/common_static/js/vendor/backbone-associations-min',
             'backbone.paginator': 'common/js/vendor/backbone.paginator',
             'backbone-super': 'js/vendor/backbone-super',
-            'popper': 'common/js/vendor/popper',
-            'bootstrap': 'common/js/vendor/bootstrap',
             'URI': 'xmodule_js/common_static/js/vendor/URI.min',
             'tinymce': 'xmodule_js/common_static/js/vendor/tinymce/js/tinymce/tinymce.full.min',
             'jquery.tinymce': 'xmodule_js/common_static/js/vendor/tinymce/js/tinymce/jquery.tinymce',
@@ -199,10 +197,6 @@
             'backbone-super': {
                 deps: ['backbone']
             },
-            'bootstrap': {
-                deps: ['jquery', 'popper'],
-                exports: 'bootstrap'
-            },
             'paging-collection': {
                 deps: ['jquery', 'underscore', 'backbone.paginator']
             },
diff --git a/webpack.common.config.js b/webpack.common.config.js
index c92c863e10..9ad5b41e18 100644
--- a/webpack.common.config.js
+++ b/webpack.common.config.js
@@ -65,9 +65,6 @@ module.exports = {
             jQuery: 'jquery',
             'window.jQuery': 'jquery'
         }),
-        new webpack.ProvidePlugin({
-            Popper: 'popper.js'
-        }),
 
         // Note: Until karma-webpack releases v3, it doesn't play well with
         // the CommonsChunkPlugin. We have a kludge in karma.common.conf.js
@@ -174,7 +171,6 @@ module.exports = {
         gettext: 'gettext',
         jquery: 'jQuery',
         logger: 'Logger',
-        popper: 'Popper',
         underscore: '_',
         URI: 'URI'
     },