Merge pull request #107 from dojoengine/update-example

Update example

.github/workflows/ci.yaml

@@ -13,6 +13,16 @@ jobs:
             - uses: actions/checkout@v2
             - uses: oven-sh/setup-bun@v1
 
+            - name: Update Submodules
+              run: git submodule update --init --recursive
+
+            - run: curl -L https://install.dojoengine.org | bash
+            - run: /home/runner/.config/.dojo/bin/dojoup -v v0.4.4
+            - run: |
+                  cd examples/dojo-starter
+                  /home/runner/.config/.dojo/bin/sozo build
+                  /home/runner/.config/.dojo/bin/sozo test
+
             - name: Install Protobuf Compiler
               run: sudo apt-get install -y protobuf-compiler
 
@@ -26,9 +36,9 @@ jobs:
               run: bun x prettier --check .
 
             - name: Build dependencies
-              run: bun run build
+              run: bun run build && bun run build-examples
 
-            - name: Upload coverage reports to Codecov
-              uses: codecov/codecov-action@v3
-              env:
-                  CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+            # - name: Upload coverage reports to Codecov
+            #   uses: codecov/codecov-action@v3
+            #   env:
+            #       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+bun run prettier

examples/react/react-app/package.json

@@ -9,7 +9,7 @@
         "lint": "eslint src --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
         "preview": "vite preview",
         "codegen": "graphql-codegen",
-        "create-components": "npx @dojoengine/core ../../dojo-starter/target/dev/manifest.json src/dojo/contractComponents.ts http://localhost:5050 0x33ac2f528bb97cc7b79148fd1756dc368be0e95d391d8c6d6473ecb60b4560e"
+        "create-components": "npx @dojoengine/core ../../dojo-starter/target/dev/manifest.json src/dojo/generated/contractComponents.ts http://localhost:5050 0x33ac2f528bb97cc7b79148fd1756dc368be0e95d391d8c6d6473ecb60b4560e"
     },
     "dependencies": {
         "@dojoengine/core": "^0.3.0",

examples/react/react-app/src/dojo/generated/setup.ts

@@ -1,13 +1,12 @@
 import { getSyncEntities } from "@dojoengine/state";
+import { DojoProvider } from "@dojoengine/core";
 import * as torii from "@dojoengine/torii-client";
 import { createClientComponents } from "../createClientComponents";
 import { createSystemCalls } from "../createSystemCalls";
-
 import { defineContractComponents } from "./contractComponents";
 import { world } from "./world";
 import { Config } from "../../../dojoConfig";
 import { setupWorld } from "./generated";
-import { DojoProvider } from "@dojoengine/core";
 
 export type SetupResult = Awaited<ReturnType<typeof setup>>;
 
@@ -16,7 +15,7 @@ export async function setup({ ...config }: Config) {
     const toriiClient = await torii.createClient([], {
         rpcUrl: config.rpcUrl,
         toriiUrl: config.toriiUrl,
-        worldAddress: config.manifest.world.address,
+        worldAddress: config.manifest.world.address || "",
     });
 
     // create contract components

examples/react/react-phaser-example/package.json

@@ -9,7 +9,7 @@
         "lint": "eslint src --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
         "preview": "vite preview",
         "codegen": "graphql-codegen",
-        "components": "npx @dojoengine/core ../../dojo-starter/target/dev/manifest.json src/dojo/contractComponents.ts http://localhost:5050 0x33ac2f528bb97cc7b79148fd1756dc368be0e95d391d8c6d6473ecb60b4560e"
+        "components": "npx @dojoengine/core ../../dojo-starter/target/dev/manifest.json src/dojo/generated/contractComponents.ts http://localhost:5050 0x33ac2f528bb97cc7b79148fd1756dc368be0e95d391d8c6d6473ecb60b4560e"
     },
     "dependencies": {
         "@dojoengine/core": "^0.3.0",
@@ -28,8 +28,6 @@
         "clsx": "^2.0.0",
         "ethers": "^5.7.2",
         "events": "^3.3.0",
-        "graphql": "^16.7.1",
-        "graphql-request": "^6.1.0",
         "lucide-react": "^0.292.0",
         "mobx": "^6.9.0",
         "phaser": "3.60.0-beta.14",
@@ -47,10 +45,6 @@
         "zustand": "^4.4.1"
     },
     "devDependencies": {
-        "@graphql-codegen/cli": "^5.0.0",
-        "@graphql-codegen/typescript": "^4.0.1",
-        "@graphql-codegen/typescript-graphql-request": "^5.0.0",
-        "@graphql-codegen/typescript-operations": "^4.0.1",
         "@types/node": "^20.9.0",
         "@types/react": "^18.0.37",
         "@types/react-dom": "^18.0.11",

examples/react/react-phaser-example/src/dojo/generated/setup.ts

@@ -15,7 +15,7 @@ export async function setup({ ...config }: Config) {
     const toriiClient = await torii.createClient([], {
         rpcUrl: config.rpcUrl,
         toriiUrl: config.toriiUrl,
-        worldAddress: config.manifest.world.address,
+        worldAddress: config.manifest.world.address || "",
     });
 
     // create contract components

examples/react/react-phaser-example/src/ui/hooks/useNetworkLayer.tsx

@@ -10,7 +10,7 @@ export const useNetworkLayer = () => {
     useEffect(() => {
         return () => {
             networkLayerPromise.then((networkLayer) =>
-                networkLayer.world.dispose()
+                networkLayer.recsWorld.dispose()
             );
         };
     }, [networkLayerPromise]);

package.json

@@ -18,7 +18,8 @@
         "tsup": "^8.0.1",
         "typedoc": "^0.25.4",
         "typedoc-material-theme": "^1.0.1",
-        "typedoc-plugin-coverage": "^2.2.0"
+        "typedoc-plugin-coverage": "^2.2.0",
+        "husky": "^8.0.0"
     },
     "scripts": {
         "build-core": "bun run --cwd packages/core build",
@@ -30,12 +31,15 @@
         "build-react": "bun run --cwd packages/react build",
         "build-state": "bun run --cwd packages/state build",
         "build-phaser": "bun run --cwd examples/react/react-phaser-example build",
+        "build-react-app": "bun run --cwd examples/react/react-app build",
         "build-watch": "bun run build-core --watch & bun run build-create-burner --watch & bun run build-create-dojo --watch & bun run build-utils --watch & bun run build-react --watch & bun run build-torii-wasm --watch & bun run build-torii-client --watch & bun run build-state --watch",
         "build": "bun run build-torii-wasm && bun run build-torii-client && bun run build-state && bun run build-core && bun run build-create-burner && bun run build-create-dojo && bun run build-utils &&  bun run build-react",
+        "build-examples": "bun run build-phaser && bun run build-react-app",
         "clean": "rm -rf node_modules packages/create-burner/node_modules node_modules packages/create-dojo/node_modules packages/core/node_modules packages/utils/node_modules packages/torii-client/node_modules packages/torii-wasm/node_modules packages/react/node_modules bun.lockb packages/create-burner/bun.lockb packages/core/bun.lockb packages/utils/bun.lockb packages/torii-client/bun.lockb packages/torii-wasm/bun.lockb packages/react/bun.lockb && rm -rf examples/react/react-app/node_modules examples/react/react-app/bun.lockb examples/react/react-phaser-example/node_modules examples/react/react-phaser-example/bun.lockb",
         "prettier-check": "bun x prettier --check .",
         "prettier": "bun x prettier --write .",
         "release": "bun run build && bun run prettier && npx lerna publish --no-private --force-publish",
-        "docs": "npx typedoc --out docs"
+        "docs": "npx typedoc --out docs",
+        "prepare": "husky install"
     }
 }