upd (fw): versions bump + configs

browser/package.json

@@ -14,12 +14,15 @@
     "build": "tsup"
   },
   "dependencies": {
-    "@entityseven/rage-fw-rpc": "0.2.5",
-    "zod": "^3.23.8"
+    "@entityseven/rage-fw-rpc": "0.2.5"
+  },
+  "devDependencies": {
+    "@types/node": "catalog:"
   },
   "peerDependencies": {
     "@entityseven/rage-fw-shared-types": "0.2.0",
-    "@ragempcommunity/types-cef": "^2.1.8"
+    "@ragempcommunity/types-cef": "catalog:",
+    "typescript": "^5"
   },
   "description": "Package used on a browser-side of your Rage:MP Server",
   "keywords": [

browser/tsconfig.json

@@ -20,6 +20,7 @@
     "esModuleInterop": true,
     "forceConsistentCasingInFileNames": true,
     "strict": true,
-    "skipLibCheck": true
+    "skipLibCheck": true,
+    "types": ["./node_modules/@ragempcommunity/types-cef/index.d.ts", "node"]
   }
 }

browser/tsup.config.ts

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

cli/package.json

@@ -22,10 +22,10 @@
         "yargs": "^17.7.2"
     },
     "devDependencies": {
-        "@types/node": "^20.14.2",
+        "@types/node": "^22.12.0",
         "@types/yargs": "^17.0.32",
         "prettier": "^3.3.2",
-        "typescript": "^5.4.5"
+        "typescript": "^5.7.3"
     },
     "description": "CLI to scaffold a preview for Rage FW",
     "keywords": ["create-rage-fw","ragefw-cli", "ragefw", "rage-fw", "ragemp", "rage:mp", "rage", "gta5"],

client/package.json

@@ -17,9 +17,13 @@
     "@entityseven/rage-fw-rpc": "0.2.5",
     "zod": "^3.23.8"
   },
+  "devDependencies": {
+    "@types/node": "catalog:"
+  },
   "peerDependencies": {
     "@entityseven/rage-fw-shared-types": "0.2.0",
-    "@ragempcommunity/types-client": "^2.1.8"
+    "@ragempcommunity/types-client": "catalog:",
+    "typescript": "^5"
   },
   "description": "Package used on a client-side of your Rage:MP Server",
   "keywords": [

client/tsconfig.json

@@ -20,6 +20,7 @@
     "esModuleInterop": true,
     "forceConsistentCasingInFileNames": true,
     "strict": true,
-    "skipLibCheck": true
+    "skipLibCheck": true,
+    "types": ["./node_modules/@ragempcommunity/types-client/index.d.ts"]
   }
 }

client/tsup.config.ts

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

package.json

@@ -10,10 +10,9 @@
   },
   "dependencies": {
     "@microsoft/api-extractor": "^7.47.0",
-    "@ragempcommunity/types-cef": "^2.1.8",
-    "@ragempcommunity/types-client": "^2.1.8",
-    "@ragempcommunity/types-server": "^2.1.8",
-    "@types/node": "^22.8.1",
+    "@ragempcommunity/types-cef": "catalog:",
+    "@ragempcommunity/types-client": "catalog:",
+    "@ragempcommunity/types-server": "catalog:",
     "@typescript-eslint/eslint-plugin": "^7.13.0",
     "@typescript-eslint/parser": "^7.13.0",
     "cli": "^1.0.1",
@@ -25,6 +24,10 @@
     "typescript": "^5.4.5",
     "winston": "^3.13.0"
   },
+  "engines": {
+    "node": ">=14",
+    "pnpm": ">=10"
+  },
   "private": true,
   "type": "module",
   "license": "SEE INDIVIDUALLY FOR EACH PACKAGE",

pnpm-workspace.yaml

@@ -2,4 +2,12 @@ packages:
   - "server"
   - "client"
   - "browser"
-  - "shared-types"
+  - "shared-types"
+  - "rpc"
+  - "!cli"
+
+catalog:
+  "@types/node": "14.10.1"
+  "@ragempcommunity/types-cef": "^2.1.8"
+  "@ragempcommunity/types-client": "^2.1.8"
+  "@ragempcommunity/types-server": "^2.1.8"

rpc/package.json

@@ -14,6 +14,7 @@
   ],
   "devDependencies": {
     "@microsoft/api-extractor": "^7.47.9",
+    "@types/node": "catalog:",
     "prettier": "^3.3.2",
     "tsup": "^8.3.0"
   },

server/package.json

@@ -17,9 +17,13 @@
     "@entityseven/rage-fw-rpc": "0.2.5",
     "zod": "^3.23.8"
   },
+  "devDependencies": {
+    "@types/node": "catalog:"
+  },
   "peerDependencies": {
     "@entityseven/rage-fw-shared-types": "0.2.0",
-    "@ragempcommunity/types-server": "^2.1.8"
+    "@ragempcommunity/types-server": "catalog:",
+    "typescript": "^5"
   },
   "description": "Package used on a server-side of your Rage:MP Server",
   "keywords": [

server/src/core/logger.ts

@@ -4,8 +4,8 @@ const { timestamp, printf, colorize } = format
 
 /** Used to log in a server console */
 export class Logger {
-    private format = printf(({ message, level, timestamp }) => {
-        return `[${new Date(timestamp).toLocaleTimeString()}] [${level}]: ${message}`
+    private format = printf(({ message, level }) => {
+        return `[${new Date().toLocaleTimeString()}] [${level}]: ${message}`
     })
 
     private systemLogger = winston.createLogger({

server/tsconfig.json

@@ -20,6 +20,7 @@
     "esModuleInterop": true,
     "forceConsistentCasingInFileNames": true,
     "strict": true,
-    "skipLibCheck": true
+    "skipLibCheck": true,
+    "types": ["./node_modules/@ragempcommunity/types-server/index.d.ts"]
   }
 }

server/tsup.config.ts

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