Merge branch 'sivicstudio:dev' into dev

.github/pull_request_template.md

@@ -4,7 +4,7 @@ _Detailed description of proposed changes_
 
 ## Related Issue(s)
 
-_Closes #<!-- issue number-->_
+Closes #<!-- issue number-->
 ## Checklist:
 
 - [ ] Read the [contributing docs](../CONTRIBUTING.md) (if this is your first contribution)
@@ -16,4 +16,4 @@ _Closes #<!-- issue number-->_
 - [ ] Documented the changes in code (API docs will be generated automatically)
 
 
-<!-- _Note: If your changes are small and straightforward, you may skip the creation of an issue beforehand and remove this section. However, for medium-to-large changes, it is recommended to have an open issue for discussion and approval prior to submitting a pull request._-->
+<!-- _Note: If your changes are small and straightforward, you may skip the creation of an issue beforehand and remove this section. However, for medium-to-large changes, it is recommended to have an open issue for discussion and approval prior to submitting a pull request._-->

.github/workflows/commitlint.yml

@@ -1,4 +1,6 @@
-name: CI
+name: Client Commitlint CI
+
+  CI=false npm run build
 
 on: [push, pull_request]
 
@@ -11,11 +13,18 @@ jobs:
           fetch-depth: 0
       - name: Install required dependencies
         run: |
-          apt update
-          apt install -y sudo
+          sudo apt-get update
+          sudo apt install -y sudo
           sudo apt install -y git curl
           curl -sL https://deb.nodesource.com/setup_14.x | sudo -E bash -
           sudo DEBIAN_FRONTEND=noninteractive apt install -y nodejs
+
+      - name: Clear npm cache
+        run: npm cache clean --force
+
+      - name: Update npm
+        run: npm install -g npm@latest
+
       - name: Print versions
         run: |
           git --version
@@ -26,11 +35,10 @@ jobs:
         run: |
           npm install conventional-changelog-conventionalcommits
           npm install commitlint@latest
-
+          npm install --save-dev lint-staged
       - name: Validate current commit (last commit) with commitlint
         if: github.event_name == 'push'
         run: npx commitlint --last --verbose
-
       - name: Validate PR commits with commitlint
-        if: github.event_name == 'pull_request'
-        run: npx commitlint --from ${{ github.event.pull_request.head.sha }}~${{ github.event.pull_request.commits }} --to ${{ github.event.pull_request.head.sha }} --verbose
+        if: github.eventxname == 'pull_request'
+        run: npx commitlint --from ${{ github.event.pull_request.head.sha }}~${{ github.event.pull_request.commits }} --to ${{ github.event.pull_request.head.sha }} --verbose

client/.eslintrc.cjs

@@ -1,14 +1,37 @@
+// module.exports = {
+//     env: { browser: true, es2020: true },
+//     extends: [
+//         "eslint:recommended",
+//         "plugin:@typescript-eslint/recommended",
+//         "plugin:react-hooks/recommended",
+//     ],
+//     parser: "@typescript-eslint/parser",
+//     parserOptions: { ecmaVersion: "latest", sourceType: "module" },
+//     plugins: ["react-refresh"],
+//     rules: {
+//         "react-refresh/only-export-components": "warn",
+//         "@typescript-eslint/no-inferrable-types": "off",
+//         "no-mixed-spaces-and-tabs": 0, 
+//         'prefer-const': 'warn',
+//         '@typescript-eslint/no-empty-function': 'off',
+//         "@typescript-eslint/ban-types": "off",
+//         "@typescript-eslint/no-unused-vars": "warn",
+//         "@typescript-eslint/no-explicit-any": "warn"
+//     },
+// };
+
 module.exports = {
-    env: { browser: true, es2020: true },
-    extends: [
-        "eslint:recommended",
-        "plugin:@typescript-eslint/recommended",
-        "plugin:react-hooks/recommended",
-    ],
-    parser: "@typescript-eslint/parser",
-    parserOptions: { ecmaVersion: "latest", sourceType: "module" },
-    plugins: ["react-refresh"],
-    rules: {
-        "react-refresh/only-export-components": "warn",
-    },
+  env: { browser: true, es2020: true },
+  extends: [
+    "eslint:recommended",
+    "plugin:@typescript-eslint/recommended",
+    "plugin:react-hooks/recommended",
+  ],
+  parser: "@typescript-eslint/parser",
+  parserOptions: { ecmaVersion: "latest", sourceType: "module" },
+  plugins: ["react-refresh"],
+  rules: {
+    "react-refresh/only-export-components": "warn",
+  },
+  ignorePatterns: ["src/dojo/typescript/models.gen.ts"],
 };

client/package.json

@@ -7,19 +7,21 @@
     "dev": "vite",
     "build": "tsc && vite build",
     "format": "prettier --ignore-path .gitignore --write \"**/*.+(js|ts|json)\"",
+
     "lint": "eslint src --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
+
     "preview": "vite preview",
     "create-components": "npx /Users/os/Documents/code/dojo/dojo.js/packages/core/bin/generateComponents.cjs ../../dojo-starter/manifests/dev/deployment/manifest.json src/dojo/generated/contractComponents.ts http://localhost:5050 0x3fc79ccfd72c1450d2ccb73c5c521a7ec68b6c6af0caf96a0f1c39ce58876c8"
   },
   "dependencies": {
     "@apollo/client": "^3.11.8",
-    "@dojoengine/core": "1.0.0-alpha.5",
-    "@dojoengine/create-burner": "1.0.0-alpha.5",
-    "@dojoengine/react": "1.0.0-alpha.5",
+    "@dojoengine/core": "1.0.0-alpha.14",
+    "@dojoengine/create-burner": "1.0.0-alpha.14",
+    "@dojoengine/react": "1.0.0-alpha.14",
     "@dojoengine/recs": "2.0.13",
-    "@dojoengine/state": "1.0.0-alpha.5",
-    "@dojoengine/torii-client": "1.0.0-alpha.5",
-    "@dojoengine/utils": "1.0.0-alpha.5",
+    "@dojoengine/state": "1.0.0-alpha.14",
+    "@dojoengine/torii-client": "1.0.0-alpha.14",
+    "@dojoengine/utils": "1.0.0-alpha.14",
     "@latticexyz/react": "^2.0.12",
     "@latticexyz/utils": "^2.0.12",
     "@starknet-react/chains": "^0.1.7",
@@ -57,4 +59,4 @@
     "typescript": "^5.5.4",
     "vite": "^4.3.9"
   }
-}
+}

client/scripts/gen.sh

@@ -0,0 +1 @@
+DOJO_MANIFEST_PATH=../onchain/scarb.toml sozo build --typescript --bindings-output=./src/dojo

client/scripts/gen_cc.sh

@@ -0,0 +1 @@
+npx @dojoengine/core ../onchain/manifests/dev/deployment/manifest.json ./_dojo http://localhost:5050 0x4e4a8cb96198772361acc30c71d81768bccc6c29501f211b0f0ca7045b194a4

client/src/App.tsx

@@ -52,7 +52,7 @@ const App = () => {
     setBoard(newBoard);
   };
 
-  const setGameData = useCallback((game: any) => {
+  const setGameData = useCallback((game: object) => {
     setGameState(game);
   }, []);
 

client/src/components/Control.tsx

@@ -66,6 +66,8 @@ const Control = ({
 }: {
   toggleActiveWindow: (window: string) => void;
 }) => {
+
+  /* eslint-disable @typescript-eslint/no-unused-vars */
   const [windows, setWindows] = useState(
     WINDOW_CONFIGS.map((config) => ({ ...config, show: false, zIndex: 0 }))
   );

client/src/components/ControlWindows/ControlWindowLayout.tsx

@@ -1,5 +1,4 @@
 import React from "react";
-import Draggable from "react-draggable";
 import { FiXSquare } from "react-icons/fi";
 import "../../styles/ControlWindowLayout.scss";