@microsoft/teamsfx-core 2.0.1 → 2.0.2-alpha.09fb224aa.0

package/build/core/question.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.confirmManifestNode = exports.selectEnvNode = exports.selectTeamsAppPackageQuestion = exports.selectTeamsAppManifestQuestion = exports.selectAadAppManifestQuestion = exports.createCapabilityForOfficeAddin = exports.CreateNewOfficeAddinOption = exports.botOptionItem = exports.BotIdsQuestion = exports.tabWebsiteUrlOptionItem = exports.tabContentUrlOptionItem = exports.tabsWebsitetUrlQuestion = exports.tabsContentUrlQuestion = exports.defaultTabLocalHostUrl = exports.ExistingTabEndpointQuestion = exports.SampleSelect = exports.getCreateNewOrFromSampleQuestion = exports.getRuntimeQuestion = exports.ScratchOptionNo = exports.ScratchOptionYes = exports.RuntimeOptionDotNet = exports.RuntimeOptionNodeJs = exports.ScratchOptionNoVSC = exports.ScratchOptionYesVSC = exports.QuestionNewResourceGroupLocation = exports.QuestionNewResourceGroupName = exports.newResourceGroupNameQuestion = exports.QuestionSelectResourceGroup = exports.QuestionSelectSourceEnvironment = exports.getQuestionNewTargetEnvironmentName = exports.QuestionSelectTargetEnvironment = exports.onChangeSelectionForCapabilities = exports.validateCapabilities = exports.getOutlookAddinTypeProjectQuestionNode = exports.getMessageExtensionTypeProjectQuestionNode = exports.getTabTypeProjectQuestionNode = exports.getBotProjectQuestionNode = exports.createNewProjectQuestionWith2Layers = exports.createCapabilityQuestionPreview = exports.createCapabilityForDotNet = exports.createCapabilityQuestion = exports.validateConflict = exports.handleSelectionConflict = exports.ProgrammingLanguageQuestion = exports.ProgrammingLanguageQuestionForDotNet = exports.QuestionRootFolder = exports.DefaultAppNameFunc = exports.createAppNameQuestion = exports.ProjectNamePattern = exports.CoreQuestionNames = void 0;
-exports.selectM365HostQuestion = exports.validateAadManifestContainsPlaceholder = exports.getQuestionForDeployAadManifest = void 0;
+exports.selectM365HostQuestion = exports.validateAadManifestContainsPlaceholder = exports.getQuestionForDeployAadManifest = exports.selectEnvNode = exports.selectTeamsAppPackageQuestion = exports.selectTeamsAppManifestQuestion = exports.selectAadAppManifestQuestion = exports.createCapabilityForOfficeAddin = exports.CreateNewOfficeAddinOption = exports.BotIdsQuestion = exports.tabsWebsitetUrlQuestion = exports.tabsContentUrlQuestion = exports.SampleSelect = exports.getCreateNewOrFromSampleQuestion = exports.getRuntimeQuestion = exports.ScratchOptionNo = exports.ScratchOptionYes = exports.RuntimeOptionDotNet = exports.RuntimeOptionNodeJs = exports.ScratchOptionNoVSC = exports.ScratchOptionYesVSC = exports.QuestionNewResourceGroupLocation = exports.newResourceGroupNameQuestion = exports.QuestionSelectResourceGroup = exports.QuestionSelectSourceEnvironment = exports.getQuestionNewTargetEnvironmentName = exports.getOutlookAddinTypeProjectQuestionNode = exports.getMessageExtensionTypeProjectQuestionNode = exports.getTabTypeProjectQuestionNode = exports.getBotProjectQuestionNode = exports.createNewProjectQuestionWith2Layers = exports.createCapabilityQuestionPreview = exports.createCapabilityForDotNet = exports.ProgrammingLanguageQuestion = exports.ProgrammingLanguageQuestionForDotNet = exports.QuestionRootFolder = exports.createAppNameQuestion = exports.ProjectNamePattern = exports.CoreQuestionNames = void 0;
 const tslib_1 = require("tslib");
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
@@ -14,11 +13,9 @@ const path = tslib_1.__importStar(require("path"));
  */
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const constants_1 = require("../common/constants");
-const featureFlags_1 = require("../common/featureFlags");
 const localizeUtils_1 = require("../common/localizeUtils");
 const constants_2 = require("../common/m365/constants");
 const samples_1 = require("../common/samples");
-const tools_1 = require("../common/tools");
 const constants_3 = require("../component/constants");
 const developerPortalScaffoldUtils_1 = require("../component/developerPortalScaffoldUtils");
 const question_1 = require("../component/generator/officeAddin/question");
@@ -26,19 +23,15 @@ const environment_1 = require("./environment");
 var CoreQuestionNames;
 (function (CoreQuestionNames) {
     CoreQuestionNames["AppName"] = "app-name";
-    CoreQuestionNames["DefaultAppNameFunc"] = "default-app-name-func";
     CoreQuestionNames["Folder"] = "folder";
     CoreQuestionNames["ProjectPath"] = "projectPath";
     CoreQuestionNames["ProgrammingLanguage"] = "programming-language";
     CoreQuestionNames["ProjectType"] = "project-type";
     CoreQuestionNames["Capabilities"] = "capabilities";
     CoreQuestionNames["Features"] = "features";
-    CoreQuestionNames["Solution"] = "solution";
     CoreQuestionNames["CreateFromScratch"] = "scratch";
     CoreQuestionNames["Runtime"] = "runtime";
     CoreQuestionNames["Samples"] = "samples";
-    CoreQuestionNames["Stage"] = "stage";
-    CoreQuestionNames["SubStage"] = "substage";
     CoreQuestionNames["SourceEnvName"] = "sourceEnvName";
     CoreQuestionNames["TargetEnvName"] = "targetEnvName";
     CoreQuestionNames["TargetResourceGroupName"] = "targetResourceGroupName";
@@ -55,11 +48,13 @@ var CoreQuestionNames;
     CoreQuestionNames["LocalTeamsAppManifestFilePath"] = "local-manifest-path";
     CoreQuestionNames["AadAppManifestFilePath"] = "manifest-file-path";
     CoreQuestionNames["TeamsAppPackageFilePath"] = "app-package-file-path";
+    CoreQuestionNames["ValidateMethod"] = "validate-method";
     CoreQuestionNames["ConfirmManifest"] = "confirmManifest";
     CoreQuestionNames["ConfirmLocalManifest"] = "confirmLocalManifest";
     CoreQuestionNames["OutputZipPathParamName"] = "output-zip-path";
     CoreQuestionNames["OutputManifestParamName"] = "output-manifest-path";
     CoreQuestionNames["M365Host"] = "m365-host";
+    CoreQuestionNames["BotHostTypeTrigger"] = "bot-host-type-trigger";
 })(CoreQuestionNames = exports.CoreQuestionNames || (exports.CoreQuestionNames = {}));
 exports.ProjectNamePattern = '^(?=(.*[\\da-zA-Z]){2})[a-zA-Z][^"<>:\\?/*&|\u0000-\u001F]*[^"\\s.<>:\\?/*&|\u0000-\u001F]$';
 function createAppNameQuestion(defaultAppName, validateProjectPathExistence = true) {
@@ -101,23 +96,6 @@ function createAppNameQuestion(defaultAppName, validateProjectPathExistence = tr
     return question;
 }
 exports.createAppNameQuestion = createAppNameQuestion;
-exports.DefaultAppNameFunc = {
-    type: "func",
-    name: CoreQuestionNames.DefaultAppNameFunc,
-    func: (inputs) => {
-        var _a;
-        const appName = path.basename((_a = inputs.projectPath) !== null && _a !== void 0 ? _a : "");
-        const schema = {
-            pattern: exports.ProjectNamePattern,
-            maxLength: 30,
-        };
-        const validateResult = jsonschema.validate(appName, schema);
-        if (validateResult.errors && validateResult.errors.length > 0) {
-            return undefined;
-        }
-        return appName;
-    },
-};
 function QuestionRootFolder() {
     return {
         type: "folder",
@@ -157,131 +135,28 @@ exports.ProgrammingLanguageQuestion = {
     },
     skipSingleOption: true,
     default: (inputs) => {
-        if (featureFlags_1.isPreviewFeaturesEnabled()) {
-            const capability = inputs[CoreQuestionNames.Capabilities];
-            if (capability && capability === constants_3.TabSPFxItem().id) {
-                return "typescript";
-            }
-            const feature = inputs[CoreQuestionNames.Features];
-            if (feature && feature === constants_3.TabSPFxItem().id) {
-                return "typescript";
-            }
+        const capability = inputs[CoreQuestionNames.Capabilities];
+        if (capability && capability === constants_3.TabSPFxItem().id) {
+            return "typescript";
         }
-        else {
-            const capabilities = inputs[CoreQuestionNames.Capabilities];
-            if (capabilities && capabilities.includes && capabilities.includes(constants_3.TabSPFxItem().id))
-                return "typescript";
+        const feature = inputs[CoreQuestionNames.Features];
+        if (feature && feature === constants_3.TabSPFxItem().id) {
+            return "typescript";
         }
         return "javascript";
     },
     placeholder: (inputs) => {
-        if (featureFlags_1.isPreviewFeaturesEnabled()) {
-            const capability = inputs[CoreQuestionNames.Capabilities];
-            if (capability && capability === constants_3.TabSPFxItem().id) {
-                return localizeUtils_1.getLocalizedString("core.ProgrammingLanguageQuestion.placeholder.spfx");
-            }
-            const feature = inputs[CoreQuestionNames.Features];
-            if (feature && feature === constants_3.TabSPFxItem().id) {
-                return localizeUtils_1.getLocalizedString("core.ProgrammingLanguageQuestion.placeholder.spfx");
-            }
+        const capability = inputs[CoreQuestionNames.Capabilities];
+        if (capability && capability === constants_3.TabSPFxItem().id) {
+            return localizeUtils_1.getLocalizedString("core.ProgrammingLanguageQuestion.placeholder.spfx");
         }
-        else {
-            const capabilities = inputs[CoreQuestionNames.Capabilities];
-            if (capabilities && capabilities.includes && capabilities.includes(constants_3.TabSPFxItem().id))
-                return localizeUtils_1.getLocalizedString("core.ProgrammingLanguageQuestion.placeholder.spfx");
+        const feature = inputs[CoreQuestionNames.Features];
+        if (feature && feature === constants_3.TabSPFxItem().id) {
+            return localizeUtils_1.getLocalizedString("core.ProgrammingLanguageQuestion.placeholder.spfx");
         }
         return localizeUtils_1.getLocalizedString("core.ProgrammingLanguageQuestion.placeholder");
     },
 };
-function hasCapability(items, optionItem) {
-    return items.includes(optionItem.id) || items.includes(optionItem.label);
-}
-function setIntersect(set1, set2) {
-    return new Set([...set1].filter((item) => set2.has(item)));
-}
-function setDiff(set1, set2) {
-    return new Set([...set1].filter((item) => !set2.has(item)));
-}
-function setUnion(...sets) {
-    return new Set([].concat(...sets.map((set) => [...set])));
-}
-// Each set is mutually exclusive. Handle conflict by removing items conflicting with the newly added items.
-// Assuming intersection of all sets are empty sets and no conflicts in newly added items.
-//
-// For example: sets = [[1, 2], [3, 4]], previous = [1, 2, 5], current = [1, 2, 4, 5].
-// So the newly added one is [4]. Remove all items from `current` that conflict with [4].
-// Result = [4, 5].
-function handleSelectionConflict(sets, previous, current) {
-    const allSets = setUnion(...sets);
-    const addedItems = setDiff(current, previous);
-    for (const set of sets) {
-        if (setIntersect(set, addedItems).size > 0) {
-            return setUnion(setIntersect(set, current), setDiff(current, allSets));
-        }
-    }
-    // If newly added items are not in any sets, do nothing.
-    return current;
-}
-exports.handleSelectionConflict = handleSelectionConflict;
-function validateConflict(sets, current) {
-    const all = setUnion(...sets);
-    const currentIntersectAll = setIntersect(all, current);
-    for (const set of sets) {
-        if (setIntersect(set, current).size > 0) {
-            const currentIntersectSet = setIntersect(set, current);
-            if (currentIntersectSet.size < currentIntersectAll.size) {
-                return localizeUtils_1.getLocalizedString("core.capability.validation", `[${Array.from(current).join(", ")}]`, Array.from(sets)
-                    .map((set) => `[${Array.from(set).join(", ")}]`)
-                    .join(", "));
-            }
-        }
-    }
-    return undefined;
-}
-exports.validateConflict = validateConflict;
-function createCapabilityQuestion() {
-    let staticOptions;
-    if (featureFlags_1.isBotNotificationEnabled()) {
-        // new capabilities question order
-        const newBots = [
-            constants_3.NotificationOptionItem(),
-            constants_3.CommandAndResponseOptionItem(),
-            constants_3.WorkflowOptionItem(),
-        ];
-        staticOptions = [
-            ...newBots,
-            ...(tools_1.isExistingTabAppEnabled() ? [constants_3.ExistingTabOptionItem()] : []),
-            ...(tools_1.isAadManifestEnabled() ? [constants_3.TabNonSsoItem()] : []),
-            ...[constants_3.TabNewUIOptionItem(), constants_3.TabSPFxNewUIItem(), constants_3.MessageExtensionNewUIItem()],
-            ...(tools_1.isM365AppEnabled() ? [constants_3.M365SsoLaunchPageOptionItem(), constants_3.M365SearchAppOptionItem()] : []),
-        ];
-    }
-    else {
-        staticOptions = [
-            ...[constants_3.TabOptionItem(), constants_3.BotOptionItem(), constants_3.MessageExtensionItem(), constants_3.TabSPFxItem()],
-            ...(tools_1.isAadManifestEnabled() ? [constants_3.TabNonSsoItem()] : []),
-            ...(tools_1.isExistingTabAppEnabled() ? [constants_3.ExistingTabOptionItem()] : []),
-            ...(tools_1.isM365AppEnabled() ? [constants_3.M365SsoLaunchPageOptionItem(), constants_3.M365SearchAppOptionItem()] : []),
-        ];
-    }
-    return {
-        name: CoreQuestionNames.Capabilities,
-        title: featureFlags_1.isBotNotificationEnabled()
-            ? localizeUtils_1.getLocalizedString("core.createCapabilityQuestion.titleNew")
-            : localizeUtils_1.getLocalizedString("core.createCapabilityQuestion.title"),
-        type: "multiSelect",
-        staticOptions: staticOptions,
-        default: featureFlags_1.isBotNotificationEnabled()
-            ? [constants_3.CommandAndResponseOptionItem().id]
-            : [constants_3.TabOptionItem().id],
-        placeholder: localizeUtils_1.getLocalizedString("core.createCapabilityQuestion.placeholder"),
-        validation: {
-            validFunc: validateCapabilities,
-        },
-        onDidChangeSelection: onChangeSelectionForCapabilities,
-    };
-}
-exports.createCapabilityQuestion = createCapabilityQuestion;
 function createCapabilityForDotNet() {
     const staticOptions = [
         constants_3.NotificationOptionItem(),
@@ -321,16 +196,13 @@ function createCapabilityQuestionPreview(inputs) {
     const staticOptions = [
         ...newBots,
         ...newTabs,
-        constants_3.TabSPFxNewUIItem(),
+        constants_3.TabSPFxItem(),
         constants_3.TabNonSsoItem(),
-        constants_3.BotNewUIOptionItem(),
+        constants_3.BotOptionItem(),
         constants_3.MessageExtensionNewUIItem(),
         constants_3.M365SsoLaunchPageOptionItem(),
         constants_3.M365SearchAppOptionItem(),
     ];
-    if (tools_1.isExistingTabAppEnabled()) {
-        staticOptions.splice(newBots.length, 0, constants_3.ExistingTabOptionItem());
-    }
     return {
         name: CoreQuestionNames.Capabilities,
         title: localizeUtils_1.getLocalizedString("core.createCapabilityQuestion.titleNew"),
@@ -362,7 +234,7 @@ function createNewProjectQuestionWith2Layers(inputs) {
 exports.createNewProjectQuestionWith2Layers = createNewProjectQuestionWith2Layers;
 function getBotProjectQuestionNode(inputs) {
     const staticOptions = [
-        constants_3.BotNewUIOptionItem(),
+        constants_3.BotOptionItem(),
         constants_3.NotificationOptionItem(),
         constants_3.CommandAndResponseOptionItem(),
         constants_3.WorkflowOptionItem(),
@@ -388,12 +260,12 @@ function getBotProjectQuestionNode(inputs) {
     };
 }
 exports.getBotProjectQuestionNode = getBotProjectQuestionNode;
-function getTabTypeProjectQuestionNode(inputs) {
+function getTabTypeProjectQuestionNode() {
     const staticOptions = [
         constants_3.TabNonSsoItem(),
         constants_3.M365SsoLaunchPageOptionItem(),
         constants_3.DashboardOptionItem(),
-        constants_3.TabSPFxNewUIItem(),
+        constants_3.TabSPFxItem(),
     ];
     return {
         name: CoreQuestionNames.Capabilities,
@@ -405,8 +277,12 @@ function getTabTypeProjectQuestionNode(inputs) {
     };
 }
 exports.getTabTypeProjectQuestionNode = getTabTypeProjectQuestionNode;
-function getMessageExtensionTypeProjectQuestionNode(inputs) {
-    const staticOptions = [constants_3.M365SearchAppOptionItem(), constants_3.MessageExtensionNewUIItem()];
+function getMessageExtensionTypeProjectQuestionNode() {
+    const staticOptions = [
+        constants_3.LinkUnfurlingItem(),
+        constants_3.M365SearchAppOptionItem(),
+        constants_3.MessageExtensionNewUIItem(),
+    ];
     return {
         name: CoreQuestionNames.Capabilities,
         title: localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.messageExtension.title"),
@@ -417,7 +293,7 @@ function getMessageExtensionTypeProjectQuestionNode(inputs) {
     };
 }
 exports.getMessageExtensionTypeProjectQuestionNode = getMessageExtensionTypeProjectQuestionNode;
-function getOutlookAddinTypeProjectQuestionNode(inputs) {
+function getOutlookAddinTypeProjectQuestionNode() {
     const staticOptions = [...question_1.OfficeAddinItems(), question_1.ImportAddinProjectItem()];
     return {
         name: CoreQuestionNames.Capabilities,
@@ -429,81 +305,6 @@ function getOutlookAddinTypeProjectQuestionNode(inputs) {
     };
 }
 exports.getOutlookAddinTypeProjectQuestionNode = getOutlookAddinTypeProjectQuestionNode;
-function validateCapabilities(inputs) {
-    if (inputs.length === 0) {
-        return localizeUtils_1.getLocalizedString("core.createCapabilityQuestion.placeholder");
-    }
-    const set = new Set();
-    inputs.forEach((i) => set.add(i));
-    let result = validateConflict([
-        new Set([constants_3.BotOptionItem().id, constants_3.MessageExtensionItem().id]),
-        new Set([constants_3.NotificationOptionItem().id]),
-        new Set([constants_3.CommandAndResponseOptionItem().id]),
-        new Set([constants_3.WorkflowOptionItem().id]),
-    ], set);
-    if (result)
-        return result;
-    result = validateConflict([
-        new Set([
-            constants_3.TabOptionItem().id,
-            constants_3.TabNonSsoItem().id,
-            constants_3.BotOptionItem().id,
-            constants_3.MessageExtensionItem().id,
-            constants_3.NotificationOptionItem().id,
-            constants_3.CommandAndResponseOptionItem().id,
-            constants_3.WorkflowOptionItem().id,
-        ]),
-        new Set([constants_3.TabSPFxItem().id]),
-    ], set);
-    if (result)
-        return result;
-    result = validateConflict([new Set([constants_3.TabOptionItem().id]), new Set([constants_3.TabNonSsoItem().id])], set);
-    if (result)
-        return result;
-    result = validateConflict([
-        new Set([
-            constants_3.TabOptionItem().id,
-            constants_3.TabNonSsoItem().id,
-            constants_3.TabSPFxItem().id,
-            constants_3.BotOptionItem().id,
-            constants_3.MessageExtensionItem().id,
-            constants_3.NotificationOptionItem().id,
-            constants_3.CommandAndResponseOptionItem().id,
-            constants_3.WorkflowOptionItem().id,
-            constants_3.ExistingTabOptionItem().id,
-        ]),
-        new Set([constants_3.M365SsoLaunchPageOptionItem().id]),
-        new Set([constants_3.M365SearchAppOptionItem().id]),
-    ], set);
-    return result;
-}
-exports.validateCapabilities = validateCapabilities;
-async function onChangeSelectionForCapabilities(currentSelectedIds, previousSelectedIds) {
-    let result = handleSelectionConflict([
-        new Set([constants_3.BotOptionItem().id, constants_3.MessageExtensionItem().id]),
-        new Set([constants_3.NotificationOptionItem().id]),
-        new Set([constants_3.CommandAndResponseOptionItem().id]),
-        new Set([constants_3.WorkflowOptionItem().id]),
-    ], previousSelectedIds, currentSelectedIds);
-    result = handleSelectionConflict([
-        new Set([
-            constants_3.TabOptionItem().id,
-            constants_3.TabNonSsoItem().id,
-            constants_3.BotOptionItem().id,
-            constants_3.MessageExtensionItem().id,
-            constants_3.NotificationOptionItem().id,
-            constants_3.CommandAndResponseOptionItem().id,
-            constants_3.WorkflowOptionItem().id,
-        ]),
-        new Set([constants_3.TabSPFxItem().id]),
-        new Set([constants_3.ExistingTabOptionItem().id]),
-        new Set([constants_3.M365SsoLaunchPageOptionItem().id]),
-        new Set([constants_3.M365SearchAppOptionItem().id]),
-    ], previousSelectedIds, result);
-    result = handleSelectionConflict([new Set([constants_3.TabOptionItem().id]), new Set([constants_3.TabNonSsoItem().id])], previousSelectedIds, result);
-    return result;
-}
-exports.onChangeSelectionForCapabilities = onChangeSelectionForCapabilities;
 function QuestionSelectTargetEnvironment() {
     return {
         type: "singleSelect",
@@ -514,9 +315,7 @@ function QuestionSelectTargetEnvironment() {
         forgetLastValue: true,
     };
 }
-exports.QuestionSelectTargetEnvironment = QuestionSelectTargetEnvironment;
 function getQuestionNewTargetEnvironmentName(projectPath) {
-    const WINDOWS_MAX_PATH_LENGTH = 260;
     return {
         type: "text",
         name: CoreQuestionNames.NewTargetEnvName,
@@ -528,10 +327,6 @@ function getQuestionNewTargetEnvironmentName(projectPath) {
                 if (!match) {
                     return localizeUtils_1.getLocalizedString("core.getQuestionNewTargetEnvironmentName.validation1");
                 }
-                const envFilePath = environment_1.environmentManager.getEnvConfigPath(targetEnvName, projectPath);
-                if (os.type() === "Windows_NT" && envFilePath.length >= WINDOWS_MAX_PATH_LENGTH) {
-                    return localizeUtils_1.getLocalizedString("core.getQuestionNewTargetEnvironmentName.validation2");
-                }
                 if (targetEnvName === teamsfx_api_1.LocalEnvironmentName) {
                     return localizeUtils_1.getLocalizedString("core.getQuestionNewTargetEnvironmentName.validation3", teamsfx_api_1.LocalEnvironmentName);
                 }
@@ -615,7 +410,6 @@ function QuestionNewResourceGroupName() {
         forgetLastValue: true,
     };
 }
-exports.QuestionNewResourceGroupName = QuestionNewResourceGroupName;
 function QuestionNewResourceGroupLocation() {
     return {
         type: "singleSelect",
@@ -626,9 +420,7 @@ function QuestionNewResourceGroupLocation() {
 }
 exports.QuestionNewResourceGroupLocation = QuestionNewResourceGroupLocation;
 function ScratchOptionYesVSC() {
-    const label = featureFlags_1.isOfficeAddinEnabled()
-        ? localizeUtils_1.getLocalizedString("core.ScratchOptionYesVSC.officeAddin.label")
-        : localizeUtils_1.getLocalizedString("core.ScratchOptionYesVSC.label");
+    const label = localizeUtils_1.getLocalizedString("core.ScratchOptionYesVSC.officeAddin.label");
     return {
         id: "yes",
         label: `$(new-folder) ${label}`,
@@ -692,9 +484,7 @@ function getCreateNewOrFromSampleQuestion(platform) {
     const staticOptions = [];
     if (platform === teamsfx_api_1.Platform.VSCode) {
         staticOptions.push(ScratchOptionYesVSC());
-        if (featureFlags_1.isOfficeAddinEnabled()) {
-            staticOptions.push(CreateNewOfficeAddinOption());
-        }
+        staticOptions.push(CreateNewOfficeAddinOption());
         staticOptions.push(ScratchOptionNoVSC());
     }
     else {
@@ -738,32 +528,13 @@ function SampleSelect() {
     };
 }
 exports.SampleSelect = SampleSelect;
-function ExistingTabEndpointQuestion() {
-    return {
-        type: "text",
-        name: CoreQuestionNames.ExistingTabEndpoint,
-        title: localizeUtils_1.getLocalizedString("core.ExistingTabEndpointQuestion.title"),
-        default: "https://localhost:3000",
-        placeholder: localizeUtils_1.getLocalizedString("core.ExistingTabEndpointQuestion.placeholder"),
-        validation: {
-            validFunc: async (endpoint) => {
-                const match = endpoint.match(/^https:\/\/[\S]+$/i);
-                if (!match) {
-                    return localizeUtils_1.getLocalizedString("core.ExistingTabEndpointQuestion.validation");
-                }
-                return undefined;
-            },
-        },
-    };
-}
-exports.ExistingTabEndpointQuestion = ExistingTabEndpointQuestion;
-exports.defaultTabLocalHostUrl = "https://localhost:53000/index.html#/tab";
+const defaultTabLocalHostUrl = "https://localhost:53000/index.html#/tab";
 const tabsContentUrlQuestion = (tabs) => {
     return {
         type: "multiSelect",
         name: CoreQuestionNames.ReplaceContentUrl,
         title: localizeUtils_1.getLocalizedString("core.updateContentUrlQuestion.title"),
-        staticOptions: tabs.map((o) => exports.tabContentUrlOptionItem(o)),
+        staticOptions: tabs.map((o) => tabContentUrlOptionItem(o)),
         default: tabs.map((o) => o.name),
         placeholder: localizeUtils_1.getLocalizedString("core.updateUrlQuestion.placeholder"),
         forgetLastValue: true,
@@ -775,7 +546,7 @@ const tabsWebsitetUrlQuestion = (tabs) => {
         type: "multiSelect",
         name: CoreQuestionNames.ReplaceWebsiteUrl,
         title: localizeUtils_1.getLocalizedString("core.updateWebsiteUrlQuestion.title"),
-        staticOptions: tabs.map((o) => exports.tabWebsiteUrlOptionItem(o)),
+        staticOptions: tabs.map((o) => tabWebsiteUrlOptionItem(o)),
         default: tabs.map((o) => o.name),
         placeholder: localizeUtils_1.getLocalizedString("core.updateUrlQuestion.placeholder"),
         forgetLastValue: true,
@@ -786,28 +557,26 @@ const tabContentUrlOptionItem = (tab) => {
     return {
         id: tab.name,
         label: tab.name,
-        detail: localizeUtils_1.getLocalizedString("core.updateContentUrlOption.description", tab.contentUrl, exports.defaultTabLocalHostUrl),
+        detail: localizeUtils_1.getLocalizedString("core.updateContentUrlOption.description", tab.contentUrl, defaultTabLocalHostUrl),
     };
 };
-exports.tabContentUrlOptionItem = tabContentUrlOptionItem;
 const tabWebsiteUrlOptionItem = (tab) => {
     return {
         id: tab.name,
         label: tab.name,
-        detail: localizeUtils_1.getLocalizedString("core.updateWebsiteUrlOption.description", tab.websiteUrl, exports.defaultTabLocalHostUrl),
+        detail: localizeUtils_1.getLocalizedString("core.updateWebsiteUrlOption.description", tab.websiteUrl, defaultTabLocalHostUrl),
     };
 };
-exports.tabWebsiteUrlOptionItem = tabWebsiteUrlOptionItem;
 const BotIdsQuestion = (botId, messageExtensionBotId) => {
     const defaultIds = [];
     const options = [];
     if (botId) {
         defaultIds.push(developerPortalScaffoldUtils_1.answerToRepaceBotId);
-        options.push(exports.botOptionItem(false, botId));
+        options.push(botOptionItem(false, botId));
     }
     if (messageExtensionBotId) {
         defaultIds.push(developerPortalScaffoldUtils_1.answerToReplaceMessageExtensionBotId);
-        options.push(exports.botOptionItem(true, messageExtensionBotId));
+        options.push(botOptionItem(true, messageExtensionBotId));
     }
     return {
         type: "multiSelect",
@@ -831,7 +600,6 @@ const botOptionItem = (isMessageExtension, botId) => {
             : localizeUtils_1.getLocalizedString("core.updateBotIdForBot.description", botId),
     };
 };
-exports.botOptionItem = botOptionItem;
 function CreateNewOfficeAddinOption() {
     return {
         id: "newAddin",
@@ -970,7 +738,6 @@ function confirmManifestNode(defaultManifestFilePath, isTeamsApp = true, isLocal
     };
     return confirmManifestNode;
 }
-exports.confirmManifestNode = confirmManifestNode;
 async function getQuestionForDeployAadManifest(inputs) {
     const isDynamicQuestion = teamsfx_api_1.DynamicPlatforms.includes(inputs.platform);
     if (isDynamicQuestion) {
@@ -990,28 +757,26 @@ async function getUpdateAadManifestQuestion(inputs) {
     }
     envNode.data.name = "env";
     aadAppSelectNode.addChild(envNode);
-    envNode.condition = {
-        validFunc: validateAadManifestContainsPlaceholder,
-    };
+    envNode.condition = validateAadManifestContainsPlaceholder;
     return aadAppSelectNode;
 }
-async function validateAadManifestContainsPlaceholder(input, inputs) {
+async function validateAadManifestContainsPlaceholder(inputs) {
     const aadManifestPath = inputs === null || inputs === void 0 ? void 0 : inputs[CoreQuestionNames.AadAppManifestFilePath];
     const placeholderRegex = /\$\{\{ *[a-zA-Z0-9_.-]* *\}\}/g;
     const regexObj = new RegExp(placeholderRegex);
     try {
         if (!aadManifestPath || !(await fs.pathExists(aadManifestPath))) {
-            return "Skip Current Question";
+            return false;
         }
         const manifest = await fs.readFile(aadManifestPath, constants_1.ConstantString.UTF8Encoding);
         if (regexObj.test(manifest)) {
-            return undefined;
+            return true;
         }
     }
     catch (e) {
-        return "Skip Current Question";
+        return false;
     }
-    return "Skip Current Question";
+    return false;
 }
 exports.validateAadManifestContainsPlaceholder = validateAadManifestContainsPlaceholder;
 function selectM365HostQuestion() {