Split RCFilter's RL modules

Create 'dm' / 'ui' and 'controller' modules for ResourceLoader,
make sure that Special:RecentChanges loads 'ui' module (that
depends on the other two) and yet the qunit tests only load
the dm module.

Bug: T156532
Change-Id: If53a735458703f0bd2c094349edf86f38f05ccd7

diff --git a/includes/specials/SpecialRecentchanges.php b/includes/specials/SpecialRecentchanges.php
index b2e5674..975e210 100644 (file)
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -532,7 +532,7 @@ class SpecialRecentChanges extends ChangesListSpecialPage {
                                /*ignoreHidden=*/ true
                        )
                ) {
-                       $out->addModules( 'mediawiki.rcfilters.filters' );
+                       $out->addModules( 'mediawiki.rcfilters.filters.ui' );
                }
        }
 

diff --git a/resources/Resources.php b/resources/Resources.php
index 02487ea..2f0311f 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1751,13 +1751,22 @@ return [
 
        /* MediaWiki Special pages */
 
-       'mediawiki.rcfilters.filters' => [
+       'mediawiki.rcfilters.filters.dm' => [
                'scripts' => [
                        'resources/src/mediawiki.rcfilters/mw.rcfilters.js',
                        'resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterItem.js',
                        'resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js',
                        'resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js',
                        'resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ChangesListViewModel.js',
+                       'resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js',
+               ],
+               'dependencies' => [
+                       'oojs',
+                       'mediawiki.Uri',
+               ],
+       ],
+       'mediawiki.rcfilters.filters.ui' => [
+               'scripts' => [
                        'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CheckboxInputWidget.js',
                        'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FiltersListWidget.js',
                        'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterGroupWidget.js',
@@ -1767,7 +1776,6 @@ return [
                        'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js',
                        'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js',
                        'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js',
-                       'resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js',
                        'resources/src/mediawiki.rcfilters/mw.rcfilters.init.js',
                ],
                'styles' => [
@@ -1828,7 +1836,7 @@ return [
                ],
                'dependencies' => [
                        'oojs-ui',
-                       'mediawiki.Uri',
+                       'mediawiki.rcfilters.filters.dm',
                        'oojs-ui.styles.icons-moderation'
                ],
        ],

diff --git a/tests/qunit/QUnitTestResources.php b/tests/qunit/QUnitTestResources.php
index f31a646..1278ecb 100644 (file)
--- a/tests/qunit/QUnitTestResources.php
+++ b/tests/qunit/QUnitTestResources.php
@@ -137,7 +137,7 @@ return [
                        'mediawiki.util',
                        'mediawiki.viewport',
                        'mediawiki.special.recentchanges',
-                       'mediawiki.rcfilters.filters',
+                       'mediawiki.rcfilters.filters.dm',
                        'mediawiki.language',
                        'mediawiki.cldr',
                        'mediawiki.cookie',