From e76d5367330bd313149323d3167545d3c585cf0f Mon Sep 17 00:00:00 2001
From: Jon Robson <jdlrobson@gmail.com>
Date: Thu, 7 Nov 2024 09:29:11 -0800
Subject: [PATCH] Drop message box styling modules from page load

The skins.minerva.messageBox.styles module is loaded on pages with
old revisions, but this message box is already being styled by another
module added by core.

Skins are not responsible for styling Codex. This is the responsibility
of the code that adds the message box to the page.

In addition to this we were loading another set of styles for message boxes
on skins.minerva.codex.styles

Bug: T375287
Change-Id: I0cf5dc6baf2e447b4944f04365addd614d59cfbe
---
 includes/Skins/SkinMinerva.php | 10 ----------
 skin.json                      | 12 +-----------
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/includes/Skins/SkinMinerva.php b/includes/Skins/SkinMinerva.php
index a10cd9e92..8cd9fd369 100644
--- a/includes/Skins/SkinMinerva.php
+++ b/includes/Skins/SkinMinerva.php
@@ -1077,16 +1077,6 @@ class SkinMinerva extends SkinMustache {
 		$requestAction = $this->getActionName();
 		$viewAction = $requestAction === 'view';
 
-		// Warning box styles are needed when reviewing old revisions
-		// and inside the fallback editor styles to action=edit page.
-		if (
-			$title->getNamespace() !== NS_MAIN ||
-			$request->getCheck( 'oldid' ) ||
-			!$viewAction
-		) {
-			$styles[] = 'skins.minerva.messageBox.styles';
-		}
-
 		if ( $title->isMainPage() ) {
 			$styles[] = 'skins.minerva.mainPage.styles';
 		} elseif ( $this->skinUserPageHelper->isUserPage() ) {
diff --git a/skin.json b/skin.json
index 1cf4aefdc..0b1d30077 100644
--- a/skin.json
+++ b/skin.json
@@ -489,7 +489,6 @@
 				"skins.minerva.mainMenu.icons",
 				"skins.minerva.mainMenu.styles",
 				"mediawiki.cookie",
-				"skins.minerva.messageBox.styles",
 				"mediawiki.util",
 				"mediawiki.router",
 				"mediawiki.Title",
@@ -560,13 +559,6 @@
 				"watchstar.js"
 			]
 		},
-		"skins.minerva.messageBox.styles": {
-			"class": "MediaWiki\\ResourceLoader\\CodexModule",
-			"codexStyleOnly": true,
-			"codexComponents": [
-				"CdxMessage"
-			]
-		},
 		"skins.minerva.categories.styles": {
 			"class": "MediaWiki\\ResourceLoader\\SkinModule",
 			"features": [
@@ -577,8 +569,7 @@
 			"class": "MediaWiki\\ResourceLoader\\CodexModule",
 			"codexStyleOnly": true,
 			"codexComponents": [
-				"CdxButton",
-				"CdxMessage"
+				"CdxButton"
 			]
 		}
 	},
@@ -587,7 +578,6 @@
 		"remoteSkinPath": "MinervaNeue/tests/qunit/skins.minerva.scripts",
 		"dependencies": [
 			"mediawiki.cookie",
-			"skins.minerva.messageBox.styles",
 			"skins.minerva.scripts",
 			"mobile.startup",
 			"mediawiki.user",