Merge "installer: Remove <doclink/> parser function and last use of it"

[lhc/web/wiklou.git] / resources / Resources.php

diff --git a/resources/Resources.php b/resources/Resources.php
index 28b8793..6298086 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -39,11 +39,6 @@ return [
                'class' => ResourceLoaderWikiModule::class,
                'styles' => [ 'MediaWiki:Filepage.css' ],
        ],
-       'user.groups' => [
-               // Merged into 'user' since MediaWiki 1.28 - kept for back-compat
-               'dependencies' => 'user',
-               'targets' => [ 'desktop', 'mobile' ],
-       ],
 
        // Scripts managed by the current user (stored in their user space)
        'user' => [ 'class' => ResourceLoaderUserModule::class ],
@@ -1262,7 +1257,10 @@ return [
                'remoteBasePath' => "$wgResourceBasePath/resources/src",
                'packageFiles' => [
                        'mediawiki.util.js',
-                       [ 'name' => 'config.json', 'config' => [ 'FragmentMode' ] ],
+                       [ 'name' => 'config.json', 'config' => [
+                               'FragmentMode',
+                               'LoadScript',
+                       ] ],
                ],
                'dependencies' => [
                        'jquery.accessKeyLabel',
@@ -1365,6 +1363,7 @@ return [
        ],
        'mediawiki.action.edit.preview' => [
                'scripts' => 'resources/src/mediawiki.action/mediawiki.action.edit.preview.js',
+               'styles' => 'resources/src/mediawiki.action/mediawiki.action.edit.preview.css',
                'dependencies' => [
                        'jquery.spinner',
                        'jquery.textSelection',
@@ -2092,11 +2091,27 @@ return [
                ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
-       'mediawiki.special.changecredentials.js' => [
-               'scripts' => 'resources/src/mediawiki.special.changecredentials.js',
+       // This bundles various small (under 5 KB?) JavaScript files that:
+       // - .. are not loaded on when viewing or editing wiki pages.
+       // - .. are used by logged-in users only.
+       // - .. depend on oojs-ui-core.
+       // - .. contain UI intialisation code (e.g. no public module exports, because
+       //      requiring or depending on this bundle is awkard)
+       'mediawiki.misc-authed-ooui' => [
+               'localBasePath' => "$IP/resources/src/mediawiki.misc-authed-ooui",
+               'remoteBasePath' => "$wgResourceBasePath/resources/src/mediawiki.misc-authed-ooui",
+               'scripts' => [
+                       'special.changecredentials.js',
+                       'special.movePage.js',
+                       'special.mute.js',
+                       'special.pageLanguage.js',
+               ],
                'dependencies' => [
-                       'mediawiki.api',
-                       'mediawiki.htmlform.ooui'
+                       'mediawiki.api', // Used by special.changecredentials.js
+                       'mediawiki.htmlform.ooui', // Used by special.changecredentials.js
+                       'mediawiki.widgets.visibleLengthLimit', // Used by special.movePage.js
+                       'mediawiki.widgets', // Used by special.movePage.js
+                       'oojs-ui-core', // Used by special.pageLanguage.js
                ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
@@ -2145,22 +2160,6 @@ return [
        'mediawiki.special.import' => [
                'scripts' => 'resources/src/mediawiki.special.import.js',
        ],
-       'mediawiki.special.movePage' => [
-               'scripts' => 'resources/src/mediawiki.special.movePage.js',
-               'dependencies' => [
-                       'mediawiki.widgets.visibleLengthLimit',
-                       'mediawiki.widgets',
-               ],
-       ],
-       'mediawiki.special.pageLanguage' => [
-               'scripts' => [
-                       'resources/src/mediawiki.special.mute.js',
-                       'resources/src/mediawiki.special.pageLanguage.js'
-               ],
-               'dependencies' => [
-                       'oojs-ui-core',
-               ],
-       ],
        'mediawiki.special.preferences.ooui' => [
                'targets' => [ 'desktop', 'mobile' ],
                'scripts' => [
@@ -2816,14 +2815,7 @@ return [
                ],
        ],
 
-       /**
-        * html5shiv
-        *
-        * This library is intended to run on older browsers
-        * that MediaWiki no longer supports as Grade A, and
-        * is not loaded through the normal module loading
-        * system.
-        */
+       // @todo FIXME: Remove 7 days after Ib0020b6bd0156 is deployed to all wikis.
        'html5shiv' => [
                'scripts' => [
                        'resources/lib/html5shiv/html5shiv.js'