Merge branch 'main' into southworks/update/nock-dependency

microsoft · Sep 27, 2024 · 89c3293 · 89c3293
2 parents a83449e + 7112170
commit 89c3293
Show file tree

Hide file tree

Showing 5 changed files with 163 additions and 58 deletions.
diff --git a/libraries/botbuilder-applicationinsights/package.json b/libraries/botbuilder-applicationinsights/package.json
@@ -28,7 +28,7 @@
     }
   },
   "dependencies": {
-    "applicationinsights": "^1.7.5",
+    "applicationinsights": "^2.9.6",
     "botbuilder-core": "4.1.6",
     "cls-hooked": "^4.2.2"
   },

diff --git a/libraries/botframework-streaming/etc/botframework-streaming.api.md b/libraries/botframework-streaming/etc/botframework-streaming.api.md
@@ -44,8 +44,6 @@ export interface INodeBuffer extends Uint8Array {
     // (undocumented)
     copy(targetBuffer: Uint8Array, targetStart?: number, sourceStart?: number, sourceEnd?: number): number;
     // (undocumented)
-    entries(): IterableIterator<[number, number]>;
-    // (undocumented)
     equals(otherBuffer: Uint8Array): boolean;
     // (undocumented)
     fill(value: any, offset?: number, end?: number): this;
@@ -54,8 +52,6 @@ export interface INodeBuffer extends Uint8Array {
     // (undocumented)
     indexOf(value: string | number | Uint8Array, byteOffset?: number, encoding?: string): number;
     // (undocumented)
-    keys(): IterableIterator<number>;
-    // (undocumented)
     lastIndexOf(value: string | number | Uint8Array, byteOffset?: number, encoding?: string): number;
     // (undocumented)
     readDoubleBE(offset: number, noAssert?: boolean): number;
@@ -109,8 +105,6 @@ export interface INodeBuffer extends Uint8Array {
     // (undocumented)
     toString(encoding?: string, start?: number, end?: number): string;
     // (undocumented)
-    values(): IterableIterator<number>;
-    // (undocumented)
     write(string: string, offset?: number, length?: number, encoding?: string): number;
     // (undocumented)
     writeDoubleBE(value: number, offset: number, noAssert?: boolean): number;

diff --git a/libraries/botframework-streaming/src/interfaces/INodeBuffer.ts b/libraries/botframework-streaming/src/interfaces/INodeBuffer.ts
@@ -96,8 +96,5 @@ export interface INodeBuffer extends Uint8Array {
     fill(value: any, offset?: number, end?: number): this;
     indexOf(value: string | number | Uint8Array, byteOffset?: number, encoding?: string): number;
     lastIndexOf(value: string | number | Uint8Array, byteOffset?: number, encoding?: string): number;
-    entries(): IterableIterator<[number, number]>;
     includes(value: string | number | this, byteOffset?: number, encoding?: string): boolean;
-    keys(): IterableIterator<number>;
-    values(): IterableIterator<number>;
 }
diff --git a/package.json b/package.json
@@ -48,13 +48,15 @@
     "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"
+    "**/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"
+    "**/nightwatch/semver": "Remove the resolution when nightwatch is updated to a latest version",
+    "**/restify/find-my-way": "Remove the resolution when restify publishes a new version with the patch"
   },
   "devDependencies": {
     "@types/node": "18.19.47",
@@ -67,7 +69,7 @@
     "@types/sinon": "^9.0.11",
     "@typescript-eslint/eslint-plugin": "^4.16.1",
     "@typescript-eslint/parser": "^4.16.1",
-    "applicationinsights": "^1.7.5",
+    "applicationinsights": "^2.9.6",
     "browserify": "^17.0.0",
     "depcheck": "^1.4.7",
     "eslint": "^7.21.0",