Merge pull request #1 from RocketChat/develop

Chore: Upgrade ESLint (RocketChat#26132)
TimiBolu · Jul 22, 2022 · 0c13bdc · 0c13bdc
2 parents 65c4906 + bff5d48
commit 0c13bdc
Show file tree

Hide file tree

Showing 172 changed files with 1,806 additions and 1,768 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,11 +1,11 @@
 {
 	"eslint.workingDirectories": [
 		{
-			"directory": "packages/*",
+			"pattern": "packages/*",
 			"changeProcessCWD": true
 		},
 		{
-			"directory": "apps/meteor",
+			"pattern": "apps/*",
 			"changeProcessCWD": true
 		}
 	],

diff --git a/_templates/package/new/.eslintrc.json.ejs.t b/_templates/package/new/.eslintrc.json.ejs.t
@@ -0,0 +1,7 @@
+---
+to: packages/<%= name %>/.eslintrc.json
+---
+{
+	"extends": ["@rocket.chat/eslint-config"],
+	"ignorePatterns": ["**/dist"]
+}
diff --git a/_templates/package/new/package.json.ejs.t b/_templates/package/new/package.json.ejs.t
@@ -24,15 +24,5 @@ to: packages/<%= name %>/package.json
 	"typings": "./dist/index.d.ts",
 	"files": [
 		"/dist"
-	],
-	"dependencies": {
-	},
-	"eslintConfig": {
-		"extends": [
-			"@rocket.chat/eslint-config"
-		],
-		"ignorePatterns": [
-			"**/dist"
-		]
-	}
+	]
 }
diff --git a/apps/meteor/.eslintrc → apps/meteor/.eslintrc.json b/apps/meteor/.eslintrc → apps/meteor/.eslintrc.json
diff --git a/apps/meteor/.storybook/.eslintrc.js b/apps/meteor/.storybook/.eslintrc.js
diff --git a/apps/meteor/.storybook/.eslintrc.json b/apps/meteor/.storybook/.eslintrc.json
@@ -0,0 +1,3 @@
+{
+	"extends": "../client/.eslintrc.json"
+}
diff --git a/apps/meteor/app/api/server/v1/e2e.ts b/apps/meteor/app/api/server/v1/e2e.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/camelcase */
 import { Meteor } from 'meteor/meteor';
 import {
 	ise2eGetUsersOfRoomWithoutKeyParamsGET,
@@ -134,6 +133,7 @@ API.v1.addRoute(
 	},
 	{
 		post() {
+			// eslint-disable-next-line @typescript-eslint/naming-convention
 			const { public_key, private_key } = Meteor.call('e2e.fetchMyKeys');
 
 			Meteor.call('e2e.setUserPublicAndPrivateKeys', {

diff --git a/apps/meteor/app/api/server/v1/misc.ts b/apps/meteor/app/api/server/v1/misc.ts
@@ -433,7 +433,7 @@ API.v1.addRoute(
 );
 
 declare module '@rocket.chat/rest-typings' {
-	// eslint-disable-next-line @typescript-eslint/interface-name-prefix
+	// eslint-disable-next-line @typescript-eslint/naming-convention
 	interface Endpoints {
 		'method.call/:method': {
 			POST: (params: { method: string; args: any[] }) => any;

diff --git a/apps/meteor/app/apps/server/bridges/rooms.ts b/apps/meteor/app/apps/server/bridges/rooms.ts
@@ -159,7 +159,7 @@ export class AppRoomBridge extends RoomBridge {
 
 		const discussion = {
 			prid: rcRoom.prid,
-			t_name: rcRoom.fname, // eslint-disable-line @typescript-eslint/camelcase
+			t_name: rcRoom.fname,
 			pmid: rcMessage ? rcMessage._id : undefined,
 			reply: reply && reply.trim() !== '' ? reply : undefined,
 			users: members.length > 0 ? members : [],

diff --git a/apps/meteor/app/assets/server/assets.ts b/apps/meteor/app/assets/server/assets.ts
@@ -40,7 +40,6 @@ const assets: IRocketChatAssets = {
 			extensions: ['svg', 'png', 'jpg', 'jpeg'],
 		},
 	},
-	// eslint-disable-next-line @typescript-eslint/camelcase
 	favicon_ico: {
 		label: 'favicon (ico)',
 		defaultUrl: 'favicon.ico',
@@ -57,7 +56,6 @@ const assets: IRocketChatAssets = {
 			extensions: ['svg'],
 		},
 	},
-	// eslint-disable-next-line @typescript-eslint/camelcase
 	favicon_16: {
 		label: 'favicon 16x16 (png)',
 		defaultUrl: 'images/logo/favicon-16x16.png',
@@ -68,7 +66,6 @@ const assets: IRocketChatAssets = {
 			height: 16,
 		},
 	},
-	// eslint-disable-next-line @typescript-eslint/camelcase
 	favicon_32: {
 		label: 'favicon 32x32 (png)',
 		defaultUrl: 'images/logo/favicon-32x32.png',
@@ -79,7 +76,6 @@ const assets: IRocketChatAssets = {
 			height: 32,
 		},
 	},
-	// eslint-disable-next-line @typescript-eslint/camelcase
 	favicon_192: {
 		label: 'android-chrome 192x192 (png)',
 		defaultUrl: 'images/logo/android-chrome-192x192.png',
@@ -90,7 +86,6 @@ const assets: IRocketChatAssets = {
 			height: 192,
 		},
 	},
-	// eslint-disable-next-line @typescript-eslint/camelcase
 	favicon_512: {
 		label: 'android-chrome 512x512 (png)',
 		defaultUrl: 'images/logo/android-chrome-512x512.png',
@@ -101,7 +96,6 @@ const assets: IRocketChatAssets = {
 			height: 512,
 		},
 	},
-	// eslint-disable-next-line @typescript-eslint/camelcase
 	touchicon_180: {
 		label: 'apple-touch-icon 180x180 (png)',
 		defaultUrl: 'images/logo/apple-touch-icon.png',
@@ -112,7 +106,6 @@ const assets: IRocketChatAssets = {
 			height: 180,
 		},
 	},
-	// eslint-disable-next-line @typescript-eslint/camelcase
 	touchicon_180_pre: {
 		label: 'apple-touch-icon-precomposed 180x180 (png)',
 		defaultUrl: 'images/logo/apple-touch-icon-precomposed.png',
@@ -123,7 +116,6 @@ const assets: IRocketChatAssets = {
 			height: 180,
 		},
 	},
-	// eslint-disable-next-line @typescript-eslint/camelcase
 	tile_70: {
 		label: 'mstile 70x70 (png)',
 		defaultUrl: 'images/logo/mstile-70x70.png',
@@ -134,7 +126,6 @@ const assets: IRocketChatAssets = {
 			height: 70,
 		},
 	},
-	// eslint-disable-next-line @typescript-eslint/camelcase
 	tile_144: {
 		label: 'mstile 144x144 (png)',
 		defaultUrl: 'images/logo/mstile-144x144.png',
@@ -145,7 +136,6 @@ const assets: IRocketChatAssets = {
 			height: 144,
 		},
 	},
-	// eslint-disable-next-line @typescript-eslint/camelcase
 	tile_150: {
 		label: 'mstile 150x150 (png)',
 		defaultUrl: 'images/logo/mstile-150x150.png',
@@ -156,7 +146,6 @@ const assets: IRocketChatAssets = {
 			height: 150,
 		},
 	},
-	// eslint-disable-next-line @typescript-eslint/camelcase
 	tile_310_square: {
 		label: 'mstile 310x310 (png)',
 		defaultUrl: 'images/logo/mstile-310x310.png',
@@ -167,7 +156,6 @@ const assets: IRocketChatAssets = {
 			height: 310,
 		},
 	},
-	// eslint-disable-next-line @typescript-eslint/camelcase
 	tile_310_wide: {
 		label: 'mstile 310x150 (png)',
 		defaultUrl: 'images/logo/mstile-310x150.png',
@@ -178,7 +166,6 @@ const assets: IRocketChatAssets = {
 			height: 150,
 		},
 	},
-	// eslint-disable-next-line @typescript-eslint/camelcase
 	safari_pinned: {
 		label: 'safari pinned tab (svg)',
 		defaultUrl: 'images/logo/safari-pinned-tab.svg',

diff --git a/apps/meteor/app/autotranslate/server/deeplTranslate.ts b/apps/meteor/app/autotranslate/server/deeplTranslate.ts
@@ -209,9 +209,7 @@ class DeeplAutoTranslate extends AutoTranslate {
 			try {
 				const result = HTTP.get(this.apiEndPointUrl, {
 					params: {
-						// eslint-disable-next-line @typescript-eslint/camelcase
 						auth_key: this.apiKey,
-						// eslint-disable-next-line @typescript-eslint/camelcase
 						target_lang: language,
 					},
 					query,
@@ -258,9 +256,7 @@ class DeeplAutoTranslate extends AutoTranslate {
 			try {
 				const result = HTTP.get(this.apiEndPointUrl, {
 					params: {
-						// eslint-disable-next-line @typescript-eslint/camelcase
 						auth_key: this.apiKey,
-						// eslint-disable-next-line @typescript-eslint/camelcase
 						target_lang: language,
 					},
 					query,

diff --git a/apps/meteor/app/federation-v2/server/infrastructure/matrix/Bridge.ts b/apps/meteor/app/federation-v2/server/infrastructure/matrix/Bridge.ts
@@ -107,12 +107,9 @@ export class MatrixBridge implements IFederationBridge {
 			options: {
 				visibility,
 				preset,
-				// eslint-disable-next-line @typescript-eslint/camelcase
 				is_direct: true,
 				invite: externalInviteeIds,
-				// eslint-disable-next-line @typescript-eslint/camelcase
 				creation_content: {
-					// eslint-disable-next-line @typescript-eslint/camelcase
 					was_internally_programatically_created: true,
 				},
 			},

diff --git a/apps/meteor/app/federation-v2/server/infrastructure/rocket-chat/adapters/Settings.ts b/apps/meteor/app/federation-v2/server/infrastructure/rocket-chat/adapters/Settings.ts
@@ -74,7 +74,6 @@ export class RocketChatSettingsAdapter {
 	}
 
 	public generateRegistrationFileObject(): Record<string, any> {
-		/* eslint-disable @typescript-eslint/camelcase */
 		return {
 			id: this.getApplicationServiceId(),
 			hs_token: this.getApplicationHomeServerToken(),
@@ -102,7 +101,6 @@ export class RocketChatSettingsAdapter {
 				],
 			},
 		};
-		/* eslint-enable @typescript-eslint/camelcase */
 	}
 
 	private async updateRegistrationFile(): Promise<void> {

diff --git a/apps/meteor/app/file-upload/server/methods/sendFileMessage.ts b/apps/meteor/app/file-upload/server/methods/sendFileMessage.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/camelcase */
 import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
 import _ from 'underscore';

diff --git a/apps/meteor/app/lib/lib/MessageTypes.ts b/apps/meteor/app/lib/lib/MessageTypes.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/camelcase */
 import { Meteor } from 'meteor/meteor';
 
 import { MessageTypes } from '../../ui-utils/lib/MessageTypes';

diff --git a/apps/meteor/app/lib/server/functions/attachMessage.ts b/apps/meteor/app/lib/server/functions/attachMessage.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/camelcase */
 import type { IMessage, IRoom } from '@rocket.chat/core-typings';
 import { MessageAttachment } from '@rocket.chat/core-typings';
 

diff --git a/apps/meteor/app/lib/server/methods/restartServer.ts b/apps/meteor/app/lib/server/methods/restartServer.ts
@@ -3,7 +3,6 @@ import { Meteor } from 'meteor/meteor';
 import { hasPermission } from '../../../authorization/server';
 
 Meteor.methods({
-	// eslint-disable-next-line @typescript-eslint/camelcase
 	restart_server() {
 		const uid = Meteor.userId();
 

diff --git a/apps/meteor/app/lib/server/startup/settings.ts b/apps/meteor/app/lib/server/startup/settings.ts
@@ -843,7 +843,6 @@ settingsRegistry.addGroup('General', function () {
 		],
 	});
 
-	// eslint-disable-next-line @typescript-eslint/camelcase
 	this.add(
 		'Site_Url',
 		typeof (global as any).__meteor_runtime_config__ !== 'undefined' && (global as any).__meteor_runtime_config__ !== null

diff --git a/apps/meteor/app/mailer/server/api.ts b/apps/meteor/app/mailer/server/api.ts
@@ -36,11 +36,8 @@ export const replace = (str: string, data: { [key: string]: unknown } = {}): str
 	}
 
 	const options = {
-		// eslint-disable-next-line @typescript-eslint/camelcase
 		Site_Name: settings.get<string>('Site_Name'),
-		// eslint-disable-next-line @typescript-eslint/camelcase
 		Site_URL: settings.get<string>('Site_Url'),
-		// eslint-disable-next-line @typescript-eslint/camelcase
 		Site_URL_Slash: settings.get<string>('Site_Url')?.replace(/\/?$/, '/'),
 		...(data.name
 			? {
@@ -61,9 +58,7 @@ export const replaceEscaped = (str: string, data: { [key: string]: unknown } = {
 	const siteUrl = settings.get<string>('Site_Url');
 
 	return replace(str, {
-		// eslint-disable-next-line @typescript-eslint/camelcase
 		Site_Name: siteName ? escapeHTML(siteName) : undefined,
-		// eslint-disable-next-line @typescript-eslint/camelcase
 		Site_Url: siteUrl ? escapeHTML(siteUrl) : undefined,
 		...Object.entries(data).reduce<{ [key: string]: string }>((ret, [key, value]) => {
 			if (value !== undefined && value !== null) {

diff --git a/apps/meteor/app/metrics/server/lib/collectMetrics.ts b/apps/meteor/app/metrics/server/lib/collectMetrics.ts
@@ -23,9 +23,7 @@ const setPrometheusData = async (): Promise<void> => {
 	metrics.info.set(
 		{
 			version: Info.version,
-			// eslint-disable-next-line @typescript-eslint/camelcase
 			unique_id: settings.get<string>('uniqueID'),
-			// eslint-disable-next-line @typescript-eslint/camelcase
 			site_url: settings.get<string>('Site_Url'),
 		},
 		1,

diff --git a/apps/meteor/app/notifications/server/lib/Presence.ts b/apps/meteor/app/notifications/server/lib/Presence.ts
@@ -69,6 +69,7 @@ export class UserPresence {
 }
 
 export class StreamPresence {
+	// eslint-disable-next-line @typescript-eslint/naming-convention
 	static getInstance(Streamer: IStreamerConstructor, name = 'user-presence'): IStreamer {
 		return new (class StreamPresence extends Streamer {
 			async _publish(

diff --git a/apps/meteor/app/oauth2-server-config/server/oauth/oauth2-server.ts b/apps/meteor/app/oauth2-server-config/server/oauth/oauth2-server.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/camelcase */
 import { Meteor } from 'meteor/meteor';
 import { Mongo } from 'meteor/mongo';
 import { WebApp } from 'meteor/webapp';

diff --git a/apps/meteor/app/oembed/server/jumpToMessage.ts b/apps/meteor/app/oembed/server/jumpToMessage.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/camelcase */
 import URL from 'url';
 import QueryString from 'querystring';
 

diff --git a/apps/meteor/app/oembed/server/server.ts b/apps/meteor/app/oembed/server/server.ts
@@ -162,7 +162,6 @@ const getUrlMeta = async function (
 	const urlObj = URL.parse(url);
 	if (withFragment != null) {
 		const queryStringObj = querystring.parse(urlObj.query || '');
-		// eslint-disable-next-line @typescript-eslint/camelcase
 		queryStringObj._escaped_fragment_ = '';
 		urlObj.query = querystring.stringify(queryStringObj);
 		let path = urlObj.pathname;

diff --git a/apps/meteor/app/push-notifications/server/lib/PushNotification.ts b/apps/meteor/app/push-notifications/server/lib/PushNotification.ts
@@ -110,7 +110,6 @@ export class PushNotification {
 			idOnly,
 		});
 
-		// eslint-disable-next-line @typescript-eslint/camelcase
 		metrics.notificationsSent.inc({ notification_type: 'mobile' });
 		Push.send(config);
 	}

diff --git a/apps/meteor/app/settings/lib/settings.ts b/apps/meteor/app/settings/lib/settings.ts
@@ -16,9 +16,10 @@ export class SettingsBase {
 	private regexCallbacks = new Map<string, ISettingRegexCallbacks>();
 
 	// private ts = new Date()
-	public get<T extends SettingValue = SettingValue>(_id: RegExp, callback: SettingCallback): void;
 
-	public get<T extends SettingValue = SettingValue>(_id: string, callback: SettingCallback): void;
+	public get(_id: RegExp, callback: SettingCallback): void;
+
+	public get(_id: string, callback: SettingCallback): void;
 
 	public get<T extends SettingValue = SettingValue>(_id: RegExp): SettingComposedValue<T>[];
 

diff --git a/apps/meteor/app/settings/server/startup.ts b/apps/meteor/app/settings/server/startup.ts
@@ -3,6 +3,7 @@ import type { ISetting } from '@rocket.chat/core-typings';
 import { Settings } from '../../models/server/models/Settings';
 import { ICachedSettings } from './CachedSettings';
 
+// eslint-disable-next-line @typescript-eslint/naming-convention
 export function initializeSettings({ SettingsModel, settings }: { SettingsModel: Settings; settings: ICachedSettings }): void {
 	SettingsModel.find().forEach((record: ISetting) => {
 		settings.set(record);

diff --git a/apps/meteor/app/ui/client/lib/fileUpload.ts b/apps/meteor/app/ui/client/lib/fileUpload.ts
@@ -19,7 +19,6 @@ type Uploading = {
 };
 
 declare module 'meteor/session' {
-	// eslint-disable-next-line @typescript-eslint/interface-name-prefix
 	// eslint-disable-next-line @typescript-eslint/no-namespace
 	namespace Session {
 		function get(key: 'uploading'): Uploading[];
-Original file line number
+Diff line change
@@ Expand Up / @@ -110,7 +110,6 @@ export class PushNotification { @@
     			idOnly,
     		});
-    		// eslint-disable-next-line @typescript-eslint/camelcase
     		metrics.notificationsSent.inc({ notification_type: 'mobile' });
     		Push.send(config);
     	}
@@ Expand Down @@