From 469c7ad6f257a2dc8135aed4859bd32598dba144 Mon Sep 17 00:00:00 2001
From: lmora <lmora@wikimedia.org>
Date: Tue, 12 Nov 2024 15:43:33 -0600
Subject: [PATCH] Merge Icon Style mergeIconStyleModules

Merging skins.minerva.icons.wikimedia and
skins.minerva.mainMenu.icons modules into
skins.minerva.icons

Bug: T266361
Change-Id: I4095da5a0c6d2cff8ccd1ff1504a2d54635d1828
---
 bundlesize.config.json |  4 ++++
 skin.json              | 41 +++++++++++++++++++++++++++++++++++++----
 2 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/bundlesize.config.json b/bundlesize.config.json
index 3d6ccfc2a..d0826bb59 100644
--- a/bundlesize.config.json
+++ b/bundlesize.config.json
@@ -23,6 +23,10 @@
 		"resourceModule": "skins.minerva.mainMenu.icons",
 		"maxSize": "0.4KB"
 	},
+	{
+		"resourceModule": "skins.minerva.icons",
+		"maxSize": "0.6KB"
+	},
 	{
 		"resourceModule": "skins.minerva.mainMenu.styles",
 		"maxSize": "1.1KB"
diff --git a/skin.json b/skin.json
index cb279f589..2cf6cc423 100644
--- a/skin.json
+++ b/skin.json
@@ -145,8 +145,7 @@
 						"skins.minerva.content.styles.images",
 						"mediawiki.hlist",
 						"skins.minerva.codex.styles",
-						"skins.minerva.icons.wikimedia",
-						"skins.minerva.mainMenu.icons"
+						"skins.minerva.icons"
 					],
 					"messages": [
 						"variants",
@@ -412,7 +411,40 @@
 				"userGroup"
 			]
 		},
+		"skins.minerva.icons": {
+			"selectorWithoutVariant": ".minerva-icon--{name}",
+			"useDataURI": false,
+			"defaultColor": "#54595d",
+			"class": "MediaWiki\\ResourceLoader\\OOUIIconPackModule",
+			"variants": [],
+			"useMaskImage": true,
+			"icons": [
+				"edit",
+				"wikiText",
+				"editLock",
+				"history",
+				"language",
+				"menu",
+				"search",
+				"userAvatar",
+				"userTalk",
+				"star",
+				"halfStar",
+				"unStar",
+				"die",
+				"heart",
+				"home",
+				"logIn",
+				"logOut",
+				"mapPin",
+				"settings",
+				"userContributions",
+				"unStar",
+				"watchlist"
+			]
+		},
 		"skins.minerva.icons.wikimedia": {
+			"deprecated": "Retained for caching reasons. Please use skins.minerva.icons instead.",
 			"selectorWithoutVariant": ".minerva-icon--{name}",
 			"useDataURI": false,
 			"defaultColor": "#54595d",
@@ -469,6 +501,7 @@
 			"useDataURI": false
 		},
 		"skins.minerva.mainMenu.icons": {
+			"deprecated": "Retained for caching reasons. Please use skins.minerva.icons instead.",
 			"class": "MediaWiki\\ResourceLoader\\OOUIIconPackModule",
 			"variants": [],
 			"useMaskImage": true,
@@ -503,8 +536,8 @@
 			"localBasePath": "resources/skins.minerva.scripts",
 			"remoteSkinPath": "MinervaNeue/resources/skins.minerva.scripts",
 			"dependencies": [
-				"skins.minerva.mainMenu.icons",
-				"skins.minerva.mainMenu.styles",
+				"skins.minerva.icons",
+				"skins.minerva.styles",
 				"mediawiki.cookie",
 				"skins.minerva.messageBox.styles",
 				"mediawiki.util",