From 5a5abfd18a6b27f0919fe2ee391fffd09bf637df Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Mon, 9 Sep 2019 18:23:34 +0100 Subject: [PATCH] mediawiki.util: Move mw.RegExp over as well to simplify migration Follows-up 8697ba835463c94. In order to allow for a simpler migration and to keep compatibility over 1 stable release at least, deprecate the module only, and keep the alias in the destination module. This means 'mediawiki.RegExp' can be replaced with 'mediawiki.util', without it causing code to break. It will still warn about the method being deprecated, which can then be fixed separately, depending on whether compat is needed. This is mainly to reduce risk from mass migrations in user scripts and gadgets (to do in two separate passes). Bug: T218339 Change-Id: I07ba0a481b83fe704be3a17199070bafba4d5233 --- resources/Resources.php | 1 - resources/src/mediawiki.RegExp.js | 5 ----- resources/src/mediawiki.util/util.js | 5 +++++ 3 files changed, 5 insertions(+), 6 deletions(-) delete mode 100644 resources/src/mediawiki.RegExp.js diff --git a/resources/Resources.php b/resources/Resources.php index b3aee844e6..8a6ec611d6 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -1028,7 +1028,6 @@ return [ ], 'mediawiki.RegExp' => [ 'deprecated' => 'Please use mw.util.escapeRegExp() instead.', - 'scripts' => 'resources/src/mediawiki.RegExp.js', 'targets' => [ 'desktop', 'mobile' ], 'dependencies' => [ 'mediawiki.util', diff --git a/resources/src/mediawiki.RegExp.js b/resources/src/mediawiki.RegExp.js deleted file mode 100644 index 258bc2c3b7..0000000000 --- a/resources/src/mediawiki.RegExp.js +++ /dev/null @@ -1,5 +0,0 @@ -( function () { - mw.RegExp = {}; - // Backwards-compatible alias; @deprecated since 1.34 - mw.log.deprecate( mw.RegExp, 'escape', mw.util.escapeRegExp, 'Use mw.util.escapeRegExp() instead.', 'mw.RegExp.escape' ); -}() ); diff --git a/resources/src/mediawiki.util/util.js b/resources/src/mediawiki.util/util.js index 6342011dd1..e8823e1249 100644 --- a/resources/src/mediawiki.util/util.js +++ b/resources/src/mediawiki.util/util.js @@ -533,6 +533,11 @@ util = { } }; +// Backwards-compatible alias for mediawiki.RegExp module. +// @deprecated since 1.34 +mw.RegExp = {}; +mw.log.deprecate( mw.RegExp, 'escape', util.escapeRegExp, 'Use mw.util.escapeRegExp() instead.', 'mw.RegExp.escape' ); + // Not allowed outside unit tests if ( window.QUnit ) { util.setOptionsForTest = function ( opts ) { -- 2.20.1