Revert "Switch container factory to webpack"

lms/envs/acceptance.py

@@ -208,7 +208,6 @@ SECRET_KEY = uuid.uuid4().hex
 ############################### PIPELINE #######################################
 
 PIPELINE_ENABLED = False
-REQUIRE_DEBUG = True
 
 # We want to make sure that any new migrations are run
 # see https://groups.google.com/forum/#!msg/django-developers/PWPj3etj3-U/kCl6pMsQYYoJ

lms/envs/bok_choy.py

@@ -49,9 +49,6 @@ update_module_store_settings(
     default_store=os.environ.get('DEFAULT_STORE', 'draft'),
 )
 
-# Capture the console log via template includes, until webdriver supports log capture again
-CAPTURE_CONSOLE_LOG = True
-
 ############################ STATIC FILES #############################
 
 # Enable debug so that static assets are served by Django

lms/envs/bok_choy_docker.py

@@ -16,9 +16,3 @@ LOGGING['handlers']['local'] = LOGGING['handlers']['tracking'] = {
 }
 
 LOGGING['loggers']['tracking']['handlers'] = ['console']
-
-# Point the URL used to test YouTube availability to our stub YouTube server
-BOK_CHOY_HOST = os.environ['BOK_CHOY_HOSTNAME']
-YOUTUBE['API'] = "http://{}:{}/get_youtube_api/".format(BOK_CHOY_HOST, YOUTUBE_PORT)
-YOUTUBE['METADATA_URL'] = "http://{}:{}/test_youtube/".format(BOK_CHOY_HOST, YOUTUBE_PORT)
-YOUTUBE['TEXT_API']['url'] = "{}:{}/test_transcripts_youtube/".format(BOK_CHOY_HOST, YOUTUBE_PORT)

lms/envs/test.py

@@ -95,6 +95,8 @@ PARENTAL_CONSENT_AGE_LIMIT = 13
 TEST_ROOT = path("test_root")
 # Want static files in the same dir for running on jenkins.
 STATIC_ROOT = TEST_ROOT / "staticfiles"
+INSTALLED_APPS = [app for app in INSTALLED_APPS if app != 'webpack_loader']
+INSTALLED_APPS.append('openedx.tests.util.webpack_loader')
 WEBPACK_LOADER['DEFAULT']['STATS_FILE'] = STATIC_ROOT / "webpack-stats.json"
 
 STATUS_MESSAGE_PATH = TEST_ROOT / "status_message.json"

lms/static/js/views/message_banner.js

@@ -1,4 +1,4 @@
-(function(define) {
+(function(define, undefined) {
     'use strict';
     define([
         'gettext', 'jquery', 'underscore', 'backbone', 'text!templates/fields/message_banner.underscore'

lms/templates/courseware/courseware-chromeless.html

@@ -51,6 +51,9 @@ ${static.get_page_title_breadcrumbs(course_name())}
   <script type="text/javascript" src="${static.url('common/js/vendor/jquery.scrollTo.js')}"></script>
   <script type="text/javascript" src="${static.url('js/vendor/flot/jquery.flot.js')}"></script>
 
+  ## codemirror
+  <script type="text/javascript" src="${static.url('js/vendor/codemirror-compressed.js')}"></script>
+
   <%static:js group='courseware'/>
 
   <%include file="/mathjax_include.html" args="disable_fast_preview=True"/>

lms/templates/courseware/courseware.html

@@ -66,6 +66,9 @@ from openedx.features.course_experience import course_home_page_title, COURSE_OU
   <script type="text/javascript" src="${static.url('common/js/vendor/jquery.scrollTo.js')}"></script>
   <script type="text/javascript" src="${static.url('js/vendor/flot/jquery.flot.js')}"></script>
 
+  ## codemirror
+  <script type="text/javascript" src="${static.url('js/vendor/codemirror-compressed.js')}"></script>
+
   <%static:js group='courseware'/>
   <%include file="/mathjax_include.html" args="disable_fast_preview=True"/>
 

lms/templates/main.html

@@ -61,22 +61,6 @@ from pipeline_mako import render_require_js_path_overrides
     ie11_fix_path = "js/ie11_find_array.js"
   %>
 
-  % if getattr(settings, 'CAPTURE_CONSOLE_LOG', False):
-    <script type="text/javascript">
-      var oldOnError = window.onerror;
-      window.localStorage.setItem('console_log_capture', JSON.stringify([]));
-
-      window.onerror = function (message, url, lineno, colno, error) {
-        if (oldOnError) {
-          oldOnError.apply(this, arguments);
-        }
-
-        var messages = JSON.parse(window.localStorage.getItem('console_log_capture'));
-        messages.push([message, url, lineno, colno, (error || {}).stack]);
-        window.localStorage.setItem('console_log_capture', JSON.stringify(messages));
-      }
-    </script>
-  % endif
   <script type="text/javascript" src="${static.url(jsi18n_path)}"></script>
   <script type="text/javascript" src="${static.url(ie11_fix_path)}"></script>
 
@@ -124,6 +108,10 @@ from pipeline_mako import render_require_js_path_overrides
     ${render_require_js_path_overrides(settings.REQUIRE_JS_PATH_OVERRIDES) | n, decode.utf8}
   </%block>
 
+  % if not disable_courseware_js:
+    <%static:js group='module-js'/>
+  % endif
+
   <%block name="headextra"/>
   <%block name="head_extra"/>
 
@@ -183,7 +171,7 @@ from pipeline_mako import render_require_js_path_overrides
     % endif
 
     <%include file="/page_banner.html" />
-
+    
     <div class="marketing-hero"><%block name="marketing_hero"></%block></div>
 
     <div class="content-wrapper main-container" id="content">