Skip to content

Commit

Permalink
Merge pull request #123 from dojoengine/fix-pr
Browse files Browse the repository at this point in the history
fix: config other cleanup
  • Loading branch information
ponderingdemocritus authored Feb 1, 2024
2 parents b84f12a + 62429f5 commit 1ec6166
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 156 deletions.
Binary file removed bun.lockb
Binary file not shown.
1 change: 0 additions & 1 deletion examples/react/react-phaser-example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
"@dojoengine/torii-client": "^0.5.0",
"@dojoengine/torii-wasm": "^0.5.0",
"@dojoengine/utils": "^0.5.0",
"@dojoengine/utils-wasm": "^0.3.3",
"@latticexyz/phaserx": "^2.0.0-next.14",
"@latticexyz/utils": "^2.0.0-next.14",
"@radix-ui/react-slot": "^1.0.2",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Tileset } from "../../assets/world";
import { PhaserLayer } from "../createPhaserLayer";
import { snoise } from "@dojoengine/utils-wasm";
import { snoise } from "@dojoengine/utils";
import { MAP_AMPLITUDE } from "../config/constants";

export function mapSystem(layer: PhaserLayer) {
Expand Down
30 changes: 4 additions & 26 deletions examples/react/react-threejs/dojoConfig.ts
Original file line number Diff line number Diff line change
@@ -1,28 +1,6 @@
import manifest from "../../dojo-starter/target/dev/manifest.json";
import { createDojoConfig } from "@dojoengine/core";

const {
VITE_PUBLIC_NODE_URL,
VITE_PUBLIC_TORII,
VITE_PUBLIC_MASTER_ADDRESS,
VITE_PUBLIC_MASTER_PRIVATE_KEY,
VITE_PUBLIC_ACCOUNT_CLASS_HASH,
} = import.meta.env;

export type Config = ReturnType<typeof dojoConfig>;

export function dojoConfig() {
return {
rpcUrl: VITE_PUBLIC_NODE_URL || "http://localhost:5050",
toriiUrl: VITE_PUBLIC_TORII || "http://localhost:8080",
masterAddress:
VITE_PUBLIC_MASTER_ADDRESS ||
"0x6162896d1d7ab204c7ccac6dd5f8e9e7c25ecd5ae4fcb4ad32e57786bb46e03",
masterPrivateKey:
VITE_PUBLIC_MASTER_PRIVATE_KEY ||
"0x1800000000300000180000000000030000000000003006001800006600",
accountClassHash:
VITE_PUBLIC_ACCOUNT_CLASS_HASH ||
"0x05400e90f7e0ae78bd02c77cd75527280470e2fe19c54970dd79dc37a9d3645c",
manifest,
};
}
export const dojoConfig = createDojoConfig({
manifest,
});
12 changes: 6 additions & 6 deletions examples/react/react-threejs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
"create-components": "npx @dojoengine/core ../contracts/target/dev/manifest.json src/dojo/generated/contractComponents.ts http://localhost:5050 0x28f5999ae62fec17c09c52a800e244961dba05251f5aaf923afabd9c9804d1a"
},
"dependencies": {
"@dojoengine/core": "^0.3.2",
"@dojoengine/create-burner": "^0.3.0",
"@dojoengine/react": "^0.3.0",
"@dojoengine/core": "^0.5.0",
"@dojoengine/create-burner": "^0.5.0",
"@dojoengine/react": "^0.5.0",
"@dojoengine/recs": "0.1.35",
"@dojoengine/state": "^0.3.0",
"@dojoengine/torii-client": "^0.3.0",
"@dojoengine/utils": "^0.3.0",
"@dojoengine/state": "^0.5.0",
"@dojoengine/torii-client": "^0.5.0",
"@dojoengine/utils": "^0.5.0",
"@fortawesome/fontawesome-svg-core": "^6.5.1",
"@fortawesome/free-brands-svg-icons": "^6.5.1",
"@fortawesome/free-regular-svg-icons": "^6.5.1",
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dojo.js",
"version": "0.5.0",
"version": "0.2.10",
"workspaces": [
"examples/react/*",
"packages/create-burner",
Expand Down Expand Up @@ -30,12 +30,12 @@
"build-torii-wasm": "bun run --cwd packages/torii-wasm build",
"build-react": "bun run --cwd packages/react build",
"build-state": "bun run --cwd packages/state build",
"build-utils-wasm": "bun run --cwd packages/utils-wasm build",
"build-phaser": "bun run --cwd examples/react/react-phaser-example build",
"build-react-app": "bun run --cwd examples/react/react-app build",
"build-threejs-app": "bun run --cwd examples/react/react-threejs 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 && bun run build-threejs-app",
"build": "bun run build-torii-wasm && bun run build-utils-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 .",
Expand Down
2 changes: 1 addition & 1 deletion packages/utils-wasm/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dojoengine/utils-wasm",
"version": "0.3.3",
"version": "0.5.0",
"description": "snoise wasm bindings for Dojo onchain game engine",
"author": "",
"license": "MIT",
Expand Down
133 changes: 16 additions & 117 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 1ec6166

Please sign in to comment.