From: James D. Forrester Date: Thu, 10 Oct 2019 23:33:54 +0000 (-0700) Subject: resources: Collapse all jQuery UI modules into one deprecated mega-module X-Git-Tag: 1.34.0-rc.1~18^2 X-Git-Url: http://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=7afced64454ad30d688540f7626448ac2faefebb resources: Collapse all jQuery UI modules into one deprecated mega-module (cherry picked from commits b76856675d78d1 and ecf4cb6610). Bug: T219604 Change-Id: I9070ad9052319f5ca2bc67e0ffaf502db0f13ceb --- diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34 index e9101b3e30..d503cd39d9 100644 --- a/RELEASE-NOTES-1.34 +++ b/RELEASE-NOTES-1.34 @@ -9,11 +9,13 @@ for use in production. * (T231742) rdbms: Restore debug toolbar "Queries" feature. * (T231366) The ProfilerOutputDb class, 'profiling' table, and profileinfo.php entry point had been deprecated. -* (T234361) localisation: Log debug message for backend of MessageCache. +* (T234361) localisation: Add debug message for backend of MessageCache. +* (T234361) session: Add debug message for the used store class. * (T235559) Fix example Kask configuration in RESTBagOStuff class comment. * (T235137) Don't apply styling for Special:Contributions on other pages. -* (T234361) session: Add debug message for the used store class. * Upgrade mediawiki-codesniffer from 26.0.0 to 28.0.0 (dev-only). +* (T219604) The "jquery.ui.*" and "jquery.effects.*" modules are now + deprecated as aliases for the "jquery.ui" module. * (T235392) Deprecate setting Parser::mTitle to null. * Supporting commits for T235392 were also backported to prevent divergence from master (MediaWiki 1.35). diff --git a/resources/Resources.php b/resources/Resources.php index 92a98051ac..dde52d212a 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -307,63 +307,36 @@ return [ /* jQuery UI */ - 'jquery.ui.core' => [ + 'jquery.ui' => [ 'deprecated' => 'Please use OOUI instead.', - 'scripts' => 'resources/lib/jquery.ui/jquery.ui.core.js', - 'dependencies' => [ - 'jquery.ui.core.styles', - ], - 'group' => 'jquery.ui', - ], - 'jquery.ui.core.styles' => [ - 'skinStyles' => [ - 'default' => [ - 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.core.css', - 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.theme.css', - ], - ], - 'group' => 'jquery.ui', - ], - 'jquery.ui.accordion' => [ - 'scripts' => 'resources/lib/jquery.ui/jquery.ui.accordion.js', - 'dependencies' => [ - 'jquery.ui.core', - 'jquery.ui.widget', - ], - 'skinStyles' => [ - 'default' => 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.accordion.css', - ], - 'group' => 'jquery.ui', - ], - 'jquery.ui.autocomplete' => [ - 'scripts' => 'resources/lib/jquery.ui/jquery.ui.autocomplete.js', - 'dependencies' => [ - 'jquery.ui.core', - 'jquery.ui.widget', - 'jquery.ui.position', - 'jquery.ui.menu', - ], - 'skinStyles' => [ - 'default' => 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.autocomplete.css', - ], - 'group' => 'jquery.ui', - ], - 'jquery.ui.button' => [ - 'scripts' => 'resources/lib/jquery.ui/jquery.ui.button.js', - 'dependencies' => [ - 'jquery.ui.core', - 'jquery.ui.widget', - ], - 'skinStyles' => [ - 'default' => 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.button.css', - ], - 'group' => 'jquery.ui', - ], - 'jquery.ui.datepicker' => [ - 'scripts' => 'resources/lib/jquery.ui/jquery.ui.datepicker.js', - 'dependencies' => 'jquery.ui.core', - 'skinStyles' => [ - 'default' => 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.datepicker.css', + 'targets' => [ 'mobile', 'desktop' ], + 'scripts' => [ + 'resources/lib/jquery.ui/jquery.ui.core.js', + 'resources/lib/jquery.ui/jquery.ui.widget.js', + 'resources/lib/jquery.ui/jquery.ui.mouse.js', + 'resources/lib/jquery.ui/jquery.ui.draggable.js', + 'resources/lib/jquery.ui/jquery.ui.droppable.js', + 'resources/lib/jquery.ui/jquery.ui.resizable.js', + 'resources/lib/jquery.ui/jquery.ui.selectable.js', + 'resources/lib/jquery.ui/jquery.ui.sortable.js', + 'resources/lib/jquery.ui/jquery.ui.effect.js', + 'resources/lib/jquery.ui/jquery.ui.accordion.js', + 'resources/lib/jquery.ui/jquery.ui.autocomplete.js', + 'resources/lib/jquery.ui/jquery.ui.button.js', + 'resources/lib/jquery.ui/jquery.ui.datepicker.js', + 'resources/lib/jquery.ui/jquery.ui.dialog.js', + 'resources/lib/jquery.ui/jquery.ui.effect-blind.js', + 'resources/lib/jquery.ui/jquery.ui.effect-clip.js', + 'resources/lib/jquery.ui/jquery.ui.effect-drop.js', + 'resources/lib/jquery.ui/jquery.ui.effect-highlight.js', + 'resources/lib/jquery.ui/jquery.ui.effect-scale.js', + 'resources/lib/jquery.ui/jquery.ui.effect-shake.js', + 'resources/lib/jquery.ui/jquery.ui.menu.js', + 'resources/lib/jquery.ui/jquery.ui.position.js', + 'resources/lib/jquery.ui/jquery.ui.progressbar.js', + 'resources/lib/jquery.ui/jquery.ui.slider.js', + 'resources/lib/jquery.ui/jquery.ui.tabs.js', + 'resources/lib/jquery.ui/jquery.ui.tooltip.js', ], 'languageScripts' => [ 'af' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-af.js', @@ -436,186 +409,161 @@ return [ 'zh-hk' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-zh-HK.js', 'zh-tw' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-zh-TW.js', ], - 'group' => 'jquery.ui', - ], - 'jquery.ui.dialog' => [ - 'scripts' => 'resources/lib/jquery.ui/jquery.ui.dialog.js', - 'dependencies' => [ - 'jquery.ui.core', - 'jquery.ui.widget', - 'jquery.ui.button', - 'jquery.ui.draggable', - 'jquery.ui.mouse', - 'jquery.ui.position', - 'jquery.ui.resizable', - ], 'skinStyles' => [ - 'default' => 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.dialog.css', + 'default' => [ + 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.core.css', + 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.accordion.css', + 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.autocomplete.css', + 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.button.css', + 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.datepicker.css', + 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.dialog.css', + 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.menu.css', + 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.progressbar.css', + 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.resizable.css', + 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.selectable.css', + 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.slider.css', + 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.tabs.css', + 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.tooltip.css', + 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.theme.css', + ], ], - 'group' => 'jquery.ui', + ], + + 'jquery.ui.core' => [ + 'deprecated' => 'Please use the main `jquery.ui` module, not this alias.', + 'targets' => [ 'mobile', 'desktop' ], + 'dependencies' => 'jquery.ui', + ], + 'jquery.ui.core.styles' => [ + 'deprecated' => 'Please use the main `jquery.ui` module, not this alias.', + 'targets' => [ 'mobile', 'desktop' ], + 'dependencies' => 'jquery.ui', + ], + 'jquery.ui.accordion' => [ + 'deprecated' => 'Please use the main `jquery.ui` module, not this alias.', + 'targets' => [ 'mobile', 'desktop' ], + 'dependencies' => 'jquery.ui', + ], + 'jquery.ui.autocomplete' => [ + 'deprecated' => 'Please use the main `jquery.ui` module, not this alias.', + 'targets' => [ 'mobile', 'desktop' ], + 'dependencies' => 'jquery.ui', + ], + 'jquery.ui.button' => [ + 'deprecated' => 'Please use the main `jquery.ui` module, not this alias.', + 'targets' => [ 'mobile', 'desktop' ], + 'dependencies' => 'jquery.ui', + ], + 'jquery.ui.datepicker' => [ + 'deprecated' => 'Please use the main `jquery.ui` module, not this alias.', + 'targets' => [ 'mobile', 'desktop' ], + 'dependencies' => 'jquery.ui', + ], + 'jquery.ui.dialog' => [ + 'deprecated' => 'Please use the main `jquery.ui` module, not this alias.', + 'targets' => [ 'mobile', 'desktop' ], + 'dependencies' => 'jquery.ui', ], 'jquery.ui.draggable' => [ - 'scripts' => 'resources/lib/jquery.ui/jquery.ui.draggable.js', - 'dependencies' => [ - 'jquery.ui.core', - 'jquery.ui.mouse', - 'jquery.ui.widget', - ], - 'group' => 'jquery.ui', + 'deprecated' => 'Please use the main `jquery.ui` module, not this alias.', + 'targets' => [ 'mobile', 'desktop' ], + 'dependencies' => 'jquery.ui', ], 'jquery.ui.droppable' => [ - 'scripts' => 'resources/lib/jquery.ui/jquery.ui.droppable.js', - 'dependencies' => [ - 'jquery.ui.core', - 'jquery.ui.mouse', - 'jquery.ui.widget', - 'jquery.ui.draggable', - ], - 'group' => 'jquery.ui', + 'deprecated' => 'Please use the main `jquery.ui` module, not this alias.', + 'targets' => [ 'mobile', 'desktop' ], + 'dependencies' => 'jquery.ui', ], 'jquery.ui.menu' => [ - 'scripts' => 'resources/lib/jquery.ui/jquery.ui.menu.js', - 'dependencies' => [ - 'jquery.ui.core', - 'jquery.ui.widget', - 'jquery.ui.position', - ], - 'skinStyles' => [ - 'default' => 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.menu.css', - ], - 'group' => 'jquery.ui', + 'deprecated' => 'Please use the main `jquery.ui` module, not this alias.', + 'targets' => [ 'mobile', 'desktop' ], + 'dependencies' => 'jquery.ui', ], 'jquery.ui.mouse' => [ - 'scripts' => 'resources/lib/jquery.ui/jquery.ui.mouse.js', - 'dependencies' => 'jquery.ui.widget', - 'group' => 'jquery.ui', + 'deprecated' => 'Please use the main `jquery.ui` module, not this alias.', + 'targets' => [ 'mobile', 'desktop' ], + 'dependencies' => 'jquery.ui', ], 'jquery.ui.position' => [ - 'deprecated' => true, + 'deprecated' => 'Please use the main `jquery.ui` module, not this alias.', 'targets' => [ 'mobile', 'desktop' ], - 'scripts' => 'resources/lib/jquery.ui/jquery.ui.position.js', - 'group' => 'jquery.ui', + 'dependencies' => 'jquery.ui', ], 'jquery.ui.progressbar' => [ - 'scripts' => 'resources/lib/jquery.ui/jquery.ui.progressbar.js', - 'dependencies' => [ - 'jquery.ui.core', - 'jquery.ui.widget', - ], - 'skinStyles' => [ - 'default' => 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.progressbar.css', - ], - 'group' => 'jquery.ui', + 'deprecated' => 'Please use the main `jquery.ui` module, not this alias.', + 'targets' => [ 'mobile', 'desktop' ], + 'dependencies' => 'jquery.ui', ], 'jquery.ui.resizable' => [ - 'scripts' => 'resources/lib/jquery.ui/jquery.ui.resizable.js', - 'dependencies' => [ - 'jquery.ui.core', - 'jquery.ui.widget', - 'jquery.ui.mouse', - ], - 'skinStyles' => [ - 'default' => 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.resizable.css', - ], - 'group' => 'jquery.ui', + 'deprecated' => 'Please use the main `jquery.ui` module, not this alias.', + 'targets' => [ 'mobile', 'desktop' ], + 'dependencies' => 'jquery.ui', ], 'jquery.ui.selectable' => [ - 'scripts' => 'resources/lib/jquery.ui/jquery.ui.selectable.js', - 'dependencies' => [ - 'jquery.ui.core', - 'jquery.ui.widget', - 'jquery.ui.mouse', - ], - 'skinStyles' => [ - 'default' => 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.selectable.css', - ], - 'group' => 'jquery.ui', + 'deprecated' => 'Please use the main `jquery.ui` module, not this alias.', + 'targets' => [ 'mobile', 'desktop' ], + 'dependencies' => 'jquery.ui', ], 'jquery.ui.slider' => [ - 'scripts' => 'resources/lib/jquery.ui/jquery.ui.slider.js', - 'dependencies' => [ - 'jquery.ui.core', - 'jquery.ui.widget', - 'jquery.ui.mouse', - ], - 'skinStyles' => [ - 'default' => 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.slider.css', - ], - 'group' => 'jquery.ui', + 'deprecated' => 'Please use the main `jquery.ui` module, not this alias.', + 'targets' => [ 'mobile', 'desktop' ], + 'dependencies' => 'jquery.ui', ], 'jquery.ui.sortable' => [ - 'scripts' => 'resources/lib/jquery.ui/jquery.ui.sortable.js', - 'dependencies' => [ - 'jquery.ui.core', - 'jquery.ui.mouse', - 'jquery.ui.widget', - ], - 'group' => 'jquery.ui', + 'deprecated' => 'Please use the main `jquery.ui` module, not this alias.', + 'targets' => [ 'mobile', 'desktop' ], + 'dependencies' => 'jquery.ui', ], 'jquery.ui.tabs' => [ - 'scripts' => 'resources/lib/jquery.ui/jquery.ui.tabs.js', - 'dependencies' => [ - 'jquery.ui.core', - 'jquery.ui.widget', - ], - 'skinStyles' => [ - 'default' => 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.tabs.css', - ], - 'group' => 'jquery.ui', + 'deprecated' => 'Please use the main `jquery.ui` module, not this alias.', + 'targets' => [ 'mobile', 'desktop' ], + 'dependencies' => 'jquery.ui', ], 'jquery.ui.tooltip' => [ - 'scripts' => 'resources/lib/jquery.ui/jquery.ui.tooltip.js', - 'dependencies' => [ - 'jquery.ui.core', - 'jquery.ui.widget', - 'jquery.ui.position', - ], - 'skinStyles' => [ - 'default' => 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.tooltip.css', - ], - 'group' => 'jquery.ui', + 'deprecated' => 'Please use the main `jquery.ui` module, not this alias.', + 'targets' => [ 'mobile', 'desktop' ], + 'dependencies' => 'jquery.ui', ], 'jquery.ui.widget' => [ - 'deprecated' => true, - 'scripts' => 'resources/lib/jquery.ui/jquery.ui.widget.js', - 'group' => 'jquery.ui', - 'targets' => [ 'desktop', 'mobile' ], + 'deprecated' => 'Please use the main `jquery.ui` module, not this alias.', + 'targets' => [ 'mobile', 'desktop' ], + 'dependencies' => 'jquery.ui', ], 'jquery.effects.core' => [ - 'deprecated' => true, - 'scripts' => 'resources/lib/jquery.ui/jquery.ui.effect.js', - 'group' => 'jquery.ui', + 'deprecated' => 'Please use the main `jquery.ui` module, not this alias.', + 'targets' => [ 'mobile', 'desktop' ], + 'dependencies' => 'jquery.ui', ], 'jquery.effects.blind' => [ - 'scripts' => 'resources/lib/jquery.ui/jquery.ui.effect-blind.js', - 'dependencies' => 'jquery.effects.core', - 'group' => 'jquery.ui', + 'deprecated' => 'Please use the main `jquery.ui` module, not this alias.', + 'targets' => [ 'mobile', 'desktop' ], + 'dependencies' => 'jquery.ui', ], 'jquery.effects.clip' => [ - 'scripts' => 'resources/lib/jquery.ui/jquery.ui.effect-clip.js', - 'dependencies' => 'jquery.effects.core', - 'group' => 'jquery.ui', + 'deprecated' => 'Please use the main `jquery.ui` module, not this alias.', + 'targets' => [ 'mobile', 'desktop' ], + 'dependencies' => 'jquery.ui', ], 'jquery.effects.drop' => [ - 'scripts' => 'resources/lib/jquery.ui/jquery.ui.effect-drop.js', - 'dependencies' => 'jquery.effects.core', - 'group' => 'jquery.ui', + 'deprecated' => 'Please use the main `jquery.ui` module, not this alias.', + 'targets' => [ 'mobile', 'desktop' ], + 'dependencies' => 'jquery.ui', ], 'jquery.effects.highlight' => [ - 'scripts' => 'resources/lib/jquery.ui/jquery.ui.effect-highlight.js', - 'dependencies' => 'jquery.effects.core', - 'group' => 'jquery.ui', + 'deprecated' => 'Please use the main `jquery.ui` module, not this alias.', + 'targets' => [ 'mobile', 'desktop' ], + 'dependencies' => 'jquery.ui', ], 'jquery.effects.scale' => [ - 'scripts' => 'resources/lib/jquery.ui/jquery.ui.effect-scale.js', - 'dependencies' => 'jquery.effects.core', - 'group' => 'jquery.ui', + 'deprecated' => 'Please use the main `jquery.ui` module, not this alias.', + 'targets' => [ 'mobile', 'desktop' ], + 'dependencies' => 'jquery.ui', ], 'jquery.effects.shake' => [ - 'scripts' => 'resources/lib/jquery.ui/jquery.ui.effect-shake.js', - 'dependencies' => 'jquery.effects.core', - 'group' => 'jquery.ui', + 'deprecated' => 'Please use the main `jquery.ui` module, not this alias.', + 'targets' => [ 'mobile', 'desktop' ], + 'dependencies' => 'jquery.ui', ], /* Moment.js */