chore: Subpath exports for @rocket.chat/ui-client

apps/meteor/app/otr/client/OTRRoom.ts

@@ -1,7 +1,8 @@
 import type { IRoom, IMessage, IUser, UserPresence } from '@rocket.chat/core-typings';
 import { UserStatus } from '@rocket.chat/core-typings';
 import { Random } from '@rocket.chat/random';
-import { GenericModal, imperativeModal } from '@rocket.chat/ui-client';
+import { GenericModal } from '@rocket.chat/ui-client';
+import { imperativeModal } from '@rocket.chat/ui-client/lib/imperativeModal';
 import EJSON from 'ejson';
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';

apps/meteor/app/ui-message/client/ActionManager.ts

@@ -1,7 +1,7 @@
 import type { DistributiveOmit } from '@rocket.chat/core-typings';
 import { Emitter } from '@rocket.chat/emitter';
 import { Random } from '@rocket.chat/random';
-import { imperativeModal } from '@rocket.chat/ui-client';
+import { imperativeModal } from '@rocket.chat/ui-client/lib/imperativeModal';
 import type { RouterContext, IActionManager } from '@rocket.chat/ui-contexts';
 import type * as UiKit from '@rocket.chat/ui-kit';
 import { t } from 'i18next';

apps/meteor/app/ui-message/client/messageBox/messageBoxFormatting.ts

@@ -1,5 +1,5 @@
 import type { Keys as IconName } from '@rocket.chat/icons';
-import { imperativeModal } from '@rocket.chat/ui-client';
+import { imperativeModal } from '@rocket.chat/ui-client/lib/imperativeModal';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import { flushSync } from 'react-dom';
 

apps/meteor/app/webrtc/client/WebRTCClass.ts

@@ -1,7 +1,8 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import type { StreamKeys, StreamNames, StreamerCallbackArgs } from '@rocket.chat/ddp-client';
 import { Emitter } from '@rocket.chat/emitter';
-import { GenericModal, imperativeModal } from '@rocket.chat/ui-client';
+import { GenericModal } from '@rocket.chat/ui-client';
+import { imperativeModal } from '@rocket.chat/ui-client/lib/imperativeModal';
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 

apps/meteor/client/hooks/roomActions/useE2EERoomAction.spec.ts

@@ -1,4 +1,4 @@
-import { imperativeModal } from '@rocket.chat/ui-client';
+import { imperativeModal } from '@rocket.chat/ui-client/lib/imperativeModal';
 import { useSetting, usePermission, useEndpoint } from '@rocket.chat/ui-contexts';
 import { act, renderHook, waitFor } from '@testing-library/react';
 
@@ -19,8 +19,8 @@ jest.mock('@rocket.chat/ui-contexts', () => ({
 	useToastMessageDispatch: jest.fn(() => dispatchToastMessage),
 }));
 
-jest.mock('@rocket.chat/ui-client', () => ({
-	...jest.requireActual('@rocket.chat/ui-client'),
+jest.mock('@rocket.chat/ui-client/lib/imperativeModal', () => ({
+	...jest.requireActual('@rocket.chat/ui-client/lib/imperativeModal'),
 	imperativeModal: {
 		open: jest.fn(),
 		close: jest.fn(),

apps/meteor/client/hooks/roomActions/useE2EERoomAction.ts

@@ -1,6 +1,6 @@
 import { isRoomFederated } from '@rocket.chat/core-typings';
 import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
-import { imperativeModal } from '@rocket.chat/ui-client';
+import { imperativeModal } from '@rocket.chat/ui-client/lib/imperativeModal';
 import { useSetting, usePermission, useEndpoint, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';

apps/meteor/client/lib/2fa/process2faReturn.ts

@@ -1,5 +1,5 @@
 import { SHA256 } from '@rocket.chat/sha256';
-import { imperativeModal } from '@rocket.chat/ui-client';
+import { imperativeModal } from '@rocket.chat/ui-client/lib/imperativeModal';
 import { Meteor } from 'meteor/meteor';
 import { lazy } from 'react';
 

apps/meteor/client/lib/chats/flows/processTooLongMessage.ts

@@ -1,5 +1,6 @@
 import type { IMessage } from '@rocket.chat/core-typings';
-import { GenericModal, imperativeModal } from '@rocket.chat/ui-client';
+import { GenericModal } from '@rocket.chat/ui-client';
+import { imperativeModal } from '@rocket.chat/ui-client/lib/imperativeModal';
 
 import { t } from '../../../../app/utils/lib/i18n';
 import { settings } from '../../settings';

apps/meteor/client/lib/chats/flows/requestMessageDeletion.ts

@@ -1,5 +1,6 @@
 import type { IMessage } from '@rocket.chat/core-typings';
-import { GenericModal, imperativeModal } from '@rocket.chat/ui-client';
+import { GenericModal } from '@rocket.chat/ui-client';
+import { imperativeModal } from '@rocket.chat/ui-client/lib/imperativeModal';
 
 import { t } from '../../../../app/utils/lib/i18n';
 import { dispatchToastMessage } from '../../toast';

apps/meteor/client/lib/chats/flows/uploadFiles.ts

@@ -1,6 +1,6 @@
 import type { IMessage, FileAttachmentProps, IE2EEMessage, IUpload } from '@rocket.chat/core-typings';
 import { isRoomFederated } from '@rocket.chat/core-typings';
-import { imperativeModal } from '@rocket.chat/ui-client';
+import { imperativeModal } from '@rocket.chat/ui-client/lib/imperativeModal';
 
 import { fileUploadIsValidContentType } from '../../../../app/utils/client';
 import { getFileExtension } from '../../../../lib/utils/getFileExtension';

apps/meteor/client/lib/e2ee/rocketchat.e2e.ts

@@ -4,7 +4,7 @@ import URL from 'url';
 import type { IE2EEMessage, IMessage, IRoom, ISubscription, IUser, IUploadWithUser, MessageAttachment } from '@rocket.chat/core-typings';
 import { isE2EEMessage } from '@rocket.chat/core-typings';
 import { Emitter } from '@rocket.chat/emitter';
-import { imperativeModal } from '@rocket.chat/ui-client';
+import { imperativeModal } from '@rocket.chat/ui-client/lib/imperativeModal';
 import EJSON from 'ejson';
 import _ from 'lodash';
 import { Accounts } from 'meteor/accounts-base';

apps/meteor/client/views/root/hooks/loggedIn/useNotificationUserCalendar.ts

@@ -1,6 +1,6 @@
 import type { ICalendarNotification, IUser } from '@rocket.chat/core-typings';
 import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
-import { imperativeModal } from '@rocket.chat/ui-client';
+import { imperativeModal } from '@rocket.chat/ui-client/lib/imperativeModal';
 import { useStream, useUserPreference } from '@rocket.chat/ui-contexts';
 import { useEffect } from 'react';
 

apps/meteor/client/views/root/hooks/useEscapeKeyStroke.ts

@@ -1,4 +1,5 @@
-import { GenericModal, imperativeModal } from '@rocket.chat/ui-client';
+import { GenericModal } from '@rocket.chat/ui-client';
+import { imperativeModal } from '@rocket.chat/ui-client/lib/imperativeModal';
 import { useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import { useEffect } from 'react';
 import { useTranslation } from 'react-i18next';

packages/gazzodown/src/elements/LinkSpan.tsx

@@ -1,5 +1,5 @@
 import type * as MessageParser from '@rocket.chat/message-parser';
-import { getBaseURI, isExternal } from '@rocket.chat/ui-client';
+import { getBaseURI, isExternal } from '@rocket.chat/ui-client/helpers/getBaseURI';
 import { ReactElement, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 

packages/livechat/webpack.config.ts

@@ -52,6 +52,9 @@ const config = (_env: any, args: webpack.WebpackOptionsNormalized): webpack.Conf
 					exclude: [/\/node_modules\/core-js\//],
 					type: 'javascript/auto',
 					use: ['babel-loader'],
+					resolve: {
+						fullySpecified: false,
+					},
 				},
 				{
 					test: /\.tsx?$/,

packages/ui-client/.eslintrc.json

@@ -43,7 +43,7 @@
 			}
 		}
 	},
-	"ignorePatterns": ["**/dist"],
+	"ignorePatterns": ["!.storybook", "components", "dist", "helpers", "hooks", "lib", "providers"],
 	"overrides": [
 		{
 			"files": ["*.ts", "*.tsx"],

packages/ui-client/components

@@ -0,0 +1 @@
+dist/components

packages/ui-client/helpers

@@ -0,0 +1 @@
+dist/helpers

packages/ui-client/hooks

@@ -0,0 +1 @@
+dist/hooks

packages/ui-client/lib

@@ -0,0 +1 @@
+dist/lib

packages/ui-client/package.json

@@ -2,6 +2,49 @@
 	"name": "@rocket.chat/ui-client",
 	"version": "22.0.0",
 	"private": true,
+	"type": "module",
+	"exports": {
+		".": {
+			"default": "./dist/index.js",
+			"types": "./dist/index.d.ts"
+		},
+		"./helpers": {
+			"default": "./dist/helpers/index.js",
+			"types": "./dist/helpers/index.d.ts"
+		},
+		"./helpers/*": {
+			"default": "./dist/helpers/*.js",
+			"types": "./dist/helpers/*.d.ts"
+		},
+		"./lib/*": {
+			"default": "./dist/lib/*.js",
+			"types": "./dist/lib/*.d.ts"
+		},
+		"./components": {
+			"default": "./dist/components/index.js",
+			"types": "./dist/components/index.d.ts"
+		},
+		"./components/*": {
+			"default": "./dist/components/*.js",
+			"types": "./dist/components/*.d.ts"
+		},
+		"./providers": {
+			"default": "./dist/providers/index.js",
+			"types": "./dist/providers/index.d.ts"
+		},
+		"./providers/*": {
+			"default": "./dist/providers/*.js",
+			"types": "./dist/providers/*.d.ts"
+		},
+		"./hooks": {
+			"default": "./dist/hooks/index.js",
+			"types": "./dist/hooks/index.d.ts"
+		},
+		"./hooks/*": {
+			"default": "./dist/hooks/*.js",
+			"types": "./dist/hooks/*.d.ts"
+		}
+	},
 	"main": "./dist/index.js",
 	"typings": "./dist/index.d.ts",
 	"files": [

packages/ui-client/providers

@@ -0,0 +1 @@
+dist/providers

packages/ui-client/src/components/CustomFieldsForm.tsx

@@ -104,3 +104,5 @@ export const CustomFieldsForm = <T extends FieldValues>({ formName, formControl,
 		})}
 	</>
 );
+
+export default CustomFieldsForm;

packages/ui-client/src/components/GenericMenu/index.ts

@@ -1,3 +1,3 @@
-export { default as GenericMenu } from './GenericMenu';
+export { default, default as GenericMenu } from './GenericMenu';
 export { default as GenericMenuItem, GenericMenuItemProps } from './GenericMenuItem';
 export { useHandleMenuAction } from './hooks/useHandleMenuAction';

packages/ui-client/src/components/PasswordVerifier/PasswordVerifier.tsx

@@ -51,3 +51,5 @@ export const PasswordVerifier = ({ password, id, vertical }: PasswordVerifierPro
 		</>
 	);
 };
+
+export default PasswordVerifier;

packages/ui-client/src/helpers/index.ts

@@ -1,2 +1 @@
 export * from './getBaseURI';
-export * from './imperativeModal';

packages/ui-client/src/providers/ModalProvider/ModalProvider.spec.tsx

@@ -7,7 +7,7 @@ import ModalProvider from './ModalProvider';
 import ModalProviderWithRegion from './ModalProviderWithRegion';
 import GenericModal from '../../components/Modal/GenericModal';
 import ModalRegion from '../../components/Modal/ModalRegion';
-import { imperativeModal } from '../../helpers/imperativeModal';
+import { imperativeModal } from '../../lib/imperativeModal';
 
 const renderWithSuspense = (ui: ReactElement) =>
 	render(ui, {

packages/ui-client/src/providers/ModalProvider/index.ts

@@ -1,3 +1,3 @@
 export * from './ModalStore';
-export { default as ModalProvider } from './ModalProvider';
+export { default, default as ModalProvider } from './ModalProvider';
 export { default as ModalProviderWithRegion } from './ModalProviderWithRegion';

packages/ui-client/tsconfig.build.json

@@ -1,5 +1,8 @@
 {
 	"extends": "./tsconfig.json",
+	"compilerOptions": {
+		"outDir": "./dist",
+	},
 	"include": ["./src/**/*"],
 	"exclude": ["**/*.stories.tsx", "./src/**/*.spec.ts", "./src/**/*.spec.tsx", "./.storybook/**/*", "./jest.config.ts"]
 }

packages/ui-client/tsconfig.json

@@ -2,7 +2,9 @@
 	"extends": "@rocket.chat/tsconfig/client.json",
 	"compilerOptions": {
 		"rootDirs": ["./src", "./"],
-		"outDir": "./dist"
+		"target": "es2024",
+		"module": "es2022",
+		"moduleResolution": "bundler"
 	},
 	"include": ["./src/**/*", "./.storybook/**/*", "./jest.config.ts"],
 }

packages/ui-voip/src/components/VoipPopupDraggable/DraggableCore.ts

@@ -1,5 +1,5 @@
 import { Emitter, OffCallbackHandler } from '@rocket.chat/emitter';
-import { useSafeRefCallback } from '@rocket.chat/ui-client';
+import { useSafeRefCallback } from '@rocket.chat/ui-client/hooks/useSafeRefCallback/index';
 import { useCallback, useRef, useState } from 'react';
 
 const GRAB_DOM_EVENTS = ['pointerdown'] as const;

packages/ui-voip/src/components/VoipPopupPortal/VoipPopupPortal.tsx

@@ -1,4 +1,4 @@
-import { AnchorPortal } from '@rocket.chat/ui-client';
+import AnchorPortal from '@rocket.chat/ui-client/components/AnchorPortal';
 import type { ReactElement, ReactNode } from 'react';
 import { memo } from 'react';
 

packages/ui-voip/src/components/VoipSettingsButton/VoipSettingsButton.tsx

@@ -1,7 +1,7 @@
 /* eslint-disable react/no-multi-comp */
 import { IconButton } from '@rocket.chat/fuselage';
 import { useSafely } from '@rocket.chat/fuselage-hooks';
-import { GenericMenu } from '@rocket.chat/ui-client';
+import GenericMenu from '@rocket.chat/ui-client/components/GenericMenu/index';
 import type { ComponentProps, Ref } from 'react';
 import { forwardRef, useCallback, useState } from 'react';
 

packages/ui-voip/src/components/VoipSettingsButton/hooks/useVoipDeviceSettings.tsx

@@ -1,5 +1,5 @@
 import { Box, RadioButton } from '@rocket.chat/fuselage';
-import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client/components/GenericMenu/index';
 import { useAvailableDevices, useSelectedDevices, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import { useMutation } from '@tanstack/react-query';
 import type { MouseEvent } from 'react';

packages/ui-voip/src/components/VoipTransferModal/VoipTransferModal.tsx

@@ -13,7 +13,7 @@ import {
 	ModalIcon,
 	ModalTitle,
 } from '@rocket.chat/fuselage';
-import { UserAutoComplete } from '@rocket.chat/ui-client';
+import UserAutoComplete from '@rocket.chat/ui-client/components/UserAutoComplete/index';
 import { useEndpoint, useUser } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import { useId, useState } from 'react';

packages/ui-voip/src/hooks/useDevicePermissionPrompt.spec.tsx

@@ -1,5 +1,6 @@
 import { mockAppRoot } from '@rocket.chat/mock-providers';
-import { ModalProvider, ModalRegion } from '@rocket.chat/ui-client';
+import ModalRegion from '@rocket.chat/ui-client/components/Modal/ModalRegion';
+import ModalProvider from '@rocket.chat/ui-client/providers/ModalProvider/index';
 import { renderHook, screen, waitFor, act } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { ReactNode } from 'react';

packages/ui-voip/src/v2/components/DevicePicker.tsx

@@ -1,6 +1,6 @@
 import { Box, RadioButton } from '@rocket.chat/fuselage';
-import { GenericMenu } from '@rocket.chat/ui-client';
-import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client/components/GenericMenu';
+import GenericMenu from '@rocket.chat/ui-client/components/GenericMenu/index';
 import { useAvailableDevices, useSelectedDevices } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, MouseEvent } from 'react';
 import { useTranslation } from 'react-i18next';

packages/web-ui-registration/src/GuestForm.tsx

@@ -1,6 +1,6 @@
 import { Button, ButtonGroup } from '@rocket.chat/fuselage';
 import { Form } from '@rocket.chat/layout';
-import { useDocumentTitle } from '@rocket.chat/ui-client';
+import { useDocumentTitle } from '@rocket.chat/ui-client/hooks/useDocumentTitle';
 import { useTranslation } from 'react-i18next';
 
 import type { DispatchLoginRouter } from './hooks/useLoginRouter';

packages/web-ui-registration/src/LoginForm.tsx

@@ -12,7 +12,7 @@ import {
 	Callout,
 } from '@rocket.chat/fuselage';
 import { Form, ActionLink } from '@rocket.chat/layout';
-import { useDocumentTitle } from '@rocket.chat/ui-client';
+import { useDocumentTitle } from '@rocket.chat/ui-client/hooks/useDocumentTitle';
 import { useLoginWithPassword, useSetting } from '@rocket.chat/ui-contexts';
 import { useMutation } from '@tanstack/react-query';
 import type { ReactElement } from 'react';

packages/web-ui-registration/src/RegisterForm.tsx

@@ -13,7 +13,9 @@ import {
 	Callout,
 } from '@rocket.chat/fuselage';
 import { Form, ActionLink } from '@rocket.chat/layout';
-import { CustomFieldsForm, PasswordVerifier, useValidatePassword } from '@rocket.chat/ui-client';
+import CustomFieldsForm from '@rocket.chat/ui-client/components/CustomFieldsForm';
+import PasswordVerifier from '@rocket.chat/ui-client/components/PasswordVerifier/PasswordVerifier';
+import { useValidatePassword } from '@rocket.chat/ui-client/hooks/useValidatePassword';
 import { useAccountsCustomFields, useSetting, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import { useEffect, useId, useRef, useState } from 'react';

packages/web-ui-registration/src/RegisterSecretPageRouter.tsx

@@ -1,4 +1,4 @@
-import { useDocumentTitle } from '@rocket.chat/ui-client';
+import { useDocumentTitle } from '@rocket.chat/ui-client/hooks/useDocumentTitle';
 import { useSetting } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import { useTranslation } from 'react-i18next';

packages/web-ui-registration/src/ResetPassword/ResetPasswordPage.tsx

@@ -1,7 +1,8 @@
 import type { IUser } from '@rocket.chat/core-typings';
 import { Button, FieldGroup, Field, FieldLabel, ButtonGroup, PasswordInput, FieldRow, FieldError } from '@rocket.chat/fuselage';
 import { Form } from '@rocket.chat/layout';
-import { PasswordVerifier, useValidatePassword } from '@rocket.chat/ui-client';
+import PasswordVerifier from '@rocket.chat/ui-client/components/PasswordVerifier/PasswordVerifier';
+import { useValidatePassword } from '@rocket.chat/ui-client/hooks/useValidatePassword';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import {
 	useSetting,

packages/web-ui-registration/src/ResetPasswordForm.tsx

@@ -1,6 +1,6 @@
 import { FieldGroup, TextInput, Field, FieldLabel, FieldRow, FieldError, ButtonGroup, Button, Callout } from '@rocket.chat/fuselage';
 import { Form, ActionLink } from '@rocket.chat/layout';
-import { useDocumentTitle } from '@rocket.chat/ui-client';
+import { useDocumentTitle } from '@rocket.chat/ui-client/hooks/useDocumentTitle';
 import type { ReactElement } from 'react';
 import { useEffect, useId, useRef } from 'react';
 import { useForm } from 'react-hook-form';