From 76c205fcbed8aeed97ef230885a58b83fa06e8a5 Mon Sep 17 00:00:00 2001 From: MathMan05 Date: Thu, 19 Sep 2024 09:38:41 -0500 Subject: [PATCH] take merge 2 --- package-lock.json | 60 +---------------------------------------------- 1 file changed, 1 insertion(+), 59 deletions(-) diff --git a/package-lock.json b/package-lock.json index 45f3f2e..463e428 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,8 +9,6 @@ "version": "0.1.0", "license": "GPL-3.0", "dependencies": { - "@types/express": "^4.17.21", - "@types/node-fetch": "^2.6.11", "compression": "^1.7.4", "express": "^4.19.2", "node-fetch": "^3.3.2", @@ -613,10 +611,7 @@ "version": "1.19.5", "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz", "integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 5cd1ed4326964da7a8d04ab8a54e7df940017d5e "license": "MIT", "dependencies": { "@types/connect": "*", @@ -637,10 +632,7 @@ "version": "3.4.38", "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz", "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 5cd1ed4326964da7a8d04ab8a54e7df940017d5e "license": "MIT", "dependencies": { "@types/node": "*" @@ -675,10 +667,7 @@ "version": "4.17.21", "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz", "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 5cd1ed4326964da7a8d04ab8a54e7df940017d5e "license": "MIT", "dependencies": { "@types/body-parser": "*", @@ -691,10 +680,7 @@ "version": "4.19.5", "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.5.tgz", "integrity": "sha512-y6W03tvrACO72aijJ5uF02FRq5cgDR9lUxddQ8vyF+GvmjJQqbzDcJngEjURc+ZsG31VI3hODNZJ2URj86pzmg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 5cd1ed4326964da7a8d04ab8a54e7df940017d5e "license": "MIT", "dependencies": { "@types/node": "*", @@ -707,10 +693,7 @@ "version": "2.0.4", "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz", "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 5cd1ed4326964da7a8d04ab8a54e7df940017d5e "license": "MIT" }, "node_modules/@types/json-schema": { @@ -723,16 +706,14 @@ "version": "1.3.5", "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz", "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 5cd1ed4326964da7a8d04ab8a54e7df940017d5e "license": "MIT" }, "node_modules/@types/node": { "version": "20.14.8", "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.8.tgz", "integrity": "sha512-DO+2/jZinXfROG7j7WKFn/3C6nFwxy2lLpgLjEXJz+0XKphZlTLJ14mo8Vfg8X5BWN6XjyESXq+LcYdT7tR3bA==", + "dev": true, "license": "MIT", "dependencies": { "undici-types": "~5.26.4" @@ -742,10 +723,7 @@ "version": "2.6.11", "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.11.tgz", "integrity": "sha512-24xFj9R5+rfQJLRyM56qh+wnVSYhyXC2tkoBndtY0U+vubqNsYXGjufB2nn8Q6gt0LrARwL6UBtMCSVCwl4B1g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 5cd1ed4326964da7a8d04ab8a54e7df940017d5e "license": "MIT", "dependencies": { "@types/node": "*", @@ -762,30 +740,21 @@ "version": "6.9.16", "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.16.tgz", "integrity": "sha512-7i+zxXdPD0T4cKDuxCUXJ4wHcsJLwENa6Z3dCu8cfCK743OGy5Nu1RmAGqDPsoTDINVEcdXKRvR/zre+P2Ku1A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 5cd1ed4326964da7a8d04ab8a54e7df940017d5e "license": "MIT" }, "node_modules/@types/range-parser": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz", "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 5cd1ed4326964da7a8d04ab8a54e7df940017d5e "license": "MIT" }, "node_modules/@types/send": { "version": "0.17.4", "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz", "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 5cd1ed4326964da7a8d04ab8a54e7df940017d5e "license": "MIT", "dependencies": { "@types/mime": "^1", @@ -796,10 +765,7 @@ "version": "1.15.7", "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz", "integrity": "sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 5cd1ed4326964da7a8d04ab8a54e7df940017d5e "license": "MIT", "dependencies": { "@types/http-errors": "*", @@ -1337,10 +1303,7 @@ "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 5cd1ed4326964da7a8d04ab8a54e7df940017d5e "license": "MIT" }, "node_modules/b4a": { @@ -1790,10 +1753,7 @@ "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 5cd1ed4326964da7a8d04ab8a54e7df940017d5e "license": "MIT", "dependencies": { "delayed-stream": "~1.0.0" @@ -2014,10 +1974,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 5cd1ed4326964da7a8d04ab8a54e7df940017d5e "license": "MIT", "engines": { "node": ">=0.4.0" @@ -2910,10 +2867,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 5cd1ed4326964da7a8d04ab8a54e7df940017d5e "license": "MIT", "dependencies": { "asynckit": "^0.4.0", @@ -2924,8 +2878,6 @@ "node": ">= 6" } }, -<<<<<<< HEAD -======= "node_modules/formdata-polyfill": { "version": "4.0.10", "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz", @@ -2938,7 +2890,6 @@ "node": ">=12.20.0" } }, ->>>>>>> 5cd1ed4326964da7a8d04ab8a54e7df940017d5e "node_modules/forwarded": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", @@ -6030,12 +5981,6 @@ "version": "5.26.5", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", - "license": "MIT" - }, - "node_modules/unique-stream": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz", - "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==", "dev": true, "license": "MIT" }, @@ -6330,8 +6275,6 @@ "node": ">=10.13.0" } }, -<<<<<<< HEAD -======= "node_modules/web-streams-polyfill": { "version": "3.3.3", "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz", @@ -6341,7 +6284,6 @@ "node": ">= 8" } }, ->>>>>>> 5cd1ed4326964da7a8d04ab8a54e7df940017d5e "node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",