fix game build (#2623)

* Fix build for new structure

* add npmrc

* Add root package.json

* Update pnpm workspace & lockfile

* Move balancing into apps

* update all package.json files

* update pnpm-lock

* fix game build

* Fix workspace dependency import

* remove husky

* lock

* add vite

* remove vite

* add vite

* lock

---------

Co-authored-by: Bob <[email protected]>

client/balancing/package.json → client/apps/balancing/package.json

@@ -10,33 +10,19 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@bibliothecadao/eternum": "workspace:^",
     "@radix-ui/react-icons": "^1.3.0",
-    "@radix-ui/react-tabs": "^1.1.0",
     "@tanstack/react-table": "^8.20.5",
     "class-variance-authority": "^0.7.0",
-    "clsx": "^1.2.1",
-    "lucide-react": "^0.365.0",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
-    "tailwind-merge": "^2.5.2",
     "tailwindcss-animate": "^1.0.7"
   },
   "devDependencies": {
     "@eslint/js": "^9.9.0",
-    "@types/node": "^20.11.10",
-    "@types/react": "^18.3.3",
-    "@types/react-dom": "^18.3.0",
-    "@vitejs/plugin-react": "^4.3.1",
     "autoprefixer": "^10.4.18",
-    "eslint": "^9.9.0",
     "eslint-plugin-react-hooks": "^5.1.0-rc.0",
     "eslint-plugin-react-refresh": "^0.4.9",
     "globals": "^15.9.0",
     "postcss": "^8.4.35",
     "tailwindcss": "^3.4.1",
-    "typescript": "^5.5.3",
-    "typescript-eslint": "^8.0.1",
-    "vite": "^5.4.1"
+    "typescript-eslint": "^8.0.1"
   }
 }

client/apps/game/dojoConfig.ts

@@ -1,7 +1,7 @@
 import { createDojoConfig } from "@dojoengine/core";
-import devManifest from "../contracts/manifest_dev.json";
-import mainnetManifest from "../contracts/manifest_mainnet.json";
-import productionManifest from "../contracts/manifest_prod.json";
+import devManifest from "../../common/manifests/manifest_dev.json";
+import mainnetManifest from "../../common/manifests/manifest_mainnet.json";
+import productionManifest from "../../common/manifests/manifest_prod.json";
 
 import { env } from "./env";
 const {

client/apps/game/package.json

@@ -1,6 +1,6 @@
 {
-  "name": "eternum-client",
-  "version": "0.0.0",
+  "name": "eternum-game-client",
+  "version": "0.0.1",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -10,100 +10,42 @@
     "test:watch": "vitest",
     "test:ui": "vitest --ui",
     "coverage": "vitest run --coverage",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --ext .ts,.tsx --fix",
     "generate-pwa-assets": "pwa-assets-generator"
   },
-  "peerDependencies": {
-    "starknet": "6.11.0"
-  },
   "dependencies": {
-    "@bibliothecadao/eternum": "workspace:^",
-    "@cartridge/connector": "0.5.7",
-    "@cartridge/controller": "0.5.7",
-    "@dojoengine/core": "1.0.4-alpha.3.1.0",
-    "@dojoengine/create-burner": "1.0.4-alpha.3.1.0",
-    "@dojoengine/react": "1.0.4-alpha.3.1.0",
-    "@dojoengine/recs": "^2.0.13",
-    "@dojoengine/state": "1.0.4-alpha.3.1.0",
-    "@dojoengine/torii-client": "1.0.4-alpha.3.1.0",
     "@dojoengine/torii-wasm": "1.0.4-alpha.3.1.0",
-    "@dojoengine/utils": "1.0.4-alpha.3.1.0",
-    "@headlessui/react": "^1.7.18",
-    "@latticexyz/utils": "^2.0.0-next.12",
-    "@radix-ui/react-collapsible": "^1.1.1",
-    "@radix-ui/react-select": "^2.0.0",
-    "@radix-ui/react-switch": "^1.1.1",
-    "@radix-ui/react-tabs": "^1.1.0",
-    "@react-three/drei": "^9.101.0",
-    "@react-three/fiber": "^8.16.1",
-    "@react-three/postprocessing": "2.16.2",
-    "@starknet-react/chains": "^3.0.2",
-    "@starknet-react/core": "^3.0.3",
-    "@tanstack/react-query": "^5.59.15",
-    "@vercel/analytics": "^1.2.2",
-    "@vite-pwa/assets-generator": "^0.2.6",
-    "buffer": "^6.0.3",
-    "clsx": "^1.2.1",
-    "framer-motion": "^11.0.24",
-    "graphql-request": "^7.1.2",
-    "gsap": "^3.12.5",
-    "lil-gui": "^0.19.2",
+    "three": "^0.166.0",
+    "zustand": "^4.5.2",
+    "wouter": "^2.12.1",
     "lodash": "^4.17.21",
-    "lucide-react": "^0.365.0",
-    "next-themes": "^0.4.3",
-    "postprocessing": "^6.36.2",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "react-draggable": "^4.4.6",
+    "graphql-request": "^7.1.2",
+    "three-stdlib": "^2.29.5",
     "react-shepherd": "^6.1.6",
-    "rxjs": "^7.8.1",
     "shepherd.js": "^14.3.0",
-    "sonner": "^1.7.0",
-    "tailwind-merge": "^2.2.2",
-    "three": "^0.166.0",
-    "three-csg": "^1.0.0",
-    "three-csg-ts": "^3.1.14",
-    "three-stdlib": "^2.29.5",
-    "use-sound": "^4.0.1",
-    "viem": "^2.21.45",
-    "vite-plugin-mkcert": "^1.17.6",
+    "react-draggable": "^4.4.6",
+    "lil-gui": "^0.19.2",
     "vite-plugin-pwa": "^0.20.5",
-    "vitest-canvas-mock": "^0.3.3",
-    "wouter": "^2.12.1",
-    "zod": "^3.23.8",
-    "zustand": "^4.5.2"
+    "use-sound": "^4.0.1",
+    "@latticexyz/utils": "^2.0.0-next.12",
+    "@vercel/analytics": "^1.2.2",
+    "postprocessing": "^6.36.2",
+    "gsap": "^3.12.5",
+    "buffer": "^6.0.3"
   },
   "devDependencies": {
-    "@svgr/rollup": "^8.1.0",
-    "@tailwindcss/typography": "^0.5.13",
-    "@types/lodash": "^4.14.202",
-    "@types/node": "^20.11.10",
-    "@types/react": "^18.2.74",
-    "@types/react-dom": "^18.2.21",
     "@types/three": "^0.163.0",
     "@typescript-eslint/eslint-plugin": "^7.5.0",
-    "@vitejs/plugin-react": "^4.3.2",
     "@vitest/coverage-v8": "^2.0.5",
     "@vitest/ui": "^2.0.1",
-    "autoprefixer": "^10.4.18",
-    "eslint": "^8.57.0",
     "eslint-config-standard-with-typescript": "^43.0.1",
-    "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-n": "^17.0.0",
-    "eslint-plugin-promise": "^6.1.1",
-    "eslint-plugin-react": "^7.34.1",
-    "eslint-plugin-react-refresh": "^0.4.16",
-    "globals": "^15.9.0",
-    "jsdom": "^24.1.0",
-    "leva": "^0.9.35",
-    "postcss": "^8.4.35",
-    "r3f-perf": "^7.2.1",
-    "tailwindcss": "^3.4.1",
-    "typescript": "^5.4.4",
-    "vite": "^5.4.8",
-    "vite-plugin-svgr": "^4.2.0",
-    "vite-plugin-top-level-await": "^1.4.1",
-    "vite-plugin-wasm": "^3.3.0",
     "vitest": "^2.0.5",
-    "workbox-window": "^7.3.0"
+    "workbox-window": "^7.3.0",
+    "@types/lodash": "^4.14.202",
+    "@tailwindcss/typography": "^0.5.13"
+  },
+  "peerDependencies": {
+    "starknet": "6.11.0"
   }
 }

client/apps/game/src/ui/modules/settings/Settings.tsx

@@ -6,6 +6,7 @@ import { ReactComponent as Unmuted } from "@/assets/icons/common/unmuted.svg";
 import { ReactComponent as DojoMark } from "@/assets/icons/dojo-mark-full-dark.svg";
 import { ReactComponent as RealmsWorld } from "@/assets/icons/rw-logo.svg";
 import { useDojo } from "@/hooks/context/DojoContext";
+import { useGuilds } from "@/hooks/helpers/useGuilds";
 import { useRealm } from "@/hooks/helpers/useRealm";
 import useUIStore from "@/hooks/store/useUIStore";
 import { useMusicPlayer } from "@/hooks/useMusic";
@@ -105,7 +106,7 @@ export const SettingsWindow = () => {
       return newFlatMode;
     });
   };
-  
+
   return (
     <OSWindow onClick={() => togglePopup(settings)} show={isOpen} title={settings}>
       <div className="flex justify-between p-4">

client/apps/landing/package.json

@@ -16,19 +16,8 @@
   "dependencies": {
     "@ark-project/core": "3.0.0-beta.1",
     "@ark-project/react": "2.0.0-beta.2",
-    "@bibliothecadao/eternum": "workspace:^",
-    "@cartridge/connector": "^0.5.7",
-    "@cartridge/controller": "^0.5.7",
-    "@dojoengine/core": "1.0.3-alpha.2",
-    "@dojoengine/create-burner": "1.0.3-alpha.2",
-    "@dojoengine/react": "1.0.3-alpha.2",
-    "@dojoengine/recs": "^2.0.13",
-    "@dojoengine/state": "1.0.3-alpha.2",
-    "@dojoengine/torii-client": "1.0.3-alpha.2",
-    "@dojoengine/utils": "1.0.3-alpha.2",
     "@graphql-codegen/schema-ast": "^4.1.0",
     "@graphql-typed-document-node/core": "^3.2.0",
-    "@headlessui/react": "^2.2.0",
     "@parcel/watcher": "^2.4.1",
     "@radix-ui/react-checkbox": "^1.1.2",
     "@radix-ui/react-collapsible": "^1.1.1",
@@ -37,45 +26,26 @@
     "@radix-ui/react-icons": "^1.3.0",
     "@radix-ui/react-label": "^2.1.0",
     "@radix-ui/react-popover": "^1.1.2",
-    "@radix-ui/react-select": "^2.0.0",
     "@radix-ui/react-separator": "^1.1.0",
     "@radix-ui/react-slot": "^1.1.0",
-    "@radix-ui/react-switch": "^1.1.1",
-    "@radix-ui/react-tabs": "^1.1.0",
     "@radix-ui/react-tooltip": "^1.1.3",
-    "@starknet-react/chains": "^3.1.0",
-    "@starknet-react/core": "^3.5.0",
-    "@svgr/rollup": "^8.1.0",
     "@tanstack/react-query": "^5.59.15",
     "@tanstack/react-router": "^1.74.0",
     "class-variance-authority": "^0.7.0",
-    "clsx": "^1.2.1",
     "cmdk": "1.0.0",
     "dotenv": "^16.3.1",
-    "framer-motion": "^11.0.24",
     "graphql": "^16.9.0",
     "graphql-tag": "^2.12.6",
     "jotai": "^2.10.1",
-    "lucide-react": "^0.365.0",
-    "next-themes": "^0.4.3",
     "nuqs": "^2.0.4",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
-    "sonner": "^1.7.0",
     "starknet": "^6.8.0",
     "storybook": "^8.3.2",
-    "tailwind-merge": "^2.5.4",
     "tailwindcss-animate": "^1.0.7",
-    "viem": "^2.21.45",
-    "vite-plugin-svgr": "^4.2.0",
-    "vite-plugin-vercel": "^9.0.3",
-    "vite-plugin-wasm": "^3.3.0",
-    "zod": "^3.23.8"
+    "vite-plugin-vercel": "^9.0.3"
   },
   "devDependencies": {
     "@0no-co/graphqlsp": "^1.12.16",
     "@chromatic-com/storybook": "^1.6.1",
-    "@eslint/js": "^9.11.1",
     "@graphql-codegen/cli": "5.0.3",
     "@graphql-codegen/client-preset": "4.4.0",
     "@graphql-codegen/introspection": "4.0.3",
@@ -90,23 +60,6 @@
     "@storybook/react-vite": "^8.3.2",
     "@storybook/test": "^8.3.2",
     "@tanstack/router-devtools": "^1.74.0",
-    "@tanstack/router-plugin": "^1.73.1",
-    "@types/node": "^20.11.10",
-    "@types/react": "^18.3.10",
-    "@types/react-dom": "^18.3.0",
-    "@vitejs/plugin-react": "^4.3.2",
-    "autoprefixer": "^10.4.18",
-    "eslint": "^9.11.1",
-    "eslint-plugin-react-hooks": "^5.1.0-rc.0",
-    "eslint-plugin-react-refresh": "^0.4.12",
-    "globals": "^15.9.0",
-    "postcss": "^8.4.35",
-    "tailwindcss": "^3.4.1",
-    "typescript": "^5.6.2",
-    "typescript-eslint": "^8.7.0",
-    "vite": "^5.4.8",
-    "vite-plugin-mkcert": "^1.17.6",
-    "vite-plugin-svgr": "^4.2.0",
-    "vite-plugin-top-level-await": "^1.4.1"
+    "@tanstack/router-plugin": "^1.73.1"
   }
 }