v0.0.12-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.12-alpha.0",
     "main": "dist/index.js",
+    "types": "dist/index.d.ts",
     "files": [
         "dist/**/*"
     ],
     "scripts": {
-        "build": "tsup && pnpm types",
-        "types": "dts-bundle-generator --config dts.config.json"
+        "build": "tsup"
     },
     "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,
-    "typeRoots": [
-      "@ragempcommunity/types-client"
-    ]
+    "skipLibCheck": true
   }
 }

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.12-alpha.0",
     "npmClient": "pnpm"
 }

package.json

@@ -1,13 +1,13 @@
 {
   "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",
     "tsup": "^8.1.0",
     "lerna": "^8.1.3",
     "prettier": "^3.3.1",

pnpm-lock.yaml

@@ -16,9 +16,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])
@@ -1673,14 +1670,6 @@ packages:
             }
         engines: { node: '>=12' }
 
-    [email protected]:
-        resolution:
-            {
-                integrity: sha512-DxpJOb2FNnEyOzMkG11sxO2dmxPjthoVWxfKqWYJ/bI/rT1rvTMktF5EKjAYrRZu6Z6t3NhOUZ0sZ5ZXevOfbA==,
-            }
-        engines: { node: '>=14.0.0' }
-        hasBin: true
-
     [email protected]:
         resolution:
             {
@@ -5499,11 +5488,6 @@ snapshots:
 
     [email protected]: {}
 
-    [email protected]:
-        dependencies:
-            typescript: 5.4.5
-            yargs: 17.7.2
-
     [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.12-alpha.0",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
-    "type": "module",
     "files": [
         "dist/**/*"
     ],
     "scripts": {
-        "build": "node --es-module-specifier-resolution=node build.js && pnpm types",
-        "types": "dts-bundle-generator --config dts.config.json"
+        "build": "tsup"
     },
     "dependencies": {
         "@ragempcommunity/types-server": "^2.1.8",

server/src/types.ts

@@ -1,4 +1,4 @@
-/// <reference types="@ragempcommunity/types-server" />
+import '@ragempcommunity/types-server'
 
 import type {
     RageFW_ICustomServerEvent,

server/tsconfig.json

@@ -1,9 +1,26 @@
 {
-  "extends": "../tsconfig.json",
-  "compilerOptions": {
-    "typeRoots": [
-      "@ragempcommunity/types-server"
+  "$schema": "https://json.schemastore.org/tsconfig",
+  "display": "Base",
+  "exclude": [
+    "node_modules"
   ],
-    "baseUrl": "./src"
+  "compilerOptions": {
+    "incremental": false,
+    "composite": false,
+    "target": "ES2022",
+    "experimentalDecorators": true,
+    "emitDecoratorMetadata": 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'],
+    dts: 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.12-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.12-alpha.0",
     "type": "module",
     "main": "index.d.ts",
     "files": [