Merge pull request #9486 from microsoft/southworks/fix/alerts

fix: Update dependencies to address pipeline failures

Author: tracyboehrer

.github/actions/conventional-pr/package-lock.json

@@ -24,14 +24,36 @@
     "json-ptr": "^2.1",
     "css-what": "^5.0.1",
     "css-select": "^4.1.3",
-    "ejs": "^3.1.6",
+    "ejs": "^3.1.8",
     "vscode-languageserver-protocol": "3.15.0-next.8",
     "@types/node": "13.9.3",
-    "express": "4.17.1",
+    "express": "4.17.3",
     "@types/express": "4.16.1",
     "@types/express-serve-static-core": "4.16.2",
     "@types/morgan": "1.7.35",
-    "@types/serve-static": "1.13.2"
+    "@types/serve-static": "1.13.2",
+    "@microsoft/bf-generate-library/botbuilder-lg": "^4.18.0",
+    "@microsoft/bf-generate-library/adaptive-expressions": "^4.18.0",
+    "plist": "^3.0.6",
+    "markdown-it-attrs-es5/terser": "^5.14.2",
+    "terser-webpack-plugin/terser": "^4.8.1",
+    "d3-color": "^3.1.0",
+    "loader-utils@^0.2.16": "^1.4.2",
+    "loader-utils@^1.0.0": "^1.4.2",
+    "loader-utils@^1.0.2": "^1.4.2",
+    "loader-utils@^1.1.0": "^1.4.2",
+    "[email protected]": "^1.4.2",
+    "loader-utils@^1.2.3": "^1.4.2",
+    "loader-utils@^1.4.0": "^1.4.2",
+    "loader-utils@^2.0.0": "^2.0.4",
+    "json5@^1.0.1": "^1.0.2",
+    "json5@^2.1.0": "^2.2.2",
+    "json5@^2.1.2": "^2.2.2",
+    "json5@^2.2.0": "^2.2.2",
+    "json5@^2.2.1": "^2.2.2",
+    "minimatch": "^3.1.2",
+    "uglify-js": "^3.17.4",
+    "jsonwebtoken": "^9.0.0"
   },
   "engines": {
     "node": "14.x"

Composer/package.json

@@ -28,8 +28,8 @@ describe('evaluateWidgetProp()', () => {
     expect(evaluate('=action.x', { action: { x: false } })).toEqual(false);
 
     // Convert to string
-    expect(evaluate('=string(action.x)', { action: { x: null } })).toEqual('null');
-    expect(evaluate('=string(action.x)', { action: { x: undefined } })).toEqual(undefined);
+    expect(evaluate('=string(action.x)', { action: { x: null } })).toEqual('');
+    expect(evaluate('=string(action.x)', { action: { x: undefined } })).toEqual('');
     expect(evaluate('=string(action.x)', { action: { x: false } })).toEqual('false');
 
     // Case-insensitive

Composer/packages/adaptive-flow/__tests__/adaptive-flow-renderer/utils/widgetExpressionEvaluator.test.ts

@@ -29,8 +29,8 @@
     "@emotion/react": "^11.1.3",
     "@emotion/styled": "^11.1.3",
     "@fluentui/react": "^8.83.1",
-    "adaptive-expressions": "4.12.0-rc1",
-    "botbuilder-lg": "4.14.0-dev.391a2ab",
+    "adaptive-expressions": "^4.18.0",
+    "botbuilder-lg": "^4.18.0",
     "create-react-class": "^15.6.3",
     "d3": "^5.9.1",
     "dagre": "^0.8.4",

Composer/packages/adaptive-flow/package.json

@@ -55,13 +55,13 @@
     "ansi_up": "5.0.0",
     "axios": "^0.21.1",
     "babel-plugin-extract-format-message": "^6.2.3",
-    "botframework-webchat": "4.15.3",
-    "botframework-webchat-core": "4.15.3",
+    "botframework-webchat": "^4.15.6",
+    "botframework-webchat-core": "^4.15.6",
     "format-message": "6.2.4",
     "format-message-generate-id": "^6.2.3",
     "immer": "^9.0.6",
-    "jsonwebtoken": "^8.5.1",
-    "jszip": "^3.6.0",
+    "jsonwebtoken": "^9.0.0",
+    "jszip": "^3.8.0",
     "jwt-decode": "^2.2.0",
     "lodash": "^4.17.19",
     "prop-types": "^15.7.2",

Composer/packages/client/package.json

@@ -40,7 +40,7 @@
     "@types/globby": "^9.1.0",
     "@types/http-errors": "^1.6.1",
     "@types/jest": "^26.0.15",
-    "@types/jsonwebtoken": "^8.3.3",
+    "@types/jsonwebtoken": "^9.0.0",
     "@types/lodash": "^4.14.146",
     "@types/lru-cache": "^5.1.0",
     "@types/mock-fs": "^3.6.30",
@@ -71,7 +71,7 @@
     "format-message-generate-id": "^6.2.3",
     "fs-extra": "^9.0.0",
     "lodash": "^4.17.19",
-    "node-fetch": "2.6.1",
+    "node-fetch": "2.6.7",
     "semver": "7.3.2",
     "tslib": "2.4.0",
     "uuid": "7.0.0"

Composer/packages/electron-server/package.json

@@ -46,7 +46,7 @@
     "autoprefixer": "^9.5.1",
     "copyfiles": "^2.2.0",
     "css-loader": "^2.1.1",
-    "express": "4.16.1",
+    "express": "4.17.3",
     "html-webpack-plugin": "^3.2.0",
     "mini-css-extract-plugin": "^0.6.0",
     "postcss-loader": "^3.0.0",

Composer/packages/lib/code-editor/package.json

@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "@microsoft/bf-lu": "4.15.0-dev.20210702.cbf708d",
-    "adaptive-expressions": "4.12.0-rc1",
-    "botbuilder-lg": "4.14.0-dev.391a2ab",
+    "adaptive-expressions": "^4.18.0",
+    "botbuilder-lg": "^4.18.0",
     "lodash": "^4.17.19",
     "tslib": "2.4.0"
   },

Composer/packages/lib/indexers/package.json

@@ -86,7 +86,7 @@
     "axios": "^0.21.1",
     "azure-storage": "^2.10.3",
     "base64url": "^3.0.1",
-    "body-parser": "^1.18.3",
+    "body-parser": "^1.19.2",
     "botframework-schema": "^4.11.1",
     "chalk": "^4.0.0",
     "compression": "1.7.4",
@@ -95,7 +95,7 @@
     "dotenv": "^8.1.0",
     "download-npm-package": "^3.1.12",
     "ejs": "3.1.8",
-    "express": "4.16.1",
+    "express": "4.17.3",
     "express-serve-static-core": "0.1.1",
     "express-session": "^1.17.0",
     "extract-zip": "2.0.1",
@@ -105,15 +105,15 @@
     "globby": "^11.0.1",
     "http-errors": "^1.7.2",
     "http-status-codes": "^2.1.4",
-    "jsonwebtoken": "^8.5.1",
+    "jsonwebtoken": "^9.0.0",
     "jwks-rsa": "^1.6.0",
     "lodash": "^4.17.19",
     "luis-apis": "2.5.1",
     "minimatch": "^3.0.4",
     "moment": "^2.29.1",
     "morgan": "^1.9.1",
     "msal": "^1.4.4",
-    "node-fetch": "2.6.1",
+    "node-fetch": "2.6.7",
     "passport": "^0.4.1",
     "path-to-regexp": "^6.1.0",
     "portfinder": "^1.0.32",

Composer/packages/server/package.json

@@ -67,7 +67,7 @@ const absh: AuthProviderInit = {
       const { kid } = header;
 
       if (!kid || kid.length === 0) {
-        callback('kid missing');
+        callback(new Error('kid missing'));
         return;
       }
 
@@ -78,7 +78,7 @@ const absh: AuthProviderInit = {
         }
 
         if (!key) {
-          callback('no key');
+          callback(new Error('no key'));
           return;
         }
 

Composer/packages/server/src/router/absh.ts

@@ -18,16 +18,16 @@
     "@bfc/built-in-functions": "*",
     "@bfc/indexers": "*",
     "@botframework-composer/types": "*",
-    "adaptive-expressions": "4.12.0-rc1",
-    "botbuilder-lg": "4.14.0-dev.391a2ab",
+    "adaptive-expressions": "^4.18.0",
+    "botbuilder-lg": "^4.18.0",
     "tslib": "2.4.0",
     "vscode-languageserver": "5.3.0-next.10"
   },
   "devDependencies": {
     "@botframework-composer/test-utils": "*",
     "@types/node": "13.9.3",
     "cross-env": "7.0.3",
-    "express": "4.16.1",
+    "express": "4.17.3",
     "rimraf": "3.0.2",
     "ts-node": "^8.4.1",
     "typescript": "3.9.2",

Composer/packages/tools/language-servers/language-generation/package.json

@@ -22,7 +22,7 @@
     "@bfc/shared": "*",
     "@microsoft/bf-cli-command": "4.14.0-dev.20210604.3f9ee15",
     "@microsoft/bf-lu": "4.15.0-dev.20210702.cbf708d",
-    "express": "4.16.1",
+    "express": "4.17.3",
     "monaco-languageclient": "0.10.2",
     "normalize-url": "^4.5.1",
     "reconnecting-websocket": "^3.2.2",