diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 888f4540..192764f5 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -20,7 +20,7 @@ jobs: run: git submodule update --init --recursive - run: curl -L https://install.dojoengine.org | bash - - run: /home/runner/.config/.dojo/bin/dojoup -v v1.0.0-alpha.5 + - run: /home/runner/.config/.dojo/bin/dojoup -v v1.0.0-alpha.6 - run: | cd examples/dojo-starter /home/runner/.config/.dojo/bin/sozo build diff --git a/examples/dojo-starter b/examples/dojo-starter index beaf9a95..5f05a9de 160000 --- a/examples/dojo-starter +++ b/examples/dojo-starter @@ -1 +1 @@ -Subproject commit beaf9a95206dc9da3868c185cb3274a7df013547 +Subproject commit 5f05a9dee566ead8a541c2fc8ef99985eb608d15 diff --git a/examples/react/react-app/package.json b/examples/react/react-app/package.json index aa33b798..b272fbe7 100644 --- a/examples/react/react-app/package.json +++ b/examples/react/react-app/package.json @@ -17,7 +17,6 @@ "@dojoengine/recs": "2.0.13", "@dojoengine/state": "workspace:*", "@dojoengine/torii-client": "workspace:*", - "@dojoengine/torii-wasm": "workspace:*", "@dojoengine/utils": "workspace:*", "@latticexyz/react": "^2.0.12", "@latticexyz/utils": "^2.0.12", @@ -41,7 +40,7 @@ "eslint": "^8.38.0", "eslint-plugin-react-hooks": "^4.6.0", "eslint-plugin-react-refresh": "^0.3.4", - "typescript": "^5.0.3", + "typescript": "^5.5.4", "vite": "^4.3.9" } } diff --git a/examples/react/react-app/src/dojo/generated/setup.ts b/examples/react/react-app/src/dojo/generated/setup.ts index 08392903..dd51a3a4 100644 --- a/examples/react/react-app/src/dojo/generated/setup.ts +++ b/examples/react/react-app/src/dojo/generated/setup.ts @@ -1,4 +1,3 @@ -import { getSyncEntities } from "@dojoengine/state"; import { DojoConfig, DojoProvider } from "@dojoengine/core"; import * as torii from "@dojoengine/torii-client"; import { createClientComponents } from "../createClientComponents"; @@ -6,16 +5,13 @@ import { createSystemCalls } from "../createSystemCalls"; import { defineContractComponents } from "./contractComponents"; import { world } from "./world"; import { setupWorld } from "./generated"; -import { - Account, - ArraySignatureType, - WeierstrassSignatureType, -} from "starknet"; +import { Account, ArraySignatureType } from "starknet"; import { BurnerManager } from "@dojoengine/create-burner"; export type SetupResult = Awaited>; export async function setup({ ...config }: DojoConfig) { + console.log(torii.poseidonHash(["1"])); // torii client const toriiClient = await torii.createClient({ rpcUrl: config.rpcUrl, @@ -30,8 +26,6 @@ export async function setup({ ...config }: DojoConfig) { // create client components const clientComponents = createClientComponents({ contractComponents }); - // fetch all existing entities from torii - // create dojo provider const dojoProvider = new DojoProvider(config.manifest, config.rpcUrl); diff --git a/examples/react/react-pwa-app/package.json b/examples/react/react-pwa-app/package.json index 479ff0fa..9c9e49be 100644 --- a/examples/react/react-pwa-app/package.json +++ b/examples/react/react-pwa-app/package.json @@ -49,7 +49,7 @@ "eslint": "^8.38.0", "eslint-plugin-react-hooks": "^4.6.0", "eslint-plugin-react-refresh": "^0.3.4", - "typescript": "^5.0.3", + "typescript": "^5.5.4", "vite": "^4.3.9", "vite-plugin-pwa": "^0.19.0" } diff --git a/examples/react/react-threejs/package.json b/examples/react/react-threejs/package.json index 8c4cf746..3299078a 100644 --- a/examples/react/react-threejs/package.json +++ b/examples/react/react-threejs/package.json @@ -77,7 +77,7 @@ "eslint-plugin-react-refresh": "^0.3.4", "eslint-plugin-storybook": "^0.6.15", "storybook": "^7.6.10", - "typescript": "^5.0.3", + "typescript": "^5.5.4", "vite": "^4.3.9" } } diff --git a/packages/core/package.json b/packages/core/package.json index cb869a50..489d087a 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -24,7 +24,7 @@ "@types/elliptic": "^6.4.14", "@vitest/coverage-v8": "^1.3.0", "tsup": "^8.0.1", - "typescript": "^5.0.3", + "typescript": "^5.5.4", "vitest": "^1.1.0" }, "dependencies": { diff --git a/packages/create-burner/package.json b/packages/create-burner/package.json index edd92905..8186d64a 100644 --- a/packages/create-burner/package.json +++ b/packages/create-burner/package.json @@ -36,7 +36,7 @@ "@vitest/coverage-v8": "^1.3.0", "jsdom": "^24.0.0", "tsup": "^8.0.1", - "typescript": "^5.0.3", + "typescript": "^5.5.4", "vitest": "^1.2.2" }, "dependencies": { diff --git a/packages/create-dojo/package.json b/packages/create-dojo/package.json index cbbec5e5..beaa023d 100644 --- a/packages/create-dojo/package.json +++ b/packages/create-dojo/package.json @@ -22,6 +22,6 @@ "devDependencies": { "@types/cross-spawn": "^6.0.6", "tsup": "^8.0.1", - "typescript": "^5.0.3" + "typescript": "^5.5.4" } } diff --git a/packages/react/package.json b/packages/react/package.json index a2d6906b..96d81652 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -31,7 +31,7 @@ "@types/react-dom": "^18.0.11", "@types/web": "^0.0.114", "tsup": "^8.0.1", - "typescript": "^5.0.3" + "typescript": "^5.5.4" }, "dependencies": { "@dojoengine/recs": "2.0.13", diff --git a/packages/state/package.json b/packages/state/package.json index fa51099c..c8af43f8 100644 --- a/packages/state/package.json +++ b/packages/state/package.json @@ -18,7 +18,7 @@ }, "devDependencies": { "tsup": "^8.0.1", - "typescript": "^5.0.3" + "typescript": "^5.5.4" }, "peerDependencies": { "starknet": "6.11.0" diff --git a/packages/torii-client/package.json b/packages/torii-client/package.json index 8a4b9e6f..44216e6e 100644 --- a/packages/torii-client/package.json +++ b/packages/torii-client/package.json @@ -18,7 +18,7 @@ }, "dependencies": { "@dojoengine/torii-wasm": "workspace:*", - "typescript": "^5.0.3" + "typescript": "^5.5.4" }, "devDependencies": { "tsup": "^8.0.1" diff --git a/packages/torii-wasm/build.sh b/packages/torii-wasm/build.sh index 0621fd95..a3ead28d 100644 --- a/packages/torii-wasm/build.sh +++ b/packages/torii-wasm/build.sh @@ -8,14 +8,14 @@ git clone --depth 1 https://github.com/dojoengine/dojo.c dojo.c cd dojo.c # Build for web (browser) -npx wasm-pack build --out-dir ../dist/pkg/web --release --target web +npx wasm-pack build --out-dir ../pkg/web --release # Build for Node.js -npx wasm-pack build --out-dir ../dist/pkg/node --release --target nodejs +npx wasm-pack build --out-dir ../pkg/node --release --target nodejs # Find and delete .gitignore files in the specified directories -find ../dist/pkg/node -name ".gitignore" -type f -delete -find ../dist/pkg/web -name ".gitignore" -type f -delete +find ../pkg/node -name ".gitignore" -type f -delete +find ../pkg/web -name ".gitignore" -type f -delete # Go back to the parent directory and delete the repository diff --git a/packages/torii-wasm/package.json b/packages/torii-wasm/package.json index f45f661b..7db8c126 100644 --- a/packages/torii-wasm/package.json +++ b/packages/torii-wasm/package.json @@ -4,26 +4,31 @@ "description": "Torii wasm bindings for Dojo onchain game engine", "author": "", "license": "MIT", - "main": "dist/pkg/node/dojo_c.js", - "browser": "dist/pkg/web/dojo_c.js", + "main": "./pkg/node/dojo_c.js", + "browser": "./pkg/web/dojo_c.js", "type": "module", "scripts": { "build-wasm": "sh ./build.sh", "build": "npm run build-wasm && tsc" }, - "module": "dist/pkg/web/dojo_c.js", - "types": "dist/pkg/web/dojo_c.d.ts", + "module": "./pkg/web/dojo_c.js", + "types": "./pkg/web/dojo_c.d.ts", "files": [ - "dist/pkg/**/*" + "./pkg/web/dojo_c_bg.wasm", + "./pkg/web/dojo_c.js", + "./pkg/web/dojo_c_bg.js", + "./pkg/web/dojo_c.d.ts", + "./pkg/node/dojo_c_bg.wasm", + "./pkg/node/dojo_c.js", + "./pkg/node/dojo_c_bg.js", + "./pkg/node/dojo_c.d.ts" ], "sideEffects": [ - "dist/pkg/web/dojo_c.js", - "dist/pkg/node/dojo_c.js", - "dist/pkg/snippets/*" + "./pkg/web/dojo_c.js" ], "devDependencies": { "tsup": "^8.1.0", - "typescript": "^5.0.3", + "typescript": "^5.5.4", "wasm-pack": "^0.13.0" } } diff --git a/packages/utils-wasm/package.json b/packages/utils-wasm/package.json index ea76e1ae..290d96aa 100644 --- a/packages/utils-wasm/package.json +++ b/packages/utils-wasm/package.json @@ -24,7 +24,7 @@ ], "devDependencies": { "tsup": "^8.0.1", - "typescript": "^5.0.3", + "typescript": "^5.5.4", "wasm-pack": "^0.12.1" } } diff --git a/packages/utils/package.json b/packages/utils/package.json index 1b7a4da5..70132d36 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -21,7 +21,7 @@ "@types/elliptic": "^6.4.14", "@vitest/coverage-v8": "^1.3.0", "tsup": "^8.0.1", - "typescript": "^5.0.3", + "typescript": "^5.5.4", "vitest": "^1.1.0" }, "peerDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f81d922e..8c931b5e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -127,9 +127,6 @@ importers: '@dojoengine/torii-client': specifier: workspace:* version: link:../../../packages/torii-client - '@dojoengine/torii-wasm': - specifier: workspace:* - version: link:../../../packages/torii-wasm '@dojoengine/utils': specifier: workspace:* version: link:../../../packages/utils @@ -195,7 +192,7 @@ importers: specifier: ^0.3.4 version: 0.3.5(eslint@8.57.0) typescript: - specifier: ^5.0.3 + specifier: ^5.5.4 version: 5.5.4 vite: specifier: ^4.3.9 @@ -446,7 +443,7 @@ importers: specifier: ^0.3.4 version: 0.3.5(eslint@8.57.0) typescript: - specifier: ^5.0.3 + specifier: ^5.5.4 version: 5.5.4 vite: specifier: ^4.3.9 @@ -648,7 +645,7 @@ importers: specifier: ^7.6.10 version: 7.6.20(encoding@0.1.13) typescript: - specifier: ^5.0.3 + specifier: ^5.5.4 version: 5.5.4 vite: specifier: ^4.3.9 @@ -777,7 +774,7 @@ importers: specifier: ^8.0.1 version: 8.2.3(@swc/core@1.7.2)(jiti@1.21.6)(postcss@8.4.40)(typescript@5.5.4)(yaml@2.5.0) typescript: - specifier: ^5.0.3 + specifier: ^5.5.4 version: 5.5.4 vitest: specifier: ^1.1.0 @@ -850,7 +847,7 @@ importers: specifier: ^8.0.1 version: 8.2.3(@swc/core@1.7.2)(jiti@1.21.6)(postcss@8.4.40)(typescript@5.5.4)(yaml@2.5.0) typescript: - specifier: ^5.0.3 + specifier: ^5.5.4 version: 5.5.4 vitest: specifier: ^1.2.2 @@ -872,7 +869,7 @@ importers: specifier: ^8.0.1 version: 8.2.3(@swc/core@1.7.2)(jiti@1.21.6)(postcss@8.4.40)(typescript@5.5.4)(yaml@2.5.0) typescript: - specifier: ^5.0.3 + specifier: ^5.5.4 version: 5.5.4 packages/react: @@ -945,7 +942,7 @@ importers: specifier: ^8.0.1 version: 8.2.3(@swc/core@1.7.2)(jiti@1.21.6)(postcss@8.4.40)(typescript@5.5.4)(yaml@2.5.0) typescript: - specifier: ^5.0.3 + specifier: ^5.5.4 version: 5.5.4 packages/state: @@ -973,7 +970,7 @@ importers: specifier: ^8.0.1 version: 8.2.3(@swc/core@1.7.2)(jiti@1.21.6)(postcss@8.4.40)(typescript@5.5.4)(yaml@2.5.0) typescript: - specifier: ^5.0.3 + specifier: ^5.5.4 version: 5.5.4 packages/torii-client: @@ -982,7 +979,7 @@ importers: specifier: workspace:* version: link:../torii-wasm typescript: - specifier: ^5.0.3 + specifier: ^5.5.4 version: 5.5.4 devDependencies: tsup: @@ -995,7 +992,7 @@ importers: specifier: ^8.1.0 version: 8.2.3(@swc/core@1.7.2)(jiti@1.21.6)(postcss@8.4.40)(typescript@5.5.4)(yaml@2.5.0) typescript: - specifier: ^5.0.3 + specifier: ^5.5.4 version: 5.5.4 wasm-pack: specifier: ^0.13.0 @@ -1029,7 +1026,7 @@ importers: specifier: ^8.0.1 version: 8.2.3(@swc/core@1.7.2)(jiti@1.21.6)(postcss@8.4.40)(typescript@5.5.4)(yaml@2.5.0) typescript: - specifier: ^5.0.3 + specifier: ^5.5.4 version: 5.5.4 vitest: specifier: ^1.1.0 @@ -1041,7 +1038,7 @@ importers: specifier: ^8.0.1 version: 8.2.3(@swc/core@1.7.2)(jiti@1.21.6)(postcss@8.4.40)(typescript@5.5.4)(yaml@2.5.0) typescript: - specifier: ^5.0.3 + specifier: ^5.5.4 version: 5.5.4 wasm-pack: specifier: ^0.12.1