From 3f58fe541fedb8a0f245a6b1bb43b4f21f144e2e Mon Sep 17 00:00:00 2001
From: Timo Tijhof <krinklemail@gmail.com>
Date: Wed, 28 Aug 2019 02:17:30 +0100
Subject: [PATCH] resourceloader: Move mw.user skeleton from startup to base

This isn't required for mw.loader to be able to process the manifest
and fetch modules, so it doesn't need to be shipped there.

Follows-up T192623, in which we didn't notice this.

Similar to 46cd3ed7a7, which moved mw.libs and mw.widgets.

Change-Id: I2d07d8c411d93a6abedd50bf67ca6bf75f93a8c6
---
 .../src/mediawiki.base/mediawiki.base.js      | 16 ++++++++++++++++
 resources/src/startup/mediawiki.js            | 19 +------------------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/resources/src/mediawiki.base/mediawiki.base.js b/resources/src/mediawiki.base/mediawiki.base.js
index 4c8880cf7d..415cabd39d 100644
--- a/resources/src/mediawiki.base/mediawiki.base.js
+++ b/resources/src/mediawiki.base/mediawiki.base.js
@@ -711,6 +711,22 @@
 			} );
 	};
 
+	// Skeleton user object, extended by the 'mediawiki.user' module.
+	/**
+	 * @class mw.user
+	 * @singleton
+	 */
+	mw.user = {
+		/**
+		 * @property {mw.Map}
+		 */
+		options: new mw.Map(),
+		/**
+		 * @property {mw.Map}
+		 */
+		tokens: new mw.Map()
+	};
+
 	// Alias $j to jQuery for backwards compatibility
 	// @deprecated since 1.23 Use $ or jQuery instead
 	mw.log.deprecate( window, '$j', $, 'Use $ or jQuery instead.' );
diff --git a/resources/src/startup/mediawiki.js b/resources/src/startup/mediawiki.js
index a4ee488885..3347cd4393 100644
--- a/resources/src/startup/mediawiki.js
+++ b/resources/src/startup/mediawiki.js
@@ -2453,24 +2453,7 @@
 					}() )
 				}
 			};
-		}() ),
-
-		// Skeleton user object, extended by the 'mediawiki.user' module.
-		/**
-		 * @class mw.user
-		 * @singleton
-		 */
-		user: {
-			/**
-			 * @property {mw.Map}
-			 */
-			options: new Map(),
-			/**
-			 * @property {mw.Map}
-			 */
-			tokens: new Map()
-		}
-
+		}() )
 	};
 
 	// Attach to window and globally alias
-- 
2.20.1