diff --git a/packages/common/vite.config.ts b/packages/common/vite.config.ts
index b680472dcb..697bafbf22 100644
--- a/packages/common/vite.config.ts
+++ b/packages/common/vite.config.ts
@@ -21,7 +21,7 @@ export default defineConfig({
     target: "esnext",
   },
   ssr: {
-    noExternal: ["execa", "is-stream", "npm-run-path"],
+    noExternal: ["execa", "is-stream", "npm-run-path", "@latticexyz/solidity-parser"],
   },
   /**
    * @see https://vitest.dev/config/
diff --git a/packages/store/package.json b/packages/store/package.json
index 7710598dfa..87b695843f 100644
--- a/packages/store/package.json
+++ b/packages/store/package.json
@@ -16,9 +16,9 @@
   },
   "types": "ts/index.ts",
   "scripts": {
-    "build": "pnpm run build:js && pnpm run build:tightcoder && pnpm run build:codegen && pnpm run build:abi && pnpm run build:typechain",
+    "build": "pnpm run build:tightcoder && pnpm run build:codegen && pnpm run build:abi && pnpm run build:typechain && pnpm run build:js",
     "build:abi": "forge build --out abi --skip test script",
-    "build:codegen": "node ./dist/tablegen.js",
+    "build:codegen": "tsx ./ts/scripts/tablegen.ts",
     "build:js": "vite build",
     "build:tightcoder": "tsx ./ts/scripts/codegenTightcoder.ts && prettier --write '**/*.sol'",
     "build:typechain": "typechain --target ethers-v5 'abi/**/*.sol/!(*.abi).json'",
diff --git a/packages/store/vite.config.ts b/packages/store/vite.config.ts
index 41b6c6d9ca..8786fef2f1 100644
--- a/packages/store/vite.config.ts
+++ b/packages/store/vite.config.ts
@@ -9,7 +9,7 @@ export default defineConfig({
   build: {
     ssr: true,
     lib: {
-      entry: ["mud.config.ts", "ts/scripts/tablegen.ts", "ts/index.ts"],
+      entry: ["mud.config.ts", "ts/index.ts"],
       formats: ["es"],
     },
     outDir: "dist",
diff --git a/packages/world/package.json b/packages/world/package.json
index 5fa74c83ba..e30b7d11fd 100644
--- a/packages/world/package.json
+++ b/packages/world/package.json
@@ -16,9 +16,9 @@
   },
   "types": "ts/index.ts",
   "scripts": {
-    "build": "pnpm run build:js && pnpm run build:codegen && pnpm run build:abi && pnpm run build:typechain",
+    "build": "pnpm run build:codegen && pnpm run build:abi && pnpm run build:typechain && pnpm run build:js",
     "build:abi": "forge build --out abi --skip test script",
-    "build:codegen": "node ./dist/tablegen.js && node ./dist/worldgen.js",
+    "build:codegen": "tsx ./ts/scripts/tablegen.ts && tsx ./ts/scripts/worldgen.ts",
     "build:js": "vite build",
     "build:typechain": "typechain --target ethers-v5 'abi/**/*.sol/!(*.abi).json'",
     "clean": "pnpm run clean:abi && pnpm run clean:typechain && pnpm run clean:js",
diff --git a/packages/world/vite.config.ts b/packages/world/vite.config.ts
index c9096518b8..33b2e7328c 100644
--- a/packages/world/vite.config.ts
+++ b/packages/world/vite.config.ts
@@ -9,7 +9,7 @@ export default defineConfig({
   build: {
     ssr: true,
     lib: {
-      entry: ["ts/scripts/worldgen.ts", "ts/scripts/tablegen.ts", "ts/index.ts", "mud.config.ts"],
+      entry: ["ts/index.ts", "mud.config.ts"],
       formats: ["es"],
     },
     outDir: "dist",