@microsoft/teamsfx-core 1.1.3-alpha.7f97c76d.0 → 1.1.3-alpha.919e09bf.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 (8) hide show
  1. package/build/plugins/resource/appstudio/manifestTemplate.d.ts.map +1 -1
  2. package/build/plugins/resource/appstudio/manifestTemplate.js +13 -8
  3. package/build/plugins/resource/appstudio/manifestTemplate.js.map +1 -1
  4. package/package.json +3 -3
  5. package/templates/plugins/resource/bot/bicep/botConfiguration.template.bicep +12 -12
  6. package/templates/plugins/resource/bot/bicep/botProvision.template.bicep +15 -11
  7. package/templates/plugins/resource/bot/bicep/config.template.bicep +2 -0
  8. package/templates/plugins/resource/frontend/bicep/frontendHostingProvision.bicep +3 -2
package/build/plugins/resource/appstudio/manifestTemplate.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"manifestTemplate.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/appstudio/manifestTemplate.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,OAAO,EACP,gBAAgB,EAChB,MAAM,EAGN,iBAAiB,EACjB,IAAI,EACJ,gBAAgB,EAChB,UAAU,EACX,MAAM,wBAAwB,CAAC;AAoBhC,wBAAsB,uBAAuB,CAC3C,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,OAAO,GACpB,OAAO,CAAC,MAAM,CAAC,CAGjB;AAED,wBAAsB,IAAI,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAQ5D;AAED,wBAAsB,YAAY,CAChC,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,OAAO,GACpB,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC,CAkC5C;AAED,wBAAsB,YAAY,CAChC,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,gBAAgB,EAC1B,YAAY,EAAE,OAAO,GACpB,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAI/B;AAED,wBAAsB,qBAAqB,CACzC,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,WAAW,GAAG,iBAAiB,GAAG,KAAK,GAAG,kBAAkB,GACvE,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAmDnC;AAED,wBAAsB,eAAe,CACnC,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,CACV;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,OAAO,CAAC,EAAE;QAAE,KAAK,EAAE,UAAU,CAAC;QAAC,MAAM,EAAE,UAAU,CAAA;KAAE,CAAA;CAAE,GAC1E;IAAE,IAAI,EAAE,iBAAiB,CAAC;IAAC,OAAO,CAAC,EAAE;QAAE,KAAK,EAAE,gBAAgB,CAAC;QAAC,MAAM,EAAE,gBAAgB,CAAA;KAAE,CAAA;CAAE,GAC5F;IAAE,IAAI,EAAE,KAAK,CAAC;IAAC,OAAO,CAAC,EAAE;QAAE,KAAK,EAAE,IAAI,CAAC;QAAC,MAAM,EAAE,IAAI,CAAA;KAAE,CAAA;CAAE,GACxD;IACE,IAAI,EAAE,kBAAkB,CAAC;IACzB,OAAO,CAAC,EAAE;QAAE,KAAK,EAAE,iBAAiB,CAAC;QAAC,MAAM,EAAE,iBAAiB,CAAA;KAAE,CAAC;CACnE,CACJ,EAAE,GACF,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAgG/B"}
1
+ {"version":3,"file":"manifestTemplate.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/appstudio/manifestTemplate.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,OAAO,EACP,gBAAgB,EAChB,MAAM,EAGN,iBAAiB,EACjB,IAAI,EACJ,gBAAgB,EAChB,UAAU,EACX,MAAM,wBAAwB,CAAC;AAoBhC,wBAAsB,uBAAuB,CAC3C,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,OAAO,GACpB,OAAO,CAAC,MAAM,CAAC,CAGjB;AAED,wBAAsB,IAAI,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAQ5D;AAED,wBAAsB,YAAY,CAChC,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,OAAO,GACpB,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC,CAkC5C;AAED,wBAAsB,YAAY,CAChC,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,gBAAgB,EAC1B,YAAY,EAAE,OAAO,GACpB,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAI/B;AAED,wBAAsB,qBAAqB,CACzC,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,WAAW,GAAG,iBAAiB,GAAG,KAAK,GAAG,kBAAkB,GACvE,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAmDnC;AAED,wBAAsB,eAAe,CACnC,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,CACV;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,OAAO,CAAC,EAAE;QAAE,KAAK,EAAE,UAAU,CAAC;QAAC,MAAM,EAAE,UAAU,CAAA;KAAE,CAAA;CAAE,GAC1E;IAAE,IAAI,EAAE,iBAAiB,CAAC;IAAC,OAAO,CAAC,EAAE;QAAE,KAAK,EAAE,gBAAgB,CAAC;QAAC,MAAM,EAAE,gBAAgB,CAAA;KAAE,CAAA;CAAE,GAC5F;IAAE,IAAI,EAAE,KAAK,CAAC;IAAC,OAAO,CAAC,EAAE;QAAE,KAAK,EAAE,IAAI,CAAC;QAAC,MAAM,EAAE,IAAI,CAAA;KAAE,CAAA;CAAE,GACxD;IACE,IAAI,EAAE,kBAAkB,CAAC;IACzB,OAAO,CAAC,EAAE;QAAE,KAAK,EAAE,iBAAiB,CAAC;QAAC,MAAM,EAAE,iBAAiB,CAAA;KAAE,CAAC;CACnE,CACJ,EAAE,GACF,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAqG/B"}
package/build/plugins/resource/appstudio/manifestTemplate.js CHANGED
@@ -93,6 +93,7 @@ async function capabilityExceedLimit(projectRoot, capability) {
93
93
  }
94
94
  exports.capabilityExceedLimit = capabilityExceedLimit;
95
95
  async function addCapabilities(projectRoot, capabilities) {
96
+ var _a, _b;
96
97
  const localManifestRes = await loadManifest(projectRoot, true);
97
98
  if (localManifestRes.isErr()) {
98
99
  return teamsfx_api_1.err(localManifestRes.error);
@@ -103,30 +104,34 @@ async function addCapabilities(projectRoot, capabilities) {
103
104
  return teamsfx_api_1.err(remoteManifestRes.error);
104
105
  }
105
106
  const remoteManifest = remoteManifestRes.value;
107
+ let staticTabIndex = (_b = (_a = remoteManifest.staticTabs) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0;
106
108
  capabilities.map((capability) => {
107
109
  switch (capability.name) {
108
110
  case "staticTab":
109
111
  if (!localManifest.staticTabs) {
110
- Object.assign(localManifest.staticTabs, []);
112
+ Object.assign(localManifest, { staticTabs: [] });
111
113
  }
112
114
  if (!remoteManifest.staticTabs) {
113
- Object.assign(remoteManifest.staticTabs, []);
115
+ Object.assign(remoteManifest, { staticTabs: [] });
114
116
  }
115
117
  if (capability.snippet) {
116
118
  localManifest.staticTabs.push(capability.snippet.local);
117
119
  remoteManifest.staticTabs.push(capability.snippet.remote);
118
120
  }
119
121
  else {
122
+ constants_1.STATIC_TABS_TPL_LOCAL_DEBUG[0].entityId = "index" + staticTabIndex;
123
+ constants_1.STATIC_TABS_TPL_FOR_MULTI_ENV[0].entityId = "index" + staticTabIndex;
120
124
  localManifest.staticTabs = localManifest.staticTabs.concat(constants_1.STATIC_TABS_TPL_LOCAL_DEBUG);
121
125
  remoteManifest.staticTabs = remoteManifest.staticTabs.concat(constants_1.STATIC_TABS_TPL_FOR_MULTI_ENV);
126
+ staticTabIndex++;
122
127
  }
123
128
  break;
124
129
  case "configurableTab":
125
130
  if (!localManifest.configurableTabs) {
126
- Object.assign(localManifest.configurableTabs, []);
131
+ Object.assign(localManifest, { configurableTabs: [] });
127
132
  }
128
133
  if (!remoteManifest.configurableTabs) {
129
- Object.assign(remoteManifest.configurableTabs, []);
134
+ Object.assign(remoteManifest, { configurableTabs: [] });
130
135
  }
131
136
  if (capability.snippet) {
132
137
  localManifest.configurableTabs.push(capability.snippet.local);
@@ -139,10 +144,10 @@ async function addCapabilities(projectRoot, capabilities) {
139
144
  break;
140
145
  case "Bot":
141
146
  if (!localManifest.bots) {
142
- Object.assign(localManifest.bots, []);
147
+ Object.assign(localManifest, { bots: [] });
143
148
  }
144
149
  if (!remoteManifest.bots) {
145
- Object.assign(remoteManifest.bots, []);
150
+ Object.assign(remoteManifest, { bots: [] });
146
151
  }
147
152
  if (capability.snippet) {
148
153
  localManifest.bots.push(capability.snippet.local);
@@ -155,10 +160,10 @@ async function addCapabilities(projectRoot, capabilities) {
155
160
  break;
156
161
  case "MessageExtension":
157
162
  if (!localManifest.composeExtensions) {
158
- Object.assign(localManifest.composeExtensions, []);
163
+ Object.assign(localManifest, { composeExtensions: [] });
159
164
  }
160
165
  if (!remoteManifest.composeExtensions) {
161
- Object.assign(remoteManifest.composeExtensions, []);
166
+ Object.assign(remoteManifest, { composeExtensions: [] });
162
167
  }
163
168
  if (capability.snippet) {
164
169
  localManifest.composeExtensions.push(capability.snippet.local);
package/build/plugins/resource/appstudio/manifestTemplate.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"manifestTemplate.js","sourceRoot":"","sources":["../../../../src/plugins/resource/appstudio/manifestTemplate.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"manifestTemplate.js","sourceRoot":"","sources":["../../../../src/plugins/resource/appstudio/manifestTemplate.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@microsoft/teamsfx-core",
3
- "version": "1.1.3-alpha.7f97c76d.0",
3
+ "version": "1.1.3-alpha.919e09bf.0",
4
4
  "main": "build/index.js",
5
5
  "types": "build/index.d.ts",
6
6
  "license": "MIT",
@@ -57,7 +57,7 @@
57
57
  "@azure/storage-blob": "^12.7.0",
58
58
  "@dbpiper/timer": "1.0.0-beta.2",
59
59
  "@feathersjs/hooks": "^0.6.5",
60
- "@microsoft/teamsfx-api": "0.12.1-alpha.7f97c76d.0",
60
+ "@microsoft/teamsfx-api": "0.12.1-alpha.919e09bf.0",
61
61
  "@npmcli/package-json": "^1.0.1",
62
62
  "@types/jwt-decode": "3.1.0",
63
63
  "@types/proper-lockfile": "^4.1.1",
@@ -170,7 +170,7 @@
170
170
  "resource/**/*",
171
171
  "templates/**/*"
172
172
  ],
173
- "gitHead": "aded1749ce420fb6a6c726e11fd2c9095f12ccd2",
173
+ "gitHead": "6e1d0197cbcbe9fa29a894a29f1aed39db904656",
174
174
  "publishConfig": {
175
175
  "access": "public"
176
176
  },
package/templates/plugins/resource/bot/bicep/botConfiguration.template.bicep CHANGED
@@ -38,21 +38,21 @@ var m365ApplicationIdUri = 'api://botid-${botId}'
38
38
  resource botWebAppSettings 'Microsoft.Web/sites/config@2021-02-01' = {
39
39
  name: '${botWebAppName}/appsettings'
40
40
  properties: union({
41
- INITIATE_LOGIN_ENDPOINT: uri(provisionOutputs.botOutput.value.siteEndpoint, 'auth-start.html')
42
- M365_AUTHORITY_HOST: m365OauthAuthorityHost
43
- M365_CLIENT_ID: m365ClientId
44
- M365_CLIENT_SECRET: m365ClientSecret
45
- M365_TENANT_ID: m365TenantId
46
- M365_APPLICATION_ID_URI: m365ApplicationIdUri
47
- BOT_ID: botAadAppClientId
48
- BOT_PASSWORD: botAadAppClientSecret
41
+ INITIATE_LOGIN_ENDPOINT: uri(provisionOutputs.botOutput.value.siteEndpoint, 'auth-start.html') // The page is used to let users consent required OAuth permissions during bot SSO process
42
+ M365_AUTHORITY_HOST: m365OauthAuthorityHost // AAD authority host
43
+ M365_CLIENT_ID: m365ClientId // Client id of AAD application
44
+ M365_CLIENT_SECRET: m365ClientSecret // Client secret of AAD application
45
+ M365_TENANT_ID: m365TenantId // Tenant id of AAD application
46
+ M365_APPLICATION_ID_URI: m365ApplicationIdUri // Application ID URI of AAD application
47
+ BOT_ID: botAadAppClientId // ID of your bot
48
+ BOT_PASSWORD: botAadAppClientSecret // Secret of your bot
49
49
  {{#if (contains "fx-resource-function" plugins) }}
50
- API_ENDPOINT: provisionOutputs.functionOutput.value.functionEndpoint
50
+ API_ENDPOINT: provisionOutputs.functionOutput.value.functionEndpoint // Azure Function endpoint
51
51
  {{/if}}
52
52
  {{#if (contains "fx-resource-azure-sql" plugins)}}
53
- SQL_DATABASE_NAME: \{{fx-resource-azure-sql.References.databaseName}}
54
- SQL_ENDPOINT: \{{fx-resource-azure-sql.References.sqlEndpoint}}
53
+ SQL_DATABASE_NAME: \{{fx-resource-azure-sql.References.databaseName}} // SQL database name
54
+ SQL_ENDPOINT: \{{fx-resource-azure-sql.References.sqlEndpoint}} // SQL server endpoint
55
55
  {{/if}}
56
- IDENTITY_ID: \{{fx-resource-identity.References.identityClientId}}
56
+ IDENTITY_ID: \{{fx-resource-identity.References.identityClientId}} // User assigned identity id, the identity is used to access other Azure resources
57
57
  }, currentAppSettings)
58
58
  }
package/templates/plugins/resource/bot/bicep/botProvision.template.bicep CHANGED
@@ -3,14 +3,15 @@ param provisionParameters object
3
3
  param userAssignedIdentityId string
4
4
 
5
5
  var resourceBaseName = provisionParameters.resourceBaseName
6
- var botAadAppClientId = provisionParameters['botAadAppClientId']
7
- var botServiceName = contains(provisionParameters, 'botServiceName') ? provisionParameters['botServiceName'] : '${resourceBaseName}'
8
- var botServiceSku = contains(provisionParameters, 'botServiceSku') ? provisionParameters['botServiceSku'] : 'F0'
9
- var botDisplayName = contains(provisionParameters, 'botDisplayName') ? provisionParameters['botDisplayName'] : '${resourceBaseName}'
10
- var serverfarmsName = contains(provisionParameters, 'botServerfarmsName') ? provisionParameters['botServerfarmsName'] : '${resourceBaseName}bot'
11
- var webAppSKU = contains(provisionParameters, 'botWebAppSKU') ? provisionParameters['botWebAppSKU'] : 'F1'
12
- var webAppName = contains(provisionParameters, 'botSitesName') ? provisionParameters['botSitesName'] : '${resourceBaseName}bot'
6
+ var botAadAppClientId = provisionParameters['botAadAppClientId'] // Read AAD app client id for Azure Bot Service from parameters
7
+ var botServiceName = contains(provisionParameters, 'botServiceName') ? provisionParameters['botServiceName'] : '${resourceBaseName}' // Try to read name for Azure Bot Service from parameters
8
+ var botServiceSku = contains(provisionParameters, 'botServiceSku') ? provisionParameters['botServiceSku'] : 'F0' // Try to read SKU for Azure Bot Service from parameters
9
+ var botDisplayName = contains(provisionParameters, 'botDisplayName') ? provisionParameters['botDisplayName'] : '${resourceBaseName}' // Try to read display name for Azure Bot Service from parameters
10
+ var serverfarmsName = contains(provisionParameters, 'botServerfarmsName') ? provisionParameters['botServerfarmsName'] : '${resourceBaseName}bot' // Try to read name for App Service Plan from parameters
11
+ var webAppSKU = contains(provisionParameters, 'botWebAppSKU') ? provisionParameters['botWebAppSKU'] : 'F1' // Try to read SKU for Azure Web App from parameters
12
+ var webAppName = contains(provisionParameters, 'botSitesName') ? provisionParameters['botSitesName'] : '${resourceBaseName}bot' // Try to read name for Azure Web App from parameters
13
13
 
14
+ // Register your web service as a bot with the Bot Framework
14
15
  resource botService 'Microsoft.BotService/botServices@2021-03-01' = {
15
16
  kind: 'azurebot'
16
17
  location: 'global'
@@ -25,6 +26,7 @@ resource botService 'Microsoft.BotService/botServices@2021-03-01' = {
25
26
  }
26
27
  }
27
28
 
29
+ // Connect the bot service to Microsoft Teams
28
30
  resource botServiceMsTeamsChannel 'Microsoft.BotService/botServices/channels@2021-03-01' = {
29
31
  parent: botService
30
32
  location: 'global'
@@ -34,6 +36,7 @@ resource botServiceMsTeamsChannel 'Microsoft.BotService/botServices/channels@202
34
36
  }
35
37
  }
36
38
 
39
+ // Compute resources for your Web App
37
40
  resource serverfarm 'Microsoft.Web/serverfarms@2021-02-01' = {
38
41
  kind: 'app'
39
42
  location: resourceGroup().location
@@ -43,22 +46,23 @@ resource serverfarm 'Microsoft.Web/serverfarms@2021-02-01' = {
43
46
  }
44
47
  }
45
48
 
49
+ // Web App that hosts your bot
46
50
  resource webApp 'Microsoft.Web/sites@2021-02-01' = {
47
51
  kind: 'app'
48
52
  location: resourceGroup().location
49
53
  name: webAppName
50
54
  properties: {
51
55
  serverFarmId: serverfarm.id
52
- keyVaultReferenceIdentity: userAssignedIdentityId
56
+ keyVaultReferenceIdentity: userAssignedIdentityId // Use given user assigned identity to access Key Vault
53
57
  siteConfig: {
54
58
  appSettings: [
55
59
  {
56
60
  name: 'SCM_DO_BUILD_DURING_DEPLOYMENT'
57
- value: 'true'
61
+ value: 'true' // Execute build steps on your site during deployment
58
62
  }
59
63
  {
60
64
  name: 'WEBSITE_NODE_DEFAULT_VERSION'
61
- value: '~14'
65
+ value: '~14' // Set NodeJS version to 14.x for your site
62
66
  }
63
67
  ]
64
68
  }
@@ -66,7 +70,7 @@ resource webApp 'Microsoft.Web/sites@2021-02-01' = {
66
70
  identity: {
67
71
  type: 'UserAssigned'
68
72
  userAssignedIdentities: {
69
- '${userAssignedIdentityId}': {}
73
+ '${userAssignedIdentityId}': {} // The identity is used to access other Azure resources
70
74
  }
71
75
  }
72
76
  }
package/templates/plugins/resource/bot/bicep/config.template.bicep CHANGED
@@ -1,5 +1,7 @@
1
+ // Get existing app settings for merge
1
2
  var botCurrentAppSettings = list('${provisionOutputs.botOutput.value.botWebAppResourceId}/config/appsettings', '2021-02-01').properties
2
3
 
4
+ // Merge TeamsFx configurations to Bot resources
3
5
  module teamsFxBotConfig '\{{fx-resource-bot.Configuration.bot.path}}' = {
4
6
  name: 'addTeamsFxBotConfiguration'
5
7
  params: {
package/templates/plugins/resource/frontend/bicep/frontendHostingProvision.bicep CHANGED
@@ -1,9 +1,10 @@
1
1
  @secure()
2
2
  param provisionParameters object
3
3
  var resourceBaseName = provisionParameters.resourceBaseName
4
- var storageName = contains(provisionParameters, 'frontendHostingStorageName') ? provisionParameters['frontendHostingStorageName'] : '${resourceBaseName}tab'
5
- var storageSku = contains(provisionParameters, 'frontendHostingStorageSku') ? provisionParameters['frontendHostingStorageSku'] : 'Standard_LRS'
4
+ var storageName = contains(provisionParameters, 'frontendHostingStorageName') ? provisionParameters['frontendHostingStorageName'] : '${resourceBaseName}tab' // Try to read name for frontend hosting Storage Account from parameters
5
+ var storageSku = contains(provisionParameters, 'frontendHostingStorageSku') ? provisionParameters['frontendHostingStorageSku'] : 'Standard_LRS' // Try to read SKU for frontend hosting Storage Account from parameters
6
6
 
7
+ // Azure Storage that hosts your static web site
7
8
  resource storage 'Microsoft.Storage/storageAccounts@2021-06-01' = {
8
9
  kind: 'StorageV2'
9
10
  location: resourceGroup().location