Skip to content

fix: wasm build issues #256

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

Merged
merged 2 commits into from
Aug 17, 2024
Merged

fix: wasm build issues #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fae3cac
fix: wasm build issues
ponderingdemocritus Aug 17, 2024
ec4b6fe
fix: yaml
ponderingdemocritus Aug 17, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/dojo-starter
Open in desktop
Submodule dojo-starter updated 14 files
+1 −1 .github/workflows/test.yaml
+1 −1 README.md
+1 −1 Scarb.lock
+1 −1 Scarb.toml
+1 −1 dojo_dev.toml
+23 −0 dojo_release.toml
+6 −2 manifests/dev/base/contracts/dojo_starter-actions-7a1c7102.toml
+2 −2 manifests/dev/base/dojo-world.toml
+2 −2 manifests/dev/base/models/dojo_starter-DirectionsAvailable-77844f1f.toml
+2 −2 manifests/dev/base/models/dojo_starter-Moves-2a29373f.toml
+2 −2 manifests/dev/base/models/dojo_starter-Position-2ac8b4c1.toml
+17 −13 manifests/dev/deployment/manifest.json
+17 −13 manifests/dev/deployment/manifest.toml
+1 −1 src/tests/test_world.cairo
3 changes: 1 addition & 2 deletions examples/react/react-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
}
10 changes: 2 additions & 8 deletions examples/react/react-app/src/dojo/generated/setup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,17 @@
import { getSyncEntities } from "@dojoengine/state";
import { DojoConfig, 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 { setupWorld } from "./generated";
import {
Account,
ArraySignatureType,
WeierstrassSignatureType,
} from "starknet";
import { Account, ArraySignatureType } from "starknet";
import { BurnerManager } from "@dojoengine/create-burner";

export type SetupResult = Awaited<ReturnType<typeof setup>>;

export async function setup({ ...config }: DojoConfig) {
console.log(torii.poseidonHash(["1"]));
// torii client
const toriiClient = await torii.createClient({
rpcUrl: config.rpcUrl,
Expand All @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion examples/react/react-pwa-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/react/react-threejs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion packages/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/create-burner/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/create-dojo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@
"devDependencies": {
"@types/cross-spawn": "^6.0.6",
"tsup": "^8.0.1",
"typescript": "^5.0.3"
"typescript": "^5.5.4"
}
}
2 changes: 1 addition & 1 deletion packages/react/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/state/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
},
"devDependencies": {
"tsup": "^8.0.1",
"typescript": "^5.0.3"
"typescript": "^5.5.4"
},
"peerDependencies": {
"starknet": "6.11.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/torii-client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
},
"dependencies": {
"@dojoengine/torii-wasm": "workspace:*",
"typescript": "^5.0.3"
"typescript": "^5.5.4"
},
"devDependencies": {
"tsup": "^8.0.1"
Expand Down
8 changes: 4 additions & 4 deletions packages/torii-wasm/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
23 changes: 14 additions & 9 deletions packages/torii-wasm/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion packages/utils-wasm/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
],
"devDependencies": {
"tsup": "^8.0.1",
"typescript": "^5.0.3",
"typescript": "^5.5.4",
"wasm-pack": "^0.12.1"
}
}
2 changes: 1 addition & 1 deletion packages/utils/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
27 changes: 12 additions & 15 deletions pnpm-lock.yaml
View file
Open in desktop

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

Loading