From b87c6d3f0b428185d532b50aa1c5494030c365ae Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 20 Jun 2018 16:14:28 +0100
Subject: [PATCH] resourceloader: spin base module code out as a proper module

Bug: T192623
Change-Id: I6f7dc40488a990d0f8a25e84ebc9eb25ad4c2975
---
 .../resourceloader/ResourceLoaderStartUpModule.php     |  2 +-
 maintenance/jsduck/eg-iframe.html                      |  4 ++--
 resources/Resources.php                                | 10 ++++++++--
 .../{mediawiki => mediawiki.base}/mediawiki.base.js    |  0
 .../mediawiki.errorLogger.js                           |  0
 5 files changed, 11 insertions(+), 5 deletions(-)
 rename resources/src/{mediawiki => mediawiki.base}/mediawiki.base.js (100%)
 rename resources/src/{mediawiki => mediawiki.base}/mediawiki.errorLogger.js (100%)

diff --git a/includes/resourceloader/ResourceLoaderStartUpModule.php b/includes/resourceloader/ResourceLoaderStartUpModule.php
index 0416c8550d..4777545d23 100644
--- a/includes/resourceloader/ResourceLoaderStartUpModule.php
+++ b/includes/resourceloader/ResourceLoaderStartUpModule.php
@@ -336,7 +336,7 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule {
 	 * @return array
 	 */
 	public static function getStartupModules() {
-		return [ 'jquery', 'mediawiki' ];
+		return [ 'jquery', 'mediawiki', 'mediawiki.base' ];
 	}
 
 	public static function getLegacyModules() {
diff --git a/maintenance/jsduck/eg-iframe.html b/maintenance/jsduck/eg-iframe.html
index f19a69b34b..8475dcaf4e 100644
--- a/maintenance/jsduck/eg-iframe.html
+++ b/maintenance/jsduck/eg-iframe.html
@@ -43,8 +43,8 @@
 	</script>
 	<script src="modules/lib/jquery/jquery.js"></script>
 	<script src="modules/src/mediawiki/mediawiki.js"></script>
-	<script src="modules/src/mediawiki/mediawiki.base.js"></script>
-	<script src="modules/src/mediawiki/mediawiki.errorLogger.js"></script>
+	<script src="modules/src/mediawiki.base/mediawiki.base.js"></script>
+	<script src="modules/src/mediawiki.base/mediawiki.errorLogger.js"></script>
 	<script src="modules/lib/oojs/oojs.jquery.js"></script>
 	<script src="modules/lib/oojs-ui/oojs-ui-core.js"></script>
 	<script src="modules/lib/oojs-ui/oojs-ui-widgets.js"></script>
diff --git a/resources/Resources.php b/resources/Resources.php
index b7ecd10c61..258434e8e1 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -848,12 +848,18 @@ return [
 		'scripts' => [
 			'resources/src/mediawiki/mediawiki.js',
 			'resources/src/mediawiki/mediawiki.requestIdleCallback.js',
-			'resources/src/mediawiki/mediawiki.errorLogger.js',
-			'resources/src/mediawiki/mediawiki.base.js',
 		],
 		'debugScripts' => 'resources/src/mediawiki/mediawiki.log.js',
 		'targets' => [ 'desktop', 'mobile' ],
 	],
+	'mediawiki.base' => [
+		// Keep in sync with maintenance/jsduck/eg-iframe.html
+		'scripts' => [
+			'resources/src/mediawiki.base/mediawiki.errorLogger.js',
+			'resources/src/mediawiki.base/mediawiki.base.js',
+		],
+		'targets' => [ 'desktop', 'mobile' ],
+	],
 	'mediawiki.apihelp' => [
 		'styles' => 'resources/src/mediawiki.apihelp.css',
 		'targets' => [ 'desktop' ],
diff --git a/resources/src/mediawiki/mediawiki.base.js b/resources/src/mediawiki.base/mediawiki.base.js
similarity index 100%
rename from resources/src/mediawiki/mediawiki.base.js
rename to resources/src/mediawiki.base/mediawiki.base.js
diff --git a/resources/src/mediawiki/mediawiki.errorLogger.js b/resources/src/mediawiki.base/mediawiki.errorLogger.js
similarity index 100%
rename from resources/src/mediawiki/mediawiki.errorLogger.js
rename to resources/src/mediawiki.base/mediawiki.errorLogger.js
-- 
2.20.1