@microsoft/teamsfx-core 1.23.3-alpha.ea3f4aad2.0 → 2.0.0-alpha.2c2e7a109.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (235) hide show
  1. package/build/common/constants.d.ts +0 -1
  2. package/build/common/constants.d.ts.map +1 -1
  3. package/build/common/constants.js +0 -1
  4. package/build/common/constants.js.map +1 -1
  5. package/build/common/jsonUtils.d.ts +7 -0
  6. package/build/common/jsonUtils.d.ts.map +1 -0
  7. package/build/common/jsonUtils.js +42 -0
  8. package/build/common/jsonUtils.js.map +1 -0
  9. package/build/common/m365/packageService.d.ts +4 -1
  10. package/build/common/m365/packageService.d.ts.map +1 -1
  11. package/build/common/m365/packageService.js +39 -10
  12. package/build/common/m365/packageService.js.map +1 -1
  13. package/build/common/permissionInterface.d.ts +1 -1
  14. package/build/common/permissionInterface.d.ts.map +1 -1
  15. package/build/common/samples-config-v3.json +2 -12
  16. package/build/common/tools.d.ts +0 -1
  17. package/build/common/tools.d.ts.map +1 -1
  18. package/build/common/tools.js +2 -6
  19. package/build/common/tools.js.map +1 -1
  20. package/build/component/arm.d.ts +1 -0
  21. package/build/component/arm.d.ts.map +1 -1
  22. package/build/component/arm.js +4 -2
  23. package/build/component/arm.js.map +1 -1
  24. package/build/component/code/utils.d.ts.map +1 -1
  25. package/build/component/code/utils.js +6 -4
  26. package/build/component/code/utils.js.map +1 -1
  27. package/build/component/configManager/constant.d.ts +3 -0
  28. package/build/component/configManager/constant.d.ts.map +1 -1
  29. package/build/component/configManager/constant.js +3 -0
  30. package/build/component/configManager/constant.js.map +1 -1
  31. package/build/component/configManager/error.d.ts +3 -0
  32. package/build/component/configManager/error.d.ts.map +1 -1
  33. package/build/component/configManager/error.js +3 -0
  34. package/build/component/configManager/error.js.map +1 -1
  35. package/build/component/configManager/interface.d.ts +4 -0
  36. package/build/component/configManager/interface.d.ts.map +1 -1
  37. package/build/component/configManager/interface.js +3 -0
  38. package/build/component/configManager/interface.js.map +1 -1
  39. package/build/component/configManager/lifecycle.d.ts +3 -0
  40. package/build/component/configManager/lifecycle.d.ts.map +1 -1
  41. package/build/component/configManager/lifecycle.js +6 -1
  42. package/build/component/configManager/lifecycle.js.map +1 -1
  43. package/build/component/configManager/parser.d.ts +3 -0
  44. package/build/component/configManager/parser.d.ts.map +1 -1
  45. package/build/component/configManager/parser.js +15 -0
  46. package/build/component/configManager/parser.js.map +1 -1
  47. package/build/component/constants.d.ts +9 -1
  48. package/build/component/constants.d.ts.map +1 -1
  49. package/build/component/constants.js +11 -2
  50. package/build/component/constants.js.map +1 -1
  51. package/build/component/coordinator/index.d.ts.map +1 -1
  52. package/build/component/coordinator/index.js +2 -1
  53. package/build/component/coordinator/index.js.map +1 -1
  54. package/build/component/driver/add/addWebPart.d.ts.map +1 -1
  55. package/build/component/driver/add/addWebPart.js +8 -5
  56. package/build/component/driver/add/addWebPart.js.map +1 -1
  57. package/build/component/driver/add/interface/AddWebPartArgs.d.ts +4 -0
  58. package/build/component/driver/add/interface/AddWebPartArgs.d.ts.map +1 -1
  59. package/build/component/driver/arm/deployImpl.d.ts.map +1 -1
  60. package/build/component/driver/arm/deployImpl.js +2 -1
  61. package/build/component/driver/arm/deployImpl.js.map +1 -1
  62. package/build/component/driver/botAadApp/create.d.ts.map +1 -1
  63. package/build/component/driver/botAadApp/create.js +4 -5
  64. package/build/component/driver/botAadApp/create.js.map +1 -1
  65. package/build/component/driver/deploy/azure/azureAppServiceDeployDriver.d.ts.map +1 -1
  66. package/build/component/driver/deploy/azure/azureAppServiceDeployDriver.js +2 -6
  67. package/build/component/driver/deploy/azure/azureAppServiceDeployDriver.js.map +1 -1
  68. package/build/component/driver/deploy/azure/azureFunctionDeployDriver.d.ts.map +1 -1
  69. package/build/component/driver/deploy/azure/azureFunctionDeployDriver.js +3 -7
  70. package/build/component/driver/deploy/azure/azureFunctionDeployDriver.js.map +1 -1
  71. package/build/component/driver/deploy/azure/azureStorageDeployDriver.d.ts +2 -2
  72. package/build/component/driver/deploy/azure/azureStorageDeployDriver.d.ts.map +1 -1
  73. package/build/component/driver/deploy/azure/azureStorageDeployDriver.js +4 -2
  74. package/build/component/driver/deploy/azure/azureStorageDeployDriver.js.map +1 -1
  75. package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.d.ts +14 -3
  76. package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.d.ts.map +1 -1
  77. package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.js +23 -2
  78. package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.js.map +1 -1
  79. package/build/component/driver/deploy/azure/impl/baseDeployImpl.d.ts +5 -10
  80. package/build/component/driver/deploy/azure/impl/baseDeployImpl.d.ts.map +1 -1
  81. package/build/component/driver/deploy/azure/impl/baseDeployImpl.js +2 -18
  82. package/build/component/driver/deploy/azure/impl/baseDeployImpl.js.map +1 -1
  83. package/build/component/driver/interface/stepDriver.d.ts +2 -1
  84. package/build/component/driver/interface/stepDriver.d.ts.map +1 -1
  85. package/build/component/driver/script/baseBuildDriver.d.ts +3 -2
  86. package/build/component/driver/script/baseBuildDriver.d.ts.map +1 -1
  87. package/build/component/driver/script/baseBuildDriver.js +14 -3
  88. package/build/component/driver/script/baseBuildDriver.js.map +1 -1
  89. package/build/component/driver/script/baseBuildStepDriver.d.ts.map +1 -1
  90. package/build/component/driver/script/baseBuildStepDriver.js +2 -6
  91. package/build/component/driver/script/baseBuildStepDriver.js.map +1 -1
  92. package/build/component/driver/teamsApp/validateAppPackage.d.ts.map +1 -1
  93. package/build/component/driver/teamsApp/validateAppPackage.js +24 -18
  94. package/build/component/driver/teamsApp/validateAppPackage.js.map +1 -1
  95. package/build/component/generator/officeAddin/generator.d.ts +3 -0
  96. package/build/component/generator/officeAddin/generator.d.ts.map +1 -1
  97. package/build/component/generator/officeAddin/generator.js +6 -1
  98. package/build/component/generator/officeAddin/generator.js.map +1 -1
  99. package/build/component/generator/officeAddin/helperMethods.d.ts +1 -0
  100. package/build/component/generator/officeAddin/helperMethods.d.ts.map +1 -1
  101. package/build/component/generator/officeAddin/helperMethods.js +41 -0
  102. package/build/component/generator/officeAddin/helperMethods.js.map +1 -1
  103. package/build/component/generator/spfxGenerator.d.ts.map +1 -1
  104. package/build/component/generator/spfxGenerator.js +2 -1
  105. package/build/component/generator/spfxGenerator.js.map +1 -1
  106. package/build/component/provisionUtils.d.ts.map +1 -1
  107. package/build/component/provisionUtils.js +12 -11
  108. package/build/component/provisionUtils.js.map +1 -1
  109. package/build/component/question.d.ts +5 -3
  110. package/build/component/question.d.ts.map +1 -1
  111. package/build/component/question.js +46 -29
  112. package/build/component/question.js.map +1 -1
  113. package/build/component/resource/botService/botRegistration/localBotRegistration.js +1 -1
  114. package/build/component/resource/botService/botRegistration/localBotRegistration.js.map +1 -1
  115. package/build/component/resource/spfx/error.d.ts.map +1 -1
  116. package/build/component/resource/spfx/error.js +3 -2
  117. package/build/component/resource/spfx/error.js.map +1 -1
  118. package/build/component/resource/spfx/utils/questions.d.ts.map +1 -1
  119. package/build/component/resource/spfx/utils/questions.js +4 -2
  120. package/build/component/resource/spfx/utils/questions.js.map +1 -1
  121. package/build/component/utils/ResourceGroupHelper.d.ts.map +1 -1
  122. package/build/component/utils/ResourceGroupHelper.js +4 -3
  123. package/build/component/utils/ResourceGroupHelper.js.map +1 -1
  124. package/build/component/utils/envUtil.d.ts +1 -0
  125. package/build/component/utils/envUtil.d.ts.map +1 -1
  126. package/build/component/utils/envUtil.js +15 -11
  127. package/build/component/utils/envUtil.js.map +1 -1
  128. package/build/core/FxCore.d.ts +4 -0
  129. package/build/core/FxCore.d.ts.map +1 -1
  130. package/build/core/FxCore.js +19 -3
  131. package/build/core/FxCore.js.map +1 -1
  132. package/build/core/FxCoreImplementV3.d.ts +3 -0
  133. package/build/core/FxCoreImplementV3.d.ts.map +1 -1
  134. package/build/core/FxCoreImplementV3.js +71 -4
  135. package/build/core/FxCoreImplementV3.js.map +1 -1
  136. package/build/core/collaborator.d.ts +9 -0
  137. package/build/core/collaborator.d.ts.map +1 -1
  138. package/build/core/collaborator.js +197 -48
  139. package/build/core/collaborator.js.map +1 -1
  140. package/build/core/middleware/projectMigratorV3.d.ts +1 -0
  141. package/build/core/middleware/projectMigratorV3.d.ts.map +1 -1
  142. package/build/core/middleware/projectMigratorV3.js +7 -5
  143. package/build/core/middleware/projectMigratorV3.js.map +1 -1
  144. package/build/core/middleware/questionModel.d.ts.map +1 -1
  145. package/build/core/middleware/questionModel.js +3 -0
  146. package/build/core/middleware/questionModel.js.map +1 -1
  147. package/build/core/middleware/utils/appYmlGenerator.d.ts +1 -0
  148. package/build/core/middleware/utils/appYmlGenerator.d.ts.map +1 -1
  149. package/build/core/middleware/utils/appYmlGenerator.js +3 -1
  150. package/build/core/middleware/utils/appYmlGenerator.js.map +1 -1
  151. package/build/core/middleware/utils/debug/appLocalYmlGenerator.d.ts +15 -14
  152. package/build/core/middleware/utils/debug/appLocalYmlGenerator.d.ts.map +1 -1
  153. package/build/core/middleware/utils/debug/appLocalYmlGenerator.js +9 -3
  154. package/build/core/middleware/utils/debug/appLocalYmlGenerator.js.map +1 -1
  155. package/build/core/middleware/utils/debug/taskMigrator.d.ts +1 -0
  156. package/build/core/middleware/utils/debug/taskMigrator.d.ts.map +1 -1
  157. package/build/core/middleware/utils/debug/taskMigrator.js +50 -53
  158. package/build/core/middleware/utils/debug/taskMigrator.js.map +1 -1
  159. package/build/core/middleware/utils/v3MigrationUtils.js +1 -1
  160. package/build/core/middleware/utils/v3MigrationUtils.js.map +1 -1
  161. package/build/core/question.d.ts +13 -2
  162. package/build/core/question.d.ts.map +1 -1
  163. package/build/core/question.js +118 -1
  164. package/build/core/question.js.map +1 -1
  165. package/build/error/azure.d.ts +33 -0
  166. package/build/error/azure.d.ts.map +1 -0
  167. package/build/error/azure.js +87 -0
  168. package/build/error/azure.js.map +1 -0
  169. package/build/error/common.d.ts +10 -1
  170. package/build/error/common.d.ts.map +1 -1
  171. package/build/error/common.js +36 -1
  172. package/build/error/common.js.map +1 -1
  173. package/package.json +7 -5
  174. package/resource/package.nls.cs.json +173 -341
  175. package/resource/package.nls.de.json +184 -352
  176. package/resource/package.nls.es.json +170 -338
  177. package/resource/package.nls.fr.json +183 -351
  178. package/resource/package.nls.it.json +193 -361
  179. package/resource/package.nls.ja.json +168 -336
  180. package/resource/package.nls.json +37 -25
  181. package/resource/package.nls.ko.json +179 -347
  182. package/resource/package.nls.pl.json +184 -352
  183. package/resource/package.nls.pt-BR.json +189 -357
  184. package/resource/package.nls.ru.json +184 -352
  185. package/resource/package.nls.tr.json +194 -362
  186. package/resource/package.nls.zh-Hans.json +174 -342
  187. package/resource/package.nls.zh-Hant.json +173 -341
  188. package/templates/core/v3Migration/csharp.app.local.yml +16 -10
  189. package/templates/core/v3Migration/csharp.app.yml +42 -47
  190. package/templates/core/v3Migration/js.ts.app.local.yml +37 -24
  191. package/templates/core/v3Migration/js.ts.app.yml +61 -43
  192. package/templates/core/v3Migration/spfx.app.yml +20 -22
  193. package/templates/core/v3Migration/upgradeReport.md +5 -3
  194. package/templates/fallback/bot.csharp.command-and-response.zip +0 -0
  195. package/templates/fallback/bot.csharp.default.zip +0 -0
  196. package/templates/fallback/bot.csharp.notification-function-base.zip +0 -0
  197. package/templates/fallback/bot.csharp.notification-trigger-http.zip +0 -0
  198. package/templates/fallback/bot.csharp.notification-trigger-timer.zip +0 -0
  199. package/templates/fallback/bot.csharp.notification-webapi.zip +0 -0
  200. package/templates/fallback/bot.csharp.workflow.zip +0 -0
  201. package/templates/fallback/bot.js.command-and-response.zip +0 -0
  202. package/templates/fallback/bot.js.default.zip +0 -0
  203. package/templates/fallback/bot.js.m365.zip +0 -0
  204. package/templates/fallback/bot.js.notification-function-base.zip +0 -0
  205. package/templates/fallback/bot.js.notification-restify.zip +0 -0
  206. package/templates/fallback/bot.js.notification-trigger-http.zip +0 -0
  207. package/templates/fallback/bot.js.notification-trigger-timer.zip +0 -0
  208. package/templates/fallback/bot.js.workflow.zip +0 -0
  209. package/templates/fallback/bot.ts.command-and-response.zip +0 -0
  210. package/templates/fallback/bot.ts.default.zip +0 -0
  211. package/templates/fallback/bot.ts.m365.zip +0 -0
  212. package/templates/fallback/bot.ts.notification-function-base.zip +0 -0
  213. package/templates/fallback/bot.ts.notification-restify.zip +0 -0
  214. package/templates/fallback/bot.ts.notification-trigger-http.zip +0 -0
  215. package/templates/fallback/bot.ts.notification-trigger-timer.zip +0 -0
  216. package/templates/fallback/bot.ts.workflow.zip +0 -0
  217. package/templates/fallback/common.zip +0 -0
  218. package/templates/fallback/csharp.zip +0 -0
  219. package/templates/fallback/function-base.js.default.zip +0 -0
  220. package/templates/fallback/function-base.ts.default.zip +0 -0
  221. package/templates/fallback/function-triggers.js.HTTPTrigger.zip +0 -0
  222. package/templates/fallback/function-triggers.ts.HTTPTrigger.zip +0 -0
  223. package/templates/fallback/js.zip +0 -0
  224. package/templates/fallback/tab.csharp.default.zip +0 -0
  225. package/templates/fallback/tab.csharp.non-sso.zip +0 -0
  226. package/templates/fallback/tab.js.dashboard.zip +0 -0
  227. package/templates/fallback/tab.js.default.zip +0 -0
  228. package/templates/fallback/tab.js.m365.zip +0 -0
  229. package/templates/fallback/tab.js.non-sso.zip +0 -0
  230. package/templates/fallback/tab.ts.dashboard.zip +0 -0
  231. package/templates/fallback/tab.ts.default.zip +0 -0
  232. package/templates/fallback/tab.ts.m365.zip +0 -0
  233. package/templates/fallback/tab.ts.non-sso.zip +0 -0
  234. package/templates/fallback/ts.zip +0 -0
  235. package/templates/plugins/resource/aad/auth/bot/README.txt +1 -1
@@ -57,8 +57,10 @@ exports.AzureStorageDeployDriver = AzureStorageDeployDriver;
57
57
  class AzureStorageDeployDriverImpl extends azureDeployImpl_1.AzureDeployImpl {
58
58
  constructor() {
59
59
  super(...arguments);
60
- this.summaries = [localizeUtils_1.getLocalizedString("driver.deploy.azureStorageDeploySummary")];
61
- this.summaryPrepare = [];
60
+ this.summaries = () => [
61
+ localizeUtils_1.getLocalizedString("driver.deploy.azureStorageDeployDetailSummary", this.distDirectory),
62
+ ];
63
+ this.summaryPrepare = () => [];
62
64
  this.progressHandler = progressBarHelper_1.progressBarHelper(deployConstant_1.ProgressBarConstant.UPLOAD_DEPLOY_TO_AZURE_STORAGE_PROGRESS, this.progressBar);
63
65
  this.progressNames = deployConstant_1.ProgressBarConstant.UPLOAD_DEPLOY_TO_AZURE_STORAGE_PROGRESS;
64
66
  this.pattern = /\/subscriptions\/([^\/]*)\/resourceGroups\/([^\/]*)\/providers\/Microsoft.Storage\/storageAccounts\/([^\/]*)/i;
@@ -1 +1 @@
1
- {"version":3,"file":"azureStorageDeployDriver.js","sourceRoot":"","sources":["../../../../../src/component/driver/deploy/azure/azureStorageDeployDriver.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"azureStorageDeployDriver.js","sourceRoot":"","sources":["../../../../../src/component/driver/deploy/azure/azureStorageDeployDriver.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,9 @@
1
1
  /// <reference types="node" />
2
+ /**
3
+ * @author FanH <Siglud@gmail.com>
4
+ */
2
5
  import { AzureDeployImpl } from "./azureDeployImpl";
3
- import { AzureUploadConfig, DeployStepArgs } from "../../../interface/buildAndDeployArgs";
6
+ import { AzureUploadConfig, DeployContext, DeployStepArgs } from "../../../interface/buildAndDeployArgs";
4
7
  import { AzureResourceInfo, DriverContext } from "../../../interface/commonArgs";
5
8
  import { TokenCredential } from "@azure/core-auth";
6
9
  import { IProgressHandler, LogProvider, UserInteraction } from "@microsoft/teamsfx-api";
@@ -8,11 +11,12 @@ export declare class AzureZipDeployImpl extends AzureDeployImpl {
8
11
  pattern: RegExp;
9
12
  private readonly serviceName;
10
13
  protected helpLink: string;
11
- protected summaries: string[];
12
- protected summaryPrepare: string[];
14
+ protected summaries: () => string[];
15
+ protected summaryPrepare: () => string[];
13
16
  protected zipBuffer: Buffer | undefined;
14
17
  protected progressHandler?: AsyncIterableIterator<void>;
15
18
  protected progressNames: (() => string)[];
19
+ protected zipFilePath?: string;
16
20
  constructor(args: unknown, context: DriverContext, serviceName: string, helpLink: string, summaries: string[], summaryPrepare: string[]);
17
21
  azureDeploy(args: DeployStepArgs, azureResource: AzureResourceInfo, azureCredential: TokenCredential): Promise<void>;
18
22
  protected prepare: (args: DeployStepArgs) => Promise<void>;
@@ -25,6 +29,13 @@ export declare class AzureZipDeployImpl extends AzureDeployImpl {
25
29
  * @protected
26
30
  */
27
31
  zipDeploy(args: DeployStepArgs, azureResource: AzureResourceInfo, azureCredential: TokenCredential): Promise<number>;
32
+ /**
33
+ * pack dist folder into zip
34
+ * @param args dist folder and ignore files
35
+ * @param context log provider etc..
36
+ * @protected
37
+ */
38
+ protected packageToZip(args: DeployStepArgs, context: DeployContext): Promise<Buffer>;
28
39
  /**
29
40
  * call azure app service or azure function zip deploy method
30
41
  * @param zipDeployEndpoint azure zip deploy endpoint
@@ -1 +1 @@
1
- {"version":3,"file":"AzureZipDeployImpl.d.ts","sourceRoot":"","sources":["../../../../../../src/component/driver/deploy/azure/impl/AzureZipDeployImpl.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAEL,iBAAiB,EACjB,cAAc,EACf,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACjF,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAQxF,qBAAa,kBAAmB,SAAQ,eAAe;IACrD,OAAO,SAC6F;IACpG,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,SAAS,CAAC,QAAQ,SAAC;IACnB,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC;IAC9B,SAAS,CAAC,cAAc,EAAE,MAAM,EAAE,CAAC;IACnC,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IACxC,SAAS,CAAC,eAAe,CAAC,EAAE,qBAAqB,CAAC,IAAI,CAAC,CAAC;IACxD,SAAS,CAAC,aAAa,EAAE,CAAC,MAAM,MAAM,CAAC,EAAE,CAAC;gBAGxC,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,aAAa,EACtB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EAAE,EACnB,cAAc,EAAE,MAAM,EAAE;IAWpB,WAAW,CACf,IAAI,EAAE,cAAc,EACpB,aAAa,EAAE,iBAAiB,EAChC,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,IAAI,CAAC;IAchB,SAAS,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,OAAO,CAAC,IAAI,CAAC,CAGxD;IAEF;;;;;;;OAOG;IACU,SAAS,CACpB,IAAI,EAAE,cAAc,EACpB,aAAa,EAAE,iBAAiB,EAChC,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,MAAM,CAAC;IA0ClB;;;;;;;OAOG;cACa,gBAAgB,CAC9B,iBAAiB,EAAE,MAAM,EACzB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,iBAAiB,EACzB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,MAAM,CAAC;IA8DlB;;;;OAIG;IACH,SAAS,CAAC,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;IAIxD,iBAAiB,CAAC,EAAE,CAAC,EAAE,eAAe,GAAG,gBAAgB,GAAG,SAAS;CAMtE"}
1
+ {"version":3,"file":"AzureZipDeployImpl.d.ts","sourceRoot":"","sources":["../../../../../../src/component/driver/deploy/azure/impl/AzureZipDeployImpl.ts"],"names":[],"mappings":";AAGA;;GAEG;AACH,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAEL,iBAAiB,EACjB,aAAa,EACb,cAAc,EACf,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACjF,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAWxF,qBAAa,kBAAmB,SAAQ,eAAe;IACrD,OAAO,SAC6F;IACpG,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,SAAS,CAAC,QAAQ,SAAC;IACnB,SAAS,CAAC,SAAS,EAAE,MAAM,MAAM,EAAE,CAAC;IACpC,SAAS,CAAC,cAAc,EAAE,MAAM,MAAM,EAAE,CAAC;IACzC,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IACxC,SAAS,CAAC,eAAe,CAAC,EAAE,qBAAqB,CAAC,IAAI,CAAC,CAAC;IACxD,SAAS,CAAC,aAAa,EAAE,CAAC,MAAM,MAAM,CAAC,EAAE,CAAC;IAC1C,SAAS,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;gBAG7B,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,aAAa,EACtB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EAAE,EACnB,cAAc,EAAE,MAAM,EAAE;IAapB,WAAW,CACf,IAAI,EAAE,cAAc,EACpB,aAAa,EAAE,iBAAiB,EAChC,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,IAAI,CAAC;IAchB,SAAS,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,OAAO,CAAC,IAAI,CAAC,CAGxD;IAEF;;;;;;;OAOG;IACU,SAAS,CACpB,IAAI,EAAE,cAAc,EACpB,aAAa,EAAE,iBAAiB,EAChC,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,MAAM,CAAC;IA0ClB;;;;;OAKG;cACa,YAAY,CAAC,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC;IAe3F;;;;;;;OAOG;cACa,gBAAgB,CAC9B,iBAAiB,EAAE,MAAM,EACzB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,iBAAiB,EACzB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,MAAM,CAAC;IA8DlB;;;;OAIG;IACH,SAAS,CAAC,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;IAIxD,iBAAiB,CAAC,EAAE,CAAC,EAAE,eAAe,GAAG,gBAAgB,GAAG,SAAS;CAMtE"}
@@ -4,6 +4,9 @@
4
4
  Object.defineProperty(exports, "__esModule", { value: true });
5
5
  exports.AzureZipDeployImpl = void 0;
6
6
  const tslib_1 = require("tslib");
7
+ /**
8
+ * @author FanH <Siglud@gmail.com>
9
+ */
7
10
  const azureDeployImpl_1 = require("./azureDeployImpl");
8
11
  const messages_1 = require("../../../../messages");
9
12
  const deployConstant_1 = require("../../../../constant/deployConstant");
@@ -11,6 +14,9 @@ const crypto_1 = require("crypto");
11
14
  const axios_1 = tslib_1.__importDefault(require("axios"));
12
15
  const deployError_1 = require("../../../../error/deployError");
13
16
  const commonConstant_1 = require("../../../../constant/commonConstant");
17
+ const localizeUtils_1 = require("../../../../../common/localizeUtils");
18
+ const path_1 = tslib_1.__importDefault(require("path"));
19
+ const fileOperation_1 = require("../../../../utils/fileOperation");
14
20
  class AzureZipDeployImpl extends azureDeployImpl_1.AzureDeployImpl {
15
21
  constructor(args, context, serviceName, helpLink, summaries, summaryPrepare) {
16
22
  super(args, context);
@@ -22,8 +28,8 @@ class AzureZipDeployImpl extends azureDeployImpl_1.AzureDeployImpl {
22
28
  };
23
29
  this.helpLink = helpLink;
24
30
  this.serviceName = serviceName;
25
- this.summaries = summaries;
26
- this.summaryPrepare = summaryPrepare;
31
+ this.summaries = () => summaries.map((summary) => localizeUtils_1.getLocalizedString(summary, this.distDirectory));
32
+ this.summaryPrepare = () => summaryPrepare.map((summary) => localizeUtils_1.getLocalizedString(summary, this.zipFilePath));
27
33
  this.progressNames = deployConstant_1.ProgressBarConstant.ZIP_DEPLOY_IN_AZURE_PROGRESS;
28
34
  this.progressPrepare = deployConstant_1.ProgressBarConstant.DRY_RUN_ZIP_DEPLOY_IN_AZURE_PROGRESS;
29
35
  }
@@ -81,6 +87,21 @@ class AzureZipDeployImpl extends azureDeployImpl_1.AzureDeployImpl {
81
87
  });
82
88
  return cost;
83
89
  }
90
+ /**
91
+ * pack dist folder into zip
92
+ * @param args dist folder and ignore files
93
+ * @param context log provider etc..
94
+ * @protected
95
+ */
96
+ async packageToZip(args, context) {
97
+ var _a, _b;
98
+ const ig = await this.handleIgnore(args, context);
99
+ this.zipFilePath = path_1.default.join(this.workingDirectory, deployConstant_1.DeployConstant.DEPLOYMENT_TMP_FOLDER, deployConstant_1.DeployConstant.DEPLOYMENT_ZIP_CACHE_FILE);
100
+ await ((_a = this.context.logProvider) === null || _a === void 0 ? void 0 : _a.debug(`start zip dist folder ${this.distDirectory}`));
101
+ const res = await fileOperation_1.zipFolderAsync(this.distDirectory, this.zipFilePath, ig);
102
+ await ((_b = this.context.logProvider) === null || _b === void 0 ? void 0 : _b.debug(`zip dist folder ${this.distDirectory} to ${this.zipFilePath} complete`));
103
+ return res;
104
+ }
84
105
  /**
85
106
  * call azure app service or azure function zip deploy method
86
107
  * @param zipDeployEndpoint azure zip deploy endpoint
@@ -1 +1 @@
1
- {"version":3,"file":"AzureZipDeployImpl.js","sourceRoot":"","sources":["../../../../../../src/component/driver/deploy/azure/impl/AzureZipDeployImpl.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"AzureZipDeployImpl.js","sourceRoot":"","sources":["../../../../../../src/component/driver/deploy/azure/impl/AzureZipDeployImpl.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,6 @@
1
- /// <reference types="node" />
1
+ /**
2
+ * @author FanH <Siglud@gmail.com>
3
+ */
2
4
  import { DeployArgs, DeployContext, DeployStepArgs } from "../../../interface/buildAndDeployArgs";
3
5
  import { Ignore } from "ignore";
4
6
  import { ExecutionResult } from "../../../interface/stepDriver";
@@ -15,8 +17,8 @@ export declare abstract class BaseDeployImpl {
15
17
  protected progressBar?: IProgressHandler;
16
18
  protected static readonly emptyMap: Map<string, string>;
17
19
  protected helpLink: string | undefined;
18
- protected abstract summaries: string[];
19
- protected abstract summaryPrepare: string[];
20
+ protected abstract summaries: () => string[];
21
+ protected abstract summaryPrepare: () => string[];
20
22
  protected abstract progressNames: (() => string)[];
21
23
  protected progressPrepare: (() => string)[];
22
24
  protected abstract progressHandler?: AsyncIterableIterator<void>;
@@ -25,13 +27,6 @@ export declare abstract class BaseDeployImpl {
25
27
  protected static asDeployArgs: (data: unknown, helpLink?: string | undefined) => DeployArgs;
26
28
  run(): Promise<ExecutionResult>;
27
29
  private handlePath;
28
- /**
29
- * pack dist folder into zip
30
- * @param args dist folder and ignore files
31
- * @param context log provider etc..
32
- * @protected
33
- */
34
- protected packageToZip(args: DeployStepArgs, context: DeployContext): Promise<Buffer>;
35
30
  protected handleIgnore(args: DeployStepArgs, context: DeployContext): Promise<Ignore>;
36
31
  protected wrapErrorHandler(fn: () => boolean | Promise<boolean>): Promise<ExecutionResult>;
37
32
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"baseDeployImpl.d.ts","sourceRoot":"","sources":["../../../../../../src/component/driver/deploy/azure/impl/baseDeployImpl.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAElG,OAAe,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAMxC,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAW,gBAAgB,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACjG,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAE9D,8BAAsB,cAAc;IAClC,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,aAAa,CAAC;IACvB,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,UAAS;IACf,SAAS,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC;IAC/B,SAAS,CAAC,EAAE,CAAC,EAAE,eAAe,CAAC;IAC/B,SAAS,CAAC,WAAW,CAAC,EAAE,gBAAgB,CAAC;IACzC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,sBAA6B;IAC/D,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAa;IACnD,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC;IACvC,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,MAAM,EAAE,CAAC;IAC5C,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,CAAC,MAAM,MAAM,CAAC,EAAE,CAAC;IACnD,SAAS,CAAC,eAAe,EAAE,CAAC,MAAM,MAAM,CAAC,EAAE,CAAM;IACjD,SAAS,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE,qBAAqB,CAAC,IAAI,CAAC,CAAC;gBAErD,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa;IAcjD,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC,EAAE,eAAe,GAAG,gBAAgB,GAAG,SAAS;IAE9E,SAAS,CAAC,MAAM,CAAC,YAAY,+DAM1B;IAEG,GAAG,IAAI,OAAO,CAAC,eAAe,CAAC;IAiBrC,OAAO,CAAC,UAAU;IAIlB;;;;;OAKG;cACa,YAAY,CAAC,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC;cAe3E,YAAY,CAAC,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC;cAuB3E,gBAAgB,CAAC,EAAE,EAAE,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC;IAqBhG;;;OAGG;IACH,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;CACpD"}
1
+ {"version":3,"file":"baseDeployImpl.d.ts","sourceRoot":"","sources":["../../../../../../src/component/driver/deploy/azure/impl/baseDeployImpl.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAElG,OAAe,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAMxC,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAW,gBAAgB,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACjG,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAE9D,8BAAsB,cAAc;IAClC,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,aAAa,CAAC;IACvB,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,UAAS;IACf,SAAS,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC;IAC/B,SAAS,CAAC,EAAE,CAAC,EAAE,eAAe,CAAC;IAC/B,SAAS,CAAC,WAAW,CAAC,EAAE,gBAAgB,CAAC;IACzC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,sBAA6B;IAC/D,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAa;IACnD,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,MAAM,EAAE,CAAC;IAC7C,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,MAAM,MAAM,EAAE,CAAC;IAClD,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,CAAC,MAAM,MAAM,CAAC,EAAE,CAAC;IACnD,SAAS,CAAC,eAAe,EAAE,CAAC,MAAM,MAAM,CAAC,EAAE,CAAM;IACjD,SAAS,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE,qBAAqB,CAAC,IAAI,CAAC,CAAC;gBAErD,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa;IAcjD,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC,EAAE,eAAe,GAAG,gBAAgB,GAAG,SAAS;IAE9E,SAAS,CAAC,MAAM,CAAC,YAAY,+DAM1B;IAEG,GAAG,IAAI,OAAO,CAAC,eAAe,CAAC;IAiBrC,OAAO,CAAC,UAAU;cAIF,YAAY,CAAC,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC;cAuB3E,gBAAgB,CAAC,EAAE,EAAE,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC;IAqBhG;;;OAGG;IACH,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;CACpD"}
@@ -9,7 +9,6 @@ const ignore_1 = tslib_1.__importDefault(require("ignore"));
9
9
  const deployConstant_1 = require("../../../../constant/deployConstant");
10
10
  const path = tslib_1.__importStar(require("path"));
11
11
  const fs = tslib_1.__importStar(require("fs-extra"));
12
- const fileOperation_1 = require("../../../../utils/fileOperation");
13
12
  const common_1 = require("../../../../utils/common");
14
13
  const teamsfx_api_1 = require("@microsoft/teamsfx-api");
15
14
  class BaseDeployImpl {
@@ -48,21 +47,6 @@ class BaseDeployImpl {
48
47
  handlePath(inputPath, baseFolder) {
49
48
  return path.isAbsolute(inputPath) ? inputPath : path.join(baseFolder, inputPath);
50
49
  }
51
- /**
52
- * pack dist folder into zip
53
- * @param args dist folder and ignore files
54
- * @param context log provider etc..
55
- * @protected
56
- */
57
- async packageToZip(args, context) {
58
- var _a, _b;
59
- const ig = await this.handleIgnore(args, context);
60
- const zipFilePath = path.join(this.workingDirectory, deployConstant_1.DeployConstant.DEPLOYMENT_TMP_FOLDER, deployConstant_1.DeployConstant.DEPLOYMENT_ZIP_CACHE_FILE);
61
- await ((_a = this.context.logProvider) === null || _a === void 0 ? void 0 : _a.debug(`start zip dist folder ${this.distDirectory}`));
62
- const res = await fileOperation_1.zipFolderAsync(this.distDirectory, zipFilePath, ig);
63
- await ((_b = this.context.logProvider) === null || _b === void 0 ? void 0 : _b.debug(`zip dist folder ${this.distDirectory} to ${zipFilePath} complete`));
64
- return res;
65
- }
66
50
  async handleIgnore(args, context) {
67
51
  // always add deploy temp folder into ignore list
68
52
  const ig = ignore_1.default().add(deployConstant_1.DeployConstant.DEPLOYMENT_TMP_FOLDER);
@@ -88,8 +72,8 @@ class BaseDeployImpl {
88
72
  var _a;
89
73
  try {
90
74
  return (await fn())
91
- ? { result: teamsfx_api_1.ok(BaseDeployImpl.emptyMap), summaries: this.summaries }
92
- : { result: teamsfx_api_1.ok(BaseDeployImpl.emptyMap), summaries: this.summaryPrepare };
75
+ ? { result: teamsfx_api_1.ok(BaseDeployImpl.emptyMap), summaries: this.summaries() }
76
+ : { result: teamsfx_api_1.ok(BaseDeployImpl.emptyMap), summaries: this.summaryPrepare() };
93
77
  }
94
78
  catch (e) {
95
79
  await ((_a = this.context.progressBar) === null || _a === void 0 ? void 0 : _a.end(false));
@@ -1 +1 @@
1
- {"version":3,"file":"baseDeployImpl.js","sourceRoot":"","sources":["../../../../../../src/component/driver/deploy/azure/impl/baseDeployImpl.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"baseDeployImpl.js","sourceRoot":"","sources":["../../../../../../src/component/driver/deploy/azure/impl/baseDeployImpl.ts"],"names":[],"mappings":"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"}
@@ -18,7 +18,8 @@ export interface StepDriver {
18
18
  * The summary is expected to contain human readable information that will be presented to users.
19
19
  * @param args Arguments from the `with` section in the yaml file.
20
20
  * @param ctx logger, telemetry, progress bar, etc.
21
+ * @param outputEnvVarNames the environment variable names for each output
21
22
  */
22
- execute?(args: unknown, ctx: DriverContext): Promise<ExecutionResult>;
23
+ execute?(args: unknown, ctx: DriverContext, outputEnvVarNames?: Map<string, string>): Promise<ExecutionResult>;
23
24
  }
24
25
  //# sourceMappingURL=stepDriver.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"stepDriver.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/interface/stepDriver.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAEzD,oBAAY,eAAe,GAAG;IAC5B,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAE7C,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AAEF,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAE9B;;;;OAIG;IACH,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;IAE1F;;;;;;OAMG;IACH,OAAO,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;CACvE"}
1
+ {"version":3,"file":"stepDriver.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/interface/stepDriver.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAEzD,oBAAY,eAAe,GAAG;IAC5B,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAE7C,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AAEF,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAE9B;;;;OAIG;IACH,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;IAE1F;;;;;;;OAOG;IACH,OAAO,CAAC,CACN,IAAI,EAAE,OAAO,EACb,GAAG,EAAE,aAAa,EAClB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,eAAe,CAAC,CAAC;CAC7B"}
@@ -2,8 +2,9 @@
2
2
  * @owner fanhu <fanhu@microsoft.com>
3
3
  */
4
4
  import { BuildArgs } from "../interface/buildAndDeployArgs";
5
- import { FxError, IProgressHandler, LogProvider, Result, TelemetryReporter } from "@microsoft/teamsfx-api";
5
+ import { IProgressHandler, LogProvider, TelemetryReporter } from "@microsoft/teamsfx-api";
6
6
  import { DriverContext } from "../interface/commonArgs";
7
+ import { ExecutionResult } from "../interface/stepDriver";
7
8
  export declare abstract class BaseBuildDriver {
8
9
  args: BuildArgs;
9
10
  progressBarName: string;
@@ -19,7 +20,7 @@ export declare abstract class BaseBuildDriver {
19
20
  constructor(args: unknown, context: DriverContext, helpLink?: string);
20
21
  protected static asBuildArgs: (data: unknown, helpLink?: string | undefined) => BuildArgs;
21
22
  protected static toBuildArgs(args: unknown, helpLink?: string): BuildArgs;
22
- run(): Promise<Result<Map<string, string>, FxError>>;
23
+ run(): Promise<ExecutionResult>;
23
24
  getCommand(): string;
24
25
  /**
25
26
  * call when error happens
@@ -1 +1 @@
1
- {"version":3,"file":"baseBuildDriver.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/script/baseBuildDriver.ts"],"names":[],"mappings":"AAEA;;GAEG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAG5D,OAAO,EAGL,OAAO,EACP,gBAAgB,EAChB,WAAW,EACX,MAAM,EACN,iBAAiB,EAClB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAGxD,8BAAsB,eAAe;IACnC,IAAI,EAAE,SAAS,CAAC;IAChB,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,SAAK;IACrB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,OAAO,EAAE,aAAa,CAAC;IACjC,SAAS,CAAC,WAAW,EAAE,WAAW,CAAC;IACnC,SAAS,CAAC,WAAW,CAAC,EAAE,gBAAgB,CAAC;IACzC,SAAS,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAC/C,MAAM,CAAC,QAAQ,CAAC,QAAQ,sBAA6B;IACrD,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;gBAEjB,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,QAAQ,CAAC,EAAE,MAAM;IAcpE,SAAS,CAAC,MAAM,CAAC,WAAW,8DAIzB;IAEH,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS;IAInE,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IA2B1D,UAAU,IAAI,MAAM;IAKpB;;;OAGG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAG/B"}
1
+ {"version":3,"file":"baseBuildDriver.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/script/baseBuildDriver.ts"],"names":[],"mappings":"AAEA;;GAEG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAG5D,OAAO,EAAW,gBAAgB,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AACnG,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAG1D,8BAAsB,eAAe;IACnC,IAAI,EAAE,SAAS,CAAC;IAChB,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,SAAK;IACrB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,OAAO,EAAE,aAAa,CAAC;IACjC,SAAS,CAAC,WAAW,EAAE,WAAW,CAAC;IACnC,SAAS,CAAC,WAAW,CAAC,EAAE,gBAAgB,CAAC;IACzC,SAAS,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAC/C,MAAM,CAAC,QAAQ,CAAC,QAAQ,sBAA6B;IACrD,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;gBAEjB,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,QAAQ,CAAC,EAAE,MAAM;IAcpE,SAAS,CAAC,MAAM,CAAC,WAAW,8DAIzB;IAEH,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS;IAInE,GAAG,IAAI,OAAO,CAAC,eAAe,CAAC;IAqCrC,UAAU,IAAI,MAAM;IAKpB;;;OAGG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAG/B"}
@@ -11,6 +11,7 @@ const common_1 = require("../../utils/common");
11
11
  const utils_1 = require("../../code/utils");
12
12
  const teamsfx_api_1 = require("@microsoft/teamsfx-api");
13
13
  const path = tslib_1.__importStar(require("path"));
14
+ const localizeUtils_1 = require("../../../common/localizeUtils");
14
15
  class BaseBuildDriver {
15
16
  constructor(args, context, helpLink) {
16
17
  var _a;
@@ -31,7 +32,7 @@ class BaseBuildDriver {
31
32
  return BaseBuildDriver.asBuildArgs(args, helpLink);
32
33
  }
33
34
  async run() {
34
- var _a, _b, _c;
35
+ var _a, _b, _c, _d;
35
36
  this.progressBar = (_a = this.context.ui) === null || _a === void 0 ? void 0 : _a.createProgressBar(this.progressBarName, this.progressBarSteps);
36
37
  const command = this.getCommand();
37
38
  await ((_b = this.progressBar) === null || _b === void 0 ? void 0 : _b.start());
@@ -43,9 +44,19 @@ class BaseBuildDriver {
43
44
  await ((_c = this.progressBar) === null || _c === void 0 ? void 0 : _c.next(`Run command ${command} at ${this.workingDirectory}`));
44
45
  const res = await utils_1.executeCommand(command, this.context.projectPath, this.logProvider, this.context.ui, this.workingDirectory, env);
45
46
  if (res.isErr()) {
46
- return teamsfx_api_1.err(res.error);
47
+ await this.cleanup();
48
+ return {
49
+ result: teamsfx_api_1.err(res.error),
50
+ summaries: [],
51
+ };
47
52
  }
48
- return teamsfx_api_1.ok(BaseBuildDriver.emptyMap);
53
+ await ((_d = this.progressBar) === null || _d === void 0 ? void 0 : _d.end(true));
54
+ return {
55
+ result: teamsfx_api_1.ok(BaseBuildDriver.emptyMap),
56
+ summaries: [
57
+ localizeUtils_1.getLocalizedString("driver.script.runCommandSummary", command, this.workingDirectory),
58
+ ],
59
+ };
49
60
  }
50
61
  getCommand() {
51
62
  const commandSuffix = common_1.checkMissingArgs("BuildCommand", this.args.args).trim();
@@ -1 +1 @@
1
- {"version":3,"file":"baseBuildDriver.js","sourceRoot":"","sources":["../../../../src/component/driver/script/baseBuildDriver.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"baseBuildDriver.js","sourceRoot":"","sources":["../../../../src/component/driver/script/baseBuildDriver.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"baseBuildStepDriver.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/script/baseBuildStepDriver.ts"],"names":[],"mappings":"AAEA;;GAEG;AAEH,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAGpD,8BAAsB,mBAAoB,YAAW,UAAU;IACvD,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAK/F,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;IAOpE,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,GAAG,eAAe;CACzE"}
1
+ {"version":3,"file":"baseBuildStepDriver.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/script/baseBuildStepDriver.ts"],"names":[],"mappings":"AAEA;;GAEG;AAEH,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,8BAAsB,mBAAoB,YAAW,UAAU;IACvD,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAK/F,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;IAKpE,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,GAAG,eAAe;CACzE"}
@@ -6,18 +6,14 @@
6
6
  */
7
7
  Object.defineProperty(exports, "__esModule", { value: true });
8
8
  exports.BaseBuildStepDriver = void 0;
9
- const common_1 = require("../../utils/common");
10
9
  class BaseBuildStepDriver {
11
10
  async run(args, context) {
12
11
  const impl = this.getImpl(args, context);
13
- return impl.run();
12
+ return (await impl.run()).result;
14
13
  }
15
14
  execute(args, ctx) {
16
- var _a, _b;
17
15
  const impl = this.getImpl(args, ctx);
18
- return common_1.wrapSummaryWithArgs(this.run.bind(this, args, ctx), [
19
- ["driver.script.buildSummary", (_a = impl.getCommand()) !== null && _a !== void 0 ? _a : "", (_b = impl.workingDirectory) !== null && _b !== void 0 ? _b : ""],
20
- ]);
16
+ return impl.run();
21
17
  }
22
18
  }
23
19
  exports.BaseBuildStepDriver = BaseBuildStepDriver;
@@ -1 +1 @@
1
- {"version":3,"file":"baseBuildStepDriver.js","sourceRoot":"","sources":["../../../../src/component/driver/script/baseBuildStepDriver.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;AAClC;;GAEG;;;AAMH,+CAAyD;AAEzD,MAAsB,mBAAmB;IACvC,KAAK,CAAC,GAAG,CAAC,IAAa,EAAE,OAAsB;QAC7C,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACzC,OAAO,IAAI,CAAC,GAAG,EAAE,CAAC;IACpB,CAAC;IAED,OAAO,CAAC,IAAa,EAAE,GAAkB;;QACvC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QACrC,OAAO,4BAAmB,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,EAAE;YACzD,CAAC,4BAA4B,EAAE,MAAA,IAAI,CAAC,UAAU,EAAE,mCAAI,EAAE,EAAE,MAAA,IAAI,CAAC,gBAAgB,mCAAI,EAAE,CAAC;SACrF,CAAC,CAAC;IACL,CAAC;CAGF;AAdD,kDAcC"}
1
+ {"version":3,"file":"baseBuildStepDriver.js","sourceRoot":"","sources":["../../../../src/component/driver/script/baseBuildStepDriver.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;AAClC;;GAEG;;;AAOH,MAAsB,mBAAmB;IACvC,KAAK,CAAC,GAAG,CAAC,IAAa,EAAE,OAAsB;QAC7C,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACzC,OAAO,CAAC,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC;IACnC,CAAC;IAED,OAAO,CAAC,IAAa,EAAE,GAAkB;QACvC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QACrC,OAAO,IAAI,CAAC,GAAG,EAAE,CAAC;IACpB,CAAC;CAGF;AAZD,kDAYC"}
@@ -1 +1 @@
1
- {"version":3,"file":"validateAppPackage.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/validateAppPackage.ts"],"names":[],"mappings":"AAGA;;GAEG;AAEH,OAAO,EAAE,MAAM,EAAE,OAAO,EAA6B,MAAM,wBAAwB,CAAC;AAMpF,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAc7E,qBACa,wBAAyB,YAAW,UAAU;IACzD,WAAW,SAAoE;IAElE,GAAG,CACd,IAAI,EAAE,sBAAsB,EAC5B,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAMnC,OAAO,CAClB,IAAI,EAAE,sBAAsB,EAC5B,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,eAAe,CAAC;IAUd,QAAQ,CACnB,IAAI,EAAE,sBAAsB,EAC5B,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IA+EhD,OAAO,CAAC,YAAY;CAuBrB"}
1
+ {"version":3,"file":"validateAppPackage.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/validateAppPackage.ts"],"names":[],"mappings":"AAGA;;GAEG;AAEH,OAAO,EAAE,MAAM,EAAE,OAAO,EAA6B,MAAM,wBAAwB,CAAC;AAMpF,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAc7E,qBACa,wBAAyB,YAAW,UAAU;IACzD,WAAW,SAAoE;IAElE,GAAG,CACd,IAAI,EAAE,sBAAsB,EAC5B,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAMnC,OAAO,CAClB,IAAI,EAAE,sBAAsB,EAC5B,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,eAAe,CAAC;IAUd,QAAQ,CACnB,IAAI,EAAE,sBAAsB,EAC5B,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IA6FhD,OAAO,CAAC,YAAY;CAuBrB"}
@@ -43,7 +43,7 @@ let ValidateAppPackageDriver = class ValidateAppPackageDriver {
43
43
  };
44
44
  }
45
45
  async validate(args, context) {
46
- var _a, _b;
46
+ var _a, _b, _c, _d;
47
47
  telemetry_1.TelemetryUtils.init(context);
48
48
  const result = this.validateArgs(args);
49
49
  if (result.isErr()) {
@@ -71,23 +71,29 @@ let ValidateAppPackageDriver = class ValidateAppPackageDriver {
71
71
  return teamsfx_api_1.err(appStudioTokenRes.error);
72
72
  }
73
73
  const appStudioToken = appStudioTokenRes.value;
74
- const validationResult = await appStudioClient_1.AppStudioClient.partnerCenterAppPackageValidation(archivedFile, appStudioToken);
75
- // logs in output window
76
- const errors = validationResult.errors
77
- .map((error) => {
78
- return `(x) Error: ${error.content} \n${localizeUtils_1.getLocalizedString("core.option.learnMore")}: ${error.helpUrl}`;
79
- })
80
- .join(os_1.EOL);
81
- const warnings = validationResult.warnings
82
- .map((warning) => {
83
- return `(!) Warning: ${warning.content} \n${localizeUtils_1.getLocalizedString("core.option.learnMore")}: ${warning.helpUrl}`;
84
- })
85
- .join(os_1.EOL);
86
- const outputMessage = os_1.EOL +
87
- localizeUtils_1.getLocalizedString("driver.teamsApp.summary.validate", validationResult.errors.length + validationResult.warnings.length, validationResult.notes.length, errors, warnings, undefined);
88
- (_a = context.logProvider) === null || _a === void 0 ? void 0 : _a.info(outputMessage);
89
- const message = localizeUtils_1.getLocalizedString("driver.teamsApp.validate.result", validationResult.errors.length + validationResult.warnings.length, validationResult.notes.length, "command:fx-extension.showOutputChannel");
90
- (_b = context.ui) === null || _b === void 0 ? void 0 : _b.showMessage("info", message, false);
74
+ try {
75
+ const validationResult = await appStudioClient_1.AppStudioClient.partnerCenterAppPackageValidation(archivedFile, appStudioToken);
76
+ // logs in output window
77
+ const errors = validationResult.errors
78
+ .map((error) => {
79
+ return `(x) Error: ${error.content} \n${localizeUtils_1.getLocalizedString("core.option.learnMore")}: ${error.helpUrl}`;
80
+ })
81
+ .join(os_1.EOL);
82
+ const warnings = validationResult.warnings
83
+ .map((warning) => {
84
+ return `(!) Warning: ${warning.content} \n${localizeUtils_1.getLocalizedString("core.option.learnMore")}: ${warning.helpUrl}`;
85
+ })
86
+ .join(os_1.EOL);
87
+ const outputMessage = os_1.EOL +
88
+ localizeUtils_1.getLocalizedString("driver.teamsApp.summary.validate", validationResult.errors.length + validationResult.warnings.length, validationResult.notes.length, errors, warnings, undefined);
89
+ (_a = context.logProvider) === null || _a === void 0 ? void 0 : _a.info(outputMessage);
90
+ const message = localizeUtils_1.getLocalizedString("driver.teamsApp.validate.result", validationResult.errors.length + validationResult.warnings.length, validationResult.notes.length, "command:fx-extension.showOutputChannel");
91
+ (_b = context.ui) === null || _b === void 0 ? void 0 : _b.showMessage("info", message, false);
92
+ }
93
+ catch (e) {
94
+ (_c = context.logProvider) === null || _c === void 0 ? void 0 : _c.warning(localizeUtils_1.getLocalizedString("error.teamsApp.validate.apiFailed", e.message));
95
+ (_d = context.ui) === null || _d === void 0 ? void 0 : _d.showMessage("warn", localizeUtils_1.getLocalizedString("error.teamsApp.validate.apiFailed.display", "command:fx-extension.showOutputChannel"), false);
96
+ }
91
97
  return teamsfx_api_1.ok(new Map());
92
98
  }
93
99
  validateArgs(args) {
@@ -1 +1 @@
1
- {"version":3,"file":"validateAppPackage.js","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/validateAppPackage.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"validateAppPackage.js","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/validateAppPackage.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,6 @@
1
+ /**
2
+ * @author yefuwang@microsoft.com
3
+ */
1
4
  import { FxError, Inputs, Result, ContextV3 } from "@microsoft/teamsfx-api";
2
5
  export declare class OfficeAddinGenerator {
3
6
  static generate(context: ContextV3, inputs: Inputs, destinationPath: string): Promise<Result<undefined, FxError>>;
@@ -1 +1 @@
1
- {"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/officeAddin/generator.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,OAAO,EACP,MAAM,EACN,MAAM,EAKN,SAAS,EACV,MAAM,wBAAwB,CAAC;AA0BhC,qBAAa,oBAAoB;WASlB,QAAQ,CACnB,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;WAoBlB,gBAAgB,CAAC,OAAO,EAAE,MAAM;;;;WAIhC,aAAa,CAC/B,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;CAuDvC"}
1
+ {"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/officeAddin/generator.ts"],"names":[],"mappings":"AAGA;;GAEG;AAEH,OAAO,EACL,OAAO,EACP,MAAM,EACN,MAAM,EAKN,SAAS,EACV,MAAM,wBAAwB,CAAC;AA0BhC,qBAAa,oBAAoB;WASlB,QAAQ,CACnB,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;WAoBlB,gBAAgB,CAAC,OAAO,EAAE,MAAM;;;;WAIhC,aAAa,CAC/B,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;CAyDvC"}
@@ -4,6 +4,9 @@
4
4
  Object.defineProperty(exports, "__esModule", { value: true });
5
5
  exports.OfficeAddinGenerator = void 0;
6
6
  const tslib_1 = require("tslib");
7
+ /**
8
+ * @author yefuwang@microsoft.com
9
+ */
7
10
  const teamsfx_api_1 = require("@microsoft/teamsfx-api");
8
11
  const path_1 = require("path");
9
12
  const question_1 = require("./question");
@@ -58,8 +61,10 @@ class OfficeAddinGenerator {
58
61
  // Call 'convert-to-single-host' npm script in generated project, passing in host parameter
59
62
  const cmdLine = `npm run convert-to-single-host --if-present -- ${lodash_1.default.toLower(host)}`;
60
63
  await OfficeAddinGenerator.childProcessExec(cmdLine);
64
+ const manifestPath = jsonData.getManifestPath(template);
61
65
  // modify manifest guid and DisplayName
62
- await office_addin_manifest_1.OfficeAddinManifest.modifyManifestFile(`${path_1.join(addinRoot, jsonData.getManifestPath(template))}`, "random", `${name}`);
66
+ await office_addin_manifest_1.OfficeAddinManifest.modifyManifestFile(`${path_1.join(addinRoot, manifestPath)}`, "random", `${name}`);
67
+ await helperMethods_1.HelperMethods.moveManifestLocation(addinRoot, manifestPath);
63
68
  }
64
69
  }
65
70
  else {
@@ -1 +1 @@
1
- {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/component/generator/officeAddin/generator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/component/generator/officeAddin/generator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC;;GAEG;AAEH,wDASgC;AAChC,+BAA4B;AAC5B,yCAMoB;AACpB,mDAAgD;AAChD,iEAA4D;AAC5D,yFAAyD;AACzD,oEAA8C;AAC9C,+BAAiC;AACjC,+CAAoD;AACpD,4DAAuB;AACvB,+CAA8C;AAC9C,0EAAuE;AACvE,4CAAyC;AACzC,qDAA2D;AAC3D,+DAAsD;AAEtD,MAAM,aAAa,GAAG,cAAc,CAAC;AACrC,MAAM,cAAc,GAAG,UAAU,CAAC;AAClC,MAAM,YAAY,GAAG,cAAc,CAAC;AAEpC,MAAa,oBAAoB;IAS/B,MAAM,CAAC,KAAK,CAAC,QAAQ,CACnB,OAAkB,EAClB,MAAc,EACd,eAAuB;QAEvB,MAAM,MAAM,GAAG,MAAM,oBAAoB,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,eAAe,CAAC,CAAC;QAC1F,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE;YAClB,OAAO,iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;SAC1B;QAED,uEAAuE;QACvE,MAAM,IAAI,GAAG,MAAM,CAAC,gCAAqB,CAAC,IAAI,CAAC,CAAC;QAEhD,MAAM,WAAW,GAAG,MAAM,qBAAS,CAAC,gBAAgB,CAClD,OAAO,EACP,eAAe,EACf,YAAY,EACZ,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CACzD,CAAC;QACF,IAAI,WAAW,CAAC,KAAK,EAAE;YAAE,OAAO,iBAAG,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAEvD,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;IACvB,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,OAAe;QAClD,OAAO,gBAAS,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC;IAC/C,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,aAAa,CAC/B,OAAkB,EAClB,MAAc,EACd,eAAuB;QAEvB,MAAM,QAAQ,GAAG,sBAAW,CAAC,MAAM,CAAC,CAAC;QACrC,MAAM,IAAI,GAAG,MAAM,CAAC,4BAAiB,CAAC,OAAO,CAAW,CAAC;QACzD,MAAM,SAAS,GAAG,eAAe,CAAC;QAClC,MAAM,UAAU,GAAG,MAAM,CAAC,qCAA0B,CAAC,IAAI,CAAC,CAAC;QAC3D,MAAM,QAAQ,GAAG,MAAM,CAAC,gCAAqB,CAAC,IAAI,CAAC,CAAC;QACpD,MAAM,IAAI,GAAG,MAAM,CAAC,6BAAkB,CAAC,IAAI,CAAC,CAAC;QAC7C,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;QAEjC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACzB,IAAI;YACF,IAAI,CAAC,UAAU,EAAE;gBACf,gBAAgB;gBAChB,MAAM,QAAQ,GAAG,IAAI,0BAAgB,EAAE,CAAC;gBACxC,MAAM,qBAAqB,GAAG,QAAQ,CAAC,uBAAuB,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;gBAEzF,sDAAsD;gBACtD,IAAI,qBAAqB,CAAC,IAAI,EAAE;oBAC9B,MAAM,6BAAa,CAAC,8BAA8B,CAChD,SAAS,EACT,qBAAqB,CAAC,IAAI,EAC1B,qBAAqB,CAAC,MAAM,CAC7B,CAAC;oBAEF,2FAA2F;oBAC3F,MAAM,OAAO,GAAG,kDAAkD,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;oBACpF,MAAM,oBAAoB,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;oBAErD,MAAM,YAAY,GAAG,QAAQ,CAAC,eAAe,CAAC,QAAQ,CAAW,CAAC;oBAClE,uCAAuC;oBACvC,MAAM,2CAAmB,CAAC,kBAAkB,CAC1C,GAAG,WAAI,CAAC,SAAS,EAAE,YAAY,CAAC,EAAE,EAClC,QAAQ,EACR,GAAG,IAAI,EAAE,CACV,CAAC;oBACF,MAAM,6BAAa,CAAC,oBAAoB,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;iBACnE;aACF;iBAAM;gBACL,wBAAwB;gBACxB,6BAAa,CAAC,cAAc,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;gBACpD,MAAM,kBAAkB,GAAW,MAAM,CAAC,uCAA4B,CAAC,IAAI,CAAC,CAAC;gBAC7E,IAAI,YAAY,GAAW,kBAAkB,CAAC,OAAO,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;gBAC7E,IAAI,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;oBACjC,wCAAwC;oBACxC,MAAM,qCAAc,CAAC,YAAY,CAAC,CAAC;oBACnC,YAAY,GAAG,YAAY,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;iBACxD;gBACD,MAAM,CAAC,6BAAkB,CAAC,IAAI,CAAC,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,CAAC;gBAC9D,6BAAa,CAAC,cAAc,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;aAC7D;YACD,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YAC1B,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;SACtB;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YAC1B,OAAO,iBAAG,CAAC,qBAAa,CAAC,CAAU,CAAC,CAAC,CAAC;SACvC;IACH,CAAC;CACF;AAzFC;IARC,WAAK,CAAC;QACL,qCAAiB,CAAC;YAChB,eAAe,EAAE,IAAI;YACrB,sBAAsB,EAAE,aAAa;YACrC,kBAAkB,EAAE,cAAc;YAClC,WAAW,EAAE,aAAa;SAC3B,CAAC;KACH,CAAC;;;;0CAuBD;AA/BH,oDAkGC;AAKD,KAAK,UAAU,OAAO,CAAC,iBAAyB;;IAC9C,4BAA4B;IAC5B,MAAM,aAAa,GAAgC,MAAM,0BAAY,CAAC,YAAY,CAChF,iBAAiB,CAClB,CAAC;IACF,IAAI,IAAI,GAAe,SAAS,CAAC;IACjC,QAAQ,MAAA,MAAA,MAAA,aAAa,CAAC,UAAU,0CAAG,CAAC,EAAE,YAAY,0CAAE,MAAM,0CAAG,CAAC,CAAC,EAAE;QAC/D,mBAAmB;QACnB,mBAAmB;QACnB,KAAK,MAAM;YACT,IAAI,GAAG,SAAS,CAAC;QACnB,mBAAmB;QACnB,sBAAsB;QACtB,uBAAuB;QACvB,yBAAyB;QACzB,kBAAkB;QAClB,sBAAsB;QACtB,mBAAmB;QACnB,oBAAoB;KACrB;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}
@@ -4,5 +4,6 @@ export declare class HelperMethods {
4
4
  static moveUnzippedFiles(projectFolder: string): void;
5
5
  static copyAddinFiles(fromFolder: string, toFolder: string): void;
6
6
  static updateManifest(projectRoot: string, addinManifestPath: string): Promise<void>;
7
+ static moveManifestLocation(projectRoot: string, manifestRelativePath: string): Promise<void>;
7
8
  }
8
9
  //# sourceMappingURL=helperMethods.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"helperMethods.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/officeAddin/helperMethods.ts"],"names":[],"mappings":"AAUA,qBAAa,aAAa;WACX,8BAA8B,CACzC,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,EACnB,aAAa,CAAC,EAAE,MAAM,GACrB,OAAO,CAAC,IAAI,CAAC;WA0BH,oBAAoB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBvE,MAAM,CAAC,iBAAiB,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI;IAoBrD,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;WAMpD,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAmB3F"}
1
+ {"version":3,"file":"helperMethods.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/officeAddin/helperMethods.ts"],"names":[],"mappings":"AAaA,qBAAa,aAAa;WACX,8BAA8B,CACzC,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,EACnB,aAAa,CAAC,EAAE,MAAM,GACrB,OAAO,CAAC,IAAI,CAAC;WA0BH,oBAAoB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBvE,MAAM,CAAC,iBAAiB,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI;IAoBrD,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;WAMpD,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;WAqB7E,oBAAoB,CAC/B,WAAW,EAAE,MAAM,EACnB,oBAAoB,EAAE,MAAM,GAC3B,OAAO,CAAC,IAAI,CAAC;CA2CjB"}