diff --git a/examples/hackathon-submissions/package-lock.json b/examples/hackathon-submissions/package-lock.json
index 5f44e3422f..d9cd1d1a24 100644
--- a/examples/hackathon-submissions/package-lock.json
+++ b/examples/hackathon-submissions/package-lock.json
@@ -32,7 +32,6 @@
         "axios": "^1.4.0",
         "express": "~4.21.0",
         "jsdom": "^21.1.1",
-        "lodash.merge": "^4.6.2",
         "mitt": "3.0.0",
         "msw": "^1.1.0",
         "postcss": "^8.4.21",
@@ -42,7 +41,8 @@
         "react-router-dom": "^6.26.2",
         "superjson": "^2.2.1",
         "tailwindcss": "^3.2.7",
-        "vitest": "^1.2.1"
+        "vitest": "^1.2.1",
+        "zod": "^3.23.8"
       },
       "devDependencies": {
         "@tsconfig/node18": "latest",
@@ -4011,12 +4011,6 @@
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
       "license": "MIT"
     },
-    "node_modules/lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "license": "MIT"
-    },
     "node_modules/log-symbols": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
@@ -7619,6 +7613,15 @@
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
+    },
+    "node_modules/zod": {
+      "version": "3.24.1",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.1.tgz",
+      "integrity": "sha512-muH7gBL9sI1nciMZV67X5fTKKBLtwpZ5VBp1vsOQzj1MhrBZ4wlVCm3gedKZWLp0Oyel8sIGfeiz54Su+OVT+A==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/colinhacks"
+      }
     }
   }
 }
diff --git a/examples/streaming/package-lock.json b/examples/streaming/package-lock.json
index bdd6d6c0d6..3b0cdd3171 100644
--- a/examples/streaming/package-lock.json
+++ b/examples/streaming/package-lock.json
@@ -30,7 +30,6 @@
         "axios": "^1.4.0",
         "express": "~4.21.0",
         "jsdom": "^21.1.1",
-        "lodash.merge": "^4.6.2",
         "mitt": "3.0.0",
         "msw": "^1.1.0",
         "prisma": "5.19.1",
@@ -38,7 +37,8 @@
         "react-hook-form": "^7.45.4",
         "react-router-dom": "^6.26.2",
         "superjson": "^2.2.1",
-        "vitest": "^1.2.1"
+        "vitest": "^1.2.1",
+        "zod": "^3.23.8"
       },
       "devDependencies": {
         "@tsconfig/node18": "latest",
@@ -2490,10 +2490,6 @@
       "version": "4.17.21",
       "license": "MIT"
     },
-    "node_modules/lodash.merge": {
-      "version": "4.6.2",
-      "license": "MIT"
-    },
     "node_modules/log-symbols": {
       "version": "4.1.0",
       "license": "MIT",
@@ -4556,6 +4552,15 @@
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
+    },
+    "node_modules/zod": {
+      "version": "3.24.1",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.1.tgz",
+      "integrity": "sha512-muH7gBL9sI1nciMZV67X5fTKKBLtwpZ5VBp1vsOQzj1MhrBZ4wlVCm3gedKZWLp0Oyel8sIGfeiz54Su+OVT+A==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/colinhacks"
+      }
     }
   }
 }
diff --git a/examples/thoughts/package-lock.json b/examples/thoughts/package-lock.json
index b454f5042f..0437149bd0 100644
--- a/examples/thoughts/package-lock.json
+++ b/examples/thoughts/package-lock.json
@@ -18,7 +18,7 @@
         "prisma": "5.19.1",
         "typescript": "^5.1.0",
         "vite": "^4.3.9",
-        "wasp-config": "file:../../../../../.local/share/wasp-lang/0.15.0/data/packages/wasp-config"
+        "wasp-config": "file:../../../../../.local/share/wasp-lang/0.16.0-rc2/data/packages/wasp-config"
       }
     },
     "../../../../../.local/share/wasp-lang/0.15.0-rc2/data/packages/wasp-config": {
@@ -40,6 +40,24 @@
       }
     },
     "../../../../../.local/share/wasp-lang/0.15.0/data/packages/wasp-config": {
+      "version": "1.0.0",
+      "extraneous": true,
+      "license": "MIT",
+      "bin": {
+        "wasp-config": "dist/run.js"
+      },
+      "devDependencies": {
+        "@eslint/js": "^9.9.0",
+        "@types/node": "^22.4.1",
+        "eslint": "^9.9.0",
+        "globals": "^15.9.0",
+        "nodemon": "^3.1.4",
+        "prettier": "3.3.3",
+        "typescript": "^5.5.4",
+        "typescript-eslint": "^8.1.0"
+      }
+    },
+    "../../../../../.local/share/wasp-lang/0.16.0-rc2/data/packages/wasp-config": {
       "version": "1.0.0",
       "dev": true,
       "license": "MIT",
@@ -7862,7 +7880,7 @@
       "link": true
     },
     "node_modules/wasp-config": {
-      "resolved": "../../../../../.local/share/wasp-lang/0.15.0/data/packages/wasp-config",
+      "resolved": "../../../../../.local/share/wasp-lang/0.16.0-rc2/data/packages/wasp-config",
       "link": true
     },
     "node_modules/wcwidth": {
diff --git a/examples/thoughts/package.json b/examples/thoughts/package.json
index 8afdada06d..ab6ab1001f 100644
--- a/examples/thoughts/package.json
+++ b/examples/thoughts/package.json
@@ -14,6 +14,6 @@
     "prisma": "5.19.1",
     "typescript": "^5.1.0",
     "vite": "^4.3.9",
-    "wasp-config": "file:../../../../../.local/share/wasp-lang/0.15.0/data/packages/wasp-config"
+    "wasp-config": "file:../../../../../.local/share/wasp-lang/0.16.0-rc2/data/packages/wasp-config"
   }
 }
diff --git a/examples/thoughts/tsconfig.json b/examples/thoughts/tsconfig.json
index 506b0e2fc1..a8bd021015 100644
--- a/examples/thoughts/tsconfig.json
+++ b/examples/thoughts/tsconfig.json
@@ -1,48 +1,7 @@
-// =============================== IMPORTANT =================================
-// This file is mainly used for Wasp IDE support.
-//
-// Wasp will compile your code with slightly different (less strict) compilerOptions.
-// You can increase the configuration's strictness (e.g., by adding
-// "noUncheckedIndexedAccess": true), but you shouldn't reduce it (e.g., by
-// adding "strict": false). Just keep in mind that this will only affect your
-// IDE support, not the actual compilation.
-//
-// Full TypeScript configurability is coming very soon :)
 {
-  "compilerOptions": {
-    "module": "esnext",
-    // Needed because this is used as a project reference.
-    "composite": true,
-    "target": "esnext",
-    // We're bundling all code in the end so this is the most appropriate option,
-    // it's also important for autocomplete to work properly.
-    "moduleResolution": "bundler",
-    // JSX support
-    "jsx": "preserve",
-    "strict": true,
-    // Allow default imports.
-    "esModuleInterop": true,
-    "lib": [
-      "dom",
-      "dom.iterable",
-      "esnext"
-    ],
-    "skipLibCheck": true,
-    "allowJs": true,
-    "typeRoots": [
-      // This is needed to properly support Vitest testing with jest-dom matchers.
-      // Types for jest-dom are not recognized automatically and Typescript complains
-      // about missing types e.g. when using `toBeInTheDocument` and other matchers.
-      "node_modules/@testing-library",
-      // Specifying type roots overrides the default behavior of looking at the
-      // node_modules/@types folder so we had to list it explicitly.
-      // Source 1: https://www.typescriptlang.org/tsconfig#typeRoots 
-      // Source 2: https://github.com/testing-library/jest-dom/issues/546#issuecomment-1889884843
-      "node_modules/@types"
-    ],
-    "outDir": ".wasp/out/user"
-  },
-  "include": [
-    "src"
+  "files": [],
+  "references": [
+    { "path": "./tsconfig.src.json" },
+    { "path": "./tsconfig.wasp.json" }
   ]
 }
diff --git a/examples/thoughts/tsconfig.src.json b/examples/thoughts/tsconfig.src.json
index acf83eff0e..506b0e2fc1 100644
--- a/examples/thoughts/tsconfig.src.json
+++ b/examples/thoughts/tsconfig.src.json
@@ -1,11 +1,18 @@
 // =============================== IMPORTANT =================================
+// This file is mainly used for Wasp IDE support.
 //
-// This file is only used for Wasp IDE support. You can change it to configure
-// your IDE checks, but none of these options will affect the TypeScript
-// compiler. Proper TS compiler configuration in Wasp is coming soon :)
+// Wasp will compile your code with slightly different (less strict) compilerOptions.
+// You can increase the configuration's strictness (e.g., by adding
+// "noUncheckedIndexedAccess": true), but you shouldn't reduce it (e.g., by
+// adding "strict": false). Just keep in mind that this will only affect your
+// IDE support, not the actual compilation.
+//
+// Full TypeScript configurability is coming very soon :)
 {
   "compilerOptions": {
     "module": "esnext",
+    // Needed because this is used as a project reference.
+    "composite": true,
     "target": "esnext",
     // We're bundling all code in the end so this is the most appropriate option,
     // it's also important for autocomplete to work properly.
@@ -20,6 +27,7 @@
       "dom.iterable",
       "esnext"
     ],
+    "skipLibCheck": true,
     "allowJs": true,
     "typeRoots": [
       // This is needed to properly support Vitest testing with jest-dom matchers.
@@ -32,11 +40,9 @@
       // Source 2: https://github.com/testing-library/jest-dom/issues/546#issuecomment-1889884843
       "node_modules/@types"
     ],
-    // Since this TS config is used only for IDE support and not for
-    // compilation, the following directory doesn't exist. We need to specify
-    // it to prevent this error:
-    // https://stackoverflow.com/questions/42609768/typescript-error-cannot-write-file-because-it-would-overwrite-input-file
-    "outDir": ".wasp/phantom"
+    "outDir": ".wasp/out/user"
   },
-  "include": ["src"]
+  "include": [
+    "src"
+  ]
 }
diff --git a/examples/todo-typescript/package-lock.json b/examples/todo-typescript/package-lock.json
index 8837738de7..b10d36504b 100644
--- a/examples/todo-typescript/package-lock.json
+++ b/examples/todo-typescript/package-lock.json
@@ -33,7 +33,6 @@
         "axios": "^1.4.0",
         "express": "~4.21.0",
         "jsdom": "^21.1.1",
-        "lodash.merge": "^4.6.2",
         "lucia": "^3.0.1",
         "mitt": "3.0.0",
         "msw": "^1.1.0",
@@ -43,7 +42,8 @@
         "react-hook-form": "^7.45.4",
         "react-router-dom": "^6.26.2",
         "superjson": "^2.2.1",
-        "vitest": "^1.2.1"
+        "vitest": "^1.2.1",
+        "zod": "^3.23.8"
       },
       "devDependencies": {
         "@tsconfig/node18": "latest",
@@ -4212,12 +4212,6 @@
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
       "license": "MIT"
     },
-    "node_modules/lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "license": "MIT"
-    },
     "node_modules/log-symbols": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
@@ -7645,6 +7639,15 @@
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
+    },
+    "node_modules/zod": {
+      "version": "3.24.1",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.1.tgz",
+      "integrity": "sha512-muH7gBL9sI1nciMZV67X5fTKKBLtwpZ5VBp1vsOQzj1MhrBZ4wlVCm3gedKZWLp0Oyel8sIGfeiz54Su+OVT+A==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/colinhacks"
+      }
     }
   }
 }
diff --git a/examples/tutorials/TodoApp/package-lock.json b/examples/tutorials/TodoApp/package-lock.json
index e189aa4a20..f0b90bad8f 100644
--- a/examples/tutorials/TodoApp/package-lock.json
+++ b/examples/tutorials/TodoApp/package-lock.json
@@ -33,7 +33,6 @@
         "axios": "^1.4.0",
         "express": "~4.21.0",
         "jsdom": "^21.1.1",
-        "lodash.merge": "^4.6.2",
         "lucia": "^3.0.1",
         "mitt": "3.0.0",
         "msw": "^1.1.0",
@@ -43,7 +42,8 @@
         "react-hook-form": "^7.45.4",
         "react-router-dom": "^6.26.2",
         "superjson": "^2.2.1",
-        "vitest": "^1.2.1"
+        "vitest": "^1.2.1",
+        "zod": "^3.23.8"
       },
       "devDependencies": {
         "@tsconfig/node18": "latest",
@@ -4212,12 +4212,6 @@
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
       "license": "MIT"
     },
-    "node_modules/lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "license": "MIT"
-    },
     "node_modules/log-symbols": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
@@ -7645,6 +7639,15 @@
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
+    },
+    "node_modules/zod": {
+      "version": "3.24.1",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.1.tgz",
+      "integrity": "sha512-muH7gBL9sI1nciMZV67X5fTKKBLtwpZ5VBp1vsOQzj1MhrBZ4wlVCm3gedKZWLp0Oyel8sIGfeiz54Su+OVT+A==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/colinhacks"
+      }
     }
   }
 }
diff --git a/examples/tutorials/TodoAppTs/package-lock.json b/examples/tutorials/TodoAppTs/package-lock.json
index dda6060032..369536a0c2 100644
--- a/examples/tutorials/TodoAppTs/package-lock.json
+++ b/examples/tutorials/TodoAppTs/package-lock.json
@@ -33,7 +33,6 @@
         "axios": "^1.4.0",
         "express": "~4.21.0",
         "jsdom": "^21.1.1",
-        "lodash.merge": "^4.6.2",
         "lucia": "^3.0.1",
         "mitt": "3.0.0",
         "msw": "^1.1.0",
@@ -43,7 +42,8 @@
         "react-hook-form": "^7.45.4",
         "react-router-dom": "^6.26.2",
         "superjson": "^2.2.1",
-        "vitest": "^1.2.1"
+        "vitest": "^1.2.1",
+        "zod": "^3.23.8"
       },
       "devDependencies": {
         "@tsconfig/node18": "latest",
@@ -4212,12 +4212,6 @@
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
       "license": "MIT"
     },
-    "node_modules/lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "license": "MIT"
-    },
     "node_modules/log-symbols": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
@@ -7645,6 +7639,15 @@
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
+    },
+    "node_modules/zod": {
+      "version": "3.24.1",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.1.tgz",
+      "integrity": "sha512-muH7gBL9sI1nciMZV67X5fTKKBLtwpZ5VBp1vsOQzj1MhrBZ4wlVCm3gedKZWLp0Oyel8sIGfeiz54Su+OVT+A==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/colinhacks"
+      }
     }
   }
 }
diff --git a/examples/waspello/package-lock.json b/examples/waspello/package-lock.json
index 66fbc2444f..18ee54573c 100644
--- a/examples/waspello/package-lock.json
+++ b/examples/waspello/package-lock.json
@@ -39,7 +39,6 @@
         "axios": "^1.4.0",
         "express": "~4.21.0",
         "jsdom": "^21.1.1",
-        "lodash.merge": "^4.6.2",
         "lucia": "^3.0.1",
         "mitt": "3.0.0",
         "msw": "^1.1.0",
@@ -51,7 +50,8 @@
         "react-router-dom": "^6.26.2",
         "superjson": "^2.2.1",
         "tailwindcss": "^3.2.7",
-        "vitest": "^1.2.1"
+        "vitest": "^1.2.1",
+        "zod": "^3.23.8"
       },
       "devDependencies": {
         "@tsconfig/node18": "latest",
@@ -5060,12 +5060,6 @@
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
       "license": "MIT"
     },
-    "node_modules/lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "license": "MIT"
-    },
     "node_modules/log-symbols": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
@@ -9107,6 +9101,15 @@
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
+    },
+    "node_modules/zod": {
+      "version": "3.24.1",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.1.tgz",
+      "integrity": "sha512-muH7gBL9sI1nciMZV67X5fTKKBLtwpZ5VBp1vsOQzj1MhrBZ4wlVCm3gedKZWLp0Oyel8sIGfeiz54Su+OVT+A==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/colinhacks"
+      }
     }
   }
 }
diff --git a/examples/waspleau/package-lock.json b/examples/waspleau/package-lock.json
index 700fc3cef5..45fc09102f 100644
--- a/examples/waspleau/package-lock.json
+++ b/examples/waspleau/package-lock.json
@@ -31,7 +31,6 @@
         "axios": "^1.4.0",
         "express": "~4.21.0",
         "jsdom": "^21.1.1",
-        "lodash.merge": "^4.6.2",
         "mitt": "3.0.0",
         "msw": "^1.1.0",
         "pg-boss": "^8.4.2",
@@ -40,7 +39,8 @@
         "react-hook-form": "^7.45.4",
         "react-router-dom": "^6.26.2",
         "superjson": "^2.2.1",
-        "vitest": "^1.2.1"
+        "vitest": "^1.2.1",
+        "zod": "^3.23.8"
       },
       "devDependencies": {
         "@tsconfig/node18": "latest",
@@ -3616,12 +3616,6 @@
       "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
       "license": "MIT"
     },
-    "node_modules/lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "license": "MIT"
-    },
     "node_modules/log-symbols": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
@@ -6952,6 +6946,15 @@
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
+    },
+    "node_modules/zod": {
+      "version": "3.24.1",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.1.tgz",
+      "integrity": "sha512-muH7gBL9sI1nciMZV67X5fTKKBLtwpZ5VBp1vsOQzj1MhrBZ4wlVCm3gedKZWLp0Oyel8sIGfeiz54Su+OVT+A==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/colinhacks"
+      }
     }
   }
 }
diff --git a/examples/websockets-realtime-voting/package-lock.json b/examples/websockets-realtime-voting/package-lock.json
index 0153fa0dd6..52338e984f 100644
--- a/examples/websockets-realtime-voting/package-lock.json
+++ b/examples/websockets-realtime-voting/package-lock.json
@@ -37,7 +37,6 @@
         "axios": "^1.4.0",
         "express": "~4.21.0",
         "jsdom": "^21.1.1",
-        "lodash.merge": "^4.6.2",
         "lucia": "^3.0.1",
         "mitt": "3.0.0",
         "msw": "^1.1.0",
@@ -51,7 +50,8 @@
         "socket.io-client": "^4.6.1",
         "superjson": "^2.2.1",
         "tailwindcss": "^3.2.7",
-        "vitest": "^1.2.1"
+        "vitest": "^1.2.1",
+        "zod": "^3.23.8"
       },
       "devDependencies": {
         "@tsconfig/node18": "latest",
@@ -4297,10 +4297,6 @@
       "version": "4.17.21",
       "license": "MIT"
     },
-    "node_modules/lodash.merge": {
-      "version": "4.6.2",
-      "license": "MIT"
-    },
     "node_modules/log-symbols": {
       "version": "4.1.0",
       "license": "MIT",
@@ -7167,6 +7163,15 @@
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
+    },
+    "node_modules/zod": {
+      "version": "3.24.1",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.1.tgz",
+      "integrity": "sha512-muH7gBL9sI1nciMZV67X5fTKKBLtwpZ5VBp1vsOQzj1MhrBZ4wlVCm3gedKZWLp0Oyel8sIGfeiz54Su+OVT+A==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/colinhacks"
+      }
     }
   }
 }
diff --git a/waspc/examples/crud-testing/package-lock.json b/waspc/examples/crud-testing/package-lock.json
index 531ba5607e..520f480981 100644
--- a/waspc/examples/crud-testing/package-lock.json
+++ b/waspc/examples/crud-testing/package-lock.json
@@ -7,8 +7,8 @@
       "name": "crudTesting",
       "dependencies": {
         "react": "^18.2.0",
-        "react-dom": "18.3.1",
-        "react-router-dom": "6.28.1",
+        "react-dom": "^18.2.0",
+        "react-router-dom": "^6.26.2",
         "wasp": "file:.wasp/out/sdk/wasp",
         "zod": "^3.22.2"
       },
@@ -34,7 +34,6 @@
         "axios": "^1.4.0",
         "express": "~4.21.0",
         "jsdom": "^21.1.1",
-        "lodash.merge": "^4.6.2",
         "lucia": "^3.0.1",
         "mitt": "3.0.0",
         "msw": "^1.1.0",
@@ -45,7 +44,8 @@
         "react-hook-form": "^7.45.4",
         "react-router-dom": "^6.26.2",
         "superjson": "^2.2.1",
-        "vitest": "^1.2.1"
+        "vitest": "^1.2.1",
+        "zod": "^3.23.8"
       },
       "devDependencies": {
         "@tsconfig/node18": "latest",
@@ -4223,11 +4223,6 @@
       "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
       "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
     },
-    "node_modules/lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
-    },
     "node_modules/log-symbols": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
@@ -7827,9 +7822,10 @@
       }
     },
     "node_modules/zod": {
-      "version": "3.22.4",
-      "resolved": "https://registry.npmjs.org/zod/-/zod-3.22.4.tgz",
-      "integrity": "sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==",
+      "version": "3.24.1",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.1.tgz",
+      "integrity": "sha512-muH7gBL9sI1nciMZV67X5fTKKBLtwpZ5VBp1vsOQzj1MhrBZ4wlVCm3gedKZWLp0Oyel8sIGfeiz54Su+OVT+A==",
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
       }
diff --git a/waspc/examples/pg-vector-example/package-lock.json b/waspc/examples/pg-vector-example/package-lock.json
index 4d5d0e962c..0bc6c32bf9 100644
--- a/waspc/examples/pg-vector-example/package-lock.json
+++ b/waspc/examples/pg-vector-example/package-lock.json
@@ -39,7 +39,6 @@
         "axios": "^1.4.0",
         "express": "~4.21.0",
         "jsdom": "^21.1.1",
-        "lodash.merge": "^4.6.2",
         "mitt": "3.0.0",
         "msw": "^1.1.0",
         "postcss": "^8.4.21",
@@ -49,7 +48,8 @@
         "react-router-dom": "^6.26.2",
         "superjson": "^2.2.1",
         "tailwindcss": "^3.2.7",
-        "vitest": "^1.2.1"
+        "vitest": "^1.2.1",
+        "zod": "^3.23.8"
       },
       "devDependencies": {
         "@tsconfig/node18": "latest",
@@ -6709,11 +6709,6 @@
       "resolved": "https://registry.npmjs.org/lodash.mapkeys/-/lodash.mapkeys-4.6.0.tgz",
       "integrity": "sha512-0Al+hxpYvONWtg+ZqHpa/GaVzxuN3V7Xeo2p+bY06EaK/n+Y9R7nBePPN2o1LxmL0TWQSwP8LYZ008/hc9JzhA=="
     },
-    "node_modules/lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
-    },
     "node_modules/lodash.omit": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.omit/-/lodash.omit-4.5.0.tgz",
@@ -11237,6 +11232,15 @@
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
+    },
+    "node_modules/zod": {
+      "version": "3.24.1",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.1.tgz",
+      "integrity": "sha512-muH7gBL9sI1nciMZV67X5fTKKBLtwpZ5VBp1vsOQzj1MhrBZ4wlVCm3gedKZWLp0Oyel8sIGfeiz54Su+OVT+A==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/colinhacks"
+      }
     }
   }
 }
diff --git a/waspc/examples/todo-typescript/package-lock.json b/waspc/examples/todo-typescript/package-lock.json
index 1d106626ae..3ab5586350 100644
--- a/waspc/examples/todo-typescript/package-lock.json
+++ b/waspc/examples/todo-typescript/package-lock.json
@@ -38,7 +38,6 @@
         "axios": "^1.4.0",
         "express": "~4.21.0",
         "jsdom": "^21.1.1",
-        "lodash.merge": "^4.6.2",
         "lucia": "^3.0.1",
         "mitt": "3.0.0",
         "msw": "^1.1.0",
@@ -53,7 +52,8 @@
         "socket.io-client": "^4.6.1",
         "superjson": "^2.2.1",
         "tailwindcss": "^3.2.7",
-        "vitest": "^1.2.1"
+        "vitest": "^1.2.1",
+        "zod": "^3.23.8"
       },
       "devDependencies": {
         "@tsconfig/node18": "latest",
@@ -4831,11 +4831,6 @@
       "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
       "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
     },
-    "node_modules/lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
-    },
     "node_modules/log-symbols": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
@@ -9033,6 +9028,15 @@
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
+    },
+    "node_modules/zod": {
+      "version": "3.24.1",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.1.tgz",
+      "integrity": "sha512-muH7gBL9sI1nciMZV67X5fTKKBLtwpZ5VBp1vsOQzj1MhrBZ4wlVCm3gedKZWLp0Oyel8sIGfeiz54Su+OVT+A==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/colinhacks"
+      }
     }
   }
 }