summary refs log tree commit diff
diff options
context:
space:
mode:
authorTheArcaneBrony <myrainbowdash949@gmail.com>2022-08-05 00:55:26 +0200
committerTheArcaneBrony <myrainbowdash949@gmail.com>2022-08-09 23:28:27 +0200
commit499cd2e8ff390da392263ffc5d2e34b644f6c714 (patch)
treee78f11a92e582c976de147f8707aebab705a9dbe
parentDo all minor updates since last commit, make another script (diff)
downloadserver-499cd2e8ff390da392263ffc5d2e34b644f6c714.tar.xz
Fix ESM error caused by file-type
-rw-r--r--bundle/package-lock.json78
-rw-r--r--bundle/package.json2
-rw-r--r--cdn/package.json2
-rw-r--r--cdn/src/routes/attachments.ts2
-rw-r--r--cdn/src/routes/avatars.ts6
-rw-r--r--cdn/src/routes/external.ts2
-rw-r--r--cdn/src/routes/role-icons.ts6
-rw-r--r--package-lock.json76
8 files changed, 87 insertions, 87 deletions
diff --git a/bundle/package-lock.json b/bundle/package-lock.json
index c4058d81..14f05bcc 100644
--- a/bundle/package-lock.json
+++ b/bundle/package-lock.json
@@ -28,7 +28,7 @@
 				"dotenv": "^16.0.1",
 				"exif-be-gone": "^1.3.0",
 				"express": "^4.17.1",
-				"file-type": "^17.1.4",
+				"file-type": "16.5",
 				"form-data": "^4.0.0",
 				"i18next": "^21.8.14",
 				"i18next-http-middleware": "^3.1.3",
@@ -139,7 +139,7 @@
 				"dotenv": "^16.0.1",
 				"exif-be-gone": "^1.3.0",
 				"express": "^4.17.1",
-				"file-type": "^17.1.4",
+				"file-type": "16.5",
 				"image-size": "^1.0.0",
 				"jest": "^28.1.3",
 				"lambert-server": "^1.2.12",
@@ -5837,16 +5837,16 @@
 			}
 		},
 		"node_modules/file-type": {
-			"version": "17.1.4",
-			"resolved": "https://registry.npmjs.org/file-type/-/file-type-17.1.4.tgz",
-			"integrity": "sha512-3w/rJUUPBj6CYhVER3D5JCKwYJJiC36uj5dP+LnyubHI6H6FJo1TeWVCEA09YLVoZqV3/mLP26j9+Pz1GjAyjQ==",
+			"version": "16.5.4",
+			"resolved": "https://registry.npmjs.org/file-type/-/file-type-16.5.4.tgz",
+			"integrity": "sha512-/yFHK0aGjFEgDJjEKP0pWCplsPFPhwyfwevf/pVxiN0tmE4L9LmwWxWukdJSHdoCli4VgQLehjJtwQBnqmsKcw==",
 			"dependencies": {
-				"readable-web-to-node-stream": "^3.0.2",
-				"strtok3": "^7.0.0-alpha.9",
-				"token-types": "^5.0.0-alpha.2"
+				"readable-web-to-node-stream": "^3.0.0",
+				"strtok3": "^6.2.4",
+				"token-types": "^4.1.1"
 			},
 			"engines": {
-				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+				"node": ">=10"
 			},
 			"funding": {
 				"url": "https://github.com/sindresorhus/file-type?sponsor=1"
@@ -8636,11 +8636,11 @@
 			"integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
 		},
 		"node_modules/peek-readable": {
-			"version": "5.0.0-alpha.5",
-			"resolved": "https://registry.npmjs.org/peek-readable/-/peek-readable-5.0.0-alpha.5.tgz",
-			"integrity": "sha512-pJohF/tDwV3ntnT5+EkUo4E700q/j/OCDuPxtM+5/kFGjyOai/sK4/We4Cy1MB2OiTQliWU5DxPvYIKQAdPqAA==",
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/peek-readable/-/peek-readable-4.1.0.tgz",
+			"integrity": "sha512-ZI3LnwUv5nOGbQzD9c2iDG6toheuXSZP5esSHBjopsXH4dg19soufvpUGA3uohi5anFtGb2lhAVdHzH6R/Evvg==",
 			"engines": {
-				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+				"node": ">=8"
 			},
 			"funding": {
 				"type": "github",
@@ -9485,15 +9485,15 @@
 			}
 		},
 		"node_modules/strtok3": {
-			"version": "7.0.0-alpha.9",
-			"resolved": "https://registry.npmjs.org/strtok3/-/strtok3-7.0.0-alpha.9.tgz",
-			"integrity": "sha512-G8WxjBFjTZ77toVElv1i7k3jCXNkBB14FVaZ/6LIOka/WGo4La5XHLrU7neFVLdKbXESZf4BejVKZu5maOmocA==",
+			"version": "6.3.0",
+			"resolved": "https://registry.npmjs.org/strtok3/-/strtok3-6.3.0.tgz",
+			"integrity": "sha512-fZtbhtvI9I48xDSywd/somNqgUHl2L2cstmXCCif0itOf96jeW18MBSyrLuNicYQVkvpOxkZtkzujiTJ9LW5Jw==",
 			"dependencies": {
 				"@tokenizer/token": "^0.3.0",
-				"peek-readable": "^5.0.0-alpha.5"
+				"peek-readable": "^4.1.0"
 			},
 			"engines": {
-				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+				"node": ">=10"
 			},
 			"funding": {
 				"type": "github",
@@ -9772,15 +9772,15 @@
 			}
 		},
 		"node_modules/token-types": {
-			"version": "5.0.0-alpha.2",
-			"resolved": "https://registry.npmjs.org/token-types/-/token-types-5.0.0-alpha.2.tgz",
-			"integrity": "sha512-EsG9UxAW4M6VATrEEjhPFTKEUi1OiJqTUMIZOGBN49fGxYjZB36k0p7to3HZSmWRoHm1QfZgrg3e02fpqAt5fQ==",
+			"version": "4.2.1",
+			"resolved": "https://registry.npmjs.org/token-types/-/token-types-4.2.1.tgz",
+			"integrity": "sha512-6udB24Q737UD/SDsKAHI9FCRP7Bqc9D/MQUV02ORQg5iskjtLJlZJNdN4kKtcdtwCeWIwIHDGaUsTsCCAa8sFQ==",
 			"dependencies": {
 				"@tokenizer/token": "^0.3.0",
 				"ieee754": "^1.2.1"
 			},
 			"engines": {
-				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+				"node": ">=10"
 			},
 			"funding": {
 				"type": "github",
@@ -12919,7 +12919,7 @@
 				"dotenv": "^16.0.1",
 				"exif-be-gone": "^1.3.0",
 				"express": "^4.17.1",
-				"file-type": "^17.1.4",
+				"file-type": "16.5",
 				"image-size": "^1.0.0",
 				"jest": "^28.1.3",
 				"lambert-server": "^1.2.12",
@@ -15074,13 +15074,13 @@
 			}
 		},
 		"file-type": {
-			"version": "17.1.4",
-			"resolved": "https://registry.npmjs.org/file-type/-/file-type-17.1.4.tgz",
-			"integrity": "sha512-3w/rJUUPBj6CYhVER3D5JCKwYJJiC36uj5dP+LnyubHI6H6FJo1TeWVCEA09YLVoZqV3/mLP26j9+Pz1GjAyjQ==",
+			"version": "16.5.4",
+			"resolved": "https://registry.npmjs.org/file-type/-/file-type-16.5.4.tgz",
+			"integrity": "sha512-/yFHK0aGjFEgDJjEKP0pWCplsPFPhwyfwevf/pVxiN0tmE4L9LmwWxWukdJSHdoCli4VgQLehjJtwQBnqmsKcw==",
 			"requires": {
-				"readable-web-to-node-stream": "^3.0.2",
-				"strtok3": "^7.0.0-alpha.9",
-				"token-types": "^5.0.0-alpha.2"
+				"readable-web-to-node-stream": "^3.0.0",
+				"strtok3": "^6.2.4",
+				"token-types": "^4.1.1"
 			}
 		},
 		"file-uri-to-path": {
@@ -17028,9 +17028,9 @@
 			"integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
 		},
 		"peek-readable": {
-			"version": "5.0.0-alpha.5",
-			"resolved": "https://registry.npmjs.org/peek-readable/-/peek-readable-5.0.0-alpha.5.tgz",
-			"integrity": "sha512-pJohF/tDwV3ntnT5+EkUo4E700q/j/OCDuPxtM+5/kFGjyOai/sK4/We4Cy1MB2OiTQliWU5DxPvYIKQAdPqAA=="
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/peek-readable/-/peek-readable-4.1.0.tgz",
+			"integrity": "sha512-ZI3LnwUv5nOGbQzD9c2iDG6toheuXSZP5esSHBjopsXH4dg19soufvpUGA3uohi5anFtGb2lhAVdHzH6R/Evvg=="
 		},
 		"picocolors": {
 			"version": "1.0.0",
@@ -17662,12 +17662,12 @@
 			"dev": true
 		},
 		"strtok3": {
-			"version": "7.0.0-alpha.9",
-			"resolved": "https://registry.npmjs.org/strtok3/-/strtok3-7.0.0-alpha.9.tgz",
-			"integrity": "sha512-G8WxjBFjTZ77toVElv1i7k3jCXNkBB14FVaZ/6LIOka/WGo4La5XHLrU7neFVLdKbXESZf4BejVKZu5maOmocA==",
+			"version": "6.3.0",
+			"resolved": "https://registry.npmjs.org/strtok3/-/strtok3-6.3.0.tgz",
+			"integrity": "sha512-fZtbhtvI9I48xDSywd/somNqgUHl2L2cstmXCCif0itOf96jeW18MBSyrLuNicYQVkvpOxkZtkzujiTJ9LW5Jw==",
 			"requires": {
 				"@tokenizer/token": "^0.3.0",
-				"peek-readable": "^5.0.0-alpha.5"
+				"peek-readable": "^4.1.0"
 			}
 		},
 		"superagent": {
@@ -17872,9 +17872,9 @@
 			"integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="
 		},
 		"token-types": {
-			"version": "5.0.0-alpha.2",
-			"resolved": "https://registry.npmjs.org/token-types/-/token-types-5.0.0-alpha.2.tgz",
-			"integrity": "sha512-EsG9UxAW4M6VATrEEjhPFTKEUi1OiJqTUMIZOGBN49fGxYjZB36k0p7to3HZSmWRoHm1QfZgrg3e02fpqAt5fQ==",
+			"version": "4.2.1",
+			"resolved": "https://registry.npmjs.org/token-types/-/token-types-4.2.1.tgz",
+			"integrity": "sha512-6udB24Q737UD/SDsKAHI9FCRP7Bqc9D/MQUV02ORQg5iskjtLJlZJNdN4kKtcdtwCeWIwIHDGaUsTsCCAa8sFQ==",
 			"requires": {
 				"@tokenizer/token": "^0.3.0",
 				"ieee754": "^1.2.1"
diff --git a/bundle/package.json b/bundle/package.json
index 6d0b5865..e574af3d 100644
--- a/bundle/package.json
+++ b/bundle/package.json
@@ -69,7 +69,7 @@
 		"dotenv": "^16.0.1",
 		"exif-be-gone": "^1.3.0",
 		"express": "^4.17.1",
-		"file-type": "^17.1.4",
+		"file-type": "16.5",
 		"form-data": "^4.0.0",
 		"i18next": "^21.8.14",
 		"i18next-http-middleware": "^3.1.3",
diff --git a/cdn/package.json b/cdn/package.json
index 541f5ee2..4ee0be6a 100644
--- a/cdn/package.json
+++ b/cdn/package.json
@@ -36,7 +36,7 @@
 		"dotenv": "^16.0.1",
 		"exif-be-gone": "^1.3.0",
 		"express": "^4.17.1",
-		"file-type": "^17.1.4",
+		"file-type": "16.5",
 		"image-size": "^1.0.0",
 		"jest": "^28.1.3",
 		"lambert-server": "^1.2.12",
diff --git a/cdn/src/routes/attachments.ts b/cdn/src/routes/attachments.ts
index 3e04fe76..723a6c03 100644
--- a/cdn/src/routes/attachments.ts
+++ b/cdn/src/routes/attachments.ts
@@ -68,7 +68,7 @@ router.get(
 			`attachments/${channel_id}/${id}/${filename}`
 		);
 		if (!file) throw new HTTPError("File not found");
-		const type = await FileType.fileTypeFromBuffer(file);
+		const type = await FileType.fromBuffer(file);
 		let content_type = type?.mime || "application/octet-stream";
 
 		if (SANITIZED_CONTENT_TYPE.includes(content_type)) {
diff --git a/cdn/src/routes/avatars.ts b/cdn/src/routes/avatars.ts
index bbdf42cc..40705b2e 100644
--- a/cdn/src/routes/avatars.ts
+++ b/cdn/src/routes/avatars.ts
@@ -38,7 +38,7 @@ router.post(
 			.update(Snowflake.generate())
 			.digest("hex");
 
-		const type = await FileType.fileTypeFromBuffer(buffer);
+		const type = await FileType.fromBuffer(buffer);
 		if (!type || !ALLOWED_MIME_TYPES.includes(type.mime))
 			throw new HTTPError("Invalid file type");
 		if (ANIMATED_MIME_TYPES.includes(type.mime)) hash = `a_${hash}`; // animated icons have a_ infront of the hash
@@ -65,7 +65,7 @@ router.get("/:user_id", async (req: Request, res: Response) => {
 
 	const file = await storage.get(path);
 	if (!file) throw new HTTPError("not found", 404);
-	const type = await FileType.fileTypeFromBuffer(file);
+	const type = await FileType.fromBuffer(file);
 
 	res.set("Content-Type", type?.mime);
 	res.set("Cache-Control", "public, max-age=31536000");
@@ -80,7 +80,7 @@ router.get("/:user_id/:hash", async (req: Request, res: Response) => {
 
 	const file = await storage.get(path);
 	if (!file) throw new HTTPError("not found", 404);
-	const type = await FileType.fileTypeFromBuffer(file);
+	const type = await FileType.fromBuffer(file);
 
 	res.set("Content-Type", type?.mime);
 	res.set("Cache-Control", "public, max-age=31536000");
diff --git a/cdn/src/routes/external.ts b/cdn/src/routes/external.ts
index cf02f645..c9441fc2 100644
--- a/cdn/src/routes/external.ts
+++ b/cdn/src/routes/external.ts
@@ -48,7 +48,7 @@ router.get("/:id", async (req: Request, res: Response) => {
 
 	const file = await storage.get(`/external/${id}`);
 	if (!file) throw new HTTPError("File not found");
-	const result = await FileType.fileTypeFromBuffer(file);
+	const result = await FileType.fromBuffer(file);
 
 	res.set("Content-Type", result?.mime);
 
diff --git a/cdn/src/routes/role-icons.ts b/cdn/src/routes/role-icons.ts
index dd96c90e..2e5c42dd 100644
--- a/cdn/src/routes/role-icons.ts
+++ b/cdn/src/routes/role-icons.ts
@@ -38,7 +38,7 @@ router.post(
 			.update(Snowflake.generate())
 			.digest("hex");
 
-		const type = await FileType.fileTypeFromBuffer(buffer);
+		const type = await FileType.fromBuffer(buffer);
 		if (!type || !ALLOWED_MIME_TYPES.includes(type.mime))
 			throw new HTTPError("Invalid file type");
 
@@ -64,7 +64,7 @@ router.get("/:role_id", async (req: Request, res: Response) => {
 
 	const file = await storage.get(path);
 	if (!file) throw new HTTPError("not found", 404);
-	const type = await FileType.fileTypeFromBuffer(file);
+	const type = await FileType.fromBuffer(file);
 
 	res.set("Content-Type", type?.mime);
 	res.set("Cache-Control", "public, max-age=31536000, must-revalidate");
@@ -79,7 +79,7 @@ router.get("/:role_id/:hash", async (req: Request, res: Response) => {
 
 	const file = await storage.get(path);
 	if (!file) throw new HTTPError("not found", 404);
-	const type = await FileType.fileTypeFromBuffer(file);
+	const type = await FileType.fromBuffer(file);
 
 	res.set("Content-Type", type?.mime);
 	res.set("Cache-Control", "public, max-age=31536000, must-revalidate");
diff --git a/package-lock.json b/package-lock.json
index b37fec3e..48f8206d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -299,7 +299,7 @@
 				"dotenv": "^16.0.1",
 				"exif-be-gone": "^1.3.0",
 				"express": "^4.17.1",
-				"file-type": "^17.1.4",
+				"file-type": "16.5",
 				"image-size": "^1.0.0",
 				"jest": "^28.1.3",
 				"lambert-server": "^1.2.12",
@@ -6324,16 +6324,16 @@
 			}
 		},
 		"node_modules/file-type": {
-			"version": "17.1.4",
-			"resolved": "https://registry.npmjs.org/file-type/-/file-type-17.1.4.tgz",
-			"integrity": "sha512-3w/rJUUPBj6CYhVER3D5JCKwYJJiC36uj5dP+LnyubHI6H6FJo1TeWVCEA09YLVoZqV3/mLP26j9+Pz1GjAyjQ==",
+			"version": "16.5.4",
+			"resolved": "https://registry.npmjs.org/file-type/-/file-type-16.5.4.tgz",
+			"integrity": "sha512-/yFHK0aGjFEgDJjEKP0pWCplsPFPhwyfwevf/pVxiN0tmE4L9LmwWxWukdJSHdoCli4VgQLehjJtwQBnqmsKcw==",
 			"dependencies": {
-				"readable-web-to-node-stream": "^3.0.2",
-				"strtok3": "^7.0.0-alpha.9",
-				"token-types": "^5.0.0-alpha.2"
+				"readable-web-to-node-stream": "^3.0.0",
+				"strtok3": "^6.2.4",
+				"token-types": "^4.1.1"
 			},
 			"engines": {
-				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+				"node": ">=10"
 			},
 			"funding": {
 				"url": "https://github.com/sindresorhus/file-type?sponsor=1"
@@ -9929,11 +9929,11 @@
 			"integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
 		},
 		"node_modules/peek-readable": {
-			"version": "5.0.0-alpha.5",
-			"resolved": "https://registry.npmjs.org/peek-readable/-/peek-readable-5.0.0-alpha.5.tgz",
-			"integrity": "sha512-pJohF/tDwV3ntnT5+EkUo4E700q/j/OCDuPxtM+5/kFGjyOai/sK4/We4Cy1MB2OiTQliWU5DxPvYIKQAdPqAA==",
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/peek-readable/-/peek-readable-4.1.0.tgz",
+			"integrity": "sha512-ZI3LnwUv5nOGbQzD9c2iDG6toheuXSZP5esSHBjopsXH4dg19soufvpUGA3uohi5anFtGb2lhAVdHzH6R/Evvg==",
 			"engines": {
-				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+				"node": ">=8"
 			},
 			"funding": {
 				"type": "github",
@@ -10907,15 +10907,15 @@
 			}
 		},
 		"node_modules/strtok3": {
-			"version": "7.0.0-alpha.9",
-			"resolved": "https://registry.npmjs.org/strtok3/-/strtok3-7.0.0-alpha.9.tgz",
-			"integrity": "sha512-G8WxjBFjTZ77toVElv1i7k3jCXNkBB14FVaZ/6LIOka/WGo4La5XHLrU7neFVLdKbXESZf4BejVKZu5maOmocA==",
+			"version": "6.3.0",
+			"resolved": "https://registry.npmjs.org/strtok3/-/strtok3-6.3.0.tgz",
+			"integrity": "sha512-fZtbhtvI9I48xDSywd/somNqgUHl2L2cstmXCCif0itOf96jeW18MBSyrLuNicYQVkvpOxkZtkzujiTJ9LW5Jw==",
 			"dependencies": {
 				"@tokenizer/token": "^0.3.0",
-				"peek-readable": "^5.0.0-alpha.5"
+				"peek-readable": "^4.1.0"
 			},
 			"engines": {
-				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+				"node": ">=10"
 			},
 			"funding": {
 				"type": "github",
@@ -11214,15 +11214,15 @@
 			}
 		},
 		"node_modules/token-types": {
-			"version": "5.0.0-alpha.2",
-			"resolved": "https://registry.npmjs.org/token-types/-/token-types-5.0.0-alpha.2.tgz",
-			"integrity": "sha512-EsG9UxAW4M6VATrEEjhPFTKEUi1OiJqTUMIZOGBN49fGxYjZB36k0p7to3HZSmWRoHm1QfZgrg3e02fpqAt5fQ==",
+			"version": "4.2.1",
+			"resolved": "https://registry.npmjs.org/token-types/-/token-types-4.2.1.tgz",
+			"integrity": "sha512-6udB24Q737UD/SDsKAHI9FCRP7Bqc9D/MQUV02ORQg5iskjtLJlZJNdN4kKtcdtwCeWIwIHDGaUsTsCCAa8sFQ==",
 			"dependencies": {
 				"@tokenizer/token": "^0.3.0",
 				"ieee754": "^1.2.1"
 			},
 			"engines": {
-				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+				"node": ">=10"
 			},
 			"funding": {
 				"type": "github",
@@ -14544,7 +14544,7 @@
 				"dotenv": "^16.0.1",
 				"exif-be-gone": "^1.3.0",
 				"express": "^4.17.1",
-				"file-type": "^17.1.4",
+				"file-type": "16.5",
 				"image-size": "^1.0.0",
 				"jest": "^28.1.3",
 				"lambert-server": "^1.2.12",
@@ -17091,13 +17091,13 @@
 			}
 		},
 		"file-type": {
-			"version": "17.1.4",
-			"resolved": "https://registry.npmjs.org/file-type/-/file-type-17.1.4.tgz",
-			"integrity": "sha512-3w/rJUUPBj6CYhVER3D5JCKwYJJiC36uj5dP+LnyubHI6H6FJo1TeWVCEA09YLVoZqV3/mLP26j9+Pz1GjAyjQ==",
+			"version": "16.5.4",
+			"resolved": "https://registry.npmjs.org/file-type/-/file-type-16.5.4.tgz",
+			"integrity": "sha512-/yFHK0aGjFEgDJjEKP0pWCplsPFPhwyfwevf/pVxiN0tmE4L9LmwWxWukdJSHdoCli4VgQLehjJtwQBnqmsKcw==",
 			"requires": {
-				"readable-web-to-node-stream": "^3.0.2",
-				"strtok3": "^7.0.0-alpha.9",
-				"token-types": "^5.0.0-alpha.2"
+				"readable-web-to-node-stream": "^3.0.0",
+				"strtok3": "^6.2.4",
+				"token-types": "^4.1.1"
 			}
 		},
 		"file-uri-to-path": {
@@ -19727,9 +19727,9 @@
 			"integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
 		},
 		"peek-readable": {
-			"version": "5.0.0-alpha.5",
-			"resolved": "https://registry.npmjs.org/peek-readable/-/peek-readable-5.0.0-alpha.5.tgz",
-			"integrity": "sha512-pJohF/tDwV3ntnT5+EkUo4E700q/j/OCDuPxtM+5/kFGjyOai/sK4/We4Cy1MB2OiTQliWU5DxPvYIKQAdPqAA=="
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/peek-readable/-/peek-readable-4.1.0.tgz",
+			"integrity": "sha512-ZI3LnwUv5nOGbQzD9c2iDG6toheuXSZP5esSHBjopsXH4dg19soufvpUGA3uohi5anFtGb2lhAVdHzH6R/Evvg=="
 		},
 		"pg": {
 			"version": "8.7.3",
@@ -20459,12 +20459,12 @@
 			"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="
 		},
 		"strtok3": {
-			"version": "7.0.0-alpha.9",
-			"resolved": "https://registry.npmjs.org/strtok3/-/strtok3-7.0.0-alpha.9.tgz",
-			"integrity": "sha512-G8WxjBFjTZ77toVElv1i7k3jCXNkBB14FVaZ/6LIOka/WGo4La5XHLrU7neFVLdKbXESZf4BejVKZu5maOmocA==",
+			"version": "6.3.0",
+			"resolved": "https://registry.npmjs.org/strtok3/-/strtok3-6.3.0.tgz",
+			"integrity": "sha512-fZtbhtvI9I48xDSywd/somNqgUHl2L2cstmXCCif0itOf96jeW18MBSyrLuNicYQVkvpOxkZtkzujiTJ9LW5Jw==",
 			"requires": {
 				"@tokenizer/token": "^0.3.0",
-				"peek-readable": "^5.0.0-alpha.5"
+				"peek-readable": "^4.1.0"
 			}
 		},
 		"superagent": {
@@ -20684,9 +20684,9 @@
 			"integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="
 		},
 		"token-types": {
-			"version": "5.0.0-alpha.2",
-			"resolved": "https://registry.npmjs.org/token-types/-/token-types-5.0.0-alpha.2.tgz",
-			"integrity": "sha512-EsG9UxAW4M6VATrEEjhPFTKEUi1OiJqTUMIZOGBN49fGxYjZB36k0p7to3HZSmWRoHm1QfZgrg3e02fpqAt5fQ==",
+			"version": "4.2.1",
+			"resolved": "https://registry.npmjs.org/token-types/-/token-types-4.2.1.tgz",
+			"integrity": "sha512-6udB24Q737UD/SDsKAHI9FCRP7Bqc9D/MQUV02ORQg5iskjtLJlZJNdN4kKtcdtwCeWIwIHDGaUsTsCCAa8sFQ==",
 			"requires": {
 				"@tokenizer/token": "^0.3.0",
 				"ieee754": "^1.2.1"