@microsoft/teamsfx-core 2.0.4-alpha.dc097d3df.0 → 2.0.4-alpha.e432bab97.0

package/build/component/generator/spfx/depsChecker/yoChecker.js

@@ -24,16 +24,16 @@ class YoChecker {
     async ensureLatestDependency(ctx) {
         telemetry_helper_1.telemetryHelper.sendSuccessEvent(ctx, telemetryEvents_1.TelemetryEvents.EnsureLatestYoStart);
         try {
-            this._logger.info(`${displayName} not found, installing...`);
+            void this._logger.info(`${displayName} not found, installing...`);
             await this.install();
-            this._logger.info(`Successfully installed ${displayName}`);
+            void this._logger.info(`Successfully installed ${displayName}`);
             telemetry_helper_1.telemetryHelper.sendSuccessEvent(ctx, telemetryEvents_1.TelemetryEvents.EnsureLatestYo);
         }
         catch (error) {
             telemetry_helper_1.telemetryHelper.sendErrorEvent(ctx, telemetryEvents_1.TelemetryEvents.EnsureLatestYo, error, {
                 [telemetryEvents_1.TelemetryProperty.EnsureLatestYoReason]: error.name,
             });
-            await this._logger.error(`Failed to install ${displayName}, error = '${error}'`);
+            this._logger.error(`Failed to install ${displayName}, error = '${error.toString()}'`);
             return teamsfx_api_1.err(error);
         }
         return teamsfx_api_1.ok(true);
@@ -41,7 +41,7 @@ class YoChecker {
     async isLatestInstalled() {
         try {
             const yoVersion = await this.queryVersion();
-            const latestYeomanVersion = await this.findLatestVersion(5);
+            const latestYeomanVersion = await this.findLatestVersion(10);
             const hasSentinel = await fs_extra_1.default.pathExists(this.getSentinelPath());
             return !!latestYeomanVersion && yoVersion === latestYeomanVersion && hasSentinel;
         }
@@ -50,17 +50,17 @@ class YoChecker {
         }
     }
     async install() {
-        this._logger.info("Start installing...");
+        void this._logger.info("Start installing...");
         await this.cleanup();
         await this.installYo();
-        this._logger.info("Validating package...");
+        void this._logger.info("Validating package...");
         if (!(await this.validate())) {
-            this._logger.debug("Failed to validate yo, cleaning up...");
+            void this._logger.debug("Failed to validate yo, cleaning up...");
             await this.cleanup();
             throw error_1.DependencyValidateError(name);
         }
     }
-    async getBinFolders() {
+    getBinFolders() {
         const defaultPath = this.getDefaultInstallPath();
         return [defaultPath, path.join(defaultPath, "node_modules", ".bin")];
     }
@@ -113,7 +113,7 @@ class YoChecker {
             }));
         }
         catch (err) {
-            await this._logger.error(`Failed to clean up path: ${this.getDefaultInstallPath()}, error: ${err}`);
+            this._logger.error(`Failed to clean up path: ${this.getDefaultInstallPath()}, error: ${err.toString()}`);
         }
     }
     async installYo() {
@@ -124,7 +124,7 @@ class YoChecker {
             await fs_extra_1.default.ensureFile(this.getSentinelPath());
         }
         catch (error) {
-            this._logger.error("Failed to execute npm install yo");
+            void this._logger.error("Failed to execute npm install yo");
             throw error_1.NpmInstallError(error);
         }
     }

package/build/component/generator/spfx/depsChecker/yoChecker.js.map

@@ -1 +1 @@
-{"version":3,"file":"yoChecker.js","sourceRoot":"","sources":["../../../../../src/component/generator/spfx/depsChecker/yoChecker.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"yoChecker.js","sourceRoot":"","sources":["../../../../../src/component/generator/spfx/depsChecker/yoChecker.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,gEAA0B;AAC1B,mDAA6B;AAC7B,+CAAyB;AACzB,wDAUgC;AAEhC,gEAA4D;AAC5D,8DAA8E;AAC9E,oCAAoE;AACpE,0EAAuE;AACvE,0CAAuD;AACvD,kDAA+C;AAE/C,MAAM,IAAI,GAAG,qBAAS,CAAC,iBAAiB,CAAC;AACzC,MAAM,WAAW,GAAG,GAAG,IAAI,IAAI,qBAAS,CAAC,aAAa,EAAE,CAAC;AACzD,MAAM,OAAO,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;AAE9B,MAAa,SAAS;IAGpB,YAAY,MAAmB;QAC7B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;IAEM,KAAK,CAAC,sBAAsB,CAAC,GAAY;QAC9C,kCAAe,CAAC,gBAAgB,CAAC,GAAG,EAAE,iCAAe,CAAC,mBAAmB,CAAC,CAAC;QAC3E,IAAI;YACF,KAAK,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,WAAW,2BAA2B,CAAC,CAAC;YAClE,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;YACrB,KAAK,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,0BAA0B,WAAW,EAAE,CAAC,CAAC;YAEhE,kCAAe,CAAC,gBAAgB,CAAC,GAAG,EAAE,iCAAe,CAAC,cAAc,CAAC,CAAC;SACvE;QAAC,OAAO,KAAK,EAAE;YACd,kCAAe,CAAC,cAAc,CAC5B,GAAG,EACH,iCAAe,CAAC,cAAc,EAC9B,KAAgC,EAChC;gBACE,CAAC,mCAAiB,CAAC,oBAAoB,CAAC,EAAG,KAAiC,CAAC,IAAI;aAClF,CACF,CAAC;YACF,IAAI,CAAC,OAAO,CAAC,KAAK,CAChB,qBAAqB,WAAW,cAAc,KAAK,CAAC,QAAQ,EAAY,GAAG,CAC5E,CAAC;YACF,OAAO,iBAAG,CAAC,KAAgC,CAAC,CAAC;SAC9C;QAED,OAAO,gBAAE,CAAC,IAAI,CAAC,CAAC;IAClB,CAAC;IAEM,KAAK,CAAC,iBAAiB;QAC5B,IAAI;YACF,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;YAC5C,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC;YAC7D,MAAM,WAAW,GAAG,MAAM,kBAAE,CAAC,UAAU,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;YAChE,OAAO,CAAC,CAAC,mBAAmB,IAAI,SAAS,KAAK,mBAAmB,IAAI,WAAW,CAAC;SAClF;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,KAAK,CAAC;SACd;IACH,CAAC;IAEM,KAAK,CAAC,OAAO;QAClB,KAAK,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;QAC9C,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACrB,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QAEvB,KAAK,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;QAChD,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC,EAAE;YAC5B,KAAK,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,uCAAuC,CAAC,CAAC;YACjE,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;YACrB,MAAM,+BAAuB,CAAC,IAAI,CAAC,CAAC;SACrC;IACH,CAAC;IAEM,aAAa;QAClB,MAAM,WAAW,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC;QACjD,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,EAAE,MAAM,CAAC,CAAC,CAAC;IACvE,CAAC;IAEM,KAAK,CAAC,4BAA4B,CACvC,gBAAyB;QAEzB,OAAO,MAAM,aAAK,CAAC,4BAA4B,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,GAAI,CAAC,CAAC,CAAC;IAC7F,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAAC,gBAAwB;QACrD,OAAO,MAAM,aAAK,CAAC,iBAAiB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,gBAAgB,CAAC,CAAC;IAC7E,CAAC;IAEO,KAAK,CAAC,QAAQ;QACpB,OAAO,MAAM,kBAAE,CAAC,UAAU,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;IACrD,CAAC;IAEO,qBAAqB;QAC3B,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,IAAI,8BAAgB,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;IACtE,CAAC;IAEO,eAAe;QACrB,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,IAAI,8BAAgB,EAAE,EAAE,aAAa,CAAC,CAAC;IACxE,CAAC;IAEO,KAAK,CAAC,YAAY;;QACxB,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAC3B,IAAI,CAAC,qBAAqB,EAAE,EAC5B,cAAc,EACd,IAAI,EACJ,cAAc,CACf,CAAC;QACF,IAAI,MAAM,kBAAE,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE;YACpC,MAAM,WAAW,GAAG,MAAM,kBAAE,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;YACnD,OAAO,MAAA,WAAW,CAAC,OAAO,mCAAI,SAAS,CAAC;SACzC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAEO,KAAK,CAAC,OAAO;QACnB,IAAI;YACF,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,IAAI,8BAAgB,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;YACvF,IAAI,kBAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE;gBAClC,MAAM,kBAAE,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;gBACnC,MAAM,kBAAE,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;aACjC;YAED,MAAM,kBAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,qBAAqB,EAAE,CAAC,CAAC;YAChD,MAAM,kBAAE,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;YAExC,MAAM,aAAa,GAAG;gBACpB,IAAI;gBACJ,QAAQ;gBACR,QAAQ;gBACR,aAAa;gBACb,iBAAiB;gBACjB,iBAAiB;aAClB,CAAC;YACF,MAAM,OAAO,CAAC,GAAG,CACf,aAAa,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE;gBACrC,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE,EAAE,UAAU,CAAC,CAAC;gBAC3E,IAAI,MAAM,kBAAE,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE;oBACvC,MAAM,kBAAE,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;iBACjC;YACH,CAAC,CAAC,CACH,CAAC;SACH;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,CAAC,OAAO,CAAC,KAAK,CAChB,4BAA4B,IAAI,CAAC,qBAAqB,EAAE,YACtD,GAAG,CAAC,QAAQ,EACd,EAAE,CACH,CAAC;SACH;IACH,CAAC;IAEO,KAAK,CAAC,SAAS;QACrB,IAAI;YACF,MAAM,OAAO,GAAG,qBAAS,CAAC,aAAa,CAAC;YACxC,MAAM,kBAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE,EAAE,cAAc,CAAC,CAAC,CAAC;YAC5E,MAAM,iBAAO,CAAC,cAAc,CAC1B,SAAS,EACT,IAAI,CAAC,OAAO,EACZ,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,EAClC,sBAAc,CAAC,KAAK,CAAC,EACrB,SAAS,EACT,GAAG,IAAI,IAAI,OAAO,EAAE,EACpB,UAAU,EACV,GAAG,IAAI,CAAC,qBAAqB,EAAE,EAAE,EACjC,YAAY,EACZ,gBAAgB,CACjB,CAAC;YAEF,MAAM,kBAAE,CAAC,UAAU,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;SAC7C;QAAC,OAAO,KAAK,EAAE;YACd,KAAK,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAC;YAC5D,MAAM,uBAAe,CAAC,KAAc,CAAC,CAAC;SACvC;IACH,CAAC;CACF;AA7JD,8BA6JC"}

package/build/component/generator/spfx/error.d.ts

@@ -5,7 +5,9 @@ export declare function DependencyValidateError(dependency: string): SystemError
 export declare function DevEnvironmentSetupError(): UserError;
 export declare function LatestPackageInstallError(): SystemError;
 export declare function YoGeneratorScaffoldError(): UserError;
+export declare function CopyExistingSPFxSolutionError(e: Error): UserError;
 export declare function RetrieveSPFxInfoError(): UserError;
+export declare function UpdateSPFxTemplateError(e: Error): UserError;
 export declare function ImportSPFxSolutionError(e: Error): UserError;
 export declare function PathAlreadyExistsError(path: string): UserError;
 //# sourceMappingURL=error.d.ts.map

package/build/component/generator/spfx/error.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"error.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/spfx/error.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAIhE,wBAAgB,aAAa,CAAC,KAAK,EAAE,KAAK,GAAG,SAAS,GAAG,WAAW,CAUnE;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,KAAK,GAAG,WAAW,CAOzD;AAED,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,MAAM,GAAG,WAAW,CAOvE;AAED,wBAAgB,wBAAwB,IAAI,SAAS,CAQpD;AAED,wBAAgB,yBAAyB,IAAI,WAAW,CAgBvD;AAED,wBAAgB,wBAAwB,IAAI,SAAS,CAcpD;AAED,wBAAgB,qBAAqB,IAAI,SAAS,CAQjD;AAED,wBAAgB,uBAAuB,CAAC,CAAC,EAAE,KAAK,GAAG,SAAS,CAQ3D;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAO9D"}
+{"version":3,"file":"error.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/spfx/error.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAIhE,wBAAgB,aAAa,CAAC,KAAK,EAAE,KAAK,GAAG,SAAS,GAAG,WAAW,CAUnE;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,KAAK,GAAG,WAAW,CAOzD;AAED,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,MAAM,GAAG,WAAW,CAOvE;AAED,wBAAgB,wBAAwB,IAAI,SAAS,CAQpD;AAED,wBAAgB,yBAAyB,IAAI,WAAW,CAgBvD;AAED,wBAAgB,wBAAwB,IAAI,SAAS,CAcpD;AAED,wBAAgB,6BAA6B,CAAC,CAAC,EAAE,KAAK,GAAG,SAAS,CAQjE;AAED,wBAAgB,qBAAqB,IAAI,SAAS,CAQjD;AAED,wBAAgB,uBAAuB,CAAC,CAAC,EAAE,KAAK,GAAG,SAAS,CAQ3D;AAED,wBAAgB,uBAAuB,CAAC,CAAC,EAAE,KAAK,GAAG,SAAS,CAQ3D;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAO9D"}

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

@@ -2,7 +2,7 @@
 // Licensed under the MIT license.
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PathAlreadyExistsError = exports.ImportSPFxSolutionError = exports.RetrieveSPFxInfoError = exports.YoGeneratorScaffoldError = exports.LatestPackageInstallError = exports.DevEnvironmentSetupError = exports.DependencyValidateError = exports.NpmInstallError = exports.ScaffoldError = void 0;
+exports.PathAlreadyExistsError = exports.ImportSPFxSolutionError = exports.UpdateSPFxTemplateError = exports.RetrieveSPFxInfoError = exports.CopyExistingSPFxSolutionError = exports.YoGeneratorScaffoldError = exports.LatestPackageInstallError = exports.DevEnvironmentSetupError = exports.DependencyValidateError = exports.NpmInstallError = exports.ScaffoldError = void 0;
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const constants_1 = require("./utils/constants");
 const localizeUtils_1 = require("../../../common/localizeUtils");
@@ -52,6 +52,16 @@ function YoGeneratorScaffoldError() {
     });
 }
 exports.YoGeneratorScaffoldError = YoGeneratorScaffoldError;
+function CopyExistingSPFxSolutionError(e) {
+    return new teamsfx_api_1.UserError({
+        source: constants_1.Constants.PLUGIN_NAME,
+        name: "CopyExistingSPFxSolutioinFailed",
+        message: localizeUtils_1.getDefaultString("plugins.spfx.error.import.copySPFxSolution", e.message),
+        displayMessage: localizeUtils_1.getLocalizedString("plugins.spfx.error.import.copySPFxSolution", e.message),
+        helpLink: constants_1.Constants.IMPORT_HELP_LINK,
+    });
+}
+exports.CopyExistingSPFxSolutionError = CopyExistingSPFxSolutionError;
 function RetrieveSPFxInfoError() {
     return new teamsfx_api_1.UserError({
         source: constants_1.Constants.PLUGIN_NAME,
@@ -62,6 +72,16 @@ function RetrieveSPFxInfoError() {
     });
 }
 exports.RetrieveSPFxInfoError = RetrieveSPFxInfoError;
+function UpdateSPFxTemplateError(e) {
+    return new teamsfx_api_1.UserError({
+        source: constants_1.Constants.PLUGIN_NAME,
+        name: "UpdateSPFxTemplateFailed",
+        message: localizeUtils_1.getDefaultString("plugins.spfx.error.import.updateSPFxTemplate", e.message),
+        displayMessage: localizeUtils_1.getLocalizedString("plugins.spfx.error.import.updateSPFxTemplate", e.message),
+        helpLink: constants_1.Constants.IMPORT_HELP_LINK,
+    });
+}
+exports.UpdateSPFxTemplateError = UpdateSPFxTemplateError;
 function ImportSPFxSolutionError(e) {
     return new teamsfx_api_1.UserError({
         source: constants_1.Constants.PLUGIN_NAME,

package/build/component/generator/spfx/error.js.map

@@ -1 +1 @@
-{"version":3,"file":"error.js","sourceRoot":"","sources":["../../../../src/component/generator/spfx/error.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"error.js","sourceRoot":"","sources":["../../../../src/component/generator/spfx/error.ts"],"names":[],"mappings":"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"}

package/build/component/generator/spfx/spfxGenerator.d.ts

@@ -1,10 +1,13 @@
 import { Context, FxError, Inputs, Result } from "@microsoft/teamsfx-api";
+import { ActionContext } from "../../middleware/actionExecutionMW";
 export declare class SPFxGenerator {
-    static generate(context: Context, inputs: Inputs, destinationPath: string): Promise<Result<undefined, FxError>>;
+    static generate(context: Context, inputs: Inputs, destinationPath: string, actionContext?: ActionContext): Promise<Result<undefined, FxError>>;
     private static newSPFxProject;
     private static importSPFxProject;
     static doYeomanScaffold(context: Context, inputs: Inputs, destinationPath: string): Promise<Result<string, FxError>>;
     static getSolutionName(spfxFolder: string): Promise<string | undefined>;
+    private static copySPFxSolution;
     private static getWebpartManifest;
+    private static updateSPFxTemplate;
 }
 //# sourceMappingURL=spfxGenerator.d.ts.map

package/build/component/generator/spfx/spfxGenerator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"spfxGenerator.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/spfx/spfxGenerator.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,OAAO,EAEP,OAAO,EACP,MAAM,EAIN,MAAM,EAIP,MAAM,wBAAwB,CAAC;AA8BhC,qBAAa,aAAa;WASJ,QAAQ,CAC1B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;mBAQjB,cAAc;mBAmBd,iBAAiB;WAoQlB,gBAAgB,CAClC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;WA8Kf,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;mBAa/D,kBAAkB;CAmCxC"}
+{"version":3,"file":"spfxGenerator.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/spfx/spfxGenerator.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,OAAO,EAEP,OAAO,EACP,MAAM,EAKN,MAAM,EAIP,MAAM,wBAAwB,CAAC;AAahC,OAAO,EAAE,aAAa,EAAqB,MAAM,oCAAoC,CAAC;AAqBtF,qBAAa,aAAa;WASJ,QAAQ,CAC1B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;mBAajB,cAAc;mBAmBd,iBAAiB;WA8GlB,gBAAgB,CAClC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;WAqLf,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;mBAa/D,gBAAgB;mBAehB,kBAAkB;mBAoClB,kBAAkB;CAgKxC"}

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

@@ -11,6 +11,7 @@ const lodash_1 = require("lodash");
 const os_1 = require("os");
 const path = tslib_1.__importStar(require("path"));
 const util = tslib_1.__importStar(require("util"));
+const lodash_2 = require("lodash");
 const deps_checker_1 = require("../../../common/deps-checker");
 const localizeUtils_1 = require("../../../common/localizeUtils");
 const error_1 = require("../../../error");
@@ -28,13 +29,18 @@ const progress_helper_1 = require("./utils/progress-helper");
 const create_1 = require("../../../question/create");
 const telemetryEvents_1 = require("./utils/telemetryEvents");
 const utils_1 = require("./utils/utils");
+const semver_1 = tslib_1.__importDefault(require("semver"));
 class SPFxGenerator {
-    static async generate(context, inputs, destinationPath) {
-        if (inputs[questionNames_1.QuestionNames.SPFxSolution] === "new") {
+    static async generate(context, inputs, destinationPath, actionContext) {
+        const spfxSolution = inputs[questionNames_1.QuestionNames.SPFxSolution];
+        lodash_2.merge(actionContext === null || actionContext === void 0 ? void 0 : actionContext.telemetryProps, {
+            [telemetryEvents_1.TelemetryProperty.SPFxSolution]: spfxSolution,
+        });
+        if (spfxSolution === "new") {
             return await this.newSPFxProject(context, inputs, destinationPath);
         }
         else {
-            return await this.importSPFxProject(context, inputs, destinationPath);
+            return await this.importSPFxProject(context, inputs, destinationPath, actionContext);
         }
     }
     static async newSPFxProject(context, inputs, destinationPath) {
@@ -46,10 +52,10 @@ class SPFxGenerator {
             return teamsfx_api_1.err(templateRes.error);
         return teamsfx_api_1.ok(undefined);
     }
-    static async importSPFxProject(context, inputs, destinationPath) {
-        var _a, _b, _c, _d, _e, _f;
+    static async importSPFxProject(context, inputs, destinationPath, actionContext) {
+        var _a, _b, _c, _d;
         const importProgress = context.userInteraction.createProgressBar(localizeUtils_1.getLocalizedString("plugins.spfx.import.title"), 3);
-        importProgress.start();
+        await importProgress.start();
         const importDetails = [];
         try {
             // Copy & paste existing SPFx solution
@@ -58,14 +64,7 @@ class SPFxGenerator {
             const destSpfxFolder = path.join(destinationPath, "src");
             importDetails.push(os_1.EOL +
                 `(.) Processing: Copying existing SPFx solution from ${spfxFolder} to ${destSpfxFolder}...`);
-            await fs_extra_1.default.ensureDir(destSpfxFolder);
-            await fs_extra_1.default.copy(spfxFolder, destSpfxFolder, {
-                overwrite: true,
-                recursive: true,
-                filter: (file) => {
-                    return file.indexOf("node_modules") < 0;
-                },
-            });
+            await this.copySPFxSolution(spfxFolder, destSpfxFolder);
             importDetails.push(`(√) Done: Succeeded to copy existing SPFx solution.`);
             // Retrieve solution info to generate template
             await importProgress.next(localizeUtils_1.getLocalizedString("plugins.spfx.import.generateSPFxTemplates"));
@@ -89,7 +88,7 @@ class SPFxGenerator {
             context.templateVariables["webpartName"] =
                 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");
+            const templateRes = await generator_1.Generator.generateTemplate(context, destinationPath, constants_2.Constants.IMPORT_TEMPLATE_NAME, "ts");
             if (templateRes.isErr()) {
                 importDetails.push(`(×) Error: Failed to generate SPFx project templates!`);
                 throw templateRes.error;
@@ -97,110 +96,23 @@ class SPFxGenerator {
             importDetails.push(`(√) Done: Succeeded to generate SPFx project templates.`);
             // Update manifest and related files
             await importProgress.next(localizeUtils_1.getLocalizedString("plugins.spfx.import.updateTemplates"));
-            importDetails.push(`(.) Processing: Loading manifest.local.json...`);
-            const localManifestRes = await ManifestUtils_1.manifestUtils._readAppManifest(path.join(destinationPath, teamsfx_api_1.AppPackageFolderName, "manifest.local.json"));
-            if (localManifestRes.isErr())
-                throw localManifestRes.error;
-            const localManifest = localManifestRes.value;
-            importDetails.push(`(√) Done: Succeeded to load manifest.local.json.`);
-            importDetails.push(`(.) Processing: Loading manifest.json...`);
-            const remoteManifestRes = await ManifestUtils_1.manifestUtils._readAppManifest(path.join(destinationPath, teamsfx_api_1.AppPackageFolderName, "manifest.json"));
-            if (remoteManifestRes.isErr())
-                throw remoteManifestRes.error;
-            let remoteManifest = remoteManifestRes.value;
-            importDetails.push(`(√) Done: Succeeded to load manifest.json.`);
-            const webpartsDir = path.join(spfxFolder, "src", "webparts");
-            const webparts = (await fs_extra_1.default.readdir(webpartsDir)).filter(async (file) => fs_extra_1.default.statSync(path.join(webpartsDir, file)).isDirectory());
-            if (webparts.length > 1) {
-                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 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(webpartManifestPath, "utf8"))
-                        .toString()
-                        .replace(matchHashComment, "")
-                        .trim());
-                    importDetails.push(` [${i}] Adding web part to Teams manifest with component id: ${webpartManifest["id"]}, web part name: ${webpartManifest["preconfiguredEntries"][0].title.default}...`);
-                    const componentId = webpartManifest["id"];
-                    const webpartName = webpartManifest["preconfiguredEntries"][0].title.default;
-                    const remoteStaticSnippet = {
-                        entityId: componentId,
-                        name: webpartName,
-                        contentUrl: util.format(constants_2.ManifestTemplate.REMOTE_CONTENT_URL, componentId),
-                        websiteUrl: constants_2.ManifestTemplate.WEBSITE_URL,
-                        scopes: ["personal"],
-                    };
-                    const localStaticSnippet = {
-                        entityId: componentId,
-                        name: webpartName,
-                        contentUrl: util.format(constants_2.ManifestTemplate.LOCAL_CONTENT_URL, componentId),
-                        websiteUrl: constants_2.ManifestTemplate.WEBSITE_URL,
-                        scopes: ["personal"],
-                    };
-                    (_a = localManifest.staticTabs) === null || _a === void 0 ? void 0 : _a.push(localStaticSnippet);
-                    (_b = remoteManifest.staticTabs) === null || _b === void 0 ? void 0 : _b.push(remoteStaticSnippet);
-                }
-                importDetails.push(`(√) Done: Succeeded to expose additional web parts in Teams manifest.`);
-            }
-            if (await fs_extra_1.default.pathExists(path.join(spfxFolder, "teams", "manifest.json"))) {
-                importDetails.push(`(.) Processing: There's existing Teams manifest under ${path.join(spfxFolder, "teams", "manifest.json")}, updating default template...`);
-                const existingManifest = await fs_extra_1.default.readJson(path.join(spfxFolder, "teams", "manifest.json"));
-                importDetails.push(`(.) Processing: Writing existing app id in manifest.json to TEAMS_APP_ID in env.dev...`);
-                await envUtil_1.envUtil.writeEnv(destinationPath, "dev", { TEAMS_APP_ID: existingManifest.id });
-                importDetails.push(`(√) Done: Succeeded to write existing app id to env.dev.`);
-                importDetails.push(`(.) Processing: Updating default manifest with existing one...`);
-                existingManifest.$schema = remoteManifest.$schema;
-                existingManifest.manifestVersion = remoteManifest.manifestVersion;
-                existingManifest.id = remoteManifest.id;
-                existingManifest.icons = remoteManifest.icons;
-                existingManifest.staticTabs = remoteManifest.staticTabs;
-                existingManifest.configurableTabs = remoteManifest.configurableTabs;
-                remoteManifest = existingManifest;
-            }
-            importDetails.push(`(.) Processing: Writing to save changes to manifest.local.json...`);
-            await ManifestUtils_1.manifestUtils._writeAppManifest(localManifest, path.join(destinationPath, teamsfx_api_1.AppPackageFolderName, "manifest.local.json"));
-            importDetails.push(`(√) Done: Succeeded to write manifest.local.json.`);
-            importDetails.push(`(.) Processing: Writing to save changes to manifest.json...`);
-            await ManifestUtils_1.manifestUtils._writeAppManifest(remoteManifest, path.join(destinationPath, teamsfx_api_1.AppPackageFolderName, "manifest.json"));
-            importDetails.push(`(√) Done: Succeeded to write manifest.json.`);
-            let colorUpdated = false, outlineUpdated = false;
-            if (await fs_extra_1.default.pathExists(path.join(spfxFolder, "teams"))) {
-                for (const file of await fs_extra_1.default.readdir(path.join(spfxFolder, "teams"))) {
-                    if (file.endsWith("color.png") && !colorUpdated) {
-                        importDetails.push(`(.) Processing: Updating color.png with existing ${path.join(spfxFolder, "teams", file)}`);
-                        await fs_extra_1.default.copyFile(path.join(spfxFolder, "teams", file), path.join(destinationPath, teamsfx_api_1.AppPackageFolderName, "color.png"));
-                        colorUpdated = true;
-                        importDetails.push(`(√) Done: Succeeded to update color.png.`);
-                    }
-                    if (file.endsWith("outline.png") && !outlineUpdated) {
-                        importDetails.push(`(.) Processing: Updating outline.png with existing ${path.join(spfxFolder, "teams", file)}`);
-                        await fs_extra_1.default.copyFile(path.join(spfxFolder, "teams", file), path.join(destinationPath, teamsfx_api_1.AppPackageFolderName, "outline.png"));
-                        outlineUpdated = true;
-                        importDetails.push(`(√) Done: Succeeded to update outline.png.`);
-                    }
-                }
-            }
+            await this.updateSPFxTemplate(spfxFolder, destinationPath, importDetails);
         }
         catch (error) {
             await importProgress.end(false);
-            importDetails.push(localizeUtils_1.getLocalizedString("plugins.spfx.import.log.fail", (_c = context.logProvider) === null || _c === void 0 ? void 0 : _c.getLogFilePath()));
-            context.logProvider.info(importDetails.join(os_1.EOL), true);
-            context.logProvider.error(localizeUtils_1.getLocalizedString("plugins.spfx.import.log.fail", (_d = context.logProvider) === null || _d === void 0 ? void 0 : _d.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(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 teamsfx_api_1.err(error);
             }
             return teamsfx_api_1.err(error_2.ImportSPFxSolutionError(error));
         }
         await importProgress.end(true);
-        importDetails.push(localizeUtils_1.getLocalizedString("plugins.spfx.import.log.success", (_e = context.logProvider) === null || _e === void 0 ? void 0 : _e.getLogFilePath()));
-        context.logProvider.info(importDetails.join(os_1.EOL), true);
-        context.logProvider.info(localizeUtils_1.getLocalizedString("plugins.spfx.import.log.success", (_f = context.logProvider) === null || _f === void 0 ? void 0 : _f.getLogFilePath()));
-        context.userInteraction.showMessage("info", localizeUtils_1.getLocalizedString("plugins.spfx.import.success", destinationPath), false);
+        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(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) {
@@ -220,7 +132,7 @@ class SPFxGenerator {
             const spGeneratorChecker = new generatorChecker_1.GeneratorChecker(context.logProvider);
             if (shouldInstallLocally) {
                 const latestYoInstalled = await yoChecker.isLatestInstalled();
-                const latestGeneratorInstalled = await spGeneratorChecker.isLatestInstalled();
+                const latestGeneratorInstalled = await spGeneratorChecker.isLatestInstalled(inputs.latestSpfxPackageVersion);
                 if (!latestYoInstalled || !latestGeneratorInstalled) {
                     await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.next(localizeUtils_1.getLocalizedString("plugins.spfx.scaffold.dependencyInstall")));
                     if (!latestYoInstalled) {
@@ -238,7 +150,8 @@ class SPFxGenerator {
                 }
             }
             else {
-                const isLowerVersion = create_1.PackageSelectOptionsHelper.isLowerThanRecommendedVersion();
+                const isLowerVersion = !!inputs.globalSpfxPackageVersion &&
+                    semver_1.default.lte(inputs.globalSpfxPackageVersion, constants_2.Constants.RecommendedLowestSpfxVersion.substring(1));
                 if (isLowerVersion) {
                     context.telemetryReporter.sendTelemetryEvent(telemetryEvents_1.TelemetryEvents.UseNotRecommendedVersion);
                 }
@@ -252,12 +165,12 @@ class SPFxGenerator {
             const yoEnv = process.env;
             if (yoEnv.PATH) {
                 yoEnv.PATH = shouldInstallLocally
-                    ? `${await (await yoChecker.getBinFolders()).join(path.delimiter)}${path.delimiter}${(_a = process.env.PATH) !== null && _a !== void 0 ? _a : ""}`
+                    ? `${yoChecker.getBinFolders().join(path.delimiter)}${path.delimiter}${(_a = process.env.PATH) !== null && _a !== void 0 ? _a : ""}`
                     : process.env.PATH;
             }
             else {
                 yoEnv.Path = shouldInstallLocally
-                    ? `${await (await yoChecker.getBinFolders()).join(path.delimiter)}${path.delimiter}${(_b = process.env.Path) !== null && _b !== void 0 ? _b : ""}`
+                    ? `${yoChecker.getBinFolders().join(path.delimiter)}${path.delimiter}${(_b = process.env.Path) !== null && _b !== void 0 ? _b : ""}`
                     : process.env.Path;
             }
             const args = [
@@ -289,7 +202,7 @@ class SPFxGenerator {
             }
             catch (yoError) {
                 if (yoError.message) {
-                    context.logProvider.error(yoError.message);
+                    void context.logProvider.error(yoError.message);
                 }
                 throw error_2.YoGeneratorScaffoldError();
             }
@@ -347,10 +260,25 @@ class SPFxGenerator {
         }
         return undefined;
     }
+    static async copySPFxSolution(src, dest) {
+        try {
+            await fs_extra_1.default.ensureDir(dest);
+            await fs_extra_1.default.copy(src, dest, {
+                overwrite: true,
+                recursive: true,
+                filter: (file) => {
+                    return file.indexOf("node_modules") < 0;
+                },
+            });
+        }
+        catch (e) {
+            throw error_2.CopyExistingSPFxSolutionError(e);
+        }
+    }
     static async getWebpartManifest(spfxFolder) {
         const webpartsDir = path.join(spfxFolder, "src", "webparts");
         if (await fs_extra_1.default.pathExists(webpartsDir)) {
-            const webparts = (await fs_extra_1.default.readdir(webpartsDir)).filter(async (file) => fs_extra_1.default.statSync(path.join(webpartsDir, file)).isDirectory());
+            const webparts = (await fs_extra_1.default.readdir(webpartsDir)).filter((file) => fs_extra_1.default.statSync(path.join(webpartsDir, file)).isDirectory());
             if (webparts.length < 1) {
                 return undefined;
             }
@@ -368,6 +296,102 @@ class SPFxGenerator {
         }
         return undefined;
     }
+    static async updateSPFxTemplate(spfxFolder, destinationPath, importDetails) {
+        var _a, _b;
+        try {
+            importDetails.push(`(.) Processing: Loading manifest.local.json...`);
+            const localManifestRes = await ManifestUtils_1.manifestUtils._readAppManifest(path.join(destinationPath, teamsfx_api_1.AppPackageFolderName, "manifest.local.json"));
+            if (localManifestRes.isErr())
+                throw localManifestRes.error;
+            const localManifest = localManifestRes.value;
+            importDetails.push(`(√) Done: Succeeded to load manifest.local.json.`);
+            importDetails.push(`(.) Processing: Loading manifest.json...`);
+            const remoteManifestRes = await ManifestUtils_1.manifestUtils._readAppManifest(path.join(destinationPath, teamsfx_api_1.AppPackageFolderName, "manifest.json"));
+            if (remoteManifestRes.isErr())
+                throw remoteManifestRes.error;
+            let remoteManifest = remoteManifestRes.value;
+            importDetails.push(`(√) Done: Succeeded to load manifest.json.`);
+            const webpartsDir = path.join(spfxFolder, "src", "webparts");
+            const webparts = (await fs_extra_1.default.readdir(webpartsDir)).filter((file) => fs_extra_1.default.statSync(path.join(webpartsDir, file)).isDirectory());
+            if (webparts.length > 1) {
+                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 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(webpartManifestPath, "utf8"))
+                        .toString()
+                        .replace(matchHashComment, "")
+                        .trim());
+                    importDetails.push(` [${i}] Adding web part to Teams manifest with component id: ${webpartManifest["id"]}, web part name: ${webpartManifest["preconfiguredEntries"][0].title.default}...`);
+                    const componentId = webpartManifest["id"];
+                    const webpartName = webpartManifest["preconfiguredEntries"][0].title.default;
+                    const remoteStaticSnippet = {
+                        entityId: componentId,
+                        name: webpartName,
+                        contentUrl: util.format(constants_2.ManifestTemplate.REMOTE_CONTENT_URL, componentId),
+                        websiteUrl: constants_2.ManifestTemplate.WEBSITE_URL,
+                        scopes: ["personal"],
+                    };
+                    const localStaticSnippet = {
+                        entityId: componentId,
+                        name: webpartName,
+                        contentUrl: util.format(constants_2.ManifestTemplate.LOCAL_CONTENT_URL, componentId),
+                        websiteUrl: constants_2.ManifestTemplate.WEBSITE_URL,
+                        scopes: ["personal"],
+                    };
+                    (_a = localManifest.staticTabs) === null || _a === void 0 ? void 0 : _a.push(localStaticSnippet);
+                    (_b = remoteManifest.staticTabs) === null || _b === void 0 ? void 0 : _b.push(remoteStaticSnippet);
+                }
+                importDetails.push(`(√) Done: Succeeded to expose additional web parts in Teams manifest.`);
+            }
+            if (await fs_extra_1.default.pathExists(path.join(spfxFolder, "teams", "manifest.json"))) {
+                importDetails.push(`(.) Processing: There's existing Teams manifest under ${path.join(spfxFolder, "teams", "manifest.json")}, updating default template...`);
+                const existingManifest = await fs_extra_1.default.readJson(path.join(spfxFolder, "teams", "manifest.json"));
+                importDetails.push(`(.) Processing: Writing existing app id in manifest.json to TEAMS_APP_ID in env.dev...`);
+                await envUtil_1.envUtil.writeEnv(destinationPath, "dev", { TEAMS_APP_ID: existingManifest.id });
+                importDetails.push(`(√) Done: Succeeded to write existing app id to env.dev.`);
+                importDetails.push(`(.) Processing: Updating default manifest with existing one...`);
+                existingManifest.$schema = remoteManifest.$schema;
+                existingManifest.manifestVersion = remoteManifest.manifestVersion;
+                existingManifest.id = remoteManifest.id;
+                existingManifest.icons = remoteManifest.icons;
+                existingManifest.staticTabs = remoteManifest.staticTabs;
+                existingManifest.configurableTabs = remoteManifest.configurableTabs;
+                remoteManifest = existingManifest;
+            }
+            importDetails.push(`(.) Processing: Writing to save changes to manifest.local.json...`);
+            await ManifestUtils_1.manifestUtils._writeAppManifest(localManifest, path.join(destinationPath, teamsfx_api_1.AppPackageFolderName, "manifest.local.json"));
+            importDetails.push(`(√) Done: Succeeded to write manifest.local.json.`);
+            importDetails.push(`(.) Processing: Writing to save changes to manifest.json...`);
+            await ManifestUtils_1.manifestUtils._writeAppManifest(remoteManifest, path.join(destinationPath, teamsfx_api_1.AppPackageFolderName, "manifest.json"));
+            importDetails.push(`(√) Done: Succeeded to write manifest.json.`);
+            let colorUpdated = false, outlineUpdated = false;
+            if (await fs_extra_1.default.pathExists(path.join(spfxFolder, "teams"))) {
+                for (const file of await fs_extra_1.default.readdir(path.join(spfxFolder, "teams"))) {
+                    if (file.endsWith("color.png") && !colorUpdated) {
+                        importDetails.push(`(.) Processing: Updating color.png with existing ${path.join(spfxFolder, "teams", file)}`);
+                        await fs_extra_1.default.copyFile(path.join(spfxFolder, "teams", file), path.join(destinationPath, teamsfx_api_1.AppPackageFolderName, "color.png"));
+                        colorUpdated = true;
+                        importDetails.push(`(√) Done: Succeeded to update color.png.`);
+                    }
+                    if (file.endsWith("outline.png") && !outlineUpdated) {
+                        importDetails.push(`(.) Processing: Updating outline.png with existing ${path.join(spfxFolder, "teams", file)}`);
+                        await fs_extra_1.default.copyFile(path.join(spfxFolder, "teams", file), path.join(destinationPath, teamsfx_api_1.AppPackageFolderName, "outline.png"));
+                        outlineUpdated = true;
+                        importDetails.push(`(√) Done: Succeeded to update outline.png.`);
+                    }
+                }
+            }
+        }
+        catch (e) {
+            throw error_2.UpdateSPFxTemplateError(e);
+        }
+    }
 }
 tslib_1.__decorate([
     lib_1.hooks([
@@ -379,7 +403,7 @@ tslib_1.__decorate([
         }),
     ]),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object, Object, String]),
+    tslib_1.__metadata("design:paramtypes", [Object, Object, String, Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], SPFxGenerator, "generate", null);
 exports.SPFxGenerator = SPFxGenerator;