v0.0.11-alpha.0

client/build.js

@@ -1,16 +0,0 @@
-import { build } from 'esbuild'
-import { umdWrapper } from 'esbuild-plugin-umd-wrapper'
-build({
-    entryPoints: ['./src/index.ts'],
-    bundle: true,
-    format: 'umd',
-    platform: 'node',
-    outdir: './dist',
-    plugins: [
-        umdWrapper({
-            libraryName: 'fw',
-        }),
-    ],
-}).then(() => {
-    console.log('Successfully build. Executing types build...')
-})

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,14 +1,13 @@
 {
     "name": "rage-fw-client",
-    "version": "0.0.6-alpha.0",
+    "version": "0.0.11-alpha.0",
     "main": "dist/index.js",
-    "type": "module",
+    "types": "dist/index.d.ts",
     "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-client": "^2.1.8",

client/src/index.ts

@@ -25,9 +25,7 @@ class Player {
     }
 }
 
-const fw = {
+export const fw = {
     event: new Client(),
     player: new Player(),
 }
-
-export default fw

client/src/types.ts

@@ -5,22 +5,20 @@ import type {
     RageFW_ICustomServerEvent,
 } from 'rage-fw-shared-types'
 
-export type RageFW_ClientEvent =
-    | keyof RageFW_ICustomClientEvent
-    | keyof IClientEvents
+export type RageFW_ClientEvent = keyof RageFW_ICustomServerEvent
 
 export type RageFW_ClientEventArguments<K extends RageFW_ClientEvent> =
-    K extends keyof RageFW_ICustomClientEvent
-        ? Parameters<RageFW_ICustomClientEvent[K]>
-        : (K extends keyof IClientEvents ? IClientEvents[K] : never)[]
+    K extends keyof RageFW_ICustomServerEvent
+        ? Parameters<RageFW_ICustomServerEvent[K]>
+        : never
 
 export type RageFW_ClientEventReturn<K extends RageFW_ClientEvent> =
     K extends keyof RageFW_ICustomClientEvent
         ? ReturnType<RageFW_ICustomClientEvent[K]>
         : never
 
-export type RageFW_ClientServerEvent = keyof RageFW_ICustomServerEvent
+export type RageFW_ClientServerEvent = keyof RageFW_ICustomClientEvent
 
 export type RageFW_ClientServerCallback<K extends RageFW_ClientServerEvent> = (
-    args: Parameters<RageFW_ICustomServerEvent[K]>,
-) => ReturnType<RageFW_ICustomServerEvent[K]>
+    args: Parameters<RageFW_ICustomClientEvent[K]>,
+) => ReturnType<RageFW_ICustomClientEvent[K]>

client/tsconfig.json

@@ -1,9 +1,26 @@
 {
-  "extends": "../tsconfig.json",
-  "compilerOptions": {
-    "typeRoots": [
-      "@ragempcommunity/types-client"
+  "$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": false,
+    "declarationMap": false,
+    "sourceMap": false,
+    "downlevelIteration": false,
+    "inlineSourceMap": false,
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "skipLibCheck": true
   }
 }

client/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,
+})

lerna.json

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

package.json

@@ -1,12 +1,14 @@
 {
   "private": true,
+  "scripts": {
+    "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",
-    "esbuild": "^0.21.5",
-    "esbuild-plugin-umd-wrapper": "^2.0.0",
+    "tsup": "^8.1.0",
     "lerna": "^8.1.3",
     "prettier": "^3.3.1",
     "rage-rpc": "^0.4.0",

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.6-alpha.0",
+    "version": "0.0.11-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.5-alpha.0",
+    "version": "0.0.11-alpha.0",
     "types": "types/types/index.d.ts",
     "files": [
         "types/**/*"

shared/package.json

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