dépôts / lhc / web / wiklou.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge "Convert content.externallinks.css to less"
[lhc/web/wiklou.git] / resources / Resources.php
diff --git a/resources/Resources.php b/resources/Resources.php
index fb24c39..ddcf11a 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -132,7 +132,7 @@ return [
 
        'mediawiki.skinning.content.externallinks' => [
                'styles' => [
-                       'resources/src/mediawiki.skinning/content.externallinks.css' => [ 'media' => 'screen' ],
+                       'resources/src/mediawiki.skinning/content.externallinks.less' => [ 'media' => 'screen' ],
                ],
        ],
 
@@ -217,10 +217,6 @@ return [
                'styles' => 'resources/src/jquery/jquery.farbtastic.css',
                'dependencies' => 'jquery.colorUtil',
        ],
-       'jquery.footHovzer' => [
-               'scripts' => 'resources/src/jquery/jquery.footHovzer.js',
-               'styles' => 'resources/src/jquery/jquery.footHovzer.css',
-       ],
        'jquery.form' => [
                'scripts' => 'resources/lib/jquery/jquery.form.js',
        ],
@@ -303,8 +299,8 @@ return [
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'jquery.spinner' => [
-               'scripts' => 'resources/src/jquery/jquery.spinner.js',
-               'styles' => 'resources/src/jquery/jquery.spinner.css',
+               'scripts' => 'resources/src/jquery.spinner/spinner.js',
+               'styles' => 'resources/src/jquery.spinner/spinner.css',
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'jquery.jStorage' => [
@@ -321,6 +317,7 @@ return [
                'scripts' => 'resources/src/jquery/jquery.tabIndex.js',
        ],
        'jquery.tablesorter' => [
+               'targets' => [ 'desktop', 'mobile' ],
                'scripts' => 'resources/src/jquery.tablesorter/jquery.tablesorter.js',
                'styles' => 'resources/src/jquery.tablesorter/jquery.tablesorter.less',
                'messages' => [ 'sort-descending', 'sort-ascending' ],
@@ -865,134 +862,133 @@ return [
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.apihelp' => [
-               'styles' => 'resources/src/mediawiki/mediawiki.apihelp.css',
+               'styles' => 'resources/src/mediawiki.apihelp.css',
                'targets' => [ 'desktop' ],
        ],
        'mediawiki.template' => [
-               'scripts' => 'resources/src/mediawiki/mediawiki.template.js',
+               'scripts' => 'resources/src/mediawiki.template.js',
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.template.mustache' => [
                'scripts' => [
                        'resources/lib/mustache/mustache.js',
-                       'resources/src/mediawiki/mediawiki.template.mustache.js',
+                       'resources/src/mediawiki.template.mustache.js',
                ],
                'targets' => [ 'desktop', 'mobile' ],
                'dependencies' => 'mediawiki.template',
        ],
        'mediawiki.template.regexp' => [
-               'scripts' => 'resources/src/mediawiki/mediawiki.template.regexp.js',
+               'scripts' => 'resources/src/mediawiki.template.regexp.js',
                'targets' => [ 'desktop', 'mobile' ],
                'dependencies' => 'mediawiki.template',
        ],
        'mediawiki.apipretty' => [
-               'styles' => 'resources/src/mediawiki/mediawiki.apipretty.css',
+               'styles' => 'resources/src/mediawiki.apipretty.css',
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.api' => [
-               'scripts' => 'resources/src/mediawiki/api.js',
+               'scripts' => [
+                       'resources/src/mediawiki.api/index.js',
+                       'resources/src/mediawiki.api/category.js',
+                       'resources/src/mediawiki.api/edit.js',
+                       'resources/src/mediawiki.api/login.js',
+                       'resources/src/mediawiki.api/messages.js',
+                       'resources/src/mediawiki.api/options.js',
+                       'resources/src/mediawiki.api/parse.js',
+                       'resources/src/mediawiki.api/rollback.js',
+                       'resources/src/mediawiki.api/upload.js',
+                       'resources/src/mediawiki.api/user.js',
+                       'resources/src/mediawiki.api/watch.js',
+               ],
                'dependencies' => [
+                       'mediawiki.Title',
                        'mediawiki.util',
                        'user.tokens',
                ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.api.category' => [
-               'scripts' => 'resources/src/mediawiki/api/category.js',
-               'dependencies' => [
-                       'mediawiki.api',
-                       'mediawiki.Title',
-               ],
+               'deprecated' => 'Use "mediawiki.api" instead.',
+               'dependencies' => 'mediawiki.api',
        ],
        'mediawiki.api.edit' => [
-               'scripts' => 'resources/src/mediawiki/api/edit.js',
+               'deprecated' => 'Use "mediawiki.api" instead.',
                'dependencies' => [
                        'mediawiki.api',
-                       'mediawiki.user',
                ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.api.login' => [
-               'scripts' => 'resources/src/mediawiki/api/login.js',
+               'deprecated' => 'Use "mediawiki.api" instead.',
                'dependencies' => 'mediawiki.api',
        ],
        'mediawiki.api.options' => [
-               'scripts' => 'resources/src/mediawiki/api/options.js',
+               'deprecated' => 'Use "mediawiki.api" instead.',
                'dependencies' => 'mediawiki.api',
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.api.parse' => [
-               'scripts' => 'resources/src/mediawiki/api/parse.js',
+               'deprecated' => 'Use "mediawiki.api" instead.',
                'dependencies' => 'mediawiki.api',
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.api.upload' => [
-               'scripts' => 'resources/src/mediawiki/api/upload.js',
-               'dependencies' => [
-                       'mediawiki.api',
-                       'mediawiki.api.edit',
-               ],
+               'deprecated' => 'Use "mediawiki.api" instead.',
+               'dependencies' => 'mediawiki.api',
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.api.user' => [
-               'scripts' => 'resources/src/mediawiki/api/user.js',
-               'dependencies' => [
-                       'mediawiki.api',
-               ],
+               'deprecated' => 'Use "mediawiki.api" instead.',
+               'dependencies' => 'mediawiki.api',
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.api.watch' => [
-               'scripts' => 'resources/src/mediawiki/api/watch.js',
-               'dependencies' => [
-                       'mediawiki.api',
-               ],
+               'deprecated' => 'Use "mediawiki.api" instead.',
+               'dependencies' => 'mediawiki.api',
        ],
        'mediawiki.api.messages' => [
-               'scripts' => 'resources/src/mediawiki/api/messages.js',
-               'dependencies' => [
-                       'mediawiki.api',
-               ],
+               'deprecated' => 'Use "mediawiki.api" instead.',
+               'dependencies' => 'mediawiki.api',
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.api.rollback' => [
-               'scripts' => 'resources/src/mediawiki/api/rollback.js',
-               'dependencies' => [
-                       'mediawiki.api',
-               ],
+               'deprecated' => 'Use "mediawiki.api" instead.',
+               'dependencies' => 'mediawiki.api',
        ],
        'mediawiki.content.json' => [
-               'styles' => 'resources/src/mediawiki/mediawiki.content.json.less',
+               'styles' => 'resources/src/mediawiki.content.json.less',
        ],
        'mediawiki.confirmCloseWindow' => [
                'scripts' => [
-                       'resources/src/mediawiki/mediawiki.confirmCloseWindow.js',
+                       'resources/src/mediawiki.confirmCloseWindow.js',
                ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.debug' => [
                'scripts' => [
-                       'resources/src/mediawiki/mediawiki.debug.js',
+                       'resources/src/mediawiki.debug/jquery.footHovzer.js',
+                       'resources/src/mediawiki.debug/debug.js',
                ],
                'styles' => [
-                       'resources/src/mediawiki/mediawiki.debug.less',
+                       'resources/src/mediawiki.debug/jquery.footHovzer.css',
+                       'resources/src/mediawiki.debug/debug.less',
                ],
                'dependencies' => [
-                       'jquery.footHovzer',
                        'oojs-ui-core',
                ],
        ],
        'mediawiki.diff.styles' => [
                'styles' => [
-                       'resources/src/mediawiki/mediawiki.diff.styles.css',
-                       'resources/src/mediawiki/mediawiki.diff.styles.print.css' => [
+                       'resources/src/mediawiki.diff.styles/diff.css',
+                       'resources/src/mediawiki.diff.styles/print.css' => [
                                'media' => 'print'
                        ],
                ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.feedback' => [
-               'scripts' => 'resources/src/mediawiki/mediawiki.feedback.js',
-               'styles' => 'resources/src/mediawiki/mediawiki.feedback.css',
+               'scripts' => 'resources/src/mediawiki.feedback/feedback.js',
+               'styles' => 'resources/src/mediawiki.feedback/feedback.css',
                'dependencies' => [
                        'mediawiki.messagePoster',
                        'mediawiki.Title',
@@ -1026,11 +1022,11 @@ return [
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.feedlink' => [
-               'styles' => 'resources/src/mediawiki/mediawiki.feedlink.css',
+               'styles' => 'resources/src/mediawiki.feedlink/feedlink.css',
        ],
        'mediawiki.filewarning' => [
-               'scripts' => 'resources/src/mediawiki/mediawiki.filewarning.js',
-               'styles' => 'resources/src/mediawiki/mediawiki.filewarning.less',
+               'scripts' => 'resources/src/mediawiki.filewarning/filewarning.js',
+               'styles' => 'resources/src/mediawiki.filewarning/filewarning.less',
                'dependencies' => [
                        'oojs-ui-core',
                        'oojs-ui.styles.icons-alerts',
@@ -1043,7 +1039,7 @@ return [
                'dependencies' => 'mediawiki.ForeignApi.core',
        ],
        'mediawiki.ForeignApi.core' => [
-               'scripts' => 'resources/src/mediawiki/ForeignApi.js',
+               'scripts' => 'resources/src/mediawiki.ForeignApi.core.js',
                'dependencies' => [
                        'mediawiki.api',
                        'oojs',
@@ -1052,36 +1048,36 @@ return [
        ],
        'mediawiki.helplink' => [
                'styles' => [
-                       'resources/src/mediawiki/mediawiki.helplink.less',
+                       'resources/src/mediawiki.helplink/helplink.less',
                ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.hidpi' => [
-               'scripts' => 'resources/src/mediawiki/mediawiki.hidpi.js',
+               'scripts' => 'resources/src/mediawiki.hidpi/hidpi.js',
                'dependencies' => 'jquery.hidpi',
-               'skipFunction' => 'resources/src/mediawiki.hidpi-skip.js',
+               'skipFunction' => 'resources/src/mediawiki.hidpi/skip.js',
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.hlist' => [
                'targets' => [ 'desktop', 'mobile' ],
                'styles' => [
-                       'resources/src/mediawiki/mediawiki.hlist-allskins.less',
+                       'resources/src/mediawiki.hlist/hlist.less',
                ],
                'skinStyles' => [
-                       'default' => 'resources/src/mediawiki/mediawiki.hlist.css',
+                       'default' => 'resources/src/mediawiki.hlist/default.css',
                ],
        ],
        'mediawiki.htmlform' => [
                'scripts' => [
-                       'resources/src/mediawiki/htmlform/htmlform.js',
-                       'resources/src/mediawiki/htmlform/autocomplete.js',
-                       'resources/src/mediawiki/htmlform/autoinfuse.js',
-                       'resources/src/mediawiki/htmlform/checkmatrix.js',
-                       'resources/src/mediawiki/htmlform/cloner.js',
-                       'resources/src/mediawiki/htmlform/hide-if.js',
-                       'resources/src/mediawiki/htmlform/multiselect.js',
-                       'resources/src/mediawiki/htmlform/selectandother.js',
-                       'resources/src/mediawiki/htmlform/selectorother.js',
+                       'resources/src/mediawiki.htmlform/htmlform.js',
+                       'resources/src/mediawiki.htmlform/autocomplete.js',
+                       'resources/src/mediawiki.htmlform/autoinfuse.js',
+                       'resources/src/mediawiki.htmlform/checkmatrix.js',
+                       'resources/src/mediawiki.htmlform/cloner.js',
+                       'resources/src/mediawiki.htmlform/hide-if.js',
+                       'resources/src/mediawiki.htmlform/multiselect.js',
+                       'resources/src/mediawiki.htmlform/selectandother.js',
+                       'resources/src/mediawiki.htmlform/selectorother.js',
                ],
                'dependencies' => [
                        'mediawiki.RegExp',
@@ -1096,7 +1092,7 @@ return [
        ],
        'mediawiki.htmlform.checker' => [
                'scripts' => [
-                       'resources/src/mediawiki/htmlform/htmlform.Checker.js',
+                       'resources/src/mediawiki.htmlform.checker.js',
                ],
                'dependencies' => [
                        'jquery.throttle-debounce',
@@ -1105,7 +1101,7 @@ return [
        ],
        'mediawiki.htmlform.ooui' => [
                'scripts' => [
-                       'resources/src/mediawiki/htmlform/htmlform.Element.js',
+                       'resources/src/mediawiki.htmlform.ooui/Element.js',
                ],
                'dependencies' => [
                        'oojs-ui-core',
@@ -1113,19 +1109,19 @@ return [
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.htmlform.styles' => [
-               'styles' => 'resources/src/mediawiki/htmlform/styles.css',
+               'styles' => 'resources/src/mediawiki.htmlform.styles/styles.css',
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.htmlform.ooui.styles' => [
-               'styles' => 'resources/src/mediawiki/htmlform/ooui.styles.less',
+               'styles' => 'resources/src/mediawiki.htmlform.ooui.styles.less',
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.icon' => [
-               'styles' => 'resources/src/mediawiki/mediawiki.icon.less',
+               'styles' => 'resources/src/mediawiki.icon/icon.less',
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.inspect' => [
-               'scripts' => 'resources/src/mediawiki/mediawiki.inspect.js',
+               'scripts' => 'resources/src/mediawiki.inspect.js',
                'dependencies' => [
                        'mediawiki.String',
                        'mediawiki.RegExp',
@@ -1134,8 +1130,8 @@ return [
        ],
        'mediawiki.messagePoster' => [
                'scripts' => [
-                       'resources/src/mediawiki.messagePoster/mediawiki.messagePoster.factory.js',
-                       'resources/src/mediawiki.messagePoster/mediawiki.messagePoster.MessagePoster.js',
+                       'resources/src/mediawiki.messagePoster/factory.js',
+                       'resources/src/mediawiki.messagePoster/MessagePoster.js',
                ],
                'dependencies' => [
                        'oojs',
@@ -1146,24 +1142,24 @@ return [
        ],
        'mediawiki.messagePoster.wikitext' => [
                'scripts' => [
-                       'resources/src/mediawiki.messagePoster/mediawiki.messagePoster.WikitextMessagePoster.js',
+                       'resources/src/mediawiki.messagePoster.wikitext/WikitextMessagePoster.js',
                ],
                'dependencies' => [
-                       'mediawiki.api.edit',
+                       'mediawiki.api',
                        'mediawiki.messagePoster',
                ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.notification' => [
                'styles' => [
-                       'resources/src/mediawiki/mediawiki.notification.common.css',
-                       'resources/src/mediawiki/mediawiki.notification.print.css'
+                       'resources/src/mediawiki.notification/common.css',
+                       'resources/src/mediawiki.notification/print.css'
                                => [ 'media' => 'print' ],
                ],
                'skinStyles' => [
-                       'default' => 'resources/src/mediawiki/mediawiki.notification.css',
+                       'default' => 'resources/src/mediawiki.notification/default.css',
                ],
-               'scripts' => 'resources/src/mediawiki/mediawiki.notification.js',
+               'scripts' => 'resources/src/mediawiki.notification/notification.js',
                'dependencies' => [
                        'mediawiki.util',
                        'mediawiki.visibleTimeout',
@@ -1171,37 +1167,37 @@ return [
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.notify' => [
-               'scripts' => 'resources/src/mediawiki/mediawiki.notify.js',
+               'scripts' => 'resources/src/mediawiki.notify.js',
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.notification.convertmessagebox' => [
+               'scripts' => 'resources/src/mediawiki.notification.convertmessagebox.js',
                'dependencies' => [
                        'mediawiki.notification',
                ],
-               'scripts' => 'resources/src/mediawiki/mediawiki.notification.convertmessagebox.js',
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.notification.convertmessagebox.styles' => [
                'styles' => [
-                       'resources/src/mediawiki/mediawiki.notification.convertmessagebox.styles.less',
+                       'resources/src/mediawiki.notification.convertmessagebox.styles.less',
                ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.RegExp' => [
-               'scripts' => 'resources/src/mediawiki/mediawiki.RegExp.js',
+               'scripts' => 'resources/src/mediawiki.RegExp.js',
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.String' => [
-               'scripts' => 'resources/src/mediawiki/mediawiki.String.js',
+               'scripts' => 'resources/src/mediawiki.String.js',
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.pager.tablePager' => [
-               'styles' => 'resources/src/mediawiki/mediawiki.pager.tablePager.less',
+               'styles' => 'resources/src/mediawiki.pager.tablePager/TablePager.less',
        ],
        'mediawiki.searchSuggest' => [
                'targets' => [ 'desktop', 'mobile' ],
-               'scripts' => 'resources/src/mediawiki/mediawiki.searchSuggest.js',
-               'styles' => 'resources/src/mediawiki/mediawiki.searchSuggest.css',
+               'scripts' => 'resources/src/mediawiki.searchSuggest/searchSuggest.js',
+               'styles' => 'resources/src/mediawiki.searchSuggest/searchSuggest.css',
                'messages' => [
                        'searchsuggest-search',
                        'searchsuggest-containing',
@@ -1213,13 +1209,13 @@ return [
                ],
        ],
        'mediawiki.storage' => [
-               'scripts' => 'resources/src/mediawiki/mediawiki.storage.js',
+               'scripts' => 'resources/src/mediawiki.storage.js',
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.Title' => [
                'scripts' => [
-                       'resources/src/mediawiki/mediawiki.Title.js',
-                       'resources/src/mediawiki/mediawiki.Title.phpCharToUpper.js',
+                       'resources/src/mediawiki.Title/Title.js',
+                       'resources/src/mediawiki.Title/phpCharToUpper.js',
                ],
                'dependencies' => [
                        'mediawiki.String',
@@ -1228,13 +1224,13 @@ return [
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.Upload' => [
-               'scripts' => 'resources/src/mediawiki/mediawiki.Upload.js',
+               'scripts' => 'resources/src/mediawiki.Upload.js',
                'dependencies' => [
-                       'mediawiki.api.upload',
+                       'mediawiki.api',
                ],
        ],
        'mediawiki.ForeignUpload' => [
-               'scripts' => 'resources/src/mediawiki/mediawiki.ForeignUpload.js',
+               'scripts' => 'resources/src/mediawiki.ForeignUpload.js',
                'dependencies' => [
                        'mediawiki.ForeignApi',
                        'mediawiki.Upload',
@@ -1250,7 +1246,7 @@ return [
                'class' => ResourceLoaderUploadDialogModule::class,
        ],
        'mediawiki.ForeignStructuredUpload' => [
-               'scripts' => 'resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js',
+               'scripts' => 'resources/src/mediawiki.ForeignStructuredUpload.js',
                'dependencies' => [
                        'mediawiki.ForeignUpload',
                        'mediawiki.ForeignStructuredUpload.config',
@@ -1261,7 +1257,7 @@ return [
        ],
        'mediawiki.Upload.Dialog' => [
                'scripts' => [
-                       'resources/src/mediawiki/mediawiki.Upload.Dialog.js',
+                       'resources/src/mediawiki.Upload.Dialog.js',
                ],
                'dependencies' => [
                        'mediawiki.Upload.BookletLayout',
@@ -1277,10 +1273,10 @@ return [
        ],
        'mediawiki.Upload.BookletLayout' => [
                'scripts' => [
-                       'resources/src/mediawiki/mediawiki.Upload.BookletLayout.js',
+                       'resources/src/mediawiki.Upload.BookletLayout/BookletLayout.js',
                ],
                'styles' => [
-                       'resources/src/mediawiki/mediawiki.Upload.BookletLayout.css',
+                       'resources/src/mediawiki.Upload.BookletLayout/BookletLayout.css',
                ],
                'dependencies' => [
                        'oojs-ui-core',
@@ -1322,15 +1318,15 @@ return [
                ],
        ],
        'mediawiki.ForeignStructuredUpload.BookletLayout' => [
-               'scripts' => 'resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js',
-               'styles' => 'resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.less',
+               'scripts' => 'resources/src/mediawiki.ForeignStructuredUpload.BookletLayout/BookletLayout.js',
+               'styles' => 'resources/src/mediawiki.ForeignStructuredUpload.BookletLayout/BookletLayout.less',
                'dependencies' => [
                        'mediawiki.ForeignStructuredUpload',
                        'mediawiki.Upload.BookletLayout',
                        'mediawiki.widgets.CategoryMultiselectWidget',
                        'mediawiki.widgets.DateInputWidget',
                        'mediawiki.jqueryMsg',
-                       'mediawiki.api.messages',
+                       'mediawiki.api',
                        'moment',
                        'mediawiki.libs.jpegmeta',
                ],
@@ -1347,11 +1343,11 @@ return [
                ],
        ],
        'mediawiki.toc' => [
-               'scripts' => 'resources/src/mediawiki/mediawiki.toc.js',
+               'scripts' => 'resources/src/mediawiki.toc/toc.js',
                'styles' => [
-                       'resources/src/mediawiki/mediawiki.toc.css'
+                       'resources/src/mediawiki.toc/toc.css'
                                => [ 'media' => 'screen' ],
-                       'resources/src/mediawiki/mediawiki.toc.print.css'
+                       'resources/src/mediawiki.toc/print.css'
                                => [ 'media' => 'print' ],
                ],
                'dependencies' => 'mediawiki.cookie',
@@ -1359,19 +1355,18 @@ return [
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.Uri' => [
-               'scripts' => 'resources/src/mediawiki/mediawiki.Uri.js',
+               'scripts' => 'resources/src/mediawiki.Uri/Uri.js',
                'templates' => [
-                       'strict.regexp' => 'resources/src/mediawiki/mediawiki.Uri.strict.regexp',
-                       'loose.regexp' => 'resources/src/mediawiki/mediawiki.Uri.loose.regexp',
+                       'strict.regexp' => 'resources/src/mediawiki.Uri/strict.regexp',
+                       'loose.regexp' => 'resources/src/mediawiki.Uri/loose.regexp',
                ],
                'dependencies' => 'mediawiki.util',
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.user' => [
-               'scripts' => 'resources/src/mediawiki/mediawiki.user.js',
+               'scripts' => 'resources/src/mediawiki.user.js',
                'dependencies' => [
                        'mediawiki.api',
-                       'mediawiki.api.user',
                        'mediawiki.storage',
                        'user.options',
                        'user.tokens',
@@ -1379,7 +1374,7 @@ return [
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.userSuggest' => [
-               'scripts' => 'resources/src/mediawiki/mediawiki.userSuggest.js',
+               'scripts' => 'resources/src/mediawiki.userSuggest.js',
                'dependencies' => [
                        'jquery.suggestions',
                        'mediawiki.api'
@@ -1387,7 +1382,7 @@ return [
        ],
        'mediawiki.util' => [
                'class' => ResourceLoaderMediaWikiUtilModule::class,
-               'scripts' => 'resources/src/mediawiki/mediawiki.util.js',
+               'scripts' => 'resources/src/mediawiki.util.js',
                'dependencies' => [
                        'jquery.accessKeyLabel',
                        'mediawiki.RegExp',
@@ -1396,17 +1391,17 @@ return [
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.viewport' => [
-               'scripts' => 'resources/src/mediawiki/mediawiki.viewport.js',
+               'scripts' => 'resources/src/mediawiki.viewport.js',
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.checkboxtoggle' => [
-               'scripts' => 'resources/src/mediawiki/mediawiki.checkboxtoggle.js',
+               'scripts' => 'resources/src/mediawiki.checkboxtoggle.js',
        ],
        'mediawiki.checkboxtoggle.styles' => [
-               'styles' => 'resources/src/mediawiki/mediawiki.checkboxtoggle.css',
+               'styles' => 'resources/src/mediawiki.checkboxtoggle.styles.css',
        ],
        'mediawiki.cookie' => [
-               'scripts' => 'resources/src/mediawiki/mediawiki.cookie.js',
+               'scripts' => 'resources/src/mediawiki.cookie.js',
                'dependencies' => 'jquery.cookie',
                'targets' => [ 'desktop', 'mobile' ],
        ],
@@ -1417,15 +1412,15 @@ return [
                'dependencies' => 'jquery.textSelection',
        ],
        'mediawiki.experiments' => [
-               'scripts' => 'resources/src/mediawiki/mediawiki.experiments.js',
+               'scripts' => 'resources/src/mediawiki.experiments.js',
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.editfont.styles' => [
-               'styles' => 'resources/src/mediawiki/mediawiki.editfont.less',
+               'styles' => 'resources/src/mediawiki.editfont.less',
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.visibleTimeout' => [
-               'scripts' => 'resources/src/mediawiki/mediawiki.visibleTimeout.js',
+               'scripts' => 'resources/src/mediawiki.visibleTimeout.js',
                'targets' => [ 'desktop', 'mobile' ],
        ],
 
@@ -1641,7 +1636,7 @@ return [
        'mediawiki.jqueryMsg' => [
                // Add data for mediawiki.jqueryMsg, such as allowed tags
                'class' => ResourceLoaderJqueryMsgModule::class,
-               'scripts' => 'resources/src/mediawiki/mediawiki.jqueryMsg.js',
+               'scripts' => 'resources/src/mediawiki.jqueryMsg/mediawiki.jqueryMsg.js',
                'dependencies' => [
                        'mediawiki.util',
                        'mediawiki.language',
@@ -1651,6 +1646,7 @@ return [
        ],
 
        'mediawiki.language.months' => [
+               'targets' => [ 'desktop', 'mobile' ],
                'scripts' => 'resources/src/mediawiki.language/mediawiki.language.months.js',
                'dependencies' => 'mediawiki.language',
                'messages' => array_merge(
@@ -1679,7 +1675,7 @@ return [
        /* MediaWiki Page */
 
        'mediawiki.page.gallery' => [
-               'scripts' => 'resources/src/mediawiki/page/gallery.js',
+               'scripts' => 'resources/src/mediawiki.page.gallery.js',
                'dependencies' => [
                        'mediawiki.page.gallery.styles',
                        'jquery.throttle-debounce',
@@ -1687,13 +1683,13 @@ return [
        ],
        'mediawiki.page.gallery.styles' => [
                'styles' => [
-                       'resources/src/mediawiki/page/gallery.css',
-                       'resources/src/mediawiki/page/gallery.print.css' => [ 'media' => 'print' ],
+                       'resources/src/mediawiki.page.gallery.styles/gallery.css',
+                       'resources/src/mediawiki.page.gallery.styles/print.css' => [ 'media' => 'print' ],
                ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.page.gallery.slideshow' => [
-               'scripts' => 'resources/src/mediawiki/page/gallery-slideshow.js',
+               'scripts' => 'resources/src/mediawiki.page.gallery.slideshow.js',
                'dependencies' => [
                        'mediawiki.api',
                        'mediawiki.Title',
@@ -1708,7 +1704,7 @@ return [
                ]
        ],
        'mediawiki.page.ready' => [
-               'scripts' => 'resources/src/mediawiki/page/ready.js',
+               'scripts' => 'resources/src/mediawiki.page.ready.js',
                'dependencies' => [
                        'jquery.accessKeyLabel',
                        'jquery.checkboxShiftClick',
@@ -1717,11 +1713,11 @@ return [
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.page.startup' => [
-               'scripts' => 'resources/src/mediawiki/page/startup.js',
+               'scripts' => 'resources/src/mediawiki.page.startup.js',
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.page.patrol.ajax' => [
-               'scripts' => 'resources/src/mediawiki/page/patrol.ajax.js',
+               'scripts' => 'resources/src/mediawiki.page.patrol.ajax.js',
                'dependencies' => [
                        'mediawiki.api',
                        'mediawiki.util',
@@ -1737,9 +1733,9 @@ return [
                ],
        ],
        'mediawiki.page.watch.ajax' => [
-               'scripts' => 'resources/src/mediawiki/page/watch.js',
+               'scripts' => 'resources/src/mediawiki.page.watch.ajax.js',
                'dependencies' => [
-                       'mediawiki.api.watch',
+                       'mediawiki.api',
                        'mediawiki.notify',
                        'mediawiki.util',
                        'mediawiki.Title',
@@ -1762,9 +1758,9 @@ return [
                ],
        ],
        'mediawiki.page.rollback' => [
-               'scripts' => 'resources/src/mediawiki/page/rollback.js',
+               'scripts' => 'resources/src/mediawiki.page.rollback.js',
                'dependencies' => [
-                       'mediawiki.api.rollback',
+                       'mediawiki.api',
                        'mediawiki.notify',
                        'mediawiki.util',
                        'jquery.spinner',
@@ -1775,7 +1771,7 @@ return [
                ],
        ],
        'mediawiki.page.image.pagination' => [
-               'scripts' => 'resources/src/mediawiki/page/image-pagination.js',
+               'scripts' => 'resources/src/mediawiki.page.image.pagination.js',
                'dependencies' => [
                        'mediawiki.util',
                        'jquery.spinner',
@@ -1812,7 +1808,6 @@ return [
                        'mediawiki.String',
                        'oojs',
                        'mediawiki.api',
-                       'mediawiki.api.options',
                        'mediawiki.jqueryMsg',
                        'mediawiki.Uri',
                        'mediawiki.user',
@@ -1994,18 +1989,21 @@ return [
        ],
        'mediawiki.special' => [
                'styles' => [
-                       'resources/src/mediawiki.special/mediawiki.special.css',
-                       'resources/src/mediawiki.special/mediawiki.special.userrights.css',
+                       'resources/src/mediawiki.special/special.css',
+                       'resources/src/mediawiki.special/apisandbox.css',
+                       'resources/src/mediawiki.special/comparepages.less',
+                       'resources/src/mediawiki.special/edittags.css',
+                       'resources/src/mediawiki.special/movePage.css',
+                       'resources/src/mediawiki.special/pagesWithProp.css',
+                       'resources/src/mediawiki.special/upload.css',
+                       'resources/src/mediawiki.special/userrights.css',
+                       'resources/src/mediawiki.special/watchlist.css',
                ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
-       'mediawiki.special.apisandbox.styles' => [
-               'targets' => [ 'desktop', 'mobile' ],
-               'styles' => 'resources/src/mediawiki.special/mediawiki.special.apisandbox.top.css',
-       ],
        'mediawiki.special.apisandbox' => [
-               'styles' => 'resources/src/mediawiki.special/mediawiki.special.apisandbox.css',
-               'scripts' => 'resources/src/mediawiki.special/mediawiki.special.apisandbox.js',
+               'styles' => 'resources/src/mediawiki.special.apisandbox/apisandbox.css',
+               'scripts' => 'resources/src/mediawiki.special.apisandbox/apisandbox.js',
                'targets' => [ 'desktop', 'mobile' ],
                'dependencies' => [
                        'mediawiki.api',
@@ -2034,6 +2032,7 @@ return [
                        'apisandbox-dynamic-parameters-add-label',
                        'apisandbox-dynamic-parameters-add-placeholder',
                        'apisandbox-dynamic-error-exists',
+                       'apisandbox-templated-parameter-reason',
                        'apisandbox-deprecated-parameters',
                        'apisandbox-no-parameters',
                        'api-help-param-limit',
@@ -2070,10 +2069,13 @@ return [
                        'apisandbox-multivalue-all-values',
                        'api-format-prettyprint-status',
                        'blanknamespace',
+                       'comma-separator',
+                       'word-separator',
+                       'and'
                ],
        ],
        'mediawiki.special.block' => [
-               'scripts' => 'resources/src/mediawiki.special/mediawiki.special.block.js',
+               'scripts' => 'resources/src/mediawiki.special.block.js',
                'dependencies' => [
                        'oojs-ui-core',
                        'oojs-ui.styles.icons-editing-core',
@@ -2086,7 +2088,7 @@ return [
                ],
        ],
        'mediawiki.special.changecredentials.js' => [
-               'scripts' => 'resources/src/mediawiki.special/mediawiki.special.changecredentials.js',
+               'scripts' => 'resources/src/mediawiki.special.changecredentials.js',
                'dependencies' => [
                        'mediawiki.api',
                        'mediawiki.htmlform.ooui'
@@ -2094,39 +2096,33 @@ return [
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.special.changeslist' => [
-               'styles' => 'resources/src/mediawiki.special/mediawiki.special.changeslist.css',
+               'styles' => 'resources/src/mediawiki.special.changeslist.css',
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.special.changeslist.enhanced' => [
-               'styles' => 'resources/src/mediawiki.special/mediawiki.special.changeslist.enhanced.css',
+               'styles' => 'resources/src/mediawiki.special.changeslist.enhanced.css',
        ],
        'mediawiki.special.changeslist.legend' => [
-               'styles' => 'resources/src/mediawiki.special/mediawiki.special.changeslist.legend.css',
+               'styles' => 'resources/src/mediawiki.special.changeslist.legend.css',
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.special.changeslist.legend.js' => [
-               'scripts' => 'resources/src/mediawiki.special/mediawiki.special.changeslist.legend.js',
+               'scripts' => 'resources/src/mediawiki.special.changeslist.legend.js',
                'dependencies' => [
                        'jquery.makeCollapsible',
                        'mediawiki.cookie',
                ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
-       'mediawiki.special.changeslist.visitedstatus' => [
-               'scripts' => 'resources/src/mediawiki.special/mediawiki.special.changeslist.visitedstatus.js',
-       ],
-       'mediawiki.special.comparepages.styles' => [
-               'styles' => 'resources/src/mediawiki.special/mediawiki.special.comparepages.styles.less',
-       ],
        'mediawiki.special.contributions' => [
-               'scripts' => 'resources/src/mediawiki.special/mediawiki.special.contributions.js',
+               'scripts' => 'resources/src/mediawiki.special.contributions.js',
                'dependencies' => [
                        'mediawiki.widgets.DateInputWidget',
                        'mediawiki.jqueryMsg',
                ]
        ],
        'mediawiki.special.edittags' => [
-               'scripts' => 'resources/src/mediawiki.special/mediawiki.special.edittags.js',
+               'scripts' => 'resources/src/mediawiki.special.edittags.js',
                'dependencies' => [
                        'jquery.chosen',
                        'jquery.lengthLimit',
@@ -2136,39 +2132,30 @@ return [
                        'tags-edit-chosen-no-results',
                ],
        ],
-       'mediawiki.special.edittags.styles' => [
-               'styles' => 'resources/src/mediawiki.special/mediawiki.special.edittags.css',
-       ],
        'mediawiki.special.import' => [
-               'scripts' => 'resources/src/mediawiki.special/mediawiki.special.import.js',
+               'scripts' => 'resources/src/mediawiki.special.import.js',
        ],
        'mediawiki.special.movePage' => [
-               'scripts' => 'resources/src/mediawiki.special/mediawiki.special.movePage.js',
+               'scripts' => 'resources/src/mediawiki.special.movePage.js',
                'dependencies' => [
                        'mediawiki.widgets.visibleLengthLimit',
                        'mediawiki.widgets',
                ],
        ],
-       'mediawiki.special.movePage.styles' => [
-               'styles' => 'resources/src/mediawiki.special/mediawiki.special.movePage.css',
-       ],
        'mediawiki.special.pageLanguage' => [
-               'scripts' => 'resources/src/mediawiki.special/mediawiki.special.pageLanguage.js',
+               'scripts' => 'resources/src/mediawiki.special.pageLanguage.js',
                'dependencies' => [
                        'oojs-ui-core',
                ],
        ],
-       'mediawiki.special.pagesWithProp' => [
-               'styles' => 'resources/src/mediawiki.special/mediawiki.special.pagesWithProp.css',
-       ],
        'mediawiki.special.preferences' => [
                'targets' => [ 'desktop', 'mobile' ],
                'scripts' => [
-                       'resources/src/mediawiki.special/mediawiki.special.preferences.confirmClose.js',
-                       'resources/src/mediawiki.special/mediawiki.special.preferences.convertmessagebox.js',
-                       'resources/src/mediawiki.special/mediawiki.special.preferences.tabs.legacy.js',
-                       'resources/src/mediawiki.special/mediawiki.special.preferences.timezone.js',
-                       'resources/src/mediawiki.special/mediawiki.special.preferences.personalEmail.js',
+                       'resources/src/mediawiki.special.preferences/confirmClose.js',
+                       'resources/src/mediawiki.special.preferences/convertmessagebox.js',
+                       'resources/src/mediawiki.special.preferences/tabs.legacy.js',
+                       'resources/src/mediawiki.special.preferences/timezone.js',
+                       'resources/src/mediawiki.special.preferences/personalEmail.js',
                ],
                'messages' => [
                        'prefs-tabs-navigation-hint',
@@ -2184,17 +2171,19 @@ return [
        ],
        'mediawiki.special.preferences.styles' => [
                'targets' => [ 'desktop', 'mobile' ],
-               'styles' => 'resources/src/mediawiki.special/mediawiki.special.preferences.styles.legacy.css',
+               // legacy
+               'styles' => 'resources/src/mediawiki.special.preferences.styles.css',
        ],
        'mediawiki.special.preferences.ooui' => [
                'targets' => [ 'desktop', 'mobile' ],
                'scripts' => [
-                       'resources/src/mediawiki.special/mediawiki.special.preferences.confirmClose.js',
-                       'resources/src/mediawiki.special/mediawiki.special.preferences.convertmessagebox.js',
-                       'resources/src/mediawiki.special/mediawiki.special.preferences.editfont.js',
-                       'resources/src/mediawiki.special/mediawiki.special.preferences.tabs.js',
-                       'resources/src/mediawiki.special/mediawiki.special.preferences.timezone.js',
-                       'resources/src/mediawiki.special/mediawiki.special.preferences.personalEmail.js',
+                       // FIXME: This uses files already belonging to another module
+                       'resources/src/mediawiki.special.preferences/confirmClose.js',
+                       'resources/src/mediawiki.special.preferences/convertmessagebox.js',
+                       'resources/src/mediawiki.special.preferences.ooui/editfont.js',
+                       'resources/src/mediawiki.special.preferences.ooui/tabs.js',
+                       'resources/src/mediawiki.special.preferences/timezone.js',
+                       'resources/src/mediawiki.special.preferences/personalEmail.js',
                ],
                'messages' => [
                        'prefs-tabs-navigation-hint',
@@ -2213,14 +2202,14 @@ return [
        ],
        'mediawiki.special.preferences.styles.ooui' => [
                'targets' => [ 'desktop', 'mobile' ],
-               'styles' => 'resources/src/mediawiki.special/mediawiki.special.preferences.styles.css',
+               'styles' => 'resources/src/mediawiki.special.preferences.styles.ooui.css',
        ],
        'mediawiki.special.recentchanges' => [
-               'scripts' => 'resources/src/mediawiki.special/mediawiki.special.recentchanges.js',
+               'scripts' => 'resources/src/mediawiki.special.recentchanges.js',
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.special.revisionDelete' => [
-               'scripts' => 'resources/src/mediawiki.special/mediawiki.special.revisionDelete.js',
+               'scripts' => 'resources/src/mediawiki.special.revisionDelete.js',
                'messages' => [
                        // @todo Load this message in content language
                        'colon-separator',
@@ -2231,8 +2220,8 @@ return [
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.special.search' => [
-               'scripts' => 'resources/src/mediawiki.special/mediawiki.special.search.js',
-               'styles' => 'resources/src/mediawiki.special/mediawiki.special.search.css',
+               'scripts' => 'resources/src/mediawiki.special.search/search.js',
+               'styles' => 'resources/src/mediawiki.special.search/search.css',
                'dependencies' => 'mediawiki.widgets.SearchInputWidget',
                'messages' => [
                        'powersearch-togglelabel',
@@ -2241,7 +2230,7 @@ return [
                ],
        ],
        'mediawiki.special.search.commonsInterwikiWidget' => [
-               'scripts' => 'resources/src/mediawiki.special/mediawiki.special.search.commonsInterwikiWidget.js',
+               'scripts' => 'resources/src/mediawiki.special.search.commonsInterwikiWidget.js',
                'dependencies' => [
                        'mediawiki.api',
                        'mediawiki.Uri',
@@ -2254,24 +2243,23 @@ return [
                ],
        ],
        'mediawiki.special.search.interwikiwidget.styles' => [
-               'styles' => 'resources/src/mediawiki.special/'
-                       . 'mediawiki.special.search.interwikiwidget.styles.less',
+               'styles' => 'resources/src/mediawiki.special.search.interwikiwidget.styles.less',
                'targets' => [ 'desktop', 'mobile' ]
        ],
        'mediawiki.special.search.styles' => [
-               'styles' => 'resources/src/mediawiki.special/mediawiki.special.search.styles.css',
+               'styles' => 'resources/src/mediawiki.special.search.styles.css',
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.special.undelete' => [
-               'scripts' => 'resources/src/mediawiki.special/mediawiki.special.undelete.js',
+               'scripts' => 'resources/src/mediawiki.special.undelete.js',
                'dependencies' => [
                        'mediawiki.widgets.visibleLengthLimit',
                        'mediawiki.widgets',
                ],
        ],
        'mediawiki.special.unwatchedPages' => [
-               'scripts' => 'resources/src/mediawiki.special/mediawiki.special.unwatchedPages.js',
-               'styles' => 'resources/src/mediawiki.special/mediawiki.special.unwatchedPages.css',
+               'scripts' => 'resources/src/mediawiki.special.unwatchedPages/unwatchedPages.js',
+               'styles' => 'resources/src/mediawiki.special.unwatchedPages/unwatchedPages.css',
                'messages' => [
                        'addedwatchtext-short',
                        'removedwatchtext-short',
@@ -2283,7 +2271,6 @@ return [
                ],
                'dependencies' => [
                        'mediawiki.api',
-                       'mediawiki.api.watch',
                        'mediawiki.notify',
                        'mediawiki.Title',
                        'mediawiki.util',
@@ -2291,9 +2278,9 @@ return [
        ],
        'mediawiki.special.upload' => [
                'templates' => [
-                       'thumbnail.html' => 'resources/src/mediawiki.special/templates/thumbnail.html',
+                       'thumbnail.html' => 'resources/src/mediawiki.special.upload/templates/thumbnail.html',
                ],
-               'scripts' => 'resources/src/mediawiki.special/mediawiki.special.upload.js',
+               'scripts' => 'resources/src/mediawiki.special.upload/upload.js',
                'messages' => [
                        'widthheight',
                        'size-bytes',
@@ -2306,11 +2293,10 @@ return [
                        'prefs-editing',
                ],
                'dependencies' => [
-                       'mediawiki.special.upload.styles',
+                       'mediawiki.special',
                        'jquery.spinner',
                        'mediawiki.jqueryMsg',
                        'mediawiki.api',
-                       'mediawiki.api.parse',
                        'mediawiki.libs.jpegmeta',
                        'mediawiki.Title',
                        'mediawiki.util',
@@ -2318,22 +2304,19 @@ return [
                        'user.options',
                ],
        ],
-       'mediawiki.special.upload.styles' => [
-               'styles' => 'resources/src/mediawiki.special/mediawiki.special.upload.styles.css',
-       ],
        'mediawiki.special.userlogin.common.styles' => [
                'targets' => [ 'desktop', 'mobile' ],
                'skinStyles' => [
-                       'default' => 'resources/src/mediawiki.special/mediawiki.special.userlogin.common.css',
+                       'default' => 'resources/src/mediawiki.special.userlogin.common.styles/userlogin.css',
                ],
        ],
        'mediawiki.special.userlogin.login.styles' => [
                'styles' => [
-                       'resources/src/mediawiki.special/mediawiki.special.userlogin.login.css',
+                       'resources/src/mediawiki.special.userlogin.login.styles/login.css',
                ],
        ],
        'mediawiki.special.userlogin.signup.js' => [
-               'scripts' => 'resources/src/mediawiki.special/mediawiki.special.userlogin.signup.js',
+               'scripts' => 'resources/src/mediawiki.special.userlogin.signup.js',
                'messages' => [
                        'createacct-emailrequired',
                        'noname',
@@ -2348,18 +2331,21 @@ return [
        ],
        'mediawiki.special.userlogin.signup.styles' => [
                'styles' => [
-                       'resources/src/mediawiki.special/mediawiki.special.userlogin.signup.css',
+                       'resources/src/mediawiki.special.userlogin.signup.styles/signup.css',
                ],
        ],
        'mediawiki.special.userrights' => [
-               'scripts' => 'resources/src/mediawiki.special/mediawiki.special.userrights.js',
+               'scripts' => 'resources/src/mediawiki.special.userrights.js',
                'dependencies' => [
                        'mediawiki.notification.convertmessagebox',
                        'jquery.lengthLimit',
                ],
        ],
        'mediawiki.special.watchlist' => [
-               'scripts' => 'resources/src/mediawiki.special/mediawiki.special.watchlist.js',
+               'scripts' => [
+                       'resources/src/mediawiki.special.watchlist/watchlist.js',
+                       'resources/src/mediawiki.special.watchlist/visitedstatus.js',
+               ],
                'messages' => [
                        'addedwatchtext',
                        'addedwatchtext-talk',
@@ -2371,7 +2357,7 @@ return [
                        'watchlist-unwatch-undo',
                ],
                'dependencies' => [
-                       'mediawiki.api.watch',
+                       'mediawiki.api',
                        'mediawiki.jqueryMsg',
                        'mediawiki.Title',
                        'mediawiki.util',
@@ -2379,11 +2365,8 @@ return [
                        'user.options',
                ],
        ],
-       'mediawiki.special.watchlist.styles' => [
-               'styles' => 'resources/src/mediawiki.special/mediawiki.special.watchlist.css',
-       ],
        'mediawiki.special.version' => [
-               'styles' => 'resources/src/mediawiki.special/mediawiki.special.version.css',
+               'styles' => 'resources/src/mediawiki.special.version.css',
        ],
 
        /* MediaWiki Installer */
@@ -2569,11 +2552,6 @@ return [
                ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
-       'mediawiki.widgets.visibleByteLimit' => [
-               'dependencies' => 'mediawiki.widgets.visibleLengthLimit',
-               'deprecated' => 'Use "mediawiki.widgets.visibleLengthLimit" instead.',
-               'targets' => [ 'desktop', 'mobile' ]
-       ],
        'mediawiki.widgets.visibleLengthLimit' => [
                'scripts' => [
                        'resources/src/mediawiki.widgets.visibleLengthLimit/mediawiki.widgets.visibleLengthLimit.js'
@@ -2793,12 +2771,6 @@ return [
                ],
        ],
 
-       /* es5-shim */
-       'es5-shim' => [
-               'deprecated' => 'Use of the "es5-shim" module is deprecated since MediaWiki 1.29.0',
-               'targets' => [ 'desktop', 'mobile' ],
-       ],
-
        /* dom-level2-shim */
        'dom-level2-shim' => [
                'deprecated' => 'Use of the "dom-level2-shim" module is deprecated since MediaWiki 1.29.0',
@@ -2880,6 +2852,9 @@ return [
                        'oojs-ui.styles.icons-alerts',
                        'oojs-ui.styles.icons-interactions',
                ],
+               'messages' => [
+                       'ooui-field-help'
+               ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
        // This contains only the styles required by core widgets.
@@ -2895,9 +2870,9 @@ return [
        'oojs-ui-widgets' => [
                'class' => ResourceLoaderOOUIFileModule::class,
                'scripts' => 'resources/lib/oojs-ui/oojs-ui-widgets.js',
-               'themeStyles' => 'widgets',
                'dependencies' => [
                        'oojs-ui-core',
+                       'oojs-ui-widgets.styles',
                        'oojs-ui.styles.icons-interactions',
                        'oojs-ui.styles.icons-content',
                        'oojs-ui.styles.icons-editing-advanced',
@@ -2916,6 +2891,14 @@ return [
                ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
+       // You should never directly load this module. The CSS classes it defines are not a public API,
+       // they depend on the internal structure of OOUI widgets, which can change at any time. If you
+       // find that you need to load this module, you're probably doing something wrong or very hacky.
+       'oojs-ui-widgets.styles' => [
+               'class' => ResourceLoaderOOUIFileModule::class,
+               'themeStyles' => 'widgets',
+               'targets' => [ 'desktop', 'mobile' ],
+       ],
        // Toolbar and tools module.
        'oojs-ui-toolbars' => [
                'class' => ResourceLoaderOOUIFileModule::class,
Wiklou, le Wiki du Wiklou