[pull] develop from RocketChat:develop

apps/meteor/app/emoji/client/index.ts

@@ -1,3 +1,3 @@
 export * from './helpers';
-export * from './types';
+export type * from './types';
 export { emoji, emojiEmitter } from './lib';

apps/meteor/app/lib/server/methods/joinRoom.ts

@@ -1,5 +1,5 @@
 import { Room } from '@rocket.chat/core-services';
-import { type IRoom } from '@rocket.chat/core-typings';
+import type { IRoom } from '@rocket.chat/core-typings';
 import type { ServerMethods } from '@rocket.chat/ddp-client';
 import { Rooms } from '@rocket.chat/models';
 import { check } from 'meteor/check';

apps/meteor/app/livechat/server/hooks/afterUserActions.ts

@@ -1,4 +1,4 @@
-import { type IUser } from '@rocket.chat/core-typings';
+import type { IUser } from '@rocket.chat/core-typings';
 import { Users } from '@rocket.chat/models';
 
 import { callbacks } from '../../../../server/lib/callbacks';

apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/OmnichannelAppSourceRoomIcon.tsx

@@ -1,4 +1,4 @@
-import { type IOmnichannelSourceFromApp } from '@rocket.chat/core-typings';
+import type { IOmnichannelSourceFromApp } from '@rocket.chat/core-typings';
 import { Icon, Box } from '@rocket.chat/fuselage';
 import type { ComponentProps } from 'react';
 

apps/meteor/client/components/message/variants/RoomMessage.tsx

@@ -1,4 +1,4 @@
-import { type IMessage } from '@rocket.chat/core-typings';
+import type { IMessage } from '@rocket.chat/core-typings';
 import { Message, MessageLeftContainer, MessageContainer, CheckBox } from '@rocket.chat/fuselage';
 import { useToggle } from '@rocket.chat/fuselage-hooks';
 import { MessageAvatar } from '@rocket.chat/ui-avatar';

apps/meteor/client/components/message/variants/ThreadMessagePreview.tsx

@@ -1,4 +1,4 @@
-import { type IThreadMessage } from '@rocket.chat/core-typings';
+import type { IThreadMessage } from '@rocket.chat/core-typings';
 import {
 	Skeleton,
 	ThreadMessage,

apps/meteor/client/hooks/useAppActionButtons.ts

@@ -1,4 +1,4 @@
-import { type IUIActionButton, type UIActionButtonContext } from '@rocket.chat/apps-engine/definition/ui';
+import type { IUIActionButton, UIActionButtonContext } from '@rocket.chat/apps-engine/definition/ui';
 import { useDebouncedCallback } from '@rocket.chat/fuselage-hooks';
 import { useConnectionStatus, useEndpoint, useStream, useUserId } from '@rocket.chat/ui-contexts';
 import { useQuery, useQueryClient } from '@tanstack/react-query';

apps/meteor/client/lib/createRouteGroup.tsx

@@ -1,5 +1,5 @@
 import type { IRouterPaths, RouteName, RouterPathPattern } from '@rocket.chat/ui-contexts';
-import { type ElementType, type ReactNode } from 'react';
+import type { ElementType, ReactNode } from 'react';
 
 import { appLayout } from './appLayout';
 import { router } from '../providers/RouterProvider';

apps/meteor/client/uikit/hooks/useBannerContextValue.ts

@@ -1,6 +1,6 @@
 import type { UiKitContext } from '@rocket.chat/fuselage-ui-kit';
 import type * as UiKit from '@rocket.chat/ui-kit';
-import { type ContextType } from 'react';
+import type { ContextType } from 'react';
 
 import { useUiKitActionManager } from './useUiKitActionManager';
 

apps/meteor/client/views/audit/SecurityLogsPage.tsx

@@ -1,5 +1,5 @@
 import { Page, PageHeader, PageContent } from '@rocket.chat/ui-client';
-import { type ReactElement } from 'react';
+import type { ReactElement } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import SecurityLogsTable from './components/SecurityLogsTable';

apps/meteor/client/views/navigation/sidepanel/SidepanelItem/SidePanelParent.tsx

@@ -1,4 +1,4 @@
-import { type SubscriptionWithRoom } from '@rocket.chat/ui-contexts';
+import type { SubscriptionWithRoom } from '@rocket.chat/ui-contexts';
 import { memo } from 'react';
 
 import SidePanelParentRoom from './SidePanelParentRoom';

apps/meteor/client/views/omnichannel/components/outboundMessage/components/TemplatePlaceholderSelector/TemplatePlaceholderInput.spec.tsx

@@ -4,8 +4,7 @@ import userEvent from '@testing-library/user-event';
 import type { ComponentProps } from 'react';
 
 import TemplatePlaceholderInput from './TemplatePlaceholderInput';
-// eslint-disable-next-line @typescript-eslint/consistent-type-imports
-import TemplatePlaceholderSelector from './TemplatePlaceholderSelector';
+import type TemplatePlaceholderSelector from './TemplatePlaceholderSelector';
 
 const appRoot = mockAppRoot().build();
 

apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/useUpdateChartData.ts

@@ -1,7 +1,7 @@
 import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
 import type * as chartjs from 'chart.js';
 import type { TFunction } from 'i18next';
-import { type MutableRefObject } from 'react';
+import type { MutableRefObject } from 'react';
 
 import { updateChart } from '../../../../../app/livechat/client/lib/chartHandler';
 

apps/meteor/client/views/omnichannel/triggers/EditTrigger.tsx

@@ -1,4 +1,4 @@
-import { type ILivechatTrigger, type ILivechatTriggerAction, type Serialized } from '@rocket.chat/core-typings';
+import type { ILivechatTrigger, ILivechatTriggerAction, Serialized } from '@rocket.chat/core-typings';
 import { FieldGroup, Button, ButtonGroup, Field, FieldLabel, FieldRow, FieldError, TextInput, ToggleSwitch } from '@rocket.chat/fuselage';
 import {
 	ContextualbarScrollableContent,

apps/meteor/client/views/omnichannel/triggers/actions/ActionForm.tsx

@@ -18,7 +18,7 @@ import { Controller, useWatch } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 
 import { useHasLicenseModule } from '../../../../hooks/useHasLicenseModule';
-import { type TriggersPayload } from '../EditTrigger';
+import type { TriggersPayload } from '../EditTrigger';
 import { getActionFormFields } from '../utils';
 
 type SendMessageFormType = ComponentProps<typeof Field> & {

apps/meteor/client/views/root/MainLayout/LayoutWithSidebar.spec.tsx

@@ -1,7 +1,7 @@
 import { mockAppRoot } from '@rocket.chat/mock-providers';
 import { useCurrentRoutePath, useRouter } from '@rocket.chat/ui-contexts';
 import { render } from '@testing-library/react';
-import React from 'react';
+import type { ReactNode } from 'react';
 
 import LayoutWithSidebar from './LayoutWithSidebar';
 
@@ -17,13 +17,13 @@ jest.mock('../../navigation', () => () => <div>NavigationRegion</div>);
 jest.mock('./AccessibilityShortcut', () => () => <div>AccessibilityShortcut</div>);
 jest.mock('../../navigation/providers/RoomsNavigationProvider', () => ({
 	__esModule: true,
-	default: ({ children }: { children: React.ReactNode }) => <>{children}</>,
+	default: ({ children }: { children: ReactNode }) => <>{children}</>,
 }));
 
 jest.mock('@rocket.chat/ui-client', () => ({
-	FeaturePreview: ({ children }: { children: React.ReactNode }) => <>{children}</>,
-	FeaturePreviewOn: ({ children }: { children: React.ReactNode }) => <>{children}</>,
-	FeaturePreviewOff: ({ children }: { children: React.ReactNode }) => <>{children}</>,
+	FeaturePreview: ({ children }: { children: ReactNode }) => <>{children}</>,
+	FeaturePreviewOn: ({ children }: { children: ReactNode }) => <>{children}</>,
+	FeaturePreviewOff: ({ children }: { children: ReactNode }) => <>{children}</>,
 }));
 
 const mockedUseCurrentRoutePath = useCurrentRoutePath as jest.MockedFunction<typeof useCurrentRoutePath>;

apps/meteor/client/views/root/MainLayout/LoggedInArea.tsx

@@ -1,5 +1,5 @@
 import { useUser } from '@rocket.chat/ui-contexts';
-import { type ReactNode } from 'react';
+import type { ReactNode } from 'react';
 
 import { useCustomEmoji } from '../hooks/loggedIn/useCustomEmoji';
 import { useE2EEncryption } from '../hooks/loggedIn/useE2EEncryption';

apps/meteor/definition/externals/global.d.ts

@@ -1,5 +1,4 @@
-// eslint-disable-next-line @typescript-eslint/consistent-type-imports
-import { Server } from 'net';
+import type { Server } from 'net';
 
 declare global {
 	interface Navigator {

apps/meteor/ee/app/license/server/license.internalService.ts

@@ -1,6 +1,6 @@
 import type { ILicense } from '@rocket.chat/core-services';
 import { api, ServiceClassInternal } from '@rocket.chat/core-services';
-import { type LicenseModule } from '@rocket.chat/core-typings';
+import type { LicenseModule } from '@rocket.chat/core-typings';
 import { License } from '@rocket.chat/license';
 
 import { guestPermissions } from '../../authorization/lib/guestPermissions';

apps/meteor/ee/app/license/server/methods.ts

@@ -1,4 +1,4 @@
-import { type ILicenseTag, type LicenseModule } from '@rocket.chat/core-typings';
+import type { ILicenseTag, LicenseModule } from '@rocket.chat/core-typings';
 import type { ServerMethods } from '@rocket.chat/ddp-client';
 import { License } from '@rocket.chat/license';
 import { check } from 'meteor/check';

apps/meteor/ee/server/sdk/types/index.ts

@@ -1,2 +1,2 @@
-export * from './ILDAPEEService';
-export * from './IMessageReadsService';
+export type * from './ILDAPEEService';
+export type * from './IMessageReadsService';

apps/meteor/server/lib/ldap/UserConverter.ts

@@ -5,7 +5,7 @@ import { Users } from '@rocket.chat/models';
 
 import { logger } from './Logger';
 import type { ConverterCache } from '../../../app/importer/server/classes/converters/ConverterCache';
-import { type RecordConverterOptions } from '../../../app/importer/server/classes/converters/RecordConverter';
+import type { RecordConverterOptions } from '../../../app/importer/server/classes/converters/RecordConverter';
 import { UserConverter, type UserConverterOptions } from '../../../app/importer/server/classes/converters/UserConverter';
 import { settings } from '../../../app/settings/server';
 

apps/meteor/server/services/messages/hooks/BeforeSaveBadWords.ts

@@ -1,4 +1,4 @@
-import { type IMessage } from '@rocket.chat/core-typings';
+import type { IMessage } from '@rocket.chat/core-typings';
 import { Logger } from '@rocket.chat/logger';
 import type BadWordsFilter from 'bad-words';
 

apps/meteor/server/services/messages/hooks/BeforeSavePreventMention.ts

@@ -1,5 +1,5 @@
 import { Authorization, MeteorError } from '@rocket.chat/core-services';
-import { type IMessage, type IUser } from '@rocket.chat/core-typings';
+import type { IMessage, IUser } from '@rocket.chat/core-typings';
 
 import { i18n } from '../../../lib/i18n';
 

apps/meteor/tests/e2e/e2e-encryption/e2ee-legacy-format.spec.ts

@@ -72,7 +72,7 @@ test.describe('E2EE Legacy Format', () => {
 
 		await page.evaluate(
 			async ({ rid, kid, encryptedKey }) => {
-				// eslint-disable-next-line import/no-unresolved, @typescript-eslint/no-var-requires, import/no-absolute-path, @typescript-eslint/consistent-type-imports
+				// eslint-disable-next-line import/no-unresolved, import/no-absolute-path
 				const { e2e } = require('/client/lib/e2ee/rocketchat.e2e.ts') as typeof import('../../../client/lib/e2ee/rocketchat.e2e');
 				const room = await e2e.getInstanceByRoomId(rid);
 				await room?.importGroupKey(kid + encryptedKey);

apps/meteor/tests/e2e/fixtures/collections/users.ts

@@ -2,7 +2,7 @@ import { faker } from '@faker-js/faker';
 import type { IUser } from '@rocket.chat/core-typings';
 
 import { DEFAULT_USER_CREDENTIALS } from '../../config/constants';
-import { type IUserState } from '../userStates';
+import type { IUserState } from '../userStates';
 
 type UserFixture = IUser & {
 	username: string;

apps/meteor/tests/end-to-end/api/livechat/09-visitors.ts

@@ -2,7 +2,7 @@ import { faker } from '@faker-js/faker';
 import type { ILivechatVisitor, IOmnichannelRoom } from '@rocket.chat/core-typings';
 import { expect } from 'chai';
 import { before, describe, it, after } from 'mocha';
-import { type Response } from 'supertest';
+import type { Response } from 'supertest';
 
 import { getCredentials, api, request, credentials } from '../../../data/api-data';
 import { createCustomField, deleteCustomField } from '../../../data/livechat/custom-fields';

apps/uikit-playground/src/Components/CodeEditor/BlockEditor.tsx

@@ -5,7 +5,7 @@ import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
 import { useEffect, useContext } from 'react';
 
 import { updatePayloadAction, context } from '../../Context';
-import { type IPayload } from '../../Context/initialState';
+import type { IPayload } from '../../Context/initialState';
 import useCodeMirror from '../../hooks/useCodeMirror';
 import useFormatCodeMirrorValue from '../../hooks/useFormatCodeMirrorValue';
 import intendCode from '../../utils/intendCode';

apps/uikit-playground/src/Components/CodeEditor/index.tsx

@@ -5,7 +5,7 @@ import json5 from 'json5';
 import { useEffect, useContext } from 'react';
 
 import { updatePayloadAction, context } from '../../Context';
-import { type ILayoutBlock } from '../../Context/initialState';
+import type { ILayoutBlock } from '../../Context/initialState';
 import useCodeMirror from '../../hooks/useCodeMirror';
 import codePrettier from '../../utils/codePrettier';
 

apps/uikit-playground/src/Components/CreateNewScreen/ScreenThumbnail.tsx

@@ -7,7 +7,7 @@ import { context, renameScreenAction } from '../../Context';
 import { activeScreenAction } from '../../Context/action/activeScreenAction';
 import { deleteScreenAction } from '../../Context/action/deleteScreenAction';
 import { duplicateScreenAction } from '../../Context/action/duplicateScreenAction';
-import { type ScreenType } from '../../Context/initialState';
+import type { ScreenType } from '../../Context/initialState';
 import renderPayload from '../RenderPayload/RenderPayload';
 import EditMenu from '../ScreenThumbnail/EditMenu/EditMenu';
 import ScreenThumbnailWrapper from '../ScreenThumbnail/ScreenThumbnailWrapper';

apps/uikit-playground/src/Components/Draggable/DraggableList.tsx

@@ -3,7 +3,7 @@ import { DragDropContext, Droppable } from '@hello-pangea/dnd';
 import { memo } from 'react';
 
 import DraggableListItem from './DraggableListItem';
-import { type ILayoutBlock } from '../../Context/initialState';
+import type { ILayoutBlock } from '../../Context/initialState';
 import { SurfaceOptions } from '../Preview/Display/Surface/constant';
 
 export type Block = {

apps/uikit-playground/src/Components/FlowContainer/UIKitWrapper/UIKitWrapper.tsx

@@ -4,7 +4,7 @@ import { Handle, Position } from 'reactflow';
 import './UIKitWrapper.scss';
 
 import { context } from '../../../Context';
-import { type idType } from '../../../Context/initialState';
+import type { idType } from '../../../Context/initialState';
 import SurfaceRender from '../../Preview/Display/Surface/SurfaceRender';
 import RenderPayload from '../../RenderPayload/RenderPayload';
 

apps/uikit-playground/src/Components/HomeContainer/ProjectsList/ProjectsThumbnail.tsx

@@ -6,7 +6,7 @@ import { useNavigate } from 'react-router-dom';
 
 import { activeProjectAction, context, renameProjectAction } from '../../../Context';
 import { deleteProjectAction } from '../../../Context/action/deleteProjectAction';
-import { type ILayoutBlock } from '../../../Context/initialState';
+import type { ILayoutBlock } from '../../../Context/initialState';
 import routes from '../../../Routes/Routes';
 import { formatDate } from '../../../utils/formatDate';
 import RenderPayload from '../../RenderPayload/RenderPayload';

apps/uikit-playground/src/Components/Preview/Display/Surface/ContextualBarSurface.tsx

@@ -10,7 +10,7 @@ import {
 	ContextualbarTitle,
 } from '@rocket.chat/fuselage';
 import { Scrollbars } from 'rc-scrollbars';
-import { type ReactNode } from 'react';
+import type { ReactNode } from 'react';
 
 const ContextualBarSurface = ({ children }: { children: ReactNode }) => (
 	<Contextualbar>

apps/uikit-playground/src/Components/PrototypeRender/PrototypeRender.tsx

@@ -2,11 +2,11 @@ import './PrototypeRender.scss';
 import { css } from '@rocket.chat/css-in-js';
 import { Box } from '@rocket.chat/fuselage';
 import { useRef, useState } from 'react';
-import { type Edge } from 'reactflow';
+import type { Edge } from 'reactflow';
 
-import { type ILayoutBlock, type idType } from '../../Context/initialState';
+import type { ILayoutBlock, idType } from '../../Context/initialState';
 import SurfaceRender from '../Preview/Display/Surface/SurfaceRender';
-import { type SurfaceOptions } from '../Preview/Display/Surface/constant';
+import type { SurfaceOptions } from '../Preview/Display/Surface/constant';
 import RenderPayload from '../RenderPayload/RenderPayload';
 
 const PrototypeRender = ({

apps/uikit-playground/src/Components/RenderPayload/RenderPayload.tsx

@@ -5,7 +5,7 @@ import {
 	UiKitContextualBar as uiKitContextualBar,
 } from '@rocket.chat/fuselage-ui-kit';
 
-import { type ILayoutBlock } from '../../Context/initialState';
+import type { ILayoutBlock } from '../../Context/initialState';
 import { SurfaceOptions } from '../Preview/Display/Surface/constant';
 
 const RenderPayload = ({

apps/uikit-playground/src/Components/ScreenThumbnail/CreateNewScreenButton.tsx

@@ -1,6 +1,6 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Icon, Box } from '@rocket.chat/fuselage';
-import { type ComponentProps } from 'react';
+import type { ComponentProps } from 'react';
 
 const CreateNewScreenButton = ({
 	size = '60px',

apps/uikit-playground/src/Components/Templates/Container/Payload.tsx

@@ -4,10 +4,10 @@ import type { LayoutBlock } from '@rocket.chat/ui-kit';
 import { useContext, useMemo } from 'react';
 
 import { context, templatesToggleAction, updatePayloadAction } from '../../../Context';
-import { type ILayoutBlock } from '../../../Context/initialState';
+import type { ILayoutBlock } from '../../../Context/initialState';
 import getUniqueId from '../../../utils/getUniqueId';
 import SurfaceRender from '../../Preview/Display/Surface/SurfaceRender';
-import { type SurfaceOptions } from '../../Preview/Display/Surface/constant';
+import type { SurfaceOptions } from '../../Preview/Display/Surface/constant';
 import RenderPayload from '../../RenderPayload/RenderPayload';
 
 const Payload = ({ blocks, surface }: { surface: SurfaceOptions; blocks: LayoutBlock[] }) => {

apps/uikit-playground/src/Context/action/updateFlowEdgesAction.ts

@@ -1,4 +1,4 @@
-import { type Edge } from 'reactflow';
+import type { Edge } from 'reactflow';
 
 import { ActionTypes } from '../reducer';
 

apps/uikit-playground/src/Context/action/updateNodesAndViewPortAction.ts

@@ -1,4 +1,4 @@
-import { type Node, type Viewport } from 'reactflow';
+import type { Node, Viewport } from 'reactflow';
 
 import { ActionTypes } from '../reducer';
 

apps/uikit-playground/src/Context/action/updatePayloadAction.ts

@@ -1,5 +1,5 @@
-import { type SurfaceOptions } from '../../Components/Preview/Display/Surface/constant';
-import { type ILayoutBlock } from '../initialState';
+import type { SurfaceOptions } from '../../Components/Preview/Display/Surface/constant';
+import type { ILayoutBlock } from '../initialState';
 import { ActionTypes } from '../reducer';
 
 type PayloadType = {

apps/uikit-playground/src/Context/initialState.ts

@@ -1,5 +1,5 @@
 import type { LayoutBlock } from '@rocket.chat/ui-kit';
-import { type Edge, type Node, type Viewport } from 'reactflow';
+import type { Edge, Node, Viewport } from 'reactflow';
 
 import { SurfaceOptions } from '../Components/Preview/Display/Surface/constant';
 import getDate from '../utils/getDate';

apps/uikit-playground/src/Payload/tabNavigation/disabled.ts

@@ -1,4 +1,4 @@
-import { type LayoutBlock } from '@rocket.chat/ui-kit';
+import type { LayoutBlock } from '@rocket.chat/ui-kit';
 
 export const disabled: readonly LayoutBlock[] = [
 	{

apps/uikit-playground/src/Payload/tabNavigation/plain.ts

@@ -1,4 +1,4 @@
-import { type LayoutBlock } from '@rocket.chat/ui-kit';
+import type { LayoutBlock } from '@rocket.chat/ui-kit';
 
 export const plain: readonly LayoutBlock[] = [
 	{

apps/uikit-playground/src/Payload/tabNavigation/selected.ts

@@ -1,4 +1,4 @@
-import { type LayoutBlock } from '@rocket.chat/ui-kit';
+import type { LayoutBlock } from '@rocket.chat/ui-kit';
 
 export const selected: readonly LayoutBlock[] = [
 	{

apps/uikit-playground/src/hooks/useAuth.tsx

@@ -3,7 +3,7 @@ import type { ReactNode } from 'react';
 import { createContext, useContext, useMemo } from 'react';
 import { useNavigate } from 'react-router-dom';
 
-import { type userType } from '../Context/initialState';
+import type { userType } from '../Context/initialState';
 
 const AuthContext = createContext<{
 	user?: userType;

apps/uikit-playground/src/hooks/useFormatCodeMirrorValue.ts

@@ -1,8 +1,8 @@
 import json5 from 'json5';
 import { useEffect } from 'react';
 
-import { type ICodeMirrorChanges } from './useCodeMirror';
-import { type IPayload } from '../Context/initialState';
+import type { ICodeMirrorChanges } from './useCodeMirror';
+import type { IPayload } from '../Context/initialState';
 import codePrettier from '../utils/codePrettier';
 
 // Todo: needs to make it more strict

apps/uikit-playground/src/utils/filterEdges.ts

@@ -1,4 +1,4 @@
-import { type Edge } from 'reactflow';
+import type { Edge } from 'reactflow';
 
 export const filterEdges = (edges: Edge[], activeActionIds: string[], sourceId: string) => {
 	return edges.filter((edge) => sourceId !== edge.source || activeActionIds.includes(edge.sourceHandle || ''));

apps/uikit-playground/src/utils/persistStore.ts

@@ -1,4 +1,4 @@
-import { type initialStateType } from '../Context/initialState';
+import type { initialStateType } from '../Context/initialState';
 
 const persistStore = (state: initialStateType) => {
 	localStorage.setItem('pesrist', JSON.stringify(state));