Merge branch 'season-1' of https://github.com/BibliothecaDAO/eternum …

…into feat/labor

client/apps/balancing/package.json

@@ -1,28 +1,21 @@
 {
   "name": "balancing",
-  "private": true,
   "version": "0.0.0",
+  "private": true,
   "type": "module",
   "scripts": {
-    "dev": "vite",
     "build": "tsc -b && vite build",
+    "dev": "vite",
     "lint": "eslint .",
     "preview": "vite preview"
   },
   "dependencies": {
-    "@radix-ui/react-icons": "^1.3.0",
-    "@tanstack/react-table": "^8.20.5",
-    "class-variance-authority": "^0.7.0",
-    "tailwindcss-animate": "^1.0.7"
+    "@tanstack/react-table": "^8.20.5"
   },
   "devDependencies": {
     "@eslint/js": "^9.9.0",
-    "autoprefixer": "^10.4.18",
     "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-eslint": "^8.0.1"
   }
 }

client/apps/docs/.gitignore

@@ -0,0 +1 @@
+docs/dist/

client/apps/docs/package.json

@@ -0,0 +1,21 @@
+{
+  "name": "eternum",
+  "version": "0.1.0",
+  "type": "module",
+  "scripts": {
+    "build": "pnpm --dir ./client/apps/game build",
+    "build:docs": "vocs build",
+    "build:landing": "pnpm --dir ./client/apps/landing build",
+    "build:packages": "pnpm --dir ./client/sdk/packages/eternum build",
+    "dev": "pnpm --dir ./client/apps/game dev",
+    "dev:docs": "vocs dev",
+    "dev:landing": "pnpm --dir ./client/apps/landing dev",
+    "format": "pnpm prettier --write .",
+    "format:check": "pnpm prettier --check .",
+    "knip": "npx knip --exclude binaries,dependencies",
+    "lint": "pnpm --recursive run lint",
+    "lint:fix": "pnpm --recursive run lint:fix",
+    "test": "pnpm --recursive run test"
+  },
+  "packageManager": "[email protected]+sha512.cce0f9de9c5a7c95bef944169cc5dfe8741abfb145078c0d508b868056848a87c81e626246cb60967cbd7fd29a6c062ef73ff840d96b3c86c40ac92cf4a813ee"
+}

client/apps/game/package.json

@@ -3,47 +3,44 @@
   "version": "0.0.1",
   "type": "module",
   "scripts": {
-    "dev": "vite",
     "build": "tsc && vite build",
-    "preview": "vite preview",
-    "test": "vitest run",
-    "test:watch": "vitest",
-    "test:ui": "vitest --ui",
     "coverage": "vitest run --coverage",
+    "dev": "vite",
+    "generate-pwa-assets": "pwa-assets-generator",
     "lint": "eslint .",
     "lint:fix": "eslint . --ext .ts,.tsx --fix",
-    "generate-pwa-assets": "pwa-assets-generator"
+    "preview": "vite preview",
+    "test": "vitest run",
+    "test:ui": "vitest --ui",
+    "test:watch": "vitest"
   },
   "dependencies": {
-    "@dojoengine/torii-wasm": "1.0.4-alpha.3.1.0",
-    "three": "^0.166.0",
-    "zustand": "^4.5.2",
-    "wouter": "^2.12.1",
-    "lodash": "^4.17.21",
+    "@latticexyz/utils": "^2.0.0-next.12",
+    "@vercel/analytics": "^1.2.2",
+    "buffer": "^6.0.3",
     "graphql-request": "^7.1.2",
-    "three-stdlib": "^2.29.5",
+    "gsap": "^3.12.5",
+    "lil-gui": "^0.19.2",
+    "lodash": "^4.17.21",
+    "postprocessing": "^6.36.2",
+    "react-draggable": "^4.4.6",
     "react-shepherd": "^6.1.6",
     "shepherd.js": "^14.3.0",
-    "react-draggable": "^4.4.6",
-    "lil-gui": "^0.19.2",
-    "vite-plugin-pwa": "^0.20.5",
+    "three": "^0.166.0",
+    "three-stdlib": "^2.29.5",
     "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"
+    "vite-plugin-pwa": "^0.20.5",
+    "wouter": "^2.12.1",
+    "zustand": "^4.5.2"
   },
   "devDependencies": {
+    "@types/lodash": "^4.14.202",
     "@types/three": "^0.163.0",
     "@typescript-eslint/eslint-plugin": "^7.5.0",
     "@vitest/coverage-v8": "^2.0.5",
     "@vitest/ui": "^2.0.1",
-    "eslint-config-standard-with-typescript": "^43.0.1",
-    "vitest": "^2.0.5",
-    "workbox-window": "^7.3.0",
-    "@types/lodash": "^4.14.202",
-    "@tailwindcss/typography": "^0.5.13"
+    "eslint-config-love": "^114.0.0",
+    "workbox-window": "^7.3.0"
   },
   "peerDependencies": {
     "starknet": "6.11.0"

client/apps/landing/dojoConfig.ts

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

client/apps/landing/package.json

@@ -1,17 +1,17 @@
 {
   "name": "landing",
-  "private": true,
   "version": "0.0.0",
+  "private": true,
   "type": "module",
   "scripts": {
+    "build": "tsc --noEmit && vite build",
+    "build-storybook": "storybook build",
+    "codegen": "graphql-codegen --config codegen.ts",
     "dev": "vite",
     "dev::sepolia": "vite --mode sepolia",
-    "build": "tsc --noEmit && vite build",
     "lint": "eslint .",
     "preview": "vite preview",
-    "storybook": "storybook dev -p 6006",
-    "build-storybook": "storybook build",
-    "codegen": "graphql-codegen --config codegen.ts"
+    "storybook": "storybook dev -p 6006"
   },
   "dependencies": {
     "@ark-project/core": "3.0.0-beta.1",
@@ -23,24 +23,19 @@
     "@radix-ui/react-collapsible": "^1.1.1",
     "@radix-ui/react-dialog": "^1.1.2",
     "@radix-ui/react-dropdown-menu": "^2.1.2",
-    "@radix-ui/react-icons": "^1.3.0",
     "@radix-ui/react-label": "^2.1.0",
     "@radix-ui/react-popover": "^1.1.2",
     "@radix-ui/react-separator": "^1.1.0",
     "@radix-ui/react-slot": "^1.1.0",
     "@radix-ui/react-tooltip": "^1.1.3",
     "@tanstack/react-query": "^5.59.15",
     "@tanstack/react-router": "^1.74.0",
-    "class-variance-authority": "^0.7.0",
     "cmdk": "1.0.0",
-    "dotenv": "^16.3.1",
     "graphql": "^16.9.0",
     "graphql-tag": "^2.12.6",
     "jotai": "^2.10.1",
     "nuqs": "^2.0.4",
-    "starknet": "^6.8.0",
     "storybook": "^8.3.2",
-    "tailwindcss-animate": "^1.0.7",
     "vite-plugin-vercel": "^9.0.3"
   },
   "devDependencies": {

client/apps/landing/src/hooks/helpers/useRealms.tsx

@@ -1,6 +1,6 @@
 import { type ID } from "@bibliothecadao/eternum";
 import { type Entity, HasValue, getComponentValue, runQuery } from "@dojoengine/recs";
-import realmsJson from "../../../../client/src/data/geodata/realms.json";
+import realmsJson from "../../../../../apps/game/src/data/geodata/realms.json";
 import { useDojo } from "../context/DojoContext";
 
 export function useRealm() {

client/apps/landing/tailwind.config.js

@@ -2,7 +2,7 @@ const defaultTheme = require("tailwindcss/defaultTheme");
 
 /** @type {import('tailwindcss').Config} */
 export default {
-  presets: [require("../default.js")],
+  presets: [require("../../default.js")],
   darkMode: ["class"],
   content: ["./index.html", "./src/**/*.{js,ts,jsx,tsx}"],
   safelist: [

client/config/package.json

@@ -7,12 +7,10 @@
     "lint:fix": "eslint . --fix"
   },
   "devDependencies": {
-    "@types/bun": "latest",
-    "eslint": "^9.9.0"
+    "@types/bun": "latest"
   },
   "peerDependencies": {
-    "typescript": "^5.0.0",
-    "@dojoengine/core": "1.0.0-alpha.21",
-    "starknet": "6.11.0"
+    "starknet": "6.11.0",
+    "typescript": "^5.0.0"
   }
 }

client/package.json

@@ -3,59 +3,62 @@
   "version": "0.1.0",
   "type": "module",
   "scripts": {
-    "dev": "pnpm --filter ./apps/game dev",
-    "dev:landing": "pnpm --filter ./apps/landing dev",
-    "dev:docs": "pnpm --filter ./apps/docs dev",
-    "build": "pnpm --filter ./apps/game build",
-    "build:landing": "pnpm --filter ./apps/landing build",
-    "build:docs": "pnpm --filter ./apps/docs build",
-    "build:packages": "pnpm --filter ./sdk/packages/eternum build",
-    "test:client": "pnpm --filter ./apps/game test",
-    "lint": "pnpm --filter ./apps/game lint",
-    "lint:fix": "pnpm --filter ./apps/game lint:fix",
+    "build": "pnpm --dir ./apps/game build",
+    "build:docs": "pnpm --dir ./apps/docs build",
+    "build:landing": "pnpm --dir ./apps/landing build",
+    "build:packages": "pnpm --dir ./sdk/packages/eternum build",
+    "dev": "pnpm --dir ./apps/game dev",
+    "dev:docs": "cd ./apps/docs && vocs dev",
+    "dev:landing": "pnpm --dir ./apps/landing dev",
     "format": "prettier --write .",
     "format:check": "prettier --check .",
-    "knip": "npx knip --exclude binaries,dependencies"
+    "knip": "npx knip --exclude binaries,dependencies",
+    "lint": "pnpm --dir ./apps/game lint",
+    "lint:fix": "pnpm --dir ./apps/game lint:fix",
+    "test:client": "pnpm --dir ./apps/game test"
   },
   "dependencies": {
     "@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",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
-    "lucide-react": "^0.365.0",
-    "clsx": "^1.2.1",
-    "sonner": "^1.7.0",
-    "viem": "^2.21.45",
-    "framer-motion": "^11.0.24",
-    "@starknet-react/core": "^3.5.0",
     "@headlessui/react": "^2.2.0",
+    "@radix-ui/react-icons": "^1.3.0",
     "@radix-ui/react-select": "^2.0.0",
     "@radix-ui/react-switch": "^1.1.1",
     "@radix-ui/react-tabs": "^1.1.0",
+    "@starknet-react/chains": "^3.1.0",
+    "@starknet-react/core": "^3.5.0",
+    "@tailwindcss/typography": "^0.5.13",
+    "class-variance-authority": "^0.7.0",
+    "clsx": "^1.2.1",
+    "framer-motion": "^11.0.24",
+    "lucide-react": "^0.365.0",
     "next-themes": "^0.4.3",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
+    "sonner": "^1.7.0",
     "tailwind-merge": "^2.5.2",
-    "@starknet-react/chains": "^3.1.0",
+    "tailwindcss": "^3.4.1",
+    "tailwindcss-animate": "^1.0.7",
+    "viem": "^2.21.45",
     "zod": "^3.23.8"
   },
   "devDependencies": {
+    "@svgr/rollup": "^8.1.0",
     "@types/node": "^20.11.10",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
-    "eslint": "^9.9.0",
-    "typescript": "^5.5.3",
-    "leva": "^0.9.35",
-    "vite": "^5.4.1",
-    "vite-plugin-svgr": "^4.2.0",
-    "@svgr/rollup": "^8.1.0",
     "@vitejs/plugin-react": "^4.3.1",
+    "globals": "^15.9.0",
+    "leva": "^0.9.35",
     "vite-plugin-mkcert": "^1.17.6",
+    "vite-plugin-svgr": "^4.2.0",
     "vite-plugin-top-level-await": "^1.4.1",
     "vite-plugin-wasm": "^3.3.0"
   }

client/sdk/packages/eternum/package.json

@@ -2,23 +2,23 @@
   "name": "@bibliothecadao/eternum",
   "version": "0.2.0",
   "description": "Eternum SDK for Starknet & Dojo",
+  "license": "MIT",
+  "author": "Loaf",
   "type": "module",
-  "scripts": {
-    "build": "tsup",
-    "test": "vitest",
-    "lint": "eslint .",
-    "lint:fix": "eslint . --fix",
-    "gen:docs": "typedoc --plugin typedoc-plugin-markdown"
-  },
   "exports": {
     ".": {
       "import": "./dist/index.js",
       "types": "./dist/index.d.ts"
     }
   },
-  "author": "Loaf",
-  "license": "MIT",
   "main": "./dist/index.js",
+  "scripts": {
+    "build": "tsup",
+    "gen:docs": "typedoc --plugin typedoc-plugin-markdown",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix",
+    "test": "vitest"
+  },
   "dependencies": {
     "@dojoengine/core": "1.0.0-alpha.24",
     "@scure/starknet": "^1.1.0",

contracts/game/ext/formulas/battles/package.json

@@ -2,18 +2,18 @@
   "name": "battles",
   "version": "1.0.0",
   "description": "",
+  "keywords": [],
+  "license": "ISC",
+  "author": "",
+  "type": "module",
   "main": "index.js",
   "scripts": {
     "simulate-battle": "node battle_time.js"
   },
   "dependencies": {
     "@bibliothecadao/eternum": "workspace:^"
   },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
   "devDependencies": {
     "@types/node": "^20.11.10"
-  },
-  "type": "module"
+  }
 }

contracts/season_pass/ext/scripts/deployment/package.json

@@ -1,14 +1,14 @@
 {
   "name": "scripts",
   "version": "1.0.0",
-  "type": "module",
   "description": "",
+  "license": "ISC",
+  "author": "",
+  "type": "module",
   "main": "index.js",
   "scripts": {
     "deploy": "source .env && bun --env-file=.env ./deploy_dev",
-    "deploy::sepolia": "bun --env-file=.env.sepolia ./deploy_dev",
-    "deploy::prod": "bun --env-file=.env.production ./deploy_prod"
-  },
-  "author": "",
-  "license": "ISC"
+    "deploy::prod": "bun --env-file=.env.production ./deploy_prod",
+    "deploy::sepolia": "bun --env-file=.env.sepolia ./deploy_dev"
+  }
 }