X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Fresourceloader%2FResourceLoaderStartUpModule.php;h=d535ffcd3aecc53a6fad2c171e23a30d87a1b195;hp=04b2f72d5d34236aa65be14fc473ff99a038f50c;hb=d19826aa35b206847a568a4b2c1c9ffaa615fca5;hpb=8ea7953ab57163a575a2ce02d5dbf862d7c9744a

diff --git a/includes/resourceloader/ResourceLoaderStartUpModule.php b/includes/resourceloader/ResourceLoaderStartUpModule.php
index 04b2f72d5d..d535ffcd3a 100644
--- a/includes/resourceloader/ResourceLoaderStartUpModule.php
+++ b/includes/resourceloader/ResourceLoaderStartUpModule.php
@@ -33,7 +33,6 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule {
 	 * @return array
 	 */
 	protected function getConfigSettings( $context ) {
-
 		$hash = $context->getHash();
 		if ( isset( $this->configVars[$hash] ) ) {
 			return $this->configVars[$hash];
@@ -112,7 +111,6 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule {
 			'wgIllegalFileChars' => Title::convertByteClassToUnicodeClass( $illegalFileChars ),
 			'wgResourceLoaderStorageVersion' => $conf->get( 'ResourceLoaderStorageVersion' ),
 			'wgResourceLoaderStorageEnabled' => $conf->get( 'ResourceLoaderStorageEnabled' ),
-			'wgResourceLoaderLegacyModules' => self::getLegacyModules(),
 			'wgForeignUploadTargets' => $conf->get( 'ForeignUploadTargets' ),
 			'wgEnableUploads' => $conf->get( 'EnableUploads' ),
 		];
@@ -136,7 +134,6 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule {
 		// The list of implicit dependencies won't be altered, so we can
 		// cache them without having to worry.
 		if ( !isset( $dependencyCache[$moduleName] ) ) {
-
 			if ( !isset( $registryData[$moduleName] ) ) {
 				// Dependencies may not exist
 				$dependencyCache[$moduleName] = [];
@@ -299,6 +296,16 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule {
 		return true;
 	}
 
+	/**
+	 * @return array
+	 */
+	public function getPreloadLinks( ResourceLoaderContext $context ) {
+		$url = self::getStartupModulesUrl( $context );
+		return [
+			$url => [ 'as' => 'script' ]
+		];
+	}
+
 	/**
 	 * Base modules required for the base environment of ResourceLoader
 	 *
@@ -330,9 +337,11 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule {
 	 */
 	public static function getStartupModulesUrl( ResourceLoaderContext $context ) {
 		$rl = $context->getResourceLoader();
-
 		$derivative = new DerivativeResourceLoaderContext( $context );
-		$derivative->setModules( self::getStartupModules() );
+		$derivative->setModules( array_merge(
+			self::getStartupModules(),
+			self::getLegacyModules()
+		) );
 		$derivative->setOnly( 'scripts' );
 		// Must setModules() before makeVersionQuery()
 		$derivative->setVersion( $rl->makeVersionQuery( $derivative ) );
@@ -360,6 +369,7 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule {
 		}, [
 			'$VARS.wgLegacyJavaScriptGlobals' => $this->getConfig()->get( 'LegacyJavaScriptGlobals' ),
 			'$VARS.configuration' => $this->getConfigSettings( $context ),
+			// This url may be preloaded. See getPreloadLinks().
 			'$VARS.baseModulesUri' => self::getStartupModulesUrl( $context ),
 		] );
 		$pairs['$CODE.registrations()'] = str_replace(