Merge remote-tracking branch 'origin/master'

# Conflicts:
#	apps/client/package.json
#	apps/client/src/index.ts
#	apps/server/package.json
#	apps/server/src/index.ts

apps/browser/package.json

@@ -12,8 +12,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@entityseven/rage-fw-rpc": "workspace:*",
+    "@entityseven/rage-fw-browser": "0.2.0",
-    "@entityseven/rage-fw-browser": "workspace:*",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
@@ -26,7 +25,7 @@
     "eslint": "^8.57.0",
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-react-refresh": "^0.4.6",
-    "typescript": "^5.7.3",
+    "typescript": "^5.2.2",
     "vite": "^5.2.0"
   }
 }

apps/client/package.json

@@ -2,13 +2,12 @@
   "name": "rage-fw-example-client",
   "version": "0.1.0",
   "author": "Entity Seven Group",
-  "license": "MIT",
+  "license": "CC BY-ND",
-  "description": "Client side of rage-fw-example",
+  "description": "Client side of rage-fw example",
   "scripts": {
     "build": "esbuild src/index.ts --bundle --platform=node --outfile=../../server/client_packages/index.js --format=esm"
   },
   "dependencies": {
-    "@entityseven/rage-fw-rpc": "workspace:*",
+    "@entityseven/rage-fw-client": "latest"
-    "@entityseven/rage-fw-client": "workspace:*"
   }
 }

apps/client/src/index.ts

@@ -1,14 +1,3 @@
 import { fw } from '@entityseven/rage-fw-client'
 
-fw.player.browser = mp.browsers.new('package://cef/index.html')
+fw.player.browser = mp.browsers.new('https://localhost:8080')
-
-fw.event.register('customClientEvent', async msg => {
-    fw.system.log.info(msg)
-
-    const response = await fw.player.triggerBrowser('customBrowserEvent', [
-        'hello from client',
-    ])
-    fw.system.log.info(response)
-
-    return 'response from client'
-})

apps/server/package.json

@@ -2,13 +2,12 @@
   "name": "rage-fw-example-server",
   "version": "0.1.0",
   "author": "Entity Seven Group",
-  "license": "MIT",
+  "license": "CC BY-ND",
-  "description": "Server side of rage-fw-example",
+  "description": "Server side of rage-fw example",
   "scripts": {
     "build": "esbuild src/index.ts --bundle --platform=node --target=node10.4 --outfile=../../server/packages/server/index.js"
   },
   "dependencies": {
-    "@entityseven/rage-fw-rpc": "workspace:*",
+    "@entityseven/rage-fw-server": "latest"
-    "@entityseven/rage-fw-server": "workspace:*"
   }
 }

apps/server/src/commands.ts

@@ -0,0 +1,10 @@
+mp.events.addCommand('veh', async (player, fullText) => {
+    const vehicleID = mp.joaat(fullText)
+    const vehicle = mp.vehicles.new(vehicleID, player.position, {
+        numberPlate: 'admin',
+    })
+
+    setTimeout(() => {
+        player.putIntoVehicle(vehicle, 0)
+    }, 250)
+})

apps/server/src/index.ts

@@ -1,25 +1,9 @@
 import { fw } from '@entityseven/rage-fw-server'
 
+import './commands'
+
 fw.event.register('playerJoin', async player => {
-    fw.system.log.info('Connected:', player.socialClub)
+    fw.system.log.info(`Connected: ${player.socialClub}`)
 
-    const response = await fw.player.triggerClient(
+    fw.system.log.info(`Response from client: here respionse}`)
-        player,
-        'customClientEvent',
-        ['hello from server'],
-    )
-    fw.system.log.info(response)
-})
-
-fw.event.register('customServerEvent', async (player, msg) => {
-    fw.system.log.info(player.socialClub, msg)
-
-    const response = await fw.player.triggerBrowser(
-        player,
-        'customBrowserEvent',
-        ['hello from server'],
-    )
-    fw.system.log.info(player.socialClub, response)
-
-    return 'response from server'
 })

apps/server/tsconfig.json

@@ -4,7 +4,7 @@
     "resolveJsonModule": true,
     "baseUrl": "./src",
     "types": [
-      "../../node_modules/@ragempcommunity/types-server",
+      "../../node_modules/@ragempcommunity/types-server/",
       "../shared/declarations/rage-fw-shared-types/"
     ]
   }

package.json

@@ -1,44 +1,24 @@
 {
   "name": "framework-example",
   "description": "This project is example of RAGE FW usage.",
-  "workspaces": [
+  "workspaces": ["apps/*"],
-    "apps/*"
-  ],
   "scripts": {
     "server:update": "cd server && rage-win64.exe",
     "build:client": "cd apps/client && pnpm build",
     "build:server": "cd apps/server && pnpm build",
-    "build:browser": "cd apps/browser && pnpm build",
+    "build:cef": "cd apps/cef && pnpm build",
-    "build:all": "pnpm build:client && pnpm build:server && pnpm build:browser"
+    "build:all": "pnpm build:client && pnpm build:server && pnpm build:cef"
   },
   "devDependencies": {
-    "@ragempcommunity/types-cef": "^2.1.8",
+    "@entityseven/rage-fw-shared-types": "0.2.0",
     "@ragempcommunity/types-client": "^2.1.8",
     "@ragempcommunity/types-server": "^2.1.8",
+    "@ragempcommunity/types-cef": "^2.1.8",
     "esbuild": "^0.21.5",
-    "prettier": "^3.3.2",
+    "typescript": "^5.4.5",
-    "typescript": "^5.7.3"
+    "prettier": "^3.3.2"
   },
   "author": "Entity Seven Group",
   "license": "MIT",
-  "version": "0.1.0",
+  "version": "0.1.0"
-  "pnpm": {
-    "onlyBuiltDependencies": [
-      "esbuild"
-    ],
-    "overrides": {
-      "@entityseven/rage-fw-rpc": "link:..\\rage-framework\\rpc",
-      "@entityseven/rage-fw-browser": "link:..\\rage-framework\\browser",
-      "@entityseven/rage-fw-client": "link:..\\rage-framework\\client",
-      "@entityseven/rage-fw-server": "link:..\\rage-framework\\server",
-      "@entityseven/rage-fw-shared-types": "link:..\\rage-framework\\shared-types"
-    }
-  },
-  "dependencies": {
-    "@entityseven/rage-fw-browser": "link:..\\rage-framework\\browser",
-    "@entityseven/rage-fw-client": "link:..\\rage-framework\\client",
-    "@entityseven/rage-fw-rpc": "link:..\\rage-framework\\rpc",
-    "@entityseven/rage-fw-server": "link:..\\rage-framework\\server",
-    "@entityseven/rage-fw-shared-types": "link:..\\rage-framework\\shared-types"
-  }
 }

tsconfig.json

@@ -1,8 +1,8 @@
 {
   "compilerOptions": {
     "target": "ESNext",
-    "lib": ["ESNext", "ES2019"],
+    "lib": ["ESNext", "ES2019", "DOM"],
-    "moduleResolution": "bundler",
+    "moduleResolution": "node",
     "module": "ESNext",
     "resolveJsonModule": true,
     "esModuleInterop": true,