jenkins-bot has submitted this change and it was merged.
Change subject: resourceloader: Remove 'require' and 'module' from debug mode
......................................................................
resourceloader: Remove 'require' and 'module' from debug mode
Partially reverts 94c116240 and 7fd977b242 as it was incorrectly
split up. This should've been part of Idbd05488 instead of 94c116240.
Bug: T108655
Bug: T129776
Change-Id: Ia5e6e57c9bd651ec913a2543e2df8951ff345ea2
---
M resources/src/mediawiki/mediawiki.js
D tests/qunit/data/defineCallMwLoaderTestCallback.js
D tests/qunit/data/requireCallMwLoaderTestCallback.js
M tests/qunit/suites/resources/mediawiki/mediawiki.test.js
4 files changed, 1 insertion(+), 31 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/src/mediawiki/mediawiki.js
b/resources/src/mediawiki/mediawiki.js
index 4aad2ba..9d799db 100644
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -1189,18 +1189,11 @@
* @param {string} [moduleName] Name of currently
executing module
* @return {jQuery.Promise}
*/
- function queueModuleScript( src, moduleName ) {
+ function queueModuleScript( src ) {
var r = $.Deferred();
pendingRequests.push( function () {
- if ( moduleName && hasOwn.call(
registry, moduleName ) ) {
- window.require =
mw.loader.require;
- window.module = registry[
moduleName ].module;
- }
addScript( src ).always( function () {
- // Clear environment
- delete window.require;
- delete window.module;
r.resolve();
// Start the next one (if any)
diff --git a/tests/qunit/data/defineCallMwLoaderTestCallback.js
b/tests/qunit/data/defineCallMwLoaderTestCallback.js
deleted file mode 100644
index afd886c..0000000
--- a/tests/qunit/data/defineCallMwLoaderTestCallback.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = 'Define worked.';
diff --git a/tests/qunit/data/requireCallMwLoaderTestCallback.js
b/tests/qunit/data/requireCallMwLoaderTestCallback.js
deleted file mode 100644
index 8bc087b..0000000
--- a/tests/qunit/data/requireCallMwLoaderTestCallback.js
+++ /dev/null
@@ -1,2 +0,0 @@
-var x = require( 'test.require.define' );
-module.exports = 'Require worked.' + x;
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
b/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
index dd43c55..ce4ea8b 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
@@ -1127,24 +1127,4 @@
}, /is not loaded/, 'Requesting non-existent modules throws
error.' );
} );
- QUnit.asyncTest( 'mw.loader require in debug mode', 1, function (
assert ) {
- var path = mw.config.get( 'wgScriptPath' );
- mw.loader.register( [
- [ 'test.require.define', '0' ],
- [ 'test.require.callback', '0', [ 'test.require.define'
] ]
- ] );
- mw.loader.implement( 'test.require.callback', [ QUnit.fixurl(
path + '/tests/qunit/data/requireCallMwLoaderTestCallback.js' ) ] );
- mw.loader.implement( 'test.require.define', [ QUnit.fixurl(
path + '/tests/qunit/data/defineCallMwLoaderTestCallback.js' ) ] );
-
- mw.loader.using( 'test.require.callback', function () {
- QUnit.start();
- var exported = mw.loader.require(
'test.require.callback' );
- assert.strictEqual( exported, 'Require worked.Define
worked.',
- 'module.exports worked in debug mode' );
- }, function () {
- QUnit.start();
- assert.ok( false, 'Error callback fired while
loader.using "test.require.callback" module' );
- } );
- } );
-
}( mediaWiki, jQuery ) );
--
To view, visit https://gerrit.wikimedia.org/r/277289
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia5e6e57c9bd651ec913a2543e2df8951ff345ea2
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Cscott <[email protected]>
Gerrit-Reviewer: Edokter <[email protected]>
Gerrit-Reviewer: Jack Phoenix <[email protected]>
Gerrit-Reviewer: Jackmcbarn <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
