From f9f20ea662e52dc828c4afcb0574414820cf46bf Mon Sep 17 00:00:00 2001
From: Grant Slater <github@firefishy.com>
Date: Thu, 2 Jul 2026 13:10:01 +0100
Subject: [PATCH] mediawiki: Prep skins and extensions for v1.46

---
 cookbooks/mediawiki/resources/site.rb         | 116 +++++++++++++++---
 .../templates/default/composer.local.json.erb |  28 ++---
 2 files changed, 107 insertions(+), 37 deletions(-)

diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb
index 645bc2403..68b465dec 100644
--- a/cookbooks/mediawiki/resources/site.rb
+++ b/cookbooks/mediawiki/resources/site.rb
@@ -23,7 +23,7 @@ default_action :create
 
 property :site, :kind_of => String, :name_property => true
 property :aliases, :kind_of => [String, Array]
-property :version, :kind_of => String, :default => "1.39"
+property :version, :kind_of => String, :default => "1.43"
 property :database_name, :kind_of => String, :required => true
 property :database_user, :kind_of => String, :required => [:create, :update]
 property :database_password, :kind_of => String, :required => [:create, :update]
@@ -223,6 +223,17 @@ action :create do
     legacy false
   end
 
+  if new_resource.version.to_f >= 1.46
+    # Skins that are included in MediaWiki in 1.46 release package, but not enabled by default.
+    # Review skin documentation before enabling these skins.
+
+    # mediawiki_skin "Timeless" do
+    #   site new_resource.site
+    #   update_site false
+    #   legacy false
+    # end
+  end
+
   mediawiki_extension "Cite" do
     site new_resource.site
     update_site false
@@ -264,10 +275,13 @@ action :create do
     update_site false
   end
 
-  mediawiki_extension "Interwiki" do
-    site new_resource.site
-    template "mw-ext-Interwiki.inc.php.erb"
-    update_site false
+  if new_resource.version.to_f < 1.46
+    # Interwiki extension moved to MediaWiki Core in 1.46
+    mediawiki_extension "Interwiki" do
+      site new_resource.site
+      template "mw-ext-Interwiki.inc.php.erb"
+      update_site false
+    end
   end
 
   mediawiki_extension "Nuke" do
@@ -298,12 +312,6 @@ action :create do
     update_site false
   end
 
-  mediawiki_extension "SimpleAntiSpam" do
-    site new_resource.site
-    update_site false
-    action :delete
-  end
-
   mediawiki_extension "SpamBlacklist" do
     site new_resource.site
     template "mw-ext-SpamBlacklist.inc.php.erb"
@@ -350,12 +358,6 @@ action :create do
     update_site false
   end
 
-  # Extension has been archived: https://www.mediawiki.org/wiki/Extension:LocalisationUpdate
-  mediawiki_extension "LocalisationUpdate" do
-    site new_resource.site
-    action :delete
-  end
-
   # mediawiki_extension "Translate" do
   #   site new_resource.site
   #   template "mw-ext-Translate.inc.php.erb"
@@ -434,6 +436,86 @@ action :create do
     update_site false
   end
 
+  if new_resource.version.to_f >= 1.46
+    # Extensions that are included in MediaWiki in 1.46 release package, but not enabled by default.
+    # Review extension documentation before enabling these extensions.
+
+    # mediawiki_extension "CodeEditor" do
+    #   site new_resource.site
+    #   update_site false
+    # end
+
+    # mediawiki_extension "DiscussionTools" do
+    #   site new_resource.site
+    #   update_site false
+    # end
+
+    # mediawiki_extension "Echo" do
+    #   site new_resource.site
+    #   update_site false
+    # end
+
+    # mediawiki_extension "Linter" do
+    #   site new_resource.site
+    #   update_site false
+    # end
+
+    # mediawiki_extension "LoginNotify" do
+    #   site new_resource.site
+    #   update_site false
+    # end
+
+    # mediawiki_extension "Math" do
+    #   site new_resource.site
+    #   update_site false
+    # end
+
+    # mediawiki_extension "MultimediaViewer" do
+    #   site new_resource.site
+    #   update_site false
+    # end
+
+    # mediawiki_extension "OATHAuth" do
+    #   site new_resource.site
+    #   update_site false
+    # end
+
+    # mediawiki_extension "PageImages" do
+    #   site new_resource.site
+    #   update_site false
+    # end
+
+    # mediawiki_extension "ReplaceText" do
+    #   site new_resource.site
+    #   update_site false
+    # end
+
+    # mediawiki_extension "Scribunto" do
+    #   site new_resource.site
+    #   update_site false
+    # end
+
+    # mediawiki_extension "SecureLinkFixer" do
+    #   site new_resource.site
+    #   update_site false
+    # end
+
+    # mediawiki_extension "TemplateStyles" do
+    #   site new_resource.site
+    #   update_site false
+    # end
+
+    # mediawiki_extension "TextExtracts" do
+    #   site new_resource.site
+    #   update_site false
+    # end
+
+    # mediawiki_extension "Thanks" do
+    #   site new_resource.site
+    #   update_site false
+    # end
+  end
+
   if new_resource.commons
     mediawiki_extension "QuickInstantCommons" do
       site new_resource.site
diff --git a/cookbooks/mediawiki/templates/default/composer.local.json.erb b/cookbooks/mediawiki/templates/default/composer.local.json.erb
index 37382c5f6..f4f1998eb 100644
--- a/cookbooks/mediawiki/templates/default/composer.local.json.erb
+++ b/cookbooks/mediawiki/templates/default/composer.local.json.erb
@@ -1,22 +1,10 @@
 {
-  "extra": {
-    "merge-plugin": {
-      "include": [
-        "extensions/*/composer.json",
-        "skins/*/composer.json"
-      ]
-    }
-  },
-  "require": {
-<% if @version.to_f < 1.43 -%>
-    "guzzlehttp/psr7": "2.4.5",
-    "data-values/common": "1.0.0",
-    "data-values/data-values": "3.0.0",
-    "data-values/geo": "4.2.3",
-    "data-values/interfaces": "1.0.0",
-    "data-values/number": "0.11.1",
-    "data-values/serialization": "1.2.4",
-    "data-values/time": "1.0.4"
-<% end -%>
-  }
+	"extra": {
+		"merge-plugin": {
+			"include": [
+				"extensions/*/composer.json",
+				"skins/*/composer.json"
+			]
+		}
+	}
 }
-- 
2.47.3