From 594e4cbabfa2e64ee89b124302500f490aef8d8c Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Sun, 17 Nov 2024 18:11:10 -0500 Subject: [PATCH] Use Composer directly for SCT extensions --- Dockerfile | 2 -- composer.json | 61 +++++---------------------------------------------- 2 files changed, 5 insertions(+), 58 deletions(-) diff --git a/Dockerfile b/Dockerfile index a9ce8ea..424ce8f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -171,12 +171,10 @@ RUN set -eux; \ mv /var/www/mediawiki/extensions/Mediasearch /var/www/mediawiki/extensions/MediaSearch; \ mv /var/www/mediawiki/extensions/Revisionslider /var/www/mediawiki/extensions/RevisionSlider; \ mv /var/www/mediawiki/extensions/Rss /var/www/mediawiki/extensions/RSS; \ - mv /var/www/mediawiki/extensions/Shortdescription /var/www/mediawiki/extensions/ShortDescription; \ mv /var/www/mediawiki/extensions/Vipsscaler /var/www/mediawiki/extensions/VipsScaler; \ mv /var/www/mediawiki/extensions/Webauthn /var/www/mediawiki/extensions/WebAuthn; \ mv /var/www/mediawiki/extensions/Twocolconflict /var/www/mediawiki/extensions/TwoColConflict; \ mv /var/www/mediawiki/extensions/Pageviewinfo /var/www/mediawiki/extensions/PageViewInfo; \ - mv /var/www/mediawiki/extensions/Floatingui /var/www/mediawiki/extensions/FloatingUI; \ \ cp /var/www/mediawiki/extensions/PictureHtmlSupport/includes/ThumbnailImage.php /var/www/mediawiki/includes/media/ThumbnailImage.php; \ chown -R www-data:www-data /var/www diff --git a/composer.json b/composer.json index 8b5aa3a..1786195 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,6 @@ "mediawiki/babel": "2023.12", "mediawiki/checkuser": "1.39.0", "mediawiki/cirrus-search": "1.39.0", - "starcitizentools/citizen-skin": "dev-main", "mediawiki/cldr": "2023.12", "mediawiki/code-mirror": "1.39.0", "mediawiki/commons-metadata": "1.39.0", @@ -30,8 +29,6 @@ "mediawiki/revisionslider": "1.39.0", "mediawiki/rss": "1.39.0", "mediawiki/sandbox-link": "1.39.0", - "mediawiki/shortdescription": "1.39.0", - "mediawiki/tabber-neue": "1.39.0", "mediawiki/template-styles": "1.39.0", "octfx/template-styles-extender": "dev-develop", "mediawiki/thanks": "1.39.0", @@ -52,9 +49,12 @@ "mediawiki/semantic-drilldown": "1.39.0", "starcitizenwiki/apiunto": "dev-develop", "mediawiki/pageviewinfo": "1.39.0", - "mediawiki/floatingui": "1.39.0", "octfx/webp": "dev-develop", - "starcitizenwiki/picture-html-support": "dev-master" + "starcitizenwiki/picture-html-support": "dev-master", + "starcitizentools/citizen-skin": "dev-main", + "starcitizentools/floating-ui": "dev-main", + "starcitizentools/short-description": "dev-main", + "starcitizentools/tabber-neue": "dev-main" }, "extra": { "merge-plugin": { @@ -174,23 +174,6 @@ } } }, - { - "type": "package", - "package": { - "name": "mediawiki/shortdescription", - "type": "mediawiki-extension", - "version": "1.39.0", - "dist": { - "url": "https://github.com/StarCitizenTools/mediawiki-extensions-ShortDescription/archive/master.zip", - "type": "zip" - }, - "source": { - "type": "git", - "url": "https://github.com/StarCitizenTools/mediawiki-extensions-ShortDescription.git", - "reference": "master" - } - } - }, { "type": "package", "package": { @@ -565,23 +548,6 @@ } } }, - { - "type": "package", - "package": { - "name": "mediawiki/tabber-neue", - "type": "mediawiki-extension", - "version": "1.39.0", - "dist": { - "url": "https://github.com/StarCitizenTools/mediawiki-extensions-TabberNeue/archive/main.zip", - "type": "zip" - }, - "source": { - "type": "git", - "url": "https://github.com/StarCitizenTools/mediawiki-extensions-TabberNeue.git", - "reference": "main" - } - } - }, { "type": "package", "package": { @@ -683,23 +649,6 @@ "reference": "REL1_39" } } - }, - { - "type": "package", - "package": { - "name": "mediawiki/floatingui", - "type": "mediawiki-extension", - "version": "1.39.0", - "dist": { - "url": "https://github.com/StarCitizenTools/mediawiki-extensions-FloatingUI/archive/main.zip", - "type": "zip" - }, - "source": { - "type": "git", - "url": "https://github.com/StarCitizenTools/mediawiki-extensions-FloatingUI.git", - "reference": "main" - } - } } ] }