Merge pull request #12468 from Siglud/siglud/fix-prerelease

build: merge template change from hotfix
OfficeDev · Sep 27, 2024 · 36df05c · 36df05c
2 parents 22a2639 + a677c0f
commit 36df05c
Show file tree

Hide file tree

Showing 19 changed files with 21 additions and 4 deletions.
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.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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/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"
     }

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -5,6 +5,7 @@
     "module": "commonjs",
     "outDir": "./dist",
     "rootDir": "./",
+    "moduleResolution": "nodenext",
     "sourceMap": true,
     "incremental": true,
     "resolveJsonModule": true,

diff --git a/templates/ts/sso-tab-with-obo-flow/api/tsconfig.json b/templates/ts/sso-tab-with-obo-flow/api/tsconfig.json
@@ -2,8 +2,9 @@
   "compilerOptions": {
     "module": "commonjs",
     "target": "es6",
-    "esModuleInterop": true,  
-    "allowSyntheticDefaultImports": true,  
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true,
+    "moduleResolution": "nodenext",
     "outDir": "dist",
     "rootDir": ".",
     "sourceMap": true,

diff --git 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",