Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix game build #2623

Merged
merged 17 commits into from
Jan 7, 2025
Merged

fix game build #2623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
0832a96
Fix build for new structure
bob0005 Jan 6, 2025
b73577e
add npmrc
bob0005 Jan 6, 2025
3a2847e
Add root package.json
bob0005 Jan 6, 2025
9f36fdf
Update pnpm workspace & lockfile
bob0005 Jan 6, 2025
15a74eb
Move balancing into apps
bob0005 Jan 6, 2025
33c7c79
update all package.json files
bob0005 Jan 6, 2025
0de459e
update pnpm-lock
bob0005 Jan 6, 2025
0a0c843
fix game build
aymericdelab Jan 7, 2025
915f8c9
Merge branch 'fix/build' of https://github.com/BibliothecaDAO/eternum…
aymericdelab Jan 7, 2025
f4ec0ac
Fix workspace dependency import
bob0005 Jan 7, 2025
435521a
remove husky
bob0005 Jan 7, 2025
3c62671
Merge branch 'fix/build' of https://github.com/BibliothecaDAO/eternum…
aymericdelab Jan 7, 2025
19bbbaf
lock
aymericdelab Jan 7, 2025
006f367
add vite
aymericdelab Jan 7, 2025
60000f1
remove vite
aymericdelab Jan 7, 2025
69a06b1
add vite
aymericdelab Jan 7, 2025
d87e002
lock
aymericdelab Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 client/balancing/.gitignore → client/apps/balancing/.gitignore
View file
Open in desktop
File renamed without changes.
0 client/balancing/README.md → client/apps/balancing/README.md
View file
Open in desktop
File renamed without changes.
0 client/balancing/components.json → client/apps/balancing/components.json
View file
Open in desktop
File renamed without changes.
0 client/balancing/eslint.config.js → client/apps/balancing/eslint.config.js
View file
Open in desktop
File renamed without changes.
0 client/balancing/index.html → client/apps/balancing/index.html
View file
Open in desktop
File renamed without changes.
16 changes: 1 addition & 15 deletions client/balancing/package.json → client/apps/balancing/package.json
View file
Open in desktop
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"
Comment on lines 11 to +26
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Critical dependencies missing for React application

Several essential dependencies have been removed:

  1. Core React packages (react, react-dom)
  2. Type definitions (@types/react, @types/react-dom)
  3. Build tooling (@vitejs/plugin-react)
  4. ESLint but plugins remain

This will break the application build and development workflow.

Restore the necessary dependencies:

 "dependencies": {
   "@radix-ui/react-icons": "^1.3.0",
   "@tanstack/react-table": "^8.20.5",
   "class-variance-authority": "^0.7.0",
+  "react": "^18.3.1",
+  "react-dom": "^18.3.1",
   "tailwindcss-animate": "^1.0.7"
 },
 "devDependencies": {
   "@eslint/js": "^9.9.0",
+  "@types/react": "^18.3.3",
+  "@types/react-dom": "^18.3.0",
+  "@vitejs/plugin-react": "^4.3.1",
+  "eslint": "^8.57.0",
   "autoprefixer": "^10.4.18",
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
},
"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"
},
"dependencies": {
"@radix-ui/react-icons": "^1.3.0",
"@tanstack/react-table": "^8.20.5",
"class-variance-authority": "^0.7.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"tailwindcss-animate": "^1.0.7"
},
"devDependencies": {
"@eslint/js": "^9.9.0",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"@vitejs/plugin-react": "^4.3.1",
"eslint": "^8.57.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"

}
}
0 client/balancing/postcss.config.js → client/apps/balancing/postcss.config.js
View file
Open in desktop
File renamed without changes.
0 client/balancing/public/vite.svg → client/apps/balancing/public/vite.svg
View file
Open in desktop
File renamed without changes
0 client/balancing/src/App.css → client/apps/balancing/src/App.css
View file
Open in desktop
File renamed without changes.
0 client/balancing/src/App.tsx → client/apps/balancing/src/App.tsx
View file
Open in desktop
File renamed without changes.
0 client/balancing/src/assets/react.svg → client/apps/balancing/src/assets/react.svg
View file
Open in desktop
File renamed without changes
0 ...src/components/modules/building-table.tsx → ...src/components/modules/building-table.tsx
View file
Open in desktop
File renamed without changes.
0 ...src/components/modules/resource-table.tsx → ...src/components/modules/resource-table.tsx
View file
Open in desktop
File renamed without changes.
0 client/balancing/src/components/ui/badge.tsx → ...pps/balancing/src/components/ui/badge.tsx
View file
Open in desktop
File renamed without changes.
0 client/balancing/src/components/ui/table.tsx → ...pps/balancing/src/components/ui/table.tsx
View file
Open in desktop
File renamed without changes.
0 client/balancing/src/components/ui/tabs.tsx → ...apps/balancing/src/components/ui/tabs.tsx
View file
Open in desktop
File renamed without changes.
0 client/balancing/src/index.css → client/apps/balancing/src/index.css
View file
Open in desktop
File renamed without changes.
0 client/balancing/src/lib/utils.ts → client/apps/balancing/src/lib/utils.ts
View file
Open in desktop
File renamed without changes.
0 client/balancing/src/main.tsx → client/apps/balancing/src/main.tsx
View file
Open in desktop
File renamed without changes.
0 client/balancing/src/vite-env.d.ts → client/apps/balancing/src/vite-env.d.ts
View file
Open in desktop
File renamed without changes.
0 client/balancing/tailwind.config.js → client/apps/balancing/tailwind.config.js
View file
Open in desktop
File renamed without changes.
0 client/balancing/tsconfig.app.json → client/apps/balancing/tsconfig.app.json
View file
Open in desktop
File renamed without changes.
0 client/balancing/tsconfig.json → client/apps/balancing/tsconfig.json
View file
Open in desktop
File renamed without changes.
0 client/balancing/tsconfig.node.json → client/apps/balancing/tsconfig.node.json
View file
Open in desktop
File renamed without changes.
0 client/balancing/vite.config.ts → client/apps/balancing/vite.config.ts
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions client/apps/game/dojoConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
104 changes: 23 additions & 81 deletions client/apps/game/package.json
View file
Open in desktop
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,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"
}
}
3 changes: 2 additions & 1 deletion client/apps/game/src/ui/modules/settings/Settings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -105,7 +106,7 @@ export const SettingsWindow = () => {
return newFlatMode;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The useGuilds import is used in the component (on line 77), so it's correctly imported.

});
};

return (
<OSWindow onClick={() => togglePopup(settings)} show={isOpen} title={settings}>
<div className="flex justify-between p-4">
Expand Down
51 changes: 2 additions & 49 deletions client/apps/landing/package.json
View file
Open in desktop
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"
}
}
Loading
Loading