Merge pull request #16903 from edx/HarryRein/entitlements-jasmine-tests-requireJS

Remove dependency on Popper.js

lms/static/js/learner_dashboard/views/course_entitlement_view.js

@@ -10,7 +10,8 @@
         'js/learner_dashboard/models/course_entitlement_model',
         'js/learner_dashboard/models/course_card_model',
         'text!../../../templates/learner_dashboard/course_entitlement.underscore',
-        'text!../../../templates/learner_dashboard/verification_popover.underscore'
+        'text!../../../templates/learner_dashboard/verification_popover.underscore',
+        'bootstrap'
     ],
          function(
              Backbone,

lms/static/lms/js/build.js

@@ -32,6 +32,7 @@
             'js/groups/views/cohorts_dashboard_factory',
             'js/discussions_management/views/discussions_dashboard_factory',
             'js/header_factory',
+            'js/learner_dashboard/course_entitlement_factory',
             'js/learner_dashboard/unenrollment_factory',
             'js/learner_dashboard/program_details_factory',
             'js/learner_dashboard/program_list_factory',

lms/static/lms/js/require-config.js

@@ -100,6 +100,7 @@
             'string_utils': 'js/src/string_utils',
             'utility': 'js/src/utility',
             'draggabilly': 'js/vendor/draggabilly',
+            'bootstrap': 'common/js/vendor/bootstrap.bundle',
 
             // Files needed by OVA
             'annotator': 'js/vendor/ova/annotator-full',
@@ -165,6 +166,9 @@
             'backbone-super': {
                 deps: ['backbone']
             },
+            'bootstrap': {
+                deps: ['jquery']
+            },
             'string_utils': {
                 deps: ['underscore'],
                 exports: 'interpolate_text'

lms/static/lms/js/spec/main.js

@@ -74,6 +74,7 @@
             'mathjax_delay_renderer': 'coffee/src/mathjax_delay_renderer',
             'MathJaxProcessor': 'coffee/src/customwmd',
             'picturefill': 'common/js/vendor/picturefill',
+            'bootstrap': 'common/js/vendor/bootstrap.bundle',
             'draggabilly': 'xmodule_js/common_static/js/vendor/draggabilly',
 
             // Manually specify LMS files that are not converted to RequireJS
@@ -186,6 +187,9 @@
                 deps: ['underscore', 'jquery'],
                 exports: 'Backbone'
             },
+            'bootstrap': {
+                deps: ['jquery']
+            },
             'backbone.associations': {
                 deps: ['backbone'],
                 exports: 'Backbone.Associations'

lms/templates/dashboard.html

@@ -47,7 +47,6 @@ 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: {

lms/templates/learner_dashboard/program_details_fragment.html

@@ -9,7 +9,6 @@ from openedx.core.djangolib.js_utils import (
 %>
 
 <%block name="js_extra">
-<%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},

lms/templates/main.html

@@ -88,8 +88,7 @@ from pipeline_mako import render_require_js_path_overrides
 
   % if uses_bootstrap:
     ## xss-lint: disable=mako-invalid-js-filter
-    <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>
+    <script type="text/javascript" src="${static.url('common/js/vendor/bootstrap.bundle.js')}"></script>
   % endif
 
   <script>

pavelib/assets.py

@@ -52,7 +52,7 @@ COMMON_LOOKUP_PATHS = [
 NPM_INSTALLED_LIBRARIES = [
     'backbone.paginator/lib/backbone.paginator.js',
     'backbone/backbone.js',
-    'bootstrap/dist/js/bootstrap.js',
+    'bootstrap/dist/js/bootstrap.bundle.js',
     'hls.js/dist/hls.js',
     'jquery-migrate/dist/jquery-migrate.js',
     'jquery.scrollto/jquery.scrollTo.js',
@@ -60,7 +60,6 @@ NPM_INSTALLED_LIBRARIES = [
     'moment-timezone/builds/moment-timezone-with-data.js',
     'moment/min/moment-with-locales.js',
     'picturefill/dist/picturefill.js',
-    'popper.js/dist/umd/popper.js',
     'requirejs/require.js',
     'underscore.string/dist/underscore.string.js',
     'underscore/underscore.js',

themes/edx.org/lms/templates/dashboard.html

@@ -48,7 +48,6 @@ 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: {

webpack.common.config.js

@@ -25,7 +25,6 @@ module.exports = {
         // LMS
         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',
 
         // Features
         CourseGoals: './openedx/features/course_experience/static/course_experience/js/CourseGoals.js',
@@ -62,8 +61,7 @@ module.exports = {
             _: 'underscore',
             $: 'jquery',
             jQuery: 'jquery',
-            'window.jQuery': 'jquery',
-            Popper: ['popper.js', 'default']
+            'window.jQuery': 'jquery'
         }),
 
         // Note: Until karma-webpack releases v3, it doesn't play well with