From ed6e38178bf4d34c38af72deec8bf7d980a670dc Mon Sep 17 00:00:00 2001
From: Timo Tijhof <krinklemail@gmail.com>
Date: Fri, 2 Aug 2019 20:30:11 +0100
Subject: [PATCH] resourceloader: Merge mediawiki.legacy.wikibits into
 mediawiki.base

Still executed under the same conditional, but no longer exposed
as its own public module bundle.

Change-Id: Ifba3a73b184ce02eeeeb2ccce6d4aece732dea13
---
 .../ResourceLoaderStartUpModule.php           |  6 ------
 jsduck.json                                   |  1 +
 resources/Resources.php                       | 20 +++++++++----------
 .../legacy.wikibits.js}                       |  0
 4 files changed, 11 insertions(+), 16 deletions(-)
 rename resources/src/{mediawiki.legacy/wikibits.js => mediawiki.base/legacy.wikibits.js} (100%)

diff --git a/includes/resourceloader/ResourceLoaderStartUpModule.php b/includes/resourceloader/ResourceLoaderStartUpModule.php
index a982de2a7d..8f026dc87b 100644
--- a/includes/resourceloader/ResourceLoaderStartUpModule.php
+++ b/includes/resourceloader/ResourceLoaderStartUpModule.php
@@ -346,13 +346,7 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule {
 	 * @return array
 	 */
 	private function getBaseModules() {
-		global $wgIncludeLegacyJavaScript;
-
 		$baseModules = [ 'jquery', 'mediawiki.base' ];
-		if ( $wgIncludeLegacyJavaScript ) {
-			$baseModules[] = 'mediawiki.legacy.wikibits';
-		}
-
 		return $baseModules;
 	}
 
diff --git a/jsduck.json b/jsduck.json
index fad38e35ee..2b18c5896d 100644
--- a/jsduck.json
+++ b/jsduck.json
@@ -15,6 +15,7 @@
 		"resources/src/jquery/jquery.color.js",
 		"resources/src/jquery/jquery.highlightText.js",
 		"resources/src/jquery/jquery.mw-jump.js",
+		"resources/src/mediawiki.base/legacy.wikibits.js",
 		"resources/src/mediawiki.legacy",
 		"resources/src/mediawiki.libs.jpegmeta/jpegmeta.js",
 		"resources/src/mediawiki.skinning",
diff --git a/resources/Resources.php b/resources/Resources.php
index 133ba0f4ea..333057f806 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -139,16 +139,16 @@ return [
 		'targets' => [ 'desktop', 'mobile' ],
 	],
 	'mediawiki.base' => [
-		'scripts' => [
-			// This MUST be kept in sync with maintenance/jsduck/eg-iframe.html
-			'resources/src/mediawiki.base/mediawiki.errorLogger.js',
-			'resources/src/mediawiki.base/mediawiki.base.js',
-		],
-		'dependencies' => 'jquery',
-		'targets' => [ 'desktop', 'mobile' ],
-	],
-	'mediawiki.legacy.wikibits' => [
-		'scripts' => 'resources/src/mediawiki.legacy/wikibits.js',
+		'scripts' => array_merge(
+			[
+				// This MUST be kept in sync with maintenance/jsduck/eg-iframe.html
+				'resources/src/mediawiki.base/mediawiki.errorLogger.js',
+				'resources/src/mediawiki.base/mediawiki.base.js',
+			],
+			$GLOBALS['wgIncludeLegacyJavaScript']
+				? [ 'resources/src/mediawiki.base/legacy.wikibits.js' ]
+				: []
+		),
 		'dependencies' => 'jquery',
 		'targets' => [ 'desktop', 'mobile' ],
 	],
diff --git a/resources/src/mediawiki.legacy/wikibits.js b/resources/src/mediawiki.base/legacy.wikibits.js
similarity index 100%
rename from resources/src/mediawiki.legacy/wikibits.js
rename to resources/src/mediawiki.base/legacy.wikibits.js
-- 
2.20.1