npm - @microsoft/teamsfx-core - Versions diffs - 1.11.0 → 1.11.1-alpha.10d9b00a6.0 - Mend

@microsoft/teamsfx-core 1.11.0 → 1.11.1-alpha.10d9b00a6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (549) hide show

package/build/plugins/resource/cicd/index.js CHANGED Viewed

@@ -13,12 +13,8 @@ const typedi_1 = require("typedi");
 const ResourcePluginContainer_1 = require("../../solution/fx-solution/ResourcePluginContainer");
 const questions_1 = require("./questions");
 const logger_1 = require("./logger");
-const environment_1 = require("../../../core/environment");
 const telemetry_helper_1 = require("./utils/telemetry-helper");
-const localizeUtils_1 = require("../../../common/localizeUtils");
-const common_1 = require("../../../common");
-const error_1 = require("../../../core/error");
-const existingTemplatesStat_1 = require("./utils/existingTemplatesStat");
+const cicd_1 = require("../../../component/feature/cicd");
 let CICDPluginV2 = class CICDPluginV2 {
     constructor() {
         this.name = constants_1.PluginCICD.PLUGIN_NAME;
@@ -31,70 +27,16 @@ let CICDPluginV2 = class CICDPluginV2 {
     }
     async addCICDWorkflows(context, inputs, envInfo) {
         logger_1.Logger.setLogger(context.logProvider);
-        return await this.cicdImpl.addCICDWorkflows(context, inputs, envInfo);
-    }
-    async getQuestionsForUserTask(ctx, inputs, func, envInfo, tokenProvider) {
-        // add CI CD workflows for minimal app is not supported.
-        if (inputs.platform !== teamsfx_api_1.Platform.CLI_HELP && common_1.isExistingTabApp(ctx.projectSetting)) {
-            throw new error_1.NoCapabilityFoundError(teamsfx_api_1.Stage.addCiCdFlow);
-        }
-        const cicdWorkflowQuestions = new teamsfx_api_1.QTreeNode({
-            type: "group",
-        });
-        const whichProvider = {
-            name: questions_1.questionNames.Provider,
-            type: "singleSelect",
-            staticOptions: [questions_1.githubOption, questions_1.azdoOption, questions_1.jenkinsOption],
-            title: localizeUtils_1.getLocalizedString("plugins.cicd.whichProvider.title"),
-            default: questions_1.githubOption.id,
-        };
-        const whichTemplate = {
-            name: questions_1.questionNames.Template,
-            type: "multiSelect",
-            staticOptions: [questions_1.ciOption, questions_1.cdOption, questions_1.provisionOption, questions_1.publishOption],
-            title: localizeUtils_1.getLocalizedString("plugins.cicd.whichTemplate.title"),
-            default: [questions_1.ciOption.id],
-        };
+        let envName = inputs[questions_1.questionNames.Environment];
         // TODO: add support for VS/.Net Projects.
-        if (inputs.platform === teamsfx_api_1.Platform.VSCode) {
-            if (!inputs.projectPath) {
-                throw new errors_1.NoProjectOpenedError();
-            }
-            const envProfilesResult = await environment_1.environmentManager.listRemoteEnvConfigs(inputs.projectPath);
-            if (envProfilesResult.isErr()) {
-                throw new errors_1.InternalError([
-                    localizeUtils_1.getDefaultString("error.cicd.FailedToListMultiEnv", envProfilesResult.error.message),
-                    localizeUtils_1.getLocalizedString("error.cicd.FailedToListMultiEnv", envProfilesResult.error.message),
-                ], envProfilesResult.error);
-            }
-            const existingInstance = existingTemplatesStat_1.ExistingTemplatesStat.getInstance(inputs.projectPath, envProfilesResult.value);
-            // Mute this scan before there's initial scan on upper layers.
-            // await existingInstance.scan();
-            const whichEnvironment = {
-                type: "singleSelect",
-                name: questions_1.questionNames.Environment,
-                title: localizeUtils_1.getLocalizedString("plugins.cicd.whichEnvironment.title"),
-                staticOptions: [],
-                dynamicOptions: async (inputs) => {
-                    // Remove the env items in which all combinations of templates are scaffolded/existing.
-                    return existingInstance.availableEnvOptions();
-                },
-                skipSingleOption: true,
-            };
-            whichProvider.dynamicOptions = async (inputs) => {
-                const envName = inputs[questions_1.questionNames.Environment];
-                return existingInstance.availableProviderOptions(envName);
-            };
-            whichTemplate.dynamicOptions = async (inputs) => {
-                const envName = inputs[questions_1.questionNames.Environment];
-                const provider = inputs[questions_1.questionNames.Provider];
-                return existingInstance.availableTemplateOptions(envName, provider);
-            };
-            cicdWorkflowQuestions.addChild(new teamsfx_api_1.QTreeNode(whichEnvironment));
+        if (inputs.platform === teamsfx_api_1.Platform.CLI) {
+            // In CLI, get env name from the default `env` question.
+            envName = envInfo.envName;
         }
-        cicdWorkflowQuestions.addChild(new teamsfx_api_1.QTreeNode(whichProvider));
-        cicdWorkflowQuestions.addChild(new teamsfx_api_1.QTreeNode(whichTemplate));
-        return teamsfx_api_1.ok(cicdWorkflowQuestions);
+        return await this.cicdImpl.addCICDWorkflows(context, inputs, envName);
+    }
+    async getQuestionsForUserTask(ctx, inputs, func, envInfo, tokenProvider) {
+        return await cicd_1.addCicdQuestion(ctx, inputs);
     }
     async executeUserTask(ctx, inputs, func, localSettings, envInfo, tokenProvider) {
         if (func.method === "addCICDWorkflows") {

package/build/plugins/resource/cicd/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/plugins/resource/cicd/index.ts"],"names":[],"mappings":";;;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,~~wDAkBgC~~;AAEhC,qCAAgF;AAChF,qCAAoC;AACpC,qCAAuF;AACvF,2CAAoE;AACpE,mCAAiC;AACjC,gGAAuF;~~AAEvF~~,2CASqB;AACrB,qCAAkC;~~AAClC,2DAA+D;AAC/D~~,+DAA2D;~~AAC3D~~,~~iEAAqF~~;~~AACrF~~,~~4CAAmD;AACnD,+CAA6D;AAC7D,yEAAsE;AAGtE,~~IAAa,YAAY,GAAzB,MAAa,YAAY;IAAzB;QACE,SAAI,GAAG,sBAAU,CAAC,WAAW,CAAC;QAC9B,gBAAW,GAAG,iBAAK,CAAC,iBAAiB,CAAC;QAM/B,aAAQ,GAAa,IAAI,iBAAQ,EAAE,CAAC;~~IAmM7C~~,CAAC;~~IAxMC~~,6DAA6D;IAC7D,QAAQ,CAAC,eAAgC;QACvC,OAAO,IAAI,CAAC;IACd,CAAC;IAIM,KAAK,CAAC,gBAAgB,CAC3B,OAAgB,EAChB,MAAc,EACd,OAAqB;QAErB,eAAM,CAAC,SAAS,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QACtC,~~OAAO,MAAM,~~IAAI,~~CAAC,QAAQ,CAAC,gBAAgB,CAAC,~~OAAO,~~EAAE~~,MAAM,~~EAAE~~,~~OAAO~~,CAAC,~~CAAC;IACxE~~,CAAC~~;IAEM~~,~~KAAK,~~CAAC~~,uBAAuB,CAClC,GAAY,EACZ,MAAc,EACd,IAAU,EACV,OAAmC,EACnC,aAA4B~~;~~QAE5B~~,~~wDAAwD~~;~~QACxD~~,IAAI,MAAM,CAAC,QAAQ,KAAK,sBAAQ,CAAC,~~QAAQ,IAAI,yBAAgB,CAAC,~~GAAG,~~CAAC,cAAc,CAAC,~~EAAE;~~YACjF~~,~~MAAM,IAAI,8BAAsB,CAAC,mBAAK,CAAC,WAAW,CAAC,CAAC~~;~~SACrD;QAED~~,~~MAAM~~,~~qBAAqB,~~GAAG,~~IAAI~~,~~uBAAS,~~CAAC~~;YAC1C~~,~~IAAI,EAAE,~~OAAO~~;SACd~~,CAAC~~,CAAC~~;~~QAEH,MAAM,aAAa,GAAyB~~;~~YAC1C~~,~~IAAI,EAAE,yBAAa,CAAC,QAAQ;YAC5B,IAAI,EAAE,cAAc;YACpB,aAAa,EAAE,CAAC,wBAAY,EAAE,sBAAU,EAAE,yBAAa,CAAC;YACxD,KAAK,EAAE,kCAAkB,CAAC,kCAAkC,CAAC;YAC7D,~~OAAO,~~EAAE,wBAAY,CAAC,EAAE;SACzB,CAAC;QAEF,~~MAAM,~~aAAa,GAAwB;YACzC,~~IAAI,~~EAAE,yBAAa,~~CAAC,QAAQ~~;YAC5B~~,~~IAAI,EAAE,aAAa;YACnB,aAAa,EAAE,~~CAAC,~~oBAAQ~~,~~EAAE,oBAAQ,EAAE,2BAAe,EAAE,yBAAa,~~CAAC~~;YACnE~~,~~KAAK,EAAE,kCAAkB,CAAC,kCAAkC,CAAC;YAC7D,~~OAAO,EAAE,~~CAAC,oBAAQ,CAAC,EAAE,CAAC;SACvB,CAAC;QAEF,0CAA0C;QAC1C,IAAI,~~MAAM,~~CAAC,QAAQ,KAAK,sBAAQ,CAAC,MAAM,~~EAAE~~;YACvC~~,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;gBACvB,MAAM,IAAI,6BAAoB,EAAE,CAAC;aAClC;YAED,MAAM,iBAAiB,GAAG,MAAM,gCAAkB,CAAC,oBAAoB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;YAC5F,IAAI,iBAAiB,CAAC,KAAK,EAAE,EAAE;gBAC7B,MAAM,IAAI,sBAAa,CACrB;oBACE,gCAAgB,CAAC,iCAAiC,EAAE,iBAAiB,CAAC,KAAK,CAAC,OAAO,CAAC~~;oBACpF~~,~~kCAAkB,~~CAAC~~,iCAAiC,EAAE,iBAAiB,CAAC,KAAK,CAAC,OAAO,CAAC~~;~~iBACvF~~,~~EACD,iBAAiB,~~CAAC~~,KAAK,CACxB,CAAC~~;~~aACH;YAED~~,~~MAAM,gBAAgB,GAAG,6CAAqB,CAAC,WAAW,CACxD,MAAM,CAAC,WAAY,EACnB,iBAAiB,CAAC,~~KAAK,~~CACxB,~~CAAC~~;YACF~~,~~8DAA8D;YAC9D~~,~~iCAAiC;YAEjC~~,~~MAAM~~,~~gBAAgB~~,~~GAAyB;gBAC7C,IAAI,EAAE,cAAc;gBACpB,IAAI,EAAE,yBAAa,CAAC,WAAW;gBAC/B,KAAK,EAAE,kCAAkB,CAAC,qCAAqC,CAAC;gBAChE,aAAa,EAAE,EAAE;gBACjB,cAAc,EAAE,KAAK,EAAE,~~MAAc,~~EAAyB~~,~~EAAE;oBAC9D~~,~~uFAAuF;oBACvF~~,~~OAAO~~,~~gBAAgB~~,~~CAAC,mBAAmB,EAAE,CAAC~~;~~gBAChD~~,~~CAAC;gBACD,gBAAgB,EAAE,IAAI;aACvB,CAAC;YAEF,aAAa,CAAC,cAAc,GAAG,KAAK,EAAE,MAAc,EAAyB,EAAE;gBAC7E,MAAM,~~OAAO,~~GAAG,~~MAAM,~~CAAC~~,~~yBAAa,~~CAAC,~~WAAW~~,~~CAAC,CAAC;gBAClD,OAAO,gBAAgB,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC;YAC5D,CAAC,CAAC;YAEF,aAAa,CAAC,cAAc,GAAG,KAAK,~~EAAE,~~MAAc~~,~~EAAyB,EAAE;gBAC7E,MAAM,OAAO,GAAG,MAAM,~~CAAC,~~yBAAa,~~CAAC~~,WAAW,CAAC,CAAC~~;~~gBAClD~~,~~MAAM,QAAQ,GAAG,MAAM,~~CAAC~~,yBAAa,CAAC,QAAQ,CAAC,CAAC~~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~~AA3MY~~,YAAY;IADxB,gBAAO,CAAC,2CAAiB,CAAC,UAAU,CAAC;GACzB,YAAY,~~CA2MxB~~;~~AA3MY~~,oCAAY;~~AA6MzB~~,kBAAe,IAAI,YAAY,EAAE,CAAC"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/plugins/resource/cicd/index.ts"],"names":[],"mappings":"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"}

package/build/plugins/resource/cicd/plugin.d.ts CHANGED Viewed

@@ -1,10 +1,9 @@
-import { Context } from "@microsoft/teamsfx-api/build/v2";
 import { Inputs, v2 } from "@microsoft/teamsfx-api";
 import { FxResult } from "./result";
 export declare class CICDImpl {
     commonProperties: {
         [key: string]: string;
     };
-    addCICDWorkflows(context: Context, inputs: Inputs, envInfo: v2.EnvInfoV2): Promise<FxResult>;
+    addCICDWorkflows(context: v2.Context, inputs: Inputs, envName: string): Promise<FxResult>;
 }
 //# sourceMappingURL=plugin.d.ts.map

package/build/plugins/resource/cicd/plugin.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/cicd/plugin.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,~~OAAO,EAAE,~~MAAM,~~iCAAiC~~,~~CAAC;AAC1D,OAAO,~~EAAE,~~MAAM,~~EAAE,~~EAAE,EAAY,~~MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAA8C,QAAQ,EAAE,MAAM,UAAU,CAAC;AAShF,qBAAa,QAAQ;IACZ,gBAAgB,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAM;IAC3C,gBAAgB,CAC3B,OAAO,EAAE,OAAO,~~EAChB~~,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,~~EAAE~~,~~CAAC~~,~~SAAS,GACpB,~~OAAO,CAAC,QAAQ,CAAC;~~CAgHrB~~"}
1	+ {"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/cicd/plugin.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAY,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAA8C,QAAQ,EAAE,MAAM,UAAU,CAAC;AAShF,qBAAa,QAAQ;IACZ,gBAAgB,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAM;IAC3C,gBAAgB,CAC3B,OAAO,EAAE,EAAE,CAAC,OAAO,EACnB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,QAAQ,CAAC;CAyGrB"}

package/build/plugins/resource/cicd/plugin.js CHANGED Viewed

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CICDImpl = void 0;
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const result_1 = require("./result");
 const factory_1 = require("./providers/factory");
@@ -13,19 +15,12 @@ class CICDImpl {
     constructor() {
         this.commonProperties = {};
     }
-    async addCICDWorkflows(context, inputs, envInfo) {
+    async addCICDWorkflows(context, inputs, envName) {
         // 1. Key inputs (envName, provider, template) x (hostingType, ).
         if (!inputs.projectPath) {
             throw new errors_1.NoProjectOpenedError();
         }
         const projectPath = inputs.projectPath;
-        // By default(VSC), get env name from plugin's own `target-env` question.
-        let envName = inputs[questions_1.questionNames.Environment];
-        // TODO: add support for VS/.Net Projects.
-        if (inputs.platform === teamsfx_api_1.Platform.CLI) {
-            // In CLI, get env name from the default `env` question.
-            envName = envInfo.envName;
-        }
         const providerName = inputs[questions_1.questionNames.Provider];
         const templateNames = inputs[questions_1.questionNames.Template];
         if (!envName || !providerName || templateNames.length === 0) {

package/build/plugins/resource/cicd/plugin.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../src/plugins/resource/cicd/plugin.ts"],"names":[],"mappings":";;;~~AAGA~~,wDAA8D;AAC9D,qCAAgF;AAChF,iDAA0D;AAE1D,2CAAkF;AAClF,qCAA+D;AAC/D,qCAAkC;AAClC,iEAAqF;AACrF,yDAAmE;AAEnE,MAAa,QAAQ;IAArB;QACS,qBAAgB,GAA8B,EAAE,CAAC;~~IAqH1D~~,CAAC;~~IApHQ~~,KAAK,CAAC,gBAAgB,CAC3B,~~OAAgB~~,~~EAChB~~,MAAc,EACd,~~OAAqB~~;~~QAErB~~,iEAAiE;QACjE,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;YACvB,MAAM,IAAI,6BAAoB,EAAE,CAAC;SAClC;QACD,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;QACvC,~~yEAAyE;QACzE,IAAI,OAAO,GAAG,~~MAAM,~~CAAC,yBAAa,CAAC,WAAW,CAAC,CAAC;QAChD,0CAA0C;QAC1C,IAAI,MAAM,CAAC,QAAQ,KAAK,sBAAQ,CAAC,GAAG,EAAE;YACpC,wDAAwD;YACxD,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;SAC3B;QACD,MAAM,~~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~~AAtHD~~,~~4BAsHC~~"}
1	+ {"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../src/plugins/resource/cicd/plugin.ts"],"names":[],"mappings":"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"}

package/build/plugins/resource/cicd/providers/provider.d.ts CHANGED Viewed

@@ -1,11 +1,11 @@
+import { v2 } from "@microsoft/teamsfx-api";
 import { FxResult } from "../result";
-import { Context } from "@microsoft/teamsfx-api/build/v2";
 export declare class CICDProvider {
     scaffoldTo: string;
     providerName: string;
     sourceTemplateName?: (templateName: string) => string;
     targetTemplateName?: (templateName: string, envName: string) => string;
-    scaffold(projectPath: string, templateName: string, envName: string, context: Context): Promise<FxResult>;
+    scaffold(projectPath: string, templateName: string, envName: string, context: v2.Context): Promise<FxResult>;
     readLocalFile(localPath: string): Promise<string>;
 }
 //# sourceMappingURL=provider.d.ts.map

package/build/plugins/resource/cicd/providers/provider.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/resource/cicd/providers/provider.ts"],"names":[],"mappings":"~~AAIA~~,OAAO,EAAE,~~QAAQ,~~EAAE,MAAM,~~WAAW~~,CAAC;~~AAOrC~~,OAAO,EAAE,~~OAAO~~,EAAE,MAAM,~~iCAAiC~~,CAAC;~~AAG1D~~,qBAAa,YAAY;IAChB,UAAU,SAAM;IAChB,YAAY,SAAM;IAClB,kBAAkB,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,MAAM,CAAC;IACtD,kBAAkB,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,MAAM,CAAC;IACjE,QAAQ,CACnB,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,~~GACf~~,OAAO,CAAC,QAAQ,CAAC;~~IAkGP~~,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAiB/D"}
1	+ {"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/resource/cicd/providers/provider.ts"],"names":[],"mappings":"AAGA,OAAO,EAAyB,EAAE,EAAE,MAAM,wBAAwB,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAgBrC,qBAAa,YAAY;IAChB,UAAU,SAAM;IAChB,YAAY,SAAM;IAClB,kBAAkB,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,MAAM,CAAC;IACtD,kBAAkB,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,MAAM,CAAC;IACjE,QAAQ,CACnB,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,EAAE,CAAC,OAAO,GAClB,OAAO,CAAC,QAAQ,CAAC;IAgHP,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAiB/D"}

package/build/plugins/resource/cicd/providers/provider.js CHANGED Viewed

@@ -12,6 +12,9 @@ const path_1 = tslib_1.__importDefault(require("path"));
 const mustache_1 = tslib_1.__importDefault(require("mustache"));
 const folder_1 = require("../../../../folder");
 const buildScripts_1 = require("../utils/buildScripts");
+const utils_1 = require("../../../../common/utils");
+const globalVars_1 = require("../../../../core/globalVars");
+const projectSettingsHelperV3_1 = require("../../../../common/projectSettingsHelperV3");
 class CICDProvider {
     constructor() {
         this.scaffoldTo = "";
@@ -55,16 +58,31 @@ class CICDProvider {
             }
         }
         // 3. Generate template file.
-        const hostType = (_a = context.projectSetting.solutionSettings) === null || _a === void 0 ? void 0 : _a.hostType;
-        const replacements = {
-            env_name: envName,
-            build_script: buildScripts_1.generateBuildScript(context.projectSetting),
-            hosting_type_contains_spfx: hostType === "SPFx",
-            hosting_type_contains_azure: hostType === "Azure",
-            cloud_resources_contains_sql: (_c = (_b = context.projectSetting.solutionSettings) === null || _b === void 0 ? void 0 : _b["azureResources"].includes("sql")) !== null && _c !== void 0 ? _c : false,
-            api_prefix: context.projectSetting.appName,
-            cloud_resources_contains_apim: (_e = (_d = context.projectSetting.solutionSettings) === null || _d === void 0 ? void 0 : _d["azureResources"].includes("apim")) !== null && _e !== void 0 ? _e : false,
-        };
+        let replacements;
+        if (!globalVars_1.isV3()) {
+            const hostType = (_a = context.projectSetting.solutionSettings) === null || _a === void 0 ? void 0 : _a.hostType;
+            replacements = {
+                env_name: envName,
+                build_script: buildScripts_1.generateBuildScript(context.projectSetting),
+                hosting_type_contains_spfx: hostType === "SPFx",
+                hosting_type_contains_azure: hostType === "Azure",
+                cloud_resources_contains_sql: (_c = (_b = context.projectSetting.solutionSettings) === null || _b === void 0 ? void 0 : _b["azureResources"].includes("sql")) !== null && _c !== void 0 ? _c : false,
+                api_prefix: utils_1.convertToAlphanumericOnly(context.projectSetting.appName),
+                cloud_resources_contains_apim: (_e = (_d = context.projectSetting.solutionSettings) === null || _d === void 0 ? void 0 : _d["azureResources"].includes("apim")) !== null && _e !== void 0 ? _e : false,
+            };
+        }
+        else {
+            const projectSettingsV3 = context.projectSetting;
+            replacements = {
+                env_name: envName,
+                build_script: buildScripts_1.generateBuildScript(context.projectSetting),
+                hosting_type_contains_spfx: projectSettingsHelperV3_1.hasSPFxTab(projectSettingsV3),
+                hosting_type_contains_azure: projectSettingsHelperV3_1.hasAzureResourceV3(projectSettingsV3),
+                cloud_resources_contains_sql: projectSettingsHelperV3_1.hasSQL(projectSettingsV3),
+                api_prefix: utils_1.convertToAlphanumericOnly(context.projectSetting.appName),
+                cloud_resources_contains_apim: projectSettingsHelperV3_1.hasAPIM(projectSettingsV3),
+            };
+        }
         const targetTemplatePath = path_1.default.join(targetPath, this.targetTemplateName(templateName, envName));
         if (!(await fs.pathExists(targetTemplatePath))) {
             const localTemplatePath = path_1.default.join(folder_1.getTemplatesFolder(), "plugins", "resource", "cicd", this.providerName, this.sourceTemplateName(templateName));

package/build/plugins/resource/cicd/providers/provider.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"provider.js","sourceRoot":"","sources":["../../../../../src/plugins/resource/cicd/providers/provider.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,~~wDAA4C~~;~~AAE5C~~,qDAA+B;AAC/B,sCAAiF;AACjF,mCAAuC;AACvC,wDAAwB;AACxB,gEAAgC;AAChC,+CAAwD;~~AAExD~~,wDAA4D;~~AAE5D~~,MAAa,YAAY;IAAzB;QACS,eAAU,GAAG,EAAE,CAAC;QAChB,iBAAY,GAAG,EAAE,CAAC;~~IA2H3B~~,CAAC;~~IAxHQ~~,KAAK,CAAC,QAAQ,CACnB,WAAmB,EACnB,YAAoB,EACpB,OAAe,EACf,~~OAAgB~~;;~~QAEhB~~,0BAA0B;QAC1B,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,EAAE;YACvC,MAAM,IAAI,6BAAoB,EAAE,CAAC;SAClC;QACD,IAAI,CAAC,MAAM,CAAC,MAAM,CAAS,oBAAY,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;YAC/D,MAAM,IAAI,sBAAa,CAAC;gBACtB,GAAG,YAAY,uCAAuC;gBACtD,GAAG,YAAY,uCAAuC;aACvD,CAAC,CAAC;SACJ;QACD,IAAI,CAAC,IAAI,CAAC,kBAAkB,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE;YACxD,MAAM,IAAI,sBAAa,CAAC;gBACtB,iEAAiE;gBACjE,iEAAiE;aAClE,CAAC,CAAC;SACJ;QAED,yCAAyC;QACzC,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QAC3D,IAAI;YACF,MAAM,EAAE,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;SAChC;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,IAAI,wBAAe,CACvB,CAAC,wBAAwB,UAAU,EAAE,EAAE,wBAAwB,UAAU,EAAE,CAAC,EAC5E,CAAU,CACX,CAAC;SACH;QAED,2BAA2B;QAC3B,MAAM,gBAAgB,GAAG,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;QAC5D,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC,EAAE;YAC5C,MAAM,eAAe,GAAG,cAAI,CAAC,IAAI,CAC/B,2BAAkB,EAAE,EACpB,SAAS,EACT,UAAU,EACV,MAAM,EACN,IAAI,CAAC,YAAY,EACjB,WAAW,CACZ,CAAC;YAEF,IAAI;gBACF,MAAM,EAAE,CAAC,QAAQ,CAAC,eAAe,EAAE,gBAAgB,CAAC,CAAC;aACtD;YAAC,OAAO,CAAC,EAAE;gBACV,MAAM,IAAI,wBAAe,CACvB,CAAC,uBAAuB,gBAAgB,EAAE,EAAE,uBAAuB,gBAAgB,EAAE,CAAC,EACtF,CAAU,CACX,CAAC;aACH;SACF;QAED,6BAA6B;QAC7B,MAAM,QAAQ,GAAG,MAAA,OAAO,CAAC,cAAc,CAAC,gBAAgB,0CAAE,QAAQ,CAAC;~~QACnE~~,~~MAAM,~~YAAY,GAAG;~~YACnB~~,QAAQ,EAAE,OAAO;~~YACjB~~,YAAY,EAAE,kCAAmB,CAAC,OAAO,CAAC,cAAc,CAAC;~~YACzD~~,0BAA0B,EAAE,QAAQ,KAAK,MAAM;~~YAC~~/C,2BAA2B,EAAE,QAAQ,KAAK,OAAO;~~YACjD~~,4BAA4B,EAC1B,MAAA,MAAA,OAAO,CAAC,cAAc,CAAC,gBAAgB,0CAAG,gBAAgB,EAAE,QAAQ,CAAC,KAAK,CAAC,mCAAI,KAAK;~~YACtF~~,UAAU,EAAE,OAAO,CAAC,cAAc,CAAC,OAAO;~~YAC1C~~,6BAA6B,EAC3B,MAAA,MAAA,OAAO,CAAC,cAAc,CAAC,gBAAgB,0CAAG,gBAAgB,EAAE,QAAQ,CAAC,MAAM,CAAC,mCAAI,KAAK;~~SACxF~~,CAAC;~~QAEF~~,MAAM,kBAAkB,GAAG,cAAI,CAAC,IAAI,CAClC,UAAU,EACV,IAAI,CAAC,kBAAkB,CAAC,YAAY,EAAE,OAAO,CAAC,CAC/C,CAAC;QACF,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC,EAAE;YAC9C,MAAM,iBAAiB,GAAG,cAAI,CAAC,IAAI,CACjC,2BAAkB,EAAE,EACpB,SAAS,EACT,UAAU,EACV,MAAM,EACN,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC,CACtC,CAAC;YACF,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC;YACpE,MAAM,eAAe,GAAG,kBAAQ,CAAC,MAAM,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;YACvE,IAAI;gBACF,MAAM,EAAE,CAAC,SAAS,CAAC,kBAAkB,EAAE,eAAe,CAAC,CAAC;aACzD;YAAC,OAAO,CAAC,EAAE;gBACV,MAAM,IAAI,wBAAe,CACvB;oBACE,uBAAuB,kBAAkB,EAAE;oBAC3C,uBAAuB,kBAAkB,EAAE;iBAC5C,EACD,CAAU,CACX,CAAC;aACH;SACF;aAAM;YACL,OAAO,gBAAE,CAAC,IAAI,CAAC,CAAC,CAAC,+DAA+D;SACjF;QAED,OAAO,gBAAE,CAAC,KAAK,CAAC,CAAC,CAAC,2CAA2C;IAC/D,CAAC;IAEM,KAAK,CAAC,aAAa,CAAC,SAAiB;QAC1C,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,EAAE;YACrC,MAAM,IAAI,sBAAa,CAAC;gBACtB,eAAe,SAAS,aAAa;gBACrC,eAAe,SAAS,aAAa;aACtC,CAAC,CAAC;SACJ;QAED,IAAI;YACF,OAAO,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;SAClD;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,IAAI,wBAAe,CACvB,CAAC,sBAAsB,SAAS,EAAE,EAAE,sBAAsB,SAAS,EAAE,CAAC,EACtE,CAAU,CACX,CAAC;SACH;IACH,CAAC;CACF;~~AA7HD~~,~~oCA6HC~~"}
1	+ {"version":3,"file":"provider.js","sourceRoot":"","sources":["../../../../../src/plugins/resource/cicd/providers/provider.ts"],"names":[],"mappings":"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"}

package/build/plugins/resource/frontend/dotnet/plugin.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/resource/frontend/dotnet/plugin.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,IAAI,EACJ,aAAa,EAGb,MAAM,EACN,OAAO,EACR,MAAM,wBAAwB,CAAC;AAahC,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AA0BhE,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;~~AAM1C~~,aAAK,IAAI,GAAG,uBAAuB,CAAC,IAAI,CAAC;AACzC,aAAK,aAAa,GAAG,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;AAE1C,MAAM,WAAW,kBAAkB;IAEjC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAGlB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAG1B,IAAI,CAAC,EAAE,IAAI,CAAC;CACb;AAED,qBAAa,gBAAiB,YAAW,UAAU;IACjD,OAAO,CAAC,qBAAqB;IAuB7B,OAAO,CAAC,WAAW;IAON,QAAQ,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;~~IAiBpD~~,oBAAoB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;IAoDhE,kBAAkB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;IA0B9D,UAAU,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;IAKtD,cAAc,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;IAoC1D,aAAa,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;IAIzD,SAAS,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;IAIrD,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;IAIvE,MAAM,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;CA0ChE"}
1	+ {"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/resource/frontend/dotnet/plugin.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,IAAI,EACJ,aAAa,EAGb,MAAM,EACN,OAAO,EACR,MAAM,wBAAwB,CAAC;AAahC,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AA0BhE,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAQ1C,aAAK,IAAI,GAAG,uBAAuB,CAAC,IAAI,CAAC;AACzC,aAAK,aAAa,GAAG,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;AAE1C,MAAM,WAAW,kBAAkB;IAEjC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAGlB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAG1B,IAAI,CAAC,EAAE,IAAI,CAAC;CACb;AAED,qBAAa,gBAAiB,YAAW,UAAU;IACjD,OAAO,CAAC,qBAAqB;IAuB7B,OAAO,CAAC,WAAW;IAON,QAAQ,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;IAuBpD,oBAAoB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;IAoDhE,kBAAkB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;IA0B9D,UAAU,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;IAKtD,cAAc,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;IAoC1D,aAAa,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;IAIzD,SAAS,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;IAIrD,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;IAIvE,MAAM,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;CA0ChE"}

package/build/plugins/resource/frontend/dotnet/plugin.js CHANGED Viewed

@@ -25,6 +25,8 @@ const progress_helper_1 = require("../utils/progress-helper");
 const steps_1 = require("./resources/steps");
 const question_1 = require("../../../solution/fx-solution/question");
 const constants_3 = require("../../../solution/fx-solution/constants");
+const question_2 = require("../../../../core/question");
+const utils_1 = require("../../../../common/utils");
 class DotnetPluginImpl {
     syncConfigFromContext(ctx) {
         var _a, _b;
@@ -52,14 +54,15 @@ class DotnetPluginImpl {
         throw new errors_1.FetchConfigError(key);
     }
     async scaffold(ctx) {
-        var _a;
+        var _a, _b, _c;
         logger_1.Logger.info(messages_1.Messages.StartScaffold);
         if (!ctx.projectSettings) {
             throw new errors_1.NoProjectSettingError();
         }
         const projectName = ctx.projectSettings.appName;
-        await scaffold_1.scaffoldFromZipPackage(ctx.root, new templateInfo_1.TemplateInfo({ ProjectName: projectName }));
-        ctx.projectSettings.pluginSettings = Object.assign(Object.assign({}, (_a = ctx.projectSettings) === null || _a === void 0 ? void 0 : _a.pluginSettings), { projectFilePath: path_1.default.join(ctx.root, constants_1.DotnetPathInfo.projectFilename(ctx.projectSettings.appName)) });
+        const safeProjectName = (_b = (_a = ctx.answers) === null || _a === void 0 ? void 0 : _a[question_2.CoreQuestionNames.SafeProjectName]) !== null && _b !== void 0 ? _b : utils_1.convertToAlphanumericOnly(projectName);
+        await scaffold_1.scaffoldFromZipPackage(ctx.root, new templateInfo_1.TemplateInfo({ ProjectName: projectName, SafeProjectName: safeProjectName }));
+        ctx.projectSettings.pluginSettings = Object.assign(Object.assign({}, (_c = ctx.projectSettings) === null || _c === void 0 ? void 0 : _c.pluginSettings), { projectFilePath: path_1.default.join(ctx.root, constants_1.DotnetPathInfo.projectFilename(projectName)) });
         logger_1.Logger.info(messages_1.Messages.EndScaffold);
         return teamsfx_api_1.ok(undefined);
     }

package/build/plugins/resource/frontend/dotnet/plugin.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../../src/plugins/resource/frontend/dotnet/plugin.ts"],"names":[],"mappings":";;;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,wDAOgC;AAChC,2CASqB;AACrB,mDAAgD;AAChD,6CAAwD;AAExD,uDAA0D;AAC1D,iCAAsD;AACtD,+CAM4B;AAC5B,6DAAuC;AACvC,4CAAyC;AACzC,wDAAwB;AACxB,gEAA0B;AAC1B,+CAAwD;AACxD,oDAKkC;AAClC,2DAAwD;AACxD,4DAAqD;AACrD,mGAAsG;AACtG,sEAAyF;AAGzF,8DAA0D;AAC1D,6CAA2E;AAC3E,qEAAsF;AACtF,uEAAsE;~~AAwBtE~~,MAAa,gBAAgB;IACnB,qBAAqB,CAAC,GAAkB;;QAC9C,MAAM,MAAM,GAAuB,EAAE,CAAC;QACtC,MAAM,cAAc,GAAqC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAC5E,+BAAmB,CAAC,kBAAkB,CACvC,CAAC;QACF,MAAM,CAAC,iBAAiB,GAAG,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,GAAG,CAAC,+BAAmB,CAAC,iBAAiB,CAAW,CAAC;QAChG,MAAM,CAAC,cAAc,GAAG,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,GAAG,CAAC,+BAAmB,CAAC,cAAc,CAAW,CAAC;QAE1F,MAAM,CAAC,UAAU,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,4BAAU,CAAC,UAAU,CAAW,CAAC;QACpE,MAAM,CAAC,kBAAkB,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,4BAAU,CAAC,kBAAkB,CAAW,CAAC;QACpF,MAAM,CAAC,eAAe,GAAG,MAAA,MAAA,GAAG,CAAC,eAAe,0CAAE,cAAc,0CAAE,eAAyB,CAAC;QAExF,sCAAsC;QACtC,MAAM,gBAAgB,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,sBAAS,CAAC,gBAAgB,CAAW,CAAC;QAC9E,IAAI,gBAAgB,EAAE;YACpB,MAAM,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;YAC3C,MAAM,CAAC,iBAAiB,GAAG,0CAAkC,CAAC,gBAAgB,CAAC,CAAC;YAChF,MAAM,CAAC,UAAU,GAAG,iCAAyB,CAAC,gBAAgB,CAAC,CAAC;YAChE,MAAM,CAAC,cAAc,GAAG,uCAA+B,CAAC,gBAAgB,CAAC,CAAC;SAC3E;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,WAAW,CAAI,CAAgB,EAAE,GAAW;QAClD,IAAI,CAAC,EAAE;YACL,OAAO,CAAC,CAAC;SACV;QACD,MAAM,IAAI,yBAAgB,CAAC,GAAG,CAAC,CAAC;IAClC,CAAC;IAEM,KAAK,CAAC,QAAQ,CAAC,GAAkB;;QACtC,eAAM,CAAC,IAAI,CAAC,mBAAQ,CAAC,aAAa,CAAC,CAAC;QAEpC,IAAI,CAAC,GAAG,CAAC,eAAe,EAAE;YACxB,MAAM,IAAI,8BAAqB,EAAE,CAAC;SACnC;~~QACD~~,MAAM,WAAW,GAAG,GAAG,CAAC,eAAgB,CAAC,OAAO,CAAC;QACjD,MAAM,~~iCAAsB~~,CAAC,GAAG,CAAC,IAAI,~~EAAE~~,IAAI,2BAAY,CAAC,EAAE,WAAW,EAAE,WAAW,EAAE,~~CAAC~~,CAAC,CAAC;~~QACvF~~,GAAG,CAAC,eAAe,CAAC,cAAc,mCAC7B,MAAA,GAAG,CAAC,eAAe,0CAAE,cAAc,KACtC,eAAe,EAAE,cAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,0BAAQ,CAAC,eAAe,CAAC,~~GAAG~~,CAAC,~~eAAe,~~CAAC,~~OAAO~~,CAAC~~,CAAC,GAC5F,CAAC~~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~~AA7ND~~,~~4CA6NC~~"}
1	+ {"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../../src/plugins/resource/frontend/dotnet/plugin.ts"],"names":[],"mappings":"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"}

package/build/plugins/resource/function/v3/index.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/resource/function/v3/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAEL,OAAO,EACP,MAAM,EAEN,eAAe,EACf,SAAS,EACT,MAAM,EACN,aAAa,EACb,EAAE,EACF,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;~~AA8BhC~~,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AA4B3C,qBACa,gBAAiB,YAAW,EAAE,CAAC,QAAQ;IAClD,IAAI,SAAsC;IAC1C,WAAW,SAAoB;IAC/B,MAAM,EAAE,cAAc,CAEpB;IACF,OAAO,CAAC,0BAA0B;IAI5B,0BAA0B,CAC9B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;YAwBpC,qBAAqB;IAkBnC,OAAO,CAAC,mBAAmB;IAuB3B,OAAO,CAAC,cAAc;IA2CtB,OAAO,CAAC,WAAW;IAOb,YAAY,CAChB,GAAG,EAAE,EAAE,CAAC,2BAA2B,EACnC,MAAM,EAAE,EAAE,CAAC,gBAAgB,GAC1B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAsC3B,aAAa,CACjB,GAAG,EAAE,EAAE,CAAC,2BAA2B,EACnC,MAAM,EAAE,EAAE,CAAC,gBAAgB,GAC1B,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,aAAa,EAAE,EAAE,OAAO,CAAC,CAAC;IAiDzC,WAAW,CACf,GAAG,EAAE,EAAE,CAAC,2BAA2B,EACnC,MAAM,EAAE,EAAE,CAAC,YAAY,GACtB,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,aAAa,EAAE,EAAE,OAAO,CAAC,CAAC;IA2BzC,WAAW,CACf,GAAG,EAAE,EAAE,CAAC,2BAA2B,EACnC,MAAM,EAAE,EAAE,CAAC,qBAAqB,GAC/B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,CAAC;IAWrC,OAAO,CAAC,aAAa;IAKrB,OAAO,CAAC,kBAAkB;IAK1B,OAAO,CAAC,+BAA+B;IAMvC,OAAO,CAAC,4BAA4B;YAKtB,OAAO;IAYrB,OAAO,CAAC,0BAA0B;IAU3B,eAAe,CAAC,eAAe,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAO3E,iBAAiB,CACrB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAgEnB,mBAAmB;YAwBnB,8BAA8B;IAkBtC,MAAM,CACV,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;CAqFlC"}
1	+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/resource/function/v3/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAEL,OAAO,EACP,MAAM,EAEN,eAAe,EACf,SAAS,EACT,MAAM,EACN,aAAa,EACb,EAAE,EACF,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AA+BhC,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AA4B3C,qBACa,gBAAiB,YAAW,EAAE,CAAC,QAAQ;IAClD,IAAI,SAAsC;IAC1C,WAAW,SAAoB;IAC/B,MAAM,EAAE,cAAc,CAEpB;IACF,OAAO,CAAC,0BAA0B;IAI5B,0BAA0B,CAC9B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;YAwBpC,qBAAqB;IAkBnC,OAAO,CAAC,mBAAmB;IAuB3B,OAAO,CAAC,cAAc;IA2CtB,OAAO,CAAC,WAAW;IAOb,YAAY,CAChB,GAAG,EAAE,EAAE,CAAC,2BAA2B,EACnC,MAAM,EAAE,EAAE,CAAC,gBAAgB,GAC1B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAsC3B,aAAa,CACjB,GAAG,EAAE,EAAE,CAAC,2BAA2B,EACnC,MAAM,EAAE,EAAE,CAAC,gBAAgB,GAC1B,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,aAAa,EAAE,EAAE,OAAO,CAAC,CAAC;IAiDzC,WAAW,CACf,GAAG,EAAE,EAAE,CAAC,2BAA2B,EACnC,MAAM,EAAE,EAAE,CAAC,YAAY,GACtB,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,aAAa,EAAE,EAAE,OAAO,CAAC,CAAC;IA2BzC,WAAW,CACf,GAAG,EAAE,EAAE,CAAC,2BAA2B,EACnC,MAAM,EAAE,EAAE,CAAC,qBAAqB,GAC/B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,CAAC;IAWrC,OAAO,CAAC,aAAa;IAKrB,OAAO,CAAC,kBAAkB;IAK1B,OAAO,CAAC,+BAA+B;IAMvC,OAAO,CAAC,4BAA4B;YAKtB,OAAO;IAYrB,OAAO,CAAC,0BAA0B;IAU3B,eAAe,CAAC,eAAe,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAO3E,iBAAiB,CACrB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAgEnB,mBAAmB;YAwBnB,8BAA8B;IAkBtC,MAAM,CACV,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;CAqFlC"}

package/build/plugins/resource/function/v3/index.js CHANGED Viewed

@@ -13,6 +13,7 @@ const checkerFactory_1 = require("../../../../common/deps-checker/checkerFactory
 const depsChecker_1 = require("../../../../common/deps-checker/depsChecker");
 const depsError_1 = require("../../../../common/deps-checker/depsError");
 const tools_1 = require("../../../../common/tools");
+const utils_1 = require("../../../../common/utils");
 const CommonErrorHandlerMW_1 = require("../../../../core/middleware/CommonErrorHandlerMW");
 const folder_1 = require("../../../../folder");
 const question_1 = require("../../../solution/fx-solution/question");
@@ -133,7 +134,7 @@ let FunctionPluginV3 = class FunctionPluginV3 {
         this.config.functionName = name;
         const functionName = this.checkAndGet(this.config.functionName, enums_1.FunctionConfigKey.functionName);
         await scaffold_1.FunctionScaffold.scaffoldFunction(workingPath, functionLanguage, constants_3.DefaultValues.functionTriggerType, functionName, {
-            appName: ctx.projectSetting.appName,
+            appName: utils_1.convertToAlphanumericOnly(ctx.projectSetting.appName),
             functionName: functionName,
         });
         if (!this.config.defaultFunctionName) {

package/build/plugins/resource/function/v3/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/plugins/resource/function/v3/index.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/plugins/resource/function/v3/index.ts"],"names":[],"mappings":"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"}

package/build/plugins/resource/simpleauth/plugin.js CHANGED Viewed

@@ -148,7 +148,7 @@ class SimpleAuthPluginImpl {
         const subscriptionId = common_1.Utils.getConfigValueWithValidation(ctx, constants_1.Constants.SolutionPlugin.id, constants_1.Constants.SolutionPlugin.configKeys.subscriptionId);
         const resourceGroupName = common_1.Utils.getConfigValueWithValidation(ctx, constants_1.Constants.SolutionPlugin.id, constants_1.Constants.SolutionPlugin.configKeys.resourceGroupName);
         const location = common_1.Utils.getConfigValueWithValidation(ctx, constants_1.Constants.SolutionPlugin.id, constants_1.Constants.SolutionPlugin.configKeys.location);
-        const webAppName = common_1.Utils.generateResourceName(ctx.projectSettings.appName, resourceNameSuffix);
+        const webAppName = common_1.Utils.generateResourceName(ctx.projectSettings.appName, resourceNameSuffix); // appName will be normalized in generateResourceName(), so we don't do any conversion here.
         const appServicePlanName = webAppName;
         this.webAppClient = new webAppClient_1.WebAppClient(credentials, subscriptionId, resourceGroupName, appServicePlanName, webAppName, location, ctx);
     }

package/build/plugins/resource/simpleauth/plugin.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../src/plugins/resource/simpleauth/plugin.ts"],"names":[],"mappings":"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~~QAChG~~,MAAM,kBAAkB,GAAG,UAAU,CAAC;QAEtC,IAAI,CAAC,YAAY,GAAG,IAAI,2BAAY,CAClC,WAAW,EACX,cAAc,EACd,iBAAiB,EACjB,kBAAkB,EAClB,UAAU,EACV,QAAQ,EACR,GAAG,CACJ,CAAC;IACJ,CAAC;CACF;AA1OD,oDA0OC"}
1	+ {"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../src/plugins/resource/simpleauth/plugin.ts"],"names":[],"mappings":"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"}

package/build/plugins/resource/spfx/depsChecker/generatorChecker.d.ts CHANGED Viewed

@@ -13,7 +13,6 @@ export declare class GeneratorChecker implements DependencyChecker {
     private getPackagePath;
     private getSentinelPath;
     private queryVersion;
-    private hasNPM;
     private cleanup;
     private installGenerator;
     private getExecCommand;

package/build/plugins/resource/spfx/depsChecker/generatorChecker.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"generatorChecker.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/resource/spfx/depsChecker/generatorChecker.ts"],"names":[],"mappings":"AAMA,OAAO,EAGL,OAAO,EACP,WAAW,EAEX,aAAa,EACb,MAAM,EAGP,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAWxE,qBAAa,gBAAiB,YAAW,iBAAiB;IACxD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAc;gBAE1B,MAAM,EAAE,WAAW;WAIjB,iBAAiB,IAAI,cAAc;IAIpC,gBAAgB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IA0BvE,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAa/B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;~~IAmB9B~~,kBAAkB,IAAI,MAAM;YAarB,QAAQ;IAItB,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,eAAe;YAIT,YAAY;YAeZ,~~MAAM;YASN,~~OAAO;YASP,gBAAgB;IAsB9B,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,SAAS;CAGlB"}
1	+ {"version":3,"file":"generatorChecker.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/resource/spfx/depsChecker/generatorChecker.ts"],"names":[],"mappings":"AAMA,OAAO,EAGL,OAAO,EACP,WAAW,EAEX,aAAa,EACb,MAAM,EAGP,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAWxE,qBAAa,gBAAiB,YAAW,iBAAiB;IACxD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAc;gBAE1B,MAAM,EAAE,WAAW;WAIjB,iBAAiB,IAAI,cAAc;IAIpC,gBAAgB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IA0BvE,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAa/B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAa9B,kBAAkB,IAAI,MAAM;YAarB,QAAQ;IAItB,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,eAAe;YAIT,YAAY;YAeZ,OAAO;YASP,gBAAgB;IAsB9B,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,SAAS;CAGlB"}

package/build/plugins/resource/spfx/depsChecker/generatorChecker.js CHANGED Viewed

@@ -56,11 +56,6 @@ class GeneratorChecker {
         return isVersionSupported && hasSentinel;
     }
     async install() {
-        this._logger.info("Checking npm...");
-        if (!(await this.hasNPM())) {
-            this._logger.error(`Failed to find npm!`);
-            throw error_1.NpmNotFoundError();
-        }
         this._logger.info("Start installing...");
         await this.cleanup();
         await this.installGenerator();
@@ -95,15 +90,6 @@ class GeneratorChecker {
         }
         return undefined;
     }
-    async hasNPM() {
-        try {
-            await cpUtils_1.cpUtils.executeCommand(undefined, this._logger, { shell: true }, "npm", "--version");
-            return true;
-        }
-        catch (error) {
-            return false;
-        }
-    }
     async cleanup() {
         try {
             await fs.emptyDir(this.getPackagePath());

package/build/plugins/resource/spfx/depsChecker/generatorChecker.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"generatorChecker.js","sourceRoot":"","sources":["../../../../../src/plugins/resource/spfx/depsChecker/generatorChecker.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,qDAA+B;AAC/B,mDAA6B;AAC7B,+CAAyB;AACzB,wDAUgC;AAEhC,gEAA4D;AAC5D,8DAA8E;AAC9E,oCAAsF;AACtF,0EAAuE;AAEvE,MAAM,IAAI,GAAG,iCAAiC,CAAC;AAC/C,MAAM,gBAAgB,GAAG,QAAQ,CAAC;AAClC,MAAM,WAAW,GAAG,GAAG,IAAI,IAAI,gBAAgB,EAAE,CAAC;AAClD,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,MAAM,CAAC,iBAAiB;QAC7B,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC;IAC1E,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAAC,GAAkB;QAC9C,kCAAe,CAAC,gBAAgB,CAAC,GAAG,EAAE,iCAAe,CAAC,8BAA8B,CAAC,CAAC;QACtF,IAAI;YACF,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC,EAAE;gBAC/B,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,WAAW,4BAA4B,CAAC,CAAC;gBAC9D,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;gBACrB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,0BAA0B,WAAW,EAAE,CAAC,CAAC;aAC5D;YACD,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,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,qBAAqB,IAAI,cAAc,KAAK,GAAG,CAAC,CAAC;YAC1E,OAAO,iBAAG,CAAC,KAAgC,CAAC,CAAC;SAC9C;QAED,OAAO,gBAAE,CAAC,IAAI,CAAC,CAAC;IAClB,CAAC;IAEM,KAAK,CAAC,WAAW;QACtB,IAAI,kBAAkB,GAAG,KAAK,EAC5B,WAAW,GAAG,KAAK,CAAC;QACtB,IAAI;YACF,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;YACnD,kBAAkB,GAAG,gBAAgB,KAAK,SAAS,IAAI,gBAAgB,KAAK,gBAAgB,CAAC;YAC7F,WAAW,GAAG,MAAM,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;SAC3D;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,KAAK,CAAC;SACd;QACD,OAAO,kBAAkB,IAAI,WAAW,CAAC;IAC3C,CAAC;IAEM,KAAK,CAAC,OAAO;QAClB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,~~iBAAiB,CAAC,CAAC;QACrC,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE;YAC1B,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,~~qBAAqB,CAAC,CAAC;~~YAC1C,MAAM,wBAAgB,EAAE,CAAC;SAC1B;QAED,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;~~QACzC,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACrB,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAE9B,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;QAC3C,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC,EAAE;YAC5B,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,sBAAsB,IAAI,kBAAkB,CAAC,CAAC;YACjE,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;YACrB,MAAM,+BAAuB,CAAC,IAAI,CAAC,CAAC;SACrC;IACH,CAAC;IAEM,kBAAkB;QACvB,OAAO,IAAI,CAAC,IAAI,CACd,IAAI,CAAC,qBAAqB,EAAE,EAC5B,cAAc,EACd,YAAY,EACZ,sBAAsB,EACtB,KAAK,EACL,YAAY,EACZ,KAAK,EACL,UAAU,CACX,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,QAAQ;QACpB,OAAO,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;IAClC,CAAC;IAEO,qBAAqB;QAC3B,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,IAAI,8BAAgB,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IACxE,CAAC;IAEO,cAAc;QACpB,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE,EAAE,cAAc,EAAE,YAAY,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,~~MAAM;QAClB,IAAI;YACF,MAAM,iBAAO,CAAC,cAAc,CAAC,SAAS,EAAE,IAAI,CAAC,~~OAAO~~,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC~~;~~YAC3F,OAAO,IAAI,CAAC;SACb;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,KAAK,CAAC;SACd;IACH,CAAC;IAEO,KAAK,CAAC,OAAO;~~QACnB,IAAI;YACF,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;YACzC,MAAM,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;SACzC;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,4BAA4B,IAAI,CAAC,cAAc,EAAE,YAAY,GAAG,EAAE,CAAC,CAAC;SAC9F;IACH,CAAC;IAEO,KAAK,CAAC,gBAAgB;QAC5B,IAAI;YACF,MAAM,iBAAO,CAAC,cAAc,CAC1B,SAAS,EACT,IAAI,CAAC,OAAO,EACZ,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,EAClC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,EAC1B,SAAS,EACT,GAAG,IAAI,IAAI,gBAAgB,EAAE,EAC7B,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,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,iCAAiC,WAAW,EAAE,CAAC,CAAC;YACnE,MAAM,uBAAe,CAAC,KAAc,CAAC,CAAC;SACvC;IACH,CAAC;IAEO,cAAc,CAAC,OAAe;QACpC,OAAO,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,GAAG,OAAO,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;IACvD,CAAC;IAEO,SAAS;QACf,OAAO,EAAE,CAAC,IAAI,EAAE,KAAK,YAAY,CAAC;IACpC,CAAC;CACF;~~AAhKD~~,~~4CAgKC~~"}
1	+ {"version":3,"file":"generatorChecker.js","sourceRoot":"","sources":["../../../../../src/plugins/resource/spfx/depsChecker/generatorChecker.ts"],"names":[],"mappings":"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"}

package/build/plugins/resource/spfx/depsChecker/yoChecker.d.ts CHANGED Viewed

@@ -13,8 +13,6 @@ export declare class YoChecker implements DependencyChecker {
     private getPackagePath;
     private getSentinelPath;
     private queryVersion;
-    private hasNPM;
-    private getNPMMajorVersion;
     private cleanup;
     private installYo;
     private getExecCommand;