Skip to content
This repository was archived by the owner on Jan 15, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 22 additions & 18 deletions common/config/rush/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/chatdown/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"@microsoft/bf-cli-command": "1.0.0",
"@oclif/command": "~1.5.19",
"@oclif/config": "~1.13.3",
"@oclif/errors": "~1.2.2",
"botframework-schema": "^4.5.1",
"chalk": "2.4.1",
"cli-table3": "^0.5.1",
Expand All @@ -17,9 +18,8 @@
"latest-version": "^4.0.0",
"mime-types": "^2.1.18",
"minimist": "^1.2.0",
"node-fetch": "~2.6.0",
"please-upgrade-node": "^3.0.1",
"request": "^2.88.0",
"request-promise-native": "^1.0.5",
"semver": "^5.5.1",
"tslib": "^1.9.3",
"window-size": "^1.1.0"
Expand Down
7 changes: 3 additions & 4 deletions packages/chatdown/utils/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const ChannelAccount = require('./serializable/channelAccount');
const ConversationAccount = require('./serializable/conversationAccount');
const Attachment = require('./serializable/attachment');
const chalk = require('chalk');
const request = require('request-promise-native');
const request = require('node-fetch');
const NEWLINE = require('os').EOL;
let activityId = 1;

Expand Down Expand Up @@ -482,9 +482,8 @@ async function addAttachment(activity, arg) {
contentType = mime.lookup(contentUrl) || cardContentTypes[path.extname(contentUrl)];

if (!contentType && contentUrl && contentUrl.indexOf('http') == 0) {
let options = { method: 'HEAD', uri: contentUrl };
let response = await request(options);
contentType = response['content-type'].split(';')[0];
let response = await request(contentUrl, {method: 'HEAD'});
contentType = response.headers.get('content-type').split(';')[0];
}
}

Expand Down
2 changes: 0 additions & 2 deletions packages/qnamaker/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@
"pascal-case": "^2.0.1",
"readline": "^1.3.0",
"readline-sync": "^1.4.9",
"request": "^2.88.0",
"request-promise-native": "^1.0.5",
"rimraf": "^2.6.3",
"semver": "^5.5.1",
"tslib": "^1.10.0",
Expand Down
1 change: 0 additions & 1 deletion packages/qnamaker/utils/api/qnaLegacy.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
* Copyright(c) Microsoft Corporation.All rights reserved.
* Licensed under the MIT License.
*/
const request = require('request-promise-native');

const { ServiceBase } = require('./serviceBase');
class QnaLegacy extends ServiceBase {
Expand Down