diff --git a/apps/meteor/app/authorization/client/hasPermission.ts b/apps/meteor/app/authorization/client/hasPermission.ts index ddacd972722ac..4481ef29e45d3 100644 --- a/apps/meteor/app/authorization/client/hasPermission.ts +++ b/apps/meteor/app/authorization/client/hasPermission.ts @@ -3,7 +3,7 @@ import { Meteor } from 'meteor/meteor'; import { hasRole } from './hasRole'; import { PermissionsCachedStore } from '../../../client/cachedStores'; -import { watch } from '../../../client/lib/cachedStores'; +import { watch } from '../../../client/meteor/watch'; import { Permissions, Users } from '../../../client/stores'; import { AuthorizationUtils } from '../lib/AuthorizationUtils'; diff --git a/apps/meteor/app/authorization/client/hasRole.ts b/apps/meteor/app/authorization/client/hasRole.ts index 9c8fae2f00aae..a2e1ea5adc229 100644 --- a/apps/meteor/app/authorization/client/hasRole.ts +++ b/apps/meteor/app/authorization/client/hasRole.ts @@ -1,6 +1,6 @@ import type { IUser, IRole, IRoom } from '@rocket.chat/core-typings'; -import { watch } from '../../../client/lib/cachedStores'; +import { watch } from '../../../client/meteor/watch'; import { Roles, Subscriptions, Users } from '../../../client/stores'; export const hasRole = (userId: IUser['_id'], roleId: IRole['_id'], scope?: IRoom['_id']): boolean => { diff --git a/apps/meteor/client/lib/cachedStores/CachedStore.ts b/apps/meteor/client/lib/cachedStores/CachedStore.ts index f57a14e58e2bd..b28bdd057679b 100644 --- a/apps/meteor/client/lib/cachedStores/CachedStore.ts +++ b/apps/meteor/client/lib/cachedStores/CachedStore.ts @@ -10,10 +10,10 @@ import { baseURI } from '../baseURI'; import { onLoggedIn } from '../loggedIn'; import { CachedStoresManager } from './CachedStoresManager'; import type { IDocumentMapStore } from './DocumentMapStore'; -import { watch } from './watch'; import { sdk } from '../../../app/utils/client/lib/SDKClient'; import { isTruthy } from '../../../lib/isTruthy'; import { withDebouncing } from '../../../lib/utils/highOrderFunctions'; +import { watch } from '../../meteor/watch'; import { getConfig } from '../utils/getConfig'; type Name = 'rooms' | 'subscriptions' | 'permissions' | 'public-settings' | 'private-settings'; diff --git a/apps/meteor/client/lib/cachedStores/index.ts b/apps/meteor/client/lib/cachedStores/index.ts index b0320808dda86..b54a0f462bed2 100644 --- a/apps/meteor/client/lib/cachedStores/index.ts +++ b/apps/meteor/client/lib/cachedStores/index.ts @@ -3,6 +3,5 @@ export { pipe } from './pipe'; export { applyQueryOptions } from './utils'; export { createDocumentMapStore, type IDocumentMapStore } from './DocumentMapStore'; export { MinimongoCollection } from './MinimongoCollection'; -export { watch } from './watch'; export { PublicCachedStore, PrivateCachedStore } from './CachedStore'; export { createGlobalStore } from './createGlobalStore'; diff --git a/apps/meteor/client/lib/customOAuth/CustomOAuth.ts b/apps/meteor/client/lib/customOAuth/CustomOAuth.ts index 6142115facdf2..7a0c1c3548d38 100644 --- a/apps/meteor/client/lib/customOAuth/CustomOAuth.ts +++ b/apps/meteor/client/lib/customOAuth/CustomOAuth.ts @@ -7,7 +7,7 @@ import { OAuth } from 'meteor/oauth'; import { isURL } from '../../../lib/utils/isURL'; import type { IOAuthProvider } from '../../definitions/IOAuthProvider'; -import { createOAuthTotpLoginMethod } from '../../meteorOverrides/login/oauth'; +import { createOAuthTotpLoginMethod } from '../../meteor/overrides/login/oauth'; import { overrideLoginMethod, type LoginCallback } from '../2fa/overrideLoginMethod'; import { loginServices } from '../loginServices'; import { CustomOAuthError } from './CustomOAuthError'; diff --git a/apps/meteor/client/lib/settings/settings.ts b/apps/meteor/client/lib/settings/settings.ts index 354895476bdee..f0026eab41ec2 100644 --- a/apps/meteor/client/lib/settings/settings.ts +++ b/apps/meteor/client/lib/settings/settings.ts @@ -1,7 +1,7 @@ import type { SettingValue } from '@rocket.chat/core-typings'; +import { watch } from '../../meteor/watch'; import { PublicSettings } from '../../stores'; -import { watch } from '../cachedStores'; type SettingCallback = (key: string, value: SettingValue) => void; diff --git a/apps/meteor/client/main.ts b/apps/meteor/client/main.ts index 2d1b6f396dd84..c19ffe0b59b58 100644 --- a/apps/meteor/client/main.ts +++ b/apps/meteor/client/main.ts @@ -3,7 +3,7 @@ import './startup/accounts'; import './startup/fakeUserPresence'; import('@rocket.chat/fuselage-polyfills') - .then(() => import('./meteorOverrides')) + .then(() => import('./meteor/overrides')) .then(() => import('./ecdh')) .then(() => import('./importPackages')) .then(() => import('./startup')) diff --git a/apps/meteor/client/meteorOverrides/ddpOverREST.ts b/apps/meteor/client/meteor/overrides/ddpOverREST.ts similarity index 98% rename from apps/meteor/client/meteorOverrides/ddpOverREST.ts rename to apps/meteor/client/meteor/overrides/ddpOverREST.ts index c0abc244cc476..d3781e87a6af2 100644 --- a/apps/meteor/client/meteorOverrides/ddpOverREST.ts +++ b/apps/meteor/client/meteor/overrides/ddpOverREST.ts @@ -2,7 +2,7 @@ import { DDPCommon } from 'meteor/ddp-common'; import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; -import { sdk } from '../../app/utils/client/lib/SDKClient'; +import { sdk } from '../../../app/utils/client/lib/SDKClient'; const bypassMethods: string[] = ['setUserStatus', 'logout']; diff --git a/apps/meteor/client/meteorOverrides/index.ts b/apps/meteor/client/meteor/overrides/index.ts similarity index 100% rename from apps/meteor/client/meteorOverrides/index.ts rename to apps/meteor/client/meteor/overrides/index.ts diff --git a/apps/meteor/client/meteorOverrides/login/cas.ts b/apps/meteor/client/meteor/overrides/login/cas.ts similarity index 83% rename from apps/meteor/client/meteorOverrides/login/cas.ts rename to apps/meteor/client/meteor/overrides/login/cas.ts index 93a9f1d5b2365..9b753d5042943 100644 --- a/apps/meteor/client/meteorOverrides/login/cas.ts +++ b/apps/meteor/client/meteor/overrides/login/cas.ts @@ -1,7 +1,7 @@ import { Random } from '@rocket.chat/random'; import { Meteor } from 'meteor/meteor'; -import { callLoginMethod } from '../../lib/2fa/overrideLoginMethod'; +import { callLoginMethod } from '../../../lib/2fa/overrideLoginMethod'; declare module 'meteor/meteor' { // eslint-disable-next-line @typescript-eslint/no-namespace @@ -12,7 +12,7 @@ declare module 'meteor/meteor' { Meteor.loginWithCas = (_, callback) => { const credentialToken = Random.id(); - import('../../lib/openCASLoginPopup') + import('../../../lib/openCASLoginPopup') .then(({ openCASLoginPopup }) => openCASLoginPopup(credentialToken)) .then(() => callLoginMethod({ methodArguments: [{ cas: { credentialToken } }] })) .then(() => callback?.()) diff --git a/apps/meteor/client/meteorOverrides/login/crowd.ts b/apps/meteor/client/meteor/overrides/login/crowd.ts similarity index 96% rename from apps/meteor/client/meteorOverrides/login/crowd.ts rename to apps/meteor/client/meteor/overrides/login/crowd.ts index 9b1d4b83d4025..a07a149c09be0 100644 --- a/apps/meteor/client/meteorOverrides/login/crowd.ts +++ b/apps/meteor/client/meteor/overrides/login/crowd.ts @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { callLoginMethod, handleLogin, type LoginCallback } from '../../lib/2fa/overrideLoginMethod'; +import { callLoginMethod, handleLogin, type LoginCallback } from '../../../lib/2fa/overrideLoginMethod'; declare module 'meteor/meteor' { // eslint-disable-next-line @typescript-eslint/no-namespace diff --git a/apps/meteor/client/meteorOverrides/login/facebook.ts b/apps/meteor/client/meteor/overrides/login/facebook.ts similarity index 93% rename from apps/meteor/client/meteorOverrides/login/facebook.ts rename to apps/meteor/client/meteor/overrides/login/facebook.ts index c72b26be542fe..1e93da85386ed 100644 --- a/apps/meteor/client/meteorOverrides/login/facebook.ts +++ b/apps/meteor/client/meteor/overrides/login/facebook.ts @@ -5,8 +5,8 @@ import { Meteor } from 'meteor/meteor'; import { OAuth } from 'meteor/oauth'; import { createOAuthTotpLoginMethod } from './oauth'; -import { overrideLoginMethod } from '../../lib/2fa/overrideLoginMethod'; -import { wrapRequestCredentialFn } from '../../lib/wrapRequestCredentialFn'; +import { overrideLoginMethod } from '../../../lib/2fa/overrideLoginMethod'; +import { wrapRequestCredentialFn } from '../../../lib/wrapRequestCredentialFn'; const { loginWithFacebook } = Meteor; const loginWithFacebookAndTOTP = createOAuthTotpLoginMethod(Facebook); diff --git a/apps/meteor/client/meteorOverrides/login/github.ts b/apps/meteor/client/meteor/overrides/login/github.ts similarity index 90% rename from apps/meteor/client/meteorOverrides/login/github.ts rename to apps/meteor/client/meteor/overrides/login/github.ts index 8ee2a057921fe..93715380c9a5d 100644 --- a/apps/meteor/client/meteorOverrides/login/github.ts +++ b/apps/meteor/client/meteor/overrides/login/github.ts @@ -5,8 +5,8 @@ import { Meteor } from 'meteor/meteor'; import { OAuth } from 'meteor/oauth'; import { createOAuthTotpLoginMethod } from './oauth'; -import { overrideLoginMethod } from '../../lib/2fa/overrideLoginMethod'; -import { wrapRequestCredentialFn } from '../../lib/wrapRequestCredentialFn'; +import { overrideLoginMethod } from '../../../lib/2fa/overrideLoginMethod'; +import { wrapRequestCredentialFn } from '../../../lib/wrapRequestCredentialFn'; const { loginWithGithub } = Meteor; const loginWithGithubAndTOTP = createOAuthTotpLoginMethod(Github); diff --git a/apps/meteor/client/meteorOverrides/login/google.ts b/apps/meteor/client/meteor/overrides/login/google.ts similarity index 95% rename from apps/meteor/client/meteorOverrides/login/google.ts rename to apps/meteor/client/meteor/overrides/login/google.ts index 55ca6e0c35ed8..bb987c566d64e 100644 --- a/apps/meteor/client/meteorOverrides/login/google.ts +++ b/apps/meteor/client/meteor/overrides/login/google.ts @@ -5,8 +5,8 @@ import { Meteor } from 'meteor/meteor'; import { OAuth } from 'meteor/oauth'; import { createOAuthTotpLoginMethod } from './oauth'; -import { overrideLoginMethod, type LoginCallback } from '../../lib/2fa/overrideLoginMethod'; -import { wrapRequestCredentialFn } from '../../lib/wrapRequestCredentialFn'; +import { overrideLoginMethod, type LoginCallback } from '../../../lib/2fa/overrideLoginMethod'; +import { wrapRequestCredentialFn } from '../../../lib/wrapRequestCredentialFn'; declare module 'meteor/meteor' { // eslint-disable-next-line @typescript-eslint/no-namespace diff --git a/apps/meteor/client/meteorOverrides/login/ldap.ts b/apps/meteor/client/meteor/overrides/login/ldap.ts similarity index 96% rename from apps/meteor/client/meteorOverrides/login/ldap.ts rename to apps/meteor/client/meteor/overrides/login/ldap.ts index 77a16ce3675d4..23238126ea5ea 100644 --- a/apps/meteor/client/meteorOverrides/login/ldap.ts +++ b/apps/meteor/client/meteor/overrides/login/ldap.ts @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { callLoginMethod, handleLogin, type LoginCallback } from '../../lib/2fa/overrideLoginMethod'; +import { callLoginMethod, handleLogin, type LoginCallback } from '../../../lib/2fa/overrideLoginMethod'; declare module 'meteor/meteor' { // eslint-disable-next-line @typescript-eslint/no-namespace diff --git a/apps/meteor/client/meteorOverrides/login/meteorDeveloperAccount.ts b/apps/meteor/client/meteor/overrides/login/meteorDeveloperAccount.ts similarity index 90% rename from apps/meteor/client/meteorOverrides/login/meteorDeveloperAccount.ts rename to apps/meteor/client/meteor/overrides/login/meteorDeveloperAccount.ts index 2550630caac11..0879b1f0f0ef8 100644 --- a/apps/meteor/client/meteorOverrides/login/meteorDeveloperAccount.ts +++ b/apps/meteor/client/meteor/overrides/login/meteorDeveloperAccount.ts @@ -3,8 +3,8 @@ import { MeteorDeveloperAccounts } from 'meteor/meteor-developer-oauth'; import { OAuth } from 'meteor/oauth'; import { createOAuthTotpLoginMethod } from './oauth'; -import { overrideLoginMethod } from '../../lib/2fa/overrideLoginMethod'; -import { wrapRequestCredentialFn } from '../../lib/wrapRequestCredentialFn'; +import { overrideLoginMethod } from '../../../lib/2fa/overrideLoginMethod'; +import { wrapRequestCredentialFn } from '../../../lib/wrapRequestCredentialFn'; const { loginWithMeteorDeveloperAccount } = Meteor; const loginWithMeteorDeveloperAccountAndTOTP = createOAuthTotpLoginMethod(MeteorDeveloperAccounts); diff --git a/apps/meteor/client/meteorOverrides/login/oauth.ts b/apps/meteor/client/meteor/overrides/login/oauth.ts similarity index 94% rename from apps/meteor/client/meteorOverrides/login/oauth.ts rename to apps/meteor/client/meteor/overrides/login/oauth.ts index a3f9d72c9cbf8..cc31be9fb677d 100644 --- a/apps/meteor/client/meteorOverrides/login/oauth.ts +++ b/apps/meteor/client/meteor/overrides/login/oauth.ts @@ -2,8 +2,8 @@ import { Accounts } from 'meteor/accounts-base'; import { Meteor } from 'meteor/meteor'; import { OAuth } from 'meteor/oauth'; -import type { IOAuthProvider } from '../../definitions/IOAuthProvider'; -import type { LoginCallback } from '../../lib/2fa/overrideLoginMethod'; +import type { IOAuthProvider } from '../../../definitions/IOAuthProvider'; +import type { LoginCallback } from '../../../lib/2fa/overrideLoginMethod'; const isLoginCancelledError = (error: unknown): error is Meteor.Error => error instanceof Meteor.Error && error.error === Accounts.LoginCancelledError.numericError; @@ -113,7 +113,7 @@ Accounts.onPageLoadLogin(async (loginAttempt: any) => { const { credentialToken, credentialSecret } = oAuthArgs.oauth; const cb = loginAttempt.userCallback; - const { process2faReturn } = await import('../../lib/2fa/process2faReturn'); + const { process2faReturn } = await import('../../../lib/2fa/process2faReturn'); await process2faReturn({ error: loginAttempt.error, diff --git a/apps/meteor/client/meteorOverrides/login/password.ts b/apps/meteor/client/meteor/overrides/login/password.ts similarity index 93% rename from apps/meteor/client/meteorOverrides/login/password.ts rename to apps/meteor/client/meteor/overrides/login/password.ts index f1c6e32f2282b..7074290b1f2c5 100644 --- a/apps/meteor/client/meteorOverrides/login/password.ts +++ b/apps/meteor/client/meteor/overrides/login/password.ts @@ -1,7 +1,7 @@ import { Accounts } from 'meteor/accounts-base'; import { Meteor } from 'meteor/meteor'; -import { overrideLoginMethod, type LoginCallback } from '../../lib/2fa/overrideLoginMethod'; +import { overrideLoginMethod, type LoginCallback } from '../../../lib/2fa/overrideLoginMethod'; declare module 'meteor/meteor' { // eslint-disable-next-line @typescript-eslint/no-namespace diff --git a/apps/meteor/client/meteorOverrides/login/saml.ts b/apps/meteor/client/meteor/overrides/login/saml.ts similarity index 95% rename from apps/meteor/client/meteorOverrides/login/saml.ts rename to apps/meteor/client/meteor/overrides/login/saml.ts index 0561d6db13ad8..052fa42033594 100644 --- a/apps/meteor/client/meteorOverrides/login/saml.ts +++ b/apps/meteor/client/meteor/overrides/login/saml.ts @@ -2,8 +2,8 @@ import { Random } from '@rocket.chat/random'; import { Accounts } from 'meteor/accounts-base'; import { Meteor } from 'meteor/meteor'; -import { type LoginCallback, callLoginMethod, handleLogin } from '../../lib/2fa/overrideLoginMethod'; -import { settings } from '../../lib/settings'; +import { type LoginCallback, callLoginMethod, handleLogin } from '../../../lib/2fa/overrideLoginMethod'; +import { settings } from '../../../lib/settings'; declare module 'meteor/meteor' { // eslint-disable-next-line @typescript-eslint/no-namespace @@ -61,7 +61,7 @@ Meteor.logout = async function (...args) { if (provider && settings.peek('SAML_Custom_Default_idp_slo_redirect_url')) { console.info('SAML session terminated via SLO'); - const { sdk } = await import('../../../app/utils/client/lib/SDKClient'); + const { sdk } = await import('../../../../app/utils/client/lib/SDKClient'); sdk .call('samlLogout', provider) .then((result) => { diff --git a/apps/meteor/client/meteorOverrides/login/twitter.ts b/apps/meteor/client/meteor/overrides/login/twitter.ts similarity index 91% rename from apps/meteor/client/meteorOverrides/login/twitter.ts rename to apps/meteor/client/meteor/overrides/login/twitter.ts index b74ffadfe12d8..cddeb305be871 100644 --- a/apps/meteor/client/meteorOverrides/login/twitter.ts +++ b/apps/meteor/client/meteor/overrides/login/twitter.ts @@ -5,8 +5,8 @@ import { OAuth } from 'meteor/oauth'; import { Twitter } from 'meteor/twitter-oauth'; import { createOAuthTotpLoginMethod } from './oauth'; -import { overrideLoginMethod } from '../../lib/2fa/overrideLoginMethod'; -import { wrapRequestCredentialFn } from '../../lib/wrapRequestCredentialFn'; +import { overrideLoginMethod } from '../../../lib/2fa/overrideLoginMethod'; +import { wrapRequestCredentialFn } from '../../../lib/wrapRequestCredentialFn'; const { loginWithTwitter } = Meteor; const loginWithTwitterAndTOTP = createOAuthTotpLoginMethod(Twitter); diff --git a/apps/meteor/client/meteorOverrides/oauthRedirectUri.ts b/apps/meteor/client/meteor/overrides/oauthRedirectUri.ts similarity index 100% rename from apps/meteor/client/meteorOverrides/oauthRedirectUri.ts rename to apps/meteor/client/meteor/overrides/oauthRedirectUri.ts diff --git a/apps/meteor/client/meteorOverrides/settings.ts b/apps/meteor/client/meteor/overrides/settings.ts similarity index 89% rename from apps/meteor/client/meteorOverrides/settings.ts rename to apps/meteor/client/meteor/overrides/settings.ts index 790194d39b2aa..5235d4de0ef4e 100644 --- a/apps/meteor/client/meteorOverrides/settings.ts +++ b/apps/meteor/client/meteor/overrides/settings.ts @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { PublicSettings } from '../stores'; +import { PublicSettings } from '../../stores'; PublicSettings.use.subscribe((state) => { const removedIds = new Set(Object.keys(Meteor.settings)).difference(new Set(state.records.keys())); diff --git a/apps/meteor/client/meteorOverrides/totpOnCall.ts b/apps/meteor/client/meteor/overrides/totpOnCall.ts similarity index 88% rename from apps/meteor/client/meteorOverrides/totpOnCall.ts rename to apps/meteor/client/meteor/overrides/totpOnCall.ts index f4430db1b72d8..00506a7c2e2ab 100644 --- a/apps/meteor/client/meteorOverrides/totpOnCall.ts +++ b/apps/meteor/client/meteor/overrides/totpOnCall.ts @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; -import { t } from '../../app/utils/lib/i18n'; -import type { LoginCallback } from '../lib/2fa/overrideLoginMethod'; -import { process2faReturn, process2faAsyncReturn } from '../lib/2fa/process2faReturn'; -import { isTotpInvalidError } from '../lib/2fa/utils'; +import { t } from '../../../app/utils/lib/i18n'; +import type { LoginCallback } from '../../lib/2fa/overrideLoginMethod'; +import { process2faReturn, process2faAsyncReturn } from '../../lib/2fa/process2faReturn'; +import { isTotpInvalidError } from '../../lib/2fa/utils'; const withSyncTOTP = (call: (name: string, ...args: any[]) => any) => { const callWithTotp = diff --git a/apps/meteor/client/meteorOverrides/unstoreLoginToken.ts b/apps/meteor/client/meteor/overrides/unstoreLoginToken.ts similarity index 78% rename from apps/meteor/client/meteorOverrides/unstoreLoginToken.ts rename to apps/meteor/client/meteor/overrides/unstoreLoginToken.ts index 899d89605254a..8630d5b6ebcae 100644 --- a/apps/meteor/client/meteorOverrides/unstoreLoginToken.ts +++ b/apps/meteor/client/meteor/overrides/unstoreLoginToken.ts @@ -1,6 +1,6 @@ import { Accounts } from 'meteor/accounts-base'; -import { CachedStoresManager } from '../lib/cachedStores'; +import { CachedStoresManager } from '../../lib/cachedStores'; const { _unstoreLoginToken } = Accounts; Accounts._unstoreLoginToken = (...args) => { diff --git a/apps/meteor/client/meteorOverrides/userAndUsers.ts b/apps/meteor/client/meteor/overrides/userAndUsers.ts similarity index 96% rename from apps/meteor/client/meteorOverrides/userAndUsers.ts rename to apps/meteor/client/meteor/overrides/userAndUsers.ts index c90c98579301f..e8969df34648c 100644 --- a/apps/meteor/client/meteorOverrides/userAndUsers.ts +++ b/apps/meteor/client/meteor/overrides/userAndUsers.ts @@ -1,7 +1,7 @@ import type { IUser } from '@rocket.chat/core-typings'; import { Tracker } from 'meteor/tracker'; -import { Users } from '../stores/Users'; +import { Users } from '../../stores/Users'; // assertion is needed because global Mongo.Collection differs from the `meteor/mongo` package's Mongo.Collection Meteor.users = Users.collection as typeof Meteor.users; diff --git a/apps/meteor/client/lib/cachedStores/watch.ts b/apps/meteor/client/meteor/watch.ts similarity index 100% rename from apps/meteor/client/lib/cachedStores/watch.ts rename to apps/meteor/client/meteor/watch.ts diff --git a/apps/meteor/client/startup/accounts.ts b/apps/meteor/client/startup/accounts.ts index e91de7f87de77..c6a38360ebbea 100644 --- a/apps/meteor/client/startup/accounts.ts +++ b/apps/meteor/client/startup/accounts.ts @@ -5,9 +5,9 @@ import { Tracker } from 'meteor/tracker'; import { sdk } from '../../app/utils/client/lib/SDKClient'; import { t } from '../../app/utils/lib/i18n'; import { PublicSettingsCachedStore, SubscriptionsCachedStore } from '../cachedStores'; -import { watch } from '../lib/cachedStores'; import { dispatchToastMessage } from '../lib/toast'; import { useUserDataSyncReady } from '../lib/userData'; +import { watch } from '../meteor/watch'; const watchMainReady = () => { const uid = Meteor.userId(); diff --git a/yarn.lock b/yarn.lock index 85dcae41b4922..26dee18b2b923 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9419,7 +9419,7 @@ __metadata: peerDependencies: "@rocket.chat/layout": "*" "@rocket.chat/tools": 0.2.3 - "@rocket.chat/ui-contexts": 22.0.0-rc.6 + "@rocket.chat/ui-contexts": 22.0.0 "@tanstack/react-query": "*" react: "*" react-hook-form: "*"