@microsoft/teamsfx-core 1.1.0-rc.7 → 1.1.1
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/localSettingsProvider.js +1 -1
- package/build/common/localSettingsProvider.js.map +1 -1
- package/build/plugins/resource/utils4v2.d.ts +1 -3
- package/build/plugins/resource/utils4v2.d.ts.map +1 -1
- package/build/plugins/resource/utils4v2.js +110 -25
- package/build/plugins/resource/utils4v2.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 +6 -2
- 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 -15
- package/build/plugins/solution/fx-solution/v2/provisionLocal.js.map +1 -1
- package/package.json +3 -3
|
@@ -165,7 +165,7 @@ class LocalSettingsProvider {
|
|
|
165
165
|
}
|
|
166
166
|
async saveJson(localSettingsJson, cryptoProvider) {
|
|
167
167
|
const localSettings = this.convertToLocalSettings(localSettingsJson);
|
|
168
|
-
await this.save(localSettings);
|
|
168
|
+
await this.save(localSettings, cryptoProvider);
|
|
169
169
|
return this.convertToLocalSettingsJson(localSettings);
|
|
170
170
|
}
|
|
171
171
|
convertToLocalSettings(localSettingsJson) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"localSettingsProvider.js","sourceRoot":"","sources":["../../src/common/localSettingsProvider.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"localSettingsProvider.js","sourceRoot":"","sources":["../../src/common/localSettingsProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ConfigMap, Func, FxError, Inputs, Json,
|
|
1
|
+
import { ConfigMap, Func, FxError, Inputs, Json, Plugin, PluginContext, QTreeNode, Result, TokenProvider, Void, v2 } from "@microsoft/teamsfx-api";
|
|
2
2
|
import { Context, DeepReadonly, DeploymentInputs, EnvInfoV2, ProvisionInputs, ResourceProvisionOutput, ResourceTemplate } from "@microsoft/teamsfx-api/build/v2";
|
|
3
3
|
export declare function convert2PluginContext(pluginName: string, ctx: Context, inputs: Inputs, ignoreEmptyProjectPath?: boolean): PluginContext;
|
|
4
4
|
export declare function scaffoldSourceCodeAdapter(ctx: Context, inputs: Inputs, plugin: Plugin): Promise<Result<Void, FxError>>;
|
|
@@ -20,8 +20,6 @@ export declare function getQuestionsAdapter(ctx: Context, inputs: Inputs, envInf
|
|
|
20
20
|
export declare function getQuestionsForUserTaskAdapter(ctx: Context, inputs: Inputs, func: Func, envInfo: DeepReadonly<EnvInfoV2>, tokenProvider: TokenProvider, plugin: Plugin): Promise<Result<QTreeNode | undefined, FxError>>;
|
|
21
21
|
export declare function setStateV2ByConfigMapInc(pluginName: string, state: Json, config: ConfigMap): void;
|
|
22
22
|
export declare function setEnvInfoV1ByStateV2(pluginName: string, pluginContext: PluginContext, envInfoV2: EnvInfoV2): void;
|
|
23
|
-
export declare function setLocalSettingsV2(localSettingsJson: Json, localSettings?: LocalSettings): void;
|
|
24
23
|
export declare function assignJsonInc(target?: Json, source?: Json): Json | undefined;
|
|
25
|
-
export declare function setLocalSettingsV1(pluginContext: PluginContext, localSettings: Json): void;
|
|
26
24
|
export declare function collaborationApiAdaptor(ctx: Context, inputs: v2.InputsWithProjectPath, envInfo: DeepReadonly<EnvInfoV2>, tokenProvider: TokenProvider, userInfo: Json, plugin: Plugin, taskName: "grantPermission" | "listCollaborator" | "checkPermission"): Promise<Result<Json, FxError>>;
|
|
27
25
|
//# sourceMappingURL=utils4v2.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils4v2.d.ts","sourceRoot":"","sources":["../../../src/plugins/resource/utils4v2.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,SAAS,EAGT,IAAI,EACJ,OAAO,EACP,MAAM,EACN,IAAI,
|
|
1
|
+
{"version":3,"file":"utils4v2.d.ts","sourceRoot":"","sources":["../../../src/plugins/resource/utils4v2.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.collaborationApiAdaptor = exports.
|
|
3
|
+
exports.collaborationApiAdaptor = exports.assignJsonInc = exports.setEnvInfoV1ByStateV2 = exports.setStateV2ByConfigMapInc = exports.getQuestionsForUserTaskAdapter = exports.getQuestionsAdapter = exports.getQuestionsForScaffoldingAdapter = exports.executeUserTaskAdapter = exports.configureLocalResourceAdapter = exports.provisionLocalResourceAdapter = exports.deployAdapter = exports.configureResourceAdapter = exports.legacyConfig2EnvState = exports.flattenConfigMap = exports.provisionResourceAdapter = exports.updateResourceTemplateAdapter = exports.generateResourceTemplateAdapter = exports.scaffoldSourceCodeAdapter = exports.convert2PluginContext = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
// Copyright (c) Microsoft Corporation.
|
|
6
6
|
// Licensed under the MIT license.
|
|
@@ -210,12 +210,116 @@ async function deployAdapter(ctx, inputs, envInfo, tokenProvider, plugin) {
|
|
|
210
210
|
return teamsfx_api_1.ok(teamsfx_api_1.Void);
|
|
211
211
|
}
|
|
212
212
|
exports.deployAdapter = deployAdapter;
|
|
213
|
+
/**
|
|
214
|
+
* An adaptor that behaves like a ConfigMap for plugin local settings,
|
|
215
|
+
* but modifies plugin settings json in-place when setting values.
|
|
216
|
+
*/
|
|
217
|
+
class ConfigMapAdaptor {
|
|
218
|
+
constructor(pluginName, json) {
|
|
219
|
+
this._pluginSettings = json;
|
|
220
|
+
const map = teamsfx_api_1.ConfigMap.fromJSON(json);
|
|
221
|
+
if (!map) {
|
|
222
|
+
throw error_1.InvalidStateError(pluginName, json);
|
|
223
|
+
}
|
|
224
|
+
this._map = map;
|
|
225
|
+
this.size = this._map.size;
|
|
226
|
+
}
|
|
227
|
+
getString(k, defaultValue) {
|
|
228
|
+
return this._map.getString(k, defaultValue);
|
|
229
|
+
}
|
|
230
|
+
getBoolean(k, defaultValue) {
|
|
231
|
+
return this._map.getBoolean(k, defaultValue);
|
|
232
|
+
}
|
|
233
|
+
getNumber(k, defaultValue) {
|
|
234
|
+
return this._map.getNumber(k, defaultValue);
|
|
235
|
+
}
|
|
236
|
+
getStringArray(k, defaultValue) {
|
|
237
|
+
return this._map.getStringArray(k, defaultValue);
|
|
238
|
+
}
|
|
239
|
+
getNumberArray(k, defaultValue) {
|
|
240
|
+
return this._map.getNumberArray(k, defaultValue);
|
|
241
|
+
}
|
|
242
|
+
getBooleanArray(k, defaultValue) {
|
|
243
|
+
return this._map.getBooleanArray(k, defaultValue);
|
|
244
|
+
}
|
|
245
|
+
getOptionItem(k, defaultValue) {
|
|
246
|
+
return this._map.getOptionItem(k, defaultValue);
|
|
247
|
+
}
|
|
248
|
+
getOptionItemArray(k, defaultValue) {
|
|
249
|
+
return this._map.getOptionItemArray(k, defaultValue);
|
|
250
|
+
}
|
|
251
|
+
toJSON() {
|
|
252
|
+
return this._pluginSettings;
|
|
253
|
+
}
|
|
254
|
+
clear() {
|
|
255
|
+
Object.keys(this._pluginSettings).forEach((key) => delete this._pluginSettings[key]);
|
|
256
|
+
return this._map.clear();
|
|
257
|
+
}
|
|
258
|
+
delete(key) {
|
|
259
|
+
const deleted = this._map.delete(key);
|
|
260
|
+
if (deleted) {
|
|
261
|
+
delete this._pluginSettings[key];
|
|
262
|
+
}
|
|
263
|
+
return deleted;
|
|
264
|
+
}
|
|
265
|
+
forEach(callbackfn, thisArg) {
|
|
266
|
+
return this._map.forEach(callbackfn, thisArg);
|
|
267
|
+
}
|
|
268
|
+
get(key) {
|
|
269
|
+
return this._map.get(key);
|
|
270
|
+
}
|
|
271
|
+
has(key) {
|
|
272
|
+
return this._map.has(key);
|
|
273
|
+
}
|
|
274
|
+
entries() {
|
|
275
|
+
return this._map.entries();
|
|
276
|
+
}
|
|
277
|
+
keys() {
|
|
278
|
+
return this._map.keys();
|
|
279
|
+
}
|
|
280
|
+
values() {
|
|
281
|
+
return this._map.values();
|
|
282
|
+
}
|
|
283
|
+
[Symbol.iterator]() {
|
|
284
|
+
return this._map.entries();
|
|
285
|
+
}
|
|
286
|
+
set(key, value) {
|
|
287
|
+
this._map.set(key, value);
|
|
288
|
+
this._pluginSettings[key] = value;
|
|
289
|
+
this.size = this._map.size;
|
|
290
|
+
return this;
|
|
291
|
+
}
|
|
292
|
+
}
|
|
293
|
+
Symbol.toStringTag;
|
|
294
|
+
/**
|
|
295
|
+
* a Json backed LocalSettings which keeps localSettings Json and ConfigMap in sync
|
|
296
|
+
*/
|
|
297
|
+
class LocalSettingsAdaptor {
|
|
298
|
+
constructor(localSettings, pluginName) {
|
|
299
|
+
if (localSettings && localSettings["teamsApp"]) {
|
|
300
|
+
this.teamsApp = new ConfigMapAdaptor(pluginName, localSettings["teamsApp"]);
|
|
301
|
+
}
|
|
302
|
+
if (localSettings && localSettings["auth"]) {
|
|
303
|
+
this.auth = new ConfigMapAdaptor(pluginName, localSettings["auth"]);
|
|
304
|
+
}
|
|
305
|
+
if (localSettings && localSettings["frontend"]) {
|
|
306
|
+
this.frontend = new ConfigMapAdaptor(pluginName, localSettings["frontend"]);
|
|
307
|
+
}
|
|
308
|
+
if (localSettings && localSettings["backend"]) {
|
|
309
|
+
this.backend = new ConfigMapAdaptor(pluginName, localSettings["backend"]);
|
|
310
|
+
}
|
|
311
|
+
if (localSettings && localSettings["bot"]) {
|
|
312
|
+
this.bot = new ConfigMapAdaptor(pluginName, localSettings["bot"]);
|
|
313
|
+
}
|
|
314
|
+
}
|
|
315
|
+
}
|
|
213
316
|
async function provisionLocalResourceAdapter(ctx, inputs, localSettings, tokenProvider, plugin) {
|
|
214
317
|
if (!plugin.localDebug)
|
|
215
318
|
return teamsfx_api_1.err(error_1.PluginHasNoTaskImpl(plugin.displayName, "localDebug"));
|
|
216
319
|
const pluginContext = convert2PluginContext(plugin.name, ctx, inputs);
|
|
217
320
|
pluginContext.envInfo.state.set(plugin.name, pluginContext.config);
|
|
218
|
-
|
|
321
|
+
const localSettingsAdaptor = new LocalSettingsAdaptor(localSettings, plugin.name);
|
|
322
|
+
pluginContext.localSettings = localSettingsAdaptor;
|
|
219
323
|
pluginContext.appStudioToken = tokenProvider.appStudioToken;
|
|
220
324
|
pluginContext.azureAccountProvider = tokenProvider.azureAccountProvider;
|
|
221
325
|
pluginContext.graphTokenProvider = tokenProvider.graphTokenProvider;
|
|
@@ -223,7 +327,6 @@ async function provisionLocalResourceAdapter(ctx, inputs, localSettings, tokenPr
|
|
|
223
327
|
if (res.isErr()) {
|
|
224
328
|
return teamsfx_api_1.err(res.error);
|
|
225
329
|
}
|
|
226
|
-
setLocalSettingsV2(localSettings, pluginContext.localSettings);
|
|
227
330
|
return teamsfx_api_1.ok(teamsfx_api_1.Void);
|
|
228
331
|
}
|
|
229
332
|
exports.provisionLocalResourceAdapter = provisionLocalResourceAdapter;
|
|
@@ -232,7 +335,8 @@ async function configureLocalResourceAdapter(ctx, inputs, localSettings, tokenPr
|
|
|
232
335
|
return teamsfx_api_1.err(error_1.PluginHasNoTaskImpl(plugin.displayName, "postLocalDebug"));
|
|
233
336
|
const pluginContext = convert2PluginContext(plugin.name, ctx, inputs);
|
|
234
337
|
pluginContext.envInfo.state.set(plugin.name, pluginContext.config);
|
|
235
|
-
|
|
338
|
+
const localSettingsAdaptor = new LocalSettingsAdaptor(localSettings, plugin.name);
|
|
339
|
+
pluginContext.localSettings = localSettingsAdaptor;
|
|
236
340
|
pluginContext.appStudioToken = tokenProvider.appStudioToken;
|
|
237
341
|
pluginContext.azureAccountProvider = tokenProvider.azureAccountProvider;
|
|
238
342
|
pluginContext.graphTokenProvider = tokenProvider.graphTokenProvider;
|
|
@@ -240,7 +344,6 @@ async function configureLocalResourceAdapter(ctx, inputs, localSettings, tokenPr
|
|
|
240
344
|
if (res.isErr()) {
|
|
241
345
|
return teamsfx_api_1.err(res.error);
|
|
242
346
|
}
|
|
243
|
-
setLocalSettingsV2(localSettings, pluginContext.localSettings);
|
|
244
347
|
return teamsfx_api_1.ok(teamsfx_api_1.Void);
|
|
245
348
|
}
|
|
246
349
|
exports.configureLocalResourceAdapter = configureLocalResourceAdapter;
|
|
@@ -252,12 +355,12 @@ async function executeUserTaskAdapter(ctx, inputs, func, localSettings, envInfo,
|
|
|
252
355
|
pluginContext.appStudioToken = tokenProvider.appStudioToken;
|
|
253
356
|
pluginContext.graphTokenProvider = tokenProvider.graphTokenProvider;
|
|
254
357
|
setEnvInfoV1ByStateV2(plugin.name, pluginContext, envInfo);
|
|
255
|
-
|
|
358
|
+
const localSettingsAdaptor = new LocalSettingsAdaptor(localSettings, plugin.name);
|
|
359
|
+
pluginContext.localSettings = localSettingsAdaptor;
|
|
256
360
|
const res = await plugin.executeUserTask(func, pluginContext);
|
|
257
361
|
if (res.isErr())
|
|
258
362
|
return teamsfx_api_1.err(res.error);
|
|
259
363
|
setStateV2ByConfigMapInc(plugin.name, envInfo.state, pluginContext.config);
|
|
260
|
-
setLocalSettingsV2(localSettings, pluginContext.localSettings);
|
|
261
364
|
return teamsfx_api_1.ok(res.value);
|
|
262
365
|
}
|
|
263
366
|
exports.executeUserTaskAdapter = executeUserTaskAdapter;
|
|
@@ -314,14 +417,6 @@ function setEnvInfoV1ByStateV2(pluginName, pluginContext, envInfoV2) {
|
|
|
314
417
|
pluginContext.envInfo = envInfo;
|
|
315
418
|
}
|
|
316
419
|
exports.setEnvInfoV1ByStateV2 = setEnvInfoV1ByStateV2;
|
|
317
|
-
function setLocalSettingsV2(localSettingsJson, localSettings) {
|
|
318
|
-
lodash_1.default.assign(localSettingsJson.teamsApp, tools_1.mapToJson(localSettings === null || localSettings === void 0 ? void 0 : localSettings.teamsApp));
|
|
319
|
-
lodash_1.default.assign(localSettingsJson.auth, tools_1.mapToJson(localSettings === null || localSettings === void 0 ? void 0 : localSettings.auth));
|
|
320
|
-
lodash_1.default.assign(localSettingsJson.backend, tools_1.mapToJson(localSettings === null || localSettings === void 0 ? void 0 : localSettings.backend));
|
|
321
|
-
lodash_1.default.assign(localSettingsJson.frontend, tools_1.mapToJson(localSettings === null || localSettings === void 0 ? void 0 : localSettings.frontend));
|
|
322
|
-
lodash_1.default.assign(localSettingsJson.bot, tools_1.mapToJson(localSettings === null || localSettings === void 0 ? void 0 : localSettings.bot));
|
|
323
|
-
}
|
|
324
|
-
exports.setLocalSettingsV2 = setLocalSettingsV2;
|
|
325
420
|
function assignJsonInc(target, source) {
|
|
326
421
|
if (!target)
|
|
327
422
|
return source;
|
|
@@ -344,16 +439,6 @@ function assignJsonInc(target, source) {
|
|
|
344
439
|
return target;
|
|
345
440
|
}
|
|
346
441
|
exports.assignJsonInc = assignJsonInc;
|
|
347
|
-
function setLocalSettingsV1(pluginContext, localSettings) {
|
|
348
|
-
pluginContext.localSettings = {
|
|
349
|
-
teamsApp: teamsfx_api_1.ConfigMap.fromJSON(localSettings.teamsApp) || new teamsfx_api_1.ConfigMap(),
|
|
350
|
-
auth: teamsfx_api_1.ConfigMap.fromJSON(localSettings.auth),
|
|
351
|
-
backend: teamsfx_api_1.ConfigMap.fromJSON(localSettings.backend),
|
|
352
|
-
bot: teamsfx_api_1.ConfigMap.fromJSON(localSettings.bot),
|
|
353
|
-
frontend: teamsfx_api_1.ConfigMap.fromJSON(localSettings.frontend),
|
|
354
|
-
};
|
|
355
|
-
}
|
|
356
|
-
exports.setLocalSettingsV1 = setLocalSettingsV1;
|
|
357
442
|
async function collaborationApiAdaptor(ctx, inputs, envInfo, tokenProvider, userInfo, plugin, taskName) {
|
|
358
443
|
var _a;
|
|
359
444
|
// API v2 only works with multiple env enabled
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils4v2.js","sourceRoot":"","sources":["../../../src/plugins/resource/utils4v2.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"utils4v2.js","sourceRoot":"","sources":["../../../src/plugins/resource/utils4v2.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provision.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provision.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,MAAM,EAIN,aAAa,EACb,IAAI,EACJ,eAAe,EAEhB,MAAM,wBAAwB,CAAC;AA0ChC,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,uBAAuB,EAAE,OAAO,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"provision.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provision.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,MAAM,EAIN,aAAa,EACb,IAAI,EACJ,eAAe,EAEhB,MAAM,wBAAwB,CAAC;AA0ChC,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,uBAAuB,EAAE,OAAO,CAAC,CAAC,CAuN3D;AAED,wBAAsB,sBAAsB,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA8CjG"}
|
|
@@ -42,7 +42,7 @@ async function provisionResource(ctx, inputs, envInfo, tokenProvider) {
|
|
|
42
42
|
if (!newEnvInfo.state[constants_1.GLOBAL_CONFIG]) {
|
|
43
43
|
newEnvInfo.state[constants_1.GLOBAL_CONFIG] = { output: {}, secrets: {} };
|
|
44
44
|
}
|
|
45
|
-
newEnvInfo.state[constants_1.GLOBAL_CONFIG]["output"][constants_1.SOLUTION_PROVISION_SUCCEEDED] =
|
|
45
|
+
newEnvInfo.state[constants_1.GLOBAL_CONFIG]["output"][constants_1.SOLUTION_PROVISION_SUCCEEDED] = false;
|
|
46
46
|
if (utils_1.isAzureProject(azureSolutionSettings)) {
|
|
47
47
|
//fill in common questions for solution
|
|
48
48
|
const appName = ctx.projectSetting.appName;
|
|
@@ -167,7 +167,11 @@ async function provisionResource(ctx, inputs, envInfo, tokenProvider) {
|
|
|
167
167
|
}
|
|
168
168
|
const update = utils_1.combineRecords(configureResourceResult.output);
|
|
169
169
|
lodash_1.default.assign(newEnvInfo.state, update);
|
|
170
|
-
newEnvInfo.state[constants_1.GLOBAL_CONFIG]["output"][constants_1.SOLUTION_PROVISION_SUCCEEDED] =
|
|
170
|
+
newEnvInfo.state[constants_1.GLOBAL_CONFIG]["output"][constants_1.SOLUTION_PROVISION_SUCCEEDED] = true;
|
|
171
|
+
if (!utils_1.isAzureProject(azureSolutionSettings)) {
|
|
172
|
+
const appStudioTokenJson = await tokenProvider.appStudioToken.getJsonObject();
|
|
173
|
+
newEnvInfo.state[constants_1.GLOBAL_CONFIG]["output"][constants_1.REMOTE_TEAMS_APP_TENANT_ID] = appStudioTokenJson.tid;
|
|
174
|
+
}
|
|
171
175
|
return new teamsfx_api_1.v2.FxSuccess(newEnvInfo.state);
|
|
172
176
|
}
|
|
173
177
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provision.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provision.ts"],"names":[],"mappings":";;;;AAAA,wDAYgC;AAChC,oDAKkC;AAClC,yCAAiD;AACjD,mCAOiB;AACjB,4CAWsB;AACtB,mDAA6B;AAC7B,yDAAwC;AACxC,4DAAiE;AACjE,uCAAoD;AACpD,wDAA2D;AAC3D,gCAA4C;AAC5C,4DAA+B;AAC/B,wEAA+D;AAE/D,0EAAmF;AACnF,2CAAwD;AACxD,qEAAkE;AAG3D,KAAK,UAAU,iBAAiB,CACrC,GAAe,EACf,MAAc,EACd,OAAsC,EACtC,aAA4B;;IAE5B,IAAI,MAAM,CAAC,WAAW,KAAK,SAAS,EAAE;QACpC,OAAO,IAAI,gBAAE,CAAC,SAAS,CACrB,+BAAiB,CACf,IAAI,KAAK,CAAC,0BAA0B,CAAC,EACrC,0BAAc,EACd,yBAAa,CAAC,aAAa,CAC5B,CACF,CAAC;KACH;IACD,MAAM,WAAW,GAAW,MAAM,CAAC,WAAW,CAAC;IAE/C,MAAM,qBAAqB,GAAG,gCAAwB,CAAC,GAAG,CAAC,CAAC;IAC5D,2EAA2E;IAC3E,sFAAsF;IACtF,4EAA4E;IAC5E,MAAM,aAAa,CAAC,cAAc,CAAC,cAAc,EAAE,CAAC;IAEpD,IAAI,sBAAc,CAAC,qBAAqB,CAAC,EAAE;QACzC,IAAI,GAAG,CAAC,yBAAyB,KAAK,SAAS,EAAE;YAC/C,GAAG,CAAC,yBAAyB,GAAG,IAAI,iDAA6B,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;SACvF;QACD,MAAM,MAAM,GAAG,MAAM,+BAAuB,CAC1C,qBAAqB,EACrB,GAAG,CAAC,yBAAyB,CAC9B,CAAC;QACF,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE;YAClB,OAAO,IAAI,gBAAE,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;SACvC;KACF;IAED,MAAM,UAAU,GAAc,gBAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IACnD,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,yBAAa,CAAC,EAAE;QACpC,UAAU,CAAC,KAAK,CAAC,yBAAa,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;KAC/D;IACD,UAAU,CAAC,KAAK,CAAC,yBAAa,CAAC,CAAC,QAAQ,CAAC,CAAC,wCAA4B,CAAC,GAAG,
|
|
1
|
+
{"version":3,"file":"provision.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provision.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provisionLocal.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provisionLocal.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,
|
|
1
|
+
{"version":3,"file":"provisionLocal.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provisionLocal.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,aAAa,EAEb,IAAI,EACL,MAAM,wBAAwB,CAAC;AAkBhC,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,EACnB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAsHrC"}
|
|
@@ -36,10 +36,9 @@ async function provisionLocalResource(ctx, inputs, localSettings, tokenProvider)
|
|
|
36
36
|
if (m365TenantMatches.isErr()) {
|
|
37
37
|
return new teamsfx_api_1.v2.FxFailure(m365TenantMatches.error);
|
|
38
38
|
}
|
|
39
|
-
const localDebugPlugin = typedi_1.default.get(ResourcePluginContainer_1.ResourcePluginsV2.LocalDebugPlugin);
|
|
40
39
|
const plugins = utils_1.getSelectedPlugins(azureSolutionSettings);
|
|
41
40
|
const provisionLocalResourceThunks = plugins
|
|
42
|
-
.filter((plugin) =>
|
|
41
|
+
.filter((plugin) => !lodash_1.isUndefined(plugin.provisionLocalResource))
|
|
43
42
|
.map((plugin) => {
|
|
44
43
|
return {
|
|
45
44
|
pluginName: `${plugin.name}`,
|
|
@@ -52,12 +51,6 @@ async function provisionLocalResource(ctx, inputs, localSettings, tokenProvider)
|
|
|
52
51
|
if (provisionResult.kind !== "success") {
|
|
53
52
|
return provisionResult;
|
|
54
53
|
}
|
|
55
|
-
if (localDebugPlugin.provisionLocalResource) {
|
|
56
|
-
const localDebugResult = await localDebugPlugin.provisionLocalResource(ctx, inputs, localSettings, tokenProvider);
|
|
57
|
-
if (localDebugResult.isErr()) {
|
|
58
|
-
return new teamsfx_api_1.v2.FxFailure(localDebugResult.error);
|
|
59
|
-
}
|
|
60
|
-
}
|
|
61
54
|
const aadPlugin = typedi_1.default.get(ResourcePluginContainer_1.ResourcePluginsV2.AadPlugin);
|
|
62
55
|
if (utils_1.isAzureProject(azureSolutionSettings)) {
|
|
63
56
|
if (plugins.some((plugin) => plugin.name === aadPlugin.name) && aadPlugin.executeUserTask) {
|
|
@@ -79,7 +72,7 @@ async function provisionLocalResource(ctx, inputs, localSettings, tokenProvider)
|
|
|
79
72
|
return new teamsfx_api_1.v2.FxFailure(parseTenantIdresult.error);
|
|
80
73
|
}
|
|
81
74
|
const configureLocalResourceThunks = plugins
|
|
82
|
-
.filter((plugin) =>
|
|
75
|
+
.filter((plugin) => !lodash_1.isUndefined(plugin.configureLocalResource))
|
|
83
76
|
.map((plugin) => {
|
|
84
77
|
return {
|
|
85
78
|
pluginName: `${plugin.name}`,
|
|
@@ -95,12 +88,6 @@ async function provisionLocalResource(ctx, inputs, localSettings, tokenProvider)
|
|
|
95
88
|
}
|
|
96
89
|
return new teamsfx_api_1.v2.FxFailure(configureResourceResult.error);
|
|
97
90
|
}
|
|
98
|
-
if (localDebugPlugin.configureLocalResource) {
|
|
99
|
-
const localDebugResult = await localDebugPlugin.configureLocalResource(ctx, inputs, localSettings, tokenProvider);
|
|
100
|
-
if (localDebugResult.isErr()) {
|
|
101
|
-
return new teamsfx_api_1.v2.FxFailure(localDebugResult.error);
|
|
102
|
-
}
|
|
103
|
-
}
|
|
104
91
|
return new teamsfx_api_1.v2.FxSuccess(localSettings);
|
|
105
92
|
}
|
|
106
93
|
exports.provisionLocalResource = provisionLocalResource;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provisionLocal.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provisionLocal.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"provisionLocal.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provisionLocal.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": "1.1.
|
|
3
|
+
"version": "1.1.1",
|
|
4
4
|
"main": "build/index.js",
|
|
5
5
|
"types": "build/index.d.ts",
|
|
6
6
|
"license": "MIT",
|
|
@@ -48,7 +48,7 @@
|
|
|
48
48
|
"@azure/storage-blob": "^12.7.0",
|
|
49
49
|
"@dbpiper/timer": "1.0.0-beta.2",
|
|
50
50
|
"@feathersjs/hooks": "^0.6.5",
|
|
51
|
-
"@microsoft/teamsfx-api": "^0.12.0
|
|
51
|
+
"@microsoft/teamsfx-api": "^0.12.0",
|
|
52
52
|
"@npmcli/package-json": "^1.0.1",
|
|
53
53
|
"@types/jwt-decode": "3.1.0",
|
|
54
54
|
"@types/proper-lockfile": "^4.1.1",
|
|
@@ -155,7 +155,7 @@
|
|
|
155
155
|
"resource/**/*",
|
|
156
156
|
"templates/**/*"
|
|
157
157
|
],
|
|
158
|
-
"gitHead": "
|
|
158
|
+
"gitHead": "579ef726525eee7336fac0d42ca24dc896de9574",
|
|
159
159
|
"publishConfig": {
|
|
160
160
|
"access": "public"
|
|
161
161
|
},
|