@microsoft/teamsfx-core 1.9.0-rc.3 → 1.9.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/deps-checker/internal/funcToolChecker.d.ts.map +1 -1
- package/build/common/deps-checker/internal/funcToolChecker.js +3 -0
- package/build/common/deps-checker/internal/funcToolChecker.js.map +1 -1
- package/build/common/templates-config.json +1 -1
- package/build/plugins/solution/fx-solution/debug/util/tasksNext.js +2 -2
- 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.command-and-response.zip +0 -0
- package/templates/fallback/bot.js.default.zip +0 -0
- package/templates/fallback/bot.js.m365.zip +0 -0
- package/templates/fallback/bot.js.notification-function-base.zip +0 -0
- package/templates/fallback/bot.js.notification-restify.zip +0 -0
- package/templates/fallback/bot.js.notification-trigger-http.zip +0 -0
- package/templates/fallback/bot.js.notification-trigger-timer.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.m365.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/aad/auth/bot/README.md +3 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"funcToolChecker.d.ts","sourceRoot":"","sources":["../../../../src/common/deps-checker/internal/funcToolChecker.ts"],"names":[],"mappings":"AAMA,OAAO,EAAoB,MAAM,EAAW,MAAM,wBAAwB,CAAC;AAI3E,OAAO,EAAE,gBAAgB,EAA0B,MAAM,cAAc,CAAC;AAIxE,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAGvD,oBAAY,WAAW;IACrB,EAAE,MAAM;IACR,EAAE,MAAM;IACR,EAAE,MAAM;IACR,EAAE,MAAM;CACT;AAWD,qBAAa,eAAgB,YAAW,WAAW;IACjD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAa;IACrC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAgB;gBAE/B,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa;IAK3C,WAAW,IAAI,OAAO,CAAC,QAAQ,CAAC;IAahC,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;IAmBrD,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"funcToolChecker.d.ts","sourceRoot":"","sources":["../../../../src/common/deps-checker/internal/funcToolChecker.ts"],"names":[],"mappings":"AAMA,OAAO,EAAoB,MAAM,EAAW,MAAM,wBAAwB,CAAC;AAI3E,OAAO,EAAE,gBAAgB,EAA0B,MAAM,cAAc,CAAC;AAIxE,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAGvD,oBAAY,WAAW;IACrB,EAAE,MAAM;IACR,EAAE,MAAM;IACR,EAAE,MAAM;IACR,EAAE,MAAM;CACT;AAWD,qBAAa,eAAgB,YAAW,WAAW;IACjD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAa;IACrC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAgB;gBAE/B,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa;IAK3C,WAAW,IAAI,OAAO,CAAC,QAAQ,CAAC;IAahC,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;IAmBrD,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAoB/B,uBAAuB,IAAI,OAAO,CAAC,OAAO,CAAC;IAsB3C,qBAAqB,IAAI,OAAO,CAAC,OAAO,CAAC;IAKzC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;YAqBvB,uBAAuB;YAcvB,QAAQ;IAyBtB,OAAO,CAAC,iBAAiB;IAQzB,OAAO,CAAC,MAAM,CAAC,qBAAqB;IAIpC,OAAO,CAAC,MAAM,CAAC,eAAe;IAI9B,OAAO,CAAC,MAAM,CAAC,uBAAuB;IAUzB,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;IAUhC,yBAAyB,IAAI,MAAM,EAAE;YAO9B,gBAAgB;YAYhB,sBAAsB;YAgBtB,MAAM;YAoBN,OAAO;YAWP,kBAAkB;YAWlB,WAAW;YAYX,qBAAqB;IAyCnC,OAAO,CAAC,cAAc;YAIR,mBAAmB;CAqBlC;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI,CAmBxE"}
|
|
@@ -71,6 +71,9 @@ class FuncToolChecker {
|
|
|
71
71
|
this._telemetry.sendEvent(telemetry_1.DepsCheckerEvent.funcAlreadyInstalled, {
|
|
72
72
|
"global-func-version": `${await this.queryGlobalFuncVersion()}`,
|
|
73
73
|
});
|
|
74
|
+
if (!isPortableFuncInstalled) {
|
|
75
|
+
await this.cleanup();
|
|
76
|
+
}
|
|
74
77
|
}
|
|
75
78
|
if (isPortableFuncInstalled) {
|
|
76
79
|
// avoid missing this event after first installation 60 days
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"funcToolChecker.js","sourceRoot":"","sources":["../../../../src/common/deps-checker/internal/funcToolChecker.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,qDAA+B;AAC/B,mDAA6B;AAC7B,+CAAyB;AACzB,wDAA2E;AAE3E,mDAAuD;AACvD,iEAAqE;AACrE,4CAAwE;AACxE,6CAA0C;AAC1C,2CAAoD;AACpD,qDAA2E;AAI3E,iDAA+C;AAE/C,IAAY,WAKX;AALD,WAAY,WAAW;IACrB,uBAAQ,CAAA;IACR,uBAAQ,CAAA;IACR,uBAAQ,CAAA;IACR,uBAAQ,CAAA;AACV,CAAC,EALW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAKtB;AAED,MAAM,eAAe,GAAG,4BAA4B,CAAC;AACrD,MAAM,YAAY,GAAG,4BAA4B,CAAC;AAElD,MAAM,cAAc,GAAG,WAAW,CAAC,EAAE,CAAC;AACtC,MAAM,iBAAiB,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;AAC3C,MAAM,eAAe,GAAG,GAAG,YAAY,MAAM,WAAW,CAAC,EAAE,GAAG,CAAC;AAE/D,MAAM,OAAO,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;AAE9B,MAAa,eAAe;IAI1B,YAAY,MAAkB,EAAE,SAAwB;QACtD,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IAC9B,CAAC;IAEM,KAAK,CAAC,WAAW;QACtB,OAAO,OAAO,CAAC,OAAO,CAAC;YACrB,IAAI,EAAE,YAAY;YAClB,gBAAgB,EAAE,KAAK;YACvB,cAAc,EAAE,cAAc;YAC9B,iBAAiB,EAAE,iBAAiB;YACpC,UAAU,EAAE,CAAC,MAAM,IAAI,CAAC,uBAAuB,EAAE,CAAC;gBAChD,CAAC,CAAC,IAAI,CAAC,yBAAyB,EAAE;gBAClC,CAAC,CAAC,SAAS;YACb,OAAO,EAAE,IAAI,GAAG,EAAkB;SACnC,CAAC,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,OAAO;QAClB,IAAI;YACF,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC,EAAE;gBAC/B,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;aACtB;SACF;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;YACpC,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,OAAO,cAAc,KAAK,GAAG,CAAC,CAAC;YACjE,IAAI,KAAK,YAAY,4BAAgB,EAAE;gBACrC,OAAO,iBAAG,CAAC,KAAK,CAAC,CAAC;aACnB;YACD,OAAO,iBAAG,CAAC,IAAI,4BAAgB,CAAC,KAAK,CAAC,OAAO,EAAE,0BAAe,CAAC,CAAC,CAAC;SAClE;gBAAS;YACR,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;SACxB;QAED,OAAO,gBAAE,CAAC,IAAI,CAAC,CAAC;IAClB,CAAC;IAEM,KAAK,CAAC,WAAW;QACtB,MAAM,qBAAqB,GAAY,MAAM,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAC1E,MAAM,uBAAuB,GAAY,MAAM,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAE9E,IAAI,qBAAqB,EAAE;YACzB,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,4BAAgB,CAAC,oBAAoB,EAAE;gBAC/D,qBAAqB,EAAE,GAAG,MAAM,IAAI,CAAC,sBAAsB,EAAE,EAAE;aAChE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"funcToolChecker.js","sourceRoot":"","sources":["../../../../src/common/deps-checker/internal/funcToolChecker.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "0.
|
|
2
|
+
"version": "^0.7.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",
|
|
@@ -206,7 +206,7 @@ function startBackend(programmingLanguage) {
|
|
|
206
206
|
options: {
|
|
207
207
|
cwd: "${workspaceFolder}/api",
|
|
208
208
|
env: {
|
|
209
|
-
PATH: "${
|
|
209
|
+
PATH: "${command:fx-extension.get-func-path}${env:PATH}",
|
|
210
210
|
},
|
|
211
211
|
},
|
|
212
212
|
presentation: {
|
|
@@ -288,7 +288,7 @@ function startFuncHostedBot(includeFrontend, programmingLanguage) {
|
|
|
288
288
|
options: {
|
|
289
289
|
cwd: "${workspaceFolder}/bot",
|
|
290
290
|
env: {
|
|
291
|
-
PATH: "${
|
|
291
|
+
PATH: "${command:fx-extension.get-func-path}${env:PATH}",
|
|
292
292
|
},
|
|
293
293
|
},
|
|
294
294
|
};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@microsoft/teamsfx-core",
|
|
3
|
-
"version": "1.9.0
|
|
3
|
+
"version": "1.9.0",
|
|
4
4
|
"main": "build/index.js",
|
|
5
5
|
"types": "build/index.d.ts",
|
|
6
6
|
"license": "MIT",
|
|
@@ -65,7 +65,7 @@
|
|
|
65
65
|
"@azure/storage-blob": "^12.7.0",
|
|
66
66
|
"@dbpiper/timer": "1.0.0-beta.2",
|
|
67
67
|
"@feathersjs/hooks": "^0.6.5",
|
|
68
|
-
"@microsoft/teamsfx-api": "^0.19.0
|
|
68
|
+
"@microsoft/teamsfx-api": "^0.19.0",
|
|
69
69
|
"@npmcli/arborist": "^4.2.0",
|
|
70
70
|
"@types/jwt-decode": "3.1.0",
|
|
71
71
|
"@types/proper-lockfile": "^4.1.1",
|
|
@@ -184,7 +184,7 @@
|
|
|
184
184
|
"resource/**/*",
|
|
185
185
|
"templates/**/*"
|
|
186
186
|
],
|
|
187
|
-
"gitHead": "
|
|
187
|
+
"gitHead": "1c8b0a779584dc2858ddb3d9938b24c6f6087ac4",
|
|
188
188
|
"publishConfig": {
|
|
189
189
|
"access": "public"
|
|
190
190
|
},
|
|
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
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
@@ -20,6 +20,8 @@ After you successfully added SSO into your project, Teams Toolkit will create an
|
|
|
20
20
|
|
|
21
21
|
As described above, the Teams Toolkit generated some configuration to set up your application for SSO, but you need to update your application business logic to take advantage of the SSO feature as appropriate.
|
|
22
22
|
|
|
23
|
+
> Note: The following part is for `command and response bot`. For `basic bot`, please refer to the [bot-sso sample](https://aka.ms/bot-sso-sample).
|
|
24
|
+
|
|
23
25
|
## Set up the AAD redirects
|
|
24
26
|
|
|
25
27
|
1. Move the `auth/bot/public` folder to `bot/src`. This folder contains HTML pages that the bot application hosts. When single sign-on flows are initiated with AAD, AAD will redirect the user to these pages.
|
|
@@ -42,7 +44,7 @@ These folder contains three files as reference for sso implementation:
|
|
|
42
44
|
|
|
43
45
|
1. (Optional) Follow the code sample and register your own command with `addCommand` in this file.
|
|
44
46
|
1. Execute the following commands under `bot/`: `npm install isomorphic-fetch`
|
|
45
|
-
1. Execute the following commands under `bot/`: `npm install copyfiles` and replace following line in package.json:
|
|
47
|
+
1. (For ts only) Execute the following commands under `bot/`: `npm install copyfiles` and replace following line in package.json:
|
|
46
48
|
```
|
|
47
49
|
"tsc --build && shx cp -r ./src/adaptiveCards ./lib/src",
|
|
48
50
|
```
|