Merge branch 'develop' into fix/tee-derive-key

elizaOS · Jan 9, 2025 · 7e18a9e · 7e18a9e
2 parents 572ad9d + 0551c8a
commit 7e18a9e
Show file tree

Hide file tree

Showing 80 changed files with 16,710 additions and 1,744 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -21,7 +21,7 @@
         "editor.defaultFormatter": "esbenp.prettier-vscode"
     },
     "[typescriptreact]": {
-        "editor.defaultFormatter": "dbaeumer.vscode-eslint"
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
     },
     "[javascriptreact]": {
         "editor.defaultFormatter": "dbaeumer.vscode-eslint"
@@ -44,4 +44,4 @@
     "[shellscript]": {
         "editor.defaultFormatter": "foxundermoon.shell-format"
     }
-}
+}
diff --git a/client/README.md b/client/README.md
@@ -0,0 +1,50 @@
+# React + TypeScript + Vite
+
+This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.
+
+Currently, two official plugins are available:
+
+- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react/README.md) uses [Babel](https://babeljs.io/) for Fast Refresh
+- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh
+
+## Expanding the ESLint configuration
+
+If you are developing a production application, we recommend updating the configuration to enable type aware lint rules:
+
+- Configure the top-level `parserOptions` property like this:
+
+```js
+export default tseslint.config({
+    languageOptions: {
+        // other options...
+        parserOptions: {
+            project: ["./tsconfig.node.json", "./tsconfig.app.json"],
+            tsconfigRootDir: import.meta.dirname,
+        },
+    },
+});
+```
+
+- Replace `tseslint.configs.recommended` to `tseslint.configs.recommendedTypeChecked` or `tseslint.configs.strictTypeChecked`
+- Optionally add `...tseslint.configs.stylisticTypeChecked`
+- Install [eslint-plugin-react](https://github.com/jsx-eslint/eslint-plugin-react) and update the config:
+
+```js
+// eslint.config.js
+import react from "eslint-plugin-react";
+
+export default tseslint.config({
+    // Set the react version
+    settings: { react: { version: "18.3" } },
+    plugins: {
+        // Add the react plugin
+        react,
+    },
+    rules: {
+        // other rules...
+        // Enable its recommended rules
+        ...react.configs.recommended.rules,
+        ...react.configs["jsx-runtime"].rules,
+    },
+});
+```
diff --git a/client/components.json b/client/components.json
@@ -4,9 +4,9 @@
     "rsc": false,
     "tsx": true,
     "tailwind": {
-        "config": "tailwind.config.js",
+        "config": "tailwind.config.ts",
         "css": "src/index.css",
-        "baseColor": "neutral",
+        "baseColor": "zinc",
         "cssVariables": true,
         "prefix": ""
     },

diff --git a/client/index.html b/client/index.html
@@ -1,10 +1,9 @@
 <!doctype html>
-<html lang="en">
+<html lang="en" class="dark">
     <head>
         <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" />
-        <title>Eliza</title>
+        <title>ElizaOS - Client</title>
     </head>
     <body>
         <div id="root"></div>

diff --git a/client/package.json b/client/package.json
@@ -1,47 +1,67 @@
 {
-    "name": "eliza-client",
+    "name": "client",
     "private": true,
-    "version": "0.1.7",
+    "sideEffects": false,
     "type": "module",
     "scripts": {
-        "dev": "vite",
-        "build": "vite build",
-        "check-types": "tsc --noEmit",
-        "lint": "eslint .",
-        "preview": "vite preview"
+        "extract-version": "./version.sh",
+        "dev": "pnpm run extract-version && vite",
+        "build": "pnpm run extract-version && tsc -b && vite build",
+        "preview": "vite preview",
+        "lint": "eslint ."
     },
     "dependencies": {
         "@elizaos/core": "workspace:*",
-        "@radix-ui/react-dialog": "1.1.2",
-        "@radix-ui/react-separator": "1.1.0",
-        "@radix-ui/react-slot": "1.1.0",
-        "@radix-ui/react-tooltip": "1.1.4",
-        "@tanstack/react-query": "5.61.0",
-        "class-variance-authority": "0.7.1",
+        "@radix-ui/react-avatar": "^1.1.2",
+        "@radix-ui/react-collapsible": "^1.1.2",
+        "@radix-ui/react-dialog": "^1.1.4",
+        "@radix-ui/react-label": "^2.1.1",
+        "@radix-ui/react-separator": "^1.1.1",
+        "@radix-ui/react-slot": "^1.1.1",
+        "@radix-ui/react-tabs": "^1.1.2",
+        "@radix-ui/react-toast": "^1.2.4",
+        "@radix-ui/react-tooltip": "^1.1.6",
+        "@react-spring/web": "^9.7.5",
+        "@tanstack/react-query": "^5.63.0",
+        "@uidotdev/usehooks": "^2.4.1",
+        "class-variance-authority": "^0.7.1",
         "clsx": "2.1.1",
-        "lucide-react": "0.460.0",
-        "react": "18.3.1",
-        "react-dom": "18.3.1",
-        "react-router-dom": "6.22.1",
-        "tailwind-merge": "2.5.5",
-        "tailwindcss-animate": "1.0.7",
-        "vite-plugin-top-level-await": "1.4.4",
-        "vite-plugin-wasm": "3.3.0"
+        "dayjs": "^1.11.13",
+        "lucide-react": "^0.469.0",
+        "react": "^19.0.0",
+        "react-aiwriter": "^1.0.0",
+        "react-dom": "^19.0.0",
+        "react-router": "^7.1.1",
+        "react-router-dom": "^7.1.1",
+        "semver": "^7.6.3",
+        "tailwind-merge": "^2.6.0",
+        "tailwindcss-animate": "^1.0.7",
+        "vite-plugin-compression": "^0.5.1"
     },
     "devDependencies": {
-        "@eslint/js": "9.16.0",
-        "@types/node": "22.8.4",
-        "@types/react": "18.3.12",
-        "@types/react-dom": "18.3.1",
-        "@vitejs/plugin-react": "4.3.3",
-        "autoprefixer": "10.4.20",
-        "eslint-plugin-react-hooks": "5.0.0",
-        "eslint-plugin-react-refresh": "0.4.14",
-        "globals": "15.11.0",
-        "postcss": "8.4.49",
-        "tailwindcss": "3.4.15",
-        "typescript": "5.6.3",
-        "typescript-eslint": "8.11.0",
-        "vite": "link:@tanstack/router-plugin/vite"
+        "@eslint/js": "^9.17.0",
+        "@types/node": "^22.10.5",
+        "@types/react": "^19.0.3",
+        "@types/react-dom": "^19.0.2",
+        "@types/semver": "^7.5.8",
+        "@typescript-eslint/eslint-plugin": "^8.19.1",
+        "@typescript-eslint/parser": "^8.19.1",
+        "@vitejs/plugin-react-swc": "^3.5.0",
+        "autoprefixer": "^10.4.19",
+        "eslint": "^9.17.0",
+        "eslint-import-resolver-typescript": "^3.6.1",
+        "eslint-plugin-import": "^2.28.1",
+        "eslint-plugin-jsx-a11y": "^6.7.1",
+        "eslint-plugin-react": "^7.33.2",
+        "eslint-plugin-react-hooks": "^5.0.0",
+        "eslint-plugin-react-refresh": "^0.4.16",
+        "globals": "^15.14.0",
+        "postcss": "^8.4.38",
+        "rollup-plugin-visualizer": "^5.14.0",
+        "tailwindcss": "^3.4.4",
+        "typescript": "~5.6.3",
+        "typescript-eslint": "^8.18.2",
+        "vite": "^6.0.5",
+        "vite-tsconfig-paths": "^5.1.4"
     }
 }