diff options
author | Kosta Harlan <kharlan@wikimedia.org> | 2022-12-06 08:12:22 +0000 |
---|---|---|
committer | Kosta Harlan <kharlan@wikimedia.org> | 2022-12-06 08:19:03 +0000 |
commit | e596af730db5cee511ce97476127fc62a07071ba (patch) | |
tree | a3b57e1e2c80a5a074d9a2cf79f7cc3916beb9a6 /includes/ResourceLoader/FileModule.php | |
parent | 15622ea09a48ea9ceef5f12583794427755a7dc1 (diff) | |
download | mediawikicore-e596af730db5cee511ce97476127fc62a07071ba.tar.gz mediawikicore-e596af730db5cee511ce97476127fc62a07071ba.zip |
Revert "resourceloader: Modern ES6 code should be forced to target mobile"
This reverts commit 15622ea09a48ea9ceef5f12583794427755a7dc1.
Reason for revert: T324525
Bug: T323542
Change-Id: I496ce3589f0322e7ac0f109081fa5e0587f48f94
Diffstat (limited to 'includes/ResourceLoader/FileModule.php')
-rw-r--r-- | includes/ResourceLoader/FileModule.php | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/includes/ResourceLoader/FileModule.php b/includes/ResourceLoader/FileModule.php index 4c7147a87eaf..53902c1d26bb 100644 --- a/includes/ResourceLoader/FileModule.php +++ b/includes/ResourceLoader/FileModule.php @@ -244,24 +244,6 @@ class FileModule extends Module { break; } } - // In future this should be expanded to cover modules using packageFiles as well. - $isModernCode = $this->requiresES6(); - if ( $isModernCode ) { - // If targets omitted, modern code should automatically default to mobile+desktop targets. - $isNotMobileTargeted = !in_array( 'mobile', $this->targets ); - // Modern JavaScript should never be restricted to desktop-only (see T323542) - if ( $isNotMobileTargeted ) { - // Add the mobile target to these modules. - $this->targets[] = 'mobile'; - $targetsSpecified = isset( $options['targets'] ); - // If the user intentionally tried to avoid adding to mobile log a warning. - if ( $targetsSpecified ) { - $this->getLogger()->warning( "When 'es6' is enabled, module will automatically target mobile.", [ - 'module' => $this->getName(), - ] ); - } - } - } if ( isset( $options['scripts'] ) && isset( $options['packageFiles'] ) ) { throw new InvalidArgumentException( "A module may not set both 'scripts' and 'packageFiles'" ); } |