Merge remote-tracking branch 'origin/svelte-5' into svelte-5

- rpc generics
- some internal types to expose from rpc

.gitignore

@@ -1,8 +1,8 @@
 # Editor
-.vscode
+.vscode/
-.idea
+.idea/
 
-.git
+.git/
 
 # Server Files
 server/bin
@@ -17,4 +17,9 @@ server/ragemp-server.exe
 
 # Development
 node_modules
-pnpm-lock.yaml
+pnpm-lock.yaml
+
+# Build
+build/
+dist/
+out/

.prettierrc.yaml

@@ -4,4 +4,4 @@ singleQuote: true
 jsxSingleQuote: false
 semi: false
 arrowParens: avoid
-endOfLine: auto
+endOfLine: auto

apps/browser/.eslintrc.cjs

@@ -1,18 +0,0 @@
-module.exports = {
-  root: true,
-  env: { browser: true, es2020: true },
-  extends: [
-    'eslint:recommended',
-    'plugin:@typescript-eslint/recommended',
-    'plugin:react-hooks/recommended',
-  ],
-  ignorePatterns: ['dist', '.eslintrc.cjs'],
-  parser: '@typescript-eslint/parser',
-  plugins: ['react-refresh'],
-  rules: {
-    'react-refresh/only-export-components': [
-      'warn',
-      { allowConstantExport: true },
-    ],
-  },
-}

apps/browser/.gitignore

@@ -0,0 +1,24 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?

apps/browser/.prettierrc.yaml

@@ -0,0 +1,17 @@
+tabWidth: 4
+printWidth: 80
+singleQuote: true
+jsxSingleQuote: false
+semi: false
+arrowParens: avoid
+endOfLine: auto
+plugins:
+    - prettier-plugin-svelte
+overrides:
+    - files: '*.{css,sass,scss}'
+      options:
+          tabWidth: 2
+          parser: scss
+    - files: '*.svelte'
+      options:
+          parser: 'svelte'

apps/browser/README.md

@@ -0,0 +1,47 @@
+# Svelte + TS + Vite
+
+This template should help get you started developing with Svelte and TypeScript in Vite.
+
+## Recommended IDE Setup
+
+[VS Code](https://code.visualstudio.com/) + [Svelte](https://marketplace.visualstudio.com/items?itemName=svelte.svelte-vscode).
+
+## Need an official Svelte framework?
+
+Check out [SvelteKit](https://github.com/sveltejs/kit#readme), which is also powered by Vite. Deploy anywhere with its serverless-first approach and adapt to various platforms, with out of the box support for TypeScript, SCSS, and Less, and easily-added support for mdsvex, GraphQL, PostCSS, Tailwind CSS, and more.
+
+## Technical considerations
+
+**Why use this over SvelteKit?**
+
+-   It brings its own routing solution which might not be preferable for some users.
+-   It is first and foremost a framework that just happens to use Vite under the hood, not a Vite app.
+
+This template contains as little as possible to get started with Vite + TypeScript + Svelte, while taking into account the developer experience with regards to HMR and intellisense. It demonstrates capabilities on par with the other `create-vite` templates and is a good starting point for beginners dipping their toes into a Vite + Svelte project.
+
+Should you later need the extended capabilities and extensibility provided by SvelteKit, the template has been structured similarly to SvelteKit so that it is easy to migrate.
+
+**Why `global.d.ts` instead of `compilerOptions.types` inside `jsconfig.json` or `tsconfig.json`?**
+
+Setting `compilerOptions.types` shuts out all other types not explicitly listed in the configuration. Using triple-slash references keeps the default TypeScript setting of accepting type information from the entire workspace, while also adding `svelte` and `vite/client` type information.
+
+**Why include `.vscode/extensions.json`?**
+
+Other templates indirectly recommend extensions via the README, but this file allows VS Code to prompt the user to install the recommended extension upon opening the project.
+
+**Why enable `allowJs` in the TS template?**
+
+While `allowJs: false` would indeed prevent the use of `.js` files in the project, it does not prevent the use of JavaScript syntax in `.svelte` files. In addition, it would force `checkJs: false`, bringing the worst of both worlds: not being able to guarantee the entire codebase is TypeScript, and also having worse typechecking for the existing JavaScript. In addition, there are valid use cases in which a mixed codebase may be relevant.
+
+**Why is HMR not preserving my local component state?**
+
+HMR state preservation comes with a number of gotchas! It has been disabled by default in both `svelte-hmr` and `@sveltejs/vite-plugin-svelte` due to its often surprising behavior. You can read the details [here](https://github.com/rixo/svelte-hmr#svelte-hmr).
+
+If you have state that's important to retain within a component, consider creating an external store which would not be replaced by HMR.
+
+```ts
+// store.ts
+// An extremely simple external store
+import { writable } from 'svelte/store'
+export default writable(0)
+```

apps/browser/eslint.config.js

@@ -0,0 +1,55 @@
+import globals from 'globals'
+import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended'
+import tslint from 'typescript-eslint'
+
+export default [
+    eslintPluginPrettierRecommended,
+    ...tslint.configs.recommended,
+    {
+        name: 'config',
+        languageOptions: {
+            ecmaVersion: 'latest',
+            sourceType: 'module',
+            globals: {
+                alt: true,
+                ...globals.browser,
+                ...globals.node,
+            },
+            parser: '@typescript-eslint/parser',
+            parserOptions: {
+                ecmaVersion: 'latest',
+                sourceType: 'module',
+            },
+        },
+        ignores: [
+            'node_modules',
+            'dist',
+            '.eslintrc.mjs',
+            '*.config.*',
+            '*.yaml',
+            '*.json',
+            '**/*.d.ts',
+        ],
+        // plugins: ['prettier', '@typescript-eslint'],
+        rules: {
+            'no-console': 'off',
+            'no-empty': 'off',
+            'no-nested-ternary': 'off',
+            'no-underscore-dangle': 'off',
+            'no-unused-vars': 'off',
+            '@typescript-eslint/no-unused-vars': [
+                'warn',
+                {
+                    argsIgnorePattern: '^_',
+                    varsIgnorePattern: '^_',
+                    caughtErrorsIgnorePattern: '^_',
+                },
+            ],
+            '@typescript-eslint/ban-ts-comment': 'off',
+            'consistent-return': 'off',
+            quotes: 'off',
+            'import/prefer-default-export': 'off',
+            'import/no-dynamic-require': 'off',
+        },
+    },
+]

apps/browser/index.html

@@ -1,13 +1,12 @@
 <!doctype html>
 <html lang="en">
-  <head>
+    <head>
-    <meta charset="UTF-8" />
+        <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+        <title>Svelte 5 Demo</title>
-    <title>Vite + React + TS</title>
+    </head>
-  </head>
+    <body>
-  <body>
+        <div id="root"></div>
-    <div id="root"></div>
+        <script type="module" src="/src/main.ts"></script>
-    <script type="module" src="/src/main.tsx"></script>
+    </body>
-  </body>
 </html>

apps/browser/package.json

@@ -1,31 +1,53 @@
 {
-  "name": "rage-fw-example-cef",
+    "scripts": {
-  "version": "0.0.0",
+        "dev": "vite",
-  "type": "module",
+        "build": "tsc && vite build",
-  "author": "Entity Seven Group",
+        "preview": "vite preview",
-  "license": "CC BY-ND",
+        "lint": "eslint --c .eslintrc.yaml src",
-  "description": "CEF side of rage-fw example",
+        "check": "svelte-check --tsconfig ./tsconfig.json && tsc -p tsconfig.node.json"
-  "scripts": {
+    },
-    "dev": "vite",
+    "dependencies": {
-    "build": "tsc && vite build",
+        "@entityseven/rage-fw-browser": "0.2.0",
-    "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
+        "@rage-fw/shared": "workspace:^"
-    "preview": "vite preview"
+    },
-  },
+    "devDependencies": {
-  "dependencies": {
+        "@sveltejs/vite-plugin-svelte": "^4.0.0-next.6",
-    "react": "^18.2.0",
+        "@tsconfig/svelte": "^5.0.4",
-    "react-dom": "^18.2.0",
+        "@types/node": "^22.5.0",
-    "rage-fw-cef": "latest"
+        "@typescript-eslint/eslint-plugin": "^8.2.0",
-  },
+        "@typescript-eslint/parser": "^8.2.0",
-  "devDependencies": {
+        "autoprefixer": "^10.4.20",
-    "@types/react": "^18.2.66",
+        "eslint": "^9.3.0",
-    "@types/react-dom": "^18.2.22",
+        "eslint-config-prettier": "^9.1.0",
-    "@typescript-eslint/eslint-plugin": "^7.2.0",
+        "eslint-plugin-prettier": "^5.2.1",
-    "@typescript-eslint/parser": "^7.2.0",
+        "globals": "^15.9.0",
-    "@vitejs/plugin-react": "^4.2.1",
+        "prettier": "^3.3.3",
-    "eslint": "^8.57.0",
+        "prettier-plugin-svelte": "^3.3.3",
-    "eslint-plugin-react-hooks": "^4.6.0",
+        "svelte": "5.1.3",
-    "eslint-plugin-react-refresh": "^0.4.6",
+        "svelte-check": "^3.8.5",
-    "typescript": "^5.2.2",
+        "tslib": "^2.6.3",
-    "vite": "^5.2.0"
+        "typescript": "^5.5.3",
-  }
+        "typescript-eslint": "^8.2.0",
+        "vite": "^5.4.1"
+    },
+    "name": "src-web",
+    "private": true,
+    "homepage": ".",
+    "version": "0.0.0",
+    "type": "module",
+    "browserslist": {
+        "production": [
+            ">0.2%",
+            "not dead",
+            "not op_mini all"
+        ],
+        "development": [
+            "last 1 chrome version",
+            "last 1 firefox version",
+            "last 1 safari version"
+        ]
+    },
+    "trustedDependencies": [
+        "svelte-preprocess"
+    ]
 }

apps/browser/public/vite.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>

apps/browser/src/App.tsx

@@ -1,22 +0,0 @@
-import { fw } from 'rage-fw-cef'
-import { useEffect, useState } from 'react'
-
-function App() {
-    const [data, setData] = useState('')
-
-    useEffect(() => {
-        fw.event.register('customCefEvent', async ([test]) => {
-            setData(p => p + ' ' + test)
-            return 'from cef'
-        })
-    }, [])
-
-    return (
-        <div style={{ width: '100%', color: 'white', textAlign: 'center' }}>
-            <h1>Hello World!</h1>
-            <h2>{data}</h2>
-        </div>
-    )
-}
-
-export default App

apps/browser/src/app.svelte

@@ -0,0 +1,24 @@
+<script lang="ts">
+    import { fw } from '@entityseven/rage-fw-browser'
+    import type { RageFW_ICustomBrowserEvent } from '@entityseven/rage-fw-shared-types'
+    import { onMount } from 'svelte'
+
+    let data =
+        $state<ReturnType<RageFW_ICustomBrowserEvent['customBrowserEvent']>>()
+
+    onMount(() => {
+        try {
+            fw.event.register('customBrowserEvent', async greeting => {
+                data += greeting
+                return 'from cef'
+            })
+        } catch (e) {
+            console.error(e)
+        }
+    })
+</script>
+
+<div style="width: '100%';color: 'white';text-align: 'center'">
+    <h1>Hello World!</h1>
+    <h2>{data}</h2>
+</div>

apps/browser/src/assets/react.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>

apps/browser/src/index.css

@@ -1,3 +0,0 @@
-body {
-  margin: 0;
-}

apps/browser/src/main.ts

@@ -0,0 +1,6 @@
+import { mount } from 'svelte'
+import App from './app.svelte'
+
+const app = mount(App, { target: document.getElementById('root')! })
+
+export default app

apps/browser/src/main.tsx

@@ -1,10 +0,0 @@
-import React from 'react'
-import ReactDOM from 'react-dom/client'
-import App from './App'
-import './index.css'
-
-ReactDOM.createRoot(document.getElementById('root')!).render(
-  <React.StrictMode>
-    <App />
-  </React.StrictMode>,
-)

apps/browser/src/vite-env.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="svelte" />
 /// <reference types="vite/client" />
-/// <reference types="../../types" />
+/// <reference types="vite-plugin-svelte-svgr" />

apps/browser/svelte.config.js

@@ -0,0 +1,8 @@
+import { vitePreprocess } from '@sveltejs/vite-plugin-svelte'
+
+const config = {
+    preprocess: vitePreprocess(),
+    kit: {},
+}
+
+export default config

apps/browser/tsconfig.json

@@ -1,29 +1,33 @@
 {
-  "compilerOptions": {
+    "compilerOptions": {
-    "target": "ES2020",
+        "target": "ES2020",
-    "useDefineForClassFields": true,
+        "useDefineForClassFields": true,
-    "lib": ["ES2020", "DOM", "DOM.Iterable"],
+        "lib": ["ES2020", "DOM", "DOM.Iterable"],
-    "module": "ESNext",
+        "module": "ESNext",
-    "skipLibCheck": true,
+        "skipLibCheck": true,
 
-    /* Bundler mode */
+        /* Bundler mode */
-    "moduleResolution": "bundler",
+        "moduleResolution": "bundler",
-    "allowImportingTsExtensions": true,
+        "allowImportingTsExtensions": true,
-    "resolveJsonModule": true,
+        "resolveJsonModule": true,
-    "isolatedModules": true,
+        "isolatedModules": true,
-    "noEmit": true,
+        "noEmit": true,
-    "jsx": "react-jsx",
+        "jsx": "react-jsx",
 
-    /* Linting */
+        /* Linting */
-    "strict": true,
+        "strict": true,
-    "noUnusedLocals": true,
+        "noUnusedLocals": true,
-    "noUnusedParameters": true,
+        "noUnusedParameters": true,
-    "noFallthroughCasesInSwitch": true,
+        "noFallthroughCasesInSwitch": true,
-    "types": [
+        "types": [
-      "../../node_modules/@ragempcommunity/types-cef",
+            "../../node_modules/@ragempcommunity/types-cef",
-      "../shared/declarations/rage-fw-shared-types/"
+            "../shared/declarations/rage-fw-shared-types/"
-    ]
+        ],
-  },
+        "paths": {
-  "include": ["src"],
+            "@": ["./src"],
-  "references": [{ "path": "./tsconfig.node.json" }]
+            "@/*": ["./src/*"]
+        }
+    },
+    "include": ["src"],
+    "references": [{ "path": "./tsconfig.node.json" }]
 }

apps/browser/tsconfig.node.json

@@ -1,11 +1,11 @@
 {
-  "compilerOptions": {
+    "compilerOptions": {
-    "composite": true,
+        "composite": true,
-    "skipLibCheck": true,
+        "skipLibCheck": true,
-    "module": "ESNext",
+        "strict": true,
-    "moduleResolution": "bundler",
+        "module": "ESNext",
-    "allowSyntheticDefaultImports": true,
+        "moduleResolution": "bundler",
-    "strict": true
+        "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo"
-  },
+    },
-  "include": ["vite.config.ts"]
+    "include": ["vite.config.ts"]
 }

apps/browser/vite.config.ts

@@ -1,11 +1,18 @@
 import { defineConfig } from 'vite'
-import react from '@vitejs/plugin-react'
+import { svelte } from '@sveltejs/vite-plugin-svelte'
+import path from 'path'
 
 // https://vitejs.dev/config/
 export default defineConfig({
-  plugins: [react()],
+    plugins: [svelte()],
-  build: {
+    build: {
-    outDir: '../../server/client_packages/cef',
+        outDir: '../../server/client_packages/cef',
-    emptyOutDir: true
+        emptyOutDir: true,
-  }
+    },
+    resolve: {
+        alias: {
+            '@': path.resolve(__dirname, './src/'),
+            '@/*': path.resolve(__dirname, './src/*'),
+        },
+    },
 })

apps/client/package.json

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

apps/client/src/index.ts

@@ -1,14 +1,15 @@
-import { fw } from 'rage-fw-client'
+import { fw } from '@entityseven/rage-fw-client'
 
 fw.player.browser = mp.browsers.new('package://cef/index.html')
 
 fw.event.register('cefReady', async () => {
     fw.system.log.info('cefReady')
 
-    const responseCef = await fw.player.triggerBrowser('customCefEvent', [
+    const responseBrowser = await fw.player.triggerBrowser(
-        'from client',
+        'customBrowserEvent',
-    ])
+        ['from client'],
-    fw.system.log.info(responseCef)
+    )
+    fw.system.log.info(responseBrowser)
 
     await fw.player.triggerServer('customServerEvent', ['from client'])
 })

apps/client/tsconfig.json

@@ -1,11 +1,11 @@
 {
-  "extends": "../../tsconfig.json",
+    "extends": "../../tsconfig.json",
-  "compilerOptions": {
+    "compilerOptions": {
-    "resolveJsonModule": true,
+        "resolveJsonModule": true,
-    "baseUrl": "./src",
+        "baseUrl": "./src",
-    "types": [
+        "types": [
-      "../../node_modules/@ragempcommunity/types-client",
+            "../../node_modules/@ragempcommunity/types-client",
-      "../shared/declarations/rage-fw-shared-types/"
+            "../shared/declarations/rage-fw-shared-types/"
-    ]
+        ]
-  }
+    }
 }

apps/server/package.json

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

apps/server/src/index.ts

@@ -1,18 +1,18 @@
-import { fw } from 'rage-fw-server'
+import { fw } from '@entityseven/rage-fw-server'
 
-fw.event.register('playerJoin', async ([player]) => {
+fw.event.register('playerJoin', async player => {
     fw.system.log.info(`Connected: ${player.socialClub}`)
 })
 
-fw.event.register('customServerEvent', async ([player, msg]) => {
+fw.event.register('customServerEvent', async (player, greeting) => {
-    fw.system.log.info(player.socialClub + ' ' + msg)
+    fw.system.log.info(player.socialClub + ' ' + greeting)
 
-    const resFromCef = await fw.player.triggerBrowser(
+    const resFromBrowser = await fw.player.triggerBrowser(
         player,
-        'customCefEvent',
+        'customBrowserEvent',
         ['from server'],
     )
-    fw.system.log.info(player.socialClub + ' ' + resFromCef)
+    fw.system.log.info(player.socialClub + ' ' + resFromBrowser)
 
     return 'from server'
 })

apps/server/tsconfig.json

@@ -1,11 +1,12 @@
 {
-  "extends": "../../tsconfig.json",
+    "extends": "../../tsconfig.json",
-  "compilerOptions": {
+    "compilerOptions": {
-    "resolveJsonModule": true,
+        "lib": ["DOM", "ESNext"],
-    "baseUrl": "./src",
+        "resolveJsonModule": true,
-    "types": [
+        "baseUrl": "./src",
-      "../../node_modules/@ragempcommunity/types-server",
+        "types": [
-      "../shared/declarations/rage-fw-shared-types/"
+            "../../node_modules/@ragempcommunity/types-server",
-    ]
+            "../shared/declarations/rage-fw-shared-types/"
-  }
+        ]
+    }
 }

apps/shared/declarations/rage-fw-shared-types/index.d.ts

@@ -1,11 +1,11 @@
-declare module 'rage-fw-shared-types' {
+declare module '@entityseven/rage-fw-shared-types' {
     export interface RageFW_ICustomClientEvent {}
 
     export interface RageFW_ICustomServerEvent {
         customServerEvent(greetings: string): string
     }
 
-    export interface RageFW_ICustomCefEvent {
+    export interface RageFW_ICustomBrowserEvent {
-        customCefEvent(greetings: string): string
+        customBrowserEvent(greetings: string): string
     }
 }

apps/shared/package.json

@@ -0,0 +1,6 @@
+{
+    "name": "@rage-fw/shared",
+    "description": "Shared data for Rage-FW example",
+    "version": "0.1.0",
+    "main": "index.ts"
+}

package.json

@@ -1,25 +1,29 @@
 {
   "name": "framework-example",
-  "description": "This project is example of RAGE FW usage.",
+  "description": "This project is an example of RAGE FW usage",
-  "workspaces": ["apps/*"],
+  "workspaces": [
+    "apps/*"
+  ],
   "scripts": {
     "server:update": "cd server && rage-win64.exe",
+    "server:run": "cd server && ragemp-server.exe",
 
     "build:client": "cd apps/client && pnpm build",
     "build:server": "cd apps/server && pnpm build",
-    "build:cef": "cd apps/cef && pnpm build",
+    "build:browser": "cd apps/cef && pnpm build",
-    "build:all": "pnpm build:client && pnpm build:server && pnpm build:cef"
+    "build:all": "pnpm build:client && pnpm build:server && pnpm build:browser",
+    "build": "pnpm build:all"
   },
   "devDependencies": {
     "@ragempcommunity/types-client": "^2.1.8",
     "@ragempcommunity/types-server": "^2.1.8",
     "@ragempcommunity/types-cef": "^2.1.8",
-    "rage-fw-shared-types": "latest",
+    "@entityseven/rage-fw-shared-types": "0.2.0",
     "esbuild": "^0.21.5",
     "typescript": "^5.4.5",
     "prettier": "^3.3.2"
   },
+  "license": "MIT",
   "author": "Entity Seven Group",
-  "license": "CC BY-ND",
   "version": "0.1.0"
 }

pnpm-workspace.yaml

@@ -1,5 +1,2 @@
 packages:
-  - "apps/browser"
+  - "apps/*"
-  - "apps/client"
-  - "apps/server"
-  - "apps/shared"