Merge branch 'main' into feat-flipper-next-previous

microsoft · Feb 16, 2023 · 4b735b0 · 4b735b0
2 parents a8607e6 + 30b6b3c
commit 4b735b0
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -22,6 +22,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Added
+
+-  Resolved [#4643](https://github.com/microsoft/BotFramework-WebChat/issues/4643). Decoupling `botframework-directlinejs` from business logic of Web Chat for better tree-shaking, by [@compulim](https://github.com/compulim), in PR [#4645](https://github.com/microsoft/BotFramework-WebChat/pull/4645)
+
 ### Fixed
 
 -  Fixes [#4557](https://github.com/microsoft/BotFramework-WebChat/issues/4557). Flipper buttons in carousels and suggested actions is now renamed to "next/previous" from "left/right", by [@compulim](https://github.com/compulim), in PR [#4646](https://github.com/microsoft/BotFramework-WebChat/pull/4646)

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "botframework-webchat-root",
-  "version": "4.15.7",
+  "version": "4.15.8-0",
   "private": true,
   "files": [
     "lib/**/*"

diff --git a/packages/core/src/sagas/connectSaga.js b/packages/core/src/sagas/connectSaga.js
@@ -2,7 +2,6 @@
 
 import { call, cancel, cancelled, fork, put, race, take } from 'redux-saga/effects';
 
-import { ConnectionStatus } from 'botframework-directlinejs';
 import decode from 'jwt-decode';
 
 import { CONNECT } from '../actions/connect';
@@ -15,7 +14,9 @@ import { DISCONNECT, DISCONNECT_PENDING, DISCONNECT_FULFILLED } from '../actions
 
 import { RECONNECT } from '../actions/reconnect';
 
-const { Connecting: CONNECTING, Online: ONLINE, Uninitialized: UNINITIALIZED } = ConnectionStatus;
+const CONNECTING = 1;
+const ONLINE = 2;
+const UNINITIALIZED = 0;
 
 function randomUserID() {
   return `r_${uniqueID().substr(0, 10)}`;

diff --git a/packages/embed/servicingPlan.json b/packages/embed/servicingPlan.json
@@ -477,6 +477,17 @@
           "sha384-Ik2jNknNTBCaI/NP3GRMfDCWKnApGSdYMcdA6EtEJkL1LtUZEdNdjeNkfZZk3UlS"
         ]
       ],
+      "deprecation": "This version of Web Chat is deprecated. Please upgrade as soon as possible. We will automatically upgrade this site on or after 2025-02-15.",
+      "private": true,
+      "versionFamily": "4"
+    },
+    "4.15.7": {
+      "assets": [
+        [
+          "https://cdn.botframework.com/botframework-webchat/4.15.7/webchat-es5.js",
+          "sha384-1T+LvOs6/1ShG/+c7tarxIR/J0dUIjrba2M9SbyOv9Ls8ElcnhLZFnLGdiVf/u4W"
+        ]
+      ],
       "private": true,
       "versionFamily": "4"
     },