Merge branch 'main' into southworks/update/nightwatch

libraries/adaptive-expressions-ie11/package.json

@@ -19,28 +19,11 @@
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "dependencies": {
-    "adaptive-expressions": "4.1.6",
-    "clean-webpack-plugin": "^4.0.0",
-    "core-js": "^3.38.1",
-    "eslint-plugin-only-warn": "^1.1.0",
-    "terser-webpack-plugin": "^5.3.10"
-  },
-  "devDependencies": {
-    "@babel/core": "^7.25.2",
-    "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@babel/plugin-proposal-decorators": "^7.24.7",
-    "@babel/plugin-transform-runtime": "^7.25.4",
-    "@babel/preset-env": "^7.25.4",
-    "@babel/preset-typescript": "^7.24.7",
-    "@babel/runtime": "^7.25.4",
-    "babel-loader": "^9.1.3",
-    "ts-loader": "^9.5.1",
-    "typescript": "~4.7",
-    "webpack": "^5.94.0",
-    "webpack-cli": "^5.1.4"
+    "adaptive-expressions": "4.1.6"
   },
   "scripts": {
-    "build": "webpack",
+    "build": "npm-run-all clean build:browser",
+    "build:browser": "tsup --config ../../tsup/browser.config.ts --define.outfile dist/index.js --dts",
     "clean": "rimraf dist",
     "lint": "eslint ."
   },

libraries/adaptive-expressions-ie11/tsconfig.json

@@ -1,7 +1,6 @@
 {
     "extends": "../adaptive-expressions/tsconfig.json",
     "compilerOptions": {
-      "target": "es5",
       "outDir": "dist",
       "rootDir": "./src"
     },

libraries/adaptive-expressions/package.json

@@ -53,11 +53,12 @@
     "typescript": "~4.7"
   },
   "scripts": {
+    "build": "npm-run-all build:src build:tests build:browser",
     "build:src": "tsc -b",
     "build:tests": "tsc -p tests/tsconfig.json",
-    "build": "npm-run-all build:src build:tests",
-    "browserify": "browserify lib/browser.js -s AEL --debug -p esmify -t [ babelify --extensions .js,.mjs --global ]  | exorcist lib/browser.js.map | sponge lib/browser.js",
-    "postbuild": "rimraf --glob lib/browser.* && shx cp lib/index.js lib/browser.js && yarn browserify",
+    "build:browser": "npm-run-all build:browser:clean build:browser:run",
+    "build:browser:clean": "rimraf --glob lib/browser.*",
+    "build:browser:run": "tsup --config ../../tsup/browser.config.ts",
     "clean": "rimraf lib tsconfig.tsbuildinfo",
     "depcheck": "depcheck --config ../../.depcheckrc --ignores sinon,@types/xmldom",
     "build-docs": "typedoc --theme markdown --entryPoint adaptive-expressions --excludePrivate --includeDeclarations --ignoreCompilerErrors --module amd --out ..\\..\\doc\\adaptive-expressions .\\lib\\index.d.ts --hideGenerator --name \"Bot Builder SDK - Expression\" --readme none",

libraries/botframework-connector/package.json

@@ -37,37 +37,31 @@
     "botframework-schema": "4.1.6",
     "buffer": "^6.0.3",
     "cross-fetch": "^4.0.0",
-    "crypto-browserify": "^3.12.0",
     "eslint-plugin-only-warn": "^1.1.0",
-    "https-browserify": "^1.0.0",
     "https-proxy-agent": "^7.0.5",
     "jsonwebtoken": "^9.0.2",
     "node-fetch": "^2.7.0",
     "openssl-wrapper": "^0.3.4",
     "rsa-pem-from-mod-exp": "^0.8.6",
-    "stream-browserify": "^3.0.0",
-    "stream-http": "^3.2.0",
     "zod": "^3.23.8"
   },
   "devDependencies": {
     "@types/node": "18.19.47",
     "botbuilder-test-utils": "0.0.0",
     "dotenv": "^16.4.5",
-    "esbuild-plugin-polyfill-node": "^0.3.0",
     "nock": "^13.5.5",
-    "should": "^13.2.3",
-    "tsup": "^8.2.4"
+    "should": "^13.2.3"
   },
   "scripts": {
     "build": "tsc -b",
-    "build:tsup": "npm-run-all build:tsup:clean build:tsup:run",
-    "build:tsup:clean": "rimraf --glob lib/browser.*",
-    "build:tsup:run": "tsup",
+    "build:browser": "npm-run-all build:browser:clean build:browser:run",
+    "build:browser:clean": "rimraf --glob lib/browser.*",
+    "build:browser:run": "tsup --config ../../tsup/browser.config.ts",
     "build:downlevel-dts": "downlevel-dts lib _ts3.4/lib --checksum",
     "clean": "rimraf _ts3.4 lib tsconfig.tsbuildinfo",
     "depcheck": "depcheck --config ../../.depcheckrc --ignores azure,sinon,browserify-fs,buffer,crypto-browserify,https-browserify,stream-browserify,stream-http",
     "lint": "eslint .",
-    "postbuild": "npm-run-all -p build:tsup build:downlevel-dts",
+    "postbuild": "npm-run-all -p build:browser build:downlevel-dts",
     "test": "yarn build && yarn test:mocha",
     "test:mocha": "nyc mocha tests --recursive"
   },

libraries/botframework-streaming/package.json

@@ -40,13 +40,13 @@
     "chai": "^4.5.0"
   },
   "scripts": {
-    "build": "npm-run-all -p build:lib build:es5",
-    "build:es5": "npm-run-all build:es5:tsc build:es5:browserify",
-    "build:es5:browserify": "browserify -s BFSE --debug es5/index-browser.js | exorcist lib/index-browser.js.map > lib/index-browser.js",
-    "build:es5:tsc": "tsc -p tsconfig-es5.json",
+    "build": "npm-run-all -p build:lib build:browser",
+    "build:browser": "npm-run-all build:browser:clean build:browser:run",
+    "build:browser:clean": "rimraf --glob lib/index-browser.*",
+    "build:browser:run": "tsup --config ../../tsup/browser.config.ts --define.entry src/index-browser.ts --define.outfile lib/index-browser.js --dts",
     "build:lib": "tsc -p tsconfig.json",
     "build:rollup": "yarn clean && yarn build && api-extractor run --verbose --local",
-    "clean": "rimraf _ts3.4 es5 lib",
+    "clean": "rimraf _ts3.4 lib",
     "depcheck": "depcheck --config ../../.depcheckrc",
     "lint": "eslint .",
     "postbuild": "downlevel-dts lib _ts3.4/lib --checksum",

libraries/botframework-streaming/tsconfig.json

@@ -2,7 +2,7 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "composite": false,
-    "lib": ["es2015"],
+    "lib": ["es2015", "dom"],
     "outDir": "lib",
     "rootDir": "src"
   },

package.json

@@ -53,15 +53,13 @@
   "resolutions": {
     "@microsoft/recognizers-text-number": "~1.3.1",
     "@types/ramda": "0.26.0",
-    "babel-traverse": "npm:@babel/[email protected]",
     "lodash.pick": "file:overrides/lodash.pick",
     "**/nightwatch/ejs": "^3.1.10",
     "**/nightwatch/semver": "^7.5.2",
     "**/botbuilder-dialogs-adaptive-runtime-integration-restify/restify/send": "^0.19.0",
     "**/restify/find-my-way": "^8.2.2"
   },
   "resolutionComments": {
-    "babel-traverse": "Keep version pinned at '7.24.7'(different than other @babel/traverse), so it doesn't collide. Remove the resolution and override project when replacing browserify, so it removes esmify which has this dependency.",
     "lodash.pick": "Remove the resolution and override project when supporting Node >=18. Because we can't update nightwatch due to jsdom requires node >= 18. https://github.com/lodash/lodash/issues/5809#issuecomment-1910560681",
     "**/nightwatch/ejs": "Remove the resolution when supporting Node >=18. Because we can't update nightwatch due to jsdom requires node >= 18. https://github.com/lodash/lodash/issues/5809#issuecomment-1910560681",
     "**/nightwatch/semver": "Remove the resolution when nightwatch is updated to a latest version",
@@ -79,9 +77,10 @@
     "@types/node": "18.19.47",
     "@types/sinon": "^17.0.3",
     "applicationinsights": "^2.9.6",
-    "babelify": "^10.0.0",
-    "browserify": "^17.0.0",
+    "crypto-browserify": "^3.12.0",
     "depcheck": "^1.4.7",
+    "esbuild-plugin-polyfill-node": "^0.3.0",
+    "https-browserify": "^1.0.0",
     "eslint": "^9.12.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-import": "^2.31.0",
@@ -90,22 +89,22 @@
     "eslint-plugin-mocha": "^10.5.0",
     "eslint-plugin-prettier": "^5.2.1",
     "eslint-plugin-security": "^3.0.1",
-    "esmify": "^2.1.1",
-    "exorcist": "^2.0.0",
-    "mocha": "^10.7.3",
     "mocha-junit-reporter": "^2.2.1",
+    "mocha": "^10.7.3",
     "npm-run-all": "^4.1.5",
     "nyc": "^17.0.0",
     "prettier": "^3.3.3",
     "rimraf": "^5.0.10",
     "shx": "^0.3.4",
     "sinon": "^19.0.2",
     "source-map-support": "^0.5.21",
-    "sponge": "^0.1.0",
+    "stream-browserify": "^3.0.0",
+    "stream-http": "^3.2.0",
     "ts-node": "^10.9.2",
-    "typedoc": "^0.26.7",
+    "tsup": "^8.2.4",
     "typedoc-plugin-external-module-name": "^4.0.6",
     "typedoc-plugin-markdown": "^4.2.7",
+    "typedoc": "^0.26.7",
     "typescript": "~4.7",
     "typescript-eslint": "^8.11.0",
     "webpack-dev-server": "^5.1.0",

testing/botbuilder-test-utils/package.json

@@ -19,8 +19,7 @@
     "@types/node-forge": "^1.3.11"
   },
   "dependencies": {
-     "eslint-plugin-only-warn": "^1.1.0",
-    "nanoid": "^3.3.7",
+    "eslint-plugin-only-warn": "^1.1.0",
     "node-forge": "^1.3.1",
     "zod": "^3.23.8"
   }

testing/botbuilder-test-utils/src/jwt.ts

@@ -6,8 +6,8 @@ import forge from 'node-forge';
 import jwt, { Algorithm } from 'jsonwebtoken'; // eslint-disable-line import/no-extraneous-dependencies
 import nock from 'nock'; // eslint-disable-line import/no-extraneous-dependencies
 import url from 'url';
-import { nanoid } from 'nanoid';
 import { ok } from 'assert';
+import { randomUUID } from 'crypto';
 
 /**
  * Registers mocha hooks for proper usage
@@ -62,10 +62,10 @@ export function stub(options: Partial<Options> = {}): Result {
         algorithm = 'RS256',
         bits = 2048,
         expiresIn = 1000 * 60 * 5,
-        host = `https://${nanoid()}.jwt.localhost`,
+        host = `https://${randomUUID()}.jwt.localhost`,
         issuer = 'iss',
         jwks = { path: '/v1/.well-known/jwks' },
-        keyId = nanoid(),
+        keyId = randomUUID(),
         metadata = { path: '/v1/.well-known/openid' },
     } = options;