From b4f0f3c685f289cd50358d35552752ef9300b759 Mon Sep 17 00:00:00 2001 From: Evan Hahn <69474926+EvanHahn-Signal@users.noreply.github.com> Date: Mon, 14 Sep 2020 12:10:05 -0500 Subject: [PATCH] Upgrade node-fetch to v2.6.1 --- package.json | 5 +- ...tch+2.6.0.patch => node-fetch+2.6.1.patch} | 12 ++-- ts/util/lint/exceptions.json | 62 +++++++++---------- yarn.lock | 25 +++++--- 4 files changed, 58 insertions(+), 46 deletions(-) rename patches/{node-fetch+2.6.0.patch => node-fetch+2.6.1.patch} (88%) diff --git a/package.json b/package.json index e24e4a95f..b1d54b761 100644 --- a/package.json +++ b/package.json @@ -98,7 +98,7 @@ "mkdirp": "0.5.2", "moment": "2.21.0", "mustache": "2.3.0", - "node-fetch": "2.6.0", + "node-fetch": "2.6.1", "node-forge": "0.10.0", "node-gyp": "5.0.3", "normalize-path": "3.0.0", @@ -258,6 +258,9 @@ "webpack-cli": "3.3.7", "webpack-dev-server": "3.8.0" }, + "resolutions": { + "@storybook/react/@storybook/core/node-fetch": "2.6.1" + }, "engines": { "node": "12.13.0" }, diff --git a/patches/node-fetch+2.6.0.patch b/patches/node-fetch+2.6.1.patch similarity index 88% rename from patches/node-fetch+2.6.0.patch rename to patches/node-fetch+2.6.1.patch index 2b85e14b2..63d29f02f 100644 --- a/patches/node-fetch+2.6.0.patch +++ b/patches/node-fetch+2.6.1.patch @@ -1,8 +1,8 @@ diff --git a/node_modules/node-fetch/lib/index.es.js b/node_modules/node-fetch/lib/index.es.js -index 37d022c..22bc369 100644 +index 61906c9..51ee2bd 100644 --- a/node_modules/node-fetch/lib/index.es.js +++ b/node_modules/node-fetch/lib/index.es.js -@@ -1398,6 +1398,9 @@ function fetch(url, opts) { +@@ -1404,6 +1404,9 @@ function fetch(url, opts) { // build request object const request = new Request(url, opts); const options = getNodeRequestOptions(request); @@ -13,10 +13,10 @@ index 37d022c..22bc369 100644 const send = (options.protocol === 'https:' ? https : http).request; const signal = request.signal; diff --git a/node_modules/node-fetch/lib/index.js b/node_modules/node-fetch/lib/index.js -index daa44bc..4aae236 100644 +index 4b241bf..88de03f 100644 --- a/node_modules/node-fetch/lib/index.js +++ b/node_modules/node-fetch/lib/index.js -@@ -1402,6 +1402,9 @@ function fetch(url, opts) { +@@ -1408,6 +1408,9 @@ function fetch(url, opts) { // build request object const request = new Request(url, opts); const options = getNodeRequestOptions(request); @@ -27,10 +27,10 @@ index daa44bc..4aae236 100644 const send = (options.protocol === 'https:' ? https : http).request; const signal = request.signal; diff --git a/node_modules/node-fetch/lib/index.mjs b/node_modules/node-fetch/lib/index.mjs -index e571ea6..7a50519 100644 +index ecf59af..b4af5ff 100644 --- a/node_modules/node-fetch/lib/index.mjs +++ b/node_modules/node-fetch/lib/index.mjs -@@ -1396,6 +1396,9 @@ function fetch(url, opts) { +@@ -1402,6 +1402,9 @@ function fetch(url, opts) { // build request object const request = new Request(url, opts); const options = getNodeRequestOptions(request); diff --git a/ts/util/lint/exceptions.json b/ts/util/lint/exceptions.json index 05a12a968..732b2a0f1 100644 --- a/ts/util/lint/exceptions.json +++ b/ts/util/lint/exceptions.json @@ -10231,113 +10231,113 @@ "rule": "jQuery-append(", "path": "node_modules/node-fetch/lib/index.es.js", "line": "\t\t\t\t\tthis.append(headerName, value);", - "lineNumber": 714, + "lineNumber": 720, "reasonCategory": "falseMatch", - "updated": "2020-08-11T15:42:35.324Z" + "updated": "2020-09-14T16:19:54.461Z" }, { "rule": "jQuery-append(", "path": "node_modules/node-fetch/lib/index.es.js", "line": "\t\t// We don't worry about converting prop to ByteString here as append()", - "lineNumber": 721, + "lineNumber": 727, "reasonCategory": "falseMatch", - "updated": "2020-08-11T15:42:35.324Z" + "updated": "2020-09-14T16:19:54.461Z" }, { "rule": "jQuery-append(", "path": "node_modules/node-fetch/lib/index.es.js", "line": "\t\t\t\t\tthis.append(pair[0], pair[1]);", - "lineNumber": 744, + "lineNumber": 750, "reasonCategory": "falseMatch", - "updated": "2020-08-11T15:42:35.324Z" + "updated": "2020-09-14T16:19:54.461Z" }, { "rule": "jQuery-append(", "path": "node_modules/node-fetch/lib/index.es.js", "line": "\t\t\t\t\tthis.append(key, value);", - "lineNumber": 750, + "lineNumber": 756, "reasonCategory": "falseMatch", - "updated": "2020-08-11T15:42:35.324Z" + "updated": "2020-09-14T16:19:54.461Z" }, { "rule": "jQuery-append(", "path": "node_modules/node-fetch/lib/index.es.js", "line": "\tappend(name, value) {", - "lineNumber": 821, + "lineNumber": 827, "reasonCategory": "falseMatch", - "updated": "2020-08-11T15:42:35.324Z" + "updated": "2020-09-14T16:19:54.461Z" }, { "rule": "jQuery-append(", "path": "node_modules/node-fetch/lib/index.es.js", "line": "\t\t\t\theaders.append('Content-Type', contentType);", - "lineNumber": 1057, + "lineNumber": 1063, "reasonCategory": "falseMatch", - "updated": "2020-08-11T15:42:35.324Z" + "updated": "2020-09-14T16:19:54.461Z" }, { "rule": "jQuery-append(", "path": "node_modules/node-fetch/lib/index.es.js", "line": "\t\t\t\theaders.append('Content-Type', contentType);", - "lineNumber": 1204, + "lineNumber": 1210, "reasonCategory": "falseMatch", - "updated": "2020-08-11T15:42:35.324Z" + "updated": "2020-09-14T16:19:54.461Z" }, { "rule": "jQuery-append(", "path": "node_modules/node-fetch/lib/index.js", "line": "\t\t\t\t\tthis.append(headerName, value);", - "lineNumber": 718, + "lineNumber": 724, "reasonCategory": "falseMatch", - "updated": "2020-08-11T15:42:35.324Z" + "updated": "2020-09-14T16:19:54.461Z" }, { "rule": "jQuery-append(", "path": "node_modules/node-fetch/lib/index.js", "line": "\t\t// We don't worry about converting prop to ByteString here as append()", - "lineNumber": 725, + "lineNumber": 731, "reasonCategory": "falseMatch", - "updated": "2020-08-11T15:42:35.324Z" + "updated": "2020-09-14T16:19:54.461Z" }, { "rule": "jQuery-append(", "path": "node_modules/node-fetch/lib/index.js", "line": "\t\t\t\t\tthis.append(pair[0], pair[1]);", - "lineNumber": 748, + "lineNumber": 754, "reasonCategory": "falseMatch", - "updated": "2020-08-11T15:42:35.324Z" + "updated": "2020-09-14T16:19:54.461Z" }, { "rule": "jQuery-append(", "path": "node_modules/node-fetch/lib/index.js", "line": "\t\t\t\t\tthis.append(key, value);", - "lineNumber": 754, + "lineNumber": 760, "reasonCategory": "falseMatch", - "updated": "2020-08-11T15:42:35.324Z" + "updated": "2020-09-14T16:19:54.461Z" }, { "rule": "jQuery-append(", "path": "node_modules/node-fetch/lib/index.js", "line": "\tappend(name, value) {", - "lineNumber": 825, + "lineNumber": 831, "reasonCategory": "falseMatch", - "updated": "2020-08-11T15:42:35.324Z" + "updated": "2020-09-14T16:19:54.461Z" }, { "rule": "jQuery-append(", "path": "node_modules/node-fetch/lib/index.js", "line": "\t\t\t\theaders.append('Content-Type', contentType);", - "lineNumber": 1061, + "lineNumber": 1067, "reasonCategory": "falseMatch", - "updated": "2020-08-11T15:42:35.324Z" + "updated": "2020-09-14T16:19:54.461Z" }, { "rule": "jQuery-append(", "path": "node_modules/node-fetch/lib/index.js", "line": "\t\t\t\theaders.append('Content-Type', contentType);", - "lineNumber": 1208, + "lineNumber": 1214, "reasonCategory": "falseMatch", - "updated": "2020-08-11T15:42:35.324Z" + "updated": "2020-09-14T16:19:54.461Z" }, { "rule": "jQuery-$(", @@ -12865,7 +12865,7 @@ "rule": "React-createRef", "path": "ts/components/CaptionEditor.js", "line": " this.inputRef = react_1.default.createRef();", - "lineNumber": 27, + "lineNumber": 26, "reasonCategory": "usageTrusted", "updated": "2019-03-09T00:08:44.242Z", "reasonDetail": "Used only to set focus" @@ -12874,7 +12874,7 @@ "rule": "React-createRef", "path": "ts/components/CaptionEditor.tsx", "line": " this.inputRef = React.createRef();", - "lineNumber": 50, + "lineNumber": 48, "reasonCategory": "usageTrusted", "updated": "2019-03-09T00:08:44.242Z", "reasonDetail": "Used only to set focus" @@ -12962,7 +12962,7 @@ "rule": "React-createRef", "path": "ts/components/MainHeader.js", "line": " this.inputRef = react_1.default.createRef();", - "lineNumber": 144, + "lineNumber": 143, "reasonCategory": "usageTrusted", "updated": "2020-02-14T20:02:37.507Z", "reasonDetail": "Used only to set focus" diff --git a/yarn.lock b/yarn.lock index 53ca2e55d..e1926063a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6356,10 +6356,11 @@ encodeurl@^1.0.2, encodeurl@~1.0.2: resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" encoding@^0.1.11: - version "0.1.12" - resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb" + version "0.1.13" + resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9" + integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A== dependencies: - iconv-lite "~0.4.13" + iconv-lite "^0.6.2" end-of-stream@^1.0.0: version "1.4.0" @@ -8838,6 +8839,13 @@ iconv-lite@^0.5.1: dependencies: safer-buffer ">= 2.1.2 < 3" +iconv-lite@^0.6.2: + version "0.6.2" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.2.tgz#ce13d1875b0c3a674bd6a04b7f76b01b1b6ded01" + integrity sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ== + dependencies: + safer-buffer ">= 2.1.2 < 3.0.0" + icss-replace-symbols@1.1.0, icss-replace-symbols@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded" @@ -9532,6 +9540,7 @@ is-ssh@^1.3.0: is-stream@^1.0.0, is-stream@^1.0.1, is-stream@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" + integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= is-string@^1.0.5: version "1.0.5" @@ -11146,10 +11155,10 @@ node-environment-flags@1.0.5: object.getownpropertydescriptors "^2.0.3" semver "^5.7.0" -node-fetch@2.6.0, node-fetch@^2.6.0: - version "2.6.0" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd" - integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA== +node-fetch@2.6.1, node-fetch@^2.6.0: + version "2.6.1" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" + integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== node-fetch@^1.0.1: version "1.7.3" @@ -14152,7 +14161,7 @@ safe-regex@^1.1.0: dependencies: ret "~0.1.10" -"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: +"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==