From b279eedd5979cf52100f9c2480762a8af8c00462 Mon Sep 17 00:00:00 2001
From: Moriel Schottlender <moriel@gmail.com>
Date: Fri, 10 Feb 2017 17:27:48 -0800
Subject: [PATCH] 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
---
 includes/specials/SpecialRecentchanges.php |  2 +-
 resources/Resources.php                    | 14 +++++++++++---
 tests/qunit/QUnitTestResources.php         |  2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/includes/specials/SpecialRecentchanges.php b/includes/specials/SpecialRecentchanges.php
index b2e56742f3..975e2107da 100644
--- 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 02487eac55..2f0311fe18 100644
--- 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 f31a646902..1278ecb812 100644
--- 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',
-- 
2.20.1