@microsoft/teamsfx-core 0.8.0 → 0.8.1-alpha.249dee5b.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/index.d.ts +1 -0
- package/build/common/index.d.ts.map +1 -1
- package/build/common/index.js +1 -0
- package/build/common/index.js.map +1 -1
- package/build/common/permissionInterface.d.ts +20 -0
- package/build/common/permissionInterface.d.ts.map +1 -1
- package/build/common/permissionInterface.js +8 -0
- package/build/common/permissionInterface.js.map +1 -1
- package/build/common/tools.d.ts +3 -1
- package/build/common/tools.d.ts.map +1 -1
- package/build/common/tools.js +14 -1
- package/build/common/tools.js.map +1 -1
- package/build/core/environment.d.ts +1 -0
- package/build/core/environment.d.ts.map +1 -1
- package/build/core/environment.js +13 -2
- package/build/core/environment.js.map +1 -1
- package/build/core/error.d.ts +4 -2
- package/build/core/error.d.ts.map +1 -1
- package/build/core/error.js +5 -3
- package/build/core/error.js.map +1 -1
- package/build/core/index.d.ts +6 -10
- package/build/core/index.d.ts.map +1 -1
- package/build/core/index.js +121 -98
- package/build/core/index.js.map +1 -1
- package/build/core/middleware/envInfoLoader.d.ts +1 -2
- package/build/core/middleware/envInfoLoader.d.ts.map +1 -1
- package/build/core/middleware/envInfoLoader.js +77 -60
- package/build/core/middleware/envInfoLoader.js.map +1 -1
- package/build/core/middleware/envInfoWriter.d.ts +1 -1
- package/build/core/middleware/envInfoWriter.d.ts.map +1 -1
- package/build/core/middleware/envInfoWriter.js +5 -5
- package/build/core/middleware/envInfoWriter.js.map +1 -1
- package/build/core/middleware/errorHandler.d.ts.map +1 -1
- package/build/core/middleware/errorHandler.js +2 -1
- package/build/core/middleware/errorHandler.js.map +1 -1
- package/build/core/middleware/projectMigrator.d.ts.map +1 -1
- package/build/core/middleware/projectMigrator.js +30 -3
- package/build/core/middleware/projectMigrator.js.map +1 -1
- package/build/core/middleware/projectSettingsLoader.js +1 -1
- package/build/core/middleware/projectSettingsLoader.js.map +1 -1
- package/build/core/middleware/questionModel.d.ts.map +1 -1
- package/build/core/middleware/questionModel.js +10 -10
- package/build/core/middleware/questionModel.js.map +1 -1
- package/build/plugins/resource/aad/index.d.ts +2 -2
- package/build/plugins/resource/aad/index.d.ts.map +1 -1
- package/build/plugins/resource/aad/index.js +4 -4
- package/build/plugins/resource/aad/index.js.map +1 -1
- package/build/plugins/resource/aad/plugin.d.ts +3 -2
- package/build/plugins/resource/aad/plugin.d.ts.map +1 -1
- package/build/plugins/resource/aad/plugin.js +4 -4
- package/build/plugins/resource/aad/plugin.js.map +1 -1
- package/build/plugins/resource/aad/utils/configs.d.ts +0 -1
- package/build/plugins/resource/aad/utils/configs.d.ts.map +1 -1
- package/build/plugins/resource/aad/utils/configs.js +1 -11
- package/build/plugins/resource/aad/utils/configs.js.map +1 -1
- package/build/plugins/resource/aad/utils/tokenProvider.d.ts.map +1 -1
- package/build/plugins/resource/aad/utils/tokenProvider.js +1 -1
- package/build/plugins/resource/aad/utils/tokenProvider.js.map +1 -1
- package/build/plugins/resource/aad/v2/index.d.ts +1 -1
- package/build/plugins/resource/aad/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/aad/v2/index.js +2 -2
- package/build/plugins/resource/aad/v2/index.js.map +1 -1
- package/build/plugins/resource/apim/v2/index.d.ts +4 -2
- package/build/plugins/resource/apim/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/apim/v2/index.js +21 -23
- package/build/plugins/resource/apim/v2/index.js.map +1 -1
- package/build/plugins/resource/appstudio/errors.d.ts +1 -1
- package/build/plugins/resource/appstudio/errors.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/errors.js +5 -1
- package/build/plugins/resource/appstudio/errors.js.map +1 -1
- package/build/plugins/resource/appstudio/index.d.ts +2 -2
- package/build/plugins/resource/appstudio/index.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/index.js +6 -5
- package/build/plugins/resource/appstudio/index.js.map +1 -1
- package/build/plugins/resource/appstudio/interfaces/IAppDefinition.d.ts +1 -0
- package/build/plugins/resource/appstudio/interfaces/IAppDefinition.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/plugin.d.ts +3 -3
- package/build/plugins/resource/appstudio/plugin.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/plugin.js +21 -45
- package/build/plugins/resource/appstudio/plugin.js.map +1 -1
- package/build/plugins/resource/appstudio/utils/telemetry.d.ts +2 -1
- package/build/plugins/resource/appstudio/utils/telemetry.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/utils/telemetry.js +1 -0
- package/build/plugins/resource/appstudio/utils/telemetry.js.map +1 -1
- package/build/plugins/resource/appstudio/v2/index.d.ts +5 -5
- package/build/plugins/resource/appstudio/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/v2/index.js +17 -17
- package/build/plugins/resource/appstudio/v2/index.js.map +1 -1
- package/build/plugins/resource/bot/v2/index.d.ts +2 -2
- package/build/plugins/resource/bot/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/bot/v2/index.js +3 -3
- package/build/plugins/resource/bot/v2/index.js.map +1 -1
- package/build/plugins/resource/frontend/v2/index.d.ts +2 -1
- package/build/plugins/resource/frontend/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/frontend/v2/index.js +3 -0
- package/build/plugins/resource/frontend/v2/index.js.map +1 -1
- package/build/plugins/resource/function/v2/index.d.ts +4 -3
- package/build/plugins/resource/function/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/function/v2/index.js +5 -13
- package/build/plugins/resource/function/v2/index.js.map +1 -1
- package/build/plugins/resource/identity/index.d.ts +2 -0
- package/build/plugins/resource/identity/index.d.ts.map +1 -1
- package/build/plugins/resource/identity/index.js +14 -6
- package/build/plugins/resource/identity/index.js.map +1 -1
- package/build/plugins/resource/identity/utils/contextUtils.d.ts +1 -3
- package/build/plugins/resource/identity/utils/contextUtils.d.ts.map +1 -1
- package/build/plugins/resource/identity/utils/contextUtils.js +2 -5
- package/build/plugins/resource/identity/utils/contextUtils.js.map +1 -1
- package/build/plugins/resource/localdebug/constants.d.ts +4 -0
- package/build/plugins/resource/localdebug/constants.d.ts.map +1 -1
- package/build/plugins/resource/localdebug/constants.js +6 -1
- package/build/plugins/resource/localdebug/constants.js.map +1 -1
- package/build/plugins/resource/localdebug/index.d.ts.map +1 -1
- package/build/plugins/resource/localdebug/index.js +8 -5
- package/build/plugins/resource/localdebug/index.js.map +1 -1
- package/build/plugins/resource/localdebug/v2/index.d.ts +2 -2
- package/build/plugins/resource/localdebug/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/localdebug/v2/index.js +2 -2
- package/build/plugins/resource/localdebug/v2/index.js.map +1 -1
- package/build/plugins/resource/sql/config.d.ts +1 -0
- package/build/plugins/resource/sql/config.d.ts.map +1 -1
- package/build/plugins/resource/sql/config.js +1 -0
- package/build/plugins/resource/sql/config.js.map +1 -1
- package/build/plugins/resource/sql/constants.d.ts +3 -0
- package/build/plugins/resource/sql/constants.d.ts.map +1 -1
- package/build/plugins/resource/sql/constants.js +3 -0
- package/build/plugins/resource/sql/constants.js.map +1 -1
- package/build/plugins/resource/sql/errors.d.ts +4 -0
- package/build/plugins/resource/sql/errors.d.ts.map +1 -1
- package/build/plugins/resource/sql/errors.js +4 -0
- package/build/plugins/resource/sql/errors.js.map +1 -1
- package/build/plugins/resource/sql/plugin.d.ts +4 -1
- package/build/plugins/resource/sql/plugin.d.ts.map +1 -1
- package/build/plugins/resource/sql/plugin.js +62 -16
- package/build/plugins/resource/sql/plugin.js.map +1 -1
- package/build/plugins/resource/sql/utils/contextUtils.d.ts +1 -3
- package/build/plugins/resource/sql/utils/contextUtils.d.ts.map +1 -1
- package/build/plugins/resource/sql/utils/contextUtils.js +2 -5
- package/build/plugins/resource/sql/utils/contextUtils.js.map +1 -1
- package/build/plugins/resource/sql/v2/index.d.ts +3 -2
- package/build/plugins/resource/sql/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/sql/v2/index.js +14 -12
- package/build/plugins/resource/sql/v2/index.js.map +1 -1
- package/build/plugins/resource/utils4v2.d.ts +5 -3
- package/build/plugins/resource/utils4v2.d.ts.map +1 -1
- package/build/plugins/resource/utils4v2.js +38 -7
- package/build/plugins/resource/utils4v2.js.map +1 -1
- package/build/plugins/solution/fx-solution/ResourcePluginContainer.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/ResourcePluginContainer.js +4 -2
- package/build/plugins/solution/fx-solution/ResourcePluginContainer.js.map +1 -1
- package/build/plugins/solution/fx-solution/arm.d.ts +0 -1
- package/build/plugins/solution/fx-solution/arm.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/arm.js +2 -6
- package/build/plugins/solution/fx-solution/arm.js.map +1 -1
- package/build/plugins/solution/fx-solution/commonQuestions.d.ts +2 -2
- package/build/plugins/solution/fx-solution/commonQuestions.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/commonQuestions.js +46 -29
- package/build/plugins/solution/fx-solution/commonQuestions.js.map +1 -1
- package/build/plugins/solution/fx-solution/constants.d.ts +3 -6
- package/build/plugins/solution/fx-solution/constants.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/constants.js +3 -6
- package/build/plugins/solution/fx-solution/constants.js.map +1 -1
- package/build/plugins/solution/fx-solution/executor.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/executor.js +39 -21
- package/build/plugins/solution/fx-solution/executor.js.map +1 -1
- package/build/plugins/solution/fx-solution/index.d.ts +1 -0
- package/build/plugins/solution/fx-solution/index.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/index.js +1 -0
- package/build/plugins/solution/fx-solution/index.js.map +1 -1
- package/build/plugins/solution/fx-solution/solution.d.ts +6 -5
- package/build/plugins/solution/fx-solution/solution.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/solution.js +226 -119
- package/build/plugins/solution/fx-solution/solution.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/createEnv.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/createEnv.js +11 -1
- package/build/plugins/solution/fx-solution/v2/createEnv.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/executeUserTask.d.ts +2 -2
- package/build/plugins/solution/fx-solution/v2/executeUserTask.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/executeUserTask.js +23 -10
- package/build/plugins/solution/fx-solution/v2/executeUserTask.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/executor.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/executor.js +9 -1
- package/build/plugins/solution/fx-solution/v2/executor.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/generateResourceTemplate.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/generateResourceTemplate.js +8 -2
- package/build/plugins/solution/fx-solution/v2/generateResourceTemplate.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/getQuestions.d.ts +5 -1
- package/build/plugins/solution/fx-solution/v2/getQuestions.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/getQuestions.js +287 -1
- package/build/plugins/solution/fx-solution/v2/getQuestions.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/package.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/package.js +2 -1
- package/build/plugins/solution/fx-solution/v2/package.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/provision.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/provision.js +4 -12
- package/build/plugins/solution/fx-solution/v2/provision.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/provisionLocal.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/provisionLocal.js +2 -1
- package/build/plugins/solution/fx-solution/v2/provisionLocal.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/publish.d.ts +2 -2
- package/build/plugins/solution/fx-solution/v2/publish.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/publish.js +9 -9
- package/build/plugins/solution/fx-solution/v2/publish.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/scaffolding.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/scaffolding.js +4 -0
- package/build/plugins/solution/fx-solution/v2/scaffolding.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/solution.d.ts +6 -4
- package/build/plugins/solution/fx-solution/v2/solution.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/solution.js +2 -0
- package/build/plugins/solution/fx-solution/v2/solution.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/utils.d.ts +1 -0
- package/build/plugins/solution/fx-solution/v2/utils.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/utils.js +5 -1
- package/build/plugins/solution/fx-solution/v2/utils.js.map +1 -1
- package/package.json +3 -3
- package/resource/strings.json +2 -2
- package/templates/plugins/resource/bot/bot-msgext.js.default.zip +0 -0
- package/templates/plugins/resource/bot/bot-msgext.ts.default.zip +0 -0
- package/templates/plugins/resource/bot/bot.js.default.zip +0 -0
- package/templates/plugins/resource/bot/bot.ts.default.zip +0 -0
- package/templates/plugins/resource/bot/msgext.js.default.zip +0 -0
- package/templates/plugins/resource/bot/msgext.ts.default.zip +0 -0
- package/templates/plugins/resource/frontend/tab.js.default.zip +0 -0
- package/templates/plugins/resource/frontend/tab.ts.default.zip +0 -0
- package/templates/plugins/resource/function/function-base.js.default.zip +0 -0
- package/templates/plugins/resource/function/function-base.ts.default.zip +0 -0
- package/templates/plugins/resource/function/function-triggers.js.HTTPTrigger.zip +0 -0
- package/templates/plugins/resource/function/function-triggers.ts.HTTPTrigger.zip +0 -0
- package/templates/plugins/resource/sql/bicep/output.template.bicep +1 -0
- package/templates/plugins/resource/sql/bicep/sql.template.bicep +3 -2
|
@@ -3,19 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.publishApplication = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
6
|
+
const lodash_1 = require("lodash");
|
|
7
|
+
const util = tslib_1.__importStar(require("util"));
|
|
8
|
+
const constants_1 = require("../../../../common/constants");
|
|
6
9
|
const tools_1 = require("../../../../common/tools");
|
|
10
|
+
const constants_2 = require("../constants");
|
|
7
11
|
const executor_1 = require("./executor");
|
|
8
12
|
const utils_1 = require("./utils");
|
|
9
|
-
|
|
10
|
-
const util = tslib_1.__importStar(require("util"));
|
|
11
|
-
const lodash_1 = require("lodash");
|
|
12
|
-
const constants_2 = require("../../../../common/constants");
|
|
13
|
-
async function publishApplication(ctx, inputs, provisionInputConfig, provisionOutputs, tokenProvider) {
|
|
13
|
+
async function publishApplication(ctx, inputs, envInfo, tokenProvider) {
|
|
14
14
|
var _a;
|
|
15
15
|
const inAzureProject = utils_1.isAzureProject(utils_1.getAzureSolutionSettings(ctx));
|
|
16
|
-
const provisioned =
|
|
16
|
+
const provisioned = envInfo.profile[constants_2.GLOBAL_CONFIG][constants_2.SOLUTION_PROVISION_SUCCEEDED];
|
|
17
17
|
if (inAzureProject && !provisioned) {
|
|
18
|
-
return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error(util.format(tools_1.getStrings().solution.NotProvisionedNotice, ctx.projectSetting.appName)), "Solution",
|
|
18
|
+
return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error(util.format(tools_1.getStrings().solution.NotProvisionedNotice, ctx.projectSetting.appName)), "Solution", constants_2.SolutionError.CannotDeployBeforeProvision));
|
|
19
19
|
}
|
|
20
20
|
const plugins = utils_1.getSelectedPlugins(utils_1.getAzureSolutionSettings(ctx));
|
|
21
21
|
const thunks = plugins
|
|
@@ -25,10 +25,10 @@ async function publishApplication(ctx, inputs, provisionInputConfig, provisionOu
|
|
|
25
25
|
pluginName: `${plugin.name}`,
|
|
26
26
|
taskName: "publishApplication",
|
|
27
27
|
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
28
|
-
thunk: () => plugin.publishApplication(ctx, inputs,
|
|
28
|
+
thunk: () => plugin.publishApplication(ctx, inputs, envInfo, tokenProvider),
|
|
29
29
|
};
|
|
30
30
|
});
|
|
31
|
-
ctx.logProvider.info(util.format(tools_1.getStrings().solution.PublishStartNotice,
|
|
31
|
+
ctx.logProvider.info(util.format(tools_1.getStrings().solution.PublishStartNotice, constants_1.PluginDisplayName.Solution));
|
|
32
32
|
const result = await executor_1.executeConcurrently(thunks, ctx.logProvider);
|
|
33
33
|
if (result.kind !== "success") {
|
|
34
34
|
const msg = util.format(tools_1.getStrings().solution.PublishFailNotice, ctx.projectSetting.appName);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publish.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/publish.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"publish.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/publish.ts"],"names":[],"mappings":";;;;AAAA,wDAUgC;AAChC,mCAAqC;AACrC,mDAA6B;AAC7B,4DAAiE;AACjE,oDAAsD;AACtD,4CAA0F;AAC1F,yCAAiD;AACjD,mCAAuF;AAEhF,KAAK,UAAU,kBAAkB,CACtC,GAAe,EACf,MAAc,EACd,OAAqB,EACrB,aAAqC;;IAErC,MAAM,cAAc,GAAG,sBAAc,CAAC,gCAAwB,CAAC,GAAG,CAAC,CAAC,CAAC;IACrE,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,yBAAa,CAAC,CAAC,wCAA4B,CAAC,CAAC;IAEjF,IAAI,cAAc,IAAI,CAAC,WAAW,EAAE;QAClC,OAAO,iBAAG,CACR,6BAAe,CACb,IAAI,KAAK,CACP,IAAI,CAAC,MAAM,CAAC,kBAAU,EAAE,CAAC,QAAQ,CAAC,oBAAoB,EAAE,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,CACpF,EACD,UAAU,EACV,yBAAa,CAAC,2BAA2B,CAC1C,CACF,CAAC;KACH;IAED,MAAM,OAAO,GAAG,0BAAkB,CAAC,gCAAwB,CAAC,GAAG,CAAC,CAAC,CAAC;IAClE,MAAM,MAAM,GAAG,OAAO;SACnB,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,oBAAW,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;SAC3D,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QACd,OAAO;YACL,UAAU,EAAE,GAAG,MAAM,CAAC,IAAI,EAAE;YAC5B,QAAQ,EAAE,oBAAoB;YAC9B,oEAAoE;YACpE,KAAK,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,kBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,CAAC;SAC7E,CAAC;IACJ,CAAC,CAAC,CAAC;IAEL,GAAG,CAAC,WAAW,CAAC,IAAI,CAClB,IAAI,CAAC,MAAM,CAAC,kBAAU,EAAE,CAAC,QAAQ,CAAC,kBAAkB,EAAE,6BAAiB,CAAC,QAAQ,CAAC,CAClF,CAAC;IAEF,MAAM,MAAM,GAAG,MAAM,8BAAmB,CAAC,MAAM,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC;IAElE,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE;QAC7B,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,kBAAU,EAAE,CAAC,QAAQ,CAAC,iBAAiB,EAAE,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAC7F,MAAA,GAAG,CAAC,WAAW,0CAAE,IAAI,CAAC,GAAG,CAAC,CAAC;QAC3B,OAAO,iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;KAC1B;IACD,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AA7CD,gDA6CC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scaffolding.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/scaffolding.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,MAAM,EAGN,IAAI,EAEL,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"scaffolding.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/scaffolding.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,MAAM,EAGN,IAAI,EAEL,MAAM,wBAAwB,CAAC;AAsBhC,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA0ChC;AAED,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,EAAE,CAAC,cAAc,EAAE,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAkChC;AAED,wBAAsB,8BAA8B,CAClD,YAAY,EAAE,MAAM,EAAE,EACtB,cAAc,EAAE,MAAM,EAAE,EACxB,WAAW,EAAE,MAAM,EACnB,aAAa,CAAC,EAAE,OAAO,GACtB,OAAO,CAAC,IAAI,CAAC,CAmCf"}
|
|
@@ -16,6 +16,10 @@ async function scaffoldSourceCode(ctx, inputs) {
|
|
|
16
16
|
if (blockResult.isErr()) {
|
|
17
17
|
return teamsfx_api_1.err(blockResult.error);
|
|
18
18
|
}
|
|
19
|
+
const lang = inputs[question_1.AzureSolutionQuestionNames.ProgrammingLanguage];
|
|
20
|
+
if (lang) {
|
|
21
|
+
ctx.projectSetting.programmingLanguage = lang;
|
|
22
|
+
}
|
|
19
23
|
const solutionSettings = utils_1.getAzureSolutionSettings(ctx);
|
|
20
24
|
const fillinRes = utils_1.fillInSolutionSettings(solutionSettings, inputs);
|
|
21
25
|
if (fillinRes.isErr())
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scaffolding.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/scaffolding.ts"],"names":[],"mappings":";;;;AAAA,wDASgC;AAChC,oDAAyE;AACzE,
|
|
1
|
+
{"version":3,"file":"scaffolding.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/scaffolding.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { EnvInfoV2 } from "@microsoft/teamsfx-api/build/v2";
|
|
1
|
+
import { AppStudioTokenProvider, AzureAccountProvider, Func, FxError, Inputs, Json, QTreeNode, Result, TokenProvider, v2, Void } from "@microsoft/teamsfx-api";
|
|
2
|
+
import { DeepReadonly, EnvInfoV2 } from "@microsoft/teamsfx-api/build/v2";
|
|
3
3
|
export declare class TeamsAppSolutionV2 implements v2.SolutionPlugin {
|
|
4
4
|
name: string;
|
|
5
5
|
displayName: string;
|
|
@@ -7,10 +7,12 @@ export declare class TeamsAppSolutionV2 implements v2.SolutionPlugin {
|
|
|
7
7
|
generateResourceTemplate: (ctx: v2.Context, inputs: Inputs) => Promise<Result<Json, FxError>>;
|
|
8
8
|
provisionResources: (ctx: v2.Context, inputs: Inputs, envInfo: EnvInfoV2, tokenProvider: TokenProvider) => Promise<v2.FxResult<v2.SolutionProvisionOutput, FxError>>;
|
|
9
9
|
deploy?: (ctx: v2.Context, inputs: Inputs, provisionOutputs: Json, tokenProvider: AzureAccountProvider) => Promise<Result<Void, FxError>>;
|
|
10
|
-
publishApplication: (ctx: v2.Context, inputs: Inputs,
|
|
10
|
+
publishApplication: (ctx: v2.Context, inputs: Inputs, envInfo: v2.EnvInfoV2, tokenProvider: AppStudioTokenProvider) => Promise<Result<Void, FxError>>;
|
|
11
11
|
provisionLocalResource?: (ctx: v2.Context, inputs: Inputs, localSettings: Json, tokenProvider: TokenProvider) => Promise<v2.FxResult<Json, FxError>>;
|
|
12
12
|
getQuestionsForScaffolding?: (ctx: v2.Context, inputs: Inputs) => Promise<Result<QTreeNode | undefined, FxError>>;
|
|
13
|
-
executeUserTask?: (ctx: v2.Context, inputs: Inputs, func: Func, tokenProvider: TokenProvider) => Promise<Result<unknown, FxError>>;
|
|
13
|
+
executeUserTask?: (ctx: v2.Context, inputs: Inputs, func: Func, envInfo: EnvInfoV2, tokenProvider: TokenProvider) => Promise<Result<unknown, FxError>>;
|
|
14
14
|
createEnv?: (ctx: v2.Context, inputs: Inputs) => Promise<Result<Void, FxError>>;
|
|
15
|
+
getQuestions?: (ctx: v2.Context, inputs: Inputs, envInfo: DeepReadonly<EnvInfoV2>, tokenProvider: TokenProvider) => Promise<Result<QTreeNode | undefined, FxError>>;
|
|
16
|
+
getQuestionsForUserTask?: (ctx: v2.Context, inputs: Inputs, func: Func, envInfo: DeepReadonly<EnvInfoV2>, tokenProvider: TokenProvider) => Promise<Result<QTreeNode | undefined, FxError>>;
|
|
15
17
|
}
|
|
16
18
|
//# sourceMappingURL=solution.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"solution.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/solution.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,
|
|
1
|
+
{"version":3,"file":"solution.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/solution.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,sBAAsB,EACtB,oBAAoB,EACpB,IAAI,EACJ,OAAO,EACP,MAAM,EACN,IAAI,EACJ,SAAS,EACT,MAAM,EACN,aAAa,EACb,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAc1E,qBACa,kBAAmB,YAAW,EAAE,CAAC,cAAc;IAC1D,IAAI,SAAuB;IAC3B,WAAW,EAAE,MAAM,CAA8B;IAEjD,kBAAkB,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAClE;IACrB,wBAAwB,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAClE;IAE3B,kBAAkB,EAAE,CAClB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,SAAS,EAClB,aAAa,EAAE,aAAa,KACzB,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,uBAAuB,EAAE,OAAO,CAAC,CAAC,CAAqB;IAEnF,MAAM,CAAC,EAAE,CACP,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,gBAAgB,EAAE,IAAI,EACtB,aAAa,EAAE,oBAAoB,KAChC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAU;IAE7C,kBAAkB,EAAE,CAClB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,sBAAsB,KAClC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAsB;IACzD,sBAAsB,CAAC,EAAE,CACvB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,EACnB,aAAa,EAAE,aAAa,KACzB,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAA0B;IAElE,0BAA0B,CAAC,EAAE,CAC3B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,KACX,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAA8B;IAElF,eAAe,CAAC,EAAE,CAChB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,SAAS,EAClB,aAAa,EAAE,aAAa,KACzB,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAmB;IAEzD,SAAS,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAa;IAE5F,YAAY,CAAC,EAAE,CACb,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,YAAY,CAAC,SAAS,CAAC,EAChC,aAAa,EAAE,aAAa,KACzB,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAAgB;IAEpE,uBAAuB,CAAC,EAAE,CACxB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,YAAY,CAAC,SAAS,CAAC,EAChC,aAAa,EAAE,aAAa,KACzB,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAA2B;CAChF"}
|
|
@@ -27,6 +27,8 @@ let TeamsAppSolutionV2 = class TeamsAppSolutionV2 {
|
|
|
27
27
|
this.getQuestionsForScaffolding = getQuestions_1.getQuestionsForScaffolding;
|
|
28
28
|
this.executeUserTask = executeUserTask_1.executeUserTask;
|
|
29
29
|
this.createEnv = createEnv_1.createEnv;
|
|
30
|
+
this.getQuestions = getQuestions_1.getQuestions;
|
|
31
|
+
this.getQuestionsForUserTask = getQuestions_1.getQuestionsForUserTask;
|
|
30
32
|
}
|
|
31
33
|
};
|
|
32
34
|
TeamsAppSolutionV2 = tslib_1.__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"solution.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/solution.ts"],"names":[],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"solution.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/solution.ts"],"names":[],"mappings":";;;;AAcA,mCAAiC;AACjC,4DAAiE;AACjE,sFAA6E;AAC7E,2CAAwC;AACxC,qCAAkC;AAClC,uDAAoD;AACpD,yEAAsE;AACtE,iDAAmG;AACnG,2CAAgD;AAChD,qDAA0D;AAC1D,uCAA+C;AAC/C,+CAAmD;AAGnD,IAAa,kBAAkB,GAA/B,MAAa,kBAAkB;IAA/B;QACE,SAAI,GAAG,mBAAmB,CAAC;QAC3B,gBAAW,GAAW,6BAAiB,CAAC,QAAQ,CAAC;QAEjD,uBAAkB,GAChB,gCAAkB,CAAC;QACrB,6BAAwB,GACtB,mDAAwB,CAAC;QAE3B,uBAAkB,GAK+C,6BAAiB,CAAC;QAEnF,WAAM,GAKgC,eAAM,CAAC;QAE7C,uBAAkB,GAKoB,4BAAkB,CAAC;QACzD,2BAAsB,GAKqB,uCAAsB,CAAC;QAElE,+BAA0B,GAG6B,yCAA0B,CAAC;QAElF,oBAAe,GAM0B,iCAAe,CAAC;QAEzD,cAAS,GAAyE,qBAAS,CAAC;QAE5F,iBAAY,GAK2C,2BAAY,CAAC;QAEpE,4BAAuB,GAMgC,sCAAuB,CAAC;IACjF,CAAC;CAAA,CAAA;AAjEY,kBAAkB;IAD9B,gBAAO,CAAC,2CAAiB,CAAC,oBAAoB,CAAC;GACnC,kBAAkB,CAiE9B;AAjEY,gDAAkB"}
|
|
@@ -13,4 +13,5 @@ export declare function parseTeamsAppTenantId(appStudioToken?: Record<string, un
|
|
|
13
13
|
export declare function loadTeamsAppTenantIdForLocal(localSettings: v2.LocalSettings, appStudioToken?: Record<string, unknown>): Result<Void, FxError>;
|
|
14
14
|
export declare function blockV1Project(solutionSettings?: SolutionSettings): Result<Void, FxError>;
|
|
15
15
|
export declare function fillInSolutionSettings(solutionSettings: AzureSolutionSettings, answers: Inputs): Result<Void, FxError>;
|
|
16
|
+
export declare function checkWetherProvisionSucceeded(config: Json): boolean;
|
|
16
17
|
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,MAAM,EAGN,qBAAqB,EACrB,IAAI,EAEJ,yBAAyB,EAEzB,gBAAgB,EAChB,IAAI,EACL,MAAM,wBAAwB,CAAC;AAehC,wBAAgB,kBAAkB,CAAC,aAAa,EAAE,qBAAqB,GAAG,EAAE,CAAC,cAAc,EAAE,CAI5F;AAED,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,GAAG,qBAAqB,CAE/E;AAED,wBAAgB,cAAc,CAAC,aAAa,EAAE,qBAAqB,GAAG,OAAO,CAE5E;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,CAAC,CAAA;CAAE,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAO3F;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC,cAAc,CAQrE;AAED,wBAAgB,eAAe,CAAC,gBAAgB,EAAE,qBAAqB,GAAG,EAAE,CAAC,cAAc,EAAE,CAI5F;AAED,wBAAsB,uBAAuB,CAC3C,gBAAgB,EAAE,qBAAqB,EACvC,yBAAyB,CAAC,EAAE,yBAAyB,GACpD,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAqBhC;AAED,wBAAgB,qBAAqB,CACnC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACvC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CA0BzB;AAGD,wBAAgB,4BAA4B,CAC1C,aAAa,EAAE,EAAE,CAAC,aAAa,EAC/B,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACvC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAOvB;AAGD,wBAAgB,cAAc,CAAC,gBAAgB,CAAC,EAAE,gBAAgB,GAAG,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAWzF;AAED,wBAAgB,sBAAsB,CACpC,gBAAgB,EAAE,qBAAqB,EACvC,OAAO,EAAE,MAAM,GACd,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAgCvB"}
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,MAAM,EAGN,qBAAqB,EACrB,IAAI,EAEJ,yBAAyB,EAEzB,gBAAgB,EAChB,IAAI,EACL,MAAM,wBAAwB,CAAC;AAehC,wBAAgB,kBAAkB,CAAC,aAAa,EAAE,qBAAqB,GAAG,EAAE,CAAC,cAAc,EAAE,CAI5F;AAED,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,GAAG,qBAAqB,CAE/E;AAED,wBAAgB,cAAc,CAAC,aAAa,EAAE,qBAAqB,GAAG,OAAO,CAE5E;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,CAAC,CAAA;CAAE,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAO3F;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC,cAAc,CAQrE;AAED,wBAAgB,eAAe,CAAC,gBAAgB,EAAE,qBAAqB,GAAG,EAAE,CAAC,cAAc,EAAE,CAI5F;AAED,wBAAsB,uBAAuB,CAC3C,gBAAgB,EAAE,qBAAqB,EACvC,yBAAyB,CAAC,EAAE,yBAAyB,GACpD,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAqBhC;AAED,wBAAgB,qBAAqB,CACnC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACvC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CA0BzB;AAGD,wBAAgB,4BAA4B,CAC1C,aAAa,EAAE,EAAE,CAAC,aAAa,EAC/B,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACvC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAOvB;AAGD,wBAAgB,cAAc,CAAC,gBAAgB,CAAC,EAAE,gBAAgB,GAAG,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAWzF;AAED,wBAAgB,sBAAsB,CACpC,gBAAgB,EAAE,qBAAqB,EACvC,OAAO,EAAE,MAAM,GACd,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAgCvB;AAED,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,IAAI,GAAG,OAAO,CAEnE"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.fillInSolutionSettings = exports.blockV1Project = exports.loadTeamsAppTenantIdForLocal = exports.parseTeamsAppTenantId = exports.ensurePermissionRequest = exports.reloadV2Plugins = exports.extractSolutionInputs = exports.combineRecords = exports.isAzureProject = exports.getAzureSolutionSettings = exports.getSelectedPlugins = void 0;
|
|
3
|
+
exports.checkWetherProvisionSucceeded = exports.fillInSolutionSettings = exports.blockV1Project = exports.loadTeamsAppTenantIdForLocal = exports.parseTeamsAppTenantId = exports.ensurePermissionRequest = exports.reloadV2Plugins = exports.extractSolutionInputs = exports.combineRecords = exports.isAzureProject = exports.getAzureSolutionSettings = exports.getSelectedPlugins = void 0;
|
|
4
4
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
5
5
|
const localSettingsConstants_1 = require("../../../../common/localSettingsConstants");
|
|
6
6
|
const constants_1 = require("../constants");
|
|
@@ -117,4 +117,8 @@ function fillInSolutionSettings(solutionSettings, answers) {
|
|
|
117
117
|
return teamsfx_api_1.ok(teamsfx_api_1.Void);
|
|
118
118
|
}
|
|
119
119
|
exports.fillInSolutionSettings = fillInSolutionSettings;
|
|
120
|
+
function checkWetherProvisionSucceeded(config) {
|
|
121
|
+
return config[constants_1.GLOBAL_CONFIG] && config[constants_1.GLOBAL_CONFIG][constants_1.SOLUTION_PROVISION_SUCCEEDED];
|
|
122
|
+
}
|
|
123
|
+
exports.checkWetherProvisionSucceeded = checkWetherProvisionSucceeded;
|
|
120
124
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/utils.ts"],"names":[],"mappings":";;;AAAA,wDAcgC;AAChC,sFAAsF;AACtF,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@microsoft/teamsfx-core",
|
|
3
|
-
"version": "0.8.0",
|
|
3
|
+
"version": "0.8.1-alpha.249dee5b.0",
|
|
4
4
|
"main": "build/index.js",
|
|
5
5
|
"types": "build/index.d.ts",
|
|
6
6
|
"license": "MIT",
|
|
@@ -44,7 +44,7 @@
|
|
|
44
44
|
"@azure/storage-blob": "^12.7.0",
|
|
45
45
|
"@dbpiper/timer": "1.0.0-beta.2",
|
|
46
46
|
"@feathersjs/hooks": "^0.6.5",
|
|
47
|
-
"@microsoft/teamsfx-api": "
|
|
47
|
+
"@microsoft/teamsfx-api": "0.8.1-alpha.249dee5b.0",
|
|
48
48
|
"@types/jwt-decode": "3.1.0",
|
|
49
49
|
"@types/proper-lockfile": "^4.1.1",
|
|
50
50
|
"adm-zip": "^0.5.5",
|
|
@@ -147,7 +147,7 @@
|
|
|
147
147
|
"resource/**/*",
|
|
148
148
|
"templates/**/*"
|
|
149
149
|
],
|
|
150
|
-
"gitHead": "
|
|
150
|
+
"gitHead": "d3919be13f984a60301dcd8ce3cb0183a8edcbd0",
|
|
151
151
|
"publishConfig": {
|
|
152
152
|
"access": "public"
|
|
153
153
|
},
|
package/resource/strings.json
CHANGED
|
@@ -13,9 +13,9 @@
|
|
|
13
13
|
"FailedToDeployBeforeProvision": "Failed to deploy because the resources have not been provisioned yet. Make sure you do the provision first.",
|
|
14
14
|
"FailedToPublishBeforeProvision": "Failed to publish because the resources have not been provisioned yet. Make sure you do the provision first.",
|
|
15
15
|
"SPFxAskProvisionBeforePublish": "Failed to publish because the teams app has not been provisioned yet. Please provision first.",
|
|
16
|
-
"AddResourceNotice": "[Teams Toolkit] Resource \"%s\" have been successfully configured for your project, trigger '
|
|
16
|
+
"AddResourceNotice": "[Teams Toolkit] Resource \"%s\" have been successfully configured for your project, trigger 'Teams: Provision in the Cloud' will create the resource(s) in your Azure subscription.",
|
|
17
17
|
"AddResourceNoticeForCli": "[Teams Toolkit] Resource \"%s\" have been successfully configured for your project, run 'teamsfx provision' will create the resource(s) in your Azure subscription.",
|
|
18
|
-
"AddCapabilityNotice": "[Teams Toolkit] Capability \"%s\" have been successfully configured for your project, trigger '
|
|
18
|
+
"AddCapabilityNotice": "[Teams Toolkit] Capability \"%s\" have been successfully configured for your project, trigger 'Teams: Provision in the Cloud' will create the resource(s) in your Azure subscription.",
|
|
19
19
|
"AddCapabilityNoticeForCli": "[Teams Toolkit] Capability \"%s\" have been successfully configured for your project, run 'teamsfx provision' will create the resource(s) in your Azure subscription.",
|
|
20
20
|
"CancelProvision": "CancelProvision",
|
|
21
21
|
"AlreadyProvisionNotice": "'%s' is already provisioned in the cloud, will create the teams app again if it has been removed.",
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
param sqlServerName string
|
|
2
|
-
param sqlDatabaseName string
|
|
2
|
+
param sqlDatabaseName string
|
|
3
3
|
param administratorLogin string
|
|
4
4
|
@secure()
|
|
5
5
|
param administratorLoginPassword string
|
|
@@ -8,7 +8,7 @@ resource sqlServer 'Microsoft.Sql/servers@2021-02-01-preview' = {
|
|
|
8
8
|
location: resourceGroup().location
|
|
9
9
|
name: sqlServerName
|
|
10
10
|
properties: {
|
|
11
|
-
administratorLogin: administratorLogin
|
|
11
|
+
administratorLogin: empty(administratorLogin) ? null : administratorLogin
|
|
12
12
|
administratorLoginPassword: administratorLoginPassword
|
|
13
13
|
}
|
|
14
14
|
}
|
|
@@ -31,5 +31,6 @@ resource sqlFirewallRules 'Microsoft.Sql/servers/firewallRules@2021-02-01-previe
|
|
|
31
31
|
}
|
|
32
32
|
}
|
|
33
33
|
|
|
34
|
+
output resourceId string = sqlServer.id
|
|
34
35
|
output sqlEndpoint string = sqlServer.properties.fullyQualifiedDomainName
|
|
35
36
|
output databaseName string = sqlDatabaseName
|