@microsoft/teamsfx-core 2.0.6 → 2.0.7-alpha.5bcec827f.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/common/constants.d.ts +1 -0
- package/build/common/constants.d.ts.map +1 -1
- package/build/common/constants.js +1 -0
- package/build/common/constants.js.map +1 -1
- package/build/common/deps-checker/checkerFactory.d.ts.map +1 -1
- package/build/common/deps-checker/checkerFactory.js +3 -0
- package/build/common/deps-checker/checkerFactory.js.map +1 -1
- package/build/common/deps-checker/constant/telemetry.d.ts +1 -0
- package/build/common/deps-checker/constant/telemetry.d.ts.map +1 -1
- package/build/common/deps-checker/constant/telemetry.js +1 -0
- package/build/common/deps-checker/constant/telemetry.js.map +1 -1
- package/build/common/deps-checker/coreDepsLoggerAdapter.d.ts +17 -0
- package/build/common/deps-checker/coreDepsLoggerAdapter.d.ts.map +1 -0
- package/build/common/deps-checker/coreDepsLoggerAdapter.js +47 -0
- package/build/common/deps-checker/coreDepsLoggerAdapter.js.map +1 -0
- package/build/common/deps-checker/coreDepsTelemetryAdapter.d.ts +16 -0
- package/build/common/deps-checker/coreDepsTelemetryAdapter.d.ts.map +1 -0
- package/build/common/deps-checker/coreDepsTelemetryAdapter.js +53 -0
- package/build/common/deps-checker/coreDepsTelemetryAdapter.js.map +1 -0
- package/build/common/deps-checker/depsChecker.d.ts +6 -1
- package/build/common/deps-checker/depsChecker.d.ts.map +1 -1
- package/build/common/deps-checker/depsChecker.js +6 -1
- package/build/common/deps-checker/depsChecker.js.map +1 -1
- package/build/common/deps-checker/index.d.ts +2 -0
- package/build/common/deps-checker/index.d.ts.map +1 -1
- package/build/common/deps-checker/index.js +2 -0
- package/build/common/deps-checker/index.js.map +1 -1
- package/build/common/deps-checker/internal/testToolChecker.d.ts +14 -3
- package/build/common/deps-checker/internal/testToolChecker.d.ts.map +1 -1
- package/build/common/deps-checker/internal/testToolChecker.js +178 -75
- package/build/common/deps-checker/internal/testToolChecker.js.map +1 -1
- package/build/common/deps-checker/internal/vxTestAppChecker.d.ts.map +1 -1
- package/build/common/deps-checker/internal/vxTestAppChecker.js +3 -45
- package/build/common/deps-checker/internal/vxTestAppChecker.js.map +1 -1
- package/build/common/deps-checker/util/downloadHelper.d.ts +15 -0
- package/build/common/deps-checker/util/downloadHelper.d.ts.map +1 -0
- package/build/common/deps-checker/util/downloadHelper.js +59 -0
- package/build/common/deps-checker/util/downloadHelper.js.map +1 -0
- package/build/common/featureFlags.d.ts +1 -2
- package/build/common/featureFlags.d.ts.map +1 -1
- package/build/common/featureFlags.js +5 -9
- package/build/common/featureFlags.js.map +1 -1
- package/build/common/local/packageJsonHelper.d.ts +0 -1
- package/build/common/local/packageJsonHelper.d.ts.map +1 -1
- package/build/common/local/packageJsonHelper.js +1 -29
- package/build/common/local/packageJsonHelper.js.map +1 -1
- package/build/common/m365/packageService.d.ts +2 -2
- package/build/common/m365/packageService.d.ts.map +1 -1
- package/build/common/m365/packageService.js +43 -19
- package/build/common/m365/packageService.js.map +1 -1
- package/build/common/projectTypeChecker.d.ts +38 -0
- package/build/common/projectTypeChecker.d.ts.map +1 -0
- package/build/common/projectTypeChecker.js +217 -0
- package/build/common/projectTypeChecker.js.map +1 -0
- package/build/common/samples.d.ts +6 -4
- package/build/common/samples.d.ts.map +1 -1
- package/build/common/samples.js +64 -29
- package/build/common/samples.js.map +1 -1
- package/build/common/spec-parser/interfaces.d.ts +14 -1
- package/build/common/spec-parser/interfaces.d.ts.map +1 -1
- package/build/common/spec-parser/manifestUpdater.d.ts +2 -2
- package/build/common/spec-parser/manifestUpdater.d.ts.map +1 -1
- package/build/common/spec-parser/manifestUpdater.js +33 -19
- package/build/common/spec-parser/manifestUpdater.js.map +1 -1
- package/build/common/spec-parser/specFilter.d.ts +1 -1
- package/build/common/spec-parser/specFilter.d.ts.map +1 -1
- package/build/common/spec-parser/specFilter.js +2 -2
- package/build/common/spec-parser/specFilter.js.map +1 -1
- package/build/common/spec-parser/specParser.browser.d.ts.map +1 -1
- package/build/common/spec-parser/specParser.browser.js +5 -3
- package/build/common/spec-parser/specParser.browser.js.map +1 -1
- package/build/common/spec-parser/specParser.d.ts.map +1 -1
- package/build/common/spec-parser/specParser.js +36 -37
- package/build/common/spec-parser/specParser.js.map +1 -1
- package/build/common/spec-parser/utils.d.ts +12 -8
- package/build/common/spec-parser/utils.d.ts.map +1 -1
- package/build/common/spec-parser/utils.js +97 -34
- package/build/common/spec-parser/utils.js.map +1 -1
- package/build/common/telemetry.d.ts +17 -1
- package/build/common/telemetry.d.ts.map +1 -1
- package/build/common/telemetry.js +35 -1
- 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 +2 -2
- package/build/common/tools.js.map +1 -1
- package/build/component/configManager/lifecycle.d.ts.map +1 -1
- package/build/component/configManager/lifecycle.js +1 -1
- package/build/component/configManager/lifecycle.js.map +1 -1
- package/build/component/constant/commonConstant.d.ts +1 -0
- package/build/component/constant/commonConstant.d.ts.map +1 -1
- package/build/component/constant/commonConstant.js +2 -0
- package/build/component/constant/commonConstant.js.map +1 -1
- package/build/component/coordinator/index.d.ts +2 -1
- package/build/component/coordinator/index.d.ts.map +1 -1
- package/build/component/coordinator/index.js +12 -2
- package/build/component/coordinator/index.js.map +1 -1
- package/build/component/driver/aad/error/aadManifestError.d.ts +9 -0
- package/build/component/driver/aad/error/aadManifestError.d.ts.map +1 -1
- package/build/component/driver/aad/error/aadManifestError.js +37 -1
- package/build/component/driver/aad/error/aadManifestError.js.map +1 -1
- package/build/component/driver/aad/utility/aadAppClient.d.ts.map +1 -1
- package/build/component/driver/aad/utility/aadAppClient.js +9 -6
- package/build/component/driver/aad/utility/aadAppClient.js.map +1 -1
- package/build/component/driver/aad/utility/aadManifestHelper.d.ts.map +1 -1
- package/build/component/driver/aad/utility/aadManifestHelper.js +6 -0
- package/build/component/driver/aad/utility/aadManifestHelper.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 +7 -3
- package/build/component/driver/apiKey/create.js.map +1 -1
- package/build/component/driver/deploy/azure/azureFunctionDeployDriver.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/azureFunctionDeployDriver.js.map +1 -1
- package/build/component/driver/deploy/azure/azureStaticWebAppGetDeploymentTokenDriver.d.ts +12 -0
- package/build/component/driver/deploy/azure/azureStaticWebAppGetDeploymentTokenDriver.d.ts.map +1 -0
- package/build/component/driver/deploy/azure/azureStaticWebAppGetDeploymentTokenDriver.js +71 -0
- package/build/component/driver/deploy/azure/azureStaticWebAppGetDeploymentTokenDriver.js.map +1 -0
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.d.ts +3 -2
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.js +5 -1
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.js.map +1 -1
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.d.ts +5 -0
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.js +21 -0
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.js.map +1 -1
- package/build/component/driver/devTool/installDriver.d.ts +2 -1
- package/build/component/driver/devTool/installDriver.d.ts.map +1 -1
- package/build/component/driver/devTool/installDriver.js +5 -2
- package/build/component/driver/devTool/installDriver.js.map +1 -1
- package/build/component/driver/index.d.ts +1 -0
- package/build/component/driver/index.d.ts.map +1 -1
- package/build/component/driver/index.js +1 -0
- package/build/component/driver/index.js.map +1 -1
- package/build/component/driver/interface/provisionArgs.d.ts +3 -0
- package/build/component/driver/interface/provisionArgs.d.ts.map +1 -1
- package/build/component/driver/interface/stepDriver.d.ts +2 -1
- package/build/component/driver/interface/stepDriver.d.ts.map +1 -1
- package/build/component/driver/middleware/addSWADeployTelemetry.d.ts +7 -0
- package/build/component/driver/middleware/addSWADeployTelemetry.d.ts.map +1 -0
- package/build/component/driver/middleware/addSWADeployTelemetry.js +52 -0
- package/build/component/driver/middleware/addSWADeployTelemetry.js.map +1 -0
- package/build/component/driver/middleware/addStartAndEndTelemetry.d.ts +3 -0
- package/build/component/driver/middleware/addStartAndEndTelemetry.d.ts.map +1 -1
- package/build/component/driver/middleware/addStartAndEndTelemetry.js +2 -1
- package/build/component/driver/middleware/addStartAndEndTelemetry.js.map +1 -1
- package/build/component/driver/script/npxBuildDriver.d.ts.map +1 -1
- package/build/component/driver/script/npxBuildDriver.js +5 -1
- package/build/component/driver/script/npxBuildDriver.js.map +1 -1
- package/build/component/driver/script/scriptDriver.d.ts +12 -8
- package/build/component/driver/script/scriptDriver.d.ts.map +1 -1
- package/build/component/driver/script/scriptDriver.js +54 -36
- package/build/component/driver/script/scriptDriver.js.map +1 -1
- package/build/component/driver/teamsApp/clients/appStudioClient.d.ts.map +1 -1
- package/build/component/driver/teamsApp/clients/appStudioClient.js +52 -33
- package/build/component/driver/teamsApp/clients/appStudioClient.js.map +1 -1
- package/build/component/driver/teamsApp/utils/telemetry.d.ts +7 -0
- package/build/component/driver/teamsApp/utils/telemetry.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/telemetry.js +3 -2
- package/build/component/driver/teamsApp/utils/telemetry.js.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.js +14 -8
- package/build/component/driver/teamsApp/validateAppPackage.js.map +1 -1
- package/build/component/generator/copilotPlugin/generator.d.ts.map +1 -1
- package/build/component/generator/copilotPlugin/generator.js +5 -4
- package/build/component/generator/copilotPlugin/generator.js.map +1 -1
- package/build/component/generator/copilotPlugin/helper.d.ts.map +1 -1
- package/build/component/generator/copilotPlugin/helper.js +6 -2
- package/build/component/generator/copilotPlugin/helper.js.map +1 -1
- package/build/component/generator/error.d.ts +5 -8
- package/build/component/generator/error.d.ts.map +1 -1
- package/build/component/generator/error.js +16 -16
- package/build/component/generator/error.js.map +1 -1
- package/build/component/generator/generator.d.ts +1 -1
- package/build/component/generator/generator.d.ts.map +1 -1
- package/build/component/generator/generator.js +16 -25
- package/build/component/generator/generator.js.map +1 -1
- package/build/component/generator/generatorAction.d.ts +4 -1
- package/build/component/generator/generatorAction.d.ts.map +1 -1
- package/build/component/generator/generatorAction.js +24 -6
- package/build/component/generator/generatorAction.js.map +1 -1
- package/build/component/generator/officeAddin/helperMethods.js +21 -20
- package/build/component/generator/officeAddin/helperMethods.js.map +1 -1
- package/build/component/generator/spfx/depsChecker/dependencyChecker.d.ts +1 -1
- package/build/component/generator/spfx/depsChecker/dependencyChecker.d.ts.map +1 -1
- package/build/component/generator/spfx/depsChecker/generatorChecker.d.ts +4 -3
- package/build/component/generator/spfx/depsChecker/generatorChecker.d.ts.map +1 -1
- package/build/component/generator/spfx/depsChecker/generatorChecker.js +30 -20
- package/build/component/generator/spfx/depsChecker/generatorChecker.js.map +1 -1
- package/build/component/generator/spfx/depsChecker/yoChecker.d.ts +3 -2
- package/build/component/generator/spfx/depsChecker/yoChecker.d.ts.map +1 -1
- package/build/component/generator/spfx/depsChecker/yoChecker.js +27 -18
- package/build/component/generator/spfx/depsChecker/yoChecker.js.map +1 -1
- package/build/component/generator/spfx/error.d.ts +2 -0
- package/build/component/generator/spfx/error.d.ts.map +1 -1
- package/build/component/generator/spfx/error.js +16 -1
- package/build/component/generator/spfx/error.js.map +1 -1
- package/build/component/generator/spfx/spfxGenerator.d.ts +3 -0
- package/build/component/generator/spfx/spfxGenerator.d.ts.map +1 -1
- package/build/component/generator/spfx/spfxGenerator.js +149 -20
- package/build/component/generator/spfx/spfxGenerator.js.map +1 -1
- package/build/component/generator/spfx/utils/constants.d.ts +3 -0
- package/build/component/generator/spfx/utils/constants.d.ts.map +1 -1
- package/build/component/generator/spfx/utils/constants.js +3 -0
- package/build/component/generator/spfx/utils/constants.js.map +1 -1
- package/build/component/generator/spfx/utils/telemetryEvents.d.ts +7 -8
- package/build/component/generator/spfx/utils/telemetryEvents.d.ts.map +1 -1
- package/build/component/generator/spfx/utils/telemetryEvents.js +5 -6
- package/build/component/generator/spfx/utils/telemetryEvents.js.map +1 -1
- package/build/component/generator/spfx/utils/utils.js +1 -1
- package/build/component/generator/utils.d.ts +5 -2
- package/build/component/generator/utils.d.ts.map +1 -1
- package/build/component/generator/utils.js +32 -12
- package/build/component/generator/utils.js.map +1 -1
- package/build/component/utils/common.d.ts +4 -1
- package/build/component/utils/common.d.ts.map +1 -1
- package/build/component/utils/common.js +21 -17
- package/build/component/utils/common.js.map +1 -1
- package/build/component/utils/envUtil.d.ts +1 -0
- package/build/component/utils/envUtil.d.ts.map +1 -1
- package/build/component/utils/envUtil.js +14 -2
- package/build/component/utils/envUtil.js.map +1 -1
- package/build/component/utils/fileOperation.d.ts +1 -1
- package/build/component/utils/fileOperation.d.ts.map +1 -1
- package/build/component/utils/fileOperation.js +34 -48
- package/build/component/utils/fileOperation.js.map +1 -1
- package/build/core/FxCore.d.ts +5 -0
- package/build/core/FxCore.d.ts.map +1 -1
- package/build/core/FxCore.js +48 -24
- package/build/core/FxCore.js.map +1 -1
- package/build/core/middleware/projectMigratorV3.d.ts +1 -1
- package/build/core/middleware/projectMigratorV3.d.ts.map +1 -1
- package/build/core/middleware/projectMigratorV3.js +10 -9
- package/build/core/middleware/projectMigratorV3.js.map +1 -1
- package/build/core/middleware/projectVersionChecker.js +4 -4
- package/build/core/middleware/projectVersionChecker.js.map +1 -1
- package/build/error/deploy.d.ts +6 -0
- package/build/error/deploy.d.ts.map +1 -1
- package/build/error/deploy.js +25 -1
- package/build/error/deploy.js.map +1 -1
- package/build/index.d.ts +1 -0
- package/build/index.d.ts.map +1 -1
- package/build/index.js +1 -0
- package/build/index.js.map +1 -1
- package/build/question/create.d.ts.map +1 -1
- package/build/question/create.js +14 -5
- package/build/question/create.js.map +1 -1
- package/build/question/generator.js +1 -3
- package/build/question/generator.js.map +1 -1
- package/build/question/options/CreateProjectOptions.js +1 -1
- package/build/question/options/CreateProjectOptions.js.map +1 -1
- package/build/question/options/CreateSampleProjectOptions.d.ts.map +1 -1
- package/build/question/options/CreateSampleProjectOptions.js +5 -1
- package/build/question/options/CreateSampleProjectOptions.js.map +1 -1
- package/build/question/options/DeployAadManifestOptions.js +1 -1
- package/build/question/options/DeployAadManifestOptions.js.map +1 -1
- package/build/question/options/PermissionGrantOptions.js +1 -1
- package/build/question/options/PermissionGrantOptions.js.map +1 -1
- package/build/question/options/PermissionListOptions.js +1 -1
- package/build/question/options/PermissionListOptions.js.map +1 -1
- package/build/question/other.d.ts +2 -1
- package/build/question/other.d.ts.map +1 -1
- package/build/question/other.js +22 -8
- package/build/question/other.js.map +1 -1
- package/build/question/questionNames.d.ts +1 -0
- package/build/question/questionNames.d.ts.map +1 -1
- package/build/question/questionNames.js +1 -0
- package/build/question/questionNames.js.map +1 -1
- package/build/ui/visitor.d.ts.map +1 -1
- package/build/ui/visitor.js +11 -2
- package/build/ui/visitor.js.map +1 -1
- package/package.json +14 -22
- package/resource/package.nls.json +27 -7
- package/resource/yaml-schema/v1.3/yaml.schema.json +42 -5
- package/templates/fallback/common.zip +0 -0
- package/templates/fallback/csharp.zip +0 -0
- package/templates/fallback/js.zip +0 -0
- package/templates/fallback/ts.zip +0 -0
- package/templates/plugins/resource/aad/auth/V3/Bot/Pages/BotAuthorizeEndPage.cshtml +55 -51
- package/templates/plugins/resource/aad/auth/bot/csharp/Pages/BotAuthorizeEndPage.cshtml +55 -51
- package/templates/plugins/resource/aad/auth/bot/js/public/auth-end.html +6 -2
- package/templates/plugins/resource/aad/auth/bot/ts/public/auth-end.html +5 -1
- package/templates/plugins/resource/aad/auth/tab/js/public/auth-end.html +16 -9
- package/templates/plugins/resource/aad/auth/tab/js/public/auth-start.html +11 -7
- package/templates/plugins/resource/aad/auth/tab/ts/public/auth-end.html +16 -9
- package/templates/plugins/resource/aad/auth/tab/ts/public/auth-start.html +11 -7
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// Licensed under the MIT license.
|
|
3
3
|
"use strict";
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
-
exports.PathAlreadyExistsError = exports.ImportSPFxSolutionError = exports.UpdateSPFxTemplateError = exports.RetrieveSPFxInfoError = exports.CopyExistingSPFxSolutionError = exports.YoGeneratorScaffoldError = exports.LatestPackageInstallError = exports.DevEnvironmentSetupError = exports.DependencyValidateError = exports.NpmInstallError = exports.ScaffoldError = void 0;
|
|
5
|
+
exports.SolutionVersionMissingError = exports.PathAlreadyExistsError = exports.ImportSPFxSolutionError = exports.UpdateSPFxTemplateError = exports.RetrieveSPFxInfoError = exports.CopyExistingSPFxSolutionError = exports.YoGeneratorScaffoldError = exports.PackageTargetVersionInstallError = exports.LatestPackageInstallError = exports.DevEnvironmentSetupError = exports.DependencyValidateError = exports.NpmInstallError = exports.ScaffoldError = void 0;
|
|
6
6
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
7
7
|
const constants_1 = require("./utils/constants");
|
|
8
8
|
const localizeUtils_1 = require("../../../common/localizeUtils");
|
|
@@ -42,6 +42,12 @@ function LatestPackageInstallError() {
|
|
|
42
42
|
return new teamsfx_api_1.SystemError(constants_1.Constants.PLUGIN_NAME, "LatestPackageInstallFailed", localizeUtils_1.getDefaultString("plugins.spfx.error.installLatestDependencyError", fxFolderPath, constants_1.Constants.SetUpDevEnvironmentHelpLink), localizeUtils_1.getLocalizedString("plugins.spfx.error.installLatestDependencyError", fxFolderPath, constants_1.Constants.SetUpDevEnvironmentHelpLink));
|
|
43
43
|
}
|
|
44
44
|
exports.LatestPackageInstallError = LatestPackageInstallError;
|
|
45
|
+
function PackageTargetVersionInstallError(packageName, version) {
|
|
46
|
+
const fxFolderPath = "HOME/.fx";
|
|
47
|
+
const packageInfo = `${packageName}@${version}`;
|
|
48
|
+
return new teamsfx_api_1.SystemError(constants_1.Constants.PLUGIN_NAME, "PackageTargetVersionInstallError", localizeUtils_1.getDefaultString("plugins.spfx.error.installDependencyError", fxFolderPath, constants_1.Constants.AddWebpartHelpLink, packageInfo), localizeUtils_1.getLocalizedString("plugins.spfx.error.installDependencyError", fxFolderPath, constants_1.Constants.AddWebpartHelpLink, packageInfo));
|
|
49
|
+
}
|
|
50
|
+
exports.PackageTargetVersionInstallError = PackageTargetVersionInstallError;
|
|
45
51
|
function YoGeneratorScaffoldError() {
|
|
46
52
|
return new teamsfx_api_1.UserError({
|
|
47
53
|
source: constants_1.Constants.PLUGIN_NAME,
|
|
@@ -101,4 +107,13 @@ function PathAlreadyExistsError(path) {
|
|
|
101
107
|
});
|
|
102
108
|
}
|
|
103
109
|
exports.PathAlreadyExistsError = PathAlreadyExistsError;
|
|
110
|
+
function SolutionVersionMissingError(path) {
|
|
111
|
+
return new teamsfx_api_1.UserError({
|
|
112
|
+
source: constants_1.Constants.PLUGIN_NAME,
|
|
113
|
+
name: "SolutionVersionMissing",
|
|
114
|
+
message: localizeUtils_1.getDefaultString("plugins.spfx.addWebPart.cannotFindSolutionVersion", path),
|
|
115
|
+
displayMessage: localizeUtils_1.getLocalizedString("plugins.spfx.addWebPart.cannotFindSolutionVersion", path),
|
|
116
|
+
});
|
|
117
|
+
}
|
|
118
|
+
exports.SolutionVersionMissingError = SolutionVersionMissingError;
|
|
104
119
|
//# sourceMappingURL=error.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error.js","sourceRoot":"","sources":["../../../../src/component/generator/spfx/error.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAEb,wDAAgE;AAChE,iDAA8C;AAC9C,iEAAqF;AAErF,SAAgB,aAAa,CAAC,KAAY;IACxC,IAAI,KAAK,YAAY,uBAAS,IAAI,KAAK,YAAY,yBAAW,EAAE;QAC9D,OAAO,KAAK,CAAC;KACd;SAAM;QACL,OAAO,IAAI,yBAAW,CAAC;YACrB,KAAK,EAAE,KAAK;YACZ,MAAM,EAAE,qBAAS,CAAC,WAAW;YAC7B,IAAI,EAAE,mBAAmB;SAC1B,CAAC,CAAC;KACJ;AACH,CAAC;AAVD,sCAUC;AAED,SAAgB,eAAe,CAAC,KAAY;IAC1C,OAAO,IAAI,yBAAW,CACpB,qBAAS,CAAC,WAAW,EACrB,kBAAkB,EAClB,gCAAgB,CAAC,qCAAqC,EAAE,KAAK,CAAC,OAAO,CAAC,EACtE,kCAAkB,CAAC,qCAAqC,EAAE,KAAK,CAAC,OAAO,CAAC,CACzE,CAAC;AACJ,CAAC;AAPD,0CAOC;AAED,SAAgB,uBAAuB,CAAC,UAAkB;IACxD,OAAO,IAAI,yBAAW,CACpB,qBAAS,CAAC,WAAW,EACrB,mBAAmB,EACnB,gCAAgB,CAAC,sCAAsC,EAAE,UAAU,CAAC,EACpE,kCAAkB,CAAC,sCAAsC,EAAE,UAAU,CAAC,CACvE,CAAC;AACJ,CAAC;AAPD,0DAOC;AAED,SAAgB,wBAAwB;IACtC,OAAO,IAAI,uBAAS,CAAC;QACnB,MAAM,EAAE,qBAAS,CAAC,WAAW;QAC7B,IAAI,EAAE,0BAA0B;QAChC,OAAO,EAAE,gCAAgB,CAAC,2CAA2C,CAAC;QACtE,cAAc,EAAE,kCAAkB,CAAC,2CAA2C,CAAC;QAC/E,QAAQ,EAAE,qBAAS,CAAC,2BAA2B;KAChD,CAAC,CAAC;AACL,CAAC;AARD,4DAQC;AAED,SAAgB,yBAAyB;IACvC,MAAM,YAAY,GAAG,UAAU,CAAC;IAChC,OAAO,IAAI,yBAAW,CACpB,qBAAS,CAAC,WAAW,EACrB,4BAA4B,EAC5B,gCAAgB,CACd,iDAAiD,EACjD,YAAY,EACZ,qBAAS,CAAC,2BAA2B,CACtC,EACD,kCAAkB,CAChB,iDAAiD,EACjD,YAAY,EACZ,qBAAS,CAAC,2BAA2B,CACtC,CACF,CAAC;AACJ,CAAC;AAhBD,8DAgBC;AAED,SAAgB,wBAAwB;IACtC,OAAO,IAAI,uBAAS,CAAC;QACnB,MAAM,EAAE,qBAAS,CAAC,WAAW;QAC7B,IAAI,EAAE,gBAAgB;QACtB,OAAO,EAAE,gCAAgB,CACvB,kCAAkC,EAClC,wCAAwC,CACzC;QACD,cAAc,EAAE,kCAAkB,CAChC,kCAAkC,EAClC,wCAAwC,CACzC;QACD,QAAQ,EAAE,qBAAS,CAAC,gBAAgB;KACrC,CAAC,CAAC;AACL,CAAC;AAdD,4DAcC;AAED,SAAgB,6BAA6B,CAAC,CAAQ;IACpD,OAAO,IAAI,uBAAS,CAAC;QACnB,MAAM,EAAE,qBAAS,CAAC,WAAW;QAC7B,IAAI,EAAE,iCAAiC;QACvC,OAAO,EAAE,gCAAgB,CAAC,4CAA4C,EAAE,CAAC,CAAC,OAAO,CAAC;QAClF,cAAc,EAAE,kCAAkB,CAAC,4CAA4C,EAAE,CAAC,CAAC,OAAO,CAAC;QAC3F,QAAQ,EAAE,qBAAS,CAAC,gBAAgB;KACrC,CAAC,CAAC;AACL,CAAC;AARD,sEAQC;AAED,SAAgB,qBAAqB;IACnC,OAAO,IAAI,uBAAS,CAAC;QACnB,MAAM,EAAE,qBAAS,CAAC,WAAW;QAC7B,IAAI,EAAE,wBAAwB;QAC9B,OAAO,EAAE,gCAAgB,CAAC,gDAAgD,CAAC;QAC3E,cAAc,EAAE,kCAAkB,CAAC,gDAAgD,CAAC;QACpF,QAAQ,EAAE,qBAAS,CAAC,gBAAgB;KACrC,CAAC,CAAC;AACL,CAAC;AARD,sDAQC;AAED,SAAgB,uBAAuB,CAAC,CAAQ;IAC9C,OAAO,IAAI,uBAAS,CAAC;QACnB,MAAM,EAAE,qBAAS,CAAC,WAAW;QAC7B,IAAI,EAAE,0BAA0B;QAChC,OAAO,EAAE,gCAAgB,CAAC,8CAA8C,EAAE,CAAC,CAAC,OAAO,CAAC;QACpF,cAAc,EAAE,kCAAkB,CAAC,8CAA8C,EAAE,CAAC,CAAC,OAAO,CAAC;QAC7F,QAAQ,EAAE,qBAAS,CAAC,gBAAgB;KACrC,CAAC,CAAC;AACL,CAAC;AARD,0DAQC;AAED,SAAgB,uBAAuB,CAAC,CAAQ;IAC9C,OAAO,IAAI,uBAAS,CAAC;QACnB,MAAM,EAAE,qBAAS,CAAC,WAAW;QAC7B,IAAI,EAAE,0BAA0B;QAChC,OAAO,EAAE,gCAAgB,CAAC,kCAAkC,EAAE,CAAC,CAAC,OAAO,CAAC;QACxE,cAAc,EAAE,kCAAkB,CAAC,kCAAkC,EAAE,CAAC,CAAC,OAAO,CAAC;QACjF,QAAQ,EAAE,qBAAS,CAAC,gBAAgB;KACrC,CAAC,CAAC;AACL,CAAC;AARD,0DAQC;AAED,SAAgB,sBAAsB,CAAC,IAAY;IACjD,OAAO,IAAI,uBAAS,CAAC;QACnB,MAAM,EAAE,qBAAS,CAAC,WAAW;QAC7B,IAAI,EAAE,mBAAmB;QACzB,OAAO,EAAE,gCAAgB,CAAC,2CAA2C,EAAE,IAAI,CAAC;QAC5E,cAAc,EAAE,kCAAkB,CAAC,2CAA2C,EAAE,IAAI,CAAC;KACtF,CAAC,CAAC;AACL,CAAC;AAPD,wDAOC"}
|
|
1
|
+
{"version":3,"file":"error.js","sourceRoot":"","sources":["../../../../src/component/generator/spfx/error.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,9 @@ export declare class SPFxGenerator {
|
|
|
6
6
|
private static importSPFxProject;
|
|
7
7
|
static doYeomanScaffold(context: Context, inputs: Inputs, destinationPath: string): Promise<Result<string, FxError>>;
|
|
8
8
|
static getSolutionName(spfxFolder: string): Promise<string | undefined>;
|
|
9
|
+
private static getSolutionVersion;
|
|
10
|
+
private static ensureLocalDependencies;
|
|
11
|
+
private static shouldAddWebPartWithLocalDependencies;
|
|
9
12
|
private static copySPFxSolution;
|
|
10
13
|
private static getWebpartManifest;
|
|
11
14
|
private static updateSPFxTemplate;
|
|
@@ -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,MAAM,
|
|
1
|
+
{"version":3,"file":"spfxGenerator.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/spfx/spfxGenerator.ts"],"names":[],"mappings":"AAKA,OAAO,EAEL,OAAO,EAEP,OAAO,EACP,MAAM,EAMN,MAAM,EAIP,MAAM,wBAAwB,CAAC;AAahC,OAAO,EAAE,aAAa,EAAqB,MAAM,oCAAoC,CAAC;AAuBtF,qBAAa,aAAa;WASJ,QAAQ,CAC1B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;mBAajB,cAAc;mBAmBd,iBAAiB;WA8GlB,gBAAgB,CAClC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;WAgMf,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;mBAa/D,kBAAkB;mBAYlB,uBAAuB;mBAsEvB,qCAAqC;mBA0HrC,gBAAgB;mBAehB,kBAAkB;mBAoClB,kBAAkB;CAqKxC"}
|
|
@@ -120,7 +120,7 @@ class SPFxGenerator {
|
|
|
120
120
|
var _a, _b;
|
|
121
121
|
const ui = context.userInteraction;
|
|
122
122
|
const progressHandler = await progress_helper_1.ProgressHelper.startScaffoldProgressHandler(ui, inputs.stage == teamsfx_api_1.Stage.addWebpart);
|
|
123
|
-
|
|
123
|
+
let shouldInstallLocally = inputs[questionNames_1.QuestionNames.SPFxInstallPackage] === create_1.SPFxVersionOptionIds.installLocally;
|
|
124
124
|
try {
|
|
125
125
|
const webpartName = inputs[questionNames_1.QuestionNames.SPFxWebpartName];
|
|
126
126
|
const framework = inputs[questionNames_1.QuestionNames.SPFxFramework];
|
|
@@ -131,28 +131,28 @@ class SPFxGenerator {
|
|
|
131
131
|
await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.next(localizeUtils_1.getLocalizedString("plugins.spfx.scaffold.dependencyCheck")));
|
|
132
132
|
const yoChecker = new yoChecker_1.YoChecker(context.logProvider);
|
|
133
133
|
const spGeneratorChecker = new generatorChecker_1.GeneratorChecker(context.logProvider);
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
throw error_2.LatestPackageInstallError();
|
|
143
|
-
}
|
|
144
|
-
}
|
|
145
|
-
if (!latestGeneratorInstalled) {
|
|
146
|
-
const spGeneratorRes = await spGeneratorChecker.ensureLatestDependency(context);
|
|
147
|
-
if (spGeneratorRes.isErr()) {
|
|
148
|
-
throw error_2.LatestPackageInstallError();
|
|
149
|
-
}
|
|
150
|
-
}
|
|
134
|
+
let targetVersion = constants_2.Constants.LatestVersion;
|
|
135
|
+
let localVersion = undefined;
|
|
136
|
+
if (isAddSPFx) {
|
|
137
|
+
const yoInfoPath = path.join(inputs[questionNames_1.QuestionNames.SPFxFolder], constants_2.Constants.YO_RC_FILE);
|
|
138
|
+
targetVersion = await this.getSolutionVersion(yoInfoPath);
|
|
139
|
+
if (!targetVersion) {
|
|
140
|
+
context.logProvider.error(localizeUtils_1.getLocalizedString("plugins.spfx.addWebPart.cannotFindSolutionVersion", yoInfoPath));
|
|
141
|
+
throw error_2.SolutionVersionMissingError(yoInfoPath);
|
|
151
142
|
}
|
|
143
|
+
const versions = await Promise.all([
|
|
144
|
+
spGeneratorChecker.findLocalInstalledVersion(),
|
|
145
|
+
spGeneratorChecker.findGloballyInstalledVersion(undefined, false),
|
|
146
|
+
]);
|
|
147
|
+
localVersion = versions[0];
|
|
148
|
+
shouldInstallLocally = await this.shouldAddWebPartWithLocalDependencies(targetVersion, versions[1], localVersion, context);
|
|
149
|
+
}
|
|
150
|
+
if (shouldInstallLocally) {
|
|
151
|
+
await this.ensureLocalDependencies(targetVersion, localVersion, inputs, context, yoChecker, spGeneratorChecker, progressHandler);
|
|
152
152
|
}
|
|
153
153
|
else {
|
|
154
154
|
const isLowerVersion = !!inputs.globalSpfxPackageVersion &&
|
|
155
|
-
semver_1.default.
|
|
155
|
+
semver_1.default.lt(inputs.globalSpfxPackageVersion, constants_2.Constants.RecommendedLowestSpfxVersion.substring(1));
|
|
156
156
|
if (isLowerVersion) {
|
|
157
157
|
context.telemetryReporter.sendTelemetryEvent(telemetryEvents_1.TelemetryEvents.UseNotRecommendedVersion);
|
|
158
158
|
}
|
|
@@ -249,7 +249,7 @@ class SPFxGenerator {
|
|
|
249
249
|
}
|
|
250
250
|
}
|
|
251
251
|
static async getSolutionName(spfxFolder) {
|
|
252
|
-
const yoInfoPath = path.join(spfxFolder,
|
|
252
|
+
const yoInfoPath = path.join(spfxFolder, constants_2.Constants.YO_RC_FILE);
|
|
253
253
|
if (await fs_extra_1.default.pathExists(yoInfoPath)) {
|
|
254
254
|
const yoInfo = await fs_extra_1.default.readJson(yoInfoPath);
|
|
255
255
|
if (yoInfo["@microsoft/generator-sharepoint"]) {
|
|
@@ -261,6 +261,135 @@ class SPFxGenerator {
|
|
|
261
261
|
}
|
|
262
262
|
return undefined;
|
|
263
263
|
}
|
|
264
|
+
static async getSolutionVersion(yoInfoPath) {
|
|
265
|
+
if (await fs_extra_1.default.pathExists(yoInfoPath)) {
|
|
266
|
+
const yoInfo = await fs_extra_1.default.readJson(yoInfoPath);
|
|
267
|
+
if (yoInfo["@microsoft/generator-sharepoint"]) {
|
|
268
|
+
return yoInfo["@microsoft/generator-sharepoint"][constants_2.Constants.YO_RC_VERSION];
|
|
269
|
+
}
|
|
270
|
+
}
|
|
271
|
+
else {
|
|
272
|
+
throw new error_1.FileNotFoundError(constants_2.Constants.PLUGIN_NAME, yoInfoPath);
|
|
273
|
+
}
|
|
274
|
+
return "";
|
|
275
|
+
}
|
|
276
|
+
static async ensureLocalDependencies(targetSPFxVersion, localSPFxVersion, inputs, context, yoChecker, spGeneratorChecker, progressHandler) {
|
|
277
|
+
let needInstallYo = false;
|
|
278
|
+
let needInstallGenerator = false;
|
|
279
|
+
const isAddWebPart = targetSPFxVersion !== constants_2.Constants.LatestVersion;
|
|
280
|
+
// yo
|
|
281
|
+
if (!isAddWebPart) {
|
|
282
|
+
const latestYoInstalled = await yoChecker.isLatestInstalled();
|
|
283
|
+
needInstallYo = !latestYoInstalled;
|
|
284
|
+
}
|
|
285
|
+
else {
|
|
286
|
+
const localYoVersion = await yoChecker.findLocalInstalledVersion();
|
|
287
|
+
needInstallYo = !localYoVersion;
|
|
288
|
+
}
|
|
289
|
+
// spfx generator
|
|
290
|
+
if (!isAddWebPart) {
|
|
291
|
+
const latestGeneratorInstalled = await spGeneratorChecker.isLatestInstalled(inputs.latestSpfxPackageVersion);
|
|
292
|
+
needInstallGenerator = !latestGeneratorInstalled;
|
|
293
|
+
}
|
|
294
|
+
else {
|
|
295
|
+
// we have check and confirmed with user before install/upgrade dependencies for user
|
|
296
|
+
needInstallGenerator = !localSPFxVersion || semver_1.default.lt(localSPFxVersion, targetSPFxVersion);
|
|
297
|
+
}
|
|
298
|
+
if (needInstallYo || needInstallGenerator) {
|
|
299
|
+
await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.next(localizeUtils_1.getLocalizedString("plugins.spfx.scaffold.dependencyInstall")));
|
|
300
|
+
if (needInstallYo) {
|
|
301
|
+
const yoRes = await yoChecker.ensureDependency(context, constants_2.Constants.LatestVersion);
|
|
302
|
+
if (yoRes.isErr()) {
|
|
303
|
+
if (isAddWebPart) {
|
|
304
|
+
throw error_2.PackageTargetVersionInstallError(constants_2.Constants.YeomanPackageName, constants_2.Constants.LatestVersion);
|
|
305
|
+
}
|
|
306
|
+
else {
|
|
307
|
+
throw error_2.LatestPackageInstallError();
|
|
308
|
+
}
|
|
309
|
+
}
|
|
310
|
+
}
|
|
311
|
+
if (needInstallGenerator) {
|
|
312
|
+
const spGeneratorRes = await spGeneratorChecker.ensureDependency(context, targetSPFxVersion);
|
|
313
|
+
if (spGeneratorRes.isErr()) {
|
|
314
|
+
if (isAddWebPart) {
|
|
315
|
+
throw error_2.PackageTargetVersionInstallError(constants_2.Constants.GeneratorPackageName, targetSPFxVersion);
|
|
316
|
+
}
|
|
317
|
+
else {
|
|
318
|
+
throw error_2.LatestPackageInstallError();
|
|
319
|
+
}
|
|
320
|
+
}
|
|
321
|
+
}
|
|
322
|
+
}
|
|
323
|
+
}
|
|
324
|
+
// return shouldUseLocal
|
|
325
|
+
static async shouldAddWebPartWithLocalDependencies(solutionVersion, globalVersion, localVersion, context) {
|
|
326
|
+
if (globalVersion === solutionVersion) {
|
|
327
|
+
// use globally installed pacakge to add web part
|
|
328
|
+
context.telemetryReporter.sendTelemetryEvent(telemetryEvents_1.TelemetryEvents.CheckAddWebPartPackage, {
|
|
329
|
+
[telemetryEvents_1.TelemetryProperty.PackageSource]: "global",
|
|
330
|
+
});
|
|
331
|
+
return false;
|
|
332
|
+
}
|
|
333
|
+
if (localVersion === solutionVersion) {
|
|
334
|
+
// use locally installed package to add web part
|
|
335
|
+
context.telemetryReporter.sendTelemetryEvent(telemetryEvents_1.TelemetryEvents.CheckAddWebPartPackage, {
|
|
336
|
+
[telemetryEvents_1.TelemetryProperty.PackageSource]: "local",
|
|
337
|
+
[telemetryEvents_1.TelemetryProperty.UserAction]: "none",
|
|
338
|
+
});
|
|
339
|
+
return true;
|
|
340
|
+
}
|
|
341
|
+
const displayedSolutionVersion = `v${solutionVersion}`;
|
|
342
|
+
const displayedLocalVersion = localVersion ? `v${localVersion}` : undefined;
|
|
343
|
+
const displayedGlobalVersion = globalVersion ? `v${globalVersion}` : undefined;
|
|
344
|
+
let userAnswer;
|
|
345
|
+
let continueText;
|
|
346
|
+
let defaultContinueText;
|
|
347
|
+
if (!localVersion) {
|
|
348
|
+
// ask user to confirm to install locally
|
|
349
|
+
continueText = localizeUtils_1.getLocalizedString("plugins.spfx.addWebPart.install");
|
|
350
|
+
defaultContinueText = localizeUtils_1.getDefaultString("plugins.spfx.addWebPart.install");
|
|
351
|
+
const res = await context.userInteraction.showMessage("info", localizeUtils_1.getLocalizedString("plugins.spfx.addWebPart.confirmInstall", displayedSolutionVersion, displayedSolutionVersion), true, continueText);
|
|
352
|
+
userAnswer = res.isOk() ? res.value : undefined;
|
|
353
|
+
}
|
|
354
|
+
else if (semver_1.default.lt(localVersion, solutionVersion)) {
|
|
355
|
+
// ask user to confirm to upgrade local SPFx
|
|
356
|
+
continueText = localizeUtils_1.getLocalizedString("plugins.spfx.addWebPart.upgrade");
|
|
357
|
+
defaultContinueText = localizeUtils_1.getDefaultString("plugins.spfx.addWebPart.upgrade");
|
|
358
|
+
const res = await context.userInteraction.showMessage("info", localizeUtils_1.getLocalizedString("plugins.spfx.addWebPart.confirmUpgrade", displayedLocalVersion, displayedSolutionVersion, displayedSolutionVersion), true, continueText);
|
|
359
|
+
userAnswer = res.isOk() ? res.value : undefined;
|
|
360
|
+
}
|
|
361
|
+
else {
|
|
362
|
+
// localVersion > solutionVersion
|
|
363
|
+
// ask user to confirm to continue, learn more or cancel
|
|
364
|
+
continueText = localizeUtils_1.getLocalizedString("plugins.spfx.addWebPart.versionMismatch.continue");
|
|
365
|
+
defaultContinueText = localizeUtils_1.getDefaultString("plugins.spfx.addWebPart.versionMismatch.continue");
|
|
366
|
+
let userSelected;
|
|
367
|
+
const helpText = localizeUtils_1.getLocalizedString("plugins.spfx.addWebPart.versionMismatch.help");
|
|
368
|
+
do {
|
|
369
|
+
const res = await context.userInteraction.showMessage("info", localizeUtils_1.getLocalizedString("plugins.spfx.addWebPart.versionMismatch.continueConfirm", displayedSolutionVersion, displayedLocalVersion), true, helpText, continueText);
|
|
370
|
+
userSelected = res.isOk() ? res.value : undefined;
|
|
371
|
+
if (userSelected === helpText) {
|
|
372
|
+
context.telemetryReporter.sendTelemetryEvent(telemetryEvents_1.TelemetryEvents.LearnMoreVersionMismatch);
|
|
373
|
+
void context.userInteraction.openUrl(constants_2.Constants.AddWebpartHelpLink);
|
|
374
|
+
}
|
|
375
|
+
} while (userSelected === helpText);
|
|
376
|
+
userAnswer = userSelected;
|
|
377
|
+
context.logProvider.log(teamsfx_api_1.LogLevel.Warning, displayedGlobalVersion
|
|
378
|
+
? localizeUtils_1.getLocalizedString("plugins.spfx.addWebPart.versionMismatch.output", displayedSolutionVersion, displayedGlobalVersion, displayedLocalVersion, displayedLocalVersion, constants_2.Constants.AddWebpartHelpLink)
|
|
379
|
+
: localizeUtils_1.getLocalizedString("plugins.spfx.addWebPart.versionMismatch.localOnly.output", displayedSolutionVersion, displayedLocalVersion, displayedLocalVersion, constants_2.Constants.AddWebpartHelpLink));
|
|
380
|
+
}
|
|
381
|
+
context.telemetryReporter.sendTelemetryEvent(telemetryEvents_1.TelemetryEvents.CheckAddWebPartPackage, {
|
|
382
|
+
[telemetryEvents_1.TelemetryProperty.PackageSource]: "local",
|
|
383
|
+
[telemetryEvents_1.TelemetryProperty.UserAction]: defaultContinueText,
|
|
384
|
+
[telemetryEvents_1.TelemetryProperty.ConfirmAddWebPartResult]: !userAnswer ? "Cancel" : defaultContinueText,
|
|
385
|
+
});
|
|
386
|
+
if (userAnswer !== continueText) {
|
|
387
|
+
throw new error_1.UserCancelError(constants_2.Constants.PLUGIN_NAME);
|
|
388
|
+
}
|
|
389
|
+
else {
|
|
390
|
+
return true;
|
|
391
|
+
}
|
|
392
|
+
}
|
|
264
393
|
static async copySPFxSolution(src, dest) {
|
|
265
394
|
try {
|
|
266
395
|
await fs_extra_1.default.ensureDir(dest);
|
|
@@ -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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"}
|
|
@@ -9,10 +9,13 @@ export declare class Constants {
|
|
|
9
9
|
static readonly YeomanPackageName = "yo";
|
|
10
10
|
static readonly DEFAULT_WEBPART_NAME = "helloworld";
|
|
11
11
|
static readonly ScaffoldHelpLink = "https://aka.ms/teamsfx-spfx-help-v5";
|
|
12
|
+
static readonly AddWebpartHelpLink = "https://aka.ms/teamsfx-spfx-help-v5";
|
|
12
13
|
static readonly DevProgramLink = "https://developer.microsoft.com/en-us/microsoft-365/dev-program";
|
|
13
14
|
static readonly YO_RC_SOLUTION_NAME = "solutionName";
|
|
14
15
|
static readonly IMPORT_HELP_LINK = "https://aka.ms/teamsfx-spfx-help-v5";
|
|
15
16
|
static readonly TEAMS_APP_NAME_MAX_LENGTH = 30;
|
|
17
|
+
static readonly YO_RC_VERSION = "version";
|
|
18
|
+
static readonly YO_RC_FILE = ".yo-rc.json";
|
|
16
19
|
}
|
|
17
20
|
export declare class TelemetryKey {
|
|
18
21
|
static readonly Component = "component";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../../src/component/generator/spfx/utils/constants.ts"],"names":[],"mappings":"AAMA,qBAAa,SAAS;IACpB,gBAAuB,WAAW,UAAU;IAC5C,gBAAuB,eAAe,sBAAsB;IAC5D,gBAAuB,2BAA2B,uDACI;IACtD,gBAAuB,aAAa,cAAc;IAClD,gBAAuB,aAAa,YAAY;IAChD,gBAAuB,4BAA4B,aAAa;IAChE,gBAAuB,oBAAoB,qCAAqC;IAChF,gBAAuB,iBAAiB,QAAQ;IAChD,gBAAuB,oBAAoB,gBAAgB;IAC3D,gBAAuB,gBAAgB,yCAAyC;IAChF,gBAAuB,cAAc,qEAC+B;IACpE,gBAAuB,mBAAmB,kBAAkB;IAC5D,gBAAuB,gBAAgB,yCAAyC;IAChF,gBAAuB,yBAAyB,MAAM;
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../../src/component/generator/spfx/utils/constants.ts"],"names":[],"mappings":"AAMA,qBAAa,SAAS;IACpB,gBAAuB,WAAW,UAAU;IAC5C,gBAAuB,eAAe,sBAAsB;IAC5D,gBAAuB,2BAA2B,uDACI;IACtD,gBAAuB,aAAa,cAAc;IAClD,gBAAuB,aAAa,YAAY;IAChD,gBAAuB,4BAA4B,aAAa;IAChE,gBAAuB,oBAAoB,qCAAqC;IAChF,gBAAuB,iBAAiB,QAAQ;IAChD,gBAAuB,oBAAoB,gBAAgB;IAC3D,gBAAuB,gBAAgB,yCAAyC;IAChF,gBAAuB,kBAAkB,yCAAyC;IAClF,gBAAuB,cAAc,qEAC+B;IACpE,gBAAuB,mBAAmB,kBAAkB;IAC5D,gBAAuB,gBAAgB,yCAAyC;IAChF,gBAAuB,yBAAyB,MAAM;IACtD,gBAAuB,aAAa,aAAa;IACjD,gBAAuB,UAAU,iBAAiB;CACnD;AAED,qBAAa,YAAY;IACvB,MAAM,CAAC,QAAQ,CAAC,SAAS,eAAe;IACxC,MAAM,CAAC,QAAQ,CAAC,OAAO,aAAa;IACpC,MAAM,CAAC,QAAQ,CAAC,SAAS,gBAAgB;IACzC,MAAM,CAAC,QAAQ,CAAC,YAAY,mBAAmB;IAC/C,MAAM,CAAC,QAAQ,CAAC,SAAS,gBAAgB;CAC1C;AAED,qBAAa,cAAc;IACzB,MAAM,CAAC,QAAQ,CAAC,OAAO,SAAS;IAChC,MAAM,CAAC,QAAQ,CAAC,IAAI,QAAQ;IAC5B,MAAM,CAAC,QAAQ,CAAC,SAAS,UAAU;IACnC,MAAM,CAAC,QAAQ,CAAC,WAAW,YAAY;CACxC;AAED,qBAAa,oBAAoB;IAC/B,MAAM,CAAC,QAAQ,CAAC,sBAAsB,SAEpC;IACF,MAAM,CAAC,QAAQ,CAAC,mBAAmB,SAAmD;IACtF,MAAM,CAAC,QAAQ,CAAC,qBAAqB,SAAqD;IAC1F,MAAM,CAAC,QAAQ,CAAC,gBAAgB,SAAwD;CACzF;AAED,qBAAa,uBAAuB;IAClC,MAAM,CAAC,QAAQ,CAAC,eAAe,SAA+D;IAC9F,MAAM,CAAC,QAAQ,CAAC,iBAAiB,SAAiE;IAClG,MAAM,CAAC,QAAQ,CAAC,eAAe,SAA+D;IAC9F,MAAM,CAAC,QAAQ,CAAC,cAAc,SAA8D;CAC7F;AAED,qBAAa,gBAAgB;IAC3B,MAAM,CAAC,QAAQ,CAAC,iBAAiB,iRAC+O;IAChR,MAAM,CAAC,QAAQ,CAAC,uBAAuB,4SACoQ;IAC3S,MAAM,CAAC,QAAQ,CAAC,kBAAkB,qKACkI;IACpK,MAAM,CAAC,QAAQ,CAAC,wBAAwB,olBAC2iB;IACnlB,MAAM,CAAC,QAAQ,CAAC,WAAW,gEAAgE;IAC3F,MAAM,CAAC,QAAQ,CAAC,qBAAqB,8BAA8B;IACnE,MAAM,CAAC,QAAQ,CAAC,eAAe,0CAA0C;CAC1E"}
|
|
@@ -18,10 +18,13 @@ Constants.GeneratorPackageName = "@microsoft/generator-sharepoint";
|
|
|
18
18
|
Constants.YeomanPackageName = "yo";
|
|
19
19
|
Constants.DEFAULT_WEBPART_NAME = "helloworld";
|
|
20
20
|
Constants.ScaffoldHelpLink = "https://aka.ms/teamsfx-spfx-help-v5";
|
|
21
|
+
Constants.AddWebpartHelpLink = "https://aka.ms/teamsfx-spfx-help-v5";
|
|
21
22
|
Constants.DevProgramLink = "https://developer.microsoft.com/en-us/microsoft-365/dev-program";
|
|
22
23
|
Constants.YO_RC_SOLUTION_NAME = "solutionName";
|
|
23
24
|
Constants.IMPORT_HELP_LINK = "https://aka.ms/teamsfx-spfx-help-v5";
|
|
24
25
|
Constants.TEAMS_APP_NAME_MAX_LENGTH = 30;
|
|
26
|
+
Constants.YO_RC_VERSION = "version";
|
|
27
|
+
Constants.YO_RC_FILE = ".yo-rc.json";
|
|
25
28
|
class TelemetryKey {
|
|
26
29
|
}
|
|
27
30
|
exports.TelemetryKey = TelemetryKey;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../src/component/generator/spfx/utils/constants.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,oEAAsE;AAEtE,kCAAkC;AAClC,MAAa,SAAS;;AAAtB,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../src/component/generator/spfx/utils/constants.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,oEAAsE;AAEtE,kCAAkC;AAClC,MAAa,SAAS;;AAAtB,8BAoBC;AAnBwB,qBAAW,GAAG,MAAM,CAAC;AACrB,yBAAe,GAAG,kBAAkB,CAAC;AACrC,qCAA2B,GAChD,mDAAmD,CAAC;AAC/B,uBAAa,GAAG,UAAU,CAAC;AAC3B,uBAAa,GAAG,QAAQ,CAAC;AACzB,sCAA4B,GAAG,SAAS,CAAC;AACzC,8BAAoB,GAAG,iCAAiC,CAAC;AACzD,2BAAiB,GAAG,IAAI,CAAC;AACzB,8BAAoB,GAAG,YAAY,CAAC;AACpC,0BAAgB,GAAG,qCAAqC,CAAC;AACzD,4BAAkB,GAAG,qCAAqC,CAAC;AAC3D,wBAAc,GACnC,iEAAiE,CAAC;AAC7C,6BAAmB,GAAG,cAAc,CAAC;AACrC,0BAAgB,GAAG,qCAAqC,CAAC;AACzD,mCAAyB,GAAG,EAAE,CAAC;AAC/B,uBAAa,GAAG,SAAS,CAAC;AAC1B,oBAAU,GAAG,aAAa,CAAC;AAGpD,MAAa,YAAY;;AAAzB,oCAMC;AALiB,sBAAS,GAAG,WAAW,CAAC;AACxB,oBAAO,GAAG,SAAS,CAAC;AACpB,sBAAS,GAAG,YAAY,CAAC;AACzB,yBAAY,GAAG,eAAe,CAAC;AAC/B,sBAAS,GAAG,YAAY,CAAC;AAG3C,MAAa,cAAc;;AAA3B,wCAKC;AAJiB,sBAAO,GAAG,KAAK,CAAC;AAChB,mBAAI,GAAG,IAAI,CAAC;AACZ,wBAAS,GAAG,MAAM,CAAC;AACnB,0BAAW,GAAG,QAAQ,CAAC;AAGzC,MAAa,oBAAoB;;AAAjC,oDAOC;AANiB,2CAAsB,GAAG,kCAAkB,CACzD,qCAAqC,CACtC,CAAC;AACc,wCAAmB,GAAG,kCAAkB,CAAC,2BAA2B,CAAC,CAAC;AACtE,0CAAqB,GAAG,kCAAkB,CAAC,6BAA6B,CAAC,CAAC;AAC1E,qCAAgB,GAAG,kCAAkB,CAAC,gCAAgC,CAAC,CAAC;AAG1F,MAAa,uBAAuB;;AAApC,0DAKC;AAJiB,uCAAe,GAAG,kCAAkB,CAAC,uCAAuC,CAAC,CAAC;AAC9E,yCAAiB,GAAG,kCAAkB,CAAC,yCAAyC,CAAC,CAAC;AAClF,uCAAe,GAAG,kCAAkB,CAAC,uCAAuC,CAAC,CAAC;AAC9E,sCAAc,GAAG,kCAAkB,CAAC,sCAAsC,CAAC,CAAC;AAG9F,MAAa,gBAAgB;;AAA7B,4CAYC;AAXiB,kCAAiB,GAC/B,6QAA6Q,CAAC;AAChQ,wCAAuB,GACrC,wSAAwS,CAAC;AAC3R,mCAAkB,GAChC,iKAAiK,CAAC;AACpJ,yCAAwB,GACtC,glBAAglB,CAAC;AACnkB,4BAAW,GAAG,4DAA4D,CAAC;AAC3E,sCAAqB,GAAG,0BAA0B,CAAC;AACnD,gCAAe,GAAG,sCAAsC,CAAC"}
|
|
@@ -2,19 +2,18 @@ export declare enum TelemetryEvents {
|
|
|
2
2
|
Generate = "generate",
|
|
3
3
|
EnsureYoStart = "ensure-yo-start",
|
|
4
4
|
EnsureYo = "ensure-yo",
|
|
5
|
-
EnsureLatestYoStart = "ensure-latest-yo-start",
|
|
6
|
-
EnsureLatestYo = "ensure-latest-yo",
|
|
7
5
|
EnsureSharepointGeneratorStart = "ensure-sharepoint-generator-start",
|
|
8
6
|
EnsureSharepointGenerator = "ensure-sharepoint-generator",
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
7
|
+
UseNotRecommendedVersion = "use-not-recommended-spfx-version",
|
|
8
|
+
CheckAddWebPartPackage = "check-add-web-part-package",
|
|
9
|
+
LearnMoreVersionMismatch = "learn-more-version-mismatch"
|
|
12
10
|
}
|
|
13
11
|
export declare enum TelemetryProperty {
|
|
14
12
|
EnsureYoReason = "ensure-yo-reason",
|
|
15
13
|
EnsureSharepointGeneratorReason = "ensure-sharepoint-generator-reason",
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
14
|
+
SPFxSolution = "spfx-solution",
|
|
15
|
+
ConfirmAddWebPartResult = "confirm-add-web-part-result",
|
|
16
|
+
PackageSource = "package-source",
|
|
17
|
+
UserAction = "user-action"
|
|
19
18
|
}
|
|
20
19
|
//# sourceMappingURL=telemetryEvents.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"telemetryEvents.d.ts","sourceRoot":"","sources":["../../../../../src/component/generator/spfx/utils/telemetryEvents.ts"],"names":[],"mappings":"AAGA,oBAAY,eAAe;IACzB,QAAQ,aAAa;IACrB,aAAa,oBAAoB;IACjC,QAAQ,cAAc;IACtB,
|
|
1
|
+
{"version":3,"file":"telemetryEvents.d.ts","sourceRoot":"","sources":["../../../../../src/component/generator/spfx/utils/telemetryEvents.ts"],"names":[],"mappings":"AAGA,oBAAY,eAAe;IACzB,QAAQ,aAAa;IACrB,aAAa,oBAAoB;IACjC,QAAQ,cAAc;IACtB,8BAA8B,sCAAsC;IACpE,yBAAyB,gCAAgC;IACzD,wBAAwB,qCAAqC;IAC7D,sBAAsB,+BAA+B;IACrD,wBAAwB,gCAAgC;CACzD;AAED,oBAAY,iBAAiB;IAC3B,cAAc,qBAAqB;IACnC,+BAA+B,uCAAuC;IACtE,YAAY,kBAAkB;IAC9B,uBAAuB,gCAAgC;IACvD,aAAa,mBAAmB;IAChC,UAAU,gBAAgB;CAC3B"}
|
|
@@ -8,20 +8,19 @@ var TelemetryEvents;
|
|
|
8
8
|
TelemetryEvents["Generate"] = "generate";
|
|
9
9
|
TelemetryEvents["EnsureYoStart"] = "ensure-yo-start";
|
|
10
10
|
TelemetryEvents["EnsureYo"] = "ensure-yo";
|
|
11
|
-
TelemetryEvents["EnsureLatestYoStart"] = "ensure-latest-yo-start";
|
|
12
|
-
TelemetryEvents["EnsureLatestYo"] = "ensure-latest-yo";
|
|
13
11
|
TelemetryEvents["EnsureSharepointGeneratorStart"] = "ensure-sharepoint-generator-start";
|
|
14
12
|
TelemetryEvents["EnsureSharepointGenerator"] = "ensure-sharepoint-generator";
|
|
15
|
-
TelemetryEvents["EnsureLatestSharepointGeneratorStart"] = "ensure-latest-sharepoint-start";
|
|
16
|
-
TelemetryEvents["EnsureLatestSharepointGenerator"] = "ensure-latest-sharepoint";
|
|
17
13
|
TelemetryEvents["UseNotRecommendedVersion"] = "use-not-recommended-spfx-version";
|
|
14
|
+
TelemetryEvents["CheckAddWebPartPackage"] = "check-add-web-part-package";
|
|
15
|
+
TelemetryEvents["LearnMoreVersionMismatch"] = "learn-more-version-mismatch";
|
|
18
16
|
})(TelemetryEvents = exports.TelemetryEvents || (exports.TelemetryEvents = {}));
|
|
19
17
|
var TelemetryProperty;
|
|
20
18
|
(function (TelemetryProperty) {
|
|
21
19
|
TelemetryProperty["EnsureYoReason"] = "ensure-yo-reason";
|
|
22
20
|
TelemetryProperty["EnsureSharepointGeneratorReason"] = "ensure-sharepoint-generator-reason";
|
|
23
|
-
TelemetryProperty["EnsureLatestYoReason"] = "ensure-latest-yo-reason";
|
|
24
|
-
TelemetryProperty["EnsureLatestSharepointGeneratorReason"] = "ensure-latest-sharepoint-generator-reason";
|
|
25
21
|
TelemetryProperty["SPFxSolution"] = "spfx-solution";
|
|
22
|
+
TelemetryProperty["ConfirmAddWebPartResult"] = "confirm-add-web-part-result";
|
|
23
|
+
TelemetryProperty["PackageSource"] = "package-source";
|
|
24
|
+
TelemetryProperty["UserAction"] = "user-action";
|
|
26
25
|
})(TelemetryProperty = exports.TelemetryProperty || (exports.TelemetryProperty = {}));
|
|
27
26
|
//# sourceMappingURL=telemetryEvents.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"telemetryEvents.js","sourceRoot":"","sources":["../../../../../src/component/generator/spfx/utils/telemetryEvents.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,IAAY,
|
|
1
|
+
{"version":3,"file":"telemetryEvents.js","sourceRoot":"","sources":["../../../../../src/component/generator/spfx/utils/telemetryEvents.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,IAAY,eASX;AATD,WAAY,eAAe;IACzB,wCAAqB,CAAA;IACrB,oDAAiC,CAAA;IACjC,yCAAsB,CAAA;IACtB,uFAAoE,CAAA;IACpE,4EAAyD,CAAA;IACzD,gFAA6D,CAAA;IAC7D,wEAAqD,CAAA;IACrD,2EAAwD,CAAA;AAC1D,CAAC,EATW,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAS1B;AAED,IAAY,iBAOX;AAPD,WAAY,iBAAiB;IAC3B,wDAAmC,CAAA;IACnC,2FAAsE,CAAA;IACtE,mDAA8B,CAAA;IAC9B,4EAAuD,CAAA;IACvD,qDAAgC,CAAA;IAChC,+CAA0B,CAAA;AAC5B,CAAC,EAPW,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAO5B"}
|
|
@@ -133,7 +133,7 @@ class Utils {
|
|
|
133
133
|
}
|
|
134
134
|
}
|
|
135
135
|
catch (error) {
|
|
136
|
-
logger === null || logger === void 0 ? void 0 : logger.
|
|
136
|
+
logger === null || logger === void 0 ? void 0 : logger.debug(`Failed to execute "npm ls ${packageName}"`);
|
|
137
137
|
if (shouldThrowIfNotFound) {
|
|
138
138
|
throw error;
|
|
139
139
|
}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
import { SampleConfig } from "../../common/samples";
|
|
3
3
|
import AdmZip from "adm-zip";
|
|
4
4
|
import { AxiosResponse, CancelToken } from "axios";
|
|
5
|
+
import { AxiosError } from "axios";
|
|
5
6
|
export declare function sendRequestWithRetry<T>(requestFn: () => Promise<AxiosResponse<T>>, tryLimits: number): Promise<AxiosResponse<T>>;
|
|
6
7
|
export declare function sendRequestWithTimeout<T>(requestFn: (cancelToken: CancelToken) => Promise<AxiosResponse<T>>, timeoutInMs: number, tryLimits?: number): Promise<AxiosResponse<T>>;
|
|
7
8
|
export declare function fetchTemplateZipUrl(name: string, tryLimits?: number, timeoutInMs?: number): Promise<string>;
|
|
@@ -13,7 +14,7 @@ export declare function renderTemplateFileData(fileName: string, fileData: Buffe
|
|
|
13
14
|
export declare function renderTemplateFileName(fileName: string, fileData: Buffer, variables?: {
|
|
14
15
|
[key: string]: string;
|
|
15
16
|
}): string;
|
|
16
|
-
export declare function getSampleInfoFromName(sampleName: string): SampleConfig
|
|
17
|
+
export declare function getSampleInfoFromName(sampleName: string): Promise<SampleConfig>;
|
|
17
18
|
export declare function zipFolder(folderPath: string): AdmZip;
|
|
18
19
|
export declare function downloadDirectory(sampleInfo: SampleUrlInfo, dstPath: string, concurrencyLimits?: number, retryLimits?: number): Promise<string[]>;
|
|
19
20
|
export declare type SampleUrlInfo = {
|
|
@@ -22,7 +23,9 @@ export declare type SampleUrlInfo = {
|
|
|
22
23
|
ref: string;
|
|
23
24
|
dir: string;
|
|
24
25
|
};
|
|
25
|
-
export declare function parseSampleUrl(url: string): SampleUrlInfo;
|
|
26
26
|
export declare function runWithLimitedConcurrency<T>(items: T[], callback: (arg: T) => any, concurrencyLimit: number): Promise<void>;
|
|
27
27
|
export declare function convertToLangKey(programmingLanguage: string): string;
|
|
28
|
+
export declare function convertToUrl(sampleInfo: SampleUrlInfo): string;
|
|
29
|
+
export declare function simplifyAxiosError(error: AxiosError): Error;
|
|
30
|
+
export declare function isApiLimitError(error: Error): boolean;
|
|
28
31
|
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/component/generator/utils.ts"],"names":[],"mappings":";AAeA,OAAO,EAAE,YAAY,EAAkB,MAAM,sBAAsB,CAAC;AACpE,OAAO,MAAM,MAAM,SAAS,CAAC;AAC7B,OAAc,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/component/generator/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// Copyright (c) Microsoft Corporation.
|
|
3
3
|
// Licensed under the MIT license.
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
-
exports.
|
|
5
|
+
exports.isApiLimitError = exports.simplifyAxiosError = exports.convertToUrl = exports.convertToLangKey = exports.runWithLimitedConcurrency = exports.downloadDirectory = exports.zipFolder = exports.getSampleInfoFromName = exports.renderTemplateFileName = exports.renderTemplateFileData = exports.unzip = exports.fetchZipFromUrl = exports.fetchTemplateZipUrl = exports.sendRequestWithTimeout = exports.sendRequestWithRetry = void 0;
|
|
6
6
|
const tslib_1 = require("tslib");
|
|
7
7
|
const mustache_1 = tslib_1.__importStar(require("mustache"));
|
|
8
8
|
const path_1 = tslib_1.__importDefault(require("path"));
|
|
@@ -163,8 +163,8 @@ function renderTemplateFileName(fileName, fileData, variables) {
|
|
|
163
163
|
return mustache_1.default.render(fileName, variables, {}, constant_1.placeholderDelimiters).replace(constant_1.templateFileExt, "");
|
|
164
164
|
}
|
|
165
165
|
exports.renderTemplateFileName = renderTemplateFileName;
|
|
166
|
-
function getSampleInfoFromName(sampleName) {
|
|
167
|
-
const sample = samples_1.sampleProvider.SampleCollection.samples.find((sample) => sample.id.toLowerCase() === sampleName.toLowerCase());
|
|
166
|
+
async function getSampleInfoFromName(sampleName) {
|
|
167
|
+
const sample = (await samples_1.sampleProvider.SampleCollection).samples.find((sample) => sample.id.toLowerCase() === sampleName.toLowerCase());
|
|
168
168
|
if (!sample) {
|
|
169
169
|
throw error_2.InvalidInputError(`sample '${sampleName}' not found`);
|
|
170
170
|
}
|
|
@@ -183,15 +183,6 @@ async function downloadDirectory(sampleInfo, dstPath, concurrencyLimits = consta
|
|
|
183
183
|
return samplePaths;
|
|
184
184
|
}
|
|
185
185
|
exports.downloadDirectory = downloadDirectory;
|
|
186
|
-
function parseSampleUrl(url) {
|
|
187
|
-
const urlParserRegex = /https:\/\/github.com\/([^/]+)\/([^/]+)\/tree\/([^/]+)[/](.*)/;
|
|
188
|
-
const parsed = urlParserRegex.exec(url);
|
|
189
|
-
if (!parsed)
|
|
190
|
-
throw new error_1.ParseUrlError(url);
|
|
191
|
-
const [owner, repository, ref, dir] = parsed.slice(1);
|
|
192
|
-
return { owner, repository, ref, dir };
|
|
193
|
-
}
|
|
194
|
-
exports.parseSampleUrl = parseSampleUrl;
|
|
195
186
|
async function getSampleFileInfo(urlInfo, retryLimits) {
|
|
196
187
|
var _a;
|
|
197
188
|
const fileInfoUrl = `https://api.github.com/repos/${urlInfo.owner}/${urlInfo.repository}/git/trees/${urlInfo.ref}?recursive=1`;
|
|
@@ -251,4 +242,33 @@ function convertToLangKey(programmingLanguage) {
|
|
|
251
242
|
return programmingLanguage;
|
|
252
243
|
}
|
|
253
244
|
exports.convertToLangKey = convertToLangKey;
|
|
245
|
+
function convertToUrl(sampleInfo) {
|
|
246
|
+
return `https://github.com/${sampleInfo.owner}/${sampleInfo.repository}/tree/${sampleInfo.ref}/${sampleInfo.dir}`;
|
|
247
|
+
}
|
|
248
|
+
exports.convertToUrl = convertToUrl;
|
|
249
|
+
function simplifyAxiosError(error) {
|
|
250
|
+
var _a, _b, _c, _d;
|
|
251
|
+
const simplifiedError = {
|
|
252
|
+
message: error.message,
|
|
253
|
+
name: error.name,
|
|
254
|
+
config: error.config,
|
|
255
|
+
code: error.code,
|
|
256
|
+
stack: error.stack,
|
|
257
|
+
status: (_a = error.response) === null || _a === void 0 ? void 0 : _a.status,
|
|
258
|
+
statusText: (_b = error.response) === null || _b === void 0 ? void 0 : _b.statusText,
|
|
259
|
+
headers: (_c = error.response) === null || _c === void 0 ? void 0 : _c.headers,
|
|
260
|
+
data: (_d = error.response) === null || _d === void 0 ? void 0 : _d.data,
|
|
261
|
+
};
|
|
262
|
+
return simplifiedError;
|
|
263
|
+
}
|
|
264
|
+
exports.simplifyAxiosError = simplifyAxiosError;
|
|
265
|
+
function isApiLimitError(error) {
|
|
266
|
+
var _a, _b, _c;
|
|
267
|
+
//https://docs.github.com/en/rest/overview/rate-limits-for-the-rest-api?apiVersion=2022-11-28#exceeding-the-rate-limit
|
|
268
|
+
return (axios_1.default.isAxiosError(error) &&
|
|
269
|
+
((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) !== undefined &&
|
|
270
|
+
[403, 429].includes(error.response.status) &&
|
|
271
|
+
((_c = (_b = error.response) === null || _b === void 0 ? void 0 : _b.headers) === null || _c === void 0 ? void 0 : _c["x-ratelimit-remaining"]) === "0");
|
|
272
|
+
}
|
|
273
|
+
exports.isApiLimitError = isApiLimitError;
|
|
254
274
|
//# sourceMappingURL=utils.js.map
|