Skip to content

Commit

Permalink
Merge branch 'fix/build' of https://github.com/BibliothecaDAO/eternum
Browse files Browse the repository at this point in the history
…into fix-build-raschel
  • Loading branch information
aymericdelab committed Jan 7, 2025
2 parents 0a0c843 + 0de459e commit 915f8c9
Show file tree
Hide file tree
Showing 36 changed files with 3,186 additions and 6,002 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
105 changes: 24 additions & 81 deletions client/apps/game/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "eternum-client",
"version": "0.0.0",
"name": "eternum-game-client",
"version": "0.0.1",
"type": "module",
"scripts": {
"dev": "vite",
Expand All @@ -10,100 +10,43 @@
"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",
"@bibliothecadao/eternum": "workspace:^",
"@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"
}
}
51 changes: 2 additions & 49 deletions client/apps/landing/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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"
}
}
11 changes: 8 additions & 3 deletions client/config/package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
{
"name": "config",
"name": "eternum-config",
"module": "index.ts",
"scripts": {
"dev": "bun run index.ts",
"lint": "eslint .",
"lint:fix": "eslint . --fix"
},
"devDependencies": {
"@types/bun": "latest"
"@types/bun": "latest",
"eslint": "^9.9.0"
},
"peerDependencies": {
"typescript": "^5.0.0",
"@bibliothecadao/eternum": "workspace:^",
"@dojoengine/core": "1.0.0-alpha.21",
"starknet": "6.11.0"
}
Expand Down
78 changes: 52 additions & 26 deletions client/package.json
Original file line number Diff line number Diff line change
@@ -1,36 +1,62 @@
{
"name": "eternum",
"name": "eternum-client",
"version": "0.1.0",
"type": "module",
"scripts": {
"dev": "pnpm --dir ./client dev",
"build-packages": "pnpm --dir sdk/packages/eternum build",
"build-client": "pnpm --dir ./client build",
"build-landing": "pnpm --dir ./landing build",
"build-docs": "pnpm --dir ./eternum-docs build",
"test-client": "pnpm --dir ./client test",
"prettier-check": "npx prettier --check .",
"prettier": "npx prettier --write .",
"dev:docs": "pnpm --dir ./eternum-docs dev",
"knip": "npx knip --exclude binaries,dependencies",
"docs:dev": "vocs dev",
"docs:build": "vocs build",
"docs:preview": "vocs preview"
"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",
"format": "prettier --write .",
"format:check": "prettier --check .",
"knip": "npx knip --exclude binaries,dependencies"
},
"dependencies": {
"typescript": "5.4.4",
"vite": "^6.0.3",
"vocs": "latest"
},
"devDependencies": {
"@bibliothecadao/eternum": "workspace:^",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
"autoprefixer": "^10.4.18",
"postcss": "^8.4.35",
"@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/utils": "1.0.4-alpha.3.1.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"tailwindcss": "^3.4.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-select": "^2.0.0",
"@radix-ui/react-switch": "^1.1.1",
"@radix-ui/react-tabs": "^1.1.0",
"next-themes": "^0.4.3",
"tailwind-merge": "^2.5.2",
"@starknet-react/chains": "^3.1.0",
"zod": "^3.23.8"
},
"packageManager": "[email protected]+sha512.cce0f9de9c5a7c95bef944169cc5dfe8741abfb145078c0d508b868056848a87c81e626246cb60967cbd7fd29a6c062ef73ff840d96b3c86c40ac92cf4a813ee"
"devDependencies": {
"@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",
"vite-plugin-mkcert": "^1.17.6",
"vite-plugin-top-level-await": "^1.4.1",
"vite-plugin-wasm": "^3.3.0"
}
}
Loading

0 comments on commit 915f8c9

Please sign in to comment.