refactor: slash-and-burn Annotatable BuiltIn XBlock

openedx/core/lib/xblock_serializer/utils.py

@@ -195,7 +195,7 @@ def override_export_fs(block):
     in that it relies on `XmlMixin.export_to_file` (or `CustomTagBlock.export_to_file`) method to control
     whether a block has to be exported as two files (one .olx pointing to one .xml) file, or a single XML node.
 
-    For the legacy blocks (`AnnotatableBlock` for instance) `export_to_file` returns `True` by default.
+    For most legacy blocks, `export_to_file` returns `True` by default.
     The only exception is `CustomTagBlock`, for which this method was originally developed, as customtags don't
     have to be exported as separate files.
 

openedx/envs/common.py

@@ -2068,14 +2068,6 @@ def add_optional_apps(optional_apps, installed_apps):
 # .. toggle_target_removal_date: 2026-04-10
 USE_EXTRACTED_WORD_CLOUD_BLOCK = True
 
-# .. toggle_name: USE_EXTRACTED_ANNOTATABLE_BLOCK
-# .. toggle_default: True
-# .. toggle_implementation: DjangoSetting
-# .. toggle_description: Enables the use of the extracted annotatable XBlock, which has been shifted to the 'openedx/xblocks-contrib' repo.
-# .. toggle_use_cases: temporary
-# .. toggle_creation_date: 2024-11-10
-# .. toggle_target_removal_date: 2026-04-10
-USE_EXTRACTED_ANNOTATABLE_BLOCK = True
 
 # .. toggle_name: USE_EXTRACTED_POLL_QUESTION_BLOCK
 # .. toggle_default: True

pyproject.toml

@@ -16,8 +16,8 @@ xmodule = ["js/module/*"]
 
 [project.entry-points."xblock.v1"]
 about = "xmodule.html_block:AboutBlock"
+annotatable = "xblocks_contrib:AnnotatableBlock"
 book = "xmodule.template_block:TranslateCustomTagBlock"
-annotatable = "xmodule.annotatable_block:AnnotatableBlock"
 chapter = "xmodule.seq_block:SectionBlock"
 conditional = "xmodule.conditional_block:ConditionalBlock"
 course = "xmodule.course_block:CourseBlock"

webpack.builtinblocks.config.js

@@ -1,16 +1,5 @@
 module.exports = {
     entry: {
-        AnnotatableBlockDisplay: [
-            './xmodule/js/src/xmodule.js',
-            './xmodule/js/src/html/display.js',
-            './xmodule/js/src/annotatable/display.js',
-            './xmodule/js/src/javascript_loader.js',
-            './xmodule/js/src/collapsible.js'
-        ],
-        AnnotatableBlockEditor: [
-            './xmodule/js/src/xmodule.js',
-            './xmodule/js/src/raw/edit/xml.js'
-        ],
         ConditionalBlockDisplay: [
             './xmodule/js/src/xmodule.js',
             './xmodule/js/src/conditional/display.js',