Merge "resourceloader: Merge mediawiki.legacy.wikibits into mediawiki.base"

diff --combined resources/Resources.php
index 68188f0,333057f..c9a1660
--- 1/resources/Resources.php
--- 2/resources/Resources.php
+++ b/resources/Resources.php
@@@ -139,16 -139,16 +139,16 @@@ return 
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.base' => [
-               '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',
-               ],
-               'dependencies' => 'jquery',
-               'targets' => [ 'desktop', 'mobile' ],
-       ],
-       'mediawiki.legacy.wikibits' => [
-               'scripts' => 'resources/src/mediawiki.legacy/wikibits.js',
+               'scripts' => array_merge(
+                       [
+                               // 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',
+                       ],
+                       $GLOBALS['wgIncludeLegacyJavaScript']
+                               ? [ 'resources/src/mediawiki.base/legacy.wikibits.js' ]
+                               : []
+               ),
                'dependencies' => 'jquery',
                'targets' => [ 'desktop', 'mobile' ],
        ],
@@@ -2820,6 -2820,13 +2820,6 @@@
                ],
        ],
  
 -      // @todo FIXME: Remove 7 days after Ib0020b6bd0156 is deployed to all wikis.
 -      'html5shiv' => [
 -              'scripts' => [
 -                      'resources/lib/html5shiv/html5shiv.js'
 -              ],
 -      ],
 -
        /* EasyDeflate */
  
        'easy-deflate.core' => [