Revert "[1/3] refactor: remove XModule JS from Django Pipeline"

cms/djangoapps/pipeline_js/utils.py

@@ -0,0 +1,19 @@
+"""
+Utilities for returning XModule JS (used by requirejs)
+"""
+
+
+from django.conf import settings
+from django.contrib.staticfiles.storage import staticfiles_storage
+
+
+def get_xmodule_urls():
+    """
+    Returns a list of the URLs to hit to grab all the XModule JS
+    """
+    pipeline_js_settings = settings.PIPELINE['JAVASCRIPT']["module-js"]
+    if settings.DEBUG:
+        paths = [path.replace(".coffee", ".js") for path in pipeline_js_settings["source_filenames"]]
+    else:
+        paths = [pipeline_js_settings["output_filename"]]
+    return [staticfiles_storage.url(path) for path in paths]

cms/envs/common.py

@@ -1383,6 +1383,15 @@
         'source_filenames': base_vendor_js,
         'output_filename': 'js/cms-base-vendor.js',
     },
+    'module-js': {
+        'source_filenames': (
+            rooted_glob(COMMON_ROOT / 'static/', 'xmodule/descriptors/js/*.js') +
+            rooted_glob(COMMON_ROOT / 'static/', 'xmodule/modules/js/*.js') +
+            rooted_glob(COMMON_ROOT / 'static/', 'common/js/discussion/*.js')
+        ),
+        'output_filename': 'js/cms-modules.js',
+        'test_order': 1
+    },
 }
 
 STATICFILES_IGNORE_PATTERNS = (

lms/envs/common.py

@@ -2580,6 +2580,14 @@ def _make_locale_paths(settings):  # pylint: disable=missing-function-docstring
         'source_filenames': main_vendor_js,
         'output_filename': 'js/lms-main_vendor.js',
     },
+    'module-descriptor-js': {
+        'source_filenames': rooted_glob(COMMON_ROOT / 'static/', 'xmodule/descriptors/js/*.js'),
+        'output_filename': 'js/lms-module-descriptors.js',
+    },
+    'module-js': {
+        'source_filenames': rooted_glob(COMMON_ROOT / 'static', 'xmodule/modules/js/*.js'),
+        'output_filename': 'js/lms-modules.js',
+    },
     'discussion': {
         'source_filenames': discussion_js,
         'output_filename': 'js/discussion.js',

lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html

@@ -54,8 +54,7 @@
   <script type="text/javascript" src="${static.url('js/vendor/tinymce/js/tinymce/jquery.tinymce.min.js')}"></script>
   <script type="text/javascript" src="${static.url('js/vendor/jQuery-File-Upload/js/jquery.fileupload.js')}"></script>
   <script type="text/javascript" src="${static.url('js/vendor/jquery.qubit.js')}"></script>
-  <%static:webpack entry='HtmlBlockEditor'/>
-  <link rel="stylesheet" href="${static.url('css/HtmlBlockEditor.css')}">
+  <%static:js group='module-descriptor-js'/>
   <%static:js group='instructor_dash'/>
   <%static:js group='application'/>
 

lms/templates/wiki/preview_inline.html

@@ -40,6 +40,7 @@ <h1 class="page-header">{{ title }}</h1>
   </section>
 
   {% javascript 'application' %}
+  {% javascript 'module-js' %}
   {% with mathjax_mode='wiki' %}
     {% include "mathjax_include.html" %}
   {% endwith %}

xmodule/assets/README.rst

@@ -75,11 +75,14 @@ Currently, edx-platform XBlock JS is defined both here in `xmodule/assets`_ and
   * `VerticalBlock`_
   * `LibrarySourcedBlock`_
 
+* Some XBlock JS is also processed through Django Pipeline and used in a couple specific legacy places.
+
 As part of an `active build refactoring`_:
 
 * We update the older builtin XBlocks to reference their JS directly rather than using copies of it.
 * We will move ``webpack.xmodule.config.js`` here instead of generating it.
 * We will consolidate all edx-platform XBlock JS here in `xmodule/assets`_.
+* We will remove XBlock JS from Django Pipeline.
 * We will delete the ``xmodule_assets`` script.
 
 .. _xmodule/assets: https://github.com/openedx/edx-platform/tree/master/xmodule/assets