From 1ec82ce5e627e8af96c535ac1fb5d14928b6b36f Mon Sep 17 00:00:00 2001 From: Corina <14900841+corinagum@users.noreply.github.com> Date: Tue, 16 Jul 2019 14:05:24 -0700 Subject: [PATCH 1/2] Bump core-js for es5 package --- packages/bundle/package-lock.json | 6 +++--- packages/bundle/package.json | 2 +- packages/bundle/src/index-es5.ts | 22 ++++++++++++---------- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/packages/bundle/package-lock.json b/packages/bundle/package-lock.json index eddc05676d..d3477cd428 100644 --- a/packages/bundle/package-lock.json +++ b/packages/bundle/package-lock.json @@ -2211,9 +2211,9 @@ "dev": true }, "core-js": { - "version": "2.6.5", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.5.tgz", - "integrity": "sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==" + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.1.4.tgz", + "integrity": "sha512-YNZN8lt82XIMLnLirj9MhKDFZHalwzzrL9YLt6eb0T5D0EDl4IQ90IGkua8mHbnxNrkj1d8hbdizMc0Qmg1WnQ==" }, "core-js-compat": { "version": "3.1.4", diff --git a/packages/bundle/package.json b/packages/bundle/package.json index a97071178f..bf60177f91 100644 --- a/packages/bundle/package.json +++ b/packages/bundle/package.json @@ -37,7 +37,7 @@ "botframework-directlinejs": "^0.11.4", "botframework-webchat-component": "0.0.0-0", "botframework-webchat-core": "0.0.0-0", - "core-js": "^2.5.7", + "core-js": "^3.1.4", "markdown-it": "^8.4.2", "markdown-it-for-inline": "^0.1.1", "memoize-one": "^5.0.2", diff --git a/packages/bundle/src/index-es5.ts b/packages/bundle/src/index-es5.ts index c4842e63f7..a7c3b5a1a7 100644 --- a/packages/bundle/src/index-es5.ts +++ b/packages/bundle/src/index-es5.ts @@ -5,16 +5,18 @@ // To maintain quality, we prefer polyfills without additives // For example, we prefer Promise implementation from "core-js" than "bluebird" -import 'core-js/modules/es6.array.find-index'; -import 'core-js/modules/es6.array.find'; -import 'core-js/modules/es6.array.iterator'; -import 'core-js/modules/es6.object.assign'; -import 'core-js/modules/es6.math.sign'; -import 'core-js/modules/es6.number.is-finite'; -import 'core-js/modules/es6.promise'; -import 'core-js/modules/es6.string.starts-with'; -import 'core-js/modules/es6.symbol'; -import 'core-js/modules/es7.array.includes'; +import 'core-js/features/dom-collections'; + +import 'core-js/modules/es.array.find-index'; +import 'core-js/modules/es.array.find'; +import 'core-js/modules/es.array.includes'; +import 'core-js/modules/es.array.iterator'; +import 'core-js/modules/es.math.sign'; +import 'core-js/modules/es.number.is-finite'; +import 'core-js/modules/es.object.assign'; +import 'core-js/modules/es.promise'; +import 'core-js/modules/es.string.starts-with'; +import 'core-js/modules/es.symbol'; import 'url-search-params-polyfill'; import 'whatwg-fetch'; import { version } from './index-minimal'; From 40eb5f489dd24dfe0596f9ed0288ce4137c9ef62 Mon Sep 17 00:00:00 2001 From: Corina <14900841+corinagum@users.noreply.github.com> Date: Tue, 16 Jul 2019 14:33:04 -0700 Subject: [PATCH 2/2] Update CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f81c6c5c08..ae460b31c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -42,6 +42,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - [`redux@4.0.4`](https://www.npmjs.com/package/redux) - Removed [`redux-promise-middleware`](https://www.npmjs.com/package/redux-promise-middleware) +### Fixed + - Fix [#2187](https://github.com/microsoft/BotFramework-WebChat/issues/2187). Bump core-js and update core-js modules on index-es5.js, by [@corinagum](https://github.com/corinagum) in PR [#2195](https://github.com/microsoft/BotFramework-WebChat/pull/2195) + ## [4.5.0] - 2019-07-10 ### Added