From 0f35cad799ef865a46944682da5244000566fa9e Mon Sep 17 00:00:00 2001 From: Filipe Marins Date: Thu, 28 Apr 2022 13:29:06 -0300 Subject: [PATCH 1/8] Regression: Parser message when notify ephemeral message --- apps/meteor/server/modules/listeners/listeners.module.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/apps/meteor/server/modules/listeners/listeners.module.ts b/apps/meteor/server/modules/listeners/listeners.module.ts index a9a1c7579379..386ecf6354da 100644 --- a/apps/meteor/server/modules/listeners/listeners.module.ts +++ b/apps/meteor/server/modules/listeners/listeners.module.ts @@ -1,9 +1,12 @@ import { UserStatus, isSettingColor } from '@rocket.chat/core-typings'; +import { parser } from '@rocket.chat/message-parser'; import { IServiceClass } from '../../sdk/types/ServiceClass'; import { NotificationsModule } from '../notifications/notifications.module'; import { EnterpriseSettings } from '../../sdk/index'; +const { DISABLE_MESSAGE_PARSER = 'false' } = process.env; + const STATUS_MAP: { [k: string]: number } = { [UserStatus.OFFLINE]: 0, [UserStatus.ONLINE]: 1, @@ -32,6 +35,10 @@ export class ListenersModule { }); service.onEvent('notify.ephemeralMessage', (uid, rid, message) => { + if (message.msg && DISABLE_MESSAGE_PARSER !== 'true') { + message.md = parser(message.msg); + } + notifications.notifyUserInThisInstance(uid, 'message', { groupable: false, ...message, From 498a6ff4be0360136937253f30d59fb45fc0020a Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Fri, 29 Apr 2022 10:32:53 -0300 Subject: [PATCH 2/8] Chore: Create README.md for Rest Typings (#25335) --- packages/rest-typings/README.md | 85 +++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 packages/rest-typings/README.md diff --git a/packages/rest-typings/README.md b/packages/rest-typings/README.md new file mode 100644 index 000000000000..fa694d7ec122 --- /dev/null +++ b/packages/rest-typings/README.md @@ -0,0 +1,85 @@ + +# @rocket.chat/rest-typings + +Package containing all Rocket.Chat rest endpoint definitions + + +## Contributing + +Contributions are always welcome! +However we have some recommendations. +- Check if your implementation matches your definitions, a bad definition is worse than none. +- Use the generic types we created for paging. +- Create functions that assert properties (very useful for the backend) +- Do tests to ensure that your assertions are correct. +- Avoid incomplete and unknow typings + +### Good examples of what not to do: + +#### If you have an endpoint that accepts name or id, both are not optional, one of them is required + +```typescript + + type EndPointTestGetParams = { name?: string; id?: string; } // WRONG! + + type EndPointTestGetParams = { name: string; } | { id: string; } // Better :) +```` + +#### If you have an endpoint that accepts name or id, both are not optional, one of them is required + +```typescript + export const isEndPointTestGetParams = (props: any) is EndPointTestGetParams => 'name' in prop || 'id' in prop; // WRONG! + + // .... Better + + + import Ajv from 'ajv'; + + const ajv = new Ajv(); + const endPointTestGetParams = { + oneOf: [ + { + type: 'object', + properties: { + name: { + type: 'string', + }, + }, + required: ['name'], + additionalProperties: false, + }, + { + type: 'object', + properties: { + id: { + type: 'string', + }, + }, + required: ['id'], + additionalProperties: false, + }, + ], + }; + + export const isEndPointTestGetParams = ajv.compile(endPointTestGetParams); +``` +## Optimizations + +we use interfaces to register endpoints, so if you use a custom version, or miss an endpoint, you don't necessarily need to recompile the code, you can do it in your own code + +```typescript + declare module '@rocket.chat/rest-typings' { + interface Endpoints { + 'custom/endpoint': { + GET: (params: PaginatedRequest<{ query: string }>) => PaginatedResult<{ + some: string[]; + }>; + }; + } + } +``` + +## License + +MIT + From 219c79ddd38231f3e4c6ce665c52db4e022aae31 Mon Sep 17 00:00:00 2001 From: Guilherme Jun Grillo <48109548+guijun13@users.noreply.github.com> Date: Fri, 29 Apr 2022 12:28:38 -0300 Subject: [PATCH 3/8] Regression: bump onboarding-ui version (#25320) * fix: bump onboarding-ui version * fix: update adminData types --- .../contexts/SetupWizardContext.tsx | 2 +- .../providers/SetupWizardProvider.tsx | 10 +- .../setupWizard/steps/RegisterServerStep.tsx | 2 +- apps/meteor/package.json | 2 +- yarn.lock | 137 ++++++++++++++++-- 5 files changed, 133 insertions(+), 20 deletions(-) diff --git a/apps/meteor/client/views/setupWizard/contexts/SetupWizardContext.tsx b/apps/meteor/client/views/setupWizard/contexts/SetupWizardContext.tsx index 590e65aebaa0..052e79ef874f 100644 --- a/apps/meteor/client/views/setupWizard/contexts/SetupWizardContext.tsx +++ b/apps/meteor/client/views/setupWizard/contexts/SetupWizardContext.tsx @@ -37,7 +37,7 @@ type SetupWizarContextValue = { export const SetupWizardContext = createContext({ setupWizardData: { - adminData: { fullname: '', username: '', companyEmail: '', password: '' }, + adminData: { fullname: '', username: '', email: '', password: '' }, organizationData: { organizationName: '', organizationType: '', diff --git a/apps/meteor/client/views/setupWizard/providers/SetupWizardProvider.tsx b/apps/meteor/client/views/setupWizard/providers/SetupWizardProvider.tsx index 8d1d717ca37f..4e7c0e14b2cf 100644 --- a/apps/meteor/client/views/setupWizard/providers/SetupWizardProvider.tsx +++ b/apps/meteor/client/views/setupWizard/providers/SetupWizardProvider.tsx @@ -16,7 +16,7 @@ import { useParameters } from '../hooks/useParameters'; import { useStepRouting } from '../hooks/useStepRouting'; const initialData: ContextType['setupWizardData'] = { - adminData: { fullname: '', username: '', companyEmail: '', password: '' }, + adminData: { fullname: '', username: '', email: '', password: '' }, organizationData: { organizationName: '', organizationType: '', @@ -69,13 +69,13 @@ const SetupWizardProvider = ({ children }: { children: ReactElement }): ReactEle const registerAdminUser = useCallback(async (): Promise => { const { - adminData: { fullname, username, companyEmail, password }, + adminData: { fullname, username, email, password }, } = setupWizardData; - await registerUser({ name: fullname, username, email: companyEmail, pass: password }); + await registerUser({ name: fullname, username, email, pass: password }); callbacks.run('userRegistered', {}); try { - await loginWithPassword(companyEmail, password); + await loginWithPassword(email, password); } catch (error) { if (error instanceof Meteor.Error && error.error === 'error-invalid-email') { dispatchToastMessage({ type: 'success', message: t('We_have_sent_registration_email') }); @@ -90,7 +90,7 @@ const SetupWizardProvider = ({ children }: { children: ReactElement }): ReactEle setForceLogin(false); await defineUsername(username); - await dispatchSettings([{ _id: 'Organization_Email', value: companyEmail }]); + await dispatchSettings([{ _id: 'Organization_Email', value: email }]); callbacks.run('usernameSet', {}); }, [defineUsername, dispatchToastMessage, loginWithPassword, registerUser, setForceLogin, dispatchSettings, setupWizardData, t]); diff --git a/apps/meteor/client/views/setupWizard/steps/RegisterServerStep.tsx b/apps/meteor/client/views/setupWizard/steps/RegisterServerStep.tsx index 265fb5e601f3..5221730d4664 100644 --- a/apps/meteor/client/views/setupWizard/steps/RegisterServerStep.tsx +++ b/apps/meteor/client/views/setupWizard/steps/RegisterServerStep.tsx @@ -51,7 +51,7 @@ const RegisterServerStep = (): ReactElement => { stepCount={maxSteps} onSubmit={handleRegister} currentStep={currentStep} - initialValues={{ email: adminData.companyEmail }} + initialValues={{ email: adminData.email }} /> ); }; diff --git a/apps/meteor/package.json b/apps/meteor/package.json index 395ea012a2ed..7717dbd87cbe 100644 --- a/apps/meteor/package.json +++ b/apps/meteor/package.json @@ -203,7 +203,7 @@ "@rocket.chat/memo": "~0.31.10", "@rocket.chat/message-parser": "~0.31.10", "@rocket.chat/mp3-encoder": "^0.24.0", - "@rocket.chat/onboarding-ui": "~0.31.10", + "@rocket.chat/onboarding-ui": "next", "@rocket.chat/rest-typings": "workspace:^", "@rocket.chat/string-helpers": "~0.31.10", "@rocket.chat/ui-kit": "~0.31.10", diff --git a/yarn.lock b/yarn.lock index 60a1680869b2..4378569bef53 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3440,6 +3440,19 @@ __metadata: languageName: node linkType: hard +"@rocket.chat/css-in-js@npm:~0.31.11-dev.1": + version: 0.31.11-dev.1 + resolution: "@rocket.chat/css-in-js@npm:0.31.11-dev.1" + dependencies: + "@emotion/hash": ^0.8.0 + "@rocket.chat/css-supports": ~0.31.11-dev.1 + "@rocket.chat/memo": ~0.31.11-dev.1 + "@rocket.chat/stylis-logical-props-middleware": ~0.31.11-dev.1 + stylis: ~4.0.13 + checksum: 1535a240f01b4433bfc7428ec094b4d82ca901d5775ecc3e07a7cdc3d61fe605b4f369729fd83a8d103bfcb21e07bf7e55404e37fad650ea2cb100ecdec7038e + languageName: node + linkType: hard + "@rocket.chat/css-supports@npm:^0.31.10": version: 0.31.10 resolution: "@rocket.chat/css-supports@npm:0.31.10" @@ -3449,6 +3462,15 @@ __metadata: languageName: node linkType: hard +"@rocket.chat/css-supports@npm:~0.31.11-dev.1": + version: 0.31.11-dev.1 + resolution: "@rocket.chat/css-supports@npm:0.31.11-dev.1" + dependencies: + "@rocket.chat/memo": ~0.31.11-dev.1 + checksum: 2bda5dda225bf8cf8e35ed473c3750c871a97c6c99797261f9b13bcf3d22c0f578c847b11688f0b8dabc146671066eaa698cde004e156586586fbc175b001650 + languageName: node + linkType: hard + "@rocket.chat/emitter@npm:~0.31.10": version: 0.31.10 resolution: "@rocket.chat/emitter@npm:0.31.10" @@ -3554,6 +3576,19 @@ __metadata: languageName: node linkType: hard +"@rocket.chat/fuselage-hooks@npm:~0.31.11-dev.1": + version: 0.31.11-dev.1 + resolution: "@rocket.chat/fuselage-hooks@npm:0.31.11-dev.1" + dependencies: + "@testing-library/user-event": ^13.5.0 + peerDependencies: + "@rocket.chat/fuselage-tokens": "*" + react: ^17.0.2 + use-subscription: ^1.5.1 + checksum: 7251296bcc32e9cbe7b0f9c32034f2a83dc514e9dab61a4f4e1892f861b65a05a46953f53fb3b5697f4fdd5c22db9fac2700d2f992a71f24e8b46271ac8fc568 + languageName: node + linkType: hard + "@rocket.chat/fuselage-polyfills@npm:~0.31.10": version: 0.31.10 resolution: "@rocket.chat/fuselage-polyfills@npm:0.31.10" @@ -3575,6 +3610,13 @@ __metadata: languageName: node linkType: hard +"@rocket.chat/fuselage-tokens@npm:~0.31.11-dev.1": + version: 0.31.11-dev.1 + resolution: "@rocket.chat/fuselage-tokens@npm:0.31.11-dev.1" + checksum: 09a3fa246a3ab897c82bff036d2694cd09d74b0a90e6e16a86f66ec8949f6aae735c15ccfa1bfc74a7e59bcdb7e2115b50ff4040940475170955fbef854e87c2 + languageName: node + linkType: hard + "@rocket.chat/fuselage-ui-kit@npm:~0.31.10": version: 0.31.10 resolution: "@rocket.chat/fuselage-ui-kit@npm:0.31.10" @@ -3614,6 +3656,27 @@ __metadata: languageName: node linkType: hard +"@rocket.chat/fuselage@npm:~0.32.0-dev.22": + version: 0.32.0-dev.22 + resolution: "@rocket.chat/fuselage@npm:0.32.0-dev.22" + dependencies: + "@rocket.chat/css-in-js": ~0.31.11-dev.1 + "@rocket.chat/css-supports": ~0.31.11-dev.1 + "@rocket.chat/fuselage-tokens": ~0.31.11-dev.1 + "@rocket.chat/memo": ~0.31.11-dev.1 + invariant: ^2.2.4 + react-keyed-flatten-children: ^1.3.0 + peerDependencies: + "@rocket.chat/fuselage-hooks": "*" + "@rocket.chat/fuselage-polyfills": "*" + "@rocket.chat/icons": "*" + react: ^17.0.2 + react-dom: ^17.0.2 + react-virtuoso: 1.2.4 + checksum: eea86dce12a8e17e244ce03bec61ec4450fc8bdcd58d2f2d20b58149e7c4489215931e80297e1cafebe949428ac78702ce6a448dddd5d4d4a30532bad01ebb9d + languageName: node + linkType: hard + "@rocket.chat/icons@npm:^0.31.0, @rocket.chat/icons@npm:^0.31.9": version: 0.31.9 resolution: "@rocket.chat/icons@npm:0.31.9" @@ -3621,13 +3684,20 @@ __metadata: languageName: node linkType: hard -"@rocket.chat/icons@npm:^0.31.10, @rocket.chat/icons@npm:~0.31.10": +"@rocket.chat/icons@npm:~0.31.10": version: 0.31.10 resolution: "@rocket.chat/icons@npm:0.31.10" checksum: eb3d412fac4f3bee0971c5073017530b89e5ee583b7173c42e31cc4220ac5fc7a397709f1fda9e1b91cc73b993dab9eb45b69618e729e62135c333287c1ca6a0 languageName: node linkType: hard +"@rocket.chat/icons@npm:~0.32.0-dev.4": + version: 0.32.0-dev.4 + resolution: "@rocket.chat/icons@npm:0.32.0-dev.4" + checksum: 6160dcf4caf21f8621c2cc91a170b4913f4dbbcb9a585578777cf2b6a0eae5a0caa85ef470542ba7c1402aecf64b7d6780b6284a11f8c468ffeb2270bf64c2d1 + languageName: node + linkType: hard + "@rocket.chat/livechat@npm:1.13.3": version: 1.13.3 resolution: "@rocket.chat/livechat@npm:1.13.3" @@ -3654,7 +3724,7 @@ __metadata: languageName: node linkType: hard -"@rocket.chat/logo@npm:^0.31.10, @rocket.chat/logo@npm:~0.31.10": +"@rocket.chat/logo@npm:~0.31.10": version: 0.31.10 resolution: "@rocket.chat/logo@npm:0.31.10" dependencies: @@ -3668,6 +3738,20 @@ __metadata: languageName: node linkType: hard +"@rocket.chat/logo@npm:~0.31.11-dev.1": + version: 0.31.11-dev.1 + resolution: "@rocket.chat/logo@npm:0.31.11-dev.1" + dependencies: + "@rocket.chat/fuselage-hooks": ~0.31.11-dev.1 + "@rocket.chat/styled": ~0.31.11-dev.1 + tslib: ^2.3.1 + peerDependencies: + react: 17.0.2 + react-dom: 17.0.2 + checksum: 2744fcc3cd8c6d04a406ba2abac4231c45b67abea0b703699869a32200a9778c8da02b02e618fcd74b184eb6e15357aa0c2a55a5fafee68b3e76f4587093c554 + languageName: node + linkType: hard + "@rocket.chat/memo@npm:^0.31.10, @rocket.chat/memo@npm:~0.31.10": version: 0.31.10 resolution: "@rocket.chat/memo@npm:0.31.10" @@ -3675,6 +3759,13 @@ __metadata: languageName: node linkType: hard +"@rocket.chat/memo@npm:~0.31.11-dev.1": + version: 0.31.11-dev.1 + resolution: "@rocket.chat/memo@npm:0.31.11-dev.1" + checksum: c85ad1df5adad84e3aa22fe591b1b267ca65f8a8d844e7b2353b273a73df06284bb366b3f506ad5abf30c2b10c3d3347801791887f06c1f950a4d5bc142d0366 + languageName: node + linkType: hard + "@rocket.chat/message-parser@npm:^0.31.6, @rocket.chat/message-parser@npm:~0.31.9": version: 0.31.9 resolution: "@rocket.chat/message-parser@npm:0.31.9" @@ -3727,7 +3818,7 @@ __metadata: "@rocket.chat/memo": ~0.31.10 "@rocket.chat/message-parser": ~0.31.10 "@rocket.chat/mp3-encoder": ^0.24.0 - "@rocket.chat/onboarding-ui": ~0.31.10 + "@rocket.chat/onboarding-ui": next "@rocket.chat/rest-typings": "workspace:^" "@rocket.chat/string-helpers": ~0.31.10 "@rocket.chat/ui-kit": ~0.31.10 @@ -3992,15 +4083,15 @@ __metadata: languageName: node linkType: hard -"@rocket.chat/onboarding-ui@npm:~0.31.10": - version: 0.31.10 - resolution: "@rocket.chat/onboarding-ui@npm:0.31.10" +"@rocket.chat/onboarding-ui@npm:next": + version: 0.32.0-dev.22 + resolution: "@rocket.chat/onboarding-ui@npm:0.32.0-dev.22" dependencies: - "@rocket.chat/fuselage": ^0.31.10 - "@rocket.chat/fuselage-hooks": ^0.31.10 - "@rocket.chat/icons": ^0.31.10 - "@rocket.chat/logo": ^0.31.10 - "@rocket.chat/styled": ^0.31.10 + "@rocket.chat/fuselage": ~0.32.0-dev.22 + "@rocket.chat/fuselage-hooks": ~0.31.11-dev.1 + "@rocket.chat/icons": ~0.32.0-dev.4 + "@rocket.chat/logo": ~0.31.11-dev.1 + "@rocket.chat/styled": ~0.31.11-dev.1 i18next: ~21.6.11 react-hook-form: ~7.27.0 tslib: ~2.3.1 @@ -4009,7 +4100,7 @@ __metadata: react: 17.0.2 react-dom: 17.0.2 react-i18next: ~11.15.4 - checksum: b3e3bd6dbe25e590614af00e53127e6a2e1ed616054857319d52fbd1cf5a4adbaa6e0ce6c5b078602f249e2cae210c82e1c9a746280d7c4adc08ceaf229c3a31 + checksum: c287d7c857dc10f1b231c709ca600102dcfaa4a19e1125d2151e0f9dfecbba6586fb31214af998a3b2a946fb0d67be5a3c1a93c132104645d3503223cfea879b languageName: node linkType: hard @@ -4073,6 +4164,16 @@ __metadata: languageName: node linkType: hard +"@rocket.chat/styled@npm:~0.31.11-dev.1": + version: 0.31.11-dev.1 + resolution: "@rocket.chat/styled@npm:0.31.11-dev.1" + dependencies: + "@rocket.chat/css-in-js": ~0.31.11-dev.1 + tslib: ^2.3.1 + checksum: 44d8f501d6ecd47987e60004f789a194d470d3125aed65b9fd2d69d66c2577548545a593954ad136444ad71f9082f7e59b6d81437d89db56c3ac82f6c4dcb7f8 + languageName: node + linkType: hard + "@rocket.chat/stylis-logical-props-middleware@npm:^0.31.10": version: 0.31.10 resolution: "@rocket.chat/stylis-logical-props-middleware@npm:0.31.10" @@ -4085,6 +4186,18 @@ __metadata: languageName: node linkType: hard +"@rocket.chat/stylis-logical-props-middleware@npm:~0.31.11-dev.1": + version: 0.31.11-dev.1 + resolution: "@rocket.chat/stylis-logical-props-middleware@npm:0.31.11-dev.1" + dependencies: + "@rocket.chat/css-supports": ~0.31.11-dev.1 + tslib: ^2.3.1 + peerDependencies: + stylis: 4.0.10 + checksum: 6859ceedd0942261d6727759cfb0e1e98823423fa305f0bbcdc1d2196c83932ce48cc3a34c098e2f881d09f850eb4db7bfd5f4ef53ea6557ab5db7027f677a84 + languageName: node + linkType: hard + "@rocket.chat/ui-kit@npm:^0.14.1": version: 0.14.1 resolution: "@rocket.chat/ui-kit@npm:0.14.1" From 311af9c63720dceafff3ec222f0ccef72dd9bd6f Mon Sep 17 00:00:00 2001 From: Filipe Marins Date: Fri, 29 Apr 2022 17:38:35 -0300 Subject: [PATCH 4/8] Regression: Fix multi line is not showing an empty line between lines (#25317) * fix: render empty line * remove style * add small comment Co-authored-by: gabriellsh --- .../components/Message/MessageBodyRender/PlainText.tsx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/apps/meteor/client/components/Message/MessageBodyRender/PlainText.tsx b/apps/meteor/client/components/Message/MessageBodyRender/PlainText.tsx index 5c0cd2c4011e..5b1c3ff7172d 100644 --- a/apps/meteor/client/components/Message/MessageBodyRender/PlainText.tsx +++ b/apps/meteor/client/components/Message/MessageBodyRender/PlainText.tsx @@ -12,6 +12,12 @@ const PlainText: FC = ({ value: text }) => { const highlights = useMessageListHighlights(); const katex = useMessageListKatex(); + // TODO ENG DAY: + // Add style for empty paragraphs in fuselage + if (!text.trim()) { + return
; + } + if (highlights || katex) { return ; } From deb5e8ef1871e5ecdbbf2d881cddaba3a8d85da1 Mon Sep 17 00:00:00 2001 From: Pierre Lehnen <55164754+pierre-lehnen-rc@users.noreply.github.com> Date: Mon, 2 May 2022 13:46:59 -0300 Subject: [PATCH 5/8] Regression: Rocket.Chat Webapp not loading. (#25349) Co-authored-by: gabriellsh --- apps/meteor/package.json | 2 +- yarn.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/meteor/package.json b/apps/meteor/package.json index 7717dbd87cbe..05d4ea8c342f 100644 --- a/apps/meteor/package.json +++ b/apps/meteor/package.json @@ -344,7 +344,7 @@ "underscore.string": "^3.3.6", "universal-perf-hooks": "^1.0.1", "url-polyfill": "^1.1.12", - "use-subscription": "^1.6.0", + "use-subscription": "~1.6.0", "uuid": "^3.4.0", "webdav": "^2.10.2", "xml-crypto": "^2.1.3", diff --git a/yarn.lock b/yarn.lock index 4378569bef53..cc1e1e2cc570 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4062,7 +4062,7 @@ __metadata: underscore.string: ^3.3.6 universal-perf-hooks: ^1.0.1 url-polyfill: ^1.1.12 - use-subscription: ^1.6.0 + use-subscription: ~1.6.0 uuid: ^3.4.0 webdav: ^2.10.2 webpack: ^4.44.1 @@ -28072,7 +28072,7 @@ __metadata: languageName: node linkType: hard -"use-subscription@npm:^1.6.0": +"use-subscription@npm:~1.6.0": version: 1.6.0 resolution: "use-subscription@npm:1.6.0" peerDependencies: From 8e178934e7aafcba6d5cafdacd93ae5992e2f745 Mon Sep 17 00:00:00 2001 From: Douglas Gubert Date: Mon, 2 May 2022 17:24:49 -0300 Subject: [PATCH 6/8] Regression: Fix English i18n react text (#25368) --- .../views/room/MessageList/components/MessageReaction.tsx | 6 +++--- apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/meteor/client/views/room/MessageList/components/MessageReaction.tsx b/apps/meteor/client/views/room/MessageList/components/MessageReaction.tsx index 0ce85d54dc16..96b4bc082e24 100644 --- a/apps/meteor/client/views/room/MessageList/components/MessageReaction.tsx +++ b/apps/meteor/client/views/room/MessageList/components/MessageReaction.tsx @@ -15,9 +15,9 @@ type TranslationRepliesKey = // "You": "You", // "You_user_have_reacted": "You have reacted", -// "Users_and_more_reacted_with": "__users__ and __count__ more have react with __emoji__", -// "You_and_more_Reacted_with": "You, __users__ and __count__ more have react with __emoji__", -// "You_and_Reacted_with": "You and __count__ more have react with __emoji__", +// "Users_and_more_reacted_with": "__users__ and __count__ more have reacted with __emoji__", +// "You_and_more_Reacted_with": "You, __users__ and __count__ more have reacted with __emoji__", +// "You_and_Reacted_with": "You and __count__ more have reacted with __emoji__", const getTranslationKey = (users: string[], mine: boolean): TranslationRepliesKey => { if (users.length === 0) { diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json index d158d61f833a..86000d956a39 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json @@ -4882,10 +4882,10 @@ "Yesterday": "Yesterday", "You": "You", "You_have_reacted": "You have reacted", - "Users_reacted_with": "__users__ have react with __emoji__", - "Users_and_more_reacted_with": "__users__ and __count__ more have react with __emoji__", - "You_and_users_Reacted_with": "You and __users__ have react with __emoji__", - "You_users_and_more_Reacted_with": "You, __users__ and __count__ more have react with __emoji__", + "Users_reacted_with": "__users__ have reacted with __emoji__", + "Users_and_more_reacted_with": "__users__ and __count__ more have reacted with __emoji__", + "You_and_users_Reacted_with": "You and __users__ have reacted with __emoji__", + "You_users_and_more_Reacted_with": "You, __users__ and __count__ more have reacted with __emoji__", "You_are_converting_team_to_channel": "You are converting this Team to a Channel.", "you_are_in_preview_mode_of": "You are in preview mode of channel #__room_name__", "you_are_in_preview_mode_of_incoming_livechat": "You are in preview mode of this chat", From fcc18d7b7440197337c0d077f1dda5b1828521c7 Mon Sep 17 00:00:00 2001 From: Diego Sampaio Date: Mon, 2 May 2022 18:28:55 -0300 Subject: [PATCH 7/8] Chore: Add options to debug stdout and rate limiter (#25336) --- .../app/lib/server/startup/rateLimiter.js | 22 ++++++++++++++++--- apps/meteor/server/lib/logger/logQueue.ts | 4 +++- apps/meteor/server/stream/stdout.ts | 22 +++++++++++++++---- 3 files changed, 40 insertions(+), 8 deletions(-) diff --git a/apps/meteor/app/lib/server/startup/rateLimiter.js b/apps/meteor/app/lib/server/startup/rateLimiter.js index be5f8196e862..00b223b9e990 100644 --- a/apps/meteor/app/lib/server/startup/rateLimiter.js +++ b/apps/meteor/app/lib/server/startup/rateLimiter.js @@ -4,11 +4,22 @@ import { DDPRateLimiter } from 'meteor/ddp-rate-limiter'; import { RateLimiter } from 'meteor/rate-limit'; import { settings } from '../../../settings/server'; -import { metrics } from '../../../metrics'; -import { Logger } from '../../../logger'; +import { metrics } from '../../../metrics/server'; +import { Logger } from '../../../logger/server'; const logger = new Logger('RateLimiter'); +const slowDownRate = parseInt(process.env.RATE_LIMITER_SLOWDOWN_RATE); + +const rateLimiterConsoleLog = ({ msg, reply, input }) => { + console.warn('DDP RATE LIMIT:', msg); + console.warn(JSON.stringify({ reply, input }, null, 2)); +}; + +const rateLimiterLogger = ({ msg, reply, input }) => logger.info({ msg, reply, input }); + +const rateLimiterLog = String(process.env.RATE_LIMITER_LOGGER) === 'console' ? rateLimiterConsoleLog : rateLimiterLogger; + // Get initial set of names already registered for rules const names = new Set( Object.values(DDPRateLimiter.printRules()) @@ -85,6 +96,7 @@ RateLimiter.prototype.check = function (input) { callbackReply.timeToReset = ruleResult.timeToNextReset; callbackReply.allowed = false; callbackReply.numInvocationsLeft = 0; + callbackReply.numInvocationsExceeded = numInvocations - rule.options.numRequestsAllowed; rule._executeCallback(callbackReply, input); // ==== END OVERRIDE ==== } else { @@ -112,7 +124,7 @@ const ruleIds = {}; const callback = (msg, name) => (reply, input) => { if (reply.allowed === false) { - logger.info({ msg, reply, input }); + rateLimiterLog({ msg, reply, input }); metrics.ddpRateLimitExceeded.inc({ limit_name: name, user_id: input.userId, @@ -121,6 +133,10 @@ const callback = (msg, name) => (reply, input) => { name: input.name, connection_id: input.connectionId, }); + // sleep before sending the error to slow down next requests + if (slowDownRate > 0 && reply.numInvocationsExceeded) { + Meteor._sleepForMs(slowDownRate * reply.numInvocationsExceeded); + } // } else { // console.log('DDP RATE LIMIT:', message); // console.log(JSON.stringify({ ...reply, ...input }, null, 2)); diff --git a/apps/meteor/server/lib/logger/logQueue.ts b/apps/meteor/server/lib/logger/logQueue.ts index 31d356f1ba3f..85eabb71f013 100644 --- a/apps/meteor/server/lib/logger/logQueue.ts +++ b/apps/meteor/server/lib/logger/logQueue.ts @@ -1,5 +1,7 @@ import EventEmitter from 'events'; +const { MOLECULER_LOG_LEVEL, STDOUT_VIEWER_DISABLED = 'false' } = process.env; + type LogQueue = { id: string; data: string; @@ -56,6 +58,6 @@ function queueWrite(...args: any): boolean { return true; } -if (String(process.env.MOLECULER_LOG_LEVEL).toLowerCase() !== 'debug') { +if (String(MOLECULER_LOG_LEVEL).toLowerCase() !== 'debug' && STDOUT_VIEWER_DISABLED === 'false') { process.stdout.write = queueWrite; } diff --git a/apps/meteor/server/stream/stdout.ts b/apps/meteor/server/stream/stdout.ts index 12b1c5a0d5ee..50211e9fafd0 100644 --- a/apps/meteor/server/stream/stdout.ts +++ b/apps/meteor/server/stream/stdout.ts @@ -1,10 +1,12 @@ +import { performance } from 'perf_hooks'; + import { EJSON } from 'meteor/ejson'; import { Log } from 'meteor/logging'; import notifications from '../../app/notifications/server/lib/Notifications'; import { getQueuedLogs, logEntries } from '../lib/logger/logQueue'; -const processString = function (string: string, date: Date): string { +function processString(string: string, date: Date): string { let obj; try { if (string[0] === '{') { @@ -20,15 +22,27 @@ const processString = function (string: string, date: Date): string { } catch (error) { return string; } -}; +} -const transformLog = function (item: any): { id: string; string: string; ts: Date } { +function rawTransformLog(item: any): { id: string; string: string; ts: Date; time?: number } { return { id: item.id, string: processString(item.data, item.ts), ts: item.ts, }; -}; +} + +function timedTransformLog(log: any): { id: string; string: string; ts: Date; time?: number } { + const timeStart = performance.now(); + const item = rawTransformLog(log); + const timeEnd = performance.now(); + + item.time = timeEnd - timeStart; + + return item; +} + +const transformLog = process.env.STDOUT_METRICS === 'true' ? timedTransformLog : rawTransformLog; logEntries.on('log', (item) => { // TODO having this as 'emitWithoutBroadcast' will not sent this data to ddp-streamer, so this data From 2db109b444017a884f755c528456b3359f61a406 Mon Sep 17 00:00:00 2001 From: gabriellsh <40830821+gabriellsh@users.noreply.github.com> Date: Mon, 2 May 2022 19:02:50 -0300 Subject: [PATCH 8/8] Chore: Bump fuselage (#25371) --- apps/meteor/package.json | 28 ++-- yarn.lock | 319 +++++++++++++-------------------------- 2 files changed, 117 insertions(+), 230 deletions(-) diff --git a/apps/meteor/package.json b/apps/meteor/package.json index 05d4ea8c342f..4a5cead7c856 100644 --- a/apps/meteor/package.json +++ b/apps/meteor/package.json @@ -189,24 +189,24 @@ "@nivo/pie": "0.73.0", "@rocket.chat/apps-engine": "^1.31.0", "@rocket.chat/core-typings": "workspace:^", - "@rocket.chat/css-in-js": "~0.31.10", - "@rocket.chat/emitter": "~0.31.10", + "@rocket.chat/css-in-js": "~0.31.11", + "@rocket.chat/emitter": "~0.31.11", "@rocket.chat/forked-matrix-appservice-bridge": "^4.0.1", "@rocket.chat/forked-matrix-bot-sdk": "^0.6.0-beta.2", - "@rocket.chat/fuselage": "~0.31.10", - "@rocket.chat/fuselage-hooks": "~0.31.10", - "@rocket.chat/fuselage-polyfills": "~0.31.10", - "@rocket.chat/fuselage-tokens": "~0.31.10", - "@rocket.chat/fuselage-ui-kit": "~0.31.10", - "@rocket.chat/icons": "~0.31.10", - "@rocket.chat/logo": "~0.31.10", - "@rocket.chat/memo": "~0.31.10", - "@rocket.chat/message-parser": "~0.31.10", + "@rocket.chat/fuselage": "~0.31.11", + "@rocket.chat/fuselage-hooks": "~0.31.11", + "@rocket.chat/fuselage-polyfills": "~0.31.11", + "@rocket.chat/fuselage-tokens": "~0.31.11", + "@rocket.chat/fuselage-ui-kit": "~0.31.11", + "@rocket.chat/icons": "~0.31.11", + "@rocket.chat/logo": "~0.31.11", + "@rocket.chat/memo": "~0.31.11", + "@rocket.chat/message-parser": "~0.31.11", "@rocket.chat/mp3-encoder": "^0.24.0", - "@rocket.chat/onboarding-ui": "next", + "@rocket.chat/onboarding-ui": "~0.31.11", "@rocket.chat/rest-typings": "workspace:^", - "@rocket.chat/string-helpers": "~0.31.10", - "@rocket.chat/ui-kit": "~0.31.10", + "@rocket.chat/string-helpers": "~0.31.11", + "@rocket.chat/ui-kit": "~0.31.11", "@slack/client": "^4.12.0", "@types/cookie": "^0.4.1", "@types/lodash": "^4.14.177", diff --git a/yarn.lock b/yarn.lock index cc1e1e2cc570..80a948e88e6b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3427,54 +3427,32 @@ __metadata: languageName: unknown linkType: soft -"@rocket.chat/css-in-js@npm:^0.31.10, @rocket.chat/css-in-js@npm:~0.31.10": - version: 0.31.10 - resolution: "@rocket.chat/css-in-js@npm:0.31.10" +"@rocket.chat/css-in-js@npm:^0.31.11, @rocket.chat/css-in-js@npm:~0.31.11": + version: 0.31.11 + resolution: "@rocket.chat/css-in-js@npm:0.31.11" dependencies: "@emotion/hash": ^0.8.0 - "@rocket.chat/css-supports": ^0.31.10 - "@rocket.chat/memo": ^0.31.10 - "@rocket.chat/stylis-logical-props-middleware": ^0.31.10 + "@rocket.chat/css-supports": ^0.31.11 + "@rocket.chat/memo": ^0.31.11 + "@rocket.chat/stylis-logical-props-middleware": ^0.31.11 stylis: ~4.0.13 - checksum: 70e5f01e6952bda4502819f5eaf897afd8c133e3e7ad3903177ff8f279eb92286b3345dc6d793ba12e83b30878f7afa25b5f9eb79599eaed60fe969d23a885c8 + checksum: a6e67b89f431e01d364b9d79774e3be369b77f9b2dd5559f9ea6822032104876e980919116b4fdb46e80d76675ee44555c628850cfe75c3e4811cbb84fdf59db languageName: node linkType: hard -"@rocket.chat/css-in-js@npm:~0.31.11-dev.1": - version: 0.31.11-dev.1 - resolution: "@rocket.chat/css-in-js@npm:0.31.11-dev.1" +"@rocket.chat/css-supports@npm:^0.31.11": + version: 0.31.11 + resolution: "@rocket.chat/css-supports@npm:0.31.11" dependencies: - "@emotion/hash": ^0.8.0 - "@rocket.chat/css-supports": ~0.31.11-dev.1 - "@rocket.chat/memo": ~0.31.11-dev.1 - "@rocket.chat/stylis-logical-props-middleware": ~0.31.11-dev.1 - stylis: ~4.0.13 - checksum: 1535a240f01b4433bfc7428ec094b4d82ca901d5775ecc3e07a7cdc3d61fe605b4f369729fd83a8d103bfcb21e07bf7e55404e37fad650ea2cb100ecdec7038e - languageName: node - linkType: hard - -"@rocket.chat/css-supports@npm:^0.31.10": - version: 0.31.10 - resolution: "@rocket.chat/css-supports@npm:0.31.10" - dependencies: - "@rocket.chat/memo": ^0.31.10 - checksum: 8cf7f43c0f154caa9d7c3aefdd9e9380b23d617ca36ffe07c3def00be34e83343ce3784f2ee511f58156ec3a2cb08f07b7f4c06737428386ca3f9c6ae698f530 - languageName: node - linkType: hard - -"@rocket.chat/css-supports@npm:~0.31.11-dev.1": - version: 0.31.11-dev.1 - resolution: "@rocket.chat/css-supports@npm:0.31.11-dev.1" - dependencies: - "@rocket.chat/memo": ~0.31.11-dev.1 - checksum: 2bda5dda225bf8cf8e35ed473c3750c871a97c6c99797261f9b13bcf3d22c0f578c847b11688f0b8dabc146671066eaa698cde004e156586586fbc175b001650 + "@rocket.chat/memo": ^0.31.11 + checksum: 9db06cef9dd116c86629a10e6ee72db6beff3295b95b4bbc4ec5b37db4c9320f68bb29139c4af5af805d549c5096f08c026578425ed9043f03c06399b8d895c2 languageName: node linkType: hard -"@rocket.chat/emitter@npm:~0.31.10": - version: 0.31.10 - resolution: "@rocket.chat/emitter@npm:0.31.10" - checksum: fb72e86b47e2e1b5add11717547aa11416efe228b54612a98e12fedf74875580a071e2f51edcb55b37ab95106aa7feaa7257b35d62abc517471433cf06e6f802 +"@rocket.chat/emitter@npm:~0.31.11": + version: 0.31.11 + resolution: "@rocket.chat/emitter@npm:0.31.11" + checksum: 12b008c350c11276a66901efbd2015be1c135e7604f20c261504207f2a5de5b6a83d91a11191cdc896d14f6147711b189f229a82fadceeeed419cfea200550bb languageName: node linkType: hard @@ -3563,35 +3541,22 @@ __metadata: languageName: node linkType: hard -"@rocket.chat/fuselage-hooks@npm:^0.31.10, @rocket.chat/fuselage-hooks@npm:~0.31.10": - version: 0.31.10 - resolution: "@rocket.chat/fuselage-hooks@npm:0.31.10" +"@rocket.chat/fuselage-hooks@npm:^0.31.11, @rocket.chat/fuselage-hooks@npm:~0.31.11": + version: 0.31.11 + resolution: "@rocket.chat/fuselage-hooks@npm:0.31.11" dependencies: "@testing-library/user-event": ^13.5.0 peerDependencies: "@rocket.chat/fuselage-tokens": "*" react: ^17.0.2 use-subscription: ^1.5.1 - checksum: 9b0883d9c5905a8f20abac5c5fa88d91c975264d069445c99c8be702a54653ad8af7ba5c8e2c250deac34a21e298c9e2009a33bc1b24b1dbfca74ca86d7e04bf + checksum: 923d0e30616609651ed4e7b3dbf2342de3788cee2a7e8ce3612b22291c2ecc3291e981f4d2111bf3465b3678f8f7d592c7a19c400fd9a60ada88c2a7b850fb93 languageName: node linkType: hard -"@rocket.chat/fuselage-hooks@npm:~0.31.11-dev.1": - version: 0.31.11-dev.1 - resolution: "@rocket.chat/fuselage-hooks@npm:0.31.11-dev.1" - dependencies: - "@testing-library/user-event": ^13.5.0 - peerDependencies: - "@rocket.chat/fuselage-tokens": "*" - react: ^17.0.2 - use-subscription: ^1.5.1 - checksum: 7251296bcc32e9cbe7b0f9c32034f2a83dc514e9dab61a4f4e1892f861b65a05a46953f53fb3b5697f4fdd5c22db9fac2700d2f992a71f24e8b46271ac8fc568 - languageName: node - linkType: hard - -"@rocket.chat/fuselage-polyfills@npm:~0.31.10": - version: 0.31.10 - resolution: "@rocket.chat/fuselage-polyfills@npm:0.31.10" +"@rocket.chat/fuselage-polyfills@npm:~0.31.11": + version: 0.31.11 + resolution: "@rocket.chat/fuselage-polyfills@npm:0.31.11" dependencies: "@juggle/resize-observer": ^3.3.1 clipboard-polyfill: ^3.0.3 @@ -3599,50 +3564,43 @@ __metadata: focus-visible: ^5.2.0 focus-within-polyfill: ^5.2.1 new-event-polyfill: ^1.0.1 - checksum: 6fa9faf29f2c5a8b7c900b97d2f3661559cec7ff0c5b0206f576962b888f65b265b8f4ebe4029091b4f6bee69712e5f32077413e2988051d5054f09d22d5e520 - languageName: node - linkType: hard - -"@rocket.chat/fuselage-tokens@npm:^0.31.10, @rocket.chat/fuselage-tokens@npm:~0.31.10": - version: 0.31.10 - resolution: "@rocket.chat/fuselage-tokens@npm:0.31.10" - checksum: b3f3a646313fb32340cbacc3b42958bb372b504581255ced0bc0e973ece77bf14215fa7f0d045df3f11211cde06f4c69d9827fe3d1d234afb2c5002dc0d770de + checksum: 0a7932ce9374576adf2247560c70b2aea3167527f44ec2e3848ba0e8e64512fb4aa9c0a2d693c12621b8664a80dff6e6be5f31086837ab7f7ccec80c5e8974bf languageName: node linkType: hard -"@rocket.chat/fuselage-tokens@npm:~0.31.11-dev.1": - version: 0.31.11-dev.1 - resolution: "@rocket.chat/fuselage-tokens@npm:0.31.11-dev.1" - checksum: 09a3fa246a3ab897c82bff036d2694cd09d74b0a90e6e16a86f66ec8949f6aae735c15ccfa1bfc74a7e59bcdb7e2115b50ff4040940475170955fbef854e87c2 +"@rocket.chat/fuselage-tokens@npm:^0.31.11, @rocket.chat/fuselage-tokens@npm:~0.31.11": + version: 0.31.11 + resolution: "@rocket.chat/fuselage-tokens@npm:0.31.11" + checksum: 084ae967f460018002bdf6b0a790c03be520ee76eb7df280bd8efa15d53570f9958692d38edf9e3cc8361d196f2aed66b21ab521737b3008fae7b9d267e3eec7 languageName: node linkType: hard -"@rocket.chat/fuselage-ui-kit@npm:~0.31.10": - version: 0.31.10 - resolution: "@rocket.chat/fuselage-ui-kit@npm:0.31.10" +"@rocket.chat/fuselage-ui-kit@npm:~0.31.11": + version: 0.31.11 + resolution: "@rocket.chat/fuselage-ui-kit@npm:0.31.11" dependencies: - "@rocket.chat/fuselage": ^0.31.10 - "@rocket.chat/fuselage-hooks": ^0.31.10 - "@rocket.chat/styled": ^0.31.10 - "@rocket.chat/ui-kit": ^0.31.10 + "@rocket.chat/fuselage": ^0.31.11 + "@rocket.chat/fuselage-hooks": ^0.31.11 + "@rocket.chat/styled": ^0.31.11 + "@rocket.chat/ui-kit": ^0.31.11 tslib: ^2.3.1 peerDependencies: "@rocket.chat/fuselage-polyfills": "*" "@rocket.chat/icons": "*" react: ^17.0.2 react-dom: ^17.0.2 - checksum: 7511538d3229f5c57a772983824e9466808cc71a9d23a4b85263649743024a1c0cd01e3659aa06e7b14cc8e0177e24f3eb34d4374e0d3f3ed837eb9dc28827cf + checksum: 5843857eff90cd58c800b8ed30f29aeb99def5d3b8ad7d6f16eefd1c929eb2fa8e051823d9be74839e0fd6dbdc7a66f4d4c72d12dc5be23d61e386261d85c722 languageName: node linkType: hard -"@rocket.chat/fuselage@npm:^0.31.10, @rocket.chat/fuselage@npm:~0.31.10": - version: 0.31.10 - resolution: "@rocket.chat/fuselage@npm:0.31.10" +"@rocket.chat/fuselage@npm:^0.31.11, @rocket.chat/fuselage@npm:~0.31.11": + version: 0.31.11 + resolution: "@rocket.chat/fuselage@npm:0.31.11" dependencies: - "@rocket.chat/css-in-js": ^0.31.10 - "@rocket.chat/css-supports": ^0.31.10 - "@rocket.chat/fuselage-tokens": ^0.31.10 - "@rocket.chat/memo": ^0.31.10 + "@rocket.chat/css-in-js": ^0.31.11 + "@rocket.chat/css-supports": ^0.31.11 + "@rocket.chat/fuselage-tokens": ^0.31.11 + "@rocket.chat/memo": ^0.31.11 invariant: ^2.2.4 react-keyed-flatten-children: ^1.3.0 peerDependencies: @@ -3652,28 +3610,7 @@ __metadata: react: ^17.0.2 react-dom: ^17.0.2 react-virtuoso: 1.2.4 - checksum: 5cfc3e0909cf84d7654cd2380b33ccf5bdd1aee523bc4c925e1e12010f72c1696754c8264d8bdddbdad5882afcb1a71348dc7368d6c1b8805c740e92491fa6c8 - languageName: node - linkType: hard - -"@rocket.chat/fuselage@npm:~0.32.0-dev.22": - version: 0.32.0-dev.22 - resolution: "@rocket.chat/fuselage@npm:0.32.0-dev.22" - dependencies: - "@rocket.chat/css-in-js": ~0.31.11-dev.1 - "@rocket.chat/css-supports": ~0.31.11-dev.1 - "@rocket.chat/fuselage-tokens": ~0.31.11-dev.1 - "@rocket.chat/memo": ~0.31.11-dev.1 - invariant: ^2.2.4 - react-keyed-flatten-children: ^1.3.0 - peerDependencies: - "@rocket.chat/fuselage-hooks": "*" - "@rocket.chat/fuselage-polyfills": "*" - "@rocket.chat/icons": "*" - react: ^17.0.2 - react-dom: ^17.0.2 - react-virtuoso: 1.2.4 - checksum: eea86dce12a8e17e244ce03bec61ec4450fc8bdcd58d2f2d20b58149e7c4489215931e80297e1cafebe949428ac78702ce6a448dddd5d4d4a30532bad01ebb9d + checksum: 1c996b3253d33909882182472a74ebd980421d7d4b0aefbb0f307f5e0048f7be6ee37da8818cee8b924a17382cc4d9ac6f50b97aad704390abc219e99bde051f languageName: node linkType: hard @@ -3684,17 +3621,10 @@ __metadata: languageName: node linkType: hard -"@rocket.chat/icons@npm:~0.31.10": - version: 0.31.10 - resolution: "@rocket.chat/icons@npm:0.31.10" - checksum: eb3d412fac4f3bee0971c5073017530b89e5ee583b7173c42e31cc4220ac5fc7a397709f1fda9e1b91cc73b993dab9eb45b69618e729e62135c333287c1ca6a0 - languageName: node - linkType: hard - -"@rocket.chat/icons@npm:~0.32.0-dev.4": - version: 0.32.0-dev.4 - resolution: "@rocket.chat/icons@npm:0.32.0-dev.4" - checksum: 6160dcf4caf21f8621c2cc91a170b4913f4dbbcb9a585578777cf2b6a0eae5a0caa85ef470542ba7c1402aecf64b7d6780b6284a11f8c468ffeb2270bf64c2d1 +"@rocket.chat/icons@npm:^0.31.11, @rocket.chat/icons@npm:~0.31.11": + version: 0.31.11 + resolution: "@rocket.chat/icons@npm:0.31.11" + checksum: efb022b0854a4f987c81742988d255ed585903dac0fdaa68695c541917f39d520891355916df44513d97c01e089558fe6463bd81c9d142297e28358ea0e00e90 languageName: node linkType: hard @@ -3724,45 +3654,24 @@ __metadata: languageName: node linkType: hard -"@rocket.chat/logo@npm:~0.31.10": - version: 0.31.10 - resolution: "@rocket.chat/logo@npm:0.31.10" - dependencies: - "@rocket.chat/fuselage-hooks": ^0.31.10 - "@rocket.chat/styled": ^0.31.10 - tslib: ^2.3.1 - peerDependencies: - react: 17.0.2 - react-dom: 17.0.2 - checksum: 682cfeda6d36b15a59a7f225c8308bfe37779f4d41ff40adf6b03b460de6ef49bbec8c88e1959c8d1f54add9c866e11a9ced091a8bbaf17b7244a0015b08886e - languageName: node - linkType: hard - -"@rocket.chat/logo@npm:~0.31.11-dev.1": - version: 0.31.11-dev.1 - resolution: "@rocket.chat/logo@npm:0.31.11-dev.1" +"@rocket.chat/logo@npm:^0.31.11, @rocket.chat/logo@npm:~0.31.11": + version: 0.31.11 + resolution: "@rocket.chat/logo@npm:0.31.11" dependencies: - "@rocket.chat/fuselage-hooks": ~0.31.11-dev.1 - "@rocket.chat/styled": ~0.31.11-dev.1 + "@rocket.chat/fuselage-hooks": ^0.31.11 + "@rocket.chat/styled": ^0.31.11 tslib: ^2.3.1 peerDependencies: react: 17.0.2 react-dom: 17.0.2 - checksum: 2744fcc3cd8c6d04a406ba2abac4231c45b67abea0b703699869a32200a9778c8da02b02e618fcd74b184eb6e15357aa0c2a55a5fafee68b3e76f4587093c554 + checksum: 526fb6a2eb857dd496cace047cffc60cb91f8dd1fd93acde1ebbc2321b059ab27d1010b5677581642be6950d40fcff5739cfa94d476b546b0b2930c4640a12f7 languageName: node linkType: hard -"@rocket.chat/memo@npm:^0.31.10, @rocket.chat/memo@npm:~0.31.10": - version: 0.31.10 - resolution: "@rocket.chat/memo@npm:0.31.10" - checksum: 24c46883d34e84ec5f8bac54be4eab3a830223ee88cffb7a6b2fb32f23218f6551b215311d2e8989b841ee4d4cf746649508f37d91e7a01926bca8a3ffbac6f9 - languageName: node - linkType: hard - -"@rocket.chat/memo@npm:~0.31.11-dev.1": - version: 0.31.11-dev.1 - resolution: "@rocket.chat/memo@npm:0.31.11-dev.1" - checksum: c85ad1df5adad84e3aa22fe591b1b267ca65f8a8d844e7b2353b273a73df06284bb366b3f506ad5abf30c2b10c3d3347801791887f06c1f950a4d5bc142d0366 +"@rocket.chat/memo@npm:^0.31.11, @rocket.chat/memo@npm:~0.31.11": + version: 0.31.11 + resolution: "@rocket.chat/memo@npm:0.31.11" + checksum: b486505242092adfad7bd5aeefe079556ea2f231ffdb5254ad7c2d24235c5881a3b6751985722cd74997c6663b13823f55ca3946eae83bfe990eabac009f8918 languageName: node linkType: hard @@ -3773,10 +3682,10 @@ __metadata: languageName: node linkType: hard -"@rocket.chat/message-parser@npm:~0.31.10": - version: 0.31.10 - resolution: "@rocket.chat/message-parser@npm:0.31.10" - checksum: 9d3f11b8232256320b0abf970e69b6850c09bc3d8d2f43bbb217a6dc033016a89f2426849a7e619ed75178fc2bad7323e37a3c802f8bb3d483b4647b855bf9e9 +"@rocket.chat/message-parser@npm:~0.31.11": + version: 0.31.11 + resolution: "@rocket.chat/message-parser@npm:0.31.11" + checksum: 551ec5bcc68b125acaea92f22327ec3af11552d2e7dc9f88b9428b8d99cf4c39c9f87e0e4f622493c5086e7b5b418c4a724ade23d6072edd9bed4fdc0c9332e1 languageName: node linkType: hard @@ -3802,26 +3711,26 @@ __metadata: "@playwright/test": ^1.21.0 "@rocket.chat/apps-engine": ^1.31.0 "@rocket.chat/core-typings": "workspace:^" - "@rocket.chat/css-in-js": ~0.31.10 - "@rocket.chat/emitter": ~0.31.10 + "@rocket.chat/css-in-js": ~0.31.11 + "@rocket.chat/emitter": ~0.31.11 "@rocket.chat/eslint-config": "workspace:^" "@rocket.chat/forked-matrix-appservice-bridge": ^4.0.1 "@rocket.chat/forked-matrix-bot-sdk": ^0.6.0-beta.2 - "@rocket.chat/fuselage": ~0.31.10 - "@rocket.chat/fuselage-hooks": ~0.31.10 - "@rocket.chat/fuselage-polyfills": ~0.31.10 - "@rocket.chat/fuselage-tokens": ~0.31.10 - "@rocket.chat/fuselage-ui-kit": ~0.31.10 - "@rocket.chat/icons": ~0.31.10 + "@rocket.chat/fuselage": ~0.31.11 + "@rocket.chat/fuselage-hooks": ~0.31.11 + "@rocket.chat/fuselage-polyfills": ~0.31.11 + "@rocket.chat/fuselage-tokens": ~0.31.11 + "@rocket.chat/fuselage-ui-kit": ~0.31.11 + "@rocket.chat/icons": ~0.31.11 "@rocket.chat/livechat": 1.13.3 - "@rocket.chat/logo": ~0.31.10 - "@rocket.chat/memo": ~0.31.10 - "@rocket.chat/message-parser": ~0.31.10 + "@rocket.chat/logo": ~0.31.11 + "@rocket.chat/memo": ~0.31.11 + "@rocket.chat/message-parser": ~0.31.11 "@rocket.chat/mp3-encoder": ^0.24.0 - "@rocket.chat/onboarding-ui": next + "@rocket.chat/onboarding-ui": ~0.31.11 "@rocket.chat/rest-typings": "workspace:^" - "@rocket.chat/string-helpers": ~0.31.10 - "@rocket.chat/ui-kit": ~0.31.10 + "@rocket.chat/string-helpers": ~0.31.11 + "@rocket.chat/ui-kit": ~0.31.11 "@settlin/spacebars-loader": ^1.0.9 "@slack/client": ^4.12.0 "@storybook/addon-essentials": ~6.4.19 @@ -4083,15 +3992,15 @@ __metadata: languageName: node linkType: hard -"@rocket.chat/onboarding-ui@npm:next": - version: 0.32.0-dev.22 - resolution: "@rocket.chat/onboarding-ui@npm:0.32.0-dev.22" +"@rocket.chat/onboarding-ui@npm:~0.31.11": + version: 0.31.11 + resolution: "@rocket.chat/onboarding-ui@npm:0.31.11" dependencies: - "@rocket.chat/fuselage": ~0.32.0-dev.22 - "@rocket.chat/fuselage-hooks": ~0.31.11-dev.1 - "@rocket.chat/icons": ~0.32.0-dev.4 - "@rocket.chat/logo": ~0.31.11-dev.1 - "@rocket.chat/styled": ~0.31.11-dev.1 + "@rocket.chat/fuselage": ^0.31.11 + "@rocket.chat/fuselage-hooks": ^0.31.11 + "@rocket.chat/icons": ^0.31.11 + "@rocket.chat/logo": ^0.31.11 + "@rocket.chat/styled": ^0.31.11 i18next: ~21.6.11 react-hook-form: ~7.27.0 tslib: ~2.3.1 @@ -4100,7 +4009,7 @@ __metadata: react: 17.0.2 react-dom: 17.0.2 react-i18next: ~11.15.4 - checksum: c287d7c857dc10f1b231c709ca600102dcfaa4a19e1125d2151e0f9dfecbba6586fb31214af998a3b2a946fb0d67be5a3c1a93c132104645d3503223cfea879b + checksum: abb6ed1d3bb1dd885f580dd63b728652771bc74746dcfe33dfb2710203ab19c3fde201f63550b28f1c0cf7b60f7874f73b48468d34f8f34bf99d9c06f652f978 languageName: node linkType: hard @@ -4136,12 +4045,12 @@ __metadata: languageName: node linkType: hard -"@rocket.chat/string-helpers@npm:~0.31.10": - version: 0.31.10 - resolution: "@rocket.chat/string-helpers@npm:0.31.10" +"@rocket.chat/string-helpers@npm:~0.31.11": + version: 0.31.11 + resolution: "@rocket.chat/string-helpers@npm:0.31.11" dependencies: tslib: ^2.3.1 - checksum: 5797d11b76815f0a87837f2f1695fcc8415fe0b8ff5f8fc999ab0469be00f98e8151b2aab50644221ecb2143832ce7ccf6363a10b2d72fc4ef69227eca68f498 + checksum: 3b449b651e9386fdbf3aa966c762bb8cf97deb2adea6f65b177d17a6a3b4d25609cd3626f5b4961508b9a9db182371d71bdf585a2cad1749f08f35aacd5fd0ef languageName: node linkType: hard @@ -4154,47 +4063,25 @@ __metadata: languageName: node linkType: hard -"@rocket.chat/styled@npm:^0.31.10": - version: 0.31.10 - resolution: "@rocket.chat/styled@npm:0.31.10" - dependencies: - "@rocket.chat/css-in-js": ^0.31.10 - tslib: ^2.3.1 - checksum: ad360addb18490910ea8f1f2b4bb7ba2808d84ce12e6d139964a04932f7cf5a7a2ff29b5d20c3806b2b2db4451158602806c3e98e62075c2606d665ae9d3d3ba - languageName: node - linkType: hard - -"@rocket.chat/styled@npm:~0.31.11-dev.1": - version: 0.31.11-dev.1 - resolution: "@rocket.chat/styled@npm:0.31.11-dev.1" +"@rocket.chat/styled@npm:^0.31.11": + version: 0.31.11 + resolution: "@rocket.chat/styled@npm:0.31.11" dependencies: - "@rocket.chat/css-in-js": ~0.31.11-dev.1 + "@rocket.chat/css-in-js": ^0.31.11 tslib: ^2.3.1 - checksum: 44d8f501d6ecd47987e60004f789a194d470d3125aed65b9fd2d69d66c2577548545a593954ad136444ad71f9082f7e59b6d81437d89db56c3ac82f6c4dcb7f8 - languageName: node - linkType: hard - -"@rocket.chat/stylis-logical-props-middleware@npm:^0.31.10": - version: 0.31.10 - resolution: "@rocket.chat/stylis-logical-props-middleware@npm:0.31.10" - dependencies: - "@rocket.chat/css-supports": ^0.31.10 - tslib: ^2.3.1 - peerDependencies: - stylis: 4.0.10 - checksum: 03d427750ca85d45a4feb0f863a279ac335534fab742772dc9fc865c8017b19d6ac89d2aaa8cc9906b93b4661e958c935f4f9adb80d3ccf5fccb2a9da3c7c75c + checksum: 5a870b15c06eaf2657a7c2837d2519741907fb3574de6351a17334e3520c3ff3937064d0a2031feddfd1b6a014e665cde4a3eee7ac407757c7ee329ba39de529 languageName: node linkType: hard -"@rocket.chat/stylis-logical-props-middleware@npm:~0.31.11-dev.1": - version: 0.31.11-dev.1 - resolution: "@rocket.chat/stylis-logical-props-middleware@npm:0.31.11-dev.1" +"@rocket.chat/stylis-logical-props-middleware@npm:^0.31.11": + version: 0.31.11 + resolution: "@rocket.chat/stylis-logical-props-middleware@npm:0.31.11" dependencies: - "@rocket.chat/css-supports": ~0.31.11-dev.1 + "@rocket.chat/css-supports": ^0.31.11 tslib: ^2.3.1 peerDependencies: stylis: 4.0.10 - checksum: 6859ceedd0942261d6727759cfb0e1e98823423fa305f0bbcdc1d2196c83932ce48cc3a34c098e2f881d09f850eb4db7bfd5f4ef53ea6557ab5db7027f677a84 + checksum: a711eb247c5911b03d67a2f1b66e6673f43a22c334e9ef29c283cd64251254f0596805bf8c6c91b89b3e504ed3b1659d42b0b4ed6632887b71b54ce402d74126 languageName: node linkType: hard @@ -4205,10 +4092,10 @@ __metadata: languageName: node linkType: hard -"@rocket.chat/ui-kit@npm:^0.31.10, @rocket.chat/ui-kit@npm:~0.31.10": - version: 0.31.10 - resolution: "@rocket.chat/ui-kit@npm:0.31.10" - checksum: f7c5162ebe273df08bf8d06c1f7f7b5fa72c7f818e7988be58f90d7c7f90b331088b701ddea6e2ce6b52b9a971aff18d5abb82d3c0cf727cd44edc839d96952e +"@rocket.chat/ui-kit@npm:^0.31.11, @rocket.chat/ui-kit@npm:~0.31.11": + version: 0.31.11 + resolution: "@rocket.chat/ui-kit@npm:0.31.11" + checksum: 976ed0a00ec3b886667a1bc59429c9d4867e62cb04c4e762bd41320f602ae35560393b4d36b2460e0ea621f73fb71b4cc869fa17ad4c78da9c862df70b84d0e1 languageName: node linkType: hard