@microsoft/teamsfx-core 2.0.7-alpha.07c4fbf2b.0 → 2.0.7-alpha.0e84b9566.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 +2 -0
- package/build/common/constants.d.ts.map +1 -1
- package/build/common/constants.js +2 -0
- package/build/common/constants.js.map +1 -1
- package/build/common/deps-checker/constant/helpLink.d.ts +1 -1
- package/build/common/deps-checker/constant/helpLink.d.ts.map +1 -1
- package/build/common/deps-checker/constant/helpLink.js +1 -1
- package/build/common/deps-checker/constant/helpLink.js.map +1 -1
- package/build/common/featureFlags.d.ts +2 -0
- package/build/common/featureFlags.d.ts.map +1 -1
- package/build/common/featureFlags.js +10 -2
- package/build/common/featureFlags.js.map +1 -1
- package/build/common/jsonUtils.js.map +1 -1
- package/build/common/local/packageJsonHelper.d.ts.map +1 -1
- package/build/common/local/packageJsonHelper.js +1 -2
- package/build/common/local/packageJsonHelper.js.map +1 -1
- package/build/common/m365/packageService.d.ts +1 -0
- package/build/common/m365/packageService.d.ts.map +1 -1
- package/build/common/m365/packageService.js +17 -3
- package/build/common/m365/packageService.js.map +1 -1
- package/build/common/samples.d.ts +1 -1
- package/build/common/samples.d.ts.map +1 -1
- package/build/common/samples.js +1 -1
- package/build/common/samples.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 +2 -0
- package/build/common/telemetry.js.map +1 -1
- package/build/common/templates-config.json +1 -0
- package/build/common/tools.d.ts.map +1 -1
- package/build/common/tools.js +5 -2
- package/build/common/tools.js.map +1 -1
- package/build/common/wrappedAxiosClient.d.ts +59 -0
- package/build/common/wrappedAxiosClient.d.ts.map +1 -0
- package/build/common/wrappedAxiosClient.js +247 -0
- package/build/common/wrappedAxiosClient.js.map +1 -0
- package/build/component/configManager/lifecycle.js +1 -1
- package/build/component/configManager/lifecycle.js.map +1 -1
- package/build/component/configManager/validator.js +1 -1
- package/build/component/configManager/validator.js.map +1 -1
- package/build/component/constant/commonConstant.d.ts +5 -0
- package/build/component/constant/commonConstant.d.ts.map +1 -1
- package/build/component/constant/commonConstant.js +7 -1
- package/build/component/constant/commonConstant.js.map +1 -1
- package/build/component/coordinator/index.d.ts +4 -0
- package/build/component/coordinator/index.d.ts.map +1 -1
- package/build/component/coordinator/index.js +38 -18
- package/build/component/coordinator/index.js.map +1 -1
- package/build/component/developerPortalScaffoldUtils.d.ts.map +1 -1
- package/build/component/developerPortalScaffoldUtils.js +0 -2
- package/build/component/developerPortalScaffoldUtils.js.map +1 -1
- package/build/component/driver/aad/create.d.ts +1 -1
- package/build/component/driver/aad/create.d.ts.map +1 -1
- package/build/component/driver/aad/create.js +11 -11
- package/build/component/driver/aad/create.js.map +1 -1
- package/build/component/driver/aad/update.d.ts +1 -1
- package/build/component/driver/aad/update.d.ts.map +1 -1
- package/build/component/driver/aad/update.js +10 -8
- package/build/component/driver/aad/update.js.map +1 -1
- package/build/component/driver/aad/utility/aadAppClient.d.ts +1 -0
- package/build/component/driver/aad/utility/aadAppClient.d.ts.map +1 -1
- package/build/component/driver/aad/utility/aadAppClient.js +11 -2
- package/build/component/driver/aad/utility/aadAppClient.js.map +1 -1
- package/build/component/driver/apiKey/create.d.ts +1 -2
- package/build/component/driver/apiKey/create.d.ts.map +1 -1
- package/build/component/driver/apiKey/create.js +29 -34
- package/build/component/driver/apiKey/create.js.map +1 -1
- package/build/component/driver/apiKey/error/apiKeyClientSecretInvalid.d.ts.map +1 -1
- package/build/component/driver/apiKey/error/apiKeyClientSecretInvalid.js +2 -3
- package/build/component/driver/apiKey/error/apiKeyClientSecretInvalid.js.map +1 -1
- package/build/component/driver/apiKey/interface/createApiKeyArgs.d.ts +2 -1
- package/build/component/driver/apiKey/interface/createApiKeyArgs.d.ts.map +1 -1
- package/build/component/driver/apiKey/utility/constants.d.ts +2 -1
- package/build/component/driver/apiKey/utility/constants.d.ts.map +1 -1
- package/build/component/driver/apiKey/utility/constants.js +3 -2
- package/build/component/driver/apiKey/utility/constants.js.map +1 -1
- package/build/component/driver/botAadApp/create.d.ts +2 -2
- package/build/component/driver/botAadApp/create.d.ts.map +1 -1
- package/build/component/driver/botAadApp/create.js +18 -18
- package/build/component/driver/botAadApp/create.js.map +1 -1
- package/build/component/driver/botFramework/createOrUpdateBot.d.ts.map +1 -1
- package/build/component/driver/botFramework/createOrUpdateBot.js +9 -11
- package/build/component/driver/botFramework/createOrUpdateBot.js.map +1 -1
- package/build/component/driver/file/createOrUpdateEnvironmentFile.d.ts.map +1 -1
- package/build/component/driver/file/createOrUpdateEnvironmentFile.js +6 -6
- package/build/component/driver/file/createOrUpdateEnvironmentFile.js.map +1 -1
- package/build/component/driver/file/createOrUpdateJsonFile.d.ts.map +1 -1
- package/build/component/driver/file/createOrUpdateJsonFile.js +8 -8
- package/build/component/driver/file/createOrUpdateJsonFile.js.map +1 -1
- package/build/component/driver/m365/acquire.d.ts.map +1 -1
- package/build/component/driver/m365/acquire.js +9 -10
- package/build/component/driver/m365/acquire.js.map +1 -1
- package/build/component/driver/middleware/addSWADeployTelemetry.js +1 -2
- package/build/component/driver/middleware/addSWADeployTelemetry.js.map +1 -1
- package/build/component/driver/teamsApp/appStudio.d.ts.map +1 -1
- package/build/component/driver/teamsApp/appStudio.js +0 -2
- package/build/component/driver/teamsApp/appStudio.js.map +1 -1
- package/build/component/driver/teamsApp/clients/appStudioClient.d.ts +3 -9
- package/build/component/driver/teamsApp/clients/appStudioClient.d.ts.map +1 -1
- package/build/component/driver/teamsApp/clients/appStudioClient.js +79 -112
- package/build/component/driver/teamsApp/clients/appStudioClient.js.map +1 -1
- package/build/component/driver/teamsApp/clients/authSvcClient.d.ts.map +1 -1
- package/build/component/driver/teamsApp/clients/authSvcClient.js +3 -24
- package/build/component/driver/teamsApp/clients/authSvcClient.js.map +1 -1
- package/build/component/driver/teamsApp/configure.d.ts.map +1 -1
- package/build/component/driver/teamsApp/configure.js +0 -2
- package/build/component/driver/teamsApp/configure.js.map +1 -1
- package/build/component/driver/teamsApp/constants.d.ts +4 -0
- package/build/component/driver/teamsApp/constants.d.ts.map +1 -1
- package/build/component/driver/teamsApp/constants.js +4 -0
- package/build/component/driver/teamsApp/constants.js.map +1 -1
- package/build/component/driver/teamsApp/create.d.ts.map +1 -1
- package/build/component/driver/teamsApp/create.js +0 -2
- package/build/component/driver/teamsApp/create.js.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/publishAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/publishAppPackage.js +3 -5
- package/build/component/driver/teamsApp/publishAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/utils/telemetry.d.ts +0 -31
- package/build/component/driver/teamsApp/utils/telemetry.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/telemetry.js +1 -53
- package/build/component/driver/teamsApp/utils/telemetry.js.map +1 -1
- package/build/component/driver/teamsApp/validate.d.ts.map +1 -1
- package/build/component/driver/teamsApp/validate.js +0 -1
- package/build/component/driver/teamsApp/validate.js.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.js +0 -1
- package/build/component/driver/teamsApp/validateAppPackage.js.map +1 -1
- package/build/component/feature/collaboration.d.ts +1 -1
- package/build/component/feature/collaboration.d.ts.map +1 -1
- package/build/component/feature/collaboration.js +10 -12
- package/build/component/feature/collaboration.js.map +1 -1
- package/build/component/generator/copilotPlugin/generator.d.ts +3 -2
- package/build/component/generator/copilotPlugin/generator.d.ts.map +1 -1
- package/build/component/generator/copilotPlugin/generator.js +31 -15
- package/build/component/generator/copilotPlugin/generator.js.map +1 -1
- package/build/component/generator/copilotPlugin/helper.d.ts +1 -1
- package/build/component/generator/copilotPlugin/helper.js +19 -19
- package/build/component/generator/copilotPlugin/helper.js.map +1 -1
- package/build/component/generator/generator.d.ts.map +1 -1
- package/build/component/generator/generator.js +7 -6
- package/build/component/generator/generator.js.map +1 -1
- package/build/component/generator/generatorAction.d.ts +3 -4
- package/build/component/generator/generatorAction.d.ts.map +1 -1
- package/build/component/generator/generatorAction.js +29 -22
- package/build/component/generator/generatorAction.js.map +1 -1
- package/build/component/generator/officeAddin/config/projectProperties.d.ts +1 -0
- package/build/component/generator/officeAddin/config/projectProperties.d.ts.map +1 -1
- package/build/component/generator/officeAddin/config/projectProperties.js +1 -0
- package/build/component/generator/officeAddin/config/projectProperties.js.map +1 -1
- package/build/component/generator/officeAddin/config/projectsJsonData.d.ts +1 -4
- package/build/component/generator/officeAddin/config/projectsJsonData.d.ts.map +1 -1
- package/build/component/generator/officeAddin/config/projectsJsonData.js +3 -10
- package/build/component/generator/officeAddin/config/projectsJsonData.js.map +1 -1
- package/build/component/generator/officeAddin/generator.d.ts.map +1 -1
- package/build/component/generator/officeAddin/generator.js +5 -5
- package/build/component/generator/officeAddin/generator.js.map +1 -1
- package/build/component/generator/officeAddin/helperMethods.d.ts +2 -1
- package/build/component/generator/officeAddin/helperMethods.d.ts.map +1 -1
- package/build/component/generator/officeAddin/helperMethods.js +21 -10
- package/build/component/generator/officeAddin/helperMethods.js.map +1 -1
- package/build/component/generator/spfx/error.d.ts +1 -0
- package/build/component/generator/spfx/error.d.ts.map +1 -1
- package/build/component/generator/spfx/error.js +11 -1
- package/build/component/generator/spfx/error.js.map +1 -1
- package/build/component/generator/spfx/spfxGenerator.d.ts +1 -0
- package/build/component/generator/spfx/spfxGenerator.d.ts.map +1 -1
- package/build/component/generator/spfx/spfxGenerator.js +33 -0
- package/build/component/generator/spfx/spfxGenerator.js.map +1 -1
- package/build/component/generator/spfx/utils/constants.d.ts +2 -0
- package/build/component/generator/spfx/utils/constants.d.ts.map +1 -1
- package/build/component/generator/spfx/utils/constants.js +2 -0
- package/build/component/generator/spfx/utils/constants.js.map +1 -1
- package/build/component/generator/spfx/utils/telemetryEvents.d.ts +2 -1
- package/build/component/generator/spfx/utils/telemetryEvents.d.ts.map +1 -1
- package/build/component/generator/spfx/utils/telemetryEvents.js +1 -0
- package/build/component/generator/spfx/utils/telemetryEvents.js.map +1 -1
- package/build/component/generator/utils.d.ts +3 -1
- package/build/component/generator/utils.d.ts.map +1 -1
- package/build/component/generator/utils.js +11 -3
- package/build/component/generator/utils.js.map +1 -1
- package/build/component/middleware/envMW.d.ts.map +1 -1
- package/build/component/middleware/envMW.js +9 -6
- package/build/component/middleware/envMW.js.map +1 -1
- package/build/component/resource/botService/appStudio/appStudioClient.d.ts +2 -0
- package/build/component/resource/botService/appStudio/appStudioClient.d.ts.map +1 -1
- package/build/component/resource/botService/appStudio/appStudioClient.js +46 -31
- package/build/component/resource/botService/appStudio/appStudioClient.js.map +1 -1
- package/build/component/utils/envUtil.d.ts +2 -0
- package/build/component/utils/envUtil.d.ts.map +1 -1
- package/build/component/utils/envUtil.js +22 -0
- package/build/component/utils/envUtil.js.map +1 -1
- package/build/component/utils/pathUtils.js +1 -1
- package/build/component/utils/pathUtils.js.map +1 -1
- package/build/core/FxCore.js +3 -3
- package/build/core/FxCore.js.map +1 -1
- package/build/core/collaborator.js +3 -3
- package/build/core/collaborator.js.map +1 -1
- package/build/core/middleware/projectMigratorV3.d.ts.map +1 -1
- package/build/core/middleware/projectMigratorV3.js +6 -1
- package/build/core/middleware/projectMigratorV3.js.map +1 -1
- package/build/error/common.d.ts +4 -0
- package/build/error/common.d.ts.map +1 -1
- package/build/error/common.js +36 -2
- package/build/error/common.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 +0 -1
- package/build/index.d.ts.map +1 -1
- package/build/index.js +1 -3
- package/build/index.js.map +1 -1
- package/build/question/create.d.ts +10 -0
- package/build/question/create.d.ts.map +1 -1
- package/build/question/create.js +123 -22
- package/build/question/create.js.map +1 -1
- package/build/question/inputs/CreateProjectInputs.d.ts +4 -4
- package/build/question/inputs/CreateProjectInputs.d.ts.map +1 -1
- package/build/question/options/CreateProjectOptions.d.ts.map +1 -1
- package/build/question/options/CreateProjectOptions.js +11 -8
- package/build/question/options/CreateProjectOptions.js.map +1 -1
- package/build/question/other.d.ts.map +1 -1
- package/build/question/other.js +2 -1
- 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/package.json +7 -7
- package/resource/package.nls.json +17 -7
- package/resource/yaml-schema/v1.3/yaml.schema.json +6 -43
- package/resource/yaml-schema/v1.4/yaml.schema.json +1588 -0
- package/resource/yaml-schema/yaml.schema.json +1588 -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/ts.zip +0 -0
- package/templates/plugins/resource/aad/auth/V3/Enable SSO.txt +1 -1
- package/build/common/spec-parser/adaptiveCardGenerator.d.ts +0 -7
- package/build/common/spec-parser/adaptiveCardGenerator.d.ts.map +0 -1
- package/build/common/spec-parser/adaptiveCardGenerator.js +0 -168
- package/build/common/spec-parser/adaptiveCardGenerator.js.map +0 -1
- package/build/common/spec-parser/adaptiveCardWrapper.d.ts +0 -15
- package/build/common/spec-parser/adaptiveCardWrapper.d.ts.map +0 -1
- package/build/common/spec-parser/adaptiveCardWrapper.js +0 -98
- package/build/common/spec-parser/adaptiveCardWrapper.js.map +0 -1
- package/build/common/spec-parser/constants.d.ts +0 -41
- package/build/common/spec-parser/constants.d.ts.map +0 -1
- package/build/common/spec-parser/constants.js +0 -95
- package/build/common/spec-parser/constants.js.map +0 -1
- package/build/common/spec-parser/index.browser.d.ts +0 -6
- package/build/common/spec-parser/index.browser.d.ts.map +0 -1
- package/build/common/spec-parser/index.browser.js +0 -16
- package/build/common/spec-parser/index.browser.js.map +0 -1
- package/build/common/spec-parser/index.d.ts +0 -5
- package/build/common/spec-parser/index.d.ts.map +0 -1
- package/build/common/spec-parser/index.js +0 -16
- package/build/common/spec-parser/index.js.map +0 -1
- package/build/common/spec-parser/interfaces.d.ts +0 -180
- package/build/common/spec-parser/interfaces.d.ts.map +0 -1
- package/build/common/spec-parser/interfaces.js +0 -51
- package/build/common/spec-parser/interfaces.js.map +0 -1
- package/build/common/spec-parser/manifestUpdater.d.ts +0 -7
- package/build/common/spec-parser/manifestUpdater.d.ts.map +0 -1
- package/build/common/spec-parser/manifestUpdater.js +0 -98
- package/build/common/spec-parser/manifestUpdater.js.map +0 -1
- package/build/common/spec-parser/specFilter.d.ts +0 -3
- package/build/common/spec-parser/specFilter.d.ts.map +0 -1
- package/build/common/spec-parser/specFilter.js +0 -40
- package/build/common/spec-parser/specFilter.js.map +0 -1
- package/build/common/spec-parser/specParser.browser.d.ts +0 -46
- package/build/common/spec-parser/specParser.browser.d.ts.map +0 -1
- package/build/common/spec-parser/specParser.browser.js +0 -139
- package/build/common/spec-parser/specParser.browser.js.map +0 -1
- package/build/common/spec-parser/specParser.d.ts +0 -46
- package/build/common/spec-parser/specParser.d.ts.map +0 -1
- package/build/common/spec-parser/specParser.js +0 -244
- package/build/common/spec-parser/specParser.js.map +0 -1
- package/build/common/spec-parser/specParserError.d.ts +0 -6
- package/build/common/spec-parser/specParserError.d.ts.map +0 -1
- package/build/common/spec-parser/specParserError.js +0 -13
- package/build/common/spec-parser/specParserError.js.map +0 -1
- package/build/common/spec-parser/utils.d.ts +0 -43
- package/build/common/spec-parser/utils.d.ts.map +0 -1
- package/build/common/spec-parser/utils.js +0 -587
- package/build/common/spec-parser/utils.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generatorAction.d.ts","sourceRoot":"","sources":["../../../src/component/generator/generatorAction.ts"],"names":[],"mappings":";AAGA,OAAO,MAAM,MAAM,SAAS,CAAC;AAI7B,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAKrD,OAAO,
|
|
1
|
+
{"version":3,"file":"generatorAction.d.ts","sourceRoot":"","sources":["../../../src/component/generator/generatorAction.ts"],"names":[],"mappings":";AAGA,OAAO,MAAM,MAAM,SAAS,CAAC;AAI7B,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAKrD,OAAO,EAIL,aAAa,EAMd,MAAM,SAAS,CAAC;AAGjB,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,WAAW,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,aAAa,CAAC;IAC3B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAEnB,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;IACrC,iBAAiB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;IAC3D,iBAAiB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,MAAM,GAAG,MAAM,CAAC;IAEpE,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACtF,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACpF,aAAa,EAAE,CACb,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,gBAAgB,EACzB,KAAK,EAAE,KAAK,KACT,OAAO,CAAC,IAAI,CAAC,CAAC;CACpB;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACnD;AAED,oBAAY,mBAAmB;IAC7B,8BAA8B,yCAAyC;IACvE,qBAAqB,0BAA0B;IAC/C,eAAe,oBAAoB;IACnC,yBAAyB,8BAA8B;IACvD,eAAe,oBAAoB;IACnC,iBAAiB,sBAAsB;IACvC,KAAK,UAAU;CAChB;AAGD,eAAO,MAAM,oCAAoC,EAAE,eA4BlD,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,eAMnC,CAAC;AAEF,eAAO,MAAM,uBAAuB,EAAE,eAarC,CAAC;AAEF,eAAO,MAAM,2BAA2B,EAAE,eAuBzC,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,eAcnC,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,eAezB,CAAC;AAEF,eAAO,MAAM,4BAA4B,EAAE,eAyB1C,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,eAAe,EAM9C,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,eAAe,EAAqD,CAAC"}
|
|
@@ -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.SampleActionSeq = exports.TemplateActionSeq = exports.fetchTemplateFromLocalAction = exports.unzipAction = exports.fetchZipFromUrlAction = exports.fetchUrlForHotfixOnlyAction = exports.downloadDirectoryAction = exports.fetchSampleInfoAction = exports.fetchTemplateZipFromSourceCodeAction = exports.GeneratorActionName = void 0;
|
|
6
6
|
const tslib_1 = require("tslib");
|
|
7
7
|
const adm_zip_1 = tslib_1.__importDefault(require("adm-zip"));
|
|
8
8
|
const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
|
|
@@ -11,10 +11,11 @@ const constants_1 = require("../../common/constants");
|
|
|
11
11
|
const folder_1 = require("../../folder");
|
|
12
12
|
const error_1 = require("./error");
|
|
13
13
|
const utils_1 = require("./utils");
|
|
14
|
+
const semver_1 = tslib_1.__importDefault(require("semver"));
|
|
14
15
|
var GeneratorActionName;
|
|
15
16
|
(function (GeneratorActionName) {
|
|
16
17
|
GeneratorActionName["FetchTemplateZipFromSourceCode"] = "FetchTemplateZipFromSourceCodeAction";
|
|
17
|
-
GeneratorActionName["
|
|
18
|
+
GeneratorActionName["FetchUrlForHotfixOnly"] = "FetchUrlForHotfixOnly";
|
|
18
19
|
GeneratorActionName["FetchZipFromUrl"] = "FetchZipFromUrl";
|
|
19
20
|
GeneratorActionName["FetchTemplateZipFromLocal"] = "FetchTemplateZipFromLocal";
|
|
20
21
|
GeneratorActionName["FetchSampleInfo"] = "FetchSampleInfo";
|
|
@@ -63,14 +64,24 @@ exports.downloadDirectoryAction = {
|
|
|
63
64
|
}
|
|
64
65
|
},
|
|
65
66
|
};
|
|
66
|
-
exports.
|
|
67
|
-
name: GeneratorActionName.
|
|
67
|
+
exports.fetchUrlForHotfixOnlyAction = {
|
|
68
|
+
name: GeneratorActionName.FetchUrlForHotfixOnly,
|
|
68
69
|
run: async (context) => {
|
|
69
|
-
if (context.zip || context.
|
|
70
|
+
if (context.zip || context.cancelDownloading) {
|
|
70
71
|
return;
|
|
71
72
|
}
|
|
72
73
|
context.logProvider.debug(`Fetching template url with tag: ${JSON.stringify(context)}`);
|
|
73
|
-
|
|
74
|
+
const latestTag = await utils_1.getTemplateLatestTag(context.language, context.tryLimits, context.timeoutInMs);
|
|
75
|
+
const localVer = utils_1.getTemplateLocalVersion();
|
|
76
|
+
const latestVer = latestTag.split("@")[1];
|
|
77
|
+
// git tag version is higher than the local version, download template from github
|
|
78
|
+
if (semver_1.default.gt(latestVer, localVer)) {
|
|
79
|
+
context.url = utils_1.getTemplateZipUrlByTag(context.language, latestTag);
|
|
80
|
+
}
|
|
81
|
+
else {
|
|
82
|
+
// generate template from fallback
|
|
83
|
+
context.cancelDownloading = true;
|
|
84
|
+
}
|
|
74
85
|
},
|
|
75
86
|
};
|
|
76
87
|
exports.fetchZipFromUrlAction = {
|
|
@@ -86,6 +97,16 @@ exports.fetchZipFromUrlAction = {
|
|
|
86
97
|
context.zip = await utils_1.fetchZipFromUrl(context.url, context.tryLimits, context.timeoutInMs);
|
|
87
98
|
},
|
|
88
99
|
};
|
|
100
|
+
exports.unzipAction = {
|
|
101
|
+
name: GeneratorActionName.Unzip,
|
|
102
|
+
run: async (context) => {
|
|
103
|
+
if (!context.zip) {
|
|
104
|
+
return;
|
|
105
|
+
}
|
|
106
|
+
context.logProvider.debug(`Unzipping: ${JSON.stringify(context)}`);
|
|
107
|
+
context.outputs = await utils_1.unzip(context.zip, context.destination, context.fileNameReplaceFn, context.fileDataReplaceFn, context.filterFn);
|
|
108
|
+
},
|
|
109
|
+
};
|
|
89
110
|
exports.fetchTemplateFromLocalAction = {
|
|
90
111
|
name: GeneratorActionName.FetchTemplateZipFromLocal,
|
|
91
112
|
run: async (context) => {
|
|
@@ -106,26 +127,12 @@ exports.fetchTemplateFromLocalAction = {
|
|
|
106
127
|
}
|
|
107
128
|
},
|
|
108
129
|
};
|
|
109
|
-
exports.unzipAction = {
|
|
110
|
-
name: GeneratorActionName.Unzip,
|
|
111
|
-
run: async (context) => {
|
|
112
|
-
if (!context.zip) {
|
|
113
|
-
return;
|
|
114
|
-
}
|
|
115
|
-
context.logProvider.debug(`Unzipping: ${JSON.stringify(context)}`);
|
|
116
|
-
context.outputs = await utils_1.unzip(context.zip, context.destination, context.fileNameReplaceFn, context.fileDataReplaceFn, context.filterFn);
|
|
117
|
-
},
|
|
118
|
-
};
|
|
119
130
|
exports.TemplateActionSeq = [
|
|
120
131
|
exports.fetchTemplateZipFromSourceCodeAction,
|
|
121
|
-
exports.
|
|
132
|
+
exports.fetchUrlForHotfixOnlyAction,
|
|
122
133
|
exports.fetchZipFromUrlAction,
|
|
123
134
|
exports.unzipAction,
|
|
124
135
|
exports.fetchTemplateFromLocalAction,
|
|
125
136
|
];
|
|
126
|
-
exports.SampleActionSeq = [exports.
|
|
127
|
-
exports.DownloadDirectoryActionSeq = [
|
|
128
|
-
exports.fetchSampleInfoAction,
|
|
129
|
-
exports.downloadDirectoryAction,
|
|
130
|
-
];
|
|
137
|
+
exports.SampleActionSeq = [exports.fetchSampleInfoAction, exports.downloadDirectoryAction];
|
|
131
138
|
//# sourceMappingURL=generatorAction.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generatorAction.js","sourceRoot":"","sources":["../../../src/component/generator/generatorAction.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,8DAA6B;AAC7B,gEAA0B;AAC1B,wDAAwB;AAIxB,sDAAyD;AACzD,yCAAkD;AAClD,mCAAmF;AACnF,
|
|
1
|
+
{"version":3,"file":"generatorAction.js","sourceRoot":"","sources":["../../../src/component/generator/generatorAction.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectProperties.d.ts","sourceRoot":"","sources":["../../../../../src/component/generator/officeAddin/config/projectProperties.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,iBAAiB
|
|
1
|
+
{"version":3,"file":"projectProperties.d.ts","sourceRoot":"","sources":["../../../../../src/component/generator/officeAddin/config/projectProperties.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAqC7B,CAAC"}
|
|
@@ -14,6 +14,7 @@ exports.projectProperties = {
|
|
|
14
14
|
repository: "https://github.com/OfficeDev/Office-Addin-TaskPane",
|
|
15
15
|
branch: "json-preview-yo-office",
|
|
16
16
|
prerelease: "json-preview-yo-office-prerelease",
|
|
17
|
+
archive: "https://aka.ms/teams-toolkit/office-addin-taskpane",
|
|
17
18
|
},
|
|
18
19
|
},
|
|
19
20
|
supportedHosts: ["Outlook"],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectProperties.js","sourceRoot":"","sources":["../../../../../src/component/generator/officeAddin/config/projectProperties.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAErB,QAAA,iBAAiB,GAAG;IAC/B,YAAY,EAAE;QACZ,QAAQ,EAAE;YACR,WAAW,EAAE,6BAA6B;YAC1C,MAAM,EAAE,8BAA8B;YACtC,YAAY,EAAE,eAAe;YAC7B,SAAS,EAAE;gBACT,UAAU,EAAE;oBACV,UAAU,EAAE,oDAAoD;oBAChE,MAAM,EAAE,wBAAwB;oBAChC,UAAU,EAAE,mCAAmC;
|
|
1
|
+
{"version":3,"file":"projectProperties.js","sourceRoot":"","sources":["../../../../../src/component/generator/officeAddin/config/projectProperties.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAErB,QAAA,iBAAiB,GAAG;IAC/B,YAAY,EAAE;QACZ,QAAQ,EAAE;YACR,WAAW,EAAE,6BAA6B;YAC1C,MAAM,EAAE,8BAA8B;YACtC,YAAY,EAAE,eAAe;YAC7B,SAAS,EAAE;gBACT,UAAU,EAAE;oBACV,UAAU,EAAE,oDAAoD;oBAChE,MAAM,EAAE,wBAAwB;oBAChC,UAAU,EAAE,mCAAmC;oBAC/C,OAAO,EAAE,oDAAoD;iBAC9D;aACF;YACD,cAAc,EAAE,CAAC,SAAS,CAAC;SAC5B;KACF;IACD,SAAS,EAAE;QACT,KAAK,EAAE;YACL,WAAW,EAAE,OAAO;SACrB;QACD,OAAO,EAAE;YACP,WAAW,EAAE,SAAS;SACvB;QACD,OAAO,EAAE;YACP,WAAW,EAAE,SAAS;SACvB;QACD,UAAU,EAAE;YACV,WAAW,EAAE,YAAY;SAC1B;QACD,OAAO,EAAE;YACP,WAAW,EAAE,SAAS;SACvB;QACD,IAAI,EAAE;YACJ,WAAW,EAAE,MAAM;SACpB;KACF;CACF,CAAC"}
|
|
@@ -12,9 +12,6 @@ export default class projectsJsonData {
|
|
|
12
12
|
getHostDisplayName(hostKey: string): string | undefined;
|
|
13
13
|
getProjectTemplateRepository(projectTypeKey: string, scriptType: string): string | undefined;
|
|
14
14
|
getProjectTemplateBranchName(projectTypeKey: string, scriptType: string, prerelease: boolean): string | undefined;
|
|
15
|
-
|
|
16
|
-
repo: string | undefined;
|
|
17
|
-
branch: string | undefined;
|
|
18
|
-
};
|
|
15
|
+
getProjectDownloadLink(projectTypeKey: string, scriptType: string): string;
|
|
19
16
|
}
|
|
20
17
|
//# sourceMappingURL=projectsJsonData.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectsJsonData.d.ts","sourceRoot":"","sources":["../../../../../src/component/generator/officeAddin/config/projectsJsonData.ts"],"names":[],"mappings":"AAMA,MAAM,CAAC,OAAO,OAAO,gBAAgB;IAEnC,eAAe,EAAE,GAAG,CAAC;;IAMrB,qBAAqB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM;IAIlD,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM;IAI9C,wBAAwB,IAAI,OAAO;IAInC,uBAAuB,IAAI,MAAM,EAAE;IAQnC,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO;IAOpD,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAIxD,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE;IAYnD,uBAAuB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE;IAiBtD,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IASvD,4BAA4B,CAAC,cAAc,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAa5F,4BAA4B,CAC1B,cAAc,EAAE,MAAM,EACtB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,OAAO,GAClB,MAAM,GAAG,SAAS;IAiBrB,
|
|
1
|
+
{"version":3,"file":"projectsJsonData.d.ts","sourceRoot":"","sources":["../../../../../src/component/generator/officeAddin/config/projectsJsonData.ts"],"names":[],"mappings":"AAMA,MAAM,CAAC,OAAO,OAAO,gBAAgB;IAEnC,eAAe,EAAE,GAAG,CAAC;;IAMrB,qBAAqB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM;IAIlD,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM;IAI9C,wBAAwB,IAAI,OAAO;IAInC,uBAAuB,IAAI,MAAM,EAAE;IAQnC,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO;IAOpD,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAIxD,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE;IAYnD,uBAAuB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE;IAiBtD,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IASvD,4BAA4B,CAAC,cAAc,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAa5F,4BAA4B,CAC1B,cAAc,EAAE,MAAM,EACtB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,OAAO,GAClB,MAAM,GAAG,SAAS;IAiBrB,sBAAsB,CAAC,cAAc,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM;CAK3E"}
|
|
@@ -98,17 +98,10 @@ class projectsJsonData {
|
|
|
98
98
|
}
|
|
99
99
|
return undefined;
|
|
100
100
|
}
|
|
101
|
-
|
|
101
|
+
getProjectDownloadLink(projectTypeKey, scriptType) {
|
|
102
102
|
scriptType = scriptType === "TypeScript" ? "typescript" : "javascript";
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
branch: null,
|
|
106
|
-
};
|
|
107
|
-
repoBranchInfo.repo = this.getProjectTemplateRepository(projectTypeKey, scriptType);
|
|
108
|
-
repoBranchInfo.branch = repoBranchInfo.repo
|
|
109
|
-
? this.getProjectTemplateBranchName(projectTypeKey, scriptType, prerelease)
|
|
110
|
-
: undefined;
|
|
111
|
-
return repoBranchInfo;
|
|
103
|
+
return this.projectJsonData.projectTypes[projectTypeKey].templates[scriptType]
|
|
104
|
+
.archive;
|
|
112
105
|
}
|
|
113
106
|
}
|
|
114
107
|
exports.default = projectsJsonData;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectsJsonData.js","sourceRoot":"","sources":["../../../../../src/component/generator/officeAddin/config/projectsJsonData.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"projectsJsonData.js","sourceRoot":"","sources":["../../../../../src/component/generator/officeAddin/config/projectsJsonData.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/officeAddin/generator.ts"],"names":[],"mappings":"AAGA;;GAEG;AAEH,OAAO,EACL,OAAO,EACP,MAAM,EACN,MAAM,EAKN,OAAO,EACR,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/officeAddin/generator.ts"],"names":[],"mappings":"AAGA;;GAEG;AAEH,OAAO,EACL,OAAO,EACP,MAAM,EACN,MAAM,EAKN,OAAO,EACR,MAAM,wBAAwB,CAAC;AAsBhC,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;WAoBlB,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;CAqEvC"}
|
|
@@ -14,7 +14,6 @@ const office_addin_manifest_1 = require("office-addin-manifest");
|
|
|
14
14
|
const projectsJsonData_1 = tslib_1.__importDefault(require("./config/projectsJsonData"));
|
|
15
15
|
const childProcess = tslib_1.__importStar(require("child_process"));
|
|
16
16
|
const util_1 = require("util");
|
|
17
|
-
const error_1 = require("../../../core/error");
|
|
18
17
|
const lodash_1 = tslib_1.__importDefault(require("lodash"));
|
|
19
18
|
const lib_1 = require("@feathersjs/hooks/lib");
|
|
20
19
|
const actionExecutionMW_1 = require("../../middleware/actionExecutionMW");
|
|
@@ -23,6 +22,7 @@ const office_addin_project_1 = require("office-addin-project");
|
|
|
23
22
|
const questionNames_1 = require("../../../question/questionNames");
|
|
24
23
|
const create_1 = require("../../../question/create");
|
|
25
24
|
const localizeUtils_1 = require("../../../common/localizeUtils");
|
|
25
|
+
const error_1 = require("../../../error");
|
|
26
26
|
const componentName = "office-addin";
|
|
27
27
|
const telemetryEvent = "generate";
|
|
28
28
|
const templateName = "office-addin";
|
|
@@ -56,10 +56,10 @@ class OfficeAddinGenerator {
|
|
|
56
56
|
if (!fromFolder) {
|
|
57
57
|
// from template
|
|
58
58
|
const jsonData = new projectsJsonData_1.default();
|
|
59
|
-
const
|
|
59
|
+
const projectLink = jsonData.getProjectDownloadLink(template, language);
|
|
60
60
|
// Copy project template files from project repository
|
|
61
|
-
if (
|
|
62
|
-
await helperMethods_1.HelperMethods.downloadProjectTemplateZipFile(addinRoot,
|
|
61
|
+
if (projectLink) {
|
|
62
|
+
await helperMethods_1.HelperMethods.downloadProjectTemplateZipFile(addinRoot, projectLink);
|
|
63
63
|
// Call 'convert-to-single-host' npm script in generated project, passing in host parameter
|
|
64
64
|
const cmdLine = `npm run convert-to-single-host --if-present -- ${lodash_1.default.toLower(host)}`;
|
|
65
65
|
await OfficeAddinGenerator.childProcessExec(cmdLine);
|
|
@@ -93,7 +93,7 @@ class OfficeAddinGenerator {
|
|
|
93
93
|
catch (e) {
|
|
94
94
|
process.chdir(workingDir);
|
|
95
95
|
await importProgress.end(false, true);
|
|
96
|
-
return teamsfx_api_1.err(error_1.
|
|
96
|
+
return teamsfx_api_1.err(error_1.assembleError(e));
|
|
97
97
|
}
|
|
98
98
|
}
|
|
99
99
|
}
|
|
@@ -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,wDASgC;AAChC,+BAA4B;AAC5B,mDAAgD;AAChD,iEAA4D;AAC5D,yFAAyD;AACzD,oEAA8C;AAC9C,+BAAiC;
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/component/generator/officeAddin/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
export declare class HelperMethods {
|
|
2
|
-
static downloadProjectTemplateZipFile(projectFolder: string, projectRepo: string
|
|
2
|
+
static downloadProjectTemplateZipFile(projectFolder: string, projectRepo: string): Promise<void>;
|
|
3
3
|
static unzipProjectTemplate(projectFolder: string): Promise<void>;
|
|
4
4
|
static moveUnzippedFiles(projectFolder: string): void;
|
|
5
5
|
static copyAddinFiles(fromFolder: string, toFolder: string): void;
|
|
6
6
|
static updateManifest(projectRoot: string, addinManifestPath: string): Promise<void>;
|
|
7
7
|
static moveManifestLocation(projectRoot: string, manifestRelativePath: string): Promise<void>;
|
|
8
8
|
}
|
|
9
|
+
export declare function unzipErrorHandler(projectFolder: string, reject: any, error: Error): void;
|
|
9
10
|
//# sourceMappingURL=helperMethods.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helperMethods.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/officeAddin/helperMethods.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"helperMethods.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/officeAddin/helperMethods.ts"],"names":[],"mappings":"AAiBA,qBAAa,aAAa;WACX,8BAA8B,CACzC,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,IAAI,CAAC;WAqCH,oBAAoB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBvE,MAAM,CAAC,iBAAiB,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI;IAoBrD,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;WAMpD,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;WAwB7E,oBAAoB,CAC/B,WAAW,EAAE,MAAM,EACnB,oBAAoB,EAAE,MAAM,GAC3B,OAAO,CAAC,IAAI,CAAC;CA2CjB;AAED,wBAAgB,iBAAiB,CAAC,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,GAAG,IAAI,CAKxF"}
|
|
@@ -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.HelperMethods = void 0;
|
|
5
|
+
exports.unzipErrorHandler = exports.HelperMethods = void 0;
|
|
6
6
|
const tslib_1 = require("tslib");
|
|
7
7
|
/**
|
|
8
8
|
* @author darrmill@microsoft.com, yefuwang@microsoft.com
|
|
@@ -14,19 +14,24 @@ const path = tslib_1.__importStar(require("path"));
|
|
|
14
14
|
const unzip = tslib_1.__importStar(require("unzipper"));
|
|
15
15
|
const ManifestUtils_1 = require("../../driver/teamsApp/utils/ManifestUtils");
|
|
16
16
|
const node_fetch_1 = tslib_1.__importDefault(require("node-fetch"));
|
|
17
|
+
const common_1 = require("../../../error/common");
|
|
17
18
|
const zipFile = "project.zip";
|
|
18
19
|
class HelperMethods {
|
|
19
|
-
static async downloadProjectTemplateZipFile(projectFolder, projectRepo
|
|
20
|
-
const projectTemplateZipFile =
|
|
21
|
-
|
|
20
|
+
static async downloadProjectTemplateZipFile(projectFolder, projectRepo) {
|
|
21
|
+
const projectTemplateZipFile = projectRepo;
|
|
22
|
+
let response;
|
|
23
|
+
try {
|
|
24
|
+
response = await node_fetch_1.default(projectTemplateZipFile, { method: "GET" });
|
|
25
|
+
}
|
|
26
|
+
catch (e) {
|
|
27
|
+
throw new common_1.AccessGithubError(projectTemplateZipFile, "OfficeAddinGenerator", e);
|
|
28
|
+
}
|
|
22
29
|
return new Promise((resolve, reject) => {
|
|
23
30
|
if (response.body) {
|
|
24
31
|
response.body
|
|
25
32
|
.pipe(fs_1.default.createWriteStream(path.resolve(projectFolder, zipFile)))
|
|
26
33
|
.on("error", (err) => {
|
|
27
|
-
reject(
|
|
28
|
-
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
|
|
29
|
-
`Unable to download project zip file for "${projectTemplateZipFile}".\n${err}`);
|
|
34
|
+
reject(new common_1.AccessGithubError(projectTemplateZipFile, "OfficeAddinGenerator", err));
|
|
30
35
|
})
|
|
31
36
|
.on("close", () => {
|
|
32
37
|
HelperMethods.unzipProjectTemplate(projectFolder)
|
|
@@ -39,7 +44,7 @@ class HelperMethods {
|
|
|
39
44
|
});
|
|
40
45
|
}
|
|
41
46
|
else {
|
|
42
|
-
reject(`Response body is null.`);
|
|
47
|
+
reject(new common_1.AccessGithubError(projectTemplateZipFile, "OfficeAddinGenerator", new Error(`Response body of GET "${projectTemplateZipFile}" is null.`)));
|
|
43
48
|
}
|
|
44
49
|
});
|
|
45
50
|
}
|
|
@@ -50,8 +55,7 @@ class HelperMethods {
|
|
|
50
55
|
readStream
|
|
51
56
|
.pipe(unzip.Extract({ path: projectFolder }))
|
|
52
57
|
.on("error", function (err) {
|
|
53
|
-
|
|
54
|
-
reject(`Unable to unzip project zip file for "${projectFolder}".\n${err}`);
|
|
58
|
+
unzipErrorHandler(projectFolder, reject, err);
|
|
55
59
|
})
|
|
56
60
|
.on("close", () => {
|
|
57
61
|
HelperMethods.moveUnzippedFiles(projectFolder);
|
|
@@ -135,4 +139,11 @@ class HelperMethods {
|
|
|
135
139
|
}
|
|
136
140
|
}
|
|
137
141
|
exports.HelperMethods = HelperMethods;
|
|
142
|
+
function unzipErrorHandler(projectFolder, reject, error) {
|
|
143
|
+
if (error.message) {
|
|
144
|
+
error.message = `Unable to unzip project zip file for "${projectFolder}", reason: ${error.message}`;
|
|
145
|
+
}
|
|
146
|
+
reject(new common_1.ReadFileError(error, "OfficeAddinGenerator"));
|
|
147
|
+
}
|
|
148
|
+
exports.unzipErrorHandler = unzipErrorHandler;
|
|
138
149
|
//# sourceMappingURL=helperMethods.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helperMethods.js","sourceRoot":"","sources":["../../../../src/component/generator/officeAddin/helperMethods.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC;;GAEG;AACH,wDAAkE;AAClE,oDAAoB;AACpB,gEAA2B;AAC3B,mDAA6B;AAC7B,wDAAkC;AAClC,6EAA0E;AAC1E,oEAA+B;
|
|
1
|
+
{"version":3,"file":"helperMethods.js","sourceRoot":"","sources":["../../../../src/component/generator/officeAddin/helperMethods.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,4 +12,5 @@ export declare function UpdateSPFxTemplateError(e: Error): UserError;
|
|
|
12
12
|
export declare function ImportSPFxSolutionError(e: Error): UserError;
|
|
13
13
|
export declare function PathAlreadyExistsError(path: string): UserError;
|
|
14
14
|
export declare function SolutionVersionMissingError(path: string): UserError;
|
|
15
|
+
export declare function CannotFindPropertyfromJsonError(field: string): UserError;
|
|
15
16
|
//# sourceMappingURL=error.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/spfx/error.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAIhE,wBAAgB,aAAa,CAAC,KAAK,EAAE,KAAK,GAAG,SAAS,GAAG,WAAW,CAUnE;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,KAAK,GAAG,WAAW,CAOzD;AAED,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,MAAM,GAAG,WAAW,CAOvE;AAED,wBAAgB,wBAAwB,IAAI,SAAS,CAQpD;AAED,wBAAgB,yBAAyB,IAAI,WAAW,CAgBvD;AAED,wBAAgB,gCAAgC,CAC9C,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,GACd,WAAW,CAmBb;AAED,wBAAgB,wBAAwB,IAAI,SAAS,CAcpD;AAED,wBAAgB,6BAA6B,CAAC,CAAC,EAAE,KAAK,GAAG,SAAS,CAQjE;AAED,wBAAgB,qBAAqB,IAAI,SAAS,CAQjD;AAED,wBAAgB,uBAAuB,CAAC,CAAC,EAAE,KAAK,GAAG,SAAS,CAQ3D;AAED,wBAAgB,uBAAuB,CAAC,CAAC,EAAE,KAAK,GAAG,SAAS,CAQ3D;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAO9D;AAED,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAOnE"}
|
|
1
|
+
{"version":3,"file":"error.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/spfx/error.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAIhE,wBAAgB,aAAa,CAAC,KAAK,EAAE,KAAK,GAAG,SAAS,GAAG,WAAW,CAUnE;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,KAAK,GAAG,WAAW,CAOzD;AAED,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,MAAM,GAAG,WAAW,CAOvE;AAED,wBAAgB,wBAAwB,IAAI,SAAS,CAQpD;AAED,wBAAgB,yBAAyB,IAAI,WAAW,CAgBvD;AAED,wBAAgB,gCAAgC,CAC9C,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,GACd,WAAW,CAmBb;AAED,wBAAgB,wBAAwB,IAAI,SAAS,CAcpD;AAED,wBAAgB,6BAA6B,CAAC,CAAC,EAAE,KAAK,GAAG,SAAS,CAQjE;AAED,wBAAgB,qBAAqB,IAAI,SAAS,CAQjD;AAED,wBAAgB,uBAAuB,CAAC,CAAC,EAAE,KAAK,GAAG,SAAS,CAQ3D;AAED,wBAAgB,uBAAuB,CAAC,CAAC,EAAE,KAAK,GAAG,SAAS,CAQ3D;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAO9D;AAED,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAOnE;AAED,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAQxE"}
|
|
@@ -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.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;
|
|
5
|
+
exports.CannotFindPropertyfromJsonError = exports.SolutionVersionMissingError = exports.PathAlreadyExistsError = exports.ImportSPFxSolutionError = exports.UpdateSPFxTemplateError = exports.RetrieveSPFxInfoError = exports.CopyExistingSPFxSolutionError = exports.YoGeneratorScaffoldError = exports.PackageTargetVersionInstallError = exports.LatestPackageInstallError = exports.DevEnvironmentSetupError = exports.DependencyValidateError = exports.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");
|
|
@@ -116,4 +116,14 @@ function SolutionVersionMissingError(path) {
|
|
|
116
116
|
});
|
|
117
117
|
}
|
|
118
118
|
exports.SolutionVersionMissingError = SolutionVersionMissingError;
|
|
119
|
+
function CannotFindPropertyfromJsonError(field) {
|
|
120
|
+
const message = `Cannot find property "${field}" from json.`;
|
|
121
|
+
return new teamsfx_api_1.UserError({
|
|
122
|
+
source: constants_1.Constants.PLUGIN_NAME,
|
|
123
|
+
name: "CannotFindPropertyfromJson",
|
|
124
|
+
message,
|
|
125
|
+
displayMessage: message, // This message won't be shown to users. No need to localize.
|
|
126
|
+
});
|
|
127
|
+
}
|
|
128
|
+
exports.CannotFindPropertyfromJsonError = CannotFindPropertyfromJsonError;
|
|
119
129
|
//# sourceMappingURL=error.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error.js","sourceRoot":"","sources":["../../../../src/component/generator/spfx/error.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"error.js","sourceRoot":"","sources":["../../../../src/component/generator/spfx/error.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,MAAM,EAMN,MAAM,EAIP,MAAM,wBAAwB,CAAC;AAahC,OAAO,EAAE,aAAa,EAAqB,MAAM,oCAAoC,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,MAAM,EAMN,MAAM,EAIP,MAAM,wBAAwB,CAAC;AAahC,OAAO,EAAE,aAAa,EAAqB,MAAM,oCAAoC,CAAC;AA0BtF,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;WAmMf,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;mBAsKlB,cAAc;CAyCpC"}
|
|
@@ -31,6 +31,8 @@ const create_1 = require("../../../question/create");
|
|
|
31
31
|
const telemetryEvents_1 = require("./utils/telemetryEvents");
|
|
32
32
|
const utils_1 = require("./utils/utils");
|
|
33
33
|
const semver_1 = tslib_1.__importDefault(require("semver"));
|
|
34
|
+
const jsonUtils_1 = require("../../../common/jsonUtils");
|
|
35
|
+
const telemetry_helper_1 = require("./utils/telemetry-helper");
|
|
34
36
|
class SPFxGenerator {
|
|
35
37
|
static async generate(context, inputs, destinationPath, actionContext) {
|
|
36
38
|
const spfxSolution = inputs[questionNames_1.QuestionNames.SPFxSolution];
|
|
@@ -85,6 +87,8 @@ class SPFxGenerator {
|
|
|
85
87
|
if (!context.templateVariables) {
|
|
86
88
|
context.templateVariables = generator_1.Generator.getDefaultVariables(inputs[questionNames_1.QuestionNames.AppName]);
|
|
87
89
|
}
|
|
90
|
+
const nodeVersion = await this.getNodeVersion(destSpfxFolder, context);
|
|
91
|
+
context.templateVariables["SpfxNodeVersion"] = nodeVersion;
|
|
88
92
|
context.templateVariables["componentId"] = webpartManifest["id"];
|
|
89
93
|
context.templateVariables["webpartName"] =
|
|
90
94
|
webpartManifest["preconfiguredEntries"][0].title.default;
|
|
@@ -227,6 +231,8 @@ class SPFxGenerator {
|
|
|
227
231
|
}
|
|
228
232
|
context.templateVariables["componentId"] = componentId;
|
|
229
233
|
context.templateVariables["webpartName"] = webpartName;
|
|
234
|
+
const nodeVersion = await this.getNodeVersion(newPath, context);
|
|
235
|
+
context.templateVariables["SpfxNodeVersion"] = nodeVersion;
|
|
230
236
|
}
|
|
231
237
|
// remove dataVersion() function, related issue: https://github.com/SharePoint/sp-dev-docs/issues/6469
|
|
232
238
|
const webpartFile = `${newPath}/src/webparts/${componentNameCamelCase}/${componentName}WebPart.ts`;
|
|
@@ -525,6 +531,33 @@ class SPFxGenerator {
|
|
|
525
531
|
throw error_2.UpdateSPFxTemplateError(e);
|
|
526
532
|
}
|
|
527
533
|
}
|
|
534
|
+
static async getNodeVersion(solutionPath, context) {
|
|
535
|
+
const packageJsonPath = path.join(solutionPath, constants_2.Constants.PACKAGE_JSON_FILE);
|
|
536
|
+
if (await fs_extra_1.default.pathExists(packageJsonPath)) {
|
|
537
|
+
const jsonContentRes = await jsonUtils_1.jsonUtils.readJSONFile(packageJsonPath);
|
|
538
|
+
if (jsonContentRes.isErr()) {
|
|
539
|
+
telemetry_helper_1.telemetryHelper.sendErrorEvent(context, telemetryEvents_1.TelemetryEvents.GetSpfxNodeVersionFailed, jsonContentRes.error);
|
|
540
|
+
}
|
|
541
|
+
else {
|
|
542
|
+
const packageJson = jsonContentRes.value;
|
|
543
|
+
if (!packageJson.engines) {
|
|
544
|
+
telemetry_helper_1.telemetryHelper.sendErrorEvent(context, telemetryEvents_1.TelemetryEvents.GetSpfxNodeVersionFailed, error_2.CannotFindPropertyfromJsonError("engines"));
|
|
545
|
+
}
|
|
546
|
+
else {
|
|
547
|
+
if (!packageJson.engines.node) {
|
|
548
|
+
telemetry_helper_1.telemetryHelper.sendErrorEvent(context, telemetryEvents_1.TelemetryEvents.GetSpfxNodeVersionFailed, error_2.CannotFindPropertyfromJsonError("engines.node"));
|
|
549
|
+
}
|
|
550
|
+
else {
|
|
551
|
+
return packageJson.engines.node;
|
|
552
|
+
}
|
|
553
|
+
}
|
|
554
|
+
}
|
|
555
|
+
}
|
|
556
|
+
else {
|
|
557
|
+
telemetry_helper_1.telemetryHelper.sendErrorEvent(context, telemetryEvents_1.TelemetryEvents.GetSpfxNodeVersionFailed, new error_1.FileNotFoundError(constants_2.Constants.PLUGIN_NAME, packageJsonPath));
|
|
558
|
+
}
|
|
559
|
+
return constants_2.Constants.DEFAULT_NODE_VERSION;
|
|
560
|
+
}
|
|
528
561
|
}
|
|
529
562
|
tslib_1.__decorate([
|
|
530
563
|
lib_1.hooks([
|