@microsoft/teamsfx-core 2.0.10-alpha.530dccdb5.0 → 2.0.10-alpha.535ba4ece.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.
- package/build/client/teamsDevPortalClient.d.ts +1 -0
- package/build/client/teamsDevPortalClient.d.ts.map +1 -1
- package/build/client/teamsDevPortalClient.js +16 -1
- package/build/client/teamsDevPortalClient.js.map +1 -1
- package/build/common/constants.d.ts +0 -16
- package/build/common/constants.d.ts.map +1 -1
- package/build/common/constants.js +1 -18
- package/build/common/constants.js.map +1 -1
- package/build/common/correlator.d.ts +1 -0
- package/build/common/correlator.d.ts.map +1 -1
- package/build/common/correlator.js +6 -1
- package/build/common/correlator.js.map +1 -1
- package/build/common/featureFlags.d.ts +43 -4
- package/build/common/featureFlags.d.ts.map +1 -1
- package/build/common/featureFlags.js +75 -16
- package/build/common/featureFlags.js.map +1 -1
- package/build/common/globalState.js +1 -1
- package/build/common/globalState.js.map +1 -1
- package/build/common/globalVars.d.ts +1 -0
- package/build/common/globalVars.d.ts.map +1 -1
- package/build/common/globalVars.js +2 -1
- package/build/common/globalVars.js.map +1 -1
- package/build/common/projectTypeChecker.js +1 -1
- package/build/common/projectTypeChecker.js.map +1 -1
- package/build/common/samples.js +2 -2
- package/build/common/samples.js.map +1 -1
- package/build/common/secretmasker/dict.d.ts +22 -0
- package/build/common/secretmasker/dict.d.ts.map +1 -0
- package/build/common/secretmasker/dict.js +83 -0
- package/build/common/secretmasker/dict.js.map +1 -0
- package/build/common/secretmasker/feature.d.ts +15 -0
- package/build/common/secretmasker/feature.d.ts.map +1 -0
- package/build/common/secretmasker/feature.js +148 -0
- package/build/common/secretmasker/feature.js.map +1 -0
- package/build/common/secretmasker/masker.d.ts +12 -0
- package/build/common/secretmasker/masker.d.ts.map +1 -0
- package/build/common/secretmasker/masker.js +54 -0
- package/build/common/secretmasker/masker.js.map +1 -0
- package/build/common/stringUtils.d.ts +3 -5
- package/build/common/stringUtils.d.ts.map +1 -1
- package/build/common/stringUtils.js +11 -103
- package/build/common/stringUtils.js.map +1 -1
- package/build/common/telemetry.d.ts +3 -1
- package/build/common/telemetry.d.ts.map +1 -1
- package/build/common/telemetry.js +5 -0
- package/build/common/telemetry.js.map +1 -1
- package/build/common/templates-config.json +1 -1
- package/build/common/tools.d.ts +1 -1
- package/build/common/tools.d.ts.map +1 -1
- package/build/common/tools.js +9 -3
- package/build/common/tools.js.map +1 -1
- package/build/common/utils.d.ts +3 -0
- package/build/common/utils.d.ts.map +1 -1
- package/build/common/utils.js +14 -1
- package/build/common/utils.js.map +1 -1
- package/build/common/wrappedAxiosClient.d.ts.map +1 -1
- package/build/common/wrappedAxiosClient.js +10 -0
- package/build/common/wrappedAxiosClient.js.map +1 -1
- package/build/component/coordinator/index.d.ts.map +1 -1
- package/build/component/coordinator/index.js +11 -120
- package/build/component/coordinator/index.js.map +1 -1
- package/build/component/developerPortalScaffoldUtils.js +1 -1
- package/build/component/developerPortalScaffoldUtils.js.map +1 -1
- package/build/component/driver/aad/create.d.ts.map +1 -1
- package/build/component/driver/aad/create.js +9 -1
- package/build/component/driver/aad/create.js.map +1 -1
- package/build/component/driver/aad/utility/constants.d.ts +1 -0
- package/build/component/driver/aad/utility/constants.d.ts.map +1 -1
- package/build/component/driver/aad/utility/constants.js +1 -0
- package/build/component/driver/aad/utility/constants.js.map +1 -1
- package/build/component/driver/apiKey/create.d.ts.map +1 -1
- package/build/component/driver/apiKey/create.js +4 -1
- package/build/component/driver/apiKey/create.js.map +1 -1
- package/build/component/driver/apiKey/error/apiKeyFromScratchClientSecretInvalid.d.ts +5 -0
- package/build/component/driver/apiKey/error/apiKeyFromScratchClientSecretInvalid.d.ts.map +1 -0
- package/build/component/driver/apiKey/error/apiKeyFromScratchClientSecretInvalid.js +21 -0
- package/build/component/driver/apiKey/error/apiKeyFromScratchClientSecretInvalid.js.map +1 -0
- package/build/component/driver/apiKey/utility/constants.d.ts +1 -1
- package/build/component/driver/apiKey/utility/constants.js +1 -1
- package/build/component/driver/arm/deployImpl.d.ts.map +1 -1
- package/build/component/driver/arm/deployImpl.js +3 -1
- package/build/component/driver/arm/deployImpl.js.map +1 -1
- package/build/component/driver/botAadApp/create.d.ts.map +1 -1
- package/build/component/driver/botAadApp/create.js +10 -1
- package/build/component/driver/botAadApp/create.js.map +1 -1
- package/build/component/driver/botAadApp/utility/constants.d.ts +1 -0
- package/build/component/driver/botAadApp/utility/constants.d.ts.map +1 -1
- package/build/component/driver/botAadApp/utility/constants.js +1 -0
- package/build/component/driver/botAadApp/utility/constants.js.map +1 -1
- package/build/component/driver/deploy/azure/azureStaticWebAppGetDeploymentTokenDriver.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/azureStaticWebAppGetDeploymentTokenDriver.js +7 -1
- package/build/component/driver/deploy/azure/azureStaticWebAppGetDeploymentTokenDriver.js.map +1 -1
- package/build/component/driver/middleware/addSWADeployTelemetry.js +1 -1
- package/build/component/driver/middleware/addSWADeployTelemetry.js.map +1 -1
- package/build/component/driver/oauth/create.d.ts.map +1 -1
- package/build/component/driver/oauth/create.js +33 -3
- package/build/component/driver/oauth/create.js.map +1 -1
- package/build/component/driver/oauth/error/oauthDisablePKCEError.d.ts +5 -0
- package/build/component/driver/oauth/error/oauthDisablePKCEError.d.ts.map +1 -0
- package/build/component/driver/oauth/error/oauthDisablePKCEError.js +21 -0
- package/build/component/driver/oauth/error/oauthDisablePKCEError.js.map +1 -0
- package/build/component/driver/oauth/error/oauthIdentityProviderInvalid.d.ts +5 -0
- package/build/component/driver/oauth/error/oauthIdentityProviderInvalid.d.ts.map +1 -0
- package/build/component/driver/oauth/error/oauthIdentityProviderInvalid.js +21 -0
- package/build/component/driver/oauth/error/oauthIdentityProviderInvalid.js.map +1 -0
- package/build/component/driver/oauth/interface/createOauthArgs.d.ts +2 -0
- package/build/component/driver/oauth/interface/createOauthArgs.d.ts.map +1 -1
- package/build/component/driver/oauth/interface/updateOauthArgs.d.ts +1 -0
- package/build/component/driver/oauth/interface/updateOauthArgs.d.ts.map +1 -1
- package/build/component/driver/oauth/update.d.ts.map +1 -1
- package/build/component/driver/oauth/update.js +11 -0
- package/build/component/driver/oauth/update.js.map +1 -1
- package/build/component/driver/oauth/utility/constants.d.ts +1 -1
- package/build/component/driver/oauth/utility/constants.js +1 -1
- package/build/component/driver/script/scriptDriver.d.ts.map +1 -1
- package/build/component/driver/script/scriptDriver.js +21 -22
- package/build/component/driver/script/scriptDriver.js.map +1 -1
- package/build/component/driver/teamsApp/appStudio.d.ts.map +1 -1
- package/build/component/driver/teamsApp/appStudio.js +4 -15
- package/build/component/driver/teamsApp/appStudio.js.map +1 -1
- package/build/component/driver/teamsApp/clients/appStudioClient.js +1 -1
- package/build/component/driver/teamsApp/clients/appStudioClient.js.map +1 -1
- package/build/component/driver/teamsApp/constants.d.ts +14 -1
- package/build/component/driver/teamsApp/constants.d.ts.map +1 -1
- package/build/component/driver/teamsApp/constants.js +131 -2
- package/build/component/driver/teamsApp/constants.js.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.js +10 -10
- package/build/component/driver/teamsApp/createAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/interfaces/OauthRegistration.d.ts +2 -0
- package/build/component/driver/teamsApp/interfaces/OauthRegistration.d.ts.map +1 -1
- package/build/component/driver/teamsApp/interfaces/OauthRegistration.js.map +1 -1
- package/build/component/driver/teamsApp/interfaces/appdefinitions/IValidationResult.d.ts +1 -0
- package/build/component/driver/teamsApp/interfaces/appdefinitions/IValidationResult.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/CopilotGptManifestUtils.d.ts +3 -3
- package/build/component/driver/teamsApp/utils/CopilotGptManifestUtils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/CopilotGptManifestUtils.js +2 -2
- package/build/component/driver/teamsApp/utils/CopilotGptManifestUtils.js.map +1 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.d.ts +3 -2
- package/build/component/driver/teamsApp/utils/ManifestUtils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.js +37 -13
- package/build/component/driver/teamsApp/utils/ManifestUtils.js.map +1 -1
- package/build/component/driver/teamsApp/utils/PluginManifestUtils.d.ts +3 -3
- package/build/component/driver/teamsApp/utils/PluginManifestUtils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/PluginManifestUtils.js +2 -2
- package/build/component/driver/teamsApp/utils/PluginManifestUtils.js.map +1 -1
- package/build/component/driver/teamsApp/utils/utils.d.ts +3 -3
- package/build/component/driver/teamsApp/utils/utils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/utils.js +37 -7
- package/build/component/driver/teamsApp/utils/utils.js.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.d.ts +1 -0
- package/build/component/driver/teamsApp/validateAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.js +16 -2
- package/build/component/driver/teamsApp/validateAppPackage.js.map +1 -1
- package/build/component/generator/apiSpec/generator.d.ts +0 -6
- package/build/component/generator/apiSpec/generator.d.ts.map +1 -1
- package/build/component/generator/apiSpec/generator.js +56 -157
- package/build/component/generator/apiSpec/generator.js.map +1 -1
- package/build/component/generator/apiSpec/helper.d.ts +10 -1
- package/build/component/generator/apiSpec/helper.d.ts.map +1 -1
- package/build/component/generator/apiSpec/helper.js +118 -8
- package/build/component/generator/apiSpec/helper.js.map +1 -1
- package/build/component/generator/constant.d.ts +1 -0
- package/build/component/generator/constant.d.ts.map +1 -1
- package/build/component/generator/constant.js +2 -1
- package/build/component/generator/constant.js.map +1 -1
- package/build/component/generator/copilotExtension/generator.d.ts +19 -0
- package/build/component/generator/copilotExtension/generator.d.ts.map +1 -0
- package/build/component/generator/copilotExtension/generator.js +84 -0
- package/build/component/generator/copilotExtension/generator.js.map +1 -0
- package/build/component/generator/error.d.ts +1 -1
- package/build/component/generator/error.d.ts.map +1 -1
- package/build/component/generator/error.js +2 -2
- package/build/component/generator/error.js.map +1 -1
- package/build/component/generator/generator.js +1 -1
- package/build/component/generator/generator.js.map +1 -1
- package/build/component/generator/generatorProvider.d.ts.map +1 -1
- package/build/component/generator/generatorProvider.js +4 -2
- package/build/component/generator/generatorProvider.js.map +1 -1
- package/build/component/generator/officeAddin/generator.d.ts +1 -2
- package/build/component/generator/officeAddin/generator.d.ts.map +1 -1
- package/build/component/generator/officeAddin/generator.js +16 -16
- package/build/component/generator/officeAddin/generator.js.map +1 -1
- package/build/component/generator/spfx/depsChecker/generatorChecker.js +1 -1
- package/build/component/generator/spfx/depsChecker/generatorChecker.js.map +1 -1
- package/build/component/generator/spfx/depsChecker/yoChecker.js +1 -1
- package/build/component/generator/spfx/depsChecker/yoChecker.js.map +1 -1
- package/build/component/generator/spfx/spfxGenerator.d.ts.map +1 -1
- package/build/component/generator/spfx/spfxGenerator.js +9 -9
- package/build/component/generator/spfx/spfxGenerator.js.map +1 -1
- package/build/component/generator/spfx/utils/utils.d.ts +1 -0
- package/build/component/generator/spfx/utils/utils.d.ts.map +1 -1
- package/build/component/generator/spfx/utils/utils.js +11 -7
- package/build/component/generator/spfx/utils/utils.js.map +1 -1
- package/build/component/generator/templates/templateNames.d.ts.map +1 -1
- package/build/component/generator/templates/templateNames.js +0 -35
- package/build/component/generator/templates/templateNames.js.map +1 -1
- package/build/component/generator/templates/templateReplaceMap.d.ts.map +1 -1
- package/build/component/generator/templates/templateReplaceMap.js +19 -5
- package/build/component/generator/templates/templateReplaceMap.js.map +1 -1
- package/build/component/generator/utils.js +1 -1
- package/build/component/generator/utils.js.map +1 -1
- package/build/component/local/localCertificateManager.d.ts.map +1 -1
- package/build/component/local/localCertificateManager.js +4 -2
- package/build/component/local/localCertificateManager.js.map +1 -1
- package/build/component/utils/envFunctionUtils.d.ts +12 -0
- package/build/component/utils/envFunctionUtils.d.ts.map +1 -0
- package/build/component/utils/envFunctionUtils.js +185 -0
- package/build/component/utils/envFunctionUtils.js.map +1 -0
- package/build/core/FxCore.d.ts +30 -0
- package/build/core/FxCore.d.ts.map +1 -1
- package/build/core/FxCore.js +332 -11
- package/build/core/FxCore.js.map +1 -1
- package/build/core/middleware/concurrentLocker.js +2 -2
- package/build/core/middleware/concurrentLocker.js.map +1 -1
- package/build/error/common.d.ts +1 -1
- package/build/error/common.d.ts.map +1 -1
- package/build/error/common.js +7 -2
- package/build/error/common.js.map +1 -1
- package/build/error/script.d.ts +2 -2
- package/build/error/script.d.ts.map +1 -1
- package/build/error/script.js +14 -8
- package/build/error/script.js.map +1 -1
- package/build/error/teamsApp.d.ts.map +1 -1
- package/build/error/teamsApp.js +3 -1
- package/build/error/teamsApp.js.map +1 -1
- package/build/index.d.ts +2 -1
- package/build/index.d.ts.map +1 -1
- package/build/index.js +6 -2
- package/build/index.js.map +1 -1
- package/build/question/constants.d.ts +28 -13
- package/build/question/constants.d.ts.map +1 -1
- package/build/question/constants.js +95 -67
- package/build/question/constants.js.map +1 -1
- package/build/question/create.d.ts.map +1 -1
- package/build/question/create.js +78 -45
- package/build/question/create.js.map +1 -1
- package/build/question/generator.js +2 -0
- package/build/question/generator.js.map +1 -1
- package/build/question/index.d.ts +1 -0
- package/build/question/index.d.ts.map +1 -1
- package/build/question/index.js +3 -0
- package/build/question/index.js.map +1 -1
- package/build/question/inputs/AddPluginInputs.d.ts +1 -1
- package/build/question/inputs/AddPluginInputs.d.ts.map +1 -1
- package/build/question/inputs/CreateProjectInputs.d.ts +5 -1
- package/build/question/inputs/CreateProjectInputs.d.ts.map +1 -1
- package/build/question/inputs/UninstallInputs.d.ts +22 -0
- package/build/question/inputs/UninstallInputs.d.ts.map +1 -0
- package/build/question/inputs/UninstallInputs.js +5 -0
- package/build/question/inputs/UninstallInputs.js.map +1 -0
- package/build/question/inputs/index.d.ts +1 -0
- package/build/question/inputs/index.d.ts.map +1 -1
- package/build/question/inputs/index.js +1 -0
- package/build/question/inputs/index.js.map +1 -1
- package/build/question/options/AddPluginOptions.js +1 -1
- package/build/question/options/AddPluginOptions.js.map +1 -1
- package/build/question/options/CreateProjectOptions.d.ts.map +1 -1
- package/build/question/options/CreateProjectOptions.js +16 -4
- package/build/question/options/CreateProjectOptions.js.map +1 -1
- package/build/question/options/UninstallOptions.d.ts +10 -0
- package/build/question/options/UninstallOptions.d.ts.map +1 -0
- package/build/question/options/UninstallOptions.js +44 -0
- package/build/question/options/UninstallOptions.js.map +1 -0
- package/build/question/options/index.d.ts +1 -0
- package/build/question/options/index.d.ts.map +1 -1
- package/build/question/options/index.js +1 -0
- package/build/question/options/index.js.map +1 -1
- package/build/question/other.d.ts +1 -0
- package/build/question/other.d.ts.map +1 -1
- package/build/question/other.js +128 -5
- package/build/question/other.js.map +1 -1
- package/build/tsconfig.tsbuildinfo +1 -0
- package/package.json +10 -7
- package/resource/dict.zip +0 -0
- package/resource/package.nls.json +146 -91
- package/resource/yaml-schema/v1.6/yaml.schema.json +13 -0
- package/resource/yaml-schema/yaml.schema.json +13 -0
- package/templates/fallback/common.zip +0 -0
- package/templates/fallback/csharp.zip +0 -0
- package/templates/fallback/js.zip +0 -0
- package/templates/fallback/python.zip +0 -0
- package/templates/fallback/ts.zip +0 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generatorProvider.js","sourceRoot":"","sources":["../../../src/component/generator/generatorProvider.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,mDAAoD;AACpD,uDAAkE;AAClE,wDAA6E;AAC7E,iEAA8D;AAC9D,qEAAyE;AAEzE,6EAA6E;AAChE,QAAA,UAAU,GAAG;IACxB,IAAI,mCAAuB,EAAE;IAC7B,IAAI,iCAAe,EAAE;IACrB,IAAI,4CAAwB,EAAE;IAC9B,IAAI,gCAAgB,EAAE;IACtB,IAAI,mCAAmB,EAAE;IACzB,IAAI,yBAAa,EAAE;
|
|
1
|
+
{"version":3,"file":"generatorProvider.js","sourceRoot":"","sources":["../../../src/component/generator/generatorProvider.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,mDAAoD;AACpD,4DAAyE;AACzE,uDAAkE;AAClE,wDAA6E;AAC7E,iEAA8D;AAC9D,qEAAyE;AAEzE,6EAA6E;AAChE,QAAA,UAAU,GAAG;IACxB,IAAI,mCAAuB,EAAE;IAC7B,IAAI,iCAAe,EAAE;IACrB,IAAI,4CAAwB,EAAE;IAC9B,IAAI,gCAAgB,EAAE;IACtB,IAAI,mCAAmB,EAAE;IACzB,IAAI,yBAAa,EAAE;IACnB,IAAI,qCAAyB,EAAE;CAChC,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Context, FxError,
|
|
1
|
+
import { Context, FxError, Inputs, Result } from "@microsoft/teamsfx-api";
|
|
2
2
|
import { ActionContext } from "../../middleware/actionExecutionMW";
|
|
3
3
|
import { DefaultTemplateGenerator } from "../templates/templateGenerator";
|
|
4
4
|
import { TemplateInfo } from "../templates/templateInfo";
|
|
@@ -21,7 +21,6 @@ export declare class OfficeAddinGeneratorNew extends DefaultTemplateGenerator {
|
|
|
21
21
|
componentName: string;
|
|
22
22
|
activate(context: Context, inputs: Inputs): boolean;
|
|
23
23
|
getTemplateInfos(context: Context, inputs: Inputs, destinationPath: string, actionContext?: ActionContext): Promise<Result<TemplateInfo[], FxError>>;
|
|
24
|
-
post(context: Context, inputs: Inputs, destinationPath: string, actionContext?: ActionContext): Promise<Result<GeneratorResult, FxError>>;
|
|
25
24
|
}
|
|
26
25
|
export {};
|
|
27
26
|
//# sourceMappingURL=generator.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/officeAddin/generator.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,OAAO,EACP,OAAO,
|
|
1
|
+
{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/officeAddin/generator.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,OAAO,EACP,OAAO,EAEP,MAAM,EAEN,MAAM,EAIP,MAAM,wBAAwB,CAAC;AAiBhC,OAAO,EAAE,aAAa,EAAqB,MAAM,oCAAoC,CAAC;AAEtF,OAAO,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AASzD;;;;GAIG;AACH,qBAAa,oBAAoB;WASlB,QAAQ,CACnB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;WA0BlB,gBAAgB,CAAC,OAAO,EAAE,MAAM;;;;WAIhC,aAAa,CAC/B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;CAsGvC;AAID,aAAK,UAAU,GAAG,SAAS,GAAG,MAAM,GAAG,OAAO,GAAG,YAAY,CAAC;AAC9D,wBAAsB,OAAO,CAAC,iBAAiB,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAyB5E;AAED,qBAAa,uBAAwB,SAAQ,wBAAwB;IACnE,aAAa,SAA4B;IAGlC,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAK7C,gBAAgB,CAC3B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,OAAO,CAAC,CAAC;CAc5C"}
|
|
@@ -63,18 +63,6 @@ class OfficeAddinGenerator {
|
|
|
63
63
|
const projectType = inputs[constants_1.QuestionNames.ProjectType];
|
|
64
64
|
const capability = inputs[constants_1.QuestionNames.Capabilities];
|
|
65
65
|
const inputHost = inputs[constants_1.QuestionNames.OfficeAddinHost];
|
|
66
|
-
let host = inputHost;
|
|
67
|
-
if (projectType === constants_1.ProjectTypeOptions.outlookAddin().id) {
|
|
68
|
-
host = "outlook";
|
|
69
|
-
}
|
|
70
|
-
else if (projectType === constants_1.ProjectTypeOptions.officeAddin().id) {
|
|
71
|
-
if (capability === "json-taskpane") {
|
|
72
|
-
host = "wxpo"; // wxpo - support word, excel, powerpoint, outlook
|
|
73
|
-
}
|
|
74
|
-
else if (capability === constants_1.CapabilityOptions.officeContentAddin().id) {
|
|
75
|
-
host = "xp"; // content add-in support excel, powerpoint
|
|
76
|
-
}
|
|
77
|
-
}
|
|
78
66
|
const workingDir = process.cwd();
|
|
79
67
|
const importProgressStr = projectType === constants_1.ProjectTypeOptions.officeAddin().id
|
|
80
68
|
? localizeUtils_1.getLocalizedString("core.generator.officeAddin.importOfficeProject.title")
|
|
@@ -83,6 +71,21 @@ class OfficeAddinGenerator {
|
|
|
83
71
|
process.chdir(addinRoot);
|
|
84
72
|
try {
|
|
85
73
|
if (!fromFolder) {
|
|
74
|
+
let host = inputHost;
|
|
75
|
+
if (projectType === constants_1.ProjectTypeOptions.outlookAddin().id) {
|
|
76
|
+
host = "outlook";
|
|
77
|
+
}
|
|
78
|
+
else if (projectType === constants_1.ProjectTypeOptions.officeAddin().id) {
|
|
79
|
+
if (capability === "json-taskpane") {
|
|
80
|
+
host = "wxpo"; // wxpo - support word, excel, powerpoint, outlook
|
|
81
|
+
}
|
|
82
|
+
else if (capability === constants_1.CapabilityOptions.officeContentAddin().id) {
|
|
83
|
+
host = "xp"; // content add-in support excel, powerpoint
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
if (!["outlook", "wxpo", "xp"].includes(host)) {
|
|
87
|
+
return teamsfx_api_1.err(new error_1.InputValidationError(constants_1.QuestionNames.OfficeAddinHost, `Invalid host: ${host}`, "office-addin-generator"));
|
|
88
|
+
}
|
|
86
89
|
// from template
|
|
87
90
|
const framework = create_1.getOfficeAddinFramework(inputs);
|
|
88
91
|
const templateConfig = create_1.getOfficeAddinTemplateConfig();
|
|
@@ -194,13 +197,10 @@ class OfficeAddinGeneratorNew extends templateGenerator_1.DefaultTemplateGenerat
|
|
|
194
197
|
inputs[constants_1.QuestionNames.Capabilities] === constants_1.CapabilityOptions.officeAddinImport().id
|
|
195
198
|
? constants_1.ProgrammingLanguage.TS
|
|
196
199
|
: lang;
|
|
197
|
-
return Promise.resolve(teamsfx_api_1.ok([{ templateName: tplName, language: lang }]));
|
|
198
|
-
}
|
|
199
|
-
async post(context, inputs, destinationPath, actionContext) {
|
|
200
200
|
const res = await OfficeAddinGenerator.doScaffolding(context, inputs, destinationPath);
|
|
201
201
|
if (res.isErr())
|
|
202
202
|
return teamsfx_api_1.err(res.error);
|
|
203
|
-
return teamsfx_api_1.ok({});
|
|
203
|
+
return Promise.resolve(teamsfx_api_1.ok([{ templateName: tplName, language: lang }]));
|
|
204
204
|
}
|
|
205
205
|
}
|
|
206
206
|
exports.OfficeAddinGeneratorNew = OfficeAddinGeneratorNew;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/component/generator/officeAddin/generator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC;;GAEG;AAEH,+CAA8C;AAC9C,wDAUgC;AAChC,oEAA8C;
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/component/generator/officeAddin/generator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC;;GAEG;AAEH,+CAA8C;AAC9C,wDAUgC;AAChC,oEAA8C;AAE9C,mCAAiC;AACjC,iEAA4D;AAC5D,+DAAsD;AACtD,+BAA4B;AAC5B,+BAAiC;AACjC,iEAAmE;AACnE,0CAAqE;AACrE,2DAKqC;AACrC,qDAAiG;AACjG,0EAAsF;AACtF,4CAAyC;AACzC,sEAA0E;AAE1E,oCAA4C;AAC5C,mDAAgD;AAEhD,MAAM,aAAa,GAAG,cAAc,CAAC;AACrC,MAAM,cAAc,GAAG,UAAU,CAAC;AAClC,MAAM,YAAY,GAAG,cAAc,CAAC;AACpC,MAAM,mBAAmB,GAAG,mBAAmB,CAAC;AAEhD;;;;GAIG;AACH,MAAa,oBAAoB;IAS/B,MAAM,CAAC,KAAK,CAAC,QAAQ,CACnB,OAAgB,EAChB,MAAc,EACd,eAAuB;QAEvB,MAAM,MAAM,GAAG,MAAM,oBAAoB,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,eAAe,CAAC,CAAC;QAC1F,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE;YAClB,OAAO,iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;SAC1B;QAED,uEAAuE;QACvE,MAAM,IAAI,GAAG,gBAAO,CAAC,MAAM,CAAC,yBAAa,CAAC,mBAAmB,CAAC,CAAgC,CAAC;QAC/F,MAAM,OAAO,GACX,MAAM,CAAC,yBAAa,CAAC,YAAY,CAAC,KAAK,6BAAiB,CAAC,kBAAkB,EAAE,CAAC,EAAE;YAChF,MAAM,CAAC,yBAAa,CAAC,YAAY,CAAC,KAAK,6BAAiB,CAAC,iBAAiB,EAAE,CAAC,EAAE;YAC7E,CAAC,CAAC,IAAI;YACN,CAAC,CAAC,wBAAgB,CAAC,IAAI,CAAC,CAAC;QAC7B,MAAM,WAAW,GAAG,MAAM,qBAAS,CAAC,gBAAgB,CAClD,OAAO,EACP,eAAe,EACf,MAAM,CAAC,yBAAa,CAAC,WAAW,CAAC,KAAK,8BAAkB,CAAC,WAAW,EAAE,CAAC,EAAE;YACvE,CAAC,CAAC,mBAAmB;YACrB,CAAC,CAAC,YAAY,EAChB,OAAO,CACR,CAAC;QACF,IAAI,WAAW,CAAC,KAAK,EAAE;YAAE,OAAO,iBAAG,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAEvD,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;IACvB,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,OAAe;QAClD,OAAO,gBAAS,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC;IAC/C,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,aAAa,CAC/B,OAAgB,EAChB,MAAc,EACd,eAAuB;QAEvB,MAAM,IAAI,GAAG,MAAM,CAAC,yBAAa,CAAC,OAAO,CAAW,CAAC;QACrD,MAAM,SAAS,GAAG,eAAe,CAAC;QAClC,MAAM,UAAU,GAAG,MAAM,CAAC,yBAAa,CAAC,iBAAiB,CAAC,CAAC;QAC3D,MAAM,QAAQ,GAAG,gBAAO,CAAC,MAAM,CAAC,yBAAa,CAAC,mBAAmB,CAAC,CAElD,CAAC;QACjB,MAAM,WAAW,GAAG,MAAM,CAAC,yBAAa,CAAC,WAAW,CAAC,CAAC;QACtD,MAAM,UAAU,GAAG,MAAM,CAAC,yBAAa,CAAC,YAAY,CAAC,CAAC;QACtD,MAAM,SAAS,GAAG,MAAM,CAAC,yBAAa,CAAC,eAAe,CAAC,CAAC;QACxD,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;QACjC,MAAM,iBAAiB,GACrB,WAAW,KAAK,8BAAkB,CAAC,WAAW,EAAE,CAAC,EAAE;YACjD,CAAC,CAAC,kCAAkB,CAAC,sDAAsD,CAAC;YAC5E,CAAC,CAAC,kCAAkB,CAAC,gDAAgD,CAAC,CAAC;QAC3E,MAAM,cAAc,GAAG,OAAO,CAAC,eAAe,CAAC,iBAAiB,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC;QAEvF,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACzB,IAAI;YACF,IAAI,CAAC,UAAU,EAAE;gBACf,IAAI,IAAI,GAAW,SAAS,CAAC;gBAC7B,IAAI,WAAW,KAAK,8BAAkB,CAAC,YAAY,EAAE,CAAC,EAAE,EAAE;oBACxD,IAAI,GAAG,SAAS,CAAC;iBAClB;qBAAM,IAAI,WAAW,KAAK,8BAAkB,CAAC,WAAW,EAAE,CAAC,EAAE,EAAE;oBAC9D,IAAI,UAAU,KAAK,eAAe,EAAE;wBAClC,IAAI,GAAG,MAAM,CAAC,CAAC,kDAAkD;qBAClE;yBAAM,IAAI,UAAU,KAAK,6BAAiB,CAAC,kBAAkB,EAAE,CAAC,EAAE,EAAE;wBACnE,IAAI,GAAG,IAAI,CAAC,CAAC,2CAA2C;qBACzD;iBACF;gBACD,IAAI,CAAC,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;oBAC7C,OAAO,iBAAG,CACR,IAAI,4BAAoB,CACtB,yBAAa,CAAC,eAAe,EAC7B,iBAAiB,IAAI,EAAE,EACvB,wBAAwB,CACzB,CACF,CAAC;iBACH;gBACD,gBAAgB;gBAChB,MAAM,SAAS,GAAG,gCAAuB,CAAC,MAAM,CAAC,CAAC;gBAClD,MAAM,cAAc,GAAG,qCAA4B,EAAE,CAAC;gBACtD,MAAM,WAAW,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC;gBAE9E,sDAAsD;gBACtD,IAAI,WAAW,EAAE;oBACf,MAAM,QAAQ,GAAG,MAAM,6BAAa,CAAC,aAAa,CAChD,wBAAwB,EACxB,WAAW,EACX,SAAS,CACV,CAAC;oBACF,IAAI,QAAQ,CAAC,KAAK,EAAE,EAAE;wBACpB,OAAO,iBAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;qBAC5B;oBACD,IAAI,OAAO,GAAG,EAAE,CAAC,CAAC,2FAA2F;oBAC7G,IAAI,MAAM,CAAC,yBAAa,CAAC,WAAW,CAAC,KAAK,8BAAkB,CAAC,WAAW,EAAE,CAAC,EAAE,EAAE;wBAC7E,OAAO,GAAG,kDAAkD,IAAI,OAAO,CAAC;qBACzE;yBAAM;wBACL,OAAO,GAAG,kDAAkD,IAAI,EAAE,CAAC;qBACpE;oBACD,MAAM,oBAAoB,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;oBACrD,MAAM,YAAY,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC,YAAsB,CAAC;oBACvE,uCAAuC;oBACvC,MAAM,2CAAmB,CAAC,kBAAkB,CAC1C,GAAG,WAAI,CAAC,SAAS,EAAE,YAAY,CAAC,EAAE,EAClC,QAAQ,EACR,GAAG,IAAI,EAAE,CACV,CAAC;oBACF,MAAM,6BAAa,CAAC,oBAAoB,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;iBACnE;aACF;iBAAM;gBACL,MAAM,cAAc,CAAC,KAAK,EAAE,CAAC;gBAC7B,wBAAwB;gBACxB,MAAM,cAAc,CAAC,IAAI,CACvB,kCAAkB,CAAC,oDAAoD,CAAC,CACzE,CAAC;gBACF,6BAAa,CAAC,cAAc,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;gBACpD,MAAM,kBAAkB,GAAW,MAAM,CAAC,yBAAa,CAAC,mBAAmB,CAAC,CAAC;gBAC7E,IAAI,YAAY,GAAW,kBAAkB,CAAC,OAAO,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;gBAC7E,MAAM,cAAc,CAAC,IAAI,CACvB,kCAAkB,CAAC,yDAAyD,CAAC,CAC9E,CAAC;gBACF,IAAI,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;oBACjC,wCAAwC;oBACxC,MAAM,qCAAc,CAAC,YAAY,CAAC,CAAC;oBACnC,YAAY,GAAG,YAAY,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;iBACxD;gBACD,MAAM,CAAC,yBAAa,CAAC,eAAe,CAAC,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,CAAC;gBACpE,MAAM,cAAc,CAAC,IAAI,CACvB,kCAAkB,CAAC,yDAAyD,CAAC,CAC9E,CAAC;gBACF,MAAM,6BAAa,CAAC,cAAc,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;aACnE;YACD,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YAC1B,MAAM,cAAc,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACrC,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;SACtB;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YAC1B,MAAM,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;YACtC,OAAO,iBAAG,CAAC,qBAAa,CAAC,CAAU,CAAC,CAAC,CAAC;SACvC;IACH,CAAC;CACF;AA5IC;IARC,WAAK,CAAC;QACL,qCAAiB,CAAC;YAChB,eAAe,EAAE,IAAI;YACrB,sBAAsB,EAAE,aAAa;YACrC,kBAAkB,EAAE,cAAc;YAClC,WAAW,EAAE,aAAa;SAC3B,CAAC;KACH,CAAC;;;;0CA6BD;AArCH,oDAqJC;AAKM,KAAK,UAAU,OAAO,CAAC,iBAAyB;;IACrD,4BAA4B;IAC5B,MAAM,aAAa,GAAgC,MAAM,0BAAY,CAAC,YAAY,CAChF,iBAAiB,CAClB,CAAC;IACF,IAAI,IAAI,GAAe,SAAS,CAAC;IACjC,QAAQ,MAAA,MAAA,MAAA,aAAa,CAAC,UAAU,0CAAG,CAAC,EAAE,YAAY,0CAAE,MAAM,0CAAG,CAAC,CAAC,EAAE;QAC/D,KAAK,UAAU;YACb,IAAI,GAAG,MAAM,CAAC;YACd,MAAM;QACR,KAAK,MAAM;YACT,IAAI,GAAG,SAAS,CAAC;YACjB,MAAM;QACR,mBAAmB;QACnB,sBAAsB;QACtB,KAAK,cAAc;YACjB,IAAI,GAAG,YAAY,CAAC;YACpB,MAAM;QACR,kBAAkB;QAClB,sBAAsB;QACtB,KAAK,UAAU;YACb,IAAI,GAAG,OAAO,CAAC;YACf,MAAM;KACT;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAzBD,0BAyBC;AAED,MAAa,uBAAwB,SAAQ,4CAAwB;IAArE;;QACE,kBAAa,GAAG,wBAAwB,CAAC;IA2B3C,CAAC;IAzBC,uBAAuB;IAChB,QAAQ,CAAC,OAAgB,EAAE,MAAc;QAC9C,MAAM,WAAW,GAAG,MAAM,CAAC,yBAAa,CAAC,WAAW,CAAC,CAAC;QACtD,OAAO,8BAAkB,CAAC,iBAAiB,EAAE,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IACtE,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAC3B,OAAgB,EAChB,MAAc,EACd,eAAuB,EACvB,aAA6B;QAE7B,MAAM,WAAW,GAAG,MAAM,CAAC,yBAAa,CAAC,WAAW,CAAC,CAAC;QACtD,MAAM,OAAO,GACX,WAAW,KAAK,8BAAkB,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,YAAY,CAAC;QAC3F,IAAI,IAAI,GAAG,gBAAO,CAAC,MAAM,CAAC,yBAAa,CAAC,mBAAmB,CAAC,CAAwB,CAAC;QACrF,IAAI;YACF,MAAM,CAAC,yBAAa,CAAC,YAAY,CAAC,KAAK,6BAAiB,CAAC,kBAAkB,EAAE,CAAC,EAAE;gBAChF,MAAM,CAAC,yBAAa,CAAC,YAAY,CAAC,KAAK,6BAAiB,CAAC,iBAAiB,EAAE,CAAC,EAAE;gBAC7E,CAAC,CAAC,+BAAmB,CAAC,EAAE;gBACxB,CAAC,CAAC,IAAI,CAAC;QACX,MAAM,GAAG,GAAG,MAAM,oBAAoB,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,eAAe,CAAC,CAAC;QACvF,IAAI,GAAG,CAAC,KAAK,EAAE;YAAE,OAAO,iBAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACvC,OAAO,OAAO,CAAC,OAAO,CAAC,gBAAE,CAAC,CAAC,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAC1E,CAAC;CACF;AA5BD,0DA4BC"}
|
|
@@ -118,7 +118,7 @@ class GeneratorChecker {
|
|
|
118
118
|
const version = targetVersion !== null && targetVersion !== void 0 ? targetVersion : constants_1.Constants.LatestVersion;
|
|
119
119
|
try {
|
|
120
120
|
await fs.ensureDir(path.join(this.getDefaultInstallPath(), "node_modules"));
|
|
121
|
-
await cpUtils_1.cpUtils.executeCommand(undefined, this._logger, { timeout: timeout, shell:
|
|
121
|
+
await cpUtils_1.cpUtils.executeCommand(undefined, this._logger, { timeout: timeout, shell: utils_1.getShellOptionValue() }, utils_1.getExecCommand("npm"), "install", `${name}@${version}`, "--prefix", `${this.getDefaultInstallPath()}`, "--no-audit", "--global-style");
|
|
122
122
|
await fs.ensureFile(this.getSentinelPath());
|
|
123
123
|
}
|
|
124
124
|
catch (error) {
|
|
@@ -1 +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,
|
|
1
|
+
{"version":3,"file":"generatorChecker.js","sourceRoot":"","sources":["../../../../../src/component/generator/spfx/depsChecker/generatorChecker.ts"],"names":[],"mappings":"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"}
|
|
@@ -130,7 +130,7 @@ class YoChecker {
|
|
|
130
130
|
const version = targetVersion !== null && targetVersion !== void 0 ? targetVersion : constants_1.Constants.LatestVersion;
|
|
131
131
|
try {
|
|
132
132
|
await fs_extra_1.default.ensureDir(path.join(this.getDefaultInstallPath(), "node_modules"));
|
|
133
|
-
await cpUtils_1.cpUtils.executeCommand(undefined, this._logger, { timeout: timeout, shell:
|
|
133
|
+
await cpUtils_1.cpUtils.executeCommand(undefined, this._logger, { timeout: timeout, shell: utils_1.getShellOptionValue() }, utils_1.getExecCommand("npm"), "install", `${name}@${version}`, "--prefix", `${this.getDefaultInstallPath()}`, "--no-audit", "--global-style");
|
|
134
134
|
await fs_extra_1.default.ensureFile(this.getSentinelPath());
|
|
135
135
|
}
|
|
136
136
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"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,oCAAmD;AACnD,gEAA6D;AAC7D,
|
|
1
|
+
{"version":3,"file":"yoChecker.js","sourceRoot":"","sources":["../../../../../src/component/generator/spfx/depsChecker/yoChecker.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spfxGenerator.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/spfx/spfxGenerator.ts"],"names":[],"mappings":"AAKA,OAAO,EAEL,OAAO,EAEP,OAAO,EACP,eAAe,EACf,MAAM,EAMN,MAAM,EAIP,MAAM,wBAAwB,CAAC;AAkBhC,OAAO,EAAE,aAAa,EAAqB,MAAM,oCAAoC,CAAC;AAGtF,OAAO,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAqBzD,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;WAiHlB,gBAAgB,CAClC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"spfxGenerator.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/spfx/spfxGenerator.ts"],"names":[],"mappings":"AAKA,OAAO,EAEL,OAAO,EAEP,OAAO,EACP,eAAe,EACf,MAAM,EAMN,MAAM,EAIP,MAAM,wBAAwB,CAAC;AAkBhC,OAAO,EAAE,aAAa,EAAqB,MAAM,oCAAoC,CAAC;AAGtF,OAAO,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAqBzD,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;WAiHlB,gBAAgB,CAClC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;mBAoMd,kBAAkB;mBAYlB,uBAAuB;mBAsEvB,qCAAqC;WA0HtC,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;WAe1C,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,GAAG,SAAS,CAAC;WAqChE,kBAAkB,CACpC,UAAU,EAAE,MAAM,EAClB,eAAe,EAAE,MAAM,EACvB,aAAa,EAAE,MAAM,EAAE;WAsKL,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;CAyC5F;AAED,qBAAa,gBAAiB,SAAQ,wBAAwB;IAC5D,aAAa,SAAwB;IAC9B,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAK7C,gBAAgB,CAC3B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,OAAO,CAAC,CAAC;CAe5C;AAED,qBAAa,mBAAoB,SAAQ,wBAAwB;IAC/D,aAAa,SAA2B;IACxC,aAAa,EAAE,MAAM,EAAE,CAAM;IACtB,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAM7C,gBAAgB,CAC3B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,OAAO,CAAC,CAAC;IA0E9B,IAAI,CACf,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;CA+B7C"}
|
|
@@ -201,6 +201,7 @@ class SPFxGenerator {
|
|
|
201
201
|
await deps_checker_1.cpUtils.executeCommand(isAddSPFx ? inputs[constants_1.QuestionNames.SPFxFolder] : destinationPath, context.logProvider, {
|
|
202
202
|
timeout: 2 * 60 * 1000,
|
|
203
203
|
env: yoEnv,
|
|
204
|
+
shell: utils_1.getShellOptionValue(),
|
|
204
205
|
}, "yo", ...args);
|
|
205
206
|
}
|
|
206
207
|
catch (yoError) {
|
|
@@ -403,13 +404,12 @@ class SPFxGenerator {
|
|
|
403
404
|
if (webparts.length < 1) {
|
|
404
405
|
return undefined;
|
|
405
406
|
}
|
|
406
|
-
const
|
|
407
|
-
|
|
408
|
-
|
|
409
|
-
throw new error_1.FileNotFoundError(constants_2.Constants.PLUGIN_NAME, webpartManifestPath, constants_2.Constants.IMPORT_HELP_LINK);
|
|
407
|
+
const webpartManifest = (await fs_extra_1.default.readdir(path.join(webpartsDir, webparts[0]))).find((file) => file.endsWith("WebPart.manifest.json"));
|
|
408
|
+
if (webpartManifest === undefined) {
|
|
409
|
+
throw new error_1.FileNotFoundError(constants_2.Constants.PLUGIN_NAME, path.join(webpartsDir, webparts[0], `${webparts[0].split(path.sep).pop()}WebPart.manifest.json`), constants_2.Constants.IMPORT_HELP_LINK);
|
|
410
410
|
}
|
|
411
411
|
const matchHashComment = new RegExp(/(\/\/ .*)/, "gi");
|
|
412
|
-
const manifest = JSON.parse((await fs_extra_1.default.readFile(
|
|
412
|
+
const manifest = JSON.parse((await fs_extra_1.default.readFile(path.join(webpartsDir, webparts[0], webpartManifest), "utf8"))
|
|
413
413
|
.toString()
|
|
414
414
|
.replace(matchHashComment, "")
|
|
415
415
|
.trim());
|
|
@@ -438,13 +438,13 @@ class SPFxGenerator {
|
|
|
438
438
|
importDetails.push(`(.) Processing: There're multiple web parts in the SPFx solution, exposing each of them in Teams manifest...`);
|
|
439
439
|
for (let i = 1; i < webparts.length; i++) {
|
|
440
440
|
const webpart = webparts[i];
|
|
441
|
-
const
|
|
442
|
-
if (
|
|
443
|
-
importDetails.push(` [${i}] Web part manifest doesn't exist at ${
|
|
441
|
+
const webpartManifestFile = (await fs_extra_1.default.readdir(path.join(webpartsDir, webpart))).find((file) => file.endsWith("WebPart.manifest.json"));
|
|
442
|
+
if (webpartManifestFile === undefined) {
|
|
443
|
+
importDetails.push(` [${i}] Web part manifest doesn't exist at ${path.join(webpartsDir, webpart, `${webpart}WebPart.manifest.json`)}, skip...`);
|
|
444
444
|
continue;
|
|
445
445
|
}
|
|
446
446
|
const matchHashComment = new RegExp(/(\/\/ .*)/, "gi");
|
|
447
|
-
const webpartManifest = JSON.parse((await fs_extra_1.default.readFile(
|
|
447
|
+
const webpartManifest = JSON.parse((await fs_extra_1.default.readFile(path.join(webpartsDir, webpart, webpartManifestFile), "utf8"))
|
|
448
448
|
.toString()
|
|
449
449
|
.replace(matchHashComment, "")
|
|
450
450
|
.trim());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spfxGenerator.js","sourceRoot":"","sources":["../../../../src/component/generator/spfx/spfxGenerator.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"spfxGenerator.js","sourceRoot":"","sources":["../../../../src/component/generator/spfx/spfxGenerator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/component/generator/spfx/utils/utils.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAc,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAW,WAAW,EAAE,MAAM,oCAAoC,CAAC;AAI1E,qBAAa,KAAK;WACH,SAAS,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBtF,MAAM,CAAC,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;WAMtC,OAAO,CAClB,OAAO,EAAE,MAAM,EACf,KAAK,CAAC,EAAE,MAAM,EACd,UAAU,CAAC,EAAE,MAAM,EACnB,WAAW,CAAC,EAAE,WAAW,EACzB,kBAAkB,UAAQ,GACzB,OAAO,CAAC,MAAM,CAAC;IAuBlB,MAAM,CAAC,4BAA4B,CAAC,WAAW,EAAE,MAAM,GAAG,aAAa;IASvE,MAAM,CAAC,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;WAgBhD,MAAM,CAAC,MAAM,EAAE,WAAW,GAAG,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC;WAKzD,kBAAkB,CAAC,MAAM,EAAE,WAAW,GAAG,SAAS,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;WAsBhF,cAAc,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;WAsB7C,4BAA4B,CACvC,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,WAAW,EAAE,MAAM,EACnB,gBAAgB,EAAE,MAAM,EACxB,qBAAqB,UAAO,GAC3B,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;WA6BjB,iBAAiB,CAC5B,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,WAAW,EAAE,MAAM,EACnB,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IA0B9B,MAAM,CAAC,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;CAuBrD;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEtD"}
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/component/generator/spfx/utils/utils.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAc,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAW,WAAW,EAAE,MAAM,oCAAoC,CAAC;AAI1E,qBAAa,KAAK;WACH,SAAS,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBtF,MAAM,CAAC,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;WAMtC,OAAO,CAClB,OAAO,EAAE,MAAM,EACf,KAAK,CAAC,EAAE,MAAM,EACd,UAAU,CAAC,EAAE,MAAM,EACnB,WAAW,CAAC,EAAE,WAAW,EACzB,kBAAkB,UAAQ,GACzB,OAAO,CAAC,MAAM,CAAC;IAuBlB,MAAM,CAAC,4BAA4B,CAAC,WAAW,EAAE,MAAM,GAAG,aAAa;IASvE,MAAM,CAAC,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;WAgBhD,MAAM,CAAC,MAAM,EAAE,WAAW,GAAG,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC;WAKzD,kBAAkB,CAAC,MAAM,EAAE,WAAW,GAAG,SAAS,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;WAsBhF,cAAc,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;WAsB7C,4BAA4B,CACvC,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,WAAW,EAAE,MAAM,EACnB,gBAAgB,EAAE,MAAM,EACxB,qBAAqB,UAAO,GAC3B,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;WA6BjB,iBAAiB,CAC5B,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,WAAW,EAAE,MAAM,EACnB,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IA0B9B,MAAM,CAAC,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;CAuBrD;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEtD;AAED,wBAAgB,mBAAmB,IAAI,OAAO,GAAG,MAAM,CAEtD"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getExecCommand = exports.Utils = void 0;
|
|
3
|
+
exports.getShellOptionValue = exports.getExecCommand = exports.Utils = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
// Copyright (c) Microsoft Corporation.
|
|
6
6
|
// Licensed under the MIT license.
|
|
@@ -10,7 +10,7 @@ const glob_1 = require("glob");
|
|
|
10
10
|
const child_process_1 = require("child_process");
|
|
11
11
|
const axios_1 = tslib_1.__importDefault(require("axios"));
|
|
12
12
|
const cpUtils_1 = require("../../../deps-checker/util/cpUtils");
|
|
13
|
-
const
|
|
13
|
+
const os_1 = tslib_1.__importDefault(require("os"));
|
|
14
14
|
const constants_1 = require("./constants");
|
|
15
15
|
class Utils {
|
|
16
16
|
static async configure(configurePath, map) {
|
|
@@ -89,7 +89,7 @@ class Utils {
|
|
|
89
89
|
}
|
|
90
90
|
static async getNPMMajorVersion(logger) {
|
|
91
91
|
try {
|
|
92
|
-
const output = await cpUtils_1.cpUtils.executeCommand(undefined, logger, { shell:
|
|
92
|
+
const output = await cpUtils_1.cpUtils.executeCommand(undefined, logger, { shell: getShellOptionValue() }, "npm", "--version");
|
|
93
93
|
const regex = /(?<majorVersion>\d+)(\.\d+\.\d+)/;
|
|
94
94
|
const match = regex.exec(output.toString());
|
|
95
95
|
if (match && match.groups) {
|
|
@@ -105,7 +105,7 @@ class Utils {
|
|
|
105
105
|
}
|
|
106
106
|
static async getNodeVersion() {
|
|
107
107
|
try {
|
|
108
|
-
const output = await cpUtils_1.cpUtils.executeCommand(undefined, undefined,
|
|
108
|
+
const output = await cpUtils_1.cpUtils.executeCommand(undefined, undefined, { shell: getShellOptionValue() }, "node", "--version");
|
|
109
109
|
const regex = /v(?<major_version>\d+)\.(?<minor_version>\d+)\.(?<patch_version>\d+)/gm;
|
|
110
110
|
const match = regex.exec(output);
|
|
111
111
|
if (match && match.groups) {
|
|
@@ -122,7 +122,7 @@ class Utils {
|
|
|
122
122
|
static async findGloballyInstalledVersion(logger, packageName, timeoutInSeconds, shouldThrowIfNotFound = true) {
|
|
123
123
|
const timeout = timeoutInSeconds * 1000;
|
|
124
124
|
try {
|
|
125
|
-
const output = await cpUtils_1.cpUtils.executeCommand(undefined, logger, { timeout: timeout, shell:
|
|
125
|
+
const output = await cpUtils_1.cpUtils.executeCommand(undefined, logger, { timeout: timeout, shell: getShellOptionValue() }, getExecCommand("npm"), "ls", `${packageName}`, "-g", "--depth=0");
|
|
126
126
|
const regex = new RegExp(packageName + "@" + "(?<version>\\d+\\.\\d+\\.\\d+[\\w-.]*)"); // in case user has installed any -alpha, -beta version
|
|
127
127
|
const match = regex.exec(output.toString());
|
|
128
128
|
if (match && match.groups) {
|
|
@@ -142,7 +142,7 @@ class Utils {
|
|
|
142
142
|
static async findLatestVersion(logger, packageName, timeoutInSeconds) {
|
|
143
143
|
const timeout = timeoutInSeconds * 1000;
|
|
144
144
|
try {
|
|
145
|
-
const output = await cpUtils_1.cpUtils.executeCommand(undefined, logger, { timeout: timeout, shell:
|
|
145
|
+
const output = await cpUtils_1.cpUtils.executeCommand(undefined, logger, { timeout: timeout, shell: getShellOptionValue() }, getExecCommand("npm"), "view", `${packageName}`, "version");
|
|
146
146
|
const regex = new RegExp("(?<version>\\d+\\.\\d+\\.\\d)");
|
|
147
147
|
const match = regex.exec(output.toString());
|
|
148
148
|
if (match && match.groups) {
|
|
@@ -176,7 +176,11 @@ function getExecCommand(command) {
|
|
|
176
176
|
return isWindows() ? `${command}.cmd` : command;
|
|
177
177
|
}
|
|
178
178
|
exports.getExecCommand = getExecCommand;
|
|
179
|
+
function getShellOptionValue() {
|
|
180
|
+
return isWindows() ? "cmd.exe" : true;
|
|
181
|
+
}
|
|
182
|
+
exports.getShellOptionValue = getShellOptionValue;
|
|
179
183
|
function isWindows() {
|
|
180
|
-
return
|
|
184
|
+
return os_1.default.type() === "Windows_NT";
|
|
181
185
|
}
|
|
182
186
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/component/generator/spfx/utils/utils.ts"],"names":[],"mappings":";;;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,4DAA4B;AAC5B,qDAA+B;AAC/B,+BAA4B;AAC5B,iDAA+C;AAE/C,0DAA6C;AAC7C,gEAA0E;AAC1E
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/component/generator/spfx/utils/utils.ts"],"names":[],"mappings":";;;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,4DAA4B;AAC5B,qDAA+B;AAC/B,+BAA4B;AAC5B,iDAA+C;AAE/C,0DAA6C;AAC7C,gEAA0E;AAC1E,oDAAoB;AACpB,2CAAwC;AAExC,MAAa,KAAK;IAChB,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,aAAqB,EAAE,GAAwB;QACpE,IAAI,KAAK,GAAa,EAAE,CAAC;QACzB,MAAM,UAAU,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;QAEjE,IAAI,EAAE,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,MAAM,EAAE,EAAE;YACxC,KAAK,GAAG,CAAC,aAAa,CAAC,CAAC;SACzB;aAAM;YACL,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE;gBAC5B,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,WAAI,CAAC,IAAI,CAAC,GAAG,aAAa,OAAO,GAAG,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;aAChF;SACF;QAED,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACxB,IAAI,OAAO,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;YACnD,GAAG,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;gBACzB,MAAM,GAAG,GAAG,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;gBACjC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YACxC,CAAC,CAAC,CAAC;YACH,MAAM,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACnC;IACH,CAAC;IAED,MAAM,CAAC,sBAAsB,CAAC,IAAY;QACxC,IAAI,GAAG,gBAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC9B,IAAI,GAAG,gBAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAC/B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,OAAO,CAClB,OAAe,EACf,KAAc,EACd,UAAmB,EACnB,WAAyB,EACzB,kBAAkB,GAAG,KAAK;QAE1B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,IAAI,kBAAkB,EAAE;gBACtB,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,IAAI,CAAC,IAAI,KAAK,IAAI,EAAE,4BAA4B,OAAO,IAAI,CAAC,CAAC;aAC3E;YAED,oBAAI,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,EAAE,CAAC,KAAK,EAAE,cAAc,EAAE,EAAE;gBAC3D,IAAI,kBAAkB,EAAE;oBACtB,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,KAAK,CAAC,IAAI,KAAK,IAAI,EAAE,IAAI,cAAc,EAAE,CAAC,CAAC;iBACzD;gBACD,IAAI,KAAK,EAAE;oBACT,IAAI,kBAAkB,EAAE;wBACtB,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,KAAK,CAAC,IAAI,KAAK,IAAI,EAAE,6BAA6B,OAAO,IAAI,CAAC,CAAC;wBAC5E,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;qBACnC;oBACD,MAAM,CAAC,KAAK,CAAC,CAAC;oBACd,OAAO;iBACR;gBACD,OAAO,CAAC,cAAc,CAAC,CAAC;YAC1B,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,4BAA4B,CAAC,WAAmB;QACrD,MAAM,aAAa,GAAG,eAAK,CAAC,MAAM,CAAC;YACjC,OAAO,EAAE;gBACP,aAAa,EAAE,UAAU,WAAW,EAAE;aACvC;SACF,CAAC,CAAC;QACH,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,MAAM,CAAC,iBAAiB,CAAC,OAAe;QACtC,IAAI;YACF,MAAM,MAAM,GAAG,wBAAQ,CAAC,YAAY,OAAO,eAAe,CAAC,CAAC;YAE5D,MAAM,KAAK,GAAG,+DAA+D,CAAC;YAC9E,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC5C,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,EAAE;gBACzB,OAAO,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC;aAC7B;iBAAM;gBACL,OAAO,SAAS,CAAC;aAClB;SACF;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,SAAS,CAAC;SAClB;IACH,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAA+B;QACjD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;QACtD,OAAO,OAAO,KAAK,SAAS,CAAC;IAC/B,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,MAA+B;QAC7D,IAAI;YACF,MAAM,MAAM,GAAG,MAAM,iBAAO,CAAC,cAAc,CACzC,SAAS,EACT,MAAM,EACN,EAAE,KAAK,EAAE,mBAAmB,EAAE,EAAE,EAChC,KAAK,EACL,WAAW,CACZ,CAAC;YAEF,MAAM,KAAK,GAAG,kCAAkC,CAAC;YACjD,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC5C,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,EAAE;gBACzB,OAAO,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC;aAClC;iBAAM;gBACL,OAAO,SAAS,CAAC;aAClB;SACF;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,SAAS,CAAC;SAClB;IACH,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,cAAc;QACzB,IAAI;YACF,MAAM,MAAM,GAAG,MAAM,iBAAO,CAAC,cAAc,CACzC,SAAS,EACT,SAAS,EACT,EAAE,KAAK,EAAE,mBAAmB,EAAE,EAAE,EAChC,MAAM,EACN,WAAW,CACZ,CAAC;YAEF,MAAM,KAAK,GAAG,wEAAwE,CAAC;YACvF,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACjC,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,EAAE;gBACzB,OAAO,KAAK,CAAC,MAAM,CAAC,aAAa,CAAC;aACnC;iBAAM;gBACL,OAAO,SAAS,CAAC;aAClB;SACF;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,SAAS,CAAC;SAClB;IACH,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,4BAA4B,CACvC,MAA+B,EAC/B,WAAmB,EACnB,gBAAwB,EACxB,qBAAqB,GAAG,IAAI;QAE5B,MAAM,OAAO,GAAG,gBAAgB,GAAG,IAAI,CAAC;QACxC,IAAI;YACF,MAAM,MAAM,GAAG,MAAM,iBAAO,CAAC,cAAc,CACzC,SAAS,EACT,MAAM,EACN,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,mBAAmB,EAAE,EAAE,EAClD,cAAc,CAAC,KAAK,CAAC,EACrB,IAAI,EACJ,GAAG,WAAW,EAAE,EAChB,IAAI,EACJ,WAAW,CACZ,CAAC;YAEF,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,WAAW,GAAG,GAAG,GAAG,wCAAwC,CAAC,CAAC,CAAC,uDAAuD;YAC/I,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC5C,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,EAAE;gBACzB,OAAO,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC;aAC7B;iBAAM;gBACL,OAAO,SAAS,CAAC;aAClB;SACF;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,6BAA6B,WAAW,GAAG,CAAC,CAAC;YAC3D,IAAI,qBAAqB,EAAE;gBACzB,MAAM,KAAK,CAAC;aACb;SACF;IACH,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAC5B,MAA+B,EAC/B,WAAmB,EACnB,gBAAwB;QAExB,MAAM,OAAO,GAAG,gBAAgB,GAAG,IAAI,CAAC;QACxC,IAAI;YACF,MAAM,MAAM,GAAG,MAAM,iBAAO,CAAC,cAAc,CACzC,SAAS,EACT,MAAM,EACN,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,mBAAmB,EAAE,EAAE,EAClD,cAAc,CAAC,KAAK,CAAC,EACrB,MAAM,EACN,GAAG,WAAW,EAAE,EAChB,SAAS,CACV,CAAC;YAEF,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,+BAA+B,CAAC,CAAC;YAC1D,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;YAE5C,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,EAAE;gBACzB,OAAO,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC;aAC7B;iBAAM;gBACL,OAAO,SAAS,CAAC;aAClB;SACF;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,SAAS,CAAC;SAClB;IACH,CAAC;IAED,MAAM,CAAC,oBAAoB,CAAC,OAAe;QACzC,MAAM,wBAAwB,GAAG,sBAAsB,CAAC;QACxD,MAAM,WAAW,GAAG,OAAO,CAAC;QAE5B,IAAI,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAAC,EAAE;YAC9C,MAAM,mBAAmB,GAAG,OAAO,CAAC,SAAS,CAC3C,CAAC,EACD,OAAO,CAAC,MAAM,GAAG,wBAAwB,CAAC,MAAM,CACjD,CAAC;YACF,IAAI,mBAAmB,CAAC,MAAM,GAAG,WAAW,CAAC,MAAM,GAAG,qBAAS,CAAC,yBAAyB,EAAE;gBACzF,OAAO,CACL,mBAAmB,CAAC,SAAS,CAC3B,CAAC,EACD,qBAAS,CAAC,yBAAyB,GAAG,WAAW,CAAC,MAAM,CACzD,GAAG,wBAAwB,CAC7B,CAAC;aACH;SACF;aAAM,IAAI,OAAO,CAAC,MAAM,GAAG,qBAAS,CAAC,yBAAyB,EAAE;YAC/D,OAAO,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,qBAAS,CAAC,yBAAyB,CAAC,CAAC;SAClE;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;CACF;AA3ND,sBA2NC;AAED,SAAgB,cAAc,CAAC,OAAe;IAC5C,OAAO,SAAS,EAAE,CAAC,CAAC,CAAC,GAAG,OAAO,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;AAClD,CAAC;AAFD,wCAEC;AAED,SAAgB,mBAAmB;IACjC,OAAO,SAAS,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC;AACxC,CAAC;AAFD,kDAEC;AAED,SAAS,SAAS;IAChB,OAAO,YAAE,CAAC,IAAI,EAAE,KAAK,YAAY,CAAC;AACpC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"templateNames.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/templates/templateNames.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"templateNames.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/templates/templateNames.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAchD,oBAAY,aAAa;IACvB,KAAK,UAAU;IACf,GAAG,gBAAgB;IACnB,MAAM,YAAY;IAClB,SAAS,0BAA0B;IACnC,MAAM,oBAAoB;IAC1B,SAAS,gBAAgB;IACzB,YAAY,kBAAkB;IAC9B,mBAAmB,yBAAyB;IAC5C,kBAAkB,wBAAwB;IAC1C,+BAA+B,uCAAuC;IACtE,uBAAuB,8BAA8B;IACrD,gCAAgC,wCAAwC;IACxE,wBAAwB,+BAA+B;IACvD,oCAAoC,6CAA6C;IACjF,4BAA4B,oCAAoC;IAChE,kBAAkB,yBAAyB;IAC3C,QAAQ,aAAa;IACrB,UAAU,gBAAgB;IAC1B,gBAAgB,sBAAsB;IACtC,sBAAsB,6BAA6B;IACnD,sBAAsB,6BAA6B;IACnD,uBAAuB,8BAA8B;IACrD,oBAAoB,2BAA2B;IAC/C,gBAAgB,4BAA4B;IAC5C,sBAAsB,kCAAkC;IACxD,aAAa,mBAAmB;IAChC,KAAK,WAAW;IAChB,cAAc,qBAAqB;IACnC,oBAAoB,4BAA4B;IAChD,0BAA0B,mCAAmC;IAC7D,yBAAyB,kCAAkC;IAC3D,wBAAwB,gCAAgC;IACxD,8BAA8B,wCAAwC;IACtE,sBAAsB,8BAA8B;IACpD,kBAAkB,yBAAyB;IAC3C,yBAAyB,iCAAiC;IAC1D,6BAA6B,uCAAuC;IACpE,yBAAyB,kCAAkC;IAC3D,4BAA4B,oCAAoC;IAChE,yBAAyB,iCAAiC;IAC1D,mCAAmC,4CAA4C;IAC/E,QAAQ,sBAAsB;IAC9B,wBAAwB,oCAAoC;CAC7D;AAGD,eAAO,MAAM,oBAAoB;;CAyEhC,CAAC;AAEF,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS,CAM5E;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa,CAM7D;AAGD,eAAO,MAAM,oBAAoB,EAAE,GAAG,CAAC;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAAE,aAAa,CA+L1E,CAAC"}
|
|
@@ -78,9 +78,6 @@ exports.Feature2TemplateName = {
|
|
|
78
78
|
[`${constants_1.CapabilityOptions.linkUnfurling().id}:undefined`]: TemplateNames.LinkUnfurling,
|
|
79
79
|
[`${constants_1.CapabilityOptions.aiBot().id}:undefined`]: TemplateNames.AIBot,
|
|
80
80
|
[`${constants_1.CapabilityOptions.aiAssistantBot().id}:undefined`]: TemplateNames.AIAssistantBot,
|
|
81
|
-
[`${constants_1.CapabilityOptions.copilotPluginNewApi().id}:undefined:${constants_1.ApiAuthOptions.none().id}`]: TemplateNames.ApiPluginFromScratch,
|
|
82
|
-
[`${constants_1.CapabilityOptions.copilotPluginNewApi().id}:undefined:${constants_1.ApiAuthOptions.apiKey().id}`]: TemplateNames.ApiPluginFromScratchBearer,
|
|
83
|
-
[`${constants_1.CapabilityOptions.copilotPluginNewApi().id}:undefined:${constants_1.ApiAuthOptions.oauth().id}`]: TemplateNames.ApiPluginFromScratchOAuth,
|
|
84
81
|
[`${constants_1.CapabilityOptions.m365SearchMe().id}:undefined:${constants_1.MeArchitectureOptions.newApi().id}:${constants_1.ApiAuthOptions.none().id}`]: TemplateNames.CopilotPluginFromScratch,
|
|
85
82
|
[`${constants_1.CapabilityOptions.m365SearchMe().id}:undefined:${constants_1.MeArchitectureOptions.newApi().id}:${constants_1.ApiAuthOptions.apiKey().id}`]: TemplateNames.CopilotPluginFromScratchApiKey,
|
|
86
83
|
[`${constants_1.CapabilityOptions.m365SearchMe().id}:undefined:${constants_1.MeArchitectureOptions.newApi().id}:${constants_1.ApiAuthOptions.microsoftEntra().id}`]: TemplateNames.ApiMessageExtensionSso,
|
|
@@ -91,8 +88,6 @@ exports.Feature2TemplateName = {
|
|
|
91
88
|
[`${constants_1.CapabilityOptions.customCopilotRag().id}:undefined:${constants_1.CustomCopilotRagOptions.microsoft365().id}`]: TemplateNames.CustomCopilotRagMicrosoft365,
|
|
92
89
|
[`${constants_1.CapabilityOptions.customCopilotAssistant().id}:undefined:${constants_1.CustomCopilotAssistantOptions.new().id}`]: TemplateNames.CustomCopilotAssistantNew,
|
|
93
90
|
[`${constants_1.CapabilityOptions.customCopilotAssistant().id}:undefined:${constants_1.CustomCopilotAssistantOptions.assistantsApi().id}`]: TemplateNames.CustomCopilotAssistantAssistantsApi,
|
|
94
|
-
[`${constants_1.CapabilityOptions.customizeGptBasic().id}:undefined`]: TemplateNames.BasicGpt,
|
|
95
|
-
[`${constants_1.CapabilityOptions.customizeGptWithPlugin().id}:undefined`]: TemplateNames.GptWithPluginFromScratch,
|
|
96
91
|
};
|
|
97
92
|
function tryGetTemplateName(inputs) {
|
|
98
93
|
for (const [key, value] of exports.inputsToTemplateName) {
|
|
@@ -302,35 +297,5 @@ exports.inputsToTemplateName = new Map([
|
|
|
302
297
|
},
|
|
303
298
|
TemplateNames.CustomCopilotAssistantAssistantsApi,
|
|
304
299
|
],
|
|
305
|
-
// Copilot Plugin
|
|
306
|
-
[
|
|
307
|
-
{
|
|
308
|
-
[constants_1.QuestionNames.Capabilities]: constants_1.CapabilityOptions.copilotPluginNewApi().id,
|
|
309
|
-
[constants_1.QuestionNames.ApiAuth]: constants_1.ApiAuthOptions.none().id,
|
|
310
|
-
},
|
|
311
|
-
TemplateNames.ApiPluginFromScratch,
|
|
312
|
-
],
|
|
313
|
-
[
|
|
314
|
-
{
|
|
315
|
-
[constants_1.QuestionNames.Capabilities]: constants_1.CapabilityOptions.copilotPluginNewApi().id,
|
|
316
|
-
[constants_1.QuestionNames.ApiAuth]: constants_1.ApiAuthOptions.apiKey().id,
|
|
317
|
-
},
|
|
318
|
-
TemplateNames.ApiPluginFromScratchBearer,
|
|
319
|
-
],
|
|
320
|
-
[
|
|
321
|
-
{
|
|
322
|
-
[constants_1.QuestionNames.Capabilities]: constants_1.CapabilityOptions.copilotPluginNewApi().id,
|
|
323
|
-
[constants_1.QuestionNames.ApiAuth]: constants_1.ApiAuthOptions.oauth().id,
|
|
324
|
-
},
|
|
325
|
-
TemplateNames.ApiPluginFromScratchOAuth,
|
|
326
|
-
],
|
|
327
|
-
[
|
|
328
|
-
{ [constants_1.QuestionNames.Capabilities]: constants_1.CapabilityOptions.customizeGptBasic().id },
|
|
329
|
-
TemplateNames.BasicGpt,
|
|
330
|
-
],
|
|
331
|
-
[
|
|
332
|
-
{ [constants_1.QuestionNames.Capabilities]: constants_1.CapabilityOptions.customizeGptWithPlugin().id },
|
|
333
|
-
TemplateNames.GptWithPluginFromScratch,
|
|
334
|
-
],
|
|
335
300
|
]);
|
|
336
301
|
//# sourceMappingURL=templateNames.js.map
|