Merge branch 'master' into export-emojipicker

jaapbakker88 · web-flow · commit 167596847697 · 2020-10-05T13:56:27.000+02:00
diff --git a/docs/build/bundle.13de61e4.js b/docs/build/bundle.13de61e4.js
diff --git a/docs/build/bundle.13de61e4.js.LICENSE.txt b/docs/build/bundle.13de61e4.js.LICENSE.txt
diff --git a/docs/index.html b/docs/index.html
@@ -9,6 +9,6 @@
   </head>
   <body>
     <div id="rsg-root"></div>
-    <script src="build/bundle.852685aa.js"></script>
+    <script src="build/bundle.13de61e4.js"></script>
   </body>
 </html>
diff --git a/examples/typescript-app/package.json b/examples/typescript-app/package.json
@@ -6,7 +6,7 @@
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
     "react-scripts": "3.4.1",
-    "stream-chat": "^2.3.0",
+    "stream-chat": "^2.4.0",
     "stream-chat-react": "^2.4.1",
     "typescript": "~3.7.2"
   },
diff --git a/examples/typescript-app/yarn.lock b/examples/typescript-app/yarn.lock
@@ -1004,13 +1004,20 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.3", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.1":
+"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.3", "@babel/runtime@^7.5.1":
   version "7.10.5"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.10.5.tgz#303d8bd440ecd5a491eae6117fd3367698674c5c"
   integrity sha512-otddXKhdNn7d0ptoFRHtMLa8LqDxLYwTjB4nYgM1yy5N6gU/MUf8zqyyLltCH3yAVitBzmwK4us+DD0l/MauAg==
   dependencies:
     regenerator-runtime "^0.13.4"
 
+"@babel/runtime@^7.3.1":
+  version "7.11.2"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.11.2.tgz#f549c13c754cc40b87644b9fa9f09a6a95fe0736"
+  integrity sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==
+  dependencies:
+    regenerator-runtime "^0.13.4"
+
 "@babel/template@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz#3251996c4200ebc71d1a8fc405fba940f36ba278"
@@ -1589,6 +1596,13 @@
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz#38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339"
   integrity sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA==
 
+"@types/jsonwebtoken@^8.3.5":
+  version "8.5.0"
+  resolved "https://registry.yarnpkg.com/@types/jsonwebtoken/-/jsonwebtoken-8.5.0.tgz#2531d5e300803aa63279b232c014acf780c981c5"
+  integrity sha512-9bVao7LvyorRGZCw0VmH/dr7Og+NdjYSsKAxB43OQoComFbBgsEpoR9JW6+qSq/ogwVBg8GI2MfAlk4SYI4OLg==
+  dependencies:
+    "@types/node" "*"
+
 "@types/minimatch@*":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
@@ -1634,6 +1648,11 @@
     "@types/prop-types" "*"
     csstype "^2.2.0"
 
+"@types/seamless-immutable@7.1.13":
+  version "7.1.13"
+  resolved "https://registry.yarnpkg.com/@types/seamless-immutable/-/seamless-immutable-7.1.13.tgz#dc8d645914086300e49410c72f6e5fae902fdbc5"
+  integrity sha512-kvgsr2sI8NBtxgR+YZNgSk0S+isAtS77TKtITUCGcNHlwYERrvgv6DbLER4TbvUK4/Qclm8C9jXzHqegpV2Ikg==
+
 "@types/stack-utils@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
@@ -1662,6 +1681,18 @@
     "@types/testing-library__dom" "*"
     pretty-format "^25.1.0"
 
+"@types/uuid@^3.4.5":
+  version "3.4.9"
+  resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-3.4.9.tgz#fcf01997bbc9f7c09ae5f91383af076d466594e1"
+  integrity sha512-XDwyIlt/47l2kWLTzw/mtrpLdB+GPSskR2n/PIcPn+VYhVO77rGhRncIR5GPU0KRzXuqkDO+J5qqrG0Y8P6jzQ==
+
+"@types/ws@^6.0.3":
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-6.0.4.tgz#7797707c8acce8f76d8c34b370d4645b70421ff1"
+  integrity sha512-PpPrX7SZW9re6+Ha8ojZG4Se8AZXgf0GK6zmfqEuCsY49LFDNXO3SByp44X3dFEqtB73lkCDAdUazhAjVPiNwg==
+  dependencies:
+    "@types/node" "*"
+
 "@types/yargs-parser@*":
   version "15.0.0"
   resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d"
@@ -10475,12 +10506,16 @@ stream-chat-react@^2.4.1:
     textarea-caret "^3.1.0"
     uuid "^7.0.3"
 
-stream-chat@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-2.3.0.tgz#5ebe22e4078ee9bd52ceb704f7b3f4b6e2073923"
-  integrity sha512-L7evlsIyTFpi3/rhwAdQvEXVDzUngxGAo6HV03DTKKAVh4/tu2jKEID+Lv1fCISoJshlwcSXf54ppwvWY/ASSw==
+stream-chat@^2.4.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-2.5.0.tgz#1859f810ffaeb53ddf19b47c2c5bc8d480bac016"
+  integrity sha512-uh6Ms3ovyGaTME21o8/hjjh3FbdNu6Ph3Me16IMjINTubUI0tJjj+NRqcg1Wnk2WlMmsFJlOQ9Fnx3fSVdw+mw==
   dependencies:
     "@babel/runtime" "^7.3.1"
+    "@types/jsonwebtoken" "^8.3.5"
+    "@types/seamless-immutable" "7.1.13"
+    "@types/uuid" "^3.4.5"
+    "@types/ws" "^6.0.3"
     axios "^0.18.1"
     base64-js "^1.3.1"
     form-data "^2.3.3"
diff --git a/package.json b/package.json
@@ -20,12 +20,12 @@
     "getstream.io"
   ],
   "dependencies": {
-    "@braintree/sanitize-url": "4.1.1",
+    "@braintree/sanitize-url": "5.0.0",
     "custom-event": "^1.0.1",
-    "dayjs": "^1.8.35",
+    "dayjs": "^1.9.1",
     "emoji-mart": "3.0.0",
     "emoji-regex": "^9.0.0",
-    "i18next": "^19.7.0",
+    "i18next": "^19.8.1",
     "isomorphic-ws": "^4.0.1",
     "linkifyjs": "^2.1.9",
     "lodash.debounce": "^4.0.8",
@@ -48,7 +48,7 @@
   "peerDependencies": {
     "react": "^16.8.x",
     "react-dom": "^16.8.x",
-    "stream-chat": "2.4.x"
+    "stream-chat": "2.5.x"
   },
   "files": [
     "dist",
@@ -70,8 +70,8 @@
     "@rollup/plugin-replace": "^2.3.3",
     "@stream-io/rollup-plugin-node-builtins": "^2.1.5",
     "@testing-library/jest-dom": "5.11.4",
-    "@testing-library/react": "^11.0.2",
-    "@testing-library/react-hooks": "^3.4.1",
+    "@testing-library/react": "^11.0.4",
+    "@testing-library/react-hooks": "^3.4.2",
     "@types/braintree__sanitize-url": "4.1.0",
     "@types/deep-equal": "^1.0.1",
     "@types/emoji-mart": "^3.0.2",
@@ -82,63 +82,63 @@
     "@types/react-dom": "^16.9.8",
     "@types/seamless-immutable": "7.1.13",
     "@types/uuid": "^8.3.0",
-    "autoprefixer": "^9.8.6",
+    "autoprefixer": "^10.0.1",
     "babel-eslint": "^10.1.0",
     "babel-loader": "8.1.0",
-    "babel-plugin-i18next-extract": "^0.7.2",
+    "babel-plugin-i18next-extract": "^0.8.0",
     "codecov": "^3.7.2",
     "css-loader": "^4.3.0",
-    "eslint": "7.8.1",
+    "eslint": "7.10.0",
     "eslint-config-airbnb": "^18.2.0",
-    "eslint-config-prettier": "^6.11.0",
+    "eslint-config-prettier": "^6.12.0",
     "eslint-config-react-app": "^5.2.1",
     "eslint-import-resolver-alias": "^1.1.2",
     "eslint-loader": "^4.0.2",
     "eslint-plugin-babel": "^5.3.1",
     "eslint-plugin-flowtype": "^5.2.0",
-    "eslint-plugin-import": "^2.22.0",
-    "eslint-plugin-jest": "^24.0.0",
+    "eslint-plugin-import": "^2.22.1",
+    "eslint-plugin-jest": "^24.0.2",
     "eslint-plugin-jest-dom": "^3.2.3",
     "eslint-plugin-jsx-a11y": "^6.3.1",
     "eslint-plugin-markdown": "^1.0.2",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.1.4",
     "eslint-plugin-promise": "^4.2.1",
-    "eslint-plugin-react": "^7.20.6",
-    "eslint-plugin-react-hooks": "^4.1.1",
+    "eslint-plugin-react": "^7.21.3",
+    "eslint-plugin-react-hooks": "^4.1.2",
     "eslint-plugin-sonarjs": "^0.5.0",
-    "htmlparser2": "^4.1.0",
+    "htmlparser2": "^5.0.0",
     "husky": "^4.3.0",
-    "jest": "^26.4.2",
+    "jest": "^26.5.0",
     "node-sass": "^4.14.1",
     "node-sass-import": "^2.0.1",
-    "postcss": "^7.0.32",
-    "postcss-loader": "^4.0.1",
-    "prettier": "^2.1.1",
+    "postcss": "^8.1.1",
+    "postcss-loader": "^4.0.3",
+    "prettier": "^2.1.2",
     "react-styleguidist": "^11.1.0",
     "react-test-renderer": "^16.13.1",
-    "rollup": "^2.26.11",
+    "rollup": "^2.28.2",
     "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-copy": "^3.3.0",
     "rollup-plugin-copy-glob": "^0.3.1",
     "rollup-plugin-insert": "^1.3.1",
     "rollup-plugin-node-globals": "^1.4.0",
     "rollup-plugin-peer-deps-external": "^2.2.3",
-    "rollup-plugin-scss": "^2.6.0",
+    "rollup-plugin-scss": "^2.6.1",
     "rollup-plugin-terser": "^7.0.2",
     "rollup-plugin-url": "^3.0.1",
     "rollup-plugin-visualizer": "^4.1.1",
-    "sass": "^1.26.10",
+    "sass": "^1.26.11",
     "sass-loader": "^10.0.2",
-    "stream-chat": "^2.4.0",
-    "style-loader": "^1.2.1",
-    "stylelint": "^13.7.0",
+    "stream-chat": "^2.5.0",
+    "style-loader": "^1.3.0",
+    "stylelint": "^13.7.2",
     "stylelint-config-recommended-scss": "^4.2.0",
     "stylelint-config-standard": "^20.0.0",
     "stylelint-scss": "^3.18.0",
-    "typescript": "^4.0.2",
+    "typescript": "^4.0.3",
     "url-loader": "^4.1.0",
-    "webpack": "4.44.1",
+    "webpack": "4.44.2",
     "webpack-cli": "^3.3.12",
     "webpack-dev-server": "~3.11.0"
   },
@@ -181,6 +181,9 @@
       "block-no-empty": null
     }
   },
+  "resolutions": {
+    "ast-types": "^0.14.0"
+  },
   "browserslist": [
     ">0.2%",
     "not ie <= 11",
diff --git a/src/components/Chat/Chat.js b/src/components/Chat/Chat.js
@@ -52,16 +52,14 @@ const Chat = ({
   const clientMutes = client?.user?.mutes;
 
   useEffect(() => {
+    if (!client) return;
     const userAgent = client.getUserAgent();
     if (!userAgent.includes('stream-chat-react')) {
       // should result in something like:
       // 'stream-chat-react-2.3.2-stream-chat-javascript-client-browser-2.2.2'
       client.setUserAgent(`stream-chat-react-${version}-${userAgent}`);
     }
-    // don't want client in dep array because it is a required
-    // prop for this component and we only want this run on mount
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+  }, [client]);
 
   useEffect(() => {
     setMutes(clientMutes || []);
diff --git a/types/index.d.ts b/types/index.d.ts
@@ -13,17 +13,17 @@ import { ScrollSeekConfiguration } from 'react-virtuoso/dist/engines/scrollSeekE
 
 export type Mute = Client.Mute<StreamChatReactUserType>;
 export type AnyType = Record<string, any>;
-export type StreamChatReactUserType = {
+export type StreamChatReactUserType = AnyType & {
   status?: string;
   image?: string;
   mutes?: Array<Mute>;
 };
-export type StreamChatReactChannelType = {
+export type StreamChatReactChannelType = AnyType & {
   image?: string;
   subtitle?: string;
   member_count?: number;
 };
-export type StreamChatMessageType = {
+export type StreamChatMessageType = AnyType & {
   event?: Client.Event<
     AnyType,
     StreamChatReactChannelType,
diff --git a/yarn.lock b/yarn.lock
