@microsoft/teamsfx-core 1.7.0-rc.0 → 1.7.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/templates-config.json +1 -1
- package/build/plugins/resource/spfx/depsChecker/generatorChecker.d.ts +1 -0
- package/build/plugins/resource/spfx/depsChecker/generatorChecker.d.ts.map +1 -1
- package/build/plugins/resource/spfx/depsChecker/generatorChecker.js +7 -4
- package/build/plugins/resource/spfx/depsChecker/generatorChecker.js.map +1 -1
- package/build/plugins/resource/spfx/depsChecker/yoChecker.d.ts +3 -1
- package/build/plugins/resource/spfx/depsChecker/yoChecker.d.ts.map +1 -1
- package/build/plugins/resource/spfx/depsChecker/yoChecker.js +36 -6
- package/build/plugins/resource/spfx/depsChecker/yoChecker.js.map +1 -1
- package/build/plugins/resource/spfx/plugin.d.ts.map +1 -1
- package/build/plugins/resource/spfx/plugin.js +7 -6
- package/build/plugins/resource/spfx/plugin.js.map +1 -1
- package/package.json +3 -3
- package/templates/fallback/blazor-base.csharp.default.zip +0 -0
- package/templates/fallback/bot.csharp.default.zip +0 -0
- package/templates/fallback/bot.js.default.zip +0 -0
- package/templates/fallback/bot.ts.command-and-response.zip +0 -0
- package/templates/fallback/bot.ts.default.zip +0 -0
- package/templates/fallback/bot.ts.notification-function-base.zip +0 -0
- package/templates/fallback/bot.ts.notification-restify.zip +0 -0
- package/templates/fallback/bot.ts.notification-trigger-http.zip +0 -0
- package/templates/fallback/bot.ts.notification-trigger-timer.zip +0 -0
- package/templates/fallback/function-base.js.default.zip +0 -0
- package/templates/fallback/function-base.ts.default.zip +0 -0
- package/templates/fallback/function-triggers.js.HTTPTrigger.zip +0 -0
- package/templates/fallback/function-triggers.ts.HTTPTrigger.zip +0 -0
- package/templates/fallback/tab.csharp.default.zip +0 -0
- package/templates/fallback/tab.js.default.zip +0 -0
- package/templates/fallback/tab.js.m365.zip +0 -0
- package/templates/fallback/tab.js.non-sso.zip +0 -0
- package/templates/fallback/tab.ts.default.zip +0 -0
- package/templates/fallback/tab.ts.m365.zip +0 -0
- package/templates/fallback/tab.ts.non-sso.zip +0 -0
- package/templates/plugins/resource/spfx/solution/README.md +0 -1
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "0.
|
|
2
|
+
"version": "^0.6.0",
|
|
3
3
|
"tagPrefix": "templates@",
|
|
4
4
|
"tagListURL": "https://github.com/OfficeDev/TeamsFx/releases/download/template-tag-list/template-tags.txt",
|
|
5
5
|
"templateDownloadBaseURL": "https://github.com/OfficeDev/TeamsFx/releases/download",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generatorChecker.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/resource/spfx/depsChecker/generatorChecker.ts"],"names":[],"mappings":"AAMA,OAAO,EAGL,OAAO,EACP,WAAW,EAEX,aAAa,EACb,MAAM,EAGP,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAWxE,qBAAa,gBAAiB,YAAW,iBAAiB;IACxD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAc;gBAE1B,MAAM,EAAE,WAAW;WAIjB,iBAAiB,IAAI,cAAc;IAIpC,gBAAgB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IA0BvE,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAa/B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAmB9B,kBAAkB,IAAI,MAAM;YAarB,QAAQ;IAItB,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,eAAe;YAIT,YAAY;YAeZ,MAAM;YASN,OAAO;
|
|
1
|
+
{"version":3,"file":"generatorChecker.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/resource/spfx/depsChecker/generatorChecker.ts"],"names":[],"mappings":"AAMA,OAAO,EAGL,OAAO,EACP,WAAW,EAEX,aAAa,EACb,MAAM,EAGP,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAWxE,qBAAa,gBAAiB,YAAW,iBAAiB;IACxD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAc;gBAE1B,MAAM,EAAE,WAAW;WAIjB,iBAAiB,IAAI,cAAc;IAIpC,gBAAgB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IA0BvE,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAa/B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAmB9B,kBAAkB,IAAI,MAAM;YAarB,QAAQ;IAItB,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,eAAe;YAIT,YAAY;YAeZ,MAAM;YASN,OAAO;YASP,gBAAgB;IAsB9B,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,SAAS;CAGlB"}
|
|
@@ -78,7 +78,10 @@ class GeneratorChecker {
|
|
|
78
78
|
return await this.isInstalled();
|
|
79
79
|
}
|
|
80
80
|
getDefaultInstallPath() {
|
|
81
|
-
return path.join(os.homedir(), `.${teamsfx_api_1.ConfigFolderName}`, "bin", "
|
|
81
|
+
return path.join(os.homedir(), `.${teamsfx_api_1.ConfigFolderName}`, "bin", "spfx");
|
|
82
|
+
}
|
|
83
|
+
getPackagePath() {
|
|
84
|
+
return path.join(this.getDefaultInstallPath(), "node_modules", "@microsoft");
|
|
82
85
|
}
|
|
83
86
|
getSentinelPath() {
|
|
84
87
|
return path.join(os.homedir(), `.${teamsfx_api_1.ConfigFolderName}`, "spGenerator-sentinel");
|
|
@@ -103,16 +106,16 @@ class GeneratorChecker {
|
|
|
103
106
|
}
|
|
104
107
|
async cleanup() {
|
|
105
108
|
try {
|
|
106
|
-
await fs.emptyDir(this.
|
|
109
|
+
await fs.emptyDir(this.getPackagePath());
|
|
107
110
|
await fs.remove(this.getSentinelPath());
|
|
108
111
|
}
|
|
109
112
|
catch (err) {
|
|
110
|
-
await this._logger.error(`Failed to clean up path: ${this.
|
|
113
|
+
await this._logger.error(`Failed to clean up path: ${this.getPackagePath()}, error: ${err}`);
|
|
111
114
|
}
|
|
112
115
|
}
|
|
113
116
|
async installGenerator() {
|
|
114
117
|
try {
|
|
115
|
-
await cpUtils_1.cpUtils.executeCommand(undefined, this._logger, { timeout: timeout, shell: false }, this.getExecCommand("npm"), "install", `${name}@${supportedVersion}`, "--prefix", `${this.getDefaultInstallPath()}`, "--no-audit");
|
|
118
|
+
await cpUtils_1.cpUtils.executeCommand(undefined, this._logger, { timeout: timeout, shell: false }, this.getExecCommand("npm"), "install", `${name}@${supportedVersion}`, "--prefix", `${this.getDefaultInstallPath()}`, "--no-audit", "--global-style");
|
|
116
119
|
await fs.ensureFile(this.getSentinelPath());
|
|
117
120
|
}
|
|
118
121
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generatorChecker.js","sourceRoot":"","sources":["../../../../../src/plugins/resource/spfx/depsChecker/generatorChecker.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"generatorChecker.js","sourceRoot":"","sources":["../../../../../src/plugins/resource/spfx/depsChecker/generatorChecker.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,12 +7,14 @@ export declare class YoChecker implements DependencyChecker {
|
|
|
7
7
|
ensureDependency(ctx: PluginContext): Promise<Result<boolean, FxError>>;
|
|
8
8
|
isInstalled(): Promise<boolean>;
|
|
9
9
|
install(): Promise<void>;
|
|
10
|
-
getBinFolder(): string
|
|
10
|
+
getBinFolder(): Promise<string>;
|
|
11
11
|
private validate;
|
|
12
12
|
private getDefaultInstallPath;
|
|
13
|
+
private getPackagePath;
|
|
13
14
|
private getSentinelPath;
|
|
14
15
|
private queryVersion;
|
|
15
16
|
private hasNPM;
|
|
17
|
+
private getNPMMajorVersion;
|
|
16
18
|
private cleanup;
|
|
17
19
|
private installYo;
|
|
18
20
|
private getExecCommand;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yoChecker.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/resource/spfx/depsChecker/yoChecker.ts"],"names":[],"mappings":"AAMA,OAAO,EAGL,OAAO,EACP,WAAW,EAEX,aAAa,EACb,MAAM,EAGP,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAWxE,qBAAa,SAAU,YAAW,iBAAiB;IACjD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAc;gBAE1B,MAAM,EAAE,WAAW;WAIjB,iBAAiB,IAAI,cAAc;IAIpC,gBAAgB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAuBvE,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAa/B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"yoChecker.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/resource/spfx/depsChecker/yoChecker.ts"],"names":[],"mappings":"AAMA,OAAO,EAGL,OAAO,EACP,WAAW,EAEX,aAAa,EACb,MAAM,EAGP,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAWxE,qBAAa,SAAU,YAAW,iBAAiB;IACjD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAc;gBAE1B,MAAM,EAAE,WAAW;WAIjB,iBAAiB,IAAI,cAAc;IAIpC,gBAAgB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAuBvE,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAa/B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAmBxB,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;YAa9B,QAAQ;IAItB,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,eAAe;YAIT,YAAY;YAcZ,MAAM;YASN,kBAAkB;YAsBlB,OAAO;YASP,SAAS;IAsBvB,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,SAAS;CAGlB"}
|
|
@@ -68,14 +68,28 @@ class YoChecker {
|
|
|
68
68
|
throw error_1.DependencyValidateError(name);
|
|
69
69
|
}
|
|
70
70
|
}
|
|
71
|
-
getBinFolder() {
|
|
72
|
-
|
|
71
|
+
async getBinFolder() {
|
|
72
|
+
if (this.isWindows()) {
|
|
73
|
+
const npmVersion = await this.getNPMMajorVersion();
|
|
74
|
+
if (npmVersion && parseInt(npmVersion) > 6) {
|
|
75
|
+
return path.join(this.getDefaultInstallPath(), "node_modules", ".bin");
|
|
76
|
+
}
|
|
77
|
+
else {
|
|
78
|
+
return this.getDefaultInstallPath();
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
else {
|
|
82
|
+
return path.join(this.getDefaultInstallPath(), "node_modules", ".bin");
|
|
83
|
+
}
|
|
73
84
|
}
|
|
74
85
|
async validate() {
|
|
75
86
|
return await this.isInstalled();
|
|
76
87
|
}
|
|
77
88
|
getDefaultInstallPath() {
|
|
78
|
-
return path.join(os.homedir(), `.${teamsfx_api_1.ConfigFolderName}`, "bin", "
|
|
89
|
+
return path.join(os.homedir(), `.${teamsfx_api_1.ConfigFolderName}`, "bin", "spfx");
|
|
90
|
+
}
|
|
91
|
+
getPackagePath() {
|
|
92
|
+
return path.join(this.getDefaultInstallPath(), "node_modules", "yo");
|
|
79
93
|
}
|
|
80
94
|
getSentinelPath() {
|
|
81
95
|
return path.join(os.homedir(), `.${teamsfx_api_1.ConfigFolderName}`, "yo-sentinel");
|
|
@@ -98,18 +112,34 @@ class YoChecker {
|
|
|
98
112
|
return false;
|
|
99
113
|
}
|
|
100
114
|
}
|
|
115
|
+
async getNPMMajorVersion() {
|
|
116
|
+
try {
|
|
117
|
+
const output = await cpUtils_1.cpUtils.executeCommand(undefined, this._logger, { shell: true }, "npm", "--version");
|
|
118
|
+
const regex = /(?<majorVersion>\d+)(\.\d+\.\d+)/;
|
|
119
|
+
const match = regex.exec(output.toString());
|
|
120
|
+
if (match && match.groups) {
|
|
121
|
+
return match.groups.majorVersion;
|
|
122
|
+
}
|
|
123
|
+
else {
|
|
124
|
+
return undefined;
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
catch (error) {
|
|
128
|
+
return undefined;
|
|
129
|
+
}
|
|
130
|
+
}
|
|
101
131
|
async cleanup() {
|
|
102
132
|
try {
|
|
103
|
-
await fs.emptyDir(this.
|
|
133
|
+
await fs.emptyDir(this.getPackagePath());
|
|
104
134
|
await fs.remove(this.getSentinelPath());
|
|
105
135
|
}
|
|
106
136
|
catch (err) {
|
|
107
|
-
await this._logger.error(`Failed to clean up path: ${this.
|
|
137
|
+
await this._logger.error(`Failed to clean up path: ${this.getPackagePath()}, error: ${err}`);
|
|
108
138
|
}
|
|
109
139
|
}
|
|
110
140
|
async installYo() {
|
|
111
141
|
try {
|
|
112
|
-
await cpUtils_1.cpUtils.executeCommand(undefined, this._logger, { timeout: timeout, shell: false }, this.getExecCommand("npm"), "install", `${name}@${supportedVersion}`, "--prefix", `${this.getDefaultInstallPath()}`, "--no-audit");
|
|
142
|
+
await cpUtils_1.cpUtils.executeCommand(undefined, this._logger, { timeout: timeout, shell: false }, this.getExecCommand("npm"), "install", `${name}@${supportedVersion}`, "--prefix", `${this.getDefaultInstallPath()}`, "--no-audit", "--global-style");
|
|
113
143
|
await fs.ensureFile(this.getSentinelPath());
|
|
114
144
|
}
|
|
115
145
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yoChecker.js","sourceRoot":"","sources":["../../../../../src/plugins/resource/spfx/depsChecker/yoChecker.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"yoChecker.js","sourceRoot":"","sources":["../../../../../src/plugins/resource/spfx/depsChecker/yoChecker.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/spfx/plugin.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,aAAa,EACb,OAAO,EACP,MAAM,EAUP,MAAM,wBAAwB,CAAC;AAmDhC,qBAAa,cAAc;IACZ,YAAY,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/spfx/plugin.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,aAAa,EACb,OAAO,EACP,MAAM,EAUP,MAAM,wBAAwB,CAAC;AAmDhC,qBAAa,cAAc;IACZ,YAAY,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YA6V9D,cAAc;IAuDf,SAAS,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAI5D,MAAM,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YA8GxD,SAAS;YA4BT,UAAU;YAMV,QAAQ;mBAMD,eAAe;CAkBrC"}
|
|
@@ -30,7 +30,7 @@ const generatorChecker_1 = require("./depsChecker/generatorChecker");
|
|
|
30
30
|
const cpUtils_1 = require("../../solution/fx-solution/utils/depsChecker/cpUtils");
|
|
31
31
|
class SPFxPluginImpl {
|
|
32
32
|
async postScaffold(ctx) {
|
|
33
|
-
var _a, _b, _c, _d, _e, _f;
|
|
33
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
34
34
|
const progressHandler = await progress_helper_1.ProgressHelper.startScaffoldProgressHandler(ctx.ui);
|
|
35
35
|
try {
|
|
36
36
|
const webpartName = ctx.answers[questions_1.SPFXQuestionNames.webpart_name];
|
|
@@ -69,15 +69,12 @@ class SPFxPluginImpl {
|
|
|
69
69
|
}
|
|
70
70
|
const yoEnv = process.env;
|
|
71
71
|
yoEnv.PATH = tools_1.isYoCheckerEnabled()
|
|
72
|
-
? `${yoChecker.getBinFolder()}${path.delimiter}${(_c = process.env.PATH) !== null && _c !== void 0 ? _c : ""}`
|
|
72
|
+
? `${await yoChecker.getBinFolder()}${path.delimiter}${(_c = process.env.PATH) !== null && _c !== void 0 ? _c : ""}`
|
|
73
73
|
: process.env.PATH;
|
|
74
|
-
const generator = tools_1.isGeneratorCheckerEnabled()
|
|
75
|
-
? spGeneratorChecker.getSpGeneratorPath()
|
|
76
|
-
: "@microsoft/sharepoint";
|
|
77
74
|
await cpUtils_1.cpUtils.executeCommand(ctx.root, ctx.logProvider, {
|
|
78
75
|
timeout: 2 * 60 * 1000,
|
|
79
76
|
env: yoEnv,
|
|
80
|
-
}, "yo",
|
|
77
|
+
}, "yo", "@microsoft/sharepoint", "--skip-install", "true", "--component-type", "webpart", "--component-name", webpartName, "--framework", framework, "--solution-name", solutionName, "--environment", "spo", "--skip-feature-deployment", "true", "--is-domain-isolated", "false");
|
|
81
78
|
const currentPath = path.join(ctx.root, solutionName);
|
|
82
79
|
const newPath = path.join(ctx.root, "SPFx");
|
|
83
80
|
await fs.rename(currentPath, newPath);
|
|
@@ -227,6 +224,10 @@ class SPFxPluginImpl {
|
|
|
227
224
|
(_e = ctx.logProvider) === null || _e === void 0 ? void 0 : _e.error(`We've encountered some issues when trying to install prerequisites under HOME/.fx folder. Learn how to remediate by going to this link(aka.ms/teamsfx-spfx-help) and following the steps applicable to your system: \n ${yoMessage} \n ${generatorMessage}`);
|
|
228
225
|
(_f = ctx.logProvider) === null || _f === void 0 ? void 0 : _f.error(`Teams Toolkit recommends using ${yoInfo.displayName} ${genInfo.displayName}`);
|
|
229
226
|
}
|
|
227
|
+
if (error.message &&
|
|
228
|
+
error.message.includes("'yo' is not recognized as an internal or external command")) {
|
|
229
|
+
(_g = ctx.logProvider) === null || _g === void 0 ? void 0 : _g.error("NPM v6.x with Node.js v12.13.0+ (Erbium) or Node.js v14.15.0+ (Fermium) is recommended for spfx scaffolding and later development. You can use correct version and try again.");
|
|
230
|
+
}
|
|
230
231
|
await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.end(false));
|
|
231
232
|
return teamsfx_api_1.err(error_1.ScaffoldError(error));
|
|
232
233
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../src/plugins/resource/spfx/plugin.ts"],"names":[],"mappings":";;;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,wDAagC;AAChC,mDAA6B;AAC7B,4DAA4B;AAC5B,qDAA+B;AAC/B,mDAA6B;AAC7B,iDAAsD;AACtD,yCAA6C;AAC7C,iDAO2B;AAC3B,mCAWiB;AACjB,mDAA6B;AAC7B,6DAAyD;AACzD,iDAI+B;AAC/B,4CAAqD;AACrD,sDAIgC;AAChC,0DAA0B;AAC1B,2CAAwC;AACxC,4CAAuD;AACvD,yEAAmF;AACnF,0CAA8C;AAC9C,yDAAiE;AACjE,iEAAmE;AACnE,uDAAoD;AACpD,qEAAkE;AAClE,kFAA+E;AAE/E,MAAa,cAAc;IAClB,KAAK,CAAC,YAAY,CAAC,GAAkB;;QAC1C,MAAM,eAAe,GAAG,MAAM,gCAAc,CAAC,4BAA4B,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAClF,IAAI;YACF,MAAM,WAAW,GAAG,GAAG,CAAC,OAAQ,CAAC,6BAAiB,CAAC,YAAY,CAAW,CAAC;YAC3E,MAAM,aAAa,GAAG,aAAK,CAAC,sBAAsB,CAAC,WAAW,CAAC,CAAC;YAChE,MAAM,sBAAsB,GAAG,gBAAM,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;YAC/D,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,2BAAkB,EAAE,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;YACtF,MAAM,gBAAgB,GAAG,GAAG,GAAG,CAAC,IAAI,OAAO,CAAC;YAC5C,IAAI,WAAmB,CAAC;YACxB,MAAM,UAAU,GAAwB,IAAI,GAAG,EAAE,CAAC;YAClD,IAAI,kCAAqB,EAAE,EAAE;gBAC3B,MAAM,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,IAAI,CAAC,mCAAuB,CAAC,eAAe,CAAC,CAAA,CAAC;gBAErE,MAAM,SAAS,GAAG,IAAI,qBAAS,CAAC,GAAG,CAAC,WAAY,CAAC,CAAC;gBAClD,MAAM,kBAAkB,GAAG,IAAI,mCAAgB,CAAC,GAAG,CAAC,WAAY,CAAC,CAAC;gBAElE,MAAM,WAAW,GAAG,MAAM,SAAS,CAAC,WAAW,EAAE,CAAC;gBAClD,MAAM,kBAAkB,GAAG,MAAM,kBAAkB,CAAC,WAAW,EAAE,CAAC;gBAElE,IAAI,CAAC,WAAW,IAAI,CAAC,kBAAkB,EAAE;oBACvC,MAAM,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,IAAI,CAAC,mCAAuB,CAAC,iBAAiB,CAAC,CAAA,CAAC;oBAEvE,IAAI,0BAAkB,EAAE,EAAE;wBACxB,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;wBACpD,IAAI,KAAK,CAAC,KAAK,EAAE,EAAE;4BACjB,MAAM,8BAAsB,CAAC,IAAI,CAAC,CAAC;yBACpC;qBACF;oBAED,IAAI,iCAAyB,EAAE,EAAE;wBAC/B,MAAM,cAAc,GAAG,MAAM,kBAAkB,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;wBACtE,IAAI,cAAc,CAAC,KAAK,EAAE,EAAE;4BAC1B,MAAM,8BAAsB,CAAC,sBAAsB,CAAC,CAAC;yBACtD;qBACF;iBACF;gBAED,MAAM,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,IAAI,CAAC,mCAAuB,CAAC,eAAe,CAAC,CAAA,CAAC;gBACrE,MAAM,SAAS,GAAG,GAAG,CAAC,OAAQ,CAAC,6BAAiB,CAAC,cAAc,CAAW,CAAC;gBAC3E,MAAM,YAAY,GAAG,MAAA,GAAG,CAAC,eAAe,0CAAE,OAAiB,CAAC;gBAC5D,IAAI,CAAA,MAAA,GAAG,CAAC,OAAO,0CAAE,QAAQ,MAAK,sBAAQ,CAAC,MAAM,EAAE;oBAC5C,GAAG,CAAC,WAAmB,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;iBAC/C;gBAED,MAAM,KAAK,GAAsB,OAAO,CAAC,GAAG,CAAC;gBAC7C,KAAK,CAAC,IAAI,GAAG,0BAAkB,EAAE;oBAC/B,CAAC,CAAC,GAAG,SAAS,CAAC,YAAY,EAAE,GAAG,IAAI,CAAC,SAAS,GAAG,MAAA,OAAO,CAAC,GAAG,CAAC,IAAI,mCAAI,EAAE,EAAE;oBACzE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;gBACrB,MAAM,SAAS,GAAG,iCAAyB,EAAE;oBAC3C,CAAC,CAAC,kBAAkB,CAAC,kBAAkB,EAAE;oBACzC,CAAC,CAAC,uBAAuB,CAAC;gBAC5B,MAAM,iBAAO,CAAC,cAAc,CAC1B,GAAG,CAAC,IAAI,EACR,GAAG,CAAC,WAAW,EACf;oBACE,OAAO,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI;oBACtB,GAAG,EAAE,KAAK;iBACX,EACD,IAAI,EACJ,SAAS,EACT,gBAAgB,EAChB,MAAM,EACN,kBAAkB,EAClB,SAAS,EACT,kBAAkB,EAClB,WAAW,EACX,aAAa,EACb,SAAS,EACT,iBAAiB,EACjB,YAAY,EACZ,eAAe,EACf,KAAK,EACL,2BAA2B,EAC3B,MAAM,EACN,sBAAsB,EACtB,OAAO,CACR,CAAC;gBAEF,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;gBACtD,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;gBAC5C,MAAM,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;gBAEtC,MAAM,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,IAAI,CAAC,mCAAuB,CAAC,cAAc,CAAC,CAAA,CAAC;gBACpE,MAAM,YAAY,GAAG,GAAG,OAAO,iBAAiB,sBAAsB,IAAI,aAAa,uBAAuB,CAAC;gBAC/G,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;gBACzD,IAAI,cAAc,GAAG,QAAQ,CAAC,QAAQ,EAAE,CAAC;gBACzC,cAAc,GAAG,cAAc,CAAC,OAAO,CACrC,yCAAyC,EACzC,yEAAyE,CAC1E,CAAC;gBACF,MAAM,EAAE,CAAC,SAAS,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;gBAEjD,MAAM,gBAAgB,GAAG,IAAI,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;gBACvD,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;gBACrF,WAAW,GAAG,YAAY,CAAC,EAAE,CAAC;gBAC9B,UAAU,CAAC,GAAG,CAAC,wBAAY,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;gBACtD,UAAU,CAAC,GAAG,CAAC,wBAAY,CAAC,sBAAsB,EAAE,WAAW,CAAC,CAAC;gBAEjE,sGAAsG;gBACtG,MAAM,WAAW,GAAG,GAAG,OAAO,iBAAiB,sBAAsB,IAAI,aAAa,YAAY,CAAC;gBACnG,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;gBACxD,IAAI,UAAU,GAAG,QAAQ,CAAC,QAAQ,EAAE,CAAC;gBACrC,UAAU,GAAG,UAAU,CAAC,OAAO,CAC7B,6FAA6F,EAC7F,EAAE,CACH,CAAC;gBACF,UAAU,GAAG,UAAU,CAAC,OAAO,CAC7B,2DAA2D,EAC3D,EAAE,CACH,CAAC;gBACF,MAAM,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;gBAE5C,iBAAiB;gBACjB,MAAM,SAAS,GAAG,GAAG,OAAO,UAAU,CAAC;gBACvC,MAAM,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;gBAE3B,gBAAgB;gBAChB,MAAM,EAAE,CAAC,QAAQ,CACf,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,sBAAsB,CAAC,EACpD,GAAG,gBAAgB,YAAY,CAChC,CAAC;aACH;iBAAM;gBACL,WAAW,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;gBACxB,MAAM,kBAAkB,GAAG,GAAG,aAAa,SAAS,CAAC;gBACrD,MAAM,gBAAgB,GAAG,kBAAkB,GAAG,SAAS,CAAC;gBACxD,MAAM,WAAW,GAAG,gBAAM,CAAC,SAAS,CAAC,MAAA,GAAG,CAAC,eAAe,0CAAE,OAAO,CAAC,CAAC;gBACnE,IAAI,cAAc,GAAG,kBAAkB,CAAC;gBACxC,IAAI,kBAAkB,CAAC,MAAM,GAAG,qBAAS,CAAC,gBAAgB,EAAE;oBAC1D,cAAc,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAC,EAAE,qBAAS,CAAC,gBAAgB,CAAC,CAAC;iBAC9E;gBACD,IAAI,2BAA2B,GAAG,gBAAM,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;gBACvE,IAAI,2BAA2B,CAAC,MAAM,GAAG,qBAAS,CAAC,sBAAsB,EAAE;oBACzE,2BAA2B,GAAG,2BAA2B,CAAC,SAAS,CACjE,CAAC,EACD,qBAAS,CAAC,sBAAsB,CACjC,CAAC;oBACF,MAAM,kBAAkB,GAAG,2BAA2B,CAAC,MAAM,GAAG,CAAC,CAAC;oBAClE,IAAI,2BAA2B,CAAC,kBAAkB,CAAC,KAAK,GAAG,EAAE;wBAC3D,2BAA2B,GAAG,2BAA2B,CAAC,SAAS,CACjE,CAAC,EACD,kBAAkB,CACnB,CAAC;qBACH;iBACF;gBAED,MAAM,EAAE,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;gBAEjC,eAAe;gBACf,MAAM,QAAQ,GAAG,GAAG,gBAAgB,QAAQ,CAAC;gBAE7C,MAAM,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;gBACzB,MAAM,EAAE,CAAC,QAAQ,CACf,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,iCAAiC,CAAC,EAC/D,GAAG,QAAQ,IAAI,WAAW,YAAY,CACvC,CAAC;gBACF,MAAM,EAAE,CAAC,QAAQ,CACf,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,mCAAmC,CAAC,EACjE,GAAG,QAAQ,IAAI,WAAW,cAAc,CACzC,CAAC;gBAEF,aAAa;gBACb,MAAM,MAAM,GAAG,GAAG,gBAAgB,MAAM,CAAC;gBACzC,MAAM,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;gBACvB,MAAM,EAAE,CAAC,QAAQ,CACf,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,yBAAyB,CAAC,EACvD,GAAG,MAAM,WAAW,CACrB,CAAC;gBAEF,QAAQ,GAAG,CAAC,OAAQ,CAAC,6BAAiB,CAAC,cAAc,CAAW,EAAE;oBAChE,KAAK,qBAAS,CAAC,cAAc;wBAC3B,EAAE,CAAC,SAAS,CAAC,GAAG,MAAM,aAAa,sBAAsB,EAAE,EAAE;4BAC3D,SAAS,EAAE,IAAI;yBAChB,CAAC,CAAC;wBACH,MAAM,EAAE,CAAC,QAAQ,CACf,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,iDAAiD,CAAC,EAC/E,GAAG,MAAM,aAAa,sBAAsB,IAAI,kBAAkB,cAAc,CACjF,CAAC;wBACF,MAAM,EAAE,CAAC,QAAQ,CACf,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,wCAAwC,CAAC,EACtE,GAAG,MAAM,aAAa,sBAAsB,IAAI,kBAAkB,KAAK,CACxE,CAAC;wBACF,MAAM,EAAE,CAAC,QAAQ,CACf,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,6BAA6B,CAAC,EAC3D,GAAG,gBAAgB,eAAe,CACnC,CAAC;wBACF,MAAM;oBACR,KAAK,qBAAS,CAAC,eAAe;wBAC5B,MAAM,YAAY,GAAG,GAAG,MAAM,aAAa,sBAAsB,aAAa,CAAC;wBAC/E,EAAE,CAAC,SAAS,CAAC,YAAY,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;wBAChD,MAAM,EAAE,CAAC,QAAQ,CACf,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,yCAAyC,CAAC,EACvE,GAAG,MAAM,aAAa,sBAAsB,IAAI,kBAAkB,KAAK,CACxE,CAAC;wBACF,MAAM,EAAE,CAAC,QAAQ,CACf,IAAI,CAAC,OAAO,CACV,cAAc,EACd,wDAAwD,CACzD,EACD,GAAG,YAAY,IAAI,aAAa,cAAc,CAC/C,CAAC;wBACF,MAAM,EAAE,CAAC,QAAQ,CACf,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,gDAAgD,CAAC,EAC9E,GAAG,YAAY,IAAI,aAAa,MAAM,CACvC,CAAC;wBACF,MAAM,EAAE,CAAC,QAAQ,CACf,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,qDAAqD,CAAC,EACnF,GAAG,YAAY,KAAK,aAAa,UAAU,CAC5C,CAAC;wBACF,MAAM,EAAE,CAAC,QAAQ,CACf,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,8BAA8B,CAAC,EAC5D,GAAG,gBAAgB,eAAe,CACnC,CAAC;wBACF,MAAM;iBACT;gBAED,MAAM,EAAE,CAAC,IAAI,CACX,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,oBAAoB,CAAC,EAClD,GAAG,MAAM,aAAa,sBAAsB,MAAM,CACnD,CAAC;gBACF,MAAM,EAAE,CAAC,IAAI,CACX,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,mDAAmD,CAAC,EACjF,GAAG,MAAM,aAAa,sBAAsB,IAAI,kBAAkB,gBAAgB,CACnF,CAAC;gBAEF,gBAAgB;gBAChB,MAAM,EAAE,CAAC,IAAI,CACX,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,mBAAmB,CAAC,EACjD,GAAG,gBAAgB,SAAS,CAC7B,CAAC;gBAEF,cAAc;gBACd,MAAM,EAAE,CAAC,QAAQ,CACf,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,sBAAsB,CAAC,EACpD,GAAG,gBAAgB,YAAY,CAChC,CAAC;gBACF,MAAM,EAAE,CAAC,QAAQ,CACf,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,uBAAuB,CAAC,EACrD,GAAG,gBAAgB,aAAa,CACjC,CAAC;gBACF,MAAM,EAAE,CAAC,QAAQ,CACf,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,wBAAwB,CAAC,EACtD,GAAG,gBAAgB,cAAc,CAClC,CAAC;gBACF,MAAM,EAAE,CAAC,QAAQ,CACf,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,0BAA0B,CAAC,EACxD,GAAG,gBAAgB,gBAAgB,CACpC,CAAC;gBACF,MAAM,EAAE,CAAC,QAAQ,CACf,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,wBAAwB,CAAC,EACtD,GAAG,gBAAgB,cAAc,CAClC,CAAC;gBAEF,yBAAyB;gBACzB,UAAU,CAAC,GAAG,CAAC,wBAAY,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;gBAC1D,UAAU,CAAC,GAAG,CAAC,wBAAY,CAAC,sBAAsB,EAAE,sBAAsB,CAAC,CAAC;gBAC5E,UAAU,CAAC,GAAG,CAAC,wBAAY,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC;gBACpE,UAAU,CAAC,GAAG,CAAC,wBAAY,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,CAAC;gBAChE,UAAU,CAAC,GAAG,CAAC,wBAAY,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;gBACtD,UAAU,CAAC,GAAG,CAAC,wBAAY,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;gBACtD,UAAU,CAAC,GAAG,CAAC,wBAAY,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC;gBAC5D,UAAU,CAAC,GAAG,CACZ,wBAAY,CAAC,oBAAoB,EACjC,GAAG,CAAC,OAAQ,CAAC,6BAAiB,CAAC,YAAY,CAAW,CACvD,CAAC;gBACF,UAAU,CAAC,GAAG,CAAC,wBAAY,CAAC,sBAAsB,EAAE,WAAW,CAAC,CAAC;gBACjE,UAAU,CAAC,GAAG,CAAC,wBAAY,CAAC,2BAA2B,EAAE,2BAA2B,CAAC,CAAC;gBAEtF,MAAM,aAAK,CAAC,SAAS,CAAC,gBAAgB,EAAE,UAAU,CAAC,CAAC;aACrD;YAED,MAAM,YAAY,GAAG,MAAM,uBAAe,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACrD,IAAI,6BAAoB,EAAE,EAAE;gBAC1B,MAAM,aAAK,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,yCAA6B,CAAC,EAAE,UAAU,CAAC,CAAC;gBAE1F,MAAM,mBAAmB,GAAG,IAAI,oCAAuB,EAAE,CAAC;gBAC1D,MAAM,yBAAyB,GAA4B,EAAE,CAAC;gBAC9D,MAAM,mBAAmB,GAAe;oBACtC,QAAQ,EAAE,WAAW;oBACrB,IAAI,EAAE,WAAW;oBACjB,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,4BAAgB,CAAC,kBAAkB,EAAE,WAAW,EAAE,WAAW,CAAC;oBACtF,UAAU,EAAE,4BAAgB,CAAC,WAAW;oBACxC,MAAM,EAAE,CAAC,UAAU,CAAC;iBACrB,CAAC;gBACF,MAAM,yBAAyB,GAAqB;oBAClD,gBAAgB,EAAE,IAAI,CAAC,MAAM,CAC3B,4BAAgB,CAAC,wBAAwB,EACzC,WAAW,EACX,WAAW,CACZ;oBACD,sBAAsB,EAAE,IAAI;oBAC5B,MAAM,EAAE,CAAC,MAAM,CAAC;iBACjB,CAAC;gBACF,yBAAyB,CAAC,IAAI,CAC5B;oBACE,IAAI,EAAE,WAAW;oBACjB,OAAO,EAAE,mBAAmB;iBAC7B,EACD;oBACE,IAAI,EAAE,iBAAiB;oBACvB,OAAO,EAAE,yBAAyB;iBACnC,CACF,CAAC;gBAEF,MAAM,iBAAiB,GAAG,0BAAe,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;gBACrD,KAAK,MAAM,UAAU,IAAI,yBAAyB,EAAE;oBAClD,MAAM,SAAS,GAAG,MAAM,mBAAmB,CAAC,gBAAgB,CAC1D,iBAAiB,CAAC,OAAO,EACzB,iBAAiB,CAAC,MAAM,EACxB,UAAU,CACX,CAAC;oBACF,IAAI,SAAS,CAAC,KAAK,EAAE;wBAAE,OAAO,iBAAG,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;iBACpD;aACF;iBAAM;gBACL,MAAM,aAAK,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,6BAAiB,CAAC,EAAE,UAAU,CAAC,CAAC;gBAC9E,MAAM,aAAK,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,0BAAc,CAAC,EAAE,UAAU,CAAC,CAAC;aAC5E;YACD,MAAM,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,GAAG,CAAC,IAAI,CAAC,CAAA,CAAC;YACjC,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;SACtB;QAAC,OAAO,KAAK,EAAE;YACd,IAAK,KAAa,CAAC,IAAI,KAAK,yBAAyB,EAAE;gBACrD,MAAM,eAAe,GAAG,aAAK,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;gBACtD,MAAM,gBAAgB,GAAG,aAAK,CAAC,iBAAiB,CAAC,iCAAiC,CAAC,CAAC;gBACpF,MAAM,MAAM,GAAG,qBAAS,CAAC,iBAAiB,EAAE,CAAC;gBAC7C,MAAM,OAAO,GAAG,mCAAgB,CAAC,iBAAiB,EAAE,CAAC;gBACrD,MAAM,SAAS,GACb,eAAe,KAAK,SAAS;oBAC3B,CAAC,CAAC,sBAAsB;oBACxB,CAAC,CAAC,6BAA6B,eAAe,EAAE,CAAC;gBACrD,MAAM,gBAAgB,GACpB,gBAAgB,KAAK,SAAS;oBAC5B,CAAC,CAAC,mDAAmD;oBACrD,CAAC,CAAC,0DAA0D,eAAe,EAAE,CAAC;gBAClF,MAAA,GAAG,CAAC,WAAW,0CAAE,KAAK,CACpB,2NAA2N,SAAS,OAAO,gBAAgB,EAAE,CAC9P,CAAC;gBACF,MAAA,GAAG,CAAC,WAAW,0CAAE,KAAK,CACpB,kCAAkC,MAAM,CAAC,WAAW,IAAI,OAAO,CAAC,WAAW,EAAE,CAC9E,CAAC;aACH;YACD,MAAM,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,GAAG,CAAC,KAAK,CAAC,CAAA,CAAC;YAClC,OAAO,iBAAG,CAAC,qBAAa,CAAC,KAAK,CAAC,CAAC,CAAC;SAClC;IACH,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,GAAkB;;QAC7C,MAAM,eAAe,GAAG,MAAM,gCAAc,CAAC,6BAA6B,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACnF,IAAI,CAAA,MAAA,GAAG,CAAC,OAAO,0CAAE,QAAQ,MAAK,sBAAQ,CAAC,MAAM,EAAE;YAC5C,GAAG,CAAC,WAAmB,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;SAC/C;QACD,IAAI;YACF,MAAM,aAAa,GAAG,GAAG,GAAG,CAAC,IAAI,OAAO,CAAC;YACzC,MAAM,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,IAAI,CAAC,oCAAwB,CAAC,UAAU,CAAC,CAAA,CAAC;YACjE,MAAM,aAAK,CAAC,OAAO,CAAC,aAAa,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;YACjF,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC;YACxE,MAAM,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,IAAI,CAAC,oCAAwB,CAAC,UAAU,CAAC,CAAA,CAAC;YACjE,MAAM,aAAK,CAAC,OAAO,CACjB,GAAG,WAAW,2BAA2B,EACzC,MAAM,EACN,aAAa,EACb,GAAG,CAAC,WAAW,EACf,IAAI,CACL,CAAC;YACF,MAAM,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,IAAI,CAAC,oCAAwB,CAAC,WAAW,CAAC,CAAA,CAAC;YAClE,MAAM,aAAK,CAAC,OAAO,CACjB,GAAG,WAAW,qCAAqC,EACnD,MAAM,EACN,aAAa,EACb,GAAG,CAAC,WAAW,EACf,IAAI,CACL,CAAC;YACF,MAAM,gCAAc,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;YAEhD,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAC1D,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC,EAAE;gBAC7C,MAAM,wBAAgB,CAAC,iBAAiB,CAAC,CAAC;aAC3C;YAED,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,GAAG,CAAC,CAAC;YAE9D,IAAI,CAAA,MAAA,GAAG,CAAC,OAAO,0CAAE,QAAQ,MAAK,sBAAQ,CAAC,GAAG,EAAE;gBAC1C,MAAM,QAAQ,GAAG;oBACf;wBACE,OAAO,EAAE,oDAAoD;wBAC7D,KAAK,EAAE,oBAAM,CAAC,YAAY;qBAC3B;oBACD,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,oBAAM,CAAC,cAAc,EAAE;iBAC/C,CAAC;gBACF,MAAA,GAAG,CAAC,EAAE,0CAAE,WAAW,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;aAC9C;iBAAM;gBACL,MAAM,QAAQ,GAAG,kCAAkB,CAAC,0BAA0B,EAAE,GAAG,CAAC,CAAC;gBACrE,MAAA,GAAG,CAAC,EAAE,0CAAE,WAAW,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;aACpD;YACD,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;SACtB;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,gCAAc,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;YACjD,OAAO,iBAAG,CAAC,2BAAmB,CAAC,KAAK,CAAC,CAAC,CAAC;SACxC;IACH,CAAC;IAEM,KAAK,CAAC,SAAS,CAAC,GAAkB;QACvC,OAAO,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;IAClC,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,GAAkB;;QACpC,MAAM,eAAe,GAAG,MAAM,gCAAc,CAAC,0BAA0B,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAChF,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,IAAI;YACF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;YACzC,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE;gBAClB,OAAO,MAAM,CAAC;aACf;YACD,qBAAS,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAEnC,MAAM,QAAQ,GAAG,MAAM,CAAA,MAAA,GAAG,CAAC,uBAAuB,0CAAE,cAAc,EAAE,CAAA,CAAC;YACrE,IAAI,CAAC,QAAQ,EAAE;gBACb,OAAO,iBAAG,CAAC,8BAAsB,EAAE,CAAC,CAAC;aACtC;YAED,IAAI,cAAc,GAAG,MAAM,qBAAS,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;YACjE,IAAI,cAAc,EAAE;gBAClB,qBAAS,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;aACtC;iBAAM;gBACL,MAAM,GAAG,GAAG,MAAM,CAAA,MAAA,GAAG,CAAC,EAAE,0CAAE,WAAW,CACnC,MAAM,EACN,kCAAkB,CAAC,qCAAqC,EAAE,MAAM,CAAC,KAAK,CAAC,EACvE,IAAI,EACJ,IAAI,EACJ,qBAAS,CAAC,SAAS,CACpB,CAAA,CAAC;gBACF,MAAM,OAAO,GAAG,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,EAAE,EAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;gBACpD,QAAQ,OAAO,EAAE;oBACf,KAAK,IAAI;wBACP,IAAI;4BACF,MAAM,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,IAAI,CAAC,iCAAqB,CAAC,kBAAkB,CAAC,CAAA,CAAC;4BACtE,MAAM,qBAAS,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;yBAC5C;wBAAC,OAAO,CAAM,EAAE;4BACf,OAAO,iBAAG,CAAC,mCAA2B,CAAC,CAAC,CAAC,CAAC,CAAC;yBAC5C;wBACD,IAAI,KAAK,GAAG,CAAC,CAAC;wBACd,cAAc,GAAG,MAAM,qBAAS,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;wBAC7D,OAAO,cAAc,IAAI,IAAI,IAAI,KAAK,GAAG,qBAAS,CAAC,qBAAqB,EAAE;4BACxE,MAAA,GAAG,CAAC,WAAW,0CAAE,OAAO,CAAC,uCAAuC,KAAK,EAAE,CAAC,CAAC;4BACzE,MAAM,aAAK,CAAC,qBAAS,CAAC,wBAAwB,CAAC,CAAC;4BAChD,cAAc,GAAG,MAAM,qBAAS,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;4BAC7D,KAAK,IAAI,CAAC,CAAC;yBACZ;wBACD,IAAI,cAAc,EAAE;4BAClB,qBAAS,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;4BACrC,MAAA,GAAG,CAAC,WAAW,0CAAE,IAAI,CACnB,iCAAiC,cAAc,gDAAgD,CAChG,CAAC;4BACF,MAAM,aAAK,CAAC,qBAAS,CAAC,uBAAuB,CAAC,CAAC;yBAChD;6BAAM;4BACL,OAAO,iBAAG,CACR,mCAA2B,CACzB,IAAI,KAAK,CAAC,kCAAkB,CAAC,kCAAkC,CAAC,CAAC,CAClE,CACF,CAAC;yBACH;wBACD,MAAM;oBACR,KAAK,qBAAS,CAAC,SAAS;wBACtB,MAAA,GAAG,CAAC,EAAE,0CAAE,OAAO,CAAC,qBAAS,CAAC,wBAAwB,CAAC,CAAC;wBACpD,OAAO,gBAAE,CAAC,6BAAe,CAAC,CAAC;oBAC7B;wBACE,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;iBACxB;aACF;YAED,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACnD,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,EAAE;gBACtC,OAAO,iBAAG,CAAC,wBAAgB,CAAC,UAAU,CAAC,CAAC,CAAC;aAC1C;YAED,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC;YAC7C,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;YAC5C,IAAI;gBACF,MAAM,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,IAAI,CAAC,iCAAqB,CAAC,eAAe,CAAC,CAAA,CAAC;gBACnE,MAAM,qBAAS,CAAC,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;aAC7D;YAAC,OAAO,CAAM,EAAE;gBACf,IAAI,CAAA,MAAA,CAAC,CAAC,QAAQ,0CAAE,MAAM,MAAK,GAAG,EAAE;oBAC9B,MAAA,GAAG,CAAC,EAAE,0CAAE,WAAW,CACjB,OAAO,EACP,kCAAkB,CAAC,iCAAiC,EAAE,cAAe,CAAC,EACtE,KAAK,EACL,IAAI,CACL,CAAC;oBACF,OAAO,iBAAG,CAAC,mCAA2B,CAAC,cAAe,CAAC,CAAC,CAAC;iBAC1D;qBAAM;oBACL,OAAO,iBAAG,CAAC,mCAA2B,CAAC,CAAC,CAAC,CAAC,CAAC;iBAC5C;aACF;YAED,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAC5C,MAAM,qBAAS,CAAC,gBAAgB,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;YAElD,MAAM,QAAQ,GAAG,kCAAkB,CACjC,2BAA2B,EAC3B,UAAU,EACV,cAAc,EACd,cAAc,CACf,CAAC;YACF,IAAI,CAAA,MAAA,GAAG,CAAC,OAAO,0CAAE,QAAQ,MAAK,sBAAQ,CAAC,GAAG,EAAE;gBAC1C,MAAA,GAAG,CAAC,EAAE,0CAAE,WAAW,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;aAC9C;iBAAM;gBACL,MAAA,GAAG,CAAC,EAAE,0CAAE,WAAW,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;aACpD;YACD,OAAO,GAAG,IAAI,CAAC;YACf,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;SACtB;gBAAS;YACR,MAAM,gCAAc,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;SACjD;IACH,CAAC;IAEO,KAAK,CAAC,SAAS,CAAC,GAAkB;;QACxC,MAAM,UAAU,GAAG,MAAM,CAAA,MAAA,GAAG,CAAC,kBAAkB,0CAAE,cAAc,EAAE,CAAA,CAAC;QAClE,IAAI,CAAC,UAAU,EAAE;YACf,OAAO,iBAAG,CAAC,gCAAwB,EAAE,CAAC,CAAC;SACxC;QAED,MAAM,SAAS,GAAG,MAAM,CAAA,MAAA,GAAG,CAAC,kBAAkB,0CAAE,aAAa,EAAE,CAAA,CAAC;QAChE,MAAM,QAAQ,GAAI,SAAiB,CAAC,WAAW,CAAC;QAEhD,MAAM,QAAQ,GAAG,eAAK,CAAC,MAAM,CAAC;YAC5B,OAAO,EAAE,kCAAkC;SAC5C,CAAC,CAAC;QACH,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC,GAAG,UAAU,UAAU,EAAE,CAAC;QAE3E,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,IAAI;YACF,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;YAC7D,IAAI,GAAG,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE;gBACtC,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC;aAC1B;iBAAM;gBACL,OAAO,iBAAG,CAAC,4BAAoB,CAAC,QAAQ,CAAC,CAAC,CAAC;aAC5C;SACF;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,iBAAG,CAAC,4BAAoB,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC;SAC/C;QACD,OAAO,gBAAE,CAAC,MAAM,CAAC,CAAC;IACpB,CAAC;IAEO,KAAK,CAAC,UAAU,CAAC,IAAY;QACnC,MAAM,cAAc,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,GAAG,IAAI,oCAAoC,CAAC,CAAC;QACtF,MAAM,iBAAiB,GAAG,GAAG,IAAI,oBAAoB,cAAc,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC;QAC1F,OAAO,iBAAiB,CAAC;IAC3B,CAAC;IAEO,KAAK,CAAC,QAAQ,CAAC,IAAY;QACjC,MAAM,cAAc,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,GAAG,IAAI,oCAAoC,CAAC,CAAC;QACtF,MAAM,KAAK,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC;QAC/C,OAAO,KAAK,CAAC;IACf,CAAC;IAEO,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,QAAgB;QACnD,IAAI,WAAmB,CAAC;QACxB,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QAClC,IACE,QAAQ,KAAK,OAAO;YACpB,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,cAAc,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,EAC9E;YACA,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;SAClE;aAAM,IACL,CAAC,QAAQ,KAAK,OAAO,IAAI,QAAQ,KAAK,QAAQ,CAAC;YAC/C,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,EAC1E;YACA,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;SAC9D;aAAM;YACL,WAAW,GAAG,MAAM,CAAC;SACtB;QACD,OAAO,WAAW,CAAC;IACrB,CAAC;CACF;AA5jBD,wCA4jBC"}
|
|
1
|
+
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../src/plugins/resource/spfx/plugin.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.7.0
|
|
3
|
+
"version": "1.7.0",
|
|
4
4
|
"main": "build/index.js",
|
|
5
5
|
"types": "build/index.d.ts",
|
|
6
6
|
"license": "MIT",
|
|
@@ -64,7 +64,7 @@
|
|
|
64
64
|
"@azure/storage-blob": "^12.7.0",
|
|
65
65
|
"@dbpiper/timer": "1.0.0-beta.2",
|
|
66
66
|
"@feathersjs/hooks": "^0.6.5",
|
|
67
|
-
"@microsoft/teamsfx-api": "^0.17.2
|
|
67
|
+
"@microsoft/teamsfx-api": "^0.17.2",
|
|
68
68
|
"@npmcli/arborist": "^4.2.0",
|
|
69
69
|
"@types/jwt-decode": "3.1.0",
|
|
70
70
|
"@types/proper-lockfile": "^4.1.1",
|
|
@@ -183,7 +183,7 @@
|
|
|
183
183
|
"resource/**/*",
|
|
184
184
|
"templates/**/*"
|
|
185
185
|
],
|
|
186
|
-
"gitHead": "
|
|
186
|
+
"gitHead": "98782ce0bca09d3a36bed239017ff81ed6994c0e",
|
|
187
187
|
"publishConfig": {
|
|
188
188
|
"access": "public"
|
|
189
189
|
},
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
@@ -71,7 +71,6 @@ Version|Date|Comments
|
|
|
71
71
|
Start debugging the project by hitting the `F5` key in Visual Studio Code. Alternatively use the `Run and Debug Activity Panel` in Visual Studio Code and click the `Start Debugging` green arrow button.
|
|
72
72
|
|
|
73
73
|
- `Teams workbench` is the default debug configuration. Using this configuration, you can install the SPFx app within Teams context as a Teams app.
|
|
74
|
-
- `Local workbench` providing a SPFx local workbench to view and debug the webpart locally on your machine before actually deploying solutions to the tenant.
|
|
75
74
|
- `Hosted workbench`. You need to navigate to [launch.json](.vscode/launch.json), replace `enter-your-SharePoint-site` with your SharePoint site, eg. `https://{your-tenant-name}.sharepoint.com/sites/{your-team-name}/_layouts/workbench.aspx`.
|
|
76
75
|
|
|
77
76
|
## References
|