From add9bd191fd4d16250b301208600854cb52f6b33 Mon Sep 17 00:00:00 2001
From: Timo Tijhof <krinklemail@gmail.com>
Date: Wed, 29 Aug 2018 05:46:30 +0100
Subject: [PATCH] resources: Strip '$' and 'mw' from file closures

Follows-up Id6d13bbea6:
- '$': mw.loader.implement does this already.
- 'mw': Use the canonical name directly.

This replaces the following patterns:

File closures (common):
- `( function ( $, mw ) {`     => `( function () {`
- `( function ( $ ) {`         => `( function () {`
- `( function ( mw ) {`        => `( function () {`
- `( function ( mw, $ ) {`     => `( function () {`

File closures (rare):
- `( function ( mw, $, OO ) {`    => `( function () {`
- `( function ( mw, OO, $ ) {`    => `( function () {`
- `( function ( mw, document ) {` => `( function () {`

Combined dom-ready and file closure (rare):
- `jQuery( function ( $ ) {` => `$( function () {
- `jQuery( function () {` => `$( function () {

Remaining references in files without a closure, as found by
the new ESLint setting (rare):
- `jQuery`    => `$`
- `mediaWiki` => `mw`

Change-Id: I7cf2426cde597259e8c6f3f6f615a1a81a0ca82b
---
 .eslintrc.json                                       |  2 --
 mw-config/config.js                                  |  4 ++--
 resources/src/jquery.spinner/spinner.js              |  4 ++--
 .../src/jquery.tablesorter/jquery.tablesorter.js     |  4 ++--
 resources/src/jquery.tipsy/jquery.tipsy.js           |  4 ++--
 resources/src/jquery/jquery.accessKeyLabel.js        |  4 ++--
 resources/src/jquery/jquery.byteLength.js            |  2 +-
 resources/src/jquery/jquery.checkboxShiftClick.js    |  4 ++--
 resources/src/jquery/jquery.color.js                 |  4 ++--
 resources/src/jquery/jquery.colorUtil.js             |  4 ++--
 resources/src/jquery/jquery.confirmable.js           |  4 ++--
 resources/src/jquery/jquery.confirmable.mediawiki.js |  4 ++--
 resources/src/jquery/jquery.getAttrs.js              |  4 ++--
 resources/src/jquery/jquery.hidpi.js                 |  4 ++--
 resources/src/jquery/jquery.highlightText.js         |  4 ++--
 resources/src/jquery/jquery.lengthLimit.js           |  4 ++--
 resources/src/jquery/jquery.localize.js              |  4 ++--
 resources/src/jquery/jquery.makeCollapsible.js       |  4 ++--
 resources/src/jquery/jquery.mw-jump.js               |  2 +-
 resources/src/jquery/jquery.suggestions.js           |  4 ++--
 resources/src/jquery/jquery.tabIndex.js              |  4 ++--
 resources/src/jquery/jquery.textSelection.js         |  4 ++--
 resources/src/mediawiki.ForeignApi.core.js           |  4 ++--
 .../BookletLayout.js                                 |  4 ++--
 resources/src/mediawiki.ForeignStructuredUpload.js   |  4 ++--
 resources/src/mediawiki.ForeignUpload.js             |  4 ++--
 resources/src/mediawiki.RegExp.js                    |  4 ++--
 resources/src/mediawiki.Title/Title.js               |  4 ++--
 resources/src/mediawiki.Title/phpCharToUpper.js      |  4 ++--
 .../mediawiki.Upload.BookletLayout/BookletLayout.js  |  4 ++--
 resources/src/mediawiki.Upload.Dialog.js             |  4 ++--
 resources/src/mediawiki.Upload.js                    |  4 ++--
 resources/src/mediawiki.Uri/Uri.js                   |  4 ++--
 .../mediawiki.action/mediawiki.action.delete.file.js |  4 ++--
 .../src/mediawiki.action/mediawiki.action.delete.js  |  4 ++--
 .../mediawiki.action.edit.collapsibleFooter.js       |  4 ++--
 .../mediawiki.action.edit.editWarning.js             |  4 ++--
 .../src/mediawiki.action/mediawiki.action.edit.js    |  4 ++--
 .../mediawiki.action.edit.preview.js                 |  4 ++--
 .../mediawiki.action/mediawiki.action.edit.stash.js  |  4 ++--
 .../src/mediawiki.action/mediawiki.action.history.js |  2 +-
 .../mediawiki.action.view.dblClickEdit.js            |  4 ++--
 .../mediawiki.action.view.metadata.js                |  4 ++--
 .../mediawiki.action.view.postEdit.js                |  4 ++--
 .../mediawiki.action.view.redirect.js                |  4 ++--
 .../mediawiki.action.view.rightClickEdit.js          |  4 ++--
 resources/src/mediawiki.api/category.js              |  4 ++--
 resources/src/mediawiki.api/edit.js                  |  4 ++--
 resources/src/mediawiki.api/index.js                 |  4 ++--
 resources/src/mediawiki.api/login.js                 |  4 ++--
 resources/src/mediawiki.api/messages.js              |  4 ++--
 resources/src/mediawiki.api/options.js               |  4 ++--
 resources/src/mediawiki.api/parse.js                 |  4 ++--
 resources/src/mediawiki.api/rollback.js              |  4 ++--
 resources/src/mediawiki.api/upload.js                |  4 ++--
 resources/src/mediawiki.api/user.js                  |  4 ++--
 resources/src/mediawiki.api/watch.js                 |  4 ++--
 resources/src/mediawiki.checkboxtoggle.js            |  4 ++--
 resources/src/mediawiki.confirmCloseWindow.js        |  4 ++--
 resources/src/mediawiki.cookie.js                    |  4 ++--
 resources/src/mediawiki.debug/debug.js               |  4 ++--
 resources/src/mediawiki.debug/jquery.footHovzer.js   |  4 ++--
 resources/src/mediawiki.experiments.js               |  4 ++--
 resources/src/mediawiki.feedback/feedback.js         |  4 ++--
 resources/src/mediawiki.filewarning/filewarning.js   |  6 +++---
 resources/src/mediawiki.htmlform.checker.js          |  4 ++--
 resources/src/mediawiki.htmlform.ooui/Element.js     |  4 ++--
 resources/src/mediawiki.htmlform/autocomplete.js     |  4 ++--
 resources/src/mediawiki.htmlform/autoinfuse.js       |  4 ++--
 resources/src/mediawiki.htmlform/checkmatrix.js      |  4 ++--
 resources/src/mediawiki.htmlform/cloner.js           |  4 ++--
 resources/src/mediawiki.htmlform/hide-if.js          |  8 ++++----
 resources/src/mediawiki.htmlform/htmlform.js         |  4 ++--
 resources/src/mediawiki.htmlform/multiselect.js      |  4 ++--
 resources/src/mediawiki.htmlform/selectandother.js   |  4 ++--
 resources/src/mediawiki.htmlform/selectorother.js    |  4 ++--
 resources/src/mediawiki.inspect.js                   |  4 ++--
 .../src/mediawiki.jqueryMsg/mediawiki.jqueryMsg.js   | 12 ++++++------
 resources/src/mediawiki.language/mediawiki.cldr.js   |  4 ++--
 .../mediawiki.language.fallback.js                   |  4 ++--
 .../mediawiki.language/mediawiki.language.init.js    |  4 ++--
 .../src/mediawiki.language/mediawiki.language.js     |  6 +++---
 .../mediawiki.language/mediawiki.language.months.js  |  4 ++--
 .../mediawiki.language/mediawiki.language.numbers.js |  4 ++--
 resources/src/mediawiki.legacy/protect.js            |  4 ++--
 resources/src/mediawiki.legacy/wikibits.js           |  4 ++--
 resources/src/mediawiki.libs.jpegmeta/export.js      |  4 ++--
 .../src/mediawiki.libs.pluralruleparser/export.js    |  2 +-
 .../WikitextMessagePoster.js                         |  4 ++--
 .../src/mediawiki.messagePoster/MessagePoster.js     |  4 ++--
 resources/src/mediawiki.messagePoster/factory.js     |  4 ++--
 .../src/mediawiki.notification.convertmessagebox.js  |  4 ++--
 resources/src/mediawiki.notification/notification.js |  4 ++--
 resources/src/mediawiki.notify.js                    |  4 ++--
 resources/src/mediawiki.page.gallery.js              |  4 ++--
 resources/src/mediawiki.page.gallery.slideshow.js    |  4 ++--
 resources/src/mediawiki.page.image.pagination.js     |  4 ++--
 resources/src/mediawiki.page.patrol.ajax.js          |  4 ++--
 resources/src/mediawiki.page.ready.js                |  4 ++--
 resources/src/mediawiki.page.rollback.js             |  4 ++--
 resources/src/mediawiki.page.startup.js              |  4 ++--
 resources/src/mediawiki.page.watch.ajax.js           |  4 ++--
 .../dm/mw.rcfilters.dm.ChangesListViewModel.js       |  4 ++--
 .../dm/mw.rcfilters.dm.FilterGroup.js                |  4 ++--
 .../dm/mw.rcfilters.dm.FilterItem.js                 |  4 ++--
 .../dm/mw.rcfilters.dm.FiltersViewModel.js           |  4 ++--
 .../dm/mw.rcfilters.dm.ItemModel.js                  |  4 ++--
 .../dm/mw.rcfilters.dm.SavedQueriesModel.js          |  4 ++--
 .../dm/mw.rcfilters.dm.SavedQueryItemModel.js        |  4 ++--
 .../mediawiki.rcfilters/mw.rcfilters.Controller.js   |  4 ++--
 .../mw.rcfilters.HighlightColors.js                  |  4 ++--
 .../mediawiki.rcfilters/mw.rcfilters.UriProcessor.js |  4 ++--
 .../src/mediawiki.rcfilters/mw.rcfilters.init.js     |  4 ++--
 resources/src/mediawiki.rcfilters/mw.rcfilters.js    |  4 ++--
 ...w.rcfilters.ui.ChangesLimitAndDateButtonWidget.js |  4 ++--
 .../ui/mw.rcfilters.ui.ChangesLimitPopupWidget.js    |  4 ++--
 .../ui/mw.rcfilters.ui.ChangesListWrapperWidget.js   |  4 ++--
 .../ui/mw.rcfilters.ui.CheckboxInputWidget.js        |  4 ++--
 .../ui/mw.rcfilters.ui.DatePopupWidget.js            |  4 ++--
 .../ui/mw.rcfilters.ui.FilterItemHighlightButton.js  |  4 ++--
 .../ui/mw.rcfilters.ui.FilterMenuHeaderWidget.js     |  4 ++--
 .../ui/mw.rcfilters.ui.FilterMenuOptionWidget.js     |  4 ++--
 .../mw.rcfilters.ui.FilterMenuSectionOptionWidget.js |  4 ++--
 .../ui/mw.rcfilters.ui.FilterTagItemWidget.js        |  4 ++--
 .../ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js |  4 ++--
 .../ui/mw.rcfilters.ui.FilterWrapperWidget.js        |  4 ++--
 .../ui/mw.rcfilters.ui.FormWrapperWidget.js          |  4 ++--
 .../ui/mw.rcfilters.ui.GroupWidget.js                |  4 ++--
 .../ui/mw.rcfilters.ui.HighlightColorPickerWidget.js |  4 ++--
 .../ui/mw.rcfilters.ui.HighlightPopupWidget.js       |  4 ++--
 .../ui/mw.rcfilters.ui.ItemMenuOptionWidget.js       |  4 ++--
 .../ui/mw.rcfilters.ui.LiveUpdateButtonWidget.js     |  4 ++--
 .../ui/mw.rcfilters.ui.MainWrapperWidget.js          |  4 ++--
 .../ui/mw.rcfilters.ui.MarkSeenButtonWidget.js       |  4 ++--
 .../ui/mw.rcfilters.ui.MenuSelectWidget.js           |  4 ++--
 .../ui/mw.rcfilters.ui.RcTopSectionWidget.js         |  4 ++--
 .../ui/mw.rcfilters.ui.RclTargetPageWidget.js        |  4 ++--
 .../ui/mw.rcfilters.ui.RclToOrFromWidget.js          |  4 ++--
 .../ui/mw.rcfilters.ui.RclTopSectionWidget.js        |  4 ++--
 .../mw.rcfilters.ui.SaveFiltersPopupButtonWidget.js  |  4 ++--
 .../ui/mw.rcfilters.ui.SavedLinksListItemWidget.js   |  4 ++--
 .../ui/mw.rcfilters.ui.SavedLinksListWidget.js       |  4 ++--
 .../ui/mw.rcfilters.ui.TagItemWidget.js              |  4 ++--
 .../ui/mw.rcfilters.ui.ValuePickerWidget.js          |  4 ++--
 .../ui/mw.rcfilters.ui.ViewSwitchWidget.js           |  4 ++--
 .../ui/mw.rcfilters.ui.WatchlistTopSectionWidget.js  |  4 ++--
 .../src/mediawiki.searchSuggest/searchSuggest.js     |  4 ++--
 .../src/mediawiki.special.apisandbox/apisandbox.js   |  4 ++--
 resources/src/mediawiki.special.block.js             |  4 ++--
 resources/src/mediawiki.special.changecredentials.js |  4 ++--
 .../src/mediawiki.special.changeslist.legend.js      |  4 ++--
 resources/src/mediawiki.special.contributions.js     |  4 ++--
 resources/src/mediawiki.special.edittags.js          |  4 ++--
 resources/src/mediawiki.special.import.js            |  4 ++--
 resources/src/mediawiki.special.movePage.js          |  4 ++--
 resources/src/mediawiki.special.pageLanguage.js      |  4 ++--
 .../mediawiki.special.preferences.ooui/editfont.js   |  4 ++--
 .../src/mediawiki.special.preferences.ooui/tabs.js   |  4 ++--
 .../mediawiki.special.preferences/confirmClose.js    |  4 ++--
 .../convertmessagebox.js                             |  4 ++--
 .../mediawiki.special.preferences/personalEmail.js   |  4 ++--
 .../src/mediawiki.special.preferences/tabs.legacy.js |  4 ++--
 .../src/mediawiki.special.preferences/timezone.js    |  4 ++--
 resources/src/mediawiki.special.recentchanges.js     |  4 ++--
 resources/src/mediawiki.special.revisionDelete.js    |  4 ++--
 ...ediawiki.special.search.commonsInterwikiWidget.js |  4 ++--
 resources/src/mediawiki.special.search/search.js     |  4 ++--
 resources/src/mediawiki.special.undelete.js          |  4 ++--
 .../unwatchedPages.js                                |  4 ++--
 resources/src/mediawiki.special.upload/upload.js     |  4 ++--
 resources/src/mediawiki.special.userlogin.signup.js  |  4 ++--
 resources/src/mediawiki.special.userrights.js        |  4 ++--
 .../src/mediawiki.special.watchlist/visitedstatus.js |  4 ++--
 .../src/mediawiki.special.watchlist/watchlist.js     |  5 ++---
 resources/src/mediawiki.storage.js                   |  4 ++--
 resources/src/mediawiki.template.js                  |  4 ++--
 resources/src/mediawiki.template.mustache.js         |  4 ++--
 resources/src/mediawiki.template.regexp.js           |  2 +-
 resources/src/mediawiki.toc/toc.js                   |  4 ++--
 resources/src/mediawiki.toolbar/toolbar.js           |  4 ++--
 resources/src/mediawiki.user.js                      |  4 ++--
 resources/src/mediawiki.userSuggest.js               |  4 ++--
 resources/src/mediawiki.util.js                      |  4 ++--
 resources/src/mediawiki.viewport.js                  |  4 ++--
 resources/src/mediawiki.visibleTimeout.js            |  5 +++--
 .../src/mediawiki.widgets.datetime/CalendarWidget.js |  4 ++--
 .../mediawiki.widgets.datetime/DateTimeFormatter.js  |  4 ++--
 .../DateTimeInputWidget.js                           |  4 ++--
 .../DiscordianDateTimeFormatter.js                   |  4 ++--
 .../ProlepticGregorianDateTimeFormatter.js           |  4 ++--
 .../mediawiki.widgets.datetime.js                    |  2 +-
 .../mediawiki.widgets.visibleLengthLimit.js          |  4 ++--
 .../MediaSearch/mw.widgets.APIResultsProvider.js     |  4 ++--
 .../MediaSearch/mw.widgets.APIResultsQueue.js        |  4 ++--
 .../MediaSearch/mw.widgets.MediaResourceProvider.js  |  4 ++--
 .../MediaSearch/mw.widgets.MediaResourceQueue.js     |  4 ++--
 .../MediaSearch/mw.widgets.MediaResultWidget.js      |  4 ++--
 .../MediaSearch/mw.widgets.MediaSearchProvider.js    |  4 ++--
 .../MediaSearch/mw.widgets.MediaSearchQueue.js       |  4 ++--
 .../MediaSearch/mw.widgets.MediaSearchWidget.js      |  4 ++--
 .../mediawiki.widgets/mw.widgets.CalendarWidget.js   |  4 ++--
 .../mw.widgets.CategoryMultiselectWidget.js          |  4 ++--
 .../mw.widgets.CategoryTagItemWidget.js              |  4 ++--
 .../mw.widgets.CheckMatrixWidget.js                  |  4 ++--
 .../mw.widgets.ComplexNamespaceInputWidget.js        |  4 ++--
 .../mw.widgets.ComplexTitleInputWidget.js            |  4 ++--
 .../mediawiki.widgets/mw.widgets.DateInputWidget.js  |  4 ++--
 .../mw.widgets.ExpiryInputWidget.js                  |  4 ++--
 .../mw.widgets.NamespaceInputWidget.js               |  4 ++--
 .../mw.widgets.SearchInputWidget.js                  |  4 ++--
 .../mw.widgets.SelectWithInputWidget.js              |  4 ++--
 .../mediawiki.widgets/mw.widgets.SizeFilterWidget.js |  4 ++--
 .../mw.widgets.StashedFileWidget.js                  |  4 ++--
 .../mediawiki.widgets/mw.widgets.TitleInputWidget.js |  4 ++--
 .../mw.widgets.TitleOptionWidget.js                  |  4 ++--
 .../mw.widgets.TitleSearchWidget.js                  |  4 ++--
 .../src/mediawiki.widgets/mw.widgets.TitleWidget.js  |  4 ++--
 .../mediawiki.widgets/mw.widgets.UserInputWidget.js  |  4 ++--
 .../mw.widgets.UsersMultiselectWidget.js             |  4 ++--
 resources/src/moment/moment-locale-overrides.js      |  6 +++---
 resources/src/ooui-local.js                          |  4 ++--
 tests/qunit/data/mwLoaderTestCallback.js             |  2 +-
 tests/qunit/data/testrunner.js                       |  4 ++--
 .../resources/jquery/jquery.accessKeyLabel.test.js   |  4 ++--
 .../suites/resources/jquery/jquery.color.test.js     |  4 ++--
 .../suites/resources/jquery/jquery.colorUtil.test.js |  4 ++--
 .../suites/resources/jquery/jquery.getAttrs.test.js  |  4 ++--
 .../suites/resources/jquery/jquery.hidpi.test.js     |  4 ++--
 .../resources/jquery/jquery.highlightText.test.js    |  4 ++--
 .../resources/jquery/jquery.lengthLimit.test.js      |  4 ++--
 .../suites/resources/jquery/jquery.localize.test.js  |  4 ++--
 .../resources/jquery/jquery.makeCollapsible.test.js  |  4 ++--
 .../suites/resources/jquery/jquery.tabIndex.test.js  |  4 ++--
 .../jquery/jquery.tablesorter.parsers.test.js        |  4 ++--
 .../resources/jquery/jquery.tablesorter.test.js      |  4 ++--
 .../resources/jquery/jquery.textSelection.test.js    |  4 ++--
 .../mediawiki.api/mediawiki.ForeignApi.test.js       |  4 ++--
 .../mediawiki.api/mediawiki.api.category.test.js     |  4 ++--
 .../mediawiki.api/mediawiki.api.edit.test.js         |  4 ++--
 .../mediawiki.api/mediawiki.api.messages.test.js     |  4 ++--
 .../mediawiki.api/mediawiki.api.options.test.js      |  4 ++--
 .../mediawiki.api/mediawiki.api.parse.test.js        |  4 ++--
 .../resources/mediawiki.api/mediawiki.api.test.js    |  6 +++---
 .../mediawiki.api/mediawiki.api.upload.test.js       |  4 ++--
 .../mediawiki.api/mediawiki.api.watch.test.js        |  4 ++--
 .../mediawiki.rcfilters/UriProcessor.test.js         |  4 ++--
 .../mediawiki.rcfilters/dm.FilterItem.test.js        |  4 ++--
 .../mediawiki.rcfilters/dm.FiltersViewModel.test.js  |  4 ++--
 .../mediawiki.rcfilters/dm.SavedQueriesModel.test.js |  4 ++--
 .../dm.SavedQueryItemModel.test.js                   |  4 ++--
 .../mediawiki.special.recentchanges.test.js          |  4 ++--
 .../mediawiki.widgets.APIResultsQueue.test.js        |  4 ++--
 .../resources/mediawiki/mediawiki.RegExp.test.js     |  4 ++--
 .../mediawiki.String.trimByteLength.test.js          |  4 ++--
 .../resources/mediawiki/mediawiki.Title.test.js      |  4 ++--
 .../suites/resources/mediawiki/mediawiki.Uri.test.js |  4 ++--
 .../resources/mediawiki/mediawiki.base.test.js       |  4 ++--
 .../resources/mediawiki/mediawiki.cldr.test.js       |  4 ++--
 .../resources/mediawiki/mediawiki.cookie.test.js     |  4 ++--
 .../mediawiki/mediawiki.errorLogger.test.js          |  4 ++--
 .../mediawiki/mediawiki.experiments.test.js          |  4 ++--
 .../resources/mediawiki/mediawiki.html.test.js       |  4 ++--
 .../resources/mediawiki/mediawiki.inspect.test.js    |  4 ++--
 .../resources/mediawiki/mediawiki.jqueryMsg.test.js  |  4 ++--
 .../resources/mediawiki/mediawiki.jscompat.test.js   |  4 ++--
 .../resources/mediawiki/mediawiki.language.test.js   |  4 ++--
 .../resources/mediawiki/mediawiki.loader.test.js     |  4 ++--
 .../mediawiki.messagePoster.factory.test.js          |  4 ++--
 .../mediawiki/mediawiki.requestIdleCallback.test.js  |  4 ++--
 .../resources/mediawiki/mediawiki.storage.test.js    |  4 ++--
 .../mediawiki/mediawiki.template.mustache.test.js    |  4 ++--
 .../resources/mediawiki/mediawiki.template.test.js   |  4 ++--
 .../suites/resources/mediawiki/mediawiki.test.js     |  4 ++--
 .../suites/resources/mediawiki/mediawiki.toc.test.js |  4 ++--
 .../resources/mediawiki/mediawiki.track.test.js      |  4 ++--
 .../resources/mediawiki/mediawiki.user.test.js       |  4 ++--
 .../resources/mediawiki/mediawiki.util.test.js       |  6 +++---
 .../resources/mediawiki/mediawiki.viewport.test.js   |  4 ++--
 .../mediawiki/mediawiki.visibleTimeout.test.js       |  4 ++--
 279 files changed, 561 insertions(+), 563 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 4630e071e5..c0767517ea 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -8,8 +8,6 @@
 		"module": false,
 		"mw": false,
 		"$": false,
-		"mediaWiki": false,
-		"jQuery": false,
 		"OO": false
 	},
 	"rules": {
diff --git a/mw-config/config.js b/mw-config/config.js
index 99290f4453..74bdcf85b1 100644
--- a/mw-config/config.js
+++ b/mw-config/config.js
@@ -1,5 +1,5 @@
 /* global extDependencyMap */
-( function ( $ ) {
+( function () {
 	$( function () {
 		var $label, labelText;
 
@@ -148,4 +148,4 @@
 			} );
 		} );
 	} );
-}( jQuery ) );
+}() );
diff --git a/resources/src/jquery.spinner/spinner.js b/resources/src/jquery.spinner/spinner.js
index 9079cc09b7..5024688677 100644
--- a/resources/src/jquery.spinner/spinner.js
+++ b/resources/src/jquery.spinner/spinner.js
@@ -5,7 +5,7 @@
  *
  * @class jQuery.plugin.spinner
  */
-( function ( $ ) {
+( function () {
 
 	// Default options for new spinners,
 	// stored outside the function to share between calls.
@@ -111,4 +111,4 @@
 	 * @mixins jQuery.plugin.spinner
 	 */
 
-}( jQuery ) );
+}() );
diff --git a/resources/src/jquery.tablesorter/jquery.tablesorter.js b/resources/src/jquery.tablesorter/jquery.tablesorter.js
index cbdc2fa9b3..a37bcf7b1d 100644
--- a/resources/src/jquery.tablesorter/jquery.tablesorter.js
+++ b/resources/src/jquery.tablesorter/jquery.tablesorter.js
@@ -43,7 +43,7 @@
  *
  * @author Christian Bach/christian.bach@polyester.se
  */
-( function ( $, mw ) {
+( function () {
 	var ts,
 		parsers = [];
 
@@ -1281,4 +1281,4 @@
 		type: 'numeric'
 	} );
 
-}( jQuery, mediaWiki ) );
+}() );
diff --git a/resources/src/jquery.tipsy/jquery.tipsy.js b/resources/src/jquery.tipsy/jquery.tipsy.js
index ddda432f32..a5e51843de 100644
--- a/resources/src/jquery.tipsy/jquery.tipsy.js
+++ b/resources/src/jquery.tipsy/jquery.tipsy.js
@@ -6,7 +6,7 @@
 // * This installation of tipsy includes several local modifications to both Javascript and CSS.
 //   Please be careful when upgrading.
 
-( function ( mw, $ ) {
+( function () {
 
     function maybeCall(thing, ctx) {
         return (typeof thing == 'function') ? (thing.call(ctx)) : thing;
@@ -278,4 +278,4 @@
         }
     };
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/jquery/jquery.accessKeyLabel.js b/resources/src/jquery/jquery.accessKeyLabel.js
index 674f62cd74..cdc5808ca7 100644
--- a/resources/src/jquery/jquery.accessKeyLabel.js
+++ b/resources/src/jquery/jquery.accessKeyLabel.js
@@ -3,7 +3,7 @@
  *
  * @class jQuery.plugin.accessKeyLabel
  */
-( function ( $, mw ) {
+( function () {
 
 	// Cached access key modifiers for used browser
 	var cachedAccessKeyModifiers,
@@ -236,4 +236,4 @@
 	 * @mixins jQuery.plugin.accessKeyLabel
 	 */
 
-}( jQuery, mediaWiki ) );
+}() );
diff --git a/resources/src/jquery/jquery.byteLength.js b/resources/src/jquery/jquery.byteLength.js
index 5764ae90ad..2e1a338d56 100644
--- a/resources/src/jquery/jquery.byteLength.js
+++ b/resources/src/jquery/jquery.byteLength.js
@@ -12,7 +12,7 @@
  * @param {string} str
  * @return {number}
  */
-mediaWiki.log.deprecate( jQuery, 'byteLength', require( 'mediawiki.String' ).byteLength,
+mw.log.deprecate( $, 'byteLength', require( 'mediawiki.String' ).byteLength,
 	'Use require( \'mediawiki.String\' ).byteLength instead.', '$.byteLength' );
 
 /**
diff --git a/resources/src/jquery/jquery.checkboxShiftClick.js b/resources/src/jquery/jquery.checkboxShiftClick.js
index d99e9f0a8b..63cf28c5b8 100644
--- a/resources/src/jquery/jquery.checkboxShiftClick.js
+++ b/resources/src/jquery/jquery.checkboxShiftClick.js
@@ -1,7 +1,7 @@
 /**
  * @class jQuery.plugin.checkboxShiftClick
  */
-( function ( $ ) {
+( function () {
 
 	/**
 	 * Enable checkboxes to be checked or unchecked in a row by clicking one,
@@ -40,4 +40,4 @@
 	 * @mixins jQuery.plugin.checkboxShiftClick
 	 */
 
-}( jQuery ) );
+}() );
diff --git a/resources/src/jquery/jquery.color.js b/resources/src/jquery/jquery.color.js
index 894cf863e8..6df02adf5b 100644
--- a/resources/src/jquery/jquery.color.js
+++ b/resources/src/jquery/jquery.color.js
@@ -7,7 +7,7 @@
  *
  * - 2011-01-05: Forked for MediaWiki. See also jQuery.colorUtil plugin
  */
-( function ( $ ) {
+( function () {
 
 	function getColor( elem, attr ) {
 		var color;
@@ -52,4 +52,4 @@
 		};
 	} );
 
-}( jQuery ) );
+}() );
diff --git a/resources/src/jquery/jquery.colorUtil.js b/resources/src/jquery/jquery.colorUtil.js
index d46d009909..009be1aa73 100644
--- a/resources/src/jquery/jquery.colorUtil.js
+++ b/resources/src/jquery/jquery.colorUtil.js
@@ -6,7 +6,7 @@
  * Mostly based on other plugins and functions (linted and optimized a little).
  * Sources cited inline.
  */
-( function ( $ ) {
+( function () {
 	/**
 	 * @class jQuery.colorUtil
 	 * @singleton
@@ -265,4 +265,4 @@
 
 	};
 
-}( jQuery ) );
+}() );
diff --git a/resources/src/jquery/jquery.confirmable.js b/resources/src/jquery/jquery.confirmable.js
index 7931c8147f..028b4b9184 100644
--- a/resources/src/jquery/jquery.confirmable.js
+++ b/resources/src/jquery/jquery.confirmable.js
@@ -7,7 +7,7 @@
  *
  * @class jQuery.plugin.confirmable
  */
-( function ( $ ) {
+( function () {
 	var identity = function ( data ) {
 		return data;
 	};
@@ -180,4 +180,4 @@
 			noTitle: undefined
 		}
 	};
-}( jQuery ) );
+}() );
diff --git a/resources/src/jquery/jquery.confirmable.mediawiki.js b/resources/src/jquery/jquery.confirmable.mediawiki.js
index daf23a99c0..aa1e90e14c 100644
--- a/resources/src/jquery/jquery.confirmable.mediawiki.js
+++ b/resources/src/jquery/jquery.confirmable.mediawiki.js
@@ -4,7 +4,7 @@
  * This file serves to inject our localised messages into it.
  */
 
-( function ( mw, $ ) {
+( function () {
 	$.fn.confirmable.defaultOptions.i18n = {
 		space: mw.message( 'word-separator' ).text(),
 		confirm: mw.message( 'confirmable-confirm', mw.user ).text(),
@@ -13,4 +13,4 @@
 		yesTitle: undefined,
 		noTitle: undefined
 	};
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/jquery/jquery.getAttrs.js b/resources/src/jquery/jquery.getAttrs.js
index e00298f406..e464c90bd1 100644
--- a/resources/src/jquery/jquery.getAttrs.js
+++ b/resources/src/jquery/jquery.getAttrs.js
@@ -1,7 +1,7 @@
 /**
  * @class jQuery.plugin.getAttrs
  */
-( function ( $ ) {
+( function () {
 	function serializeControls( controls ) {
 		var i,
 			data = {},
@@ -34,4 +34,4 @@
 	$.fn.serializeObject = function () {
 		return serializeControls( this.serializeArray() );
 	};
-}( jQuery ) );
+}() );
diff --git a/resources/src/jquery/jquery.hidpi.js b/resources/src/jquery/jquery.hidpi.js
index 7a7109cbc3..025e6c23e1 100644
--- a/resources/src/jquery/jquery.hidpi.js
+++ b/resources/src/jquery/jquery.hidpi.js
@@ -9,7 +9,7 @@
  *
  * @class jQuery.plugin.hidpi
  */
-( function ( $ ) {
+( function () {
 
 	/**
 	 * Get reported or approximate device pixel ratio.
@@ -174,4 +174,4 @@
 	 * @mixins jQuery.plugin.hidpi
 	 */
 
-}( jQuery ) );
+}() );
diff --git a/resources/src/jquery/jquery.highlightText.js b/resources/src/jquery/jquery.highlightText.js
index a14e3ebd38..782d7118fd 100644
--- a/resources/src/jquery/jquery.highlightText.js
+++ b/resources/src/jquery/jquery.highlightText.js
@@ -3,7 +3,7 @@
  * TODO: Add a function for restoring the previous text.
  * TODO: Accept mappings for converting shortcuts like WP: to Wikipedia:.
  */
-( function ( $, mw ) {
+( function () {
 
 	$.highlightText = {
 
@@ -94,4 +94,4 @@
 		} );
 	};
 
-}( jQuery, mediaWiki ) );
+}() );
diff --git a/resources/src/jquery/jquery.lengthLimit.js b/resources/src/jquery/jquery.lengthLimit.js
index 3823395c6b..26f8f9b1f3 100644
--- a/resources/src/jquery/jquery.lengthLimit.js
+++ b/resources/src/jquery/jquery.lengthLimit.js
@@ -1,7 +1,7 @@
 /**
  * @class jQuery.plugin.lengthLimit
  */
-( function ( $, mw ) {
+( function () {
 
 	var
 		eventKeys = [
@@ -211,4 +211,4 @@
 	 * @class jQuery
 	 * @mixins jQuery.plugin.lengthLimit
 	 */
-}( jQuery, mediaWiki ) );
+}() );
diff --git a/resources/src/jquery/jquery.localize.js b/resources/src/jquery/jquery.localize.js
index 20dc1b20fe..ab269f0cff 100644
--- a/resources/src/jquery/jquery.localize.js
+++ b/resources/src/jquery/jquery.localize.js
@@ -1,7 +1,7 @@
 /**
  * @class jQuery.plugin.localize
  */
-( function ( $, mw ) {
+( function () {
 
 	/**
 	 * Gets a localized message, using parameters from options if present.
@@ -177,4 +177,4 @@
 	 * @mixins jQuery.plugin.localize
 	 */
 
-}( jQuery, mediaWiki ) );
+}() );
diff --git a/resources/src/jquery/jquery.makeCollapsible.js b/resources/src/jquery/jquery.makeCollapsible.js
index 082603a5a0..43b8f0d667 100644
--- a/resources/src/jquery/jquery.makeCollapsible.js
+++ b/resources/src/jquery/jquery.makeCollapsible.js
@@ -10,7 +10,7 @@
  *
  * @class jQuery.plugin.makeCollapsible
  */
-( function ( $, mw ) {
+( function () {
 	/**
 	 * Handler for a click on a collapsible toggler.
 	 *
@@ -364,4 +364,4 @@
 	 * @mixins jQuery.plugin.makeCollapsible
 	 */
 
-}( jQuery, mediaWiki ) );
+}() );
diff --git a/resources/src/jquery/jquery.mw-jump.js b/resources/src/jquery/jquery.mw-jump.js
index 5eae0bec8d..ad1c96dba4 100644
--- a/resources/src/jquery/jquery.mw-jump.js
+++ b/resources/src/jquery/jquery.mw-jump.js
@@ -1,7 +1,7 @@
 /**
  * JavaScript to show jump links to motor-impaired users when they are focused.
  */
-jQuery( function ( $ ) {
+$( function () {
 
 	$( '.mw-jump' ).on( 'focus blur', 'a', function ( e ) {
 		// Confusingly jQuery leaves e.type as focusout for delegated blur events
diff --git a/resources/src/jquery/jquery.suggestions.js b/resources/src/jquery/jquery.suggestions.js
index 35c6a5dfb7..f2d6a044f1 100644
--- a/resources/src/jquery/jquery.suggestions.js
+++ b/resources/src/jquery/jquery.suggestions.js
@@ -90,7 +90,7 @@
  *  input or not.
  */
 
-( function ( $, mw ) {
+( function () {
 
 	var hasOwn = Object.hasOwnProperty;
 
@@ -775,4 +775,4 @@
 	 * @mixins jQuery.plugin.suggestions
 	 */
 
-}( jQuery, mediaWiki ) );
+}() );
diff --git a/resources/src/jquery/jquery.tabIndex.js b/resources/src/jquery/jquery.tabIndex.js
index 5fb28aa34b..dab437d4f0 100644
--- a/resources/src/jquery/jquery.tabIndex.js
+++ b/resources/src/jquery/jquery.tabIndex.js
@@ -1,7 +1,7 @@
 /**
  * @class jQuery.plugin.tabIndex
  */
-( function ( $ ) {
+( function () {
 
 	/**
 	 * Find the lowest tabindex in use within a selection.
@@ -54,4 +54,4 @@
 	 * @mixins jQuery.plugin.tabIndex
 	 */
 
-}( jQuery ) );
+}() );
diff --git a/resources/src/jquery/jquery.textSelection.js b/resources/src/jquery/jquery.textSelection.js
index da882708b9..6b4ab979a1 100644
--- a/resources/src/jquery/jquery.textSelection.js
+++ b/resources/src/jquery/jquery.textSelection.js
@@ -19,7 +19,7 @@
  *     $textbox.textSelection( 'encapsulateSelection', { pre: '<b>', post: '</b>' } );
  *     // Result: Textbox contains 'This is <b>bold</b>!', with cursor before the '!'
  */
-( function ( $ ) {
+( function () {
 	/**
 	 * Do things to the selection in a `<textarea>`, or a textarea-like editable element.
 	 *
@@ -443,4 +443,4 @@
 	 * @inheritdoc jQuery.plugin.textSelection#textSelection
 	 */
 
-}( jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.ForeignApi.core.js b/resources/src/mediawiki.ForeignApi.core.js
index 1a3cdd5a3f..4b6313b93c 100644
--- a/resources/src/mediawiki.ForeignApi.core.js
+++ b/resources/src/mediawiki.ForeignApi.core.js
@@ -1,4 +1,4 @@
-( function ( mw, $ ) {
+( function () {
 
 	/**
 	 * Create an object like mw.Api, but automatically handling everything required to communicate
@@ -116,4 +116,4 @@
 	// Expose
 	mw.ForeignApi = CoreForeignApi;
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.ForeignStructuredUpload.BookletLayout/BookletLayout.js b/resources/src/mediawiki.ForeignStructuredUpload.BookletLayout/BookletLayout.js
index ae1b590a0d..9974e2bd3b 100644
--- a/resources/src/mediawiki.ForeignStructuredUpload.BookletLayout/BookletLayout.js
+++ b/resources/src/mediawiki.ForeignStructuredUpload.BookletLayout/BookletLayout.js
@@ -1,5 +1,5 @@
 /* global moment, Uint8Array */
-( function ( $, mw ) {
+( function () {
 
 	/**
 	 * mw.ForeignStructuredUpload.BookletLayout encapsulates the process
@@ -459,4 +459,4 @@
 		this.dateWidget.setValue( '' ).setValidityFlag( true );
 	};
 
-}( jQuery, mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.ForeignStructuredUpload.js b/resources/src/mediawiki.ForeignStructuredUpload.js
index 177861ec05..2a167fe5ae 100644
--- a/resources/src/mediawiki.ForeignStructuredUpload.js
+++ b/resources/src/mediawiki.ForeignStructuredUpload.js
@@ -1,4 +1,4 @@
-( function ( mw, $, OO ) {
+( function () {
 	/**
 	 * Used to represent an upload in progress on the frontend.
 	 *
@@ -247,4 +247,4 @@
 	};
 
 	mw.ForeignStructuredUpload = ForeignStructuredUpload;
-}( mediaWiki, jQuery, OO ) );
+}() );
diff --git a/resources/src/mediawiki.ForeignUpload.js b/resources/src/mediawiki.ForeignUpload.js
index 08fc01d2f2..79c256200b 100644
--- a/resources/src/mediawiki.ForeignUpload.js
+++ b/resources/src/mediawiki.ForeignUpload.js
@@ -1,4 +1,4 @@
-( function ( mw, OO, $ ) {
+( function () {
 	/**
 	 * Used to represent an upload in progress on the frontend.
 	 *
@@ -140,4 +140,4 @@
 	};
 
 	mw.ForeignUpload = ForeignUpload;
-}( mediaWiki, OO, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.RegExp.js b/resources/src/mediawiki.RegExp.js
index 91cdc2d155..5323d4fd87 100644
--- a/resources/src/mediawiki.RegExp.js
+++ b/resources/src/mediawiki.RegExp.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	/**
 	 * @class mw.RegExp
 	 */
@@ -19,4 +19,4 @@
 			return str.replace( /([\\{}()|.?*+\-^$\[\]])/g, '\\$1' ); // eslint-disable-line no-useless-escape
 		}
 	};
-}( mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.Title/Title.js b/resources/src/mediawiki.Title/Title.js
index 4491634e41..33e5fbf93c 100644
--- a/resources/src/mediawiki.Title/Title.js
+++ b/resources/src/mediawiki.Title/Title.js
@@ -4,7 +4,7 @@
  * @since 1.18
  */
 
-( function ( mw, $ ) {
+( function () {
 	/**
 	 * Parse titles into an object structure. Note that when using the constructor
 	 * directly, passing invalid titles will result in an exception. Use #newFromText to use the
@@ -957,4 +957,4 @@
 	// Expose
 	mw.Title = Title;
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.Title/phpCharToUpper.js b/resources/src/mediawiki.Title/phpCharToUpper.js
index 2b39c9ab29..ed700f0f81 100644
--- a/resources/src/mediawiki.Title/phpCharToUpper.js
+++ b/resources/src/mediawiki.Title/phpCharToUpper.js
@@ -2,7 +2,7 @@
 // (It is excluded in jsduck.json.)
 // ESLint suggests unquoting some object keys, which would render the file unparseable by Opera 12.
 /* eslint-disable quote-props */
-( function ( mw ) {
+( function () {
 	var toUpperMapping = {
 		'ß': 'ß',
 		'ʼn': 'ʼn',
@@ -252,4 +252,4 @@
 		var mapped = toUpperMapping[ chr ];
 		return mapped || chr.toUpperCase();
 	};
-}( mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.Upload.BookletLayout/BookletLayout.js b/resources/src/mediawiki.Upload.BookletLayout/BookletLayout.js
index 06788f58e8..6b37dd1534 100644
--- a/resources/src/mediawiki.Upload.BookletLayout/BookletLayout.js
+++ b/resources/src/mediawiki.Upload.BookletLayout/BookletLayout.js
@@ -1,5 +1,5 @@
 /* global moment */
-( function ( $, mw, moment ) {
+( function () {
 
 	/**
 	 * mw.Upload.BookletLayout encapsulates the process of uploading a file
@@ -708,4 +708,4 @@
 		this.filenameUsageWidget.setValue( null );
 	};
 
-}( jQuery, mediaWiki, moment ) );
+}() );
diff --git a/resources/src/mediawiki.Upload.Dialog.js b/resources/src/mediawiki.Upload.Dialog.js
index 00c04bc807..5d88c5cf0c 100644
--- a/resources/src/mediawiki.Upload.Dialog.js
+++ b/resources/src/mediawiki.Upload.Dialog.js
@@ -1,4 +1,4 @@
-( function ( $, mw ) {
+( function () {
 
 	/**
 	 * mw.Upload.Dialog controls a {@link mw.Upload.BookletLayout BookletLayout}.
@@ -227,4 +227,4 @@
 				this.uploadBooklet.clear();
 			}, this );
 	};
-}( jQuery, mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.Upload.js b/resources/src/mediawiki.Upload.js
index 7e6cfb68fe..951efbd8ed 100644
--- a/resources/src/mediawiki.Upload.js
+++ b/resources/src/mediawiki.Upload.js
@@ -1,4 +1,4 @@
-( function ( mw, $ ) {
+( function () {
 	var UP;
 
 	/**
@@ -390,4 +390,4 @@
 	};
 
 	mw.Upload = Upload;
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.Uri/Uri.js b/resources/src/mediawiki.Uri/Uri.js
index bfdfc88077..178f16977d 100644
--- a/resources/src/mediawiki.Uri/Uri.js
+++ b/resources/src/mediawiki.Uri/Uri.js
@@ -50,7 +50,7 @@
  * @class mw.Uri
  */
 
-( function ( mw, $ ) {
+( function () {
 	var parser, properties;
 
 	/**
@@ -435,4 +435,4 @@
 		return location.href;
 	} );
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.action/mediawiki.action.delete.file.js b/resources/src/mediawiki.action/mediawiki.action.delete.file.js
index c282d6ac81..7996ea425d 100644
--- a/resources/src/mediawiki.action/mediawiki.action.delete.file.js
+++ b/resources/src/mediawiki.action/mediawiki.action.delete.file.js
@@ -1,7 +1,7 @@
 /*!
  * JavaScript for Special:RevisionDelete
  */
-( function ( mw, $ ) {
+( function () {
 	$( function () {
 		var colonSeparator = mw.message( 'colon-separator' ).text(),
 			summaryCodePointLimit = mw.config.get( 'wgCommentCodePointLimit' ),
@@ -28,4 +28,4 @@
 		}
 	} );
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.action/mediawiki.action.delete.js b/resources/src/mediawiki.action/mediawiki.action.delete.js
index 005a8df023..a7228edd50 100644
--- a/resources/src/mediawiki.action/mediawiki.action.delete.js
+++ b/resources/src/mediawiki.action/mediawiki.action.delete.js
@@ -1,7 +1,7 @@
 /*!
  * Scripts for action=delete at domready
  */
-( function ( mw, $ ) {
+( function () {
 	$( function () {
 		var colonSeparator = mw.message( 'colon-separator' ).text(),
 			summaryCodePointLimit = mw.config.get( 'wgCommentCodePointLimit' ),
@@ -27,4 +27,4 @@
 			reason.$input.byteLimit( summaryByteLimit, filterFn );
 		}
 	} );
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.collapsibleFooter.js b/resources/src/mediawiki.action/mediawiki.action.edit.collapsibleFooter.js
index 938962f37d..a8ea6b8f14 100644
--- a/resources/src/mediawiki.action/mediawiki.action.edit.collapsibleFooter.js
+++ b/resources/src/mediawiki.action/mediawiki.action.edit.collapsibleFooter.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	var collapsibleLists, handleOne;
 
 	// Collapsible lists of categories and templates
@@ -63,4 +63,4 @@
 			);
 		}
 	} );
-}( mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.editWarning.js b/resources/src/mediawiki.action/mediawiki.action.edit.editWarning.js
index 56dba703f4..4c4f5eb521 100644
--- a/resources/src/mediawiki.action/mediawiki.action.edit.editWarning.js
+++ b/resources/src/mediawiki.action/mediawiki.action.edit.editWarning.js
@@ -1,7 +1,7 @@
 /*
  * Javascript for module editWarning
  */
-( function ( mw, $ ) {
+( function () {
 	'use strict';
 
 	$( function () {
@@ -39,4 +39,4 @@
 		} );
 	} );
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.js b/resources/src/mediawiki.action/mediawiki.action.edit.js
index a85e740a87..966b5bcb90 100644
--- a/resources/src/mediawiki.action/mediawiki.action.edit.js
+++ b/resources/src/mediawiki.action/mediawiki.action.edit.js
@@ -1,7 +1,7 @@
 /*!
  * Scripts for action=edit at domready
  */
-( function ( mw, $ ) {
+( function () {
 	'use strict';
 
 	/**
@@ -48,4 +48,4 @@
 			} );
 		}
 	} );
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.preview.js b/resources/src/mediawiki.action/mediawiki.action.edit.preview.js
index dc1f33b7d8..b90427e935 100644
--- a/resources/src/mediawiki.action/mediawiki.action.edit.preview.js
+++ b/resources/src/mediawiki.action/mediawiki.action.edit.preview.js
@@ -1,7 +1,7 @@
 /*!
  * Live edit preview.
  */
-( function ( mw, $ ) {
+( function () {
 
 	/**
 	 * @ignore
@@ -329,4 +329,4 @@
 		$( document.body ).on( 'click', '#wpPreview, #wpDiff', doLivePreview );
 	} );
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.stash.js b/resources/src/mediawiki.action/mediawiki.action.edit.stash.js
index 1be0052aa5..ea3c0da034 100644
--- a/resources/src/mediawiki.action/mediawiki.action.edit.stash.js
+++ b/resources/src/mediawiki.action/mediawiki.action.edit.stash.js
@@ -2,7 +2,7 @@
  * Scripts for pre-emptive edit preparing on action=edit
  */
 
-( function ( mw, $ ) {
+( function () {
 	if ( !mw.config.get( 'wgAjaxEditStash' ) ) {
 		return;
 	}
@@ -162,4 +162,4 @@
 			checkStash();
 		}
 	} );
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.action/mediawiki.action.history.js b/resources/src/mediawiki.action/mediawiki.action.history.js
index 6f49fa6001..4e7ebcd39f 100644
--- a/resources/src/mediawiki.action/mediawiki.action.history.js
+++ b/resources/src/mediawiki.action/mediawiki.action.history.js
@@ -1,7 +1,7 @@
 /*!
  * JavaScript for History action
  */
-jQuery( function ( $ ) {
+$( function () {
 	var	$historyCompareForm = $( '#mw-history-compare' ),
 		$historySubmitter,
 		$lis = $( '#pagehistory > li' );
diff --git a/resources/src/mediawiki.action/mediawiki.action.view.dblClickEdit.js b/resources/src/mediawiki.action/mediawiki.action.view.dblClickEdit.js
index d89cd4a2d0..4b0e49b8d4 100644
--- a/resources/src/mediawiki.action/mediawiki.action.view.dblClickEdit.js
+++ b/resources/src/mediawiki.action/mediawiki.action.view.dblClickEdit.js
@@ -1,7 +1,7 @@
 /*!
  * Enables double-click-to-edit functionality.
  */
-( function ( mw, $ ) {
+( function () {
 	$( function () {
 		mw.util.$content.dblclick( function ( e ) {
 			var $a;
@@ -17,4 +17,4 @@
 			}
 		} );
 	} );
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.action/mediawiki.action.view.metadata.js b/resources/src/mediawiki.action/mediawiki.action.view.metadata.js
index bbe3032fc5..e76ea33ddc 100644
--- a/resources/src/mediawiki.action/mediawiki.action.view.metadata.js
+++ b/resources/src/mediawiki.action/mediawiki.action.view.metadata.js
@@ -6,7 +6,7 @@
  *
  * See also ImagePage.php#makeMetadataTable (creates the HTML)
  */
-( function ( mw, $ ) {
+( function () {
 	$( function () {
 		var $tables = $( '.mw_metadata' );
 		if ( !$tables.find( '.mw-metadata-collapsible, .collapsable' ).length ) {
@@ -54,4 +54,4 @@
 		$tables.addClass( 'collapsed' );
 	} );
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.action/mediawiki.action.view.postEdit.js b/resources/src/mediawiki.action/mediawiki.action.view.postEdit.js
index 5e859ac8a0..68b5214019 100644
--- a/resources/src/mediawiki.action/mediawiki.action.view.postEdit.js
+++ b/resources/src/mediawiki.action/mediawiki.action.view.postEdit.js
@@ -1,4 +1,4 @@
-( function ( mw, $ ) {
+( function () {
 	'use strict';
 
 	/**
@@ -80,4 +80,4 @@
 		} );
 	}
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.action/mediawiki.action.view.redirect.js b/resources/src/mediawiki.action/mediawiki.action.view.redirect.js
index 4e73354637..2a2a01d48e 100644
--- a/resources/src/mediawiki.action/mediawiki.action.view.redirect.js
+++ b/resources/src/mediawiki.action/mediawiki.action.view.redirect.js
@@ -5,7 +5,7 @@
  * This is loaded in the top queue, so avoid unnecessary dependencies
  * like mediawiki.Title or mediawiki.Uri.
  */
-( function ( mw, $ ) {
+( function () {
 	var profile = $.client.profile(),
 		canonical = mw.config.get( 'wgInternalRedirectTargetUrl' ),
 		fragment = null,
@@ -62,4 +62,4 @@
 		} );
 	}
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.action/mediawiki.action.view.rightClickEdit.js b/resources/src/mediawiki.action/mediawiki.action.view.rightClickEdit.js
index 35f948ebab..59d1d4f3fe 100644
--- a/resources/src/mediawiki.action/mediawiki.action.view.rightClickEdit.js
+++ b/resources/src/mediawiki.action/mediawiki.action.view.rightClickEdit.js
@@ -3,7 +3,7 @@
  * When the user right-clicks in a heading, it will open the
  * edit screen.
  */
-( function ( $ ) {
+( function () {
 	// Trigger this when a contextmenu click on the page targets an h1-h6 element.
 	// This uses a delegate handler which 1) starts immediately instead of blocking
 	// response on dom-ready, and 2) selects and binds once instead of N times.
@@ -24,4 +24,4 @@
 			$edit.get( 0 ).click();
 		}
 	} );
-}( jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.api/category.js b/resources/src/mediawiki.api/category.js
index 85df90e912..1c0fcbf8be 100644
--- a/resources/src/mediawiki.api/category.js
+++ b/resources/src/mediawiki.api/category.js
@@ -1,7 +1,7 @@
 /**
  * @class mw.Api.plugin.category
  */
-( function ( mw, $ ) {
+( function () {
 
 	$.extend( mw.Api.prototype, {
 		/**
@@ -98,4 +98,4 @@
 	 * @mixins mw.Api.plugin.category
 	 */
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.api/edit.js b/resources/src/mediawiki.api/edit.js
index e6f56680bd..0656c93a26 100644
--- a/resources/src/mediawiki.api/edit.js
+++ b/resources/src/mediawiki.api/edit.js
@@ -1,7 +1,7 @@
 /**
  * @class mw.Api.plugin.edit
  */
-( function ( mw, $ ) {
+( function () {
 
 	$.extend( mw.Api.prototype, {
 
@@ -196,4 +196,4 @@
 	 * @mixins mw.Api.plugin.edit
 	 */
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.api/index.js b/resources/src/mediawiki.api/index.js
index 8c9b309e2b..81c55e8019 100644
--- a/resources/src/mediawiki.api/index.js
+++ b/resources/src/mediawiki.api/index.js
@@ -1,4 +1,4 @@
-( function ( mw, $ ) {
+( function () {
 
 	/**
 	 * @class mw.Api
@@ -506,4 +506,4 @@
 	];
 	mw.log.deprecate( mw.Api, 'warnings', mw.Api.warnings, null, 'mw.Api.warnings' );
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.api/login.js b/resources/src/mediawiki.api/login.js
index 2b709aae7b..4432596f06 100644
--- a/resources/src/mediawiki.api/login.js
+++ b/resources/src/mediawiki.api/login.js
@@ -5,7 +5,7 @@
  * @class mw.Api.plugin.login
  * @since 1.22
  */
-( function ( mw, $ ) {
+( function () {
 	'use strict';
 
 	$.extend( mw.Api.prototype, {
@@ -57,4 +57,4 @@
 	 * @mixins mw.Api.plugin.login
 	 */
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.api/messages.js b/resources/src/mediawiki.api/messages.js
index 824cc190f4..c5287fc091 100644
--- a/resources/src/mediawiki.api/messages.js
+++ b/resources/src/mediawiki.api/messages.js
@@ -6,7 +6,7 @@
  * @class mw.Api.plugin.messages
  * @since 1.27
  */
-( function ( mw, $ ) {
+( function () {
 	'use strict';
 
 	$.extend( mw.Api.prototype, {
@@ -75,4 +75,4 @@
 	 * @mixins mw.Api.plugin.messages
 	 */
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.api/options.js b/resources/src/mediawiki.api/options.js
index 4930c4fccc..f0ca272383 100644
--- a/resources/src/mediawiki.api/options.js
+++ b/resources/src/mediawiki.api/options.js
@@ -1,7 +1,7 @@
 /**
  * @class mw.Api.plugin.options
  */
-( function ( mw, $ ) {
+( function () {
 
 	$.extend( mw.Api.prototype, {
 
@@ -99,4 +99,4 @@
 	 * @mixins mw.Api.plugin.options
 	 */
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.api/parse.js b/resources/src/mediawiki.api/parse.js
index f38e88b5c3..42b0771dbf 100644
--- a/resources/src/mediawiki.api/parse.js
+++ b/resources/src/mediawiki.api/parse.js
@@ -1,7 +1,7 @@
 /**
  * @class mw.Api.plugin.parse
  */
-( function ( mw, $ ) {
+( function () {
 
 	$.extend( mw.Api.prototype, {
 		/**
@@ -46,4 +46,4 @@
 	 * @mixins mw.Api.plugin.parse
 	 */
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.api/rollback.js b/resources/src/mediawiki.api/rollback.js
index 322143dc5f..18a7efc386 100644
--- a/resources/src/mediawiki.api/rollback.js
+++ b/resources/src/mediawiki.api/rollback.js
@@ -2,7 +2,7 @@
  * @class mw.Api.plugin.rollback
  * @since 1.28
  */
-( function ( mw, $ ) {
+( function () {
 
 	$.extend( mw.Api.prototype, {
 		/**
@@ -30,4 +30,4 @@
 	 * @mixins mw.Api.plugin.rollback
 	 */
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.api/upload.js b/resources/src/mediawiki.api/upload.js
index dc82fb5555..1785ab3bbc 100644
--- a/resources/src/mediawiki.api/upload.js
+++ b/resources/src/mediawiki.api/upload.js
@@ -4,7 +4,7 @@
  * @class mw.Api.plugin.upload
  * @singleton
  */
-( function ( mw, $ ) {
+( function () {
 	var nonce = 0,
 		fieldsAllowed = {
 			stash: true,
@@ -664,4 +664,4 @@
 	 * @class mw.Api
 	 * @mixins mw.Api.plugin.upload
 	 */
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.api/user.js b/resources/src/mediawiki.api/user.js
index e7b4b6d54f..3100b28de8 100644
--- a/resources/src/mediawiki.api/user.js
+++ b/resources/src/mediawiki.api/user.js
@@ -2,7 +2,7 @@
  * @class mw.Api.plugin.user
  * @since 1.27
  */
-( function ( mw, $ ) {
+( function () {
 
 	$.extend( mw.Api.prototype, {
 
@@ -34,4 +34,4 @@
 	 * @mixins mw.Api.plugin.user
 	 */
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.api/watch.js b/resources/src/mediawiki.api/watch.js
index 025c111e84..eead10cf31 100644
--- a/resources/src/mediawiki.api/watch.js
+++ b/resources/src/mediawiki.api/watch.js
@@ -2,7 +2,7 @@
  * @class mw.Api.plugin.watch
  * @since 1.19
  */
-( function ( mw, $ ) {
+( function () {
 
 	/**
 	 * @private
@@ -67,4 +67,4 @@
 	 * @mixins mw.Api.plugin.watch
 	 */
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.checkboxtoggle.js b/resources/src/mediawiki.checkboxtoggle.js
index 76bc86c5c0..a89293dd70 100644
--- a/resources/src/mediawiki.checkboxtoggle.js
+++ b/resources/src/mediawiki.checkboxtoggle.js
@@ -9,7 +9,7 @@
  * Jeroen De Dauw <jeroendedauw at gmail dot com>
  */
 
-( function ( $ ) {
+( function () {
 	'use strict';
 
 	$( function () {
@@ -35,4 +35,4 @@
 
 	} );
 
-}( jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.confirmCloseWindow.js b/resources/src/mediawiki.confirmCloseWindow.js
index 4510b2c50f..27b1471265 100644
--- a/resources/src/mediawiki.confirmCloseWindow.js
+++ b/resources/src/mediawiki.confirmCloseWindow.js
@@ -1,4 +1,4 @@
-( function ( mw, $ ) {
+( function () {
 	/**
 	 * Prevent the closing of a window with a confirm message (the onbeforeunload event seems to
 	 * work in most browsers.)
@@ -108,4 +108,4 @@
 			}
 		};
 	};
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.cookie.js b/resources/src/mediawiki.cookie.js
index d260fca64e..5923ff8fcc 100644
--- a/resources/src/mediawiki.cookie.js
+++ b/resources/src/mediawiki.cookie.js
@@ -1,4 +1,4 @@
-( function ( mw, $ ) {
+( function () {
 	'use strict';
 
 	/**
@@ -128,4 +128,4 @@
 		}
 	};
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.debug/debug.js b/resources/src/mediawiki.debug/debug.js
index 37c0fac771..f0c2601139 100644
--- a/resources/src/mediawiki.debug/debug.js
+++ b/resources/src/mediawiki.debug/debug.js
@@ -1,4 +1,4 @@
-( function ( mw, $ ) {
+( function () {
 	'use strict';
 
 	var debug,
@@ -387,4 +387,4 @@
 		debug.init();
 	} );
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.debug/jquery.footHovzer.js b/resources/src/mediawiki.debug/jquery.footHovzer.js
index 091aa2543e..ef8afdfee7 100644
--- a/resources/src/mediawiki.debug/jquery.footHovzer.js
+++ b/resources/src/mediawiki.debug/jquery.footHovzer.js
@@ -2,7 +2,7 @@
  * @private
  * @class jQuery.plugin.footHovzer
  */
-( function ( $ ) {
+( function () {
 	var $hovzer, footHovzer, $spacer;
 
 	function getHovzer() {
@@ -64,4 +64,4 @@
 	 * @mixins jQuery.plugin.footHovzer
 	 */
 
-}( jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.experiments.js b/resources/src/mediawiki.experiments.js
index 4fedbeaea9..e91902aaee 100644
--- a/resources/src/mediawiki.experiments.js
+++ b/resources/src/mediawiki.experiments.js
@@ -1,4 +1,4 @@
-( function ( mw, $ ) {
+( function () {
 
 	var CONTROL_BUCKET = 'control',
 		MAX_INT32_UNSIGNED = 4294967295;
@@ -106,4 +106,4 @@
 		}
 	};
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.feedback/feedback.js b/resources/src/mediawiki.feedback/feedback.js
index ca4d239606..d1fb98bf3a 100644
--- a/resources/src/mediawiki.feedback/feedback.js
+++ b/resources/src/mediawiki.feedback/feedback.js
@@ -6,7 +6,7 @@
  * @author Moriel Schottlender, 2015
  * @since 1.19
  */
-( function ( mw, $ ) {
+( function () {
 	/**
 	 * This is a way of getting simple feedback from users. It's useful
 	 * for testing new features -- users can give you feedback without
@@ -512,4 +512,4 @@
 		return this.bugReportLink;
 	};
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.filewarning/filewarning.js b/resources/src/mediawiki.filewarning/filewarning.js
index 72bf3d7696..572d8305b2 100644
--- a/resources/src/mediawiki.filewarning/filewarning.js
+++ b/resources/src/mediawiki.filewarning/filewarning.js
@@ -4,7 +4,7 @@
  * @author Mark Holmquist, 2015
  * @since 1.25
  */
-( function ( mw, $, oo ) {
+( function () {
 	var warningConfig = mw.config.get( 'wgFileWarning' ),
 		warningMessages = warningConfig.messages,
 		warningLink = warningConfig.link,
@@ -18,7 +18,7 @@
 			.addClass( 'mediawiki-filewarning-info empty' ),
 		$footer = $( '<p>' )
 			.addClass( 'mediawiki-filewarning-footer empty' ),
-		dialog = new oo.ui.PopupButtonWidget( {
+		dialog = new OO.ui.PopupButtonWidget( {
 			classes: [ 'mediawiki-filewarning-anchor' ],
 			label: $mimetype,
 			flags: [ 'warning' ],
@@ -64,4 +64,4 @@
 		// object at all. Sort of nasty, but it gets the job done.
 		dialog.getPopup().toggle = $.noop;
 	}
-}( mediaWiki, jQuery, OO ) );
+}() );
diff --git a/resources/src/mediawiki.htmlform.checker.js b/resources/src/mediawiki.htmlform.checker.js
index a9f08db9d8..beecfea58e 100644
--- a/resources/src/mediawiki.htmlform.checker.js
+++ b/resources/src/mediawiki.htmlform.checker.js
@@ -1,4 +1,4 @@
-( function ( mw, $ ) {
+( function () {
 
 	// FIXME: mw.htmlform.Element also sets this to empty object
 	mw.htmlform = {};
@@ -178,4 +178,4 @@
 		return this;
 	};
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.htmlform.ooui/Element.js b/resources/src/mediawiki.htmlform.ooui/Element.js
index e195ccbd9e..6d4fefb5d1 100644
--- a/resources/src/mediawiki.htmlform.ooui/Element.js
+++ b/resources/src/mediawiki.htmlform.ooui/Element.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 
 	// FIXME: mw.htmlform.Checker also sets this to empty object
 	mw.htmlform = {};
@@ -44,4 +44,4 @@
 	OO.inheritClass( mw.htmlform.ActionFieldLayout, OO.ui.ActionFieldLayout );
 	OO.mixinClass( mw.htmlform.ActionFieldLayout, mw.htmlform.Element );
 
-}( mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.htmlform/autocomplete.js b/resources/src/mediawiki.htmlform/autocomplete.js
index 2f62371980..b49db93fdc 100644
--- a/resources/src/mediawiki.htmlform/autocomplete.js
+++ b/resources/src/mediawiki.htmlform/autocomplete.js
@@ -2,7 +2,7 @@
  * HTMLForm enhancements:
  * Set up autocomplete fields.
  */
-( function ( mw, $ ) {
+( function () {
 
 	mw.hook( 'htmlform.enhance' ).add( function ( $root ) {
 		var $autocomplete = $root.find( '.mw-htmlform-autocomplete' );
@@ -22,4 +22,4 @@
 		}
 	} );
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.htmlform/autoinfuse.js b/resources/src/mediawiki.htmlform/autoinfuse.js
index 1628c5a9ff..00ca581c62 100644
--- a/resources/src/mediawiki.htmlform/autoinfuse.js
+++ b/resources/src/mediawiki.htmlform/autoinfuse.js
@@ -2,7 +2,7 @@
  * HTMLForm enhancements:
  * Infuse some OOUI HTMLForm fields (those which benefit from always being infused).
  */
-( function ( mw, $ ) {
+( function () {
 
 	mw.hook( 'htmlform.enhance' ).add( function ( $root ) {
 		var $oouiNodes, modules, extraModules;
@@ -34,4 +34,4 @@
 
 	} );
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.htmlform/checkmatrix.js b/resources/src/mediawiki.htmlform/checkmatrix.js
index b825f12b98..955e1ce8e7 100644
--- a/resources/src/mediawiki.htmlform/checkmatrix.js
+++ b/resources/src/mediawiki.htmlform/checkmatrix.js
@@ -2,7 +2,7 @@
  * HTMLForm enhancements:
  * Show fancy tooltips for checkmatrix fields.
  */
-( function ( mw ) {
+( function () {
 
 	mw.hook( 'htmlform.enhance' ).add( function ( $root ) {
 		var $matrixTooltips = $root.find( '.mw-htmlform-matrix .mw-htmlform-tooltip' );
@@ -13,4 +13,4 @@
 		}
 	} );
 
-}( mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.htmlform/cloner.js b/resources/src/mediawiki.htmlform/cloner.js
index ab81580bee..4d94deb0e7 100644
--- a/resources/src/mediawiki.htmlform/cloner.js
+++ b/resources/src/mediawiki.htmlform/cloner.js
@@ -2,7 +2,7 @@
  * HTMLForm enhancements:
  * Add/remove cloner clones without having to resubmit the form.
  */
-( function ( mw, $ ) {
+( function () {
 
 	var cloneCounter = 0;
 
@@ -33,4 +33,4 @@
 		} );
 	} );
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.htmlform/hide-if.js b/resources/src/mediawiki.htmlform/hide-if.js
index 6d3c9fd189..c8f8cc9145 100644
--- a/resources/src/mediawiki.htmlform/hide-if.js
+++ b/resources/src/mediawiki.htmlform/hide-if.js
@@ -2,7 +2,7 @@
  * HTMLForm enhancements:
  * Set up 'hide-if' behaviors for form fields that have them.
  */
-( function ( mw, $ ) {
+( function () {
 
 	/**
 	 * Helper function for hide-if to find the nearby form field.
@@ -154,7 +154,7 @@
 				}
 				v = spec[ 2 ];
 
-				if ( !( field instanceof jQuery ) ) {
+				if ( !( field instanceof $ ) ) {
 					// field is a OO.ui.Widget
 					if ( field.supports( 'isSelected' ) ) {
 						getVal = function () {
@@ -252,7 +252,7 @@
 					// It is impossible to submit a form with hidden fields failing validation, e.g. one that
 					// is required. However, validity is not checked for disabled fields, as these are not
 					// submitted with the form. So we should also disable fields when hiding them.
-					if ( self instanceof jQuery ) {
+					if ( self instanceof $ ) {
 						// This also finds elements inside any nested fields (in case of HTMLFormFieldCloner),
 						// which is problematic. But it works because:
 						// * HTMLFormFieldCloner::createFieldsForKey() copies 'hide-if' rules to nested fields
@@ -292,4 +292,4 @@
 		} );
 	} );
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.htmlform/htmlform.js b/resources/src/mediawiki.htmlform/htmlform.js
index bc835b5924..f8b9c0649a 100644
--- a/resources/src/mediawiki.htmlform/htmlform.js
+++ b/resources/src/mediawiki.htmlform/htmlform.js
@@ -1,4 +1,4 @@
-( function ( mw, $ ) {
+( function () {
 
 	$( function () {
 		mw.hook( 'htmlform.enhance' ).fire( $( document ) );
@@ -11,4 +11,4 @@
 		$root.find( '.mw-htmlform' ).removeAttr( 'novalidate' );
 	} );
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.htmlform/multiselect.js b/resources/src/mediawiki.htmlform/multiselect.js
index 8ef56a22c7..ab11f858e3 100644
--- a/resources/src/mediawiki.htmlform/multiselect.js
+++ b/resources/src/mediawiki.htmlform/multiselect.js
@@ -2,7 +2,7 @@
  * HTMLForm enhancements:
  * Convert multiselect fields from checkboxes to Chosen selector when requested.
  */
-( function ( mw, $ ) {
+( function () {
 
 	function addMulti( $oldContainer, $container ) {
 		var name = $oldContainer.find( 'input:first-child' ).attr( 'name' ),
@@ -112,4 +112,4 @@
 		}
 	} );
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.htmlform/selectandother.js b/resources/src/mediawiki.htmlform/selectandother.js
index fda6742063..7a643a5683 100644
--- a/resources/src/mediawiki.htmlform/selectandother.js
+++ b/resources/src/mediawiki.htmlform/selectandother.js
@@ -2,7 +2,7 @@
  * HTMLForm enhancements:
  * Add a dynamic max length to the reason field of SelectAndOther.
  */
-( function ( mw, $ ) {
+( function () {
 
 	// cache the separator to avoid object creation on each keypress
 	var colonSeparator = mw.message( 'colon-separator' ).text();
@@ -63,4 +63,4 @@
 			} );
 	} );
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.htmlform/selectorother.js b/resources/src/mediawiki.htmlform/selectorother.js
index b6899d95f9..dec832df11 100644
--- a/resources/src/mediawiki.htmlform/selectorother.js
+++ b/resources/src/mediawiki.htmlform/selectorother.js
@@ -2,7 +2,7 @@
  * HTMLForm enhancements:
  * Animate the SelectOrOther fields, to only show the text field when 'other' is selected.
  */
-( function ( mw, $ ) {
+( function () {
 
 	/**
 	 * @class jQuery.plugin.htmlform
@@ -59,4 +59,4 @@
 			} );
 	} );
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.inspect.js b/resources/src/mediawiki.inspect.js
index 3a649a90b1..f5c2c93e87 100644
--- a/resources/src/mediawiki.inspect.js
+++ b/resources/src/mediawiki.inspect.js
@@ -7,7 +7,7 @@
 
 /* eslint-disable no-console */
 
-( function ( mw, $ ) {
+( function () {
 
 	// mw.inspect is a singleton class with static methods
 	// that itself can also be invoked as a function (mediawiki.base/mw#inspect).
@@ -386,4 +386,4 @@
 		mw.log( 'mw.inspect: reports are not available in debug mode.' );
 	}
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.jqueryMsg/mediawiki.jqueryMsg.js b/resources/src/mediawiki.jqueryMsg/mediawiki.jqueryMsg.js
index b3154e155f..b1a89268dc 100644
--- a/resources/src/mediawiki.jqueryMsg/mediawiki.jqueryMsg.js
+++ b/resources/src/mediawiki.jqueryMsg/mediawiki.jqueryMsg.js
@@ -6,7 +6,7 @@
 * @author neilk@wikimedia.org
 * @author mflaschen@wikimedia.org
 */
-( function ( mw, $ ) {
+( function () {
 	/**
 	 * @class mw.jqueryMsg
 	 * @singleton
@@ -82,7 +82,7 @@
 			if ( typeof children[ i ] !== 'object' ) {
 				children[ i ] = document.createTextNode( children[ i ] );
 			}
-			if ( children[ i ] instanceof jQuery && children[ i ].hasClass( 'mediaWiki_htmlEmitter' ) ) {
+			if ( children[ i ] instanceof $ && children[ i ].hasClass( 'mediaWiki_htmlEmitter' ) ) {
 				children[ i ] = children[ i ].contents();
 			}
 		}
@@ -114,7 +114,7 @@
 	 * @return {string} Textual value of input
 	 */
 	function textify( input ) {
-		if ( input instanceof jQuery ) {
+		if ( input instanceof $ ) {
 			input = input.text();
 		}
 		return String( input );
@@ -1144,7 +1144,7 @@
 			var $el,
 				arg = nodes[ 0 ],
 				contents = nodes[ 1 ];
-			if ( arg instanceof jQuery && !arg.hasClass( 'mediaWiki_htmlEmitter' ) ) {
+			if ( arg instanceof $ && !arg.hasClass( 'mediaWiki_htmlEmitter' ) ) {
 				$el = arg;
 			} else {
 				$el = $( '<a>' );
@@ -1184,7 +1184,7 @@
 			for ( formIndex = 0; formIndex < forms.length; formIndex++ ) {
 				form = forms[ formIndex ];
 
-				if ( form instanceof jQuery && form.hasClass( 'mediaWiki_htmlEmitter' ) ) {
+				if ( form instanceof $ && form.hasClass( 'mediaWiki_htmlEmitter' ) ) {
 					// This is a nested node, may be an explicit plural form like 5=[$2 linktext]
 					firstChild = form.contents().get( 0 );
 					if ( firstChild && firstChild.nodeType === Node.TEXT_NODE ) {
@@ -1388,4 +1388,4 @@
 		};
 	}() );
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.language/mediawiki.cldr.js b/resources/src/mediawiki.language/mediawiki.cldr.js
index a13f0591e2..505481007e 100644
--- a/resources/src/mediawiki.language/mediawiki.cldr.js
+++ b/resources/src/mediawiki.language/mediawiki.cldr.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	'use strict';
 
 	/**
@@ -29,4 +29,4 @@
 		}
 	};
 
-}( mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.language/mediawiki.language.fallback.js b/resources/src/mediawiki.language/mediawiki.language.fallback.js
index b1bab02a37..09bf7254be 100644
--- a/resources/src/mediawiki.language/mediawiki.language.fallback.js
+++ b/resources/src/mediawiki.language/mediawiki.language.fallback.js
@@ -1,7 +1,7 @@
 /*
  * Language-fallback-chain-related utilities for mediawiki.language.
  */
-( function ( mw, $ ) {
+( function () {
 	/**
 	 * @class mw.language
 	 */
@@ -32,4 +32,4 @@
 
 	} );
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.language/mediawiki.language.init.js b/resources/src/mediawiki.language/mediawiki.language.init.js
index 34add28def..33f8fd7d93 100644
--- a/resources/src/mediawiki.language/mediawiki.language.init.js
+++ b/resources/src/mediawiki.language/mediawiki.language.init.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	/**
 	 * Base language object with methods related to language support, attempting to mirror some of the
 	 * functionality of the Language class in MediaWiki:
@@ -85,4 +85,4 @@
 		}
 	};
 
-}( mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.language/mediawiki.language.js b/resources/src/mediawiki.language/mediawiki.language.js
index 45863a3e33..9c1d00e155 100644
--- a/resources/src/mediawiki.language/mediawiki.language.js
+++ b/resources/src/mediawiki.language/mediawiki.language.js
@@ -1,7 +1,7 @@
 /*
  * Methods for transforming message syntax.
  */
-( function ( mw, $ ) {
+( function () {
 
 	/**
 	 * @class mw.language
@@ -129,7 +129,7 @@
 				return forms[ form ][ word ];
 			}
 
-			transformations = mediaWiki.language.getData( userLanguage, 'grammarTransformations' );
+			transformations = mw.language.getData( userLanguage, 'grammarTransformations' );
 
 			if ( !( transformations && transformations[ form ] ) ) {
 				return word;
@@ -230,4 +230,4 @@
 		}
 	} );
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.language/mediawiki.language.months.js b/resources/src/mediawiki.language/mediawiki.language.months.js
index 7b78562c43..ca6429cb7f 100644
--- a/resources/src/mediawiki.language/mediawiki.language.months.js
+++ b/resources/src/mediawiki.language/mediawiki.language.months.js
@@ -3,7 +3,7 @@
  *
  * Loading this module also ensures the availability of appropriate messages via mw.msg.
  */
-( function ( mw ) {
+( function () {
 	var
 		monthMessages = [
 			'january', 'february', 'march', 'april',
@@ -53,4 +53,4 @@
 		abbrev: monthAbbrevMessages.map( mwMsgMapper )
 	};
 
-}( mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.language/mediawiki.language.numbers.js b/resources/src/mediawiki.language/mediawiki.language.numbers.js
index f4194d3b08..981beac5b0 100644
--- a/resources/src/mediawiki.language/mediawiki.language.numbers.js
+++ b/resources/src/mediawiki.language/mediawiki.language.numbers.js
@@ -1,7 +1,7 @@
 /*
  * Number-related utilities for mediawiki.language.
  */
-( function ( mw, $ ) {
+( function () {
 	/**
 	 * @class mw.language
 	 */
@@ -307,4 +307,4 @@
 
 	} );
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.legacy/protect.js b/resources/src/mediawiki.legacy/protect.js
index 676ddb0e60..829052d0bd 100644
--- a/resources/src/mediawiki.legacy/protect.js
+++ b/resources/src/mediawiki.legacy/protect.js
@@ -1,5 +1,5 @@
 /* eslint-disable no-restricted-properties */
-( function ( mw, $ ) {
+( function () {
 	var ProtectionForm,
 		reasonCodePointLimit = mw.config.get( 'wgCommentCodePointLimit' ),
 		reasonByteLimit = mw.config.get( 'wgCommentByteLimit' );
@@ -257,4 +257,4 @@
 
 	$( ProtectionForm.init.bind( ProtectionForm ) );
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.legacy/wikibits.js b/resources/src/mediawiki.legacy/wikibits.js
index 27d049eb3a..d4c3621891 100644
--- a/resources/src/mediawiki.legacy/wikibits.js
+++ b/resources/src/mediawiki.legacy/wikibits.js
@@ -1,7 +1,7 @@
 /**
  * MediaWiki legacy wikibits
  */
-( function ( mw, $ ) {
+( function () {
 	var msg,
 		loadedScripts = {};
 
@@ -102,4 +102,4 @@
 		}, 'Use jQuery or mw.loader.load instead.', 'document.' + method );
 	} );
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.libs.jpegmeta/export.js b/resources/src/mediawiki.libs.jpegmeta/export.js
index e8913aae30..a28bd8f14c 100644
--- a/resources/src/mediawiki.libs.jpegmeta/export.js
+++ b/resources/src/mediawiki.libs.jpegmeta/export.js
@@ -1,5 +1,5 @@
 /* global JpegMeta */
-( function ( mw ) {
+( function () {
 
 	// Export as module
 	module.exports = function ( fileReaderResult, fileName ) {
@@ -9,4 +9,4 @@
 	// Back-compat: Also expose via mw.lib
 	// @deprecated since 1.31
 	mw.log.deprecate( mw.libs, 'jpegmeta', module.exports );
-}( mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.libs.pluralruleparser/export.js b/resources/src/mediawiki.libs.pluralruleparser/export.js
index 28449d3df9..5edb398f24 100644
--- a/resources/src/mediawiki.libs.pluralruleparser/export.js
+++ b/resources/src/mediawiki.libs.pluralruleparser/export.js
@@ -2,4 +2,4 @@
 module.exports = window.pluralRuleParser;
 
 // Back-compat: Also expose via mw.lib
-mediaWiki.libs.pluralRuleParser = window.pluralRuleParser;
+mw.libs.pluralRuleParser = window.pluralRuleParser;
diff --git a/resources/src/mediawiki.messagePoster.wikitext/WikitextMessagePoster.js b/resources/src/mediawiki.messagePoster.wikitext/WikitextMessagePoster.js
index a2dbcd4919..20621d2fa4 100644
--- a/resources/src/mediawiki.messagePoster.wikitext/WikitextMessagePoster.js
+++ b/resources/src/mediawiki.messagePoster.wikitext/WikitextMessagePoster.js
@@ -1,4 +1,4 @@
-( function ( mw, $ ) {
+( function () {
 	/**
 	 * This is an implementation of MessagePoster for wikitext talk pages.
 	 *
@@ -50,4 +50,4 @@
 
 	mw.messagePoster.factory.register( 'wikitext', WikitextMessagePoster );
 	mw.messagePoster.WikitextMessagePoster = WikitextMessagePoster;
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.messagePoster/MessagePoster.js b/resources/src/mediawiki.messagePoster/MessagePoster.js
index 64642b26bf..7f217e938c 100644
--- a/resources/src/mediawiki.messagePoster/MessagePoster.js
+++ b/resources/src/mediawiki.messagePoster/MessagePoster.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	/**
 	 * This is the abstract base class for MessagePoster implementations.
 	 *
@@ -37,4 +37,4 @@
 	 * something.
 	 */
 	mw.messagePoster.MessagePoster.prototype.post = function () {};
-}( mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.messagePoster/factory.js b/resources/src/mediawiki.messagePoster/factory.js
index e20b422f14..cadf62b918 100644
--- a/resources/src/mediawiki.messagePoster/factory.js
+++ b/resources/src/mediawiki.messagePoster/factory.js
@@ -1,4 +1,4 @@
-( function ( mw, $ ) {
+( function () {
 	/**
 	 * Factory for MessagePoster objects. This provides a pluggable to way to script the action
 	 * of adding a message to someone's talk page.
@@ -104,4 +104,4 @@
 	mw.messagePoster = {
 		factory: new MessagePosterFactory()
 	};
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.notification.convertmessagebox.js b/resources/src/mediawiki.notification.convertmessagebox.js
index 5d46de60bb..d496d7af83 100644
--- a/resources/src/mediawiki.notification.convertmessagebox.js
+++ b/resources/src/mediawiki.notification.convertmessagebox.js
@@ -6,7 +6,7 @@
  * @class mw.plugin.convertmessagebox
  * @singleton
  */
-( function ( mw, $ ) {
+( function () {
 	'use strict';
 
 	/**
@@ -61,4 +61,4 @@
 
 	module.exports = convertmessagebox;
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.notification/notification.js b/resources/src/mediawiki.notification/notification.js
index cb3e4ae6c6..0ec010e8a1 100644
--- a/resources/src/mediawiki.notification/notification.js
+++ b/resources/src/mediawiki.notification/notification.js
@@ -1,4 +1,4 @@
-( function ( mw, $ ) {
+( function () {
 	'use strict';
 
 	var notification,
@@ -466,4 +466,4 @@
 
 	mw.notification = notification;
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.notify.js b/resources/src/mediawiki.notify.js
index 0f3a086774..f0833eb7ce 100644
--- a/resources/src/mediawiki.notify.js
+++ b/resources/src/mediawiki.notify.js
@@ -1,7 +1,7 @@
 /**
  * @class mw.plugin.notify
  */
-( function ( mw ) {
+( function () {
 	'use strict';
 
 	/**
@@ -25,4 +25,4 @@
 	 * @mixins mw.plugin.notify
 	 */
 
-}( mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.page.gallery.js b/resources/src/mediawiki.page.gallery.js
index ff27c58280..3f35c4bbc7 100644
--- a/resources/src/mediawiki.page.gallery.js
+++ b/resources/src/mediawiki.page.gallery.js
@@ -4,7 +4,7 @@
  * - Toggle gallery captions when focused.
  * - Dynamically resize images to fill horizontal space.
  */
-( function ( mw, $ ) {
+( function () {
 	var $galleries,
 		bound = false,
 		lastWidth = window.innerWidth,
@@ -286,4 +286,4 @@
 			}
 		} );
 	} );
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.page.gallery.slideshow.js b/resources/src/mediawiki.page.gallery.slideshow.js
index 6e9ff0e7cd..204d9154ab 100644
--- a/resources/src/mediawiki.page.gallery.slideshow.js
+++ b/resources/src/mediawiki.page.gallery.slideshow.js
@@ -1,7 +1,7 @@
 /*!
  * mw.GallerySlideshow: Interface controls for the slideshow gallery
  */
-( function ( mw, $, OO ) {
+( function () {
 	/**
 	 * mw.GallerySlideshow encapsulates the user interface of the slideshow
 	 * galleries. An object is instantiated for each `.mw-gallery-slideshow`
@@ -457,4 +457,4 @@
 			new mw.GallerySlideshow( this );
 		} );
 	} );
-}( mediaWiki, jQuery, OO ) );
+}() );
diff --git a/resources/src/mediawiki.page.image.pagination.js b/resources/src/mediawiki.page.image.pagination.js
index 1823ef0eb5..4541c582ad 100644
--- a/resources/src/mediawiki.page.image.pagination.js
+++ b/resources/src/mediawiki.page.image.pagination.js
@@ -2,7 +2,7 @@
  * Implement AJAX navigation for multi-page images so the user may browse without a full page reload.
  */
 
-( function ( mw, $ ) {
+( function () {
 	var jqXhr, $multipageimage, $spinner,
 		cache = {},
 		cacheOrder = [];
@@ -139,4 +139,4 @@
 			} );
 		}
 	} );
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.page.patrol.ajax.js b/resources/src/mediawiki.page.patrol.ajax.js
index d8fb249dc6..27d9e55684 100644
--- a/resources/src/mediawiki.page.patrol.ajax.js
+++ b/resources/src/mediawiki.page.patrol.ajax.js
@@ -5,7 +5,7 @@
  * @since 1.21
  * @author Marius Hoch <hoo@online.de>
  */
-( function ( mw, $ ) {
+( function () {
 	if ( !mw.user.tokens.exists( 'patrolToken' ) ) {
 		// Current user has no patrol right, or an old cached version of user.tokens
 		// that didn't have patrolToken yet.
@@ -61,4 +61,4 @@
 			e.preventDefault();
 		} );
 	} );
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.page.ready.js b/resources/src/mediawiki.page.ready.js
index e1476641e2..71e7f800c1 100644
--- a/resources/src/mediawiki.page.ready.js
+++ b/resources/src/mediawiki.page.ready.js
@@ -1,4 +1,4 @@
-( function ( mw, $ ) {
+( function () {
 	mw.hook( 'wikipage.content' ).add( function ( $content ) {
 		var $sortable, $collapsible;
 
@@ -55,4 +55,4 @@
 		} );
 	} );
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.page.rollback.js b/resources/src/mediawiki.page.rollback.js
index 6db518db1e..2896f40447 100644
--- a/resources/src/mediawiki.page.rollback.js
+++ b/resources/src/mediawiki.page.rollback.js
@@ -5,7 +5,7 @@
  * @since 1.28
  * @author Timo Tijhof
  */
-( function ( mw, $ ) {
+( function () {
 
 	$( function () {
 		$( '.mw-rollback-link' ).on( 'click', 'a[data-mw="interface"]', function ( e ) {
@@ -64,4 +64,4 @@
 		} );
 	} );
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.page.startup.js b/resources/src/mediawiki.page.startup.js
index 7514044538..0088ec0d54 100644
--- a/resources/src/mediawiki.page.startup.js
+++ b/resources/src/mediawiki.page.startup.js
@@ -1,4 +1,4 @@
-( function ( mw, $ ) {
+( function () {
 	// Break out of framesets
 	if ( mw.config.get( 'wgBreakFrames' ) ) {
 		// Note: In IE < 9 strict comparison to window is non-standard (the standard didn't exist yet)
@@ -46,4 +46,4 @@
 		}
 	} );
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.page.watch.ajax.js b/resources/src/mediawiki.page.watch.ajax.js
index 2002b9f87d..1b401c7cca 100644
--- a/resources/src/mediawiki.page.watch.ajax.js
+++ b/resources/src/mediawiki.page.watch.ajax.js
@@ -14,7 +14,7 @@
  * @class mw.plugin.page.watch.ajax
  * @singleton
  */
-( function ( mw, $ ) {
+( function () {
 	var watch,
 		// The name of the page to watch or unwatch
 		title = mw.config.get( 'wgRelevantPageName' );
@@ -187,4 +187,4 @@
 		} );
 	} );
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ChangesListViewModel.js b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ChangesListViewModel.js
index 96b44100ea..e51829c253 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ChangesListViewModel.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ChangesListViewModel.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	/**
 	 * View model for the changes list
 	 *
@@ -163,4 +163,4 @@
 	mw.rcfilters.dm.ChangesListViewModel.prototype.hasUnseenWatchedChanges = function () {
 		return this.unseenWatchedChanges;
 	};
-}( mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
index 7aceed65d4..e08e28c6ee 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
@@ -1,5 +1,5 @@
 /* eslint-disable no-restricted-properties */
-( function ( mw ) {
+( function () {
 	/**
 	 * View model for a filter group
 	 *
@@ -981,4 +981,4 @@
 			itemModel.toggleVisible( visibleItems.indexOf( itemModel ) !== -1 );
 		} );
 	};
-}( mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterItem.js b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterItem.js
index 7e35b333e0..0204013923 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterItem.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterItem.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	/**
 	 * Filter item model
 	 *
@@ -396,4 +396,4 @@
 		return this.visible;
 	};
 
-}( mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
index 45d54a03cd..c76cd257a7 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
@@ -1,5 +1,5 @@
 /* eslint-disable no-restricted-properties */
-( function ( mw, $ ) {
+( function () {
 	/**
 	 * View model for the filters selection and display
 	 *
@@ -1274,4 +1274,4 @@
 		this.getItemByName( filterName ).clearHighlightColor();
 	};
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ItemModel.js b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ItemModel.js
index 63b0b0321c..c3283c13e2 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ItemModel.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ItemModel.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	/**
 	 * RCFilter base item model
 	 *
@@ -270,4 +270,4 @@
 	mw.rcfilters.dm.ItemModel.prototype.isHighlighted = function () {
 		return !!this.getHighlightColor();
 	};
-}( mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js
index e7cb6b680d..9d8f977d00 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js
@@ -1,5 +1,5 @@
 /* eslint-disable no-restricted-properties */
-( function ( mw, $ ) {
+( function () {
 	/**
 	 * View model for saved queries
 	 *
@@ -404,4 +404,4 @@
 	mw.rcfilters.dm.SavedQueriesModel.prototype.isConverted = function () {
 		return this.converted;
 	};
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueryItemModel.js b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueryItemModel.js
index c74648e8eb..46344cb8bc 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueryItemModel.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueryItemModel.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	/**
 	 * View model for a single saved query
 	 *
@@ -122,4 +122,4 @@
 			this.emit( 'update' );
 		}
 	};
-}( mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index 1664e86135..13c51aa109 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -1,5 +1,5 @@
 /* eslint-disable no-restricted-properties */
-( function ( mw, $ ) {
+( function () {
 
 	var byteLength = require( 'mediawiki.String' ).byteLength;
 
@@ -1217,4 +1217,4 @@
 			this.filtersModel.getViewTrigger( view )
 		);
 	};
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.HighlightColors.js b/resources/src/mediawiki.rcfilters/mw.rcfilters.HighlightColors.js
index 0bef90282e..6231f28ef6 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.HighlightColors.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.HighlightColors.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	/**
 	 * Supported highlight colors.
 	 * Warning: These are also hardcoded in "styles/mw.rcfilters.variables.less"
@@ -7,4 +7,4 @@
 	 * @property {string[]}
 	 */
 	mw.rcfilters.HighlightColors = [ 'c1', 'c2', 'c3', 'c4', 'c5' ];
-}( mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.UriProcessor.js b/resources/src/mediawiki.rcfilters/mw.rcfilters.UriProcessor.js
index b8ff22ee11..5344af4a03 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.UriProcessor.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.UriProcessor.js
@@ -1,4 +1,4 @@
-( function ( mw, $ ) {
+( function () {
 	/* eslint no-underscore-dangle: "off" */
 	/**
 	 * URI Processor for RCFilters
@@ -291,4 +291,4 @@
 			{ urlversion: '2' }
 		);
 	};
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
index 9724927106..2adfa7ddbb 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
@@ -1,7 +1,7 @@
 /*!
  * JavaScript for Special:RecentChanges
  */
-( function ( mw, $ ) {
+( function () {
 	var rcfilters = {
 		/**
 		 * @member mw.rcfilters
@@ -157,4 +157,4 @@
 
 	module.exports = rcfilters;
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.js b/resources/src/mediawiki.rcfilters/mw.rcfilters.js
index c62d6f25ab..f30c278b42 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	/**
 	 * @class
 	 * @singleton
@@ -46,4 +46,4 @@
 			}
 		}
 	};
-}( mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesLimitAndDateButtonWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesLimitAndDateButtonWidget.js
index 1ed597d005..e907a158f6 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesLimitAndDateButtonWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesLimitAndDateButtonWidget.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	/**
 	 * Widget defining the button controlling the popup for the number of results
 	 *
@@ -165,4 +165,4 @@
 		}
 	};
 
-}( mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesLimitPopupWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesLimitPopupWidget.js
index 9dd87d8339..8cf965798e 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesLimitPopupWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesLimitPopupWidget.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	/**
 	 * Widget defining the popup to choose number of results
 	 *
@@ -75,4 +75,4 @@
 	mw.rcfilters.ui.ChangesLimitPopupWidget.prototype.onGroupByPageModelUpdate = function () {
 		this.groupByPageCheckbox.setSelected( this.groupByPageItemModel.isSelected() );
 	};
-}( mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
index 3a83eeca5e..c102e5997d 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	/**
 	 * List of changes
 	 *
@@ -380,4 +380,4 @@
 		// Turn off highlights
 		this.$element.removeClass( 'mw-rcfilters-ui-changesListWrapperWidget-highlighted' );
 	};
-}( mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CheckboxInputWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CheckboxInputWidget.js
index 9fd4593944..b273a01acd 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CheckboxInputWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CheckboxInputWidget.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	/**
 	 * A widget representing a single toggle filter
 	 *
@@ -60,4 +60,4 @@
 	mw.rcfilters.ui.CheckboxInputWidget.prototype.onUserChange = function () {
 		this.emit( 'userChange', this.$input.prop( 'checked' ) );
 	};
-}( mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.DatePopupWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.DatePopupWidget.js
index 2014ef75a3..792ea4b5bc 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.DatePopupWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.DatePopupWidget.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	/**
 	 * Widget defining the popup to choose date for the results
 	 *
@@ -63,4 +63,4 @@
 	 *
 	 * A days item was chosen
 	 */
-}( mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterItemHighlightButton.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterItemHighlightButton.js
index e3de55e48c..f4a40cbbb8 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterItemHighlightButton.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterItemHighlightButton.js
@@ -1,4 +1,4 @@
-( function ( mw, $ ) {
+( function () {
 	/**
 	 * A button to configure highlight for a filter item
 	 *
@@ -77,4 +77,4 @@
 				);
 		} );
 	};
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuHeaderWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuHeaderWidget.js
index 91a4673fe8..1fef7a0dc2 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuHeaderWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuHeaderWidget.js
@@ -1,4 +1,4 @@
-( function ( mw, $ ) {
+( function () {
 	/**
 	 * Menu header for the RCFilters filters menu
 	 *
@@ -179,4 +179,4 @@
 	mw.rcfilters.ui.FilterMenuHeaderWidget.prototype.onInvertNamespacesButtonClick = function () {
 		this.controller.toggleInvertedNamespaces();
 	};
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuOptionWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuOptionWidget.js
index 65b44202af..8840155ac0 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuOptionWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuOptionWidget.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	/**
 	 * A widget representing a single toggle filter
 	 *
@@ -87,4 +87,4 @@
 			} );
 		}
 	};
-}( mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuSectionOptionWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuSectionOptionWidget.js
index 20bf73ff16..3d598c9022 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuSectionOptionWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuSectionOptionWidget.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	/**
 	 * A widget representing a menu section for filter groups
 	 *
@@ -122,4 +122,4 @@
 		return this.model.getName();
 	};
 
-}( mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagItemWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagItemWidget.js
index 41c7bae48c..411ada908e 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagItemWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagItemWidget.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	/**
 	 * Extend OOUI's FilterTagItemWidget to also display a popup on hover.
 	 *
@@ -42,4 +42,4 @@
 			invalid: this.itemModel.isSelected() && this.itemModel.isConflicted()
 		} );
 	};
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
index 6d36c71782..6c2fda7b3e 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	/**
 	 * List displaying all filter groups
 	 *
@@ -756,4 +756,4 @@
 			} );
 		}
 	};
-}( mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
index a5a8187a71..567d86d6ce 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	/**
 	 * List displaying all filter groups
 	 *
@@ -128,4 +128,4 @@
 	mw.rcfilters.ui.FilterWrapperWidget.prototype.onNewChangesExist = function ( newChangesExist ) {
 		this.showNewChangesLink.toggle( newChangesExist );
 	};
-}( mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js
index 237a635284..a28cde0377 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	/**
 	 * Wrapper for the RC form with hide/show links
 	 * Must be constructed after the model is initialized.
@@ -170,4 +170,4 @@
 			this.$element.detach();
 		}
 	};
-}( mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.GroupWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.GroupWidget.js
index 7a95e3dd4c..491651ab6d 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.GroupWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.GroupWidget.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	/**
 	 * A group widget to allow for aggregation of events
 	 *
@@ -39,4 +39,4 @@
 
 	OO.inheritClass( mw.rcfilters.ui.GroupWidget, OO.ui.Widget );
 	OO.mixinClass( mw.rcfilters.ui.GroupWidget, OO.ui.mixin.GroupWidget );
-}( mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.HighlightColorPickerWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.HighlightColorPickerWidget.js
index fda0772808..a55246fd56 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.HighlightColorPickerWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.HighlightColorPickerWidget.js
@@ -1,4 +1,4 @@
-( function ( mw, $ ) {
+( function () {
 	/**
 	 * A widget representing a filter item highlight color picker
 	 *
@@ -119,4 +119,4 @@
 		}
 		this.emit( 'chooseColor', color );
 	};
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.HighlightPopupWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.HighlightPopupWidget.js
index aedecc44b1..2dd03791ce 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.HighlightPopupWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.HighlightPopupWidget.js
@@ -1,4 +1,4 @@
-( function ( mw, $ ) {
+( function () {
 	/**
 	 * A popup containing a color picker, for setting highlight colors.
 	 *
@@ -60,4 +60,4 @@
 		this.toggle( false );
 	};
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ItemMenuOptionWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ItemMenuOptionWidget.js
index 1660fb2e03..cda13eb7f2 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ItemMenuOptionWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ItemMenuOptionWidget.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	/**
 	 * A widget representing a base toggle item
 	 *
@@ -162,4 +162,4 @@
 		return this.itemModel;
 	};
 
-}( mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.LiveUpdateButtonWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.LiveUpdateButtonWidget.js
index 0fb3cb77c0..926ff4a6ea 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.LiveUpdateButtonWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.LiveUpdateButtonWidget.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	/**
 	 * Widget for toggling live updates
 	 *
@@ -66,4 +66,4 @@
 		this.setState( enable );
 	};
 
-}( mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MainWrapperWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MainWrapperWidget.js
index eab8499193..b402627ce1 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MainWrapperWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MainWrapperWidget.js
@@ -1,4 +1,4 @@
-( function ( $, mw ) {
+( function () {
 	/**
 	 * Wrapper for changes list content
 	 *
@@ -127,4 +127,4 @@
 		return new mw.rcfilters.ui.FormWrapperWidget(
 			this.model, this.changesListModel, this.controller, this.$formContainer );
 	};
-}( jQuery, mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MarkSeenButtonWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MarkSeenButtonWidget.js
index d447f918cd..328be8c5b8 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MarkSeenButtonWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MarkSeenButtonWidget.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	/**
 	 * Button for marking all changes as seen on the Watchlist
 	 *
@@ -52,4 +52,4 @@
 		this.setDisabled( !this.model.hasUnseenWatchedChanges() );
 	};
 
-}( mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js
index d4f0aea070..46e8208f73 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	/**
 	 * A floating menu widget for the filter list
 	 *
@@ -356,4 +356,4 @@
 	mw.rcfilters.ui.MenuSelectWidget.prototype.setUserSelecting = function ( isSelecting ) {
 		this.userSelecting = !!isSelecting;
 	};
-}( mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.RcTopSectionWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.RcTopSectionWidget.js
index fce1cb794b..e3d557563c 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.RcTopSectionWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.RcTopSectionWidget.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	/**
 	 * Top section (between page title and filters) on Special:Recentchanges
 	 *
@@ -110,4 +110,4 @@
 		}
 		this.$topLinks.toggleClass( 'mw-recentchanges-toplinks-collapsed', state === 'collapsed' );
 	};
-}( mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.RclTargetPageWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.RclTargetPageWidget.js
index 527d790d6c..426c47fd26 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.RclTargetPageWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.RclTargetPageWidget.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	/**
 	 * Widget to select and display target page on Special:RecentChangesLinked (AKA Related Changes)
 	 *
@@ -76,4 +76,4 @@
 		this.titleSearch.setValue( text );
 		this.titleSearch.setTitle( text );
 	};
-}( mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.RclToOrFromWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.RclToOrFromWidget.js
index 4fce08c982..8925dcf9d5 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.RclToOrFromWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.RclToOrFromWidget.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	/**
 	 * Widget to select to view changes that link TO or FROM the target page
 	 * on Special:RecentChangesLinked (AKA Related Changes)
@@ -70,4 +70,4 @@
 				'rcfilters-filter-showlinkedfrom-label'
 		) );
 	};
-}( mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.RclTopSectionWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.RclTopSectionWidget.js
index 2fdf365fac..7488254018 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.RclTopSectionWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.RclTopSectionWidget.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	/**
 	 * Top section (between page title and filters) on Special:RecentChangesLinked (AKA RelatedChanges)
 	 *
@@ -63,4 +63,4 @@
 	/* Initialization */
 
 	OO.inheritClass( mw.rcfilters.ui.RclTopSectionWidget, OO.ui.Widget );
-}( mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SaveFiltersPopupButtonWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SaveFiltersPopupButtonWidget.js
index 89ad38283f..ae1ec90eb4 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SaveFiltersPopupButtonWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SaveFiltersPopupButtonWidget.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	/**
 	 * Save filters widget. This widget is displayed in the tag area
 	 * and allows the user to save the current state of the system
@@ -185,4 +185,4 @@
 			this.emit( 'saveCurrent' );
 		}
 	};
-}( mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js
index c13c2f79ac..3645b20a1f 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	/**
 	 * Quick links menu option widget
 	 *
@@ -326,4 +326,4 @@
 		return this.model.getID();
 	};
 
-}( mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js
index 088aa5bb0d..034a1c9748 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	/**
 	 * Quick links widget
 	 *
@@ -150,4 +150,4 @@
 		this.menu.removeItems( [ this.menu.findItemFromData( item.getID() ) ] );
 		this.placeholderItem.toggle( this.model.isEmpty() );
 	};
-}( mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.TagItemWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.TagItemWidget.js
index 188650a9b7..88117e79c9 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.TagItemWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.TagItemWidget.js
@@ -1,4 +1,4 @@
-( function ( mw, $ ) {
+( function () {
 	/**
 	 * Extend OOUI's TagItemWidget to also display a popup on hover.
 	 *
@@ -220,4 +220,4 @@
 		this.itemModel.disconnect( this );
 		this.closeButton.disconnect( this );
 	};
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ValuePickerWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ValuePickerWidget.js
index 304929b78e..ca85a6e1cf 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ValuePickerWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ValuePickerWidget.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	/**
 	 * Widget defining the behavior used to choose from a set of values
 	 * in a single_value group
@@ -107,4 +107,4 @@
 			this.selectWidget.selectItemByData( selectedItem.getName() );
 		}
 	};
-}( mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ViewSwitchWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ViewSwitchWidget.js
index aadded156f..72d2203d6c 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ViewSwitchWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ViewSwitchWidget.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	/**
 	 * A widget for the footer for the default view, allowing to switch views
 	 *
@@ -75,4 +75,4 @@
 	mw.rcfilters.ui.ViewSwitchWidget.prototype.onButtonClick = function ( buttonWidget ) {
 		this.controller.switchView( buttonWidget.getData() );
 	};
-}( mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.WatchlistTopSectionWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.WatchlistTopSectionWidget.js
index b9d9bdfd94..423c105eb2 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.WatchlistTopSectionWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.WatchlistTopSectionWidget.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	/**
 	 * Top section (between page title and filters) on Special:Watchlist
 	 *
@@ -80,4 +80,4 @@
 	/* Initialization */
 
 	OO.inheritClass( mw.rcfilters.ui.WatchlistTopSectionWidget, OO.ui.Widget );
-}( mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.searchSuggest/searchSuggest.js b/resources/src/mediawiki.searchSuggest/searchSuggest.js
index bd94f29f55..d3b64b06c8 100644
--- a/resources/src/mediawiki.searchSuggest/searchSuggest.js
+++ b/resources/src/mediawiki.searchSuggest/searchSuggest.js
@@ -2,7 +2,7 @@
 /*!
  * Add search suggestions to the search form.
  */
-( function ( mw, $ ) {
+( function () {
 	var searchNS = $.map( mw.config.get( 'wgFormattedNamespaces' ), function ( nsName, nsID ) {
 		if ( nsID >= 0 && mw.user.options.get( 'searchNs' + nsID ) ) {
 			// Cast string key to number
@@ -320,4 +320,4 @@
 			.find( '.mw-fallbackSearchButton' ).remove();
 	} );
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.special.apisandbox/apisandbox.js b/resources/src/mediawiki.special.apisandbox/apisandbox.js
index ad5fb065d0..48b3269bfa 100644
--- a/resources/src/mediawiki.special.apisandbox/apisandbox.js
+++ b/resources/src/mediawiki.special.apisandbox/apisandbox.js
@@ -1,5 +1,5 @@
 /* eslint-disable no-restricted-properties */
-( function ( $, mw, OO ) {
+( function () {
 	'use strict';
 	var ApiSandbox, Util, WidgetMethods, Validators,
 		$content, panel, booklet, oldhash, windowManager,
@@ -2072,4 +2072,4 @@
 
 	module.exports = ApiSandbox;
 
-}( jQuery, mediaWiki, OO ) );
+}() );
diff --git a/resources/src/mediawiki.special.block.js b/resources/src/mediawiki.special.block.js
index 180f040135..cb54e71d08 100644
--- a/resources/src/mediawiki.special.block.js
+++ b/resources/src/mediawiki.special.block.js
@@ -1,7 +1,7 @@
 /*!
  * JavaScript for Special:Block
  */
-( function ( mw, $ ) {
+( function () {
 	// Like OO.ui.infuse(), but if the element doesn't exist, return null instead of throwing an exception.
 	function infuseOrNull( elem ) {
 		try {
@@ -55,4 +55,4 @@
 			updateBlockOptions();
 		}
 	} );
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.special.changecredentials.js b/resources/src/mediawiki.special.changecredentials.js
index ad8a4f4f06..36ad252441 100644
--- a/resources/src/mediawiki.special.changecredentials.js
+++ b/resources/src/mediawiki.special.changecredentials.js
@@ -1,7 +1,7 @@
 /*!
  * JavaScript for change credentials form.
  */
-( function ( mw, $, OO ) {
+( function () {
 	mw.hook( 'htmlform.enhance' ).add( function ( $root ) {
 		var api = new mw.Api();
 
@@ -52,4 +52,4 @@
 			} );
 		} );
 	} );
-}( mediaWiki, jQuery, OO ) );
+}() );
diff --git a/resources/src/mediawiki.special.changeslist.legend.js b/resources/src/mediawiki.special.changeslist.legend.js
index 079276265e..0cdb110fb1 100644
--- a/resources/src/mediawiki.special.changeslist.legend.js
+++ b/resources/src/mediawiki.special.changeslist.legend.js
@@ -3,7 +3,7 @@
  */
 
 /* Remember the collapse state of the legend on recent changes and watchlist pages. */
-( function ( mw ) {
+( function () {
 	var
 		cookieName = 'changeslist-state',
 		// Expanded by default
@@ -21,4 +21,4 @@
 		};
 
 	mw.hook( 'wikipage.content' ).add( doCollapsibleLegend );
-}( mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.special.contributions.js b/resources/src/mediawiki.special.contributions.js
index 6558bda513..275e96a8d4 100644
--- a/resources/src/mediawiki.special.contributions.js
+++ b/resources/src/mediawiki.special.contributions.js
@@ -1,4 +1,4 @@
-( function ( mw, $ ) {
+( function () {
 
 	// Return a promise that is resolved when the element is blurred (loses focus).
 	// If it already is blurred, resolved immediately.
@@ -35,4 +35,4 @@
 		} );
 	} );
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.special.edittags.js b/resources/src/mediawiki.special.edittags.js
index 4f51e9b761..2d12b53a70 100644
--- a/resources/src/mediawiki.special.edittags.js
+++ b/resources/src/mediawiki.special.edittags.js
@@ -1,7 +1,7 @@
 /*!
  * JavaScript for Special:EditTags
  */
-( function ( mw, $ ) {
+( function () {
 	$( function () {
 		var summaryCodePointLimit = mw.config.get( 'wgCommentCodePointLimit' ),
 			summaryByteLimit = mw.config.get( 'wgCommentByteLimit' ),
@@ -35,4 +35,4 @@
 		}
 	} );
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.special.import.js b/resources/src/mediawiki.special.import.js
index 2cb96afc48..ba34eb3588 100644
--- a/resources/src/mediawiki.special.import.js
+++ b/resources/src/mediawiki.special.import.js
@@ -1,7 +1,7 @@
 /*!
  * JavaScript for Special:Import
  */
-( function ( $ ) {
+( function () {
 	var subprojectListAlreadyShown;
 	function updateImportSubprojectList() {
 		var $projectField = $( '#mw-import-table-interwiki #interwiki' ),
@@ -34,4 +34,4 @@
 			updateImportSubprojectList();
 		}
 	} );
-}( jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.special.movePage.js b/resources/src/mediawiki.special.movePage.js
index 0968e8428c..8004a44bae 100644
--- a/resources/src/mediawiki.special.movePage.js
+++ b/resources/src/mediawiki.special.movePage.js
@@ -1,7 +1,7 @@
 /*!
  * JavaScript for Special:MovePage
  */
-( function ( mw, $ ) {
+( function () {
 	$( function () {
 		var summaryCodePointLimit = mw.config.get( 'wgCommentCodePointLimit' ),
 			summaryByteLimit = mw.config.get( 'wgCommentByteLimit' ),
@@ -16,4 +16,4 @@
 			mw.widgets.visibleByteLimit( wpReason, summaryByteLimit );
 		}
 	} );
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.special.pageLanguage.js b/resources/src/mediawiki.special.pageLanguage.js
index edfbe1eaab..589182acc1 100644
--- a/resources/src/mediawiki.special.pageLanguage.js
+++ b/resources/src/mediawiki.special.pageLanguage.js
@@ -1,11 +1,11 @@
 /*!
  * JavaScript module used on Special:PageLanguage
  */
-( function ( $, OO ) {
+( function () {
 	$( function () {
 		// Select the 'Language select' option if user is trying to select language
 		OO.ui.infuse( 'mw-pl-languageselector' ).on( 'change', function () {
 			OO.ui.infuse( 'mw-pl-options' ).setValue( '2' );
 		} );
 	} );
-}( jQuery, OO ) );
+}() );
diff --git a/resources/src/mediawiki.special.preferences.ooui/editfont.js b/resources/src/mediawiki.special.preferences.ooui/editfont.js
index 7c98ece15f..9827dab529 100644
--- a/resources/src/mediawiki.special.preferences.ooui/editfont.js
+++ b/resources/src/mediawiki.special.preferences.ooui/editfont.js
@@ -1,7 +1,7 @@
 /*!
  * JavaScript for Special:Preferences: editfont field enhancements.
  */
-( function ( mw ) {
+( function () {
 	mw.hook( 'htmlform.enhance' ).add( function ( $root ) {
 		var widget, lastValue,
 			$target = $root.find( '#mw-input-wpeditfont' );
@@ -37,4 +37,4 @@
 		updateLabel( widget.getValue() );
 
 	} );
-}( mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.special.preferences.ooui/tabs.js b/resources/src/mediawiki.special.preferences.ooui/tabs.js
index cc87f439d8..5642046773 100644
--- a/resources/src/mediawiki.special.preferences.ooui/tabs.js
+++ b/resources/src/mediawiki.special.preferences.ooui/tabs.js
@@ -1,7 +1,7 @@
 /*!
  * JavaScript for Special:Preferences: Tab navigation.
  */
-( function ( mw, $ ) {
+( function () {
 	$( function () {
 		var $preferences, tabs, wrapper, previousTab, switchingNoHash;
 
@@ -143,4 +143,4 @@
 		} );
 
 	} );
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.special.preferences/confirmClose.js b/resources/src/mediawiki.special.preferences/confirmClose.js
index c092682984..03309de67b 100644
--- a/resources/src/mediawiki.special.preferences/confirmClose.js
+++ b/resources/src/mediawiki.special.preferences/confirmClose.js
@@ -2,7 +2,7 @@
  * JavaScript for Special:Preferences: Enable save button and prevent the window being accidentally
  * closed when any form field is changed.
  */
-( function ( mw, $ ) {
+( function () {
 	$( function () {
 		var allowCloseWindow, saveButton, restoreButton,
 			oouiEnabled = $( '#mw-prefs-form' ).hasClass( 'mw-htmlform-ooui' );
@@ -93,4 +93,4 @@
 			$( '#mw-prefs-restoreprefs' ).on( 'click', allowCloseWindow.release );
 		}
 	} );
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.special.preferences/convertmessagebox.js b/resources/src/mediawiki.special.preferences/convertmessagebox.js
index e6b7432fbd..45bdda2bd7 100644
--- a/resources/src/mediawiki.special.preferences/convertmessagebox.js
+++ b/resources/src/mediawiki.special.preferences/convertmessagebox.js
@@ -1,9 +1,9 @@
 /*!
  * JavaScript for Special:Preferences: Check for successbox to replace with notifications.
  */
-( function ( $ ) {
+( function () {
 	$( function () {
 		var convertmessagebox = require( 'mediawiki.notification.convertmessagebox' );
 		convertmessagebox();
 	} );
-}( jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.special.preferences/personalEmail.js b/resources/src/mediawiki.special.preferences/personalEmail.js
index f934d59e1e..10023ef144 100644
--- a/resources/src/mediawiki.special.preferences/personalEmail.js
+++ b/resources/src/mediawiki.special.preferences/personalEmail.js
@@ -1,7 +1,7 @@
 /*!
  * JavaScript for Special:Preferences: Email preferences better UX
  */
-( function ( $ ) {
+( function () {
 	$( function () {
 		var allowEmail, allowEmailFromNewUsers;
 
@@ -21,4 +21,4 @@
 			toggleDisabled();
 		}
 	} );
-}( jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.special.preferences/tabs.legacy.js b/resources/src/mediawiki.special.preferences/tabs.legacy.js
index 598b8f8f26..4b058ce3a5 100644
--- a/resources/src/mediawiki.special.preferences/tabs.legacy.js
+++ b/resources/src/mediawiki.special.preferences/tabs.legacy.js
@@ -1,7 +1,7 @@
 /*!
  * JavaScript for Special:Preferences: Tab navigation.
  */
-( function ( mw, $ ) {
+( function () {
 	$( function () {
 		var $preftoc, $preferences, $fieldsets, labelFunc, previousTab;
 
@@ -140,4 +140,4 @@
 		} );
 
 	} );
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.special.preferences/timezone.js b/resources/src/mediawiki.special.preferences/timezone.js
index 47a4bbccef..bdfe9a165d 100644
--- a/resources/src/mediawiki.special.preferences/timezone.js
+++ b/resources/src/mediawiki.special.preferences/timezone.js
@@ -1,7 +1,7 @@
 /*!
  * JavaScript for Special:Preferences: Timezone field enhancements.
  */
-( function ( mw, $ ) {
+( function () {
 	mw.hook( 'htmlform.enhance' ).add( function ( $root ) {
 		var $tzSelect, $tzTextbox, timezoneWidget, $localtimeHolder, servertime,
 			$target = $root.find( '#wpTimeCorrection' ),
@@ -116,4 +116,4 @@
 		}
 
 	} );
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.special.recentchanges.js b/resources/src/mediawiki.special.recentchanges.js
index 29c0feaf17..d8f73b2368 100644
--- a/resources/src/mediawiki.special.recentchanges.js
+++ b/resources/src/mediawiki.special.recentchanges.js
@@ -1,7 +1,7 @@
 /*!
  * JavaScript for Special:RecentChanges
  */
-( function ( mw, $ ) {
+( function () {
 	var rc, $checkboxes, $select;
 
 	/**
@@ -35,4 +35,4 @@
 
 	module.exports = rc;
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.special.revisionDelete.js b/resources/src/mediawiki.special.revisionDelete.js
index cad9db0e9c..e9b0e6a0ea 100644
--- a/resources/src/mediawiki.special.revisionDelete.js
+++ b/resources/src/mediawiki.special.revisionDelete.js
@@ -1,7 +1,7 @@
 /*!
  * JavaScript for Special:RevisionDelete
  */
-( function ( mw, $ ) {
+( function () {
 	var colonSeparator = mw.message( 'colon-separator' ).text(),
 		summaryCodePointLimit = mw.config.get( 'wgCommentCodePointLimit' ),
 		summaryByteLimit = mw.config.get( 'wgCommentByteLimit' ),
@@ -26,4 +26,4 @@
 		$wpReason.byteLimit( summaryByteLimit, filterFn );
 	}
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.special.search.commonsInterwikiWidget.js b/resources/src/mediawiki.special.search.commonsInterwikiWidget.js
index 648bf67540..8e6d160914 100644
--- a/resources/src/mediawiki.special.search.commonsInterwikiWidget.js
+++ b/resources/src/mediawiki.special.search.commonsInterwikiWidget.js
@@ -1,4 +1,4 @@
-( function ( mw, $ ) {
+( function () {
 
 	var api = new mw.Api(),
 		pageUrl = new mw.Uri(),
@@ -75,4 +75,4 @@
 		} );
 	} );
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.special.search/search.js b/resources/src/mediawiki.special.search/search.js
index e809f2ea93..f0bc49555c 100644
--- a/resources/src/mediawiki.special.search/search.js
+++ b/resources/src/mediawiki.special.search/search.js
@@ -1,7 +1,7 @@
 /*!
  * JavaScript for Special:Search
  */
-( function ( mw, $ ) {
+( function () {
 	$( function () {
 		var $checkboxes, $headerLinks, updateHeaderLinks, searchWidget;
 
@@ -57,4 +57,4 @@
 
 	} );
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.special.undelete.js b/resources/src/mediawiki.special.undelete.js
index e3cf598454..e8eb870145 100644
--- a/resources/src/mediawiki.special.undelete.js
+++ b/resources/src/mediawiki.special.undelete.js
@@ -1,7 +1,7 @@
 /*!
  * JavaScript for Special:Undelete
  */
-( function ( mw, $ ) {
+( function () {
 	$( function () {
 		var summaryCodePointLimit = mw.config.get( 'wgCommentCodePointLimit' ),
 			summaryByteLimit = mw.config.get( 'wgCommentByteLimit' ),
@@ -20,4 +20,4 @@
 			mw.widgets.visibleByteLimit( wpComment, summaryByteLimit );
 		}
 	} );
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.special.unwatchedPages/unwatchedPages.js b/resources/src/mediawiki.special.unwatchedPages/unwatchedPages.js
index 0886f8c7e9..7783ff7790 100644
--- a/resources/src/mediawiki.special.unwatchedPages/unwatchedPages.js
+++ b/resources/src/mediawiki.special.unwatchedPages/unwatchedPages.js
@@ -1,7 +1,7 @@
 /*!
  * JavaScript for Special:UnwatchedPages
  */
-( function ( mw, $ ) {
+( function () {
 	$( function () {
 		$( 'a.mw-watch-link' ).click( function ( e ) {
 			var promise,
@@ -46,4 +46,4 @@
 			e.preventDefault();
 		} );
 	} );
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.special.upload/upload.js b/resources/src/mediawiki.special.upload/upload.js
index da54ad2795..bfb4c5e995 100644
--- a/resources/src/mediawiki.special.upload/upload.js
+++ b/resources/src/mediawiki.special.upload/upload.js
@@ -8,7 +8,7 @@
 
 /* global Uint8Array */
 
-( function ( mw, $ ) {
+( function () {
 	var uploadWarning, uploadTemplatePreview,
 		ajaxUploadDestCheck = mw.config.get( 'wgAjaxUploadDestCheck' ),
 		$license = $( '#wpLicense' );
@@ -651,4 +651,4 @@
 		$( '.mw-editTools' ).attr( 'tabindex', '0' );
 		setEditTabindex( '-1' );
 	} );
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.special.userlogin.signup.js b/resources/src/mediawiki.special.userlogin.signup.js
index 8a61afbe6a..777f5e9dcf 100644
--- a/resources/src/mediawiki.special.userlogin.signup.js
+++ b/resources/src/mediawiki.special.userlogin.signup.js
@@ -1,7 +1,7 @@
 /*!
  * JavaScript for signup form.
  */
-( function ( mw, $ ) {
+( function () {
 	// When sending password by email, hide the password input fields.
 	$( function () {
 		// Always required if checked, otherwise it depends, so we use the original
@@ -119,4 +119,4 @@
 		passwordChecker = new mw.htmlform.Checker( $passwordInput, checkPassword );
 		passwordChecker.attach( $usernameInput.add( $emailInput ).add( $realNameInput ) );
 	} );
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.special.userrights.js b/resources/src/mediawiki.special.userrights.js
index 487e63a67d..a4f5d1aabc 100644
--- a/resources/src/mediawiki.special.userrights.js
+++ b/resources/src/mediawiki.special.userrights.js
@@ -1,7 +1,7 @@
 /*!
  * JavaScript for Special:UserRights
  */
-( function ( mw, $ ) {
+( function () {
 	var convertmessagebox = require( 'mediawiki.notification.convertmessagebox' ),
 		summaryCodePointLimit = mw.config.get( 'wgCommentCodePointLimit' ),
 		summaryByteLimit = mw.config.get( 'wgCommentByteLimit' ),
@@ -22,4 +22,4 @@
 		$wpReason.byteLimit( summaryByteLimit );
 	}
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.special.watchlist/visitedstatus.js b/resources/src/mediawiki.special.watchlist/visitedstatus.js
index 6b25327d95..f4e7b89533 100644
--- a/resources/src/mediawiki.special.watchlist/visitedstatus.js
+++ b/resources/src/mediawiki.special.watchlist/visitedstatus.js
@@ -1,7 +1,7 @@
 /*!
  * JavaScript for Special:Watchlist
  */
-( function ( $ ) {
+( function () {
 	$( function () {
 		$( '.mw-changeslist-line-watched .mw-title a' ).on( 'click', function () {
 			$( this )
@@ -9,4 +9,4 @@
 				.removeClass( 'mw-changeslist-line-watched' );
 		} );
 	} );
-}( jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.special.watchlist/watchlist.js b/resources/src/mediawiki.special.watchlist/watchlist.js
index 565ed2c974..715b5a5971 100644
--- a/resources/src/mediawiki.special.watchlist/watchlist.js
+++ b/resources/src/mediawiki.special.watchlist/watchlist.js
@@ -1,7 +1,7 @@
 /*!
  * JavaScript for Special:Watchlist
  */
-( function ( mw, $, OO ) {
+( function () {
 	$( function () {
 		var api = new mw.Api(), $progressBar, $resetForm = $( '#mw-watchlist-resetbutton' );
 
@@ -154,5 +154,4 @@
 		}
 	} );
 
-}( mediaWiki, jQuery, OO )
-);
+}() );
diff --git a/resources/src/mediawiki.storage.js b/resources/src/mediawiki.storage.js
index 84e146a73f..e9b2c9d329 100644
--- a/resources/src/mediawiki.storage.js
+++ b/resources/src/mediawiki.storage.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	'use strict';
 
 	// Catch exceptions to avoid fatal in Chrome's "Block data storage" mode
@@ -91,4 +91,4 @@
 	 */
 	mw.storage.session = new SafeStorage( sessionStorage );
 
-}( mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.template.js b/resources/src/mediawiki.template.js
index 4a3157c44f..4cee91c116 100644
--- a/resources/src/mediawiki.template.js
+++ b/resources/src/mediawiki.template.js
@@ -2,7 +2,7 @@
  * @class mw.template
  * @singleton
  */
-( function ( mw, $ ) {
+( function () {
 	var compiledTemplates = {},
 		compilers = {};
 
@@ -121,4 +121,4 @@
 		}
 	} );
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.template.mustache.js b/resources/src/mediawiki.template.mustache.js
index c3139a29cf..2b3e8bbd08 100644
--- a/resources/src/mediawiki.template.mustache.js
+++ b/resources/src/mediawiki.template.mustache.js
@@ -1,5 +1,5 @@
 /* global Mustache */
-( function ( mw, $ ) {
+( function () {
 	// Register mustache compiler
 	mw.template.registerCompiler( 'mustache', {
 		compile: function ( src ) {
@@ -32,4 +32,4 @@
 		}
 	} );
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.template.regexp.js b/resources/src/mediawiki.template.regexp.js
index 3ec0a1f5c9..2418d53fee 100644
--- a/resources/src/mediawiki.template.regexp.js
+++ b/resources/src/mediawiki.template.regexp.js
@@ -1,4 +1,4 @@
-mediaWiki.template.registerCompiler( 'regexp', {
+mw.template.registerCompiler( 'regexp', {
 	compile: function ( src ) {
 		return {
 			render: function () {
diff --git a/resources/src/mediawiki.toc/toc.js b/resources/src/mediawiki.toc/toc.js
index 4c201a67a1..5781d88ceb 100644
--- a/resources/src/mediawiki.toc/toc.js
+++ b/resources/src/mediawiki.toc/toc.js
@@ -1,4 +1,4 @@
-( function ( mw, $ ) {
+( function () {
 	'use strict';
 
 	// Table of contents toggle
@@ -58,4 +58,4 @@
 		} );
 	} );
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.toolbar/toolbar.js b/resources/src/mediawiki.toolbar/toolbar.js
index 827ef0194b..be49d26b6e 100644
--- a/resources/src/mediawiki.toolbar/toolbar.js
+++ b/resources/src/mediawiki.toolbar/toolbar.js
@@ -4,7 +4,7 @@
  * @class mw.toolbar
  * @singleton
  */
-( function ( mw, $ ) {
+( function () {
 	var toolbar, isReady, $toolbar, queue, slice, $currentFocused;
 
 	/**
@@ -205,4 +205,4 @@
 		} );
 	} );
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.user.js b/resources/src/mediawiki.user.js
index 5e9648593f..e41ed58677 100644
--- a/resources/src/mediawiki.user.js
+++ b/resources/src/mediawiki.user.js
@@ -3,7 +3,7 @@
  * @singleton
  */
 /* global Uint16Array */
-( function ( mw, $ ) {
+( function () {
 	var userInfoPromise, pageviewRandomId;
 
 	/**
@@ -196,4 +196,4 @@
 	 */
 	mw.log.deprecate( mw.user, 'stickyRandomId', mw.user.getPageviewToken, 'Please use getPageviewToken instead' );
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.userSuggest.js b/resources/src/mediawiki.userSuggest.js
index 43f0552b51..78fb1eabe7 100644
--- a/resources/src/mediawiki.userSuggest.js
+++ b/resources/src/mediawiki.userSuggest.js
@@ -1,7 +1,7 @@
 /*!
  * Add autocomplete suggestions for names of registered users.
  */
-( function ( mw, $ ) {
+( function () {
 	var api, config;
 
 	config = {
@@ -39,4 +39,4 @@
 	$( function () {
 		$( '.mw-autocomplete-user' ).suggestions( config );
 	} );
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.util.js b/resources/src/mediawiki.util.js
index ca0c3035d1..d8f5b1965c 100644
--- a/resources/src/mediawiki.util.js
+++ b/resources/src/mediawiki.util.js
@@ -1,4 +1,4 @@
-( function ( mw, $ ) {
+( function () {
 	'use strict';
 
 	var util;
@@ -593,4 +593,4 @@
 	mw.util = util;
 	module.exports = util;
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.viewport.js b/resources/src/mediawiki.viewport.js
index b453ac8d44..45cf597590 100644
--- a/resources/src/mediawiki.viewport.js
+++ b/resources/src/mediawiki.viewport.js
@@ -1,4 +1,4 @@
-( function ( mw, $ ) {
+( function () {
 	'use strict';
 
 	/**
@@ -98,4 +98,4 @@
 	};
 
 	mw.viewport = viewport;
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/resources/src/mediawiki.visibleTimeout.js b/resources/src/mediawiki.visibleTimeout.js
index bac06746d0..11bac7168f 100644
--- a/resources/src/mediawiki.visibleTimeout.js
+++ b/resources/src/mediawiki.visibleTimeout.js
@@ -1,7 +1,8 @@
-( function ( mw, document ) {
+( function () {
 	var hidden, visibilityChange,
 		nextVisibleTimeoutId = 0,
 		activeTimeouts = {},
+		document = window.document,
 		init = function ( overrideDoc ) {
 			if ( overrideDoc !== undefined ) {
 				document = overrideDoc;
@@ -111,4 +112,4 @@
 		module.exports.setDocument = init;
 	}
 
-}( mediaWiki, document ) );
+}() );
diff --git a/resources/src/mediawiki.widgets.datetime/CalendarWidget.js b/resources/src/mediawiki.widgets.datetime/CalendarWidget.js
index fa05991431..4c3d8d4bba 100644
--- a/resources/src/mediawiki.widgets.datetime/CalendarWidget.js
+++ b/resources/src/mediawiki.widgets.datetime/CalendarWidget.js
@@ -1,4 +1,4 @@
-( function ( $, mw ) {
+( function () {
 
 	/**
 	 * CalendarWidget displays a calendar that can be used to select a date. It
@@ -593,4 +593,4 @@
 		return this;
 	};
 
-}( jQuery, mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.widgets.datetime/DateTimeFormatter.js b/resources/src/mediawiki.widgets.datetime/DateTimeFormatter.js
index 038af953f0..d8ec5b5513 100644
--- a/resources/src/mediawiki.widgets.datetime/DateTimeFormatter.js
+++ b/resources/src/mediawiki.widgets.datetime/DateTimeFormatter.js
@@ -1,5 +1,5 @@
 /* eslint-disable no-restricted-properties */
-( function ( $, mw ) {
+( function () {
 
 	/**
 	 * Provides various methods needed for formatting dates and times.
@@ -625,4 +625,4 @@
 		};
 	};
 
-}( jQuery, mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.js b/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.js
index 77271f7b76..21aecd6b37 100644
--- a/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.js
+++ b/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.js
@@ -1,4 +1,4 @@
-( function ( $, mw ) {
+( function () {
 
 	/**
 	 * DateTimeInputWidgets can be used to input a date, a time, or a date and
@@ -835,4 +835,4 @@
 		this.focus();
 	};
 
-}( jQuery, mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.widgets.datetime/DiscordianDateTimeFormatter.js b/resources/src/mediawiki.widgets.datetime/DiscordianDateTimeFormatter.js
index 926c9157fa..e1d467215e 100644
--- a/resources/src/mediawiki.widgets.datetime/DiscordianDateTimeFormatter.js
+++ b/resources/src/mediawiki.widgets.datetime/DiscordianDateTimeFormatter.js
@@ -1,5 +1,5 @@
 /* eslint-disable no-restricted-properties */
-( function ( $, mw ) {
+( function () {
 
 	/**
 	 * Provides various methods needed for formatting dates and times. This
@@ -567,4 +567,4 @@
 		return ret;
 	};
 
-}( jQuery, mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.widgets.datetime/ProlepticGregorianDateTimeFormatter.js b/resources/src/mediawiki.widgets.datetime/ProlepticGregorianDateTimeFormatter.js
index b0b7d60836..35d4365c80 100644
--- a/resources/src/mediawiki.widgets.datetime/ProlepticGregorianDateTimeFormatter.js
+++ b/resources/src/mediawiki.widgets.datetime/ProlepticGregorianDateTimeFormatter.js
@@ -1,5 +1,5 @@
 /* eslint-disable no-restricted-properties */
-( function ( $, mw ) {
+( function () {
 
 	/**
 	 * Provides various methods needed for formatting dates and times. This
@@ -673,4 +673,4 @@
 		return ret;
 	};
 
-}( jQuery, mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.widgets.datetime/mediawiki.widgets.datetime.js b/resources/src/mediawiki.widgets.datetime/mediawiki.widgets.datetime.js
index 8d4be8c523..be45d88750 100644
--- a/resources/src/mediawiki.widgets.datetime/mediawiki.widgets.datetime.js
+++ b/resources/src/mediawiki.widgets.datetime/mediawiki.widgets.datetime.js
@@ -1,2 +1,2 @@
 // Create the namespace object
-mediaWiki.widgets.datetime = {};
+mw.widgets.datetime = {};
diff --git a/resources/src/mediawiki.widgets.visibleLengthLimit/mediawiki.widgets.visibleLengthLimit.js b/resources/src/mediawiki.widgets.visibleLengthLimit/mediawiki.widgets.visibleLengthLimit.js
index aab1e7c6d3..63da95a51d 100644
--- a/resources/src/mediawiki.widgets.visibleLengthLimit/mediawiki.widgets.visibleLengthLimit.js
+++ b/resources/src/mediawiki.widgets.visibleLengthLimit/mediawiki.widgets.visibleLengthLimit.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 
 	var byteLength = require( 'mediawiki.String' ).byteLength,
 		codePointLength = require( 'mediawiki.String' ).codePointLength;
@@ -63,4 +63,4 @@
 		textInputWidget.$input.codePointLimit( limit );
 	};
 
-}( mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.widgets/MediaSearch/mw.widgets.APIResultsProvider.js b/resources/src/mediawiki.widgets/MediaSearch/mw.widgets.APIResultsProvider.js
index dd07b928a4..8f8ef53f50 100644
--- a/resources/src/mediawiki.widgets/MediaSearch/mw.widgets.APIResultsProvider.js
+++ b/resources/src/mediawiki.widgets/MediaSearch/mw.widgets.APIResultsProvider.js
@@ -3,7 +3,7 @@
  *
  * @copyright 2011-2016 VisualEditor Team and others; see http://ve.mit-license.org
  */
-( function ( $, mw ) {
+( function () {
 
 	/**
 	 * API Results Provider object.
@@ -226,4 +226,4 @@
 	mw.widgets.APIResultsProvider.prototype.setAjaxSettings = function ( settings ) {
 		this.ajaxSettings = settings;
 	};
-}( jQuery, mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.widgets/MediaSearch/mw.widgets.APIResultsQueue.js b/resources/src/mediawiki.widgets/MediaSearch/mw.widgets.APIResultsQueue.js
index 3bc1d51bac..86103d1b2f 100644
--- a/resources/src/mediawiki.widgets/MediaSearch/mw.widgets.APIResultsQueue.js
+++ b/resources/src/mediawiki.widgets/MediaSearch/mw.widgets.APIResultsQueue.js
@@ -3,7 +3,7 @@
  *
  * @copyright 2011-2016 VisualEditor Team and others; see http://ve.mit-license.org
  */
-( function ( $, mw ) {
+( function () {
 
 	/**
 	 * API Results Queue object.
@@ -221,4 +221,4 @@
 	mw.widgets.APIResultsQueue.prototype.getThreshold = function () {
 		return this.threshold;
 	};
-}( jQuery, mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.widgets/MediaSearch/mw.widgets.MediaResourceProvider.js b/resources/src/mediawiki.widgets/MediaSearch/mw.widgets.MediaResourceProvider.js
index d767109c2d..23ee2c0518 100644
--- a/resources/src/mediawiki.widgets/MediaSearch/mw.widgets.MediaResourceProvider.js
+++ b/resources/src/mediawiki.widgets/MediaSearch/mw.widgets.MediaResourceProvider.js
@@ -4,7 +4,7 @@
  * @copyright 2011-2016 VisualEditor Team and others; see AUTHORS.txt
  * @license The MIT License (MIT); see LICENSE.txt
  */
-( function ( $, mw ) {
+( function () {
 
 	/**
 	 * MediaWiki media resource provider.
@@ -319,4 +319,4 @@
 			this.apiurl !== undefined ||
 			this.scriptDirUrl !== undefined;
 	};
-}( jQuery, mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.widgets/MediaSearch/mw.widgets.MediaResourceQueue.js b/resources/src/mediawiki.widgets/MediaSearch/mw.widgets.MediaResourceQueue.js
index 34fa44b4ec..81cc217229 100644
--- a/resources/src/mediawiki.widgets/MediaSearch/mw.widgets.MediaResourceQueue.js
+++ b/resources/src/mediawiki.widgets/MediaSearch/mw.widgets.MediaResourceQueue.js
@@ -4,7 +4,7 @@
  * @copyright 2011-2016 VisualEditor Team and others; see AUTHORS.txt
  * @license The MIT License (MIT); see LICENSE.txt
  */
-( function ( $, mw ) {
+( function () {
 
 	/**
 	 * MediaWiki media resource queue.
@@ -65,4 +65,4 @@
 	mw.widgets.MediaResourceQueue.prototype.getMaxHeight = function () {
 		return this.maxHeight;
 	};
-}( jQuery, mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.widgets/MediaSearch/mw.widgets.MediaResultWidget.js b/resources/src/mediawiki.widgets/MediaSearch/mw.widgets.MediaResultWidget.js
index 7607e84258..aaa5da5f2c 100644
--- a/resources/src/mediawiki.widgets/MediaSearch/mw.widgets.MediaResultWidget.js
+++ b/resources/src/mediawiki.widgets/MediaSearch/mw.widgets.MediaResultWidget.js
@@ -4,7 +4,7 @@
  * @copyright 2011-2016 VisualEditor Team and others; see AUTHORS.txt
  * @license The MIT License (MIT); see LICENSE.txt
  */
-( function ( $, mw ) {
+( function () {
 
 	/**
 	 * Creates an mw.widgets.MediaResultWidget object.
@@ -271,4 +271,4 @@
 	mw.widgets.MediaResultWidget.prototype.hasSrc = function () {
 		return !!this.src;
 	};
-}( jQuery, mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.widgets/MediaSearch/mw.widgets.MediaSearchProvider.js b/resources/src/mediawiki.widgets/MediaSearch/mw.widgets.MediaSearchProvider.js
index a46d911004..47df5c01df 100644
--- a/resources/src/mediawiki.widgets/MediaSearch/mw.widgets.MediaSearchProvider.js
+++ b/resources/src/mediawiki.widgets/MediaSearch/mw.widgets.MediaSearchProvider.js
@@ -4,7 +4,7 @@
  * @copyright 2011-2016 VisualEditor Team and others; see AUTHORS.txt
  * @license The MIT License (MIT); see LICENSE.txt
  */
-( function ( $, mw ) {
+( function () {
 
 	/**
 	 * MediaWiki media search provider.
@@ -66,4 +66,4 @@
 	mw.widgets.MediaSearchProvider.prototype.isValid = function () {
 		return this.getUserParams().gsrsearch && mw.widgets.MediaSearchProvider.super.prototype.isValid.call( this );
 	};
-}( jQuery, mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.widgets/MediaSearch/mw.widgets.MediaSearchQueue.js b/resources/src/mediawiki.widgets/MediaSearch/mw.widgets.MediaSearchQueue.js
index 3639525902..bf833959f6 100644
--- a/resources/src/mediawiki.widgets/MediaSearch/mw.widgets.MediaSearchQueue.js
+++ b/resources/src/mediawiki.widgets/MediaSearch/mw.widgets.MediaSearchQueue.js
@@ -4,7 +4,7 @@
  * @copyright 2011-2016 VisualEditor Team and others; see AUTHORS.txt
  * @license The MIT License (MIT); see LICENSE.txt
  */
-( function ( mw ) {
+( function () {
 
 	/**
 	 * MediaWiki media resource queue.
@@ -79,4 +79,4 @@
 	mw.widgets.MediaSearchQueue.prototype.getSearchQuery = function () {
 		return this.getParams().gsrsearch;
 	};
-}( mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.widgets/MediaSearch/mw.widgets.MediaSearchWidget.js b/resources/src/mediawiki.widgets/MediaSearch/mw.widgets.MediaSearchWidget.js
index 08266f0935..9fc7edb70b 100644
--- a/resources/src/mediawiki.widgets/MediaSearch/mw.widgets.MediaSearchWidget.js
+++ b/resources/src/mediawiki.widgets/MediaSearch/mw.widgets.MediaSearchWidget.js
@@ -4,7 +4,7 @@
  * @copyright 2011-2016 VisualEditor Team and others; see AUTHORS.txt
  * @license The MIT License (MIT); see LICENSE.txt
  */
-( function ( $, mw ) {
+( function () {
 
 	/**
 	 * Creates an mw.widgets.MediaSearchWidget object.
@@ -470,4 +470,4 @@
 	mw.widgets.MediaSearchWidget.prototype.getLang = function () {
 		return this.lang;
 	};
-}( jQuery, mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.js b/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.js
index b91617e789..94aa3b9c5f 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.js
@@ -5,7 +5,7 @@
  * @license The MIT License (MIT); see LICENSE.txt
  */
 /* global moment */
-( function ( $, mw ) {
+( function () {
 
 	/**
 	 * Creates an mw.widgets.CalendarWidget object.
@@ -588,4 +588,4 @@
 		return this;
 	};
 
-}( jQuery, mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.widgets/mw.widgets.CategoryMultiselectWidget.js b/resources/src/mediawiki.widgets/mw.widgets.CategoryMultiselectWidget.js
index a71b3d11ce..54ddca7e94 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.CategoryMultiselectWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.CategoryMultiselectWidget.js
@@ -4,7 +4,7 @@
  * @copyright 2011-2015 MediaWiki Widgets Team and others; see AUTHORS.txt
  * @license The MIT License (MIT); see LICENSE.txt
  */
-( function ( $, mw ) {
+( function () {
 	var hasOwn = Object.prototype.hasOwnProperty,
 		NS_CATEGORY = mw.config.get( 'wgNamespaceIds' ).category;
 
@@ -409,4 +409,4 @@
 		/** Search only parent categories */
 		ParentCategories: 4
 	};
-}( jQuery, mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.widgets/mw.widgets.CategoryTagItemWidget.js b/resources/src/mediawiki.widgets/mw.widgets.CategoryTagItemWidget.js
index 77c2c359d7..819bc23bbb 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.CategoryTagItemWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.CategoryTagItemWidget.js
@@ -4,7 +4,7 @@
  * @copyright 2011-2015 MediaWiki Widgets Team and others; see AUTHORS.txt
  * @license The MIT License (MIT); see LICENSE.txt
  */
-( function ( $, mw ) {
+( function () {
 
 	var hasOwn = Object.prototype.hasOwnProperty;
 
@@ -206,4 +206,4 @@
 
 	// For backwards compatibility. See T183299.
 	mw.widgets.CategoryCapsuleItemWidget = mw.widgets.CategoryTagItemWidget;
-}( jQuery, mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.widgets/mw.widgets.CheckMatrixWidget.js b/resources/src/mediawiki.widgets/mw.widgets.CheckMatrixWidget.js
index 64b75927d4..01165ca082 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.CheckMatrixWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.CheckMatrixWidget.js
@@ -1,4 +1,4 @@
-( function ( $, mw ) {
+( function () {
 	/**
 	 * A JavaScript version of CheckMatrixWidget.
 	 *
@@ -144,4 +144,4 @@
 			} );
 		}
 	};
-}( jQuery, mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.widgets/mw.widgets.ComplexNamespaceInputWidget.js b/resources/src/mediawiki.widgets/mw.widgets.ComplexNamespaceInputWidget.js
index 9edd0bd958..9bfe87d81f 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.ComplexNamespaceInputWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.ComplexNamespaceInputWidget.js
@@ -4,7 +4,7 @@
  * @copyright 2011-2015 MediaWiki Widgets Team and others; see AUTHORS.txt
  * @license The MIT License (MIT); see LICENSE.txt
  */
-( function ( $, mw ) {
+( function () {
 
 	/**
 	 * Namespace input widget. Displays a dropdown box with the choice of available namespaces, plus
@@ -133,4 +133,4 @@
 		return this;
 	};
 
-}( jQuery, mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.js b/resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.js
index a01fbde1f8..2c4044d10f 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.js
@@ -4,7 +4,7 @@
  * @copyright 2011-2015 MediaWiki Widgets Team and others; see AUTHORS.txt
  * @license The MIT License (MIT); see LICENSE.txt
  */
-( function ( $, mw ) {
+( function () {
 
 	/**
 	 * Like TitleInputWidget, but the namespace has to be input through a separate dropdown field.
@@ -118,4 +118,4 @@
 		return this;
 	};
 
-}( jQuery, mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js
index 2265132c88..c7502da547 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js
@@ -5,7 +5,7 @@
  * @license The MIT License (MIT); see LICENSE.txt
  */
 /* global moment */
-( function ( $, mw ) {
+( function () {
 
 	/**
 	 * Creates an mw.widgets.DateInputWidget object.
@@ -692,4 +692,4 @@
 		}
 	};
 
-}( jQuery, mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.widgets/mw.widgets.ExpiryInputWidget.js b/resources/src/mediawiki.widgets/mw.widgets.ExpiryInputWidget.js
index 54d4f2a753..26f347a350 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.ExpiryInputWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.ExpiryInputWidget.js
@@ -5,7 +5,7 @@
  * @license The MIT License (MIT); see LICENSE.txt
  */
 /* global moment */
-( function ( $, mw ) {
+( function () {
 
 	/**
 	 * Creates a mw.widgets.ExpiryWidget object.
@@ -224,4 +224,4 @@
 		return this.relativeField.getValue();
 	};
 
-}( jQuery, mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.widgets/mw.widgets.NamespaceInputWidget.js b/resources/src/mediawiki.widgets/mw.widgets.NamespaceInputWidget.js
index 08d5b87448..cca950ff51 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.NamespaceInputWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.NamespaceInputWidget.js
@@ -5,7 +5,7 @@
  * @copyright 2011-2015 MediaWiki Widgets Team and others; see AUTHORS.txt
  * @license The MIT License (MIT); see LICENSE.txt
  */
-( function ( $, mw ) {
+( function () {
 
 	/**
 	 * Namespace input widget. Displays a dropdown box with the choice of available namespaces.
@@ -69,4 +69,4 @@
 		return options;
 	};
 
-}( jQuery, mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.widgets/mw.widgets.SearchInputWidget.js b/resources/src/mediawiki.widgets/mw.widgets.SearchInputWidget.js
index 75bf891cee..e821ce8fdc 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.SearchInputWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.SearchInputWidget.js
@@ -4,7 +4,7 @@
  * @copyright 2011-2015 MediaWiki Widgets Team and others; see AUTHORS.txt
  * @license The MIT License (MIT); see LICENSE.txt
  */
-( function ( $, mw ) {
+( function () {
 
 	/**
 	 * Creates a mw.widgets.SearchInputWidget object.
@@ -248,4 +248,4 @@
 		return items;
 	};
 
-}( jQuery, mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.widgets/mw.widgets.SelectWithInputWidget.js b/resources/src/mediawiki.widgets/mw.widgets.SelectWithInputWidget.js
index 436ca2f56b..f61255abb3 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.SelectWithInputWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.SelectWithInputWidget.js
@@ -4,7 +4,7 @@
  * @copyright 2011-2017 MediaWiki Widgets Team and others; see AUTHORS.txt
  * @license The MIT License (MIT); see LICENSE.txt
  */
-( function ( $, mw ) {
+( function () {
 
 	/**
 	 * Select with input widget. Displays an OO.ui.TextInputWidget along with
@@ -189,4 +189,4 @@
 		this.emit( 'change', this.getValue() );
 	};
 
-}( jQuery, mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.widgets/mw.widgets.SizeFilterWidget.js b/resources/src/mediawiki.widgets/mw.widgets.SizeFilterWidget.js
index 7c750f0d61..6484404803 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.SizeFilterWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.SizeFilterWidget.js
@@ -4,7 +4,7 @@
  * @copyright 2011-2018 MediaWiki Widgets Team and others; see AUTHORS.txt
  * @license The MIT License (MIT); see LICENSE.txt
  */
-( function ( $, mw ) {
+( function () {
 
 	/**
 	 * RadioSelectInputWidget and a TextInputWidget to set minimum or maximum byte size
@@ -105,4 +105,4 @@
 		this.textinput.restorePreInfuseState( state.textinput );
 	};
 
-}( jQuery, mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.widgets/mw.widgets.StashedFileWidget.js b/resources/src/mediawiki.widgets/mw.widgets.StashedFileWidget.js
index cdcf5a23a8..bc6bc25d09 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.StashedFileWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.StashedFileWidget.js
@@ -4,7 +4,7 @@
  * @copyright 2011-2016 MediaWiki Widgets Team and others; see AUTHORS.txt
  * @license The MIT License (MIT); see LICENSE.txt
  */
-( function ( $, mw, OO ) {
+( function () {
 
 	/**
 	 * Accepts a stashed file and displays the information for purposes of
@@ -155,4 +155,4 @@
 
 		return $.Deferred().reject( 'No filekey' );
 	};
-}( jQuery, mediaWiki, OO ) );
+}() );
diff --git a/resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.js b/resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.js
index 4b1109b491..fa8b96701f 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.js
@@ -4,7 +4,7 @@
  * @copyright 2011-2015 MediaWiki Widgets Team and others; see AUTHORS.txt
  * @license The MIT License (MIT); see LICENSE.txt
  */
-( function ( $, mw ) {
+( function () {
 
 	var trimByteLength = require( 'mediawiki.String' ).trimByteLength;
 
@@ -138,4 +138,4 @@
 		} ).newVal;
 	};
 
-}( jQuery, mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.widgets/mw.widgets.TitleOptionWidget.js b/resources/src/mediawiki.widgets/mw.widgets.TitleOptionWidget.js
index 76d4bfbac6..661f9aecd6 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.TitleOptionWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.TitleOptionWidget.js
@@ -4,7 +4,7 @@
  * @copyright 2011-2015 MediaWiki Widgets Team and others; see AUTHORS.txt
  * @license The MIT License (MIT); see LICENSE.txt
  */
-( function ( $, mw ) {
+( function () {
 
 	/**
 	 * Creates a mw.widgets.TitleOptionWidget object.
@@ -105,4 +105,4 @@
 
 	OO.inheritClass( mw.widgets.TitleOptionWidget, OO.ui.MenuOptionWidget );
 
-}( jQuery, mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.widgets/mw.widgets.TitleSearchWidget.js b/resources/src/mediawiki.widgets/mw.widgets.TitleSearchWidget.js
index cd937f79fa..b9bd1e00a9 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.TitleSearchWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.TitleSearchWidget.js
@@ -4,7 +4,7 @@
  * @copyright 2011-2015 MediaWiki Widgets Team and others; see AUTHORS.txt
  * @license The MIT License (MIT); see LICENSE.txt
  */
-( function ( mw ) {
+( function () {
 
 	/**
 	 * Creates an mw.widgets.TitleSearchWidget object.
@@ -102,4 +102,4 @@
 		return response.query || {};
 	};
 
-}( mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js b/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
index 44a7d61d9b..c256f1f8b1 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
@@ -4,7 +4,7 @@
  * @copyright 2011-2015 MediaWiki Widgets Team and others; see AUTHORS.txt
  * @license The MIT License (MIT); see LICENSE.txt
  */
-( function ( $, mw ) {
+( function () {
 	var hasOwn = Object.prototype.hasOwnProperty;
 
 	/**
@@ -378,4 +378,4 @@
 		return !!this.getMWTitle();
 	};
 
-}( jQuery, mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.widgets/mw.widgets.UserInputWidget.js b/resources/src/mediawiki.widgets/mw.widgets.UserInputWidget.js
index 2b3a59f5c0..9c3772da68 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.UserInputWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.UserInputWidget.js
@@ -4,7 +4,7 @@
  * @copyright 2011-2015 MediaWiki Widgets Team and others; see AUTHORS.txt
  * @license The MIT License (MIT); see LICENSE.txt
  */
-( function ( $, mw ) {
+( function () {
 
 	/**
 	 * Creates a mw.widgets.UserInputWidget object.
@@ -117,4 +117,4 @@
 		return items;
 	};
 
-}( jQuery, mediaWiki ) );
+}() );
diff --git a/resources/src/mediawiki.widgets/mw.widgets.UsersMultiselectWidget.js b/resources/src/mediawiki.widgets/mw.widgets.UsersMultiselectWidget.js
index f0ad0565d9..e37da8bb0b 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.UsersMultiselectWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.UsersMultiselectWidget.js
@@ -4,7 +4,7 @@
  * @copyright 2017 MediaWiki Widgets Team and others; see AUTHORS.txt
  * @license The MIT License (MIT); see LICENSE.txt
  */
-( function ( $, mw ) {
+( function () {
 
 	/**
 	 * UsersMultiselectWidget can be used to input list of users in a single
@@ -170,4 +170,4 @@
 		this.input.setValue( '' );
 	};
 
-}( jQuery, mediaWiki ) );
+}() );
diff --git a/resources/src/moment/moment-locale-overrides.js b/resources/src/moment/moment-locale-overrides.js
index bafb86a227..04658b92ae 100644
--- a/resources/src/moment/moment-locale-overrides.js
+++ b/resources/src/moment/moment-locale-overrides.js
@@ -1,6 +1,6 @@
-/* global mediaWiki, moment */
+/* global moment */
 
-( function ( mw ) {
+( function () {
 	// HACK: Overwrite moment's i18n with MediaWiki's for the current language so that
 	// wgTranslateNumerals is respected.
 	moment.updateLocale( moment.locale(), {
@@ -41,4 +41,4 @@
 			return s;
 		}
 	} );
-}( mediaWiki ) );
+}() );
diff --git a/resources/src/ooui-local.js b/resources/src/ooui-local.js
index 0c65512b4a..14c974062e 100644
--- a/resources/src/ooui-local.js
+++ b/resources/src/ooui-local.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	var isMobile;
 	// Connect OOUI to MediaWiki's localisation system
 	OO.ui.getUserLanguages = mw.language.getFallbackLanguageChain;
@@ -14,4 +14,4 @@
 		}
 		return isMobile;
 	};
-}( mediaWiki ) );
+}() );
diff --git a/tests/qunit/data/mwLoaderTestCallback.js b/tests/qunit/data/mwLoaderTestCallback.js
index dd03411594..3f2ee92ffe 100644
--- a/tests/qunit/data/mwLoaderTestCallback.js
+++ b/tests/qunit/data/mwLoaderTestCallback.js
@@ -1 +1 @@
-mediaWiki.loader.testCallback();
+mw.loader.testCallback();
diff --git a/tests/qunit/data/testrunner.js b/tests/qunit/data/testrunner.js
index 981043bc2d..be8b3a9ec4 100644
--- a/tests/qunit/data/testrunner.js
+++ b/tests/qunit/data/testrunner.js
@@ -1,5 +1,5 @@
 /* global sinon */
-( function ( $, mw, QUnit ) {
+( function () {
 	'use strict';
 
 	var addons, nested;
@@ -654,4 +654,4 @@
 		} );
 	} );
 
-}( jQuery, mediaWiki, QUnit ) );
+}() );
diff --git a/tests/qunit/suites/resources/jquery/jquery.accessKeyLabel.test.js b/tests/qunit/suites/resources/jquery/jquery.accessKeyLabel.test.js
index c064275e65..a12cfc7a9c 100644
--- a/tests/qunit/suites/resources/jquery/jquery.accessKeyLabel.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.accessKeyLabel.test.js
@@ -1,4 +1,4 @@
-( function ( $ ) {
+( function () {
 	var getAccessKeyPrefixTestData, updateTooltipAccessKeysTestData;
 
 	QUnit.module( 'jquery.accessKeyLabel', QUnit.newMwEnvironment( {
@@ -118,4 +118,4 @@
 		$.fn.updateTooltipAccessKeys.setTestMode( false );
 	} );
 
-}( jQuery ) );
+}() );
diff --git a/tests/qunit/suites/resources/jquery/jquery.color.test.js b/tests/qunit/suites/resources/jquery/jquery.color.test.js
index ca6a512fc5..d207260b7c 100644
--- a/tests/qunit/suites/resources/jquery/jquery.color.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.color.test.js
@@ -1,4 +1,4 @@
-( function ( $ ) {
+( function () {
 	QUnit.module( 'jquery.color', QUnit.newMwEnvironment() );
 
 	QUnit.test( 'animate', function ( assert ) {
@@ -12,4 +12,4 @@
 			} )
 			.always( done );
 	} );
-}( jQuery ) );
+}() );
diff --git a/tests/qunit/suites/resources/jquery/jquery.colorUtil.test.js b/tests/qunit/suites/resources/jquery/jquery.colorUtil.test.js
index bd6e7b2f01..1051a83c9e 100644
--- a/tests/qunit/suites/resources/jquery/jquery.colorUtil.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.colorUtil.test.js
@@ -1,4 +1,4 @@
-( function ( $ ) {
+( function () {
 	QUnit.module( 'jquery.colorUtil', QUnit.newMwEnvironment() );
 
 	QUnit.test( 'getRGB', function ( assert ) {
@@ -60,4 +60,4 @@
 		b = $.colorUtil.getColorBrightness( 'rgb(200,50,50)', -0.2 );
 		assert.strictEqual( b, 'rgb(118,29,29)', 'Start with rgb string "rgb(200,50,50)", darken 20%' );
 	} );
-}( jQuery ) );
+}() );
diff --git a/tests/qunit/suites/resources/jquery/jquery.getAttrs.test.js b/tests/qunit/suites/resources/jquery/jquery.getAttrs.test.js
index 74d85090d6..ae464f06e0 100644
--- a/tests/qunit/suites/resources/jquery/jquery.getAttrs.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.getAttrs.test.js
@@ -1,4 +1,4 @@
-( function ( $ ) {
+( function () {
 	QUnit.module( 'jquery.getAttrs', QUnit.newMwEnvironment() );
 
 	QUnit.test( 'getAttrs()', function ( assert ) {
@@ -11,4 +11,4 @@
 
 		assert.propEqual( $el.getAttrs(), attrs, 'keys and values match' );
 	} );
-}( jQuery ) );
+}() );
diff --git a/tests/qunit/suites/resources/jquery/jquery.hidpi.test.js b/tests/qunit/suites/resources/jquery/jquery.hidpi.test.js
index 3f17ca51d4..cb09180b21 100644
--- a/tests/qunit/suites/resources/jquery/jquery.hidpi.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.hidpi.test.js
@@ -1,4 +1,4 @@
-( function ( $ ) {
+( function () {
 	QUnit.module( 'jquery.hidpi', QUnit.newMwEnvironment() );
 
 	QUnit.test( 'devicePixelRatio', function ( assert ) {
@@ -35,4 +35,4 @@
 		assert.strictEqual( $.matchSrcSet( 1.75, srcset ), 'onefive.png', '1.75 gives match to 1.5' );
 		assert.strictEqual( $.matchSrcSet( 2.25, srcset ), 'two.png', '2.25 gives match to 2' );
 	} );
-}( jQuery ) );
+}() );
diff --git a/tests/qunit/suites/resources/jquery/jquery.highlightText.test.js b/tests/qunit/suites/resources/jquery/jquery.highlightText.test.js
index 0e34e34bfb..b73b2666fc 100644
--- a/tests/qunit/suites/resources/jquery/jquery.highlightText.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.highlightText.test.js
@@ -1,4 +1,4 @@
-( function ( $ ) {
+( function () {
 	QUnit.module( 'jquery.highlightText', QUnit.newMwEnvironment() );
 
 	QUnit.test( 'Check', function ( assert ) {
@@ -232,4 +232,4 @@
 			);
 		} );
 	} );
-}( jQuery ) );
+}() );
diff --git a/tests/qunit/suites/resources/jquery/jquery.lengthLimit.test.js b/tests/qunit/suites/resources/jquery/jquery.lengthLimit.test.js
index 9d4f8ddf82..75a8d1049c 100644
--- a/tests/qunit/suites/resources/jquery/jquery.lengthLimit.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.lengthLimit.test.js
@@ -1,4 +1,4 @@
-( function ( $, mw ) {
+( function () {
 	var simpleSample, U_20AC, poop, mbSample;
 
 	QUnit.module( 'jquery.lengthLimit', QUnit.newMwEnvironment() );
@@ -283,4 +283,4 @@
 		expected: '\uD800'
 	} );
 
-}( jQuery, mediaWiki ) );
+}() );
diff --git a/tests/qunit/suites/resources/jquery/jquery.localize.test.js b/tests/qunit/suites/resources/jquery/jquery.localize.test.js
index a3e46abe1e..c88768d57e 100644
--- a/tests/qunit/suites/resources/jquery/jquery.localize.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.localize.test.js
@@ -1,4 +1,4 @@
-( function ( $, mw ) {
+( function () {
 	QUnit.module( 'jquery.localize', QUnit.newMwEnvironment() );
 
 	QUnit.test( 'Handle basic replacements', function ( assert ) {
@@ -132,4 +132,4 @@
 		assert.strictEqual( $lc.length, 1, 'link is created' );
 		assert.strictEqual( $lc.text(), 'link', 'the link text got added' );
 	} );
-}( jQuery, mediaWiki ) );
+}() );
diff --git a/tests/qunit/suites/resources/jquery/jquery.makeCollapsible.test.js b/tests/qunit/suites/resources/jquery/jquery.makeCollapsible.test.js
index df29ee6ced..0b3e809eaa 100644
--- a/tests/qunit/suites/resources/jquery/jquery.makeCollapsible.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.makeCollapsible.test.js
@@ -1,4 +1,4 @@
-( function ( $ ) {
+( function () {
 	var loremIpsum = 'Lorem ipsum dolor sit amet, consectetuer adipiscing elit.';
 
 	QUnit.module( 'jquery.makeCollapsible', QUnit.newMwEnvironment() );
@@ -394,4 +394,4 @@
 			assert.assertFalse( $collapsible2.find( '> .mw-collapsible-toggle' ).hasClass( 'mw-collapsible-toggle-collapsed' ) );
 		} ).find( '> .mw-collapsible-toggle a' ).trigger( 'click' );
 	} );
-}( jQuery ) );
+}() );
diff --git a/tests/qunit/suites/resources/jquery/jquery.tabIndex.test.js b/tests/qunit/suites/resources/jquery/jquery.tabIndex.test.js
index ec3539b95a..220771b14d 100644
--- a/tests/qunit/suites/resources/jquery/jquery.tabIndex.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.tabIndex.test.js
@@ -1,4 +1,4 @@
-( function ( $ ) {
+( function () {
 	QUnit.module( 'jquery.tabIndex', QUnit.newMwEnvironment() );
 
 	QUnit.test( 'firstTabIndex', function ( assert ) {
@@ -32,4 +32,4 @@
 		$testB = $( '<div>' );
 		assert.strictEqual( $testB.lastTabIndex(), null, 'Return null if none available.' );
 	} );
-}( jQuery ) );
+}() );
diff --git a/tests/qunit/suites/resources/jquery/jquery.tablesorter.parsers.test.js b/tests/qunit/suites/resources/jquery/jquery.tablesorter.parsers.test.js
index e49110ffa0..148197726a 100644
--- a/tests/qunit/suites/resources/jquery/jquery.tablesorter.parsers.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.tablesorter.parsers.test.js
@@ -1,4 +1,4 @@
-( function ( $, mw ) {
+( function () {
 	/**
 	 * This module tests the input/output capabilities of the parsers of tablesorter.
 	 * It does not test actual sorting.
@@ -264,4 +264,4 @@
 
 	// TODO add numbers sorting tests for T10115 with a different language
 
-}( jQuery, mediaWiki ) );
+}() );
diff --git a/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js b/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
index 69a5cecbd1..360ef01064 100644
--- a/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
@@ -1,4 +1,4 @@
-( function ( $, mw ) {
+( function () {
 	var header = [ 'Planet', 'Radius (km)' ],
 
 		// Data set "planets"
@@ -1528,4 +1528,4 @@
 		);
 	} );
 
-}( jQuery, mediaWiki ) );
+}() );
diff --git a/tests/qunit/suites/resources/jquery/jquery.textSelection.test.js b/tests/qunit/suites/resources/jquery/jquery.textSelection.test.js
index d598586bab..496674721e 100644
--- a/tests/qunit/suites/resources/jquery/jquery.textSelection.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.textSelection.test.js
@@ -1,4 +1,4 @@
-( function ( $ ) {
+( function () {
 	var caretSample,
 		sig = {
 			pre: '--~~~~'
@@ -263,4 +263,4 @@
 		end: 11,
 		mode: 'set'
 	} );
-}( jQuery ) );
+}() );
diff --git a/tests/qunit/suites/resources/mediawiki.api/mediawiki.ForeignApi.test.js b/tests/qunit/suites/resources/mediawiki.api/mediawiki.ForeignApi.test.js
index 69ab7975bb..541c61072d 100644
--- a/tests/qunit/suites/resources/mediawiki.api/mediawiki.ForeignApi.test.js
+++ b/tests/qunit/suites/resources/mediawiki.api/mediawiki.ForeignApi.test.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	QUnit.module( 'mediawiki.ForeignApi', QUnit.newMwEnvironment( {
 		setup: function () {
 			this.server = this.sandbox.useFakeServer();
@@ -29,4 +29,4 @@
 		return api.post( {} );
 	} );
 
-}( mediaWiki ) );
+}() );
diff --git a/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.category.test.js b/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.category.test.js
index fdf90dde39..51ee7ad390 100644
--- a/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.category.test.js
+++ b/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.category.test.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	QUnit.module( 'mediawiki.api.category', QUnit.newMwEnvironment( {
 		setup: function () {
 			this.server = this.sandbox.useFakeServer();
@@ -111,4 +111,4 @@
 		} );
 	} );
 
-}( mediaWiki ) );
+}() );
diff --git a/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.edit.test.js b/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.edit.test.js
index ff5cb2c93e..e9132f4723 100644
--- a/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.edit.test.js
+++ b/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.edit.test.js
@@ -1,4 +1,4 @@
-( function ( mw, $ ) {
+( function () {
 	QUnit.module( 'mediawiki.api.edit', QUnit.newMwEnvironment( {
 		setup: function () {
 			this.server = this.sandbox.useFakeServer();
@@ -217,4 +217,4 @@
 			} );
 	} );
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.messages.test.js b/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.messages.test.js
index 7282b3fbe0..72f57e96ee 100644
--- a/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.messages.test.js
+++ b/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.messages.test.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	QUnit.module( 'mediawiki.api.messages', QUnit.newMwEnvironment( {
 		setup: function () {
 			this.server = this.sandbox.useFakeServer();
@@ -26,4 +26,4 @@
 			);
 		} );
 	} );
-}( mediaWiki ) );
+}() );
diff --git a/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.options.test.js b/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.options.test.js
index 997a42c8b1..549deb0e1b 100644
--- a/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.options.test.js
+++ b/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.options.test.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	QUnit.module( 'mediawiki.api.options', QUnit.newMwEnvironment( {
 		setup: function () {
 			this.server = this.sandbox.useFakeServer();
@@ -138,4 +138,4 @@
 			} )
 		);
 	} );
-}( mediaWiki ) );
+}() );
diff --git a/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.parse.test.js b/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.parse.test.js
index 56732275a2..0bcce12476 100644
--- a/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.parse.test.js
+++ b/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.parse.test.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	QUnit.module( 'mediawiki.api.parse', QUnit.newMwEnvironment( {
 		setup: function () {
 			this.server = this.sandbox.useFakeServer();
@@ -42,4 +42,4 @@
 			assert.strictEqual( html, '<p><b>Earth</b> is a planet.</p>', 'Parse page by Title object' );
 		} );
 	} );
-}( mediaWiki ) );
+}() );
diff --git a/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.test.js b/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.test.js
index 5ae0e94e7a..1387be2f29 100644
--- a/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.test.js
+++ b/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.test.js
@@ -1,4 +1,4 @@
-( function ( mw, $ ) {
+( function () {
 	QUnit.module( 'mediawiki.api', QUnit.newMwEnvironment( {
 		setup: function () {
 			this.server = this.sandbox.useFakeServer();
@@ -453,7 +453,7 @@
 			var self = this,
 				requests = this.requests = [];
 			this.api = new mw.Api();
-			this.sandbox.stub( jQuery, 'ajax', function () {
+			this.sandbox.stub( $, 'ajax', function () {
 				var request = $.extend( {
 					abort: self.sandbox.spy()
 				}, $.Deferred() );
@@ -476,4 +476,4 @@
 			assert.ok( request.abort.calledOnce, 'abort request number ' + i );
 		} );
 	} );
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.upload.test.js b/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.upload.test.js
index 788a427e72..f4d4b287bd 100644
--- a/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.upload.test.js
+++ b/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.upload.test.js
@@ -1,4 +1,4 @@
-( function ( mw, $ ) {
+( function () {
 	QUnit.module( 'mediawiki.api.upload', QUnit.newMwEnvironment( {} ) );
 
 	QUnit.test( 'Basic functionality', function ( assert ) {
@@ -30,4 +30,4 @@
 		assert.strictEqual( $input.val(), 'Testing API upload.jpg', 'input value' );
 	} );
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.watch.test.js b/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.watch.test.js
index 649bf03edd..eff662e840 100644
--- a/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.watch.test.js
+++ b/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.watch.test.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	QUnit.module( 'mediawiki.api.watch', QUnit.newMwEnvironment( {
 		setup: function () {
 			this.server = this.sandbox.useFakeServer();
@@ -57,4 +57,4 @@
 		} );
 	} );
 
-}( mediaWiki ) );
+}() );
diff --git a/tests/qunit/suites/resources/mediawiki.rcfilters/UriProcessor.test.js b/tests/qunit/suites/resources/mediawiki.rcfilters/UriProcessor.test.js
index 79a1b26644..2de4043b67 100644
--- a/tests/qunit/suites/resources/mediawiki.rcfilters/UriProcessor.test.js
+++ b/tests/qunit/suites/resources/mediawiki.rcfilters/UriProcessor.test.js
@@ -1,6 +1,6 @@
 /* eslint-disable camelcase */
 /* eslint no-underscore-dangle: "off" */
-( function ( mw, $ ) {
+( function () {
 	var mockFilterStructure = [ {
 			name: 'group1',
 			title: 'Group 1',
@@ -351,4 +351,4 @@
 		} );
 	} );
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/tests/qunit/suites/resources/mediawiki.rcfilters/dm.FilterItem.test.js b/tests/qunit/suites/resources/mediawiki.rcfilters/dm.FilterItem.test.js
index 03ef38751e..bbbe567ad1 100644
--- a/tests/qunit/suites/resources/mediawiki.rcfilters/dm.FilterItem.test.js
+++ b/tests/qunit/suites/resources/mediawiki.rcfilters/dm.FilterItem.test.js
@@ -1,5 +1,5 @@
 /* eslint-disable camelcase */
-( function ( mw ) {
+( function () {
 	QUnit.module( 'mediawiki.rcfilters - FilterItem' );
 
 	QUnit.test( 'Initializing filter item', function ( assert ) {
@@ -202,4 +202,4 @@
 
 		assert.strictEqual( item.getValue(), '1', 'Value is kept as-is' );
 	} );
-}( mediaWiki ) );
+}() );
diff --git a/tests/qunit/suites/resources/mediawiki.rcfilters/dm.FiltersViewModel.test.js b/tests/qunit/suites/resources/mediawiki.rcfilters/dm.FiltersViewModel.test.js
index 45d591d51e..2c2ce87a9e 100644
--- a/tests/qunit/suites/resources/mediawiki.rcfilters/dm.FiltersViewModel.test.js
+++ b/tests/qunit/suites/resources/mediawiki.rcfilters/dm.FiltersViewModel.test.js
@@ -1,5 +1,5 @@
 /* eslint-disable camelcase */
-( function ( mw, $ ) {
+( function () {
 	var filterDefinition = [ {
 			name: 'group1',
 			type: 'send_unselected_if_any',
@@ -1561,4 +1561,4 @@
 		} );
 		assert.strictEqual( model.areVisibleFiltersEmpty(), false );
 	} );
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/tests/qunit/suites/resources/mediawiki.rcfilters/dm.SavedQueriesModel.test.js b/tests/qunit/suites/resources/mediawiki.rcfilters/dm.SavedQueriesModel.test.js
index 92e5f2e4ac..5850875101 100644
--- a/tests/qunit/suites/resources/mediawiki.rcfilters/dm.SavedQueriesModel.test.js
+++ b/tests/qunit/suites/resources/mediawiki.rcfilters/dm.SavedQueriesModel.test.js
@@ -1,5 +1,5 @@
 /* eslint-disable camelcase */
-( function ( mw ) {
+( function () {
 	var filterDefinition = [ {
 			name: 'group1',
 			type: 'send_unselected_if_any',
@@ -517,4 +517,4 @@
 			'Invert parameter saved if there are namespaces.'
 		);
 	} );
-}( mediaWiki ) );
+}() );
diff --git a/tests/qunit/suites/resources/mediawiki.rcfilters/dm.SavedQueryItemModel.test.js b/tests/qunit/suites/resources/mediawiki.rcfilters/dm.SavedQueryItemModel.test.js
index 5e35c18f6a..59641364c1 100644
--- a/tests/qunit/suites/resources/mediawiki.rcfilters/dm.SavedQueryItemModel.test.js
+++ b/tests/qunit/suites/resources/mediawiki.rcfilters/dm.SavedQueryItemModel.test.js
@@ -1,5 +1,5 @@
 /* eslint-disable camelcase */
-( function ( mw ) {
+( function () {
 	var itemData = {
 		params: {
 			param1: '1',
@@ -91,4 +91,4 @@
 			'Default state represented when item initialized with default:true.'
 		);
 	} );
-}( mediaWiki ) );
+}() );
diff --git a/tests/qunit/suites/resources/mediawiki.special/mediawiki.special.recentchanges.test.js b/tests/qunit/suites/resources/mediawiki.special/mediawiki.special.recentchanges.test.js
index 14c2bb4c86..54fdffccfe 100644
--- a/tests/qunit/suites/resources/mediawiki.special/mediawiki.special.recentchanges.test.js
+++ b/tests/qunit/suites/resources/mediawiki.special/mediawiki.special.recentchanges.test.js
@@ -1,4 +1,4 @@
-( function ( $ ) {
+( function () {
 	QUnit.module( 'mediawiki.special.recentchanges', QUnit.newMwEnvironment() );
 
 	// TODO: verify checkboxes == [ 'nsassociated', 'nsinvert' ]
@@ -61,4 +61,4 @@
 		// DOM cleanup
 		$env.remove();
 	} );
-}( jQuery ) );
+}() );
diff --git a/tests/qunit/suites/resources/mediawiki.widgets/MediaSearch/mediawiki.widgets.APIResultsQueue.test.js b/tests/qunit/suites/resources/mediawiki.widgets/MediaSearch/mediawiki.widgets.APIResultsQueue.test.js
index a343aa55c1..b1a3650cf1 100644
--- a/tests/qunit/suites/resources/mediawiki.widgets/MediaSearch/mediawiki.widgets.APIResultsQueue.test.js
+++ b/tests/qunit/suites/resources/mediawiki.widgets/MediaSearch/mediawiki.widgets.APIResultsQueue.test.js
@@ -6,7 +6,7 @@
 
 QUnit.module( 'mediawiki.widgets.APIResultsQueue' );
 
-( function ( $, mw ) {
+( function () {
 	var itemCounter, FullResourceProvider, EmptyResourceProvider, SingleResultResourceProvider;
 
 	itemCounter = 0;
@@ -194,4 +194,4 @@ QUnit.module( 'mediawiki.widgets.APIResultsQueue' );
 			// Finish the async test
 			.then( done );
 	} );
-}( jQuery, mediaWiki ) );
+}() );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.RegExp.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.RegExp.test.js
index 485bac0877..cde77e72a4 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.RegExp.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.RegExp.test.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	QUnit.module( 'mediawiki.RegExp' );
 
 	QUnit.test( 'escape', function ( assert ) {
@@ -35,4 +35,4 @@
 		assert.strictEqual( mw.RegExp.escape( normal ), normal, 'Alphanumerals are left alone' );
 	} );
 
-}( mediaWiki ) );
+}() );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.String.trimByteLength.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.String.trimByteLength.test.js
index 0898afdd7f..e7e7a8de96 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.String.trimByteLength.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.String.trimByteLength.test.js
@@ -1,4 +1,4 @@
-( function ( $, mw ) {
+( function () {
 	var simpleSample, U_20AC, poop, mbSample,
 		trimByteLength = require( 'mediawiki.String' ).trimByteLength;
 
@@ -147,4 +147,4 @@
 		expected: '\uD800'
 	} );
 
-}( jQuery, mediaWiki ) );
+}() );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js
index 8d67b4b4be..44c1f4be4f 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js
@@ -1,4 +1,4 @@
-( function ( mw, $ ) {
+( function () {
 	/* eslint-disable camelcase */
 	var repeat = function ( input, multiplier ) {
 			return new Array( multiplier + 1 ).join( input );
@@ -735,4 +735,4 @@
 		}
 	} );
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.Uri.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.Uri.test.js
index eece8c0a54..5eb5e05d39 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.Uri.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.Uri.test.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	QUnit.module( 'mediawiki.Uri', QUnit.newMwEnvironment( {
 		setup: function () {
 			this.mwUriOrg = mw.Uri;
@@ -506,4 +506,4 @@
 		href = uri.toString();
 		assert.strictEqual( href, testProtocol + testServer + ':' + testPort + testPath, 'Root-relative URL gets host, protocol, and port supplied' );
 	} );
-}( mediaWiki ) );
+}() );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.base.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.base.test.js
index 65765f2df5..33423d8071 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.base.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.base.test.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	QUnit.module( 'mediawiki.base' );
 
 	QUnit.test( 'mw.hook - basic', function ( assert ) {
@@ -139,4 +139,4 @@
 		} ] );
 	} );
 
-}( mediaWiki ) );
+}() );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.cldr.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.cldr.test.js
index b5824d33b0..32457fa9f0 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.cldr.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.cldr.test.js
@@ -1,4 +1,4 @@
-( function ( mw, $ ) {
+( function () {
 	var pluralTestcases = {
 		/*
 		 * Sample:
@@ -80,4 +80,4 @@
 			pluralTest( langCode, tests );
 		}
 	} );
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.cookie.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.cookie.test.js
index 59bf7376cb..4606cbd3df 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.cookie.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.cookie.test.js
@@ -1,4 +1,4 @@
-( function ( mw, $ ) {
+( function () {
 
 	var NOW = 9012, // miliseconds
 		DEFAULT_DURATION = 5678, // seconds
@@ -176,4 +176,4 @@
 		assert.strictEqual( key, 'barfoo' );
 	} );
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.errorLogger.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.errorLogger.test.js
index 2a4d9912b8..a65051bac8 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.errorLogger.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.errorLogger.test.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	QUnit.module( 'mediawiki.errorLogger', QUnit.newMwEnvironment() );
 
 	QUnit.test( 'installGlobalHandler', function ( assert ) {
@@ -39,4 +39,4 @@
 		assert.strictEqual( w.onerror( errorMessage, errorUrl, errorLine ), true,
 			'Global handler preserves true return from previous handler' );
 	} );
-}( mediaWiki ) );
+}() );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.experiments.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.experiments.test.js
index c2abc08641..ec3dd91ea6 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.experiments.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.experiments.test.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 
 	var getBucket = mw.experiments.getBucket;
 
@@ -60,4 +60,4 @@
 		);
 	} );
 
-}( mediaWiki ) );
+}() );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.html.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.html.test.js
index 91afec3bfb..5bbc78d97e 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.html.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.html.test.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	QUnit.module( 'mediawiki.html' );
 
 	QUnit.test( 'escape', function ( assert ) {
@@ -102,4 +102,4 @@
 		);
 	} );
 
-}( mediaWiki ) );
+}() );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.inspect.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.inspect.test.js
index 3d3eeddd1d..a55c43da04 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.inspect.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.inspect.test.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 
 	QUnit.module( 'mediawiki.inspect' );
 
@@ -71,4 +71,4 @@
 			);
 		} );
 	} );
-}( mediaWiki ) );
+}() );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js
index e4cf4461d5..2491ca3b70 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js
@@ -1,4 +1,4 @@
-( function ( mw, $ ) {
+( function () {
 	/* eslint-disable camelcase */
 	var formatText, formatParse, formatnumTests, specialCharactersPageName, expectedListUsers,
 		expectedListUsersSitename, expectedLinkPagenamee, expectedEntrypoints,
@@ -1221,4 +1221,4 @@
 			'setParserDefaults is deep if requested'
 		);
 	} );
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.jscompat.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.jscompat.test.js
index 54d4285445..207385fc0e 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.jscompat.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.jscompat.test.js
@@ -2,7 +2,7 @@
  * Some misc JavaScript compatibility tests,
  * just to make sure the environments we run in are consistent.
  */
-( function ( $ ) {
+( function () {
 	QUnit.module( 'mediawiki.jscompat', QUnit.newMwEnvironment() );
 
 	QUnit.test( 'Variable with Unicode letter in name', function ( assert ) {
@@ -66,4 +66,4 @@
 			assert.strictEqual( $textarea.val(), expected, 'Expecting ' + n + ' newlines (from DOM set with ' + n + ')' );
 		}
 	} );
-}( jQuery ) );
+}() );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
index d460c0be14..3040b85817 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
@@ -1,4 +1,4 @@
-( function ( mw, $ ) {
+( function () {
 	'use strict';
 
 	var grammarTests, bcp47Tests;
@@ -707,4 +707,4 @@
 			assert.strictEqual( mw.language.bcp47( input ), expected );
 		} );
 	} );
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js
index 3a48e6ed68..347614c4c3 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js
@@ -1,4 +1,4 @@
-( function ( mw, $ ) {
+( function () {
 	QUnit.module( 'mediawiki.loader', QUnit.newMwEnvironment( {
 		setup: function ( assert ) {
 			// Expose for load.mock.php
@@ -1055,4 +1055,4 @@
 		} );
 	} );
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.messagePoster.factory.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.messagePoster.factory.test.js
index 923f97d101..28dfc53051 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.messagePoster.factory.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.messagePoster.factory.test.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	var TEST_MODEL = 'test-content-model';
 
 	QUnit.module( 'mediawiki.messagePoster', QUnit.newMwEnvironment( {
@@ -25,4 +25,4 @@
 			'Throws exception is same model is registered a second time'
 		);
 	} );
-}( mediaWiki ) );
+}() );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.requestIdleCallback.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.requestIdleCallback.test.js
index df02693bff..7b25707bdb 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.requestIdleCallback.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.requestIdleCallback.test.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	QUnit.module( 'mediawiki.requestIdleCallback', QUnit.newMwEnvironment( {
 		setup: function () {
 			var clock = this.clock = this.sandbox.useFakeTimers();
@@ -105,4 +105,4 @@
 		} );
 	}
 
-}( mediaWiki ) );
+}() );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.storage.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.storage.test.js
index 436cb2ed75..fab7e1fef1 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.storage.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.storage.test.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	QUnit.module( 'mediawiki.storage' );
 
 	QUnit.test( 'set/get with storage support', function ( assert ) {
@@ -53,4 +53,4 @@
 		mw.storage.store = old;
 	} );
 
-}( mediaWiki ) );
+}() );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.template.mustache.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.template.mustache.test.js
index ab1d55e409..de8811fcae 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.template.mustache.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.template.mustache.test.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 
 	QUnit.module( 'mediawiki.template.mustache', {
 		beforeEach: function () {
@@ -29,4 +29,4 @@
 		assert.strictEqual( htmlPartial, 'Hello goodbye', 'Render with partial' );
 	} );
 
-}( mediaWiki ) );
+}() );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.template.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.template.test.js
index 31f4782420..534408e4dc 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.template.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.template.test.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 
 	QUnit.module( 'mediawiki.template', {
 		beforeEach: function () {
@@ -60,4 +60,4 @@
 		);
 	} );
 
-}( mediaWiki ) );
+}() );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
index 37b6c8808f..201dc254ab 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	var specialCharactersPageName,
 		// Can't mock SITENAME since jqueryMsg caches it at load
 		siteName = mw.config.get( 'wgSiteName' );
@@ -353,4 +353,4 @@
 
 		assert.strictEqual( mw.msg( 'int-msg' ), 'Some Other Message', 'int is resolved' );
 	} );
-}( mediaWiki ) );
+}() );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.toc.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.toc.test.js
index 6a1b83cf12..b9a64b58bc 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.toc.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.toc.test.js
@@ -1,4 +1,4 @@
-( function ( mw, $ ) {
+( function () {
 	QUnit.module( 'mediawiki.toc', QUnit.newMwEnvironment( {
 		setup: function () {
 			// Prevent live cookies from interferring with the test
@@ -36,4 +36,4 @@
 			return $tocList.promise();
 		} );
 	} );
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.track.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.track.test.js
index 6c27c5bab4..ce0ca57d99 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.track.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.track.test.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	QUnit.module( 'mediawiki.track' );
 
 	QUnit.test( 'track', function ( assert ) {
@@ -57,4 +57,4 @@
 			[ 'unsub', { key: 2 } ]
 		], 'Stop when unsubscribing' );
 	} );
-}( mediaWiki ) );
+}() );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.user.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.user.test.js
index 751155daff..1e3521171b 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.user.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.user.test.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 	QUnit.module( 'mediawiki.user', QUnit.newMwEnvironment( {
 		setup: function () {
 			this.server = this.sandbox.useFakeServer();
@@ -118,4 +118,4 @@
 		assert.strictEqual( result.trim(), result, 'no leading or trailing whitespace' );
 		assert.strictEqual( result2, result, 'retained' );
 	} );
-}( mediaWiki ) );
+}() );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js
index 0a65788682..2bd0901912 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js
@@ -1,4 +1,4 @@
-( function ( mw, $ ) {
+( function () {
 	var util = require( 'mediawiki.util' ),
 		// Based on IPTest.php > testisIPv4
 		IPV4_CASES = [
@@ -283,7 +283,7 @@
 	} );
 
 	QUnit.test( '$content', function ( assert ) {
-		assert.ok( util.$content instanceof jQuery, 'mw.util.$content instance of jQuery' );
+		assert.ok( util.$content instanceof $, 'mw.util.$content instance of jQuery' );
 		assert.strictEqual( util.$content.length, 1, 'mw.util.$content must have length of 1' );
 	} );
 
@@ -424,4 +424,4 @@
 			assert.strictEqual( util.isIPv6Address( ipCase[ 1 ] ), ipCase[ 0 ], ipCase[ 2 ] );
 		} );
 	} );
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.viewport.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.viewport.test.js
index 986416622c..2c639b79a3 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.viewport.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.viewport.test.js
@@ -1,4 +1,4 @@
-( function ( mw, $ ) {
+( function () {
 
 	// Simulate square element with 20px long edges placed at (20, 20) on the page
 	var
@@ -109,4 +109,4 @@
 			'It should default to a threshold of 50px and the window\'s viewport' );
 	} );
 
-}( mediaWiki, jQuery ) );
+}() );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.visibleTimeout.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.visibleTimeout.test.js
index 7f8819dec9..2bda47b1e8 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.visibleTimeout.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.visibleTimeout.test.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 
 	QUnit.module( 'mediawiki.visibleTimeout', QUnit.newMwEnvironment( {
 		setup: function () {
@@ -112,4 +112,4 @@
 		this.sandbox.clock.tick( 50 );
 		assert.strictEqual( called, 1 );
 	} );
-}( mediaWiki ) );
+}() );
-- 
2.20.1