Skip to content

Bump dependencies #366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
compulim merged 3 commits into from
Feb 1, 2022
Merged

Bump dependencies #366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2d41312
Bump dependencies
compulim Jan 27, 2022
74c700c
Fix tests
compulim Jan 27, 2022
ab576ff
Set timeout to 10s
compulim Jan 27, 2022
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
6 changes: 3 additions & 3 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

### Changed

- Bumped dependencies, by [@compulim](https://github.com/compulim), in PR [#351](https://github.com/microsoft/BotFramework-DirectLineJS/pull/351)
- Bumped dependencies, by [@compulim](https://github.com/compulim), in PR [#351](https://github.com/microsoft/BotFramework-DirectLineJS/pull/351) and PR [#366](https://github.com/microsoft/BotFramework-DirectLineJS/pull/366)
- Production dependencies
- [`@babel/runtime@7.14.8`](https://npmjs.com/package/@babel/runtime)
- [`botframework-streaming@4.14.1`](https://npmjs.com/package/botframework-streaming)
- [`buffer@6.0.3`](https://npmjs.com/package/buffer)
- [`core-js@3.15.2`](https://npmjs.com/package/core-js)
- [`cross-fetch@3.1.4`](https://npmjs.com/package/cross-fetch)
- [`cross-fetch@3.1.5`](https://npmjs.com/package/cross-fetch)
- [`rxjs@5.5.12`](https://npmjs.com/package/rxjs)
- [`url-search-params-polyfill@8.1.1`](https://npmjs.com/package/url-search-params-polyfill)
- Development dependencies
Expand All @@ -48,7 +48,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- [`jest-environment-jsdom@27.0.6`](https://npmjs.com/package/jest-environment-jsdom)
- [`jsdom@16.6.0`](https://npmjs.com/package/jsdom)
- [`nock@13.1.1`](https://npmjs.com/package/nock)
- [`node-fetch@2.6.1`](https://npmjs.com/package/node-fetch)
- [`node-fetch@2.6.7`](https://npmjs.com/package/node-fetch)
- [`restify@8.5.1`](https://npmjs.com/package/restify)
- [`rimraf@3.0.2`](https://npmjs.com/package/rimraf)
- [`simple-update-in@2.2.0`](https://npmjs.com/package/simple-update-in)
Expand Down
6 changes: 4 additions & 2 deletions __tests__/happy.uploadAttachmentStreams.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import postActivity from './setup/postActivity';
import waitForBotToEcho from './setup/waitForBotToEcho';
import waitForConnected from './setup/waitForConnected';

jest.setTimeout(10000);

describe('Happy path', () => {
let unsubscribes;

Expand All @@ -34,10 +36,10 @@ describe('Happy path', () => {
// DirectLine.postActivityWithAttachments support "contentUrl" only but not "content"
attachments: [{
contentType: 'image/jpg',
contentUrl: 'http://dljstestbot.azurewebsites.net/177KB.jpg'
contentUrl: 'https://dljstestbot.azurewebsites.net/177KB.jpg'
}, {
contentType: 'image/jpg',
contentUrl: 'http://dljstestbot.azurewebsites.net/100KB.jpg'
contentUrl: 'https://dljstestbot.azurewebsites.net/100KB.jpg'
}],
text: 'Hello, World!',
type: 'message',
Expand Down
6 changes: 4 additions & 2 deletions __tests__/happy.uploadAttachments.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import postActivity from './setup/postActivity';
import waitForBotToEcho from './setup/waitForBotToEcho';
import waitForConnected from './setup/waitForConnected';

jest.setTimeout(10000);

describe('Happy path', () => {
let unsubscribes;

Expand Down Expand Up @@ -53,11 +55,11 @@ describe('Happy path', () => {
// DirectLine.postActivityWithAttachments support "contentUrl" only but not "content"
attachments: [{
contentType: 'image/jpg',
contentUrl: 'http://dljstestbot.azurewebsites.net/177KB.jpg',
contentUrl: 'https://dljstestbot.azurewebsites.net/177KB.jpg',
thumbnailUrl: 'data:image/png;base64,===177KB.jpg'
}, {
contentType: 'image/png',
contentUrl: 'http://dljstestbot.azurewebsites.net/100KB.jpg',
contentUrl: 'https://dljstestbot.azurewebsites.net/100KB.jpg',
thumbnailUrl: 'data:image/png;base64,===100KB.jpb'
}],
text: 'Hello, World!',
Expand Down
110 changes: 68 additions & 42 deletions package-lock.json
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"botframework-streaming": "4.14.1",
"buffer": "6.0.3",
"core-js": "3.15.2",
"cross-fetch": "3.1.4",
"cross-fetch": "^3.1.5",
"jwt-decode": "3.1.2",
"rxjs": "5.5.12",
"url-search-params-polyfill": "8.1.1"
Expand Down Expand Up @@ -60,7 +60,7 @@
"jest-environment-jsdom": "^27.0.6",
"jsdom": "^16.6.0",
"nock": "^13.1.1",
"node-fetch": "^2.6.1",
"node-fetch": "^2.6.7",
"on-error-resume-next": "^1.1.0",
"restify": "^8.5.1",
"rimraf": "^3.0.2",
Expand Down