SUPPORT-2113 | merge code from develop

fusioncharts · Jun 18, 2021 · 2d171a8 · 2d171a8
2 parents 11cee7c + 135d733
commit 2d171a8
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 46 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -61,6 +61,8 @@
     "yards": "^0.1.4"
   },
   "dependencies": {
-    "underscore": "^1.9.1"
+    "mixin-deep": "^1.3.2",
+    "underscore": "^1.9.1",
+    "websocket-extensions": "^0.1.4"
   }
 }
diff --git a/yarn.lock b/yarn.lock
@@ -3552,8 +3552,8 @@ websocket-driver@>=0.5.1:
     websocket-extensions ">=0.1.1"
 
 websocket-extensions@>=0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.1.tgz#76899499c184b6ef754377c2dbb0cd6cb55d29e7"
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#76899499c184b6ef754377c2dbb0cd6cb55d29e7"
 
 which-module@^1.0.0:
   version "1.0.0"