From 30565e249175ef4cf1a3fa75cecfac6b4dedfb63 Mon Sep 17 00:00:00 2001
From: Timo Tijhof <krinklemail@gmail.com>
Date: Tue, 30 Jul 2019 01:17:35 +0100
Subject: [PATCH] API: Create a module bundle for 'apipretty' and 'apihelp'

These are both fairly small modules used in related low-traffic
scenarios. The cost of registering both globally on all page views
as a top-level entry point does not seem worth the marginal gain
of loading only one of these two in the contexts where they are
needed.

Change-Id: I42458ebec3f8d6e14e52e44d62fb914fcbeda5db
---
 includes/api/ApiHelp.php                                 | 2 +-
 resources/Resources.php                                  | 9 ++++-----
 .../apihelp.css}                                         | 0
 .../apipretty.css}                                       | 0
 4 files changed, 5 insertions(+), 6 deletions(-)
 rename resources/src/{mediawiki.apihelp.css => mediawiki.apipretty/apihelp.css} (100%)
 rename resources/src/{mediawiki.apipretty.css => mediawiki.apipretty/apipretty.css} (100%)

diff --git a/includes/api/ApiHelp.php b/includes/api/ApiHelp.php
index cc96f907a3..988957b6d8 100644
--- a/includes/api/ApiHelp.php
+++ b/includes/api/ApiHelp.php
@@ -100,7 +100,7 @@ class ApiHelp extends ApiBase {
 		$out = $context->getOutput();
 		$out->addModuleStyles( [
 			'mediawiki.hlist',
-			'mediawiki.apihelp',
+			'mediawiki.apipretty',
 		] );
 		if ( !empty( $options['toc'] ) ) {
 			$out->addModuleStyles( 'mediawiki.toc.styles' );
diff --git a/resources/Resources.php b/resources/Resources.php
index 9a7b9e8362..77d7d88bac 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -768,10 +768,6 @@ return [
 	],
 
 	/* MediaWiki */
-	'mediawiki.apihelp' => [
-		'styles' => 'resources/src/mediawiki.apihelp.css',
-		'targets' => [ 'desktop' ],
-	],
 	'mediawiki.template' => [
 		'scripts' => 'resources/src/mediawiki.template.js',
 		'targets' => [ 'desktop', 'mobile' ],
@@ -790,7 +786,10 @@ return [
 		'dependencies' => 'mediawiki.template',
 	],
 	'mediawiki.apipretty' => [
-		'styles' => 'resources/src/mediawiki.apipretty.css',
+		'styles' => [
+			'resources/src/mediawiki.apipretty/apipretty.css',
+			'resources/src/mediawiki.apipretty/apihelp.css',
+		],
 		'targets' => [ 'desktop', 'mobile' ],
 	],
 	'mediawiki.api' => [
diff --git a/resources/src/mediawiki.apihelp.css b/resources/src/mediawiki.apipretty/apihelp.css
similarity index 100%
rename from resources/src/mediawiki.apihelp.css
rename to resources/src/mediawiki.apipretty/apihelp.css
diff --git a/resources/src/mediawiki.apipretty.css b/resources/src/mediawiki.apipretty/apipretty.css
similarity index 100%
rename from resources/src/mediawiki.apipretty.css
rename to resources/src/mediawiki.apipretty/apipretty.css
-- 
2.20.1