diff --git a/bundle/package-lock.json b/bundle/package-lock.json
index fd388bd2..5078696f 100644
--- a/bundle/package-lock.json
+++ b/bundle/package-lock.json
@@ -48,7 +48,6 @@
"nan": "^2.15.0",
"nanocolors": "^0.2.12",
"node-2fa": "^2.0.3",
- "node-fetch": "^3.2.9",
"node-os-utils": "^1.3.5",
"patch-package": "^6.4.7",
"pg": "^8.7.3",
@@ -82,8 +81,7 @@
"@types/jsonwebtoken": "^8.5.0",
"@types/morgan": "^1.9.3",
"@types/multer": "^1.4.7",
- "@types/node": "^14.17.9",
- "@types/node-fetch": "^2.5.12",
+ "@types/node": "^18.0.6",
"@types/node-os-utils": "^1.2.0",
"@types/supertest": "^2.0.11",
"@types/ws": "^8.5.3",
@@ -128,7 +126,6 @@
"morgan": "^1.10.0",
"multer": "^1.4.5-lts.1",
"node-2fa": "^2.0.3",
- "node-fetch": "^3.2.9",
"patch-package": "^6.4.7",
"picocolors": "^1.0.0",
"proxy-agent": "^5.0.0",
@@ -149,8 +146,7 @@
"@types/jsonwebtoken": "^8.5.0",
"@types/morgan": "^1.9.3",
"@types/multer": "^1.4.5",
- "@types/node": "^14.18.22",
- "@types/node-fetch": "^2.5.5",
+ "@types/node": "^18.0.6",
"@types/supertest": "^2.0.11",
"jest": "^28.1.3",
"jest-expect-message": "^1.0.2",
@@ -186,7 +182,6 @@
"missing-native-js-functions": "^1.2.17",
"multer": "^1.4.5-lts.1",
"nanocolors": "^0.2.12",
- "node-fetch": "^3.2.9",
"supertest": "^6.1.6",
"typescript": "^4.1.2"
},
@@ -200,8 +195,7 @@
"@types/fs-extra": "^9.0.12",
"@types/jsonwebtoken": "^8.5.0",
"@types/multer": "^1.4.7",
- "@types/node": "^14.17.0",
- "@types/node-fetch": "^2.5.7",
+ "@types/node": "^18.0.6",
"ts-patch": "^2.0.1"
}
},
@@ -217,7 +211,6 @@
"jsonwebtoken": "^8.5.1",
"lambert-server": "^1.2.11",
"missing-native-js-functions": "^1.2.18",
- "node-fetch": "^3.2.9",
"proxy-agent": "^5.0.0",
"typeorm": "^0.3.7",
"ws": "^8.8.1"
@@ -226,8 +219,7 @@
"@ovos-media/ts-transform-paths": "^1.7.18-1",
"@types/amqplib": "^0.8.1",
"@types/jsonwebtoken": "^8.5.0",
- "@types/node": "^14.17.9",
- "@types/node-fetch": "^2.5.12",
+ "@types/node": "^18.0.6",
"@types/ws": "^8.5.3",
"ts-node-dev": "^2.0.0",
"ts-patch": "^2.0.1",
@@ -3889,31 +3881,9 @@
}
},
"node_modules/@types/node": {
- "version": "14.18.22",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.22.tgz",
- "integrity": "sha512-qzaYbXVzin6EPjghf/hTdIbnVW1ErMx8rPzwRNJhlbyJhu2SyqlvjGOY/tbUt6VFyzg56lROcOeSQRInpt63Yw=="
- },
- "node_modules/@types/node-fetch": {
- "version": "2.5.12",
- "integrity": "sha512-MKgC4dlq4kKNa/mYrwpKfzQMB5X3ee5U6fSprkKpToBqBmX4nFZL9cW5jl6sWn+xpRJ7ypWh2yyqqr8UUCstSw==",
- "dev": true,
- "dependencies": {
- "@types/node": "*",
- "form-data": "^3.0.0"
- }
- },
- "node_modules/@types/node-fetch/node_modules/form-data": {
- "version": "3.0.1",
- "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
- "dev": true,
- "dependencies": {
- "asynckit": "^0.4.0",
- "combined-stream": "^1.0.8",
- "mime-types": "^2.1.12"
- },
- "engines": {
- "node": ">= 6"
- }
+ "version": "18.0.6",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-18.0.6.tgz",
+ "integrity": "sha512-/xUq6H2aQm261exT6iZTMifUySEt4GR5KX8eYyY+C4MSNPqSh9oNIP7tz2GLKTlFaiBbgZNxffoR3CVRG+cljw=="
},
"node_modules/@types/node-os-utils": {
"version": "1.2.0",
@@ -5091,14 +5061,6 @@
"url": "https://github.com/sponsors/fb55"
}
},
- "node_modules/data-uri-to-buffer": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.0.tgz",
- "integrity": "sha512-Vr3mLBA8qWmcuschSLAOogKgQ/Jwxulv3RNE4FXnYWRGujzrRWQI4m12fQqRkwX06C0KanhLr4hK+GydchZsaA==",
- "engines": {
- "node": ">= 12"
- }
- },
"node_modules/date-fns": {
"version": "2.28.0",
"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.28.0.tgz",
@@ -5615,28 +5577,6 @@
"bser": "2.1.1"
}
},
- "node_modules/fetch-blob": {
- "version": "3.2.0",
- "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz",
- "integrity": "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==",
- "funding": [
- {
- "type": "github",
- "url": "https://github.com/sponsors/jimmywarting"
- },
- {
- "type": "paypal",
- "url": "https://paypal.me/jimmywarting"
- }
- ],
- "dependencies": {
- "node-domexception": "^1.0.0",
- "web-streams-polyfill": "^3.0.3"
- },
- "engines": {
- "node": "^12.20 || >= 14.13"
- }
- },
"node_modules/file-type": {
"version": "17.1.2",
"resolved": "https://registry.npmjs.org/file-type/-/file-type-17.1.2.tgz",
@@ -5725,17 +5665,6 @@
"node": ">= 6"
}
},
- "node_modules/formdata-polyfill": {
- "version": "4.0.10",
- "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz",
- "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==",
- "dependencies": {
- "fetch-blob": "^3.1.2"
- },
- "engines": {
- "node": ">=12.20.0"
- }
- },
"node_modules/formidable": {
"version": "1.2.2",
"integrity": "sha512-V8gLm+41I/8kguQ4/o1D3RIHRmhYFG4pnNyonvua+40rqcEmT4+V71yaZ3B457xbbgCsCfjSPi65u/W6vK1U5Q==",
@@ -8140,41 +8069,6 @@
"version": "3.2.1",
"integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A=="
},
- "node_modules/node-domexception": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz",
- "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==",
- "funding": [
- {
- "type": "github",
- "url": "https://github.com/sponsors/jimmywarting"
- },
- {
- "type": "github",
- "url": "https://paypal.me/jimmywarting"
- }
- ],
- "engines": {
- "node": ">=10.5.0"
- }
- },
- "node_modules/node-fetch": {
- "version": "3.2.9",
- "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.2.9.tgz",
- "integrity": "sha512-/2lI+DBecVvVm9tDhjziTVjo2wmTsSxSk58saUYP0P/fRJ3xxtfMDY24+CKTkfm0Dlhyn3CSXNL0SoRiCZ8Rzg==",
- "dependencies": {
- "data-uri-to-buffer": "^4.0.0",
- "fetch-blob": "^3.1.4",
- "formdata-polyfill": "^4.0.10"
- },
- "engines": {
- "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/node-fetch"
- }
- },
"node_modules/node-int64": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
@@ -11317,14 +11211,6 @@
"makeerror": "1.0.12"
}
},
- "node_modules/web-streams-polyfill": {
- "version": "3.2.1",
- "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz",
- "integrity": "sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==",
- "engines": {
- "node": ">= 8"
- }
- },
"node_modules/webidl-conversions": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
@@ -13711,8 +13597,7 @@
"@types/jsonwebtoken": "^8.5.0",
"@types/morgan": "^1.9.3",
"@types/multer": "^1.4.5",
- "@types/node": "^14.18.22",
- "@types/node-fetch": "^2.5.5",
+ "@types/node": "^18.0.6",
"@types/supertest": "^2.0.11",
"ajv": "8.6.2",
"ajv-formats": "^2.1.1",
@@ -13737,7 +13622,6 @@
"morgan": "^1.10.0",
"multer": "^1.4.5-lts.1",
"node-2fa": "^2.0.3",
- "node-fetch": "^3.2.9",
"patch-package": "^6.4.7",
"picocolors": "^1.0.0",
"proxy-agent": "^5.0.0",
@@ -13765,8 +13649,7 @@
"@types/fs-extra": "^9.0.12",
"@types/jsonwebtoken": "^8.5.0",
"@types/multer": "^1.4.7",
- "@types/node": "^14.17.0",
- "@types/node-fetch": "^2.5.7",
+ "@types/node": "^18.0.6",
"body-parser": "^1.19.0",
"btoa": "^1.2.1",
"dotenv": "^16.0.1",
@@ -13783,7 +13666,6 @@
"missing-native-js-functions": "^1.2.17",
"multer": "^1.4.5-lts.1",
"nanocolors": "^0.2.12",
- "node-fetch": "^3.2.9",
"supertest": "^6.1.6",
"ts-patch": "^2.0.1",
"typescript": "^4.1.2"
@@ -13796,8 +13678,7 @@
"@ovos-media/ts-transform-paths": "^1.7.18-1",
"@types/amqplib": "^0.8.1",
"@types/jsonwebtoken": "^8.5.0",
- "@types/node": "^14.17.9",
- "@types/node-fetch": "^2.5.12",
+ "@types/node": "^18.0.6",
"@types/ws": "^8.5.3",
"@yukikaze-bot/erlpack": "^1.0.1",
"amqplib": "^0.10.0",
@@ -13805,7 +13686,6 @@
"jsonwebtoken": "^8.5.1",
"lambert-server": "^1.2.11",
"missing-native-js-functions": "^1.2.18",
- "node-fetch": "^3.2.9",
"proxy-agent": "^5.0.0",
"ts-node-dev": "^2.0.0",
"ts-patch": "^2.0.1",
@@ -14572,30 +14452,9 @@
}
},
"@types/node": {
- "version": "14.18.22",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.22.tgz",
- "integrity": "sha512-qzaYbXVzin6EPjghf/hTdIbnVW1ErMx8rPzwRNJhlbyJhu2SyqlvjGOY/tbUt6VFyzg56lROcOeSQRInpt63Yw=="
- },
- "@types/node-fetch": {
- "version": "2.5.12",
- "integrity": "sha512-MKgC4dlq4kKNa/mYrwpKfzQMB5X3ee5U6fSprkKpToBqBmX4nFZL9cW5jl6sWn+xpRJ7ypWh2yyqqr8UUCstSw==",
- "dev": true,
- "requires": {
- "@types/node": "*",
- "form-data": "^3.0.0"
- },
- "dependencies": {
- "form-data": {
- "version": "3.0.1",
- "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
- "dev": true,
- "requires": {
- "asynckit": "^0.4.0",
- "combined-stream": "^1.0.8",
- "mime-types": "^2.1.12"
- }
- }
- }
+ "version": "18.0.6",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-18.0.6.tgz",
+ "integrity": "sha512-/xUq6H2aQm261exT6iZTMifUySEt4GR5KX8eYyY+C4MSNPqSh9oNIP7tz2GLKTlFaiBbgZNxffoR3CVRG+cljw=="
},
"@types/node-os-utils": {
"version": "1.2.0",
@@ -15507,11 +15366,6 @@
"version": "5.0.1",
"integrity": "sha512-FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg=="
},
- "data-uri-to-buffer": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.0.tgz",
- "integrity": "sha512-Vr3mLBA8qWmcuschSLAOogKgQ/Jwxulv3RNE4FXnYWRGujzrRWQI4m12fQqRkwX06C0KanhLr4hK+GydchZsaA=="
- },
"date-fns": {
"version": "2.28.0",
"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.28.0.tgz",
@@ -15888,15 +15742,6 @@
"bser": "2.1.1"
}
},
- "fetch-blob": {
- "version": "3.2.0",
- "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz",
- "integrity": "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==",
- "requires": {
- "node-domexception": "^1.0.0",
- "web-streams-polyfill": "^3.0.3"
- }
- },
"file-type": {
"version": "17.1.2",
"resolved": "https://registry.npmjs.org/file-type/-/file-type-17.1.2.tgz",
@@ -15967,14 +15812,6 @@
"mime-types": "^2.1.12"
}
},
- "formdata-polyfill": {
- "version": "4.0.10",
- "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz",
- "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==",
- "requires": {
- "fetch-blob": "^3.1.2"
- }
- },
"formidable": {
"version": "1.2.2",
"integrity": "sha512-V8gLm+41I/8kguQ4/o1D3RIHRmhYFG4pnNyonvua+40rqcEmT4+V71yaZ3B457xbbgCsCfjSPi65u/W6vK1U5Q=="
@@ -17710,21 +17547,6 @@
"version": "3.2.1",
"integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A=="
},
- "node-domexception": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz",
- "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ=="
- },
- "node-fetch": {
- "version": "3.2.9",
- "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.2.9.tgz",
- "integrity": "sha512-/2lI+DBecVvVm9tDhjziTVjo2wmTsSxSk58saUYP0P/fRJ3xxtfMDY24+CKTkfm0Dlhyn3CSXNL0SoRiCZ8Rzg==",
- "requires": {
- "data-uri-to-buffer": "^4.0.0",
- "fetch-blob": "^3.1.4",
- "formdata-polyfill": "^4.0.10"
- }
- },
"node-int64": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
@@ -19990,11 +19812,6 @@
"makeerror": "1.0.12"
}
},
- "web-streams-polyfill": {
- "version": "3.2.1",
- "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz",
- "integrity": "sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q=="
- },
"webidl-conversions": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
diff --git a/bundle/package.json b/bundle/package.json
index 670569e5..002ed7f9 100644
--- a/bundle/package.json
+++ b/bundle/package.json
@@ -29,6 +29,7 @@
"@babel/core": "^7.18.9",
"@babel/preset-env": "^7.18.9",
"@babel/preset-typescript": "^7.15.0",
+ "@ovos-media/ts-transform-paths": "^1.7.18-1",
"@types/amqplib": "^0.8.1",
"@types/bcrypt": "^5.0.0",
"@types/body-parser": "^1.19.0",
@@ -42,12 +43,10 @@
"@types/jsonwebtoken": "^8.5.0",
"@types/morgan": "^1.9.3",
"@types/multer": "^1.4.7",
- "@types/node": "^14.17.9",
- "@types/node-fetch": "^2.5.12",
+ "@types/node": "^18.0.6",
"@types/node-os-utils": "^1.2.0",
"@types/supertest": "^2.0.11",
"@types/ws": "^8.5.3",
- "@ovos-media/ts-transform-paths": "^1.7.18-1",
"jest": "^28.1.3",
"jest-expect-message": "^1.0.2",
"jest-runtime": "^28.1.3",
@@ -98,7 +97,6 @@
"nan": "^2.15.0",
"nanocolors": "^0.2.12",
"node-2fa": "^2.0.3",
- "node-fetch": "^3.2.9",
"node-os-utils": "^1.3.5",
"patch-package": "^6.4.7",
"pg": "^8.7.3",
diff --git a/bundle/tsconfig.json b/bundle/tsconfig.json
index 5fa81174..87f6578a 100644
--- a/bundle/tsconfig.json
+++ b/bundle/tsconfig.json
@@ -8,7 +8,7 @@
"target": "ESNext" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */,
"module": "commonjs" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */,
"lib": [
- "ES2021"
+ "ESNext"
] /* Specify library files to be included in the compilation. */,
"allowJs": true /* Allow javascript files to be compiled. */,
"checkJs": true /* Report errors in .js files. */,
|
