Merge pull request #382 from microsoft/develop

Release - June 3rd, 2019

.circleci/config.yml

@@ -1,4 +1,4 @@
-version: 2
+version: 2.1
 jobs:
   build:
     docker:
@@ -11,9 +11,10 @@ jobs:
 
       # Download and cache dependencies
       - restore_cache:
-          key: v1-deps-{{ .Branch }}-{{ checksum "package.json" }}
-          key: v1-deps-{{ .Branch }}
-          key: v1-deps
+          keys:
+            - v1-deps-{{ .Branch }}-{{ checksum "package.json" }}
+            - v1-deps-{{ .Branch }}
+            - v1-deps
       
       - run: node --version
       - run: npm --version
@@ -28,9 +29,7 @@ jobs:
       - run: npm run build
       - run: npm run test
 
-
 workflows:
-  version: 2
-  build:
+  build-test:
     jobs:
       - build

package-lock.json

@@ -33,17 +33,17 @@
       }
     },
     "@conversationlearner/models": {
-      "version": "0.199.3",
-      "resolved": "https://registry.npmjs.org/@conversationlearner/models/-/models-0.199.3.tgz",
-      "integrity": "sha512-OL3saxD8/9UOUyDvcNSqH4JzgXPKSMK/DrY3BbgxBvHj5UJyU6LP3huvL6KzFFYpcUf6/SK6wjA6gdC21XSoVw=="
+      "version": "0.200.1",
+      "resolved": "https://registry.npmjs.org/@conversationlearner/models/-/models-0.200.1.tgz",
+      "integrity": "sha512-Y+jTVDeQEDUTWaS9nDC2WN5TveQE2IhEvPe/u3tTuSR/6fnok+wWQor21n+DyJDAKco+3eNYqyC7Po1egcchbg=="
     },
     "@conversationlearner/sdk": {
-      "version": "0.318.12",
-      "resolved": "https://registry.npmjs.org/@conversationlearner/sdk/-/sdk-0.318.12.tgz",
-      "integrity": "sha512-kpuFZRMF9ZRsUJdZ500grk1WM+dLJpAcqPpYj70yhgB47nTY1fVeUxpE0vMBtpCS5jf/Y/Hrk16fQn037XUPUQ==",
+      "version": "0.319.7",
+      "resolved": "https://registry.npmjs.org/@conversationlearner/sdk/-/sdk-0.319.7.tgz",
+      "integrity": "sha512-uoFZrxouf0lQ6isql66oXmRR0ON2DRI69QUkEgHk6tfJGyUEZMIcwAOoNGoAzwSHye7oTSgbkDzSh5eEMg6gDg==",
       "requires": {
-        "@conversationlearner/models": "0.199.3",
-        "@conversationlearner/ui": "0.353.21",
+        "@conversationlearner/models": "0.200.1",
+        "@conversationlearner/ui": "0.358.3",
         "@types/supertest": "2.0.4",
         "async-file": "^2.0.2",
         "body-parser": "1.18.3",
@@ -101,9 +101,9 @@
       }
     },
     "@conversationlearner/ui": {
-      "version": "0.353.21",
-      "resolved": "https://registry.npmjs.org/@conversationlearner/ui/-/ui-0.353.21.tgz",
-      "integrity": "sha512-c+/wdp2qlYvJI4haCpiAWNRj970/SPmPzZu0qRpV+P77gXPhWvPtTrcmZOmyTaoTa12n07vmzt4MHXba1DhVww=="
+      "version": "0.358.3",
+      "resolved": "https://registry.npmjs.org/@conversationlearner/ui/-/ui-0.358.3.tgz",
+      "integrity": "sha512-eyA6zrYETQnqqsFbi7PI26EJ48ckOphf4dhqc31VfZtlYvMP9kYSRfRtAL3SryBtQyEiyNcPCAgrzEX77nBZHQ=="
     },
     "@types/bluebird": {
       "version": "3.5.20",
@@ -250,9 +250,9 @@
       }
     },
     "@types/lodash": {
-      "version": "4.14.130",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.130.tgz",
-      "integrity": "sha512-H++wk0tbneBsRVfLkgAAd0IIpmpVr2Bj4T0HncoOsQf3/xrJexRYQK2Tqo0Ej3pFslM8GkMgdis9bu6xIb1ycw=="
+      "version": "4.14.133",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.133.tgz",
+      "integrity": "sha512-/3JqnvPnY58GLzG3Y7fpphOhATV1DDZ/Ak3DQufjlRK5E4u+s0CfClfNFtAGBabw+jDGtRFbOZe+Z02ZMWCBNQ=="
     },
     "@types/marked": {
       "version": "0.4.2",
@@ -3070,9 +3070,9 @@
       }
     },
     "highlight.js": {
-      "version": "9.15.6",
-      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.15.6.tgz",
-      "integrity": "sha512-zozTAWM1D6sozHo8kqhfYgsac+B+q0PmsjXeyDrYIHHcBN0zTVT66+s2GW1GZv7DbyaROdLXKdabwS/WqPyIdQ=="
+      "version": "9.15.8",
+      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.15.8.tgz",
+      "integrity": "sha512-RrapkKQWwE+wKdF73VsOa2RQdIoO3mxwJ4P8mhbI6KYJUraUHRKM5w5zQQKXNk0xNL4UVRdulV9SBJcmzJNzVA=="
     },
     "home-or-tmp": {
       "version": "2.0.0",

package.json

@@ -30,7 +30,7 @@
   "author": "Microsoft Conversation Learner Team",
   "license": "MIT",
   "dependencies": {
-    "@conversationlearner/sdk": "0.318.12",
+    "@conversationlearner/sdk": "0.319.7",
     "botbuilder": "4.1.7",
     "chalk": "2.4.1",
     "convict": "^4.0.2",

src/demos/tutorialEntityDetectionCallback.ts

@@ -54,7 +54,7 @@ if (isDevelopment) {
 let cl = new ConversationLearner(modelId);
 
 //=========================================================
-// Bots Buisness Logic
+// Bots Business Logic
 //=========================================================
 let cities = ['new york', 'boston', 'new orleans', 'chicago'];
 let cityMap:{ [index:string] : string } = {};