fix: wasm build issues

ponderingdemocritus · ponderingdemocritus · commit fae3cacee11f · 2024-08-17T09:40:58.000-04:00
diff --git 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
@@ -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
@@ -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,
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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",
-        "wasm-pack": "^0.13.0"
+        "typescript": "^5.5.4",
+        "wasm-pack": "^0.12.4"
     }
 }
diff --git 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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@`
`49`	`49`	`"eslint": "^8.38.0",`
`50`	`50`	`"eslint-plugin-react-hooks": "^4.6.0",`
`51`	`51`	`"eslint-plugin-react-refresh": "^0.3.4",`
`52`		`- "typescript": "^5.0.3",`
	`52`	`+ "typescript": "^5.5.4",`
`53`	`53`	`"vite": "^4.3.9",`
`54`	`54`	`"vite-plugin-pwa": "^0.19.0"`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@`
`77`	`77`	`"eslint-plugin-react-refresh": "^0.3.4",`
`78`	`78`	`"eslint-plugin-storybook": "^0.6.15",`
`79`	`79`	`"storybook": "^7.6.10",`
`80`		`- "typescript": "^5.0.3",`
	`80`	`+ "typescript": "^5.5.4",`
`81`	`81`	`"vite": "^4.3.9"`
`82`	`82`	`}`
`83`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,6 @@`
`22`	`22`	`"devDependencies": {`
`23`	`23`	`"@types/cross-spawn": "^6.0.6",`
`24`	`24`	`"tsup": "^8.0.1",`
`25`		`- "typescript": "^5.0.3"`
	`25`	`+ "typescript": "^5.5.4"`
`26`	`26`	`}`
`27`	`27`	`}`