From bf3bbf0594cf3ef23624d6bf3b95a7d9ebba76f5 Mon Sep 17 00:00:00 2001 From: Yimin-Jin <139844715+Yimin-Jin@users.noreply.github.com> Date: Thu, 19 Sep 2024 15:03:45 +0800 Subject: [PATCH 01/14] hotfix: fix sso-tab template https://msazure.visualstudio.com/Microsoft%20Teams%20Extensibility/_sprints/taskboard/Compute%20Team/Microsoft%20Teams%20Extensibility/Dilithium/CY24Q3/2Wk/2Wk12%20(Sep%2008%20-%20Sep%2021)?workitem=29507818 --- templates/ts/sso-tab-with-obo-flow/api/tsconfig.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/ts/sso-tab-with-obo-flow/api/tsconfig.json b/templates/ts/sso-tab-with-obo-flow/api/tsconfig.json index cca0ca9573..916ea95a7e 100644 --- a/templates/ts/sso-tab-with-obo-flow/api/tsconfig.json +++ b/templates/ts/sso-tab-with-obo-flow/api/tsconfig.json @@ -2,6 +2,8 @@ "compilerOptions": { "module": "commonjs", "target": "es6", + "esModuleInterop": true, + "allowSyntheticDefaultImports": true, "outDir": "dist", "rootDir": ".", "sourceMap": true, From bf6de48d7f8131ebf2d473a79a97af8e798a054a Mon Sep 17 00:00:00 2001 From: MSFT-yiz Date: Thu, 19 Sep 2024 07:49:27 +0000 Subject: [PATCH 02/14] build(release): publish detail - templates@4.2.3-rc-hotfix.0 --- packages/fx-core/src/common/templates-config.json | 4 ++-- templates/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/fx-core/src/common/templates-config.json b/packages/fx-core/src/common/templates-config.json index 443e3563e3..055582c46f 100644 --- 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.2", + "version": "0.0.0-rc", + "localVersion": "4.2.3-rc-hotfix.0", "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/templates/package.json b/templates/package.json index 76ad166bb9..acd1b81821 100644 --- a/templates/package.json +++ b/templates/package.json @@ -1,6 +1,6 @@ { "name": "templates", - "version": "4.2.2", + "version": "4.2.3-rc-hotfix.0", "private": "true", "license": "MIT", "scripts": { From fdba7670e54901c88bf6c2d111ee39780d932793 Mon Sep 17 00:00:00 2001 From: QinghuiMeng-M Date: Thu, 5 Sep 2024 13:27:30 +0800 Subject: [PATCH 03/14] remove confict dependency (#12336) --- templates/js/custom-copilot-rag-azure-ai-search/package.json.tpl | 1 - templates/js/custom-copilot-rag-customize/package.json.tpl | 1 - templates/js/custom-copilot-rag-microsoft365/package.json.tpl | 1 - .../ts/custom-copilot-assistant-assistants-api/package.json.tpl | 1 - templates/ts/custom-copilot-assistant-new/package.json.tpl | 1 - templates/ts/custom-copilot-basic/package.json.tpl | 1 - templates/ts/custom-copilot-rag-azure-ai-search/package.json.tpl | 1 - templates/ts/custom-copilot-rag-customize/package.json.tpl | 1 - templates/ts/custom-copilot-rag-microsoft365/package.json.tpl | 1 - 9 files changed, 9 deletions(-) diff --git a/templates/js/custom-copilot-rag-azure-ai-search/package.json.tpl b/templates/js/custom-copilot-rag-azure-ai-search/package.json.tpl index dc442456d7..d73deb7d08 100644 --- a/templates/js/custom-copilot-rag-azure-ai-search/package.json.tpl +++ b/templates/js/custom-copilot-rag-azure-ai-search/package.json.tpl @@ -30,7 +30,6 @@ "@azure/search-documents": "^12.0.0", "@microsoft/teams-ai": "^1.1.0", "botbuilder": "^4.20.0", - "openai": "~4.28.4", "restify": "^10.0.0" }, "devDependencies": { diff --git a/templates/js/custom-copilot-rag-customize/package.json.tpl b/templates/js/custom-copilot-rag-customize/package.json.tpl index 9bf2fbfd81..b5b6bf642d 100644 --- a/templates/js/custom-copilot-rag-customize/package.json.tpl +++ b/templates/js/custom-copilot-rag-customize/package.json.tpl @@ -28,7 +28,6 @@ "@azure/search-documents": "^12.0.0", "@microsoft/teams-ai": "^1.1.0", "botbuilder": "^4.20.0", - "openai": "~4.28.4", "restify": "^10.0.0" }, "devDependencies": { diff --git a/templates/js/custom-copilot-rag-microsoft365/package.json.tpl b/templates/js/custom-copilot-rag-microsoft365/package.json.tpl index 002cdca69d..f1a9f2b25b 100644 --- a/templates/js/custom-copilot-rag-microsoft365/package.json.tpl +++ b/templates/js/custom-copilot-rag-microsoft365/package.json.tpl @@ -29,7 +29,6 @@ "@azure/search-documents": "^12.0.0", "@microsoft/teams-ai": "^1.1.0", "botbuilder": "^4.20.0", - "openai": "~4.28.4", "restify": "^10.0.0" }, "devDependencies": { diff --git a/templates/ts/custom-copilot-assistant-assistants-api/package.json.tpl b/templates/ts/custom-copilot-assistant-assistants-api/package.json.tpl index 4522c4ddc9..7e9278decc 100644 --- a/templates/ts/custom-copilot-assistant-assistants-api/package.json.tpl +++ b/templates/ts/custom-copilot-assistant-assistants-api/package.json.tpl @@ -29,7 +29,6 @@ "dependencies": { "@microsoft/teams-ai": "^1.1.0", "botbuilder": "^4.20.0", - "openai": "~4.28.4", "restify": "^10.0.0" }, "devDependencies": { diff --git a/templates/ts/custom-copilot-assistant-new/package.json.tpl b/templates/ts/custom-copilot-assistant-new/package.json.tpl index d643e4dda6..d581a2ee3c 100644 --- a/templates/ts/custom-copilot-assistant-new/package.json.tpl +++ b/templates/ts/custom-copilot-assistant-new/package.json.tpl @@ -28,7 +28,6 @@ "dependencies": { "@microsoft/teams-ai": "^1.1.0", "botbuilder": "^4.20.0", - "openai": "~4.28.4", "restify": "^10.0.0" }, "devDependencies": { diff --git a/templates/ts/custom-copilot-basic/package.json.tpl b/templates/ts/custom-copilot-basic/package.json.tpl index d643e4dda6..d581a2ee3c 100644 --- a/templates/ts/custom-copilot-basic/package.json.tpl +++ b/templates/ts/custom-copilot-basic/package.json.tpl @@ -28,7 +28,6 @@ "dependencies": { "@microsoft/teams-ai": "^1.1.0", "botbuilder": "^4.20.0", - "openai": "~4.28.4", "restify": "^10.0.0" }, "devDependencies": { 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 index e49f60335c..575055b1bf 100644 --- a/templates/ts/custom-copilot-rag-azure-ai-search/package.json.tpl +++ b/templates/ts/custom-copilot-rag-azure-ai-search/package.json.tpl @@ -31,7 +31,6 @@ "@azure/search-documents": "^12.0.0", "@microsoft/teams-ai": "^1.1.0", "botbuilder": "^4.20.0", - "openai": "~4.28.4", "restify": "^10.0.0" }, "devDependencies": { diff --git a/templates/ts/custom-copilot-rag-customize/package.json.tpl b/templates/ts/custom-copilot-rag-customize/package.json.tpl index c59a3f97cf..2989836c72 100644 --- a/templates/ts/custom-copilot-rag-customize/package.json.tpl +++ b/templates/ts/custom-copilot-rag-customize/package.json.tpl @@ -29,7 +29,6 @@ "@azure/search-documents": "^12.0.0", "@microsoft/teams-ai": "^1.1.0", "botbuilder": "^4.20.0", - "openai": "~4.28.4", "restify": "^10.0.0" }, "devDependencies": { diff --git a/templates/ts/custom-copilot-rag-microsoft365/package.json.tpl b/templates/ts/custom-copilot-rag-microsoft365/package.json.tpl index 024aec6337..36cd8871b5 100644 --- a/templates/ts/custom-copilot-rag-microsoft365/package.json.tpl +++ b/templates/ts/custom-copilot-rag-microsoft365/package.json.tpl @@ -30,7 +30,6 @@ "@azure/search-documents": "^12.0.0", "@microsoft/teams-ai": "^1.1.0", "botbuilder": "^4.20.0", - "openai": "~4.28.4", "restify": "^10.0.0" }, "devDependencies": { From 6f5b003af37db29951518bfbd6875d9d7ac25dc1 Mon Sep 17 00:00:00 2001 From: MSFT-yiz Date: Thu, 19 Sep 2024 13:33:37 +0000 Subject: [PATCH 04/14] build(release): publish detail - templates@4.2.3-rc-hotfix.1 --- packages/fx-core/src/common/templates-config.json | 2 +- templates/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/fx-core/src/common/templates-config.json b/packages/fx-core/src/common/templates-config.json index 055582c46f..a650360a8a 100644 --- a/packages/fx-core/src/common/templates-config.json +++ b/packages/fx-core/src/common/templates-config.json @@ -1,6 +1,6 @@ { "version": "0.0.0-rc", - "localVersion": "4.2.3-rc-hotfix.0", + "localVersion": "4.2.3-rc-hotfix.1", "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/templates/package.json b/templates/package.json index acd1b81821..1e017abb59 100644 --- a/templates/package.json +++ b/templates/package.json @@ -1,6 +1,6 @@ { "name": "templates", - "version": "4.2.3-rc-hotfix.0", + "version": "4.2.3-rc-hotfix.1", "private": "true", "license": "MIT", "scripts": { From 478436764cc1be95749efacc18cb696c90b77e60 Mon Sep 17 00:00:00 2001 From: Yimin-Jin <139844715+Yimin-Jin@users.noreply.github.com> Date: Fri, 20 Sep 2024 16:18:35 +0800 Subject: [PATCH 05/14] hotfix: fix sso-tab template --- templates/ts/sso-tab-with-obo-flow/api/tsconfig.json | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/ts/sso-tab-with-obo-flow/api/tsconfig.json b/templates/ts/sso-tab-with-obo-flow/api/tsconfig.json index 916ea95a7e..e8f3677ee6 100644 --- a/templates/ts/sso-tab-with-obo-flow/api/tsconfig.json +++ b/templates/ts/sso-tab-with-obo-flow/api/tsconfig.json @@ -4,6 +4,7 @@ "target": "es6", "esModuleInterop": true, "allowSyntheticDefaultImports": true, + "moduleResolution": "nodenext", "outDir": "dist", "rootDir": ".", "sourceMap": true, From 352fdf9aeb0ad22f0020790317b33877bf7fd49a Mon Sep 17 00:00:00 2001 From: MSFT-yiz Date: Fri, 20 Sep 2024 08:41:05 +0000 Subject: [PATCH 06/14] build(release): publish detail - templates@4.2.3-rc-hotfix.2 --- packages/fx-core/src/common/templates-config.json | 2 +- templates/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/fx-core/src/common/templates-config.json b/packages/fx-core/src/common/templates-config.json index a650360a8a..8ac4b4c8d5 100644 --- a/packages/fx-core/src/common/templates-config.json +++ b/packages/fx-core/src/common/templates-config.json @@ -1,6 +1,6 @@ { "version": "0.0.0-rc", - "localVersion": "4.2.3-rc-hotfix.1", + "localVersion": "4.2.3-rc-hotfix.2", "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/templates/package.json b/templates/package.json index 1e017abb59..c330e5e293 100644 --- a/templates/package.json +++ b/templates/package.json @@ -1,6 +1,6 @@ { "name": "templates", - "version": "4.2.3-rc-hotfix.1", + "version": "4.2.3-rc-hotfix.2", "private": "true", "license": "MIT", "scripts": { From add6bcd3712db648498be589e358c1dfc2b03077 Mon Sep 17 00:00:00 2001 From: yukun-dong Date: Mon, 23 Sep 2024 11:00:27 +0800 Subject: [PATCH 07/14] fix: add moduleResolution section to templates tsconfig file --- templates/ts/ai-assistant-bot/tsconfig.json | 1 + templates/ts/ai-bot/tsconfig.json | 1 + templates/ts/command-and-response/tsconfig.json | 1 + .../ts/custom-copilot-assistant-assistants-api/tsconfig.json | 1 + templates/ts/custom-copilot-assistant-new/tsconfig.json | 1 + templates/ts/custom-copilot-basic/tsconfig.json | 1 + templates/ts/custom-copilot-rag-azure-ai-search/tsconfig.json | 1 + templates/ts/custom-copilot-rag-custom-api/tsconfig.json | 1 + templates/ts/custom-copilot-rag-customize/tsconfig.json | 1 + templates/ts/custom-copilot-rag-microsoft365/tsconfig.json | 1 + templates/ts/default-bot-message-extension/tsconfig.json | 1 + templates/ts/default-bot/tsconfig.json | 1 + templates/ts/link-unfurling/tsconfig.json | 1 + templates/ts/m365-message-extension/tsconfig.json | 1 + templates/ts/message-extension-action/tsconfig.json | 1 + templates/ts/message-extension-copilot/tsconfig.json | 1 + templates/ts/message-extension/tsconfig.json | 1 + templates/ts/non-sso-tab-default-bot/bot/tsconfig.json | 1 + templates/ts/notification-http-timer-trigger/tsconfig.json | 1 + templates/ts/notification-http-trigger/tsconfig.json | 1 + templates/ts/notification-restify/tsconfig.json | 1 + templates/ts/notification-timer-trigger/tsconfig.json | 1 + templates/ts/workflow/tsconfig.json | 1 + 23 files changed, 23 insertions(+) diff --git a/templates/ts/ai-assistant-bot/tsconfig.json b/templates/ts/ai-assistant-bot/tsconfig.json index a68afb21f7..e11f855139 100644 --- a/templates/ts/ai-assistant-bot/tsconfig.json +++ b/templates/ts/ai-assistant-bot/tsconfig.json @@ -5,6 +5,7 @@ "module": "commonjs", "outDir": "./lib", "rootDir": "./", + "moduleResolution": "nodenext", "sourceMap": true, "incremental": true, "tsBuildInfoFile": "./lib/.tsbuildinfo", diff --git a/templates/ts/ai-bot/tsconfig.json b/templates/ts/ai-bot/tsconfig.json index a68afb21f7..e11f855139 100644 --- a/templates/ts/ai-bot/tsconfig.json +++ b/templates/ts/ai-bot/tsconfig.json @@ -5,6 +5,7 @@ "module": "commonjs", "outDir": "./lib", "rootDir": "./", + "moduleResolution": "nodenext", "sourceMap": true, "incremental": true, "tsBuildInfoFile": "./lib/.tsbuildinfo", diff --git a/templates/ts/command-and-response/tsconfig.json b/templates/ts/command-and-response/tsconfig.json index 77972584b2..385a05ba67 100644 --- a/templates/ts/command-and-response/tsconfig.json +++ b/templates/ts/command-and-response/tsconfig.json @@ -5,6 +5,7 @@ "module": "commonjs", "outDir": "./lib", "rootDir": "./", + "moduleResolution": "nodenext", "sourceMap": true, "incremental": true, "tsBuildInfoFile": "./lib/.tsbuildinfo", diff --git a/templates/ts/custom-copilot-assistant-assistants-api/tsconfig.json b/templates/ts/custom-copilot-assistant-assistants-api/tsconfig.json index a68afb21f7..e11f855139 100644 --- a/templates/ts/custom-copilot-assistant-assistants-api/tsconfig.json +++ b/templates/ts/custom-copilot-assistant-assistants-api/tsconfig.json @@ -5,6 +5,7 @@ "module": "commonjs", "outDir": "./lib", "rootDir": "./", + "moduleResolution": "nodenext", "sourceMap": true, "incremental": true, "tsBuildInfoFile": "./lib/.tsbuildinfo", diff --git a/templates/ts/custom-copilot-assistant-new/tsconfig.json b/templates/ts/custom-copilot-assistant-new/tsconfig.json index a68afb21f7..e11f855139 100644 --- a/templates/ts/custom-copilot-assistant-new/tsconfig.json +++ b/templates/ts/custom-copilot-assistant-new/tsconfig.json @@ -5,6 +5,7 @@ "module": "commonjs", "outDir": "./lib", "rootDir": "./", + "moduleResolution": "nodenext", "sourceMap": true, "incremental": true, "tsBuildInfoFile": "./lib/.tsbuildinfo", diff --git a/templates/ts/custom-copilot-basic/tsconfig.json b/templates/ts/custom-copilot-basic/tsconfig.json index a68afb21f7..e11f855139 100644 --- a/templates/ts/custom-copilot-basic/tsconfig.json +++ b/templates/ts/custom-copilot-basic/tsconfig.json @@ -5,6 +5,7 @@ "module": "commonjs", "outDir": "./lib", "rootDir": "./", + "moduleResolution": "nodenext", "sourceMap": true, "incremental": true, "tsBuildInfoFile": "./lib/.tsbuildinfo", diff --git a/templates/ts/custom-copilot-rag-azure-ai-search/tsconfig.json b/templates/ts/custom-copilot-rag-azure-ai-search/tsconfig.json index a68afb21f7..e11f855139 100644 --- a/templates/ts/custom-copilot-rag-azure-ai-search/tsconfig.json +++ b/templates/ts/custom-copilot-rag-azure-ai-search/tsconfig.json @@ -5,6 +5,7 @@ "module": "commonjs", "outDir": "./lib", "rootDir": "./", + "moduleResolution": "nodenext", "sourceMap": true, "incremental": true, "tsBuildInfoFile": "./lib/.tsbuildinfo", diff --git a/templates/ts/custom-copilot-rag-custom-api/tsconfig.json b/templates/ts/custom-copilot-rag-custom-api/tsconfig.json index a68afb21f7..e11f855139 100644 --- a/templates/ts/custom-copilot-rag-custom-api/tsconfig.json +++ b/templates/ts/custom-copilot-rag-custom-api/tsconfig.json @@ -5,6 +5,7 @@ "module": "commonjs", "outDir": "./lib", "rootDir": "./", + "moduleResolution": "nodenext", "sourceMap": true, "incremental": true, "tsBuildInfoFile": "./lib/.tsbuildinfo", diff --git a/templates/ts/custom-copilot-rag-customize/tsconfig.json b/templates/ts/custom-copilot-rag-customize/tsconfig.json index a68afb21f7..e11f855139 100644 --- a/templates/ts/custom-copilot-rag-customize/tsconfig.json +++ b/templates/ts/custom-copilot-rag-customize/tsconfig.json @@ -5,6 +5,7 @@ "module": "commonjs", "outDir": "./lib", "rootDir": "./", + "moduleResolution": "nodenext", "sourceMap": true, "incremental": true, "tsBuildInfoFile": "./lib/.tsbuildinfo", diff --git a/templates/ts/custom-copilot-rag-microsoft365/tsconfig.json b/templates/ts/custom-copilot-rag-microsoft365/tsconfig.json index a68afb21f7..e11f855139 100644 --- a/templates/ts/custom-copilot-rag-microsoft365/tsconfig.json +++ b/templates/ts/custom-copilot-rag-microsoft365/tsconfig.json @@ -5,6 +5,7 @@ "module": "commonjs", "outDir": "./lib", "rootDir": "./", + "moduleResolution": "nodenext", "sourceMap": true, "incremental": true, "tsBuildInfoFile": "./lib/.tsbuildinfo", diff --git a/templates/ts/default-bot-message-extension/tsconfig.json b/templates/ts/default-bot-message-extension/tsconfig.json index 77972584b2..385a05ba67 100644 --- a/templates/ts/default-bot-message-extension/tsconfig.json +++ b/templates/ts/default-bot-message-extension/tsconfig.json @@ -5,6 +5,7 @@ "module": "commonjs", "outDir": "./lib", "rootDir": "./", + "moduleResolution": "nodenext", "sourceMap": true, "incremental": true, "tsBuildInfoFile": "./lib/.tsbuildinfo", diff --git a/templates/ts/default-bot/tsconfig.json b/templates/ts/default-bot/tsconfig.json index 77972584b2..385a05ba67 100644 --- a/templates/ts/default-bot/tsconfig.json +++ b/templates/ts/default-bot/tsconfig.json @@ -5,6 +5,7 @@ "module": "commonjs", "outDir": "./lib", "rootDir": "./", + "moduleResolution": "nodenext", "sourceMap": true, "incremental": true, "tsBuildInfoFile": "./lib/.tsbuildinfo", diff --git a/templates/ts/link-unfurling/tsconfig.json b/templates/ts/link-unfurling/tsconfig.json index 77972584b2..385a05ba67 100644 --- a/templates/ts/link-unfurling/tsconfig.json +++ b/templates/ts/link-unfurling/tsconfig.json @@ -5,6 +5,7 @@ "module": "commonjs", "outDir": "./lib", "rootDir": "./", + "moduleResolution": "nodenext", "sourceMap": true, "incremental": true, "tsBuildInfoFile": "./lib/.tsbuildinfo", diff --git a/templates/ts/m365-message-extension/tsconfig.json b/templates/ts/m365-message-extension/tsconfig.json index 77972584b2..385a05ba67 100644 --- a/templates/ts/m365-message-extension/tsconfig.json +++ b/templates/ts/m365-message-extension/tsconfig.json @@ -5,6 +5,7 @@ "module": "commonjs", "outDir": "./lib", "rootDir": "./", + "moduleResolution": "nodenext", "sourceMap": true, "incremental": true, "tsBuildInfoFile": "./lib/.tsbuildinfo", diff --git a/templates/ts/message-extension-action/tsconfig.json b/templates/ts/message-extension-action/tsconfig.json index 77972584b2..385a05ba67 100644 --- a/templates/ts/message-extension-action/tsconfig.json +++ b/templates/ts/message-extension-action/tsconfig.json @@ -5,6 +5,7 @@ "module": "commonjs", "outDir": "./lib", "rootDir": "./", + "moduleResolution": "nodenext", "sourceMap": true, "incremental": true, "tsBuildInfoFile": "./lib/.tsbuildinfo", diff --git a/templates/ts/message-extension-copilot/tsconfig.json b/templates/ts/message-extension-copilot/tsconfig.json index 77972584b2..385a05ba67 100644 --- a/templates/ts/message-extension-copilot/tsconfig.json +++ b/templates/ts/message-extension-copilot/tsconfig.json @@ -5,6 +5,7 @@ "module": "commonjs", "outDir": "./lib", "rootDir": "./", + "moduleResolution": "nodenext", "sourceMap": true, "incremental": true, "tsBuildInfoFile": "./lib/.tsbuildinfo", diff --git a/templates/ts/message-extension/tsconfig.json b/templates/ts/message-extension/tsconfig.json index 77972584b2..385a05ba67 100644 --- a/templates/ts/message-extension/tsconfig.json +++ b/templates/ts/message-extension/tsconfig.json @@ -5,6 +5,7 @@ "module": "commonjs", "outDir": "./lib", "rootDir": "./", + "moduleResolution": "nodenext", "sourceMap": true, "incremental": true, "tsBuildInfoFile": "./lib/.tsbuildinfo", diff --git a/templates/ts/non-sso-tab-default-bot/bot/tsconfig.json b/templates/ts/non-sso-tab-default-bot/bot/tsconfig.json index 77972584b2..385a05ba67 100644 --- a/templates/ts/non-sso-tab-default-bot/bot/tsconfig.json +++ b/templates/ts/non-sso-tab-default-bot/bot/tsconfig.json @@ -5,6 +5,7 @@ "module": "commonjs", "outDir": "./lib", "rootDir": "./", + "moduleResolution": "nodenext", "sourceMap": true, "incremental": true, "tsBuildInfoFile": "./lib/.tsbuildinfo", diff --git a/templates/ts/notification-http-timer-trigger/tsconfig.json b/templates/ts/notification-http-timer-trigger/tsconfig.json index 75fd242a30..e5d60497c0 100644 --- a/templates/ts/notification-http-timer-trigger/tsconfig.json +++ b/templates/ts/notification-http-timer-trigger/tsconfig.json @@ -5,6 +5,7 @@ "module": "commonjs", "outDir": "./dist", "rootDir": "./", + "moduleResolution": "nodenext", "sourceMap": true, "incremental": true, "resolveJsonModule": true, diff --git a/templates/ts/notification-http-trigger/tsconfig.json b/templates/ts/notification-http-trigger/tsconfig.json index 75fd242a30..e5d60497c0 100644 --- a/templates/ts/notification-http-trigger/tsconfig.json +++ b/templates/ts/notification-http-trigger/tsconfig.json @@ -5,6 +5,7 @@ "module": "commonjs", "outDir": "./dist", "rootDir": "./", + "moduleResolution": "nodenext", "sourceMap": true, "incremental": true, "resolveJsonModule": true, diff --git a/templates/ts/notification-restify/tsconfig.json b/templates/ts/notification-restify/tsconfig.json index 77972584b2..385a05ba67 100644 --- a/templates/ts/notification-restify/tsconfig.json +++ b/templates/ts/notification-restify/tsconfig.json @@ -5,6 +5,7 @@ "module": "commonjs", "outDir": "./lib", "rootDir": "./", + "moduleResolution": "nodenext", "sourceMap": true, "incremental": true, "tsBuildInfoFile": "./lib/.tsbuildinfo", diff --git a/templates/ts/notification-timer-trigger/tsconfig.json b/templates/ts/notification-timer-trigger/tsconfig.json index 75fd242a30..e5d60497c0 100644 --- a/templates/ts/notification-timer-trigger/tsconfig.json +++ b/templates/ts/notification-timer-trigger/tsconfig.json @@ -5,6 +5,7 @@ "module": "commonjs", "outDir": "./dist", "rootDir": "./", + "moduleResolution": "nodenext", "sourceMap": true, "incremental": true, "resolveJsonModule": true, diff --git a/templates/ts/workflow/tsconfig.json b/templates/ts/workflow/tsconfig.json index 77972584b2..385a05ba67 100644 --- a/templates/ts/workflow/tsconfig.json +++ b/templates/ts/workflow/tsconfig.json @@ -5,6 +5,7 @@ "module": "commonjs", "outDir": "./lib", "rootDir": "./", + "moduleResolution": "nodenext", "sourceMap": true, "incremental": true, "tsBuildInfoFile": "./lib/.tsbuildinfo", From 9ee685845044f9f89e692a9518b65439ed2a93ed Mon Sep 17 00:00:00 2001 From: MSFT-yiz Date: Mon, 23 Sep 2024 03:31:20 +0000 Subject: [PATCH 08/14] build(release): publish detail - templates@4.2.3-rc-hotfix.3 --- packages/fx-core/src/common/templates-config.json | 2 +- templates/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/fx-core/src/common/templates-config.json b/packages/fx-core/src/common/templates-config.json index 8ac4b4c8d5..dd1fce4969 100644 --- a/packages/fx-core/src/common/templates-config.json +++ b/packages/fx-core/src/common/templates-config.json @@ -1,6 +1,6 @@ { "version": "0.0.0-rc", - "localVersion": "4.2.3-rc-hotfix.2", + "localVersion": "4.2.3-rc-hotfix.3", "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/templates/package.json b/templates/package.json index c330e5e293..fa1b56ae5b 100644 --- a/templates/package.json +++ b/templates/package.json @@ -1,6 +1,6 @@ { "name": "templates", - "version": "4.2.3-rc-hotfix.2", + "version": "4.2.3-rc-hotfix.3", "private": "true", "license": "MIT", "scripts": { From bcf50cbb09ea6b8165e7fb7f54db00ae25699eff Mon Sep 17 00:00:00 2001 From: yukun-dong Date: Mon, 23 Sep 2024 16:20:51 +0800 Subject: [PATCH 09/14] fix: revert changes for teams-ai related template --- .../ts/custom-copilot-assistant-assistants-api/tsconfig.json | 1 - templates/ts/custom-copilot-assistant-new/tsconfig.json | 1 - templates/ts/custom-copilot-basic/tsconfig.json | 1 - templates/ts/custom-copilot-rag-azure-ai-search/tsconfig.json | 1 - templates/ts/custom-copilot-rag-custom-api/tsconfig.json | 1 - templates/ts/custom-copilot-rag-customize/tsconfig.json | 1 - templates/ts/custom-copilot-rag-microsoft365/tsconfig.json | 1 - templates/ts/message-extension-copilot/package.json.tpl | 2 +- 8 files changed, 1 insertion(+), 8 deletions(-) diff --git a/templates/ts/custom-copilot-assistant-assistants-api/tsconfig.json b/templates/ts/custom-copilot-assistant-assistants-api/tsconfig.json index e11f855139..a68afb21f7 100644 --- a/templates/ts/custom-copilot-assistant-assistants-api/tsconfig.json +++ b/templates/ts/custom-copilot-assistant-assistants-api/tsconfig.json @@ -5,7 +5,6 @@ "module": "commonjs", "outDir": "./lib", "rootDir": "./", - "moduleResolution": "nodenext", "sourceMap": true, "incremental": true, "tsBuildInfoFile": "./lib/.tsbuildinfo", diff --git a/templates/ts/custom-copilot-assistant-new/tsconfig.json b/templates/ts/custom-copilot-assistant-new/tsconfig.json index e11f855139..a68afb21f7 100644 --- a/templates/ts/custom-copilot-assistant-new/tsconfig.json +++ b/templates/ts/custom-copilot-assistant-new/tsconfig.json @@ -5,7 +5,6 @@ "module": "commonjs", "outDir": "./lib", "rootDir": "./", - "moduleResolution": "nodenext", "sourceMap": true, "incremental": true, "tsBuildInfoFile": "./lib/.tsbuildinfo", diff --git a/templates/ts/custom-copilot-basic/tsconfig.json b/templates/ts/custom-copilot-basic/tsconfig.json index e11f855139..a68afb21f7 100644 --- a/templates/ts/custom-copilot-basic/tsconfig.json +++ b/templates/ts/custom-copilot-basic/tsconfig.json @@ -5,7 +5,6 @@ "module": "commonjs", "outDir": "./lib", "rootDir": "./", - "moduleResolution": "nodenext", "sourceMap": true, "incremental": true, "tsBuildInfoFile": "./lib/.tsbuildinfo", diff --git a/templates/ts/custom-copilot-rag-azure-ai-search/tsconfig.json b/templates/ts/custom-copilot-rag-azure-ai-search/tsconfig.json index e11f855139..a68afb21f7 100644 --- a/templates/ts/custom-copilot-rag-azure-ai-search/tsconfig.json +++ b/templates/ts/custom-copilot-rag-azure-ai-search/tsconfig.json @@ -5,7 +5,6 @@ "module": "commonjs", "outDir": "./lib", "rootDir": "./", - "moduleResolution": "nodenext", "sourceMap": true, "incremental": true, "tsBuildInfoFile": "./lib/.tsbuildinfo", diff --git a/templates/ts/custom-copilot-rag-custom-api/tsconfig.json b/templates/ts/custom-copilot-rag-custom-api/tsconfig.json index e11f855139..a68afb21f7 100644 --- a/templates/ts/custom-copilot-rag-custom-api/tsconfig.json +++ b/templates/ts/custom-copilot-rag-custom-api/tsconfig.json @@ -5,7 +5,6 @@ "module": "commonjs", "outDir": "./lib", "rootDir": "./", - "moduleResolution": "nodenext", "sourceMap": true, "incremental": true, "tsBuildInfoFile": "./lib/.tsbuildinfo", diff --git a/templates/ts/custom-copilot-rag-customize/tsconfig.json b/templates/ts/custom-copilot-rag-customize/tsconfig.json index e11f855139..a68afb21f7 100644 --- a/templates/ts/custom-copilot-rag-customize/tsconfig.json +++ b/templates/ts/custom-copilot-rag-customize/tsconfig.json @@ -5,7 +5,6 @@ "module": "commonjs", "outDir": "./lib", "rootDir": "./", - "moduleResolution": "nodenext", "sourceMap": true, "incremental": true, "tsBuildInfoFile": "./lib/.tsbuildinfo", diff --git a/templates/ts/custom-copilot-rag-microsoft365/tsconfig.json b/templates/ts/custom-copilot-rag-microsoft365/tsconfig.json index e11f855139..a68afb21f7 100644 --- a/templates/ts/custom-copilot-rag-microsoft365/tsconfig.json +++ b/templates/ts/custom-copilot-rag-microsoft365/tsconfig.json @@ -5,7 +5,6 @@ "module": "commonjs", "outDir": "./lib", "rootDir": "./", - "moduleResolution": "nodenext", "sourceMap": true, "incremental": true, "tsBuildInfoFile": "./lib/.tsbuildinfo", diff --git a/templates/ts/message-extension-copilot/package.json.tpl b/templates/ts/message-extension-copilot/package.json.tpl index e900c8a110..e4883775a8 100644 --- a/templates/ts/message-extension-copilot/package.json.tpl +++ b/templates/ts/message-extension-copilot/package.json.tpl @@ -34,7 +34,7 @@ "@types/node": "^20.8.9", "env-cmd": "^10.1.0", "ts-node": "^10.4.0", - "typescript": "^5.2.2", + "typescript": "^4.4.4", "nodemon": "^3.0.1", "shx": "^0.3.3" } From 6e5f4d890d1c13d924bdd91bd938330a57b45d85 Mon Sep 17 00:00:00 2001 From: MSFT-yiz Date: Mon, 23 Sep 2024 09:20:18 +0000 Subject: [PATCH 10/14] build(release): publish detail - @microsoft/teamsfx-core@2.0.10-rc.0 - @microsoft/teamsfx-server@2.0.9-rc.0 - @microsoft/m365-spec-parser@0.2.2-rc.0 - templates@4.3.0-rc.0 --- packages/fx-core/package.json | 2 +- packages/fx-core/src/common/templates-config.json | 4 ++-- packages/server/package.json | 2 +- packages/spec-parser/package.json | 2 +- templates/package.json | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/fx-core/package.json b/packages/fx-core/package.json index 8368d40424..5c04000065 100644 --- 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-rc.0", "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 index 443e3563e3..a43af497c8 100644 --- 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.2", + "version": "0.0.0-rc", + "localVersion": "4.3.0-rc.0", "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/server/package.json b/packages/server/package.json index dcee502915..13679b4148 100644 --- 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-rc.0", "author": "Microsoft Corporation", "description": "", "license": "MIT", diff --git a/packages/spec-parser/package.json b/packages/spec-parser/package.json index f876f5d08e..cb3a4c837a 100644 --- a/packages/spec-parser/package.json +++ b/packages/spec-parser/package.json @@ -1,6 +1,6 @@ { "name": "@microsoft/m365-spec-parser", - "version": "0.2.1", + "version": "0.2.2-rc.0", "description": "OpenAPI specification files Parser for M365 Apps", "main": "dist/index.node.cjs.js", "browser": "dist/index.esm2017.js", diff --git a/templates/package.json b/templates/package.json index 1d459eb0d4..8b76fadd50 100644 --- a/templates/package.json +++ b/templates/package.json @@ -1,6 +1,6 @@ { "name": "templates", - "version": "4.3.0-alpha", + "version": "4.3.0-rc.0", "private": "true", "license": "MIT", "scripts": { From 0715b5f64e0e8c72237ad83b6c4475876004e340 Mon Sep 17 00:00:00 2001 From: Bowen Song Date: Tue, 24 Sep 2024 09:28:30 +0800 Subject: [PATCH 11/14] fix: remove spec auth support for VS --- .../src/component/generator/apiSpec/helper.ts | 13 ++++++-- .../generator/apiSpecGenerator.test.ts | 30 +++++++++++++++++++ 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/packages/fx-core/src/component/generator/apiSpec/helper.ts b/packages/fx-core/src/component/generator/apiSpec/helper.ts index ae14f25caa..2571212703 100644 --- a/packages/fx-core/src/component/generator/apiSpec/helper.ts +++ b/packages/fx-core/src/component/generator/apiSpec/helper.ts @@ -85,7 +85,11 @@ const enum telemetryEvents { failedToGetGenerateWarning = "failed-to-get-generate-warning", } -export function getParserOptions(type: ProjectType, isDeclarativeCopilot?: boolean): ParseOptions { +export function getParserOptions( + type: ProjectType, + isDeclarativeCopilot?: boolean, + platform?: string +): ParseOptions { return type === ProjectType.Copilot ? { isGptPlugin: isDeclarativeCopilot, @@ -113,7 +117,7 @@ export function getParserOptions(type: ProjectType, isDeclarativeCopilot?: boole } : { projectType: type, - allowBearerTokenAuth: true, // Currently, API key auth support is actually bearer token auth + allowBearerTokenAuth: !!platform && platform === Platform.VS ? false : true, // Currently, API key auth support is actually bearer token auth allowMultipleParameters: true, allowOauth2: featureFlagManager.getBooleanValue(FeatureFlags.SMEOAuth), }; @@ -158,7 +162,10 @@ export async function listOperations( : ProjectType.SME; try { - const specParser = new SpecParser(apiSpecUrl as string, getParserOptions(projectType)); + const specParser = new SpecParser( + apiSpecUrl as string, + getParserOptions(projectType, undefined, inputs.platform) + ); const validationRes = await specParser.validate(); validationRes.errors = formatValidationErrors(validationRes.errors, inputs); diff --git a/packages/fx-core/tests/component/generator/apiSpecGenerator.test.ts b/packages/fx-core/tests/component/generator/apiSpecGenerator.test.ts index 1feef321a8..173c71743d 100644 --- a/packages/fx-core/tests/component/generator/apiSpecGenerator.test.ts +++ b/packages/fx-core/tests/component/generator/apiSpecGenerator.test.ts @@ -1359,6 +1359,36 @@ describe("listOperations", async () => { expect(res.error[0].type).to.be.equal(ErrorType.AddedAPINotInOriginalSpec); } }); + + it("should not allow auth for VS project", async () => { + const inputs = { + platform: Platform.VS, + }; + sandbox.stub(CopilotPluginHelper, "formatValidationErrors").resolves([]); + sandbox.stub(CopilotPluginHelper, "logValidationResults").resolves(); + sandbox.stub(SpecParser.prototype, "validate").resolves({ + status: ValidationStatus.Valid, + warnings: [], + errors: [], + specHash: "xxx", + }); + sandbox.stub(SpecParser.prototype, "list").resolves({ + APIs: [ + { + api: "1", + server: "https://test", + operationId: "id1", + isValid: false, + reason: [ErrorType.AuthTypeIsNotSupported], + }, + ], + allAPICount: 1, + validAPICount: 0, + }); + + const res = await CopilotPluginHelper.listOperations(context, "", inputs, true, false, ""); + expect(res.isOk()).to.be.true; + }); }); describe("SpecGenerator", async () => { From 73016337d33a6ee4429d99645670ae9d84d6e79d Mon Sep 17 00:00:00 2001 From: MSFT-yiz Date: Tue, 24 Sep 2024 01:54:14 +0000 Subject: [PATCH 12/14] build(release): publish detail - templates@4.2.3-rc-hotfix.4 --- packages/fx-core/src/common/templates-config.json | 2 +- templates/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/fx-core/src/common/templates-config.json b/packages/fx-core/src/common/templates-config.json index dd1fce4969..a95bde47d5 100644 --- a/packages/fx-core/src/common/templates-config.json +++ b/packages/fx-core/src/common/templates-config.json @@ -1,6 +1,6 @@ { "version": "0.0.0-rc", - "localVersion": "4.2.3-rc-hotfix.3", + "localVersion": "4.2.3-rc-hotfix.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/templates/package.json b/templates/package.json index fa1b56ae5b..b119a2c367 100644 --- a/templates/package.json +++ b/templates/package.json @@ -1,6 +1,6 @@ { "name": "templates", - "version": "4.2.3-rc-hotfix.3", + "version": "4.2.3-rc-hotfix.4", "private": "true", "license": "MIT", "scripts": { From 589494fd695bfbf3f5907150c1adca86f9b0ee2f Mon Sep 17 00:00:00 2001 From: MSFT-yiz Date: Wed, 25 Sep 2024 05:44:22 +0000 Subject: [PATCH 13/14] build(release): publish detail - templates@4.2.3 --- packages/fx-core/src/common/templates-config.json | 4 ++-- templates/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/fx-core/src/common/templates-config.json b/packages/fx-core/src/common/templates-config.json index a95bde47d5..942ccb11b9 100644 --- a/packages/fx-core/src/common/templates-config.json +++ b/packages/fx-core/src/common/templates-config.json @@ -1,6 +1,6 @@ { - "version": "0.0.0-rc", - "localVersion": "4.2.3-rc-hotfix.4", + "version": "~4.2", + "localVersion": "4.2.3", "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/templates/package.json b/templates/package.json index b119a2c367..f9624d67ed 100644 --- a/templates/package.json +++ b/templates/package.json @@ -1,6 +1,6 @@ { "name": "templates", - "version": "4.2.3-rc-hotfix.4", + "version": "4.2.3", "private": "true", "license": "MIT", "scripts": { From 918b2a9f5cfab0debcb3eaf17e6d4586f0f41787 Mon Sep 17 00:00:00 2001 From: Siglud Date: Wed, 25 Sep 2024 16:49:11 +0800 Subject: [PATCH 14/14] build: rollback package version --- packages/fx-core/package.json | 2 +- packages/server/package.json | 2 +- packages/spec-parser/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/fx-core/package.json b/packages/fx-core/package.json index 5c04000065..8368d40424 100644 --- a/packages/fx-core/package.json +++ b/packages/fx-core/package.json @@ -1,6 +1,6 @@ { "name": "@microsoft/teamsfx-core", - "version": "2.0.10-rc.0", + "version": "2.0.9", "main": "build/index.js", "types": "build/index.d.ts", "license": "MIT", diff --git a/packages/server/package.json b/packages/server/package.json index 13679b4148..dcee502915 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,6 +1,6 @@ { "name": "@microsoft/teamsfx-server", - "version": "2.0.9-rc.0", + "version": "2.0.8", "author": "Microsoft Corporation", "description": "", "license": "MIT", diff --git a/packages/spec-parser/package.json b/packages/spec-parser/package.json index cb3a4c837a..f876f5d08e 100644 --- a/packages/spec-parser/package.json +++ b/packages/spec-parser/package.json @@ -1,6 +1,6 @@ { "name": "@microsoft/m365-spec-parser", - "version": "0.2.2-rc.0", + "version": "0.2.1", "description": "OpenAPI specification files Parser for M365 Apps", "main": "dist/index.node.cjs.js", "browser": "dist/index.esm2017.js",