* Decline to cache minified private modules, because they exist in as many
variants as there are users, and are unlikely to be cache hits now that we
use APC.
* Other modules are minified individually, to improve cache hit rate.
Bug: T107377
Change-Id: Id6f5142062d73b5701126724e0fe8264105f7813
// Generate output
$isRaw = false;
// Generate output
$isRaw = false;
+
+ $filter = $context->getOnly() === 'styles' ? 'minify-css' : 'minify-js';
+
foreach ( $modules as $name => $module ) {
try {
$content = $module->getModuleContent( $context );
foreach ( $modules as $name => $module ) {
try {
$content = $module->getModuleContent( $context );
// Append output
switch ( $context->getOnly() ) {
// Append output
switch ( $context->getOnly() ) {
$scripts = $content['scripts'];
if ( is_string( $scripts ) ) {
// Load scripts raw...
$scripts = $content['scripts'];
if ( is_string( $scripts ) ) {
// Load scripts raw...
+ $strContent = $scripts;
} elseif ( is_array( $scripts ) ) {
// ...except when $scripts is an array of URLs
} elseif ( is_array( $scripts ) ) {
// ...except when $scripts is an array of URLs
- $out .= self::makeLoaderImplementScript( $name, $scripts, array(), array(), array() );
+ $strContent = self::makeLoaderImplementScript( $name, $scripts, array(), array(), array() );
// We no longer seperate into media, they are all combined now with
// custom media type groups into @media .. {} sections as part of the css string.
// Module returns either an empty array or a numerical array with css strings.
// We no longer seperate into media, they are all combined now with
// custom media type groups into @media .. {} sections as part of the css string.
// Module returns either an empty array or a numerical array with css strings.
- $out .= isset( $styles['css'] ) ? implode( '', $styles['css'] ) : '';
+ $strContent = isset( $styles['css'] ) ? implode( '', $styles['css'] ) : '';
- $out .= self::makeLoaderImplementScript(
+ $strContent = self::makeLoaderImplementScript(
$name,
isset( $content['scripts'] ) ? $content['scripts'] : '',
isset( $content['styles'] ) ? $content['styles'] : array(),
$name,
isset( $content['scripts'] ) ? $content['scripts'] : '',
isset( $content['styles'] ) ? $content['styles'] : array(),
+
+ if ( !$context->getDebug() ) {
+ // Don't cache private modules. This is especially important in the case
+ // of modules which change every time they are built, like the embedded
+ // user.tokens module (bug T84960).
+ $filterOptions = array( 'cache' => ( $module->getGroup() !== 'private' ) );
+ $strContent = $this->filter( $filter, $strContent, $filterOptions );
+ }
+
+ $out .= $strContent;
+
} catch ( Exception $e ) {
MWExceptionHandler::logException( $e );
$this->logger->warning( 'Generating module package failed: {exception}', array(
} catch ( Exception $e ) {
MWExceptionHandler::logException( $e );
$this->logger->warning( 'Generating module package failed: {exception}', array(
// Set the state of modules we didn't respond to with mw.loader.implement
if ( count( $states ) ) {
// Set the state of modules we didn't respond to with mw.loader.implement
if ( count( $states ) ) {
- $out .= self::makeLoaderStateScript( $states );
+ $stateScript = self::makeLoaderStateScript( $states );
+ if ( !$context->getDebug() ) {
+ $stateScript = $this->filter( 'minify-js', $stateScript );
+ }
+ $out .= $stateScript;
}
} else {
if ( count( $states ) ) {
}
} else {
if ( count( $states ) ) {
- $enableFilterCache = true;
- if ( count( $modules ) === 1 && reset( $modules ) instanceof ResourceLoaderUserTokensModule ) {
- // If we're building the embedded user.tokens, don't cache (T84960)
- $enableFilterCache = false;
- }
-
- if ( !$context->getDebug() ) {
- if ( $context->getOnly() === 'styles' ) {
- $out = $this->filter( 'minify-css', $out );
- } else {
- $out = $this->filter( 'minify-js', $out, array(
- 'cache' => $enableFilterCache
- ) );
- }
- }
-