core setup fixes

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

@@ -2,12 +2,12 @@
     "name": "rage-fw-client",
     "version": "0.0.10-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/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,

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",

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

@@ -7,8 +7,7 @@
         "dist/**/*"
     ],
     "scripts": {
-        "build": "tsup && pnpm types",
+        "build": "tsup"
-        "types": "dts-bundle-generator --config dts.config.json"
     },
     "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

@@ -5,7 +5,7 @@
     "node_modules"
   ],
   "compilerOptions": {
-    "incremental": true,
+    "incremental": false,
     "composite": false,
     "target": "ES2022",
     "experimentalDecorators": true,
@@ -13,7 +13,7 @@
     "moduleDetection": "auto",
     "module": "CommonJS",
     "resolveJsonModule": true,
-    "declaration": false,
+    "declaration": true,
     "declarationMap": false,
     "sourceMap": false,
     "downlevelIteration": false,
@@ -21,9 +21,6 @@
     "esModuleInterop": true,
     "forceConsistentCasingInFileNames": true,
     "strict": true,
-    "skipLibCheck": true,
+    "skipLibCheck": true
-    "typeRoots": [
-      "@ragempcommunity/types-server"
-    ]
   }
 }

server/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,