diff --git a/.pnp.cjs b/.pnp.cjs index df486163f..02bb3db26 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -4108,7 +4108,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["make-dir", "npm:3.1.0"], ["migrate-mongo", "npm:8.2.3"], ["mongodb", "virtual:de91c39668fa27c49801db5d765163a8d5fe1dd6644bbf594c9a99591c8140f2b2bfdbc859f0bac2c6a285a3a2fbcc9ca74b4dc21999af1cbe4cd4f5deee285f#npm:3.6.9"], - ["node-fetch", "npm:3.0.0"], + ["node-fetch", "npm:2.6.2"], ["nodemailer", "npm:6.6.3"], ["nodemailer-sendgrid-transport", "npm:0.2.0"], ["nodemon", "npm:2.0.12"], @@ -16285,16 +16285,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], - ["fetch-blob", [ - ["npm:3.1.2", { - "packageLocation": "./.yarn/cache/fetch-blob-npm-3.1.2-6076d01b9c-3e3717cf30.zip/node_modules/fetch-blob/", - "packageDependencies": [ - ["fetch-blob", "npm:3.1.2"], - ["web-streams-polyfill", "npm:3.1.0"] - ], - "linkType": "HARD", - }] - ]], ["figlet", [ ["npm:1.5.0", { "packageLocation": "./.yarn/cache/figlet-npm-1.5.0-8014ee3b57-89641163b3.zip/node_modules/figlet/", @@ -22172,12 +22162,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ], "linkType": "HARD", }], - ["npm:3.0.0", { - "packageLocation": "./.yarn/cache/node-fetch-npm-3.0.0-6aa31e95cd-50224bf682.zip/node_modules/node-fetch/", + ["npm:2.6.2", { + "packageLocation": "./.yarn/cache/node-fetch-npm-2.6.2-2820154539-de367eae1d.zip/node_modules/node-fetch/", "packageDependencies": [ - ["node-fetch", "npm:3.0.0"], - ["data-uri-to-buffer", "npm:3.0.1"], - ["fetch-blob", "npm:3.1.2"] + ["node-fetch", "npm:2.6.2"] ], "linkType": "HARD", }] @@ -29080,15 +29068,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], - ["web-streams-polyfill", [ - ["npm:3.1.0", { - "packageLocation": "./.yarn/cache/web-streams-polyfill-npm-3.1.0-8989407eac-50922239b5.zip/node_modules/web-streams-polyfill/", - "packageDependencies": [ - ["web-streams-polyfill", "npm:3.1.0"] - ], - "linkType": "HARD", - }] - ]], ["webidl-conversions", [ ["npm:2.0.1", { "packageLocation": "./.yarn/cache/webidl-conversions-npm-2.0.1-655ba792c9-3546816b29.zip/node_modules/webidl-conversions/", diff --git a/.yarn/cache/fetch-blob-npm-3.1.2-6076d01b9c-3e3717cf30.zip b/.yarn/cache/fetch-blob-npm-3.1.2-6076d01b9c-3e3717cf30.zip deleted file mode 100644 index d3f1588d1..000000000 Binary files a/.yarn/cache/fetch-blob-npm-3.1.2-6076d01b9c-3e3717cf30.zip and /dev/null differ diff --git a/.yarn/cache/node-fetch-npm-2.6.2-2820154539-de367eae1d.zip b/.yarn/cache/node-fetch-npm-2.6.2-2820154539-de367eae1d.zip new file mode 100644 index 000000000..9114b1a99 Binary files /dev/null and b/.yarn/cache/node-fetch-npm-2.6.2-2820154539-de367eae1d.zip differ diff --git a/.yarn/cache/node-fetch-npm-3.0.0-6aa31e95cd-50224bf682.zip b/.yarn/cache/node-fetch-npm-3.0.0-6aa31e95cd-50224bf682.zip deleted file mode 100644 index 750acd3f1..000000000 Binary files a/.yarn/cache/node-fetch-npm-3.0.0-6aa31e95cd-50224bf682.zip and /dev/null differ diff --git a/.yarn/cache/web-streams-polyfill-npm-3.1.0-8989407eac-50922239b5.zip b/.yarn/cache/web-streams-polyfill-npm-3.1.0-8989407eac-50922239b5.zip deleted file mode 100644 index ad3cb50c5..000000000 Binary files a/.yarn/cache/web-streams-polyfill-npm-3.1.0-8989407eac-50922239b5.zip and /dev/null differ diff --git a/packages/api/package.json b/packages/api/package.json index 89423fcab..f1667afbc 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -43,7 +43,7 @@ "lodash": "^4.17.21", "make-dir": "^3.1.0", "mongodb": "^3.6.9", - "node-fetch": "^3.0.0", + "node-fetch": "^2.6.2", "nodemailer": "^6.6.3", "nodemailer-sendgrid-transport": "^0.2.0", "nopt": "^5.0.0", diff --git a/packages/api/scripts/archive.sh b/packages/api/scripts/archive.sh index c27e79ae4..eac209462 100755 --- a/packages/api/scripts/archive.sh +++ b/packages/api/scripts/archive.sh @@ -1,5 +1,5 @@ #!/bin/sh - +set -e cd dist npm install --production diff --git a/yarn.lock b/yarn.lock index 70635b749..9de9cb1c1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2508,7 +2508,7 @@ __metadata: make-dir: ^3.1.0 migrate-mongo: ^8.2.3 mongodb: ^3.6.9 - node-fetch: ^3.0.0 + node-fetch: ^2.6.2 nodemailer: ^6.6.3 nodemailer-sendgrid-transport: ^0.2.0 nodemon: ^2.0.12 @@ -9945,7 +9945,7 @@ __metadata: languageName: node linkType: hard -"data-uri-to-buffer@npm:3.0.1, data-uri-to-buffer@npm:^3.0.1": +"data-uri-to-buffer@npm:3.0.1": version: 3.0.1 resolution: "data-uri-to-buffer@npm:3.0.1" checksum: c59c3009686a78c071806b72f4810856ec28222f0f4e252aa495ec027ed9732298ceea99c50328cf59b151dd34cbc3ad6150bbb43e41fc56fa19f48c99e9fc30 @@ -11908,15 +11908,6 @@ __metadata: languageName: node linkType: hard -"fetch-blob@npm:^3.1.2": - version: 3.1.2 - resolution: "fetch-blob@npm:3.1.2" - dependencies: - web-streams-polyfill: ^3.0.3 - checksum: 3e3717cf30da9f204aee83dded63f1a9f9c8bda7a0dc59648f89eeb1e88ee592231f4d922e1f119e1390383520768594dd3a1fe5e844f2f2f014d17ce04213a5 - languageName: node - linkType: hard - "figlet@npm:^1.1.1": version: 1.5.0 resolution: "figlet@npm:1.5.0" @@ -17199,13 +17190,10 @@ fsevents@^1.2.7: languageName: node linkType: hard -"node-fetch@npm:^3.0.0": - version: 3.0.0 - resolution: "node-fetch@npm:3.0.0" - dependencies: - data-uri-to-buffer: ^3.0.1 - fetch-blob: ^3.1.2 - checksum: 50224bf682a0bc3d44faee0f38df6269d8ae646de343595ef37f9d94b4322d3763a49819fb7b2df9330fcae16e0a20e5fb129dfed8725cf0e8f720277db7611c +"node-fetch@npm:^2.6.2": + version: 2.6.2 + resolution: "node-fetch@npm:2.6.2" + checksum: de367eae1dfbc0e12283c1cf92256ea7fba7eac8655e2e51ebb217727162396fc6cf24689ef9fc6accf075e3991e2ffaa061f7cfaa958215329649b2297ff06d languageName: node linkType: hard @@ -23219,13 +23207,6 @@ typescript@^4.4.2: languageName: node linkType: hard -"web-streams-polyfill@npm:^3.0.3": - version: 3.1.0 - resolution: "web-streams-polyfill@npm:3.1.0" - checksum: 50922239b5a85b6a686dcecb3603bd77d53a7489c1c542e3025537409e01b5a6b2a03f37c95c42296f5585a41ee1b7d6474eea56c1a3c6e682d8ef46a55b4a17 - languageName: node - linkType: hard - "webidl-conversions@npm:^2.0.0": version: 2.0.1 resolution: "webidl-conversions@npm:2.0.1"