Merge branch 'master' into bump-servicing-plan-4.5.0

compulim · Jul 16, 2019 · b986df9 · b986df9
2 parents ff32c33 + 8c8679e
commit b986df9
Show file tree

Hide file tree

Showing 18 changed files with 257 additions and 233 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -32,6 +32,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 -  `*`: Bumps [`@babel/runtime@7.5.4`](https://www.npmjs.com/package/@babel/runtime), by [@compulim](https://github.com/compulim), in PR [#2182](https://github.com/microsoft/BotFramework-WebChat/pull/2182)
 -  `*`: Bumps Docker container for headless Chrome to `selenium/standalone-chrome:3.141.59-radium`, by [@compulim](https://github.com/compulim), in PR [#2182](https://github.com/microsoft/BotFramework-WebChat/pull/2182)
 -  `*`: Moves from [`babel-plugin-version-transform`](https://www.npmjs.com/package/babel-plugin-version-transform) to [`babel-plugin-transform-inline-environment-variables`](https://www.npmjs.com/package/babel-plugin-transform-inline-environment-variables), by [@compulim](https://github.com/compulim), in PR [#2182](https://github.com/microsoft/BotFramework-WebChat/pull/2182)
+-  `*`: Bumps ESLint and related dependencies to latest version, by [@compulim](https://github.com/compulim), in PR [#2185](https://github.com/microsoft/BotFramework-WebChat/pull/2185)
+   - [`eslint-plugin-react@7.14.2`](https://www.npmjs.com/package/eslint-plugin-react)
+   - [`eslint@6.0.1`](https://www.npmjs.com/package/eslint)
+-  `*`: Bumps React, Redux and their related dependencies to latest version, by [@compulim](https://github.com/compulim), in PR [#2184](https://github.com/microsoft/BotFramework-WebChat/pull/2184)
+   - [`react-dom@16.8.6`](https://www.npmjs.com/package/react-dom)
+   - [`react-redux@5.1.1`](https://www.npmjs.com/package/react-redux)
+   - [`react@16.8.6`](https://www.npmjs.com/package/react)
+   - [`redux@4.0.4`](https://www.npmjs.com/package/redux)
+   - Removed [`redux-promise-middleware`](https://www.npmjs.com/package/redux-promise-middleware)
 
 ## [4.5.0] - 2019-07-10
 

diff --git a/packages/bundle/package-lock.json b/packages/bundle/package-lock.json
diff --git a/packages/bundle/package.json b/packages/bundle/package.json
@@ -44,8 +44,8 @@
     "memoize-one": "^5.0.2",
     "microsoft-speech-browser-sdk": "^0.0.12",
     "prop-types": "^15.7.2",
-    "react": "^16.5.0",
-    "react-dom": "^16.5.0",
+    "react": "^16.8.6",
+    "react-dom": "^16.8.6",
     "sanitize-html": "^1.19.0",
     "url-search-params-polyfill": "^5.0.0",
     "web-speech-cognitive-services": "^4.0.0",

diff --git a/packages/bundle/src/adaptiveCards/Attachment/ThumbnailCardAttachment.js b/packages/bundle/src/adaptiveCards/Attachment/ThumbnailCardAttachment.js
@@ -76,6 +76,9 @@ ThumbnailCardAttachment.propTypes = {
       text: PropTypes.string,
       title: PropTypes.string
     }).isRequired
+  }).isRequired,
+  styleSet: PropTypes.shape({
+    options: PropTypes.any.isRequired
   }).isRequired
 };
 

diff --git a/packages/bundle/src/addVersion.js b/packages/bundle/src/addVersion.js
@@ -1,4 +1,4 @@
-/* global global:readonly, VERSION:readonly */
+/* global global:readonly, process:readonly */
 /* eslint no-empty: ["error", { "allowEmptyCatch": true }] */
 
 import { version as componentVersion } from 'botframework-webchat-component';