From 791b8b141ee03aca0ff693e03ec30103a51ccade Mon Sep 17 00:00:00 2001
From: Harry Rein <hrein@edx.org>
Date: Tue, 12 Dec 2017 14:50:38 -0500
Subject: [PATCH] Importing bootstrap and popper through webpack.

---
 lms/templates/dashboard.html                                | 6 +-----
 .../learner_dashboard/program_details_fragment.html         | 5 +----
 themes/edx.org/lms/templates/dashboard.html                 | 6 +-----
 webpack.common.config.js                                    | 4 ++--
 4 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html
index d679d5816e..05520a36de 100644
--- a/lms/templates/dashboard.html
+++ b/lms/templates/dashboard.html
@@ -33,11 +33,6 @@ from student.models import CourseEnrollment
   <%static:include path="dashboard/${template_name}.underscore" />
 </script>
 % endfor
-% if course_entitlements:
-    <!-- This is a temporary solution before we land a fix to load these through Webpack, tracked by LEARNER-3483 -->
-    <script type="text/javascript" src="${static.url('common/js/vendor/popper.js')}"></script>
-    <script type="text/javascript" src="${static.url('common/js/vendor/bootstrap.js')}"></script>
-% endif
 </%block>
 
 <%block name="js_extra">
@@ -52,6 +47,7 @@ from student.models import CourseEnrollment
       });
     });
   </script>
+  <%static:webpack entry="Bootstrap"></%static:webpack>
   <%static:require_module module_name="js/learner_dashboard/unenrollment_factory" class_name="UnenrollmentFactory">
     UnenrollmentFactory({
       urls: {
diff --git a/lms/templates/learner_dashboard/program_details_fragment.html b/lms/templates/learner_dashboard/program_details_fragment.html
index d361a27c06..580d62ec54 100644
--- a/lms/templates/learner_dashboard/program_details_fragment.html
+++ b/lms/templates/learner_dashboard/program_details_fragment.html
@@ -9,10 +9,7 @@ from openedx.core.djangolib.js_utils import (
 %>
 
 <%block name="js_extra">
-<!-- This is a temporary solution before we land a fix to load these through Webpack, tracked by LEARNER-3483 -->
-<script type="text/javascript" src="${static.url('common/js/vendor/popper.js')}"></script>
-<script type="text/javascript" src="${static.url('common/js/vendor/bootstrap.js')}"></script>
-
+<%static:webpack entry="Bootstrap"></%static:webpack>
 <%static:require_module module_name="js/learner_dashboard/program_details_factory" class_name="ProgramDetailsFactory">
 ProgramDetailsFactory({
     programData: ${program_data | n, dump_js_escaped_json},
diff --git a/themes/edx.org/lms/templates/dashboard.html b/themes/edx.org/lms/templates/dashboard.html
index d91091e760..aa502c4ff7 100644
--- a/themes/edx.org/lms/templates/dashboard.html
+++ b/themes/edx.org/lms/templates/dashboard.html
@@ -34,11 +34,6 @@ from student.models import CourseEnrollment
   <%static:include path="dashboard/${template_name}.underscore" />
 </script>
 % endfor
-% if course_entitlements:
-    <!-- This is a temporary solution before we land a fix to load these through Webpack, tracked by LEARNER-3483 -->
-    <script type="text/javascript" src="${static.url('common/js/vendor/popper.js')}"></script>
-    <script type="text/javascript" src="${static.url('common/js/vendor/bootstrap.js')}"></script>
-% endif
 </%block>
 
 <%block name="js_extra">
@@ -53,6 +48,7 @@ from student.models import CourseEnrollment
       });
     });
   </script>
+  <%static:webpack entry="Bootstrap"></%static:webpack>
   <%static:require_module module_name="js/learner_dashboard/unenrollment_factory" class_name="UnenrollmentFactory">
     UnenrollmentFactory({
       urls: {
diff --git a/webpack.common.config.js b/webpack.common.config.js
index 9ad5b41e18..7b7e80905f 100644
--- a/webpack.common.config.js
+++ b/webpack.common.config.js
@@ -26,7 +26,6 @@ module.exports = {
         SingleSupportForm: './lms/static/support/jsx/single_support_form.jsx',
         AlertStatusBar: './lms/static/js/accessible_components/StatusBarAlert.jsx',
         Bootstrap: './lms/static/common/js/vendor/bootstrap.js',
-        EntitlementView: './lms/static/js/learner_dashboard/views/course_entitlement_view.js',
 
         // Features
         CourseGoals: './openedx/features/course_experience/static/course_experience/js/CourseGoals.js',
@@ -63,7 +62,8 @@ module.exports = {
             _: 'underscore',
             $: 'jquery',
             jQuery: 'jquery',
-            'window.jQuery': 'jquery'
+            'window.jQuery': 'jquery',
+            Popper: ['popper.js', 'default']
         }),
 
         // Note: Until karma-webpack releases v3, it doesn't play well with