Merge "Move ext.echo.logger module registration to extension.json"

extension.json

@@ -53,6 +53,18 @@
 		"EchoAliases": "Echo.alias.php"
 	},
 	"ResourceModules": {
+		"ext.echo.logger": {
+			"scripts": [
+				"logger/mw.echo.Logger.js"
+			],
+			"dependencies": [
+				"oojs"
+			],
+			"targets": [
+				"desktop",
+				"mobile"
+			]
+		},
 		"ext.echo.ui.desktop": {
 			"scripts": [
 				"ui/mw.echo.ui.BadgeLinkWidget.js",

includes/EchoHooks.php

@@ -143,22 +143,6 @@ class EchoHooks {
 	 * @param ResourceLoader &$resourceLoader
 	 */
 	public static function onResourceLoaderRegisterModules( ResourceLoader &$resourceLoader ) {
-		// ext.echo.logger is used by mobile notifications as well, so be sure not to add any
-		// dependencies that do not target mobile.
-		$definition = [
-			'scripts' => [
-				'logger/mw.echo.Logger.js',
-			],
-			'dependencies' => [
-				'oojs'
-			],
-			'localBasePath' => dirname( __DIR__ ) . '/modules',
-			'remoteExtPath' => 'Echo/modules',
-			'targets' => [ 'desktop', 'mobile' ],
-		];
-
-		$resourceLoader->register( 'ext.echo.logger', $definition );
-
 		global $wgExtensionDirectory, $wgEchoNotificationIcons, $wgEchoSecondaryIcons;
 		$resourceLoader->register( 'ext.echo.emailicons', [
 			'class' => 'ResourceLoaderEchoImageModule',