fix test

(minor)

.all-contributorsrc

@@ -1302,7 +1302,8 @@
       "avatar_url": "https://avatars1.githubusercontent.com/u/6379824?v=4",
       "profile": "https://oesterkilde.dk/",
       "contributions": [
-        "doc"
+        "doc",
+        "code"
       ]
     },
     {
@@ -1540,6 +1541,318 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "rap2hpoutre",
+      "name": "Raphaël Huchet",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/1575946?v=4",
+      "profile": "http://raph.site",
+      "contributions": [
+        "doc",
+        "test",
+        "code"
+      ]
+    },
+    {
+      "login": "KATT",
+      "name": "Alex Johansson",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/459267?v=4",
+      "profile": "http://kattcorp.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "dmzza",
+      "name": "David Mazza",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/120893?v=4",
+      "profile": "http://davidmazza.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "rayandrews",
+      "name": "Ray Andrew",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/4437323?v=4",
+      "profile": "https://github.com/rayandrews",
+      "contributions": [
+        "code",
+        "doc"
+      ]
+    },
+    {
+      "login": "Mzaien",
+      "name": "Abdullah Mzaien",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/43112535?v=4",
+      "profile": "http://Dal.Design",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "williamkwao",
+      "name": "William Kwao",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/8839514?v=4",
+      "profile": "http://kwao.io",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "sakulstra",
+      "name": "Lukas Strassel",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/4396533?v=4",
+      "profile": "https://github.com/sakulstra",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "tpatel",
+      "name": "Thibaut Patel",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/494686?v=4",
+      "profile": "https://thibpat.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "jonstuebe",
+      "name": "Jon Stuebe",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/156722?v=4",
+      "profile": "http://jonstuebe.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "ugogo",
+      "name": "Ugo Onali",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/5040476?v=4",
+      "profile": "https://ugogo.dev",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "saintmalik",
+      "name": "SaintMalik",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/37118134?v=4",
+      "profile": "https://saintmalik.me",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "Khaledgarbaya",
+      "name": "Khaled Garbaya",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/1156093?v=4",
+      "profile": "https://khaledgarbaya.net",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "tundera",
+      "name": "tundera",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/61833561?v=4",
+      "profile": "https://tundera.dev",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "markylaing",
+      "name": "markylaing",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/41469221?v=4",
+      "profile": "https://github.com/markylaing",
+      "contributions": [
+        "code",
+        "doc"
+      ]
+    },
+    {
+      "login": "AkifumiSato",
+      "name": "Akifumi Sato",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/25711332?v=4",
+      "profile": "https://akfm.dev/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "beeplin",
+      "name": "Beep LIN",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/13058150?v=4",
+      "profile": "https://github.com/beeplin",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "mattfwood",
+      "name": "Matt Wood",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/22530815?v=4",
+      "profile": "https://mattwood.tech/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "jackbravo",
+      "name": "Joaquin Bravo Contreras",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/15214?v=4",
+      "profile": "http://joaquin.axai.mx",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "arjundubey-cr",
+      "name": "Arjun Dubey",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/40758425?v=4",
+      "profile": "https://github.com/arjundubey-cr",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "chanand",
+      "name": "chanand",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/1317789?v=4",
+      "profile": "https://github.com/chanand",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "phillipkregg",
+      "name": "phillipkregg",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/1066044?v=4",
+      "profile": "https://github.com/phillipkregg",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "timReynolds",
+      "name": "Tim Reynolds",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/168870?v=4",
+      "profile": "http://timothyreynolds.co.uk",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "linbudu599",
+      "name": "Linbudu",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/48507806?v=4",
+      "profile": "https://linbudu.top/",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "creimers",
+      "name": "C Reimers",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/6090492?v=4",
+      "profile": "http://www.superservice-international.com",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "kyken",
+      "name": "Tsuyoshi Osawa",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/20137120?v=4",
+      "profile": "https://github.com/kyken",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "rembrandtreyes",
+      "name": "Rembrandt Reyes",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/15057964?v=4",
+      "profile": "https://rembrandtreyes.com/",
+      "contributions": [
+        "code",
+        "doc",
+        "test"
+      ]
+    },
+    {
+      "login": "doi-t",
+      "name": "Toshiya Doi",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/5877477?v=4",
+      "profile": "https://doi-t.net",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "koolii",
+      "name": "t.kuriyama",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/3866581?v=4",
+      "profile": "https://www.koolii.net/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "malkomalko",
+      "name": "Robert Malko",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/763?v=4",
+      "profile": "https://github.com/malkomalko",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "ranjan-purbey",
+      "name": "Ranjan Purbey",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/6953187?v=4",
+      "profile": "https://github.com/ranjan-purbey",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "tarunama",
+      "name": "tarunama",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/6047881?v=4",
+      "profile": "https://github.com/tarunama",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "bacongravy",
+      "name": "David Kramer",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/16848768?v=4",
+      "profile": "http://www.bacongravy.net/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "mikeesto",
+      "name": "Michael Esteban",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/21051488?v=4",
+      "profile": "https://mikeesto.com",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "marina-ki",
+      "name": "marina",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/54174518?v=4",
+      "profile": "https://github.com/marina-ki",
+      "contributions": [
+        "doc"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.eslintrc.js

@@ -30,7 +30,7 @@ module.exports = {
     // note you must disable the base rule as it can report incorrect errors
     "no-redeclare": "off",
     "@typescript-eslint/no-redeclare": ["error"],
-    "simple-import-sort/sort": [
+    "simple-import-sort/imports": [
       "warn",
       {
         groups: [

.github/CODEOWNERS

@@ -2,7 +2,7 @@
 
 * @flybayer
 
-packages/cli/**/* @aem
-packages/generator/**/* @aem
+packages/cli/**/* @aem, @flybayer
+packages/generator/**/* @aem @flybayer
 packages/generator/templates**/* @flybayer
-packages/installer/**/* @aem
+packages/installer/**/* @aem @flybayer

.github/workflows/compressed.yml

@@ -1,4 +1,4 @@
-name: Compressed Size
+name: CI
 
 on:
   pull_request:
@@ -6,14 +6,15 @@ on:
 
 jobs:
   build:
+    name: Compressed Size
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v2
       - name: Use Node and Yarn
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2
         with:
-          node-version: "12.x"
+          node-version: "14"
       - name: Install dependencies
         run: |
           yarn && yarn build

.github/workflows/main.yml

@@ -1,4 +1,4 @@
-name: Continuous Integration
+name: CI
 
 on:
   push:
@@ -17,9 +17,9 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2
         with:
-          node-version: "12.16.1"
+          node-version: "14"
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
@@ -32,9 +32,9 @@ jobs:
             **/node_modules
             /home/runner/.cache/Cypress
             C:\Users\runneradmin\AppData\Local\Cypress\Cache
-          key: ${{ runner.os }}-yarn-v4-${{ hashFiles('yarn.lock') }}
+          key: ${{ runner.os }}-${{ runner.node_version}}-yarn-v4-${{ hashFiles('yarn.lock') }}
           restore-keys: |
-            ${{ runner.os }}-yarn-v4-
+            ${{ runner.os }}-${{ runner.node_version}}-yarn-v4-
       - name: Install dependencies
         run: yarn install --frozen-lockfile --silent
         env:
@@ -44,17 +44,18 @@ jobs:
         env:
           CI: true
   build_and_test_pkgs:
-    name: Build & Test Packages
+    name: Packages Tests
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
+        node_version: [12, 14]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2
         with:
-          node-version: "12.16.1"
+          node-version: ${{ matrix.node_version }}
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
@@ -66,9 +67,9 @@ jobs:
             ${{ steps.yarn-cache-dir-path.outputs.dir }}
             /home/runner/.cache/Cypress
             C:\Users\runneradmin\AppData\Local\Cypress\Cache
-          key: ${{ runner.os }}-yarn-v4-${{ hashFiles('yarn.lock') }}
+          key: ${{ runner.os }}-${{ runner.node_version}}-yarn-v4-${{ hashFiles('yarn.lock') }}
           restore-keys: |
-            ${{ runner.os }}-yarn-v4-
+            ${{ runner.os }}-${{ runner.node_version}}-yarn-v4-
       - name: Install dependencies
         run: yarn install --frozen-lockfile --silent
         env:
@@ -85,17 +86,19 @@ jobs:
         env:
           CI: true
   build_and_test_examples:
-    name: Build & Test Examples
+    timeout-minutes: 30
+    name: Example Apps Tests
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
+        node_version: [12, 14]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2
         with:
-          node-version: "12.16.1"
+          node-version: ${{ matrix.node_version }}
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
@@ -107,9 +110,9 @@ jobs:
             ${{ steps.yarn-cache-dir-path.outputs.dir }}
             /home/runner/.cache/Cypress
             C:\Users\runneradmin\AppData\Local\Cypress\Cache
-          key: ${{ runner.os }}-yarn-v4-${{ hashFiles('yarn.lock') }}
+          key: ${{ runner.os }}-${{ runner.node_version}}-yarn-v4-${{ hashFiles('yarn.lock') }}
           restore-keys: |
-            ${{ runner.os }}-yarn-v4-
+            ${{ runner.os }}-${{ runner.node_version}}-yarn-v4-
       - name: Install dependencies
         run: yarn install --frozen-lockfile --silent
         env:

.gitignore

@@ -22,3 +22,5 @@ dist
 .blitz-cli-cache
 .vscode
 .tsbuildinfo
+.nvmrc
+**/.test*

.kodiak.toml

@@ -0,0 +1,5 @@
+# .kodiak.toml
+# Minimal config. version is the only required field.
+version = 1
+merge.automerge_label = "0 - <(^_^)> -  merge it! ✌️"
+approve.auto_approve_usernames = ["flybayer", "depfu"]

.node-version

@@ -1 +1 @@
-12.16.1
+12.20.0

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-162-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-196-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">
@@ -128,13 +128,17 @@ 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">
-<img alt="" src="https://reactbricks.com/reactbricks_icon.svg" width="30px">
+ <img alt="" src="https://reactbricks.com/reactbricks_icon.svg" width="30px"/>
+ </a>
+ <a aria-label="Andreas Asprou" href="https://andreas.fyi">
+<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/canary/assets/andreas.jpg" width="30px"/>
 </a>
 
+
 ### 🥉 Bronze Sponsors
 
-<a aria-label="Your Company" href="#">
-<img alt="" src="https://dummyimage.com/1000x330/efe8ff/000000.png&text=Your+Logo+Here" width="100px">
+<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="110px">
 </a>
 
 ### 🥈 Silver Sponsors
@@ -145,9 +149,11 @@ Your financial contributions help ensure Blitz continues to be developed and mai
 
 ### 🏆 Gold Sponsors
 
-<a aria-label="Your Company" href="#">
-<img alt="" src="https://dummyimage.com/1000x330/efe8ff/000000.png&text=Your+Logo+Here" width="300px">
+<div>
+<a aria-label="G2i" href="http://g2i.co/sign-up?utm_source=blitz&utm_medium=referral&utm_campaign=blitz2020">
+<img alt="" src="https://files-5oz00y7xp.vercel.app/G2i_Logo_wwords.png" width="160px">
 </a>
+</div>
 
 ### 💎 Diamond Sponsors
 
@@ -163,7 +169,6 @@ Your financial contributions help ensure Blitz continues to be developed and mai
 <table>
   <tr>
     <td align="center"><a href="https://twitter.com/flybayer"><img src="https://avatars3.githubusercontent.com/u/8813276?v=4" width="100px;" alt=""/><br /><sub><b>Brandon Bayer</b></sub></a><br />Creator</td>
-    <td align="center"><a href="https://merelinguist.now.sh"><img src="https://avatars3.githubusercontent.com/u/24858006?v=4" width="100px;" alt=""/><br /><sub><b>Dylan Brookes</b></sub></a><br />Friendly Generalist</td>
   </tr>
 </table>
 <!-- markdownlint-enable -->
@@ -211,6 +216,8 @@ _Issue triage, pull request triage, community encouragement and moderation, etc_
     <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://flavioander.com/"><img src="https://avatars2.githubusercontent.com/u/14948074?s=460&u=31d7ea58b5c5cd9f724d684ed578f68896c4af71&v=4" width="100px;" alt=""/><br /><sub><b>Flavio Andrade</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>
 </table>
 <!-- markdownlint-enable -->
@@ -401,7 +408,7 @@ Thanks to these wonderful people ([emoji key](https://allcontributors.org/docs/e
   <tr>
     <td align="center"><a href="https://github.com/aericson"><img src="https://avatars3.githubusercontent.com/u/692542?v=4" width="100px;" alt=""/><br /><sub><b>André Ericson</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=aericson" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=aericson" title="Documentation">📖</a></td>
     <td align="center"><a href="http://Cajotafer.com"><img src="https://avatars2.githubusercontent.com/u/41461969?v=4" width="100px;" alt=""/><br /><sub><b>Carlos Fernández</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=cajotafer" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://oesterkilde.dk/"><img src="https://avatars1.githubusercontent.com/u/6379824?v=4" width="100px;" alt=""/><br /><sub><b>Kevin Østerkilde</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=Kosai106" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://oesterkilde.dk/"><img src="https://avatars1.githubusercontent.com/u/6379824?v=4" width="100px;" alt=""/><br /><sub><b>Kevin Østerkilde</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=Kosai106" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=Kosai106" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/aaronfulkerson"><img src="https://avatars0.githubusercontent.com/u/31112737?v=4" width="100px;" alt=""/><br /><sub><b>aaronfulkerson</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=aaronfulkerson" title="Code">💻</a> <a href="#question-aaronfulkerson" title="Answering Questions">💬</a></td>
     <td align="center"><a href="https://github.com/alexnaiman"><img src="https://avatars3.githubusercontent.com/u/25799714?v=4" width="100px;" alt=""/><br /><sub><b>Alexandru Naiman</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=alexnaiman" title="Code">💻</a></td>
     <td align="center"><a href="https://davidlutta.github.io/portfolio/"><img src="https://avatars2.githubusercontent.com/u/14890315?v=4" width="100px;" alt=""/><br /><sub><b>David Ezekiel Lutta</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=davidlutta" title="Code">💻</a></td>
@@ -436,6 +443,48 @@ Thanks to these wonderful people ([emoji key](https://allcontributors.org/docs/e
   </tr>
   <tr>
     <td align="center"><a href="https://github.com/piotrski"><img src="https://avatars0.githubusercontent.com/u/244174?v=4" width="100px;" alt=""/><br /><sub><b>Piotrek Tomczewski</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=piotrski" title="Code">💻</a></td>
+    <td align="center"><a href="http://raph.site"><img src="https://avatars3.githubusercontent.com/u/1575946?v=4" width="100px;" alt=""/><br /><sub><b>Raphaël Huchet</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=rap2hpoutre" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=rap2hpoutre" title="Tests">⚠️</a> <a href="https://github.com/blitz-js/blitz/commits?author=rap2hpoutre" title="Code">💻</a></td>
+    <td align="center"><a href="http://kattcorp.com"><img src="https://avatars1.githubusercontent.com/u/459267?v=4" width="100px;" alt=""/><br /><sub><b>Alex Johansson</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=KATT" title="Code">💻</a></td>
+    <td align="center"><a href="http://davidmazza.com"><img src="https://avatars0.githubusercontent.com/u/120893?v=4" width="100px;" alt=""/><br /><sub><b>David Mazza</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=dmzza" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/rayandrews"><img src="https://avatars1.githubusercontent.com/u/4437323?v=4" width="100px;" alt=""/><br /><sub><b>Ray Andrew</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=rayandrews" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=rayandrews" title="Documentation">📖</a></td>
+    <td align="center"><a href="http://Dal.Design"><img src="https://avatars3.githubusercontent.com/u/43112535?v=4" width="100px;" alt=""/><br /><sub><b>Abdullah Mzaien</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=Mzaien" title="Code">💻</a></td>
+    <td align="center"><a href="http://kwao.io"><img src="https://avatars2.githubusercontent.com/u/8839514?v=4" 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" 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://thibpat.com"><img src="https://avatars3.githubusercontent.com/u/494686?v=4" 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" 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" 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" 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" 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" 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>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/markylaing"><img src="https://avatars2.githubusercontent.com/u/41469221?v=4" 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>
+    <td align="center"><a href="https://akfm.dev/"><img src="https://avatars2.githubusercontent.com/u/25711332?v=4" width="100px;" alt=""/><br /><sub><b>Akifumi Sato</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=AkifumiSato" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/beeplin"><img src="https://avatars3.githubusercontent.com/u/13058150?v=4" width="100px;" alt=""/><br /><sub><b>Beep LIN</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=beeplin" title="Code">💻</a></td>
+    <td align="center"><a href="https://mattwood.tech/"><img src="https://avatars1.githubusercontent.com/u/22530815?v=4" width="100px;" alt=""/><br /><sub><b>Matt Wood</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=mattfwood" title="Code">💻</a></td>
+    <td align="center"><a href="http://joaquin.axai.mx"><img src="https://avatars1.githubusercontent.com/u/15214?v=4" width="100px;" alt=""/><br /><sub><b>Joaquin Bravo Contreras</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=jackbravo" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/arjundubey-cr"><img src="https://avatars0.githubusercontent.com/u/40758425?v=4" width="100px;" alt=""/><br /><sub><b>Arjun Dubey</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=arjundubey-cr" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/chanand"><img src="https://avatars0.githubusercontent.com/u/1317789?v=4" width="100px;" alt=""/><br /><sub><b>chanand</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=chanand" title="Code">💻</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/phillipkregg"><img src="https://avatars0.githubusercontent.com/u/1066044?v=4" width="100px;" alt=""/><br /><sub><b>phillipkregg</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=phillipkregg" title="Documentation">📖</a></td>
+    <td align="center"><a href="http://timothyreynolds.co.uk"><img src="https://avatars1.githubusercontent.com/u/168870?v=4" width="100px;" alt=""/><br /><sub><b>Tim Reynolds</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=timReynolds" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://linbudu.top/"><img src="https://avatars0.githubusercontent.com/u/48507806?v=4" width="100px;" alt=""/><br /><sub><b>Linbudu</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=linbudu599" title="Documentation">📖</a></td>
+    <td align="center"><a href="http://www.superservice-international.com"><img src="https://avatars0.githubusercontent.com/u/6090492?v=4" width="100px;" alt=""/><br /><sub><b>C Reimers</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=creimers" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/kyken"><img src="https://avatars2.githubusercontent.com/u/20137120?v=4" width="100px;" alt=""/><br /><sub><b>Tsuyoshi Osawa</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=kyken" title="Code">💻</a></td>
+    <td align="center"><a href="https://rembrandtreyes.com/"><img src="https://avatars1.githubusercontent.com/u/15057964?v=4" width="100px;" alt=""/><br /><sub><b>Rembrandt Reyes</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=rembrandtreyes" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=rembrandtreyes" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=rembrandtreyes" title="Tests">⚠️</a></td>
+    <td align="center"><a href="https://doi-t.net"><img src="https://avatars2.githubusercontent.com/u/5877477?v=4" width="100px;" alt=""/><br /><sub><b>Toshiya Doi</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=doi-t" title="Documentation">📖</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://www.koolii.net/"><img src="https://avatars1.githubusercontent.com/u/3866581?v=4" width="100px;" alt=""/><br /><sub><b>t.kuriyama</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=koolii" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/malkomalko"><img src="https://avatars3.githubusercontent.com/u/763?v=4" width="100px;" alt=""/><br /><sub><b>Robert Malko</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=malkomalko" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/ranjan-purbey"><img src="https://avatars3.githubusercontent.com/u/6953187?v=4" width="100px;" alt=""/><br /><sub><b>Ranjan Purbey</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=ranjan-purbey" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/tarunama"><img src="https://avatars3.githubusercontent.com/u/6047881?v=4" width="100px;" alt=""/><br /><sub><b>tarunama</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=tarunama" title="Code">💻</a></td>
+    <td align="center"><a href="http://www.bacongravy.net/"><img src="https://avatars3.githubusercontent.com/u/16848768?v=4" width="100px;" alt=""/><br /><sub><b>David Kramer</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=bacongravy" title="Code">💻</a></td>
+    <td align="center"><a href="https://mikeesto.com"><img src="https://avatars1.githubusercontent.com/u/21051488?v=4" width="100px;" alt=""/><br /><sub><b>Michael Esteban</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=mikeesto" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/marina-ki"><img src="https://avatars0.githubusercontent.com/u/54174518?v=4" width="100px;" alt=""/><br /><sub><b>marina</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=marina-ki" title="Documentation">📖</a></td>
   </tr>
 </table>
 

examples/auth/.eslintrc.js

@@ -1,15 +1,3 @@
 module.exports = {
-  env: {
-    es2020: true,
-    "cypress/globals": true,
-  },
-  extends: ["react-app", "plugin:jsx-a11y/recommended"],
-  plugins: ["jsx-a11y", "cypress"],
-  rules: {
-    "import/no-anonymous-default-export": "error",
-    "import/no-webpack-loader-syntax": "off",
-    "react/react-in-jsx-scope": "off", // React is always in scope with Blitz
-    "jsx-a11y/anchor-is-valid": "off", //Doesn't play well with Blitz/Next <Link> usage
-    "jsx-a11y/label-has-associated-control": "off", //Doesn't play well with form libraries
-  },
+  extends: ["blitz"],
 }

examples/auth/README.md

@@ -14,7 +14,7 @@ model Project {
 2. DB migrate
 
 ```
-blitz db migrate
+blitz prisma migrate dev --preview-feature
 ```
 
 3. Start the dev server

examples/auth/app/api/auth/[...auth].ts

@@ -23,109 +23,115 @@ assert(process.env.AUTH0_CLIENT_SECRET, "You must provide the AUTH0_CLIENT_SECRE
 
 export default passportAuth({
   successRedirectUrl: "/",
-  authenticateOptions: {scope: "openid email profile"}, //used for Auth0Strategy - without an empty profile is returned
   strategies: [
-    new TwitterStrategy(
-      {
-        consumerKey: process.env.TWITTER_CONSUMER_KEY,
-        consumerSecret: process.env.TWITTER_CONSUMER_SECRET,
-        callbackURL:
-          process.env.NODE_ENV === "production"
-            ? "https://auth-example-flybayer.blitzjs.vercel.app/api/auth/twitter/callback"
-            : "http://localhost:3000/api/auth/twitter/callback",
-        includeEmail: true,
-      },
-      async function (_token, _tokenSecret, profile, done) {
-        const email = profile.emails && profile.emails[0]?.value
+    {
+      strategy: new TwitterStrategy(
+        {
+          consumerKey: process.env.TWITTER_CONSUMER_KEY,
+          consumerSecret: process.env.TWITTER_CONSUMER_SECRET,
+          callbackURL:
+            process.env.NODE_ENV === "production"
+              ? "https://auth-example-flybayer.blitzjs.vercel.app/api/auth/twitter/callback"
+              : "http://localhost:3000/api/auth/twitter/callback",
+          includeEmail: true,
+        },
+        async function (_token, _tokenSecret, profile, done) {
+          const email = profile.emails && profile.emails[0]?.value
 
-        if (!email) {
-          // This can happen if you haven't enabled email access in your twitter app permissions
-          return done(new Error("Twitter OAuth response doesn't have email."))
-        }
+          if (!email) {
+            // This can happen if you haven't enabled email access in your twitter app permissions
+            return done(new Error("Twitter OAuth response doesn't have email."))
+          }
 
-        const user = await db.user.upsert({
-          where: {email},
-          create: {
-            email,
-            name: profile.displayName,
-          },
-          update: {email},
-        })
+          const user = await db.user.upsert({
+            where: {email},
+            create: {
+              email,
+              name: profile.displayName,
+            },
+            update: {email},
+          })
 
-        const publicData = {userId: user.id, roles: [user.role], source: "twitter"}
-        done(null, {publicData})
-      },
-    ),
-    new GitHubStrategy(
-      {
-        clientID: process.env.GITHUB_CLIENT_ID,
-        clientSecret: process.env.GITHUB_CLIENT_SECRET,
-        callbackURL:
-          process.env.NODE_ENV === "production"
-            ? "https://auth-example-flybayer.blitzjs.vercel.app/api/auth/github/callback"
-            : "http://localhost:3000/api/auth/github/callback",
-      },
-      async function (_token, _tokenSecret, profile, done) {
-        const email = profile.emails && profile.emails[0]?.value
+          const publicData = {userId: user.id, roles: [user.role], source: "twitter"}
+          done(null, {publicData})
+        },
+      ),
+    },
+    {
+      strategy: new GitHubStrategy(
+        {
+          clientID: process.env.GITHUB_CLIENT_ID,
+          clientSecret: process.env.GITHUB_CLIENT_SECRET,
+          callbackURL:
+            process.env.NODE_ENV === "production"
+              ? "https://auth-example-flybayer.blitzjs.vercel.app/api/auth/github/callback"
+              : "http://localhost:3000/api/auth/github/callback",
+        },
+        async function (_token, _tokenSecret, profile, done) {
+          const email = profile.emails && profile.emails[0]?.value
 
-        if (!email) {
-          // This can happen if you haven't enabled email access in your twitter app permissions
-          return done(new Error("Twitter OAuth response doesn't have email."))
-        }
+          if (!email) {
+            // This can happen if you haven't enabled email access in your twitter app permissions
+            return done(new Error("Twitter OAuth response doesn't have email."))
+          }
 
-        const user = await db.user.upsert({
-          where: {email},
-          create: {
-            email,
-            name: profile.displayName,
-          },
-          update: {email},
-        })
+          const user = await db.user.upsert({
+            where: {email},
+            create: {
+              email,
+              name: profile.displayName,
+            },
+            update: {email},
+          })
 
-        const publicData = {
-          userId: user.id,
-          roles: [user.role],
-          source: "github",
-          githubUsername: profile.username,
-        }
-        done(null, {publicData})
-      },
-    ),
-    new Auth0Strategy(
-      {
-        domain: process.env.AUTH0_DOMAIN,
-        clientID: process.env.AUTH0_CLIENT_ID,
-        clientSecret: process.env.AUTH0_CLIENT_SECRET,
-        callbackURL:
-          process.env.NODE_ENV === "production"
-            ? "https://auth-example-flybayer.blitzjs.vercel.app/api/auth/auth0/callback"
-            : "http://localhost:3000/api/auth/auth0/callback",
-      },
-      async function (_token, _tokenSecret, extraParams, profile, done) {
-        const email = profile.emails && profile.emails[0]?.value
+          const publicData = {
+            userId: user.id,
+            roles: [user.role],
+            source: "github",
+            githubUsername: profile.username,
+          }
+          done(null, {publicData})
+        },
+      ),
+    },
+    {
+      authenticateOptions: {scope: "openid email profile"},
+      strategy: new Auth0Strategy(
+        {
+          domain: process.env.AUTH0_DOMAIN,
+          clientID: process.env.AUTH0_CLIENT_ID,
+          clientSecret: process.env.AUTH0_CLIENT_SECRET,
+          callbackURL:
+            process.env.NODE_ENV === "production"
+              ? "https://auth-example-flybayer.blitzjs.vercel.app/api/auth/auth0/callback"
+              : "http://localhost:3000/api/auth/auth0/callback",
+        },
+        async function (_token, _tokenSecret, extraParams, profile, done) {
+          const email = profile.emails && profile.emails[0]?.value
 
-        if (!email) {
-          // This can happen if you haven't enabled email access in your twitter app permissions
-          return done(new Error("GitHub OAuth response doesn't have email."))
-        }
+          if (!email) {
+            // This can happen if you haven't enabled email access in your twitter app permissions
+            return done(new Error("Auth0 response doesn't have email."))
+          }
 
-        const user = await db.user.upsert({
-          where: {email},
-          create: {
-            email,
-            name: profile.displayName,
-          },
-          update: {email},
-        })
+          const user = await db.user.upsert({
+            where: {email},
+            create: {
+              email,
+              name: profile.displayName,
+            },
+            update: {email},
+          })
 
-        const publicData = {
-          userId: user.id,
-          roles: [user.role],
-          source: "auth0",
-          githubUsername: profile.username,
-        }
-        done(undefined, {publicData})
-      },
-    ),
+          const publicData = {
+            userId: user.id,
+            roles: [user.role],
+            source: "auth0",
+            githubUsername: profile.username,
+          }
+          done(undefined, {publicData})
+        },
+      ),
+    },
   ],
 })

examples/auth/app/auth/auth-utils.ts

@@ -1,39 +0,0 @@
-import {AuthenticationError} from "blitz"
-import SecurePassword from "secure-password"
-import db from "db"
-
-const SP = () => new SecurePassword()
-
-export const hashPassword = async (password: string) => {
-  const hashedBuffer = await SP().hash(Buffer.from(password))
-  return hashedBuffer.toString("base64")
-}
-export const verifyPassword = async (hashedPassword: string, password: string) => {
-  try {
-    return await SP().verify(Buffer.from(password), Buffer.from(hashedPassword, "base64"))
-  } catch (error) {
-    console.error(error)
-    return false
-  }
-}
-
-export const authenticateUser = async (email: string, password: string) => {
-  const user = await db.user.findOne({where: {email}})
-
-  if (!user || !user.hashedPassword) throw new AuthenticationError()
-
-  switch (await verifyPassword(user.hashedPassword, password)) {
-    case SecurePassword.VALID:
-      break
-    case SecurePassword.VALID_NEEDS_REHASH:
-      // Upgrade hashed password with a more secure hash
-      const improvedHash = await hashPassword(password)
-      await db.user.update({where: {id: user.id}, data: {hashedPassword: improvedHash}})
-      break
-    default:
-      throw new AuthenticationError()
-  }
-
-  const {hashedPassword, ...rest} = user
-  return rest
-}

examples/auth/app/auth/mutations/login.ts

@@ -1,7 +1,23 @@
-import {Ctx} from "blitz"
-import {authenticateUser} from "app/auth/auth-utils"
+import {Ctx, SecurePassword, AuthenticationError} from "blitz"
+import db from "db"
 import * as z from "zod"
 
+export const authenticateUser = async (email: string, password: string) => {
+  const user = await db.user.findFirst({where: {email}})
+  if (!user) throw new AuthenticationError()
+
+  const result = await SecurePassword.verify(user.hashedPassword, password)
+
+  if (result === SecurePassword.VALID_NEEDS_REHASH) {
+    // Upgrade hashed password with a more secure hash
+    const improvedHash = await SecurePassword.hash(password)
+    await db.user.update({where: {id: user.id}, data: {hashedPassword: improvedHash}})
+  }
+
+  const {hashedPassword, ...rest} = user
+  return rest
+}
+
 export const LoginInput = z.object({
   email: z.string().email(),
   password: z.string(),

examples/auth/app/auth/mutations/signup.ts

@@ -1,6 +1,5 @@
-import {Ctx} from "blitz"
+import {Ctx, SecurePassword} from "blitz"
 import db from "db"
-import {hashPassword} from "app/auth/auth-utils"
 import * as z from "zod"
 
 export const SignupInput = z.object({
@@ -13,7 +12,7 @@ export default async function signup(input: SignupInputType, {session}: Ctx) {
   // This throws an error if input is invalid
   const {email, password} = SignupInput.parse(input)
 
-  const hashedPassword = await hashPassword(password)
+  const hashedPassword = await SecurePassword.hash(password)
   const user = await db.user.create({
     data: {email, hashedPassword, role: "user"},
     select: {id: true, name: true, email: true, role: true},

examples/auth/app/hooks/useCurrentUser.ts

@@ -1,10 +1,7 @@
-import {useQuery, useSession} from "blitz"
+import {useQuery} from "blitz"
 import getCurrentUser from "app/users/queries/getCurrentUser"
 
 export const useCurrentUser = () => {
-  // We wouldn't have to useSession() here, but doing so improves perf on initial
-  // load since we can skip the getCurrentUser() request.
-  const session = useSession()
-  const [user] = useQuery(getCurrentUser, null, {enabled: !!session.userId})
-  return session.userId ? user : null
+  const [user] = useQuery(getCurrentUser, null)
+  return user
 }

examples/auth/app/pages/index.tsx

@@ -25,8 +25,6 @@ const UserStuff = () => {
 
   if (session.isLoading) return <div>Loading...</div>
 
-  console.log(session.views)
-
   return (
     <div>
       {!session.userId && (

examples/auth/app/users/queries/getCurrentUser.ts

@@ -4,7 +4,7 @@ import db from "db"
 export default async function getCurrentUser(_ = null, ctx: Ctx) {
   if (!ctx.session.userId) return null
 
-  const user = await db.user.findOne({
+  const user = await db.user.findFirst({
     where: {id: ctx.session.userId},
     select: {id: true, name: true, email: true, role: true},
   })

examples/auth/app/users/queries/getUser.ts

@@ -1,15 +1,14 @@
 import {Ctx, NotFoundError} from "blitz"
-import db, {FindOneUserArgs} from "db"
+import db, {Prisma} from "db"
 
 type GetUserInput = {
-  where: FindOneUserArgs["where"]
+  where: Prisma.FindUniqueUserArgs["where"]
 }
 
 export default async function getUser({where}: GetUserInput, ctx: Ctx) {
   ctx.session.authorize()
-  console.log(ctx.session.userId)
 
-  const user = await db.user.findOne({where})
+  const user = await db.user.findFirst({where})
 
   if (!user) throw new NotFoundError(`User with id ${where.id} does not exist`)
 

examples/auth/blitz.config.js

@@ -1,4 +1,4 @@
-const {sessionMiddleware, unstable_simpleRolesIsAuthorized} = require("@blitzjs/server")
+const {sessionMiddleware, simpleRolesIsAuthorized} = require("@blitzjs/server")
 const withBundleAnalyzer = require("@next/bundle-analyzer")({
   enabled: process.env.ANALYZE === "true",
 })
@@ -6,10 +6,16 @@ const withBundleAnalyzer = require("@next/bundle-analyzer")({
 module.exports = withBundleAnalyzer({
   middleware: [
     sessionMiddleware({
-      unstable_isAuthorized: unstable_simpleRolesIsAuthorized,
+      isAuthorized: simpleRolesIsAuthorized,
       sessionExpiryMinutes: 4,
     }),
   ],
+  log: {
+    level: "trace",
+  },
+  experimental: {
+    isomorphicResolverImports: true,
+  },
   /*
   webpack: (config, {buildId, dev, isServer, defaultLoaders, webpack}) => {
     // Note: we provide webpack above so you should not `require` it

examples/auth/db/index.ts

@@ -1,15 +1,7 @@
+import {makeServerOnlyPrisma} from "blitz"
 import {PrismaClient} from "@prisma/client"
+
+const ServerOnlyPrisma = makeServerOnlyPrisma(PrismaClient)
+
 export * from "@prisma/client"
-
-let prisma: PrismaClient
-
-if (process.env.NODE_ENV === "production") {
-  prisma = new PrismaClient()
-} else {
-  // Ensure the prisma instance is re-used during hot-reloading
-  // Otherwise, a new client will be created on every reload
-  globalThis["prisma"] = globalThis["prisma"] || new PrismaClient()
-  prisma = globalThis["prisma"]
-}
-
-export default prisma
+export default new ServerOnlyPrisma()

examples/auth/db/migrations/20200704211726/README.md

@@ -1,82 +0,0 @@
-# Migration `20200704211726`
-
-This migration has been generated by Brandon Bayer at 7/4/2020, 9:17:26 PM.
-You can check out the [state of the schema](./schema.prisma) after the migration.
-
-## Database Steps
-
-```sql
-PRAGMA foreign_keys=OFF;
-
-CREATE TABLE "quaint"."User" (
-"createdAt" DATE NOT NULL DEFAULT CURRENT_TIMESTAMP ,"email" TEXT NOT NULL  ,"hashedPassword" TEXT NOT NULL  ,"id" INTEGER NOT NULL  PRIMARY KEY AUTOINCREMENT,"name" TEXT   ,"role" TEXT NOT NULL  ,"updatedAt" DATE NOT NULL  )
-
-CREATE TABLE "quaint"."Session" (
-"antiCSRFToken" TEXT   ,"createdAt" DATE NOT NULL DEFAULT CURRENT_TIMESTAMP ,"expiresAt" DATE   ,"handle" TEXT NOT NULL  ,"hashedSessionToken" TEXT   ,"id" INTEGER NOT NULL  PRIMARY KEY AUTOINCREMENT,"privateData" TEXT   ,"publicData" TEXT   ,"updatedAt" DATE NOT NULL  ,"userId" INTEGER   ,FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE SET NULL ON UPDATE CASCADE)
-
-CREATE UNIQUE INDEX "quaint"."User.email" ON "User"("email")
-
-CREATE UNIQUE INDEX "quaint"."Session.handle" ON "Session"("handle")
-
-PRAGMA "quaint".foreign_key_check;
-
-PRAGMA foreign_keys=ON;
-```
-
-## Changes
-
-```diff
-diff --git schema.prisma schema.prisma
-migration ..20200704211726
---- datamodel.dml
-+++ datamodel.dml
-@@ -1,0 +1,46 @@
-+// This is your Prisma schema file,
-+// learn more about it in the docs: https://pris.ly/d/prisma-schema
-+
-+datasource sqlite {
-+  provider = "sqlite"
-+  url = "***"
-+}
-+
-+// SQLite is easy to start with, but if you use Postgres in production
-+// you should also use it in development with the following:
-+//datasource postgresql {
-+//  provider = "postgresql"
-+//  url = "***"
-+//}
-+
-+generator client {
-+  provider = "prisma-client-js"
-+}
-+
-+
-+// --------------------------------------
-+
-+model User {
-+  id        Int      @default(autoincrement()) @id
-+  createdAt DateTime @default(now())
-+  updatedAt DateTime @updatedAt
-+  name      String?
-+  email     String   @unique
-+  hashedPassword String
-+  role      String
-+  sessions  Session[]
-+}
-+
-+model Session {
-+  id                 Int      @default(autoincrement()) @id
-+  createdAt          DateTime @default(now())
-+  updatedAt          DateTime @updatedAt
-+  expiresAt          DateTime?
-+  handle             String   @unique
-+  user               User?     @relation(fields: [userId], references: [id])
-+  userId             Int?
-+  hashedSessionToken String?
-+  antiCSRFToken      String?
-+  publicData         String?
-+  privateData        String?
-+}
-```
-
-

examples/auth/db/migrations/20200704211726/schema.prisma

@@ -1,46 +0,0 @@
-// This is your Prisma schema file,
-// learn more about it in the docs: https://pris.ly/d/prisma-schema
-
-datasource sqlite {
-  provider = "sqlite"
-  url = "***"
-}
-
-// SQLite is easy to start with, but if you use Postgres in production
-// you should also use it in development with the following:
-//datasource postgresql {
-//  provider = "postgresql"
-//  url = "***"
-//}
-
-generator client {
-  provider = "prisma-client-js"
-}
-
-
-// --------------------------------------
-
-model User {
-  id        Int      @default(autoincrement()) @id
-  createdAt DateTime @default(now())
-  updatedAt DateTime @updatedAt
-  name      String?
-  email     String   @unique
-  hashedPassword String
-  role      String
-  sessions  Session[]
-}
-
-model Session {
-  id                 Int      @default(autoincrement()) @id
-  createdAt          DateTime @default(now())
-  updatedAt          DateTime @updatedAt
-  expiresAt          DateTime?
-  handle             String   @unique
-  user               User?     @relation(fields: [userId], references: [id])
-  userId             Int?
-  hashedSessionToken String?
-  antiCSRFToken      String?
-  publicData         String?
-  privateData        String?
-}

examples/auth/db/migrations/20200704211726/steps.json

@@ -1,373 +0,0 @@
-{
-  "version": "0.3.14-fixed",
-  "steps": [
-    {
-      "tag": "CreateSource",
-      "source": "sqlite"
-    },
-    {
-      "tag": "CreateArgument",
-      "location": {
-        "tag": "Source",
-        "source": "sqlite"
-      },
-      "argument": "provider",
-      "value": "\"sqlite\""
-    },
-    {
-      "tag": "CreateArgument",
-      "location": {
-        "tag": "Source",
-        "source": "sqlite"
-      },
-      "argument": "url",
-      "value": "\"file:./db.sqlite\""
-    },
-    {
-      "tag": "CreateModel",
-      "model": "User"
-    },
-    {
-      "tag": "CreateField",
-      "model": "User",
-      "field": "id",
-      "type": "Int",
-      "arity": "Required"
-    },
-    {
-      "tag": "CreateDirective",
-      "location": {
-        "path": {
-          "tag": "Field",
-          "model": "User",
-          "field": "id"
-        },
-        "directive": "default"
-      }
-    },
-    {
-      "tag": "CreateArgument",
-      "location": {
-        "tag": "Directive",
-        "path": {
-          "tag": "Field",
-          "model": "User",
-          "field": "id"
-        },
-        "directive": "default"
-      },
-      "argument": "",
-      "value": "autoincrement()"
-    },
-    {
-      "tag": "CreateDirective",
-      "location": {
-        "path": {
-          "tag": "Field",
-          "model": "User",
-          "field": "id"
-        },
-        "directive": "id"
-      }
-    },
-    {
-      "tag": "CreateField",
-      "model": "User",
-      "field": "createdAt",
-      "type": "DateTime",
-      "arity": "Required"
-    },
-    {
-      "tag": "CreateDirective",
-      "location": {
-        "path": {
-          "tag": "Field",
-          "model": "User",
-          "field": "createdAt"
-        },
-        "directive": "default"
-      }
-    },
-    {
-      "tag": "CreateArgument",
-      "location": {
-        "tag": "Directive",
-        "path": {
-          "tag": "Field",
-          "model": "User",
-          "field": "createdAt"
-        },
-        "directive": "default"
-      },
-      "argument": "",
-      "value": "now()"
-    },
-    {
-      "tag": "CreateField",
-      "model": "User",
-      "field": "updatedAt",
-      "type": "DateTime",
-      "arity": "Required"
-    },
-    {
-      "tag": "CreateDirective",
-      "location": {
-        "path": {
-          "tag": "Field",
-          "model": "User",
-          "field": "updatedAt"
-        },
-        "directive": "updatedAt"
-      }
-    },
-    {
-      "tag": "CreateField",
-      "model": "User",
-      "field": "name",
-      "type": "String",
-      "arity": "Optional"
-    },
-    {
-      "tag": "CreateField",
-      "model": "User",
-      "field": "email",
-      "type": "String",
-      "arity": "Required"
-    },
-    {
-      "tag": "CreateDirective",
-      "location": {
-        "path": {
-          "tag": "Field",
-          "model": "User",
-          "field": "email"
-        },
-        "directive": "unique"
-      }
-    },
-    {
-      "tag": "CreateField",
-      "model": "User",
-      "field": "hashedPassword",
-      "type": "String",
-      "arity": "Required"
-    },
-    {
-      "tag": "CreateField",
-      "model": "User",
-      "field": "role",
-      "type": "String",
-      "arity": "Required"
-    },
-    {
-      "tag": "CreateField",
-      "model": "User",
-      "field": "sessions",
-      "type": "Session",
-      "arity": "List"
-    },
-    {
-      "tag": "CreateModel",
-      "model": "Session"
-    },
-    {
-      "tag": "CreateField",
-      "model": "Session",
-      "field": "id",
-      "type": "Int",
-      "arity": "Required"
-    },
-    {
-      "tag": "CreateDirective",
-      "location": {
-        "path": {
-          "tag": "Field",
-          "model": "Session",
-          "field": "id"
-        },
-        "directive": "default"
-      }
-    },
-    {
-      "tag": "CreateArgument",
-      "location": {
-        "tag": "Directive",
-        "path": {
-          "tag": "Field",
-          "model": "Session",
-          "field": "id"
-        },
-        "directive": "default"
-      },
-      "argument": "",
-      "value": "autoincrement()"
-    },
-    {
-      "tag": "CreateDirective",
-      "location": {
-        "path": {
-          "tag": "Field",
-          "model": "Session",
-          "field": "id"
-        },
-        "directive": "id"
-      }
-    },
-    {
-      "tag": "CreateField",
-      "model": "Session",
-      "field": "createdAt",
-      "type": "DateTime",
-      "arity": "Required"
-    },
-    {
-      "tag": "CreateDirective",
-      "location": {
-        "path": {
-          "tag": "Field",
-          "model": "Session",
-          "field": "createdAt"
-        },
-        "directive": "default"
-      }
-    },
-    {
-      "tag": "CreateArgument",
-      "location": {
-        "tag": "Directive",
-        "path": {
-          "tag": "Field",
-          "model": "Session",
-          "field": "createdAt"
-        },
-        "directive": "default"
-      },
-      "argument": "",
-      "value": "now()"
-    },
-    {
-      "tag": "CreateField",
-      "model": "Session",
-      "field": "updatedAt",
-      "type": "DateTime",
-      "arity": "Required"
-    },
-    {
-      "tag": "CreateDirective",
-      "location": {
-        "path": {
-          "tag": "Field",
-          "model": "Session",
-          "field": "updatedAt"
-        },
-        "directive": "updatedAt"
-      }
-    },
-    {
-      "tag": "CreateField",
-      "model": "Session",
-      "field": "expiresAt",
-      "type": "DateTime",
-      "arity": "Optional"
-    },
-    {
-      "tag": "CreateField",
-      "model": "Session",
-      "field": "handle",
-      "type": "String",
-      "arity": "Required"
-    },
-    {
-      "tag": "CreateDirective",
-      "location": {
-        "path": {
-          "tag": "Field",
-          "model": "Session",
-          "field": "handle"
-        },
-        "directive": "unique"
-      }
-    },
-    {
-      "tag": "CreateField",
-      "model": "Session",
-      "field": "user",
-      "type": "User",
-      "arity": "Optional"
-    },
-    {
-      "tag": "CreateDirective",
-      "location": {
-        "path": {
-          "tag": "Field",
-          "model": "Session",
-          "field": "user"
-        },
-        "directive": "relation"
-      }
-    },
-    {
-      "tag": "CreateArgument",
-      "location": {
-        "tag": "Directive",
-        "path": {
-          "tag": "Field",
-          "model": "Session",
-          "field": "user"
-        },
-        "directive": "relation"
-      },
-      "argument": "fields",
-      "value": "[userId]"
-    },
-    {
-      "tag": "CreateArgument",
-      "location": {
-        "tag": "Directive",
-        "path": {
-          "tag": "Field",
-          "model": "Session",
-          "field": "user"
-        },
-        "directive": "relation"
-      },
-      "argument": "references",
-      "value": "[id]"
-    },
-    {
-      "tag": "CreateField",
-      "model": "Session",
-      "field": "userId",
-      "type": "Int",
-      "arity": "Optional"
-    },
-    {
-      "tag": "CreateField",
-      "model": "Session",
-      "field": "hashedSessionToken",
-      "type": "String",
-      "arity": "Optional"
-    },
-    {
-      "tag": "CreateField",
-      "model": "Session",
-      "field": "antiCSRFToken",
-      "type": "String",
-      "arity": "Optional"
-    },
-    {
-      "tag": "CreateField",
-      "model": "Session",
-      "field": "publicData",
-      "type": "String",
-      "arity": "Optional"
-    },
-    {
-      "tag": "CreateField",
-      "model": "Session",
-      "field": "privateData",
-      "type": "String",
-      "arity": "Optional"
-    }
-  ]
-}

examples/auth/db/migrations/20200711145940/README.md

@@ -1,66 +0,0 @@
-# Migration `20200711145940`
-
-This migration has been generated by Brandon Bayer at 7/11/2020, 2:59:40 PM.
-You can check out the [state of the schema](./schema.prisma) after the migration.
-
-## Database Steps
-
-```sql
-PRAGMA foreign_keys=OFF;
-
-CREATE TABLE "quaint"."new_User" (
-"createdAt" DATE NOT NULL DEFAULT CURRENT_TIMESTAMP ,"email" TEXT NOT NULL  ,"hashedPassword" TEXT   ,"id" INTEGER NOT NULL  PRIMARY KEY AUTOINCREMENT,"name" TEXT   ,"role" TEXT NOT NULL DEFAULT 'user' ,"updatedAt" DATE NOT NULL  )
-
-INSERT INTO "quaint"."new_User" ("createdAt", "email", "hashedPassword", "id", "name", "role", "updatedAt") SELECT "createdAt", "email", "hashedPassword", "id", "name", "role", "updatedAt" FROM "quaint"."User"
-
-PRAGMA foreign_keys=off;
-DROP TABLE "quaint"."User";;
-PRAGMA foreign_keys=on
-
-ALTER TABLE "quaint"."new_User" RENAME TO "User";
-
-CREATE UNIQUE INDEX "quaint"."User.email" ON "User"("email")
-
-PRAGMA "quaint".foreign_key_check;
-
-PRAGMA foreign_keys=ON;
-```
-
-## Changes
-
-```diff
-diff --git schema.prisma schema.prisma
-migration 20200704211726..20200711145940
---- datamodel.dml
-+++ datamodel.dml
-@@ -2,16 +2,16 @@
- // learn more about it in the docs: https://pris.ly/d/prisma-schema
- datasource sqlite {
-   provider = "sqlite"
--  url = "***"
-+  url = "***"
- }
- // SQLite is easy to start with, but if you use Postgres in production
- // you should also use it in development with the following:
- //datasource postgresql {
- //  provider = "postgresql"
--//  url = "***"
-+//  url = "***"
- //}
- generator client {
-   provider = "prisma-client-js"
-@@ -25,10 +25,10 @@
-   createdAt DateTime @default(now())
-   updatedAt DateTime @updatedAt
-   name      String?
-   email     String   @unique
--  hashedPassword String
--  role      String
-+  hashedPassword String?
-+  role      String   @default("user")
-   sessions  Session[]
- }
- model Session {
-```
-
-

examples/auth/db/migrations/20200711145940/schema.prisma

@@ -1,46 +0,0 @@
-// This is your Prisma schema file,
-// learn more about it in the docs: https://pris.ly/d/prisma-schema
-
-datasource sqlite {
-  provider = "sqlite"
-  url = "***"
-}
-
-// SQLite is easy to start with, but if you use Postgres in production
-// you should also use it in development with the following:
-//datasource postgresql {
-//  provider = "postgresql"
-//  url = "***"
-//}
-
-generator client {
-  provider = "prisma-client-js"
-}
-
-
-// --------------------------------------
-
-model User {
-  id        Int      @default(autoincrement()) @id
-  createdAt DateTime @default(now())
-  updatedAt DateTime @updatedAt
-  name      String?
-  email     String   @unique
-  hashedPassword String?
-  role      String   @default("user")
-  sessions  Session[]
-}
-
-model Session {
-  id                 Int      @default(autoincrement()) @id
-  createdAt          DateTime @default(now())
-  updatedAt          DateTime @updatedAt
-  expiresAt          DateTime?
-  handle             String   @unique
-  user               User?     @relation(fields: [userId], references: [id])
-  userId             Int?
-  hashedSessionToken String?
-  antiCSRFToken      String?
-  publicData         String?
-  privateData        String?
-}

examples/auth/db/migrations/20200711145940/steps.json

@@ -1,36 +0,0 @@
-{
-  "version": "0.3.14-fixed",
-  "steps": [
-    {
-      "tag": "UpdateField",
-      "model": "User",
-      "field": "hashedPassword",
-      "arity": "Optional"
-    },
-    {
-      "tag": "CreateDirective",
-      "location": {
-        "path": {
-          "tag": "Field",
-          "model": "User",
-          "field": "role"
-        },
-        "directive": "default"
-      }
-    },
-    {
-      "tag": "CreateArgument",
-      "location": {
-        "tag": "Directive",
-        "path": {
-          "tag": "Field",
-          "model": "User",
-          "field": "role"
-        },
-        "directive": "default"
-      },
-      "argument": "",
-      "value": "\"user\""
-    }
-  ]
-}

examples/auth/db/migrations/20201214220426_initial_migration/migration.sql

@@ -0,0 +1,32 @@
+-- CreateTable
+CREATE TABLE "User" (
+    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    "name" TEXT,
+    "email" TEXT NOT NULL,
+    "hashedPassword" TEXT,
+    "role" TEXT NOT NULL DEFAULT 'user'
+);
+
+-- CreateTable
+CREATE TABLE "Session" (
+    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    "expiresAt" DATETIME,
+    "handle" TEXT NOT NULL,
+    "userId" INTEGER,
+    "hashedSessionToken" TEXT,
+    "antiCSRFToken" TEXT,
+    "publicData" TEXT,
+    "privateData" TEXT,
+
+    FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE SET NULL ON UPDATE CASCADE
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "User.email_unique" ON "User"("email");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Session.handle_unique" ON "Session"("handle");

examples/auth/db/migrations/migrate.lock

@@ -1,4 +0,0 @@
-# Prisma Migrate lockfile v1
-
-20200704211726
-20200711145940

examples/auth/db/seeds.ts

@@ -0,0 +1,6 @@
+import db from "./index"
+const seed = async () => {
+  const user = await db.user.create({data: {name: "FooBar", email: "hey@" + new Date().getTime()}})
+  console.log("Created user", user)
+}
+export default seed

examples/auth/jest.config.js

@@ -1,30 +1,3 @@
-const {pathsToModuleNameMapper} = require("ts-jest/utils")
-const {compilerOptions} = require("./tsconfig")
-
 module.exports = {
-  // Test setup file
-  setupFilesAfterEnv: ["<rootDir>/test/setup.ts"],
-  // Add type checking to Typescript test files
-  preset: "ts-jest",
-  testEnvironment: "jest-environment-jsdom-fourteen",
-  // Automatically clear mock calls and instances between every test
-  clearMocks: true,
-  testPathIgnorePatterns: ["/node_modules/", "/.blitz/", "/.next/", "<rootDir>/db/migrations"],
-  transformIgnorePatterns: ["[/\\\\]node_modules[/\\\\].+\\.(ts|tsx)$"],
-  transform: {
-    "^.+\\.(ts|tsx)$": "babel-jest",
-  },
-  // This makes absolute imports work
-  moduleDirectories: ["node_modules", "<rootDir>"],
-  modulePathIgnorePatterns: ["<rootDir>/.blitz", "<rootDir>/.next", "<rootDir>/cypress"],
-  moduleNameMapper: {
-    // This ensures any path aliases in tsconfig also work in jest
-    ...pathsToModuleNameMapper(compilerOptions.paths || {}),
-    "\\.(css|less|sass|scss)$": "identity-obj-proxy",
-    "\\.(gif|ttf|eot|svg|png|jpg|jpeg)$": "<rootDir>/test/__mocks__/fileMock.js",
-  },
-  watchPlugins: ["jest-watch-typeahead/filename", "jest-watch-typeahead/testname"],
-  // Coverage output
-  coverageDirectory: ".coverage",
-  collectCoverageFrom: ["**/*.{js,jsx,ts,tsx}", "!**/*.d.ts", "!**/node_modules/**"],
+  preset: "blitz",
 }

examples/auth/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@examples/auth",
-  "version": "0.25.1-canary.1",
+  "version": "0.29.2",
   "scripts": {
     "start": "blitz start",
-    "studio": "blitz db studio",
+    "studio": "blitz prisma studio",
     "build": "blitz build",
     "lint": "eslint --ignore-path .gitignore --ext .js,.ts,.tsx .",
     "analyze": "cross-env ANALYZE=true blitz build",
@@ -11,7 +11,7 @@
     "cy:run": "cypress run",
     "test": "prisma generate && yarn test:jest && yarn test:e2e",
     "test:jest": "jest",
-    "test:server": "blitz db migrate && blitz start --production -p 3099",
+    "test:server": "blitz prisma migrate deploy --preview-feature && blitz build && blitz start --production -p 3099",
     "test:e2e": "cross-env NODE_ENV=test start-server-and-test test:server http://localhost:3099 cy:run"
   },
   "browserslist": [
@@ -38,55 +38,37 @@
     ]
   },
   "dependencies": {
-    "@prisma/cli": "2.10.0",
-    "@prisma/client": "2.10.0",
-    "blitz": "0.25.1-canary.1",
+    "@prisma/cli": "2.14.0",
+    "@prisma/client": "2.14.0",
+    "blitz": "0.29.2",
     "final-form": "4.20.1",
-    "passport-auth0": "1.3.3",
-    "passport-github2": "0.1.11",
+    "passport-auth0": "1.4.0",
+    "passport-github2": "0.1.12",
     "passport-twitter": "1.0.4",
-    "react": "0.0.0-experimental-4ead6b530",
-    "react-dom": "0.0.0-experimental-4ead6b530",
-    "react-error-boundary": "2.3.1",
-    "react-final-form": "6.5.1",
-    "secure-password": "4.0.0",
-    "zod": "1.10.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"
   },
   "devDependencies": {
-    "@cypress/skip-test": "2.5.0",
+    "@cypress/skip-test": "2.5.1",
     "@next/bundle-analyzer": "latest",
-    "@testing-library/jest-dom": "5.11.4",
-    "@testing-library/react": "11.1.0",
-    "@testing-library/react-hooks": "3.4.2",
-    "@types/jest": "26.0.14",
+    "@testing-library/react": "11.2.3",
+    "@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/react": "16.9.38",
-    "@types/secure-password": "3.1.0",
-    "@typescript-eslint/eslint-plugin": "2.34.1-alpha.2",
-    "@typescript-eslint/parser": "2.34.1-alpha.2",
-    "babel-eslint": "10.1.0",
-    "cross-env": "latest",
-    "cypress": "4.11.0",
-    "eslint": "7.6.0",
-    "eslint-config-react-app": "5.2.1",
-    "eslint-plugin-cypress": "2.11.1",
-    "eslint-plugin-flowtype": "5.2.0",
-    "eslint-plugin-import": "2.22.0",
-    "eslint-plugin-jsx-a11y": "6.3.1",
-    "eslint-plugin-react": "7.20.5",
-    "eslint-plugin-react-hooks": "4.0.8",
-    "husky": "4.2.5",
-    "jest": "26.5.3",
-    "jest-environment-jsdom-fourteen": "1.0.1",
-    "jest-watch-typeahead": "0.6.1",
-    "lint-staged": "10.2.13",
-    "prettier": "2.0.5",
-    "pretty-quick": "2.0.1",
-    "start-server-and-test": "1.11.2",
-    "ts-jest": "26.4.1",
-    "typescript": "3.9.5"
+    "@types/react": "17.0.0",
+    "cross-env": "7.0.3",
+    "cypress": "6.2.1",
+    "eslint": "7.17.0",
+    "husky": "4.3.7",
+    "lint-staged": "10.5.3",
+    "prettier": "2.2.1",
+    "pretty-quick": "3.1.0",
+    "start-server-and-test": "1.11.7",
+    "typescript": "4.1.3"
   },
   "private": true
 }

examples/auth/test/setup.ts

@@ -1,6 +1,2 @@
-// jest-dom adds custom jest matchers for asserting on DOM nodes.
-// allows you to do things like:
-// expect(element).toHaveTextContent(/react/i)
-// learn more: https://github.com/testing-library/jest-dom
-import "@testing-library/jest-dom/extend-expect"
-require("dotenv-flow").config({silent: true})
+// This is the jest 'setupFilesAfterEnv' setup file
+// It's a good place to set globals, add global before/after hooks, etc

examples/auth/test/utils.tsx

@@ -73,6 +73,7 @@ export const mockRouter: BlitzRouter = {
   asPath: "/",
   params: {},
   query: {},
+  isReady: true,
   push: jest.fn(),
   replace: jest.fn(),
   reload: jest.fn(),

examples/custom-server/.env

@@ -0,0 +1,2 @@
+# This env file should be checked into source control
+# This is the place for default values that should be used in all environments

examples/custom-server/.env.test

@@ -0,0 +1 @@
+SESSION_SECRET_KEY=A4B979A108440A218DE8F11CBB13A7B0

examples/custom-server/.eslintrc.js

@@ -0,0 +1,14 @@
+module.exports = {
+  parser: "@typescript-eslint/parser",
+  env: {
+    es2020: true,
+  },
+  extends: ["react-app", "plugin:jsx-a11y/recommended"],
+  plugins: ["@typescript-eslint", "jsx-a11y"],
+  rules: {
+    "import/no-anonymous-default-export": "error",
+    "import/no-webpack-loader-syntax": "off",
+    "react/react-in-jsx-scope": "off", // React is always in scope with Blitz
+    "jsx-a11y/anchor-is-valid": "off", //Doesn't play well with Blitz/Next <Link> usage
+  },
+}

examples/custom-server/.gitignore

@@ -0,0 +1,55 @@
+# 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
+
+# Custom build
+build

examples/custom-server/.npmrc

@@ -0,0 +1 @@
+save-exact=true

examples/custom-server/.prettierignore

@@ -0,0 +1,7 @@
+.gitkeep
+.env*
+*.ico
+*.lock
+db/migrations
+.next
+.blitz

examples/custom-server/README.md

@@ -0,0 +1,29 @@
+# custom-server
+
+## Development
+
+1. Install
+   ```sh
+   yarn
+   ```
+2. Migrate
+   ```sh
+   blitz prisma migrate dev --preview-feature
+   ```
+3. Start the dev server
+
+```sh
+blitz start
+
+// Or if you want hot-reloading of server.js, use:
+yarn start
+```
+
+Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.
+
+## Production
+
+```sh
+blitz build
+blitz start --production
+```

examples/custom-server/app/auth/components/LoginForm.tsx

@@ -0,0 +1,50 @@
+import React from "react"
+import { AuthenticationError, Link, useMutation } from "blitz"
+import { LabeledTextField } from "app/components/LabeledTextField"
+import { Form, FORM_ERROR } from "app/components/Form"
+import login from "app/auth/mutations/login"
+import { LoginInput } from "app/auth/validations"
+
+type LoginFormProps = {
+  onSuccess?: () => void
+}
+
+export const LoginForm = (props: LoginFormProps) => {
+  const [loginMutation] = useMutation(login)
+
+  return (
+    <div>
+      <h1>Login</h1>
+
+      <Form
+        submitText="Login"
+        schema={LoginInput}
+        initialValues={{ email: "", password: "" }}
+        onSubmit={async (values) => {
+          try {
+            await loginMutation(values)
+            props.onSuccess?.()
+          } catch (error) {
+            if (error instanceof AuthenticationError) {
+              return { [FORM_ERROR]: "Sorry, those credentials are invalid" }
+            } else {
+              return {
+                [FORM_ERROR]:
+                  "Sorry, we had an unexpected error. Please try again. - " + error.toString(),
+              }
+            }
+          }
+        }}
+      >
+        <LabeledTextField name="email" label="Email" placeholder="Email" />
+        <LabeledTextField name="password" label="Password" placeholder="Password" type="password" />
+      </Form>
+
+      <div style={{ marginTop: "1rem" }}>
+        Or <Link href="/signup">Sign Up</Link>
+      </div>
+    </div>
+  )
+}
+
+export default LoginForm

examples/custom-server/app/auth/components/SignupForm.tsx

@@ -0,0 +1,44 @@
+import React from "react"
+import { useMutation } from "blitz"
+import { LabeledTextField } from "app/components/LabeledTextField"
+import { Form, FORM_ERROR } from "app/components/Form"
+import signup from "app/auth/mutations/signup"
+import { SignupInput } from "app/auth/validations"
+
+type SignupFormProps = {
+  onSuccess?: () => void
+}
+
+export const SignupForm = (props: SignupFormProps) => {
+  const [signupMutation] = useMutation(signup)
+
+  return (
+    <div>
+      <h1>Create an Account</h1>
+
+      <Form
+        submitText="Create Account"
+        schema={SignupInput}
+        initialValues={{ email: "", password: "" }}
+        onSubmit={async (values) => {
+          try {
+            await signupMutation(values)
+            props.onSuccess?.()
+          } catch (error) {
+            if (error.code === "P2002" && error.meta?.target?.includes("email")) {
+              // This error comes from Prisma
+              return { email: "This email is already being used" }
+            } else {
+              return { [FORM_ERROR]: error.toString() }
+            }
+          }
+        }}
+      >
+        <LabeledTextField name="email" label="Email" placeholder="Email" />
+        <LabeledTextField name="password" label="Password" placeholder="Password" type="password" />
+      </Form>
+    </div>
+  )
+}
+
+export default SignupForm

examples/custom-server/app/auth/mutations/login.ts

@@ -0,0 +1,15 @@
+import { Ctx } from "blitz"
+import { authenticateUser } from "app/auth/auth-utils"
+import { LoginInput, LoginInputType } from "../validations"
+
+export default async function login(input: LoginInputType, { session }: Ctx) {
+  // This throws an error if input is invalid
+  const { email, password } = LoginInput.parse(input)
+
+  // This throws an error if credentials are invalid
+  const user = await authenticateUser(email, password)
+
+  await session.create({ userId: user.id, roles: [user.role] })
+
+  return user
+}

examples/custom-server/app/auth/mutations/logout.ts

@@ -0,0 +1,5 @@
+import { Ctx } from "blitz"
+
+export default async function logout(_: any, { session }: Ctx) {
+  return await session.revoke()
+}

examples/custom-server/app/auth/mutations/signup.ts

@@ -0,0 +1,19 @@
+import { Ctx } from "blitz"
+import db from "db"
+import { hashPassword } from "app/auth/auth-utils"
+import { SignupInput, SignupInputType } from "app/auth/validations"
+
+export default async function signup(input: SignupInputType, { session }: Ctx) {
+  // This throws an error if input is invalid
+  const { email, password } = SignupInput.parse(input)
+
+  const hashedPassword = await hashPassword(password)
+  const user = await db.user.create({
+    data: { email: email.toLowerCase(), hashedPassword, role: "user" },
+    select: { id: true, name: true, email: true, role: true },
+  })
+
+  await session.create({ userId: user.id, roles: [user.role] })
+
+  return user
+}

examples/custom-server/app/auth/pages/login.tsx

@@ -0,0 +1,18 @@
+import React from "react"
+import { useRouter, BlitzPage } from "blitz"
+import Layout from "app/layouts/Layout"
+import { LoginForm } from "app/auth/components/LoginForm"
+
+const LoginPage: BlitzPage = () => {
+  const router = useRouter()
+
+  return (
+    <div>
+      <LoginForm onSuccess={() => router.push("/")} />
+    </div>
+  )
+}
+
+LoginPage.getLayout = (page) => <Layout title="Log In">{page}</Layout>
+
+export default LoginPage

examples/custom-server/app/auth/pages/signup.tsx

@@ -0,0 +1,18 @@
+import React from "react"
+import { useRouter, BlitzPage } from "blitz"
+import Layout from "app/layouts/Layout"
+import { SignupForm } from "app/auth/components/SignupForm"
+
+const SignupPage: BlitzPage = () => {
+  const router = useRouter()
+
+  return (
+    <div>
+      <SignupForm onSuccess={() => router.push("/")} />
+    </div>
+  )
+}
+
+SignupPage.getLayout = (page) => <Layout title="Sign Up">{page}</Layout>
+
+export default SignupPage

examples/custom-server/app/auth/validations.ts

@@ -0,0 +1,13 @@
+import * as z from "zod"
+
+export const SignupInput = z.object({
+  email: z.string().email(),
+  password: z.string().min(10).max(100),
+})
+export type SignupInputType = z.infer<typeof SignupInput>
+
+export const LoginInput = z.object({
+  email: z.string().email(),
+  password: z.string(),
+})
+export type LoginInputType = z.infer<typeof LoginInput>

examples/custom-server/app/components/Form.tsx

@@ -0,0 +1,62 @@
+import React, { ReactNode, PropsWithoutRef } from "react"
+import { Form as FinalForm, FormProps as FinalFormProps } from "react-final-form"
+import * as z from "zod"
+export { FORM_ERROR } from "final-form"
+
+type FormProps<S extends z.ZodType<any, any>> = {
+  /** All your form fields */
+  children: ReactNode
+  /** Text to display in the submit button */
+  submitText: string
+  schema?: S
+  onSubmit: FinalFormProps<z.infer<S>>["onSubmit"]
+  initialValues?: FinalFormProps<z.infer<S>>["initialValues"]
+} & Omit<PropsWithoutRef<JSX.IntrinsicElements["form"]>, "onSubmit">
+
+export function Form<S extends z.ZodType<any, any>>({
+  children,
+  submitText,
+  schema,
+  initialValues,
+  onSubmit,
+  ...props
+}: FormProps<S>) {
+  return (
+    <FinalForm
+      initialValues={initialValues}
+      validate={(values) => {
+        if (!schema) return
+        try {
+          schema.parse(values)
+        } catch (error) {
+          return error.formErrors.fieldErrors
+        }
+      }}
+      onSubmit={onSubmit}
+      render={({ handleSubmit, submitting, submitError }) => (
+        <form onSubmit={handleSubmit} className="form" {...props}>
+          {/* Form fields supplied as children are rendered here */}
+          {children}
+
+          {submitError && (
+            <div role="alert" style={{ color: "red" }}>
+              {submitError}
+            </div>
+          )}
+
+          <button type="submit" disabled={submitting}>
+            {submitText}
+          </button>
+
+          <style global jsx>{`
+            .form > * + * {
+              margin-top: 1rem;
+            }
+          `}</style>
+        </form>
+      )}
+    />
+  )
+}
+
+export default Form

examples/custom-server/app/components/LabeledTextField.tsx

@@ -0,0 +1,57 @@
+import React, { PropsWithoutRef } from "react"
+import { useField } from "react-final-form"
+
+export interface LabeledTextFieldProps extends PropsWithoutRef<JSX.IntrinsicElements["input"]> {
+  /** Field name. */
+  name: string
+  /** Field label. */
+  label: string
+  /** Field type. Doesn't include radio buttons and checkboxes */
+  type?: "text" | "password" | "email" | "number"
+  outerProps?: PropsWithoutRef<JSX.IntrinsicElements["div"]>
+}
+
+export const LabeledTextField = React.forwardRef<HTMLInputElement, LabeledTextFieldProps>(
+  ({ name, label, outerProps, ...props }, ref) => {
+    const {
+      input,
+      meta: { touched, error, submitError, submitting },
+    } = useField(name)
+
+    const normalizedError = Array.isArray(error) ? error.join(", ") : error || submitError
+
+    return (
+      <div {...outerProps}>
+        <label>
+          {label}
+          <input {...input} disabled={submitting} {...props} ref={ref} />
+        </label>
+
+        {touched && normalizedError && (
+          <div role="alert" style={{ color: "red" }}>
+            {normalizedError}
+          </div>
+        )}
+
+        <style jsx>{`
+          label {
+            display: flex;
+            flex-direction: column;
+            align-items: start;
+            font-size: 1rem;
+          }
+          input {
+            font-size: 1rem;
+            padding: 0.25rem 0.5rem;
+            border-radius: 3px;
+            border: 1px solid purple;
+            appearance: none;
+            margin-top: 0.5rem;
+          }
+        `}</style>
+      </div>
+    )
+  }
+)
+
+export default LabeledTextField

examples/custom-server/app/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 || "custom-server"}</title>
+        <link rel="icon" href="/favicon.ico" />
+      </Head>
+
+      {children}
+    </>
+  )
+}
+
+export default Layout

examples/custom-server/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} />
+    </>
+  )
+}

examples/custom-server/app/pages/_app.tsx

@@ -0,0 +1,43 @@
+import { AppProps, ErrorComponent, useRouter, AuthenticationError, AuthorizationError } from "blitz"
+import { ErrorBoundary, FallbackProps } from "react-error-boundary"
+import { queryCache } from "react-query"
+import LoginForm from "app/auth/components/LoginForm"
+
+export default function App({ Component, pageProps }: AppProps) {
+  const getLayout = Component.getLayout || ((page) => page)
+  const router = useRouter()
+
+  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>
+  )
+}
+
+function RootErrorFallback({ error, resetErrorBoundary }: FallbackProps) {
+  if (error instanceof AuthenticationError) {
+    return <LoginForm onSuccess={resetErrorBoundary} />
+  } else if (error instanceof AuthorizationError) {
+    return (
+      <ErrorComponent
+        statusCode={(error as any).statusCode}
+        title="Sorry, you are not authorized to access this"
+      />
+    )
+  } else {
+    return (
+      <ErrorComponent
+        statusCode={(error as any)?.statusCode || 400}
+        title={error?.message || error?.name}
+      />
+    )
+  }
+}

examples/custom-server/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

examples/custom-server/app/pages/index.test.tsx

@@ -0,0 +1,26 @@
+import React from "react"
+import { render } from "test/utils"
+
+import Home from "./index"
+import { useCurrentUser } from "app/hooks/useCurrentUser"
+
+jest.mock("app/hooks/useCurrentUser")
+const mockUseCurrentUser = useCurrentUser as jest.MockedFunction<typeof useCurrentUser>
+
+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
+
+  // This is an example on how to mock api hooks when testing
+  mockUseCurrentUser.mockReturnValue({
+    id: 1,
+    name: "User",
+    email: "user@email.com",
+    role: "user",
+  })
+
+  const { getByText } = render(<Home />)
+  const linkElement = getByText(/Documentation/i)
+  expect(linkElement).toBeInTheDocument()
+})

examples/custom-server/app/pages/index.tsx

@@ -0,0 +1,272 @@
+import {Link, BlitzPage, useMutation} from "blitz"
+import Layout from "app/layouts/Layout"
+import logout from "app/auth/mutations/logout"
+import {useCurrentUser} from "app/hooks/useCurrentUser"
+import {Suspense} from "react"
+
+/*
+ * This file is just for a pleasant getting started page for your new app.
+ * You can delete everything in here and start from scratch if you like.
+ */
+
+const UserInfo = () => {
+  const currentUser = useCurrentUser()
+  const [logoutMutation] = useMutation(logout)
+
+  if (currentUser) {
+    return (
+      <>
+        <button
+          className="button small"
+          onClick={async () => {
+            await logoutMutation()
+          }}
+        >
+          Logout
+        </button>
+        <div>
+          User id: <code>{currentUser.id}</code>
+          <br />
+          User role: <code>{currentUser.role}</code>
+        </div>
+      </>
+    )
+  } else {
+    return (
+      <>
+        <Link href="/signup">
+          <a className="button small">
+            <strong>Sign Up</strong>
+          </a>
+        </Link>
+        <Link href="/login">
+          <a className="button small">
+            <strong>Login</strong>
+          </a>
+        </Link>
+      </>
+    )
+  }
+}
+
+const Home: BlitzPage = () => {
+  return (
+    <div className="container">
+      <main>
+        <div className="logo">
+          <img src="/logo.png" alt="blitz.js" />
+        </div>
+        <p>
+          <strong>Congrats!</strong> Your app is ready, including user sign-up and log-in.
+        </p>
+        <div className="buttons" style={{marginTop: "1rem", marginBottom: "1rem"}}>
+          <Suspense fallback="Loading...">
+            <UserInfo />
+          </Suspense>
+        </div>
+        <p>
+          <strong>
+            To add a new model to your app, <br />
+            run the following in your terminal:
+          </strong>
+        </p>
+        <pre>
+          <code>blitz generate all project name:string</code>
+        </pre>
+        <pre>
+          <code>blitz prisma migrate dev --preview-feature</code>
+        </pre>
+        <div>
+          <p>
+            Then <strong>restart the server</strong>
+          </p>
+          <pre>
+            <code>Ctrl + c</code>
+          </pre>
+          <pre>
+            <code>blitz start</code>
+          </pre>
+          <p>
+            and go to{" "}
+            <Link href="/projects">
+              <a>/projects</a>
+            </Link>
+          </p>
+        </div>
+        <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://slack.blitzjs.com"
+            target="_blank"
+            rel="noopener noreferrer"
+          >
+            Slack 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 jsx global>{`
+        @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

examples/custom-server/app/users/queries/getCurrentUser.ts

@@ -0,0 +1,13 @@
+import { Ctx } from "blitz"
+import db from "db"
+
+export default async function getCurrentUser(_ = null, { session }: Ctx) {
+  if (!session.userId) return null
+
+  const user = await db.user.findOne({
+    where: { id: session.userId },
+    select: { id: true, name: true, email: true, role: true },
+  })
+
+  return user
+}

examples/custom-server/babel.config.js

@@ -0,0 +1,4 @@
+module.exports = {
+  presets: ["next/babel"],
+  plugins: [],
+}

examples/custom-server/blitz.config.js

@@ -0,0 +1,17 @@
+const { sessionMiddleware, simpleRolesIsAuthorized } = require("@blitzjs/server")
+
+module.exports = {
+  middleware: [
+    sessionMiddleware({
+      isAuthorized: simpleRolesIsAuthorized,
+    }),
+  ],
+  /* 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
+  },
+  */
+}

examples/custom-server/cypress.json

@@ -0,0 +1,6 @@
+{
+  "baseUrl": "http://localhost:3099",
+  "defaultCommandTimeout": 10000,
+  "video": false,
+  "chromeWebSecurity": false
+}

examples/custom-server/cypress/fixtures/example.json

@@ -0,0 +1,5 @@
+{
+  "name": "Using fixtures to represent data",
+  "email": "hello@cypress.io",
+  "body": "Fixtures are a great way to mock data for responses to routes"
+}

examples/custom-server/cypress/index.d.ts

@@ -0,0 +1,8 @@
+/// <reference types="Cypress" />
+/// <reference types="@cypress/skip-test" />
+
+declare namespace Cypress {
+  interface Chainable {
+    signup(user: { email: string; password: string }): void
+  }
+}

examples/custom-server/cypress/integration/index.test.ts

@@ -0,0 +1,55 @@
+import { createRandomUser } from "../support/helpers"
+
+describe("index page", () => {
+  beforeEach(() => {
+    cy.visit("/")
+  })
+
+  it("goes to the signup page", () => {
+    cy.contains("a", "Sign Up").click()
+    cy.location("pathname").should("equal", "/signup")
+  })
+
+  it("goes to the login page", () => {
+    cy.contains("a", /login/i).click()
+    cy.location("pathname").should("equal", "/login")
+  })
+
+  it("allows the user to signup", () => {
+    const user = createRandomUser()
+
+    cy.signup(user)
+
+    cy.location("pathname").should("equal", "/")
+    cy.contains("button", "Logout")
+  })
+
+  it("allows the user to log in", () => {
+    const user = createRandomUser()
+
+    cy.signup(user)
+
+    cy.contains("button", "Logout").click()
+    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.location("pathname").should("equal", "/")
+    cy.contains("button", "Logout")
+  })
+
+  it("allows the user to logout", () => {
+    const user = createRandomUser()
+
+    cy.signup(user)
+
+    cy.contains("button", "Logout").click()
+
+    cy.location("pathname").should("equal", "/")
+    cy.contains("a", /login/i)
+  })
+})
+
+export {}

examples/custom-server/cypress/plugins/index.ts

@@ -0,0 +1,22 @@
+/// <reference types="cypress" />
+// ***********************************************************
+// This example plugins/index.js can be used to load plugins
+//
+// You can change the location of this file or turn off loading
+// the plugins file with the 'pluginsFile' configuration option.
+//
+// You can read more here:
+// https://on.cypress.io/plugins-guide
+// ***********************************************************
+
+// This function is called when a project is opened or re-opened (e.g. due to
+// the project's config changing)
+
+/**
+ * @type {Cypress.PluginConfig}
+ */
+//@ts-ignore
+module.exports = (on, config) => {
+  // `on` is used to hook into various events Cypress emits
+  // `config` is the resolved Cypress config
+}

examples/custom-server/cypress/support/commands.ts

@@ -0,0 +1,19 @@
+// ***********************************************
+// This example commands.js shows you how to
+// create various custom commands and overwrite
+// existing commands.
+//
+// For more comprehensive examples of custom
+// commands please read more here:
+// https://on.cypress.io/custom-commands
+// ***********************************************
+//
+//
+
+Cypress.Commands.add("signup", ({ email, password }) => {
+  cy.contains("a", "Sign Up").click()
+
+  cy.contains("Email").find("input").type(email)
+  cy.contains("Password").find("input").type(password)
+  cy.contains("button", "Create Account").click()
+})

examples/custom-server/cypress/support/helpers.ts

@@ -0,0 +1,7 @@
+export const createRandomUser = () => {
+  const random = Math.round(Math.random() * 100000).toString()
+  const email = `test_${random}@example.com`
+  const password = `password_${random}`
+
+  return { email, password }
+}

examples/custom-server/cypress/support/index.ts

@@ -0,0 +1,26 @@
+// ***********************************************************
+// This example support/index.js is processed and
+// loaded automatically before your test files.
+//
+// This is a great place to put global configuration and
+// behavior that modifies Cypress.
+//
+// You can change the location of this file or turn off
+// automatically serving support files with the
+// 'supportFile' configuration option.
+//
+// You can read more here:
+// https://on.cypress.io/configuration
+// ***********************************************************
+
+// Import commands.js using ES2015 syntax:
+import "./commands"
+
+// Alternatively you can use CommonJS syntax:
+// require('./commands')
+
+Cypress.Screenshot.defaults({
+  screenshotOnRunFailure: false,
+})
+
+require("@cypress/skip-test/support")

examples/custom-server/db/index.ts

@@ -0,0 +1,7 @@
+import {makeServerOnlyPrisma} from "blitz"
+import {PrismaClient} from "@prisma/client"
+
+const ServerOnlyPrisma = makeServerOnlyPrisma(PrismaClient)
+
+export * from "@prisma/client"
+export default new ServerOnlyPrisma()

examples/custom-server/db/migrations/20210112001717_initial/migration.sql

@@ -0,0 +1,32 @@
+-- CreateTable
+CREATE TABLE "User" (
+    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    "name" TEXT,
+    "email" TEXT NOT NULL,
+    "hashedPassword" TEXT,
+    "role" TEXT NOT NULL DEFAULT 'user'
+);
+
+-- CreateTable
+CREATE TABLE "Session" (
+    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    "expiresAt" DATETIME,
+    "handle" TEXT NOT NULL,
+    "userId" INTEGER,
+    "hashedSessionToken" TEXT,
+    "antiCSRFToken" TEXT,
+    "publicData" TEXT,
+    "privateData" TEXT,
+
+    FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE SET NULL ON UPDATE CASCADE
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "User.email_unique" ON "User"("email");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Session.handle_unique" ON "Session"("handle");

examples/custom-server/db/schema.prisma

@@ -0,0 +1,38 @@
+// This is your Prisma schema file,
+// learn more about it in the docs: https://pris.ly/d/prisma-schema
+
+datasource db {
+  provider = "sqlite"
+  url      = "file:./db.sqlite"
+}
+
+generator client {
+  provider = "prisma-client-js"
+}
+
+// --------------------------------------
+
+model User {
+  id             Int       @default(autoincrement()) @id
+  createdAt      DateTime  @default(now())
+  updatedAt      DateTime  @updatedAt
+  name           String?
+  email          String    @unique
+  hashedPassword String?
+  role           String    @default("user")
+  sessions       Session[]
+}
+
+model Session {
+  id                 Int       @default(autoincrement()) @id
+  createdAt          DateTime  @default(now())
+  updatedAt          DateTime  @updatedAt
+  expiresAt          DateTime?
+  handle             String    @unique
+  user               User?     @relation(fields: [userId], references: [id])
+  userId             Int?
+  hashedSessionToken String?
+  antiCSRFToken      String?
+  publicData         String?
+  privateData        String?
+}

examples/custom-server/db/seeds.ts

@@ -0,0 +1,16 @@
+// import db from "./index"
+
+/*
+ * This seed function is executed when you run `blitz db seed`.
+ *
+ * Probably you want to use a library like https://chancejs.com
+ * or https://github.com/Marak/Faker.js to easily generate
+ * realistic data.
+ */
+const seed = async () => {
+  // for (let i = 0; i < 5; i++) {
+  //   await db.project.create({ data: { name: "Project " + i } })
+  // }
+}
+
+export default seed

examples/custom-server/jest.config.js

@@ -0,0 +1,3 @@
+module.exports = {
+  preset: "blitz",
+}

examples/custom-server/package.json

@@ -0,0 +1,88 @@
+{
+  "name": "@examples/custom-server",
+  "version": "0.29.2",
+  "scripts": {
+    "start": "nodemon --watch server.js --exec 'blitz start'",
+    "build": "blitz build",
+    "studio": "blitz prisma studio",
+    "lint": "eslint --ignore-path .gitignore --ext .js,.ts,.tsx .",
+    "test-watch": "jest --watch",
+    "cy-open": "cypress open",
+    "cy-run": "cypress run",
+    "test:migrate": "prisma generate && blitz prisma migrate deploy --preview-feature",
+    "test:jest": "jest",
+    "test-server": "blitz build && blitz start --production",
+    "test:e2e": "cross-env NODE_ENV=test PORT=3099 start-server-and-test test-server http://localhost:3099 cy-run",
+    "test": "run-s test:*"
+  },
+  "browserslist": [
+    "defaults"
+  ],
+  "prisma": {
+    "schema": "db/schema.prisma"
+  },
+  "prettier": {
+    "semi": false,
+    "printWidth": 100,
+    "bracketSpacing": false,
+    "trailingComma": "all"
+  },
+  "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/cli": "2.14.0",
+    "@prisma/client": "2.14.0",
+    "blitz": "0.29.2",
+    "final-form": "4.20.1",
+    "react": "0.0.0-experimental-4ead6b530",
+    "react-dom": "0.0.0-experimental-4ead6b530",
+    "react-error-boundary": "2.3.2",
+    "react-final-form": "6.5.2",
+    "secure-password": "4.0.0",
+    "typescript": "4.1.3",
+    "zod": "1.11.11"
+  },
+  "devDependencies": {
+    "@cypress/skip-test": "2.5.0",
+    "@testing-library/jest-dom": "5.11.6",
+    "@testing-library/react": "11.2.3",
+    "@testing-library/react-hooks": "4.0.1",
+    "@types/jest": "26.0.20",
+    "@types/react": "16.14.1",
+    "@types/secure-password": "3.1.0",
+    "@typescript-eslint/eslint-plugin": "4.12.0",
+    "@typescript-eslint/parser": "4.12.0",
+    "babel-eslint": "10.1.0",
+    "cypress": "6.2.1",
+    "eslint": "7.17.0",
+    "eslint-config-react-app": "5.2.1",
+    "eslint-plugin-cypress": "2.11.1",
+    "eslint-plugin-flowtype": "5.2.0",
+    "eslint-plugin-import": "2.22.1",
+    "eslint-plugin-jsx-a11y": "6.4.1",
+    "eslint-plugin-react": "7.21.5",
+    "eslint-plugin-react-hooks": "4.2.0",
+    "husky": "4.3.7",
+    "jest": "26.6.3",
+    "jest-environment-jsdom-fourteen": "1.0.1",
+    "jest-watch-typeahead": "0.6.1",
+    "lint-staged": "10.5.1",
+    "nodemon": "2.0.7",
+    "npm-run-all": "4.1.5",
+    "prettier": "2.2.0",
+    "pretty-quick": "3.1.0",
+    "react-test-renderer": "16.14.0",
+    "start-server-and-test": "1.11.2",
+    "ts-jest": "26.4.4"
+  },
+  "private": true
+}

examples/custom-server/server.js

@@ -0,0 +1,25 @@
+const { createServer } = require("http")
+const { parse } = require("url")
+const blitz = require("@blitzjs/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}`)
+  })
+})

examples/custom-server/test/setup.ts

@@ -0,0 +1,2 @@
+// This is the jest 'setupFilesAfterEnv' setup file
+// It's a good place to set globals, add global before/after hooks, etc

examples/custom-server/test/utils.tsx

@@ -0,0 +1,94 @@
+import React from "react"
+import { RouterContext, BlitzRouter } 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, ...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>
+    )
+  }
+  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, ...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>
+    )
+  }
+  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> }
+
+type DefaultHookParams = Parameters<typeof defaultRenderHook>
+type RenderHook = DefaultHookParams[0]
+type RenderHookOptions = DefaultHookParams[1] & { router?: Partial<BlitzRouter> }

examples/custom-server/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"],
+  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"]
+}

examples/custom-server/types.ts

@@ -0,0 +1,20 @@
+import { DefaultCtx, SessionContext, DefaultPublicData } from "blitz"
+import { User } from "db"
+import React from "react"
+
+declare module "blitz" {
+  export interface Ctx extends DefaultCtx {
+    session: SessionContext
+  }
+  export interface PublicData extends DefaultPublicData {
+    userId: User["id"]
+  }
+}
+
+// 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
+  }
+}

examples/fauna/README.md

@@ -2,7 +2,7 @@
 
 ## Intro
 
-This example shows how to use [Fauna](https://fauna.com) instead of Prisma and Postgres.
+This example shows how to use [Fauna](https://dashboard.fauna.com/accounts/register?utm_source=BlitzJS&utm_medium=sponsorship&utm_campaign=BlitzJS_Sponsorship_2020) instead of Prisma and Postgres.
 
 The bulk of the integration is in the following files:
 
@@ -28,10 +28,6 @@ This example use the Fauna GraphQL API since it's more familiar to most people t
 FAUNA_SECRET=YOUR_AUTH_KEY
 ```
 
-```
-yarn blitz db migrate
-```
-
 2. Start the dev server
 
 ```

examples/fauna/app/auth/auth-utils.ts

@@ -1,23 +1,7 @@
-import { AuthenticationError } from "blitz"
-import SecurePassword from "secure-password"
+import { SecurePassword, AuthenticationError } from "blitz"
 import db from "db"
 import { gql } from "graphql-request"
 
-const SP = new SecurePassword()
-
-export const hashPassword = async (password: string) => {
-  const hashedBuffer = await SP.hash(Buffer.from(password))
-  return hashedBuffer.toString("base64")
-}
-export const verifyPassword = async (hashedPassword: string, password: string) => {
-  try {
-    return await SP.verify(Buffer.from(password), Buffer.from(hashedPassword, "base64"))
-  } catch (error) {
-    console.error(error)
-    return false
-  }
-}
-
 export const authenticateUser = async (email: string, password: string) => {
   const { user } = await db.request(
     gql`
@@ -36,30 +20,26 @@ export const authenticateUser = async (email: string, password: string) => {
 
   if (!user || !user.hashedPassword) throw new AuthenticationError()
 
-  switch (await verifyPassword(user.hashedPassword, password)) {
-    case SecurePassword.VALID:
-      break
-    case SecurePassword.VALID_NEEDS_REHASH:
-      // Upgrade hashed password with a more secure hash
-      const improvedHash = await hashPassword(password)
-      await db.request(
-        gql`
-          mutation UpdateUser($data: UserInput!) {
-            updateUser(data: $data) {
-              id: _id
-            }
+  const result = await SecurePassword.verify(user.hashedPassword, password)
+
+  if (result === SecurePassword.VALID_NEEDS_REHASH) {
+    // Upgrade hashed password with a more secure hash
+    const improvedHash = await SecurePassword.hash(password)
+    await db.request(
+      gql`
+        mutation UpdateUser($data: UserInput!) {
+          updateUser(data: $data) {
+            id: _id
           }
-        `,
-        {
-          data: {
-            id: user.id,
-            hashedPassword: improvedHash,
-          },
         }
-      )
-      break
-    default:
-      throw new AuthenticationError()
+      `,
+      {
+        data: {
+          id: user.id,
+          hashedPassword: improvedHash,
+        },
+      }
+    )
   }
 
   const { hashedPassword, ...rest } = user

examples/fauna/app/auth/mutations/signup.ts

@@ -1,6 +1,5 @@
-import { Ctx } from "blitz"
+import { Ctx, SecurePassword } from "blitz"
 import db from "db"
-import { hashPassword } from "app/auth/auth-utils"
 import { SignupInput, SignupInputType } from "app/auth/validations"
 import { gql } from "graphql-request"
 
@@ -8,7 +7,7 @@ export default async function signup(input: SignupInputType, { session }: Ctx) {
   // This throws an error if input is invalid
   const { email, password } = SignupInput.parse(input)
 
-  const hashedPassword = await hashPassword(password)
+  const hashedPassword = await SecurePassword.hash(password)
   const { user } = await db.request(
     gql`
       mutation createUser($email: String!, $hashedPassword: String, $role: String!) {

examples/fauna/app/hooks/useCurrentUser.ts

@@ -1,10 +1,7 @@
-import { useQuery, useSession } from "blitz"
+import { useQuery } from "blitz"
 import getCurrentUser from "app/users/queries/getCurrentUser"
 
 export const useCurrentUser = () => {
-  // We wouldn't have to useSession() here, but doing so improves perf on initial
-  // load since we can skip the getCurrentUser() request.
-  const session = useSession()
-  const [user] = useQuery(getCurrentUser, null, { enabled: !!session.userId })
-  return session.userId ? user : null
+  const [user] = useQuery(getCurrentUser, null)
+  return user
 }

examples/fauna/app/pages/index.tsx

@@ -64,35 +64,6 @@ const Home: BlitzPage = () => {
             <UserInfo />
           </Suspense>
         </div>
-        <p>
-          <strong>
-            To add a new model to your app, <br />
-            run the following in your terminal:
-          </strong>
-        </p>
-        <pre>
-          <code>blitz generate all project name:string</code>
-        </pre>
-        <pre>
-          <code>blitz db migrate</code>
-        </pre>
-        <div>
-          <p>
-            Then <strong>restart the server</strong>
-          </p>
-          <pre>
-            <code>Ctrl + c</code>
-          </pre>
-          <pre>
-            <code>blitz start</code>
-          </pre>
-          <p>
-            and go to{" "}
-            <Link href="/projects">
-              <a>/projects</a>
-            </Link>
-          </p>
-        </div>
         <div className="buttons" style={{ marginTop: "5rem" }}>
           <a
             className="button"

examples/fauna/blitz.config.js

@@ -1,4 +1,4 @@
-const { sessionMiddleware, unstable_simpleRolesIsAuthorized } = require("@blitzjs/server")
+const { sessionMiddleware, simpleRolesIsAuthorized } = require("@blitzjs/server")
 const { GraphQLClient, gql } = require("graphql-request")
 
 const graphQLClient = new GraphQLClient("https://graphql.fauna.com/graphql", {
@@ -20,7 +20,7 @@ const normalizeSession = (faunaSession) => {
 module.exports = {
   middleware: [
     sessionMiddleware({
-      unstable_isAuthorized: unstable_simpleRolesIsAuthorized,
+      isAuthorized: simpleRolesIsAuthorized,
       getSession: async (handle) => {
         const { findSessionByHandle: session } = await graphQLClient.request(
           gql`

examples/fauna/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@examples/fauna",
-  "version": "0.25.1-canary.1",
+  "version": "0.29.2",
   "scripts": {
     "start": "blitz start",
-    "studio": "blitz db studio",
+    "studio": "blitz prisma studio",
     "build": "blitz build",
     "lint": "eslint --ignore-path .gitignore --ext .js,.ts,.tsx .",
     "test": "echo \"No tests yet\""
@@ -27,44 +27,44 @@
     ]
   },
   "dependencies": {
-    "blitz": "0.25.1-canary.1",
+    "blitz": "0.29.2",
     "final-form": "4.20.1",
-    "graphql": "15.3.0",
-    "graphql-request": "3.1.0",
-    "react": "0.0.0-experimental-4ead6b530",
-    "react-dom": "0.0.0-experimental-4ead6b530",
-    "react-error-boundary": "2.3.1",
-    "react-final-form": "6.5.1",
+    "graphql": "15.4.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.10.0"
+    "zod": "1.11.11"
   },
   "devDependencies": {
-    "@testing-library/jest-dom": "5.11.4",
-    "@testing-library/react": "11.1.0",
-    "@testing-library/react-hooks": "3.4.2",
-    "@types/jest": "26.0.14",
-    "@types/react": "16.9.38",
+    "@testing-library/jest-dom": "5.11.8",
+    "@testing-library/react": "11.2.3",
+    "@testing-library/react-hooks": "4.0.1",
+    "@types/jest": "26.0.20",
+    "@types/react": "17.0.0",
     "@types/secure-password": "3.1.0",
-    "@typescript-eslint/eslint-plugin": "2.34.1-alpha.2",
-    "@typescript-eslint/parser": "2.34.1-alpha.2",
+    "@typescript-eslint/eslint-plugin": "4.12.0",
+    "@typescript-eslint/parser": "4.12.0",
     "babel-eslint": "10.1.0",
-    "eslint": "7.6.0",
-    "eslint-config-react-app": "5.2.1",
+    "eslint": "7.17.0",
+    "eslint-config-react-app": "6.0.0",
     "eslint-plugin-flowtype": "5.2.0",
-    "eslint-plugin-import": "2.22.0",
-    "eslint-plugin-jsx-a11y": "6.3.1",
-    "eslint-plugin-react": "7.20.5",
-    "eslint-plugin-react-hooks": "4.0.8",
-    "husky": "4.2.5",
-    "jest": "26.5.3",
+    "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",
+    "husky": "4.3.7",
+    "jest": "26.6.3",
     "jest-environment-jsdom-fourteen": "1.0.1",
     "jest-watch-typeahead": "0.6.1",
-    "lint-staged": "10.2.13",
-    "prettier": "2.0.5",
-    "pretty-quick": "2.0.1",
-    "start-server-and-test": "1.11.2",
-    "ts-jest": "26.4.1",
-    "typescript": "3.9.5"
+    "lint-staged": "10.5.3",
+    "prettier": "2.2.1",
+    "pretty-quick": "3.1.0",
+    "start-server-and-test": "1.11.7",
+    "ts-jest": "26.4.4",
+    "typescript": "4.1.3"
   },
   "private": true
 }

examples/fauna/test/utils.tsx

@@ -77,6 +77,7 @@ export const mockRouter: BlitzRouter = {
   asPath: "/",
   params: {},
   query: {},
+  isReady: true,
   push: jest.fn(),
   replace: jest.fn(),
   reload: jest.fn(),

examples/no-prisma/README.md

@@ -11,12 +11,6 @@ model Project {
 }
 ```
 
-2. DB migrate
-
-```
-blitz db migrate
-```
-
 3. Start the dev server
 
 ```