Merge pull request #12479 from OfficeDev/huajie/hotfix/5.8.2

build: merge back to main after 5.8.2 TTK hotfix
OfficeDev · Sep 29, 2024 · ef93dc1 · ef93dc1
2 parents ef0e026 + 3451a68
commit ef93dc1
Show file tree

Hide file tree

Showing 21 changed files with 47 additions and 34 deletions.
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/teamsapp-cli",
-  "version": "3.0.2",
+  "version": "3.0.3",
   "author": "Microsoft Corporation",
   "description": "",
   "license": "MIT",

diff --git a/packages/fx-core/package.json b/packages/fx-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/teamsfx-core",
-  "version": "2.0.9",
+  "version": "2.0.10",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "license": "MIT",

diff --git a/packages/fx-core/src/common/templates-config.json b/packages/fx-core/src/common/templates-config.json
@@ -1,6 +1,6 @@
 {
     "version": "~4.2",
-    "localVersion": "4.2.3",
+    "localVersion": "4.2.4",
     "tagPrefix": "templates@",
     "tagListURL": "https://github.com/OfficeDev/TeamsFx/releases/download/template-tag-list/template-tags.txt",
     "templateDownloadBaseURL": "https://github.com/OfficeDev/TeamsFx/releases/download",

diff --git a/packages/fx-core/src/component/configManager/parser.ts b/packages/fx-core/src/component/configManager/parser.ts
@@ -33,7 +33,7 @@ function parseRawProjectModel(obj: Record<string, unknown>): Result<RawProjectMo
     if (typeof obj[environmentFolderPath] !== "string") {
       return err(new YamlFieldTypeError("environmentFolderPath", "string"));
     }
-    result.environmentFolderPath = obj[environmentFolderPath] as string;
+    result.environmentFolderPath = obj[environmentFolderPath];
   }
 
   if ("version" in obj) {

diff --git a/packages/fx-core/src/component/driver/teamsApp/clients/appStudioClient.ts b/packages/fx-core/src/component/driver/teamsApp/clients/appStudioClient.ts
@@ -711,7 +711,6 @@ export namespace AppStudioClient {
     const apiPath = "/api/usersettings/mtUserAppPolicy";
     const instance = axios.create({
       baseURL: region ?? getAppStudioEndpoint(),
-      timeout: 30000,
     });
     instance.defaults.headers.common["Authorization"] = `Bearer ${appStudioToken}`;
 

diff --git a/packages/fx-core/src/component/generator/spfx/depsChecker/yoChecker.ts b/packages/fx-core/src/component/generator/spfx/depsChecker/yoChecker.ts
@@ -1,9 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import fs from "fs-extra";
-import * as path from "path";
-import * as os from "os";
 import {
   ConfigFolderName,
   Context,
@@ -15,14 +12,17 @@ import {
   SystemError,
   UserError,
 } from "@microsoft/teamsfx-api";
-import { DependencyChecker } from "./dependencyChecker";
+import fs from "fs-extra";
+import * as os from "os";
+import * as path from "path";
+import { NpmInstallError } from "../../../../error";
+import { cpUtils } from "../../../deps-checker/util/cpUtils";
+import { DependencyValidateError } from "../error";
+import { Constants } from "../utils/constants";
 import { telemetryHelper } from "../utils/telemetry-helper";
 import { TelemetryEvents, TelemetryProperty } from "../utils/telemetryEvents";
-import { DependencyValidateError } from "../error";
-import { cpUtils } from "../../../deps-checker/util/cpUtils";
 import { getExecCommand, getShellOptionValue, Utils } from "../utils/utils";
-import { Constants } from "../utils/constants";
-import { NpmInstallError } from "../../../../error";
+import { DependencyChecker } from "./dependencyChecker";
 
 const name = Constants.YeomanPackageName;
 const displayName = `${name}`;

diff --git a/packages/fx-core/src/component/generator/spfx/utils/utils.ts b/packages/fx-core/src/component/generator/spfx/utils/utils.ts
@@ -1,13 +1,13 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
-import lodash from "lodash";
-import * as fs from "fs-extra";
-import { glob } from "glob";
-import { exec, execSync } from "child_process";
 import { LogProvider } from "@microsoft/teamsfx-api";
 import axios, { AxiosInstance } from "axios";
-import { cpUtils, DebugLogger } from "../../../deps-checker/util/cpUtils";
+import { exec, execSync } from "child_process";
+import * as fs from "fs-extra";
+import { glob } from "glob";
+import lodash from "lodash";
 import os from "os";
+import { cpUtils, DebugLogger } from "../../../deps-checker/util/cpUtils";
 import { Constants } from "./constants";
 
 export class Utils {

diff --git a/packages/fx-core/src/core/middleware/utils/migrationContext.ts b/packages/fx-core/src/core/middleware/utils/migrationContext.ts
@@ -5,7 +5,7 @@ import fs, { CopyOptions, EnsureOptions, PathLike, WriteFileOptions } from "fs-e
 import path from "path";
 import { MetadataV2 } from "../../../common/versionMetadata";
 import { CoreHookContext } from "../../types";
-import { getParameterFromCxt } from "./v3MigrationUtils";
+import { Inputs } from "@microsoft/teamsfx-api";
 
 export const backupFolder = ".backup";
 export interface MigrationContext extends CoreHookContext {
@@ -129,3 +129,9 @@ export class MigrationContext {
     this.telemetryProperties = { ...properties, ...this.telemetryProperties };
   }
 }
+
+function getParameterFromCxt(ctx: CoreHookContext, key: string, defaultValue?: string): string {
+  const inputs = ctx.arguments[ctx.arguments.length - 1] as Inputs;
+  const value = (inputs[key] as string) || defaultValue || "";
+  return value;
+}
diff --git a/packages/fx-core/tests/component/generator/spfxGenerator.test.ts b/packages/fx-core/tests/component/generator/spfxGenerator.test.ts
@@ -6,6 +6,7 @@ import * as chai from "chai";
 import fs from "fs-extra";
 import "mocha";
 import mockedEnv, { RestoreFn } from "mocked-env";
+import os from "os";
 import * as path from "path";
 import * as sinon from "sinon";
 import * as uuid from "uuid";
@@ -31,7 +32,6 @@ import {
   SPFxVersionOptionIds,
 } from "../../../src/question";
 import { MockTools } from "../../core/utils";
-import os from "os";
 
 describe("SPFxGenerator", function () {
   const testFolder = path.resolve("./tmp");

diff --git a/packages/server/package.json b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/teamsfx-server",
-  "version": "2.0.8",
+  "version": "2.0.9",
   "author": "Microsoft Corporation",
   "description": "",
   "license": "MIT",

diff --git a/packages/tests/package.json b/packages/tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/teamsfx-test",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "A UI Test Project of Teams Toolkit Extension",
   "private": true,
   "author": "Microsoft Corporation",

diff --git a/packages/vscode-extension/CHANGELOG.md b/packages/vscode-extension/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 > Note: This changelog only includes the changes for the stable versions of Teams Toolkit. For the changelog of pre-released versions, please refer to the [Teams Toolkit Pre-release Changelog](https://github.com/OfficeDev/TeamsFx/blob/dev/packages/vscode-extension/PRERELEASE.md).
 
+## 5.8.2 - Sep 26, 2024
+
+Hotfix version.
+
+- Fixed an issue ([#12143](https://github.com/OfficeDev/teams-toolkit/issues/12143)) where users may encounter an error (`SPFx.LatestPackageInstallFailed`) when creating a Tab with SPFx project.
+- Resolved an issue ([#12384](https://github.com/OfficeDev/teams-toolkit/issues/12384)) where users may encounter an error (`AppStudioPlugin.TeamsAppCreateConflict`) during local debugging.
+- Updated TypeScript from `4.4.4` to `5.5.4` to avoid build failures for `Custom Engine Agent` templates in [#12462](https://github.com/OfficeDev/teams-toolkit/pull/12462).
+
 ## 5.8.1 - May 27, 2024
 
 Hotfix version.

diff --git a/packages/vscode-extension/package.json b/packages/vscode-extension/package.json
@@ -2,7 +2,7 @@
   "name": "ms-teams-vscode-extension",
   "displayName": "Teams Toolkit",
   "description": "Create, debug, and deploy Teams apps with Teams Toolkit",
-  "version": "5.8.1",
+  "version": "5.8.2",
   "publisher": "TeamsDevApp",
   "author": "Microsoft Corporation",
   "private": true,

diff --git a/templates/package.json b/templates/package.json
@@ -1,6 +1,6 @@
 {
     "name": "templates",
-    "version": "4.2.3",
+    "version": "4.2.4",
     "private": "true",
     "license": "MIT",
     "scripts": {

diff --git a/templates/ts/custom-copilot-assistant-assistants-api/package.json.tpl b/templates/ts/custom-copilot-assistant-assistants-api/package.json.tpl
@@ -36,7 +36,7 @@
         "@types/node": "^18.0.0",
         "env-cmd": "^10.1.0",
         "ts-node": "^10.4.0",
-        "typescript": "^4.4.4",
+        "typescript": "^5.5.4",
         "nodemon": "^2.0.7",
         "shx": "^0.3.3"
     }

diff --git a/templates/ts/custom-copilot-assistant-new/package.json.tpl b/templates/ts/custom-copilot-assistant-new/package.json.tpl
@@ -35,7 +35,7 @@
         "@types/node": "^18.0.0",
         "env-cmd": "^10.1.0",
         "ts-node": "^10.4.0",
-        "typescript": "^4.4.4",
+        "typescript": "^5.5.4",
         "nodemon": "^2.0.7",
         "shx": "^0.3.3"
     }

diff --git a/templates/ts/custom-copilot-basic/package.json.tpl b/templates/ts/custom-copilot-basic/package.json.tpl
@@ -35,7 +35,7 @@
         "@types/node": "^18.0.0",
         "env-cmd": "^10.1.0",
         "ts-node": "^10.4.0",
-        "typescript": "^4.4.4",
+        "typescript": "^5.5.4",
         "nodemon": "^2.0.7",
         "shx": "^0.3.3"
     }

diff --git a/templates/ts/custom-copilot-rag-azure-ai-search/package.json.tpl b/templates/ts/custom-copilot-rag-azure-ai-search/package.json.tpl
@@ -35,10 +35,10 @@
     },
     "devDependencies": {
         "@types/restify": "^8.5.5",
-        "@types/node": "^14.0.0",
+        "@types/node": "^18.0.0",
         "env-cmd": "^10.1.0",
         "ts-node": "^10.4.0",
-        "typescript": "^4.4.4",
+        "typescript": "^5.5.4",
         "nodemon": "^2.0.7",
         "shx": "^0.3.3"
     }

diff --git a/templates/ts/custom-copilot-rag-custom-api/package.json.tpl b/templates/ts/custom-copilot-rag-custom-api/package.json.tpl
@@ -39,7 +39,7 @@
         "@types/node": "^18.0.0",
         "env-cmd": "^10.1.0",
         "ts-node": "^10.4.0",
-        "typescript": "^4.4.4",
+        "typescript": "^5.5.4",
         "nodemon": "^2.0.7",
         "shx": "^0.3.3"
     }

diff --git a/templates/ts/custom-copilot-rag-customize/package.json.tpl b/templates/ts/custom-copilot-rag-customize/package.json.tpl
@@ -33,10 +33,10 @@
     },
     "devDependencies": {
         "@types/restify": "^8.5.5",
-        "@types/node": "^14.0.0",
+        "@types/node": "^18.0.0",
         "env-cmd": "^10.1.0",
         "ts-node": "^10.4.0",
-        "typescript": "^4.4.4",
+        "typescript": "^5.5.4",
         "nodemon": "^2.0.7",
         "shx": "^0.3.3"
     }

diff --git a/templates/ts/custom-copilot-rag-microsoft365/package.json.tpl b/templates/ts/custom-copilot-rag-microsoft365/package.json.tpl
@@ -34,10 +34,10 @@
     },
     "devDependencies": {
         "@types/restify": "^8.5.5",
-        "@types/node": "^16.0.0",
+        "@types/node": "^18.0.0",
         "env-cmd": "^10.1.0",
         "ts-node": "^10.4.0",
-        "typescript": "^4.4.4",
+        "typescript": "^5.5.4",
         "nodemon": "^2.0.7",
         "shx": "^0.3.3"
     }