@microsoft/teamsfx-core 3.0.11 → 3.0.12-alpha.0a63a75aae.0

package/build/component/generator/other/tdpGenerator.js

@@ -16,10 +16,7 @@ const generator_1 = require("../generator");
  * TdpGenerator is used to generate code from TDP app definition.
  */
 class TdpGenerator extends defaultGenerator_1.DefaultTemplateGenerator {
-    constructor() {
-        super(...arguments);
-        this.componentName = "tdp-generator";
-    }
+    componentName = "tdp-generator";
     // activation condition
     activate(context, inputs) {
         // Reuse some templates which are handled by other generators
@@ -39,7 +36,10 @@ class TdpGenerator extends defaultGenerator_1.DefaultTemplateGenerator {
             {
                 templateName: templateName,
                 language: language,
-                replaceMap: Object.assign(Object.assign({}, generator_1.Generator.getDefaultVariables(appName, safeProjectNameFromVS, solutionNameFromVS, inputs.targetFramework, inputs.placeProjectFileInSolutionDir === "true")), { IsNet8Framework: isNet8 ? "true" : "" }),
+                replaceMap: {
+                    ...generator_1.Generator.getDefaultVariables(appName, safeProjectNameFromVS, solutionNameFromVS, inputs.targetFramework, inputs.placeProjectFileInSolutionDir === "true"),
+                    IsNet8Framework: isNet8 ? "true" : "",
+                },
             },
         ]));
     }

package/build/component/generator/other/tdpGenerator.js.map

@@ -1 +1 @@
-{"version":3,"file":"tdpGenerator.js","sourceRoot":"","sources":["../../../../src/component/generator/other/tdpGenerator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC;;GAEG;AAEH,wDAAoG;AACpG,0CAAsD;AACtD,2DAAiF;AACjF,qFAAkF;AAElF,0DAA+D;AAC/D,4CAAyC;AAGzC;;GAEG;AACH,MAAa,YAAa,SAAQ,2CAAwB;IAA1D;;QACE,kBAAa,GAAG,eAAe,CAAC;IA6DlC,CAAC;IA3DC,uBAAuB;IACP,QAAQ,CAAC,OAAgB,EAAE,MAAc;QACvD,6DAA6D;QAC7D,OAAO,MAAM,CAAC,eAAe,KAAK,SAAS,CAAC;IAC9C,CAAC;IAEe,KAAK,CAAC,gBAAgB,CACpC,OAAgB,EAChB,MAAc,EACd,eAAuB,EACvB,aAA6B;QAE7B,MAAM,YAAY,GAAG,MAAM,CAAC,yBAAa,CAAC,YAAY,CAAC,CAAC;QACxD,IAAI,CAAC,YAAY,EAAE;YACjB,OAAO,IAAA,iBAAG,EACR,IAAI,4BAAoB,CAAC,iBAAiB,EAAE,wBAAwB,EAAE,cAAc,CAAC,CACtF,CAAC;SACH;QACD,MAAM,OAAO,GAAG,MAAM,CAAC,yBAAa,CAAC,OAAO,CAAC,CAAC;QAC9C,MAAM,qBAAqB,GAAG,MAAM,CAAC,yBAAa,CAAC,eAAe,CAAC,CAAC;QACpE,MAAM,kBAAkB,GAAG,MAAM,CAAC,yBAAa,CAAC,YAAY,CAAC,CAAC;QAC9D,MAAM,MAAM,GAAG,CAAC,MAAM,CAAC,eAAe,IAAI,MAAM,CAAC,eAAe,KAAK,QAAQ,CAAC,CAAC,kBAAkB;QACjG,MAAM,QAAQ,GAAG,MAAM,CAAC,yBAAa,CAAC,mBAAmB,CAAwB,CAAC;QAClF,OAAO,OAAO,CAAC,OAAO,CACpB,IAAA,gBAAE,EAAC;YACD;gBACE,YAAY,EAAE,YAAY;gBAC1B,QAAQ,EAAE,QAAQ;gBAClB,UAAU,kCACL,qBAAS,CAAC,mBAAmB,CAC9B,OAAO,EACP,qBAAqB,EACrB,kBAAkB,EAClB,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,6BAA6B,KAAK,MAAM,CAChD,KACD,eAAe,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GACtC;aACF;SACF,CAAC,CACH,CAAC;IACJ,CAAC;IAEe,KAAK,CAAC,IAAI,CACxB,OAAgB,EAChB,MAAc,EACd,eAAuB,EACvB,aAA6B;QAE7B,MAAM,GAAG,GAAG,MAAM,2DAA4B,CAAC,iBAAiB,CAC9D,OAAO,EACP,MAAM,CAAC,eAAe,EACtB,MAAM,CACP,CAAC;QACF,IAAI,GAAG,CAAC,KAAK,EAAE,EAAE;YACf,OAAO,IAAA,iBAAG,EAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SACvB;QACD,OAAO,IAAA,gBAAE,EAAC,EAAE,CAAC,CAAC;IAChB,CAAC;CACF;AA9DD,oCA8DC"}
+{"version":3,"file":"tdpGenerator.js","sourceRoot":"","sources":["../../../../src/component/generator/other/tdpGenerator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC;;GAEG;AAEH,wDAAoG;AACpG,0CAAsD;AACtD,2DAAiF;AACjF,qFAAkF;AAElF,0DAA+D;AAC/D,4CAAyC;AAGzC;;GAEG;AACH,MAAa,YAAa,SAAQ,2CAAwB;IACxD,aAAa,GAAG,eAAe,CAAC;IAEhC,uBAAuB;IACP,QAAQ,CAAC,OAAgB,EAAE,MAAc;QACvD,6DAA6D;QAC7D,OAAO,MAAM,CAAC,eAAe,KAAK,SAAS,CAAC;IAC9C,CAAC;IAEe,KAAK,CAAC,gBAAgB,CACpC,OAAgB,EAChB,MAAc,EACd,eAAuB,EACvB,aAA6B;QAE7B,MAAM,YAAY,GAAG,MAAM,CAAC,yBAAa,CAAC,YAAY,CAAC,CAAC;QACxD,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,OAAO,IAAA,iBAAG,EACR,IAAI,4BAAoB,CAAC,iBAAiB,EAAE,wBAAwB,EAAE,cAAc,CAAC,CACtF,CAAC;QACJ,CAAC;QACD,MAAM,OAAO,GAAG,MAAM,CAAC,yBAAa,CAAC,OAAO,CAAC,CAAC;QAC9C,MAAM,qBAAqB,GAAG,MAAM,CAAC,yBAAa,CAAC,eAAe,CAAC,CAAC;QACpE,MAAM,kBAAkB,GAAG,MAAM,CAAC,yBAAa,CAAC,YAAY,CAAC,CAAC;QAC9D,MAAM,MAAM,GAAG,CAAC,MAAM,CAAC,eAAe,IAAI,MAAM,CAAC,eAAe,KAAK,QAAQ,CAAC,CAAC,kBAAkB;QACjG,MAAM,QAAQ,GAAG,MAAM,CAAC,yBAAa,CAAC,mBAAmB,CAAwB,CAAC;QAClF,OAAO,OAAO,CAAC,OAAO,CACpB,IAAA,gBAAE,EAAC;YACD;gBACE,YAAY,EAAE,YAAY;gBAC1B,QAAQ,EAAE,QAAQ;gBAClB,UAAU,EAAE;oBACV,GAAG,qBAAS,CAAC,mBAAmB,CAC9B,OAAO,EACP,qBAAqB,EACrB,kBAAkB,EAClB,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,6BAA6B,KAAK,MAAM,CAChD;oBACD,eAAe,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;iBACtC;aACF;SACF,CAAC,CACH,CAAC;IACJ,CAAC;IAEe,KAAK,CAAC,IAAI,CACxB,OAAgB,EAChB,MAAc,EACd,eAAuB,EACvB,aAA6B;QAE7B,MAAM,GAAG,GAAG,MAAM,2DAA4B,CAAC,iBAAiB,CAC9D,OAAO,EACP,MAAM,CAAC,eAAe,EACtB,MAAM,CACP,CAAC;QACF,IAAI,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC;YAChB,OAAO,IAAA,iBAAG,EAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACxB,CAAC;QACD,OAAO,IAAA,gBAAE,EAAC,EAAE,CAAC,CAAC;IAChB,CAAC;CACF;AA9DD,oCA8DC"}

package/build/component/generator/spfx/depsChecker/generatorChecker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generatorChecker.d.ts","sourceRoot":"","sources":["../../../../../src/component/generator/spfx/depsChecker/generatorChecker.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,OAAO,EAEP,OAAO,EACP,WAAW,EAEX,MAAM,EAGP,MAAM,wBAAwB,CAAC;AAWhC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAMxD,qBAAa,gBAAiB,YAAW,iBAAiB;IACxD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAc;gBAE1B,MAAM,EAAE,WAAW;IAIlB,gBAAgB,CAC3B,GAAG,EAAE,OAAO,EACZ,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IA2BvB,iBAAiB,CAAC,mBAAmB,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC;IAU5E,yBAAyB,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAUxD,OAAO,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAanD,kBAAkB,IAAI,MAAM;IAatB,4BAA4B,CACvC,gBAAgB,CAAC,EAAE,MAAM,EACzB,oBAAoB,CAAC,EAAE,OAAO,GAC7B,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IASjB,iBAAiB,CAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;YAIxE,QAAQ;IAItB,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,eAAe;YAIT,YAAY;YAeZ,OAAO;YAgBP,gBAAgB;CAuB/B"}
+{"version":3,"file":"generatorChecker.d.ts","sourceRoot":"","sources":["../../../../../src/component/generator/spfx/depsChecker/generatorChecker.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,OAAO,EAEP,OAAO,EACP,WAAW,EAEX,MAAM,EAGP,MAAM,wBAAwB,CAAC;AAWhC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAMxD,qBAAa,gBAAiB,YAAW,iBAAiB;IACxD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAc;gBAE1B,MAAM,EAAE,WAAW;IAIlB,gBAAgB,CAC3B,GAAG,EAAE,OAAO,EACZ,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IA2BvB,iBAAiB,CAAC,mBAAmB,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC;IAU5E,yBAAyB,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAUxD,OAAO,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAanD,kBAAkB,IAAI,MAAM;IAatB,4BAA4B,CACvC,gBAAgB,CAAC,EAAE,MAAM,EACzB,oBAAoB,CAAC,EAAE,OAAO,GAC7B,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IASjB,iBAAiB,CAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;YAIxE,QAAQ;IAItB,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,eAAe;YAIT,YAAY;YAeZ,OAAO;YAeP,gBAAgB;CAuB/B"}

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

@@ -19,6 +19,7 @@ const name = constants_1.Constants.GeneratorPackageName;
 const displayName = `${name}`;
 const timeout = 6 * 60 * 1000;
 class GeneratorChecker {
+    _logger;
     constructor(logger) {
         this._logger = logger;
     }
@@ -35,7 +36,6 @@ class GeneratorChecker {
                 [telemetryEvents_1.TelemetryProperty.EnsureSharepointGeneratorReason]: error
                     .name,
             });
-            // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
             this._logger.error(`Failed to install ${displayName}@${targetVersion}, error = '${error}'`);
             return (0, teamsfx_api_1.err)(error);
         }
@@ -44,7 +44,7 @@ class GeneratorChecker {
     async isLatestInstalled(loadedLatestVersion) {
         try {
             const generatorVersion = await this.findLocalInstalledVersion();
-            const latestGeneratorVersion = loadedLatestVersion !== null && loadedLatestVersion !== void 0 ? loadedLatestVersion : (await this.findLatestVersion(5));
+            const latestGeneratorVersion = loadedLatestVersion ?? (await this.findLatestVersion(5));
             return !!latestGeneratorVersion && generatorVersion === latestGeneratorVersion;
         }
         catch (error) {
@@ -76,10 +76,10 @@ class GeneratorChecker {
         return `"${path.join(this.getDefaultInstallPath(), "node_modules", "@microsoft", "generator-sharepoint", "lib", "generators", "app", "index.js")}"`;
     }
     async findGloballyInstalledVersion(timeoutInSeconds, shouldThrowIfNotFind) {
-        return await utils_1.Utils.findGloballyInstalledVersion(this._logger, name, timeoutInSeconds !== null && timeoutInSeconds !== void 0 ? timeoutInSeconds : 0, shouldThrowIfNotFind);
+        return await utils_1.Utils.findGloballyInstalledVersion(this._logger, name, timeoutInSeconds ?? 0, shouldThrowIfNotFind);
     }
     async findLatestVersion(timeoutInSeconds) {
-        return await utils_1.Utils.findLatestVersion(this._logger, name, timeoutInSeconds !== null && timeoutInSeconds !== void 0 ? timeoutInSeconds : 0);
+        return await utils_1.Utils.findLatestVersion(this._logger, name, timeoutInSeconds ?? 0);
     }
     async validate() {
         return await fs.pathExists(this.getSentinelPath());
@@ -91,11 +91,10 @@ class GeneratorChecker {
         return path.join(os.homedir(), `.${teamsfx_api_1.ConfigFolderName}`, "spGenerator-sentinel");
     }
     async queryVersion() {
-        var _a;
         const packagePath = path.join(this.getDefaultInstallPath(), "node_modules", "@microsoft", "generator-sharepoint", "package.json");
         if (await fs.pathExists(packagePath)) {
             const packageJson = await fs.readJson(packagePath);
-            return (_a = packageJson.version) !== null && _a !== void 0 ? _a : undefined;
+            return packageJson.version ?? undefined;
         }
         return undefined;
     }
@@ -110,12 +109,11 @@ class GeneratorChecker {
             await fs.remove(this.getSentinelPath());
         }
         catch (err) {
-            // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
             this._logger.error(`Failed to clean up path: ${this.getDefaultInstallPath()}, error: ${err}`);
         }
     }
     async installGenerator(targetVersion) {
-        const version = targetVersion !== null && targetVersion !== void 0 ? targetVersion : constants_1.Constants.LatestVersion;
+        const version = targetVersion ?? constants_1.Constants.LatestVersion;
         try {
             await fs.ensureDir(path.join(this.getDefaultInstallPath(), "node_modules"));
             await cpUtils_1.cpUtils.executeCommand(undefined, this._logger, { timeout: timeout, shell: (0, utils_1.getShellOptionValue)() }, (0, utils_1.getExecCommand)("npm"), "install", `${name}@${version}`, "--prefix", `${this.getDefaultInstallPath()}`, "--no-audit", "--global-style");

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

@@ -1 +1 @@
-{"version":3,"file":"generatorChecker.js","sourceRoot":"","sources":["../../../../../src/component/generator/spfx/depsChecker/generatorChecker.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,wDAUgC;AAChC,qDAA+B;AAC/B,+CAAyB;AACzB,mDAA6B;AAC7B,6CAAoD;AACpD,gEAA6D;AAC7D,oCAAmD;AACnD,kDAA+C;AAC/C,gEAA4D;AAC5D,8DAA8E;AAC9E,0CAA4E;AAG5E,MAAM,IAAI,GAAG,qBAAS,CAAC,oBAAoB,CAAC;AAC5C,MAAM,WAAW,GAAG,GAAG,IAAI,EAAE,CAAC;AAC9B,MAAM,OAAO,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;AAE9B,MAAa,gBAAgB;IAG3B,YAAY,MAAmB;QAC7B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAC3B,GAAY,EACZ,aAAqB;QAErB,kCAAe,CAAC,gBAAgB,CAAC,GAAG,EAAE,iCAAe,CAAC,8BAA8B,CAAC,CAAC;QAEtF,IAAI;YACF,KAAK,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,WAAW,IAAI,aAAa,2BAA2B,CAAC,CAAC;YACnF,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;YAClC,KAAK,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,0BAA0B,WAAW,IAAI,aAAa,EAAE,CAAC,CAAC;YAEjF,kCAAe,CAAC,gBAAgB,CAAC,GAAG,EAAE,iCAAe,CAAC,yBAAyB,CAAC,CAAC;SAClF;QAAC,OAAO,KAAK,EAAE;YACd,kCAAe,CAAC,cAAc,CAC5B,GAAG,EACH,iCAAe,CAAC,yBAAyB,EACzC,KAAgC,EAChC;gBACE,CAAC,mCAAiB,CAAC,+BAA+B,CAAC,EAAG,KAAiC;qBACpF,IAAI;aACR,CACF,CAAC;YACF,4EAA4E;YAC5E,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,qBAAqB,WAAW,IAAI,aAAa,cAAc,KAAK,GAAG,CAAC,CAAC;YAC5F,OAAO,IAAA,iBAAG,EAAC,KAAgC,CAAC,CAAC;SAC9C;QAED,OAAO,IAAA,gBAAE,EAAC,IAAI,CAAC,CAAC;IAClB,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAAC,mBAAuC;QACpE,IAAI;YACF,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,yBAAyB,EAAE,CAAC;YAChE,MAAM,sBAAsB,GAAG,mBAAmB,aAAnB,mBAAmB,cAAnB,mBAAmB,GAAI,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC;YACxF,OAAO,CAAC,CAAC,sBAAsB,IAAI,gBAAgB,KAAK,sBAAsB,CAAC;SAChF;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,KAAK,CAAC;SACd;IACH,CAAC;IAEM,KAAK,CAAC,yBAAyB;QACpC,IAAI;YACF,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;YACnD,MAAM,WAAW,GAAG,MAAM,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;YAChE,OAAO,WAAW,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,SAAS,CAAC;SACnD;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,SAAS,CAAC;SAClB;IACH,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,aAAqB;QACxC,KAAK,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;QAC9C,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACrB,MAAM,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;QAE3C,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,sBAAsB,IAAI,kBAAkB,CAAC,CAAC;YACtE,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;YACrB,MAAM,IAAA,+BAAuB,EAAC,IAAI,CAAC,CAAC;SACrC;IACH,CAAC;IAEM,kBAAkB;QACvB,OAAO,IAAI,IAAI,CAAC,IAAI,CAClB,IAAI,CAAC,qBAAqB,EAAE,EAC5B,cAAc,EACd,YAAY,EACZ,sBAAsB,EACtB,KAAK,EACL,YAAY,EACZ,KAAK,EACL,UAAU,CACX,GAAG,CAAC;IACP,CAAC;IAEM,KAAK,CAAC,4BAA4B,CACvC,gBAAyB,EACzB,oBAA8B;QAE9B,OAAO,MAAM,aAAK,CAAC,4BAA4B,CAC7C,IAAI,CAAC,OAAO,EACZ,IAAI,EACJ,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,GAAI,CAAC,EACrB,oBAAoB,CACrB,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAAC,gBAAyB;QACtD,OAAO,MAAM,aAAK,CAAC,iBAAiB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,GAAI,CAAC,CAAC,CAAC;IAClF,CAAC;IAEO,KAAK,CAAC,QAAQ;QACpB,OAAO,MAAM,EAAE,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,aAAa,CAAC,CAAC;IAC/E,CAAC;IAEO,eAAe;QACrB,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,IAAI,8BAAgB,EAAE,EAAE,sBAAsB,CAAC,CAAC;IACjF,CAAC;IAEO,KAAK,CAAC,YAAY;;QACxB,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAC3B,IAAI,CAAC,qBAAqB,EAAE,EAC5B,cAAc,EACd,YAAY,EACZ,sBAAsB,EACtB,cAAc,CACf,CAAC;QACF,IAAI,MAAM,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE;YACpC,MAAM,WAAW,GAAG,MAAM,EAAE,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,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE;gBAClC,MAAM,EAAE,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;gBACnC,MAAM,EAAE,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;aACjC;YAED,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,qBAAqB,EAAE,CAAC,CAAC;YAChD,MAAM,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;SACzC;QAAC,OAAO,GAAG,EAAE;YACZ,4EAA4E;YAC5E,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,4BAA4B,IAAI,CAAC,qBAAqB,EAAE,YAAY,GAAG,EAAE,CAAC,CAAC;SAC/F;IACH,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAAC,aAAqB;QAClD,MAAM,OAAO,GAAG,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,qBAAS,CAAC,aAAa,CAAC;QACzD,IAAI;YACF,MAAM,EAAE,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,IAAA,2BAAmB,GAAE,EAAE,EAClD,IAAA,sBAAc,EAAC,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,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;SAC7C;QAAC,OAAO,KAAK,EAAE;YACd,KAAK,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,iCAAiC,WAAW,IAAI,OAAO,EAAE,CAAC,CAAC;YACnF,MAAM,IAAI,uBAAe,CAAC,KAAc,EAAE,gBAAgB,CAAC,CAAC;SAC7D;IACH,CAAC;CACF;AArKD,4CAqKC"}
+{"version":3,"file":"generatorChecker.js","sourceRoot":"","sources":["../../../../../src/component/generator/spfx/depsChecker/generatorChecker.ts"],"names":[],"mappings":"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"}

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

@@ -19,6 +19,7 @@ const name = constants_1.Constants.YeomanPackageName;
 const displayName = `${name}`;
 const timeout = 6 * 60 * 1000;
 class YoChecker {
+    _logger;
     constructor(logger) {
         this._logger = logger;
     }
@@ -75,7 +76,7 @@ class YoChecker {
         return [defaultPath, path.join(defaultPath, "node_modules", ".bin")];
     }
     async findGloballyInstalledVersion(timeoutInSeconds) {
-        return await utils_1.Utils.findGloballyInstalledVersion(this._logger, name, timeoutInSeconds !== null && timeoutInSeconds !== void 0 ? timeoutInSeconds : 0);
+        return await utils_1.Utils.findGloballyInstalledVersion(this._logger, name, timeoutInSeconds ?? 0);
     }
     async findLatestVersion(timeoutInSeconds) {
         return await utils_1.Utils.findLatestVersion(this._logger, name, timeoutInSeconds);
@@ -90,11 +91,10 @@ class YoChecker {
         return path.join(os.homedir(), `.${teamsfx_api_1.ConfigFolderName}`, "yo-sentinel");
     }
     async queryVersion() {
-        var _a;
         const packagePath = path.join(this.getDefaultInstallPath(), "node_modules", "yo", "package.json");
         if (await fs_extra_1.default.pathExists(packagePath)) {
             const packageJson = await fs_extra_1.default.readJson(packagePath);
-            return (_a = packageJson.version) !== null && _a !== void 0 ? _a : undefined;
+            return packageJson.version ?? undefined;
         }
         return undefined;
     }
@@ -127,7 +127,7 @@ class YoChecker {
         }
     }
     async installYo(targetVersion) {
-        const version = targetVersion !== null && targetVersion !== void 0 ? targetVersion : constants_1.Constants.LatestVersion;
+        const version = targetVersion ?? constants_1.Constants.LatestVersion;
         try {
             await fs_extra_1.default.ensureDir(path.join(this.getDefaultInstallPath(), "node_modules"));
             await cpUtils_1.cpUtils.executeCommand(undefined, this._logger, { timeout: timeout, shell: (0, utils_1.getShellOptionValue)() }, (0, utils_1.getExecCommand)("npm"), "install", `${name}@${version}`, "--prefix", `${this.getDefaultInstallPath()}`, "--no-audit", "--global-style");

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":"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"}

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

@@ -2,7 +2,19 @@
 // Licensed under the MIT license.
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CannotFindPropertyfromJsonError = exports.SolutionVersionMissingError = exports.PathAlreadyExistsError = exports.ImportSPFxSolutionError = exports.UpdateSPFxTemplateError = exports.RetrieveSPFxInfoError = exports.CopyExistingSPFxSolutionError = exports.YoGeneratorScaffoldError = exports.PackageTargetVersionInstallError = exports.LatestPackageInstallError = exports.DevEnvironmentSetupError = exports.DependencyValidateError = exports.ScaffoldError = void 0;
+exports.ScaffoldError = ScaffoldError;
+exports.DependencyValidateError = DependencyValidateError;
+exports.DevEnvironmentSetupError = DevEnvironmentSetupError;
+exports.LatestPackageInstallError = LatestPackageInstallError;
+exports.PackageTargetVersionInstallError = PackageTargetVersionInstallError;
+exports.YoGeneratorScaffoldError = YoGeneratorScaffoldError;
+exports.CopyExistingSPFxSolutionError = CopyExistingSPFxSolutionError;
+exports.RetrieveSPFxInfoError = RetrieveSPFxInfoError;
+exports.UpdateSPFxTemplateError = UpdateSPFxTemplateError;
+exports.ImportSPFxSolutionError = ImportSPFxSolutionError;
+exports.PathAlreadyExistsError = PathAlreadyExistsError;
+exports.SolutionVersionMissingError = SolutionVersionMissingError;
+exports.CannotFindPropertyfromJsonError = CannotFindPropertyfromJsonError;
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const constants_1 = require("./utils/constants");
 const localizeUtils_1 = require("../../../common/localizeUtils");
@@ -18,11 +30,9 @@ function ScaffoldError(error) {
         });
     }
 }
-exports.ScaffoldError = ScaffoldError;
 function DependencyValidateError(dependency) {
     return new teamsfx_api_1.SystemError(constants_1.Constants.PLUGIN_NAME, "InvalidDependency", (0, localizeUtils_1.getDefaultString)("plugins.spfx.error.invalidDependency", dependency), (0, localizeUtils_1.getLocalizedString)("plugins.spfx.error.invalidDependency", dependency));
 }
-exports.DependencyValidateError = DependencyValidateError;
 function DevEnvironmentSetupError() {
     return new teamsfx_api_1.UserError({
         source: constants_1.Constants.PLUGIN_NAME,
@@ -32,18 +42,15 @@ function DevEnvironmentSetupError() {
         helpLink: constants_1.Constants.SetUpDevEnvironmentHelpLink,
     });
 }
-exports.DevEnvironmentSetupError = DevEnvironmentSetupError;
 function LatestPackageInstallError() {
     const fxFolderPath = "HOME/.fx";
     return new teamsfx_api_1.SystemError(constants_1.Constants.PLUGIN_NAME, "LatestPackageInstallFailed", (0, localizeUtils_1.getDefaultString)("plugins.spfx.error.installLatestDependencyError", fxFolderPath, constants_1.Constants.SetUpDevEnvironmentHelpLink), (0, localizeUtils_1.getLocalizedString)("plugins.spfx.error.installLatestDependencyError", fxFolderPath, constants_1.Constants.SetUpDevEnvironmentHelpLink));
 }
-exports.LatestPackageInstallError = LatestPackageInstallError;
 function PackageTargetVersionInstallError(packageName, version) {
     const fxFolderPath = "HOME/.fx";
     const packageInfo = `${packageName}@${version}`;
     return new teamsfx_api_1.SystemError(constants_1.Constants.PLUGIN_NAME, "PackageTargetVersionInstallError", (0, localizeUtils_1.getDefaultString)("plugins.spfx.error.installDependencyError", fxFolderPath, constants_1.Constants.AddWebpartHelpLink, packageInfo), (0, localizeUtils_1.getLocalizedString)("plugins.spfx.error.installDependencyError", fxFolderPath, constants_1.Constants.AddWebpartHelpLink, packageInfo));
 }
-exports.PackageTargetVersionInstallError = PackageTargetVersionInstallError;
 function YoGeneratorScaffoldError() {
     return new teamsfx_api_1.UserError({
         source: constants_1.Constants.PLUGIN_NAME,
@@ -53,7 +60,6 @@ function YoGeneratorScaffoldError() {
         helpLink: constants_1.Constants.ScaffoldHelpLink,
     });
 }
-exports.YoGeneratorScaffoldError = YoGeneratorScaffoldError;
 function CopyExistingSPFxSolutionError(e) {
     return new teamsfx_api_1.UserError({
         source: constants_1.Constants.PLUGIN_NAME,
@@ -63,7 +69,6 @@ function CopyExistingSPFxSolutionError(e) {
         helpLink: constants_1.Constants.IMPORT_HELP_LINK,
     });
 }
-exports.CopyExistingSPFxSolutionError = CopyExistingSPFxSolutionError;
 function RetrieveSPFxInfoError() {
     return new teamsfx_api_1.UserError({
         source: constants_1.Constants.PLUGIN_NAME,
@@ -73,7 +78,6 @@ function RetrieveSPFxInfoError() {
         helpLink: constants_1.Constants.IMPORT_HELP_LINK,
     });
 }
-exports.RetrieveSPFxInfoError = RetrieveSPFxInfoError;
 function UpdateSPFxTemplateError(e) {
     return new teamsfx_api_1.UserError({
         source: constants_1.Constants.PLUGIN_NAME,
@@ -83,7 +87,6 @@ function UpdateSPFxTemplateError(e) {
         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,
@@ -93,7 +96,6 @@ function ImportSPFxSolutionError(e) {
         helpLink: constants_1.Constants.IMPORT_HELP_LINK,
     });
 }
-exports.ImportSPFxSolutionError = ImportSPFxSolutionError;
 function PathAlreadyExistsError(path) {
     return new teamsfx_api_1.UserError({
         source: constants_1.Constants.PLUGIN_NAME,
@@ -102,7 +104,6 @@ function PathAlreadyExistsError(path) {
         displayMessage: (0, localizeUtils_1.getLocalizedString)("core.QuestionAppName.validation.pathExist", path),
     });
 }
-exports.PathAlreadyExistsError = PathAlreadyExistsError;
 function SolutionVersionMissingError(path) {
     return new teamsfx_api_1.UserError({
         source: constants_1.Constants.PLUGIN_NAME,
@@ -111,7 +112,6 @@ function SolutionVersionMissingError(path) {
         displayMessage: (0, localizeUtils_1.getLocalizedString)("plugins.spfx.addWebPart.cannotFindSolutionVersion", path),
     });
 }
-exports.SolutionVersionMissingError = SolutionVersionMissingError;
 function CannotFindPropertyfromJsonError(field) {
     const message = `Cannot find property "${field}" from json.`;
     return new teamsfx_api_1.UserError({
@@ -121,5 +121,4 @@ function CannotFindPropertyfromJsonError(field) {
         displayMessage: message, // This message won't be shown to users. No need to localize.
     });
 }
-exports.CannotFindPropertyfromJsonError = CannotFindPropertyfromJsonError;
 //# sourceMappingURL=error.js.map

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.js

@@ -35,7 +35,7 @@ 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, {
+        (0, lodash_1.merge)(actionContext?.telemetryProps, {
             [telemetryEvents_1.TelemetryProperty.SPFxSolution]: spfxSolution,
         });
         if (spfxSolution === "new") {
@@ -55,7 +55,6 @@ class SPFxGenerator {
         return (0, 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);
         await importProgress.start();
         const importDetails = [];
@@ -107,23 +106,22 @@ class SPFxGenerator {
         }
         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((0, localizeUtils_1.getLocalizedString)("plugins.spfx.import.log.fail", context.logProvider?.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((0, localizeUtils_1.getLocalizedString)("plugins.spfx.import.log.fail", context.logProvider?.getLogFilePath()));
             if (error instanceof teamsfx_api_1.UserError || error instanceof teamsfx_api_1.SystemError) {
                 return (0, teamsfx_api_1.err)(error);
             }
             return (0, teamsfx_api_1.err)((0, 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((0, localizeUtils_1.getLocalizedString)("plugins.spfx.import.log.success", context.logProvider?.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.logProvider.info((0, localizeUtils_1.getLocalizedString)("plugins.spfx.import.log.success", context.logProvider?.getLogFilePath()));
         void context.userInteraction.showMessage("info", (0, localizeUtils_1.getLocalizedString)("plugins.spfx.import.success", destinationPath), false);
         return (0, 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;
@@ -134,7 +132,7 @@ class SPFxGenerator {
             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")));
+            await progressHandler?.next((0, 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;
@@ -163,21 +161,21 @@ 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?.next((0, localizeUtils_1.getLocalizedString)(isAddSPFx
                 ? "driver.spfx.add.progress.scaffoldWebpart"
-                : "plugins.spfx.scaffold.scaffoldProject")));
+                : "plugins.spfx.scaffold.scaffoldProject"));
             if (inputs.platform === teamsfx_api_1.Platform.VSCode) {
                 context.logProvider.outputChannel.show();
             }
             const yoEnv = process.env;
             if (yoEnv.PATH) {
                 yoEnv.PATH = shouldInstallLocally
-                    ? `${yoChecker.getBinFolders().join(path.delimiter)}${path.delimiter}${(_a = process.env.PATH) !== null && _a !== void 0 ? _a : ""}`
+                    ? `${yoChecker.getBinFolders().join(path.delimiter)}${path.delimiter}${process.env.PATH ?? ""}`
                     : process.env.PATH;
             }
             else {
                 yoEnv.Path = shouldInstallLocally
-                    ? `${yoChecker.getBinFolders().join(path.delimiter)}${path.delimiter}${(_b = process.env.Path) !== null && _b !== void 0 ? _b : ""}`
+                    ? `${yoChecker.getBinFolders().join(path.delimiter)}${path.delimiter}${process.env.Path ?? ""}`
                     : process.env.Path;
             }
             const args = [
@@ -219,7 +217,7 @@ class SPFxGenerator {
                 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?.next((0, 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();
@@ -229,7 +227,7 @@ class SPFxGenerator {
             const manifestJson = JSON.parse(manifestString.replace(matchHashComment, "").trim());
             const componentId = manifestJson.id;
             if (!context.templateVariables) {
-                context.templateVariables = generator_1.Generator.getDefaultVariables(solutionName !== null && solutionName !== void 0 ? solutionName : "");
+                context.templateVariables = generator_1.Generator.getDefaultVariables(solutionName ?? "");
             }
             if (shouldInstallLocally) {
                 context.templateVariables["useNewDevUrl"] = "true";
@@ -257,11 +255,11 @@ class SPFxGenerator {
             if (await fs_extra_1.default.pathExists(debugPath)) {
                 await fs_extra_1.default.remove(debugPath);
             }
-            await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.end(true));
+            await progressHandler?.end(true);
             return (0, teamsfx_api_1.ok)(componentId);
         }
         catch (error) {
-            await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.end(false));
+            await progressHandler?.end(false);
             return (0, teamsfx_api_1.err)((0, error_2.ScaffoldError)(error));
         }
     }
@@ -300,7 +298,7 @@ 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?.next((0, localizeUtils_1.getLocalizedString)("plugins.spfx.scaffold.dependencyInstall"));
             if (needInstallYo) {
                 const yoRes = await yoChecker.ensureDependency(context, constants_2.Constants.LatestVersion);
                 if (yoRes.isErr()) {
@@ -430,7 +428,6 @@ class SPFxGenerator {
         return undefined;
     }
     static async updateSPFxTemplate(spfxFolder, destinationPath, importDetails, useNewDevUrl) {
-        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"));
@@ -479,8 +476,8 @@ class SPFxGenerator {
                         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);
+                    localManifest.staticTabs?.push(localStaticSnippet);
+                    remoteManifest.staticTabs?.push(remoteStaticSnippet);
                 }
                 importDetails.push(`(√) Done: Succeeded to expose additional web parts in Teams manifest.`);
             }
@@ -558,6 +555,7 @@ class SPFxGenerator {
         return constants_2.Constants.DEFAULT_NODE_VERSION;
     }
 }
+exports.SPFxGenerator = SPFxGenerator;
 tslib_1.__decorate([
     (0, lib_1.hooks)([
         (0, actionExecutionMW_1.ActionExecutionMW)({
@@ -571,12 +569,8 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:paramtypes", [Object, Object, String, Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], SPFxGenerator, "generate", null);
-exports.SPFxGenerator = SPFxGenerator;
 class SPFxGeneratorNew extends defaultGenerator_1.DefaultTemplateGenerator {
-    constructor() {
-        super(...arguments);
-        this.componentName = "spfx-new-generator";
-    }
+    componentName = "spfx-new-generator";
     activate(context, inputs) {
         const capability = inputs[constants_1.QuestionNames.Capabilities];
         const spfxSolution = inputs[constants_1.QuestionNames.SPFxSolution];
@@ -584,7 +578,7 @@ class SPFxGeneratorNew extends defaultGenerator_1.DefaultTemplateGenerator {
     }
     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, {
+        (0, lodash_1.merge)(actionContext?.telemetryProps, {
             [telemetryEvents_1.TelemetryProperty.SPFxSolution]: spfxSolution,
         });
         const yeomanRes = await SPFxGenerator.doYeomanScaffold(context, inputs, destinationPath);
@@ -601,22 +595,18 @@ class SPFxGeneratorNew extends defaultGenerator_1.DefaultTemplateGenerator {
 }
 exports.SPFxGeneratorNew = SPFxGeneratorNew;
 class SPFxGeneratorImport extends defaultGenerator_1.DefaultTemplateGenerator {
-    constructor() {
-        super(...arguments);
-        this.componentName = "spfx-import-generator";
-        this.importDetails = [];
-    }
+    componentName = "spfx-import-generator";
+    importDetails = [];
     activate(context, inputs) {
         const capability = inputs[constants_1.QuestionNames.Capabilities];
         const spfxSolution = inputs[constants_1.QuestionNames.SPFxSolution];
         return capability === CapabilityOptions_1.TabCapabilityOptions.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, {
+            (0, lodash_1.merge)(actionContext?.telemetryProps, {
                 [telemetryEvents_1.TelemetryProperty.SPFxSolution]: spfxSolution,
             });
             const spfxFolder = inputs[constants_1.QuestionNames.SPFxFolder];
@@ -659,9 +649,9 @@ class SPFxGeneratorImport extends defaultGenerator_1.DefaultTemplateGenerator {
             ]);
         }
         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((0, localizeUtils_1.getLocalizedString)("plugins.spfx.import.log.fail", context.logProvider?.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((0, localizeUtils_1.getLocalizedString)("plugins.spfx.import.log.fail", context.logProvider?.getLogFilePath()));
             if (error instanceof teamsfx_api_1.UserError || error instanceof teamsfx_api_1.SystemError) {
                 return (0, teamsfx_api_1.err)(error);
             }
@@ -669,21 +659,20 @@ class SPFxGeneratorImport extends defaultGenerator_1.DefaultTemplateGenerator {
         }
     }
     async post(context, inputs, destinationPath, actionContext) {
-        var _a, _b, _c, _d, _e;
         try {
             const spfxFolder = inputs[constants_1.QuestionNames.SPFxFolder];
-            const useNewDevUrl = (_a = context.templateVariables) === null || _a === void 0 ? void 0 : _a["useNewDevUrl"];
+            const useNewDevUrl = context.templateVariables?.["useNewDevUrl"];
             await SPFxGenerator.updateSPFxTemplate(spfxFolder, destinationPath, this.importDetails, useNewDevUrl == "true");
-            this.importDetails.push((0, localizeUtils_1.getLocalizedString)("plugins.spfx.import.log.success", (_b = context.logProvider) === null || _b === void 0 ? void 0 : _b.getLogFilePath()));
+            this.importDetails.push((0, localizeUtils_1.getLocalizedString)("plugins.spfx.import.log.success", context.logProvider?.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", (_c = context.logProvider) === null || _c === void 0 ? void 0 : _c.getLogFilePath()));
+            void context.logProvider.info((0, localizeUtils_1.getLocalizedString)("plugins.spfx.import.log.success", context.logProvider?.getLogFilePath()));
             void context.userInteraction.showMessage("info", (0, localizeUtils_1.getLocalizedString)("plugins.spfx.import.success", destinationPath), false);
             return (0, teamsfx_api_1.ok)({});
         }
         catch (error) {
-            this.importDetails.push((0, localizeUtils_1.getLocalizedString)("plugins.spfx.import.log.fail", (_d = context.logProvider) === null || _d === void 0 ? void 0 : _d.getLogFilePath()));
+            this.importDetails.push((0, localizeUtils_1.getLocalizedString)("plugins.spfx.import.log.fail", context.logProvider?.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", (_e = context.logProvider) === null || _e === void 0 ? void 0 : _e.getLogFilePath()));
+            void context.logProvider.error((0, localizeUtils_1.getLocalizedString)("plugins.spfx.import.log.fail", context.logProvider?.getLogFilePath()));
             if (error instanceof teamsfx_api_1.UserError || error instanceof teamsfx_api_1.SystemError) {
                 return (0, teamsfx_api_1.err)(error);
             }