summary refs log tree commit diff
path: root/bundle
diff options
context:
space:
mode:
authorFeatyre <88265031+Featyre@users.noreply.github.com>2022-01-23 15:57:00 +0000
committerGitHub <noreply@github.com>2022-01-23 15:57:00 +0000
commitf6774cb3ec219aeb8b07f101d94cefcd091f400a (patch)
treed1cad35337e6dd04169adf01a746c3924a9e449c /bundle
parentPartial integration of categories and discovery (diff)
parentClosed-join guilds (diff)
downloadserver-f6774cb3ec219aeb8b07f101d94cefcd091f400a.tar.xz
Merge branch 'fosscord:master' into master
Diffstat (limited to '')
-rw-r--r--bundle/package-lock.json32
-rw-r--r--bundle/package.json2
2 files changed, 22 insertions, 12 deletions
diff --git a/bundle/package-lock.json b/bundle/package-lock.json

index e763f22a..d026e7c7 100644 --- a/bundle/package-lock.json +++ b/bundle/package-lock.json
@@ -46,7 +46,7 @@ "morgan": "^1.10.0", "multer": "^1.4.2", "nanocolors": "^0.2.12", - "node-fetch": "^2.6.1", + "node-fetch": "^2.6.7", "node-os-utils": "^1.3.5", "patch-package": "^6.4.7", "pg": "^8.7.1", @@ -124,7 +124,7 @@ "missing-native-js-functions": "^1.2.18", "morgan": "^1.10.0", "multer": "^1.4.2", - "node-fetch": "^2.6.1", + "node-fetch": "^3.1.1", "patch-package": "^6.4.7", "picocolors": "^1.0.0", "proxy-agent": "^5.0.0", @@ -182,7 +182,7 @@ "missing-native-js-functions": "^1.2.17", "multer": "^1.4.2", "nanocolors": "^0.2.12", - "node-fetch": "^2.6.1", + "node-fetch": "^2.6.7", "supertest": "^6.1.6", "typescript": "^4.1.2" }, @@ -213,7 +213,7 @@ "jsonwebtoken": "^8.5.1", "lambert-server": "^1.2.11", "missing-native-js-functions": "^1.2.18", - "node-fetch": "^2.6.1", + "node-fetch": "^3.1.1", "proxy-agent": "^5.0.0", "typeorm": "^0.2.37", "ws": "^7.4.2" @@ -7901,13 +7901,22 @@ "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==" }, "node_modules/node-fetch": { - "version": "2.6.5", - "integrity": "sha512-mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ==", + "version": "2.6.7", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", + "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", "dependencies": { "whatwg-url": "^5.0.0" }, "engines": { "node": "4.x || >=6.0.0" + }, + "peerDependencies": { + "encoding": "^0.1.0" + }, + "peerDependenciesMeta": { + "encoding": { + "optional": true + } } }, "node_modules/node-fetch/node_modules/tr46": { @@ -13300,7 +13309,7 @@ "missing-native-js-functions": "^1.2.18", "morgan": "^1.10.0", "multer": "^1.4.2", - "node-fetch": "^2.6.1", + "node-fetch": "^3.1.1", "patch-package": "^6.4.7", "picocolors": "^1.0.0", "proxy-agent": "^5.0.0", @@ -13346,7 +13355,7 @@ "missing-native-js-functions": "^1.2.17", "multer": "^1.4.2", "nanocolors": "^0.2.12", - "node-fetch": "^2.6.1", + "node-fetch": "^2.6.7", "supertest": "^6.1.6", "ts-patch": "^1.4.4", "typescript": "^4.1.2" @@ -13368,7 +13377,7 @@ "jsonwebtoken": "^8.5.1", "lambert-server": "^1.2.11", "missing-native-js-functions": "^1.2.18", - "node-fetch": "^2.6.1", + "node-fetch": "^3.1.1", "proxy-agent": "^5.0.0", "ts-node-dev": "^1.1.6", "ts-patch": "^1.4.4", @@ -17268,8 +17277,9 @@ "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==" }, "node-fetch": { - "version": "2.6.5", - "integrity": "sha512-mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ==", + "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" }, diff --git a/bundle/package.json b/bundle/package.json
index e0ae6156..071a4899 100644 --- a/bundle/package.json +++ b/bundle/package.json
@@ -91,7 +91,7 @@ "missing-native-js-functions": "^1.2.18", "morgan": "^1.10.0", "multer": "^1.4.2", - "node-fetch": "^2.6.1", + "node-fetch": "^2.6.7", "node-os-utils": "^1.3.5", "patch-package": "^6.4.7", "pg": "^8.7.1",