Merge branch 'main' into southworks/fix/eslint-adaptive-runtime-integ…

…ration-packages
microsoft · Dec 10, 2024 · 2dffaf5 · 2dffaf5
2 parents 0f398a3 + 89ada0e
commit 2dffaf5
Show file tree

Hide file tree

Showing 92 changed files with 1,106 additions and 1,027 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -38,5 +38,8 @@ jobs:
       - name: yarn
         run: yarn --frozen-lockfile
 
+      - name: yarn build
+        run: yarn build
+
       - name: yarn lint
         run: yarn lint
diff --git a/generators/generator-botbuilder/generators/app/templates/core/package-with-tests.json.js b/generators/generator-botbuilder/generators/app/templates/core/package-with-tests.json.js
@@ -1,6 +1,6 @@
 {
     "name": "<%= botname %>",
-    "version": "1.0.0",
+    "version": "4.1.6",
     "description": "<%= botDescription %>",
     "author": "Generated using Microsoft Bot Builder Yeoman generator v<%= version %>",
     "license": "MIT",
@@ -17,10 +17,10 @@
     },
     "dependencies": {
         "@microsoft/recognizers-text-data-types-timex-expression": "1.1.4",
-        "botbuilder": "^4.23.1",
-        "botbuilder-ai": "^4.23.1",
-        "botbuilder-dialogs": "^4.23.1",
-        "botbuilder-testing": "^4.23.1",
+        "botbuilder": "4.1.6",
+        "botbuilder-ai": "4.1.6",
+        "botbuilder-dialogs": "4.1.6",
+        "botbuilder-testing": "4.1.6",
         "dotenv": "^8.2.0",
         "restify": "^11.1.0"
     },

diff --git a/generators/generator-botbuilder/generators/app/templates/core/package-with-tests.json.ts b/generators/generator-botbuilder/generators/app/templates/core/package-with-tests.json.ts
@@ -1,6 +1,6 @@
 {
     "name": "<%= botname %>",
-    "version": "1.0.0",
+    "version": "4.1.6",
     "description": "<%= botDescription %>",
     "author": "Generated using Microsoft Bot Builder Yeoman generator v<%= version %>",
     "license": "MIT",
@@ -38,22 +38,23 @@
     },
     "dependencies": {
       "@microsoft/recognizers-text-data-types-timex-expression": "1.1.4",
-      "botbuilder": "^4.23.1",
-      "botbuilder-ai": "^4.23.1",
-      "botbuilder-dialogs": "^4.23.1",
-      "botbuilder-testing": "^4.23.1",
+      "botbuilder": "4.1.6",
+      "botbuilder-ai": "4.1.6",
+      "botbuilder-dialogs": "4.1.6",
+      "botbuilder-testing": "4.1.6",
       "dotenv": "^8.2.0",
       "replace": "~1.2.0",
       "restify": "~11.1.0"
 },
   "devDependencies": {
       "@types/mocha": "^7.0.2",
+      "@types/node": "^18.19.47",
       "@types/restify": "8.4.2",
       "mocha": "^7.1.2",
       "nodemon": "^2.0.4",
       "nyc": "^15.0.1",
       "ts-node": "^8.10.1",
       "tslint": "^6.1.2",
-      "typescript": "^4.0.7"
+      "typescript": "^5.6.3"
   }
 }
diff --git a/generators/generator-botbuilder/generators/app/templates/core/package.json.js b/generators/generator-botbuilder/generators/app/templates/core/package.json.js
@@ -1,6 +1,6 @@
 {
     "name": "<%= botname %>",
-    "version": "1.0.0",
+    "version": "4.1.6",
     "description": "<%= botDescription %>",
     "author": "Generated using Microsoft Bot Builder Yeoman generator v<%= version %>",
     "license": "MIT",
@@ -17,9 +17,9 @@
     },
     "dependencies": {
         "@microsoft/recognizers-text-data-types-timex-expression": "1.1.4",
-        "botbuilder": "^4.23.1,
-        "botbuilder-ai": "^4.23.1",
-        "botbuilder-dialogs": "^4.23.1",
+        "botbuilder": "4.1.6",
+        "botbuilder-ai": "4.1.6",
+        "botbuilder-dialogs": "4.1.6",
         "dotenv": "~8.2.0",
         "restify": "~11.1.0"
     },

diff --git a/generators/generator-botbuilder/generators/app/templates/core/package.json.ts b/generators/generator-botbuilder/generators/app/templates/core/package.json.ts
@@ -1,6 +1,6 @@
 {
     "name": "<%= botname %>",
-    "version": "1.0.0",
+    "version": "4.1.6",
     "description": "<%= botDescription %>",
     "author": "Generated using Microsoft Bot Builder Yeoman generator v<%= version %>",
     "license": "MIT",
@@ -19,21 +19,22 @@
     },
     "dependencies": {
         "@microsoft/recognizers-text-data-types-timex-expression": "1.1.4",
-        "botbuilder": "^4.23.1",
-        "botbuilder-ai": "^4.23.1",
-        "botbuilder-dialogs": "^4.23.1",
+        "botbuilder": "4.1.6",
+        "botbuilder-ai": "4.1.6",
+        "botbuilder-dialogs": "4.1.6",
         "dotenv": "~8.2.0",
         "replace": "~1.2.0",
         "restify": "~11.1.0"
     },
     "devDependencies": {
         "@types/mocha": "^7.0.2",
+        "@types/node": "^18.19.47",
         "@types/restify": "8.4.2",
         "mocha": "^7.1.2",
         "nodemon": "^2.0.4",
         "nyc": "^15.0.1",
         "ts-node": "^8.10.1",
         "tslint": "^6.1.2",
-        "typescript": "^4.0.7"
+        "typescript": "^5.6.3"
     }
 }
diff --git a/generators/generator-botbuilder/generators/app/templates/core/tsconfig.json b/generators/generator-botbuilder/generators/app/templates/core/tsconfig.json
@@ -3,13 +3,15 @@
     "composite": true,
     "declaration": true,
     "target": "es2017",
-    "module": "commonjs",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
     "outDir": "./lib",
     "rootDir": "./src",
     "resolveJsonModule": true,
     "rootDirs": ["./src", "./resources"],
     "sourceMap": true,
     "incremental": true,
-    "tsBuildInfoFile": "./lib/.tsbuildinfo"
+    "tsBuildInfoFile": "./lib/.tsbuildinfo",
+    "esModuleInterop": true
   }
 }
diff --git a/generators/generator-botbuilder/generators/app/templates/echo/package.json.js b/generators/generator-botbuilder/generators/app/templates/echo/package.json.js
@@ -1,6 +1,6 @@
 {
     "name": "<%= botname %>",
-    "version": "1.0.0",
+    "version": "4.1.6",
     "description": "<%= botDescription %>",
     "author": "Generated using Microsoft Bot Builder Yeoman generator v<%= version %>",
     "license": "MIT",
@@ -16,7 +16,7 @@
         "url": "https://github.com"
     },
     "dependencies": {
-        "botbuilder": "^4.23.1",
+        "botbuilder": "4.1.6",
         "dotenv": "~8.2.0",
         "restify": "~11.1.0"
     },

diff --git a/generators/generator-botbuilder/generators/app/templates/echo/package.json.ts b/generators/generator-botbuilder/generators/app/templates/echo/package.json.ts
@@ -1,6 +1,6 @@
 {
     "name": "<%= botname %>",
-    "version": "1.0.0",
+    "version": "4.1.6",
     "description": "<%= botDescription %>",
     "author": "Generated using Microsoft Bot Builder Yeoman generator v<%= version %>",
     "license": "MIT",
@@ -18,15 +18,16 @@
         "url": "https://github.com"
     },
     "dependencies": {
-        "botbuilder": "~4.23.1",
+        "botbuilder": "4.1.6",
         "dotenv": "~8.2.0",
         "replace": "~1.2.0",
         "restify": "~11.1.0"
     },
     "devDependencies": {
+        "@types/node": "^18.19.47",
         "@types/restify": "8.4.2",
         "nodemon": "^2.0.4",
         "tslint": "^6.1.2",
-        "typescript": "^4.0.7"
+        "typescript": "^5.6.3"
     }
 }
diff --git a/generators/generator-botbuilder/generators/app/templates/echo/tsconfig.json b/generators/generator-botbuilder/generators/app/templates/echo/tsconfig.json
@@ -2,11 +2,13 @@
   "compilerOptions": {
     "declaration": true,
     "target": "es2017",
-    "module": "commonjs",
+    "moduleResolution": "NodeNext",
+    "module": "NodeNext",
     "outDir": "./lib",
     "rootDir": "./src",
     "sourceMap": true,
     "incremental": true,
-    "tsBuildInfoFile": "./lib/.tsbuildinfo"
+    "tsBuildInfoFile": "./lib/.tsbuildinfo",
+    "esModuleInterop": true
   }
 }
diff --git a/generators/generator-botbuilder/generators/app/templates/empty/package.json.js b/generators/generator-botbuilder/generators/app/templates/empty/package.json.js
@@ -1,6 +1,6 @@
 {
     "name": "<%= botname %>",
-    "version": "1.0.0",
+    "version": "4.1.6",
     "description": "<%= botDescription %>",
     "author": "Generated using Microsoft Bot Builder Yeoman generator v<%= version %>",
     "license": "MIT",
@@ -16,7 +16,7 @@
         "url": "https://github.com"
     },
     "dependencies": {
-        "botbuilder": "^4.23.1",
+        "botbuilder": "4.1.6",
         "restify": "~11.1.0"
     },
     "devDependencies": {

diff --git a/generators/generator-botbuilder/generators/app/templates/empty/package.json.ts b/generators/generator-botbuilder/generators/app/templates/empty/package.json.ts
@@ -1,6 +1,6 @@
 {
     "name": "<%= botname %>",
-    "version": "1.0.0",
+    "version": "4.1.6",
     "description": "<%= botDescription %>",
     "author": "Generated using Microsoft Bot Builder Yeoman generator v<%= version %>",
     "license": "MIT",
@@ -18,14 +18,15 @@
         "url": "https://github.com"
     },
     "dependencies": {
-        "botbuilder": "^4.23.1",
+        "botbuilder": "4.1.6",
         "replace": "~1.2.0",
         "restify": "~11.1.0"
     },
     "devDependencies": {
+        "@types/node": "^18.19.47",
         "@types/restify": "8.4.2",
         "nodemon": "^2.0.4",
         "tslint": "^6.1.2",
-        "typescript": "^4.0.7"
+        "typescript": "^5.6.3"
     }
 }
diff --git a/generators/generator-botbuilder/generators/app/templates/empty/tsconfig.json b/generators/generator-botbuilder/generators/app/templates/empty/tsconfig.json
@@ -2,11 +2,13 @@
   "compilerOptions": {
     "declaration": true,
     "target": "es2017",
-    "module": "commonjs",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
     "outDir": "./lib",
     "rootDir": "./src",
     "sourceMap": true,
     "incremental": true,
-    "tsBuildInfoFile": "./lib/.tsbuildinfo"
+    "tsBuildInfoFile": "./lib/.tsbuildinfo",
+    "esModuleInterop": true
   }
 }
diff --git a/generators/generator-botbuilder/package.json b/generators/generator-botbuilder/package.json
@@ -1,6 +1,6 @@
 {
     "name": "generator-botbuilder",
-    "version": "4.11.0",
+    "version": "4.1.6",
     "description": "A yeoman generator for creating bots built with Bot Framework v4",
     "homepage": "https://github.com/Microsoft/BotBuilder-JS/tree/main/generators/generator-botbuilder",
     "author": {

diff --git a/libraries/botbuilder-ai/eslint.config.cjs b/libraries/botbuilder-ai/eslint.config.cjs
diff --git a/libraries/botbuilder-ai/package.json b/libraries/botbuilder-ai/package.json
@@ -34,7 +34,6 @@
     "botbuilder-dialogs-adaptive-runtime-core": "4.1.6",
     "botbuilder-dialogs-declarative": "4.1.6",
     "botframework-connector": "4.1.6",
-    "eslint-plugin-only-warn": "^1.1.0",
     "lodash": "^4.17.21",
     "node-fetch": "^2.7.0",
     "url-parse": "^1.5.10",
@@ -51,7 +50,7 @@
     "build:rollup": "yarn clean && yarn build && api-extractor run --verbose --local",
     "clean": "rimraf _ts3.4 lib tsconfig.tsbuildinfo",
     "depcheck": "depcheck --config ../../.depcheckrc",
-    "lint": "eslint .",
+    "lint": "eslint . --config ../../eslint.config.cjs",
     "postbuild": "downlevel-dts lib _ts3.4/lib --checksum",
     "test": "npm-run-all build test:mocha",
     "test:mocha": "nyc mocha tests",

diff --git a/libraries/botbuilder-ai/src/custom.window.ts b/libraries/botbuilder-ai/src/custom.window.ts
@@ -7,7 +7,7 @@
  */
 
 declare global {
-    interface Window {} // eslint-disable-line @typescript-eslint/no-empty-interface
+    interface Window {} // eslint-disable-line @typescript-eslint/no-empty-object-type
 }
 
 export type window = Window;
diff --git a/libraries/botbuilder-ai/src/customQuestionAnswering.ts b/libraries/botbuilder-ai/src/customQuestionAnswering.ts
@@ -43,7 +43,7 @@ export interface QnAMakerClient {
         turnContext: TurnContext,
         options?: QnAMakerOptions,
         telemetryProperties?: Record<string, string>,
-        telemetryMetrics?: Record<string, number>
+        telemetryMetrics?: Record<string, number>,
     ): Promise<QnAMakerResult[]>;
 
     /**
@@ -59,7 +59,7 @@ export interface QnAMakerClient {
         turnContext: TurnContext,
         options?: QnAMakerOptions,
         telemetryProperties?: Record<string, string>,
-        telemetryMetrics?: Record<string, number>
+        telemetryMetrics?: Record<string, number>,
     ): Promise<QnAMakerResults>;
 
     /**
@@ -111,7 +111,7 @@ export interface QnAMakerTelemetryClient {
         context: TurnContext,
         options?: QnAMakerOptions,
         telemetryProperties?: { [key: string]: string },
-        telemetryMetrics?: { [key: string]: number }
+        telemetryMetrics?: { [key: string]: number },
     ): Promise<QnAMakerResult[]>;
 }
 
@@ -142,7 +142,7 @@ export class CustomQuestionAnswering implements QnAMakerClient, QnAMakerTelemetr
         private readonly endpoint: QnAMakerEndpoint,
         options: QnAMakerOptions = {},
         telemetryClient?: BotTelemetryClient,
-        logPersonalInformation?: boolean
+        logPersonalInformation?: boolean,
     ) {
         if (!endpoint) {
             throw new TypeError('QnAMaker requires valid QnAMakerEndpoint.');
@@ -215,7 +215,7 @@ export class CustomQuestionAnswering implements QnAMakerClient, QnAMakerTelemetr
         context: TurnContext,
         options?: QnAMakerOptions,
         telemetryProperties?: { [key: string]: string },
-        telemetryMetrics?: { [key: string]: number }
+        telemetryMetrics?: { [key: string]: number },
     ): Promise<QnAMakerResult[]> {
         if (!context) {
             throw new TypeError('QnAMaker.getAnswers() requires a TurnContext.');
@@ -243,7 +243,7 @@ export class CustomQuestionAnswering implements QnAMakerClient, QnAMakerTelemetr
         context: TurnContext,
         options: QnAMakerOptions,
         telemetryProperties: { [key: string]: string },
-        telemetryMetrics: { [key: string]: number }
+        telemetryMetrics: { [key: string]: number },
     ): Promise<QnAMakerResults> {
         if (!context) {
             throw new TypeError('CustomQuestionAnswering.getAnswersRaw() requires a TurnContext.');
@@ -266,7 +266,7 @@ export class CustomQuestionAnswering implements QnAMakerClient, QnAMakerTelemetr
         context: TurnContext,
         options: QnAMakerOptions,
         telemetryProperties: { [key: string]: string },
-        telemetryMetrics: { [key: string]: number }
+        telemetryMetrics: { [key: string]: number },
     ): Promise<QnAMakerResults> {
         const question: string = this.getTrimmedMessageText(context);
         const userId = context?.activity?.from?.id;
@@ -327,13 +327,13 @@ export class CustomQuestionAnswering implements QnAMakerClient, QnAMakerTelemetr
         qnaResults: QnAMakerResult[],
         turnContext: TurnContext,
         telemetryProperties?: { [key: string]: string },
-        telemetryMetrics?: { [key: string]: number }
+        telemetryMetrics?: { [key: string]: number },
     ): Promise<void> {
         const [properties, metrics] = await this.fillQnAEvent(
             qnaResults,
             turnContext,
             telemetryProperties,
-            telemetryMetrics
+            telemetryMetrics,
         );
 
         this.telemetryClient.trackEvent({
@@ -357,7 +357,7 @@ export class CustomQuestionAnswering implements QnAMakerClient, QnAMakerTelemetr
         qnaResults: QnAMakerResult[],
         turnContext: TurnContext,
         telemetryProperties?: Record<string, string>,
-        telemetryMetrics?: Record<string, number>
+        telemetryMetrics?: Record<string, number>,
     ): Promise<[Record<string, string>, Record<string, number>]> {
         const properties: Record<string, string> = {
             [QnATelemetryConstants.knowledgeBaseIdProperty]: this.endpoint.knowledgeBaseId,