Skip to content

Commit

Permalink
Merge branch 'develop' into TC-64-messages-rewrite-blank-bottom-margin
Browse files Browse the repository at this point in the history
  • Loading branch information
@yash-rajpal
yash-rajpal authored Oct 10, 2022
2 parents 322315b + ff732f9 commit aad217d
Show file tree
Hide file tree
Showing 17 changed files with 209 additions and 274 deletions.
10 changes: 5 additions & 5 deletions apps/meteor/ee/server/services/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
"dependencies": {
"@rocket.chat/apps-engine": "^1.32.0",
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/emitter": "next",
"@rocket.chat/message-parser": "next",
"@rocket.chat/emitter": "0.31.19",
"@rocket.chat/message-parser": "0.31.19",
"@rocket.chat/model-typings": "workspace:^",
"@rocket.chat/models": "workspace:^",
"@rocket.chat/rest-typings": "workspace:^",
"@rocket.chat/string-helpers": "next",
"@rocket.chat/ui-kit": "next",
"@rocket.chat/string-helpers": "0.31.19",
"@rocket.chat/ui-kit": "0.31.19",
"ajv": "^8.11.0",
"bcrypt": "^5.0.1",
"body-parser": "^1.20.0",
Expand All @@ -50,7 +50,7 @@
"ws": "^8.8.1"
},
"devDependencies": {
"@rocket.chat/icons": "next",
"@rocket.chat/icons": "0.31.19",
"@types/cookie": "^0.5.1",
"@types/cookie-parser": "^1.4.3",
"@types/ejson": "^2.2.0",
Expand Down
30 changes: 15 additions & 15 deletions apps/meteor/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,35 +202,35 @@
"@rocket.chat/apps-engine": "1.35.0-alpha.46",
"@rocket.chat/cas-validate": "workspace:^",
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/css-in-js": "next",
"@rocket.chat/emitter": "next",
"@rocket.chat/css-in-js": "0.31.19",
"@rocket.chat/emitter": "0.31.19",
"@rocket.chat/favicon": "workspace:^",
"@rocket.chat/forked-matrix-appservice-bridge": "^4.0.1",
"@rocket.chat/forked-matrix-bot-sdk": "^0.6.0-beta.2",
"@rocket.chat/fuselage": "next",
"@rocket.chat/fuselage-hooks": "next",
"@rocket.chat/fuselage-polyfills": "next",
"@rocket.chat/fuselage-toastbar": "next",
"@rocket.chat/fuselage-tokens": "next",
"@rocket.chat/fuselage-ui-kit": "next",
"@rocket.chat/fuselage": "0.31.19",
"@rocket.chat/fuselage-hooks": "0.31.19",
"@rocket.chat/fuselage-polyfills": "0.31.19",
"@rocket.chat/fuselage-toastbar": "0.31.19",
"@rocket.chat/fuselage-tokens": "0.31.19",
"@rocket.chat/fuselage-ui-kit": "0.31.19",
"@rocket.chat/gazzodown": "workspace:^",
"@rocket.chat/icons": "next",
"@rocket.chat/icons": "0.31.19",
"@rocket.chat/layout": "next",
"@rocket.chat/logo": "next",
"@rocket.chat/memo": "next",
"@rocket.chat/message-parser": "next",
"@rocket.chat/logo": "0.31.19",
"@rocket.chat/memo": "0.31.19",
"@rocket.chat/message-parser": "0.31.19",
"@rocket.chat/model-typings": "workspace:^",
"@rocket.chat/models": "workspace:^",
"@rocket.chat/mp3-encoder": "0.24.0",
"@rocket.chat/onboarding-ui": "next",
"@rocket.chat/onboarding-ui": "0.31.19",
"@rocket.chat/poplib": "workspace:^",
"@rocket.chat/presence": "workspace:^",
"@rocket.chat/rest-typings": "workspace:^",
"@rocket.chat/string-helpers": "next",
"@rocket.chat/string-helpers": "0.31.19",
"@rocket.chat/ui-client": "workspace:^",
"@rocket.chat/ui-composer": "workspace:^",
"@rocket.chat/ui-contexts": "workspace:^",
"@rocket.chat/ui-kit": "next",
"@rocket.chat/ui-kit": "0.31.19",
"@rocket.chat/ui-video-conf": "workspace:^",
"@slack/rtm-api": "^6.0.0",
"@tanstack/react-query": "^4.0.10",
Expand Down
4 changes: 2 additions & 2 deletions ee/apps/account-service/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
"author": "Rocket.Chat",
"dependencies": {
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/emitter": "next",
"@rocket.chat/emitter": "0.31.19",
"@rocket.chat/model-typings": "workspace:^",
"@rocket.chat/models": "workspace:^",
"@rocket.chat/rest-typings": "workspace:^",
"@rocket.chat/string-helpers": "next",
"@rocket.chat/string-helpers": "0.31.19",
"@types/node": "^14.18.21",
"bcrypt": "^5.0.1",
"ejson": "^2.2.2",
Expand Down
4 changes: 2 additions & 2 deletions ee/apps/authorization-service/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
"author": "Rocket.Chat",
"dependencies": {
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/emitter": "next",
"@rocket.chat/emitter": "0.31.19",
"@rocket.chat/model-typings": "workspace:^",
"@rocket.chat/models": "workspace:^",
"@rocket.chat/rest-typings": "workspace:^",
"@rocket.chat/string-helpers": "next",
"@rocket.chat/string-helpers": "0.31.19",
"@types/node": "^14.18.21",
"ejson": "^2.2.2",
"eventemitter3": "^4.0.7",
Expand Down
4 changes: 2 additions & 2 deletions ee/apps/ddp-streamer/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
"dependencies": {
"@rocket.chat/apps-engine": "^1.32.0",
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/emitter": "next",
"@rocket.chat/emitter": "0.31.19",
"@rocket.chat/model-typings": "workspace:^",
"@rocket.chat/models": "workspace:^",
"@rocket.chat/rest-typings": "workspace:^",
"@rocket.chat/string-helpers": "next",
"@rocket.chat/string-helpers": "0.31.19",
"colorette": "^1.4.0",
"ejson": "^2.2.2",
"eventemitter3": "^4.0.7",
Expand Down
4 changes: 2 additions & 2 deletions ee/apps/presence-service/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
"author": "Rocket.Chat",
"dependencies": {
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/emitter": "next",
"@rocket.chat/emitter": "0.31.19",
"@rocket.chat/model-typings": "workspace:^",
"@rocket.chat/models": "workspace:^",
"@rocket.chat/presence": "workspace:^",
"@rocket.chat/string-helpers": "next",
"@rocket.chat/string-helpers": "0.31.19",
"@types/node": "^14.18.21",
"ejson": "^2.2.2",
"eventemitter3": "^4.0.7",
Expand Down
4 changes: 2 additions & 2 deletions ee/apps/stream-hub-service/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
"author": "Rocket.Chat",
"dependencies": {
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/emitter": "next",
"@rocket.chat/emitter": "0.31.19",
"@rocket.chat/model-typings": "workspace:^",
"@rocket.chat/models": "workspace:^",
"@rocket.chat/string-helpers": "next",
"@rocket.chat/string-helpers": "0.31.19",
"@types/node": "^14.18.21",
"ejson": "^2.2.2",
"eventemitter3": "^4.0.7",
Expand Down
6 changes: 3 additions & 3 deletions packages/core-typings/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
],
"dependencies": {
"@rocket.chat/apps-engine": "^1.32.0",
"@rocket.chat/icons": "next",
"@rocket.chat/message-parser": "next",
"@rocket.chat/ui-kit": "next"
"@rocket.chat/icons": "0.31.19",
"@rocket.chat/message-parser": "0.31.19",
"@rocket.chat/ui-kit": "0.31.19"
}
}
12 changes: 6 additions & 6 deletions packages/fuselage-ui-kit/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@
"devDependencies": {
"@rocket.chat/apps-engine": "~1.30.0",
"@rocket.chat/eslint-config": "workspace:^",
"@rocket.chat/fuselage": "next",
"@rocket.chat/fuselage-hooks": "next",
"@rocket.chat/fuselage-polyfills": "next",
"@rocket.chat/icons": "next",
"@rocket.chat/fuselage": "0.31.19",
"@rocket.chat/fuselage-hooks": "0.31.19",
"@rocket.chat/fuselage-polyfills": "0.31.19",
"@rocket.chat/icons": "0.31.19",
"@rocket.chat/prettier-config": "next",
"@rocket.chat/styled": "next",
"@rocket.chat/styled": "0.31.19",
"@storybook/addon-essentials": "~6.5.10",
"@storybook/addons": "~6.5.10",
"@storybook/builder-webpack5": "~6.5.10",
Expand All @@ -78,7 +78,7 @@
"webpack": "~5.68.0"
},
"dependencies": {
"@rocket.chat/ui-kit": "next",
"@rocket.chat/ui-kit": "0.31.19",
"tslib": "^2.3.1"
}
}
10 changes: 5 additions & 5 deletions packages/gazzodown/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
"@babel/core": "^7.18.9",
"@mdx-js/react": "^1.6.22",
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/css-in-js": "next",
"@rocket.chat/fuselage": "next",
"@rocket.chat/fuselage-tokens": "next",
"@rocket.chat/message-parser": "next",
"@rocket.chat/styled": "next",
"@rocket.chat/css-in-js": "0.31.19",
"@rocket.chat/fuselage": "0.31.19",
"@rocket.chat/fuselage-tokens": "0.31.19",
"@rocket.chat/message-parser": "0.31.19",
"@rocket.chat/styled": "0.31.19",
"@rocket.chat/ui-client": "workspace:^",
"@rocket.chat/ui-contexts": "workspace:^",
"@storybook/addon-actions": "~6.5.10",
Expand Down
6 changes: 3 additions & 3 deletions packages/livechat/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
"@babel/eslint-parser": "^7.18.9",
"@babel/preset-env": "^7.18.9",
"@rocket.chat/eslint-config": "^0.4.0",
"@rocket.chat/fuselage-tokens": "next",
"@rocket.chat/logo": "next",
"@rocket.chat/fuselage-tokens": "0.31.19",
"@rocket.chat/logo": "0.31.19",
"@storybook/addon-actions": "~6.5.10",
"@storybook/addon-backgrounds": "~6.5.10",
"@storybook/addon-essentials": "~6.5.10",
Expand Down Expand Up @@ -87,7 +87,7 @@
},
"dependencies": {
"@rocket.chat/sdk": "^1.0.0-alpha.42",
"@rocket.chat/ui-kit": "next",
"@rocket.chat/ui-kit": "0.31.19",
"crypto-js": "^4.1.1",
"css-vars-ponyfill": "^2.4.7",
"date-fns": "^2.15.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/rest-typings/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
"dependencies": {
"@rocket.chat/apps-engine": "^1.32.0",
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/message-parser": "next",
"@rocket.chat/ui-kit": "next",
"@rocket.chat/message-parser": "0.31.19",
"@rocket.chat/ui-kit": "0.31.19",
"ajv": "^8.11.0"
}
}
8 changes: 4 additions & 4 deletions packages/ui-client/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
"version": "0.0.1",
"private": true,
"devDependencies": {
"@rocket.chat/css-in-js": "next",
"@rocket.chat/fuselage": "next",
"@rocket.chat/fuselage-hooks": "next",
"@rocket.chat/icons": "next",
"@rocket.chat/css-in-js": "0.31.19",
"@rocket.chat/fuselage": "0.31.19",
"@rocket.chat/fuselage-hooks": "0.31.19",
"@rocket.chat/icons": "0.31.19",
"@rocket.chat/ui-contexts": "workspace:~",
"@storybook/addon-actions": "~6.5.10",
"@storybook/addon-docs": "~6.5.10",
Expand Down
4 changes: 2 additions & 2 deletions packages/ui-composer/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"devDependencies": {
"@babel/core": "~7.18.13",
"@rocket.chat/eslint-config": "workspace:^",
"@rocket.chat/fuselage": "next",
"@rocket.chat/icons": "next",
"@rocket.chat/fuselage": "0.31.19",
"@rocket.chat/icons": "0.31.19",
"@storybook/addon-actions": "~6.5.12",
"@storybook/addon-docs": "~6.5.12",
"@storybook/addon-essentials": "~6.5.12",
Expand Down
4 changes: 2 additions & 2 deletions packages/ui-contexts/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"private": true,
"devDependencies": {
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/emitter": "next",
"@rocket.chat/fuselage-hooks": "next",
"@rocket.chat/emitter": "0.31.19",
"@rocket.chat/fuselage-hooks": "0.31.19",
"@rocket.chat/rest-typings": "workspace:^",
"@types/jest": "^27.4.1",
"@types/react": "^17.0.47",
Expand Down
8 changes: 4 additions & 4 deletions packages/ui-video-conf/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
"version": "0.0.1",
"private": true,
"devDependencies": {
"@rocket.chat/css-in-js": "next",
"@rocket.chat/css-in-js": "0.31.19",
"@rocket.chat/eslint-config": "workspace:^",
"@rocket.chat/fuselage": "next",
"@rocket.chat/fuselage-hooks": "next",
"@rocket.chat/styled": "next",
"@rocket.chat/fuselage": "0.31.19",
"@rocket.chat/fuselage-hooks": "0.31.19",
"@rocket.chat/styled": "0.31.19",
"@types/jest": "^27.4.1",
"eslint": "^8.20.0",
"eslint-plugin-react": "^7.30.1",
Expand Down
Loading

0 comments on commit aad217d

Please sign in to comment.