From 8b7894ccb12eaf80fb496c80e87677adbc0d64f4 Mon Sep 17 00:00:00 2001 From: azur84 Date: Mon, 29 Jun 2026 14:18:13 +0200 Subject: [PATCH] common is now a node package --- .gitignore | 7 +- eslint.config.mjs | 2 +- package.json | 13 +- pnpm-lock.yaml | 359 ++++++++++-------- pnpm-workspace.yaml | 3 + src/client/controllers/settings.ts | 8 +- src/client/network.ts | 2 +- src/client/ui/components/global/toggle.tsx | 3 +- .../ui/components/settings/settings.tsx | 4 +- src/client/ui/stories/global/toggle.story.ts | 5 +- src/server/network.ts | 2 +- src/server/services/modding/player.ts | 3 +- src/server/services/settings.ts | 6 +- src/shared/network.ts | 2 +- src/shared/settings.d.ts | 2 +- tsconfig.base.json | 12 +- tsconfig.json | 7 +- 17 files changed, 247 insertions(+), 193 deletions(-) diff --git a/.gitignore b/.gitignore index 3a75190..fecb856 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,8 @@ node_modules -places/*/include -places/*/flamework.build -places/*/out -places/*/dist +/flamework.build + +/tsconfig.tsbuildinfo out diff --git a/eslint.config.mjs b/eslint.config.mjs index 45d772c..9b000f7 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -172,5 +172,5 @@ export default defineConfig( "prettier/prettier": "warn", }, }, - globalIgnores(["/out", "**/assets.d.ts", "scripts"]), + globalIgnores(["out", "**/assets.d.ts", "scripts"]), ); diff --git a/package.json b/package.json index 9654e57..0a605ac 100644 --- a/package.json +++ b/package.json @@ -8,8 +8,13 @@ ], "scripts": { "lint": "eslint --cache", - "prepare": "husky" + "prepare": "husky", + "prepack": "rotor build --type=package" }, + "files": [ + "out", + "flamework.build" + ], "keywords": [], "author": "", "license": "ISC", @@ -20,6 +25,7 @@ "@isentinel/dict-roblox": "^1.0.4", "@rbxts/compiler-types": "3.0.0-types.0", "@rbxts/types": "^1.0.912", + "@rotor-rbx/rotor": "^2.2.1", "@typescript-eslint/eslint-plugin": "^8.57.1", "@typescript-eslint/parser": "^8.57.1", "cspell": "^10.0.0", @@ -34,7 +40,10 @@ "lint-staged": "^17.0.0", "prettier": "^3.8.1", "prettier-plugin-toml": "^2.0.6", - "roblox-ts": "^3.0.0", + "rbxts-transform-boost": "^1.5.2", + "rbxts-transformer-flamework": "^1.3.2", + "rbxts-transformer-instances": "git+https://git.azur.webhop.me/Next-Station/rbxts-transformer-instances.git", + "rbxts-transformer-services": "^1.1.1", "tsc-progress": "^1.0.4", "typescript": "^5.5.4", "typescript-eslint": "^8.57.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 326db09..6c15af6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -60,6 +60,9 @@ importers: '@rbxts/types': specifier: ^1.0.912 version: 1.0.925 + '@rotor-rbx/rotor': + specifier: ^2.2.1 + version: 2.2.1 '@typescript-eslint/eslint-plugin': specifier: ^8.57.1 version: 8.61.1(@typescript-eslint/parser@8.61.1(eslint@10.5.0)(typescript@5.9.3))(eslint@10.5.0)(typescript@5.9.3) @@ -102,9 +105,18 @@ importers: prettier-plugin-toml: specifier: ^2.0.6 version: 2.0.6(prettier@3.8.4) - roblox-ts: - specifier: ^3.0.0 - version: 3.0.0 + rbxts-transform-boost: + specifier: ^1.5.2 + version: 1.5.2 + rbxts-transformer-flamework: + specifier: ^1.3.2 + version: 1.3.2(typescript@5.9.3) + rbxts-transformer-instances: + specifier: git+https://git.azur.webhop.me/Next-Station/rbxts-transformer-instances.git + version: git+https://git.azur.webhop.me/Next-Station/rbxts-transformer-instances.git#aa08e75010f8893b6fd06f8782009b9c081772af + rbxts-transformer-services: + specifier: ^1.1.1 + version: 1.1.1(typescript@5.9.3) tsc-progress: specifier: ^1.0.4 version: 1.0.4(typescript@5.9.3) @@ -489,18 +501,17 @@ packages: '@rbxts/vide@0.6.1': resolution: {integrity: sha512-syFqx+HYXy0TauDCGLhc68K2cAlfgYookIJSRtJZ01W7mUI+EKyj80x2L91dQxos3BwAAGJqBD/ovWU4M//+Lg==} - '@roblox-ts/luau-ast@2.0.0': - resolution: {integrity: sha512-cmMi093IdwBOLVxwuordhM8AmtbyTIyRpsTbB0D/JauidW4SXsQRQowSwWjHo4QP0DRJBXvOIlxtqEQi50uNzQ==} - '@roblox-ts/luau-ast@2.0.1': resolution: {integrity: sha512-jej2mzRGwhR9wu4woAtgTwqsKADlegZYlQ+M5qVHRojvjoyJVFkLrSbhBKRr8HR+fVW5nCz0qX7kNa0tSpAY+A==} - '@roblox-ts/path-translator@1.1.0': - resolution: {integrity: sha512-D0akTmnNYqBw+ZIek5JxocT3BjmbgGOuOy0x1nIIxHBPNLGCpzseToY8jyYs/0mlvnN2xnSP/k8Tv+jvGOQSwQ==} - '@roblox-ts/rojo-resolver@1.1.0': resolution: {integrity: sha512-QmvVryu1EeME+3QUoG5j/gHGJoJUaffCgZ92mhlG7cJSd1uyhgpY4CNWriZAwZJYkTlzd5Htkpn+18yDFbOFXA==} + '@rotor-rbx/rotor@2.2.1': + resolution: {integrity: sha512-525GqeNoWIBseZLnUv17qNmXobxbrbNtpES8+lTxSC8bpxVWZcYCg1CcnIlfJHL+VALHmAz3VPSqkwsHpT/01Q==} + engines: {node: '>=18'} + hasBin: true + '@taplo/core@0.2.0': resolution: {integrity: sha512-r8bl54Zj1In3QLkiW/ex694bVzpPJ9EhwqT9xkcUVODnVUGirdB1JTsmiIv0o1uwqZiwhi8xNnTOQBRQCpizrQ==} @@ -659,10 +670,6 @@ packages: resolution: {integrity: sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==} engines: {node: '>=12'} - anymatch@3.1.3: - resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==} - engines: {node: '>= 8'} - array-timsort@1.0.3: resolution: {integrity: sha512-/+3GRL7dDAGEfM6TseQk/U+mi18TU2Ms9I3UlLdUMhz2hbvGNTKdj9xniwXfUqgYhHxRx0+8UnKkvlNwVU+cWQ==} @@ -673,10 +680,6 @@ packages: resolution: {integrity: sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==} engines: {node: 18 || 20 || >=22} - binary-extensions@2.3.0: - resolution: {integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==} - engines: {node: '>=8'} - brace-expansion@2.1.1: resolution: {integrity: sha512-WR1cURNjuvBLMZBMbqM0UoE+WAfdUcEV1ccD8PVBVOI+Z3ND4+SZbN8RsfT2bMuG1qwz5RFvPukSZm5fF2D5eA==} @@ -692,14 +695,14 @@ packages: resolution: {integrity: sha512-2bxTP2yUH7AJj/VAXfcA+4IcWGdQ87HwBANLt5XxGTeomo8yG0y95N1um9i5StvhT/Bl0/2cARA5v1PpPXUxUA==} engines: {node: '>=14.16'} + chalk@4.1.2: + resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==} + engines: {node: '>=10'} + chalk@5.6.2: resolution: {integrity: sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==} engines: {node: ^12.17.0 || ^14.13 || >=16.0.0} - chokidar@3.6.0: - resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==} - engines: {node: '>= 8.10.0'} - cli-cursor@5.0.0: resolution: {integrity: sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==} engines: {node: '>=18'} @@ -708,10 +711,6 @@ packages: resolution: {integrity: sha512-xRwvIOMGrfOAnM1JYtqQImuaNtDEv9v6oIYAs4LIHwTiKee8uwvIi363igssOC0O5U04i4AlENs79LQLu9tEMw==} engines: {node: '>=20'} - cliui@8.0.1: - resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==} - engines: {node: '>=12'} - color-convert@2.0.1: resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==} engines: {node: '>=7.0.0'} @@ -814,10 +813,6 @@ packages: resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==} engines: {node: '>= 0.4'} - escalade@3.2.0: - resolution: {integrity: sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==} - engines: {node: '>=6'} - escape-string-regexp@1.0.5: resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==} engines: {node: '>=0.8.0'} @@ -983,14 +978,16 @@ packages: resolution: {integrity: sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==} engines: {node: '>=14'} + fs-extra@10.1.0: + resolution: {integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==} + engines: {node: '>=12'} + fs-extra@11.3.5: resolution: {integrity: sha512-eKpRKAovdpZtR1WopLHxlBWvAgPny3c4gX1G5Jhwmmw4XJj0ifSD5qB5TOo8hmA0wlRKDAOAhEE1yVPgs6Fgcg==} engines: {node: '>=14.14'} - fsevents@2.3.3: - resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==} - engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} - os: [darwin] + fs.realpath@1.0.0: + resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==} function-bind@1.1.2: resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==} @@ -999,18 +996,10 @@ packages: resolution: {integrity: sha512-omMVniXEXpdx/vKxGnPRoO2394Otlze28TyxECbFVyoSpZ9H3EO7lemjcB12OpQJzRW4e5tt/dL1rOxry6aMHg==} engines: {node: '>=20'} - get-caller-file@2.0.5: - resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==} - engines: {node: 6.* || 8.* || >= 10.*} - get-east-asian-width@1.6.0: resolution: {integrity: sha512-QRbvDIbx6YklUe6RxeTeleMR0yv3cYH6PsPZHcnVn7xv7zO1BHN8r0XETu8n6Ye3Q+ahtSarc3WgtNWmehIBfA==} engines: {node: '>=18'} - glob-parent@5.1.2: - resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==} - engines: {node: '>= 6'} - glob-parent@6.0.2: resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==} engines: {node: '>=10.13.0'} @@ -1025,6 +1014,11 @@ packages: deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me hasBin: true + glob@9.3.5: + resolution: {integrity: sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==} + engines: {node: '>=16 || 14 >=14.17'} + deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me + global-directory@5.0.0: resolution: {integrity: sha512-1pgFdhK3J2LeM+dVf2Pd424yHx2ou338lC0ErNP2hPx4j8eW1Sp0XqSjNxtk6Tc4Kr5wlWtSvz8cn2yb7/SG/w==} engines: {node: '>=20'} @@ -1032,10 +1026,21 @@ packages: graceful-fs@4.2.11: resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==} + has-flag@4.0.0: + resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==} + engines: {node: '>=8'} + + hashids@2.3.0: + resolution: {integrity: sha512-ljM73TE/avEhNnazxaj0Dw3BbEUuLC5yYCQ9RSkSUcT4ZSU6ZebdKCIBJ+xT/DnSYW36E9k82GH1Q6MydSIosQ==} + hasown@2.0.4: resolution: {integrity: sha512-T2UbfbBEF32wiepXIsMlTW9+dDYC6wMh/t/vYA4tuOMKqWz/n3vr1NFSxQiyP+zk2mXsoMA/i/7qV6LKut1t1A==} engines: {node: '>= 0.4'} + hosted-git-info@4.1.0: + resolution: {integrity: sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==} + engines: {node: '>=10'} + husky@9.1.7: resolution: {integrity: sha512-5gs5ytaNjBrh5Ow3zrvdUUY+0VxIuWVL4i9irt6friV+BqdCfmV11CQTWMiBYWHbXhco+J1kHfTOUkePhCDvMA==} engines: {node: '>=18'} @@ -1064,10 +1069,6 @@ packages: resolution: {integrity: sha512-IBTdIkzZNOpqm7q3dRqJvMaldXjDHWkEDfrwGEQTs5eaQMWV+djAhR+wahyNNMAa+qpbDUhBMVt4ZKNwpPm7xQ==} engines: {node: ^20.17.0 || >=22.9.0} - is-binary-path@2.1.0: - resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==} - engines: {node: '>=8'} - is-core-module@2.16.2: resolution: {integrity: sha512-evOr8xfXKxE6qSR0hSXL2r3sd7ALj8+7jQEUvPYcm5sgZFdJ+AYzT6yNmJenvIYQBgIGwfwz08sL8zoL7yq2BA==} engines: {node: '>= 0.4'} @@ -1121,10 +1122,6 @@ packages: keyv@4.5.4: resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==} - kleur@4.1.5: - resolution: {integrity: sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==} - engines: {node: '>=6'} - levn@0.4.1: resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==} engines: {node: '>= 0.8.0'} @@ -1146,10 +1143,17 @@ packages: resolution: {integrity: sha512-9ie8ItPR6tjY5uYJh8K/Zrv/RMZ5VOlOWvtZdEHYSTFKZfIBPQa9tOAEeAWhd+AnIneLJ22w5fjOYtoutpWq5w==} engines: {node: '>=18'} + lru-cache@10.4.3: + resolution: {integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==} + lru-cache@11.5.1: resolution: {integrity: sha512-RPimw/7aMdv2oqRrxKwvZXcPfwBrn/JZ2xYcY9Hus/6LaS3VOAKVWKWgNLCFSiOm1ESXinjsDlidVU7JlnCN2A==} engines: {node: 20 || >=22} + lru-cache@6.0.0: + resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==} + engines: {node: '>=10'} + markdown-table@3.0.4: resolution: {integrity: sha512-wiYz4+JrLyb/DqW2hkFJxP7Vd7JuTDm77fvbM8VfEQdmSMqcImWeeRbHwZjBjIFki/VaMK2BhFi7oUUZeM5bqw==} @@ -1165,6 +1169,10 @@ packages: resolution: {integrity: sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==} engines: {node: 18 || 20 || >=22} + minimatch@8.0.7: + resolution: {integrity: sha512-V+1uQNdzybxa14e/p00HZnQNNcTjnRJjDxg2V8wtkjFctq4M7hXFws4oekyTP0Jebeq7QYtpFyOeBAjc88zvYg==} + engines: {node: '>=16 || 14 >=14.17'} + minimatch@9.0.9: resolution: {integrity: sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==} engines: {node: '>=16 || 14 >=14.17'} @@ -1172,6 +1180,10 @@ packages: minimist@1.2.8: resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==} + minipass@4.2.8: + resolution: {integrity: sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==} + engines: {node: '>=8'} + minipass@7.1.3: resolution: {integrity: sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==} engines: {node: '>=16 || 14 >=14.17'} @@ -1191,9 +1203,9 @@ packages: resolution: {integrity: sha512-kKHJhxwpR/Okycz4HhQKKlhWe4ASEfPgkSWNmKFHd7+ezuQlxkA5cM3+XkBPvm1gmHen3w53qsYAv+8GwRrBlg==} engines: {node: '>=18'} - normalize-path@3.0.0: - resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==} - engines: {node: '>=0.10.0'} + normalize-package-data@3.0.3: + resolution: {integrity: sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==} + engines: {node: '>=10'} onetime@7.0.0: resolution: {integrity: sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==} @@ -1229,6 +1241,10 @@ packages: path-parse@1.0.7: resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==} + path-scurry@1.11.1: + resolution: {integrity: sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==} + engines: {node: '>=16 || 14 >=14.18'} + path-scurry@2.0.2: resolution: {integrity: sha512-3O/iVVsJAPsOnpwWIeD+d6z/7PmqApyQePUtCndjatj/9I5LylHvt5qluFaBT3I5h3r1ejfR056c+FCv+NnNXg==} engines: {node: 18 || 20 || >=22} @@ -1271,17 +1287,22 @@ packages: resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==} engines: {node: '>=6'} + rbxts-transform-boost@1.5.2: + resolution: {integrity: sha512-uMbBS+Aji17OFqOLCuV/pf7SOoe+SdHpQw8+4WKLTnOhjmbqX7ameqCfGOQfVeAcZpU6aqA6P/dirUWRLOLFdw==} + + rbxts-transformer-flamework@1.3.2: + resolution: {integrity: sha512-FKAT7+jAmoa2/MZNqZnjZfpSKypNO1+IzRGdHQAjGsKzH8J58Zcbb0fCA/Dydwb4LiPVVYlfgoItrxOCWRh3rg==} + peerDependencies: + typescript: '*' + rbxts-transformer-instances@git+https://git.azur.webhop.me/Next-Station/rbxts-transformer-instances.git#aa08e75010f8893b6fd06f8782009b9c081772af: resolution: {commit: aa08e75010f8893b6fd06f8782009b9c081772af, repo: https://git.azur.webhop.me/Next-Station/rbxts-transformer-instances.git, type: git} version: 1.1.0 - readdirp@3.6.0: - resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==} - engines: {node: '>=8.10.0'} - - require-directory@2.1.1: - resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==} - engines: {node: '>=0.10.0'} + rbxts-transformer-services@1.1.1: + resolution: {integrity: sha512-0cvbyUmpAhrt53qEYnErsiGzc56tPDlwOLEz1XyQXnXaW0XqnwqvrwmpegSHsKrvQQOfzIvREVmmuIdbHiDv3w==} + peerDependencies: + typescript: ^5.2.2 require-from-string@2.0.2: resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==} @@ -1303,10 +1324,6 @@ packages: rfdc@1.4.1: resolution: {integrity: sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==} - roblox-ts@3.0.0: - resolution: {integrity: sha512-hwAC2frIFlLJOtHd6F+5opMEhBgfAMK9z5l1mP+bykLBbMO5cn1q5lIwhhXbeh9Pq07rlhF8uGHlmeRLPd/3AA==} - hasBin: true - safe-buffer@5.2.1: resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==} @@ -1343,6 +1360,18 @@ packages: resolution: {integrity: sha512-dWUG8F5sIIARXih1DTaQAX4SsiTXhInKf1buxdY9DIg4ZYPZK5nGM1VRIYmEbDbsHt7USo99xSLFu5Q1IqTmsg==} engines: {node: '>= 18'} + spdx-correct@3.2.0: + resolution: {integrity: sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==} + + spdx-exceptions@2.5.0: + resolution: {integrity: sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==} + + spdx-expression-parse@3.0.1: + resolution: {integrity: sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==} + + spdx-license-ids@3.0.23: + resolution: {integrity: sha512-CWLcCCH7VLu13TgOH+r8p1O/Znwhqv/dbb6lqWy67G+pT1kHmeD/+V36AVb/vq8QMIQwVShJ6Ssl5FPh0fuSdw==} + string-argv@0.3.2: resolution: {integrity: sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==} engines: {node: '>=0.6.19'} @@ -1370,6 +1399,10 @@ packages: subarg@1.0.0: resolution: {integrity: sha512-RIrIdRY0X1xojthNcVtgT9sjpOGagEUKpZdgBUi054OEPFo282yg+zE+t1Rj3+RqKq2xStL7uUHhY+AjbC4BXg==} + supports-color@7.2.0: + resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==} + engines: {node: '>=8'} + supports-preserve-symlinks-flag@1.0.0: resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==} engines: {node: '>= 0.4'} @@ -1420,11 +1453,6 @@ packages: resolution: {integrity: sha512-IhWULya9JULMp+U7tHkcCEI8OZqqRIOWtSxcWcPuMyzprivsU+pBmAi1EYHvLIqDeIynewoepTdASi9hZdu5jA==} engines: {node: '>=18'} - typescript@5.5.3: - resolution: {integrity: sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==} - engines: {node: '>=14.17'} - hasBin: true - typescript@5.9.3: resolution: {integrity: sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==} engines: {node: '>=14.17'} @@ -1437,6 +1465,14 @@ packages: uri-js@4.4.1: resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==} + uuid@8.3.2: + resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==} + deprecated: uuid@10 and below is no longer supported. For ESM codebases, update to uuid@latest. For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028). + hasBin: true + + validate-npm-package-license@3.0.4: + resolution: {integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==} + vscode-languageserver-textdocument@1.0.12: resolution: {integrity: sha512-cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA==} @@ -1468,23 +1504,14 @@ packages: resolution: {integrity: sha512-GCPAHLvrIH13+c0SuacwvRYj2SxJXQ4kaVTT5xgL3kPrz56XxkF21IGhjSE1+W0aw7gpBWRGXLCPnPby6lSpmQ==} engines: {node: '>=12'} - y18n@5.0.8: - resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==} - engines: {node: '>=10'} + yallist@4.0.0: + resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} yaml@2.9.0: resolution: {integrity: sha512-2AvhNX3mb8zd6Zy7INTtSpl1F15HW6Wnqj0srWlkKLcpYl/gMIMJiyuGq2KeI2YFxUPjdlB+3Lc10seMLtL4cA==} engines: {node: '>= 14.6'} hasBin: true - yargs-parser@21.1.1: - resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==} - engines: {node: '>=12'} - - yargs@17.7.3: - resolution: {integrity: sha512-GZtjxm/J/4TSxuL3FNYjCmLktBTnIw/rVmKSIyKeYAZpmJB2ig9VauCC5xsa82GNKVKDAqpOn3KVzNt0zmrU0g==} - engines: {node: '>=12'} - yocto-queue@0.1.0: resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} engines: {node: '>=10'} @@ -1834,20 +1861,15 @@ snapshots: '@rbxts/vide@0.6.1': {} - '@roblox-ts/luau-ast@2.0.0': {} - '@roblox-ts/luau-ast@2.0.1': {} - '@roblox-ts/path-translator@1.1.0': - dependencies: - ajv: 8.20.0 - fs-extra: 11.3.5 - '@roblox-ts/rojo-resolver@1.1.0': dependencies: ajv: 8.20.0 fs-extra: 11.3.5 + '@rotor-rbx/rotor@2.2.1': {} + '@taplo/core@0.2.0': {} '@taplo/lib@0.5.0': @@ -2052,19 +2074,12 @@ snapshots: ansi-styles@6.2.3: {} - anymatch@3.1.3: - dependencies: - normalize-path: 3.0.0 - picomatch: 2.3.2 - array-timsort@1.0.3: {} balanced-match@1.0.2: {} balanced-match@4.0.4: {} - binary-extensions@2.3.0: {} - brace-expansion@2.1.1: dependencies: balanced-match: 1.0.2 @@ -2081,19 +2096,12 @@ snapshots: dependencies: chalk: 5.6.2 - chalk@5.6.2: {} - - chokidar@3.6.0: + chalk@4.1.2: dependencies: - anymatch: 3.1.3 - braces: 3.0.3 - glob-parent: 5.1.2 - is-binary-path: 2.1.0 - is-glob: 4.0.3 - normalize-path: 3.0.0 - readdirp: 3.6.0 - optionalDependencies: - fsevents: 2.3.3 + ansi-styles: 4.3.0 + supports-color: 7.2.0 + + chalk@5.6.2: {} cli-cursor@5.0.0: dependencies: @@ -2104,12 +2112,6 @@ snapshots: slice-ansi: 8.0.0 string-width: 8.2.1 - cliui@8.0.1: - dependencies: - string-width: 4.2.3 - strip-ansi: 6.0.1 - wrap-ansi: 7.0.0 - color-convert@2.0.1: dependencies: color-name: 1.1.4 @@ -2259,8 +2261,6 @@ snapshots: es-errors@1.3.0: {} - escalade@3.2.0: {} - escape-string-regexp@1.0.5: {} escape-string-regexp@4.0.0: {} @@ -2425,27 +2425,26 @@ snapshots: cross-spawn: 7.0.6 signal-exit: 4.1.0 + fs-extra@10.1.0: + dependencies: + graceful-fs: 4.2.11 + jsonfile: 6.2.1 + universalify: 2.0.1 + fs-extra@11.3.5: dependencies: graceful-fs: 4.2.11 jsonfile: 6.2.1 universalify: 2.0.1 - fsevents@2.3.3: - optional: true + fs.realpath@1.0.0: {} function-bind@1.1.2: {} gensequence@8.0.8: {} - get-caller-file@2.0.5: {} - get-east-asian-width@1.6.0: {} - glob-parent@5.1.2: - dependencies: - is-glob: 4.0.3 - glob-parent@6.0.2: dependencies: is-glob: 4.0.3 @@ -2463,16 +2462,31 @@ snapshots: package-json-from-dist: 1.0.1 path-scurry: 2.0.2 + glob@9.3.5: + dependencies: + fs.realpath: 1.0.0 + minimatch: 8.0.7 + minipass: 4.2.8 + path-scurry: 1.11.1 + global-directory@5.0.0: dependencies: ini: 6.0.0 graceful-fs@4.2.11: {} + has-flag@4.0.0: {} + + hashids@2.3.0: {} + hasown@2.0.4: dependencies: function-bind: 1.1.2 + hosted-git-info@4.1.0: + dependencies: + lru-cache: 6.0.0 + husky@9.1.7: {} ignore@5.3.2: {} @@ -2487,10 +2501,6 @@ snapshots: ini@6.0.0: {} - is-binary-path@2.1.0: - dependencies: - binary-extensions: 2.3.0 - is-core-module@2.16.2: dependencies: hasown: 2.0.4 @@ -2535,8 +2545,6 @@ snapshots: dependencies: json-buffer: 3.0.1 - kleur@4.1.5: {} - levn@0.4.1: dependencies: prelude-ls: 1.2.1 @@ -2571,8 +2579,14 @@ snapshots: strip-ansi: 7.2.0 wrap-ansi: 9.0.2 + lru-cache@10.4.3: {} + lru-cache@11.5.1: {} + lru-cache@6.0.0: + dependencies: + yallist: 4.0.0 + markdown-table@3.0.4: {} micromatch@4.0.8: @@ -2586,12 +2600,18 @@ snapshots: dependencies: brace-expansion: 5.0.6 + minimatch@8.0.7: + dependencies: + brace-expansion: 2.1.1 + minimatch@9.0.9: dependencies: brace-expansion: 2.1.1 minimist@1.2.8: {} + minipass@4.2.8: {} + minipass@7.1.3: {} mkdirp@3.0.1: {} @@ -2602,7 +2622,12 @@ snapshots: natural-orderby@5.0.0: {} - normalize-path@3.0.0: {} + normalize-package-data@3.0.3: + dependencies: + hosted-git-info: 4.1.0 + is-core-module: 2.16.2 + semver: 7.8.5 + validate-npm-package-license: 3.0.4 onetime@7.0.0: dependencies: @@ -2635,6 +2660,11 @@ snapshots: path-parse@1.0.7: {} + path-scurry@1.11.1: + dependencies: + lru-cache: 10.4.3 + minipass: 7.1.3 + path-scurry@2.0.2: dependencies: lru-cache: 11.5.1 @@ -2663,15 +2693,27 @@ snapshots: punycode@2.3.1: {} + rbxts-transform-boost@1.5.2: {} + + rbxts-transformer-flamework@1.3.2(typescript@5.9.3): + dependencies: + '@roblox-ts/rojo-resolver': 1.1.0 + ajv: 8.20.0 + chalk: 4.1.2 + fs-extra: 10.1.0 + glob: 9.3.5 + hashids: 2.3.0 + normalize-package-data: 3.0.3 + typescript: 5.9.3 + uuid: 8.3.2 + rbxts-transformer-instances@git+https://git.azur.webhop.me/Next-Station/rbxts-transformer-instances.git#aa08e75010f8893b6fd06f8782009b9c081772af: dependencies: typescript: 5.9.3 - readdirp@3.6.0: + rbxts-transformer-services@1.1.1(typescript@5.9.3): dependencies: - picomatch: 2.3.2 - - require-directory@2.1.1: {} + typescript: 5.9.3 require-from-string@2.0.2: {} @@ -2691,18 +2733,6 @@ snapshots: rfdc@1.4.1: {} - roblox-ts@3.0.0: - dependencies: - '@roblox-ts/luau-ast': 2.0.0 - '@roblox-ts/path-translator': 1.1.0 - '@roblox-ts/rojo-resolver': 1.1.0 - chokidar: 3.6.0 - fs-extra: 11.3.5 - kleur: 4.1.5 - resolve: 1.22.12 - typescript: 5.5.3 - yargs: 17.7.3 - safe-buffer@5.2.1: {} semver@7.8.5: {} @@ -2729,6 +2759,20 @@ snapshots: smol-toml@1.6.1: {} + spdx-correct@3.2.0: + dependencies: + spdx-expression-parse: 3.0.1 + spdx-license-ids: 3.0.23 + + spdx-exceptions@2.5.0: {} + + spdx-expression-parse@3.0.1: + dependencies: + spdx-exceptions: 2.5.0 + spdx-license-ids: 3.0.23 + + spdx-license-ids@3.0.23: {} + string-argv@0.3.2: {} string-width@4.2.3: @@ -2760,6 +2804,10 @@ snapshots: dependencies: minimist: 1.2.8 + supports-color@7.2.0: + dependencies: + has-flag: 4.0.0 + supports-preserve-symlinks-flag@1.0.0: {} synckit@0.11.13: @@ -2815,8 +2863,6 @@ snapshots: transitivePeerDependencies: - supports-color - typescript@5.5.3: {} - typescript@5.9.3: {} universalify@2.0.1: {} @@ -2825,6 +2871,13 @@ snapshots: dependencies: punycode: 2.3.1 + uuid@8.3.2: {} + + validate-npm-package-license@3.0.4: + dependencies: + spdx-correct: 3.2.0 + spdx-expression-parse: 3.0.1 + vscode-languageserver-textdocument@1.0.12: {} vscode-uri@3.1.0: {} @@ -2855,20 +2908,8 @@ snapshots: xdg-basedir@5.1.0: {} - y18n@5.0.8: {} + yallist@4.0.0: {} yaml@2.9.0: {} - yargs-parser@21.1.1: {} - - yargs@17.7.3: - dependencies: - cliui: 8.0.1 - escalade: 3.2.0 - get-caller-file: 2.0.5 - require-directory: 2.1.1 - string-width: 4.2.3 - y18n: 5.0.8 - yargs-parser: 21.1.1 - yocto-queue@0.1.0: {} diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 0240668..8395552 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -2,4 +2,7 @@ publicHoistPattern: - "*@rbxts*" - "*@flamework*" allowBuilds: + "@rotor-rbx/rotor": true rbxts-transformer-instances: true +minimumReleaseAgeExclude: + - rbxts-transform-boost@1.5.2 diff --git a/src/client/controllers/settings.ts b/src/client/controllers/settings.ts index eff86de..84ea661 100644 --- a/src/client/controllers/settings.ts +++ b/src/client/controllers/settings.ts @@ -1,9 +1,9 @@ -import settingsFile from "@common/shared/settings"; -import { SettingDefinition, SettingRealType, SettingType } from "@common/shared/typings/settings"; import { Controller, OnStart } from "@flamework/core"; import { Atom, atom } from "@rbxts/charm"; -import Object, { keys } from "@rbxts/object-utils"; +import { keys } from "@rbxts/object-utils"; +import settingsFile from "../../shared/settings"; +import { SettingDefinition, SettingRealType, SettingType } from "../../shared/typings/settings"; import { Events, Functions } from "../network"; /** @@ -78,7 +78,7 @@ export class SettingsController implements OnStart { * Setup atoms and definition at service start. */ private setupAtoms() { - const sections = Object.keys>(settingsFile).filter((key) => + const sections = keys>(settingsFile).filter((key) => typeIs(settingsFile[key], "table"), ); sections.forEach((key) => { diff --git a/src/client/network.ts b/src/client/network.ts index 62ee5cc..ad855c7 100644 --- a/src/client/network.ts +++ b/src/client/network.ts @@ -1,4 +1,4 @@ -import { GlobalEvents, GlobalFunctions } from "@common/shared/network"; +import { GlobalEvents, GlobalFunctions } from "../shared/network"; export const Events = GlobalEvents.createClient({}); export const Functions = GlobalFunctions.createClient({}); diff --git a/src/client/ui/components/global/toggle.tsx b/src/client/ui/components/global/toggle.tsx index 2d2c182..6c2f663 100644 --- a/src/client/ui/components/global/toggle.tsx +++ b/src/client/ui/components/global/toggle.tsx @@ -1,7 +1,8 @@ -import { NotDerivate, useBox } from "@common/shared/utils/ui/vide"; import { Atom } from "@rbxts/charm"; import Vide, { Derivable, source } from "@rbxts/vide"; +import { NotDerivate, useBox } from "../../../../shared/utils/ui/vide"; + /** * Props of a toggle. */ diff --git a/src/client/ui/components/settings/settings.tsx b/src/client/ui/components/settings/settings.tsx index 70ef78a..2f482ff 100644 --- a/src/client/ui/components/settings/settings.tsx +++ b/src/client/ui/components/settings/settings.tsx @@ -1,8 +1,8 @@ -import { SettingsController } from "@common/client/controllers/settings"; -import { SettingDefinition, SettingRealType, SettingType } from "@common/shared/typings/settings"; import { Atom } from "@rbxts/charm"; import Vide, { Case, For, Source, source, Switch } from "@rbxts/vide"; +import { SettingDefinition, SettingRealType, SettingType } from "../../../../shared/typings/settings"; +import { SettingsController } from "../../../controllers/settings"; import { Toggle } from "../global/toggle"; /** diff --git a/src/client/ui/stories/global/toggle.story.ts b/src/client/ui/stories/global/toggle.story.ts index d32bbf9..339c471 100644 --- a/src/client/ui/stories/global/toggle.story.ts +++ b/src/client/ui/stories/global/toggle.story.ts @@ -1,5 +1,6 @@ -import { Toggle } from "@common/client/ui/components/global/toggle"; -import { Hoarcekat } from "@common/shared/utils/ui/hoarcekat"; import { Node } from "@rbxts/vide"; +import { Hoarcekat } from "../../../../shared/utils/ui/hoarcekat"; +import { Toggle } from "../../components/global/toggle"; + export = Hoarcekat(Toggle as () => Node); diff --git a/src/server/network.ts b/src/server/network.ts index 0398197..4a51fd2 100644 --- a/src/server/network.ts +++ b/src/server/network.ts @@ -1,4 +1,4 @@ -import { GlobalEvents, GlobalFunctions } from "@common/shared/network"; +import { GlobalEvents, GlobalFunctions } from "../shared/network"; export const Events = GlobalEvents.createServer({}); export const Functions = GlobalFunctions.createServer({}); diff --git a/src/server/services/modding/player.ts b/src/server/services/modding/player.ts index 0383e58..6a875ff 100644 --- a/src/server/services/modding/player.ts +++ b/src/server/services/modding/player.ts @@ -1,7 +1,8 @@ -import { OnPlayerJoined, OnPlayerQuit } from "@common/shared/modding/players"; import { Modding, OnStart } from "@flamework/core"; import { Players } from "@rbxts/services"; +import { OnPlayerJoined, OnPlayerQuit } from "../../../shared/modding/players"; + /** * This Service Manage some player event with modding. */ diff --git a/src/server/services/settings.ts b/src/server/services/settings.ts index a5b0a7d..2cc58c3 100644 --- a/src/server/services/settings.ts +++ b/src/server/services/settings.ts @@ -1,8 +1,8 @@ -import { OnPlayerJoined } from "@common/shared/modding/players"; -import SettingsFile from "@common/shared/settings"; -import { SetSetting, SettingTypeChecker } from "@common/shared/typings/settings"; import { OnStart, Service } from "@flamework/core"; +import { OnPlayerJoined } from "../../shared/modding/players"; +import SettingsFile from "../../shared/settings"; +import { SetSetting, SettingTypeChecker } from "../../shared/typings/settings"; import { Events, Functions } from "../network"; import { DataService, Store } from "./data"; diff --git a/src/shared/network.ts b/src/shared/network.ts index 8b381ed..5d64dd0 100644 --- a/src/shared/network.ts +++ b/src/shared/network.ts @@ -1,6 +1,6 @@ import { Networking } from "@flamework/networking"; -import { SetSetting } from "./typings/settings"; +import { SetSetting } from "../shared/typings/settings"; /** * Global client to server events. diff --git a/src/shared/settings.d.ts b/src/shared/settings.d.ts index 954fa24..9a352fe 100644 --- a/src/shared/settings.d.ts +++ b/src/shared/settings.d.ts @@ -1,4 +1,4 @@ -import { SettingDefinition } from "@common/shared/typings/settings"; +import { SettingDefinition } from "./typings/settings"; /** * Type definition of the setting definition file. diff --git a/tsconfig.base.json b/tsconfig.base.json index 411f13e..4cb81bf 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -13,18 +13,12 @@ "strict": true, "target": "ESNext", "skipLibCheck": true, - "paths": { - "@common/*": ["./src/*"], - }, "typeRoots": ["node_modules/@rbxts", "node_modules/@flamework"], "types": ["compiler-types", "types"], "incremental": true, "experimentalDecorators": true, "plugins": [ - { - "transform": "rbxts-transformer-access" - }, { "transform": "rbxts-transformer-flamework", "obfuscation": true @@ -41,6 +35,12 @@ } ] }, + { + "transform": "rbxts-transform-boost", + "optimize": true, + "strict": true, + "hoist": true + }, { "transform": "tsc-progress", "title": "Building...", diff --git a/tsconfig.json b/tsconfig.json index 35304d3..49b05b7 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -4,10 +4,9 @@ "rootDir": "src", "rootDirs": ["src"], "outDir": "out", - "typeRoots": [ - "node_modules/@rbxts", - "node_modules/@flamework", - ] + "typeRoots": ["node_modules/@rbxts", "node_modules/@flamework"], + "declaration": true, + "moduleResolution": "Node" }, "include": ["src/**/*", "node_modules/rbxts-transformer-instances"] }