Merge "resourceloader: Fold legacy modules into base modules request"

diff --combined resources/src/mediawiki/mediawiki.js
index 08807fb,a49db79..d172a39
--- 1/resources/src/mediawiki/mediawiki.js
--- 2/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@@ -1270,10 -1270,7 +1270,7 @@@
                                registry[ module ].state = 'executing';
  
                                runScript = function () {
-                                       var script, markModuleReady, nestedAddScript, legacyWait, implicitDependencies,
-                                               // Expand to include dependencies since we have to exclude both legacy modules
-                                               // and their dependencies from the legacyWait (to prevent a circular dependency).
-                                               legacyModules = resolve( mw.config.get( 'wgResourceLoaderLegacyModules', [] ) );
+                                       var script, markModuleReady, nestedAddScript, implicitDependencies, implicitWait;
  
                                        script = registry[ module ].script;
                                        markModuleReady = function () {
@@@ -1294,9 -1291,7 +1291,7 @@@
                                                } );
                                        };
  
-                                       implicitDependencies = ( $.inArray( module, legacyModules ) !== -1 ) ?
-                                               [] :
-                                               legacyModules;
+                                       implicitDependencies = [];
  
                                        if ( module === 'user' ) {
                                                // Implicit dependency on the site module. Not real dependency because
@@@ -1304,11 -1299,11 +1299,11 @@@
                                                implicitDependencies.push( 'site' );
                                        }
  
-                                       legacyWait = implicitDependencies.length ?
+                                       implicitWait = implicitDependencies.length ?
                                                mw.loader.using( implicitDependencies ) :
                                                $.Deferred().resolve();
  
-                                       legacyWait.always( function () {
+                                       implicitWait.always( function () {
                                                try {
                                                        if ( Array.isArray( script ) ) {
                                                                nestedAddScript( script, markModuleReady, 0 );
@@@ -2754,16 -2749,14 +2749,16 @@@
         * @member mw.hook
         */
        $( function () {
 -              var loading = $.grep( mw.loader.getModuleNames(), function ( module ) {
 +              var loading, modules;
 +
 +              modules = $.grep( mw.loader.getModuleNames(), function ( module ) {
                        return mw.loader.getState( module ) === 'loading';
                } );
                // We only need a callback, not any actual module. First try a single using()
                // for all loading modules. If one fails, fall back to tracking each module
                // separately via $.when(), this is expensive.
 -              loading = mw.loader.using( loading ).then( null, function () {
 -                      var all = loading.map( function ( module ) {
 +              loading = mw.loader.using( modules ).then( null, function () {
 +                      var all = modules.map( function ( module ) {
                                return mw.loader.using( module ).then( null, function () {
                                        return $.Deferred().resolve();
                                } );