Skip to content

Commit 7720156

Browse files
authored
chore(eslint): Replace eslint-plugin-import with eslint-plugin-import-x (#41401)
1 parent bfacbd3 commit 7720156

55 files changed

Lines changed: 352 additions & 255 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

apps/meteor/.scripts/run-ha.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ async function runMain(config: IConfig): Promise<void> {
5656

5757
async function runInstance(config: IConfig): Promise<void> {
5858
// Desctructuring the unused variables allows us to omit them in the `mainConfig`
59-
// eslint-disable-next-line @typescript-eslint/no-unused-vars
59+
6060
const { customEnv, parentEnv, ...mainConfig } = config;
6161

6262
const env = {

apps/meteor/.scripts/version.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const path = require('path');
33
let pkgJson = {};
44

55
try {
6-
// eslint-disable-next-line import/no-dynamic-require
6+
// eslint-disable-next-line import-x/no-dynamic-require
77
pkgJson = require(path.resolve(process.cwd(), './package.json'));
88
} catch (err) {
99
console.error('no root package.json found');

apps/meteor/app/utils/client/getURL.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { getURLWithoutSettings } from '../lib/getURL';
33
import { Info } from '../rocketchat.info';
44

55
export const getURL = function (
6-
path: string, // eslint-disable-next-line @typescript-eslint/naming-convention
6+
path: string,
77
params: {
88
cdn?: boolean;
99
full?: boolean;

apps/meteor/app/utils/lib/getURL.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ function getCloudUrl(
3737

3838
export const _getURL = (
3939
path: string,
40-
// eslint-disable-next-line @typescript-eslint/naming-convention
40+
4141
{ cdn, full, cloud, cloud_route, cloud_params, _cdn_prefix, _root_url_path_prefix, _site_url }: Record<string, any>,
4242
deeplinkUrl?: string,
4343
): string => {
@@ -76,7 +76,7 @@ export const _getURL = (
7676

7777
export const getURLWithoutSettings = (
7878
path: string,
79-
// eslint-disable-next-line @typescript-eslint/naming-convention
79+
8080
{
8181
cdn = true,
8282
full = false,

apps/meteor/client/components/GenericUpsellModal/GenericUpsellModal.spec.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint-disable @typescript-eslint/naming-convention */
21
import { mockAppRoot } from '@rocket.chat/mock-providers';
32
import { composeStories } from '@storybook/react';
43
import { render, screen } from '@testing-library/react';

apps/meteor/client/definitions/global.d.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import type { IRocketChatDesktop } from '@rocket.chat/desktop-api';
22

33
declare global {
4-
// eslint-disable-next-line @typescript-eslint/naming-convention
54
interface Window {
65
RocketChatDesktop?: IRocketChatDesktop;
76

@@ -70,7 +69,6 @@ declare global {
7069
addStream(stream: MediaStream): void;
7170
}
7271

73-
// eslint-disable-next-line @typescript-eslint/naming-convention
7472
interface MediaTrackConstraints {
7573
/** @deprecated */
7674
mozMediaSource?: string;

apps/meteor/client/meteor/login/facebook.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import type { FacebookOAuthConfiguration } from '@rocket.chat/core-typings';
22
import { Random } from '@rocket.chat/random';
3-
// eslint-disable-next-line import/no-duplicates
3+
// eslint-disable-next-line import-x/no-duplicates
44
import { Facebook } from 'meteor/facebook-oauth';
55
import { Meteor } from 'meteor/meteor';
6-
// eslint-disable-next-line import/no-duplicates
6+
// eslint-disable-next-line import-x/no-duplicates
77
import { OAuth } from 'meteor/oauth';
88

99
import { createOAuthTotpLoginMethod } from './oauth';

apps/meteor/client/meteor/login/google.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { Random } from '@rocket.chat/random';
22
import { Accounts } from 'meteor/accounts-base';
3-
// eslint-disable-next-line import/no-duplicates
3+
// eslint-disable-next-line import-x/no-duplicates
44
import { Google } from 'meteor/google-oauth';
55
import { Meteor } from 'meteor/meteor';
6-
// eslint-disable-next-line import/no-duplicates
6+
// eslint-disable-next-line import-x/no-duplicates
77
import { OAuth } from 'meteor/oauth';
88

99
import { createOAuthTotpLoginMethod } from './oauth';

apps/meteor/client/meteor/login/meteorDeveloperAccount.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Meteor } from 'meteor/meteor';
2-
// eslint-disable-next-line import/no-duplicates
2+
// eslint-disable-next-line import-x/no-duplicates
33
import { MeteorDeveloperAccounts } from 'meteor/meteor-developer-oauth';
4-
// eslint-disable-next-line import/no-duplicates
4+
// eslint-disable-next-line import-x/no-duplicates
55
import { OAuth } from 'meteor/oauth';
66
import { Random } from 'meteor/random';
77

apps/meteor/client/meteor/login/twitter.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import type { TwitterOAuthConfiguration } from '@rocket.chat/core-typings';
22
import { Random } from '@rocket.chat/random';
33
import { Meteor } from 'meteor/meteor';
4-
// eslint-disable-next-line import/no-duplicates
4+
// eslint-disable-next-line import-x/no-duplicates
55
import { OAuth } from 'meteor/oauth';
6-
// eslint-disable-next-line import/no-duplicates
6+
// eslint-disable-next-line import-x/no-duplicates
77
import { Twitter } from 'meteor/twitter-oauth';
88

99
import { createOAuthTotpLoginMethod } from './oauth';

0 commit comments

Comments
 (0)