v0.0.13-alpha.0

client/dts.config.json

@@ -1,12 +0,0 @@
-{
-  "compilationOptions": {
-    "followSymlinks": true,
-    "preferredConfigPath": "../tsconfig.json"
-  },
-  "entries": [
-    {
-      "filePath": "./src/index.ts",
-      "outFile": "./dist/index.d.ts"
-    }
-  ]
-}

client/package.json

@@ -1,13 +1,13 @@
 {
     "name": "rage-fw-client",
-    "version": "0.0.10-alpha.0",
+    "version": "0.0.13-alpha.0",
     "main": "dist/index.js",
+    "types": "dist/index.d.ts",
     "files": [
         "dist/**/*"
     ],
     "scripts": {
-        "build": "tsup && pnpm types",
+        "build": "tsup"
-        "types": "dts-bundle-generator --config dts.config.json"
     },
     "dependencies": {
         "@ragempcommunity/types-client": "^2.1.8",

client/src/index.ts

@@ -12,7 +12,9 @@ class Client {
         eventName: EventName,
         callback: RageFW_ClientServerCallback<EventName>,
     ): void {
-        rpc.register(eventName, callback as rpc.ProcedureListener)
+        rpc.register(eventName, data => {
+            return callback(...data)
+        })
     }
 }
 

client/src/types.ts

@@ -20,5 +20,5 @@ export type RageFW_ClientEventReturn<K extends RageFW_ClientEvent> =
 export type RageFW_ClientServerEvent = keyof RageFW_ICustomClientEvent
 
 export type RageFW_ClientServerCallback<K extends RageFW_ClientServerEvent> = (
-    args: Parameters<RageFW_ICustomClientEvent[K]>,
+    ...args: Parameters<RageFW_ICustomClientEvent[K]>
 ) => ReturnType<RageFW_ICustomClientEvent[K]>

client/tsconfig.json

@@ -5,7 +5,7 @@
     "node_modules"
   ],
   "compilerOptions": {
-    "incremental": true,
+    "incremental": false,
     "composite": false,
     "target": "ES2022",
     "experimentalDecorators": true,
@@ -21,9 +21,6 @@
     "esModuleInterop": true,
     "forceConsistentCasingInFileNames": true,
     "strict": true,
-    "skipLibCheck": true,
+    "skipLibCheck": true
-    "typeRoots": [
-      "@ragempcommunity/types-client"
-    ]
   }
 }

client/tsup.config.ts

@@ -5,6 +5,7 @@ export default defineConfig({
     outDir: './dist',
     format: ['cjs'],
     noExternal: ['rage-rpc'],
+    dts: true,
     splitting: false,
     sourcemap: false,
     clean: true,

lerna.json

@@ -1,5 +1,5 @@
 {
     "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-    "version": "0.0.10-alpha.0",
+    "version": "0.0.13-alpha.0",
     "npmClient": "pnpm"
 }

package.json

@@ -1,13 +1,14 @@
 {
   "private": true,
   "scripts": {
-    "publish": "lerna publish --force-publish"
+    "publish": "pnpm build && lerna publish --force-publish",
+    "build": "lerna run build"
   },
   "dependencies": {
     "@ragempcommunity/types-cef": "^2.1.8",
     "@ragempcommunity/types-client": "^2.1.8",
     "@ragempcommunity/types-server": "^2.1.8",
-    "dts-bundle-generator": "^9.5.1",
+    "@microsoft/api-extractor": "^7.47.0",
     "tsup": "^8.1.0",
     "lerna": "^8.1.3",
     "prettier": "^3.3.1",

pnpm-lock.yaml

@@ -7,6 +7,9 @@ settings:
 importers:
     .:
         dependencies:
+            '@microsoft/api-extractor':
+                specifier: ^7.47.0
+                version: 7.47.0
             '@ragempcommunity/types-cef':
                 specifier: ^2.1.8
                 version: 2.1.8
@@ -16,9 +19,6 @@ importers:
             '@ragempcommunity/types-server':
                 specifier: ^2.1.8
                 version: 2.1.8
-            dts-bundle-generator:
-                specifier: ^9.5.1
-                version: 9.5.1
             lerna:
                 specifier: ^8.1.3
                 version: 8.1.3([email protected])
@@ -30,7 +30,7 @@ importers:
                 version: 0.4.0
             tsup:
                 specifier: ^8.1.0
-                version: 8.1.0([email protected])
+                version: 8.1.0(@microsoft/[email protected])([email protected])
             typescript:
                 specifier: ^5.4.5
                 version: 5.4.5
@@ -353,6 +353,31 @@ packages:
             }
         engines: { node: '>=18.0.0' }
 
+    '@microsoft/[email protected]':
+        resolution:
+            {
+                integrity: sha512-hAYajOjQan3uslhKJRwvvHIdLJ+ZByKqdSsJ/dgHFxPtEbdKpzMDO8zuW4K5gkSMYl5D0LbNwxkhxr51P2zsmw==,
+            }
+
+    '@microsoft/[email protected]':
+        resolution:
+            {
+                integrity: sha512-LT8yvcWNf76EpDC+8/ArTVSYePvuDQ+YbAUrsTcpg3ptiZ93HIcMCozP/JOxDt+rrsFfFHcpfoselKfPyRI0GQ==,
+            }
+        hasBin: true
+
+    '@microsoft/[email protected]':
+        resolution:
+            {
+                integrity: sha512-v/EYRXnCAIHxOHW+Plb6OWuUoMotxTN0GLatnpOb1xq0KuTNw/WI3pamJx/UbsoJP5k9MCw1QxvvhPcF9pH3Zg==,
+            }
+
+    '@microsoft/[email protected]':
+        resolution:
+            {
+                integrity: sha512-HZpPoABogPvjeJOdzCOSJsXeL/SMCBgBZMVC3X3d7YYp2gf31MfxhUoYUNwf1ERPJOnQc0wkFn9trqI6ZEdZuA==,
+            }
+
     '@nodelib/[email protected]':
         resolution:
             {
@@ -800,6 +825,40 @@ packages:
         cpu: [x64]
         os: [win32]
 
+    '@rushstack/[email protected]':
+        resolution:
+            {
+                integrity: sha512-WNnwdS8r9NZ/2K3u29tNoSRldscFa7SxU0RT+82B6Dy2I4Hl2MeCSKm4EXLXPKeNzLGvJ1cqbUhTLviSF8E6iA==,
+            }
+        peerDependencies:
+            '@types/node': '*'
+        peerDependenciesMeta:
+            '@types/node':
+                optional: true
+
+    '@rushstack/[email protected]':
+        resolution:
+            {
+                integrity: sha512-mUDecIJeH3yYGZs2a48k+pbhM6JYwWlgjs2Ca5f2n1G2/kgdgP9D/07oglEGf6mRyXEnazhEENeYTSNDRCwdqA==,
+            }
+
+    '@rushstack/[email protected]':
+        resolution:
+            {
+                integrity: sha512-Ou44Q2s81BqJu3dpYedAX54am9vn245F0HzqVrfJCMQk5pGgoKKOBOjkbfZC9QKcGNaECh6pwH2s5noJt7X6ew==,
+            }
+        peerDependencies:
+            '@types/node': '*'
+        peerDependenciesMeta:
+            '@types/node':
+                optional: true
+
+    '@rushstack/[email protected]':
+        resolution:
+            {
+                integrity: sha512-Qj28t6MO3HRgAZ72FDeFsrpdE6wBWxF3VENgvrXh7JF2qIT+CrXiOJIesW80VFZB9QwObSpkB1ilx794fGQg6g==,
+            }
+
     '@sigstore/[email protected]':
         resolution:
             {
@@ -911,6 +970,12 @@ packages:
             }
         engines: { node: ^16.14.0 || >=18.0.0 }
 
+    '@types/[email protected]':
+        resolution:
+            {
+                integrity: sha512-ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA==,
+            }
+
     '@types/[email protected]':
         resolution:
             {
@@ -1003,6 +1068,40 @@ packages:
             }
         engines: { node: '>=8' }
 
+    [email protected]:
+        resolution:
+            {
+                integrity: sha512-mv00Te6nmYbRp5DCwclxtt7yV/joXJPGS7nM+97GdxvuttCOfgI3K4U25zboyeX0O+myI8ERluxQe5wljMmVIw==,
+            }
+        peerDependencies:
+            ajv: ^8.5.0
+        peerDependenciesMeta:
+            ajv:
+                optional: true
+
+    [email protected]:
+        resolution:
+            {
+                integrity: sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==,
+            }
+        peerDependencies:
+            ajv: ^8.0.0
+        peerDependenciesMeta:
+            ajv:
+                optional: true
+
+    [email protected]:
+        resolution:
+            {
+                integrity: sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==,
+            }
+
+    [email protected]:
+        resolution:
+            {
+                integrity: sha512-PRA911Blj99jR5RMeTunVbNXMF6Lp4vZXnk5GQjcnUWUTsrXtekg/pnmFFI2u/I36Y/2bITGS30GZCXei6uNkA==,
+            }
+
     [email protected]:
         resolution:
             {
@@ -1673,14 +1772,6 @@ packages:
             }
         engines: { node: '>=12' }
 
-    [email protected]:
-        resolution:
-            {
-                integrity: sha512-DxpJOb2FNnEyOzMkG11sxO2dmxPjthoVWxfKqWYJ/bI/rT1rvTMktF5EKjAYrRZu6Z6t3NhOUZ0sZ5ZXevOfbA==,
-            }
-        engines: { node: '>=14.0.0' }
-        hasBin: true
-
     [email protected]:
         resolution:
             {
@@ -1815,6 +1906,12 @@ packages:
             }
         engines: { node: '>=4' }
 
+    [email protected]:
+        resolution:
+            {
+                integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==,
+            }
+
     [email protected]:
         resolution:
             {
@@ -1914,6 +2011,13 @@ packages:
             }
         engines: { node: '>=14.14' }
 
+    [email protected]:
+        resolution:
+            {
+                integrity: sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==,
+            }
+        engines: { node: '>=6 <7 || >=8' }
+
     [email protected]:
         resolution:
             {
@@ -2240,6 +2344,13 @@ packages:
             }
         engines: { node: '>=6' }
 
+    [email protected]:
+        resolution:
+            {
+                integrity: sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==,
+            }
+        engines: { node: '>=8' }
+
     [email protected]:
         resolution:
             {
@@ -2494,6 +2605,12 @@ packages:
             }
         engines: { node: ^14.15.0 || ^16.10.0 || >=18.0.0 }
 
+    [email protected]:
+        resolution:
+            {
+                integrity: sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==,
+            }
+
     [email protected]:
         resolution:
             {
@@ -2546,6 +2663,12 @@ packages:
             }
         engines: { node: ^14.17.0 || ^16.13.0 || >=18.0.0 }
 
+    [email protected]:
+        resolution:
+            {
+                integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==,
+            }
+
     [email protected]:
         resolution:
             {
@@ -2566,6 +2689,12 @@ packages:
                 integrity: sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==,
             }
 
+    [email protected]:
+        resolution:
+            {
+                integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==,
+            }
+
     [email protected]:
         resolution:
             {
@@ -3711,6 +3840,13 @@ packages:
             }
         engines: { node: '>=0.10.0' }
 
+    [email protected]:
+        resolution:
+            {
+                integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==,
+            }
+        engines: { node: '>=0.10.0' }
+
     [email protected]:
         resolution:
             {
@@ -3820,6 +3956,14 @@ packages:
             }
         hasBin: true
 
+    [email protected]:
+        resolution:
+            {
+                integrity: sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==,
+            }
+        engines: { node: '>=10' }
+        hasBin: true
+
     [email protected]:
         resolution:
             {
@@ -4001,6 +4145,13 @@ packages:
             }
         engines: { node: ^12.13.0 || ^14.15.0 || >=16.0.0 }
 
+    [email protected]:
+        resolution:
+            {
+                integrity: sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==,
+            }
+        engines: { node: '>=0.6.19' }
+
     [email protected]:
         resolution:
             {
@@ -4069,6 +4220,13 @@ packages:
             }
         engines: { node: '>=8' }
 
+    [email protected]:
+        resolution:
+            {
+                integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==,
+            }
+        engines: { node: '>=8' }
+
     [email protected]:
         resolution:
             {
@@ -4099,6 +4257,13 @@ packages:
             }
         engines: { node: '>=8' }
 
+    [email protected]:
+        resolution:
+            {
+                integrity: sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==,
+            }
+        engines: { node: '>=10' }
+
     [email protected]:
         resolution:
             {
@@ -4302,6 +4467,14 @@ packages:
                 integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==,
             }
 
+    [email protected]:
+        resolution:
+            {
+                integrity: sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ==,
+            }
+        engines: { node: '>=14.17' }
+        hasBin: true
+
     [email protected]:
         resolution:
             {
@@ -4338,6 +4511,13 @@ packages:
                 integrity: sha512-yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ==,
             }
 
+    [email protected]:
+        resolution:
+            {
+                integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==,
+            }
+        engines: { node: '>= 4.0.0' }
+
     [email protected]:
         resolution:
             {
@@ -4352,6 +4532,12 @@ packages:
             }
         engines: { node: '>=4' }
 
+    [email protected]:
+        resolution:
+            {
+                integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==,
+            }
+
     [email protected]:
         resolution:
             {
@@ -4743,6 +4929,41 @@ snapshots:
             - supports-color
             - typescript
 
+    '@microsoft/[email protected]':
+        dependencies:
+            '@microsoft/tsdoc': 0.15.0
+            '@microsoft/tsdoc-config': 0.17.0
+            '@rushstack/node-core-library': 5.4.1
+        transitivePeerDependencies:
+            - '@types/node'
+
+    '@microsoft/[email protected]':
+        dependencies:
+            '@microsoft/api-extractor-model': 7.29.2
+            '@microsoft/tsdoc': 0.15.0
+            '@microsoft/tsdoc-config': 0.17.0
+            '@rushstack/node-core-library': 5.4.1
+            '@rushstack/rig-package': 0.5.2
+            '@rushstack/terminal': 0.13.0
+            '@rushstack/ts-command-line': 4.22.0
+            lodash: 4.17.21
+            minimatch: 3.0.5
+            resolve: 1.22.8
+            semver: 7.5.4
+            source-map: 0.6.1
+            typescript: 5.4.2
+        transitivePeerDependencies:
+            - '@types/node'
+
+    '@microsoft/[email protected]':
+        dependencies:
+            '@microsoft/tsdoc': 0.15.0
+            ajv: 8.12.0
+            jju: 1.4.0
+            resolve: 1.22.8
+
+    '@microsoft/[email protected]': {}
+
     '@nodelib/[email protected]':
         dependencies:
             '@nodelib/fs.stat': 2.0.5
@@ -5003,6 +5224,36 @@ snapshots:
     '@rollup/[email protected]':
         optional: true
 
+    '@rushstack/[email protected]':
+        dependencies:
+            ajv: 8.13.0
+            ajv-draft-04: 1.0.0([email protected])
+            ajv-formats: 3.0.1([email protected])
+            fs-extra: 7.0.1
+            import-lazy: 4.0.0
+            jju: 1.4.0
+            resolve: 1.22.8
+            semver: 7.5.4
+
+    '@rushstack/[email protected]':
+        dependencies:
+            resolve: 1.22.8
+            strip-json-comments: 3.1.1
+
+    '@rushstack/[email protected]':
+        dependencies:
+            '@rushstack/node-core-library': 5.4.1
+            supports-color: 8.1.1
+
+    '@rushstack/[email protected]':
+        dependencies:
+            '@rushstack/terminal': 0.13.0
+            '@types/argparse': 1.0.38
+            argparse: 1.0.10
+            string-argv: 0.3.2
+        transitivePeerDependencies:
+            - '@types/node'
+
     '@sigstore/[email protected]':
         dependencies:
             '@sigstore/protobuf-specs': 0.2.1
@@ -5074,6 +5325,8 @@ snapshots:
             '@tufjs/canonical-json': 2.0.0
             minimatch: 9.0.4
 
+    '@types/[email protected]': {}
+
     '@types/[email protected]': {}
 
     '@types/[email protected]': {}
@@ -5123,6 +5376,28 @@ snapshots:
             clean-stack: 2.2.0
             indent-string: 4.0.0
 
+    [email protected]([email protected]):
+        optionalDependencies:
+            ajv: 8.13.0
+
+    [email protected]([email protected]):
+        optionalDependencies:
+            ajv: 8.13.0
+
+    [email protected]:
+        dependencies:
+            fast-deep-equal: 3.1.3
+            json-schema-traverse: 1.0.0
+            require-from-string: 2.0.2
+            uri-js: 4.4.1
+
+    [email protected]:
+        dependencies:
+            fast-deep-equal: 3.1.3
+            json-schema-traverse: 1.0.0
+            require-from-string: 2.0.2
+            uri-js: 4.4.1
+
     [email protected]: {}
 
     [email protected]:
@@ -5499,11 +5774,6 @@ snapshots:
 
     [email protected]: {}
 
-    [email protected]:
-        dependencies:
-            typescript: 5.4.5
-            yargs: 17.7.2
-
     [email protected]: {}
 
     [email protected]: {}
@@ -5593,6 +5863,8 @@ snapshots:
             iconv-lite: 0.4.24
             tmp: 0.0.33
 
+    [email protected]: {}
+
     [email protected]:
         dependencies:
             '@nodelib/fs.stat': 2.0.5
@@ -5653,6 +5925,12 @@ snapshots:
             jsonfile: 6.1.0
             universalify: 2.0.1
 
+    [email protected]:
+        dependencies:
+            graceful-fs: 4.2.11
+            jsonfile: 4.0.0
+            universalify: 0.1.2
+
     [email protected]:
         dependencies:
             minipass: 3.3.6
@@ -5861,6 +6139,8 @@ snapshots:
             parent-module: 1.0.1
             resolve-from: 4.0.0
 
+    [email protected]: {}
+
     [email protected]:
         dependencies:
             pkg-dir: 4.2.0
@@ -5998,6 +6278,8 @@ snapshots:
 
     [email protected]: {}
 
+    [email protected]: {}
+
     [email protected]: {}
 
     [email protected]: {}
@@ -6019,12 +6301,18 @@ snapshots:
 
     [email protected]: {}
 
+    [email protected]: {}
+
     [email protected]: {}
 
     [email protected]: {}
 
     [email protected]: {}
 
+    [email protected]:
+        optionalDependencies:
+            graceful-fs: 4.2.11
+
     [email protected]:
         dependencies:
             universalify: 2.0.1
@@ -6874,6 +7162,8 @@ snapshots:
 
     [email protected]: {}
 
+    [email protected]: {}
+
     [email protected]:
         dependencies:
             resolve-from: 5.0.0
@@ -6941,6 +7231,10 @@ snapshots:
 
     [email protected]: {}
 
+    [email protected]:
+        dependencies:
+            lru-cache: 6.0.0
+
     [email protected]: {}
 
     [email protected]: {}
@@ -7049,6 +7343,8 @@ snapshots:
         dependencies:
             minipass: 3.3.6
 
+    [email protected]: {}
+
     [email protected]:
         dependencies:
             emoji-regex: 8.0.0
@@ -7087,6 +7383,8 @@ snapshots:
         dependencies:
             min-indent: 1.0.1
 
+    [email protected]: {}
+
     [email protected]:
         dependencies:
             duplexer: 0.1.2
@@ -7111,6 +7409,10 @@ snapshots:
         dependencies:
             has-flag: 4.0.0
 
+    [email protected]:
+        dependencies:
+            has-flag: 4.0.0
+
     [email protected]: {}
 
     [email protected]:
@@ -7179,7 +7481,7 @@ snapshots:
 
     [email protected]: {}
 
-    [email protected]([email protected]):
+    [email protected](@microsoft/[email protected])([email protected]):
         dependencies:
             bundle-require: 4.2.1([email protected])
             cac: 6.7.14
@@ -7196,6 +7498,7 @@ snapshots:
             sucrase: 3.35.0
             tree-kill: 1.2.2
         optionalDependencies:
+            '@microsoft/api-extractor': 7.47.0
             typescript: 5.4.5
         transitivePeerDependencies:
             - supports-color
@@ -7229,6 +7532,8 @@ snapshots:
 
     [email protected]: {}
 
+    [email protected]: {}
+
     [email protected]: {}
 
     [email protected]:
@@ -7244,10 +7549,16 @@ snapshots:
 
     [email protected]: {}
 
+    [email protected]: {}
+
     [email protected]: {}
 
     [email protected]: {}
 
+    [email protected]:
+        dependencies:
+            punycode: 2.3.1
+
     [email protected]: {}
 
     [email protected]: {}

server/build.js

@@ -1,10 +0,0 @@
-import { build } from 'esbuild'
-
-build({
-    entryPoints: ['./src/index.ts'],
-    bundle: true,
-    format: 'cjs',
-    platform: 'node',
-    target: 'node10.4',
-    outdir: './dist',
-}).then(r => console.log('Successfully build.'))

server/dts.config.json

@@ -1,12 +0,0 @@
-{
-  "compilationOptions": {
-    "followSymlinks": true,
-    "preferredConfigPath": "../tsconfig.json"
-  },
-  "entries": [
-    {
-      "filePath": "./src/index.ts",
-      "outFile": "./dist/index.d.ts"
-    }
-  ]
-}

server/package.json

@@ -1,15 +1,13 @@
 {
     "name": "rage-fw-server",
-    "version": "0.0.10-alpha.0",
+    "version": "0.0.13-alpha.0",
     "main": "dist/index.js",
-    "types": "dist/index.d.ts",
+    "types": "dist/src/index.d.ts",
-    "type": "module",
     "files": [
         "dist/**/*"
     ],
     "scripts": {
-        "build": "node --es-module-specifier-resolution=node build.js && pnpm types",
+        "build": "tsup"
-        "types": "dts-bundle-generator --config dts.config.json"
     },
     "dependencies": {
         "@ragempcommunity/types-server": "^2.1.8",

server/tsconfig.json

@@ -1,9 +1,25 @@
 {
-  "extends": "../tsconfig.json",
+  "$schema": "https://json.schemastore.org/tsconfig",
-  "compilerOptions": {
+  "display": "Base",
-    "typeRoots": [
+  "exclude": [
-      "@ragempcommunity/types-server"
+    "node_modules"
   ],
-    "baseUrl": "./src"
+  "compilerOptions": {
+    "incremental": false,
+    "composite": false,
+    "target": "ES2022",
+    "experimentalDecorators": true,
+    "moduleDetection": "auto",
+    "module": "CommonJS",
+    "resolveJsonModule": true,
+    "declaration": true,
+    "declarationMap": false,
+    "sourceMap": false,
+    "downlevelIteration": false,
+    "inlineSourceMap": false,
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "skipLibCheck": true
   }
 }

server/tsup.config.ts

@@ -0,0 +1,12 @@
+import { defineConfig } from 'tsup'
+
+export default defineConfig({
+    entry: ['src/index.ts'],
+    outDir: './dist',
+    format: ['cjs'],
+    noExternal: ['rage-rpc'],
+    experimentalDts: true,
+    splitting: false,
+    sourcemap: false,
+    clean: true,
+})

shared-types/package.json

@@ -1,6 +1,6 @@
 {
     "name": "rage-fw-shared-types",
-    "version": "0.0.10-alpha.0",
+    "version": "0.0.13-alpha.0",
     "types": "types/types/index.d.ts",
     "files": [
         "types/**/*"

shared/package.json

@@ -1,6 +1,6 @@
 {
     "name": "rage-fw-shared",
-    "version": "0.0.10-alpha.0",
+    "version": "0.0.13-alpha.0",
     "type": "module",
     "main": "index.d.ts",
     "files": [