@microsoft/teamsfx-core 1.10.0 → 1.10.1-alpha.009656ebb.0

package/build/plugins/solution/spfx-solution/addFeature.js.map

@@ -1 +1 @@
-{"version":3,"file":"addFeature.js","sourceRoot":"","sources":["../../../../src/plugins/solution/spfx-solution/addFeature.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAWgC;AAChC,mCAAmC;AACnC,2DAAwE;AAEjE,KAAK,UAAU,yBAAyB,CAC7C,GAAe,EACf,MAAgC;IAEhC,MAAM,MAAM,GAAG,kBAAS,CAAC,GAAG,CAAc,qCAAyB,CAAC,IAAI,CAAC,CAAC;IAC1E,IAAI,MAAM,CAAC,0BAA0B,EAAE;QACrC,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,0BAA0B,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QACvE,IAAI,SAAS,CAAC,KAAK,EAAE;YAAE,OAAO,iBAAG,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACnD,IAAI,SAAS,CAAC,KAAK,EAAE;YACnB,OAAO,gBAAE,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;SAC5B;KACF;IACD,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;AACvB,CAAC;AAbD,8DAaC;AAEM,KAAK,UAAU,UAAU,CAC9B,GAAe,EACf,MAAmC;IAEnC,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AALD,gCAKC;AAEM,KAAK,UAAU,kBAAkB,CACtC,GAAe,EACf,MAAc,EACd,OAAqB,EACrB,aAAqC;IAErC,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AAPD,gDAOC"}
+{"version":3,"file":"addFeature.js","sourceRoot":"","sources":["../../../../src/plugins/solution/spfx-solution/addFeature.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAWgC;AAChC,mCAAmC;AACnC,2DAAwE;AAEjE,KAAK,UAAU,yBAAyB,CAC7C,GAAe,EACf,MAAgC;IAEhC,MAAM,MAAM,GAAG,kBAAS,CAAC,GAAG,CAAc,qCAAyB,CAAC,IAAI,CAAC,CAAC;IAC1E,IAAI,MAAM,CAAC,0BAA0B,EAAE;QACrC,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,0BAA0B,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QACvE,IAAI,SAAS,CAAC,KAAK,EAAE;YAAE,OAAO,iBAAG,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACnD,IAAI,SAAS,CAAC,KAAK,EAAE;YACnB,OAAO,gBAAE,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;SAC5B;KACF;IACD,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;AACvB,CAAC;AAbD,8DAaC;AAEM,KAAK,UAAU,UAAU,CAC9B,GAAe,EACf,MAAmC;IAEnC,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AALD,gCAKC;AAEM,KAAK,UAAU,kBAAkB,CACtC,GAAe,EACf,MAAc,EACd,OAAqB,EACrB,aAAgC;IAEhC,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AAPD,gDAOC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/teamsfx-core",
-  "version": "1.10.0",
+  "version": "1.10.1-alpha.009656ebb.0",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "license": "MIT",
@@ -40,12 +40,12 @@
     "test:env-checker": "npx mocha \"tests/common/deps-checker/**/*.it.ts\"",
     "test:core:miniapp": "nyc mocha \"tests/core/miniapp.test.ts\"",
     "test:core:other": "nyc mocha \"tests/core/other.test.ts\"",
-    "test:workflow": "nyc mocha \"tests/core/workflow.test.ts\"",
+    "test:component": "nyc mocha \"tests/component/**/*.test.ts\"",
     "test:hosting": "nyc mocha \"tests/common/hosting/**/*.test.ts\"",
     "clean": "rm -rf build",
     "build": "rimraf build && npx tsc -p ./",
     "lint:fix": "eslint --fix \"src/**/*.ts\" \"tests/**/*.ts\"",
-    "postbuild": "node ./scripts/download-templates-zip.js $(git tag --list)",
+    "postbuild": "node ./scripts/download-templates-zip.js $(git tag -l templates*)",
     "prepublishOnly": "npm run test:unit -- check-coverage --lines 0 && npm run build",
     "package": "rimraf build && webpack --mode production --config ./webpack.config.js",
     "check-sensitive": "npx eslint --plugin 'no-secrets' --cache --ignore-pattern 'package.json' --ignore-pattern 'package-lock.json'",
@@ -68,7 +68,7 @@
     "@azure/storage-blob": "^12.7.0",
     "@dbpiper/timer": "1.0.0-beta.2",
     "@feathersjs/hooks": "^0.6.5",
-    "@microsoft/teamsfx-api": "^0.20.0",
+    "@microsoft/teamsfx-api": "0.20.1-alpha.009656ebb.0",
     "@npmcli/arborist": "^4.2.0",
     "@types/jwt-decode": "3.1.0",
     "@types/proper-lockfile": "^4.1.1",
@@ -189,7 +189,7 @@
     "resource/**/*",
     "templates/**/*"
   ],
-  "gitHead": "1ef790ce4465be168e8b56317bbd5a95b5959c4a",
+  "gitHead": "83ee30c3d1b75c9c2e212d5722fb66081bc59a3e",
   "publishConfig": {
     "access": "public"
   },

package/resource/package.nls.json

@@ -45,7 +45,7 @@
   "core.generateArmTemplate.failNotice": "'%s' Failed to create ARM template for required Azure services.",
   "core.updateArmTemplate.failNotice": "'%s' Failed to update ARM template for required Azure services.",
   "core.updateArmTemplate.successNotice": "The Azure resource template is updated based on your resource and capability selection.",
-  "core.localDebug.tenantConfirmNotice": "You already run local debug for the Teams app in another tenant '%s'. You can sign out %s and sign in with the matched M365 account to re-use the previous local debug resource. If you really want to switch tenant for local debug, you can delete the %s file and re-run local debug.",
+  "core.localDebug.tenantConfirmNotice": "You already run local debug for the Teams app in another tenant '%s'. You can sign out %s and sign in with the matched M365 account to re-use the previous local debug resource. If you really want to switch tenant for local debug, you can delete the local file(s) (%s) and re-run local debug.",
   "core.migrationToArmAndMultiEnv.Message": "Teams Toolkit will upgrade your project configuration files to support the latest features. The upgrade process will not change your custom code and create the backup files in case revert is needed.\nNotice this upgrade is a must-have to continue to use current version Teams Toolkit. If you are not ready to upgrade and want to continue to use the old version, please find Teams Toolkit in Extension and install the version <= 2.10.0",
   "core.migrationToArmAndMultiEnv.SuccessMessage": "Upgrade succeeded. Your project is upgraded to new configuration files.",
   "core.migrationToArmAndMultiEnv.ErrorMessage": "Upgrade Failed. Please check the error message in Output window to troubleshoot and fix. You can also click Learn More for the FAQ and how to upgrade manually.",
@@ -57,6 +57,7 @@
   "core.consolidateLocalRemoteWithAadManifest.SuccessMessage": "Congratulations! You have successfully upgraded your Teams App project structure. We have added config.local.json for local debug, manifest.template.json for both Teams app running locally and remotely and aad.template.json for AAD manifest template. And we have backed up localSettings.json, manifest.local.template.json, manifest.remote.template.json, projectSettings.json to .backup folder.",
   "core.aadManifestMigration.outputMsg": "Congratulations! AAD manifest has been added, and please start to use this file to customize your AAD App registration. We have added aad.template.json, updated your projectSettings.json file and backed up projectSettings.json to .backup folder.",
   "core.aadManifestMigration.SuccessMessage": "Congratulations! AAD manifest has been added, and please start to use this file to customize your AAD App registration. We have added aad.template.json, updated your projectSettings.json and backed up projectSettings.json to .backup folder. For more information about AAD manifest, please refer %s",
+  "core.aadManifestMigration.ParsePermissionsFailedWarning": "Cannot parse permissions.json file when migration, and please follow this link to update permissions in aad.template.json file if necessary: https://aka.ms/teamsfx-aad-manifest#customize-requiredresourceaccess",
   "core.projectVersionChecker.vscodeUseNewVersion":"Your Teams Toolkit extension is too old to support current project, please update the extension to latest version and try to open this project again",
   "core.projectVersionChecker.cliUseNewVersion": "[core] Your TeamsFx CLI is too old to support current project, please update to latest version using command below:\nnpm install -g @microsoft/teamsfx-cli@latest",
   "core.aad.includeAadQuestionTitle": "Whether to deploy aad manifest",
@@ -162,6 +163,7 @@
   "plugins.baseErrorMessage": "%s Suggestions: %s",
   "suggestions.retryTheCurrentStep": "Please retry the current step.",
   "plugins.appstudio.buildSucceedNotice": "Teams package is successfully built at [local address](%s).",
+  "plugins.appstudio.buildSucceedNotice.fallback": "Teams package is successfully built at %s.",
   "plugins.appstudio.publishTip": "Teams: Publish to Teams",
   "plugins.appstudio.whetherToDeployManifest": "Whether to deploy app manifest to Teams platform",
   "plugins.appstudio.validationFailedNotice": "Manifest Validation failed!",
@@ -205,6 +207,10 @@
   "plugins.bot.triggers.http-restify.description": "Restify Server",
   "plugins.bot.triggers.http-restify.detail": "A running restify server hosted on Azure App Service can listen to HTTP requests.",
   "plugins.bot.triggers.http-restify.label": "HTTP Trigger",
+  "plugins.bot.triggers.http-webapi.cliName": "http-webapi",
+  "plugins.bot.triggers.http-webapi.description": "Web API Server",
+  "plugins.bot.triggers.http-webapi.detail": "A running Web API server hosted on Azure App Service can listen to HTTP requests.",
+  "plugins.bot.triggers.http-webapi.label": "HTTP Trigger",
   "plugins.bot.triggers.timer-functions.cliName": "timer-functions",
   "plugins.bot.triggers.timer-functions.description": "Azure Functions",
   "plugins.bot.triggers.timer-functions.detail": "A running function hosted on Azure Functions can respond based on a specific schedule.",
@@ -869,7 +875,7 @@
   "depChecker.NodeNotSupported": "Node.js (@CurrentVersion) is not in the supported version list (@SupportedVersions).\n\nClick \"Learn more\" to learn more about the supported Node.js versions.\n\n(If you just installed Node.js (@SupportedVersions), restart Visual Studio Code for the change to take effect.)",
   "depChecker.dotnetNotFound": "Cannot find @NameVersion. For the details why .NET SDK is needed, refer to @HelpLink",
   "depChecker.depsNotFound": "Cannot find @SupportedPackages.\n\nTeams Toolkit requires these dependencies.\n\nClick \"Install\" to install @InstallPackages.",
-  "depChecker.linuxDepsNotFound": "Cannot find @SupportedPackages.\n\nTeams Toolkit requires these dependencies. \n\n(If you just installed @SupportedPackages, restart Visual Studio Code for the change to take effect.)",
+  "depChecker.linuxDepsNotFound": "Cannot find @SupportedPackages. Install @SupportedPackages manually and restart Visual Studio Code.",
   "depChecker.linuxDepsNotFoundHelpLinkMessage": "Cannot find @SupportedPackages.\n\nTeams Toolkit requires these dependencies.",
   "error.ActionNotExist": "Action not exist: %s"
 }

package/templates/bicep/azureFunction.config.module.bicep

@@ -0,0 +1,62 @@
+// Auto generated content, please customize files under provision folder
+
+@secure()
+param provisionParameters object
+param provisionOutputs object
+@secure()
+param currentAppSettings object
+
+var functionAppName = split({{azure-function.outputs.resourceId}}, '/')[8]
+{{#if (contains "aad" connections)}}
+var m365ClientId = provisionParameters['m365ClientId']
+  {{#if (contains "key-vault" connections) }}
+var m365ClientSecret = {{key-vault.outputs.m365ClientSecretReference}}
+  {{else}}
+var m365ClientSecret = provisionParameters['m365ClientSecret']
+  {{/if}}
+var m365TenantId = provisionParameters['m365TenantId']
+var m365OauthAuthorityHost = provisionParameters['m365OauthAuthorityHost']
+  {{#if (contains "bot-service" connections) }}
+var botId = provisionParameters['botAadAppClientId']
+    {{#if (contains "teams-tab" connections)}}
+var m365ApplicationIdUri = 'api://${ {{tabDomainVarName}} }/botid-${botId}'
+    {{else}}
+var m365ApplicationIdUri = 'api://botid-${botId}'
+    {{/if}}
+  {{else}}
+var m365ApplicationIdUri = 'api://${ {{tabDomainVarName}} }'
+  {{/if}}
+{{/if}}
+{{#if (contains "teams-bot" connections)}}
+var botAadAppClientId = provisionParameters['botAadAppClientId']
+  {{#if (contains "key-vault" connections) }}
+var botAadAppClientSecret = {{key-vault.outputs.botClientSecretReference}}
+  {{else}}
+var botAadAppClientSecret = provisionParameters['botAadAppClientSecret']
+  {{/if}}
+{{/if}}
+
+resource functionAppSettings 'Microsoft.Web/sites/config@2021-02-01' = {
+  name: '${functionAppName}/appsettings'
+  properties: union({
+    {{#if (contains "aad" connections)}}
+    INITIATE_LOGIN_ENDPOINT: uri({{azure-web-app.outputs.endpoint}}, 'auth-start.html') // The page is used to let users consent required OAuth permissions during bot SSO process
+    M365_AUTHORITY_HOST: m365OauthAuthorityHost // AAD authority host
+    M365_CLIENT_ID: m365ClientId // Client id of AAD application
+    M365_CLIENT_SECRET: m365ClientSecret // Client secret of AAD application
+    M365_TENANT_ID: m365TenantId // Tenant id of AAD application
+    M365_APPLICATION_ID_URI: m365ApplicationIdUri // Application ID URI of AAD application
+    {{/if}}
+    {{#if (contains "teams-bot" connections)}}
+    BOT_ID: botAadAppClientId // ID of your bot
+    BOT_PASSWORD: botAadAppClientSecret // Secret of your bot
+    {{/if}}
+    {{#if (contains "azure-sql" connections)}}
+    SQL_DATABASE_NAME: {{azure-sql.outputs.sqlDatabaseName}} // SQL database name
+    SQL_ENDPOINT: {{azure-sql.outputs.sqlEndpoint}} // SQL server endpoint
+    {{/if}}
+    {{#if (contains "identity" connections)}}
+    IDENTITY_ID: {{identity.outputs.identityClientId}} // User assigned identity id, the identity is used to access other Azure resources
+    {{/if}}
+  }, currentAppSettings)
+}

package/templates/bicep/azureFunction.config.orchestration.bicep

@@ -0,0 +1,12 @@
+// Get existing app settings for merge
+var currentAppSettings = list('${provisionOutputs.azureFunctionOutput.value.resourceId}/config/appsettings', '2021-02-01').properties
+
+// Merge TeamsFx configurations to Azure Function App
+module teamsFxAzureFunctionConfig './teamsFx/azureFunctionConfig.bicep' = {
+  name: 'teamsFxAzureFunctionConfig'
+  params: {
+    provisionParameters: provisionParameters
+    provisionOutputs: provisionOutputs
+    currentAppSettings: currentAppSettings
+  }
+}

package/templates/bicep/azureFunction.parameters.json

@@ -0,0 +1,4 @@
+{
+  "botAadAppClientId": "{{state.bot-service.botId}}",
+  "botAadAppClientSecret": "{{state.bot-service.botPassword}}"
+}

package/templates/bicep/azureFunction.provision.module.bicep

@@ -0,0 +1,89 @@
+@secure()
+param provisionParameters object
+
+var resourceBaseName = provisionParameters.resourceBaseName
+var serverfarmsName = contains(provisionParameters, 'functionServerfarmsName') ? provisionParameters['botServerfarmsName'] : '${resourceBaseName}bot' // Try to read name for App Service Plan from parameters
+var functionAppSKU = contains(provisionParameters, 'functionAppSKU') ? provisionParameters['botfunctionAppSKU'] : 'B1' // Try to read SKU for Azure Web App from parameters
+var functionAppName = contains(provisionParameters, 'SitesName') ? provisionParameters['botSitesName'] : '${resourceBaseName}bot' // Try to read name for Azure Web App from parameters
+var storageName = contains(provisionParameters, 'StorageName') ? provisionParameters['botStorageName'] : '${resourceBaseName}bot' // Try to read name for Azure Storage from parameters
+var storageSku = contains(provisionParameters, 'StorageSku') ? provisionParameters['botStorageSku'] : 'Standard_LRS' // Try to read SKU for Azure Storage from parameters
+
+// Compute resources for your Web App
+resource serverfarm 'Microsoft.Web/serverfarms@2021-02-01' = {
+  kind: 'functionapp'
+  location: resourceGroup().location
+  name: serverfarmsName
+  sku: {
+    name: functionAppSKU
+  }
+}
+
+// Azure Function that host your app
+resource functionApp 'Microsoft.Web/sites@2021-02-01' = {
+  kind: 'functionapp'
+  location: resourceGroup().location
+  name: functionAppName
+  properties: {
+    serverFarmId: serverfarm.id
+    httpsOnly: true
+    siteConfig: {
+      alwaysOn: true
+      appSettings: [
+        {
+          name: 'AzureWebJobsDashboard'
+          value: 'DefaultEndpointsProtocol=https;AccountName=${storage.name};AccountKey=${listKeys(storage.id, storage.apiVersion).keys[0].value};EndpointSuffix=${environment().suffixes.storage}' // Azure Function internal setting
+        }
+        {
+          name: 'AzureWebJobsStorage'
+          value: 'DefaultEndpointsProtocol=https;AccountName=${storage.name};AccountKey=${listKeys(storage.id, storage.apiVersion).keys[0].value};EndpointSuffix=${environment().suffixes.storage}' // Azure Function internal setting
+        }
+        {
+          name: 'FUNCTIONS_EXTENSION_VERSION'
+          value: '~4' // Use Azure Function runtime v4
+        }
+        {
+          name: 'FUNCTIONS_WORKER_RUNTIME'
+          value: 'node' // Set runtime to NodeJS
+        }
+        {
+          name: 'WEBSITE_CONTENTAZUREFILECONNECTIONSTRING'
+          value: 'DefaultEndpointsProtocol=https;AccountName=${storage.name};AccountKey=${listKeys(storage.id, storage.apiVersion).keys[0].value};EndpointSuffix=${environment().suffixes.storage}' // Azure Function internal setting
+        }
+        {
+          name: 'WEBSITE_RUN_FROM_PACKAGE'
+          value: '1' // Run Azure Function from a package file
+        }
+        {
+          name: 'WEBSITE_NODE_DEFAULT_VERSION'
+          value: '~16' // Set NodeJS version to 16.x
+        }
+        {
+          name: 'RUNNING_ON_AZURE'
+          value: '1'
+        }
+        {
+          name: 'SCM_ZIPDEPLOY_DONOT_PRESERVE_FILETIME'
+          value: '1' // Zipdeploy files will always be updated. Detail: https://aka.ms/teamsfx-zipdeploy-donot-preserve-filetime
+        }
+      ]
+      ftpsState: 'FtpsOnly'
+    }
+  }
+}
+
+// Azure Storage is required when creating Azure Function instance
+resource storage 'Microsoft.Storage/storageAccounts@2021-06-01' = {
+  name: storageName
+  kind: 'StorageV2'
+  location: resourceGroup().location
+  sku: {
+    name: storageSku // You can follow https://aka.ms/teamsfx-bicep-add-param-tutorial to add functionStorageSku property to provisionParameters to override the default value "Standard_LRS".
+  }
+}
+
+output sku string = functionAppSKU
+output appName string = functionAppName
+output domain string = functionApp.properties.defaultHostName
+output appServicePlanName string = serverfarmsName
+output resourceId string = functionApp.id
+output endpoint string = 'https://${functionApp.properties.defaultHostName}'

package/templates/bicep/azureFunction.provision.orchestration.bicep

@@ -0,0 +1,17 @@
+// Resources Azure Function App
+module azureFunctionProvision './provision/azureFunction.bicep' = {
+  name: 'azureFunctionProvision'
+  params: {
+    provisionParameters: provisionParameters
+  }
+}
+
+output azureFunctionOutput object = {
+  teamsFxPluginId: 'azure-function'
+  sku: azureFunctionProvision.outputs.sku
+  appName: azureFunctionProvision.outputs.appName
+  domain: azureFunctionProvision.outputs.domain
+  appServicePlanName: azureFunctionProvision.outputs.appServicePlanName
+  resourceId: azureFunctionProvision.outputs.resourceId
+  endpoint: azureFunctionProvision.outputs.endpoint
+}

package/templates/bicep/azureWebApp.provision.module.bicep

@@ -5,7 +5,7 @@ var resourceBaseName = provisionParameters.resourceBaseName
 var serverfarmsName = contains(provisionParameters, 'webAppServerfarmsName') ? provisionParameters['webAppServerfarmsName'] : '${resourceBaseName}webApp' // Try to read name for App Service Plan from parameters
 var webAppSKU = contains(provisionParameters, 'webAppSKU') ? provisionParameters['webAppSKU'] : 'F1' // Try to read SKU for Azure Web App from parameters
 var webAppName = contains(provisionParameters, 'webAppSitesName') ? provisionParameters['webAppSitesName'] : '${resourceBaseName}webApp' // Try to read name for Azure Web App from parameters
- 
+
 // Compute resources for your Web App
 resource serverfarm 'Microsoft.Web/serverfarms@2021-02-01' = {
   kind: 'app'

package/templates/plugins/resource/hosting/bicep/botservice/provision.template.bicep

@@ -1,5 +1,5 @@
 // Resources for bot
-module botProvision '\{{fx-resource-bot.Provision.botservice.path}}' = {
+module botProvision './provision/botservice.bicep' = {
   name: 'botProvision'
   params: {
     provisionParameters: provisionParameters

package/templates/plugins/resource/hosting/bicep/function/config.template.bicep

@@ -0,0 +1,12 @@
+// Get existing app settings for merge
+var {{moduleName}}CurrentAppSettings = list('${ provisionOutputs.{{moduleName}}Output.value.resourceId }/config/appsettings', '2021-02-01').properties
+
+// Merge TeamsFx configurations to Function resources
+module teamsFx{{moduleNameCapitalized}}Config './teamsFx/{{moduleName}}.bicep' = {
+  name: 'addTeamsFx{{moduleNameCapitalized}}Configuration'
+  params: {
+    provisionParameters: provisionParameters
+    provisionOutputs: provisionOutputs
+    currentAppSettings: {{moduleName}}CurrentAppSettings
+  }
+}

package/templates/plugins/resource/hosting/bicep/{botFunction/botFunctionConfiguration.template.bicep → function/functionConfiguration.template.bicep}

@@ -6,7 +6,7 @@ param provisionOutputs object
 @secure()
 param currentAppSettings object
 
-var functionName = split(provisionOutputs.botFunctionOutput.value.botWebAppResourceId, '/')[8]
+var functionName = split(provisionOutputs.{{moduleName}}Output.value.resourceId, '/')[8]
 
 {{#if (contains "fx-resource-aad-app-for-teams" plugins)}}
 var m365ClientId = provisionParameters['m365ClientId']
@@ -35,7 +35,7 @@ var botAadAppClientSecret = provisionParameters['botAadAppClientSecret']
   {{/if}}
 {{/if}}
 
-resource botFunctionSettings 'Microsoft.Web/sites/config@2021-02-01' = {
+resource {{moduleName}}Settings 'Microsoft.Web/sites/config@2021-02-01' = {
   name: '${functionName}/appsettings'
   properties: union({
 {{#if (contains "fx-resource-aad-app-for-teams" plugins)}}

package/templates/plugins/resource/hosting/bicep/{botFunction/botFunctionProvision.template.bicep → function/functionProvision.template.bicep}

@@ -3,11 +3,11 @@ param provisionParameters object
 param userAssignedIdentityId string
 
 var resourceBaseName = provisionParameters.resourceBaseName
-var serverfarmsName = contains(provisionParameters, 'botServerfarmsName') ? provisionParameters['botServerfarmsName'] : '${resourceBaseName}bot' // Try to read name for App Service Plan from parameters
-var functionSKU = contains(provisionParameters, 'botFunctionAppSKU') ? provisionParameters['botFunctionAppSKU'] : 'B1' // Try to read SKU for Azure Web App from parameters
-var functionAppName = contains(provisionParameters, 'botSitesName') ? provisionParameters['botSitesName'] : '${resourceBaseName}bot' // Try to read name for Azure Web App from parameters
-var storageName = contains(provisionParameters, 'botStorageName') ? provisionParameters['botStorageName'] : '${resourceBaseName}bot' // Try to read name for Azure Storage from parameters
-var storageSku = contains(provisionParameters, 'botStorageSku') ? provisionParameters['botStorageSku'] : 'Standard_LRS' // Try to read SKU for Azure Storage from parameters
+var serverfarmsName = contains(provisionParameters, '{{moduleAlias}}ServerfarmsName') ? provisionParameters['{{moduleAlias}}ServerfarmsName'] : '${resourceBaseName}{{moduleAlias}}' // Try to read name for App Service Plan from parameters
+var functionSKU = contains(provisionParameters, '{{moduleName}}AppSKU') ? provisionParameters['{{moduleName}}AppSKU'] : 'B1' // Try to read SKU for Azure Functions from parameters
+var functionAppName = contains(provisionParameters, '{{moduleAlias}}SitesName') ? provisionParameters['{{moduleAlias}}SitesName'] : '${resourceBaseName}{{moduleAlias}}' // Try to read name for Azure Functions from parameters
+var storageName = contains(provisionParameters, '{{moduleAlias}}StorageName') ? provisionParameters['{{moduleAlias}}StorageName'] : '${resourceBaseName}{{moduleAlias}}' // Try to read name for Azure Storage from parameters
+var storageSku = contains(provisionParameters, '{{moduleAlias}}StorageSku') ? provisionParameters['{{moduleAlias}}StorageSku'] : 'Standard_LRS' // Try to read SKU for Azure Storage from parameters
 
 // Compute resources for your Function App
 resource serverfarm 'Microsoft.Web/serverfarms@2021-02-01' = {
@@ -29,7 +29,7 @@ resource storage 'Microsoft.Storage/storageAccounts@2021-06-01' = {
   }
 }
 
-// Function App that hosts your bot
+// Function App
 resource functionApp 'Microsoft.Web/sites@2021-02-01' = {
   kind: 'functionapp'
   location: resourceGroup().location
@@ -53,10 +53,22 @@ resource functionApp 'Microsoft.Web/sites@2021-02-01' = {
           name: 'FUNCTIONS_EXTENSION_VERSION'
           value: '~4' // Use Azure Functions runtime v4
         }
+        {{#if (contains "node" configs)}}
         {
           name: 'FUNCTIONS_WORKER_RUNTIME'
           value: 'node' // Set runtime to NodeJS
         }
+        {
+          name: 'WEBSITE_NODE_DEFAULT_VERSION'
+          value: '~16' // Set NodeJS version to 16.x
+        }
+        {{/if}}
+        {{#if (contains "dotnet" configs)}}
+        {
+          name: 'FUNCTIONS_WORKER_RUNTIME'
+          value: 'dotnet' // Set runtime to .NET
+        }
+        {{/if}}
         {
           name: 'WEBSITE_CONTENTAZUREFILECONNECTIONSTRING'
           value: 'DefaultEndpointsProtocol=https;AccountName=${storage.name};AccountKey=${listKeys(storage.id, storage.apiVersion).keys[0].value};EndpointSuffix=${environment().suffixes.storage}' // Azure Functions internal setting
@@ -65,12 +77,6 @@ resource functionApp 'Microsoft.Web/sites@2021-02-01' = {
           name: 'WEBSITE_RUN_FROM_PACKAGE'
           value: '1' // Run Azure Functions from a package file
         }
-        {{#if (contains "node" configs)}}
-        {
-          name: 'WEBSITE_NODE_DEFAULT_VERSION'
-          value: '~16' // Set NodeJS version to 16.x
-        }
-        {{/if}}
         {{#if (contains "running-on-azure" configs)}}
         {
           name: 'RUNNING_ON_AZURE'

package/templates/plugins/resource/hosting/bicep/function/provision.template.bicep

@@ -0,0 +1,19 @@
+module {{moduleName}}Provision './provision/{{moduleName}}.bicep' = {
+  name: '{{moduleName}}Provision'
+  params: {
+    provisionParameters: provisionParameters
+    {{#if (contains "fx-resource-identity" plugins)}}
+    userAssignedIdentityId: \{{fx-resource-identity.References.identityResourceId}}
+    {{/if}}
+  }
+}
+
+output {{moduleName}}Output object = {
+  teamsFxPluginId: '{{pluginId}}'
+  skuName: {{moduleName}}Provision.outputs.functionSKU
+  siteName: {{moduleName}}Provision.outputs.functionName
+  validDomain: {{moduleName}}Provision.outputs.domain
+  appServicePlanName: {{moduleName}}Provision.outputs.appServicePlanName
+  resourceId: {{moduleName}}Provision.outputs.functionResourceId
+  siteEndpoint: {{moduleName}}Provision.outputs.functionEndpoint
+}

package/templates/plugins/resource/hosting/bicep/webapp/config.template.bicep

@@ -1,8 +1,8 @@
 // Get existing app settings for merge
-var botCurrentAppSettings = list('${provisionOutputs.webAppOutput.value.botWebAppResourceId}/config/appsettings', '2021-02-01').properties
+var botCurrentAppSettings = list('${provisionOutputs.webAppOutput.value.resourceId}/config/appsettings', '2021-02-01').properties
 
 // Merge TeamsFx configurations to Bot resources
-module teamsFxBotConfig '\{{PluginIdPlaceholder.Configuration.webapp.path}}' = {
+module teamsFxBotConfig './teamsFx/webapp.bicep' = {
   name: 'addTeamsFxBotConfiguration'
   params: {
     provisionParameters: provisionParameters

package/templates/plugins/resource/hosting/bicep/webapp/provision.template.bicep

@@ -1,5 +1,5 @@
 // Resources for bot
-module webAppProvision '\{{PluginIdPlaceholder.Provision.webapp.path}}' = {
+module webAppProvision './provision/webapp.bicep' = {
   name: 'webAppProvision'
   params: {
     provisionParameters: provisionParameters
@@ -10,11 +10,11 @@ module webAppProvision '\{{PluginIdPlaceholder.Provision.webapp.path}}' = {
 }
 
 output webAppOutput object = {
-  teamsFxPluginId: 'PluginIdPlaceholder'
+  teamsFxPluginId: '{{pluginId}}'
   skuName: webAppProvision.outputs.webAppSKU
   siteName: webAppProvision.outputs.webAppName
   validDomain: webAppProvision.outputs.webAppDomain
   appServicePlanName: webAppProvision.outputs.appServicePlanName
-  botWebAppResourceId: webAppProvision.outputs.webAppResourceId
+  resourceId: webAppProvision.outputs.webAppResourceId
   siteEndpoint: webAppProvision.outputs.webAppEndpoint
 }

package/templates/plugins/resource/hosting/bicep/webapp/webappConfiguration.template.bicep

@@ -6,7 +6,7 @@ param provisionOutputs object
 @secure()
 param currentAppSettings object
 
-var botWebAppName = split(provisionOutputs.webAppOutput.value.botWebAppResourceId, '/')[8]
+var botWebAppName = split(provisionOutputs.webAppOutput.value.resourceId, '/')[8]
 
 {{#if (contains "fx-resource-aad-app-for-teams" plugins)}}
 var m365ClientId = provisionParameters['m365ClientId']

package/templates/plugins/resource/hosting/bicep/webapp/webappProvision.template.bicep

@@ -29,15 +29,20 @@ resource webApp 'Microsoft.Web/sites@2021-02-01' = {
     siteConfig: {
       alwaysOn: true
       appSettings: [
-        {
-          name: 'SCM_DO_BUILD_DURING_DEPLOYMENT'
-          value: 'true' // Execute build steps on your site during deployment
-        }
         {{#if (contains "node" configs)}}
         {
           name: 'WEBSITE_NODE_DEFAULT_VERSION'
           value: '~14' // Set NodeJS version to 14.x for your site
         }
+        {
+          name: 'SCM_SCRIPT_GENERATOR_ARGS'
+          value: '--node' // Register as node server
+        }
+        {{else}}
+        {
+          name: 'SCM_DO_BUILD_DURING_DEPLOYMENT'
+          value: 'true' // Execute build steps on your site during deployment
+        }
         {{/if}}
         {
           name: 'RUNNING_ON_AZURE'

package/build/component/botCode.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"botCode.d.ts","sourceRoot":"","sources":["../../src/component/botCode.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,OAAO,EAEP,MAAM,EACN,EAAE,EACF,MAAM,EACN,SAAS,EAET,YAAY,EAGZ,kBAAkB,EAClB,qBAAqB,EACtB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,kBAAkB,CAAC;AAa1B;;GAEG;AACH,qBACa,eAAgB,YAAW,kBAAkB;IACxD,QAAQ,CAAC,IAAI,UAAU;IACvB,IAAI,SAAc;IAClB,QAAQ,CACN,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,qBAAqB,GAC5B,YAAY,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IA6DpD,KAAK,CACH,OAAO,EAAE,EAAE,CAAC,OAAO,EACnB,MAAM,EAAE,qBAAqB,GAC5B,YAAY,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;CAoCrD;AAED,wBAAgB,gBAAgB,CAAC,mBAAmB,EAAE,MAAM,GAAG,MAAM,CAYpE"}