resourceloader: Combine base modules and page modules requests

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

diff --git a/resources/Resources.php b/resources/Resources.php
index fc24035..a06a25f 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -143,7 +143,6 @@ return [
                        'resources/lib/jquery/jquery.js',
                        'resources/lib/jquery/jquery.migrate.js',
                ],
-               'raw' => true,
                'targets' => [ 'desktop', 'mobile' ],
        ],
 
@@ -834,11 +833,14 @@ return [
        /* MediaWiki */
 
        'mediawiki.base' => [
-               // Keep in sync with maintenance/jsduck/eg-iframe.html
                'scripts' => [
+                       // This MUST be kept in sync with maintenance/jsduck/eg-iframe.html
                        'resources/src/mediawiki.base/mediawiki.errorLogger.js',
                        'resources/src/mediawiki.base/mediawiki.base.js',
                ],
+               // - These dependencies MUST NOT also have dependencies (would cause recursion).
+               // - These dependencies MUST also be returned from StartUpModule::getBaseModules().
+               'dependencies' => 'jquery',
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.apihelp' => [
@@ -1426,6 +1428,7 @@ return [
        'mediawiki.action.delete.file' => [
                'scripts' => 'resources/src/mediawiki.action/mediawiki.action.delete.file.js',
                'dependencies' => [
+                       'oojs-ui-core',
                        'jquery.lengthLimit',
                ],
                'messages' => [
@@ -1979,6 +1982,7 @@ return [
                        'resources/src/mediawiki.special/comparepages.less',
                        'resources/src/mediawiki.special/edittags.css',
                        'resources/src/mediawiki.special/movePage.css',
+                       'resources/src/mediawiki.special/newpages.less',
                        'resources/src/mediawiki.special/pagesWithProp.css',
                        'resources/src/mediawiki.special/upload.css',
                        'resources/src/mediawiki.special/userrights.css',
@@ -2771,6 +2775,25 @@ return [
                'raw' => true,
        ],
 
+       /* EasyDeflate */
+
+       'easy-deflate.core' => [
+               'scripts' => [ 'resources/lib/easy-deflate/easydeflate.js' ],
+               'targets' => [ 'desktop', 'mobile' ],
+       ],
+
+       'easy-deflate.deflate' => [
+               'scripts' => [ 'resources/lib/easy-deflate/deflate.js' ],
+               'dependencies' => [ 'easy-deflate.core' ],
+               'targets' => [ 'desktop', 'mobile' ],
+       ],
+
+       'easy-deflate.inflate' => [
+               'scripts' => [ 'resources/lib/easy-deflate/inflate.js' ],
+               'dependencies' => [ 'easy-deflate.core' ],
+               'targets' => [ 'desktop', 'mobile' ],
+       ],
+
        /* OOjs */
        'oojs' => [
                'scripts' => [