Revert "build: commit XModule SCSS entrypoints of generating them (#3…

…2290)"

This reverts commit 0b455e0.

pavelib/assets.py

@@ -170,8 +170,9 @@ def get_theme_sass_dirs(system, theme_dir):
     css_dir = theme_dir / system / "static" / "css"
     certs_sass_dir = theme_dir / system / "static" / "certificates" / "sass"
     certs_css_dir = theme_dir / system / "static" / "certificates" / "css"
-    xmodule_sass_dir = path("xmodule") / "static" / "sass" / system
-    xmodule_lookup_dir = path("xmodule") / "static" / "sass" / "include"
+    xmodule_sass_folder = "modules" if system == 'lms' else "descriptors"
+    xmodule_sass_dir = path("common") / "static" / "xmodule" / xmodule_sass_folder / "scss"
+    xmodule_lookup_dir = path("xmodule") / "css"
 
     dependencies = SASS_LOOKUP_DEPENDENCIES.get(system, [])
     if sass_dir.isdir():
@@ -237,8 +238,9 @@ def get_system_sass_dirs(system):
     dirs = []
     sass_dir = path(system) / "static" / "sass"
     css_dir = path(system) / "static" / "css"
-    xmodule_sass_dir = path("xmodule") / "static" / "sass" / system
-    xmodule_lookup_dir = path("xmodule") / "static" / "sass" / "include"
+    xmodule_sass_folder = "modules" if system == 'lms' else "descriptors"
+    xmodule_sass_dir = path("common") / "static" / "xmodule" / xmodule_sass_folder / "scss"
+    xmodule_lookup_dir = path("xmodule") / "css"
 
     dependencies = SASS_LOOKUP_DEPENDENCIES.get(system, [])
     dirs.append({

xmodule/annotatable_block.py

@@ -82,13 +82,23 @@ class AnnotatableBlock(
         ],
         'xmodule_js': resource_filename(__name__, 'js/src/xmodule.js'),
     }
+    preview_view_css = {
+        'scss': [
+            resource_filename(__name__, 'css/annotatable/display.scss'),
+        ],
+    }
 
     studio_view_js = {
         'js': [
             resource_filename(__name__, 'js/src/raw/edit/xml.js'),
         ],
         'xmodule_js': resource_filename(__name__, 'js/src/xmodule.js'),
     }
+    studio_view_css = {
+        'scss': [
+            resource_filename(__name__, 'css/codemirror/codemirror.scss'),
+        ],
+    }
     studio_js_module_name = "XMLEditingDescriptor"
     mako_template = "widgets/raw-edit.html"
 

xmodule/capa_block.py

@@ -177,13 +177,26 @@ class ProblemBlock(
         'xmodule_js': resource_filename(__name__, 'js/src/xmodule.js')
     }
 
+    preview_view_css = {
+        'scss': [
+            resource_filename(__name__, 'css/capa/display.scss'),
+        ],
+    }
+
     studio_view_js = {
         'js': [
             resource_filename(__name__, 'js/src/problem/edit.js'),
         ],
         'xmodule_js': resource_filename(__name__, 'js/src/xmodule.js'),
     }
 
+    studio_view_css = {
+        'scss': [
+            resource_filename(__name__, 'css/editor/edit.scss'),
+            resource_filename(__name__, 'css/problem/edit.scss'),
+        ]
+    }
+
     display_name = String(
         display_name=_("Display Name"),
         help=_("The display name for this component."),

xmodule/conditional_block.py

@@ -154,13 +154,19 @@ class ConditionalBlock(
         ],
         'xmodule_js': resource_filename(__name__, 'js/src/xmodule.js'),
     }
+    preview_view_css = {
+        'scss': [],
+    }
 
     mako_template = 'widgets/metadata-edit.html'
     studio_js_module_name = 'SequenceDescriptor'
     studio_view_js = {
         'js': [resource_filename(__name__, 'js/src/sequence/edit.js')],
         'xmodule_js': resource_filename(__name__, 'js/src/xmodule.js'),
     }
+    studio_view_css = {
+        'scss': [],
+    }
 
     # Map
     # key: <tag attribute in xml>

xmodule/html_block.py

@@ -152,6 +152,7 @@ def studio_view(self, _context):
         ],
         'xmodule_js': resource_filename(__name__, 'js/src/xmodule.js'),
     }
+    preview_view_css = {'scss': [resource_filename(__name__, 'css/html/display.scss')]}
 
     uses_xmodule_styles_setup = True
 
@@ -167,6 +168,12 @@ def studio_view(self, _context):
         ],
         'xmodule_js': resource_filename(__name__, 'js/src/xmodule.js'),
     }
+    studio_view_css = {
+        'scss': [
+            resource_filename(__name__, 'css/editor/edit.scss'),
+            resource_filename(__name__, 'css/html/edit.scss')
+        ]
+    }
 
     # VS[compat] TODO (cpennington): Delete this method once all fall 2012 course
     # are being edited in the cms

xmodule/library_content_block.py

@@ -99,6 +99,9 @@ class LibraryContentBlock(
         'js': [],
         'xmodule_js': resource_filename(__name__, 'js/src/xmodule.js'),
     }
+    preview_view_css = {
+        'scss': [],
+    }
 
     mako_template = 'widgets/metadata-edit.html'
     studio_js_module_name = "VerticalDescriptor"
@@ -108,6 +111,9 @@ class LibraryContentBlock(
         ],
         'xmodule_js': resource_filename(__name__, 'js/src/xmodule.js'),
     }
+    studio_view_css = {
+        'scss': [],
+    }
 
     show_in_read_only_mode = True
 

xmodule/lti_block.py

@@ -378,6 +378,11 @@ class LTIBlock(
         ],
         'xmodule_js': resource_filename(__name__, 'js/src/xmodule.js'),
     }
+    preview_view_css = {
+        'scss': [
+            resource_filename(__name__, 'css/lti/lti.scss')
+        ],
+    }
 
     mako_template = 'widgets/metadata-only-edit.html'
 
@@ -388,6 +393,9 @@ class LTIBlock(
         ],
         'xmodule_js': resource_filename(__name__, 'js/src/xmodule.js'),
     }
+    studio_view_css = {
+        'scss': [],
+    }
 
     def studio_view(self, _context):
         """

xmodule/poll_block.py

@@ -92,6 +92,11 @@ class PollBlock(
         ],
         'xmodule_js': resource_filename(__name__, 'js/src/xmodule.js'),
     }
+    preview_view_css = {
+        'scss': [
+            resource_filename(__name__, 'css/poll/display.scss')
+        ],
+    }
 
     # There is no studio_view() for this XBlock but this is needed to make the
     # the static_content command happy.
@@ -100,6 +105,10 @@ class PollBlock(
         'xmodule_js': resource_filename(__name__, 'js/src/xmodule.js')
     }
 
+    studio_view_css = {
+        'scss': []
+    }
+
     def handle_ajax(self, dispatch, data):  # lint-amnesty, pylint: disable=unused-argument
         """Ajax handler.
 

xmodule/seq_block.py

@@ -278,13 +278,23 @@ class SequenceBlock(
         'xmodule_js': resource_filename(__name__, 'js/src/xmodule.js')
     }
 
+    preview_view_css = {
+        'scss': [
+            resource_filename(__name__, 'css/sequence/display.scss'),
+        ],
+    }
+
     # There is no studio_view() for this XBlock but this is needed to make the
     # the static_content command happy.
     studio_view_js = {
         'js': [],
         'xmodule_js': resource_filename(__name__, 'js/src/xmodule.js')
     }
 
+    studio_view_css = {
+        'scss': []
+    }
+
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 

xmodule/split_test_block.py

@@ -162,13 +162,19 @@ class SplitTestBlock(  # lint-amnesty, pylint: disable=abstract-method
         'js': [],
         'xmodule_js': resource_filename(__name__, 'js/src/xmodule.js'),
     }
+    preview_view_css = {
+        'scss': [],
+    }
 
     mako_template = "widgets/metadata-only-edit.html"
     studio_js_module_name = 'SequenceDescriptor'
     studio_view_js = {
         'js': [resource_filename(__name__, 'js/src/sequence/edit.js')],
         'xmodule_js': resource_filename(__name__, 'js/src/xmodule.js'),
     }
+    studio_view_css = {
+        'scss': [],
+    }
 
     @cached_property
     def child_block(self):