diff --git a/client/package.json b/client/package.json index 6d1f71f..3a6a8cc 100644 --- a/client/package.json +++ b/client/package.json @@ -15,7 +15,7 @@ }, "dependencies": { "@entityseven/rage-fw-rpc": "0.2.5", - "zod": "^3.23.8" + "zod": "^3.24.1" }, "devDependencies": { "@types/node": "catalog:" diff --git a/package.json b/package.json index eb34e5c..2a736cc 100644 --- a/package.json +++ b/package.json @@ -9,19 +9,19 @@ "rebuild": "pnpm rebuild:browser && pnpm rebuild:client && pnpm rebuild:server" }, "dependencies": { - "@microsoft/api-extractor": "^7.47.0", + "@microsoft/api-extractor": "^7.49.1", "@ragempcommunity/types-cef": "catalog:", "@ragempcommunity/types-client": "catalog:", "@ragempcommunity/types-server": "catalog:", "@typescript-eslint/eslint-plugin": "^7.13.0", "@typescript-eslint/parser": "^7.13.0", "cli": "^1.0.1", - "eslint": "^8.56.0", - "lerna": "^8.1.3", - "prettier": "^3.3.1", - "tsup": "^8.1.0", - "typescript": "^5.4.5", - "winston": "^3.13.0" + "eslint": "^9.19.0", + "lerna": "^8.1.9", + "prettier": "^3.4.2", + "tsup": "^8.3.6", + "typescript": "^5.7.3", + "winston": "^3.17.0" }, "engines": { "node": ">=14", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1fe9e1d..9b99ff2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -16,16 +16,16 @@ catalogs: specifier: ^2.1.8 version: 2.1.8 '@types/node': - specifier: 14.10.1 - version: 14.10.1 + specifier: 22.12.0 + version: 22.12.0 importers: .: dependencies: '@microsoft/api-extractor': - specifier: ^7.47.0 - version: 7.49.1(@types/node@14.10.1) + specifier: ^7.49.1 + version: 7.49.1(@types/node@22.12.0) '@ragempcommunity/types-cef': specifier: 'catalog:' version: 2.1.8 @@ -37,30 +37,30 @@ importers: version: 2.1.8 '@typescript-eslint/eslint-plugin': specifier: ^7.13.0 - version: 7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.7.3))(eslint@8.57.1)(typescript@5.7.3) + version: 7.18.0(@typescript-eslint/parser@7.18.0(eslint@9.19.0)(typescript@5.7.3))(eslint@9.19.0)(typescript@5.7.3) '@typescript-eslint/parser': specifier: ^7.13.0 - version: 7.18.0(eslint@8.57.1)(typescript@5.7.3) + version: 7.18.0(eslint@9.19.0)(typescript@5.7.3) cli: specifier: ^1.0.1 version: 1.0.1 eslint: - specifier: ^8.56.0 - version: 8.57.1 + specifier: ^9.19.0 + version: 9.19.0 lerna: - specifier: ^8.1.3 + specifier: ^8.1.9 version: 8.1.9(encoding@0.1.13) prettier: - specifier: ^3.3.1 + specifier: ^3.4.2 version: 3.4.2 tsup: - specifier: ^8.1.0 - version: 8.3.6(@microsoft/api-extractor@7.49.1(@types/node@14.10.1))(typescript@5.7.3)(yaml@2.7.0) + specifier: ^8.3.6 + version: 8.3.6(@microsoft/api-extractor@7.49.1(@types/node@22.12.0))(typescript@5.7.3)(yaml@2.7.0) typescript: - specifier: ^5.4.5 + specifier: ^5.7.3 version: 5.7.3 winston: - specifier: ^3.13.0 + specifier: ^3.17.0 version: 3.17.0 browser: @@ -80,7 +80,7 @@ importers: devDependencies: '@types/node': specifier: 'catalog:' - version: 14.10.1 + version: 22.12.0 client: dependencies: @@ -97,12 +97,12 @@ importers: specifier: ^5 version: 5.7.3 zod: - specifier: ^3.23.8 + specifier: ^3.24.1 version: 3.24.1 devDependencies: '@types/node': specifier: 'catalog:' - version: 14.10.1 + version: 22.12.0 rpc: dependencies: @@ -112,16 +112,10 @@ importers: devDependencies: '@microsoft/api-extractor': specifier: ^7.47.9 - version: 7.49.1(@types/node@14.10.1) + version: 7.49.1(@types/node@22.12.0) '@types/node': specifier: 'catalog:' - version: 14.10.1 - prettier: - specifier: ^3.3.2 - version: 3.4.2 - tsup: - specifier: ^8.3.0 - version: 8.3.6(@microsoft/api-extractor@7.49.1(@types/node@14.10.1))(typescript@5.7.3)(yaml@2.7.0) + version: 22.12.0 server: dependencies: @@ -138,12 +132,12 @@ importers: specifier: ^5 version: 5.7.3 zod: - specifier: ^3.23.8 + specifier: ^3.24.1 version: 3.24.1 devDependencies: '@types/node': specifier: 'catalog:' - version: 14.10.1 + version: 22.12.0 shared-types: {} @@ -341,26 +335,49 @@ packages: resolution: {integrity: sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==} engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} - '@eslint/eslintrc@2.1.4': - resolution: {integrity: sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + '@eslint/config-array@0.19.1': + resolution: {integrity: sha512-fo6Mtm5mWyKjA/Chy1BYTdn5mGJoDNjC7C64ug20ADsRDGrA85bN3uK3MaKbeRkRuuIEAR5N33Jr1pbm411/PA==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@eslint/js@8.57.1': - resolution: {integrity: sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + '@eslint/core@0.10.0': + resolution: {integrity: sha512-gFHJ+xBOo4G3WRlR1e/3G8A6/KZAH6zcE/hkLRCZTi/B9avAG365QhFA8uOGzTMqgTghpn7/fSnscW++dpMSAw==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@humanwhocodes/config-array@0.13.0': - resolution: {integrity: sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==} - engines: {node: '>=10.10.0'} - deprecated: Use @eslint/config-array instead + '@eslint/eslintrc@3.2.0': + resolution: {integrity: sha512-grOjVNN8P3hjJn/eIETF1wwd12DdnwFDoyceUJLYYdkpbwq3nLi+4fqrTAONx7XDALqlL220wC/RHSC/QTI/0w==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + + '@eslint/js@9.19.0': + resolution: {integrity: sha512-rbq9/g38qjfqFLOVPvwjIvFFdNziEC5S65jmjPw5r6A//QH+W91akh9irMwjDN8zKUTak6W9EsAv4m/7Wnw0UQ==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + + '@eslint/object-schema@2.1.5': + resolution: {integrity: sha512-o0bhxnL89h5Bae5T318nFoFzGy+YE5i/gGkoPAgkmTVdRKTiv3p8JHevPiPaMwoloKfEiiaHlawCqaZMqRm+XQ==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + + '@eslint/plugin-kit@0.2.5': + resolution: {integrity: sha512-lB05FkqEdUg2AA0xEbUz0SnkXT1LcCTa438W4IWTUh4hdOnVbQyOJ81OrDXsJk/LSiJHubgGEFoR5EHq1NsH1A==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + + '@humanfs/core@0.19.1': + resolution: {integrity: sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==} + engines: {node: '>=18.18.0'} + + '@humanfs/node@0.16.6': + resolution: {integrity: sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==} + engines: {node: '>=18.18.0'} '@humanwhocodes/module-importer@1.0.1': resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==} engines: {node: '>=12.22'} - '@humanwhocodes/object-schema@2.0.3': - resolution: {integrity: sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==} - deprecated: Use @eslint/object-schema instead + '@humanwhocodes/retry@0.3.1': + resolution: {integrity: sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==} + engines: {node: '>=18.18'} + + '@humanwhocodes/retry@0.4.1': + resolution: {integrity: sha512-c7hNEllBlenFTHBky65mhq8WD2kbN9Q6gk0bTk8lSBvc554jpXSkST1iePudpt7+A/AQvuHs9EMqjHDXMY1lrA==} + engines: {node: '>=18.18'} '@hutson/parse-repository-url@3.0.2': resolution: {integrity: sha512-H9XAx3hc0BQHY6l+IFSWHDySypcXsvsuLhgYLUGywmJ5pswRVQJUHpOsobnLYp2ZUaUlKiKDrgWWhosOwAEM8Q==} @@ -784,14 +801,17 @@ packages: '@types/estree@1.0.6': resolution: {integrity: sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==} + '@types/json-schema@7.0.15': + resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==} + '@types/minimatch@3.0.5': resolution: {integrity: sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==} '@types/minimist@1.2.5': resolution: {integrity: sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==} - '@types/node@14.10.1': - resolution: {integrity: sha512-aYNbO+FZ/3KGeQCEkNhHFRIzBOUgc7QvcVNKXbfnhDkSfwUv91JsQQa10rDgKSTSLkXZ1UIyPe4FJJNVgw1xWQ==} + '@types/node@22.12.0': + resolution: {integrity: sha512-Fll2FZ1riMjNmlmJOdAyY5pUbkftXslB5DgEzlIuNaiWhXd00FhWxVC/r4yV/4wBb9JfImTu+jiSvXTkJ7F/gA==} '@types/normalize-package-data@2.4.4': resolution: {integrity: sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==} @@ -857,9 +877,6 @@ packages: resolution: {integrity: sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==} engines: {node: ^18.18.0 || >=20.0.0} - '@ungap/structured-clone@1.3.0': - resolution: {integrity: sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==} - '@yarnpkg/lockfile@1.1.0': resolution: {integrity: sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==} @@ -1296,10 +1313,6 @@ packages: resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==} engines: {node: '>=8'} - doctrine@3.0.0: - resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==} - engines: {node: '>=6.0.0'} - dot-prop@5.3.0: resolution: {integrity: sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==} engines: {node: '>=8'} @@ -1374,23 +1387,31 @@ packages: resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==} engines: {node: '>=10'} - eslint-scope@7.2.2: - resolution: {integrity: sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + eslint-scope@8.2.0: + resolution: {integrity: sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} eslint-visitor-keys@3.4.3: resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - eslint@8.57.1: - resolution: {integrity: sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - deprecated: This version is no longer supported. Please see https://eslint.org/version-support for other options. - hasBin: true + eslint-visitor-keys@4.2.0: + resolution: {integrity: sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - espree@9.6.1: - resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + eslint@9.19.0: + resolution: {integrity: sha512-ug92j0LepKlbbEv6hD911THhoRHmbdXt2gX+VDABAW/Ir7D3nqKdv5Pf5vtlyY6HQMTEP2skXY43ueqTCWssEA==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + hasBin: true + peerDependencies: + jiti: '*' + peerDependenciesMeta: + jiti: + optional: true + + espree@10.3.0: + resolution: {integrity: sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} esprima@4.0.1: resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==} @@ -1462,9 +1483,9 @@ packages: resolution: {integrity: sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==} engines: {node: '>=8'} - file-entry-cache@6.0.1: - resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==} - engines: {node: ^10.12.0 || >=12.0.0} + file-entry-cache@8.0.0: + resolution: {integrity: sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==} + engines: {node: '>=16.0.0'} filelist@1.0.4: resolution: {integrity: sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==} @@ -1485,9 +1506,9 @@ packages: resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==} engines: {node: '>=10'} - flat-cache@3.2.0: - resolution: {integrity: sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==} - engines: {node: ^10.12.0 || >=12.0.0} + flat-cache@4.0.1: + resolution: {integrity: sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==} + engines: {node: '>=16'} flat@5.0.2: resolution: {integrity: sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==} @@ -1609,9 +1630,9 @@ packages: resolution: {integrity: sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==} engines: {node: '>=16 || 14 >=14.17'} - globals@13.24.0: - resolution: {integrity: sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==} - engines: {node: '>=8'} + globals@14.0.0: + resolution: {integrity: sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==} + engines: {node: '>=18'} globby@11.1.0: resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==} @@ -1781,10 +1802,6 @@ packages: resolution: {integrity: sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==} engines: {node: '>=8'} - is-path-inside@3.0.3: - resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==} - engines: {node: '>=8'} - is-plain-obj@1.1.0: resolution: {integrity: sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==} engines: {node: '>=0.10.0'} @@ -2614,11 +2631,6 @@ packages: resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==} engines: {iojs: '>=1.0.0', node: '>=0.10.0'} - rimraf@3.0.2: - resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==} - deprecated: Rimraf versions prior to v4 are no longer supported - hasBin: true - rimraf@4.4.1: resolution: {integrity: sha512-Gk8NlF062+T9CqNGn6h4tls3k6T1+/nXdOcSZVikNVtlRdYpA7wRJJMoXmuvOnLW844rPjdQ7JgXCYM6PPC/og==} engines: {node: '>=14'} @@ -2841,9 +2853,6 @@ packages: text-hex@1.0.0: resolution: {integrity: sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==} - text-table@0.2.0: - resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==} - thenify-all@1.6.0: resolution: {integrity: sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==} engines: {node: '>=0.8'} @@ -2945,10 +2954,6 @@ packages: resolution: {integrity: sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==} engines: {node: '>=10'} - type-fest@0.20.2: - resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==} - engines: {node: '>=10'} - type-fest@0.21.3: resolution: {integrity: sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==} engines: {node: '>=10'} @@ -2983,6 +2988,9 @@ packages: engines: {node: '>=0.8.0'} hasBin: true + undici-types@6.20.0: + resolution: {integrity: sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==} + unique-filename@3.0.0: resolution: {integrity: sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==} engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} @@ -3250,19 +3258,31 @@ snapshots: '@esbuild/win32-x64@0.24.2': optional: true - '@eslint-community/eslint-utils@4.4.1(eslint@8.57.1)': + '@eslint-community/eslint-utils@4.4.1(eslint@9.19.0)': dependencies: - eslint: 8.57.1 + eslint: 9.19.0 eslint-visitor-keys: 3.4.3 '@eslint-community/regexpp@4.12.1': {} - '@eslint/eslintrc@2.1.4': + '@eslint/config-array@0.19.1': + dependencies: + '@eslint/object-schema': 2.1.5 + debug: 4.4.0 + minimatch: 3.1.2 + transitivePeerDependencies: + - supports-color + + '@eslint/core@0.10.0': + dependencies: + '@types/json-schema': 7.0.15 + + '@eslint/eslintrc@3.2.0': dependencies: ajv: 6.12.6 debug: 4.4.0 - espree: 9.6.1 - globals: 13.24.0 + espree: 10.3.0 + globals: 14.0.0 ignore: 5.3.2 import-fresh: 3.3.0 js-yaml: 4.1.0 @@ -3271,19 +3291,27 @@ snapshots: transitivePeerDependencies: - supports-color - '@eslint/js@8.57.1': {} + '@eslint/js@9.19.0': {} - '@humanwhocodes/config-array@0.13.0': + '@eslint/object-schema@2.1.5': {} + + '@eslint/plugin-kit@0.2.5': dependencies: - '@humanwhocodes/object-schema': 2.0.3 - debug: 4.4.0 - minimatch: 3.1.2 - transitivePeerDependencies: - - supports-color + '@eslint/core': 0.10.0 + levn: 0.4.1 + + '@humanfs/core@0.19.1': {} + + '@humanfs/node@0.16.6': + dependencies: + '@humanfs/core': 0.19.1 + '@humanwhocodes/retry': 0.3.1 '@humanwhocodes/module-importer@1.0.1': {} - '@humanwhocodes/object-schema@2.0.3': {} + '@humanwhocodes/retry@0.3.1': {} + + '@humanwhocodes/retry@0.4.1': {} '@hutson/parse-repository-url@3.0.2': {} @@ -3402,23 +3430,23 @@ snapshots: - supports-color - typescript - '@microsoft/api-extractor-model@7.30.2(@types/node@14.10.1)': + '@microsoft/api-extractor-model@7.30.2(@types/node@22.12.0)': dependencies: '@microsoft/tsdoc': 0.15.1 '@microsoft/tsdoc-config': 0.17.1 - '@rushstack/node-core-library': 5.10.2(@types/node@14.10.1) + '@rushstack/node-core-library': 5.10.2(@types/node@22.12.0) transitivePeerDependencies: - '@types/node' - '@microsoft/api-extractor@7.49.1(@types/node@14.10.1)': + '@microsoft/api-extractor@7.49.1(@types/node@22.12.0)': dependencies: - '@microsoft/api-extractor-model': 7.30.2(@types/node@14.10.1) + '@microsoft/api-extractor-model': 7.30.2(@types/node@22.12.0) '@microsoft/tsdoc': 0.15.1 '@microsoft/tsdoc-config': 0.17.1 - '@rushstack/node-core-library': 5.10.2(@types/node@14.10.1) + '@rushstack/node-core-library': 5.10.2(@types/node@22.12.0) '@rushstack/rig-package': 0.5.3 - '@rushstack/terminal': 0.14.5(@types/node@14.10.1) - '@rushstack/ts-command-line': 4.23.3(@types/node@14.10.1) + '@rushstack/terminal': 0.14.5(@types/node@22.12.0) + '@rushstack/ts-command-line': 4.23.3(@types/node@22.12.0) lodash: 4.17.21 minimatch: 3.0.8 resolve: 1.22.10 @@ -3776,7 +3804,7 @@ snapshots: '@rollup/rollup-win32-x64-msvc@4.32.1': optional: true - '@rushstack/node-core-library@5.10.2(@types/node@14.10.1)': + '@rushstack/node-core-library@5.10.2(@types/node@22.12.0)': dependencies: ajv: 8.13.0 ajv-draft-04: 1.0.0(ajv@8.13.0) @@ -3787,23 +3815,23 @@ snapshots: resolve: 1.22.10 semver: 7.5.4 optionalDependencies: - '@types/node': 14.10.1 + '@types/node': 22.12.0 '@rushstack/rig-package@0.5.3': dependencies: resolve: 1.22.10 strip-json-comments: 3.1.1 - '@rushstack/terminal@0.14.5(@types/node@14.10.1)': + '@rushstack/terminal@0.14.5(@types/node@22.12.0)': dependencies: - '@rushstack/node-core-library': 5.10.2(@types/node@14.10.1) + '@rushstack/node-core-library': 5.10.2(@types/node@22.12.0) supports-color: 8.1.1 optionalDependencies: - '@types/node': 14.10.1 + '@types/node': 22.12.0 - '@rushstack/ts-command-line@4.23.3(@types/node@14.10.1)': + '@rushstack/ts-command-line@4.23.3(@types/node@22.12.0)': dependencies: - '@rushstack/terminal': 0.14.5(@types/node@14.10.1) + '@rushstack/terminal': 0.14.5(@types/node@22.12.0) '@types/argparse': 1.0.38 argparse: 1.0.10 string-argv: 0.3.2 @@ -3859,25 +3887,29 @@ snapshots: '@types/estree@1.0.6': {} + '@types/json-schema@7.0.15': {} + '@types/minimatch@3.0.5': {} '@types/minimist@1.2.5': {} - '@types/node@14.10.1': {} + '@types/node@22.12.0': + dependencies: + undici-types: 6.20.0 '@types/normalize-package-data@2.4.4': {} '@types/triple-beam@1.3.5': {} - '@typescript-eslint/eslint-plugin@7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.7.3))(eslint@8.57.1)(typescript@5.7.3)': + '@typescript-eslint/eslint-plugin@7.18.0(@typescript-eslint/parser@7.18.0(eslint@9.19.0)(typescript@5.7.3))(eslint@9.19.0)(typescript@5.7.3)': dependencies: '@eslint-community/regexpp': 4.12.1 - '@typescript-eslint/parser': 7.18.0(eslint@8.57.1)(typescript@5.7.3) + '@typescript-eslint/parser': 7.18.0(eslint@9.19.0)(typescript@5.7.3) '@typescript-eslint/scope-manager': 7.18.0 - '@typescript-eslint/type-utils': 7.18.0(eslint@8.57.1)(typescript@5.7.3) - '@typescript-eslint/utils': 7.18.0(eslint@8.57.1)(typescript@5.7.3) + '@typescript-eslint/type-utils': 7.18.0(eslint@9.19.0)(typescript@5.7.3) + '@typescript-eslint/utils': 7.18.0(eslint@9.19.0)(typescript@5.7.3) '@typescript-eslint/visitor-keys': 7.18.0 - eslint: 8.57.1 + eslint: 9.19.0 graphemer: 1.4.0 ignore: 5.3.2 natural-compare: 1.4.0 @@ -3887,14 +3919,14 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.7.3)': + '@typescript-eslint/parser@7.18.0(eslint@9.19.0)(typescript@5.7.3)': dependencies: '@typescript-eslint/scope-manager': 7.18.0 '@typescript-eslint/types': 7.18.0 '@typescript-eslint/typescript-estree': 7.18.0(typescript@5.7.3) '@typescript-eslint/visitor-keys': 7.18.0 debug: 4.4.0 - eslint: 8.57.1 + eslint: 9.19.0 optionalDependencies: typescript: 5.7.3 transitivePeerDependencies: @@ -3905,12 +3937,12 @@ snapshots: '@typescript-eslint/types': 7.18.0 '@typescript-eslint/visitor-keys': 7.18.0 - '@typescript-eslint/type-utils@7.18.0(eslint@8.57.1)(typescript@5.7.3)': + '@typescript-eslint/type-utils@7.18.0(eslint@9.19.0)(typescript@5.7.3)': dependencies: '@typescript-eslint/typescript-estree': 7.18.0(typescript@5.7.3) - '@typescript-eslint/utils': 7.18.0(eslint@8.57.1)(typescript@5.7.3) + '@typescript-eslint/utils': 7.18.0(eslint@9.19.0)(typescript@5.7.3) debug: 4.4.0 - eslint: 8.57.1 + eslint: 9.19.0 ts-api-utils: 1.4.3(typescript@5.7.3) optionalDependencies: typescript: 5.7.3 @@ -3934,13 +3966,13 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@7.18.0(eslint@8.57.1)(typescript@5.7.3)': + '@typescript-eslint/utils@7.18.0(eslint@9.19.0)(typescript@5.7.3)': dependencies: - '@eslint-community/eslint-utils': 4.4.1(eslint@8.57.1) + '@eslint-community/eslint-utils': 4.4.1(eslint@9.19.0) '@typescript-eslint/scope-manager': 7.18.0 '@typescript-eslint/types': 7.18.0 '@typescript-eslint/typescript-estree': 7.18.0(typescript@5.7.3) - eslint: 8.57.1 + eslint: 9.19.0 transitivePeerDependencies: - supports-color - typescript @@ -3950,8 +3982,6 @@ snapshots: '@typescript-eslint/types': 7.18.0 eslint-visitor-keys: 3.4.3 - '@ungap/structured-clone@1.3.0': {} - '@yarnpkg/lockfile@1.1.0': {} '@yarnpkg/parsers@3.0.2': @@ -4366,10 +4396,6 @@ snapshots: dependencies: path-type: 4.0.0 - doctrine@3.0.0: - dependencies: - esutils: 2.0.3 - dot-prop@5.3.0: dependencies: is-obj: 2.0.0 @@ -4451,61 +4477,59 @@ snapshots: escape-string-regexp@4.0.0: {} - eslint-scope@7.2.2: + eslint-scope@8.2.0: dependencies: esrecurse: 4.3.0 estraverse: 5.3.0 eslint-visitor-keys@3.4.3: {} - eslint@8.57.1: + eslint-visitor-keys@4.2.0: {} + + eslint@9.19.0: dependencies: - '@eslint-community/eslint-utils': 4.4.1(eslint@8.57.1) + '@eslint-community/eslint-utils': 4.4.1(eslint@9.19.0) '@eslint-community/regexpp': 4.12.1 - '@eslint/eslintrc': 2.1.4 - '@eslint/js': 8.57.1 - '@humanwhocodes/config-array': 0.13.0 + '@eslint/config-array': 0.19.1 + '@eslint/core': 0.10.0 + '@eslint/eslintrc': 3.2.0 + '@eslint/js': 9.19.0 + '@eslint/plugin-kit': 0.2.5 + '@humanfs/node': 0.16.6 '@humanwhocodes/module-importer': 1.0.1 - '@nodelib/fs.walk': 1.2.8 - '@ungap/structured-clone': 1.3.0 + '@humanwhocodes/retry': 0.4.1 + '@types/estree': 1.0.6 + '@types/json-schema': 7.0.15 ajv: 6.12.6 chalk: 4.1.2 cross-spawn: 7.0.6 debug: 4.4.0 - doctrine: 3.0.0 escape-string-regexp: 4.0.0 - eslint-scope: 7.2.2 - eslint-visitor-keys: 3.4.3 - espree: 9.6.1 + eslint-scope: 8.2.0 + eslint-visitor-keys: 4.2.0 + espree: 10.3.0 esquery: 1.6.0 esutils: 2.0.3 fast-deep-equal: 3.1.3 - file-entry-cache: 6.0.1 + file-entry-cache: 8.0.0 find-up: 5.0.0 glob-parent: 6.0.2 - globals: 13.24.0 - graphemer: 1.4.0 ignore: 5.3.2 imurmurhash: 0.1.4 is-glob: 4.0.3 - is-path-inside: 3.0.3 - js-yaml: 4.1.0 json-stable-stringify-without-jsonify: 1.0.1 - levn: 0.4.1 lodash.merge: 4.6.2 minimatch: 3.1.2 natural-compare: 1.4.0 optionator: 0.9.4 - strip-ansi: 6.0.1 - text-table: 0.2.0 transitivePeerDependencies: - supports-color - espree@9.6.1: + espree@10.3.0: dependencies: acorn: 8.14.0 acorn-jsx: 5.3.2(acorn@8.14.0) - eslint-visitor-keys: 3.4.3 + eslint-visitor-keys: 4.2.0 esprima@4.0.1: {} @@ -4573,9 +4597,9 @@ snapshots: dependencies: escape-string-regexp: 1.0.5 - file-entry-cache@6.0.1: + file-entry-cache@8.0.0: dependencies: - flat-cache: 3.2.0 + flat-cache: 4.0.1 filelist@1.0.4: dependencies: @@ -4599,11 +4623,10 @@ snapshots: locate-path: 6.0.0 path-exists: 4.0.0 - flat-cache@3.2.0: + flat-cache@4.0.1: dependencies: flatted: 3.3.2 keyv: 4.5.4 - rimraf: 3.0.2 flat@5.0.2: {} @@ -4732,9 +4755,7 @@ snapshots: minipass: 4.2.8 path-scurry: 1.11.1 - globals@13.24.0: - dependencies: - type-fest: 0.20.2 + globals@14.0.0: {} globby@11.1.0: dependencies: @@ -4905,8 +4926,6 @@ snapshots: is-obj@2.0.0: {} - is-path-inside@3.0.3: {} - is-plain-obj@1.1.0: {} is-plain-object@2.0.4: @@ -5550,7 +5569,7 @@ snapshots: bl: 4.1.0 chalk: 4.1.2 cli-cursor: 3.1.0 - cli-spinners: 2.6.1 + cli-spinners: 2.9.2 is-interactive: 1.0.0 log-symbols: 4.1.0 strip-ansi: 6.0.1 @@ -5860,10 +5879,6 @@ snapshots: reusify@1.0.4: {} - rimraf@3.0.2: - dependencies: - glob: 7.2.3 - rimraf@4.4.1: dependencies: glob: 9.3.5 @@ -6100,8 +6115,6 @@ snapshots: text-hex@1.0.0: {} - text-table@0.2.0: {} - thenify-all@1.6.0: dependencies: thenify: 3.3.1 @@ -6162,7 +6175,7 @@ snapshots: tslib@2.8.1: {} - tsup@8.3.6(@microsoft/api-extractor@7.49.1(@types/node@14.10.1))(typescript@5.7.3)(yaml@2.7.0): + tsup@8.3.6(@microsoft/api-extractor@7.49.1(@types/node@22.12.0))(typescript@5.7.3)(yaml@2.7.0): dependencies: bundle-require: 5.1.0(esbuild@0.24.2) cac: 6.7.14 @@ -6181,7 +6194,7 @@ snapshots: tinyglobby: 0.2.10 tree-kill: 1.2.2 optionalDependencies: - '@microsoft/api-extractor': 7.49.1(@types/node@14.10.1) + '@microsoft/api-extractor': 7.49.1(@types/node@22.12.0) typescript: 5.7.3 transitivePeerDependencies: - jiti @@ -6203,8 +6216,6 @@ snapshots: type-fest@0.18.1: {} - type-fest@0.20.2: {} - type-fest@0.21.3: {} type-fest@0.4.1: {} @@ -6222,6 +6233,8 @@ snapshots: uglify-js@3.19.3: optional: true + undici-types@6.20.0: {} + unique-filename@3.0.0: dependencies: unique-slug: 4.0.0 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index bb7b0c2..56acaa1 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -7,7 +7,7 @@ packages: - "!cli" catalog: - "@types/node": "14.10.1" + "@types/node": "22.12.0" "@ragempcommunity/types-cef": "^2.1.8" "@ragempcommunity/types-client": "^2.1.8" "@ragempcommunity/types-server": "^2.1.8" diff --git a/rpc/package.json b/rpc/package.json index 417b5ba..e17298a 100644 --- a/rpc/package.json +++ b/rpc/package.json @@ -14,9 +14,7 @@ ], "devDependencies": { "@microsoft/api-extractor": "^7.47.9", - "@types/node": "catalog:", - "prettier": "^3.3.2", - "tsup": "^8.3.0" + "@types/node": "catalog:" }, "peerDependencies": { "typescript": "^5" diff --git a/rpc/src/browser.ts b/rpc/src/browser.ts index e6ea52a..3929f8a 100644 --- a/rpc/src/browser.ts +++ b/rpc/src/browser.ts @@ -24,7 +24,7 @@ export class Browser extends Wrapper { * NOT INTENDED FOR OUT-OF-CONTEXT USE */ public _resolveEmitDestination(dataRaw: string) { - let state = Utils.prepareExecution(dataRaw) + const state = Utils.prepareExecution(dataRaw) switch (state.calledTo) { case Environment.BROWSER: diff --git a/rpc/src/index.ts b/rpc/src/index.ts index a3d5e48..f04e759 100644 --- a/rpc/src/index.ts +++ b/rpc/src/index.ts @@ -91,7 +91,7 @@ class Rpc extends Wrapper { */ public register< CallbackArguments extends unknown[] = unknown[], - CallbackReturn extends unknown = unknown, + CallbackReturn = unknown, EventName extends string = string, >( eventName: EventName, @@ -155,7 +155,7 @@ class Rpc extends Wrapper { public async callClient< Arguments extends unknown[] = unknown[], EventName extends string = string, - Return extends unknown = unknown, + Return = unknown, >(eventName: EventName, args?: Arguments): Promise /** * Calls a client-side event from server or browser @@ -178,7 +178,7 @@ class Rpc extends Wrapper { public async callClient< Arguments extends unknown[] = unknown[], EventName extends string = string, - Return extends unknown = unknown, + Return = unknown, >(player: PlayerMp, eventName: EventName, args?: Arguments): Promise public async callClient( playerOrEventName: PlayerMp | string, @@ -282,7 +282,7 @@ class Rpc extends Wrapper { public async callServer< Arguments extends unknown[] = unknown[], EventName extends string = string, - Return extends unknown = unknown, + Return = unknown, >(eventName: EventName, args?: Arguments): Promise { this.log('callServer', eventName, args) if (this.forceBrowserDevMode_) @@ -337,7 +337,7 @@ class Rpc extends Wrapper { public async callBrowser< Arguments extends unknown[] = unknown[], EventName extends string = string, - Return extends unknown = unknown, + Return = unknown, >(eventName: EventName, args?: Arguments): Promise /** * Calls a browser-side event from server or client @@ -360,7 +360,7 @@ class Rpc extends Wrapper { public async callBrowser< Arguments extends unknown[] = unknown[], EventName extends string = string, - Return extends unknown = unknown, + Return = unknown, >(player: PlayerMp, eventName: EventName, args?: Arguments): Promise public async callBrowser( playerOrEventName: PlayerMp | string, @@ -446,14 +446,14 @@ class Rpc extends Wrapper { public async call< Arguments extends unknown[] = unknown[], EventName extends string = string, - Return extends unknown = unknown, + Return = unknown, >(eventName: EventName, args?: Arguments): Promise { this.log('call', eventName, args) if (this.forceBrowserDevMode_) return undefined as unknown as Promise Utils.errorUnknownEnvironment(this.environment_) - let state: RPCState = { + const state: RPCState = { uuid: Utils.generateUUID(), eventName, calledTo: this.environment_, @@ -469,9 +469,7 @@ class Rpc extends Wrapper { /** * redirects an event in cases of it calling its own environment */ - private async callSelf( - state: RPCState, - ): Promise { + private async callSelf(state: RPCState): Promise { state = this.verifyEvent_(state) if (state.knownError) { this.triggerError_(state, state.knownError) diff --git a/rpc/src/server.ts b/rpc/src/server.ts index a255123..1e2bb9c 100644 --- a/rpc/src/server.ts +++ b/rpc/src/server.ts @@ -1,8 +1,8 @@ import { Wrapper } from './wrapper' import { + type PlayerMp, Environment, Events, - type PlayerMp, RPCEventType, RPCState, RpcWrapperConfig, @@ -20,7 +20,7 @@ export class Server extends Wrapper { ) { super(options) - if (!!options.forceBrowserDevMode) return + if (options.forceBrowserDevMode) return // specific event to save player in context as it is not available on server -> server calls mp.events.add( @@ -35,7 +35,7 @@ export class Server extends Wrapper { * NOT INTENDED FOR OUT-OF-CONTEXT USE */ public _resolveEmitDestination(player: PlayerMp, dataRaw: string) { - let state = Utils.prepareExecution(dataRaw) + const state = Utils.prepareExecution(dataRaw) switch (state.calledTo) { case Environment.SERVER: diff --git a/rpc/src/wrapper.ts b/rpc/src/wrapper.ts index 28f6765..71313fb 100644 --- a/rpc/src/wrapper.ts +++ b/rpc/src/wrapper.ts @@ -29,7 +29,7 @@ export class Wrapper { // checks if event is available (registered) in current environment protected verifyEvent_(data: string | RPCState): RPCState { - let rpcData = + const rpcData = typeof data === 'string' ? Utils.prepareExecution(data) : data if (!this.state_[rpcData.eventName]) { diff --git a/server/package.json b/server/package.json index 6df6e01..e9bfb23 100644 --- a/server/package.json +++ b/server/package.json @@ -15,7 +15,7 @@ }, "dependencies": { "@entityseven/rage-fw-rpc": "0.2.5", - "zod": "^3.23.8" + "zod": "^3.24.1" }, "devDependencies": { "@types/node": "catalog:"