@microsoft/teamsfx-core 2.0.10-rc.0 → 2.0.10

package/build/component/generator/spfx/spfxGenerator.js

@@ -13,11 +13,13 @@ const os_1 = require("os");
 const path = tslib_1.__importStar(require("path"));
 const semver_1 = tslib_1.__importDefault(require("semver"));
 const util = tslib_1.__importStar(require("util"));
-const deps_checker_1 = require("../../deps-checker");
+const deps_checker_1 = require("../../../common/deps-checker");
 const jsonUtils_1 = require("../../../common/jsonUtils");
 const localizeUtils_1 = require("../../../common/localizeUtils");
 const error_1 = require("../../../error");
-const constants_1 = require("../../../question/constants");
+const create_1 = require("../../../question/create");
+const questionNames_1 = require("../../../question/questionNames");
+const constants_1 = require("../../constants");
 const ManifestUtils_1 = require("../../driver/teamsApp/utils/ManifestUtils");
 const actionExecutionMW_1 = require("../../middleware/actionExecutionMW");
 const envUtil_1 = require("../../utils/envUtil");
@@ -33,8 +35,8 @@ const telemetryEvents_1 = require("./utils/telemetryEvents");
 const utils_1 = require("./utils/utils");
 class SPFxGenerator {
     static async generate(context, inputs, destinationPath, actionContext) {
-        const spfxSolution = inputs[constants_1.QuestionNames.SPFxSolution];
-        (0, lodash_1.merge)(actionContext === null || actionContext === void 0 ? void 0 : actionContext.telemetryProps, {
+        const spfxSolution = inputs[questionNames_1.QuestionNames.SPFxSolution];
+        lodash_1.merge(actionContext === null || actionContext === void 0 ? void 0 : actionContext.telemetryProps, {
             [telemetryEvents_1.TelemetryProperty.SPFxSolution]: spfxSolution,
         });
         if (spfxSolution === "new") {
@@ -47,28 +49,28 @@ class SPFxGenerator {
     static async newSPFxProject(context, inputs, destinationPath) {
         const yeomanRes = await this.doYeomanScaffold(context, inputs, destinationPath);
         if (yeomanRes.isErr())
-            return (0, teamsfx_api_1.err)(yeomanRes.error);
+            return teamsfx_api_1.err(yeomanRes.error);
         const templateRes = await generator_1.Generator.generateTemplate(context, destinationPath, constants_2.Constants.TEMPLATE_NAME, "ts");
         if (templateRes.isErr())
-            return (0, teamsfx_api_1.err)(templateRes.error);
-        return (0, teamsfx_api_1.ok)(undefined);
+            return teamsfx_api_1.err(templateRes.error);
+        return teamsfx_api_1.ok(undefined);
     }
     static async importSPFxProject(context, inputs, destinationPath, actionContext) {
         var _a, _b, _c, _d;
-        const importProgress = context.userInteraction.createProgressBar((0, localizeUtils_1.getLocalizedString)("plugins.spfx.import.title"), 3);
+        const importProgress = context.userInteraction.createProgressBar(localizeUtils_1.getLocalizedString("plugins.spfx.import.title"), 3);
         await importProgress.start();
         const importDetails = [];
         try {
             // Copy & paste existing SPFx solution
-            await importProgress.next((0, localizeUtils_1.getLocalizedString)("plugins.spfx.import.copyExistingSPFxSolution"));
-            const spfxFolder = inputs[constants_1.QuestionNames.SPFxFolder];
+            await importProgress.next(localizeUtils_1.getLocalizedString("plugins.spfx.import.copyExistingSPFxSolution"));
+            const spfxFolder = inputs[questionNames_1.QuestionNames.SPFxFolder];
             const destSpfxFolder = path.join(destinationPath, "src");
             importDetails.push(os_1.EOL +
                 `(.) Processing: Copying existing SPFx solution from ${spfxFolder} to ${destSpfxFolder}...`);
             await this.copySPFxSolution(spfxFolder, destSpfxFolder);
             importDetails.push(`(√) Done: Succeeded to copy existing SPFx solution.`);
             // Retrieve solution info to generate template
-            await importProgress.next((0, localizeUtils_1.getLocalizedString)("plugins.spfx.import.generateSPFxTemplates"));
+            await importProgress.next(localizeUtils_1.getLocalizedString("plugins.spfx.import.generateSPFxTemplates"));
             importDetails.push(`(.) Processing: Reading web part manifest in SPFx solution...`);
             const webpartManifest = await this.getWebpartManifest(spfxFolder);
             if (!webpartManifest ||
@@ -79,18 +81,18 @@ class SPFxGenerator {
                     : !webpartManifest["id"]
                         ? "web part manifest id"
                         : "preconfiguredEntries title in web part manifest file"}!`);
-                throw (0, error_2.RetrieveSPFxInfoError)();
+                throw error_2.RetrieveSPFxInfoError();
             }
             importDetails.push(`(√) Done: Succeeded to retrieve web part manifest in SPFx solution.`);
             if (!context.templateVariables) {
-                context.templateVariables = generator_1.Generator.getDefaultVariables(inputs[constants_1.QuestionNames.AppName]);
+                context.templateVariables = generator_1.Generator.getDefaultVariables(inputs[questionNames_1.QuestionNames.AppName]);
             }
             const nodeVersion = await this.getNodeVersion(destSpfxFolder, context);
             context.templateVariables["SpfxNodeVersion"] = nodeVersion;
             context.templateVariables["componentId"] = webpartManifest["id"];
             context.templateVariables["webpartName"] =
                 webpartManifest["preconfiguredEntries"][0].title.default;
-            importDetails.push(`(.) Processing: Generating SPFx project templates with app name: ${inputs[constants_1.QuestionNames.AppName]}, component id: ${webpartManifest["id"]}, web part name: ${webpartManifest["preconfiguredEntries"][0].title.default}`);
+            importDetails.push(`(.) Processing: Generating SPFx project templates with app name: ${inputs[questionNames_1.QuestionNames.AppName]}, component id: ${webpartManifest["id"]}, web part name: ${webpartManifest["preconfiguredEntries"][0].title.default}`);
             const templateRes = await generator_1.Generator.generateTemplate(context, destinationPath, constants_2.Constants.TEMPLATE_NAME, "ts");
             if (templateRes.isErr()) {
                 importDetails.push(`(×) Error: Failed to generate SPFx project templates!`);
@@ -98,49 +100,49 @@ class SPFxGenerator {
             }
             importDetails.push(`(√) Done: Succeeded to generate SPFx project templates.`);
             // Update manifest and related files
-            await importProgress.next((0, localizeUtils_1.getLocalizedString)("plugins.spfx.import.updateTemplates"));
+            await importProgress.next(localizeUtils_1.getLocalizedString("plugins.spfx.import.updateTemplates"));
             await this.updateSPFxTemplate(spfxFolder, destinationPath, importDetails);
         }
         catch (error) {
             await importProgress.end(false);
-            importDetails.push((0, localizeUtils_1.getLocalizedString)("plugins.spfx.import.log.fail", (_a = context.logProvider) === null || _a === void 0 ? void 0 : _a.getLogFilePath()));
+            importDetails.push(localizeUtils_1.getLocalizedString("plugins.spfx.import.log.fail", (_a = context.logProvider) === null || _a === void 0 ? void 0 : _a.getLogFilePath()));
             await context.logProvider.logInFile(teamsfx_api_1.LogLevel.Info, importDetails.join(os_1.EOL));
-            void context.logProvider.error((0, localizeUtils_1.getLocalizedString)("plugins.spfx.import.log.fail", (_b = context.logProvider) === null || _b === void 0 ? void 0 : _b.getLogFilePath()));
+            void context.logProvider.error(localizeUtils_1.getLocalizedString("plugins.spfx.import.log.fail", (_b = context.logProvider) === null || _b === void 0 ? void 0 : _b.getLogFilePath()));
             if (error instanceof teamsfx_api_1.UserError || error instanceof teamsfx_api_1.SystemError) {
-                return (0, teamsfx_api_1.err)(error);
+                return teamsfx_api_1.err(error);
             }
-            return (0, teamsfx_api_1.err)((0, error_2.ImportSPFxSolutionError)(error));
+            return teamsfx_api_1.err(error_2.ImportSPFxSolutionError(error));
         }
         await importProgress.end(true);
-        importDetails.push((0, localizeUtils_1.getLocalizedString)("plugins.spfx.import.log.success", (_c = context.logProvider) === null || _c === void 0 ? void 0 : _c.getLogFilePath()));
+        importDetails.push(localizeUtils_1.getLocalizedString("plugins.spfx.import.log.success", (_c = context.logProvider) === null || _c === void 0 ? void 0 : _c.getLogFilePath()));
         await context.logProvider.logInFile(teamsfx_api_1.LogLevel.Info, importDetails.join(os_1.EOL));
-        void context.logProvider.info((0, localizeUtils_1.getLocalizedString)("plugins.spfx.import.log.success", (_d = context.logProvider) === null || _d === void 0 ? void 0 : _d.getLogFilePath()));
-        void context.userInteraction.showMessage("info", (0, localizeUtils_1.getLocalizedString)("plugins.spfx.import.success", destinationPath), false);
-        return (0, teamsfx_api_1.ok)(undefined);
+        void context.logProvider.info(localizeUtils_1.getLocalizedString("plugins.spfx.import.log.success", (_d = context.logProvider) === null || _d === void 0 ? void 0 : _d.getLogFilePath()));
+        void context.userInteraction.showMessage("info", localizeUtils_1.getLocalizedString("plugins.spfx.import.success", destinationPath), false);
+        return teamsfx_api_1.ok(undefined);
     }
     static async doYeomanScaffold(context, inputs, destinationPath) {
         var _a, _b;
         const ui = context.userInteraction;
         const progressHandler = await progress_helper_1.ProgressHelper.startScaffoldProgressHandler(ui, inputs.stage == teamsfx_api_1.Stage.addWebpart);
-        let shouldInstallLocally = inputs[constants_1.QuestionNames.SPFxInstallPackage] === constants_1.SPFxVersionOptionIds.installLocally;
+        let shouldInstallLocally = inputs[questionNames_1.QuestionNames.SPFxInstallPackage] === create_1.SPFxVersionOptionIds.installLocally;
         try {
-            const webpartName = inputs[constants_1.QuestionNames.SPFxWebpartName];
-            const framework = inputs[constants_1.QuestionNames.SPFxFramework];
-            const solutionName = inputs[constants_1.QuestionNames.AppName];
+            const webpartName = inputs[questionNames_1.QuestionNames.SPFxWebpartName];
+            const framework = inputs[questionNames_1.QuestionNames.SPFxFramework];
+            const solutionName = inputs[questionNames_1.QuestionNames.AppName];
             const isAddSPFx = inputs.stage == teamsfx_api_1.Stage.addWebpart;
             const componentName = utils_1.Utils.normalizeComponentName(webpartName);
-            const componentNameCamelCase = (0, lodash_1.camelCase)(componentName);
-            await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.next((0, localizeUtils_1.getLocalizedString)("plugins.spfx.scaffold.dependencyCheck")));
+            const componentNameCamelCase = lodash_1.camelCase(componentName);
+            await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.next(localizeUtils_1.getLocalizedString("plugins.spfx.scaffold.dependencyCheck")));
             const yoChecker = new yoChecker_1.YoChecker(context.logProvider);
             const spGeneratorChecker = new generatorChecker_1.GeneratorChecker(context.logProvider);
             let targetVersion = constants_2.Constants.LatestVersion;
             let localVersion = undefined;
             if (isAddSPFx) {
-                const yoInfoPath = path.join(inputs[constants_1.QuestionNames.SPFxFolder], constants_2.Constants.YO_RC_FILE);
+                const yoInfoPath = path.join(inputs[questionNames_1.QuestionNames.SPFxFolder], constants_2.Constants.YO_RC_FILE);
                 targetVersion = await this.getSolutionVersion(yoInfoPath);
                 if (!targetVersion) {
-                    context.logProvider.error((0, localizeUtils_1.getLocalizedString)("plugins.spfx.addWebPart.cannotFindSolutionVersion", yoInfoPath));
-                    throw (0, error_2.SolutionVersionMissingError)(yoInfoPath);
+                    context.logProvider.error(localizeUtils_1.getLocalizedString("plugins.spfx.addWebPart.cannotFindSolutionVersion", yoInfoPath));
+                    throw error_2.SolutionVersionMissingError(yoInfoPath);
                 }
                 const versions = await Promise.all([
                     spGeneratorChecker.findLocalInstalledVersion(),
@@ -159,7 +161,7 @@ class SPFxGenerator {
                     context.telemetryReporter.sendTelemetryEvent(telemetryEvents_1.TelemetryEvents.UseNotRecommendedVersion);
                 }
             }
-            await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.next((0, localizeUtils_1.getLocalizedString)(isAddSPFx
+            await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.next(localizeUtils_1.getLocalizedString(isAddSPFx
                 ? "driver.spfx.add.progress.scaffoldWebpart"
                 : "plugins.spfx.scaffold.scaffoldProject")));
             if (inputs.platform === teamsfx_api_1.Platform.VSCode) {
@@ -198,24 +200,24 @@ class SPFxGenerator {
                 args.push("--solution-name", `"${solutionName}"`);
             }
             try {
-                await deps_checker_1.cpUtils.executeCommand(isAddSPFx ? inputs[constants_1.QuestionNames.SPFxFolder] : destinationPath, context.logProvider, {
+                await deps_checker_1.cpUtils.executeCommand(isAddSPFx ? inputs[constants_1.SPFxQuestionNames.SPFxFolder] : destinationPath, context.logProvider, {
                     timeout: 2 * 60 * 1000,
                     env: yoEnv,
-                    shell: (0, utils_1.getShellOptionValue)(),
+                    shell: utils_1.getShellOptionValue(),
                 }, "yo", ...args);
             }
             catch (yoError) {
                 if (yoError.message) {
                     void context.logProvider.error(yoError.message);
                 }
-                throw (0, error_2.YoGeneratorScaffoldError)();
+                throw error_2.YoGeneratorScaffoldError();
             }
             const newPath = path.join(destinationPath, "src");
             if (!isAddSPFx) {
                 const currentPath = path.join(destinationPath, solutionName);
                 await fs_extra_1.default.rename(currentPath, newPath);
             }
-            await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.next((0, localizeUtils_1.getLocalizedString)("plugins.spfx.scaffold.updateManifest")));
+            await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.next(localizeUtils_1.getLocalizedString("plugins.spfx.scaffold.updateManifest")));
             const manifestPath = `${newPath}/src/webparts/${componentNameCamelCase}/${componentName}WebPart.manifest.json`;
             const manifest = await fs_extra_1.default.readFile(manifestPath, "utf8");
             let manifestString = manifest.toString();
@@ -246,11 +248,11 @@ class SPFxGenerator {
                 await fs_extra_1.default.remove(debugPath);
             }
             await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.end(true));
-            return (0, teamsfx_api_1.ok)(componentId);
+            return teamsfx_api_1.ok(componentId);
         }
         catch (error) {
             await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.end(false));
-            return (0, teamsfx_api_1.err)((0, error_2.ScaffoldError)(error));
+            return teamsfx_api_1.err(error_2.ScaffoldError(error));
         }
     }
     static async getSolutionVersion(yoInfoPath) {
@@ -288,15 +290,15 @@ class SPFxGenerator {
             needInstallGenerator = !localSPFxVersion || semver_1.default.lt(localSPFxVersion, targetSPFxVersion);
         }
         if (needInstallYo || needInstallGenerator) {
-            await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.next((0, localizeUtils_1.getLocalizedString)("plugins.spfx.scaffold.dependencyInstall")));
+            await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.next(localizeUtils_1.getLocalizedString("plugins.spfx.scaffold.dependencyInstall")));
             if (needInstallYo) {
                 const yoRes = await yoChecker.ensureDependency(context, constants_2.Constants.LatestVersion);
                 if (yoRes.isErr()) {
                     if (isAddWebPart) {
-                        throw (0, error_2.PackageTargetVersionInstallError)(constants_2.Constants.YeomanPackageName, constants_2.Constants.LatestVersion);
+                        throw error_2.PackageTargetVersionInstallError(constants_2.Constants.YeomanPackageName, constants_2.Constants.LatestVersion);
                     }
                     else {
-                        throw (0, error_2.LatestPackageInstallError)();
+                        throw error_2.LatestPackageInstallError();
                     }
                 }
             }
@@ -304,10 +306,10 @@ class SPFxGenerator {
                 const spGeneratorRes = await spGeneratorChecker.ensureDependency(context, targetSPFxVersion);
                 if (spGeneratorRes.isErr()) {
                     if (isAddWebPart) {
-                        throw (0, error_2.PackageTargetVersionInstallError)(constants_2.Constants.GeneratorPackageName, targetSPFxVersion);
+                        throw error_2.PackageTargetVersionInstallError(constants_2.Constants.GeneratorPackageName, targetSPFxVersion);
                     }
                     else {
-                        throw (0, error_2.LatestPackageInstallError)();
+                        throw error_2.LatestPackageInstallError();
                     }
                 }
             }
@@ -338,27 +340,27 @@ class SPFxGenerator {
         let defaultContinueText;
         if (!localVersion) {
             // ask user to confirm to install locally
-            continueText = (0, localizeUtils_1.getLocalizedString)("plugins.spfx.addWebPart.install");
-            defaultContinueText = (0, localizeUtils_1.getDefaultString)("plugins.spfx.addWebPart.install");
-            const res = await context.userInteraction.showMessage("info", (0, localizeUtils_1.getLocalizedString)("plugins.spfx.addWebPart.confirmInstall", displayedSolutionVersion, displayedSolutionVersion), true, continueText);
+            continueText = localizeUtils_1.getLocalizedString("plugins.spfx.addWebPart.install");
+            defaultContinueText = localizeUtils_1.getDefaultString("plugins.spfx.addWebPart.install");
+            const res = await context.userInteraction.showMessage("info", localizeUtils_1.getLocalizedString("plugins.spfx.addWebPart.confirmInstall", displayedSolutionVersion, displayedSolutionVersion), true, continueText);
             userAnswer = res.isOk() ? res.value : undefined;
         }
         else if (semver_1.default.lt(localVersion, solutionVersion)) {
             // ask user to confirm to upgrade local SPFx
-            continueText = (0, localizeUtils_1.getLocalizedString)("plugins.spfx.addWebPart.upgrade");
-            defaultContinueText = (0, localizeUtils_1.getDefaultString)("plugins.spfx.addWebPart.upgrade");
-            const res = await context.userInteraction.showMessage("info", (0, localizeUtils_1.getLocalizedString)("plugins.spfx.addWebPart.confirmUpgrade", displayedLocalVersion, displayedSolutionVersion, displayedSolutionVersion), true, continueText);
+            continueText = localizeUtils_1.getLocalizedString("plugins.spfx.addWebPart.upgrade");
+            defaultContinueText = localizeUtils_1.getDefaultString("plugins.spfx.addWebPart.upgrade");
+            const res = await context.userInteraction.showMessage("info", localizeUtils_1.getLocalizedString("plugins.spfx.addWebPart.confirmUpgrade", displayedLocalVersion, displayedSolutionVersion, displayedSolutionVersion), true, continueText);
             userAnswer = res.isOk() ? res.value : undefined;
         }
         else {
             // localVersion > solutionVersion
             // ask user to confirm to continue, learn more or cancel
-            continueText = (0, localizeUtils_1.getLocalizedString)("plugins.spfx.addWebPart.versionMismatch.continue");
-            defaultContinueText = (0, localizeUtils_1.getDefaultString)("plugins.spfx.addWebPart.versionMismatch.continue");
+            continueText = localizeUtils_1.getLocalizedString("plugins.spfx.addWebPart.versionMismatch.continue");
+            defaultContinueText = localizeUtils_1.getDefaultString("plugins.spfx.addWebPart.versionMismatch.continue");
             let userSelected;
-            const helpText = (0, localizeUtils_1.getLocalizedString)("plugins.spfx.addWebPart.versionMismatch.help");
+            const helpText = localizeUtils_1.getLocalizedString("plugins.spfx.addWebPart.versionMismatch.help");
             do {
-                const res = await context.userInteraction.showMessage("info", (0, localizeUtils_1.getLocalizedString)("plugins.spfx.addWebPart.versionMismatch.continueConfirm", displayedSolutionVersion, displayedLocalVersion), true, helpText, continueText);
+                const res = await context.userInteraction.showMessage("info", localizeUtils_1.getLocalizedString("plugins.spfx.addWebPart.versionMismatch.continueConfirm", displayedSolutionVersion, displayedLocalVersion), true, helpText, continueText);
                 userSelected = res.isOk() ? res.value : undefined;
                 if (userSelected === helpText) {
                     context.telemetryReporter.sendTelemetryEvent(telemetryEvents_1.TelemetryEvents.LearnMoreVersionMismatch);
@@ -367,8 +369,8 @@ class SPFxGenerator {
             } while (userSelected === helpText);
             userAnswer = userSelected;
             context.logProvider.log(teamsfx_api_1.LogLevel.Warning, displayedGlobalVersion
-                ? (0, localizeUtils_1.getLocalizedString)("plugins.spfx.addWebPart.versionMismatch.output", displayedSolutionVersion, displayedGlobalVersion, displayedLocalVersion, displayedLocalVersion, constants_2.Constants.AddWebpartHelpLink)
-                : (0, localizeUtils_1.getLocalizedString)("plugins.spfx.addWebPart.versionMismatch.localOnly.output", displayedSolutionVersion, displayedLocalVersion, displayedLocalVersion, constants_2.Constants.AddWebpartHelpLink));
+                ? localizeUtils_1.getLocalizedString("plugins.spfx.addWebPart.versionMismatch.output", displayedSolutionVersion, displayedGlobalVersion, displayedLocalVersion, displayedLocalVersion, constants_2.Constants.AddWebpartHelpLink)
+                : localizeUtils_1.getLocalizedString("plugins.spfx.addWebPart.versionMismatch.localOnly.output", displayedSolutionVersion, displayedLocalVersion, displayedLocalVersion, constants_2.Constants.AddWebpartHelpLink));
         }
         context.telemetryReporter.sendTelemetryEvent(telemetryEvents_1.TelemetryEvents.CheckAddWebPartPackage, {
             [telemetryEvents_1.TelemetryProperty.PackageSource]: "local",
@@ -394,7 +396,7 @@ class SPFxGenerator {
             });
         }
         catch (e) {
-            throw (0, error_2.CopyExistingSPFxSolutionError)(e);
+            throw error_2.CopyExistingSPFxSolutionError(e);
         }
     }
     static async getWebpartManifest(spfxFolder) {
@@ -404,12 +406,13 @@ class SPFxGenerator {
             if (webparts.length < 1) {
                 return undefined;
             }
-            const webpartManifest = (await fs_extra_1.default.readdir(path.join(webpartsDir, webparts[0]))).find((file) => file.endsWith("WebPart.manifest.json"));
-            if (webpartManifest === undefined) {
-                throw new error_1.FileNotFoundError(constants_2.Constants.PLUGIN_NAME, path.join(webpartsDir, webparts[0], `${webparts[0].split(path.sep).pop()}WebPart.manifest.json`), constants_2.Constants.IMPORT_HELP_LINK);
+            const webpartName = webparts[0].split(path.sep).pop();
+            const webpartManifestPath = path.join(webpartsDir, webparts[0], `${webpartName}WebPart.manifest.json`);
+            if (!(await fs_extra_1.default.pathExists(webpartManifestPath))) {
+                throw new error_1.FileNotFoundError(constants_2.Constants.PLUGIN_NAME, webpartManifestPath, constants_2.Constants.IMPORT_HELP_LINK);
             }
             const matchHashComment = new RegExp(/(\/\/ .*)/, "gi");
-            const manifest = JSON.parse((await fs_extra_1.default.readFile(path.join(webpartsDir, webparts[0], webpartManifest), "utf8"))
+            const manifest = JSON.parse((await fs_extra_1.default.readFile(webpartManifestPath, "utf8"))
                 .toString()
                 .replace(matchHashComment, "")
                 .trim());
@@ -438,13 +441,13 @@ class SPFxGenerator {
                 importDetails.push(`(.) Processing: There're multiple web parts in the SPFx solution, exposing each of them in Teams manifest...`);
                 for (let i = 1; i < webparts.length; i++) {
                     const webpart = webparts[i];
-                    const webpartManifestFile = (await fs_extra_1.default.readdir(path.join(webpartsDir, webpart))).find((file) => file.endsWith("WebPart.manifest.json"));
-                    if (webpartManifestFile === undefined) {
-                        importDetails.push(` [${i}] Web part manifest doesn't exist at ${path.join(webpartsDir, webpart, `${webpart}WebPart.manifest.json`)}, skip...`);
+                    const webpartManifestPath = path.join(webpartsDir, webpart, `${webpart.split(path.sep).pop()}WebPart.manifest.json`);
+                    if (!(await fs_extra_1.default.pathExists(webpartManifestPath))) {
+                        importDetails.push(` [${i}] Web part manifest doesn't exist at ${webpartManifestPath}, skip...`);
                         continue;
                     }
                     const matchHashComment = new RegExp(/(\/\/ .*)/, "gi");
-                    const webpartManifest = JSON.parse((await fs_extra_1.default.readFile(path.join(webpartsDir, webpart, webpartManifestFile), "utf8"))
+                    const webpartManifest = JSON.parse((await fs_extra_1.default.readFile(webpartManifestPath, "utf8"))
                         .toString()
                         .replace(matchHashComment, "")
                         .trim());
@@ -513,7 +516,7 @@ class SPFxGenerator {
             }
         }
         catch (e) {
-            throw (0, error_2.UpdateSPFxTemplateError)(e);
+            throw error_2.UpdateSPFxTemplateError(e);
         }
     }
     static async getNodeVersion(solutionPath, context) {
@@ -526,11 +529,11 @@ class SPFxGenerator {
             else {
                 const packageJson = jsonContentRes.value;
                 if (!packageJson.engines) {
-                    telemetry_helper_1.telemetryHelper.sendErrorEvent(context, telemetryEvents_1.TelemetryEvents.GetSpfxNodeVersionFailed, (0, error_2.CannotFindPropertyfromJsonError)("engines"));
+                    telemetry_helper_1.telemetryHelper.sendErrorEvent(context, telemetryEvents_1.TelemetryEvents.GetSpfxNodeVersionFailed, error_2.CannotFindPropertyfromJsonError("engines"));
                 }
                 else {
                     if (!packageJson.engines.node) {
-                        telemetry_helper_1.telemetryHelper.sendErrorEvent(context, telemetryEvents_1.TelemetryEvents.GetSpfxNodeVersionFailed, (0, error_2.CannotFindPropertyfromJsonError)("engines.node"));
+                        telemetry_helper_1.telemetryHelper.sendErrorEvent(context, telemetryEvents_1.TelemetryEvents.GetSpfxNodeVersionFailed, error_2.CannotFindPropertyfromJsonError("engines.node"));
                     }
                     else {
                         return packageJson.engines.node;
@@ -545,8 +548,8 @@ class SPFxGenerator {
     }
 }
 tslib_1.__decorate([
-    (0, lib_1.hooks)([
-        (0, actionExecutionMW_1.ActionExecutionMW)({
+    lib_1.hooks([
+        actionExecutionMW_1.ActionExecutionMW({
             enableTelemetry: true,
             telemetryComponentName: constants_2.Constants.PLUGIN_DEV_NAME,
             telemetryEventName: telemetryEvents_1.TelemetryEvents.Generate,
@@ -564,22 +567,22 @@ class SPFxGeneratorNew extends templateGenerator_1.DefaultTemplateGenerator {
         this.componentName = "spfx-new-generator";
     }
     activate(context, inputs) {
-        const capability = inputs[constants_1.QuestionNames.Capabilities];
-        const spfxSolution = inputs[constants_1.QuestionNames.SPFxSolution];
-        return capability === constants_1.CapabilityOptions.SPFxTab().id && spfxSolution === "new";
+        const capability = inputs[questionNames_1.QuestionNames.Capabilities];
+        const spfxSolution = inputs[questionNames_1.QuestionNames.SPFxSolution];
+        return capability === create_1.CapabilityOptions.SPFxTab().id && spfxSolution === "new";
     }
     async getTemplateInfos(context, inputs, destinationPath, actionContext) {
-        const spfxSolution = inputs[constants_1.QuestionNames.SPFxSolution];
-        (0, lodash_1.merge)(actionContext === null || actionContext === void 0 ? void 0 : actionContext.telemetryProps, {
+        const spfxSolution = inputs[questionNames_1.QuestionNames.SPFxSolution];
+        lodash_1.merge(actionContext === null || actionContext === void 0 ? void 0 : actionContext.telemetryProps, {
             [telemetryEvents_1.TelemetryProperty.SPFxSolution]: spfxSolution,
         });
         const yeomanRes = await SPFxGenerator.doYeomanScaffold(context, inputs, destinationPath);
         if (yeomanRes.isErr())
-            return (0, teamsfx_api_1.err)(yeomanRes.error);
-        return (0, teamsfx_api_1.ok)([
+            return teamsfx_api_1.err(yeomanRes.error);
+        return teamsfx_api_1.ok([
             {
                 templateName: constants_2.Constants.TEMPLATE_NAME,
-                language: constants_1.ProgrammingLanguage.TS,
+                language: create_1.ProgrammingLanguage.TS,
                 replaceMap: context.templateVariables || {},
             },
         ]);
@@ -593,19 +596,19 @@ class SPFxGeneratorImport extends templateGenerator_1.DefaultTemplateGenerator {
         this.importDetails = [];
     }
     activate(context, inputs) {
-        const capability = inputs[constants_1.QuestionNames.Capabilities];
-        const spfxSolution = inputs[constants_1.QuestionNames.SPFxSolution];
-        return capability === constants_1.CapabilityOptions.SPFxTab().id && spfxSolution !== "new";
+        const capability = inputs[questionNames_1.QuestionNames.Capabilities];
+        const spfxSolution = inputs[questionNames_1.QuestionNames.SPFxSolution];
+        return capability === create_1.CapabilityOptions.SPFxTab().id && spfxSolution !== "new";
     }
     async getTemplateInfos(context, inputs, destinationPath, actionContext) {
         var _a, _b;
         this.importDetails = [];
         try {
-            const spfxSolution = inputs[constants_1.QuestionNames.SPFxSolution];
-            (0, lodash_1.merge)(actionContext === null || actionContext === void 0 ? void 0 : actionContext.telemetryProps, {
+            const spfxSolution = inputs[questionNames_1.QuestionNames.SPFxSolution];
+            lodash_1.merge(actionContext === null || actionContext === void 0 ? void 0 : actionContext.telemetryProps, {
                 [telemetryEvents_1.TelemetryProperty.SPFxSolution]: spfxSolution,
             });
-            const spfxFolder = inputs[constants_1.QuestionNames.SPFxFolder];
+            const spfxFolder = inputs[questionNames_1.QuestionNames.SPFxFolder];
             const destSpfxFolder = path.join(destinationPath, "src");
             this.importDetails.push(os_1.EOL +
                 `(.) Processing: Copying existing SPFx solution from ${spfxFolder} to ${destSpfxFolder}...`);
@@ -621,55 +624,55 @@ class SPFxGeneratorImport extends templateGenerator_1.DefaultTemplateGenerator {
                     : !webpartManifest["id"]
                         ? "web part manifest id"
                         : "preconfiguredEntries title in web part manifest file"}!`);
-                throw (0, error_2.RetrieveSPFxInfoError)();
+                throw error_2.RetrieveSPFxInfoError();
             }
             this.importDetails.push(`(√) Done: Succeeded to retrieve web part manifest in SPFx solution.`);
             if (!context.templateVariables) {
-                context.templateVariables = generator_1.Generator.getDefaultVariables(inputs[constants_1.QuestionNames.AppName]);
+                context.templateVariables = generator_1.Generator.getDefaultVariables(inputs[questionNames_1.QuestionNames.AppName]);
             }
             const nodeVersion = await SPFxGenerator.getNodeVersion(destSpfxFolder, context);
             context.templateVariables["SpfxNodeVersion"] = nodeVersion;
             context.templateVariables["componentId"] = webpartManifest["id"];
             context.templateVariables["webpartName"] =
                 webpartManifest["preconfiguredEntries"][0].title.default;
-            this.importDetails.push(`(.) Processing: Generating SPFx project templates with app name: ${inputs[constants_1.QuestionNames.AppName]}, component id: ${webpartManifest["id"]}, web part name: ${webpartManifest["preconfiguredEntries"][0].title.default}`);
-            return (0, teamsfx_api_1.ok)([
+            this.importDetails.push(`(.) Processing: Generating SPFx project templates with app name: ${inputs[questionNames_1.QuestionNames.AppName]}, component id: ${webpartManifest["id"]}, web part name: ${webpartManifest["preconfiguredEntries"][0].title.default}`);
+            return teamsfx_api_1.ok([
                 {
                     templateName: constants_2.Constants.TEMPLATE_NAME,
-                    language: constants_1.ProgrammingLanguage.TS,
+                    language: create_1.ProgrammingLanguage.TS,
                     replaceMap: context.templateVariables,
                 },
             ]);
         }
         catch (error) {
-            this.importDetails.push((0, localizeUtils_1.getLocalizedString)("plugins.spfx.import.log.fail", (_a = context.logProvider) === null || _a === void 0 ? void 0 : _a.getLogFilePath()));
+            this.importDetails.push(localizeUtils_1.getLocalizedString("plugins.spfx.import.log.fail", (_a = context.logProvider) === null || _a === void 0 ? void 0 : _a.getLogFilePath()));
             await context.logProvider.logInFile(teamsfx_api_1.LogLevel.Info, this.importDetails.join(os_1.EOL));
-            void context.logProvider.error((0, localizeUtils_1.getLocalizedString)("plugins.spfx.import.log.fail", (_b = context.logProvider) === null || _b === void 0 ? void 0 : _b.getLogFilePath()));
+            void context.logProvider.error(localizeUtils_1.getLocalizedString("plugins.spfx.import.log.fail", (_b = context.logProvider) === null || _b === void 0 ? void 0 : _b.getLogFilePath()));
             if (error instanceof teamsfx_api_1.UserError || error instanceof teamsfx_api_1.SystemError) {
-                return (0, teamsfx_api_1.err)(error);
+                return teamsfx_api_1.err(error);
             }
-            return (0, teamsfx_api_1.err)((0, error_2.ImportSPFxSolutionError)(error));
+            return teamsfx_api_1.err(error_2.ImportSPFxSolutionError(error));
         }
     }
     async post(context, inputs, destinationPath, actionContext) {
         var _a, _b, _c, _d;
         try {
-            const spfxFolder = inputs[constants_1.QuestionNames.SPFxFolder];
+            const spfxFolder = inputs[questionNames_1.QuestionNames.SPFxFolder];
             await SPFxGenerator.updateSPFxTemplate(spfxFolder, destinationPath, this.importDetails);
-            this.importDetails.push((0, localizeUtils_1.getLocalizedString)("plugins.spfx.import.log.success", (_a = context.logProvider) === null || _a === void 0 ? void 0 : _a.getLogFilePath()));
+            this.importDetails.push(localizeUtils_1.getLocalizedString("plugins.spfx.import.log.success", (_a = context.logProvider) === null || _a === void 0 ? void 0 : _a.getLogFilePath()));
             await context.logProvider.logInFile(teamsfx_api_1.LogLevel.Info, this.importDetails.join(os_1.EOL));
-            void context.logProvider.info((0, localizeUtils_1.getLocalizedString)("plugins.spfx.import.log.success", (_b = context.logProvider) === null || _b === void 0 ? void 0 : _b.getLogFilePath()));
-            void context.userInteraction.showMessage("info", (0, localizeUtils_1.getLocalizedString)("plugins.spfx.import.success", destinationPath), false);
-            return (0, teamsfx_api_1.ok)({});
+            void context.logProvider.info(localizeUtils_1.getLocalizedString("plugins.spfx.import.log.success", (_b = context.logProvider) === null || _b === void 0 ? void 0 : _b.getLogFilePath()));
+            void context.userInteraction.showMessage("info", localizeUtils_1.getLocalizedString("plugins.spfx.import.success", destinationPath), false);
+            return teamsfx_api_1.ok(undefined);
         }
         catch (error) {
-            this.importDetails.push((0, localizeUtils_1.getLocalizedString)("plugins.spfx.import.log.fail", (_c = context.logProvider) === null || _c === void 0 ? void 0 : _c.getLogFilePath()));
+            this.importDetails.push(localizeUtils_1.getLocalizedString("plugins.spfx.import.log.fail", (_c = context.logProvider) === null || _c === void 0 ? void 0 : _c.getLogFilePath()));
             await context.logProvider.logInFile(teamsfx_api_1.LogLevel.Info, this.importDetails.join(os_1.EOL));
-            void context.logProvider.error((0, localizeUtils_1.getLocalizedString)("plugins.spfx.import.log.fail", (_d = context.logProvider) === null || _d === void 0 ? void 0 : _d.getLogFilePath()));
+            void context.logProvider.error(localizeUtils_1.getLocalizedString("plugins.spfx.import.log.fail", (_d = context.logProvider) === null || _d === void 0 ? void 0 : _d.getLogFilePath()));
             if (error instanceof teamsfx_api_1.UserError || error instanceof teamsfx_api_1.SystemError) {
-                return (0, teamsfx_api_1.err)(error);
+                return teamsfx_api_1.err(error);
             }
-            return (0, teamsfx_api_1.err)((0, error_2.ImportSPFxSolutionError)(error));
+            return teamsfx_api_1.err(error_2.ImportSPFxSolutionError(error));
         }
     }
 }