Merge branch 'main' into southworks/fix/minimist-alert

microsoft · Feb 7, 2023 · 5486bed · 5486bed
2 parents 30213e9 + 66a028a
commit 5486bed
Show file tree

Hide file tree

Showing 8 changed files with 1,689 additions and 1,237 deletions.
diff --git a/Composer/packages/lib/code-editor/src/LuEditor.tsx b/Composer/packages/lib/code-editor/src/LuEditor.tsx
@@ -245,7 +245,7 @@ const LuEditor: React.FC<LULSPEditorProps> = (props) => {
     }
 
     return () => {
-      webSocket.close();
+      webSocket?.close();
     };
   }, [editor, onNavigateToLuPage]);
 

diff --git a/Composer/packages/lib/code-editor/src/lg/LgCodeEditor.tsx b/Composer/packages/lib/code-editor/src/lg/LgCodeEditor.tsx
@@ -175,7 +175,7 @@ export const LgCodeEditor = (props: LgCodeEditorProps) => {
     }
 
     return () => {
-      webSocket.close();
+      webSocket?.close();
     };
   }, [editor, onNavigateToLgPage]);
 

diff --git a/extensions/azurePublish/package.json b/extensions/azurePublish/package.json
@@ -37,26 +37,26 @@
     }
   },
   "dependencies": {
-    "@azure/arm-appinsights": "4.0.0",
-    "@azure/arm-appservice": "13.0.0",
-    "@azure/arm-appservice-profile-2019-03-01-hybrid": "1.2.0",
+    "@azure/arm-appinsights": "^3.0.0",
+    "@azure/arm-appservice": "^6.0.0",
+    "@azure/arm-appservice-profile-2019-03-01-hybrid": "1.0.0",
     "@azure/arm-botservice": "3.1.0",
-    "@azure/arm-cognitiveservices": "7.2.0",
-    "@azure/arm-cosmosdb": "15.0.0",
-    "@azure/arm-deploymentmanager": "3.1.1",
-    "@azure/arm-keyvault": "2.0.0",
-    "@azure/arm-keyvault-profile-2020-09-01-hybrid": "2.0.0",
-    "@azure/arm-resources": "5.0.1",
-    "@azure/arm-search": "3.0.1",
-    "@azure/arm-storage": "17.2.1",
-    "@azure/arm-subscriptions": "5.0.1",
-    "@azure/cognitiveservices-luis-authoring": "4.0.0-preview.3",
-    "@azure/cosmos": "3.16.2",
-    "@azure/graph": "5.0.3",
-    "@azure/keyvault-secrets": "4.4.0",
-    "@azure/ms-rest-browserauth": "1.0.2",
-    "@azure/ms-rest-js": "2.6.1",
-    "@azure/ms-rest-nodeauth": "3.1.1",
+    "@azure/arm-cognitiveservices": "^5.2.0",
+    "@azure/arm-cosmosdb": "^9.0.0",
+    "@azure/arm-deploymentmanager": "3.0.0",
+    "@azure/arm-keyvault": "^1.2.1",
+    "@azure/arm-keyvault-profile-2020-09-01-hybrid": "^1.0.0",
+    "@azure/arm-resources": "2.1.0",
+    "@azure/arm-search": "^1.3.0",
+    "@azure/arm-storage": "^15.0.0",
+    "@azure/arm-subscriptions": "2.0.0",
+    "@azure/cognitiveservices-luis-authoring": "4.0.0-preview.1",
+    "@azure/cosmos": "^3.7.4",
+    "@azure/graph": "5.0.1",
+    "@azure/keyvault-secrets": "^4.1.0",
+    "@azure/ms-rest-browserauth": "0.1.4",
+    "@azure/ms-rest-js": "^2.0.7",
+    "@azure/ms-rest-nodeauth": "3.0.3",
     "@bfc/built-in-functions": "../../Composer/packages/tools/built-in-functions",
     "@bfc/code-editor": "../../Composer/packages/lib/code-editor",
     "@bfc/extension-client": "file:../../Composer/packages/extension-client",
@@ -86,11 +86,7 @@
   "resolutions": {
     "@botframework-composer/types": "file:../../Composer/packages/types",
     "bl": "^4.0.3",
-    "underscore": "^1.12.1",
-    "@azure/ms-rest-nodeauth/adal-node": "0.2.4",
-    "terser": "^5.14.2",
-    "loader-utils": "^2.0.4",
-    "json5": "^2.2.2"
+    "underscore": "^1.12.1"
   },
   "devDependencies": {
     "@babel/plugin-transform-runtime": "7.18.6",