upgrade monorepo react to v18 alpha

Add test for Page.redirectAuthenticatedTo (#2531 )
(meta)
2026-02-06 09:00:12 -05:00 · 2021-07-05 16:37:39 -04:00 · 2021-07-05 16:21:00 -04:00 · 2021-07-05 12:50:56 -04:00 · 2021-07-05 12:45:24 -04:00 · 2021-07-05 12:09:51 -04:00
4695 changed files with 87492 additions and 130748 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -181,7 +181,8 @@
      "contributions": [
        "code",
        "maintenance",
-        "test"
+        "test",
+        "doc"
      ]
    },
    {
@@ -356,7 +357,8 @@
      "contributions": [
        "test",
        "code",
-        "review"
+        "review",
+        "doc"
      ]
    },
    {
@@ -367,7 +369,8 @@
      "contributions": [
        "code",
        "test",
-        "maintenance"
+        "maintenance",
+        "doc"
      ]
    },
    {
@@ -529,7 +532,8 @@
      "avatar_url": "https://avatars1.githubusercontent.com/u/19371989?v=4",
      "profile": "https://builtforfifty.com",
      "contributions": [
-        "code"
+        "code",
+        "doc"
      ]
    },
    {
@@ -1247,7 +1251,8 @@
      "avatar_url": "https://avatars0.githubusercontent.com/u/8682104?v=4",
      "profile": "https://github.com/konradkalemba",
      "contributions": [
-        "code"
+        "code",
+        "doc"
      ]
    },
    {
@@ -1608,7 +1613,8 @@
      "avatar_url": "https://avatars3.githubusercontent.com/u/4396533?v=4",
      "profile": "https://github.com/sakulstra",
      "contributions": [
-        "code"
+        "code",
+        "test"
      ]
    },
    {
@@ -1662,7 +1668,9 @@
      "avatar_url": "https://avatars0.githubusercontent.com/u/61833561?v=4",
      "profile": "https://tundera.dev",
      "contributions": [
-        "code"
+        "code",
+        "test",
+        "doc"
      ]
    },
    {
@@ -2005,7 +2013,8 @@
      "profile": "https://juanm04.com",
      "contributions": [
        "code",
-        "doc"
+        "doc",
+        "test"
      ]
    },
    {
@@ -2140,7 +2149,8 @@
      "avatar_url": "https://avatars.githubusercontent.com/u/35121685?v=4",
      "profile": "http://remjx.com/",
      "contributions": [
-        "doc"
+        "doc",
+        "code"
      ]
    },
    {
@@ -2187,7 +2197,8 @@
      "profile": "https://roshan.page/",
      "contributions": [
        "code",
-        "doc"
+        "doc",
+        "test"
      ]
    },
    {
@@ -2196,7 +2207,8 @@
      "avatar_url": "https://avatars.githubusercontent.com/u/877634?v=4",
      "profile": "https://kevinlangleyjr.com",
      "contributions": [
-        "code"
+        "code",
+        "doc"
      ]
    },
    {
@@ -2244,8 +2256,622 @@
      "contributions": [
        "code"
      ]
+    },
+    {
+      "login": "the-red",
+      "name": "Hisaki Akaza",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4494300?v=4",
+      "profile": "https://github.com/the-red",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "Flavyoo",
+      "name": "Flavio",
+      "avatar_url": "https://avatars.githubusercontent.com/u/14948074?v=4",
+      "profile": "http://flavioander.com/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "pbteja1998",
+      "name": "Bhanu Teja Pachipulusu",
+      "avatar_url": "https://avatars.githubusercontent.com/u/17903466?v=4",
+      "profile": "https://bhanuteja.dev/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "pavestru",
+      "name": "Pavel Struhar",
+      "avatar_url": "https://avatars.githubusercontent.com/u/10186479?v=4",
+      "profile": "https://twitter.com/pavestru",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "reo777",
+      "name": "Reo Ishiyama",
+      "avatar_url": "https://avatars.githubusercontent.com/u/42126368?v=4",
+      "profile": "https://in-thepink.com/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "tmcw",
+      "name": "Tom MacWright",
+      "avatar_url": "https://avatars.githubusercontent.com/u/32314?v=4",
+      "profile": "https://macwright.com/",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "franky47",
+      "name": "François Best",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1174092?v=4",
+      "profile": "https://francoisbest.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "FarazPatankar",
+      "name": "Faraz Patankar",
+      "avatar_url": "https://avatars.githubusercontent.com/u/10681116?v=4",
+      "profile": "https://github.com/FarazPatankar",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "ericvicenti",
+      "name": "Eric Vicenti",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1483597?v=4",
+      "profile": "https://github.com/ericvicenti",
+      "contributions": [
+        "doc",
+        "code"
+      ]
+    },
+    {
+      "login": "amdolan",
+      "name": "Alex Dolan",
+      "avatar_url": "https://avatars.githubusercontent.com/u/2552275?v=4",
+      "profile": "https://github.com/amdolan",
+      "contributions": [
+        "doc",
+        "code",
+        "test"
+      ]
+    },
+    {
+      "login": "Maastrich",
+      "name": "Mathis Pinsault",
+      "avatar_url": "https://avatars.githubusercontent.com/u/58431775?v=4",
+      "profile": "https://github.com/Maastrich",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "gstranger",
+      "name": "gstranger",
+      "avatar_url": "https://avatars.githubusercontent.com/u/36181416?v=4",
+      "profile": "https://github.com/gstranger",
+      "contributions": [
+        "code",
+        "doc"
+      ]
+    },
+    {
+      "login": "markhughes",
+      "name": "Mark Hughes",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1357323?v=4",
+      "profile": "http://twitter.com/_markeh",
+      "contributions": [
+        "code",
+        "doc"
+      ]
+    },
+    {
+      "login": "andrearizzello",
+      "name": "Andrea Rizzello",
+      "avatar_url": "https://avatars.githubusercontent.com/u/10348930?v=4",
+      "profile": "www.andrearizzello.work",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "jahredhope",
+      "name": "Jahred Hope",
+      "avatar_url": "https://avatars.githubusercontent.com/u/13903378?v=4",
+      "profile": "jahred.com.au",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "simonelnahas",
+      "name": "Simon El Nahas",
+      "avatar_url": "https://avatars.githubusercontent.com/u/29279201?v=4",
+      "profile": "simonelnahas.github.io/",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "Cristy94",
+      "name": "Buleandra Cristian",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1384885?v=4",
+      "profile": "www.usertrack.net",
+      "contributions": [
+        "doc",
+        "code"
+      ]
+    },
+    {
+      "login": "peterpalau",
+      "name": "Pedro Enrique Palau Isaac",
+      "avatar_url": "https://avatars.githubusercontent.com/u/12257885?v=4",
+      "profile": "http://palauisaac.me/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "sean-brydon",
+      "name": "sean-brydon",
+      "avatar_url": "https://avatars.githubusercontent.com/u/55134778?v=4",
+      "profile": "www.seanbrydon.me",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "Dieman89",
+      "name": "Alessandro",
+      "avatar_url": "https://avatars.githubusercontent.com/u/28837891?v=4",
+      "profile": "buonerba.dev",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "laubonghaudoi",
+      "name": "laubonghaudoi",
+      "avatar_url": "https://avatars.githubusercontent.com/u/11172180?v=4",
+      "profile": "www.jyutping.org",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "TommasoBruno99",
+      "name": "Tommaso Bruno",
+      "avatar_url": "https://avatars.githubusercontent.com/u/61512591?v=4",
+      "profile": "https://github.com/TommasoBruno99",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "antonykamp",
+      "name": "Antony",
+      "avatar_url": "https://avatars.githubusercontent.com/u/45163503?v=4",
+      "profile": "antonykamp.de",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "frontsideair",
+      "name": "Fatih Altinok",
+      "avatar_url": "https://avatars.githubusercontent.com/u/868283?v=4",
+      "profile": "https://blog.6nok.org",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "Mokshit06",
+      "name": "Mokshit Jain",
+      "avatar_url": "https://avatars.githubusercontent.com/u/50412128?v=4",
+      "profile": "https://mokshitjain.co/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "mubaidr",
+      "name": "Muhammad Ubaid Raza",
+      "avatar_url": "https://avatars.githubusercontent.com/u/2222702?v=4",
+      "profile": "https://mubaidr.github.io",
+      "contributions": [
+        "code",
+        "doc"
+      ]
+    },
+    {
+      "login": "silicontwin",
+      "name": "Nick Warren",
+      "avatar_url": "https://avatars.githubusercontent.com/u/121665?v=4",
+      "profile": "https://github.com/silicontwin",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "mlabate",
+      "name": "mlabate",
+      "avatar_url": "https://avatars.githubusercontent.com/u/17139676?v=4",
+      "profile": "https://github.com/mlabate",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "lumaxis",
+      "name": "Lukas Spieß",
+      "avatar_url": "https://avatars.githubusercontent.com/u/406937?v=4",
+      "profile": "https://github.com/lumaxis",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "dawnofmidnight",
+      "name": "DawnOfMidnight",
+      "avatar_url": "https://avatars.githubusercontent.com/u/78233879?v=4",
+      "profile": "https://dawnofmidnight.vercel.app",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "kirakik",
+      "name": "Kenza Iraki",
+      "avatar_url": "https://avatars.githubusercontent.com/u/17203119?v=4",
+      "profile": "https://www.linkedin.com/in/kenzairaki/",
+      "contributions": [
+        "test",
+        "code"
+      ]
+    },
+    {
+      "login": "agustif",
+      "name": "Agusti Fernandez",
+      "avatar_url": "https://avatars.githubusercontent.com/u/6601142?v=4",
+      "profile": "https://github.com/agustif",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Anjianto",
+      "name": "Anjianto",
+      "avatar_url": "https://avatars.githubusercontent.com/u/61521141?v=4",
+      "profile": "https://github.com/Anjianto",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "adblanc",
+      "name": "Blanc Adrien",
+      "avatar_url": "https://avatars.githubusercontent.com/u/41756894?v=4",
+      "profile": "https://adrienblanc.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "meepdeew",
+      "name": "meepdeew",
+      "avatar_url": "https://avatars.githubusercontent.com/u/43303008?v=4",
+      "profile": "https://github.com/meepdeew",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "Hardik3296",
+      "name": "Hardik Gaur",
+      "avatar_url": "https://avatars.githubusercontent.com/u/20360325?v=4",
+      "profile": "https://github.com/Hardik3296",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "acornellier",
+      "name": "acornellier",
+      "avatar_url": "https://avatars.githubusercontent.com/u/8725423?v=4",
+      "profile": "https://github.com/acornellier",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "craigglennie",
+      "name": "craigglennie",
+      "avatar_url": "https://avatars.githubusercontent.com/u/149281?v=4",
+      "profile": "https://github.com/craigglennie",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "fernvilla",
+      "name": "Fernando Villasenor",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5857808?v=4",
+      "profile": "http://www.fernvillasenor.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "swiftgaruda",
+      "name": "swiftgaruda",
+      "avatar_url": "https://avatars.githubusercontent.com/u/16741392?v=4",
+      "profile": "https://github.com/swiftgaruda",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "Patil2099",
+      "name": "Pankaj Patil",
+      "avatar_url": "https://avatars.githubusercontent.com/u/35653876?v=4",
+      "profile": "https://pplife.home.blog",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "mabadir",
+      "name": "Mina Abadir",
+      "avatar_url": "https://avatars.githubusercontent.com/u/3389914?v=4",
+      "profile": "minaabadir.ca",
+      "contributions": [
+        "code",
+        "doc",
+        "test"
+      ]
+    },
+    {
+      "login": "frankiesardo",
+      "name": "Francesco Sardo",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1476561?v=4",
+      "profile": "https://github.com/frankiesardo",
+      "contributions": [
+        "doc",
+        "code"
+      ]
+    },
+    {
+      "login": "enemycnt",
+      "name": "Nikolay",
+      "avatar_url": "https://avatars.githubusercontent.com/u/320313?v=4",
+      "profile": "https://github.com/enemycnt",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "Dipeshwagle",
+      "name": "Dipesh Wagle",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4191022?v=4",
+      "profile": "https://dipeshwagle.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "benbender",
+      "name": "Benjamin Bender",
+      "avatar_url": "https://avatars.githubusercontent.com/u/462455?v=4",
+      "profile": "https://codepoet.de",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "nimashoghi",
+      "name": "Nima Shoghi",
+      "avatar_url": "https://avatars.githubusercontent.com/u/3728170?v=4",
+      "profile": "https://nima.sh",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "chronark",
+      "name": "Andreas Thomas",
+      "avatar_url": "https://avatars.githubusercontent.com/u/18246773?v=4",
+      "profile": "https://github.com/chronark",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "guoqqqi",
+      "name": "guoqqqi",
+      "avatar_url": "https://avatars.githubusercontent.com/u/72343596?v=4",
+      "profile": "https://github.com/guoqqqi",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "timbooker",
+      "name": "Tim",
+      "avatar_url": "https://avatars.githubusercontent.com/u/612681?v=4",
+      "profile": "https://github.com/timbooker",
+      "contributions": [
+        "code",
+        "test"
+      ]
+    },
+    {
+      "login": "ormarek",
+      "name": "Marek Orłowski",
+      "avatar_url": "https://avatars.githubusercontent.com/u/16357457?v=4",
+      "profile": "http://orlowski.me/",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "AntoineGuestin",
+      "name": "Antoine G",
+      "avatar_url": "https://avatars.githubusercontent.com/u/70888750?v=4",
+      "profile": "https://github.com/AntoineGuestin",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "swinner2",
+      "name": "Sean Winner",
+      "avatar_url": "https://avatars.githubusercontent.com/u/6707308?v=4",
+      "profile": "https://github.com/swinner2",
+      "contributions": [
+        "code",
+        "test",
+        "doc"
+      ]
+    },
+    {
+      "login": "max-programming",
+      "name": "Max Programming",
+      "avatar_url": "https://avatars.githubusercontent.com/u/51731966?v=4",
+      "profile": "https://usman-s.me",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "sebastianhoitz",
+      "name": "Sebastian Hoitz",
+      "avatar_url": "https://avatars.githubusercontent.com/u/353768?v=4",
+      "profile": "https://makemake.sh",
+      "contributions": [
+        "test",
+        "code"
+      ]
+    },
+    {
+      "login": "garnerp",
+      "name": "garnerp",
+      "avatar_url": "https://avatars.githubusercontent.com/u/737307?v=4",
+      "profile": "https://github.com/garnerp",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "kivi",
+      "name": "kivi",
+      "avatar_url": "https://avatars.githubusercontent.com/u/366163?v=4",
+      "profile": "https://github.com/kivi",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "dangreaves",
+      "name": "Dan Greaves",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1036142?v=4",
+      "profile": "http://dangreaves.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "lksnmnn",
+      "name": "Lukas Neumann",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4983285?v=4",
+      "profile": "lksnmnn.com",
+      "contributions": [
+        "doc",
+        "code",
+        "test"
+      ]
+    },
+    {
+      "login": "dbachrach",
+      "name": "Dustin Bachrach",
+      "avatar_url": "https://avatars.githubusercontent.com/u/45016?v=4",
+      "profile": "dbachrach.com",
+      "contributions": [
+        "code",
+        "doc"
+      ]
+    },
+    {
+      "login": "ashikka",
+      "name": "Ashikka Gupta",
+      "avatar_url": "https://avatars.githubusercontent.com/u/58368421?v=4",
+      "profile": "https://github.com/ashikka",
+      "contributions": [
+        "code",
+        "test"
+      ]
+    },
+    {
+      "login": "deini",
+      "name": "Daniel Almaguer",
+      "avatar_url": "https://avatars.githubusercontent.com/u/2752665?v=4",
+      "profile": "https://github.com/deini",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "igeligel",
+      "name": "Kevin Peters",
+      "avatar_url": "https://avatars.githubusercontent.com/u/12736734?v=4",
+      "profile": "https://www.kevinpeters.net/about/",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "prisis",
+      "name": "Daniel Bannert",
+      "avatar_url": "https://avatars.githubusercontent.com/u/2716058?v=4",
+      "profile": "http://anolilab.de",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "benjakugler96",
+      "name": "Benja Kugler",
+      "avatar_url": "https://avatars.githubusercontent.com/u/53273645?v=4",
+      "profile": "https://benjakugler96.github.io/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "esemeniuc",
+      "name": "Eric Semeniuc",
+      "avatar_url": "https://avatars.githubusercontent.com/u/3838856?v=4",
+      "profile": "https://semeniuc.ml/",
+      "contributions": [
+        "test",
+        "code"
+      ]
    }
  ],
  "contributorsPerLine": 7,
  "skipCi": true
-}
+}
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,4 +1,3 @@
-lib
 node_modules
 reports
 *.log
@@ -26,6 +25,29 @@ eslint.config.*
 /scripts
 /types
 /recipes/*/templates
-packages/generator/templates
+/packages/generator/templates
+/packages/cli/lib
+/packages/babel-preset/src/fix-node-file-trace/tests/**
+/test/integration/**/out/**
+/nextjs/packages/create-next-app

-/nextjs
+
+// COPIED FROM nextjs/.eslintignore
+/nextjs/**/.next/**
+/nextjs/**/_next/**
+/nextjs/**/dist/**
+/nextjs/examples/**
+/nextjs/packages/next/bundles/webpack/packages/*.runtime.js
+/nextjs/packages/next/compiled/**/*
+/nextjs/packages/react-refresh-utils/**/*.js
+/nextjs/packages/react-dev-overlay/lib/**
+/nextjs/**/__tmp__/**
+/nextjs/.github/actions/next-stats-action/.work
+/nextjs/packages/next-codemod/transforms/__testfixtures__/**/*
+/nextjs/packages/next-codemod/transforms/__tests__/**/*
+/nextjs/packages/next-codemod/**/*.js
+/nextjs/packages/next-codemod/**/*.d.ts
+/nextjs/packages/next-env/**/*.d.ts
+/nextjs/test/integration/async-modules/**
+/nextjs/test/integration/eslint/**
+/nextjs/test-timings.json
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -80,6 +80,19 @@ module.exports = {
        "@typescript-eslint/no-floating-promises": "off",
      },
    },
+    {
+      files: ["examples/**"],
+      plugins: ["cypress"],
+      parserOptions: {
+        project: null,
+      },
+      env: {
+        "cypress/globals": true,
+      },
+      rules: {
+        "simple-import-sort/imports": "off",
+      },
+    },
    {
      files: ["packages/cli/src/commands/**/*"],
      rules: {
@@ -87,9 +100,11 @@ module.exports = {
      },
    },
    {
-      files: ["**/__fixtures__/**"],
+      files: ["test/**", "**/__fixtures__/**"],
      rules: {
        "import/no-default-export": "off",
+        "require-await": "off",
+        "unicorn/filename-case": "off",
      },
    },
  ],
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -2,7 +2,7 @@

 * @flybayer

-packages/cli/**/* @aem, @flybayer
-packages/generator/**/* @aem @flybayer
+# packages/cli/**/* @aem, @flybayer
+# packages/generator/**/* @aem @flybayer
 packages/generator/templates**/* @flybayer
-packages/installer/**/* @aem @flybayer
+# packages/installer/**/* @aem @flybayer
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,7 +1,6 @@
 name: Bug Report
-about: Something is not working right. Or error messages are unclear.
+description: Something is not working right. Or error messages are unclear.
 labels: "kind/bug, status/triage"
-issue_body: true
 body:
  - type: markdown
    attributes:
@@ -44,6 +43,6 @@ body:
        ```
    validations:
      required: true
-  - type: markdown
+  - type: textarea
    attributes:
-      value: "Please include below any other applicable logs and screenshots that show your problem:"
+      label: "Please include below any other applicable logs and screenshots that show your problem:"
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,10 +1,19 @@
-Closes: ??
+<!--
+Thanks for opening a PR! Your contribution is much appreciated.
+To make sure your PR is handled as smoothly as possible please:
+ - Link issue via "Closes #[issue_number]
+ - Choose & follow the right checklist for the change that you're making:
+-->
+
+Closes: ?

 ### What are the changes and their implications?

-### Checklist
+## Bug Checklist

- [ ] Changes covered by tests (tests added if needed)
- [ ] PR submitted to [blitzjs.com](https://github.com/blitz-js/blitzjs.com) for any user facing changes
+- [ ] Integration test added (see [test docs](https://blitzjs.com/docs/contributing#running-tests) if needed)

-<!-- IMPORTANT: Make sure to check the "Allow edits from maintainers" box below this window -->
+## Feature Checklist
+
+- [ ] Integration test added (see [test docs](https://blitzjs.com/docs/contributing#running-tests) if needed)
+- [ ] Documentation added/updated (submit PR to [blitzjs.com repo](https://github.com/blitz-js/blitzjs.com))
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -1,67 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
-name: "CodeQL"
-
-on:
-  push:
-    branches: [ canary, master ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ canary ]
-  schedule:
-    - cron: '31 19 * * 5'
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'javascript' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
-        # Learn more:
-        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
-
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
-
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
-
-    #- run: |
-    #   make bootstrap
-    #   make release
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
--- a/.github/workflows/compressed.yml
+++ b/.github/workflows/compressed.yml
@@ -1,9 +1,13 @@
-name: CI
+name: Size Check

 on:
  pull_request:
    branches: [master, canary]

+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
  build:
    name: Compressed Size
@@ -11,16 +15,8 @@ jobs:

    steps:
      - uses: actions/checkout@v2
-      - name: Use Node and Yarn
-        uses: actions/setup-node@v2
-        with:
-          node-version: "14"
-      - name: Install dependencies
-        run: |
-          yarn && yarn build
-        env:
-          CI: true
      - name: Count size
        uses: preactjs/compressed-size-action@v2
        with:
          repo-token: "${{ secrets.GITHUB_TOKEN }}"
+          exclude: "{./nextjs/**}"
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,14 +1,14 @@
+# https://github.com/vercel/next.js/commits/canary/.github/workflows/build_test_deploy.yml
+
 name: CI

 on:
-  push:
-    branches:
-      - master
-      - canary
  pull_request:
-    branches:
-      - master
-      - canary
+    types: [opened, synchronize]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true

 jobs:
  lint:
@@ -30,11 +30,9 @@ jobs:
          path: |
            ${{ steps.yarn-cache-dir-path.outputs.dir }}
            **/node_modules
-            /home/runner/.cache/Cypress
-            C:\Users\runneradmin\AppData\Local\Cypress\Cache
-          key: ${{ runner.os }}-${{ runner.node_version}}-yarn-v4-${{ hashFiles('yarn.lock') }}
+          key: ${{ runner.os }}-${{ runner.node_version}}-yarn-v13-${{ hashFiles('yarn.lock') }}
          restore-keys: |
-            ${{ runner.os }}-${{ runner.node_version}}-yarn-v4-
+            ${{ runner.os }}-${{ runner.node_version}}-yarn-v13-
      - name: Install dependencies
        run: yarn install --frozen-lockfile --silent
        env:
@@ -43,23 +41,31 @@ jobs:
        run: yarn manypkg check
        env:
          CI: true
+      - name: Build next.js
+        run: yarn build:nextjs
+        env:
+          CI: true
      - name: yarn lint
        run: yarn lint
        env:
          CI: true
-  build_and_test_pkgs:
-    name: Packages Tests
-    strategy:
-      matrix:
-        os: [ubuntu-latest, windows-latest]
-        node_version: [12, 15]
-    runs-on: ${{ matrix.os }}
+
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    env:
+      NEXT_TELEMETRY_DISABLED: 1
+    outputs:
+      docsChange: ${{ steps.docs-change.outputs.DOCS_CHANGE }}
    steps:
      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 25
      - name: Use Node.js
        uses: actions/setup-node@v2
        with:
-          node-version: ${{ matrix.node_version }}
+          node-version: "14"
+      - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
      - name: Get yarn cache directory path
        id: yarn-cache-dir-path
        run: echo "::set-output name=dir::$(yarn cache dir)"
@@ -69,40 +75,65 @@ jobs:
        with:
          path: |
            ${{ steps.yarn-cache-dir-path.outputs.dir }}
-            /home/runner/.cache/Cypress
-            C:\Users\runneradmin\AppData\Local\Cypress\Cache
-          key: ${{ runner.os }}-${{ runner.node_version}}-yarn-v4-${{ hashFiles('yarn.lock') }}
+            **/node_modules
+          key: ${{ runner.os }}-${{ runner.node_version}}-yarn-v13-${{ hashFiles('yarn.lock') }}
          restore-keys: |
-            ${{ runner.os }}-${{ runner.node_version}}-yarn-v4-
-      - name: Install dependencies
-        run: yarn install --frozen-lockfile --silent
-        env:
-          CI: true
+            ${{ runner.os }}-${{ runner.node_version}}-yarn-v13-
+      - run: yarn install --frozen-lockfile --check-files
+      - name: Build Packages
+        run: yarn build
+      - run: node run-tests.js --timings --write-timings -g 1/1
+        working-directory: nextjs
+      - name: Check docs only change
+        working-directory: nextjs
+        run: echo ::set-output name=DOCS_CHANGE::$(node skip-docs-change.js echo 'not-docs-only-change')
+        id: docs-change
+      - run: echo ${{steps.docs-change.outputs.DOCS_CHANGE}}
+      - uses: actions/cache@v2
+        id: cache-build
+        with:
+          path: ./*
+          key: ${{ github.sha }}
+
+  testBlitzPackages:
+    name: Blitz - Test Packages
+    needs: build
+    runs-on: ubuntu-latest
+    env:
+      NEXT_TELEMETRY_DISABLED: 1
+    steps:
+      - uses: actions/cache@v2
+        if: ${{needs.build.outputs.docsChange != 'docs only change'}}
+        id: restore-build
+        with:
+          path: ./*
+          key: ${{ github.sha }}
      - name: Setup kernel to increase watchers
        if: matrix.os == 'ubuntu-latest'
        run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
-      - name: Build packages
-        run: yarn build
-        env:
-          CI: true
      - name: Test Blitz Packages
        run: yarn testonly:packages
        env:
          CI: true
-  build_and_test_examples:
+
+  testBlitzExamples:
    timeout-minutes: 30
-    name: Example Apps Tests
+    name: Blitz - Test Example Apps
    strategy:
      matrix:
        os: [ubuntu-latest, windows-latest]
-        node_version: [12, 15]
    runs-on: ${{ matrix.os }}
+    env:
+      NEXT_TELEMETRY_DISABLED: 1
    steps:
      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 25
      - name: Use Node.js
        uses: actions/setup-node@v2
        with:
-          node-version: ${{ matrix.node_version }}
+          node-version: "14"
+      - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
      - name: Get yarn cache directory path
        id: yarn-cache-dir-path
        run: echo "::set-output name=dir::$(yarn cache dir)"
@@ -112,23 +143,237 @@ jobs:
        with:
          path: |
            ${{ steps.yarn-cache-dir-path.outputs.dir }}
-            /home/runner/.cache/Cypress
-            C:\Users\runneradmin\AppData\Local\Cypress\Cache
-          key: ${{ runner.os }}-${{ runner.node_version}}-yarn-v4-${{ hashFiles('yarn.lock') }}
+            **/node_modules
+          key: ${{ runner.os }}-${{ runner.node_version}}-yarn-v13-${{ hashFiles('yarn.lock') }}
          restore-keys: |
-            ${{ runner.os }}-${{ runner.node_version}}-yarn-v4-
-      - name: Install dependencies
-        run: yarn install --frozen-lockfile --silent
-        env:
-          CI: true
+            ${{ runner.os }}-${{ runner.node_version}}-yarn-v13-
+      - run: yarn install --frozen-lockfile --check-files
+      # - run: yarn cpy node_modules/.blitz packages/core/node_modules/.blitz
+      #   if: matrix.os == 'windows-latest'
+      - name: Build Packages
+        run: yarn build
+      # Needed to get cypress binary
+      - run: yarn cypress install
+      - name: Install sass
+        run: yarn install -W sass
      - name: Setup kernel to increase watchers
        if: matrix.os == 'ubuntu-latest'
        run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
-      - name: Build packages
-        run: yarn build
-        env:
-          CI: true
      - name: Test examples
        run: yarn testonly:examples
        env:
          CI: true
+
+  checkPrecompiled:
+    name: Check Pre-compiled
+    defaults:
+      run:
+        working-directory: nextjs
+    runs-on: ubuntu-latest
+    needs: build
+    env:
+      NEXT_TELEMETRY_DISABLED: 1
+    steps:
+      - uses: actions/cache@v2
+        if: ${{needs.build.outputs.docsChange != 'docs only change'}}
+        id: restore-build
+        with:
+          path: ./*
+          key: ${{ github.sha }}
+      - run: ./check-pre-compiled.sh
+        if: ${{needs.build.outputs.docsChange != 'docs only change'}}
+
+  testUnit:
+    name: Nextjs - Test Unit
+    defaults:
+      run:
+        working-directory: nextjs
+    runs-on: ubuntu-latest
+    needs: build
+    env:
+      NEXT_TELEMETRY_DISABLED: 1
+      NEXT_TEST_JOB: 1
+      HEADLESS: true
+    steps:
+      - uses: actions/cache@v2
+        if: ${{needs.build.outputs.docsChange != 'docs only change'}}
+        id: restore-build
+        with:
+          path: ./*
+          key: ${{ github.sha }}
+
+      - run: node run-tests.js --timings --type unit -g 1/1
+        if: ${{needs.build.outputs.docsChange != 'docs only change'}}
+
+  testIntegrationBlitz:
+    name: Blitz - Test Integration
+    runs-on: ubuntu-latest
+    needs: build
+    env:
+      NEXT_TELEMETRY_DISABLED: 1
+      NEXT_TEST_JOB: 1
+      HEADLESS: true
+    strategy:
+      fail-fast: false
+    steps:
+      - run: echo ${{needs.build.outputs.docsChange}}
+      - uses: actions/cache@v2
+        if: ${{needs.build.outputs.docsChange != 'docs only change'}}
+        id: restore-build
+        with:
+          path: ./*
+          key: ${{ github.sha }}
+
+      # TODO: remove after we fix watchpack watching too much
+      - run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
+        if: ${{needs.build.outputs.docsChange != 'docs only change'}}
+
+      - run: xvfb-run node nextjs/run-tests.js -c 3
+        if: ${{needs.build.outputs.docsChange != 'docs only change'}}
+
+  testIntegration:
+    name: Nextjs - Test Integration
+    defaults:
+      run:
+        working-directory: nextjs
+    runs-on: ubuntu-latest
+    needs: build
+    env:
+      NEXT_TELEMETRY_DISABLED: 1
+      NEXT_TEST_JOB: 1
+      HEADLESS: true
+    strategy:
+      fail-fast: false
+      matrix:
+        group: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20]
+    steps:
+      - run: echo ${{needs.build.outputs.docsChange}}
+        working-directory: ./
+      - uses: actions/cache@v2
+        if: ${{needs.build.outputs.docsChange != 'docs only change'}}
+        id: restore-build
+        with:
+          path: ./*
+          key: ${{ github.sha }}
+
+      # TODO: remove after we fix watchpack watching too much
+      - run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
+        if: ${{needs.build.outputs.docsChange != 'docs only change'}}
+
+      - run: xvfb-run node run-tests.js --timings -g ${{ matrix.group }}/20 -c 3
+        if: ${{needs.build.outputs.docsChange != 'docs only change'}}
+
+  testElectron:
+    name: Nextjs - Test Electron
+    defaults:
+      run:
+        working-directory: nextjs
+    runs-on: ubuntu-latest
+    needs: build
+    env:
+      NEXT_TELEMETRY_DISABLED: 1
+      NEXT_TEST_JOB: 1
+      HEADLESS: true
+      TEST_ELECTRON: 1
+    steps:
+      - uses: actions/cache@v2
+        if: ${{needs.build.outputs.docsChange != 'docs only change'}}
+        id: restore-build
+        with:
+          path: ./*
+          key: ${{ github.sha }}
+
+      # TODO: remove after we fix watchpack watching too much
+      - run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
+        if: ${{needs.build.outputs.docsChange != 'docs only change'}}
+
+      - run: cd test/integration/with-electron/app && yarn
+        if: ${{needs.build.outputs.docsChange != 'docs only change'}}
+
+      - run: xvfb-run node run-tests.js test/integration/with-electron/test/index.test.js
+        if: ${{needs.build.outputs.docsChange != 'docs only change'}}
+
+  testsPass:
+    name: thank you, next
+    runs-on: ubuntu-latest
+    needs:
+      [
+        checkPrecompiled,
+        testIntegration,
+        testIntegrationBlitz,
+        testUnit,
+        testBlitzPackages,
+        testBlitzExamples,
+      ]
+    steps:
+      - run: exit 0
+
+  testFirefox:
+    name: Nextjs - Test Firefox (production)
+    defaults:
+      run:
+        working-directory: nextjs
+    runs-on: ubuntu-latest
+    needs: build
+    env:
+      HEADLESS: true
+      BROWSER_NAME: "firefox"
+      NEXT_TELEMETRY_DISABLED: 1
+    steps:
+      - uses: actions/cache@v2
+        if: ${{needs.build.outputs.docsChange != 'docs only change'}}
+        id: restore-build
+        with:
+          path: ./*
+          key: ${{ github.sha }}
+      - run: node run-tests.js -c 1 test/integration/production/test/index.test.js
+        if: ${{needs.build.outputs.docsChange != 'docs only change'}}
+
+  testSafari:
+    name: Nextjs - Test Safari (production)
+    defaults:
+      run:
+        working-directory: nextjs
+    runs-on: ubuntu-latest
+    needs: build
+    env:
+      BROWSERSTACK: true
+      BROWSER_NAME: "safari"
+      NEXT_TELEMETRY_DISABLED: 1
+      SKIP_LOCAL_SELENIUM_SERVER: true
+      BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USERNAME }}
+      BROWSERSTACK_ACCESS_KEY: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
+    steps:
+      - uses: actions/cache@v2
+        if: ${{needs.build.outputs.docsChange != 'docs only change'}}
+        id: restore-build
+        with:
+          path: ./*
+          key: ${{ github.sha }}
+      - run: '[[ -z "$BROWSERSTACK_ACCESS_KEY" ]] && echo "Skipping for PR" || node run-tests.js -c 1 test/integration/production/test/index.test.js'
+        if: ${{needs.build.outputs.docsChange != 'docs only change'}}
+
+  testSafariOld:
+    name: Nextjs - Test Safari 10.1 (nav)
+    defaults:
+      run:
+        working-directory: nextjs
+    runs-on: ubuntu-latest
+    needs: [build, testSafari]
+    env:
+      BROWSERSTACK: true
+      LEGACY_SAFARI: true
+      BROWSERNAME: "safari"
+      NEXT_TELEMETRY_DISABLED: 1
+      SKIP_LOCAL_SELENIUM_SERVER: true
+      BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USERNAME }}
+      BROWSERSTACK_ACCESS_KEY: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
+    steps:
+      - uses: actions/cache@v2
+        if: ${{needs.build.outputs.docsChange != 'docs only change'}}
+        id: restore-build
+        with:
+          path: ./*
+          key: ${{ github.sha }}
+      - run: '[[ -z "$BROWSERSTACK_ACCESS_KEY" ]] && echo "Skipping for PR" || node run-tests.js test/integration/production-nav/test/index.test.js'
+        if: ${{needs.build.outputs.docsChange != 'docs only change'}}
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,6 @@
 .DS_Store
 .idea
 .jest-*
-lib
 node_modules
 reports
 *.log
@@ -29,3 +28,6 @@ examples/auth2
 .idea
 .ultra.cache.json
 db.sqlite-journal
+test/integration/**/db.json
+test/**/*/out
+.blitz**
--- a/.prettierignore
+++ b/.prettierignore
@@ -4,7 +4,7 @@
 .log
 .DS_Store
 .jest-*
-lib
+packages/cli/lib
 node_modules
 reports
 *.log
@@ -19,3 +19,7 @@ bin
 !packages/blitz/src/bin
 packages/generator/templates/**
 .github/ISSUE_TEMPLATE/bug_report.md
+nextjs/packages/next/compiled/**
+
+// Because file from nextjs upstream isn't formatted properly
+nextjs/packages/next/build/webpack-config.ts
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,3 +1,35 @@
 # Contributing

 [Read the Contributing Guide at Blitzjs.com](https://blitzjs.com/docs/contributing)
+
+## Notes For Core Team
+
+### Syncing Next.js Fork
+
+1. Run `yarn push-nextjs`
+   - If it fails with an error of `git-subrepo: Can't commit: 'subrepo/nextjs' doesn't contain upstream HEAD:`, then run `yarn push-nextjs --force` (see https://github.com/ingydotnet/git-subrepo/issues/530)
+2. Create new git branch for the upgrade
+3. In the forked repo (https://github.com/blitz-js/next.js), run:
+   1. `git pull`
+   2. `git fetch --all`
+   3. `git merge v10.2.0` (change the version to be the version you are updating to)
+   4. Run `rm -rf examples && git add examples`
+   5. To resolve conflict with their version for a path, like docs, run this:
+      - `git checkout --theirs docs && git add docs`
+   6. Resolve all merge conflicts and complete merge
+   7. Run `yarn` and make sure all builds complete
+   8. Run `yarn lint` and fix any issues
+   9. `git push`
+4. Run `yarn pull next-nextjs`
+5. Run `yarn`
+6. Run `yarn manypkg check` and optionally `yarn manypkg fix` to fix any issues
+7. Under `nextjs/`, run `./check-pre-compiled.sh` and commit the changes
+8. Run `yarn build:nextjs`
+9. Run `yarn lint` - fix any issues
+10. Run `yarn build` - fix any issues
+11. Run `yarn test:nextjs-size` and update tests if there are any failures
+12. Open PR and fix any failing tests
+13. Update any references to nextjs in new code including imports like `next/image`, etc.
+14. Any doc updates needed?
+15. Merge PR
+16. `yarn push-nextjs`
--- a/CONTRIBUTOR_STATS.md
+++ b/CONTRIBUTOR_STATS.md
@@ -0,0 +1,3 @@
+# Contributor over time
+
+[![Contributor over time](https://contributor-graph-api.apiseven.com/contributors-svg?chart=contributorOverTime&repo=blitz-js/blitz)](https://www.apiseven.com/en/contributor-graph?chart=contributorOverTime&repo=blitz-js/blitz)
--- 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-238-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-304-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">
@@ -105,22 +105,40 @@ Your financial contributions help ensure Blitz continues to be developed and mai

 ### 🌱 Seedling Sponsors

-<a aria-label="React Bricks" href="https://reactbricks.com/?utm_source=blitzjs&utm_medium=sponsorship&utm_campaign=blitzjs_sponsorship">
+<table>
+  <tr>
+<td><a aria-label="React Bricks" href="https://reactbricks.com/?utm_source=blitzjs&utm_medium=sponsorship&utm_campaign=blitzjs_sponsorship">
 <img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/canary/assets/reactbricks_icon.svg" width="40px"/>
- </a>
- <a aria-label="Andreas Asprou" href="https://andreas.fyi">
+  </a></td>
+ <td><a aria-label="Andreas Asprou" href="https://andreas.fyi">
 <img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/canary/assets/andreas.jpg" width="40px"/>
-</a>
- <a aria-label="Robert Malko" href="https://github.com/malkomalko">
+</a></td>
+ <td><a aria-label="Robert Malko" href="https://github.com/malkomalko">
 <img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/canary/assets/rob_blitz.jpg" width="40px"/>
-</a>
+</a></td>
+ <td><a aria-label="Digas" href="https://digsas.com">
+<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/canary/assets/digsas.svg" width="40px"/>
+</a></td>
+ <td><a aria-label="userTrack" href="https://www.usertrack.net/?ref=blitzjs">
+<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/canary/assets/usertrack.png" width="40px"/>
+</a></td>
+  </tr>
+</table>


 ### 🥉 Bronze Sponsors

-<a aria-label="Render.com" href="https://render.com?utm_source=BlitzJS&utm_medium=sponsorship&utm_campaign=BlitzJS_Sponsorship_2020">
+<table>
+  <tr>
+<td><a aria-label="Render.com" href="https://render.com?utm_source=BlitzJS&utm_medium=sponsorship&utm_campaign=BlitzJS_Sponsorship_2020">
 <img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/canary/assets/render-logo-color2.png" width="200px">
-</a>
+</a></td>
+<td><a aria-label="RIT" href="https://rit-inc.co.jp/?utm_source=BlitzJS&utm_medium=sponsorship&utm_campaign=BlitzJS_Sponsorship_2021">
+<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/canary/assets/rit_logo.png" width="200px">
+</a></td>
+  </tr>
+</table>
+

 ### 🥈 Silver Sponsors

@@ -164,7 +182,6 @@ _Code ownership, pull request approvals and merging, etc_ (see [Maintainers L2](
 <!-- markdownlint-disable -->
 <table>
  <tr>
-    <td align="center"><a href="https://github.com/aem"><img src="https://avatars0.githubusercontent.com/u/1909883?v=4" width="100px;" alt=""/><br /><sub><b>Adam Markon</b></sub></a><br />CLI</td>
    <td align="center"><a href="http://robdrosenberg.com"><img src="https://avatars0.githubusercontent.com/u/20813991?v=4" width="100px;" alt=""/><br /><sub><b>Robert Rosenberg</b></sub></a><br />Website/Docs</td>
    <td align="center"><a href="http://simonknott.de"><img src="https://avatars1.githubusercontent.com/u/14912729?v=4" width="100px;" alt=""/><br /><sub><b>Simon Knott</b></sub></a><br />SuperJSON</td>
    <td align="center"><a href="https://juanm04.com"><img src="https://avatars0.githubusercontent.com/u/16712703?v=4" width="100px;" alt=""/><br /><sub><b>Juan Martín Seery</b></sub></a><br />Website/Docs</td>
@@ -184,19 +201,35 @@ _Issue triage, pull request triage, community encouragement and moderation, etc_
 <!-- markdownlint-disable -->
 <table>
  <tr>
-    <td align="center"><a href="https://corey-brown.com"><img src="https://avatars1.githubusercontent.com/u/12791148?v=4" width="100px;" alt=""/><br /><sub><b>Corey Brown</b></sub></a></td>
    <td align="center"><a href="http://jeremyliberman.com/"><img src="https://avatars3.githubusercontent.com/u/2754163?v=4" width="100px;" alt=""/><br /><sub><b>Jeremy Liberman</b></td>
-    <td align="center"><a href="http://jagascript.com"><img src="https://avatars0.githubusercontent.com/u/4562878?v=4" width="100px;" alt=""/><br /><sub><b>Jaga Santagostino</b></sub></a></td>
    <td align="center"><a href="https://twitter.com/nitaking_"><img src="https://avatars2.githubusercontent.com/u/10850034?v=4" width="100px;" alt=""/><br /><sub><b>Satoshi Nitawaki</b></sub></a></td>
-    <td align="center"><a href="https://twitter.com/sandulat"><img src="https://avatars2.githubusercontent.com/u/7345874?v=4" width="100px;" alt=""/><br /><sub><b>Alexandru Stratulat</b></sub></a></td>
    <td align="center"><a href="https://github.com/engelkes-finstreet"><img src="https://avatars0.githubusercontent.com/u/36962022?s=460&u=34cfc4a3d6da0a87026f6068c371779c68daa3a2&v=4" width="100px;" alt=""/><br /><sub><b>Patrick Engelkes</b></sub></a></td>
-  </tr>
-  <tr>
-    <td align="center"><a href="https://twitter.com/jdavenport97"><img src="https://avatars2.githubusercontent.com/u/1329874?v=4" width="100px;" alt=""/><br /><sub><b>Jamie Davenport</b></sub></a></td>
    <td align="center"><a href="https://twitter.com/myrondavis"><img src="https://avatars2.githubusercontent.com/u/1430136?v=4" width="100px;" alt=""/><br /><sub><b>Myron Davis</b></sub></a></td>
    <td align="center"><a href="https://twitter.com/NaReto1125_"><img src="https://avatars.githubusercontent.com/reo777" width="100px;" alt=""/><br /><sub><b>Reo Ishiyama</b></sub></a></td>
    <td align="center"><a href="https://github.com/malkomalko"><img src="https://avatars.githubusercontent.com/malkomalko" width="100px;" alt=""/><br /><sub><b>Robert Malko</b></sub></a></td>
  </tr>
+  <tr>
+    <td align="center">
+      <a href="https://kevinlangleyjr.com">
+        <img
+          src="https://avatars.githubusercontent.com/u/877634?v=4"
+          width="100px;"
+          alt=""
+        /><br />
+        <sub>
+          <b>Kevin Langley Jr.</b>
+        </sub>
+      </a>
+    </td>
+     <td align="center">
+       <a href="https://mina.ca">
+        <img src="https://avatars.githubusercontent.com/mabadir" width="100px;" alt="Mina Abadir avatar" /><br />
+          <sub>
+            <b>Mina Abadir</b>
+          </sub>
+      </a>
+    </td>
+  </tr>
 </table>
 <!-- markdownlint-enable -->
 <!-- prettier-ignore-end -->
@@ -232,7 +265,7 @@ Thanks to these wonderful people ([emoji key](https://allcontributors.org/docs/e
  </tr>
  <tr>
    <td align="center"><a href="http://gielcobben.com"><img src="https://avatars0.githubusercontent.com/u/2663212?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Giel</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=gielcobben" title="Code">💻</a></td>
-    <td align="center"><a href="http://jeremyliberman.com/"><img src="https://avatars3.githubusercontent.com/u/2754163?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jeremy Liberman</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=MrLeebo" title="Code">💻</a> <a href="#maintenance-MrLeebo" title="Maintenance">🚧</a> <a href="https://github.com/blitz-js/blitz/commits?author=MrLeebo" title="Tests">⚠️</a></td>
+    <td align="center"><a href="http://jeremyliberman.com/"><img src="https://avatars3.githubusercontent.com/u/2754163?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jeremy Liberman</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=MrLeebo" title="Code">💻</a> <a href="#maintenance-MrLeebo" title="Maintenance">🚧</a> <a href="https://github.com/blitz-js/blitz/commits?author=MrLeebo" title="Tests">⚠️</a> <a href="https://github.com/blitz-js/blitz/commits?author=MrLeebo" title="Documentation">📖</a></td>
    <td align="center"><a href="https://jimthedev.com"><img src="https://avatars0.githubusercontent.com/u/108938?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jim Cummins</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=jimthedev" title="Code">💻</a></td>
    <td align="center"><a href="http://kristinamatuska.com/"><img src="https://media-exp1.licdn.com/dms/image/C5603AQHVPAjV21gw9g/profile-displayphoto-shrink_200_200/0?e=1591228800&v=beta&t=0MlbmiYhNvGv1xjLD_fOhOFjVDZ7ltNwfGNeJ4DHedQ?s=100" width="100px;" alt=""/><br /><sub><b>Kristina Matuška</b></sub></a><br /><a href="#design" title="Design">🎨</a></td>
    <td align="center"><a href="https://github.com/jasonblalock"><img src="https://avatars0.githubusercontent.com/u/5899929?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jason Blalock</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=jasonblalock" title="Code">💻</a></td>
@@ -255,10 +288,10 @@ Thanks to these wonderful people ([emoji key](https://allcontributors.org/docs/e
    <td align="center"><a href="https://mikeattara.com"><img src="https://avatars1.githubusercontent.com/u/31483629?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mike Perry Y Attara</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=mikeattara" title="Documentation">📖</a></td>
    <td align="center"><a href="https://devanthe.dev"><img src="https://avatars0.githubusercontent.com/u/354652?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Devan</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=DevanB" title="Documentation">📖</a></td>
    <td align="center"><a href="https://github.com/jclancy93"><img src="https://avatars2.githubusercontent.com/u/7850202?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jack Clancy</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=jclancy93" title="Code">💻</a> <a href="#maintenance-jclancy93" title="Maintenance">🚧</a></td>
-    <td align="center"><a href="https://github.com/ntgussoni"><img src="https://avatars0.githubusercontent.com/u/10161067?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nicolas Torres</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=ntgussoni" title="Tests">⚠️</a> <a href="https://github.com/blitz-js/blitz/commits?author=ntgussoni" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/pulls?q=is%3Apr+reviewed-by%3Antgussoni" title="Reviewed Pull Requests">👀</a></td>
+    <td align="center"><a href="https://github.com/ntgussoni"><img src="https://avatars0.githubusercontent.com/u/10161067?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nicolas Torres</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=ntgussoni" title="Tests">⚠️</a> <a href="https://github.com/blitz-js/blitz/commits?author=ntgussoni" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/pulls?q=is%3Apr+reviewed-by%3Antgussoni" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/blitz-js/blitz/commits?author=ntgussoni" title="Documentation">📖</a></td>
  </tr>
  <tr>
-    <td align="center"><a href="http://simonknott.de"><img src="https://avatars1.githubusercontent.com/u/14912729?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Simon Knott</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=Skn0tt" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=Skn0tt" title="Tests">⚠️</a> <a href="#maintenance-Skn0tt" title="Maintenance">🚧</a></td>
+    <td align="center"><a href="http://simonknott.de"><img src="https://avatars1.githubusercontent.com/u/14912729?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Simon Knott</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=Skn0tt" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=Skn0tt" title="Tests">⚠️</a> <a href="#maintenance-Skn0tt" title="Maintenance">🚧</a> <a href="https://github.com/blitz-js/blitz/commits?author=Skn0tt" title="Documentation">📖</a></td>
    <td align="center"><a href="http://jagascript.com"><img src="https://avatars0.githubusercontent.com/u/4562878?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jaga Santagostino</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=kandros" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=kandros" title="Documentation">📖</a> <a href="#maintenance-kandros" title="Maintenance">🚧</a></td>
    <td align="center"><a href="http://www.joaoportela.com"><img src="https://avatars0.githubusercontent.com/u/1010018?v=4?s=100" width="100px;" alt=""/><br /><sub><b>João Portela</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=jportela" title="Code">💻</a></td>
    <td align="center"><a href="http://dajin.dev"><img src="https://avatars0.githubusercontent.com/u/7122182?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Da-Jin Chu</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=dajinchu" title="Code">💻</a></td>
@@ -279,7 +312,7 @@ Thanks to these wonderful people ([emoji key](https://allcontributors.org/docs/e
    <td align="center"><a href="https://www.dwightwatson.com"><img src="https://avatars3.githubusercontent.com/u/1100408?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Dwight Watson</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=dwightwatson" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=dwightwatson" title="Documentation">📖</a></td>
    <td align="center"><a href="http://is2ei.com/"><img src="https://avatars3.githubusercontent.com/u/3948353?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Horie Issei</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=is2ei" title="Code">💻</a></td>
    <td align="center"><a href="https://twitter.com/lednhatkhanh"><img src="https://avatars2.githubusercontent.com/u/9303093?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nhat Khanh</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=lednhatkhanh" title="Code">💻</a></td>
-    <td align="center"><a href="https://builtforfifty.com"><img src="https://avatars1.githubusercontent.com/u/19371989?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Abu Uzayr</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=abuuzayr" title="Code">💻</a></td>
+    <td align="center"><a href="https://builtforfifty.com"><img src="https://avatars1.githubusercontent.com/u/19371989?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Abu Uzayr</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=abuuzayr" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=abuuzayr" title="Documentation">📖</a></td>
    <td align="center"><a href="https://github.com/nabi009"><img src="https://avatars0.githubusercontent.com/u/3170831?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nabiullah elham</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=nabi009" title="Code">💻</a></td>
    <td align="center"><a href="https://lachlanjc.com"><img src="https://avatars1.githubusercontent.com/u/5074763?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Lachlan Campbell</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=lachlanjc" title="Code">💻</a></td>
    <td align="center"><a href="http://enzoferey.com"><img src="https://avatars1.githubusercontent.com/u/10673347?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Enzo Ferey</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=enzoferey" title="Code">💻</a></td>
@@ -378,7 +411,7 @@ Thanks to these wonderful people ([emoji key](https://allcontributors.org/docs/e
    <td align="center"><a href="https://github.com/phillippschmedt"><img src="https://avatars0.githubusercontent.com/u/16028406?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Phillipp Schmedt</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=phillippschmedt" title="Code">💻</a></td>
    <td align="center"><a href="https://haspar.us"><img src="https://avatars0.githubusercontent.com/u/15332326?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Piotr Monwid-Olechnowicz</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=hasparus" title="Code">💻</a></td>
    <td align="center"><a href="https://mizchi.dev"><img src="https://avatars2.githubusercontent.com/u/73962?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kotaro Chikuba</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=mizchi" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=mizchi" title="Tests">⚠️</a></td>
-    <td align="center"><a href="https://github.com/konradkalemba"><img src="https://avatars0.githubusercontent.com/u/8682104?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Konrad Kalemba</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=konradkalemba" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/konradkalemba"><img src="https://avatars0.githubusercontent.com/u/8682104?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Konrad Kalemba</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=konradkalemba" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=konradkalemba" title="Documentation">📖</a></td>
    <td align="center"><a href="https://github.com/Alucard17"><img src="https://avatars1.githubusercontent.com/u/26205172?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Alucard17</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=Alucard17" title="Code">💻</a></td>
    <td align="center"><a href="https://github.com/Dohxis"><img src="https://avatars2.githubusercontent.com/u/8768909?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Domantas Mauruča</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=Dohxis" title="Tests">⚠️</a> <a href="https://github.com/blitz-js/blitz/commits?author=Dohxis" title="Code">💻</a></td>
    <td align="center"><a href="https://sandulat.com/"><img src="https://avatars0.githubusercontent.com/u/7345874?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stratulat Alexandru</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=sandulat" title="Code">💻</a> <a href="#maintenance-sandulat" title="Maintenance">🚧</a></td>
@@ -429,13 +462,13 @@ Thanks to these wonderful people ([emoji key](https://allcontributors.org/docs/e
    <td align="center"><a href="http://kwao.io"><img src="https://avatars2.githubusercontent.com/u/8839514?v=4?s=100" width="100px;" alt=""/><br /><sub><b>William Kwao</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=williamkwao" title="Documentation">📖</a></td>
  </tr>
  <tr>
-    <td align="center"><a href="https://github.com/sakulstra"><img src="https://avatars3.githubusercontent.com/u/4396533?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Lukas Strassel</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=sakulstra" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/sakulstra"><img src="https://avatars3.githubusercontent.com/u/4396533?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Lukas Strassel</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=sakulstra" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=sakulstra" title="Tests">⚠️</a></td>
    <td align="center"><a href="https://thibpat.com"><img src="https://avatars3.githubusercontent.com/u/494686?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thibaut Patel</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=tpatel" title="Code">💻</a></td>
    <td align="center"><a href="http://jonstuebe.com"><img src="https://avatars0.githubusercontent.com/u/156722?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jon Stuebe</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=jonstuebe" title="Code">💻</a></td>
    <td align="center"><a href="https://ugogo.dev"><img src="https://avatars2.githubusercontent.com/u/5040476?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ugo Onali</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=ugogo" title="Documentation">📖</a></td>
    <td align="center"><a href="https://saintmalik.me"><img src="https://avatars1.githubusercontent.com/u/37118134?v=4?s=100" width="100px;" alt=""/><br /><sub><b>SaintMalik</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=saintmalik" title="Documentation">📖</a></td>
    <td align="center"><a href="https://khaledgarbaya.net"><img src="https://avatars1.githubusercontent.com/u/1156093?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Khaled Garbaya</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=Khaledgarbaya" title="Code">💻</a></td>
-    <td align="center"><a href="https://tundera.dev"><img src="https://avatars0.githubusercontent.com/u/61833561?v=4?s=100" width="100px;" alt=""/><br /><sub><b>tundera</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=tundera" title="Code">💻</a></td>
+    <td align="center"><a href="https://tundera.dev"><img src="https://avatars0.githubusercontent.com/u/61833561?v=4?s=100" width="100px;" alt=""/><br /><sub><b>tundera</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=tundera" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=tundera" title="Tests">⚠️</a> <a href="https://github.com/blitz-js/blitz/commits?author=tundera" title="Documentation">📖</a></td>
  </tr>
  <tr>
    <td align="center"><a href="https://github.com/markylaing"><img src="https://avatars2.githubusercontent.com/u/41469221?v=4?s=100" width="100px;" alt=""/><br /><sub><b>markylaing</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=markylaing" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=markylaing" title="Documentation">📖</a></td>
@@ -484,7 +517,7 @@ Thanks to these wonderful people ([emoji key](https://allcontributors.org/docs/e
  </tr>
  <tr>
    <td align="center"><a href="http://aleksandra.codes"><img src="https://avatars.githubusercontent.com/u/9019397?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Aleksandra Sikora</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=beerose" title="Code">💻</a></td>
-    <td align="center"><a href="https://juanm04.com"><img src="https://avatars.githubusercontent.com/u/16712703?v=4?s=100" width="100px;" alt=""/><br /><sub><b>JuanM04</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=JuanM04" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=JuanM04" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://juanm04.com"><img src="https://avatars.githubusercontent.com/u/16712703?v=4?s=100" width="100px;" alt=""/><br /><sub><b>JuanM04</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=JuanM04" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=JuanM04" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=JuanM04" title="Tests">⚠️</a></td>
    <td align="center"><a href="https://github.com/arenddeboer"><img src="https://avatars.githubusercontent.com/u/7022204?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Arend de Boer</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=arenddeboer" title="Documentation">📖</a></td>
    <td align="center"><a href="https://github.com/fmilani"><img src="https://avatars.githubusercontent.com/u/1580375?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Felipe Milani</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=fmilani" title="Documentation">📖</a></td>
    <td align="center"><a href="http://nxhx.org"><img src="https://avatars.githubusercontent.com/u/13018?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Joe Edelman</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=jxe" title="Code">💻</a></td>
@@ -503,21 +536,107 @@ Thanks to these wonderful people ([emoji key](https://allcontributors.org/docs/e
  <tr>
    <td align="center"><a href="http://aditsachde.com"><img src="https://avatars.githubusercontent.com/u/23707194?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Adit Sachde</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=aditsachde" title="Documentation">📖</a></td>
    <td align="center"><a href="https://github.com/hirenchauhan2"><img src="https://avatars.githubusercontent.com/u/8999668?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Hiren Chauhan</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=hirenchauhan2" title="Code">💻</a></td>
-    <td align="center"><a href="http://remjx.com/"><img src="https://avatars.githubusercontent.com/u/35121685?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mark Jackson</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=remjx" title="Documentation">📖</a></td>
+    <td align="center"><a href="http://remjx.com/"><img src="https://avatars.githubusercontent.com/u/35121685?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mark Jackson</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=remjx" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=remjx" title="Code">💻</a></td>
    <td align="center"><a href="https://lewisb.cloud/"><img src="https://avatars.githubusercontent.com/u/51877955?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Lewis Blackburn</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=lewisblackburn" title="Documentation">📖</a></td>
    <td align="center"><a href="https://github.com/FDiskas"><img src="https://avatars.githubusercontent.com/u/468006?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vytenis</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=FDiskas" title="Code">💻</a></td>
    <td align="center"><a href="https://portfolio.matthieupetit.com"><img src="https://avatars.githubusercontent.com/u/12969089?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Matthieu</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=matthieu994" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=matthieu994" title="Tests">⚠️</a></td>
    <td align="center"><a href="https://github.com/mitchazj"><img src="https://avatars.githubusercontent.com/u/15032956?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mitchell Johnson</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=mitchazj" title="Code">💻</a></td>
  </tr>
  <tr>
-    <td align="center"><a href="https://roshan.page/"><img src="https://avatars.githubusercontent.com/u/31125563?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Roshan Manuel</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=Roesh" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=Roesh" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://kevinlangleyjr.com"><img src="https://avatars.githubusercontent.com/u/877634?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kevin Langley Jr.</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=kevinlangleyjr" title="Code">💻</a></td>
+    <td align="center"><a href="https://roshan.page/"><img src="https://avatars.githubusercontent.com/u/31125563?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Roshan Manuel</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=Roesh" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=Roesh" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=Roesh" title="Tests">⚠️</a></td>
+    <td align="center"><a href="https://kevinlangleyjr.com"><img src="https://avatars.githubusercontent.com/u/877634?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kevin Langley Jr.</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=kevinlangleyjr" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=kevinlangleyjr" title="Documentation">📖</a></td>
    <td align="center"><a href="https://projet-test-99df0.firebaseapp.com/"><img src="https://avatars.githubusercontent.com/u/51029779?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Gabriel Picard</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=heavygabriel" title="Documentation">📖</a></td>
    <td align="center"><a href="http://ryanchenkie.com/"><img src="https://avatars.githubusercontent.com/u/1847678?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ryan Chenkie</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=chenkie" title="Documentation">📖</a></td>
    <td align="center"><a href="https://github.com/sbappan"><img src="https://avatars.githubusercontent.com/u/12586088?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Santhosh B. Appan</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=sbappan" title="Documentation">📖</a></td>
    <td align="center"><a href="http://stackoverflow.com/users/5207233/james-moran"><img src="https://avatars.githubusercontent.com/u/10858584?v=4?s=100" width="100px;" alt=""/><br /><sub><b>James Moran</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=james2406" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=james2406" title="Documentation">📖</a></td>
    <td align="center"><a href="http://fb.me/yz"><img src="https://avatars.githubusercontent.com/u/14841421?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jack Zhao</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=bugzpodder" title="Code">💻</a></td>
  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/the-red"><img src="https://avatars.githubusercontent.com/u/4494300?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Hisaki Akaza</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=the-red" title="Documentation">📖</a></td>
+    <td align="center"><a href="http://flavioander.com/"><img src="https://avatars.githubusercontent.com/u/14948074?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Flavio</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=Flavyoo" title="Code">💻</a></td>
+    <td align="center"><a href="https://bhanuteja.dev/"><img src="https://avatars.githubusercontent.com/u/17903466?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Bhanu Teja Pachipulusu</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=pbteja1998" title="Code">💻</a></td>
+    <td align="center"><a href="https://twitter.com/pavestru"><img src="https://avatars.githubusercontent.com/u/10186479?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pavel Struhar</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=pavestru" title="Code">💻</a></td>
+    <td align="center"><a href="https://in-thepink.com/"><img src="https://avatars.githubusercontent.com/u/42126368?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Reo Ishiyama</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=reo777" title="Code">💻</a></td>
+    <td align="center"><a href="https://macwright.com/"><img src="https://avatars.githubusercontent.com/u/32314?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tom MacWright</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=tmcw" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://francoisbest.com"><img src="https://avatars.githubusercontent.com/u/1174092?v=4?s=100" width="100px;" alt=""/><br /><sub><b>François Best</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=franky47" title="Code">💻</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/FarazPatankar"><img src="https://avatars.githubusercontent.com/u/10681116?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Faraz Patankar</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=FarazPatankar" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/ericvicenti"><img src="https://avatars.githubusercontent.com/u/1483597?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Eric Vicenti</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=ericvicenti" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=ericvicenti" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/amdolan"><img src="https://avatars.githubusercontent.com/u/2552275?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Alex Dolan</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=amdolan" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=amdolan" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=amdolan" title="Tests">⚠️</a></td>
+    <td align="center"><a href="https://github.com/Maastrich"><img src="https://avatars.githubusercontent.com/u/58431775?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mathis Pinsault</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=Maastrich" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/gstranger"><img src="https://avatars.githubusercontent.com/u/36181416?v=4?s=100" width="100px;" alt=""/><br /><sub><b>gstranger</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=gstranger" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=gstranger" title="Documentation">📖</a></td>
+    <td align="center"><a href="http://twitter.com/_markeh"><img src="https://avatars.githubusercontent.com/u/1357323?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mark Hughes</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=markhughes" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=markhughes" title="Documentation">📖</a></td>
+    <td align="center"><a href="www.andrearizzello.work"><img src="https://avatars.githubusercontent.com/u/10348930?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Andrea Rizzello</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=andrearizzello" title="Documentation">📖</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="jahred.com.au"><img src="https://avatars.githubusercontent.com/u/13903378?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jahred Hope</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=jahredhope" title="Documentation">📖</a></td>
+    <td align="center"><a href="simonelnahas.github.io/"><img src="https://avatars.githubusercontent.com/u/29279201?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Simon El Nahas</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=simonelnahas" title="Documentation">📖</a></td>
+    <td align="center"><a href="www.usertrack.net"><img src="https://avatars.githubusercontent.com/u/1384885?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Buleandra Cristian</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=Cristy94" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=Cristy94" title="Code">💻</a></td>
+    <td align="center"><a href="http://palauisaac.me/"><img src="https://avatars.githubusercontent.com/u/12257885?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pedro Enrique Palau Isaac</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=peterpalau" title="Code">💻</a></td>
+    <td align="center"><a href="www.seanbrydon.me"><img src="https://avatars.githubusercontent.com/u/55134778?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sean-brydon</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=sean-brydon" title="Documentation">📖</a></td>
+    <td align="center"><a href="buonerba.dev"><img src="https://avatars.githubusercontent.com/u/28837891?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Alessandro</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=Dieman89" title="Documentation">📖</a></td>
+    <td align="center"><a href="www.jyutping.org"><img src="https://avatars.githubusercontent.com/u/11172180?v=4?s=100" width="100px;" alt=""/><br /><sub><b>laubonghaudoi</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=laubonghaudoi" title="Documentation">📖</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/TommasoBruno99"><img src="https://avatars.githubusercontent.com/u/61512591?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tommaso Bruno</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=TommasoBruno99" title="Documentation">📖</a></td>
+    <td align="center"><a href="antonykamp.de"><img src="https://avatars.githubusercontent.com/u/45163503?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Antony</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=antonykamp" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://blog.6nok.org"><img src="https://avatars.githubusercontent.com/u/868283?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Fatih Altinok</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=frontsideair" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://mokshitjain.co/"><img src="https://avatars.githubusercontent.com/u/50412128?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mokshit Jain</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=Mokshit06" title="Code">💻</a></td>
+    <td align="center"><a href="https://mubaidr.github.io"><img src="https://avatars.githubusercontent.com/u/2222702?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Muhammad Ubaid Raza</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=mubaidr" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=mubaidr" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/silicontwin"><img src="https://avatars.githubusercontent.com/u/121665?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nick Warren</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=silicontwin" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/mlabate"><img src="https://avatars.githubusercontent.com/u/17139676?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mlabate</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=mlabate" title="Documentation">📖</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/lumaxis"><img src="https://avatars.githubusercontent.com/u/406937?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Lukas Spieß</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=lumaxis" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://dawnofmidnight.vercel.app"><img src="https://avatars.githubusercontent.com/u/78233879?v=4?s=100" width="100px;" alt=""/><br /><sub><b>DawnOfMidnight</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=dawnofmidnight" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://www.linkedin.com/in/kenzairaki/"><img src="https://avatars.githubusercontent.com/u/17203119?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kenza Iraki</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=kirakik" title="Tests">⚠️</a> <a href="https://github.com/blitz-js/blitz/commits?author=kirakik" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/agustif"><img src="https://avatars.githubusercontent.com/u/6601142?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Agusti Fernandez</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=agustif" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/Anjianto"><img src="https://avatars.githubusercontent.com/u/61521141?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Anjianto</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=Anjianto" title="Code">💻</a></td>
+    <td align="center"><a href="https://adrienblanc.com"><img src="https://avatars.githubusercontent.com/u/41756894?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Blanc Adrien</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=adblanc" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/meepdeew"><img src="https://avatars.githubusercontent.com/u/43303008?v=4?s=100" width="100px;" alt=""/><br /><sub><b>meepdeew</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=meepdeew" title="Documentation">📖</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/Hardik3296"><img src="https://avatars.githubusercontent.com/u/20360325?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Hardik Gaur</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=Hardik3296" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/acornellier"><img src="https://avatars.githubusercontent.com/u/8725423?v=4?s=100" width="100px;" alt=""/><br /><sub><b>acornellier</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=acornellier" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/craigglennie"><img src="https://avatars.githubusercontent.com/u/149281?v=4?s=100" width="100px;" alt=""/><br /><sub><b>craigglennie</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=craigglennie" title="Documentation">📖</a></td>
+    <td align="center"><a href="http://www.fernvillasenor.com"><img src="https://avatars.githubusercontent.com/u/5857808?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Fernando Villasenor</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=fernvilla" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/swiftgaruda"><img src="https://avatars.githubusercontent.com/u/16741392?v=4?s=100" width="100px;" alt=""/><br /><sub><b>swiftgaruda</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=swiftgaruda" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://pplife.home.blog"><img src="https://avatars.githubusercontent.com/u/35653876?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pankaj Patil</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=Patil2099" title="Documentation">📖</a></td>
+    <td align="center"><a href="minaabadir.ca"><img src="https://avatars.githubusercontent.com/u/3389914?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mina Abadir</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=mabadir" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=mabadir" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=mabadir" title="Tests">⚠️</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/frankiesardo"><img src="https://avatars.githubusercontent.com/u/1476561?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Francesco Sardo</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=frankiesardo" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=frankiesardo" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/enemycnt"><img src="https://avatars.githubusercontent.com/u/320313?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nikolay</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=enemycnt" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://dipeshwagle.com"><img src="https://avatars.githubusercontent.com/u/4191022?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Dipesh Wagle</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=Dipeshwagle" title="Code">💻</a></td>
+    <td align="center"><a href="https://codepoet.de"><img src="https://avatars.githubusercontent.com/u/462455?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Benjamin Bender</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=benbender" title="Code">💻</a></td>
+    <td align="center"><a href="https://nima.sh"><img src="https://avatars.githubusercontent.com/u/3728170?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nima Shoghi</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=nimashoghi" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/chronark"><img src="https://avatars.githubusercontent.com/u/18246773?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Andreas Thomas</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=chronark" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/guoqqqi"><img src="https://avatars.githubusercontent.com/u/72343596?v=4?s=100" width="100px;" alt=""/><br /><sub><b>guoqqqi</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=guoqqqi" title="Documentation">📖</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/timbooker"><img src="https://avatars.githubusercontent.com/u/612681?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tim</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=timbooker" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=timbooker" title="Tests">⚠️</a></td>
+    <td align="center"><a href="http://orlowski.me/"><img src="https://avatars.githubusercontent.com/u/16357457?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Marek Orłowski</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=ormarek" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/AntoineGuestin"><img src="https://avatars.githubusercontent.com/u/70888750?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Antoine G</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=AntoineGuestin" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/swinner2"><img src="https://avatars.githubusercontent.com/u/6707308?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sean Winner</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=swinner2" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=swinner2" title="Tests">⚠️</a> <a href="https://github.com/blitz-js/blitz/commits?author=swinner2" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://usman-s.me"><img src="https://avatars.githubusercontent.com/u/51731966?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Max Programming</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=max-programming" title="Code">💻</a></td>
+    <td align="center"><a href="https://makemake.sh"><img src="https://avatars.githubusercontent.com/u/353768?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sebastian Hoitz</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=sebastianhoitz" title="Tests">⚠️</a> <a href="https://github.com/blitz-js/blitz/commits?author=sebastianhoitz" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/garnerp"><img src="https://avatars.githubusercontent.com/u/737307?v=4?s=100" width="100px;" alt=""/><br /><sub><b>garnerp</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=garnerp" title="Documentation">📖</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/kivi"><img src="https://avatars.githubusercontent.com/u/366163?v=4?s=100" width="100px;" alt=""/><br /><sub><b>kivi</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=kivi" title="Code">💻</a></td>
+    <td align="center"><a href="http://dangreaves.com"><img src="https://avatars.githubusercontent.com/u/1036142?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Dan Greaves</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=dangreaves" title="Code">💻</a></td>
+    <td align="center"><a href="lksnmnn.com"><img src="https://avatars.githubusercontent.com/u/4983285?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Lukas Neumann</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=lksnmnn" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=lksnmnn" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=lksnmnn" title="Tests">⚠️</a></td>
+    <td align="center"><a href="dbachrach.com"><img src="https://avatars.githubusercontent.com/u/45016?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Dustin Bachrach</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=dbachrach" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=dbachrach" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/ashikka"><img src="https://avatars.githubusercontent.com/u/58368421?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ashikka Gupta</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=ashikka" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=ashikka" title="Tests">⚠️</a></td>
+    <td align="center"><a href="https://github.com/deini"><img src="https://avatars.githubusercontent.com/u/2752665?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Daniel Almaguer</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=deini" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://www.kevinpeters.net/about/"><img src="https://avatars.githubusercontent.com/u/12736734?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kevin Peters</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=igeligel" title="Documentation">📖</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="http://anolilab.de"><img src="https://avatars.githubusercontent.com/u/2716058?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Daniel Bannert</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=prisis" title="Code">💻</a></td>
+    <td align="center"><a href="https://benjakugler96.github.io/"><img src="https://avatars.githubusercontent.com/u/53273645?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Benja Kugler</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=benjakugler96" title="Code">💻</a></td>
+    <td align="center"><a href="https://semeniuc.ml/"><img src="https://avatars.githubusercontent.com/u/3838856?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Eric Semeniuc</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=esemeniuc" title="Tests">⚠️</a> <a href="https://github.com/blitz-js/blitz/commits?author=esemeniuc" title="Code">💻</a></td>
+  </tr>
 </table>

 <!-- markdownlint-restore -->
--- a/assets/digsas.svg
+++ b/assets/digsas.svg
@@ -0,0 +1,24 @@
+<svg width="128" height="128" viewBox="0 0 128 128" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0)">
+<path d="M79.4831 1.95572C70.2813 -0.81923 55.2811 -0.617415 46.1549 2.4098L18.6125 11.5167C9.48627 14.5313 9.38542 19.7784 18.3856 23.1588L49.9743 35.028C58.9744 38.4084 73.6217 38.194 82.5084 34.5487L110.883 22.9192C119.782 19.2739 119.53 14.0267 110.316 11.2518L79.4831 1.95572Z" fill="url(#paint0_linear)"/>
+<path d="M84.235 38.6101C75.3357 42.2554 68.0625 53.1029 68.0625 62.727V113.635C68.0625 123.259 74.9071 127.245 83.2644 122.489L109.282 107.706C117.639 102.951 124.912 91.208 125.442 81.6092L127.837 37.8281C128.366 28.2167 121.509 23.3479 112.609 26.9932L84.235 38.6101Z" fill="url(#paint1_linear)"/>
+<path d="M0.0071345 37.8409C-0.257575 28.2295 6.877 23.1211 15.8771 26.5015L47.4658 38.3707C56.466 41.7511 63.8274 52.3842 63.8274 62.0082V112.916C63.8274 122.54 56.882 126.715 48.386 122.212L17.0998 105.6C8.60392 101.085 1.44415 89.5306 1.16683 79.9192L0.0071345 37.8409Z" fill="url(#paint2_linear)"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear" x1="63.9326" y1="0" x2="63.9326" y2="124.497" gradientUnits="userSpaceOnUse">
+<stop stop-color="#036EB8"/>
+<stop offset="1" stop-color="#469196"/>
+</linearGradient>
+<linearGradient id="paint1_linear" x1="63.9326" y1="0" x2="63.9326" y2="124.497" gradientUnits="userSpaceOnUse">
+<stop stop-color="#036EB8"/>
+<stop offset="1" stop-color="#469196"/>
+</linearGradient>
+<linearGradient id="paint2_linear" x1="63.9326" y1="0" x2="63.9326" y2="124.497" gradientUnits="userSpaceOnUse">
+<stop stop-color="#036EB8"/>
+<stop offset="1" stop-color="#469196"/>
+</linearGradient>
+<clipPath id="clip0">
+<rect width="128" height="128" fill="white"/>
+</clipPath>
+</defs>
+</svg>
--- a/assets/rit_logo.png
+++ b/assets/rit_logo.png
--- a/assets/usertrack.png
+++ b/assets/usertrack.png
--- a/babel.config.js
+++ b/babel.config.js
@@ -26,4 +26,39 @@ module.exports = {
      },
    ],
  ],
+  overrides: [
+    {
+      test: "./test/**/*",
+      presets: [
+        [
+          "@babel/preset-env",
+          {
+            modules: false,
+            exclude: [
+              "@babel/plugin-transform-async-to-generator",
+              "@babel/plugin-transform-regenerator",
+            ],
+          },
+        ],
+        "blitz/babel",
+      ],
+      plugins: [],
+    },
+    {
+      test: "./nextjs/test/**/*",
+      presets: [
+        [
+          "@babel/preset-env",
+          {
+            modules: false,
+            exclude: [
+              "@babel/plugin-transform-async-to-generator",
+              "@babel/plugin-transform-regenerator",
+            ],
+          },
+        ],
+        "blitz/babel",
+      ],
+    },
+  ],
 }
--- a/examples/auth/README.md
+++ b/examples/auth/README.md
@@ -14,7 +14,7 @@ model Project {
 2. DB migrate

 ```
-blitz prisma migrate dev --preview-feature
+blitz prisma migrate dev
 ```

 3. Start the dev server
--- a/examples/auth/app/auth/components/LoginForm.tsx
+++ b/examples/auth/app/auth/components/LoginForm.tsx
@@ -4,6 +4,8 @@ import {Form, FORM_ERROR} from "app/core/components/Form"
 import login from "app/auth/mutations/login"
 import {Login} from "app/auth/validations"

+import {Routes} from ".blitz"
+
 type LoginFormProps = {
  onSuccess?: () => void
 }
@@ -38,14 +40,14 @@ export const LoginForm = (props: LoginFormProps) => {
        <LabeledTextField name="email" label="Email" placeholder="Email" />
        <LabeledTextField name="password" label="Password" placeholder="Password" type="password" />
        <div>
-          <Link href="/forgot-password">
+          <Link href={Routes.ForgotPasswordPage()}>
            <a>Forgot your password?</a>
          </Link>
        </div>
      </Form>

      <div style={{marginTop: "1rem"}}>
-        Or <Link href="/signup">Sign Up</Link>
+        Or <Link href={Routes.SignupPage()}>Sign Up</Link>
      </div>
    </div>
  )
--- a/examples/auth/app/auth/mutations/forgotPassword.test.ts
+++ b/examples/auth/app/auth/mutations/forgotPassword.test.ts
@@ -9,7 +9,7 @@ beforeEach(async () => {

 const generatedToken = "plain-token"
 jest.mock("@blitzjs/core/server", () => ({
-  ...jest.requireActual("@blitzjs/core/server")!,
+  ...jest.requireActual<object>("@blitzjs/core/server")!,
  generateToken: () => generatedToken,
 }))
 jest.mock("preview-email", () => jest.fn())
--- a/examples/auth/app/auth/mutations/login.ts
+++ b/examples/auth/app/auth/mutations/login.ts
@@ -27,3 +27,11 @@ export default resolver.pipe(resolver.zod(Login), async ({email, password}, ctx)

  return user
 })
+
+export const config = {
+  api: {
+    bodyParser: {
+      sizeLimit: "2mb",
+    },
+  },
+}
--- a/examples/auth/app/auth/pages/login.tsx
+++ b/examples/auth/app/auth/pages/login.tsx
@@ -2,6 +2,7 @@ import React from "react"
 import {useRouter, BlitzPage} from "blitz"
 import Layout from "app/core/layouts/Layout"
 import {LoginForm} from "app/auth/components/LoginForm"
+import {Routes} from ".blitz"

 const LoginPage: BlitzPage = () => {
  const router = useRouter()
@@ -10,7 +11,7 @@ const LoginPage: BlitzPage = () => {
    <div>
      <LoginForm
        onSuccess={() => {
-          const next = (router.query.next as string) ?? "/"
+          const next = router.query.next ? decodeURIComponent(router.query.next as string) : "/"
          router.push(next)
        }}
      />
@@ -18,7 +19,7 @@ const LoginPage: BlitzPage = () => {
  )
 }

-LoginPage.redirectAuthenticatedTo = "/"
+LoginPage.redirectAuthenticatedTo = Routes.Home().pathname
 LoginPage.getLayout = (page) => <Layout title="Log In">{page}</Layout>

 export default LoginPage
--- a/examples/auth/app/auth/pages/reset-password.tsx
+++ b/examples/auth/app/auth/pages/reset-password.tsx
@@ -5,6 +5,8 @@ import {Form, FORM_ERROR} from "app/core/components/Form"
 import {ResetPassword} from "app/auth/validations"
 import resetPassword from "app/auth/mutations/resetPassword"

+import {Routes} from ".blitz"
+
 const ResetPasswordPage: BlitzPage = () => {
  const query = useRouterQuery()
  const [resetPasswordMutation, {isSuccess}] = useMutation(resetPassword)
@@ -17,7 +19,7 @@ const ResetPasswordPage: BlitzPage = () => {
        <div>
          <h2>Password Reset Successfully</h2>
          <p>
-            Go to the <Link href="/">homepage</Link>
+            Go to the <Link href={Routes.Home()}>homepage</Link>
          </p>
        </div>
      ) : (
--- a/examples/auth/app/auth/validations.ts
+++ b/examples/auth/app/auth/validations.ts
@@ -1,4 +1,4 @@
-import * as z from "zod"
+import {z} from "zod"

 const password = z.string().min(10).max(100)

--- a/examples/auth/app/core/components/Form.tsx
+++ b/examples/auth/app/core/components/Form.tsx
@@ -1,6 +1,7 @@
 import React, {ReactNode, PropsWithoutRef} from "react"
 import {Form as FinalForm, FormProps as FinalFormProps} from "react-final-form"
-import * as z from "zod"
+import {z} from "zod"
+import {validateZodSchema} from "blitz"
 export {FORM_ERROR} from "final-form"

 export interface FormProps<S extends z.ZodType<any, any>>
@@ -25,14 +26,7 @@ export function Form<S extends z.ZodType<any, any>>({
  return (
    <FinalForm
      initialValues={initialValues}
-      validate={(values) => {
-        if (!schema) return
-        try {
-          schema.parse(values)
-        } catch (error) {
-          return error.formErrors.fieldErrors
-        }
-      }}
+      validate={validateZodSchema(schema)}
      onSubmit={onSubmit}
      render={({handleSubmit, submitting, submitError}) => (
        <form onSubmit={handleSubmit} className="form" {...props}>
--- a/examples/auth/app/pages/_app.tsx
+++ b/examples/auth/app/pages/_app.tsx
@@ -1,31 +1,26 @@
 import {
  AppProps,
+  ErrorBoundary,
  ErrorComponent,
-  useRouter,
  AuthenticationError,
  AuthorizationError,
  ErrorFallbackProps,
+  useQueryErrorResetBoundary,
 } from "blitz"
-import {ErrorBoundary} from "react-error-boundary"
-import {queryCache} from "react-query"
 import LoginForm from "app/auth/components/LoginForm"
+import {ReactQueryDevtools} from "react-query/devtools"

 export default function App({Component, pageProps}: AppProps) {
  const getLayout = Component.getLayout || ((page) => page)
-  const router = useRouter()
+  const {reset} = useQueryErrorResetBoundary()

  return (
-    <ErrorBoundary
-      FallbackComponent={RootErrorFallback}
-      resetKeys={[router.asPath]}
-      onReset={() => {
-        // This ensures the Blitz useQuery hooks will automatically refetch
-        // data any time you reset the error boundary
-        queryCache.resetErrorBoundaries()
-      }}
-    >
-      {getLayout(<Component {...pageProps} />)}
-    </ErrorBoundary>
+    <>
+      <ErrorBoundary FallbackComponent={RootErrorFallback} onReset={reset}>
+        {getLayout(<Component {...pageProps} />)}
+      </ErrorBoundary>
+      <ReactQueryDevtools />
+    </>
  )
 }

@@ -41,7 +36,10 @@ function RootErrorFallback({error, resetErrorBoundary}: ErrorFallbackProps) {
    )
  } else {
    return (
-      <ErrorComponent statusCode={error.statusCode || 400} title={error.message || error.name} />
+      <ErrorComponent
+        statusCode={(error as any)?.statusCode || 400}
+        title={error.message || error.name}
+      />
    )
  }
 }
--- a/examples/auth/app/pages/index.test.tsx
+++ b/examples/auth/app/pages/index.test.tsx
@@ -2,7 +2,7 @@ import {render} from "test/utils"
 import Home from "./index"

 jest.mock("@blitzjs/core", () => ({
-  ...jest.requireActual("@blitzjs/core")!,
+  ...jest.requireActual<object>("@blitzjs/core")!,
  useQuery: () => [
    {
      id: 1,
@@ -24,4 +24,4 @@ test("renders blitz documentation link", () => {
  const element = getByText(/powered by blitz/i)
  // @ts-ignore
  expect(element).toBeInTheDocument()
-})
+})
--- a/examples/auth/app/pages/index.tsx
+++ b/examples/auth/app/pages/index.tsx
@@ -13,6 +13,8 @@ import getUser from "app/users/queries/getUser"
 import trackView from "app/users/mutations/trackView"
 import Layout from "app/core/layouts/Layout"

+import {Routes} from ".blitz"
+
 const CurrentUserInfo = () => {
  const session = useSession()
  const [currentUser] = useQuery(getUser, {where: {id: session.userId!}})
@@ -30,10 +32,10 @@ const UserStuff = () => {
      {!session.userId && (
        <>
          <div style={{marginTop: "1rem"}}>
-            <Link href="/signup">Sign Up</Link>
+            <Link href={Routes.SignupPage()}>Sign Up</Link>
          </div>
          <div>
-            <Link href="/login">Login</Link>
+            <Link href={Routes.LoginPage()}>Login</Link>
          </div>
          <a href="/api/auth/twitter" style={{display: "block"}}>
            Login with Twitter
--- a/examples/auth/app/pages/projects/[projectId].tsx
+++ b/examples/auth/app/pages/projects/[projectId].tsx
@@ -4,6 +4,8 @@ import Layout from "app/core/layouts/Layout"
 import getProject from "app/projects/queries/getProject"
 import deleteProject from "app/projects/mutations/deleteProject"

+import {Routes} from ".blitz"
+
 export const Project = () => {
  const router = useRouter()
  const projectId = useParam("projectId", "number")
@@ -22,7 +24,7 @@ export const Project = () => {
        <h1>Project {project.id}</h1>
        <pre>{JSON.stringify(project, null, 2)}</pre>

-        <Link href={`/projects/${project.id}/edit`}>
+        <Link href={Routes.EditProjectPage({projectId: project.id})}>
          <a>Edit</a>
        </Link>

@@ -47,7 +49,7 @@ const ShowProjectPage: BlitzPage = () => {
  return (
    <div>
      <p>
-        <Link href="/projects">
+        <Link href={Routes.ProjectsPage()}>
          <a>Projects</a>
        </Link>
      </p>
--- a/examples/auth/app/pages/projects/[projectId]/edit.tsx
+++ b/examples/auth/app/pages/projects/[projectId]/edit.tsx
@@ -5,10 +5,19 @@ import getProject from "app/projects/queries/getProject"
 import updateProject from "app/projects/mutations/updateProject"
 import {ProjectForm, FORM_ERROR} from "app/projects/components/ProjectForm"

+import {Routes} from ".blitz"
+
 export const EditProject = () => {
  const router = useRouter()
  const projectId = useParam("projectId", "number")
-  const [project, {setQueryData}] = useQuery(getProject, {id: projectId})
+  const [project, {setQueryData}] = useQuery(
+    getProject,
+    {id: projectId},
+    {
+      // This ensures the query never refreshes and overwrites the form data while the user is editing.
+      staleTime: Infinity,
+    },
+  )
  const [updateProjectMutation] = useMutation(updateProject)

  return (
@@ -57,7 +66,7 @@ const EditProjectPage: BlitzPage = () => {
      </Suspense>

      <p>
-        <Link href="/projects">
+        <Link href={Routes.ProjectsPage()}>
          <a>Projects</a>
        </Link>
      </p>
--- a/examples/auth/app/pages/projects/index.tsx
+++ b/examples/auth/app/pages/projects/index.tsx
@@ -3,6 +3,8 @@ import {Head, Link, usePaginatedQuery, useRouter, BlitzPage} from "blitz"
 import Layout from "app/core/layouts/Layout"
 import getProjects from "app/projects/queries/getProjects"

+import {Routes} from ".blitz"
+
 const ITEMS_PER_PAGE = 100

 export const ProjectsList = () => {
@@ -22,7 +24,7 @@ export const ProjectsList = () => {
      <ul>
        {projects.map((project) => (
          <li key={project.id}>
-            <Link href={`/projects/${project.id}`}>
+            <Link href={Routes.ShowProjectPage({projectId: project.id})}>
              <a>{project.name}</a>
            </Link>
          </li>
@@ -48,7 +50,7 @@ const ProjectsPage: BlitzPage = () => {

      <div>
        <p>
-          <Link href="/projects/new">
+          <Link href={Routes.NewProjectPage()}>
            <a>Create Project</a>
          </Link>
        </p>
--- a/examples/auth/app/pages/projects/new.tsx
+++ b/examples/auth/app/pages/projects/new.tsx
@@ -3,6 +3,8 @@ import Layout from "app/core/layouts/Layout"
 import createProject from "app/projects/mutations/createProject"
 import {ProjectForm, FORM_ERROR} from "app/projects/components/ProjectForm"

+import {Routes} from ".blitz"
+
 const NewProjectPage: BlitzPage = () => {
  const router = useRouter()
  const [createProjectMutation] = useMutation(createProject)
@@ -21,7 +23,7 @@ const NewProjectPage: BlitzPage = () => {
        onSubmit={async (values) => {
          try {
            const project = await createProjectMutation(values)
-            router.push(`/projects/${project.id}`)
+            router.push(Routes.ShowProjectPage({projectId: project.id}))
          } catch (error) {
            console.error(error)
            return {
@@ -32,7 +34,7 @@ const NewProjectPage: BlitzPage = () => {
      />

      <p>
-        <Link href="/projects">
+        <Link href={Routes.ProjectsPage()}>
          <a>Projects</a>
        </Link>
      </p>
--- a/examples/auth/app/pages/ssr.tsx
+++ b/examples/auth/app/pages/ssr.tsx
@@ -12,16 +12,8 @@ import {
 } from "blitz"
 import getUser from "app/users/queries/getUser"
 import logout from "app/auth/mutations/logout"
-import path from "path"

 export const getServerSideProps: GetServerSideProps = async ({req, res}) => {
-  // Ensure these files are not eliminated by trace-based tree-shaking (like Vercel)
-  // https://github.com/blitz-js/blitz/issues/794
-  path.resolve("next.config.js")
-  path.resolve("blitz.config.js")
-  path.resolve(".next/blitz/db.js")
-  // End anti-tree-shaking
-
  const session = await getSession(req, res)
  console.log("Session id:", session.userId)
  try {
--- a/examples/auth/app/pages/test.tsx
+++ b/examples/auth/app/pages/test.tsx
@@ -0,0 +1,13 @@
+import {useRouter} from "next/router"
+import React from "react"
+
+export default function Test() {
+  const {replace} = useRouter()
+
+  const handleChange = (event: any) => {
+    // replace({ query }, undefined, { shallow: true })
+    replace(`/test?p=${event.target.value}`)
+  }
+
+  return <input onChange={handleChange} />
+}
--- a/examples/auth/app/projects/components/ProjectForm.tsx
+++ b/examples/auth/app/projects/components/ProjectForm.tsx
@@ -1,9 +1,9 @@
 import {Form, FormProps} from "app/core/components/Form"
 import {LabeledTextField} from "app/core/components/LabeledTextField"
-import * as z from "zod"
+import {ZodType} from "zod"
 export {FORM_ERROR} from "app/core/components/Form"

-export function ProjectForm<S extends z.ZodType<any, any>>(props: FormProps<S>) {
+export function ProjectForm<S extends ZodType<any, any>>(props: FormProps<S>) {
  return (
    <Form<S> {...props}>
      <LabeledTextField name="name" label="Name" placeholder="Name" />
--- a/examples/auth/app/projects/mutations/createProject.ts
+++ b/examples/auth/app/projects/mutations/createProject.ts
@@ -1,12 +1,10 @@
 import {resolver} from "blitz"
 import db from "db"
-import * as z from "zod"
+import {z} from "zod"

-const CreateProject = z
-  .object({
-    name: z.string(),
-  })
-  .nonstrict()
+const CreateProject = z.object({
+  name: z.string(),
+})

 export default resolver.pipe(resolver.zod(CreateProject), resolver.authorize(), async (input) => {
  // TODO: in multi-tenant app, you must add validation to ensure correct tenant
--- a/examples/auth/app/projects/mutations/deleteProject.ts
+++ b/examples/auth/app/projects/mutations/deleteProject.ts
@@ -1,12 +1,10 @@
 import {resolver} from "blitz"
 import db from "db"
-import * as z from "zod"
+import {z} from "zod"

-const DeleteProject = z
-  .object({
-    id: z.number(),
-  })
-  .nonstrict()
+const DeleteProject = z.object({
+  id: z.number(),
+})

 export default resolver.pipe(resolver.zod(DeleteProject), resolver.authorize(), async ({id}) => {
  // TODO: in multi-tenant app, you must add validation to ensure correct tenant
--- a/examples/auth/app/projects/mutations/updateProject.ts
+++ b/examples/auth/app/projects/mutations/updateProject.ts
@@ -1,13 +1,11 @@
 import {resolver} from "blitz"
 import db from "db"
-import * as z from "zod"
+import {z} from "zod"

-const UpdateProject = z
-  .object({
-    id: z.number(),
-    name: z.string(),
-  })
-  .nonstrict()
+const UpdateProject = z.object({
+  id: z.number(),
+  name: z.string(),
+})

 export default resolver.pipe(
  resolver.zod(UpdateProject),
--- a/examples/auth/app/projects/queries/getProject.ts
+++ b/examples/auth/app/projects/queries/getProject.ts
@@ -1,6 +1,6 @@
 import {resolver, NotFoundError} from "blitz"
 import db from "db"
-import * as z from "zod"
+import {z} from "zod"

 const GetProject = z.object({
  // This accepts type of undefined, but is required at runtime
--- a/examples/auth/blitz.config.js
+++ b/examples/auth/blitz.config.js
@@ -1,35 +0,0 @@
-const {sessionMiddleware, simpleRolesIsAuthorized} = require("blitz")
-const withMonorepoBuildTooling = require("@preconstruct/next")
-const withBundleAnalyzer = require("@next/bundle-analyzer")({
-  enabled: process.env.ANALYZE === "true",
-})
-
-module.exports = withMonorepoBuildTooling(
-  withBundleAnalyzer({
-    middleware: [
-      sessionMiddleware({
-        isAuthorized: simpleRolesIsAuthorized,
-        // sessionExpiryMinutes: 4,
-      }),
-    ],
-    log: {
-      // level: "trace",
-    },
-    experimental: {
-      isomorphicResolverImports: false,
-    },
-    /*
-  webpack: (config, {buildId, dev, isServer, defaultLoaders, webpack}) => {
-    // Note: we provide webpack above so you should not `require` it
-    // Perform customizations to webpack config
-    // Important: return the modified config
-    return config
-  },
-  webpackDevMiddleware: (config) => {
-    // Perform customizations to webpack dev middleware config
-    // Important: return the modified config
-    return config
-  },
-  */
-  }),
-)
--- a/examples/auth/blitz.config.ts
+++ b/examples/auth/blitz.config.ts
@@ -0,0 +1,40 @@
+import {sessionMiddleware, simpleRolesIsAuthorized} from "blitz"
+import db from "db"
+const withBundleAnalyzer = require("@next/bundle-analyzer")({
+  enabled: process.env.ANALYZE === "true",
+})
+
+module.exports = withBundleAnalyzer({
+  middleware: [
+    sessionMiddleware({
+      cookiePrefix: "blitz-auth-example",
+      isAuthorized: simpleRolesIsAuthorized,
+      // sessionExpiryMinutes: 4,
+      getSession: (handle) => db.session.findFirst({where: {handle}}),
+    }),
+  ],
+  cli: {
+    clearConsoleOnBlitzDev: false,
+  },
+  log: {
+    // level: "trace",
+  },
+  experimental: {
+    initServer() {
+      console.log("Hello world from initServer")
+    },
+  },
+  /*
+  webpack: (config, {buildId, dev, isServer, defaultLoaders, webpack}) => {
+    // Note: we provide webpack above so you should not `require` it
+    // Perform customizations to webpack config
+    // Important: return the modified config
+    return config
+  },
+  webpackDevMiddleware: (config) => {
+    // Perform customizations to webpack dev middleware config
+    // Important: return the modified config
+    return config
+  },
+  */
+})
--- a/examples/auth/cypress.json
+++ b/examples/auth/cypress.json
@@ -1,6 +1,9 @@
 {
  "baseUrl": "http://localhost:3099",
  "defaultCommandTimeout": 10000,
+  "retries": {
+    "runMode": 1
+  },
  "video": false,
  "chromeWebSecurity": false
 }
--- a/examples/auth/package.json
+++ b/examples/auth/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@examples/auth",
-  "version": "0.32.1",
+  "version": "0.34.0-canary.0",
  "scripts": {
    "dev": "blitz dev",
    "build": "blitz build",
@@ -10,9 +10,9 @@
    "analyze": "cross-env ANALYZE=true blitz build",
    "cy:open": "cypress open",
    "cy:run": "cypress run --browser chrome",
-    "test": "prisma generate && yarn test:jest && yarn test:e2e",
+    "test": "prisma generate && blitz codegen && yarn test:jest && yarn test:e2e",
    "test:jest": "jest",
-    "test:server": "cross-env NODE_ENV=test blitz prisma migrate deploy --preview-feature && blitz build && cross-env NODE_ENV=test blitz start -p 3099",
+    "test:server": "cross-env NODE_ENV=test blitz prisma migrate deploy && blitz build && cross-env NODE_ENV=test blitz start -p 3099",
    "test:e2e": "cross-env NODE_ENV=test start-server-and-test test:server http://localhost:3099 cy:run"
  },
  "browserslist": [
@@ -28,39 +28,36 @@
    "trailingComma": "all"
  },
  "dependencies": {
-    "@prisma/client": "2.17.0",
-    "blitz": "0.32.1",
+    "@prisma/client": "2.24.1",
+    "blitz": "0.38.3-canary.1",
    "final-form": "4.20.1",
    "passport-auth0": "1.4.0",
    "passport-github2": "0.1.12",
    "passport-twitter": "1.0.4",
-    "prisma": "2.17.0",
-    "react": "0.0.0-experimental-3310209d0",
-    "react-dom": "0.0.0-experimental-3310209d0",
-    "react-error-boundary": "3.1.0",
-    "react-final-form": "6.5.2",
-    "zod": "1.11.11"
+    "prisma": "2.24.1",
+    "react": "18.0.0-alpha-ed6c091fe-20210701",
+    "react-dom": "18.0.0-alpha-ed6c091fe-20210701",
+    "react-final-form": "6.5.2"
  },
  "devDependencies": {
    "@cypress/skip-test": "2.6.0",
    "@next/bundle-analyzer": "^10.0.6",
-    "@testing-library/react": "^11.2.3",
+    "@testing-library/react": "11.2.5",
    "@testing-library/react-hooks": "^4.0.1",
    "@types/passport-auth0": "1.0.4",
    "@types/passport-github2": "1.2.4",
    "@types/passport-twitter": "1.0.36",
    "@types/preview-email": "2.0.0",
-    "@types/react": "17.0.0",
+    "@types/react": "17.0.13",
    "cross-env": "7.0.3",
    "cypress": "6.2.1",
-    "eslint": "7.18.0",
+    "eslint": "7.21.0",
    "husky": "5.1.2",
-    "lint-staged": "10.5.3",
+    "lint-staged": "10.5.4",
    "prettier": "2.2.1",
    "pretty-quick": "3.1.0",
    "preview-email": "3.0.3",
-    "start-server-and-test": "1.11.7",
-    "typescript": "4.1.3"
+    "start-server-and-test": "1.11.7"
  },
  "private": true
 }
--- a/examples/auth/test/utils.tsx
+++ b/examples/auth/test/utils.tsx
@@ -1,4 +1,4 @@
-import {RouterContext, BlitzRouter} from "blitz"
+import {RouterContext, BlitzRouter, BlitzProvider} from "blitz"
 import {render as defaultRender} from "@testing-library/react"
 import {renderHook as defaultRenderHook} from "@testing-library/react-hooks"

@@ -24,11 +24,18 @@ export * from "@testing-library/react"
 //   router: { pathname: '/my-custom-pathname' },
 // });
 // --------------------------------------------------
-export function render(ui: RenderUI, {wrapper, router, ...options}: RenderOptions = {}) {
+export function render(
+  ui: RenderUI,
+  {wrapper, router, dehydratedState, ...options}: RenderOptions = {},
+) {
  if (!wrapper) {
    // Add a default context wrapper if one isn't supplied from the test
    wrapper = ({children}) => (
-      <RouterContext.Provider value={{...mockRouter, ...router}}>{children}</RouterContext.Provider>
+      <BlitzProvider dehydratedState={dehydratedState}>
+        <RouterContext.Provider value={{...mockRouter, ...router}}>
+          {children}
+        </RouterContext.Provider>
+      </BlitzProvider>
    )
  }
  return defaultRender(ui, {wrapper, ...options})
@@ -47,12 +54,16 @@ export function render(ui: RenderUI, {wrapper, router, ...options}: RenderOption
 // --------------------------------------------------
 export function renderHook(
  hook: RenderHook,
-  {wrapper, router, ...options}: RenderHookOptions = {},
+  {wrapper, router, dehydratedState, ...options}: RenderHookOptions = {},
 ) {
  if (!wrapper) {
    // Add a default context wrapper if one isn't supplied from the test
    wrapper = ({children}) => (
-      <RouterContext.Provider value={{...mockRouter, ...router}}>{children}</RouterContext.Provider>
+      <BlitzProvider dehydratedState={dehydratedState}>
+        <RouterContext.Provider value={{...mockRouter, ...router}}>
+          {children}
+        </RouterContext.Provider>
+      </BlitzProvider>
    )
  }
  return defaultRenderHook(hook, {wrapper, ...options})
@@ -67,6 +78,7 @@ export const mockRouter: BlitzRouter = {
  query: {},
  isReady: true,
  isLocaleDomain: false,
+  isPreview: false,
  push: jest.fn(),
  replace: jest.fn(),
  reload: jest.fn(),
@@ -83,8 +95,14 @@ export const mockRouter: BlitzRouter = {

 type DefaultParams = Parameters<typeof defaultRender>
 type RenderUI = DefaultParams[0]
-type RenderOptions = DefaultParams[1] & {router?: Partial<BlitzRouter>}
+type RenderOptions = DefaultParams[1] & {
+  router?: Partial<BlitzRouter>
+  dehydratedState?: unknown
+}

 type DefaultHookParams = Parameters<typeof defaultRenderHook>
 type RenderHook = DefaultHookParams[0]
-type RenderHookOptions = DefaultHookParams[1] & {router?: Partial<BlitzRouter>}
+type RenderHookOptions = DefaultHookParams[1] & {
+  router?: Partial<BlitzRouter>
+  dehydratedState?: unknown
+}
--- a/examples/auth/types.ts
+++ b/examples/auth/types.ts
@@ -16,3 +16,11 @@ declare module "blitz" {
    }
  }
 }
+
+// This should not be needed. Usually it isn't but for some reason in this example it is
+declare module "react" {
+  interface StyleHTMLAttributes<T> extends React.HTMLAttributes<T> {
+    jsx?: boolean
+    global?: boolean
+  }
+}
--- a/examples/custom-server/README.md
+++ b/examples/custom-server/README.md
@@ -8,7 +8,7 @@
   ```
 2. Migrate
   ```sh
-   blitz prisma migrate dev --preview-feature
+   blitz prisma migrate dev
   ```
 3. Start the dev server

--- a/examples/custom-server/app/auth/validations.ts
+++ b/examples/custom-server/app/auth/validations.ts
@@ -1,4 +1,4 @@
-import * as z from "zod"
+import {z} from "zod"

 export const SignupInput = z.object({
  email: z.string().email(),
--- a/examples/custom-server/app/components/Form.tsx
+++ b/examples/custom-server/app/components/Form.tsx
@@ -1,6 +1,7 @@
 import React, {ReactNode, PropsWithoutRef} from "react"
 import {Form as FinalForm, FormProps as FinalFormProps} from "react-final-form"
-import * as z from "zod"
+import {z} from "zod"
+import {validateZodSchema} from "blitz"
 export {FORM_ERROR} from "final-form"

 type FormProps<S extends z.ZodType<any, any>> = {
@@ -24,14 +25,7 @@ export function Form<S extends z.ZodType<any, any>>({
  return (
    <FinalForm
      initialValues={initialValues}
-      validate={(values) => {
-        if (!schema) return
-        try {
-          schema.parse(values)
-        } catch (error) {
-          return error.formErrors.fieldErrors
-        }
-      }}
+      validate={validateZodSchema(schema)}
      onSubmit={onSubmit}
      render={({handleSubmit, submitting, submitError}) => (
        <form onSubmit={handleSubmit} className="form" {...props}>
--- a/examples/custom-server/app/pages/_app.tsx
+++ b/examples/custom-server/app/pages/_app.tsx
@@ -1,28 +1,26 @@
-import {AppProps, ErrorComponent, useRouter, AuthenticationError, AuthorizationError} from "blitz"
-import {ErrorBoundary, FallbackProps} from "react-error-boundary"
-import {queryCache} from "react-query"
+import {
+  AppProps,
+  ErrorBoundary,
+  ErrorFallbackProps,
+  ErrorComponent,
+  AuthenticationError,
+  AuthorizationError,
+  useQueryErrorResetBoundary,
+} from "blitz"
 import LoginForm from "app/auth/components/LoginForm"

 export default function App({Component, pageProps}: AppProps) {
  const getLayout = Component.getLayout || ((page) => page)
-  const router = useRouter()
+  const {reset} = useQueryErrorResetBoundary()

  return (
-    <ErrorBoundary
-      FallbackComponent={RootErrorFallback}
-      resetKeys={[router.asPath]}
-      onReset={() => {
-        // This ensures the Blitz useQuery hooks will automatically refetch
-        // data any time you reset the error boundary
-        queryCache.resetErrorBoundaries()
-      }}
-    >
+    <ErrorBoundary FallbackComponent={RootErrorFallback} onReset={reset}>
      {getLayout(<Component {...pageProps} />)}
    </ErrorBoundary>
  )
 }

-function RootErrorFallback({error, resetErrorBoundary}: FallbackProps) {
+function RootErrorFallback({error, resetErrorBoundary}: ErrorFallbackProps) {
  if (error instanceof AuthenticationError) {
    return <LoginForm onSuccess={resetErrorBoundary} />
  } else if (error instanceof AuthorizationError) {
--- a/examples/custom-server/app/pages/index.tsx
+++ b/examples/custom-server/app/pages/index.tsx
@@ -74,7 +74,7 @@ const Home: BlitzPage = () => {
          <code>blitz generate all project name:string</code>
        </pre>
        <pre>
-          <code>blitz prisma migrate dev --preview-feature</code>
+          <code>blitz prisma migrate dev</code>
        </pre>
        <div>
          <p>
--- a/examples/custom-server/blitz.config.js
+++ b/examples/custom-server/blitz.config.js
@@ -1,9 +1,9 @@
 const {sessionMiddleware, simpleRolesIsAuthorized} = require("blitz")
-const withMonorepoBuildTooling = require("@preconstruct/next")

-module.exports = withMonorepoBuildTooling({
+module.exports = {
  middleware: [
    sessionMiddleware({
+      cookiePrefix: "blitz-custom-server-example",
      isAuthorized: simpleRolesIsAuthorized,
    }),
  ],
@@ -15,4 +15,4 @@ module.exports = withMonorepoBuildTooling({
    return config
  },
  */
-})
+}
--- a/examples/custom-server/cypress/integration/index.test.ts
+++ b/examples/custom-server/cypress/integration/index.test.ts
@@ -30,11 +30,13 @@ describe("index page", () => {
    cy.signup(user)

    cy.contains("button", "Logout").click()
+    cy.wait(500)
    cy.contains("a", /login/i).click()

    cy.contains("Email").find("input").type(user.email)
    cy.contains("Password").find("input").type(user.password)
    cy.contains("button", /login/i).click()
+    cy.wait(500)

    cy.location("pathname").should("equal", "/")
    cy.contains("button", "Logout")
--- a/examples/custom-server/package.json
+++ b/examples/custom-server/package.json
@@ -1,8 +1,8 @@
 {
  "name": "@examples/custom-server",
-  "version": "0.32.1",
+  "version": "0.34.0-canary.0",
  "scripts": {
-    "dev": "nodemon --watch server.js --exec 'blitz dev'",
+    "dev": "blitz dev",
    "build": "blitz build",
    "start": "blitz start",
    "studio": "blitz prisma studio",
@@ -10,10 +10,11 @@
    "test-watch": "jest --watch",
    "cy-open": "cypress open",
    "cy-run": "cypress run",
-    "test:migrate": "prisma generate && blitz prisma migrate deploy --preview-feature",
+    "test:migrate": "prisma generate && blitz prisma migrate deploy",
    "test:jest": "jest --passWithNoTests",
    "test-server": "blitz build && blitz start",
-    "test:e2e": "cross-env NODE_ENV=test PORT=3099 start-server-and-test test-server http://localhost:3099 cy-run",
+    "test-run-e2e": "cross-env NODE_ENV=test PORT=3099 start-server-and-test test-server http://localhost:3099 cy-run",
+    "test:e2e": "yarn test-run-e2e || yarn test-run-e2e",
    "test": "run-s test:*"
  },
  "browserslist": [
@@ -29,28 +30,25 @@
    "trailingComma": "all"
  },
  "dependencies": {
-    "@prisma/client": "2.17.0",
-    "blitz": "0.32.1",
+    "@prisma/client": "2.24.1",
+    "blitz": "0.38.3-canary.1",
    "final-form": "4.20.1",
-    "prisma": "2.17.0",
-    "react": "0.0.0-experimental-3310209d0",
-    "react-dom": "0.0.0-experimental-3310209d0",
-    "react-error-boundary": "3.1.0",
+    "prisma": "2.24.1",
+    "react": "18.0.0-alpha-ed6c091fe-20210701",
+    "react-dom": "18.0.0-alpha-ed6c091fe-20210701",
    "react-final-form": "6.5.2",
-    "secure-password": "4.0.0",
-    "typescript": "4.1.3",
-    "zod": "1.11.11"
+    "secure-password": "4.0.0"
  },
  "devDependencies": {
    "@cypress/skip-test": "2.6.0",
-    "@testing-library/react": "^11.2.3",
+    "@testing-library/react": "11.2.5",
    "@testing-library/react-hooks": "^4.0.1",
-    "@types/react": "17.0.0",
+    "@types/react": "17.0.13",
    "@types/secure-password": "3.1.0",
    "cypress": "6.2.1",
-    "eslint": "7.18.0",
+    "eslint": "7.21.0",
    "husky": "5.1.2",
-    "lint-staged": "10.5.3",
+    "lint-staged": "10.5.4",
    "nodemon": "2.0.7",
    "npm-run-all": "4.1.5",
    "prettier": "2.2.1",
--- a/examples/custom-server/server.js
+++ b/examples/custom-server/server.js
@@ -1,25 +0,0 @@
-const {createServer} = require("http")
-const {parse} = require("url")
-const blitz = require("blitz/custom-server")
-const {log} = require("@blitzjs/display")
-
-const {PORT = "3000"} = process.env
-const dev = process.env.NODE_ENV !== "production"
-const app = blitz({dev})
-const handle = app.getRequestHandler()
-
-app.prepare().then(() => {
-  createServer((req, res) => {
-    const parsedUrl = parse(req.url, true)
-    const {pathname} = parsedUrl
-
-    if (pathname === "/hello") {
-      res.writeHead(200).end("world")
-      return
-    }
-
-    handle(req, res, parsedUrl)
-  }).listen(PORT, () => {
-    log.success(`Ready on http://localhost:${PORT}`)
-  })
-})
--- a/examples/custom-server/server/index.ts
+++ b/examples/custom-server/server/index.ts
@@ -0,0 +1,25 @@
+import blitz from "blitz/custom-server"
+import {createServer} from "http"
+import {parse} from "url"
+import {log} from "@blitzjs/display"
+
+const {PORT = "3000"} = process.env
+const dev = process.env.NODE_ENV !== "production"
+const app = blitz({dev})
+const handle = app.getRequestHandler()
+
+app.prepare().then(() => {
+  createServer((req, res) => {
+    const parsedUrl = parse(req.url!, true)
+    const {pathname} = parsedUrl
+
+    if (pathname === "/hello") {
+      res.writeHead(200).end("world")
+      return
+    }
+
+    handle(req, res, parsedUrl)
+  }).listen(PORT, () => {
+    log.success(`Ready on http://localhost:${PORT}`)
+  })
+})
--- a/examples/custom-server/test/utils.tsx
+++ b/examples/custom-server/test/utils.tsx
@@ -1,5 +1,5 @@
 import React from "react"
-import {RouterContext, BlitzRouter} from "blitz"
+import {RouterContext, BlitzRouter, BlitzProvider} from "blitz"
 import {render as defaultRender} from "@testing-library/react"
 import {renderHook as defaultRenderHook} from "@testing-library/react-hooks"

@@ -25,11 +25,18 @@ export * from "@testing-library/react"
 //   router: { pathname: '/my-custom-pathname' },
 // });
 // --------------------------------------------------
-export function render(ui: RenderUI, {wrapper, router, ...options}: RenderOptions = {}) {
+export function render(
+  ui: RenderUI,
+  {wrapper, router, dehydratedState, ...options}: RenderOptions = {},
+) {
  if (!wrapper) {
    // Add a default context wrapper if one isn't supplied from the test
    wrapper = ({children}) => (
-      <RouterContext.Provider value={{...mockRouter, ...router}}>{children}</RouterContext.Provider>
+      <BlitzProvider dehydratedState={dehydratedState}>
+        <RouterContext.Provider value={{...mockRouter, ...router}}>
+          {children}
+        </RouterContext.Provider>
+      </BlitzProvider>
    )
  }
  return defaultRender(ui, {wrapper, ...options})
@@ -48,12 +55,16 @@ export function render(ui: RenderUI, {wrapper, router, ...options}: RenderOption
 // --------------------------------------------------
 export function renderHook(
  hook: RenderHook,
-  {wrapper, router, ...options}: RenderHookOptions = {},
+  {wrapper, router, dehydratedState, ...options}: RenderHookOptions = {},
 ) {
  if (!wrapper) {
    // Add a default context wrapper if one isn't supplied from the test
    wrapper = ({children}) => (
-      <RouterContext.Provider value={{...mockRouter, ...router}}>{children}</RouterContext.Provider>
+      <BlitzProvider dehydratedState={dehydratedState}>
+        <RouterContext.Provider value={{...mockRouter, ...router}}>
+          {children}
+        </RouterContext.Provider>
+      </BlitzProvider>
    )
  }
  return defaultRenderHook(hook, {wrapper, ...options})
@@ -68,6 +79,7 @@ export const mockRouter: BlitzRouter = {
  query: {},
  isReady: true,
  isLocaleDomain: false,
+  isPreview: false,
  push: jest.fn(),
  replace: jest.fn(),
  reload: jest.fn(),
@@ -84,8 +96,14 @@ export const mockRouter: BlitzRouter = {

 type DefaultParams = Parameters<typeof defaultRender>
 type RenderUI = DefaultParams[0]
-type RenderOptions = DefaultParams[1] & {router?: Partial<BlitzRouter>}
+type RenderOptions = DefaultParams[1] & {
+  router?: Partial<BlitzRouter>
+  dehydratedState?: unknown
+}

 type DefaultHookParams = Parameters<typeof defaultRenderHook>
 type RenderHook = DefaultHookParams[0]
-type RenderHookOptions = DefaultHookParams[1] & {router?: Partial<BlitzRouter>}
+type RenderHookOptions = DefaultHookParams[1] & {
+  router?: Partial<BlitzRouter>
+  dehydratedState?: unknown
+}
--- a/examples/fauna/app/auth/validations.ts
+++ b/examples/fauna/app/auth/validations.ts
@@ -1,4 +1,4 @@
-import * as z from "zod"
+import { z } from "zod"

 export const SignupInput = z.object({
  email: z.string().email(),
--- a/examples/fauna/app/components/Form.tsx
+++ b/examples/fauna/app/components/Form.tsx
@@ -1,6 +1,7 @@
 import { ReactNode, PropsWithoutRef } from "react"
 import { Form as FinalForm, FormProps as FinalFormProps } from "react-final-form"
-import * as z from "zod"
+import { z } from "zod"
+import { validateZodSchema } from "blitz"
 export { FORM_ERROR } from "final-form"

 type FormProps<S extends z.ZodType<any, any>> = {
@@ -24,14 +25,7 @@ export function Form<S extends z.ZodType<any, any>>({
  return (
    <FinalForm
      initialValues={initialValues}
-      validate={(values) => {
-        if (!schema) return
-        try {
-          schema.parse(values)
-        } catch (error) {
-          return error.formErrors.fieldErrors
-        }
-      }}
+      validate={validateZodSchema(schema)}
      onSubmit={onSubmit}
      render={({ handleSubmit, submitting, submitError }) => (
        <form onSubmit={handleSubmit} className="form" {...props}>
--- a/examples/fauna/app/pages/_app.tsx
+++ b/examples/fauna/app/pages/_app.tsx
@@ -1,28 +1,24 @@
-import { AppProps, ErrorComponent, useRouter } from "blitz"
-import { ErrorBoundary, FallbackProps } from "react-error-boundary"
-import { queryCache } from "react-query"
+import {
+  AppProps,
+  ErrorBoundary,
+  ErrorFallbackProps,
+  ErrorComponent,
+  useQueryErrorResetBoundary,
+} from "blitz"
 import LoginForm from "app/auth/components/LoginForm"

 export default function App({ Component, pageProps }: AppProps) {
  const getLayout = Component.getLayout || ((page) => page)
-  const router = useRouter()
+  const { reset } = useQueryErrorResetBoundary()

  return (
-    <ErrorBoundary
-      FallbackComponent={RootErrorFallback}
-      resetKeys={[router.asPath]}
-      onReset={() => {
-        // This ensures the Blitz useQuery hooks will automatically refetch
-        // data any time you reset the error boundary
-        queryCache.resetErrorBoundaries()
-      }}
-    >
+    <ErrorBoundary FallbackComponent={RootErrorFallback} onReset={reset}>
      {getLayout(<Component {...pageProps} />)}
    </ErrorBoundary>
  )
 }

-function RootErrorFallback({ error, resetErrorBoundary }: FallbackProps) {
+function RootErrorFallback({ error, resetErrorBoundary }: ErrorFallbackProps) {
  if (error?.name === "AuthenticationError") {
    return <LoginForm onSuccess={resetErrorBoundary} />
  } else if (error?.name === "AuthorizationError") {
--- a/examples/fauna/blitz.config.js
+++ b/examples/fauna/blitz.config.js
@@ -1,5 +1,4 @@
 const { sessionMiddleware, simpleRolesIsAuthorized } = require("blitz")
-const withMonorepoBuildTooling = require("@preconstruct/next")
 const { GraphQLClient, gql } = require("graphql-request")

 const graphQLClient = new GraphQLClient("https://graphql.fauna.com/graphql", {
@@ -18,9 +17,10 @@ const normalizeSession = (faunaSession) => {
  }
 }

-module.exports = withMonorepoBuildTooling({
+module.exports = {
  middleware: [
    sessionMiddleware({
+      cookiePrefix: "blitz-fauna-example",
      isAuthorized: simpleRolesIsAuthorized,
      getSession: async (handle) => {
        const { findSessionByHandle: session } = await graphQLClient.request(
@@ -159,4 +159,4 @@ module.exports = withMonorepoBuildTooling({
    return config
  },
  */
-})
+}
--- a/examples/fauna/package.json
+++ b/examples/fauna/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@examples/fauna",
-  "version": "0.32.1",
+  "version": "0.34.0-canary.0",
  "scripts": {
    "dev": "blitz dev",
    "build": "blitz build",
@@ -28,44 +28,29 @@
    ]
  },
  "dependencies": {
-    "blitz": "0.32.1",
+    "blitz": "0.38.3-canary.1",
    "final-form": "4.20.1",
    "graphql": "15.5.0",
    "graphql-request": "3.4.0",
-    "react": "0.0.0-experimental-3310209d0",
-    "react-dom": "0.0.0-experimental-3310209d0",
-    "react-error-boundary": "3.1.0",
-    "react-final-form": "6.5.2",
-    "secure-password": "4.0.0",
-    "zod": "1.11.11"
+    "react": "18.0.0-alpha-ed6c091fe-20210701",
+    "react-dom": "18.0.0-alpha-ed6c091fe-20210701",
+    "react-final-form": "6.5.2"
  },
  "devDependencies": {
-    "@testing-library/jest-dom": "5.11.9",
-    "@testing-library/react": "^11.2.3",
+    "@testing-library/react": "11.2.5",
    "@testing-library/react-hooks": "^4.0.1",
-    "@types/jest": "^26.0.20",
-    "@types/react": "17.0.0",
+    "@types/react": "17.0.13",
    "@types/secure-password": "3.1.0",
-    "@typescript-eslint/eslint-plugin": "~4.14.0",
-    "@typescript-eslint/parser": "~4.14.0",
    "babel-eslint": "~10.1.0",
-    "eslint": "7.18.0",
+    "eslint": "7.21.0",
    "eslint-config-react-app": "~6.0.0",
    "eslint-plugin-flowtype": "~5.2.0",
-    "eslint-plugin-import": "~2.22.1",
-    "eslint-plugin-jsx-a11y": "~6.4.1",
-    "eslint-plugin-react": "~7.22.0",
-    "eslint-plugin-react-hooks": "~4.2.0",
+    "eslint-plugin-import": "^2.22.1",
+    "eslint-plugin-jsx-a11y": "^6.4.1",
+    "eslint-plugin-react": "^7.23.1",
+    "eslint-plugin-react-hooks": "^4.2.0",
    "husky": "5.1.2",
-    "jest": "^26.6.3",
-    "jest-environment-jsdom-fourteen": "^1.0.1",
-    "jest-watch-typeahead": "^0.6.1",
-    "lint-staged": "10.5.3",
-    "prettier": "2.2.1",
-    "pretty-quick": "3.1.0",
-    "start-server-and-test": "1.11.7",
-    "ts-jest": "26.5.0",
-    "typescript": "4.1.3"
+    "start-server-and-test": "1.11.7"
  },
  "private": true
 }
--- a/examples/fauna/test/utils.tsx
+++ b/examples/fauna/test/utils.tsx
@@ -1,4 +1,4 @@
-import { RouterContext, BlitzRouter } from "blitz"
+import { RouterContext, BlitzRouter, BlitzProvider } from "blitz"
 import { render as defaultRender } from "@testing-library/react"
 import { renderHook as defaultRenderHook } from "@testing-library/react-hooks"

@@ -15,11 +15,17 @@ export * from "@testing-library/react"

 type DefaultParams = Parameters<typeof defaultRender>
 type RenderUI = DefaultParams[0]
-type RenderOptions = DefaultParams[1] & { router?: Partial<BlitzRouter> }
+type RenderOptions = DefaultParams[1] & {
+  router?: Partial<BlitzRouter>
+  dehydratedState?: unknown
+}

 type DefaultHookParams = Parameters<typeof defaultRenderHook>
 type RenderHook = DefaultHookParams[0]
-type RenderHookOptions = DefaultHookParams[1] & { router?: Partial<BlitzRouter> }
+type RenderHookOptions = DefaultHookParams[1] & {
+  router?: Partial<BlitzRouter>
+  dehydratedState?: unknown
+}

 // --------------------------------------------------
 // render()
@@ -32,13 +38,18 @@ type RenderHookOptions = DefaultHookParams[1] & { router?: Partial<BlitzRouter>
 //   router: { pathname: '/my-custom-pathname' },
 // });
 // --------------------------------------------------
-export function render(ui: RenderUI, { wrapper, router, ...options }: RenderOptions = {}) {
+export function render(
+  ui: RenderUI,
+  { wrapper, router, dehydratedState, ...options }: RenderOptions = {}
+) {
  if (!wrapper) {
    // Add a default context wrapper if one isn't supplied from the test
    wrapper = ({ children }) => (
-      <RouterContext.Provider value={{ ...mockRouter, ...router }}>
-        {children}
-      </RouterContext.Provider>
+      <BlitzProvider dehydratedState={dehydratedState}>
+        <RouterContext.Provider value={{ ...mockRouter, ...router }}>
+          {children}
+        </RouterContext.Provider>
+      </BlitzProvider>
    )
  }
  return defaultRender(ui, { wrapper, ...options })
@@ -57,14 +68,16 @@ export function render(ui: RenderUI, { wrapper, router, ...options }: RenderOpti
 // --------------------------------------------------
 export function renderHook(
  hook: RenderHook,
-  { wrapper, router, ...options }: RenderHookOptions = {}
+  { wrapper, router, dehydratedState, ...options }: RenderHookOptions = {}
 ) {
  if (!wrapper) {
    // Add a default context wrapper if one isn't supplied from the test
    wrapper = ({ children }) => (
-      <RouterContext.Provider value={{ ...mockRouter, ...router }}>
-        {children}
-      </RouterContext.Provider>
+      <BlitzProvider dehydratedState={dehydratedState}>
+        <RouterContext.Provider value={{ ...mockRouter, ...router }}>
+          {children}
+        </RouterContext.Provider>
+      </BlitzProvider>
    )
  }
  return defaultRenderHook(hook, { wrapper, ...options })
@@ -79,6 +92,7 @@ export const mockRouter: BlitzRouter = {
  query: {},
  isReady: true,
  isLocaleDomain: false,
+  isPreview: false,
  push: jest.fn(),
  replace: jest.fn(),
  reload: jest.fn(),
--- a/examples/no-prisma/blitz.config.js
+++ b/examples/no-prisma/blitz.config.js
@@ -1,6 +1,4 @@
-const withMonorepoBuildTooling = require("@preconstruct/next")
-
-module.exports = withMonorepoBuildTooling({
+module.exports = {
  webpack: (config, { buildId, dev, isServer, defaultLoaders, webpack }) => {
    // Note: we provide webpack above so you should not `require` it
    // Perform customizations to webpack config
@@ -12,4 +10,4 @@ module.exports = withMonorepoBuildTooling({
    // Important: return the modified config
    return config
  },
-})
+}
--- a/examples/no-prisma/package.json
+++ b/examples/no-prisma/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "no-prisma",
-  "version": "0.32.1",
+  "name": "@examples/no-prisma",
+  "version": "0.34.0-canary.0",
  "scripts": {
    "dev": "blitz dev",
    "build": "blitz build",
@@ -26,29 +26,26 @@
    ]
  },
  "dependencies": {
-    "blitz": "0.32.1",
+    "blitz": "0.38.3-canary.1",
    "knex": "0.21.16",
-    "react": "0.0.0-experimental-3310209d0",
-    "react-dom": "0.0.0-experimental-3310209d0",
-    "sqlite3": "5.0.0"
+    "react": "18.0.0-alpha-ed6c091fe-20210701",
+    "react-dom": "18.0.0-alpha-ed6c091fe-20210701",
+    "sqlite3": "5.0.2"
  },
  "devDependencies": {
-    "@types/react": "17.0.0",
-    "@typescript-eslint/eslint-plugin": "~4.14.0",
-    "@typescript-eslint/parser": "~4.14.0",
+    "@types/react": "17.0.13",
    "babel-eslint": "~10.1.0",
-    "eslint": "7.18.0",
+    "eslint": "7.21.0",
    "eslint-config-react-app": "~6.0.0",
    "eslint-plugin-flowtype": "~5.2.0",
-    "eslint-plugin-import": "~2.22.1",
-    "eslint-plugin-jsx-a11y": "~6.4.1",
-    "eslint-plugin-react": "~7.22.0",
-    "eslint-plugin-react-hooks": "~4.2.0",
+    "eslint-plugin-import": "^2.22.1",
+    "eslint-plugin-jsx-a11y": "^6.4.1",
+    "eslint-plugin-react": "^7.23.1",
+    "eslint-plugin-react-hooks": "^4.2.0",
    "husky": "5.1.2",
-    "lint-staged": "10.5.3",
+    "lint-staged": "10.5.4",
    "prettier": "2.2.1",
-    "pretty-quick": "3.1.0",
-    "typescript": "4.1.3"
+    "pretty-quick": "3.1.0"
  },
  "private": true
 }
--- a/examples/plain-js/README.md
+++ b/examples/plain-js/README.md
@@ -14,7 +14,7 @@ model Project {
 2. DB migrate

 ```
-blitz prisma migrate dev --preview-feature
+blitz prisma migrate dev
 ```

 3. Start the dev server
--- a/examples/plain-js/app/pages/index.js
+++ b/examples/plain-js/app/pages/index.js
@@ -3,7 +3,7 @@ const modelSnippet = `model Project {
  id      Int      @default(autoincrement()) @id
  name    String
 }`
-const migrateSnippet = `$ blitz prisma migrate dev --preview-feature
+const migrateSnippet = `$ blitz prisma migrate dev
 $ blitz generate all project`

 const Home = () => (
--- a/examples/plain-js/package.json
+++ b/examples/plain-js/package.json
@@ -1,9 +1,9 @@
 {
  "name": "@examples/plain-js",
-  "version": "0.32.1",
+  "version": "0.34.0-canary.0",
  "scripts": {
    "dev": "blitz dev",
-    "build": "blitz prisma migrate deploy --preview-feature && blitz build",
+    "build": "blitz prisma migrate deploy && blitz build",
    "start": "blitz start",
    "lint": "eslint --ignore-path .gitignore --ext .js,.ts,.tsx .",
    "test": "echo \"DISABLED\""
@@ -11,6 +11,9 @@
  "browserslist": [
    "defaults"
  ],
+  "prisma": {
+    "schema": "db/schema.prisma"
+  },
  "prettier": {
    "semi": false,
    "printWidth": 100,
@@ -29,28 +32,25 @@
    ]
  },
  "dependencies": {
-    "@prisma/client": "2.17.0",
-    "blitz": "0.32.1",
-    "prisma": "2.17.0",
-    "react": "0.0.0-experimental-3310209d0",
-    "react-dom": "0.0.0-experimental-3310209d0"
+    "@prisma/client": "2.24.1",
+    "blitz": "0.38.3-canary.1",
+    "prisma": "2.24.1",
+    "react": "18.0.0-alpha-ed6c091fe-20210701",
+    "react-dom": "18.0.0-alpha-ed6c091fe-20210701"
  },
  "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "~4.14.0",
-    "@typescript-eslint/parser": "~4.14.0",
    "babel-eslint": "~10.1.0",
-    "eslint": "7.18.0",
+    "eslint": "7.21.0",
    "eslint-config-react-app": "~6.0.0",
    "eslint-plugin-flowtype": "~5.2.0",
-    "eslint-plugin-import": "~2.22.1",
-    "eslint-plugin-jsx-a11y": "~6.4.1",
-    "eslint-plugin-react": "~7.22.0",
-    "eslint-plugin-react-hooks": "~4.2.0",
+    "eslint-plugin-import": "^2.22.1",
+    "eslint-plugin-jsx-a11y": "^6.4.1",
+    "eslint-plugin-react": "^7.23.1",
+    "eslint-plugin-react-hooks": "^4.2.0",
    "husky": "5.1.2",
-    "lint-staged": "10.5.3",
+    "lint-staged": "10.5.4",
    "prettier": "2.2.1",
-    "pretty-quick": "3.1.0",
-    "typescript": "4.1.3"
+    "pretty-quick": "3.1.0"
  },
  "private": true
 }
--- a/examples/plain-js/yarn.lock
+++ b/examples/plain-js/yarn.lock
--- a/examples/static/.env
+++ b/examples/static/.env
@@ -0,0 +1,3 @@
+# This env file should be checked into source control
+# This is the place for default values for all environments
+# Values in `.env.local` and `.env.production` will override these values
--- a/examples/static/.eslintrc.js
+++ b/examples/static/.eslintrc.js
--- a/examples/static/.gitignore
+++ b/examples/static/.gitignore
@@ -0,0 +1,52 @@
+# dependencies
+node_modules
+.yarn/cache
+.yarn/unplugged
+.yarn/build-state.yml
+.pnp.*
+.npm
+web_modules/
+
+# blitz
+/.blitz/
+/.next/
+*.sqlite
+.now
+.blitz-console-history
+blitz-log.log
+
+# misc
+.DS_Store
+
+# local env files
+.env.local
+.env.*.local
+.envrc
+
+# Logs
+logs
+*.log
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Testing
+.coverage
+*.lcov
+.nyc_output
+lib-cov
+
+# Caches
+*.tsbuildinfo
+.eslintcache
+.node_repl_history
+.yarn-integrity
+
+# Serverless directories
+.serverless/
+
+# Stores VSCode versions used for testing VSCode extensions
+.vscode-test
--- a/packages/generator/templates/app/.npmrc
+++ b/packages/generator/templates/app/.npmrc
--- a/examples/static/.prettierignore
+++ b/examples/static/.prettierignore
@@ -0,0 +1,7 @@
+.gitkeep
+.env*
+*.ico
+*.lock
+db/migrations
+.next
+.blitz
--- a/examples/static/README.md
+++ b/examples/static/README.md
@@ -0,0 +1,3 @@
+# Static
+
+This is an example to demonstrate usage of `blitz export`.
--- a/examples/static/app/core/layouts/Layout.tsx
+++ b/examples/static/app/core/layouts/Layout.tsx
@@ -0,0 +1,22 @@
+import { ReactNode } from "react"
+import { Head } from "blitz"
+
+type LayoutProps = {
+  title?: string
+  children: ReactNode
+}
+
+const Layout = ({ title, children }: LayoutProps) => {
+  return (
+    <>
+      <Head>
+        <title>{title || "static"}</title>
+        <link rel="icon" href="/favicon.ico" />
+      </Head>
+
+      {children}
+    </>
+  )
+}
+
+export default Layout
--- a/examples/static/app/pages/404.tsx
+++ b/examples/static/app/pages/404.tsx
@@ -0,0 +1,19 @@
+import { Head, ErrorComponent } from "blitz"
+
+// ------------------------------------------------------
+// This page is rendered if a route match is not found
+// ------------------------------------------------------
+export default function Page404() {
+  const statusCode = 404
+  const title = "This page could not be found"
+  return (
+    <>
+      <Head>
+        <title>
+          {statusCode}: {title}
+        </title>
+      </Head>
+      <ErrorComponent statusCode={statusCode} title={title} />
+    </>
+  )
+}
--- a/examples/static/app/pages/_app.tsx
+++ b/examples/static/app/pages/_app.tsx
@@ -0,0 +1,22 @@
+import {
+  AppProps,
+  ErrorBoundary,
+  ErrorComponent,
+  ErrorFallbackProps,
+  useQueryErrorResetBoundary,
+} from "blitz"
+
+export default function App({ Component, pageProps }: AppProps) {
+  const getLayout = Component.getLayout || ((page) => page)
+  const { reset } = useQueryErrorResetBoundary()
+
+  return (
+    <ErrorBoundary FallbackComponent={RootErrorFallback} onReset={reset}>
+      {getLayout(<Component {...pageProps} />)}
+    </ErrorBoundary>
+  )
+}
+
+function RootErrorFallback({ error }: ErrorFallbackProps) {
+  return <ErrorComponent statusCode={error.statusCode || 400} title={error.message || error.name} />
+}
--- a/examples/static/app/pages/_document.tsx
+++ b/examples/static/app/pages/_document.tsx
@@ -0,0 +1,23 @@
+import { Document, Html, DocumentHead, Main, BlitzScript /*DocumentContext*/ } from "blitz"
+
+class MyDocument extends Document {
+  // Only uncomment if you need to customize this behaviour
+  // static async getInitialProps(ctx: DocumentContext) {
+  //   const initialProps = await Document.getInitialProps(ctx)
+  //   return {...initialProps}
+  // }
+
+  render() {
+    return (
+      <Html lang="en">
+        <DocumentHead />
+        <body>
+          <Main />
+          <BlitzScript />
+        </body>
+      </Html>
+    )
+  }
+}
+
+export default MyDocument
--- a/examples/static/app/pages/index.test.tsx
+++ b/examples/static/app/pages/index.test.tsx
@@ -0,0 +1,14 @@
+import React from "react"
+import { render } from "test/utils"
+
+import Home from "./index"
+
+test.skip("renders blitz documentation link", () => {
+  // This is an example of how to ensure a specific item is in the document
+  // But it's disabled by default (by test.skip) so the test doesn't fail
+  // when you remove the the default content from the page
+
+  const { getByText } = render(<Home />)
+  const linkElement = getByText(/Documentation/i)
+  expect(linkElement).toBeInTheDocument()
+})
--- a/examples/static/app/pages/index.tsx
+++ b/examples/static/app/pages/index.tsx
@@ -0,0 +1,190 @@
+import { BlitzPage } from "blitz"
+import Layout from "app/core/layouts/Layout"
+
+const Home: BlitzPage = () => {
+  return (
+    <div className="container">
+      <main>
+        <div className="logo">
+          <img src="/logo.png" alt="blitz.js" />
+        </div>
+        <p>
+          <strong>Congrats!</strong> Your static app is ready.
+        </p>
+        <div className="buttons" style={{ marginTop: "5rem" }}>
+          <a
+            className="button"
+            href="https://blitzjs.com/docs/getting-started?utm_source=blitz-new&utm_medium=app-template&utm_campaign=blitz-new"
+            target="_blank"
+            rel="noopener noreferrer"
+          >
+            Documentation
+          </a>
+          <a
+            className="button-outline"
+            href="https://github.com/blitz-js/blitz"
+            target="_blank"
+            rel="noopener noreferrer"
+          >
+            Github Repo
+          </a>
+          <a
+            className="button-outline"
+            href="https://discord.blitzjs.com"
+            target="_blank"
+            rel="noopener noreferrer"
+          >
+            Discord Community
+          </a>
+        </div>
+      </main>
+
+      <footer>
+        <a
+          href="https://blitzjs.com?utm_source=blitz-new&utm_medium=app-template&utm_campaign=blitz-new"
+          target="_blank"
+          rel="noopener noreferrer"
+        >
+          Powered by Blitz.js
+        </a>
+      </footer>
+
+      <style>{`
+        @import url("https://fonts.googleapis.com/css2?family=Libre+Franklin:wght@300;700&display=swap");
+
+        html,
+        body {
+          padding: 0;
+          margin: 0;
+          font-family: "Libre Franklin", -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen,
+            Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif;
+        }
+
+        * {
+          -webkit-font-smoothing: antialiased;
+          -moz-osx-font-smoothing: grayscale;
+          box-sizing: border-box;
+        }
+        .container {
+          min-height: 100vh;
+          display: flex;
+          flex-direction: column;
+          justify-content: center;
+          align-items: center;
+        }
+
+        main {
+          padding: 5rem 0;
+          flex: 1;
+          display: flex;
+          flex-direction: column;
+          justify-content: center;
+          align-items: center;
+        }
+
+        main p {
+          font-size: 1.2rem;
+        }
+
+        p {
+          text-align: center;
+        }
+
+        footer {
+          width: 100%;
+          height: 60px;
+          border-top: 1px solid #eaeaea;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          background-color: #45009d;
+        }
+
+        footer a {
+          display: flex;
+          justify-content: center;
+          align-items: center;
+        }
+
+        footer a {
+          color: #f4f4f4;
+          text-decoration: none;
+        }
+
+        .logo {
+          margin-bottom: 2rem;
+        }
+
+        .logo img {
+          width: 300px;
+        }
+
+        .buttons {
+          display: grid;
+          grid-auto-flow: column;
+          grid-gap: 0.5rem;
+        }
+        .button {
+          font-size: 1rem;
+          background-color: #6700eb;
+          padding: 1rem 2rem;
+          color: #f4f4f4;
+          text-align: center;
+        }
+
+        .button.small {
+          padding: 0.5rem 1rem;
+        }
+
+        .button:hover {
+          background-color: #45009d;
+        }
+
+        .button-outline {
+          border: 2px solid #6700eb;
+          padding: 1rem 2rem;
+          color: #6700eb;
+          text-align: center;
+        }
+
+        .button-outline:hover {
+          border-color: #45009d;
+          color: #45009d;
+        }
+
+        pre {
+          background: #fafafa;
+          border-radius: 5px;
+          padding: 0.75rem;
+          text-align: center;
+        }
+        code {
+          font-size: 0.9rem;
+          font-family: Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono,
+            Bitstream Vera Sans Mono, Courier New, monospace;
+        }
+
+        .grid {
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          flex-wrap: wrap;
+
+          max-width: 800px;
+          margin-top: 3rem;
+        }
+
+        @media (max-width: 600px) {
+          .grid {
+            width: 100%;
+            flex-direction: column;
+          }
+        }
+      `}</style>
+    </div>
+  )
+}
+
+Home.getLayout = (page) => <Layout title="Home">{page}</Layout>
+
+export default Home
--- a/examples/static/babel.config.js
+++ b/examples/static/babel.config.js
@@ -0,0 +1,4 @@
+module.exports = {
+  presets: ["blitz/babel"],
+  plugins: [],
+}
--- a/examples/static/blitz.config.js
+++ b/examples/static/blitz.config.js
@@ -0,0 +1,11 @@
+module.exports = {
+  middleware: [],
+  /* Uncomment this to customize the webpack config
+  webpack: (config, { buildId, dev, isServer, defaultLoaders, webpack }) => {
+    // Note: we provide webpack above so you should not `require` it
+    // Perform customizations to webpack config
+    // Important: return the modified config
+    return config
+  },
+  */
+}
--- a/examples/static/jest.config.js
+++ b/examples/static/jest.config.js
@@ -0,0 +1,3 @@
+module.exports = {
+  preset: "blitz",
+}
--- a/examples/static/package.json
+++ b/examples/static/package.json
@@ -0,0 +1,55 @@
+{
+  "name": "@examples/static",
+  "version": "0.34.0-canary.0",
+  "scripts": {
+    "dev": "blitz dev",
+    "build": "blitz build",
+    "start": "blitz start",
+    "studio": "blitz prisma studio",
+    "lint": "eslint --ignore-path .gitignore --ext .js,.ts,.tsx .",
+    "test": "jest",
+    "test:watch": "jest --watch"
+  },
+  "browserslist": [
+    "defaults"
+  ],
+  "prisma": {
+    "schema": "db/schema.prisma"
+  },
+  "prettier": {
+    "semi": false,
+    "printWidth": 100
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged && pretty-quick --staged",
+      "pre-push": "tsc && npm run lint && npm run test"
+    }
+  },
+  "lint-staged": {
+    "*.{js,ts,tsx}": [
+      "eslint --fix"
+    ]
+  },
+  "dependencies": {
+    "@prisma/client": "2.24.1",
+    "blitz": "0.38.3-canary.1",
+    "final-form": "4.20.1",
+    "prisma": "2.24.1",
+    "react": "18.0.0-alpha-ed6c091fe-20210701",
+    "react-dom": "18.0.0-alpha-ed6c091fe-20210701",
+    "react-final-form": "6.5.2"
+  },
+  "devDependencies": {
+    "@types/preview-email": "2.0.0",
+    "@types/react": "17.0.13",
+    "eslint": "7.21.0",
+    "husky": "5.1.2",
+    "lint-staged": "10.5.4",
+    "prettier": "2.2.1",
+    "prettier-plugin-prisma": "0.4.0",
+    "pretty-quick": "3.1.0",
+    "preview-email": "3.0.3"
+  },
+  "private": true
+}
--- a/examples/static/public/favicon.ico
+++ b/examples/static/public/favicon.ico
--- a/examples/static/public/logo.png
+++ b/examples/static/public/logo.png
--- a/examples/static/test/setup.ts
+++ b/examples/static/test/setup.ts
@@ -0,0 +1,4 @@
+// This is the jest 'setupFilesAfterEnv' setup file
+// It's a good place to set globals, add global before/after hooks, etc
+
+export {} // so TS doesn't complain
--- a/examples/static/test/utils.tsx
+++ b/examples/static/test/utils.tsx
@@ -0,0 +1,107 @@
+import React from "react"
+import { RouterContext, BlitzRouter, BlitzProvider } from "blitz"
+import { render as defaultRender } from "@testing-library/react"
+import { renderHook as defaultRenderHook } from "@testing-library/react-hooks"
+
+export * from "@testing-library/react"
+
+// --------------------------------------------------------------------------------
+// This file customizes the render() and renderHook() test functions provided
+// by React testing library. It adds a router context wrapper with a mocked router.
+//
+// You should always import `render` and `renderHook` from this file
+//
+// This is the place to add any other context providers you need while testing.
+// --------------------------------------------------------------------------------
+
+// --------------------------------------------------
+// render()
+// --------------------------------------------------
+// Override the default test render with our own
+//
+// You can override the router mock like this:
+//
+// const { baseElement } = render(<MyComponent />, {
+//   router: { pathname: '/my-custom-pathname' },
+// });
+// --------------------------------------------------
+export function render(
+  ui: RenderUI,
+  { wrapper, router, dehydratedState, ...options }: RenderOptions = {}
+) {
+  if (!wrapper) {
+    // Add a default context wrapper if one isn't supplied from the test
+    wrapper = ({ children }) => (
+      <BlitzProvider dehydratedState={dehydratedState}>
+        <RouterContext.Provider value={{ ...mockRouter, ...router }}>
+          {children}
+        </RouterContext.Provider>
+      </BlitzProvider>
+    )
+  }
+  return defaultRender(ui, { wrapper, ...options })
+}
+
+// --------------------------------------------------
+// renderHook()
+// --------------------------------------------------
+// Override the default test renderHook with our own
+//
+// You can override the router mock like this:
+//
+// const result = renderHook(() => myHook(), {
+//   router: { pathname: '/my-custom-pathname' },
+// });
+// --------------------------------------------------
+export function renderHook(
+  hook: RenderHook,
+  { wrapper, router, dehydratedState, ...options }: RenderHookOptions = {}
+) {
+  if (!wrapper) {
+    // Add a default context wrapper if one isn't supplied from the test
+    wrapper = ({ children }) => (
+      <BlitzProvider dehydratedState={dehydratedState}>
+        <RouterContext.Provider value={{ ...mockRouter, ...router }}>
+          {children}
+        </RouterContext.Provider>
+      </BlitzProvider>
+    )
+  }
+  return defaultRenderHook(hook, { wrapper, ...options })
+}
+
+export const mockRouter: BlitzRouter = {
+  basePath: "",
+  pathname: "/",
+  route: "/",
+  asPath: "/",
+  params: {},
+  query: {},
+  isReady: true,
+  push: jest.fn(),
+  replace: jest.fn(),
+  reload: jest.fn(),
+  back: jest.fn(),
+  prefetch: jest.fn(),
+  beforePopState: jest.fn(),
+  events: {
+    on: jest.fn(),
+    off: jest.fn(),
+    emit: jest.fn(),
+  },
+  isFallback: false,
+}
+
+type DefaultParams = Parameters<typeof defaultRender>
+type RenderUI = DefaultParams[0]
+type RenderOptions = DefaultParams[1] & {
+  router?: Partial<BlitzRouter>
+  dehydratedState?: unknown
+}
+
+type DefaultHookParams = Parameters<typeof defaultRenderHook>
+type RenderHook = DefaultHookParams[0]
+type RenderHookOptions = DefaultHookParams[1] & {
+  router?: Partial<BlitzRouter>
+  dehydratedState?: unknown
+}
--- a/examples/static/tsconfig.json
+++ b/examples/static/tsconfig.json
@@ -0,0 +1,23 @@
+{
+  "compilerOptions": {
+    "target": "es5",
+    "lib": ["dom", "dom.iterable", "esnext"],
+    "baseUrl": "./",
+    "allowJs": true,
+    "skipLibCheck": true,
+    "strict": false,
+    "strictNullChecks": true,
+    "forceConsistentCasingInFileNames": true,
+    "noEmit": true,
+    "esModuleInterop": true,
+    "module": "esnext",
+    "moduleResolution": "node",
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "jsx": "preserve",
+    "incremental": true,
+    "tsBuildInfoFile": ".tsbuildinfo"
+  },
+  "exclude": ["node_modules", "**/*.e2e.ts", "cypress"],
+  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"]
+}
--- a/examples/static/types.ts
+++ b/examples/static/types.ts
@@ -0,0 +1,16 @@
+import { DefaultCtx, SessionContext } from "blitz"
+
+// Note: You should switch to Postgres and then use a DB enum for role type
+export type Role = "ADMIN" | "USER"
+
+declare module "blitz" {
+  export interface Ctx extends DefaultCtx {
+    session: SessionContext
+  }
+  export interface Session {
+    PublicData: {
+      userId: string
+      roles: Role[]
+    }
+  }
+}
--- a/examples/store/README.md
+++ b/examples/store/README.md
@@ -3,7 +3,7 @@
 1. DB migrate

 ```
-yarn blitz prisma migrate dev --preview-feature
+yarn blitz prisma migrate dev
 ```

 2. Start the dev server
--- a/examples/store/app/admin/api/users.ts
+++ b/examples/store/app/admin/api/users.ts
@@ -1,13 +1,5 @@
-import db, {Product} from "db"
+import db from "db"
 import {BlitzApiRequest, BlitzApiResponse} from "blitz"
-import {mean} from "lodash"
-
-// this is here mainly as an integration test for
-// importing from api/
-export function meanPrice(products: Product[]) {
-  const prices = products.map((p) => p.price).filter((p) => !!p) as number[]
-  return mean(prices)
-}

 export default async function users(_req: BlitzApiRequest, res: BlitzApiResponse) {
  const products = await db.product.findMany()
--- a/examples/store/app/admin/pages/admin/products/index.tsx
+++ b/examples/store/app/admin/pages/admin/products/index.tsx
@@ -1,7 +1,15 @@
 import {Suspense, useState} from "react"
 import {useQuery, Link, useRouterQuery, invalidateQuery, setQueryData} from "blitz"
 import getProducts from "app/products/queries/getProducts"
-import {meanPrice} from "app/admin/api/users"
+import {mean} from "lodash"
+import {Product} from "@prisma/client"
+
+// this is here mainly as an integration test for
+// importing from api/
+export function meanPrice(products: Product[]) {
+  const prices = products.map((p) => p.price).filter((p) => !!p) as number[]
+  return mean(prices)
+}

 function reversedProductList(productsList) {
  return {...productsList, products: [...productsList.products].reverse()}
--- a/examples/store/app/pages/_app.tsx
+++ b/examples/store/app/pages/_app.tsx
@@ -1,21 +1,14 @@
-import {AppProps, ErrorComponent} from "blitz"
-import {ErrorBoundary} from "react-error-boundary"
-import {queryCache} from "react-query"
+import {AppProps, ErrorBoundary, ErrorComponent, useQueryErrorResetBoundary} from "blitz"

 if (typeof window !== "undefined") {
  window["DEBUG_BLITZ"] = 1
 }

 export default function App({Component, pageProps}: AppProps) {
+  const {reset} = useQueryErrorResetBoundary()
+
  return (
-    <ErrorBoundary
-      FallbackComponent={RootErrorFallback}
-      onReset={() => {
-        // This ensures the Blitz useQuery hooks will automatically refetch
-        // data any time you reset the error boundary
-        queryCache.resetErrorBoundaries()
-      }}
-    >
+    <ErrorBoundary FallbackComponent={RootErrorFallback} onReset={reset}>
      <Component {...pageProps} />
    </ErrorBoundary>
  )
--- a/examples/store/app/products/pages/products/[handle].tsx
+++ b/examples/store/app/products/pages/products/[handle].tsx
@@ -27,8 +27,8 @@ const Page = function ({product}: InferGetStaticPropsType<typeof getStaticProps>
  return (
    <div>
      <h1>{product.name}</h1>
-      <p>{product.description}</p>
-      <p>Price: ${product.price}</p>
+      <p className="description">{product.description}</p>
+      <p className="price">Price: ${product.price}</p>

      <Link href="/products">
        <a>All Products</a>
--- a/examples/store/app/products/pages/products/index.tsx
+++ b/examples/store/app/products/pages/products/index.tsx
@@ -1,10 +1,17 @@
 import {Link, BlitzPage, InferGetStaticPropsType} from "blitz"
-import getProducts, {averagePrice} from "../../queries/getProducts"
+import getProducts from "../../queries/getProducts"
+import {sum} from "lodash"
+import {Product} from "@prisma/client"

 // regression test for #1646
 import {getMeSomeQualityHumor} from "../../api"
 console.log("Attention! Must read: " + getMeSomeQualityHumor())

+export function averagePrice(products: Product[]) {
+  const prices = products.map((p) => p.price ?? 0)
+  return sum(prices) / prices.length
+}
+
 export const getStaticProps = async () => {
  const {products} = await getProducts({orderBy: {id: "desc"}})
  return {
--- a/examples/store/app/products/pages/products/infinite.tsx
+++ b/examples/store/app/products/pages/products/infinite.tsx
@@ -3,19 +3,18 @@ import {BlitzPage, useInfiniteQuery, Link} from "blitz"
 import getProducts from "app/products/queries/getProducts"

 const Products = () => {
-  const [groupedProducts, {isFetching, isFetchingMore, fetchMore, canFetchMore}] = useInfiniteQuery(
-    getProducts,
-    (page = {take: 3, skip: 0}) => page,
-    {
-      getFetchMore: (lastGroup) => lastGroup.nextPage,
-    },
-  )
+  const [
+    productPages,
+    {isFetching, isFetchingNextPage, fetchNextPage, hasNextPage},
+  ] = useInfiniteQuery(getProducts, (page = {take: 3, skip: 0}) => page, {
+    getNextPageParam: (lastPage) => lastPage.nextPage,
+  })

  return (
    <>
-      {groupedProducts.map((group, i) => (
+      {productPages.map((page, i) => (
        <Fragment key={i}>
-          {group.products.map((product) => (
+          {page.products.map((product) => (
            <p key={product.id} data-test="productName">
              {product.name}
            </p>
@@ -24,12 +23,16 @@ const Products = () => {
      ))}

      <div>
-        <button onClick={() => fetchMore()} disabled={!canFetchMore || !!isFetchingMore}>
-          {isFetchingMore ? "Loading more..." : canFetchMore ? "Load More" : "Nothing more to load"}
+        <button onClick={() => fetchNextPage()} disabled={!hasNextPage || !!isFetchingNextPage}>
+          {isFetchingNextPage
+            ? "Loading more..."
+            : hasNextPage
+            ? "Load More"
+            : "Nothing more to load"}
        </button>
      </div>

-      <div>{isFetching && !isFetchingMore ? "Fetching..." : null}</div>
+      <div>{isFetching && !isFetchingNextPage ? "Fetching..." : null}</div>
    </>
  )
 }
--- a/examples/store/app/products/queries/getProducts.ts
+++ b/examples/store/app/products/queries/getProducts.ts
@@ -1,11 +1,5 @@
 import {Middleware, paginate} from "blitz"
-import db, {Prisma, Product} from "db"
-import {sum} from "lodash"
-
-export function averagePrice(products: Product[]) {
-  const prices = products.map((p) => p.price ?? 0)
-  return sum(prices) / prices.length
-}
+import db, {Prisma} from "db"

 type GetProductsInput = {
  where?: Prisma.ProductFindManyArgs["where"]
--- a/examples/store/blitz.config.js
+++ b/examples/store/blitz.config.js
@@ -1,6 +1,4 @@
-const withMonorepoBuildTooling = require("@preconstruct/next")
-
-module.exports = withMonorepoBuildTooling({
+module.exports = {
  middleware: [
    (req, res, next) => {
      res.blitzCtx.referer = req.headers.referer
@@ -24,4 +22,4 @@ module.exports = withMonorepoBuildTooling({
  //   // Important: return the modified config
  //   return config
  // },
-})
+}
--- a/Show More
+++ b/Show More