Version Packages (alpha) (#3653 )

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
(meta) added @chaiwattsw as contributor
2026-02-03 18:01:02 -05:00 · 2022-08-05 00:04:16 +02:00 · 2022-08-04 17:57:34 -04:00 · 2022-08-04 23:57:29 +02:00 · 2022-08-04 18:54:40 +02:00 · 2022-08-04 18:43:13 +02:00
86 changed files with 2568 additions and 807 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -971,7 +971,8 @@
      "profile": "https://twitter.com/dillonraphael",
      "contributions": [
        "code",
-        "doc"
+        "doc",
+        "test"
      ]
    },
    {
@@ -3630,6 +3631,35 @@
      "contributions": [
        "doc"
      ]
+    },
+    {
+      "login": "tommywong-dev",
+      "name": "tommywong-dev",
+      "avatar_url": "https://avatars.githubusercontent.com/u/79971095?v=4",
+      "profile": "https://github.com/tommywong-dev",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "datner",
+      "name": "Datner",
+      "avatar_url": "https://avatars.githubusercontent.com/u/22598347?v=4",
+      "profile": "https://github.com/datner",
+      "contributions": [
+        "doc",
+        "code"
+      ]
+    },
+    {
+      "login": "chaiwattsw",
+      "name": "Chaiwat Trisuwan",
+      "avatar_url": "https://avatars.githubusercontent.com/u/30198386?v=4",
+      "profile": "https://chaiwattsw.com/",
+      "contributions": [
+        "doc",
+        "code"
+      ]
    }
  ],
  "contributorsPerLine": 7,
--- a/.changeset/calm-carpets-deny.md
+++ b/.changeset/calm-carpets-deny.md
@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Fixes the db seed command so that the database can disconnect after running the seed file.
--- a/.changeset/calm-tomatoes-drive.md
+++ b/.changeset/calm-tomatoes-drive.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Include `.env.test` file to the generator templates
--- a/.changeset/fair-carrots-guess.md
+++ b/.changeset/fair-carrots-guess.md
@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Fixes loading production env variables by default for blitz build command
--- a/.changeset/gorgeous-games-obey.md
+++ b/.changeset/gorgeous-games-obey.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+Avoid `invalid config detected` warnings by deleting `"blitz"` key from next config object
--- a/.changeset/great-terms-rescue.md
+++ b/.changeset/great-terms-rescue.md
@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Add BlitzServerMiddleware utility function to wrap middleware in blitz server file
--- a/.changeset/green-pillows-hammer.md
+++ b/.changeset/green-pillows-hammer.md
@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Runs the codegen on the blitz build command
--- a/.changeset/happy-hotels-visit.md
+++ b/.changeset/happy-hotels-visit.md
@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Add missing value to "skip" option when choosing a package manager during new app scaffolding
--- a/.changeset/hot-cups-rhyme.md
+++ b/.changeset/hot-cups-rhyme.md
@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Fix blitz codegen to work with monorepos
--- a/.changeset/light-donkeys-double.md
+++ b/.changeset/light-donkeys-double.md
@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Run `prisma generate` as a `blitz codegen` step if "prisma" is found in project's dependencies
--- a/.changeset/ninety-rice-tickle.md
+++ b/.changeset/ninety-rice-tickle.md
@@ -0,0 +1,6 @@
+---
+"blitz": patch
+"@blitzjs/generator": patch
+---
+
+Improve `blitz new` messaging and fix minor issues
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -25,7 +25,9 @@
    "breezy-cameras-double",
    "breezy-moose-behave",
    "bright-mangos-run",
+    "calm-carpets-deny",
    "calm-nails-wait",
+    "calm-tomatoes-drive",
    "clean-walls-wink",
    "cool-doors-invent",
    "cool-horses-check",
@@ -35,6 +37,7 @@
    "eleven-humans-sort",
    "empty-berries-rule",
    "empty-turkeys-wave",
+    "fair-carrots-guess",
    "fair-wombats-sneeze",
    "famous-kings-explain",
    "fast-trainers-kneel",
@@ -48,15 +51,21 @@
    "good-apes-drum",
    "good-insects-wink",
    "gorgeous-buses-scream",
+    "gorgeous-games-obey",
    "great-months-train",
+    "great-terms-rescue",
    "green-papayas-do",
+    "green-pillows-hammer",
+    "happy-hotels-visit",
    "healthy-rice-shout",
    "heavy-apes-judge",
+    "hot-cups-rhyme",
    "hot-drinks-approve",
    "hungry-baboons-swim",
    "late-steaks-give",
    "lemon-games-press",
    "lemon-seas-push",
+    "light-donkeys-double",
    "lovely-colts-share",
    "lucky-cows-try",
    "mean-gorillas-reply",
@@ -73,6 +82,7 @@
    "nine-onions-admire",
    "ninety-lies-press",
    "ninety-pets-heal",
+    "ninety-rice-tickle",
    "olive-bees-buy",
    "olive-feet-rhyme",
    "olive-sheep-rhyme",
@@ -89,10 +99,12 @@
    "quiet-feet-travel",
    "quiet-pans-hunt",
    "quiet-sloths-rule",
+    "red-badgers-retire",
    "rich-chairs-invent",
    "rich-queens-travel",
    "sharp-falcons-begin",
    "shy-olives-hang",
+    "shy-pumpkins-try",
    "silent-colts-reply",
    "silly-apricots-share",
    "six-apricots-kick",
@@ -103,23 +115,27 @@
    "smooth-stingrays-drum",
    "soft-adults-smell",
    "sour-lemons-hunt",
+    "spicy-beds-float",
    "strong-apes-reply",
    "stupid-walls-sell",
    "sweet-kiwis-cross",
    "swift-drinks-dress",
    "tall-meals-learn",
    "tame-keys-reply",
+    "tasty-maps-fetch",
    "tasty-news-collect",
    "ten-hairs-listen",
    "ten-rivers-burn",
    "tender-pianos-check",
    "thick-parrots-float",
    "thirty-countries-build",
+    "three-lies-pull",
    "tidy-clouds-smoke",
    "tough-toes-pull",
    "twelve-lemons-smile",
    "twenty-beans-pump",
    "two-carpets-rhyme",
+    "two-eyes-knock",
    "two-kiwis-help",
    "two-tigers-type",
    "unlucky-papayas-sleep",
@@ -127,6 +143,8 @@
    "violet-lions-help",
    "weak-suns-shave",
    "wicked-ghosts-cough",
-    "wise-frogs-give"
+    "wicked-rings-walk",
+    "wise-frogs-give",
+    "wise-rabbits-complain"
  ]
 }
--- a/.changeset/red-badgers-retire.md
+++ b/.changeset/red-badgers-retire.md
@@ -0,0 +1,8 @@
+---
+"blitz": patch
+"@blitzjs/next": patch
+"@blitzjs/rpc": patch
+"@blitzjs/generator": patch
+---
+
+Fixes peer dependency warnings
--- a/.changeset/shy-pumpkins-try.md
+++ b/.changeset/shy-pumpkins-try.md
@@ -0,0 +1,6 @@
+---
+"@blitzjs/next": patch
+"@blitzjs/rpc": patch
+---
+
+Upgrade react-query to v4
--- a/.changeset/spicy-beds-float.md
+++ b/.changeset/spicy-beds-float.md
@@ -0,0 +1,8 @@
+---
+"@blitzjs/auth": patch
+"@blitzjs/next": patch
+"@blitzjs/rpc": patch
+"blitz": patch
+"@blitzjs/generator": patch
+---
+Fixes the supports-color warning for pnpm
--- a/.changeset/tasty-maps-fetch.md
+++ b/.changeset/tasty-maps-fetch.md
@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Fix `enhancePrisma is undefined` errors by moving the utility function to a browser entrypoint
--- a/.changeset/three-lies-pull.md
+++ b/.changeset/three-lies-pull.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/rpc": patch
+---
+
+moves zod to devDependencies
--- a/.changeset/two-eyes-knock.md
+++ b/.changeset/two-eyes-knock.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Update new app templates to use blitz-rpc's resolver function
--- a/.changeset/wicked-rings-walk.md
+++ b/.changeset/wicked-rings-walk.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+Set prefix in moduleNameWrapper's options in Blitz's jest configuration
--- a/.changeset/wise-rabbits-complain.md
+++ b/.changeset/wise-rabbits-complain.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Mocks @blitzjs/auth instead of blitz inside the forgotPassword mutation test & hardcodes blitz package version types instead of just using the alpha tag.
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
    <img alt="" src="https://img.shields.io/badge/Join%20our%20community-6700EB.svg?style=for-the-badge&labelColor=000000&logoWidth=20&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAQ9SURBVHgB7d3dVdtAEIbhcSpICUoH0IEogQqSVBBSAU4FSSpIOoAORAfQgSghHXzZ1U/YcMD4R9rZmf2ec3y448LyiNf27iLiGIAmPLrweC9Un3DhrzG6EarLNP09nlwJ1SOZ/lQr5N80/S/p2QMVCBf5N17XCfm1Y/rBHqjAG9PPHvBsz+mf9WAP+HLA9M/YA14cOP2payH7jpj+VCtk1wnTP+vj7xCy6cTpn7EHLMLp059iD1iD8eveJbVCNsSLheX1YA/YgOWnf8YeKB3Wmf7Ud6Fy4f/FHmtpxbl3YlC4MJ/Cj0bWdwPnPbARg+L0S54XQHS32WwuxClzd4CM0z9rPfeAuTtA5ulPXYQ7wZ04Y+oOoDD9KZc9YOoOoDj9s4dwFzgXR6w1wIPoOvPWA9buAHEJ173o3gWiy3AnuBUHLEbgmYwvAk1/wuM8vAgexThzbwPDkx7/DHwVXfFOxP2GmsKd4Ab6zPeAyU8CI7AHFmH2BRCBPXAyk18GzUrqAXCTiR4ssyj0VFw/oCU8+e+RZ33AWz6KMaYbIIWxB+JSLs1bsbkeMN0AqakHvoku9oA2sAfqBvbAQdw0QArsgb25aYBUQT3QgT2gB+yBuqGcHij2UCqXDZACe2Anlw2QYg/QAOyBuoE98CL3DZDCuK4/rh/Q7oGL6U+TOvcNkJoijN8X1C48+T+g75eQDrAH/qmqAVJgDwyqaoAUe4AGYA/UDZX3QLUNkEIZPRCd5+6BahsgVUgPROwBTSijB7jpVAvGHriHvmw9wAZ4BpX1ABvgmakHtPcbRuwBTWAPULgAV9D/jKDY9YRvwvgEaurD44uQHvAol7qBW7WKluVtIHiUS7GyvA0s6CiXDnxrpQfsgbqBS7GKk/2jYHCrVlGyfxTMrVo0ALdq1Q3sgSKofh0M9oA61a+D2QM0AHugbmAPqClmSRjK2apVVQ8UsySsoK1aHdgDesCtWnUDeyCrIpeFg1u3sylyWTi3btMA7IG6gT2wuuK3hoE9sKrit4YVslWLPaAN7IG6ocKt2zmY2h4O9sDiTG0PZw/QANy6XTewBxZj9ogYVHy025LMHhEz9cBn0We6B0yfERReBLfhx0/R1YQHPx/QBPbA0VwcEwf2wNFcHBPHHjiem3MC2QPHcXdSaJjA+KfgTPQ8hhfjBzHC40mhlzJ+Xq9lK4a4PCs43AVaGTed5mZq+iOXZwWHi3AnOj2wFWNcnxYe7gTxLtBKHuamP/J+Wnh8a5irB7ZC5Yk9gPX1QuXC+usHWqGyhYvUYR0a7zboUOFCNVhnk0krZAOW7wFOvzXhom2xnEbIHizTA1wEYhWW6YFGyC6c1gOcfg9wfA80Qj7g8B7g9HuCww+haIR8wf49wOn3Cvv9k8tGyC/s7gFOv3fY3QONkH+v9MBWqB7PeqDn9FcIT//kcitUn6kHOu/T/xfWzlQy3dEHhwAAAABJRU5ErkJggg==">
  </a>
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-<a aria-label="All Contributors" href="#contributors-"><img alt="" src="https://img.shields.io/badge/all_contributors-385-17BB8A.svg?style=for-the-badge&labelColor=000000"></a>
+<a aria-label="All Contributors" href="#contributors-"><img alt="" src="https://img.shields.io/badge/all_contributors-388-17BB8A.svg?style=for-the-badge&labelColor=000000"></a>
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
  <a aria-label="License" href="https://github.com/blitz-js/blitz/blob/canary/LICENSE">
    <img alt="" src="https://img.shields.io/npm/l/blitz.svg?style=for-the-badge&labelColor=000000&color=blue">
@@ -337,7 +337,7 @@ Thanks to these wonderful people ([emoji key](https://allcontributors.org/docs/e
  </tr>
  <tr>
    <td align="center"><a href="https://github.com/jschepmans"><img src="https://avatars2.githubusercontent.com/u/5782977?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Johan Schepmans</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=jschepmans" title="Code">💻</a></td>
-    <td align="center"><a href="https://twitter.com/dillonraphael"><img src="https://avatars0.githubusercontent.com/u/3496193?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Dillon Raphael</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=dillonraphael" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=dillonraphael" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://twitter.com/dillonraphael"><img src="https://avatars0.githubusercontent.com/u/3496193?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Dillon Raphael</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=dillonraphael" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=dillonraphael" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=dillonraphael" title="Tests">⚠️</a></td>
    <td align="center"><a href="https://github.com/clgeoio"><img src="https://avatars2.githubusercontent.com/u/37571416?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Cody G</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=clgeoio" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=clgeoio" title="Tests">⚠️</a></td>
    <td align="center"><a href="https://github.com/madflow"><img src="https://avatars0.githubusercontent.com/u/183248?v=4?s=100" width="100px;" alt=""/><br /><sub><b>madflow</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=madflow" title="Documentation">📖</a></td>
    <td align="center"><a href="https://twitter.com/nitaking_"><img src="https://avatars2.githubusercontent.com/u/10850034?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Satoshi Nitawaki</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=nitaking" title="Code">💻</a> <a href="#maintenance-nitaking" title="Maintenance">🚧</a> <a href="#question-nitaking" title="Answering Questions">💬</a> <a href="https://github.com/blitz-js/blitz/commits?author=nitaking" title="Documentation">📖</a></td>
@@ -704,6 +704,11 @@ Thanks to these wonderful people ([emoji key](https://allcontributors.org/docs/e
    <td align="center"><a href="https://linkedin.com/in/ryanwashburne"><img src="https://avatars.githubusercontent.com/u/12566087?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ryan Washburne</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=ryanwashburne" title="Documentation">📖</a></td>
    <td align="center"><a href="https://github.com/sherryxiao1988"><img src="https://avatars.githubusercontent.com/u/1202426?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Shundan Xiao</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=sherryxiao1988" title="Documentation">📖</a></td>
  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/tommywong-dev"><img src="https://avatars.githubusercontent.com/u/79971095?v=4?s=100" width="100px;" alt=""/><br /><sub><b>tommywong-dev</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=tommywong-dev" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/datner"><img src="https://avatars.githubusercontent.com/u/22598347?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Datner</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=datner" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=datner" title="Code">💻</a></td>
+    <td align="center"><a href="https://chaiwattsw.com/"><img src="https://avatars.githubusercontent.com/u/30198386?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Chaiwat Trisuwan</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=chaiwattsw" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=chaiwattsw" title="Code">💻</a></td>
+  </tr>
 </table>

 <!-- markdownlint-restore -->
--- a/apps/toolkit-app/.npmrc
+++ b/apps/toolkit-app/.npmrc
@@ -1,7 +1,7 @@
 save-exact=true
 legacy-peer-deps=true

-public-hoist-pattern[]=react-query
+public-hoist-pattern[]=@tanstack/react-query
 public-hoist-pattern[]=next
 public-hoist-pattern[]=secure-password
 public-hoist-pattern[]=*jest*
--- a/apps/toolkit-app/package.json
+++ b/apps/toolkit-app/package.json
@@ -29,7 +29,7 @@
    "@blitzjs/rpc": "workspace:*",
    "@hookform/resolvers": "2.8.8",
    "@prisma/client": "4.0.0",
-    "blitz": "workspace:2.0.0-alpha.61",
+    "blitz": "workspace:2.0.0-alpha.66",
    "next": "12.2.0",
    "prisma": "4.0.0",
    "react": "18.0.0",
--- a/apps/web/.npmrc
+++ b/apps/web/.npmrc
@@ -1,7 +1,7 @@
 save-exact=true
 legacy-peer-deps=true

-public-hoist-pattern[]=react-query
+public-hoist-pattern[]=@tanstack/react-query
 public-hoist-pattern[]=next
 public-hoist-pattern[]=secure-password
 public-hoist-pattern[]=*jest*
--- a/integration-tests/qm/package.json
+++ b/integration-tests/qm/package.json
@@ -13,12 +13,12 @@
    "@blitzjs/next": "workspace:*",
    "@blitzjs/rpc": "workspace:*",
    "@prisma/client": "4.0.0",
+    "@tanstack/react-query": "4.0.10",
    "blitz": "workspace:*",
    "next": "12.2.0",
    "prisma": "4.0.0",
    "react": "18.0.0",
-    "react-dom": "18.0.0",
-    "react-query": "3.39.0"
+    "react-dom": "18.0.0"
  },
  "devDependencies": {
    "@testing-library/react": "13.0.0",
--- a/integration-tests/qm/test/snapshots/use-mutation.test.tsx.snap
+++ b/integration-tests/qm/test/snapshots/use-mutation.test.tsx.snap
@@ -2,4 +2,4 @@

 exports[`useMutation > useMutation calls the resolver with the argument > shouldn't work with query function 1`] = `"\\"useMutation\\" was expected to be called with a mutation but was called with a \\"query\\""`;

-exports[`useMutation > useMutation calls the resolver with the argument > shouldn't work with regular functions 1`] = `"Either the file path to your resolver is incorrect (must be in a \\"queries\\" or \\"mutations\\" folder that isn't nested inside \\"pages\\" or \\"api\\") or you are trying to use Blitz's useQuery to fetch from third-party APIs (to do that, import useQuery directly from \\"react-query\\")"`;
+exports[`useMutation > useMutation calls the resolver with the argument > shouldn't work with regular functions 1`] = `"Either the file path to your resolver is incorrect (must be in a \\"queries\\" or \\"mutations\\" folder that isn't nested inside \\"pages\\" or \\"api\\") or you are trying to use Blitz's useQuery to fetch from third-party APIs (to do that, import useQuery directly from \\"@tanstack/react-query\\")."`;
--- a/integration-tests/qm/test/snapshots/use-query.test.tsx.snap
+++ b/integration-tests/qm/test/snapshots/use-query.test.tsx.snap
@@ -1,5 +1,5 @@
 // Vitest Snapshot v1

-exports[`useQuery > a "query" that converts the string parameter to uppercase > shouldn't work with mutation function 1`] = `"Cannot read properties of null (reading 'isReady')"`;
+exports[`useQuery > a "query" that converts the string parameter to uppercase > shouldn't work with mutation function 1`] = `"\\"useQuery\\" was expected to be called with a query but was called with a \\"mutation\\""`;

-exports[`useQuery > a "query" that converts the string parameter to uppercase > shouldn't work with regular functions 1`] = `"Cannot read properties of null (reading 'isReady')"`;
+exports[`useQuery > a "query" that converts the string parameter to uppercase > shouldn't work with regular functions 1`] = `"Either the file path to your resolver is incorrect (must be in a \\"queries\\" or \\"mutations\\" folder that isn't nested inside \\"pages\\" or \\"api\\") or you are trying to use Blitz's useQuery to fetch from third-party APIs (to do that, import useQuery directly from \\"@tanstack/react-query\\")."`;
--- a/integration-tests/qm/test/use-query.test.tsx
+++ b/integration-tests/qm/test/use-query.test.tsx
@@ -1,166 +1,190 @@
 import {describe, it, expect, beforeAll, vi} from "vitest"
 import {act, screen, waitForElementToBeRemoved, waitFor} from "@testing-library/react"
-import {useQuery, useInfiniteQuery} from "@blitzjs/rpc"
+import {useQuery, useInfiniteQuery, BlitzRpcPlugin, QueryClientProvider} from "@blitzjs/rpc"
 import React from "react"
 import delay from "delay"
-import {buildMutationRpc, buildQueryRpc, render} from "../../utils/blitz-test-utils"
+import {buildMutationRpc, buildQueryRpc, mockRouter, render} from "../../utils/blitz-test-utils"
+import {RouterContext} from "next/dist/shared/lib/router-context"
+
+beforeAll(() => {
+  globalThis.__BLITZ_SESSION_COOKIE_PREFIX = "qm-test-cookie-prefix"
+  globalThis.IS_REACT_ACT_ENVIRONMENT = true
+})

 describe("useQuery", () => {
-  it("Placeholder", async () => {
-    console.log("placeholder")
+  const setupHook = (
+    ID: string,
+    params: any,
+    queryFn: (...args: any) => any,
+    options: Parameters<typeof useQuery>[2] = {} as any,
+  ): [{data?: any; setQueryData?: any}, Function] => {
+    let res = {}
+    const qc = BlitzRpcPlugin({})
+
+    function TestHarness() {
+      const [data, {setQueryData}] = useQuery(queryFn, params, {
+        suspense: true,
+        ...options,
+      } as any)
+
+      Object.assign(res, {data, setQueryData})
+      return (
+        <div id={`harness-${ID}`}>
+          <span>{data ? `Ready${ID}` : "No data"}</span>
+          <span>{data}</span>
+        </div>
+      )
+    }
+
+    const ui = () => (
+      <React.Suspense fallback="Loading...">
+        <TestHarness />
+      </React.Suspense>
+    )
+
+    const {rerender} = render(ui(), {
+      wrapper: ({children}) => (
+        <QueryClientProvider client={globalThis.queryClient}>
+          <RouterContext.Provider value={mockRouter}>{children}</RouterContext.Provider>
+        </QueryClientProvider>
+      ),
+    })
+    return [res, () => rerender(ui())]
+  }
+
+  describe('a "query" that converts the string parameter to uppercase', () => {
+    const upcase = async (args: string) => {
+      await delay(500)
+      return args.toUpperCase()
+    }
+
+    it("should work with Blitz queries", async () => {
+      const [res] = setupHook("2", "test", buildQueryRpc(upcase))
+      await waitForElementToBeRemoved(() => screen.getByText("Loading..."))
+      await act(async () => {
+        await screen.findByText("Ready2")
+        expect(res.data).toBe("TEST")
+      })
+    })
+
+    it("should be able to change the data with setQueryData", async () => {
+      const [res] = setupHook("3", "fooBar", buildQueryRpc(upcase))
+      await waitForElementToBeRemoved(() => screen.getByText("Loading..."))
+      await act(async () => {
+        await screen.findByText("Ready3")
+        expect(res.data).toBe("FOOBAR")
+        res.setQueryData((p: string) => p.substr(3, 3), {refetch: false})
+        await delay(100)
+      })
+
+      expect(res.data).toBe("BAR")
+    })
+
+    it("shouldn't work with regular functions", () => {
+      console.error = vi.fn()
+      expect(() => setupHook("4", "test", upcase)).toThrowErrorMatchingSnapshot()
+    })
+
+    it("shouldn't work with mutation function", () => {
+      console.error = vi.fn()
+      expect(() => setupHook("5", "test", buildMutationRpc(upcase))).toThrowErrorMatchingSnapshot()
+    })
+
+    it("suspense disabled if enabled is false", async () => {
+      setupHook("6", "test", buildQueryRpc(upcase), {enabled: false})
+      await screen.findByText("No data")
+    })
+
+    it("suspense disabled if enabled is undefined", async () => {
+      setupHook("7", "test", buildQueryRpc(upcase), {enabled: undefined})
+      await screen.findByText("No data")
+    })
+
+    // it("suspense disabled if enabled is false and suspense set", async () => {
+    //   setupHook("8", "test", buildQueryRpc(upcase), {
+    //     enabled: false,
+    //     suspense: true,
+    //   })
+    //   await screen.findByText("No data")
+    // })
+
+    it("works with options other than enabled & suspense without type error", () => {
+      const Demo = () => {
+        useQuery(buildQueryRpc(upcase), undefined, {refetchInterval: 10000})
+        return <div></div>
+      }
+      const ui = () => <Demo />
+
+      const {rerender} = render(ui(), {
+        wrapper: ({children}) => (
+          <QueryClientProvider client={globalThis.queryClient}>
+            <RouterContext.Provider value={mockRouter}>{children}</RouterContext.Provider>
+          </QueryClientProvider>
+        ),
+      })
+    })
  })
 })
-// beforeAll(() => {
-//   globalThis.__BLITZ_SESSION_COOKIE_PREFIX = "qm-test-cookie-prefix"
-//   globalThis.IS_REACT_ACT_ENVIRONMENT = true
-// })

-// describe("useQuery", () => {
-//   const setupHook = (
-//     params: any,
-//     queryFn: (...args: any) => any,
-//     options: Parameters<typeof useQuery>[2] = {} as any,
-//   ): [{data?: any; setQueryData?: any}, Function] => {
-//     let res = {}
-//     function TestHarness() {
-//       const [data, {setQueryData}] = useQuery(queryFn, params, {
-//         suspense: true,
-//         ...options,
-//       } as any)
-//       Object.assign(res, {data, setQueryData})
-//       return (
-//         <div id="harness">
-//           <span>{data ? "Ready" : "No data"}</span>
-//           <span>{data}</span>
-//         </div>
-//       )
-//     }
+describe("useInfiniteQuery", () => {
+  const setupHook = (
+    ID: string,
+    params: (arg?: any) => any,
+    queryFn: (...args: any) => any,
+  ): [{data?: any; setQueryData?: any}, Function] => {
+    let res = {}
+    const qc = BlitzRpcPlugin({})

-//     const ui = () => (
-//       <React.Suspense fallback="Loading...">
-//         <TestHarness />
-//       </React.Suspense>
-//     )
+    function TestHarness() {
+      // TODO - fix typing
+      //@ts-ignore
+      const [groupedData] = useInfiniteQuery(queryFn, params, {
+        suspense: true,
+        getNextPageParam: () => {},
+      })
+      Object.assign(res, {groupedData})
+      return (
+        <div id="harness">
+          <span>{groupedData ? `Ready${ID}` : "No data"}</span>
+          <div>
+            {groupedData.map((data: any, i) => (
+              <div key={i}>{data}</div>
+            ))}
+          </div>
+        </div>
+      )
+    }

-//     const {rerender} = render(ui())
-//     return [res, () => rerender(ui())]
-//   }
+    const ui = () => (
+      <React.Suspense fallback={`Loading${ID}...`}>
+        <TestHarness />
+      </React.Suspense>
+    )

-//   describe('a "query" that converts the string parameter to uppercase', () => {
-//     const upcase = async (args: string) => {
-//       await delay(1000)
-//       return args.toUpperCase()
-//     }
-//     it("should work with Blitz queries", async () => {
-//       const [res] = setupHook("test", buildQueryRpc(upcase))
-//       await waitForElementToBeRemoved(() => screen.getByText("Loading..."))
-//       await act(async () => {
-//         await screen.findByText("Ready")
-//         expect(res.data).toBe("TEST")
-//       })
-//     })
+    const {rerender} = render(ui(), {
+      wrapper: ({children}) => (
+        <QueryClientProvider client={globalThis.queryClient}>
+          <RouterContext.Provider value={mockRouter}>{children}</RouterContext.Provider>
+        </QueryClientProvider>
+      ),
+    })
+    return [res, () => rerender(ui())]
+  }

-//     it("should be able to change the data with setQueryData", async () => {
-//       const [res] = setupHook("test", buildQueryRpc(upcase))
-//       await waitForElementToBeRemoved(() => screen.getByText("Loading..."))
-//       await act(async () => {
-//         await screen.findByText("Ready")
-//         expect(res.data).toBe("TEST")
-//         res.setQueryData((p: string) => p.substr(1, 2), {refetch: false})
-//         await waitFor(() => screen.getByText("ES"))
-//       })
-//     })
-
-//     it("shouldn't work with regular functions", () => {
-//       console.error = vi.fn()
-//       expect(() => setupHook("test", upcase)).toThrowErrorMatchingSnapshot()
-//     })
-
-//     it("shouldn't work with mutation function", () => {
-//       console.error = vi.fn()
-//       expect(() => setupHook("test", buildMutationRpc(upcase))).toThrowErrorMatchingSnapshot()
-//     })
-
-//     it("suspense disabled if enabled is false", async () => {
-//       setupHook("test", buildQueryRpc(upcase), {enabled: false})
-//       await screen.findByText("No data")
-//     })
-
-//     it("suspense disabled if enabled is undefined", async () => {
-//       setupHook("test", buildQueryRpc(upcase), {enabled: undefined})
-//       await screen.findByText("No data")
-//     })
-
-//     it("suspense disabled if enabled is false and suspense set", async () => {
-//       setupHook("test", buildQueryRpc(upcase), {
-//         enabled: false,
-//         suspense: true,
-//       })
-//       await screen.findByText("No data")
-//     })
-//   })
-
-//   // it("works with options other than enabled & suspense without type error", () => {
-//   //   const queryFn = ((() => true) as unknown) as () => Promise<boolean>
-//   //   useQuery(queryFn, undefined, {refetchInterval: 10000})
-//   // })
-// })
-
-// describe("useInfiniteQuery", () => {
-//   const setupHook = (
-//     params: (arg?: any) => any,
-//     queryFn: (...args: any) => any,
-//   ): [{data?: any; setQueryData?: any}, Function] => {
-//     let res = {}
-//     function TestHarness() {
-//       // TODO - fix typing
-//       //@ts-ignore
-//       const [groupedData] = useInfiniteQuery(queryFn, params, {
-//         suspense: true,
-//         getNextPageParam: () => {},
-//       })
-//       Object.assign(res, {groupedData})
-//       return (
-//         <div id="harness">
-//           <span>{groupedData ? "Ready" : "No data"}</span>
-//           <div>
-//             {groupedData.map((data: any, i) => (
-//               <div key={i}>{data}</div>
-//             ))}
-//           </div>
-//         </div>
-//       )
-//     }
-
-//     const ui = () => (
-//       <React.Suspense fallback="Loading...">
-//         <TestHarness />
-//       </React.Suspense>
-//     )
-
-//     const {rerender} = render(ui())
-//     return [res, () => rerender(ui())]
-//   }
-
-//   const getItems = ({id}: {id: number}) => {
-//     if (id === 1) {
-//       return "item1"
-//     } else if (id === 2) {
-//       return "item2"
-//     } else {
-//       throw new Error("No item for this id")
-//     }
-//   }
-//   it("should work", async () => {
-//     setupHook(() => ({id: 1}), buildQueryRpc(getItems))
-//     await waitForElementToBeRemoved(() => screen.getByText("Loading..."))
-//     await act(async () => {
-//       await screen.findByText("item1")
-//     })
-
-//     setupHook(() => ({id: 2}), buildQueryRpc(getItems))
-//     await act(async () => {
-//       await screen.findByText("item2")
-//     })
-//   })
-// })
+  const getItems = ({id}: {id: number}) => {
+    if (id === 1) {
+      return "item1"
+    } else if (id === 2) {
+      return "item2"
+    } else {
+      throw new Error("No item for this id")
+    }
+  }
+  it("should show loading", async () => {
+    setupHook("1", () => ({id: 1}), buildQueryRpc(getItems))
+    await waitForElementToBeRemoved(() => screen.getByText("Loading1..."))
+    await act(async () => {
+      await screen.findByText("item1")
+    })
+  })
+})
--- a/integration-tests/utils/blitz-test-utils.tsx
+++ b/integration-tests/utils/blitz-test-utils.tsx
@@ -1,11 +1,12 @@
-import {render as defaultRender} from "@testing-library/react"
-import {NextRouter} from "next/router"
-import {vi} from "vitest"
-import {QueryClient, QueryClientProvider} from "react-query"
 import React from "react"
-import {BlitzRpcPlugin} from "@blitzjs/rpc"
+import {vi} from "vitest"
+import {QueryClient} from "@tanstack/react-query"
+import {BlitzRpcPlugin, QueryClientProvider} from "@blitzjs/rpc"
+import {NextRouter} from "next/router"
+import {RouterContext} from "next/dist/shared/lib/router-context"
+import {render as defaultRender} from "@testing-library/react"

-const mockRouter: NextRouter = {
+export const mockRouter: NextRouter = {
  basePath: "",
  pathname: "/",
  route: "/",
@@ -56,8 +57,6 @@ const BlitzProvider = ({

  return children
 }
-export const RouterContext = React.createContext(null as any)
-RouterContext.displayName = "RouterContext"
 const compose =
  (...rest) =>
  (x: React.ComponentType<any>) =>
--- a/integration-tests/utils/next-webdriver.d.ts
+++ b/integration-tests/utils/next-webdriver.d.ts
@@ -1,34 +1,24 @@
-interface ChainMethods {
-  elementByCss: (selector: string) => Chain<Element>
-  elementById: () => Chain<Element>
-  getValue: () => Chain<any>
-  text: () => Chain<string>
-  type: () => Chain<any>
-  moveTo: () => Chain<any>
-  getComputedCss: () => Chain<any>
-  getAttribute: () => Chain<any>
-  hasElementByCssSelector: () => Chain<any>
-  click: () => Chain<any>
-  elementsByCss: () => Chain<Element[]>
-  waitForElementByCss: (arg: string) => Chain<any>
-  eval: (evalStr: string) => Chain<any>
-  log: () => Chain<any>
-  url: () => Chain<any>
-  back: () => Chain<any>
-  forward: () => Chain<any>
-  refresh: () => Chain<any>
-  setDimensions: (opts: {height: number; width: number}) => Chain<any>
-  close: () => Chain<any>
-  quit: () => Chain<any>
-}
-
-interface Chain<T> extends Promise<T & ChainMethods>, ChainMethods {}
-
-type Browser = {__brand: "Browser"}
-
-export default function (
-  appPort: number,
-  path: string,
-  waitHydration?: boolean,
-  allowHydrationRetry?: boolean,
-): Promise<Chain<Browser>>
+import {BrowserInterface} from "./browsers/base"
+export declare const USE_SELENIUM: boolean
+/**
+ *
+ * @param appPortOrUrl can either be the port or the full URL
+ * @param url the path/query to append when using appPort
+ * @param options.waitHydration whether to wait for react hydration to finish
+ * @param options.retryWaitHydration allow retrying hydration wait if reload occurs
+ * @param options.disableCache disable cache for page load
+ * @param options.beforePageLoad the callback receiving page instance before loading page
+ * @returns thenable browser instance
+ */
+export default function webdriver(
+  appPortOrUrl: string | number,
+  url: string,
+  options?: {
+    waitHydration?: boolean
+    retryWaitHydration?: boolean
+    disableCache?: boolean
+    beforePageLoad?: (page: any) => void
+    locale?: string
+  },
+): Promise<BrowserInterface>
+//# sourceMappingURL=next-webdriver.d.ts.map
--- a/integration-tests/utils/package.json
+++ b/integration-tests/utils/package.json
@@ -5,6 +5,7 @@
  "devDependencies": {
    "@blitzjs/config": "workspace: *",
    "@blitzjs/rpc": "workspace: *",
+    "@tanstack/react-query": "4.0.10",
    "@testing-library/react": "13.0.0",
    "@types/express": "4.17.13",
    "@types/fs-extra": "9.0.13",
@@ -23,7 +24,6 @@
    "playwright-chromium": "1.14.1",
    "react": "18.0.0",
    "react-dom": "18.0.0",
-    "react-query": "3.39.0",
    "resolve-cwd": "3.0.0",
    "resolve-from": "5.0.0",
    "rimraf": "3.0.2",
--- a/package.json
+++ b/package.json
@@ -38,5 +38,10 @@
    "wait-on": "6.0.1"
  },
  "npmClient": "pnpm",
-  "packageManager": "pnpm@7.4.0-1"
+  "packageManager": "pnpm@7.4.0-1",
+  "manypkg": {
+    "ignoredRules": [
+      "EXTERNAL_MISMATCH"
+    ]
+  }
 }
--- a/packages/blitz-auth/CHANGELOG.md
+++ b/packages/blitz-auth/CHANGELOG.md
@@ -1,5 +1,47 @@
 # @blitzjs/auth

+## 2.0.0-alpha.66
+
+### Patch Changes
+
+- a3e6c49c: Fixes the supports-color warning for pnpm
+- Updated dependencies [928e840b]
+- Updated dependencies [240f3f34]
+- Updated dependencies [55b1cb20]
+- Updated dependencies [4d7d126d]
+- Updated dependencies [890b0c0c]
+- Updated dependencies [807a2b56]
+- Updated dependencies [a3e6c49c]
+  - blitz@2.0.0-alpha.66
+
+## 2.0.0-alpha.65
+
+### Patch Changes
+
+- Updated dependencies [dd5f5174]
+  - blitz@2.0.0-alpha.65
+
+## 2.0.0-alpha.64
+
+### Patch Changes
+
+- Updated dependencies [54db8a46]
+- Updated dependencies [62bf12b5]
+  - blitz@2.0.0-alpha.64
+
+## 2.0.0-alpha.63
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.63
+
+## 2.0.0-alpha.62
+
+### Patch Changes
+
+- Updated dependencies [365e6709]
+  - blitz@2.0.0-alpha.62
+
 ## 2.0.0-alpha.61

 ### Patch Changes
--- a/packages/blitz-auth/package.json
+++ b/packages/blitz-auth/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@blitzjs/auth",
-  "version": "2.0.0-alpha.61",
+  "version": "2.0.0-alpha.66",
  "scripts": {
    "build": "unbuild",
    "predev": "wait-on -d 250 ../blitz/dist/index-server.d.ts",
@@ -26,7 +26,7 @@
    "@types/secure-password": "3.1.1",
    "b64-lite": "1.4.0",
    "bad-behavior": "1.0.1",
-    "blitz": "2.0.0-alpha.61",
+    "blitz": "2.0.0-alpha.66",
    "cookie": "0.4.1",
    "cookie-session": "2.0.0",
    "debug": "4.3.3",
@@ -36,10 +36,11 @@
    "passport": "0.5.2",
    "path": "0.12.7",
    "secure-password": "4.0.0",
+    "supports-color": "8.1.1",
    "url": "0.11.0"
  },
  "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.61",
+    "@blitzjs/config": "workspace:2.0.0-alpha.66",
    "@testing-library/react": "13.0.0",
    "@testing-library/react-hooks": "7.0.2",
    "@types/cookie": "0.4.1",
@@ -50,7 +51,7 @@
    "react": "18.0.0",
    "react-dom": "18.0.0",
    "typescript": "^4.5.3",
-    "unbuild": "0.6.9",
+    "unbuild": "0.7.6",
    "watch": "1.0.2"
  },
  "publishConfig": {
--- a/packages/blitz-next/CHANGELOG.md
+++ b/packages/blitz-next/CHANGELOG.md
@@ -1,5 +1,44 @@
 # @blitzjs/next

+## 2.0.0-alpha.66
+
+### Patch Changes
+
+- ccb1af8d: Avoid `invalid config detected` warnings by deleting `"blitz"` key from next config object
+- 807a2b56: Fixes peer dependency warnings
+- a3e6c49c: Fixes the supports-color warning for pnpm
+- Updated dependencies [807a2b56]
+- Updated dependencies [a3e6c49c]
+- Updated dependencies [9620ef6b]
+  - @blitzjs/rpc@2.0.0-alpha.66
+
+## 2.0.0-alpha.65
+
+### Patch Changes
+
+- @blitzjs/rpc@2.0.0-alpha.65
+
+## 2.0.0-alpha.64
+
+### Patch Changes
+
+- @blitzjs/rpc@2.0.0-alpha.64
+
+## 2.0.0-alpha.63
+
+### Patch Changes
+
+- f52ca398: Upgrade react-query to v4
+- Updated dependencies [f52ca398]
+  - @blitzjs/rpc@2.0.0-alpha.63
+
+## 2.0.0-alpha.62
+
+### Patch Changes
+
+- 31d7a6f4: Set prefix in moduleNameWrapper's options in Blitz's jest configuration
+  - @blitzjs/rpc@2.0.0-alpha.62
+
 ## 2.0.0-alpha.61

 ### Patch Changes
--- a/packages/blitz-next/build.config.ts
+++ b/packages/blitz-next/build.config.ts
@@ -2,7 +2,7 @@ import {BuildConfig} from "unbuild"

 const config: BuildConfig = {
  entries: ["./src/index-browser", "./src/index-server"],
-  externals: ["index-browser.cjs", "index-browser.mjs", "blitz", ".blitz"],
+  externals: ["index-browser.cjs", "index-browser.mjs", "blitz", ".blitz", "next", "react"],
  declaration: true,
  rollup: {
    emitCJS: true,
--- a/packages/blitz-next/jest/index.js
+++ b/packages/blitz-next/jest/index.js
@@ -21,6 +21,7 @@ function createJestConfigForNext(options) {
        // This ensures any path aliases in tsconfig also work in jest
        ...pathsToModuleNameMapper(
          (tsConfig && tsConfig.compilerOptions && tsConfig.compilerOptions.paths) || {},
+          {prefix: "<rootDir>/"},
        ),
        "\\.(jpg|jpeg|png|gif|webp|ico)$": path.resolve(__dirname, "./jest-preset/image-mock.js"),
      },
--- a/packages/blitz-next/package.json
+++ b/packages/blitz-next/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@blitzjs/next",
-  "version": "2.0.0-alpha.61",
+  "version": "2.0.0-alpha.66",
  "scripts": {
    "build": "unbuild",
    "dev": "pnpm predev && pnpm watch unbuild src --wait=0.2",
@@ -24,16 +24,17 @@
    "eslint.js"
  ],
  "dependencies": {
-    "@blitzjs/rpc": "2.0.0-alpha.61",
+    "@blitzjs/rpc": "2.0.0-alpha.66",
+    "@tanstack/react-query": "4.0.10",
    "@types/hoist-non-react-statics": "3.3.1",
    "debug": "4.3.3",
    "fs-extra": "10.0.1",
    "hoist-non-react-statics": "3.3.2",
-    "react-query": "3.39.0",
-    "superjson": "1.8.0"
+    "superjson": "1.8.0",
+    "supports-color": "8.1.1"
  },
  "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.61",
+    "@blitzjs/config": "workspace:2.0.0-alpha.66",
    "@testing-library/dom": "8.13.0",
    "@testing-library/jest-dom": "5.16.3",
    "@testing-library/react": "13.0.0",
@@ -43,7 +44,7 @@
    "@types/react": "18.0.1",
    "@types/react-dom": "17.0.14",
    "@types/testing-library__react-hooks": "4.0.0",
-    "blitz": "2.0.0-alpha.61",
+    "blitz": "2.0.0-alpha.66",
    "cross-spawn": "7.0.3",
    "find-up": "4.1.0",
    "next": "12.2.0",
@@ -52,14 +53,10 @@
    "resolve-from": "5.0.0",
    "ts-jest": "27.1.4",
    "typescript": "^4.5.3",
-    "unbuild": "0.6.9",
+    "unbuild": "0.7.6",
    "watch": "1.0.2"
  },
  "publishConfig": {
    "access": "public"
-  },
-  "peerDependencies": {
-    "next": ">=12.2.0",
-    "react": "*"
  }
 }
--- a/packages/blitz-next/src/global.ts
+++ b/packages/blitz-next/src/global.ts
@@ -1,4 +1,4 @@
-import {QueryClient} from "react-query"
+import {QueryClient} from "@tanstack/react-query"

 declare global {
  var queryClient: QueryClient
--- a/packages/blitz-next/src/index-browser.tsx
+++ b/packages/blitz-next/src/index-browser.tsx
@@ -7,8 +7,7 @@ import type {
 } from "blitz"
 import Head from "next/head"
 import React, {ReactNode} from "react"
-import {QueryClient, QueryClientProvider} from "react-query"
-import {Hydrate, HydrateOptions} from "react-query/hydration"
+import {QueryClient, QueryClientProvider, Hydrate, HydrateOptions} from "@tanstack/react-query"
 import {withSuperJSONPage} from "./superjson"
 import {Ctx} from "blitz"
 import {UrlObject} from "url"
--- a/packages/blitz-next/src/index-server.ts
+++ b/packages/blitz-next/src/index-server.ts
@@ -25,7 +25,7 @@ import {
  InstallWebpackConfigOptions,
  ResolverPathOptions,
 } from "@blitzjs/rpc"
-import {DefaultOptions, QueryClient} from "react-query"
+import {DefaultOptions, QueryClient} from "@tanstack/react-query"
 import {IncomingMessage, ServerResponse} from "http"
 import {withSuperJsonProps} from "./superjson"
 import {ParsedUrlQuery} from "querystring"
@@ -209,7 +209,8 @@ export function withBlitz(nextConfig: BlitzConfig = {}) {
    },
  })

-  return config
+  const {blitz, ...rest} = config
+  return rest
 }

 export type PrefetchQueryFn = <T extends AsyncFunc, TInput = FirstParam<T>>(
--- a/packages/blitz-rpc/CHANGELOG.md
+++ b/packages/blitz-rpc/CHANGELOG.md
@@ -1,5 +1,48 @@
 # @blitzjs/rpc

+## 2.0.0-alpha.66
+
+### Patch Changes
+
+- 807a2b56: Fixes peer dependency warnings
+- a3e6c49c: Fixes the supports-color warning for pnpm
+- 9620ef6b: moves zod to devDependencies
+- Updated dependencies [a3e6c49c]
+  - @blitzjs/auth@2.0.0-alpha.66
+
+## 2.0.0-alpha.65
+
+### Patch Changes
+
+- Updated dependencies [dd5f5174]
+  - blitz@2.0.0-alpha.65
+  - @blitzjs/auth@2.0.0-alpha.65
+
+## 2.0.0-alpha.64
+
+### Patch Changes
+
+- Updated dependencies [54db8a46]
+- Updated dependencies [62bf12b5]
+  - blitz@2.0.0-alpha.64
+  - @blitzjs/auth@2.0.0-alpha.64
+
+## 2.0.0-alpha.63
+
+### Patch Changes
+
+- f52ca398: Upgrade react-query to v4
+  - @blitzjs/auth@2.0.0-alpha.63
+  - blitz@2.0.0-alpha.63
+
+## 2.0.0-alpha.62
+
+### Patch Changes
+
+- Updated dependencies [365e6709]
+  - blitz@2.0.0-alpha.62
+  - @blitzjs/auth@2.0.0-alpha.62
+
 ## 2.0.0-alpha.61

 ### Patch Changes
--- a/packages/blitz-rpc/build.config.ts
+++ b/packages/blitz-rpc/build.config.ts
@@ -14,6 +14,9 @@ const config: BuildConfig = {
    "index-server.cjs",
    "index-server.mjs",
    "react",
+    "blitz",
+    "next",
+    "zod",
  ],
  declaration: true,
  rollup: {
--- a/packages/blitz-rpc/package.json
+++ b/packages/blitz-rpc/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@blitzjs/rpc",
-  "version": "2.0.0-alpha.61",
+  "version": "2.0.0-alpha.66",
  "scripts": {
    "build": "unbuild",
    "predev": "wait-on -d 250 ../blitz/dist/index-server.d.ts && wait-on -d 250 ../blitz-auth/dist/index-browser.d.ts",
@@ -20,31 +20,28 @@
    "dist/**"
  ],
  "dependencies": {
-    "@blitzjs/auth": "2.0.0-alpha.61",
+    "@blitzjs/auth": "2.0.0-alpha.66",
+    "@tanstack/react-query": "4.0.10",
    "b64-lite": "1.4.0",
    "bad-behavior": "1.0.1",
    "chalk": "^4.1.0",
    "debug": "4.3.3",
-    "react-query": "3.39.0",
    "superjson": "1.8.0",
-    "zod": "3.17.3"
+    "supports-color": "8.1.1"
  },
  "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.61",
+    "@blitzjs/config": "workspace:2.0.0-alpha.66",
    "@types/debug": "4.1.7",
    "@types/react": "18.0.1",
    "@types/react-dom": "17.0.14",
-    "blitz": "2.0.0-alpha.61",
+    "blitz": "2.0.0-alpha.66",
    "next": "12.2.0",
    "react": "18.0.0",
    "react-dom": "18.0.0",
    "typescript": "^4.5.3",
-    "unbuild": "0.6.9",
-    "watch": "1.0.2"
-  },
-  "peerDependencies": {
-    "blitz": "2.0.0-alpha.61",
-    "next": ">=12.2.0"
+    "unbuild": "0.7.6",
+    "watch": "1.0.2",
+    "zod": "3.17.3"
  },
  "publishConfig": {
    "access": "public"
--- a/packages/blitz-rpc/src/data-client/index.ts
+++ b/packages/blitz-rpc/src/data-client/index.ts
@@ -8,7 +8,11 @@ export {
  setQueryData,
  getQueryClient,
 } from "./react-query-utils"
-export {useQueryErrorResetBoundary, QueryClient} from "react-query"
-export {dehydrate} from "react-query/hydration"
+export {
+  useQueryErrorResetBoundary,
+  QueryClientProvider,
+  QueryClient,
+  dehydrate,
+} from "@tanstack/react-query"
 export {invoke} from "./invoke"
 export {invokeWithCtx} from "./invokeWithCtx"
--- a/packages/blitz-rpc/src/data-client/react-query-utils.ts
+++ b/packages/blitz-rpc/src/data-client/react-query-utils.ts
@@ -1,4 +1,4 @@
-import {QueryClient, QueryKey} from "react-query"
+import {QueryClient} from "@tanstack/react-query"
 import {serialize} from "superjson"
 import {isClient, isServer, AsyncFunc} from "blitz"
 import {ResolverType, RpcClient} from "./rpc"
@@ -94,7 +94,7 @@ export const validateQueryFn = <TInput, TResult>(
 ) => {
  if (isClient && !isRpcClient(queryFn) && isNotInUserTestEnvironment()) {
    throw new Error(
-      `Either the file path to your resolver is incorrect (must be in a "queries" or "mutations" folder that isn't nested inside "pages" or "api") or you are trying to use Blitz's useQuery to fetch from third-party APIs (to do that, import useQuery directly from "react-query")`,
+      `Either the file path to your resolver is incorrect (must be in a "queries" or "mutations" folder that isn't nested inside "pages" or "api") or you are trying to use Blitz's useQuery to fetch from third-party APIs (to do that, import useQuery directly from "@tanstack/react-query").`,
    )
  }
 }
@@ -169,14 +169,7 @@ export function invalidateQuery<TInput, TResult, T extends AsyncFunc>(
  }

  const fullQueryKey = getQueryKey(resolver, params)
-  let queryKey: QueryKey
-  if (params) {
-    queryKey = fullQueryKey
-  } else {
-    // Params not provided, only use first query key item (url)
-    queryKey = fullQueryKey[0]
-  }
-  return getQueryClient().invalidateQueries(queryKey)
+  return getQueryClient().invalidateQueries(fullQueryKey)
 }

 export function setQueryData<TInput, TResult, T extends AsyncFunc>(
--- a/packages/blitz-rpc/src/data-client/react-query.tsx
+++ b/packages/blitz-rpc/src/data-client/react-query.tsx
@@ -9,7 +9,7 @@ import {
  useMutation as useReactQueryMutation,
  UseMutationOptions,
  UseMutationResult,
-} from "react-query"
+} from "@tanstack/react-query"
 import {useSession} from "@blitzjs/auth"
 import {isServer, FirstParam, PromiseReturnType, AsyncFunc} from "blitz"
 import {
@@ -92,7 +92,7 @@ export function useQuery<
  })

  if (
-    queryRest.isIdle &&
+    queryRest.fetchStatus === "idle" &&
    isServer &&
    suspenseEnabled !== false &&
    !data &&
@@ -178,7 +178,7 @@ export function usePaginatedQuery<
  })

  if (
-    queryRest.isIdle &&
+    queryRest.fetchStatus === "idle" &&
    isServer &&
    suspenseEnabled !== false &&
    !data &&
@@ -275,7 +275,7 @@ export function useInfiniteQuery<
  })

  if (
-    queryRest.isIdle &&
+    queryRest.fetchStatus === "idle" &&
    isServer &&
    suspenseEnabled !== false &&
    !data &&
--- a/packages/blitz-rpc/src/global.ts
+++ b/packages/blitz-rpc/src/global.ts
@@ -1,4 +1,4 @@
-import {QueryClient} from "react-query"
+import {QueryClient} from "@tanstack/react-query"

 declare global {
  var queryClient: QueryClient
--- a/packages/blitz-rpc/src/index-browser.tsx
+++ b/packages/blitz-rpc/src/index-browser.tsx
@@ -1,6 +1,6 @@
 import "./global"
 import {createClientPlugin} from "blitz"
-import {DefaultOptions, QueryClient} from "react-query"
+import {DefaultOptions, QueryClient} from "@tanstack/react-query"

 export * from "./data-client/index"

@@ -21,7 +21,7 @@ export const BlitzRpcPlugin = createClientPlugin<BlitzRpcOptions, {queryClient:
          ...reactQueryOptions,
          queries: {
            ...(typeof window === "undefined" && {cacheTime: 0}),
-            retry: (failureCount, error: any) => {
+            retry: (failureCount: number, error: any) => {
              if (process.env.NODE_ENV !== "production") return false

              // Retry (max. 3 times) only if network error detected
--- a/packages/blitz-rpc/src/index-server.ts
+++ b/packages/blitz-rpc/src/index-server.ts
@@ -68,6 +68,11 @@ interface WebpackRule {

 export interface InstallWebpackConfigOptions {
  webpackConfig: {
+    resolve: {
+      alias: {
+        [key: string]: boolean
+      }
+    }
    module: {
      rules: WebpackRule[]
    }
@@ -79,6 +84,8 @@ export function installWebpackConfig({
  webpackConfig,
  webpackRuleOptions,
 }: InstallWebpackConfigOptions) {
+  webpackConfig.resolve.alias["npm-which"] = false
+  webpackConfig.resolve.alias["cross-spawn"] = false
  webpackConfig.module.rules.push({
    test: /[\\/]\[\[\.\.\.blitz]]\.[jt]sx?$/,
    use: [
--- a/packages/blitz/CHANGELOG.md
+++ b/packages/blitz/CHANGELOG.md
@@ -1,5 +1,52 @@
 # blitz

+## 2.0.0-alpha.66
+
+### Patch Changes
+
+- 928e840b: Fixes loading production env variables by default for blitz build command
+- 240f3f34: Add BlitzServerMiddleware utility function to wrap middleware in blitz server file
+- 55b1cb20: Runs the codegen on the blitz build command
+- 4d7d126d: Run `prisma generate` as a `blitz codegen` step if "prisma" is found in project's dependencies
+- 890b0c0c: Improve `blitz new` messaging and fix minor issues
+- 807a2b56: Fixes peer dependency warnings
+- a3e6c49c: Fixes the supports-color warning for pnpm
+- Updated dependencies [91aa5356]
+- Updated dependencies [890b0c0c]
+- Updated dependencies [807a2b56]
+- Updated dependencies [a3e6c49c]
+- Updated dependencies [065db256]
+- Updated dependencies [f202aac1]
+  - @blitzjs/generator@2.0.0-alpha.66
+
+## 2.0.0-alpha.65
+
+### Patch Changes
+
+- dd5f5174: Fix `enhancePrisma is undefined` errors by moving the utility function to a browser entrypoint
+  - @blitzjs/generator@2.0.0-alpha.65
+
+## 2.0.0-alpha.64
+
+### Patch Changes
+
+- 54db8a46: Add missing value to "skip" option when choosing a package manager during new app scaffolding
+- 62bf12b5: Fix blitz codegen to work with monorepos
+  - @blitzjs/generator@2.0.0-alpha.64
+
+## 2.0.0-alpha.63
+
+### Patch Changes
+
+- @blitzjs/generator@2.0.0-alpha.63
+
+## 2.0.0-alpha.62
+
+### Patch Changes
+
+- 365e6709: Fixes the db seed command so that the database can disconnect after running the seed file.
+  - @blitzjs/generator@2.0.0-alpha.62
+
 ## 2.0.0-alpha.61

 ### Patch Changes
--- a/packages/blitz/build.config.ts
+++ b/packages/blitz/build.config.ts
@@ -2,7 +2,7 @@ import {BuildConfig} from "unbuild"

 const config: BuildConfig = {
  entries: ["./src/index-browser", "./src/index-server", "./src/cli/index"],
-  externals: ["index-browser.cjs", "index-browser.mjs", "index.cjs", "zod"],
+  externals: ["index-browser.cjs", "index-browser.mjs", "index.cjs", "zod", "react"],
  declaration: true,
  rollup: {
    emitCJS: true,
--- a/packages/blitz/package.json
+++ b/packages/blitz/package.json
@@ -1,6 +1,6 @@
 {
  "name": "blitz",
-  "version": "2.0.0-alpha.61",
+  "version": "2.0.0-alpha.66",
  "scripts": {
    "build": "unbuild",
    "dev": "watch unbuild src --wait=0.2",
@@ -23,7 +23,7 @@
    "blitz": "bin/blitz"
  },
  "dependencies": {
-    "@blitzjs/generator": "2.0.0-alpha.61",
+    "@blitzjs/generator": "2.0.0-alpha.66",
    "arg": "5.0.1",
    "boxen": "7.0.0",
    "chalk": "^4.1.0",
@@ -48,13 +48,14 @@
    "resolve-cwd": "3.0.0",
    "resolve-from": "5.0.0",
    "superjson": "1.8.0",
+    "supports-color": "8.1.1",
    "ts-node": "10.7.0",
    "tsconfig-paths": "4.0.0",
    "tslog": "3.3.1",
    "watchpack": "2.1.1"
  },
  "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.61",
+    "@blitzjs/config": "workspace:2.0.0-alpha.66",
    "@types/cookie": "0.4.1",
    "@types/cross-spawn": "6.0.2",
    "@types/debug": "4.1.7",
@@ -74,13 +75,10 @@
    "react": "18.0.0",
    "test-listen": "1.1.0",
    "typescript": "^4.5.3",
-    "unbuild": "0.6.9",
+    "unbuild": "0.7.6",
    "watch": "1.0.2",
    "zod": "3.17.3"
  },
-  "peerDependencies": {
-    "react": "*"
-  },
  "publishConfig": {
    "access": "public"
  }
--- a/packages/blitz/src/cli/commands/codegen.ts
+++ b/packages/blitz/src/cli/commands/codegen.ts
@@ -1,37 +1,14 @@
 import {CliCommand} from "../index"
-/* @ts-ignore */
-import {generateManifest} from "../utils/routes-manifest"
-import resolveCwd from "resolve-cwd"
-import {join} from "path"
-import fs from "fs-extra"
+import {codegenTasks} from "../utils/codegen-tasks"

 const codegen: CliCommand = async () => {
  try {
-    /* 
-      Updates the user's nextjs file and adds onRecoverableError to the hydrateRoot 3rd parameter object.
-      We can remove this when https://github.com/vercel/next.js/pull/38207 is merged into next.js
-    */
-    const nextDir = await resolveCwd("next")
-    const nextClientIndex = join(nextDir, "../..", "client", "index.js")
-    const readFile = await fs.readFile(nextClientIndex)
-    const updatedFile = readFile
-      .toString()
-      .replace(
-        /ReactDOM\.hydrateRoot\(.*?\);/,
-        `ReactDOM.hydrateRoot(domEl, reactEl, process.env.NODE_ENV === 'development' ? {onRecoverableError: (err) => err.toString().includes("could not finish this Suspense boundary") ? null : console.error(err)} : undefined);`,
-      )
-    await fs.writeFile(nextClientIndex, updatedFile)
+    await codegenTasks()
+    process.exit(0)
  } catch (err) {
    console.log(err)
+    process.exit(1)
  }
-
-  try {
-    await generateManifest()
-  } catch (err) {
-    console.log(err)
-  }
-
-  process.exit(0)
 }

 export {codegen}
--- a/packages/blitz/src/cli/commands/db.ts
+++ b/packages/blitz/src/cli/commands/db.ts
@@ -51,7 +51,7 @@ const runSeed = async (seedBasePath: string) => {
    throw err
  }

-  const db = require(dbPath)
+  const db = require(dbPath).default
  await db.$disconnect()
  console.log("Done Seeding")
 }
--- a/packages/blitz/src/cli/commands/new.ts
+++ b/packages/blitz/src/cli/commands/new.ts
@@ -6,20 +6,18 @@ import hasbin from "hasbin"
 import {CliCommand} from "../index"
 import arg from "arg"
 import {AppGenerator, AppGeneratorOptions, getLatestVersion} from "@blitzjs/generator"
-import {runPrisma} from "../../prisma-utils"
 import {checkLatestVersion} from "../utils/check-latest-version"
+import {runPrisma} from "../../run-prisma"

-const forms = {
-  "react-final-form": "React Final Form" as const,
-  "react-hook-form": "React Hook Form" as const,
-  formik: "Formik" as const,
+const forms: Record<AppGeneratorOptions["form"], string> = {
+  finalform: "React Final Form (recommended)",
+  hookform: "React Hook Form",
+  formik: "Formik",
 }

-type TForms = keyof typeof forms
-
 const language = {
  typescript: "TypeScript",
-  javascript: "Javascript",
+  javascript: "JavaScript",
 }

 type TLanguage = keyof typeof language
@@ -75,7 +73,7 @@ const args = arg(
 let projectName: string = ""
 let projectPath: string = ""
 let projectLanguage: string | TLanguage = ""
-let projectFormLib: AppGeneratorOptions["form"] = undefined
+let projectFormLib: AppGeneratorOptions["form"] = "finalform"
 let projectTemplate: AppGeneratorOptions["template"] = templates.full
 let projectPkgManger: TPkgManager = PREFERABLE_PKG_MANAGER
 let shouldInstallDeps: boolean = true
@@ -110,7 +108,7 @@ const determineLanguage = async () => {
    const res = await prompts({
      type: "select",
      name: "language",
-      message: "Pick which language you'd like to use for your new blitz project",
+      message: "Pick a new project's language",
      initial: 0,
      choices: Object.entries(language).map((c) => {
        return {title: c[1], value: c[1]}
@@ -129,16 +127,16 @@ const determineFormLib = async () => {
    const res = await prompts({
      type: "select",
      name: "form",
-      message: "Pick which form you'd like to use for your new blitz project",
+      message: "Pick a form library (you can switch to something else later if you want)",
      initial: 0,
      choices: Object.entries(forms).map((c) => {
-        return {title: c[1], value: c[1]}
+        return {value: c[0], title: c[1]}
      }),
    })

    projectFormLib = res.form
  } else {
-    projectFormLib = forms[args["--form"] as TForms]
+    projectFormLib = args["--form"] as AppGeneratorOptions["form"]
  }
 }

@@ -148,14 +146,17 @@ const determineTemplate = async () => {
    !args["--template"] ||
    (args["--template"] && !Object.keys(templates).includes(args["--template"].toLowerCase()))
  ) {
+    const choices: Array<{value: keyof typeof templates; title: string}> = [
+      {value: "full", title: "Full - includes DB and auth (Recommended)"},
+      {value: "minimal", title: "Minimal — no DB, no auth"},
+    ]
+
    const res = await prompts({
      type: "select",
      name: "template",
-      message: "Pick which template you'd like to use for your new blitz project",
+      message: "Pick your new app template",
      initial: 0,
-      choices: Object.entries(templates).map((c) => {
-        return {title: c[0], value: c[0]}
-      }),
+      choices,
    })

    projectTemplate = templates[res.template as TTemplate]
@@ -199,11 +200,15 @@ const determinePkgManagerToInstallDeps = async () => {
          {title: "npm", value: "npm"},
          {title: "yarn", value: "yarn", disabled: !IS_YARN_INSTALLED},
          {title: "pnpm", value: "pnpm", disabled: !IS_PNPM_INSTALLED},
-          {title: "skip"},
+          {title: "skip", value: "skip"},
        ],
      })

-      projectPkgManger = res.pkgManager
+      if (res.pkgManager === "skip") {
+        projectPkgManger = PREFERABLE_PKG_MANAGER
+      } else {
+        projectPkgManger = res.pkgManager
+      }

      shouldInstallDeps = res.pkgManager !== "skip"
    } else {
--- a/packages/blitz/src/cli/commands/next/build.ts
+++ b/packages/blitz/src/cli/commands/next/build.ts
@@ -15,7 +15,7 @@ const build: CliCommand = async () => {
  const config: ServerConfig = {
    rootFolder: process.cwd(),
    inspect: nextArgs["--inspect"],
-    env: process.env.NODE_ENV === "production" ? "prod" : "dev",
+    env: "prod",
  }

  await import("../../utils/next-commands").then((i) => i.build(config))
--- a/packages/blitz/src/cli/index.ts
+++ b/packages/blitz/src/cli/index.ts
@@ -124,7 +124,6 @@ async function main() {
  if (args["--env"]) {
    process.env.APP_ENV = args["--env"]
  }
-  loadEnvConfig(process.cwd(), undefined, {error: console.error, info: console.info})

  // Version is inlined into the file using taskr build pipeline
  if (args["_"].length === 0 && args["--version"]) {
@@ -145,7 +144,7 @@ async function main() {
  }

  process.env.NODE_ENV = process.env.NODE_ENV || defaultEnv
-
+  loadEnvConfig(process.cwd(), undefined, {error: console.error, info: console.info})
  // Make sure commands gracefully respect termination signals (e.g. from Docker)
  process.on("SIGTERM", () => process.exit(0))
  process.on("SIGINT", () => process.exit(0))
--- a/packages/blitz/src/cli/utils/check-latest-version.ts
+++ b/packages/blitz/src/cli/utils/check-latest-version.ts
@@ -5,6 +5,7 @@ import fs from "fs"
 import {readVersions, resolveVersionType} from "./read-versions"
 import {getPkgManager} from "./helpers"
 import superjson from "superjson"
+import {isInternalBlitzMonorepoDevelopment} from "./helpers"

 const returnNpmEndpoint = (packageName: string) => {
  return `https://registry.npmjs.org/-/package/${packageName}/dist-tags`
@@ -21,9 +22,6 @@ function getUpdateString(packageName: string, tag: string, isGlobal?: boolean) {
      return `pnpm install${isGlobal ? " -g" : ""} ${packageName}@${tag}`
  }
 }
-const isInternalBlitzMonorepoDevelopment = fs.existsSync(
-  join(process.cwd(), "..", "..", "packages", "blitz", "dist", "chunks"),
-)

 async function findNodeModulesRoot(src: string) {
  const blitzPkgLocation = dirname(
--- a/packages/blitz/src/cli/utils/codegen-tasks.ts
+++ b/packages/blitz/src/cli/utils/codegen-tasks.ts
@@ -0,0 +1,54 @@
+import {generateManifest} from "./routes-manifest"
+import {log} from "../../logging"
+import resolveCwd from "resolve-cwd"
+import {join} from "path"
+import fs from "fs-extra"
+import {getPackageJson} from "./get-package-json"
+import {runPrisma} from "../../run-prisma"
+
+export const codegenTasks = async () => {
+  try {
+    /* 
+      Updates the user's nextjs file and adds onRecoverableError to the hydrateRoot 3rd parameter object.
+      We can remove this when https://github.com/vercel/next.js/pull/38207 is merged into next.js
+    */
+    const nextDir = await resolveCwd("next")
+    const nextClientIndex = join(nextDir, "../..", "client", "index.js")
+    const readFile = await fs.readFile(nextClientIndex)
+    const updatedFile = readFile
+      .toString()
+      .replace(
+        /ReactDOM\.hydrateRoot\(.*?\);/,
+        `ReactDOM.hydrateRoot(domEl, reactEl, process.env.NODE_ENV === 'development' ? {onRecoverableError: (err) => err.toString().includes("could not finish this Suspense boundary") ? null : console.error(err)} : undefined);`,
+      )
+    await fs.writeFile(nextClientIndex, updatedFile)
+    log.success("Next.js was successfully patched with a React Suspense fix")
+  } catch (err) {
+    log.error(JSON.stringify(err, null, 2))
+  }
+
+  try {
+    await generateManifest()
+    log.success("Routes manifest was successfully generated")
+
+    const {dependencies, devDependencies} = await getPackageJson()
+
+    const hasPrisma = Object.keys({...dependencies, ...devDependencies}).some(
+      (name) => name === "prisma",
+    )
+
+    if (hasPrisma) {
+      let prismaSpinner = log.spinner(`Generating Prisma client`).start()
+      const result = await runPrisma(["generate"], true)
+      if (result.success) {
+        prismaSpinner.succeed()
+      } else {
+        prismaSpinner.fail()
+        console.log("\n" + result.stderr)
+        process.exit(1)
+      }
+    }
+  } catch (err) {
+    log.error(JSON.stringify(err, null, 2))
+  }
+}
--- a/packages/blitz/src/cli/utils/get-package-json.ts
+++ b/packages/blitz/src/cli/utils/get-package-json.ts
@@ -0,0 +1,11 @@
+import {existsSync} from "fs"
+import {readJSON} from "fs-extra"
+import {join} from "path"
+
+export const getPackageJson = async () => {
+  const pkgJsonPath = join(process.cwd(), "package.json")
+  if (existsSync(pkgJsonPath)) {
+    return readJSON(pkgJsonPath)
+  }
+  return {}
+}
--- a/packages/blitz/src/cli/utils/helpers.ts
+++ b/packages/blitz/src/cli/utils/helpers.ts
@@ -1,4 +1,5 @@
-import {readdirSync} from "fs-extra"
+import {readdirSync, existsSync} from "fs-extra"
+import {join} from "path"

 export function getPkgManager() {
  return readdirSync(process.cwd()).includes("pnpm-lock.yaml")
@@ -7,3 +8,7 @@ export function getPkgManager() {
    ? "yarn"
    : "npm"
 }
+
+export const isInternalBlitzMonorepoDevelopment =
+  existsSync(join(process.cwd(), "..", "..", "packages", "blitz", "dist", "chunks")) &&
+  existsSync(join(process.cwd(), "..", "..", "packages", "blitz-next", "dist", "chunks"))
--- a/packages/blitz/src/cli/utils/next-commands.ts
+++ b/packages/blitz/src/cli/utils/next-commands.ts
@@ -9,17 +9,18 @@ import {
 } from "./next-utils"
 import {checkLatestVersion} from "./check-latest-version"
 import {readBlitzConfig} from "../../server-utils"
+import {codegenTasks} from "./codegen-tasks"

 export async function build(config: ServerConfig) {
  const {rootFolder, nextBin, watch} = await normalize(config)
-
+  await codegenTasks()
  await nextBuild(nextBin, rootFolder, {} as any, config)
  if (customServerExists()) await buildCustomServer({watch})
 }

 export async function dev(config: ServerConfig) {
  const {rootFolder, nextBin} = await normalize({...config, env: "dev"})
-  void checkLatestVersion()
+  // void checkLatestVersion()
  if (customServerExists()) {
    console.log("Using your custom server")

--- a/packages/blitz/src/cli/utils/routes-manifest.ts
+++ b/packages/blitz/src/cli/utils/routes-manifest.ts
@@ -6,6 +6,7 @@ import {outputFile, readdir} from "fs-extra"
 import findUp from "find-up"
 import resolveFrom from "resolve-from"
 import Watchpack from "watchpack"
+import {isInternalBlitzMonorepoDevelopment} from "./helpers"
 export const CONFIG_FILE = ".blitz.config.compiled.js"
 export const NEXT_CONFIG_FILE = "next.config.js"
 export const PHASE_PRODUCTION_SERVER = "phase-production-server"
@@ -152,9 +153,9 @@ const normalizeConfig = (phase: string, config: any) => {
 }
 const loadConfig = (pagesDir: string) => {
  let userConfigModule
+
  try {
    const path = join(pagesDir, NEXT_CONFIG_FILE)
-
    // eslint-disable-next-line no-eval -- block webpack from following this module path
    userConfigModule = eval("require")(path)
  } catch {
@@ -162,6 +163,7 @@ const loadConfig = (pagesDir: string) => {
    // In case user does not have custom config
    userConfigModule = {}
  }
+
  let userConfig = normalizeConfig(
    PHASE_PRODUCTION_SERVER,
    userConfigModule.default || userConfigModule,
@@ -485,7 +487,6 @@ export function parseDefaultExportName(contents: string): string | null {
 export async function generateManifest() {
  const config = await loadConfig(process.cwd())
  const allRoutes = await collectAllRoutes(process.cwd(), config)
-
  const routes: Record<string, RouteManifestEntry> = {}

  for (let {filePath, route, type} of allRoutes) {
@@ -527,10 +528,6 @@ export async function generateManifest() {
  })
 }

-export const isInternalBlitzMonorepoDevelopment = __dirname.match(
-  /[\\/]packages[\\/]blitz[\\/]dist[\\/]chunks$/,
-)
-
 async function findNodeModulesRoot(src: string) {
  let root: string
  if (isInternalBlitzMonorepoDevelopment) {
@@ -593,7 +590,7 @@ export async function stopWatcher(): Promise<void> {
  if (!webpackWatcher) {
    return
  }
-  console.log("stopWatcher")
+
  webpackWatcher.close()
  webpackWatcher = null
 }
--- a/packages/blitz/src/index-browser.tsx
+++ b/packages/blitz/src/index-browser.tsx
@@ -83,3 +83,4 @@ export * from "./ts-utils"
 export * from "./types"
 export * from "./errors"
 export * from "./zod-utils"
+export * from "./prisma-utils"
--- a/packages/blitz/src/index-server.ts
+++ b/packages/blitz/src/index-server.ts
@@ -7,6 +7,7 @@ import {Ctx} from "./types"
 export * from "./index-browser"
 export * from "./types"
 export * from "./prisma-utils"
+export * from "./run-prisma"
 export * from "./middleware"
 export * from "./paginate"
 export {baseLogger, newLine, log} from "./logging"
@@ -59,3 +60,11 @@ export function createSetupServer<TMiddleware extends RequestMiddleware, TExport
 ) {
  return setupServerConstructor
 }
+
+export const BlitzServerMiddleware = <
+  TMiddleware extends RequestMiddleware<any, any> = RequestMiddleware,
+>(
+  middleware: TMiddleware,
+): BlitzServerPlugin => ({
+  requestMiddlewares: [middleware],
+})
--- a/packages/blitz/src/prisma-utils.ts
+++ b/packages/blitz/src/prisma-utils.ts
@@ -1,7 +1,5 @@
 import {spawn} from "cross-spawn"
 import which from "npm-which"
-import {Readable} from "stream"
-import pEvent from "p-event"

 export interface Constructor<T = unknown> {
  new (...args: never[]): T
@@ -54,26 +52,3 @@ export const enhancePrisma = <TPrismaClientCtor extends Constructor>(
    },
  })
 }
-
-export const runPrisma = async (args: string[], silent = false) => {
-  const prismaBin = which(process.cwd()).sync("prisma")
-
-  const cp = spawn(prismaBin, args, {
-    stdio: silent ? "pipe" : "inherit",
-    env: process.env,
-  })
-
-  const cp_stderr: string[] = []
-  if (silent) {
-    cp?.stderr?.on("data", (chunk: Readable) => {
-      cp_stderr.push(chunk.toString())
-    })
-  }
-
-  const code = await pEvent(cp, "exit", {rejectionEvents: []})
-
-  return {
-    success: code === 0,
-    stderr: silent ? cp_stderr.join("") : undefined,
-  }
-}
--- a/packages/blitz/src/run-prisma.ts
+++ b/packages/blitz/src/run-prisma.ts
@@ -0,0 +1,27 @@
+import which from "npm-which"
+import pEvent from "p-event"
+import {Readable} from "stream"
+import {spawn} from "cross-spawn"
+
+export const runPrisma = async (args: string[], silent = false) => {
+  const prismaBin = which(process.cwd()).sync("prisma")
+
+  const cp = spawn(prismaBin, args, {
+    stdio: silent ? "pipe" : "inherit",
+    env: process.env,
+  })
+
+  const cp_stderr: string[] = []
+  if (silent) {
+    cp?.stderr?.on("data", (chunk: Readable) => {
+      cp_stderr.push(chunk.toString())
+    })
+  }
+
+  const code = await pEvent(cp, "exit", {rejectionEvents: []})
+
+  return {
+    success: code === 0,
+    stderr: silent ? cp_stderr.join("") : undefined,
+  }
+}
--- a/packages/codemod/CHANGELOG.md
+++ b/packages/codemod/CHANGELOG.md
@@ -1,5 +1,54 @@
 # @blitzjs/codemod

+## 2.0.0-alpha.66
+
+### Patch Changes
+
+- Updated dependencies [91aa5356]
+- Updated dependencies [928e840b]
+- Updated dependencies [240f3f34]
+- Updated dependencies [55b1cb20]
+- Updated dependencies [4d7d126d]
+- Updated dependencies [890b0c0c]
+- Updated dependencies [807a2b56]
+- Updated dependencies [a3e6c49c]
+- Updated dependencies [065db256]
+- Updated dependencies [f202aac1]
+  - @blitzjs/generator@2.0.0-alpha.66
+  - blitz@2.0.0-alpha.66
+
+## 2.0.0-alpha.65
+
+### Patch Changes
+
+- Updated dependencies [dd5f5174]
+  - blitz@2.0.0-alpha.65
+  - @blitzjs/generator@2.0.0-alpha.65
+
+## 2.0.0-alpha.64
+
+### Patch Changes
+
+- Updated dependencies [54db8a46]
+- Updated dependencies [62bf12b5]
+  - blitz@2.0.0-alpha.64
+  - @blitzjs/generator@2.0.0-alpha.64
+
+## 2.0.0-alpha.63
+
+### Patch Changes
+
+- @blitzjs/generator@2.0.0-alpha.63
+- blitz@2.0.0-alpha.63
+
+## 2.0.0-alpha.62
+
+### Patch Changes
+
+- Updated dependencies [365e6709]
+  - blitz@2.0.0-alpha.62
+  - @blitzjs/generator@2.0.0-alpha.62
+
 ## 2.0.0-alpha.61

 ### Patch Changes
--- a/packages/codemod/package.json
+++ b/packages/codemod/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@blitzjs/codemod",
-  "version": "2.0.0-alpha.61",
+  "version": "2.0.0-alpha.66",
  "scripts": {
    "build": "unbuild",
    "dev": "watch unbuild src --wait=0.2",
@@ -25,9 +25,9 @@
    "@babel/plugin-proposal-class-properties": "7.17.12",
    "@babel/plugin-syntax-jsx": "7.17.12",
    "@babel/plugin-syntax-typescript": "7.17.12",
-    "@blitzjs/generator": "2.0.0-alpha.61",
+    "@blitzjs/generator": "2.0.0-alpha.66",
    "arg": "5.0.1",
-    "blitz": "2.0.0-alpha.61",
+    "blitz": "2.0.0-alpha.66",
    "chalk": "^4.1.0",
    "cross-spawn": "7.0.3",
    "debug": "4.3.3",
@@ -42,7 +42,7 @@
    "@types/jscodeshift": "0.11.2",
    "@types/node": "17.0.16",
    "ast-types": "0.14.2",
-    "unbuild": "0.6.9",
+    "unbuild": "0.7.6",
    "watch": "1.0.2"
  },
  "publishConfig": {
--- a/packages/config/CHANGELOG.md
+++ b/packages/config/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @blitzjs/config

+## 2.0.0-alpha.66
+
+## 2.0.0-alpha.65
+
+## 2.0.0-alpha.64
+
+## 2.0.0-alpha.63
+
+## 2.0.0-alpha.62
+
 ## 2.0.0-alpha.61

 ## 2.0.0-alpha.60
--- a/packages/config/package.json
+++ b/packages/config/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@blitzjs/config",
  "private": true,
-  "version": "2.0.0-alpha.61",
+  "version": "2.0.0-alpha.66",
  "license": "MIT",
  "dependencies": {
    "@typescript-eslint/eslint-plugin": "5.9.1",
--- a/packages/generator/CHANGELOG.md
+++ b/packages/generator/CHANGELOG.md
@@ -1,5 +1,24 @@
 # @blitzjs/generator

+## 2.0.0-alpha.66
+
+### Patch Changes
+
+- 91aa5356: Include `.env.test` file to the generator templates
+- 890b0c0c: Improve `blitz new` messaging and fix minor issues
+- 807a2b56: Fixes peer dependency warnings
+- a3e6c49c: Fixes the supports-color warning for pnpm
+- 065db256: Update new app templates to use blitz-rpc's resolver function
+- f202aac1: Mocks @blitzjs/auth instead of blitz inside the forgotPassword mutation test & hardcodes blitz package version types instead of just using the alpha tag.
+
+## 2.0.0-alpha.65
+
+## 2.0.0-alpha.64
+
+## 2.0.0-alpha.63
+
+## 2.0.0-alpha.62
+
 ## 2.0.0-alpha.61

 ## 2.0.0-alpha.60
--- a/packages/generator/package.json
+++ b/packages/generator/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@blitzjs/generator",
-  "version": "2.0.0-alpha.61",
+  "version": "2.0.0-alpha.66",
  "scripts": {
    "dev": "watch unbuild src --wait=0.2",
    "build": "unbuild && pnpm build:templates",
@@ -40,12 +40,13 @@
    "pluralize": "8.0.0",
    "prettier": "^2.5.1",
    "recast": "0.20.5",
+    "supports-color": "8.1.1",
    "tslog": "3.3.1",
    "username": "5.1.0",
    "vinyl": "2.2.1"
  },
  "devDependencies": {
-    "@blitzjs/config": "2.0.0-alpha.61",
+    "@blitzjs/config": "2.0.0-alpha.66",
    "@juanm04/cpx": "2.0.1",
    "@types/babel__core": "7.1.19",
    "@types/diff": "5.0.2",
@@ -70,8 +71,5 @@
  },
  "publishConfig": {
    "access": "public"
-  },
-  "peerDependencies": {
-    "react": "*"
  }
 }
--- a/packages/generator/src/generator.ts
+++ b/packages/generator/src/generator.ts
@@ -302,7 +302,7 @@ export abstract class Generator<
      return path.join(
        __dirname,
        "..",
-        process.env.NODE_ENV === "test" ? "./templates" : "./dist/templates",
+        process.env.NODE_ENV === "test" ? "./templates" : "./templates",
        this.sourceRoot.path,
        ...paths,
      )
--- a/packages/generator/src/generators/app-generator.ts
+++ b/packages/generator/src/generators/app-generator.ts
@@ -27,7 +27,7 @@ export interface AppGeneratorOptions extends GeneratorOptions {
  version: string
  skipInstall: boolean
  skipGit: boolean
-  form?: "React Final Form" | "React Hook Form" | "Formik"
+  form?: "finalform" | "hookform" | "formik"
  onPostInstall?: () => Promise<void>
 }

@@ -126,6 +126,9 @@ export class AppGenerator extends Generator<AppGeneratorOptions> {
    pkg.dependencies = newDependencies
    pkg.devDependencies = newDevDependencies
    pkg.dependencies.blitz = blitzDependencyVersion
+    pkg.dependencies["@blitzjs/next"] = blitzDependencyVersion
+    pkg.dependencies["@blitzjs/rpc"] = blitzDependencyVersion
+    pkg.dependencies["@blitzjs/auth"] = blitzDependencyVersion

    const fallbackUsed = dependenciesUsedFallback || devDependenciesUsedFallback

@@ -299,21 +302,18 @@ export class AppGenerator extends Generator<AppGeneratorOptions> {
    assert(pkg, "couldn't find package.json")

    const ext = this.options.useTs ? "tsx" : "js"
-    let type: string = ""

-    switch (this.options.form) {
-      case "React Final Form":
-        type = "finalform"
+    const type = this.options.form
+    switch (type) {
+      case "finalform":
        pkg.dependencies["final-form"] = "4.x"
        pkg.dependencies["react-final-form"] = "6.x"
        break
-      case "React Hook Form":
-        type = "hookform"
+      case "hookform":
        pkg.dependencies["react-hook-form"] = "7.x"
        pkg.dependencies["@hookform/resolvers"] = "2.x"
        break
-      case "Formik":
-        type = "formik"
+      case "formik":
        pkg.dependencies["formik"] = "2.x"
        break
    }
--- a/packages/generator/templates/app/.env.test
+++ b/packages/generator/templates/app/.env.test
@@ -0,0 +1,5 @@
+# SQLite is ready to go out of the box, but you can switch to Postgres
+# by first changing the provider from "sqlite" to "postgres" in the Prisma
+# schema file and by second swapping the DATABASE_URL below.
+DATABASE_URL="file:./db_test.sqlite"
+# DATABASE_URL=postgresql://__username__@localhost:5432/__name___test
--- a/packages/generator/templates/app/app/auth/mutations/changePassword.ts
+++ b/packages/generator/templates/app/app/auth/mutations/changePassword.ts
@@ -1,9 +1,9 @@
 import { NotFoundError, AuthenticationError } from "blitz"
+import { resolver } from "@blitzjs/rpc"
+import { SecurePassword } from "@blitzjs/auth"
 import db from "db"
 import { authenticateUser } from "./login"
 import { ChangePassword } from "../validations"
-import { resolver } from "@blitzjs/rpc"
-import { SecurePassword } from "@blitzjs/auth"

 export default resolver.pipe(
  resolver.zod(ChangePassword),
--- a/packages/generator/templates/app/app/auth/mutations/forgotPassword.test.ts
+++ b/packages/generator/templates/app/app/auth/mutations/forgotPassword.test.ts
@@ -9,8 +9,8 @@ beforeEach(async () => {
 })

 const generatedToken = "plain-token"
-jest.mock("blitz", () => ({
-  ...jest.requireActual<Record<string, unknown>>("blitz")!,
+jest.mock("@blitzjs/auth", () => ({
+  ...jest.requireActual<Record<string, unknown>>("@blitzjs/auth")!,
  generateToken: () => generatedToken,
 }))
 jest.mock("preview-email", () => jest.fn())
--- a/packages/generator/templates/app/app/auth/mutations/resetPassword.ts
+++ b/packages/generator/templates/app/app/auth/mutations/resetPassword.ts
@@ -1,4 +1,5 @@
 import { SecurePassword, hash256 } from "@blitzjs/auth"
+import { resolver } from "@blitzjs/rpc"
 import db from "db"
 import { ResetPassword } from "../validations"
 import login from "./login"
@@ -8,10 +9,9 @@ export class ResetPasswordError extends Error {
  message = "Reset password link is invalid or it has expired."
 }

-export default async function resetPassword(input, ctx) {
-  ResetPassword.parse(input)
+export default resolver.pipe(resolver.zod(ResetPassword), async ({ password, token }, ctx) => {
  // 1. Try to find this token in the database
-  const hashedToken = hash256(input.token)
+  const hashedToken = hash256(token)
  const possibleToken = await db.token.findFirst({
    where: { hashedToken, type: "RESET_PASSWORD" },
    include: { user: true },
@@ -32,7 +32,7 @@ export default async function resetPassword(input, ctx) {
  }

  // 5. Since token is valid, now we can update the user's password
-  const hashedPassword = await SecurePassword.hash(input.password.trim())
+  const hashedPassword = await SecurePassword.hash(password.trim())
  const user = await db.user.update({
    where: { id: savedToken.userId },
    data: { hashedPassword },
@@ -42,7 +42,7 @@ export default async function resetPassword(input, ctx) {
  await db.session.deleteMany({ where: { userId: user.id } })

  // 7. Now log the user in with the new credentials
-  await login({ email: user.email, password: input.password }, ctx)
+  await login({ email: user.email, password }, ctx)

  return true
-}
+})
--- a/packages/generator/templates/app/app/auth/mutations/signup.ts
+++ b/packages/generator/templates/app/app/auth/mutations/signup.ts
@@ -1,21 +1,16 @@
-import db from "db"
 import { SecurePassword } from "@blitzjs/auth"
+import { resolver } from "@blitzjs/rpc"
+import db from "db"
 import { Role } from "types"
+import { Signup } from "../validations"

-export default async function signup(input, ctx) {
-  const blitzContext = ctx
-
-  const hashedPassword = await SecurePassword.hash((input.password as string) || "test-password")
-  const email = (input.email as string) || "test" + Math.random() + "@test.com"
+export default resolver.pipe(resolver.zod(Signup), async ({ email, password }, ctx) => {
+  const hashedPassword = await SecurePassword.hash(password.trim())
  const user = await db.user.create({
-    data: { email, hashedPassword, role: "user" },
+    data: { email: email.toLowerCase().trim(), hashedPassword, role: "USER" },
    select: { id: true, name: true, email: true, role: true },
  })

-  await blitzContext.session.$create({
-    userId: user.id,
-    role: user.role as Role,
-  })
-
-  return { userId: blitzContext.session.userId, ...user, email: input.email }
-}
+  await ctx.session.$create({ userId: user.id, role: user.role as Role })
+  return user
+})
--- a/packages/generator/templates/app/npmrc
+++ b/packages/generator/templates/app/npmrc
@@ -3,7 +3,7 @@ legacy-peer-deps=true
 strict-peer-dependencies=false
 side-effects-cache=false

-public-hoist-pattern[]=react-query
+public-hoist-pattern[]=@tanstack/react-query
 public-hoist-pattern[]=next
 public-hoist-pattern[]=secure-password
 public-hoist-pattern[]=*jest*
--- a/packages/generator/templates/minimalapp/.env.test
+++ b/packages/generator/templates/minimalapp/.env.test
@@ -0,0 +1,5 @@
+# SQLite is ready to go out of the box, but you can switch to Postgres
+# by first changing the provider from "sqlite" to "postgres" in the Prisma
+# schema file and by second swapping the DATABASE_URL below.
+DATABASE_URL="file:./db_test.sqlite"
+# DATABASE_URL=postgresql://__username__@localhost:5432/__name___test
--- a/packages/generator/templates/minimalapp/npmrc
+++ b/packages/generator/templates/minimalapp/npmrc
@@ -3,7 +3,7 @@ legacy-peer-deps=true
 strict-peer-dependencies=false
 side-effects-cache=false

-public-hoist-pattern[]=react-query
+public-hoist-pattern[]=@tanstack/react-query
 public-hoist-pattern[]=next
 public-hoist-pattern[]=secure-password
 public-hoist-pattern[]=*jest*
--- a/packages/pkg-template/package.json
+++ b/packages/pkg-template/package.json
@@ -25,12 +25,12 @@
    "@typescript-eslint/parser": "5.9.1"
  },
  "devDependencies": {
-    "@blitzjs/config": "2.0.0-alpha.61",
+    "@blitzjs/config": "2.0.0-alpha.66",
    "@types/react": "18.0.1",
    "@types/react-dom": "17.0.14",
    "react": "18.0.0",
    "typescript": "^4.5.3",
-    "unbuild": "0.6.9",
+    "unbuild": "0.7.6",
    "watch": "1.0.2"
  },
  "publishConfig": {
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
Author	SHA1	Message	Date
github-actions[bot]	414d758fe8	Version Packages (alpha) (#3653 ) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>	2022-08-05 00:04:16 +02:00
Blitz.js Bot	fce0f3135a	(meta) added @chaiwattsw as contributor	2022-08-04 17:57:34 -04:00
Chaiwat Trisuwan	9620ef6b1e	chore: move zod to devDependencies (#3674 )	2022-08-04 23:57:29 +02:00
Dillon Raphael	240f3f3471	exports BlitzServerMiddleware util function (#3671 )	2022-08-04 18:54:40 +02:00
Dillon Raphael	91aa535632	Include `.env.test` to generator templates (#3672 ) * adds env test file to generator templates	2022-08-04 18:43:13 +02:00
Aleksandra	ccb1af8d08	Avoid Next's `invalid config detected` warnings by deleting `"blitz"` key from the config object (#3670 )	2022-08-04 13:21:50 +02:00
Dillon Raphael	807a2b5645	removes peer dependencies and adds to build externals (#3667 )	2022-08-04 01:51:13 +02:00
Dillon Raphael	a3e6c49c4d	Fixes the supports-color warning for pnpm (#3666 ) * add supports-color to package.json	2022-08-04 01:13:33 +02:00
Aleksandra	4d7d126d9c	Run `prisma generate` as a `blitz codegen` step (#3662 )	2022-08-03 18:02:03 +02:00
Aleksandra	890b0c0c9d	various `blitz new` fixes and improvements (#3661 )	2022-08-03 12:46:00 +02:00
Dillon Raphael	928e840b59	Fixes loading production env variables by default for blitz build command (#3659 )	2022-08-03 01:21:58 +02:00
Dillon Raphael	55b1cb2044	runs codegen on build & remove stopWatcher console log (#3658 )	2022-08-03 01:07:44 +02:00
Blitz.js Bot	3a6677b307	(meta) updated @dillonraphael contributions	2022-08-02 16:19:49 -04:00
Dillon Raphael	f202aac183	fixes mock in forgotPassword mutation test & uses hardcoded blitz package versions instead of the alpha tag (#3655 )	2022-08-02 22:19:43 +02:00
Aleksandra	065db256d7	Update generator templates to use resolver function (#3652 )	2022-08-02 14:49:31 +02:00
github-actions[bot]	ada5cac7e3	Version Packages (alpha) (#3650 ) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Aleksandra <alexsandra.sikora@gmail.com>	2022-08-02 11:02:12 +02:00
Blitz.js Bot	e286bcb3ff	(meta) added @datner as contributor	2022-08-02 04:57:42 -04:00
Datner	dd5f51744f	Move enchancePrisma to a browser entrypoint (#3609 ) Co-authored-by: Aleksandra <alexsandra.sikora@gmail.com>	2022-08-02 10:57:37 +02:00
github-actions[bot]	99b054a44a	Version Packages (alpha) (#3645 ) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>	2022-08-01 13:11:24 +02:00
Aleksandra	54db8a46dd	Comment out version check until it's fixed & fix missing value in pkg manager options (#3647 )	2022-08-01 13:01:56 +02:00
Blitz.js Bot	6125eb7837	(meta) added @tommywong-dev as contributor	2022-08-01 05:08:00 -04:00
Dillon Raphael	62bf12b5c6	Update how cli checks if isInternalBlitzMonorepoDevelopment for codegen (#3644 ) Co-authored-by: Aleksandra <alexsandra.sikora@gmail.com>	2022-08-01 11:03:19 +02:00
github-actions[bot]	8e4580a446	Version Packages (alpha) (#3642 ) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>	2022-07-30 21:03:36 +02:00
Fran Zekan	f52ca398ee	Upgrade React-Query to V4 (#3557 )	2022-07-30 20:59:38 +02:00
github-actions[bot]	922bc276d9	Version Packages (alpha) (#3638 ) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>	2022-07-29 19:58:38 +02:00
Dillon Raphael	365e67094c	Fixes db seed command (#3639 ) * require db.default in db runSeed cli command	2022-07-29 19:51:23 +02:00
Dillon Raphael	31d7a6f413	Adds rootDir prefix to tsconfig alias module name mapper (#3634 ) Co-authored-by: beerose <alexsandra.sikora@gmail.com>	2022-07-29 11:36:43 +02:00