Merge "ResourceLoaderLessVarFileModule: Add parameter 'lessMessages'"

diff --combined resources/Resources.php
index 4e0a452,0fe5dd7..e624dc3
--- 1/resources/Resources.php
--- 2/resources/Resources.php
+++ b/resources/Resources.php
@@@ -115,6 -115,10 +115,10 @@@ return 
        'jquery.makeCollapsible.styles' => [
                'targets' => [ 'desktop', 'mobile' ],
                'class' => ResourceLoaderLessVarFileModule::class,
+               'lessMessages' => [
+                       'collapsible-collapse',
+                       'collapsible-expand',
+               ],
                'styles' => [
                        'resources/src/jquery/jquery.makeCollapsible.styles.less',
                ],
@@@ -132,7 -136,7 +136,7 @@@
  
        'mediawiki.skinning.content.externallinks' => [
                'styles' => [
 -                      'resources/src/mediawiki.skinning/content.externallinks.css' => [ 'media' => 'screen' ],
 +                      'resources/src/mediawiki.skinning/content.externallinks.less' => [ 'media' => 'screen' ],
                ],
        ],
  
@@@ -212,6 -216,15 +216,6 @@@
        'jquery.expandableField' => [
                'scripts' => 'resources/src/jquery/jquery.expandableField.js',
        ],
 -      'jquery.farbtastic' => [
 -              'scripts' => 'resources/src/jquery/jquery.farbtastic.js',
 -              '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',
        ],
@@@ -294,8 -307,8 +298,8 @@@
                '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' => [
@@@ -312,7 -325,6 +316,7 @@@
                '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' ],
@@@ -882,73 -894,75 +886,73 @@@
                '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.content.json.less',
@@@ -961,14 -975,13 +965,14 @@@
        ],
        'mediawiki.debug' => [
                'scripts' => [
 +                      'resources/src/mediawiki.debug/jquery.footHovzer.js',
                        'resources/src/mediawiki.debug/debug.js',
                ],
                'styles' => [
 +                      'resources/src/mediawiki.debug/jquery.footHovzer.css',
                        'resources/src/mediawiki.debug/debug.less',
                ],
                'dependencies' => [
 -                      'jquery.footHovzer',
                        'oojs-ui-core',
                ],
        ],
@@@ -1140,7 -1153,7 +1144,7 @@@
                        'resources/src/mediawiki.messagePoster.wikitext/WikitextMessagePoster.js',
                ],
                'dependencies' => [
 -                      'mediawiki.api.edit',
 +                      'mediawiki.api',
                        'mediawiki.messagePoster',
                ],
                'targets' => [ 'desktop', 'mobile' ],
@@@ -1221,7 -1234,7 +1225,7 @@@
        'mediawiki.Upload' => [
                'scripts' => 'resources/src/mediawiki.Upload.js',
                'dependencies' => [
 -                      'mediawiki.api.upload',
 +                      'mediawiki.api',
                ],
        ],
        'mediawiki.ForeignUpload' => [
@@@ -1321,7 -1334,7 +1325,7 @@@
                        'mediawiki.widgets.CategoryMultiselectWidget',
                        'mediawiki.widgets.DateInputWidget',
                        'mediawiki.jqueryMsg',
 -                      'mediawiki.api.messages',
 +                      'mediawiki.api',
                        'moment',
                        'mediawiki.libs.jpegmeta',
                ],
@@@ -1362,6 -1375,7 +1366,6 @@@
                'scripts' => 'resources/src/mediawiki.user.js',
                'dependencies' => [
                        'mediawiki.api',
 -                      'mediawiki.api.user',
                        'mediawiki.storage',
                        'user.options',
                        'user.tokens',
@@@ -1641,7 -1655,6 +1645,7 @@@
        ],
  
        'mediawiki.language.months' => [
 +              'targets' => [ 'desktop', 'mobile' ],
                'scripts' => 'resources/src/mediawiki.language/mediawiki.language.months.js',
                'dependencies' => 'mediawiki.language',
                'messages' => array_merge(
@@@ -1730,7 -1743,7 +1734,7 @@@
        'mediawiki.page.watch.ajax' => [
                'scripts' => 'resources/src/mediawiki.page.watch.ajax.js',
                'dependencies' => [
 -                      'mediawiki.api.watch',
 +                      'mediawiki.api',
                        'mediawiki.notify',
                        'mediawiki.util',
                        'mediawiki.Title',
@@@ -1755,7 -1768,7 +1759,7 @@@
        'mediawiki.page.rollback' => [
                'scripts' => 'resources/src/mediawiki.page.rollback.js',
                'dependencies' => [
 -                      'mediawiki.api.rollback',
 +                      'mediawiki.api',
                        'mediawiki.notify',
                        'mediawiki.util',
                        'jquery.spinner',
@@@ -1803,6 -1816,7 +1807,6 @@@
                        'mediawiki.String',
                        'oojs',
                        'mediawiki.api',
 -                      'mediawiki.api.options',
                        'mediawiki.jqueryMsg',
                        'mediawiki.Uri',
                        'mediawiki.user',
@@@ -1984,21 -1998,18 +1988,21 @@@
        ],
        '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',
@@@ -2027,7 -2038,6 +2031,7 @@@
                        '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',
@@@ -2064,13 -2074,10 +2068,13 @@@
                        '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',
@@@ -2083,7 -2090,7 +2087,7 @@@
                ],
        ],
        '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'
@@@ -2091,33 -2098,39 +2095,33 @@@
                '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',
@@@ -2127,30 -2140,39 +2131,30 @@@
                        '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',
@@@ -2166,19 -2188,17 +2170,19 @@@
        ],
        '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',
@@@ -2197,14 -2217,14 +2201,14 @@@
        ],
        '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',
@@@ -2215,8 -2235,8 +2219,8 @@@
                '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',
@@@ -2225,7 -2245,7 +2229,7 @@@
                ],
        ],
        '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',
@@@ -2238,23 -2258,24 +2242,23 @@@
                ],
        ],
        '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',
@@@ -2266,6 -2287,7 +2270,6 @@@
                ],
                'dependencies' => [
                        'mediawiki.api',
 -                      'mediawiki.api.watch',
                        'mediawiki.notify',
                        'mediawiki.Title',
                        'mediawiki.util',
@@@ -2273,9 -2295,9 +2277,9 @@@
        ],
        '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',
@@@ -2288,10 -2310,11 +2292,10 @@@
                        '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',
@@@ -2299,19 -2322,22 +2303,19 @@@
                        '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',
@@@ -2326,21 -2352,18 +2330,21 @@@
        ],
        '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',
@@@ -2352,7 -2375,7 +2356,7 @@@
                        'watchlist-unwatch-undo',
                ],
                'dependencies' => [
 -                      'mediawiki.api.watch',
 +                      'mediawiki.api',
                        'mediawiki.jqueryMsg',
                        'mediawiki.Title',
                        'mediawiki.util',
@@@ -2360,8 -2383,11 +2364,8 @@@
                        '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 */
@@@ -2547,6 -2573,11 +2551,6 @@@
                ],
                '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'
@@@ -2766,6 -2797,12 +2770,6 @@@
                ],
        ],
  
 -      /* 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',
@@@ -2865,9 -2902,9 +2869,9 @@@
        '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',
@@@ -2886,14 -2923,6 +2890,14 @@@
                ],
                '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,