From 37333c71890cf91166bc1cf1049622fd6871be89 Mon Sep 17 00:00:00 2001
From: Stephen Niedzielski <stephen@niedzielski.com>
Date: Thu, 6 Dec 2018 22:46:46 +0000
Subject: [PATCH] Hygiene: collapse mobile.search* into mobile.startup

MinervaNeue depends on mobile.search and mobile.search.api. These
ResourceLoader modules existed in MobileFrontend but now have been
collapsed into mobile.startup.

This patch updates Minerva's ResourceLoader module and JavaScript
references.

Bug: T210207
Depends-On: I1eae36f2927a4e0f9d1e91d604d656beb8cc33ae
Change-Id: Ied6f4873bf2550564673296e9ef4fa009ca45e5b
---
 resources/skins.minerva.scripts/search.js | 8 +++++---
 skin.json                                 | 2 --
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/skins.minerva.scripts/search.js b/resources/skins.minerva.scripts/search.js
index 136f3eb..51e51ef 100644
--- a/resources/skins.minerva.scripts/search.js
+++ b/resources/skins.minerva.scripts/search.js
@@ -1,8 +1,10 @@
 ( function ( M ) {
-	var SearchOverlay = M.require( 'mobile.search/SearchOverlay' ),
-		SearchGateway = M.require( 'mobile.search.api/SearchGateway' ),
+	var
+		client = M.require( 'mobile.startup' ),
+		SearchOverlay = client.search.SearchOverlay,
+		SearchGateway = client.search.SearchGateway,
 		overlayManager = M.require( 'skins.minerva.scripts/overlayManager' ),
-		searchLogger = M.require( 'mobile.search/MobileWebSearchLogger' ),
+		searchLogger = client.search.MobileWebSearchLogger,
 		searchInput = $( '#searchInput' ),
 		placeholder = searchInput.attr( 'placeholder' ),
 		searchRoute = new RegExp( /\/search/ ),
diff --git a/skin.json b/skin.json
index 1a4328c..d0ab272 100644
--- a/skin.json
+++ b/skin.json
@@ -396,8 +396,6 @@
 				"mediawiki.Title",
 				"mobile.startup",
 				"skins.minerva.mainMenu",
-				"mobile.search.api",
-				"mobile.search",
 				"mediawiki.user",
 				"mediawiki.storage",
 				"mediawiki.experiments"