diff --git a/CHANGELOG.md b/CHANGELOG.md index c042bfb99..1a48ef543 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 @@ -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) diff --git a/__tests__/happy.uploadAttachmentStreams.js b/__tests__/happy.uploadAttachmentStreams.js index 386452d6f..c0a2db634 100644 --- a/__tests__/happy.uploadAttachmentStreams.js +++ b/__tests__/happy.uploadAttachmentStreams.js @@ -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; @@ -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', diff --git a/__tests__/happy.uploadAttachments.js b/__tests__/happy.uploadAttachments.js index 9e9ff6c7d..317241db4 100644 --- a/__tests__/happy.uploadAttachments.js +++ b/__tests__/happy.uploadAttachments.js @@ -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; @@ -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!', diff --git a/package-lock.json b/package-lock.json index c101fef95..7c6148620 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2734,9 +2734,9 @@ } }, "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true }, "ansi-styles": { @@ -3745,11 +3745,11 @@ "dev": true }, "cross-fetch": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.4.tgz", - "integrity": "sha512-1eAtFWdIubi6T4XPy6ei9iUFoKpUkIF971QLN8lIvvvwueI65+Nw5haMNKUwfJxabqlIIDODJKGrQ66gxC0PbQ==", + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz", + "integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==", "requires": { - "node-fetch": "2.6.1" + "node-fetch": "2.6.7" } }, "cross-spawn": { @@ -4588,9 +4588,9 @@ } }, "follow-redirects": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz", - "integrity": "sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==", + "version": "1.14.7", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz", + "integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==", "dev": true }, "for-in": { @@ -4965,14 +4965,34 @@ } }, "http-signature": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", - "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.3.6.tgz", + "integrity": "sha512-3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw==", "dev": true, "requires": { "assert-plus": "^1.0.0", - "jsprim": "^1.2.2", - "sshpk": "^1.7.0" + "jsprim": "^2.0.2", + "sshpk": "^1.14.1" + }, + "dependencies": { + "json-schema": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz", + "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==", + "dev": true + }, + "jsprim": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-2.0.2.tgz", + "integrity": "sha512-gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ==", + "dev": true, + "requires": { + "assert-plus": "1.0.0", + "extsprintf": "1.3.0", + "json-schema": "0.4.0", + "verror": "1.10.0" + } + } } }, "https-proxy-agent": { @@ -7958,12 +7978,6 @@ "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", "dev": true }, - "json-schema": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", - "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", - "dev": true - }, "json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", @@ -7985,18 +7999,6 @@ "minimist": "^1.2.5" } }, - "jsprim": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", - "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", - "dev": true, - "requires": { - "assert-plus": "1.0.0", - "extsprintf": "1.3.0", - "json-schema": "0.2.3", - "verror": "1.10.0" - } - }, "jwt-decode": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-3.1.2.tgz", @@ -8253,9 +8255,9 @@ } }, "mixme": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mixme/-/mixme-0.5.1.tgz", - "integrity": "sha512-NaeZIckeBFT7i0XBEpGyFcAE0/bLcQ9MHErTpnU3bLWVE5WZbxG5Y3fDsMxYGifTo5khDA42OquXCC2ngKJB+g==", + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/mixme/-/mixme-0.5.4.tgz", + "integrity": "sha512-3KYa4m4Vlqx98GPdOHghxSdNtTvcP8E0kkaJ5Dlh+h2DRzF7zpuVVcA8B0QpKd11YJeP9QQ7ASkKzOeu195Wzw==", "dev": true }, "mkdirp": { @@ -8401,9 +8403,33 @@ } }, "node-fetch": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", - "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==" + "version": "2.6.7", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", + "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", + "requires": { + "whatwg-url": "^5.0.0" + }, + "dependencies": { + "tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=" + }, + "webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=" + }, + "whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=", + "requires": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + } + } }, "node-int64": { "version": "0.4.0", @@ -9935,9 +9961,9 @@ "dev": true }, "tmpl": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz", - "integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", + "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==", "dev": true }, "to-fast-properties": { diff --git a/package.json b/package.json index 8286ec353..9a5f44c2d 100644 --- a/package.json +++ b/package.json @@ -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" @@ -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",