Skip to content

Commit 7399d15

Browse files
committed
doing
1 parent 31bda64 commit 7399d15

File tree

4 files changed

+43
-60
lines changed

4 files changed

+43
-60
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@
364364
"@types/glob": "^7.2.0",
365365
"@types/js-yaml": "^4.0.3",
366366
"@types/mocha": "^9.0.0",
367-
"@types/node-fetch": "^2.x",
367+
"node-fetch": "^3.x",
368368
"@types/vscode": "^1.61.0",
369369
"@types/webpack-env": "^1.16.2",
370370
"@typescript-eslint/eslint-plugin": "^5.2.0",

src/utils/downloadFile.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
* API for downloading information from web
33
*/
44
import { logger } from "./logger";
5-
import fetch from 'node-fetch';
5+
import * as fetch from 'node-fetch';
66

77
export async function downloadFromMultiSources(urls: string[]): Promise<string | undefined> {
88
for (const url of urls) {
99
try {
10-
const data = await fetch(url);
10+
const data = await fetch.default(url);
1111
const val = await data.text();
1212
if (val) {
1313
return val;

webpack.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ const webExtensionConfig = {
101101
],
102102
externals: {
103103
vscode: 'commonjs vscode', // ignored because it doesn't exist
104+
'node-fetch': 'window fetch'
104105
},
105106
performance: {
106107
hints: false,

yarn.lock

Lines changed: 39 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -127,14 +127,6 @@
127127
resolved "https://registry.nlark.com/@types/mocha/download/@types/mocha-9.0.0.tgz#3205bcd15ada9bc681ac20bef64e9e6df88fd297"
128128
integrity sha1-MgW80Vram8aBrCC+9k6ebfiP0pc=
129129

130-
"@types/node-fetch@^2.x":
131-
version "2.5.12"
132-
resolved "https://registry.nlark.com/@types/node-fetch/download/@types/node-fetch-2.5.12.tgz#8a6f779b1d4e60b7a57fb6fd48d84fb545b9cc66"
133-
integrity sha1-im93mx1OYLelf7b9SNhPtUW5zGY=
134-
dependencies:
135-
"@types/node" "*"
136-
form-data "^3.0.0"
137-
138130
"@types/node@*":
139131
version "16.11.6"
140132
resolved "https://registry.npmmirror.com/@types/node/download/@types/node-16.11.6.tgz?cache=0&sync_timestamp=1635213523930&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fnode%2Fdownload%2F%40types%2Fnode-16.11.6.tgz#6bef7a2a0ad684cf6e90fcfe31cecabd9ce0a3ae"
@@ -510,11 +502,6 @@ assert@^2.0.0:
510502
object-is "^1.0.1"
511503
util "^0.12.0"
512504

513-
asynckit@^0.4.0:
514-
version "0.4.0"
515-
resolved "https://registry.nlark.com/asynckit/download/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
516-
integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
517-
518505
available-typed-arrays@^1.0.5:
519506
version "1.0.5"
520507
resolved "https://registry.nlark.com/available-typed-arrays/download/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
@@ -776,13 +763,6 @@ colorette@^2.0.14:
776763
resolved "https://registry.npmmirror.com/colorette/download/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da"
777764
integrity sha1-cTua+E/bAAE58EVGvUqT9ipQhdo=
778765

779-
combined-stream@^1.0.8:
780-
version "1.0.8"
781-
resolved "https://registry.nlark.com/combined-stream/download/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
782-
integrity sha1-w9RaizT9cwYxoRCoolIGgrMdWn8=
783-
dependencies:
784-
delayed-stream "~1.0.0"
785-
786766
commander@^2.20.0, commander@^2.8.1:
787767
version "2.20.3"
788768
resolved "https://registry.npmmirror.com/commander/download/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
@@ -837,6 +817,27 @@ cross-spawn@^7.0.2, cross-spawn@^7.0.3:
837817
shebang-command "^2.0.0"
838818
which "^2.0.1"
839819

820+
css-select@^4.1.3:
821+
version "4.1.3"
822+
resolved "https://registry.nlark.com/css-select/download/css-select-4.1.3.tgz?cache=0&sync_timestamp=1622994263502&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcss-select%2Fdownload%2Fcss-select-4.1.3.tgz#a70440f70317f2669118ad74ff105e65849c7067"
823+
integrity sha1-pwRA9wMX8maRGK10/xBeZYSccGc=
824+
dependencies:
825+
boolbase "^1.0.0"
826+
css-what "^5.0.0"
827+
domhandler "^4.2.0"
828+
domutils "^2.6.0"
829+
nth-check "^2.0.0"
830+
831+
css-what@^5.0.0, css-what@^5.0.1:
832+
version "5.1.0"
833+
resolved "https://registry.npmmirror.com/css-what/download/css-what-5.1.0.tgz#3f7b707aadf633baf62c2ceb8579b545bb40f7fe"
834+
integrity sha1-P3tweq32M7r2LCzrhXm1RbtA9/4=
835+
836+
data-uri-to-buffer@^3.0.1:
837+
version "3.0.1"
838+
resolved "https://registry.npmmirror.com/data-uri-to-buffer/download/data-uri-to-buffer-3.0.1.tgz#594b8973938c5bc2c33046535785341abc4f3636"
839+
integrity sha1-WUuJc5OMW8LDMEZTV4U0GrxPNjY=
840+
840841
debug@2.6.9:
841842
version "2.6.9"
842843
resolved "https://registry.nlark.com/debug/download/debug-2.6.9.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdebug%2Fdownload%2Fdebug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
@@ -959,11 +960,6 @@ del@^6.0.0:
959960
rimraf "^3.0.2"
960961
slash "^3.0.0"
961962

962-
delayed-stream@~1.0.0:
963-
version "1.0.0"
964-
resolved "https://registry.nlark.com/delayed-stream/download/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
965-
integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
966-
967963
delegates@^1.0.0:
968964
version "1.0.0"
969965
resolved "https://registry.npmmirror.com/delegates/download/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
@@ -1365,6 +1361,13 @@ fd-slicer@~1.1.0:
13651361
dependencies:
13661362
pend "~1.2.0"
13671363

1364+
fetch-blob@^3.1.2:
1365+
version "3.1.2"
1366+
resolved "https://registry.nlark.com/fetch-blob/download/fetch-blob-3.1.2.tgz#6bc438675f3851ecea51758ac91f6a1cd1bacabd"
1367+
integrity sha1-a8Q4Z184UezqUXWKyR9qHNG6yr0=
1368+
dependencies:
1369+
web-streams-polyfill "^3.0.3"
1370+
13681371
file-entry-cache@^6.0.1:
13691372
version "6.0.1"
13701373
resolved "https://registry.nlark.com/file-entry-cache/download/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
@@ -1457,15 +1460,6 @@ foreach@^2.0.5:
14571460
resolved "https://registry.nlark.com/foreach/download/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
14581461
integrity sha1-C+4AUBiusmDQo6865ljdATbsG5k=
14591462

1460-
form-data@^3.0.0:
1461-
version "3.0.1"
1462-
resolved "https://registry.nlark.com/form-data/download/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
1463-
integrity sha1-69U3kbeDVqma+aMA1CgsTV65dV8=
1464-
dependencies:
1465-
asynckit "^0.4.0"
1466-
combined-stream "^1.0.8"
1467-
mime-types "^2.1.12"
1468-
14691463
fresh@~0.5.2:
14701464
version "0.5.2"
14711465
resolved "https://registry.nlark.com/fresh/download/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
@@ -2343,7 +2337,7 @@ mime-db@1.50.0, mime-db@^1.28.0:
23432337
resolved "https://registry.nlark.com/mime-db/download/mime-db-1.50.0.tgz#abd4ac94e98d3c0e185016c67ab45d5fde40c11f"
23442338
integrity sha1-q9SslOmNPA4YUBbGerRdX95AwR8=
23452339

2346-
mime-types@^2.1.12, mime-types@^2.1.18, mime-types@^2.1.27, mime-types@~2.1.24:
2340+
mime-types@^2.1.18, mime-types@^2.1.27, mime-types@~2.1.24:
23472341
version "2.1.33"
23482342
resolved "https://registry.npmmirror.com/mime-types/download/mime-types-2.1.33.tgz#1fa12a904472fafd068e48d9e8401f74d3f70edb"
23492343
integrity sha1-H6EqkERy+v0GjkjZ6EAfdNP3Dts=
@@ -2460,12 +2454,13 @@ neo-async@^2.6.2:
24602454
resolved "https://registry.nlark.com/neo-async/download/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
24612455
integrity sha1-tKr7k+OustgXTKU88WOrfXMIMF8=
24622456

2463-
node-fetch@^2.x:
2464-
version "2.6.5"
2465-
resolved "https://registry.npmmirror.com/node-fetch/download/node-fetch-2.6.5.tgz#42735537d7f080a7e5f78b6c549b7146be1742fd"
2466-
integrity sha1-QnNVN9fwgKfl94tsVJtxRr4XQv0=
2457+
node-fetch@^3.x:
2458+
version "3.0.0"
2459+
resolved "https://registry.npmmirror.com/node-fetch/download/node-fetch-3.0.0.tgz#79da7146a520036f2c5f644e4a26095f17e411ea"
2460+
integrity sha1-edpxRqUgA28sX2ROSiYJXxfkEeo=
24672461
dependencies:
2468-
whatwg-url "^5.0.0"
2462+
data-uri-to-buffer "^3.0.1"
2463+
fetch-blob "^3.1.2"
24692464

24702465
node-releases@^2.0.1:
24712466
version "2.0.1"
@@ -3257,11 +3252,6 @@ toidentifier@1.0.0:
32573252
resolved "https://registry.nlark.com/toidentifier/download/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
32583253
integrity sha1-fhvjRw8ed5SLxD2Uo8j013UrpVM=
32593254

3260-
tr46@~0.0.3:
3261-
version "0.0.3"
3262-
resolved "https://registry.npmmirror.com/tr46/download/tr46-0.0.3.tgz?cache=0&sync_timestamp=1633302260375&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Ftr46%2Fdownload%2Ftr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
3263-
integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
3264-
32653255
"traverse@>=0.3.0 <0.4":
32663256
version "0.3.9"
32673257
resolved "https://registry.nlark.com/traverse/download/traverse-0.3.9.tgz#717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9"
@@ -3429,10 +3419,10 @@ watchpack@^2.2.0:
34293419
glob-to-regexp "^0.4.1"
34303420
graceful-fs "^4.1.2"
34313421

3432-
webidl-conversions@^3.0.0:
3433-
version "3.0.1"
3434-
resolved "https://registry.nlark.com/webidl-conversions/download/webidl-conversions-3.0.1.tgz?cache=0&sync_timestamp=1631409524428&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fwebidl-conversions%2Fdownload%2Fwebidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
3435-
integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=
3422+
web-streams-polyfill@^3.0.3:
3423+
version "3.1.1"
3424+
resolved "https://registry.nlark.com/web-streams-polyfill/download/web-streams-polyfill-3.1.1.tgz#1516f2d4ea8f1bdbfed15eb65cb2df87098c8364"
3425+
integrity sha1-FRby1OqPG9v+0V62XLLfhwmMg2Q=
34363426

34373427
webpack-cli@^4.9.1:
34383428
version "4.9.1"
@@ -3495,14 +3485,6 @@ webpack@^5.60.0:
34953485
watchpack "^2.2.0"
34963486
webpack-sources "^3.2.0"
34973487

3498-
whatwg-url@^5.0.0:
3499-
version "5.0.0"
3500-
resolved "https://registry.npmmirror.com/whatwg-url/download/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
3501-
integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0=
3502-
dependencies:
3503-
tr46 "~0.0.3"
3504-
webidl-conversions "^3.0.0"
3505-
35063488
which-boxed-primitive@^1.0.2:
35073489
version "1.0.2"
35083490
resolved "https://registry.nlark.com/which-boxed-primitive/download/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"

0 commit comments

Comments
 (0)