v0.32.1

(patch)

.all-contributorsrc

@@ -20,7 +20,9 @@
         "code",
         "content",
         "ideas",
-        "review"
+        "review",
+        "test",
+        "doc"
       ]
     },
     {
@@ -1587,7 +1589,8 @@
       "avatar_url": "https://avatars3.githubusercontent.com/u/43112535?v=4",
       "profile": "http://Dal.Design",
       "contributions": [
-        "code"
+        "code",
+        "doc"
       ]
     },
     {
@@ -1872,6 +1875,375 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "rince",
+      "name": "Kazuma Suzuki",
+      "avatar_url": "https://avatars.githubusercontent.com/u/933895?v=4",
+      "profile": "https://github.com/rince",
+      "contributions": [
+        "design",
+        "code"
+      ]
+    },
+    {
+      "login": "queq1890",
+      "name": "Yuji Matsumoto",
+      "avatar_url": "https://avatars.githubusercontent.com/u/32263803?v=4",
+      "profile": "http://queq1890.info",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "Gim3l",
+      "name": "Gimel Dick",
+      "avatar_url": "https://avatars.githubusercontent.com/u/46765702?v=4",
+      "profile": "https://github.com/Gim3l",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "akbo",
+      "name": "Andreas Bollig",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1926271?v=4",
+      "profile": "https://github.com/akbo",
+      "contributions": [
+        "code",
+        "doc"
+      ]
+    },
+    {
+      "login": "ajmarkow",
+      "name": "AJ Markow",
+      "avatar_url": "https://avatars.githubusercontent.com/u/66390428?v=4",
+      "profile": "https://ajm.codes",
+      "contributions": [
+        "test",
+        "code"
+      ]
+    },
+    {
+      "login": "wafuwafu13",
+      "name": "TagawaHirotaka",
+      "avatar_url": "https://avatars.githubusercontent.com/u/50798936?v=4",
+      "profile": "https://wafuwafu13.hateblo.jp/",
+      "contributions": [
+        "code",
+        "test"
+      ]
+    },
+    {
+      "login": "merodiro",
+      "name": "Amr A.Mohammed",
+      "avatar_url": "https://avatars.githubusercontent.com/u/17033502?v=4",
+      "profile": "https://github.com/merodiro",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "lcswillems",
+      "name": "Lucas Willems",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5437552?v=4",
+      "profile": "http://www.lucaswillems.com",
+      "contributions": [
+        "doc",
+        "code"
+      ]
+    },
+    {
+      "login": "alii",
+      "name": "Alistair Smith",
+      "avatar_url": "https://avatars.githubusercontent.com/u/25351731?v=4",
+      "profile": "https://alistair.cloud",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "rodrigoehlers",
+      "name": "Rodrigo Ehlers",
+      "avatar_url": "https://avatars.githubusercontent.com/u/19683042?v=4",
+      "profile": "https://rodrigoehlers.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "mtford90",
+      "name": "Michael Ford",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1734057?v=4",
+      "profile": "https://www.builtopen.com/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "LBrian",
+      "name": "Brian Liu",
+      "avatar_url": "https://avatars.githubusercontent.com/u/3888780?v=4",
+      "profile": "https://brianypliu.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "beerose",
+      "name": "Aleksandra Sikora",
+      "avatar_url": "https://avatars.githubusercontent.com/u/9019397?v=4",
+      "profile": "http://aleksandra.codes",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "JuanM04",
+      "name": "JuanM04",
+      "avatar_url": "https://avatars.githubusercontent.com/u/16712703?v=4",
+      "profile": "https://juanm04.com",
+      "contributions": [
+        "code",
+        "doc"
+      ]
+    },
+    {
+      "login": "arenddeboer",
+      "name": "Arend de Boer",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7022204?v=4",
+      "profile": "https://github.com/arenddeboer",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "fmilani",
+      "name": "Felipe Milani",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1580375?v=4",
+      "profile": "https://github.com/fmilani",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "jxe",
+      "name": "Joe Edelman",
+      "avatar_url": "https://avatars.githubusercontent.com/u/13018?v=4",
+      "profile": "http://nxhx.org",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "garytube",
+      "name": "Gary",
+      "avatar_url": "https://avatars.githubusercontent.com/u/3823504?v=4",
+      "profile": "https://github.com/garytube",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "oliverloops",
+      "name": "Oliver Lopez ",
+      "avatar_url": "https://avatars.githubusercontent.com/u/33361399?v=4",
+      "profile": "http://oliverloops.com",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "DecadentIpsum",
+      "name": "Andreas Zaralis",
+      "avatar_url": "https://avatars.githubusercontent.com/u/32861532?v=4",
+      "profile": "https://decadentIpsum.me",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "davetorbeck",
+      "name": "David Torbeck",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5829885?v=4",
+      "profile": "https://github.com/davetorbeck",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "gusgard",
+      "name": "Gustavo Gard",
+      "avatar_url": "https://avatars.githubusercontent.com/u/2577356?v=4",
+      "profile": "https://github.com/gusgard",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "Immortalin",
+      "name": "Immortalin",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7126128?v=4",
+      "profile": "https://narrationbox.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "cristianbgp",
+      "name": "Cristian Granda",
+      "avatar_url": "https://avatars.githubusercontent.com/u/8507974?v=4",
+      "profile": "https://cristianbgp.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "deniseyu",
+      "name": "Denise Yu",
+      "avatar_url": "https://avatars.githubusercontent.com/u/8420094?v=4",
+      "profile": "https://deniseyu.io",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "andreadellacorte",
+      "name": "Andrea Della Corte",
+      "avatar_url": "https://avatars.githubusercontent.com/u/295683?v=4",
+      "profile": "http://dellacorte.me",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "aditsachde",
+      "name": "Adit Sachde",
+      "avatar_url": "https://avatars.githubusercontent.com/u/23707194?v=4",
+      "profile": "http://aditsachde.com",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "hirenchauhan2",
+      "name": "Hiren Chauhan",
+      "avatar_url": "https://avatars.githubusercontent.com/u/8999668?v=4",
+      "profile": "https://github.com/hirenchauhan2",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "remjx",
+      "name": "Mark Jackson",
+      "avatar_url": "https://avatars.githubusercontent.com/u/35121685?v=4",
+      "profile": "http://remjx.com/",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "lewisblackburn",
+      "name": "Lewis Blackburn",
+      "avatar_url": "https://avatars.githubusercontent.com/u/51877955?v=4",
+      "profile": "https://lewisb.cloud/",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "FDiskas",
+      "name": "Vytenis",
+      "avatar_url": "https://avatars.githubusercontent.com/u/468006?v=4",
+      "profile": "https://github.com/FDiskas",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "matthieu994",
+      "name": "Matthieu",
+      "avatar_url": "https://avatars.githubusercontent.com/u/12969089?v=4",
+      "profile": "https://portfolio.matthieupetit.com",
+      "contributions": [
+        "code",
+        "test"
+      ]
+    },
+    {
+      "login": "mitchazj",
+      "name": "Mitchell Johnson",
+      "avatar_url": "https://avatars.githubusercontent.com/u/15032956?v=4",
+      "profile": "https://github.com/mitchazj",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Roesh",
+      "name": "Roshan Manuel",
+      "avatar_url": "https://avatars.githubusercontent.com/u/31125563?v=4",
+      "profile": "https://roshan.page/",
+      "contributions": [
+        "code",
+        "doc"
+      ]
+    },
+    {
+      "login": "kevinlangleyjr",
+      "name": "Kevin Langley Jr.",
+      "avatar_url": "https://avatars.githubusercontent.com/u/877634?v=4",
+      "profile": "https://kevinlangleyjr.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "heavygabriel",
+      "name": "Gabriel Picard",
+      "avatar_url": "https://avatars.githubusercontent.com/u/51029779?v=4",
+      "profile": "https://projet-test-99df0.firebaseapp.com/",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "chenkie",
+      "name": "Ryan Chenkie",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1847678?v=4",
+      "profile": "http://ryanchenkie.com/",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "sbappan",
+      "name": "Santhosh B. Appan",
+      "avatar_url": "https://avatars.githubusercontent.com/u/12586088?v=4",
+      "profile": "https://github.com/sbappan",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "james2406",
+      "name": "James Moran",
+      "avatar_url": "https://avatars.githubusercontent.com/u/10858584?v=4",
+      "profile": "http://stackoverflow.com/users/5207233/james-moran",
+      "contributions": [
+        "code",
+        "doc"
+      ]
+    },
+    {
+      "login": "bugzpodder",
+      "name": "Jack Zhao",
+      "avatar_url": "https://avatars.githubusercontent.com/u/14841421?v=4",
+      "profile": "http://fb.me/yz",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.eslintignore

@@ -0,0 +1,31 @@
+lib
+node_modules
+reports
+*.log
+.nyc_output
+**/coverage
+tsconfig.tsbuildinfo
+**/.blitz/**
+**/.next/**
+**/dist/**
+**/.vercel/**
+**/.test*
+/examples/auth2
+
+prettier.config.*
+jest.config.*
+jest.setup.*
+babel.config.*
+eslint.config.*
+
+/__mocks__
+/__fixturse
+/assets
+/patches
+/rfc-docs
+/scripts
+/types
+/recipes/*/templates
+packages/generator/templates
+
+/nextjs

.eslintrc.js

@@ -1,14 +1,19 @@
 module.exports = {
-  parser: "@typescript-eslint/parser",
+  parser: "babel-eslint",
+  env: {
+    browser: true,
+    commonjs: true,
+    es6: true,
+    node: true,
+  },
   parserOptions: {
     ecmaVersion: 6,
     sourceType: "module",
     ecmaFeatures: {
       jsx: true,
     },
-    project: `./tsconfig.json`,
   },
-  plugins: ["@typescript-eslint", "import", "unicorn", "simple-import-sort"],
+  plugins: ["import", "unicorn", "simple-import-sort"],
   extends: ["react-app"],
   rules: {
     "react/react-in-jsx-scope": "off", // React is always in scope with Blitz
@@ -23,13 +28,6 @@ module.exports = {
         case: "kebabCase",
       },
     ],
-    "@typescript-eslint/no-floating-promises": "error",
-    // note you must disable the base rule as it can report incorrect errors
-    "no-use-before-define": "off",
-    "@typescript-eslint/no-use-before-define": ["error"],
-    // note you must disable the base rule as it can report incorrect errors
-    "no-redeclare": "off",
-    "@typescript-eslint/no-redeclare": ["error"],
     "simple-import-sort/imports": [
       "warn",
       {
@@ -51,20 +49,48 @@ module.exports = {
       },
     ],
   },
-  ignorePatterns: [
-    "packages/cli/",
-    "packages/generator/templates",
-    ".eslintrc.js",
-    "recipes/*/templates",
-  ],
   overrides: [
     {
-      files: ["examples/**", "packages/gui/**", "recipes/**"],
+      files: ["**/*.ts", "**/*.tsx"],
+      parser: "@typescript-eslint/parser",
+      parserOptions: {
+        ecmaVersion: 6,
+        sourceType: "module",
+        ecmaFeatures: {
+          jsx: true,
+        },
+        project: `./tsconfig.eslint.json`,
+      },
+      plugins: ["@typescript-eslint"],
+      rules: {
+        "@typescript-eslint/no-floating-promises": "error",
+        // note you must disable the base rule as it can report incorrect errors
+        "no-use-before-define": "off",
+        // "@typescript-eslint/no-use-before-define": ["error"],
+        // note you must disable the base rule as it can report incorrect errors
+        "no-redeclare": "off",
+        "@typescript-eslint/no-redeclare": ["error"],
+      },
+    },
+    {
+      files: ["examples/**", "recipes/**"],
       rules: {
         "import/no-default-export": "off",
         "unicorn/filename-case": "off",
         "@typescript-eslint/no-floating-promises": "off",
       },
     },
+    {
+      files: ["packages/cli/src/commands/**/*"],
+      rules: {
+        "require-await": "off",
+      },
+    },
+    {
+      files: ["**/__fixtures__/**"],
+      rules: {
+        "import/no-default-export": "off",
+      },
+    },
   ],
 }

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,23 +0,0 @@
----
-name: Bug report
-about: Something is not working right. Or error messages are unclear.
-title: ''
-labels: ''
-assignees: ''
----
-
-### What is the problem?
-
-### Steps to Reproduce
-
-1.
-
-### Versions
-
-```
-output of `blitz --version --verbose`
-```
-
-### Other
-
-Please include applicable logs and screenshots that show your problem.

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,49 @@
+name: Bug Report
+about: Something is not working right. Or error messages are unclear.
+labels: "kind/bug, status/triage"
+issue_body: true
+body:
+  - type: markdown
+    attributes:
+      value: Thanks for taking the time to file a bug report! Please fill out this form as completely as possible.
+  - type: textarea
+    attributes:
+      label: What is the problem?
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: "Paste all your error logs here:"
+      value: |
+        ```
+        PASTE_HERE (leave the ``` marks)
+        ```
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: "Paste all relevant code snippets here:"
+      value: |
+        ```
+        PASTE_HERE (leave the ``` marks)
+        ```
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: What are detailed steps to reproduce this?
+      value: "1."
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: "Run `blitz -v` and paste the output here:"
+      value: |
+        ```
+        PASTE_HERE (leave the ``` marks)
+        ```
+    validations:
+      required: true
+  - type: markdown
+    attributes:
+      value: "Please include below any other applicable logs and screenshots that show your problem:"

.github/ISSUE_TEMPLATE/feature_request.md

@@ -2,7 +2,7 @@
 name: Feature/change request
 about: Something new or better!
 title: ""
-labels: ""
+labels: "status/triage"
 assignees: ""
 ---
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -4,7 +4,7 @@ Closes: ??
 
 ### Checklist
 
-- [ ] Tests added for changes
+- [ ] Changes covered by tests (tests added if needed)
 - [ ] PR submitted to [blitzjs.com](https://github.com/blitz-js/blitzjs.com) for any user facing changes
 
 <!-- IMPORTANT: Make sure to check the "Allow edits from maintainers" box below this window -->

.github/workflows/codeql-analysis.yml

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

.github/workflows/main.yml

@@ -39,6 +39,10 @@ jobs:
         run: yarn install --frozen-lockfile --silent
         env:
           CI: true
+      - name: manypkg lint
+        run: yarn manypkg check
+        env:
+          CI: true
       - name: yarn lint
         run: yarn lint
         env:
@@ -48,7 +52,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
-        node_version: [12, 14]
+        node_version: [12, 15]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
@@ -91,7 +95,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
-        node_version: [12, 14]
+        node_version: [12, 15]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2

.gitignore

@@ -1,5 +1,6 @@
 .log
 .DS_Store
+.idea
 .jest-*
 lib
 node_modules
@@ -24,3 +25,7 @@ dist
 .tsbuildinfo
 .nvmrc
 **/.test*
+examples/auth2
+.idea
+.ultra.cache.json
+db.sqlite-journal

.husky/.gitignore

@@ -0,0 +1 @@
+_

.husky/pre-commit

@@ -0,0 +1,5 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+yarn lint-staged
+yarn pretty-quick --staged

GOVERNANCE.md

@@ -1,11 +0,0 @@
-# Blitz.js Governance
-
-_From Brandon Bayer (@flybayer), the creator:_
-
-Currently at this very early stage it's basically a [BDFL situation](https://opensource.guide/leadership-and-governance/#what-are-some-of-the-common-governance-structures-for-open-source-projects), with me having the final say in decisions.
-
-However we will move away from BDFL to something that looks more like Ember.js. It's extremely important to me (Brandon) that Blitz.js is a long-term, sustainable, and community-run project.
-
-I would love some mentorship from people with experience in large open-source projects on making this transition.
-
-Also, it's possible I will create one or more business around Blitz, perhaps similar to how Taylor Otwell has around Laravel, but Blitz itself will always remain a separate community-run project.

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Brandon Bayer
+Copyright (c) 2021 Brandon Bayer
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

MAINTAINERS.md

@@ -1 +0,0 @@
-This document has moved here: https://blitzjs.com/docs/maintainers

MANIFESTO.md

@@ -1,3 +0,0 @@
-# Manifesto
-
-[The Manifesto has been moved to Blitzjs.com](https://blitzjs.com/docs/manifesto)

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-198-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-238-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">
@@ -22,15 +22,15 @@
 <h1 align="center">The Fullstack React Framework</h1>
 
 <h5 align="center">"Zero-API" Data Layer — Built on Next.js — Inspired by Ruby on Rails</h3>
-<h3 align="center">Makes you far more productive than you ever dreamed was possible 😉</h3>
 <h3 align="center"><a href="https://blitzjs.com" target="_blank">Read the Documentation</a></h3>
 <br>
 
 “Zero-API” data layer **lets you import server code directly into your React components** instead of having to manually add API endpoints and do client-side fetching and caching.
 
-Includes everything you need for production apps. **Everything end-to-end from the database to the frontend.**
+New Blitz apps come with **all the boring stuff already set up for you!** Like ESLint, Prettier, Jest, user sign up, log in, and password reset.
+
+Provides **helpful defaults and conventions** for things like routing, file structure, and authentication while also being extremely flexible.
 
-Blitz brings back the **simplicity and conventions** of server-rendered frameworks like Ruby on Rails while preserving everything we love about React and client-side rendering!
 
 <br>
 
@@ -48,8 +48,8 @@ _You can alternatively use [`npx`](https://www.npmjs.com/package/npx)_
 
 1. `blitz new myAppName`
 2. `cd myAppName`
-3. `blitz start`
-4. View your baby app at http://localhost:3000
+3. `blitz dev`
+4. View your brand new app at http://localhost:3000
 
 <br><br>
 
@@ -57,32 +57,10 @@ _You can alternatively use [`npx`](https://www.npmjs.com/package/npx)_
 <img alt="Bytes Newsletter" src="https://files-8wtskjofb.vercel.app/smarter-16x1.jpg">
 </a>
 
-<br><br>
-
-![Architecture diagram](https://blitzjs.now.sh/img/architecture-diagram.png)
 
 <br><br>
 
-**Features:**<br>
-⚡️ Built on Next.js<br>
-⚡️ Don't have to build an API for client-side rendering<br>
-⚡️ Client-side rendering, Server-side rendering, and fully static pages all in the same app<br>
-⚡️ Full TypeScript support with static, end-to-end typing (no code generation step needed like with GraphQL)<br>
-⚡️ React Concurrent Mode enabled<br>
-⚡️ Database/ORM agnostic, but Prisma 2 is default<br>
-⚡️ CLI with code scaffolding, Rails-style console REPL, etc<br>
-⚡️ GraphQL Ready<br>
-⚡️ Deploy serverless or serverful<br>
-⚡️ Highly secure authentication <br>
-⚡️ Authorization you can use on both server and client<br>
-⚡️ Recipes for easily adding libraries like Tailwind, CSS-in-JS, etc.<br>
 
-**Other key features coming:**<br>
-⚡️ Model validation you can use on both server and client<br>
-⚡️ React native support<br>
-⚡️ GUI so you don't have to use the CLI<br>
-
-<br>
 
 ### The Foundational Principles
 
@@ -128,37 +106,38 @@ 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://raw.githubusercontent.com/blitz-js/blitz/canary/assets/reactbricks_icon.svg" width="40px"/>
  </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"/>
+<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/canary/assets/andreas.jpg" width="40px"/>
+</a>
+ <a aria-label="Robert Malko" href="https://github.com/malkomalko">
+<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/canary/assets/rob_blitz.jpg" width="40px"/>
 </a>
 
 
 ### 🥉 Bronze Sponsors
 
 <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">
+<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/canary/assets/render-logo-color2.png" width="200px">
 </a>
 
 ### 🥈 Silver Sponsors
 
 <a aria-label="Fauna" href="https://dashboard.fauna.com/accounts/register?utm_source=BlitzJS&utm_medium=sponsorship&utm_campaign=BlitzJS_Sponsorship_2020">
-<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/canary/assets/Fauna_Logo_Blue.png" width="200px">
+<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/canary/assets/Fauna_Logo_Blue.png" width="300px">
 </a>
 
 ### 🏆 Gold Sponsors
 
-<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 aria-label="Your Company" href="#">
+<img alt="" src="https://dummyimage.com/1000x330/efe8ff/000000.png&text=Your+Logo+Here" width="400px">
 </a>
-</div>
 
 ### 💎 Diamond Sponsors
 
 <a aria-label="Your Company" href="#">
-<img alt="" src="https://dummyimage.com/1000x330/efe8ff/000000.png&text=Your+Logo+Here" width="400px">
+<img alt="" src="https://dummyimage.com/1000x330/efe8ff/000000.png&text=Your+Logo+Here" width="500px">
 </a>
 
 <br>
@@ -179,7 +158,7 @@ Your financial contributions help ensure Blitz continues to be developed and mai
 
 ## Maintainers (Level 2) ✨
 
-_Code ownership, pull request approvals and merging, etc_ (see [MAINTAINERS.md](./MAINTAINERS.md))
+_Code ownership, pull request approvals and merging, etc_ (see [Maintainers L2](https://blitzjs.com/docs/maintainers#level-2-maintainers))
 
 <!-- prettier-ignore-start -->
 <!-- markdownlint-disable -->
@@ -188,6 +167,7 @@ _Code ownership, pull request approvals and merging, etc_ (see [MAINTAINERS.md](
     <td align="center"><a href="https://github.com/aem"><img src="https://avatars0.githubusercontent.com/u/1909883?v=4" width="100px;" alt=""/><br /><sub><b>Adam Markon</b></sub></a><br />CLI</td>
     <td align="center"><a href="http://robdrosenberg.com"><img src="https://avatars0.githubusercontent.com/u/20813991?v=4" width="100px;" alt=""/><br /><sub><b>Robert Rosenberg</b></sub></a><br />Website/Docs</td>
     <td align="center"><a href="http://simonknott.de"><img src="https://avatars1.githubusercontent.com/u/14912729?v=4" width="100px;" alt=""/><br /><sub><b>Simon Knott</b></sub></a><br />SuperJSON</td>
+    <td align="center"><a href="https://juanm04.com"><img src="https://avatars0.githubusercontent.com/u/16712703?v=4" width="100px;" alt=""/><br /><sub><b>Juan Martín Seery</b></sub></a><br />Website/Docs</td>
   </tr>
 </table>
 <!-- markdownlint-enable -->
@@ -197,7 +177,7 @@ _Code ownership, pull request approvals and merging, etc_ (see [MAINTAINERS.md](
 
 ## Maintainers (Level 1) ✨
 
-_Issue triage, pull request triage, community encouragement and moderation, etc_ (see [MAINTAINERS.md](./MAINTAINERS.md))
+_Issue triage, pull request triage, community encouragement and moderation, etc_ (see [Maintainers L1](https://blitzjs.com/docs/maintainers#level-1-maintainers))
 
 
 <!-- prettier-ignore-start -->
@@ -214,7 +194,6 @@ _Issue triage, pull request triage, community encouragement and moderation, etc_
   <tr>
     <td align="center"><a href="https://twitter.com/jdavenport97"><img src="https://avatars2.githubusercontent.com/u/1329874?v=4" width="100px;" alt=""/><br /><sub><b>Jamie Davenport</b></sub></a></td>
     <td align="center"><a href="https://twitter.com/myrondavis"><img src="https://avatars2.githubusercontent.com/u/1430136?v=4" width="100px;" alt=""/><br /><sub><b>Myron Davis</b></sub></a></td>
-    <td align="center"><a href="https://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>
@@ -234,7 +213,7 @@ Thanks to these wonderful people ([emoji key](https://allcontributors.org/docs/e
 <!-- markdownlint-disable -->
 <table>
   <tr>
-    <td align="center"><a href="https://twitter.com/flybayer"><img src="https://avatars3.githubusercontent.com/u/8813276?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Brandon Bayer</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=flybayer" title="Code">💻</a> <a href="#content-flybayer" title="Content">🖋</a> <a href="#ideas-flybayer" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/blitz-js/blitz/pulls?q=is%3Apr+reviewed-by%3Aflybayer" title="Reviewed Pull Requests">👀</a></td>
+    <td align="center"><a href="https://twitter.com/flybayer"><img src="https://avatars3.githubusercontent.com/u/8813276?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Brandon Bayer</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=flybayer" title="Code">💻</a> <a href="#content-flybayer" title="Content">🖋</a> <a href="#ideas-flybayer" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/blitz-js/blitz/pulls?q=is%3Apr+reviewed-by%3Aflybayer" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/blitz-js/blitz/commits?author=flybayer" title="Tests">⚠️</a> <a href="https://github.com/blitz-js/blitz/commits?author=flybayer" title="Documentation">📖</a></td>
     <td align="center"><a href="https://medium.com/@ryardley"><img src="https://avatars0.githubusercontent.com/u/1256409?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rudi Yardley</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=ryardley" title="Code">💻</a> <a href="#ideas-ryardley" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/blitz-js/blitz/pulls?q=is%3Apr+reviewed-by%3Aryardley" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/blitz-js/blitz/commits?author=ryardley" title="Tests">⚠️</a></td>
     <td align="center"><a href="https://merelinguist.me"><img src="https://avatars3.githubusercontent.com/u/24858006?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Dylan Brookes</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=merelinguist" title="Code">💻</a> <a href="#ideas-merelinguist" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/blitz-js/blitz/pulls?q=is%3Apr+reviewed-by%3Amerelinguist" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/blitz-js/blitz/commits?author=merelinguist" title="Tests">⚠️</a> <a href="https://github.com/blitz-js/blitz/commits?author=merelinguist" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/aem"><img src="https://avatars0.githubusercontent.com/u/1909883?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Adam Markon</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=aem" title="Code">💻</a> <a href="#ideas-aem" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/blitz-js/blitz/pulls?q=is%3Apr+reviewed-by%3Aaem" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/blitz-js/blitz/commits?author=aem" title="Tests">⚠️</a> <a href="#maintenance-aem" title="Maintenance">🚧</a></td>
@@ -446,7 +425,7 @@ Thanks to these wonderful people ([emoji key](https://allcontributors.org/docs/e
     <td align="center"><a href="http://kattcorp.com"><img src="https://avatars1.githubusercontent.com/u/459267?v=4?s=100" 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?s=100" 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?s=100" 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?s=100" 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://Dal.Design"><img src="https://avatars3.githubusercontent.com/u/43112535?v=4?s=100" 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> <a href="https://github.com/blitz-js/blitz/commits?author=Mzaien" title="Documentation">📖</a></td>
     <td align="center"><a href="http://kwao.io"><img src="https://avatars2.githubusercontent.com/u/8839514?v=4?s=100" width="100px;" alt=""/><br /><sub><b>William Kwao</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=williamkwao" title="Documentation">📖</a></td>
   </tr>
   <tr>
@@ -488,6 +467,56 @@ Thanks to these wonderful people ([emoji key](https://allcontributors.org/docs/e
   <tr>
     <td align="center"><a href="https://github.com/jonasthiesen"><img src="https://avatars.githubusercontent.com/u/23408018?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jonas Thiesen</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=jonasthiesen" title="Documentation">📖</a></td>
     <td align="center"><a href="https://thakkaryash94.github.io/"><img src="https://avatars.githubusercontent.com/u/7349778?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Yash Thakkar</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=thakkaryash94" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/rince"><img src="https://avatars.githubusercontent.com/u/933895?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kazuma Suzuki</b></sub></a><br /><a href="#design-rince" title="Design">🎨</a> <a href="https://github.com/blitz-js/blitz/commits?author=rince" title="Code">💻</a></td>
+    <td align="center"><a href="http://queq1890.info"><img src="https://avatars.githubusercontent.com/u/32263803?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Yuji Matsumoto</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=queq1890" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/Gim3l"><img src="https://avatars.githubusercontent.com/u/46765702?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Gimel Dick</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=Gim3l" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/akbo"><img src="https://avatars.githubusercontent.com/u/1926271?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Andreas Bollig</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=akbo" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=akbo" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://ajm.codes"><img src="https://avatars.githubusercontent.com/u/66390428?v=4?s=100" width="100px;" alt=""/><br /><sub><b>AJ Markow</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=ajmarkow" title="Tests">⚠️</a> <a href="https://github.com/blitz-js/blitz/commits?author=ajmarkow" title="Code">💻</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://wafuwafu13.hateblo.jp/"><img src="https://avatars.githubusercontent.com/u/50798936?v=4?s=100" width="100px;" alt=""/><br /><sub><b>TagawaHirotaka</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=wafuwafu13" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=wafuwafu13" title="Tests">⚠️</a></td>
+    <td align="center"><a href="https://github.com/merodiro"><img src="https://avatars.githubusercontent.com/u/17033502?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Amr A.Mohammed</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=merodiro" title="Code">💻</a></td>
+    <td align="center"><a href="http://www.lucaswillems.com"><img src="https://avatars.githubusercontent.com/u/5437552?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Lucas Willems</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=lcswillems" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=lcswillems" title="Code">💻</a></td>
+    <td align="center"><a href="https://alistair.cloud"><img src="https://avatars.githubusercontent.com/u/25351731?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Alistair Smith</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=alii" title="Code">💻</a></td>
+    <td align="center"><a href="https://rodrigoehlers.com"><img src="https://avatars.githubusercontent.com/u/19683042?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rodrigo Ehlers</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=rodrigoehlers" title="Code">💻</a></td>
+    <td align="center"><a href="https://www.builtopen.com/"><img src="https://avatars.githubusercontent.com/u/1734057?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael Ford</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=mtford90" title="Code">💻</a></td>
+    <td align="center"><a href="https://brianypliu.com"><img src="https://avatars.githubusercontent.com/u/3888780?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Brian Liu</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=LBrian" title="Code">💻</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="http://aleksandra.codes"><img src="https://avatars.githubusercontent.com/u/9019397?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Aleksandra Sikora</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=beerose" title="Code">💻</a></td>
+    <td align="center"><a href="https://juanm04.com"><img src="https://avatars.githubusercontent.com/u/16712703?v=4?s=100" width="100px;" alt=""/><br /><sub><b>JuanM04</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=JuanM04" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=JuanM04" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/arenddeboer"><img src="https://avatars.githubusercontent.com/u/7022204?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Arend de Boer</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=arenddeboer" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/fmilani"><img src="https://avatars.githubusercontent.com/u/1580375?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Felipe Milani</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=fmilani" title="Documentation">📖</a></td>
+    <td align="center"><a href="http://nxhx.org"><img src="https://avatars.githubusercontent.com/u/13018?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Joe Edelman</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=jxe" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/garytube"><img src="https://avatars.githubusercontent.com/u/3823504?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Gary</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=garytube" title="Documentation">📖</a></td>
+    <td align="center"><a href="http://oliverloops.com"><img src="https://avatars.githubusercontent.com/u/33361399?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Oliver Lopez </b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=oliverloops" title="Documentation">📖</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://decadentIpsum.me"><img src="https://avatars.githubusercontent.com/u/32861532?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Andreas Zaralis</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=DecadentIpsum" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/davetorbeck"><img src="https://avatars.githubusercontent.com/u/5829885?v=4?s=100" width="100px;" alt=""/><br /><sub><b>David Torbeck</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=davetorbeck" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/gusgard"><img src="https://avatars.githubusercontent.com/u/2577356?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Gustavo Gard</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=gusgard" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://narrationbox.com"><img src="https://avatars.githubusercontent.com/u/7126128?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Immortalin</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=Immortalin" title="Code">💻</a></td>
+    <td align="center"><a href="https://cristianbgp.com"><img src="https://avatars.githubusercontent.com/u/8507974?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Cristian Granda</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=cristianbgp" title="Code">💻</a></td>
+    <td align="center"><a href="https://deniseyu.io"><img src="https://avatars.githubusercontent.com/u/8420094?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Denise Yu</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=deniseyu" title="Code">💻</a></td>
+    <td align="center"><a href="http://dellacorte.me"><img src="https://avatars.githubusercontent.com/u/295683?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Andrea Della Corte</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=andreadellacorte" title="Documentation">📖</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="http://aditsachde.com"><img src="https://avatars.githubusercontent.com/u/23707194?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Adit Sachde</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=aditsachde" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/hirenchauhan2"><img src="https://avatars.githubusercontent.com/u/8999668?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Hiren Chauhan</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=hirenchauhan2" title="Code">💻</a></td>
+    <td align="center"><a href="http://remjx.com/"><img src="https://avatars.githubusercontent.com/u/35121685?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mark Jackson</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=remjx" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://lewisb.cloud/"><img src="https://avatars.githubusercontent.com/u/51877955?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Lewis Blackburn</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=lewisblackburn" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/FDiskas"><img src="https://avatars.githubusercontent.com/u/468006?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vytenis</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=FDiskas" title="Code">💻</a></td>
+    <td align="center"><a href="https://portfolio.matthieupetit.com"><img src="https://avatars.githubusercontent.com/u/12969089?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Matthieu</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=matthieu994" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=matthieu994" title="Tests">⚠️</a></td>
+    <td align="center"><a href="https://github.com/mitchazj"><img src="https://avatars.githubusercontent.com/u/15032956?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mitchell Johnson</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=mitchazj" title="Code">💻</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://roshan.page/"><img src="https://avatars.githubusercontent.com/u/31125563?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Roshan Manuel</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=Roesh" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=Roesh" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://kevinlangleyjr.com"><img src="https://avatars.githubusercontent.com/u/877634?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kevin Langley Jr.</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=kevinlangleyjr" title="Code">💻</a></td>
+    <td align="center"><a href="https://projet-test-99df0.firebaseapp.com/"><img src="https://avatars.githubusercontent.com/u/51029779?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Gabriel Picard</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=heavygabriel" title="Documentation">📖</a></td>
+    <td align="center"><a href="http://ryanchenkie.com/"><img src="https://avatars.githubusercontent.com/u/1847678?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ryan Chenkie</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=chenkie" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/sbappan"><img src="https://avatars.githubusercontent.com/u/12586088?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Santhosh B. Appan</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=sbappan" title="Documentation">📖</a></td>
+    <td align="center"><a href="http://stackoverflow.com/users/5207233/james-moran"><img src="https://avatars.githubusercontent.com/u/10858584?v=4?s=100" width="100px;" alt=""/><br /><sub><b>James Moran</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=james2406" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=james2406" title="Documentation">📖</a></td>
+    <td align="center"><a href="http://fb.me/yz"><img src="https://avatars.githubusercontent.com/u/14841421?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jack Zhao</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=bugzpodder" title="Code">💻</a></td>
   </tr>
 </table>
 

SECURITY.md

@@ -0,0 +1,10 @@
+# Security Policy
+
+## Supported Versions
+
+TODO
+
+## Reporting a Vulnerability
+
+Email Brandon Bayer at b@bayer.ws to report a vulnerablity, and he will follow up with you asap.
+

assets/reactbricks_icon.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 980 979.97"><path d="M139.38,0c-185.82-3.54-185.82,277,0,273.46H251.44C437.25,277,437.25-3.5,251.44,0ZM729.25,353.24c-184.92-2.62-184.92,276.1,0,273.48H841.31c184.92,2.62,184.92-276.1,0-273.48ZM138.69,706.46c-184.92-2.61-184.92,276.1,0,273.49H250.75c184.91,2.61,184.91-276.1,0-273.49Z" fill="#b43278"/><path d="M583.47,0c-185.82-3.54-185.82,277,0,273.46H840.61c185.81,3.54,185.81-277,0-273.46ZM138.7,353.24c-184.92-2.62-184.92,276.1,0,273.48H395.85c184.92,2.62,184.92-276.1,0-273.48ZM584.13,706.46c-184.91-2.61-184.91,276.1,0,273.49H841.3c184.92,2.61,184.92-276.1,0-273.49Z" fill="#f65a8e"/></svg>

babel.config.js

@@ -0,0 +1,29 @@
+module.exports = {
+  presets: [
+    "@babel/preset-typescript",
+    "@babel/preset-react",
+    [
+      "@babel/preset-env",
+      {
+        modules: false,
+        loose: true,
+        exclude: [
+          "@babel/plugin-transform-async-to-generator",
+          "@babel/plugin-transform-regenerator",
+        ],
+      },
+    ],
+  ],
+  plugins: [
+    "babel-plugin-annotate-pure-calls",
+    "babel-plugin-dev-expression",
+    ["@babel/plugin-proposal-class-properties", {loose: true}],
+    "babel-plugin-macros",
+    [
+      "transform-inline-environment-variables",
+      {
+        include: ["BLITZ_PROD_BUILD"],
+      },
+    ],
+  ],
+}

examples/auth/README.md

@@ -20,7 +20,7 @@ blitz prisma migrate dev --preview-feature
 3. Start the dev server
 
 ```
-blitz start
+blitz dev
 ```
 
 Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.

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

@@ -1,8 +1,9 @@
-import {passportAuth} from "blitz"
+import {passportAuth, PublicData} from "blitz"
 import db from "db"
 import {Strategy as TwitterStrategy} from "passport-twitter"
 import {Strategy as GitHubStrategy} from "passport-github2"
 import {Strategy as Auth0Strategy} from "passport-auth0"
+import {Role} from "types"
 
 function assert(condition: any, message: string): asserts condition {
   if (!condition) throw new Error(message)
@@ -21,14 +22,14 @@ assert(process.env.AUTH0_DOMAIN, "You must provide the AUTH0_DOMAIN env variable
 assert(process.env.AUTH0_CLIENT_ID, "You must provide the AUTH0_CLIENT_ID env variable")
 assert(process.env.AUTH0_CLIENT_SECRET, "You must provide the AUTH0_CLIENT_SECRET env variable")
 
-export default passportAuth({
+export default passportAuth((ctx) => ({
   successRedirectUrl: "/",
   strategies: [
     {
       strategy: new TwitterStrategy(
         {
-          consumerKey: process.env.TWITTER_CONSUMER_KEY,
-          consumerSecret: process.env.TWITTER_CONSUMER_SECRET,
+          consumerKey: process.env.TWITTER_CONSUMER_KEY as string,
+          consumerSecret: process.env.TWITTER_CONSUMER_SECRET as string,
           callbackURL:
             process.env.NODE_ENV === "production"
               ? "https://auth-example-flybayer.blitzjs.vercel.app/api/auth/twitter/callback"
@@ -43,6 +44,8 @@ export default passportAuth({
             return done(new Error("Twitter OAuth response doesn't have email."))
           }
 
+          console.log(ctx.session.userId)
+
           const user = await db.user.upsert({
             where: {email},
             create: {
@@ -52,7 +55,7 @@ export default passportAuth({
             update: {email},
           })
 
-          const publicData = {userId: user.id, roles: [user.role], source: "twitter"}
+          const publicData = {userId: user.id, role: user.role, source: "twitter"}
           done(null, {publicData})
         },
       ),
@@ -60,14 +63,19 @@ export default passportAuth({
     {
       strategy: new GitHubStrategy(
         {
-          clientID: process.env.GITHUB_CLIENT_ID,
-          clientSecret: process.env.GITHUB_CLIENT_SECRET,
+          clientID: process.env.GITHUB_CLIENT_ID as string,
+          clientSecret: process.env.GITHUB_CLIENT_SECRET as string,
           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) {
+        async function (
+          _token: string,
+          _tokenSecret: string,
+          profile: any,
+          done: (err: Error | null, data?: {publicData: PublicData}) => void,
+        ) {
           const email = profile.emails && profile.emails[0]?.value
 
           if (!email) {
@@ -86,7 +94,7 @@ export default passportAuth({
 
           const publicData = {
             userId: user.id,
-            roles: [user.role],
+            role: user.role as Role,
             source: "github",
             githubUsername: profile.username,
           }
@@ -98,15 +106,15 @@ export default passportAuth({
       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,
+          domain: process.env.AUTH0_DOMAIN as string,
+          clientID: process.env.AUTH0_CLIENT_ID as string,
+          clientSecret: process.env.AUTH0_CLIENT_SECRET as string,
           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) {
+        async function (_token, _tokenSecret, _extraParams, profile, done) {
           const email = profile.emails && profile.emails[0]?.value
 
           if (!email) {
@@ -125,7 +133,7 @@ export default passportAuth({
 
           const publicData = {
             userId: user.id,
-            roles: [user.role],
+            role: user.role,
             source: "auth0",
             githubUsername: profile.username,
           }
@@ -134,4 +142,4 @@ export default passportAuth({
       ),
     },
   ],
-})
+}))

examples/auth/app/auth/components/LoginForm.tsx

@@ -1,7 +1,8 @@
-import {Link, useMutation, AuthenticationError} from "blitz"
-import {LabeledTextField} from "app/components/LabeledTextField"
-import {Form, FORM_ERROR} from "app/components/Form"
-import login, {LoginInput} from "app/auth/mutations/login"
+import {AuthenticationError, Link, useMutation} from "blitz"
+import {LabeledTextField} from "app/core/components/LabeledTextField"
+import {Form, FORM_ERROR} from "app/core/components/Form"
+import login from "app/auth/mutations/login"
+import {Login} from "app/auth/validations"
 
 type LoginFormProps = {
   onSuccess?: () => void
@@ -9,17 +10,19 @@ type LoginFormProps = {
 
 export const LoginForm = (props: LoginFormProps) => {
   const [loginMutation] = useMutation(login)
+
   return (
     <div>
       <h1>Login</h1>
+
       <Form
         submitText="Login"
-        schema={LoginInput}
-        initialValues={{email: undefined, password: undefined}}
+        schema={Login}
+        initialValues={{email: "", password: ""}}
         onSubmit={async (values) => {
           try {
             await loginMutation(values)
-            props.onSuccess && props.onSuccess()
+            props.onSuccess?.()
           } catch (error) {
             if (error instanceof AuthenticationError) {
               return {[FORM_ERROR]: "Sorry, those credentials are invalid"}
@@ -34,7 +37,13 @@ export const LoginForm = (props: LoginFormProps) => {
       >
         <LabeledTextField name="email" label="Email" placeholder="Email" />
         <LabeledTextField name="password" label="Password" placeholder="Password" type="password" />
+        <div>
+          <Link href="/forgot-password">
+            <a>Forgot your password?</a>
+          </Link>
+        </div>
       </Form>
+
       <div style={{marginTop: "1rem"}}>
         Or <Link href="/signup">Sign Up</Link>
       </div>

examples/auth/app/auth/components/SignupForm.tsx

@@ -0,0 +1,44 @@
+import React from "react"
+import {useMutation} from "blitz"
+import {LabeledTextField} from "app/core/components/LabeledTextField"
+import {Form, FORM_ERROR} from "app/core/components/Form"
+import signup from "app/auth/mutations/signup"
+import {Signup} 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={Signup}
+        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/auth/app/auth/mutations/changePassword.ts

@@ -0,0 +1,23 @@
+import {NotFoundError, SecurePassword, resolver} from "blitz"
+import db from "db"
+import {authenticateUser} from "./login"
+import {ChangePassword} from "../validations"
+
+export default resolver.pipe(
+  resolver.zod(ChangePassword),
+  resolver.authorize(),
+  async ({currentPassword, newPassword}, ctx) => {
+    const user = await db.user.findFirst({where: {id: ctx.session.userId!}})
+    if (!user) throw new NotFoundError()
+
+    await authenticateUser(user.email, currentPassword)
+
+    const hashedPassword = await SecurePassword.hash(newPassword)
+    await db.user.update({
+      where: {id: user.id},
+      data: {hashedPassword},
+    })
+
+    return true
+  },
+)

examples/auth/app/auth/mutations/forgotPassword.test.ts

@@ -0,0 +1,56 @@
+import {hash256, Ctx} from "blitz"
+import forgotPassword from "./forgotPassword"
+import db from "db"
+import previewEmail from "preview-email"
+
+beforeEach(async () => {
+  await db.$reset()
+})
+
+const generatedToken = "plain-token"
+jest.mock("@blitzjs/core/server", () => ({
+  ...jest.requireActual("@blitzjs/core/server")!,
+  generateToken: () => generatedToken,
+}))
+jest.mock("preview-email", () => jest.fn())
+
+describe("forgotPassword mutation", () => {
+  it("does not throw error if user doesn't exist", async () => {
+    await expect(forgotPassword({email: "no-user@email.com"}, {} as Ctx)).resolves.not.toThrow()
+  })
+
+  it("works correctly", async () => {
+    // Create test user
+    const user = await db.user.create({
+      data: {
+        email: "user@example.com",
+        tokens: {
+          // Create old token to ensure it's deleted
+          create: {
+            type: "RESET_PASSWORD",
+            hashedToken: "token",
+            expiresAt: new Date(),
+            sentTo: "user@example.com",
+          },
+        },
+      },
+      include: {tokens: true},
+    })
+
+    // Invoke the mutation
+    await forgotPassword({email: user.email}, {} as Ctx)
+
+    const tokens = await db.token.findMany({where: {userId: user.id}})
+    const token = tokens[0]
+
+    // delete's existing tokens
+    expect(tokens.length).toBe(1)
+
+    expect(token.id).not.toBe(user.tokens[0].id)
+    expect(token.type).toBe("RESET_PASSWORD")
+    expect(token.sentTo).toBe(user.email)
+    expect(token.hashedToken).toBe(hash256(generatedToken))
+    expect(token.expiresAt > new Date()).toBe(true)
+    expect(previewEmail).toBeCalled()
+  })
+})

examples/auth/app/auth/mutations/forgotPassword.ts

@@ -0,0 +1,41 @@
+import {resolver, generateToken, hash256} from "blitz"
+import db from "db"
+import {forgotPasswordMailer} from "mailers/forgotPasswordMailer"
+import {ForgotPassword} from "../validations"
+
+const RESET_PASSWORD_TOKEN_EXPIRATION_IN_HOURS = 4
+
+export default resolver.pipe(resolver.zod(ForgotPassword), async ({email}) => {
+  // 1. Get the user
+  const user = await db.user.findFirst({where: {email: email.toLowerCase()}})
+
+  // 2. Generate the token and expiration date.
+  const token = generateToken()
+  const hashedToken = hash256(token)
+  const expiresAt = new Date()
+  expiresAt.setHours(expiresAt.getHours() + RESET_PASSWORD_TOKEN_EXPIRATION_IN_HOURS)
+
+  // 3. If user with this email was found
+  if (user) {
+    // 4. Delete any existing password reset tokens
+    await db.token.deleteMany({where: {type: "RESET_PASSWORD", userId: user.id}})
+    // 5. Save this new token in the database.
+    await db.token.create({
+      data: {
+        user: {connect: {id: user.id}},
+        type: "RESET_PASSWORD",
+        expiresAt,
+        hashedToken,
+        sentTo: user.email,
+      },
+    })
+    // 6. Send the email
+    await forgotPasswordMailer({to: user.email, token}).send()
+  } else {
+    // 7. If no user found wait the same time so attackers can't tell the difference
+    await new Promise((resolve) => setTimeout(resolve, 750))
+  }
+
+  // 8. Return the same result whether a password reset email was sent or not
+  return
+})

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

@@ -1,6 +1,7 @@
-import {pipe, SecurePassword, AuthenticationError} from "blitz"
+import {resolver, SecurePassword, AuthenticationError} from "blitz"
 import db from "db"
-import * as z from "zod"
+import {Login} from "../validations"
+import {Role} from "types"
 
 export const authenticateUser = async (email: string, password: string) => {
   const user = await db.user.findFirst({where: {email}})
@@ -18,16 +19,11 @@ export const authenticateUser = async (email: string, password: string) => {
   return rest
 }
 
-export const LoginInput = z.object({
-  email: z.string().email(),
-  password: z.string(),
-})
-
-export default pipe.resolver(pipe.zod(LoginInput), async ({email, password}, {session}) => {
+export default resolver.pipe(resolver.zod(Login), async ({email, password}, ctx) => {
   // This throws an error if credentials are invalid
   const user = await authenticateUser(email, password)
 
-  await session.$create({userId: user.id, roles: [user.role]})
+  await ctx.session.$create({userId: user.id, role: user.role as Role})
 
   return user
 })

examples/auth/app/auth/mutations/logout.ts

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

examples/auth/app/auth/mutations/resetPassword.test.ts

@@ -0,0 +1,82 @@
+import resetPassword from "./resetPassword"
+import db from "db"
+import {hash256, SecurePassword} from "blitz"
+
+beforeEach(async () => {
+  await db.$reset()
+})
+
+const mockCtx: any = {
+  session: {
+    $create: jest.fn,
+  },
+}
+
+describe("resetPassword mutation", () => {
+  it("works correctly", async () => {
+    expect(true).toBe(true)
+
+    // Create test user
+    const goodToken = "randomPasswordResetToken"
+    const expiredToken = "expiredRandomPasswordResetToken"
+    const future = new Date()
+    future.setHours(future.getHours() + 4)
+    const past = new Date()
+    past.setHours(past.getHours() - 4)
+
+    const user = await db.user.create({
+      data: {
+        email: "user@example.com",
+        tokens: {
+          // Create old token to ensure it's deleted
+          create: [
+            {
+              type: "RESET_PASSWORD",
+              hashedToken: hash256(expiredToken),
+              expiresAt: past,
+              sentTo: "user@example.com",
+            },
+            {
+              type: "RESET_PASSWORD",
+              hashedToken: hash256(goodToken),
+              expiresAt: future,
+              sentTo: "user@example.com",
+            },
+          ],
+        },
+      },
+      include: {tokens: true},
+    })
+
+    const newPassword = "newPassword"
+
+    // Non-existent token
+    await expect(
+      resetPassword({token: "no-token", password: "", passwordConfirmation: ""}, mockCtx),
+    ).rejects.toThrowError()
+
+    // Expired token
+    await expect(
+      resetPassword(
+        {token: expiredToken, password: newPassword, passwordConfirmation: newPassword},
+        mockCtx,
+      ),
+    ).rejects.toThrowError()
+
+    // Good token
+    await resetPassword(
+      {token: goodToken, password: newPassword, passwordConfirmation: newPassword},
+      mockCtx,
+    )
+
+    // Delete's the token
+    const numberOfTokens = await db.token.count({where: {userId: user.id}})
+    expect(numberOfTokens).toBe(0)
+
+    // Updates user's password
+    const updatedUser = await db.user.findFirst({where: {id: user.id}})
+    expect(await SecurePassword.verify(updatedUser!.hashedPassword, newPassword)).toBe(
+      SecurePassword.VALID,
+    )
+  })
+})

examples/auth/app/auth/mutations/resetPassword.ts

@@ -0,0 +1,47 @@
+import {resolver, SecurePassword, hash256} from "blitz"
+import db from "db"
+import {ResetPassword} from "../validations"
+import login from "./login"
+
+export class ResetPasswordError extends Error {
+  name = "ResetPasswordError"
+  message = "Reset password link is invalid or it has expired."
+}
+
+export default resolver.pipe(resolver.zod(ResetPassword), async ({password, token}, ctx) => {
+  // 1. Try to find this token in the database
+  const hashedToken = hash256(token)
+  const possibleToken = await db.token.findFirst({
+    where: {hashedToken, type: "RESET_PASSWORD"},
+    include: {user: true},
+  })
+
+  // 2. If token not found, error
+  if (!possibleToken) {
+    throw new ResetPasswordError()
+  }
+  const savedToken = possibleToken
+
+  // 3. Delete token so it can't be used again
+  await db.token.delete({where: {id: savedToken.id}})
+
+  // 4. If token has expired, error
+  if (savedToken.expiresAt < new Date()) {
+    throw new ResetPasswordError()
+  }
+
+  // 5. Since token is valid, now we can update the user's password
+  const hashedPassword = await SecurePassword.hash(password)
+  const user = await db.user.update({
+    where: {id: savedToken.userId},
+    data: {hashedPassword},
+  })
+
+  // 6. Revoke all existing login sessions for this user
+  await db.session.deleteMany({where: {userId: user.id}})
+
+  // 7. Now log the user in with the new credentials
+  await login({email: user.email, password}, ctx)
+
+  return true
+})

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

@@ -1,20 +1,15 @@
-import {pipe, SecurePassword} from "blitz"
+import {resolver, SecurePassword} from "blitz"
 import db from "db"
-import * as z from "zod"
+import {Signup} from "app/auth/validations"
+import {Role} from "types"
 
-export const SignupInput = z.object({
-  email: z.string().email(),
-  password: z.string().min(10).max(100),
-})
-
-export default pipe.resolver(pipe.zod(SignupInput), async ({email, password}, {session}) => {
+export default resolver.pipe(resolver.zod(Signup), async ({email, password}, ctx) => {
   const hashedPassword = await SecurePassword.hash(password)
   const user = await db.user.create({
-    data: {email, hashedPassword, role: "user"},
+    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]})
-
+  await ctx.session.$create({userId: user.id, role: user.role as Role})
   return user
 })

examples/auth/app/auth/pages/forgot-password.tsx

@@ -0,0 +1,47 @@
+import {BlitzPage, useMutation} from "blitz"
+import Layout from "app/core/layouts/Layout"
+import {LabeledTextField} from "app/core/components/LabeledTextField"
+import {Form, FORM_ERROR} from "app/core/components/Form"
+import {ForgotPassword} from "app/auth/validations"
+import forgotPassword from "app/auth/mutations/forgotPassword"
+
+const ForgotPasswordPage: BlitzPage = () => {
+  const [forgotPasswordMutation, {isSuccess}] = useMutation(forgotPassword)
+
+  return (
+    <div>
+      <h1>Forgot your password?</h1>
+
+      {isSuccess ? (
+        <div>
+          <h2>Request Submitted</h2>
+          <p>
+            If your email is in our system, you will receive instructions to reset your password
+            shortly.
+          </p>
+        </div>
+      ) : (
+        <Form
+          submitText="Send Reset Password Instructions"
+          schema={ForgotPassword}
+          initialValues={{email: ""}}
+          onSubmit={async (values) => {
+            try {
+              await forgotPasswordMutation(values)
+            } catch (error) {
+              return {
+                [FORM_ERROR]: "Sorry, we had an unexpected error. Please try again.",
+              }
+            }
+          }}
+        >
+          <LabeledTextField name="email" label="Email" placeholder="Email" />
+        </Form>
+      )}
+    </div>
+  )
+}
+
+ForgotPasswordPage.getLayout = (page) => <Layout title="Forgot Your Password?">{page}</Layout>
+
+export default ForgotPasswordPage

examples/auth/app/auth/pages/login.tsx

@@ -1,21 +1,24 @@
-import {Head, useRouter, BlitzPage} from "blitz"
+import React from "react"
+import {useRouter, BlitzPage} from "blitz"
+import Layout from "app/core/layouts/Layout"
 import {LoginForm} from "app/auth/components/LoginForm"
 
-const SignupPage: BlitzPage = () => {
+const LoginPage: BlitzPage = () => {
   const router = useRouter()
 
   return (
-    <>
-      <Head>
-        <title>Login</title>
-        <link rel="icon" href="/favicon.ico" />
-      </Head>
-
-      <div>
-        <LoginForm onSuccess={() => router.push("/")} />
-      </div>
-    </>
+    <div>
+      <LoginForm
+        onSuccess={() => {
+          const next = (router.query.next as string) ?? "/"
+          router.push(next)
+        }}
+      />
+    </div>
   )
 }
 
-export default SignupPage
+LoginPage.redirectAuthenticatedTo = "/"
+LoginPage.getLayout = (page) => <Layout title="Log In">{page}</Layout>
+
+export default LoginPage

examples/auth/app/auth/pages/reset-password.tsx

@@ -0,0 +1,58 @@
+import {BlitzPage, useRouterQuery, Link, useMutation} from "blitz"
+import Layout from "app/core/layouts/Layout"
+import {LabeledTextField} from "app/core/components/LabeledTextField"
+import {Form, FORM_ERROR} from "app/core/components/Form"
+import {ResetPassword} from "app/auth/validations"
+import resetPassword from "app/auth/mutations/resetPassword"
+
+const ResetPasswordPage: BlitzPage = () => {
+  const query = useRouterQuery()
+  const [resetPasswordMutation, {isSuccess}] = useMutation(resetPassword)
+
+  return (
+    <div>
+      <h1>Set a New Password</h1>
+
+      {isSuccess ? (
+        <div>
+          <h2>Password Reset Successfully</h2>
+          <p>
+            Go to the <Link href="/">homepage</Link>
+          </p>
+        </div>
+      ) : (
+        <Form
+          submitText="Reset Password"
+          schema={ResetPassword}
+          initialValues={{password: "", passwordConfirmation: "", token: query.token as string}}
+          onSubmit={async (values) => {
+            try {
+              await resetPasswordMutation(values)
+            } catch (error) {
+              if (error.name === "ResetPasswordError") {
+                return {
+                  [FORM_ERROR]: error.message,
+                }
+              } else {
+                return {
+                  [FORM_ERROR]: "Sorry, we had an unexpected error. Please try again.",
+                }
+              }
+            }
+          }}
+        >
+          <LabeledTextField name="password" label="New Password" type="password" />
+          <LabeledTextField
+            name="passwordConfirmation"
+            label="Confirm New Password"
+            type="password"
+          />
+        </Form>
+      )}
+    </div>
+  )
+}
+
+ResetPasswordPage.getLayout = (page) => <Layout title="Reset Your Password">{page}</Layout>
+
+export default ResetPasswordPage

examples/auth/app/auth/pages/signup.tsx

@@ -1,53 +1,17 @@
-import {Head, useRouter, BlitzPage, useMutation} from "blitz"
-import {Form, FORM_ERROR} from "app/components/Form"
-import {LabeledTextField} from "app/components/LabeledTextField"
-import signup, {SignupInput} from "app/auth/mutations/signup"
+import {useRouter, BlitzPage} from "blitz"
+import Layout from "app/core/layouts/Layout"
+import {SignupForm} from "app/auth/components/SignupForm"
 
 const SignupPage: BlitzPage = () => {
   const router = useRouter()
-  const [signupMutation] = useMutation(signup)
 
   return (
-    <>
-      <Head>
-        <title>Sign Up</title>
-        <link rel="icon" href="/favicon.ico" />
-      </Head>
-
-      <div>
-        <h1>Create an Account</h1>
-
-        <Form
-          submitText="Create Account"
-          schema={SignupInput}
-          onSubmit={async (values) => {
-            try {
-              await signupMutation(values)
-              router.push("/")
-            } 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]:
-                    "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>
-    </>
+    <div>
+      <SignupForm onSuccess={() => router.push("/")} />
+    </div>
   )
 }
 
+SignupPage.getLayout = (page) => <Layout title="Sign Up">{page}</Layout>
+
 export default SignupPage

examples/auth/app/auth/validations.ts

@@ -0,0 +1,33 @@
+import * as z from "zod"
+
+const password = z.string().min(10).max(100)
+
+export const Signup = z.object({
+  email: z.string().email(),
+  password,
+})
+
+export const Login = z.object({
+  email: z.string().email(),
+  password: z.string(),
+})
+
+export const ForgotPassword = z.object({
+  email: z.string().email(),
+})
+
+export const ResetPassword = z
+  .object({
+    password: password,
+    passwordConfirmation: password,
+    token: z.string(),
+  })
+  .refine((data) => data.password === data.passwordConfirmation, {
+    message: "Passwords don't match",
+    path: ["passwordConfirmation"], // set the path of the error
+  })
+
+export const ChangePassword = z.object({
+  currentPassword: z.string(),
+  newPassword: password,
+})

examples/auth/app/core/components/Form.tsx

@@ -1,17 +1,18 @@
-import {ReactNode, PropsWithoutRef} from "react"
+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>> = {
+export interface FormProps<S extends z.ZodType<any, any>>
+  extends Omit<PropsWithoutRef<JSX.IntrinsicElements["form"]>, "onSubmit"> {
   /** All your form fields */
-  children: ReactNode
+  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"]
-  schema?: S
-} & Omit<PropsWithoutRef<JSX.IntrinsicElements["form"]>, "onSubmit">
+}
 
 export function Form<S extends z.ZodType<any, any>>({
   children,

examples/auth/app/core/components/LabeledTextField.tsx

@@ -1,4 +1,4 @@
-import {forwardRef, PropsWithoutRef} from "react"
+import React, {PropsWithoutRef} from "react"
 import {useField} from "react-final-form"
 
 export interface LabeledTextFieldProps extends PropsWithoutRef<JSX.IntrinsicElements["input"]> {
@@ -11,12 +11,16 @@ export interface LabeledTextFieldProps extends PropsWithoutRef<JSX.IntrinsicElem
   outerProps?: PropsWithoutRef<JSX.IntrinsicElements["div"]>
 }
 
-export const LabeledTextField = forwardRef<HTMLInputElement, LabeledTextFieldProps>(
+export const LabeledTextField = React.forwardRef<HTMLInputElement, LabeledTextFieldProps>(
   ({name, label, outerProps, ...props}, ref) => {
     const {
       input,
       meta: {touched, error, submitError, submitting},
-    } = useField(name)
+    } = useField(name, {
+      parse: props.type === "number" ? Number : undefined,
+    })
+
+    const normalizedError = Array.isArray(error) ? error.join(", ") : error || submitError
 
     return (
       <div {...outerProps}>
@@ -25,9 +29,9 @@ export const LabeledTextField = forwardRef<HTMLInputElement, LabeledTextFieldPro
           <input {...input} disabled={submitting} {...props} ref={ref} />
         </label>
 
-        {touched && (error || submitError) && (
+        {touched && normalizedError && (
           <div role="alert" style={{color: "red"}}>
-            {error || submitError}
+            {normalizedError}
           </div>
         )}
 

examples/auth/app/core/layouts/Layout.tsx

@@ -2,7 +2,7 @@ import {useSession, useRouter, useMutation, Head} from "blitz"
 import logout from "app/auth/mutations/logout"
 
 export default function Layout({title, children}: {title?: string; children: React.ReactNode}) {
-  const session = useSession()
+  const session = useSession({suspense: false})
   const router = useRouter()
   const [logoutMutation] = useMutation(logout)
   return (

examples/auth/app/pages/_app.tsx

@@ -1,14 +1,19 @@
-import {AppProps, ErrorComponent, useRouter, AuthenticationError, AuthorizationError} from "blitz"
+import {
+  AppProps,
+  ErrorComponent,
+  useRouter,
+  AuthenticationError,
+  AuthorizationError,
+  ErrorFallbackProps,
+} from "blitz"
 import {ErrorBoundary} from "react-error-boundary"
 import {queryCache} from "react-query"
 import LoginForm from "app/auth/components/LoginForm"
 
-if (typeof window !== "undefined") {
-  window["DEBUG_BLITZ"] = 1
-}
-
 export default function App({Component, pageProps}: AppProps) {
+  const getLayout = Component.getLayout || ((page) => page)
   const router = useRouter()
+
   return (
     <ErrorBoundary
       FallbackComponent={RootErrorFallback}
@@ -19,12 +24,12 @@ export default function App({Component, pageProps}: AppProps) {
         queryCache.resetErrorBoundaries()
       }}
     >
-      <Component {...pageProps} />
+      {getLayout(<Component {...pageProps} />)}
     </ErrorBoundary>
   )
 }
 
-function RootErrorFallback({error, resetErrorBoundary}) {
+function RootErrorFallback({error, resetErrorBoundary}: ErrorFallbackProps) {
   if (error instanceof AuthenticationError) {
     return <LoginForm onSuccess={resetErrorBoundary} />
   } else if (error instanceof AuthorizationError) {

examples/auth/app/pages/index.test.tsx

@@ -1,20 +1,27 @@
 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>
+jest.mock("@blitzjs/core", () => ({
+  ...jest.requireActual("@blitzjs/core")!,
+  useQuery: () => [
+    {
+      id: 1,
+      name: "User",
+      email: "user@email.com",
+      role: "user",
+    },
+  ],
+}))
 
 test("renders blitz documentation link", () => {
-  mockUseCurrentUser.mockReturnValue({
-    id: 1,
-    name: "User",
-    email: "user@email.com",
-    role: "user",
-  })
+  // 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
 
   const {getByText} = render(<Home />)
   const element = getByText(/powered by blitz/i)
+  // @ts-ignore
   expect(element).toBeInTheDocument()
 })

examples/auth/app/pages/index.tsx

@@ -1,30 +1,30 @@
 import {Suspense} from "react"
-import {Head, Link, useSession, useRouterQuery, useMutation, invoke} from "blitz"
+import {
+  Head,
+  Link,
+  useSession,
+  useRouterQuery,
+  useMutation,
+  invoke,
+  useQuery,
+  BlitzPage,
+} from "blitz"
 import getUser from "app/users/queries/getUser"
 import trackView from "app/users/mutations/trackView"
 import Layout from "app/core/layouts/Layout"
-import {useCurrentUser} from "app/hooks/useCurrentUser"
-// import getUsers from "app/users/queries/getUsers"
 
 const CurrentUserInfo = () => {
-  const currentUser = useCurrentUser()
+  const session = useSession()
+  const [currentUser] = useQuery(getUser, {where: {id: session.userId!}})
 
   return <pre>{JSON.stringify(currentUser, null, 2)}</pre>
 }
 
-// const Users = () => {
-//   const [users] = useQuery(getUsers, {})
-//
-//   return <pre style={{maxWidth: "30rem"}}>{JSON.stringify(users, null, 2)}</pre>
-// }
-
 const UserStuff = () => {
   const session = useSession()
   const query = useRouterQuery()
   const [trackViewMutation] = useMutation(trackView)
 
-  if (session.isLoading) return <div>Loading...</div>
-
   return (
     <div>
       {!session.userId && (
@@ -48,11 +48,6 @@ const UserStuff = () => {
       <Suspense fallback="Loading...">
         <CurrentUserInfo />
       </Suspense>
-      {/*
-      <Suspense fallback="Loading...">
-        <Users />
-      </Suspense>
-        */}
       <button
         onClick={async () => {
           try {
@@ -81,7 +76,7 @@ const UserStuff = () => {
   )
 }
 
-const Home = () => (
+const Home: BlitzPage = () => (
   <Layout>
     <div className="container">
       <Head>
@@ -94,7 +89,9 @@ const Home = () => (
           <img src="/logo.png" alt="blitz.js" />
         </div>
 
-        <UserStuff />
+        <Suspense fallback={"Loading..."}>
+          <UserStuff />
+        </Suspense>
       </main>
 
       <footer>
@@ -238,4 +235,6 @@ const Home = () => (
   </Layout>
 )
 
+Home.suppressFirstRenderFlicker = true
+
 export default Home

examples/auth/app/pages/projects/[projectId].tsx

@@ -1,5 +1,5 @@
 import {Suspense} from "react"
-import {Link, useRouter, useQuery, useParam, BlitzPage, useMutation} from "blitz"
+import {Head, Link, useRouter, useQuery, useParam, BlitzPage, useMutation} from "blitz"
 import Layout from "app/core/layouts/Layout"
 import getProject from "app/projects/queries/getProject"
 import deleteProject from "app/projects/mutations/deleteProject"
@@ -7,30 +7,39 @@ import deleteProject from "app/projects/mutations/deleteProject"
 export const Project = () => {
   const router = useRouter()
   const projectId = useParam("projectId", "number")
-  const [project] = useQuery(getProject, {where: {id: projectId}})
-  const [deleteProjectMutation] = useMutation(deleteProject)
+  const [deleteProjectMutation, {isSuccess}] = useMutation(deleteProject)
+  const [project] = useQuery(getProject, {id: projectId}, {enabled: !isSuccess})
+
+  if (!project) return null
 
   return (
-    <div>
-      <h1>Project {project.id}</h1>
-      <pre>{JSON.stringify(project, null, 2)}</pre>
+    <>
+      <Head>
+        <title>Project {project.id}</title>
+      </Head>
 
-      <Link href={`/projects/${project.id}/edit`}>
-        <a>Edit</a>
-      </Link>
+      <div>
+        <h1>Project {project.id}</h1>
+        <pre>{JSON.stringify(project, null, 2)}</pre>
 
-      <button
-        type="button"
-        onClick={async () => {
-          if (window.confirm("This will be deleted")) {
-            await deleteProjectMutation({where: {id: project.id}})
-            router.push("/projects")
-          }
-        }}
-      >
-        Delete
-      </button>
-    </div>
+        <Link href={`/projects/${project.id}/edit`}>
+          <a>Edit</a>
+        </Link>
+
+        <button
+          type="button"
+          onClick={async () => {
+            if (window.confirm("This will be deleted")) {
+              await deleteProjectMutation({id: project.id})
+              router.push("/projects")
+            }
+          }}
+          style={{marginLeft: "0.5rem"}}
+        >
+          Delete
+        </button>
+      </div>
+    </>
   )
 }
 
@@ -50,6 +59,7 @@ const ShowProjectPage: BlitzPage = () => {
   )
 }
 
-ShowProjectPage.getLayout = (page) => <Layout title={"Project"}>{page}</Layout>
+ShowProjectPage.authenticate = true
+ShowProjectPage.getLayout = (page) => <Layout>{page}</Layout>
 
 export default ShowProjectPage

examples/auth/app/pages/projects/[projectId]/edit.tsx

@@ -1,39 +1,51 @@
 import {Suspense} from "react"
-import {Link, useRouter, useQuery, useMutation, useParam, BlitzPage} from "blitz"
+import {Head, Link, useRouter, useQuery, useMutation, useParam, BlitzPage} from "blitz"
 import Layout from "app/core/layouts/Layout"
 import getProject from "app/projects/queries/getProject"
 import updateProject from "app/projects/mutations/updateProject"
-import ProjectForm from "app/projects/components/ProjectForm"
+import {ProjectForm, FORM_ERROR} from "app/projects/components/ProjectForm"
 
 export const EditProject = () => {
   const router = useRouter()
   const projectId = useParam("projectId", "number")
-  const [project, {setQueryData}] = useQuery(getProject, {where: {id: projectId}})
+  const [project, {setQueryData}] = useQuery(getProject, {id: projectId})
   const [updateProjectMutation] = useMutation(updateProject)
 
   return (
-    <div>
-      <h1>Edit Project {project.id}</h1>
-      <pre>{JSON.stringify(project)}</pre>
+    <>
+      <Head>
+        <title>Edit Project {project.id}</title>
+      </Head>
 
-      <ProjectForm
-        initialValues={project}
-        onSubmit={async () => {
-          try {
-            const updated = await updateProjectMutation({
-              where: {id: project.id},
-              data: {name: "MyNewName"},
-            })
-            await setQueryData(updated)
-            alert("Success!" + JSON.stringify(updated))
-            router.push(`/projects/${updated.id}`)
-          } catch (error) {
-            console.log(error)
-            alert("Error editing project " + JSON.stringify(error, null, 2))
-          }
-        }}
-      />
-    </div>
+      <div>
+        <h1>Edit Project {project.id}</h1>
+        <pre>{JSON.stringify(project)}</pre>
+
+        <ProjectForm
+          submitText="Update Project"
+          // TODO use a zod schema for form validation
+          //  - Tip: extract mutation's schema into a shared `validations.ts` file and
+          //         then import and use it here
+          // schema={UpdateProject}
+          initialValues={project}
+          onSubmit={async (values) => {
+            try {
+              const updated = await updateProjectMutation({
+                id: project.id,
+                ...values,
+              })
+              await setQueryData(updated)
+              router.push(`/projects/${updated.id}`)
+            } catch (error) {
+              console.error(error)
+              return {
+                [FORM_ERROR]: error.toString(),
+              }
+            }
+          }}
+        />
+      </div>
+    </>
   )
 }
 
@@ -53,6 +65,7 @@ const EditProjectPage: BlitzPage = () => {
   )
 }
 
-EditProjectPage.getLayout = (page) => <Layout title={"Edit Project"}>{page}</Layout>
+EditProjectPage.authenticate = true
+EditProjectPage.getLayout = (page) => <Layout>{page}</Layout>
 
 export default EditProjectPage

examples/auth/app/pages/projects/index.tsx

@@ -1,5 +1,5 @@
 import {Suspense} from "react"
-import {Link, usePaginatedQuery, useRouter, BlitzPage} from "blitz"
+import {Head, Link, usePaginatedQuery, useRouter, BlitzPage} from "blitz"
 import Layout from "app/core/layouts/Layout"
 import getProjects from "app/projects/queries/getProjects"
 
@@ -41,20 +41,27 @@ export const ProjectsList = () => {
 
 const ProjectsPage: BlitzPage = () => {
   return (
-    <div>
-      <p>
-        <Link href="/projects/new">
-          <a>Create Project</a>
-        </Link>
-      </p>
+    <>
+      <Head>
+        <title>Projects</title>
+      </Head>
 
-      <Suspense fallback={<div>Loading...</div>}>
-        <ProjectsList />
-      </Suspense>
-    </div>
+      <div>
+        <p>
+          <Link href="/projects/new">
+            <a>Create Project</a>
+          </Link>
+        </p>
+
+        <Suspense fallback={<div>Loading...</div>}>
+          <ProjectsList />
+        </Suspense>
+      </div>
+    </>
   )
 }
 
-ProjectsPage.getLayout = (page) => <Layout title={"Projects"}>{page}</Layout>
+ProjectsPage.authenticate = {redirectTo: "/login"}
+ProjectsPage.getLayout = (page) => <Layout>{page}</Layout>
 
 export default ProjectsPage

examples/auth/app/pages/projects/new.tsx

@@ -1,7 +1,7 @@
 import {Link, useRouter, useMutation, BlitzPage} from "blitz"
 import Layout from "app/core/layouts/Layout"
 import createProject from "app/projects/mutations/createProject"
-import ProjectForm from "app/projects/components/ProjectForm"
+import {ProjectForm, FORM_ERROR} from "app/projects/components/ProjectForm"
 
 const NewProjectPage: BlitzPage = () => {
   const router = useRouter()
@@ -12,14 +12,21 @@ const NewProjectPage: BlitzPage = () => {
       <h1>Create New Project</h1>
 
       <ProjectForm
-        initialValues={{}}
-        onSubmit={async () => {
+        submitText="Create Project"
+        // TODO use a zod schema for form validation
+        //  - Tip: extract mutation's schema into a shared `validations.ts` file and
+        //         then import and use it here
+        // schema={CreateProject}
+        // initialValues={{}}
+        onSubmit={async (values) => {
           try {
-            const project = await createProjectMutation({name: "MyName"})
-            alert("Success!" + JSON.stringify(project))
+            const project = await createProjectMutation(values)
             router.push(`/projects/${project.id}`)
           } catch (error) {
-            alert("Error creating project " + JSON.stringify(error, null, 2))
+            console.error(error)
+            return {
+              [FORM_ERROR]: error.toString(),
+            }
           }
         }}
       />
@@ -33,6 +40,7 @@ const NewProjectPage: BlitzPage = () => {
   )
 }
 
+NewProjectPage.authenticate = true
 NewProjectPage.getLayout = (page) => <Layout title={"Create New Project"}>{page}</Layout>
 
 export default NewProjectPage

examples/auth/app/pages/ssr.tsx

@@ -1,36 +1,28 @@
-import {FC} from "react"
-import {getSessionContext} from "@blitzjs/server"
 import {
+  getSession,
   invokeWithMiddleware,
   useRouter,
-  GetServerSideProps,
-  PromiseReturnType,
   ErrorComponent as ErrorPage,
   useMutation,
   AuthenticationError,
   AuthorizationError,
+  GetServerSideProps,
+  InferGetServerSidePropsType,
+  BlitzPage,
 } from "blitz"
 import getUser from "app/users/queries/getUser"
 import logout from "app/auth/mutations/logout"
 import path from "path"
 
-type PageProps = {
-  user?: PromiseReturnType<typeof getUser>
-  error?: {
-    statusCode: number
-    message: string
-  }
-}
-
-export const getServerSideProps: GetServerSideProps<PageProps> = async ({req, res}) => {
+export const getServerSideProps: GetServerSideProps = async ({req, res}) => {
   // Ensure these files are not eliminated by trace-based tree-shaking (like Vercel)
   // https://github.com/blitz-js/blitz/issues/794
   path.resolve("next.config.js")
   path.resolve("blitz.config.js")
-  path.resolve(".next/__db.js")
+  path.resolve(".next/blitz/db.js")
   // End anti-tree-shaking
 
-  const session = await getSessionContext(req, res)
+  const session = await getSession(req, res)
   console.log("Session id:", session.userId)
   try {
     const user = await invokeWithMiddleware(
@@ -62,7 +54,7 @@ export const getServerSideProps: GetServerSideProps<PageProps> = async ({req, re
   }
 }
 
-const Test: FC<PageProps> = ({user, error}: PageProps) => {
+const Test: BlitzPage<InferGetServerSidePropsType<typeof getServerSideProps>> = ({user, error}) => {
   const router = useRouter()
   const [logoutMutation] = useMutation(logout)
 

examples/auth/app/projects/components/ProjectForm.tsx

@@ -1,23 +1,12 @@
-import React from "react"
+import {Form, FormProps} from "app/core/components/Form"
+import {LabeledTextField} from "app/core/components/LabeledTextField"
+import * as z from "zod"
+export {FORM_ERROR} from "app/core/components/Form"
 
-type ProjectFormProps = {
-  initialValues: any
-  onSubmit: React.FormEventHandler<HTMLFormElement>
-}
-
-const ProjectForm = ({initialValues, onSubmit}: ProjectFormProps) => {
+export function ProjectForm<S extends z.ZodType<any, any>>(props: FormProps<S>) {
   return (
-    <form
-      onSubmit={(event) => {
-        event.preventDefault()
-        onSubmit(event)
-      }}
-    >
-      <div>Put your form fields here. But for now, just click submit</div>
-      <div>{JSON.stringify(initialValues)}</div>
-      <button>Submit</button>
-    </form>
+    <Form<S> {...props}>
+      <LabeledTextField name="name" label="Name" placeholder="Name" />
+    </Form>
   )
 }
-
-export default ProjectForm

examples/auth/app/projects/mutations/createProject.ts

@@ -1,25 +1,16 @@
-import {pipe} from "blitz"
+import {resolver} from "blitz"
 import db from "db"
 import * as z from "zod"
 
-export const CreateProject = z.object({
-  name: z.string(),
-  dueDate: z.date().optional(),
+const CreateProject = z
+  .object({
+    name: z.string(),
+  })
+  .nonstrict()
+
+export default resolver.pipe(resolver.zod(CreateProject), resolver.authorize(), async (input) => {
+  // TODO: in multi-tenant app, you must add validation to ensure correct tenant
+  const project = await db.project.create({data: input})
+
+  return project
 })
-
-export default pipe.resolver(
-  pipe.zod(CreateProject),
-  pipe.authorize(),
-  pipe.authorizeIf((input, ctx) => input.name === ctx.session.roles[0], "admin"),
-  // How to set a default input value
-  (input, _ctx) => ({dueDate: new Date(), ...input}),
-  async (input, _ctx) => {
-    console.log("Creating project...")
-    const project = await db.project.create({
-      data: input,
-    })
-    console.log("Created project")
-
-    return project
-  },
-)

examples/auth/app/projects/mutations/deleteProject.ts

@@ -1,12 +1,16 @@
-import {Ctx} from "blitz"
-import db, {Prisma} from "db"
+import {resolver} from "blitz"
+import db from "db"
+import * as z from "zod"
 
-type DeleteProjectInput = Pick<Prisma.ProjectDeleteArgs, "where">
+const DeleteProject = z
+  .object({
+    id: z.number(),
+  })
+  .nonstrict()
 
-export default async function deleteProject({where}: DeleteProjectInput, ctx: Ctx) {
-  ctx.session.$authorize()
-
-  const project = await db.project.delete({where})
+export default resolver.pipe(resolver.zod(DeleteProject), resolver.authorize(), async ({id}) => {
+  // TODO: in multi-tenant app, you must add validation to ensure correct tenant
+  const project = await db.project.delete({where: {id}})
 
   return project
-}
+})

examples/auth/app/projects/mutations/updateProject.ts

@@ -1,12 +1,21 @@
-import {Ctx} from "blitz"
-import db, {Prisma} from "db"
+import {resolver} from "blitz"
+import db from "db"
+import * as z from "zod"
 
-type UpdateProjectInput = Pick<Prisma.ProjectUpdateArgs, "where" | "data">
+const UpdateProject = z
+  .object({
+    id: z.number(),
+    name: z.string(),
+  })
+  .nonstrict()
 
-export default async function updateProject({where, data}: UpdateProjectInput, ctx: Ctx) {
-  ctx.session.$authorize()
+export default resolver.pipe(
+  resolver.zod(UpdateProject),
+  resolver.authorize(),
+  async ({id, ...data}) => {
+    // TODO: in multi-tenant app, you must add validation to ensure correct tenant
+    const project = await db.project.update({where: {id}, data})
 
-  const project = await db.project.update({where, data})
-
-  return project
-}
+    return project
+  },
+)

examples/auth/app/projects/queries/getProject.ts

@@ -1,14 +1,17 @@
-import {Ctx, NotFoundError} from "blitz"
-import db, {Prisma} from "db"
+import {resolver, NotFoundError} from "blitz"
+import db from "db"
+import * as z from "zod"
 
-type GetProjectInput = Pick<Prisma.ProjectFindFirstArgs, "where">
+const GetProject = z.object({
+  // This accepts type of undefined, but is required at runtime
+  id: z.number().optional().refine(Boolean, "Required"),
+})
 
-export default async function getProject({where}: GetProjectInput, ctx: Ctx) {
-  ctx.session.$authorize()
-
-  const project = await db.project.findFirst({where})
+export default resolver.pipe(resolver.zod(GetProject), resolver.authorize(), async ({id}) => {
+  // TODO: in multi-tenant app, you must add validation to ensure correct tenant
+  const project = await db.project.findFirst({where: {id}})
 
   if (!project) throw new NotFoundError()
 
   return project
-}
+})

examples/auth/app/projects/queries/getProjects.ts

@@ -1,29 +1,25 @@
-import {Ctx} from "blitz"
+import {paginate, resolver} from "blitz"
 import db, {Prisma} from "db"
 
-type GetProjectsInput = Pick<Prisma.ProjectFindManyArgs, "where" | "orderBy" | "skip" | "take">
+interface GetProjectsInput
+  extends Pick<Prisma.ProjectFindManyArgs, "where" | "orderBy" | "skip" | "take"> {}
 
-export default async function getProjects(
-  {where, orderBy, skip = 0, take}: GetProjectsInput,
-  ctx: Ctx,
-) {
-  ctx.session.$authorize()
+export default resolver.pipe(
+  resolver.authorize(),
+  async ({where, orderBy, skip = 0, take = 100}: GetProjectsInput) => {
+    // TODO: in multi-tenant app, you must add validation to ensure correct tenant
+    const {items: projects, hasMore, nextPage, count} = await paginate({
+      skip,
+      take,
+      count: () => db.project.count({where}),
+      query: (paginateArgs) => db.project.findMany({...paginateArgs, where, orderBy}),
+    })
 
-  const projects = await db.project.findMany({
-    where,
-    orderBy,
-    take,
-    skip,
-  })
-
-  const count = await db.project.count()
-  const hasMore = typeof take === "number" ? skip + take < count : false
-  const nextPage = hasMore ? {take, skip: skip + take!} : null
-
-  return {
-    projects,
-    nextPage,
-    hasMore,
-    count,
-  }
-}
+    return {
+      projects,
+      nextPage,
+      hasMore,
+      count,
+    }
+  },
+)

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

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

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

@@ -6,7 +6,7 @@ type GetUserInput = {
 }
 
 export default async function getUser({where}: GetUserInput, ctx: Ctx) {
-  ctx.session.$authorize()
+  if (!ctx.session.userId) return null
 
   const user = await db.user.findFirst({where})
 

examples/auth/blitz.config.js

@@ -1,22 +1,24 @@
-const {sessionMiddleware, simpleRolesIsAuthorized} = require("@blitzjs/server")
+const {sessionMiddleware, simpleRolesIsAuthorized} = require("blitz")
+const withMonorepoBuildTooling = require("@preconstruct/next")
 const withBundleAnalyzer = require("@next/bundle-analyzer")({
   enabled: process.env.ANALYZE === "true",
 })
 
-module.exports = withBundleAnalyzer({
-  middleware: [
-    sessionMiddleware({
-      isAuthorized: simpleRolesIsAuthorized,
-      sessionExpiryMinutes: 4,
-    }),
-  ],
-  log: {
-    // level: "trace",
-  },
-  experimental: {
-    isomorphicResolverImports: true,
-  },
-  /*
+module.exports = withMonorepoBuildTooling(
+  withBundleAnalyzer({
+    middleware: [
+      sessionMiddleware({
+        isAuthorized: simpleRolesIsAuthorized,
+        // sessionExpiryMinutes: 4,
+      }),
+    ],
+    log: {
+      // level: "trace",
+    },
+    experimental: {
+      isomorphicResolverImports: false,
+    },
+    /*
   webpack: (config, {buildId, dev, isServer, defaultLoaders, webpack}) => {
     // Note: we provide webpack above so you should not `require` it
     // Perform customizations to webpack config
@@ -29,4 +31,5 @@ module.exports = withBundleAnalyzer({
     return config
   },
   */
-})
+  }),
+)

examples/auth/cypress/integration/index.test.ts

@@ -19,6 +19,7 @@ describe("index page", () => {
     const user = createRandomUser()
 
     cy.signup(user)
+    cy.wait(1000)
 
     cy.location("pathname").should("equal", "/")
     cy.contains("button", "Logout")
@@ -28,8 +29,10 @@ describe("index page", () => {
     const user = createRandomUser()
 
     cy.signup(user)
+    cy.wait(1000)
 
     cy.contains("button", "Logout").click()
+    cy.wait(1000)
     cy.contains("a", /login/i).click()
 
     cy.contains("Email").find("input").type(user.email)
@@ -37,6 +40,7 @@ describe("index page", () => {
     cy.contains("button", /login/i).click()
 
     cy.location("pathname").should("equal", "/")
+    cy.wait(1000)
     cy.contains("button", "Logout")
   })
 
@@ -44,10 +48,12 @@ describe("index page", () => {
     const user = createRandomUser()
 
     cy.signup(user)
+    cy.wait(1000)
 
     cy.contains("button", "Logout").click()
 
     cy.location("pathname").should("equal", "/")
+    cy.wait(1000)
     cy.contains("a", /login/i)
   })
 
@@ -57,10 +63,13 @@ describe("index page", () => {
     const user = createRandomUser()
 
     cy.contains("button", "Track view").click()
+    cy.wait(500)
     cy.contains("button", "Track view").click()
+    cy.wait(1000)
     cy.contains('"views": 2')
 
     cy.signup(user)
+    cy.wait(1000)
 
     cy.contains('"views": 2')
   })

examples/auth/cypress/tsconfig.json

@@ -0,0 +1,7 @@
+{
+  "compilerOptions": {
+    "target": "es5",
+    "lib": ["dom", "es5"],
+    "types": ["cypress"]
+  }
+}

examples/auth/db/migrations/20210204235014_add_tokens/migration.sql

@@ -0,0 +1,15 @@
+-- CreateTable
+CREATE TABLE "Token" (
+    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    "hashedToken" TEXT NOT NULL,
+    "type" TEXT NOT NULL,
+    "expiresAt" DATETIME NOT NULL,
+    "sentTo" TEXT NOT NULL,
+    "userId" INTEGER NOT NULL,
+    FOREIGN KEY ("userId") REFERENCES "User" ("id") ON DELETE CASCADE ON UPDATE CASCADE
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Token.hashedToken_type_unique" ON "Token"("hashedToken", "type");

examples/auth/db/schema.prisma

@@ -20,18 +20,20 @@ generator client {
 // --------------------------------------
 
 model User {
-  id             Int       @default(autoincrement()) @id
-  createdAt      DateTime  @default(now())
-  updatedAt      DateTime  @updatedAt
+  id             Int      @id @default(autoincrement())
+  createdAt      DateTime @default(now())
+  updatedAt      DateTime @updatedAt
   name           String?
-  email          String    @unique
+  email          String   @unique
   hashedPassword String?
-  role           String    @default("user")
-  sessions       Session[]
+  role           String   @default("user")
+
+  sessions Session[]
+  tokens   Token[]
 }
 
 model Session {
-  id                 Int       @default(autoincrement()) @id
+  id                 Int       @id @default(autoincrement())
   createdAt          DateTime  @default(now())
   updatedAt          DateTime  @updatedAt
   expiresAt          DateTime?
@@ -44,10 +46,25 @@ model Session {
   privateData        String?
 }
 
+model Token {
+  id          Int      @id @default(autoincrement())
+  createdAt   DateTime @default(now())
+  updatedAt   DateTime @updatedAt
+  hashedToken String
+  type        String
+  expiresAt   DateTime
+  sentTo      String
+
+  user   User @relation(fields: [userId], references: [id])
+  userId Int
+
+  @@unique([hashedToken, type])
+}
+
 model Project {
-  id        Int      @default(autoincrement()) @id
-  createdAt DateTime @default(now())
-  updatedAt DateTime @updatedAt
+  id        Int       @id @default(autoincrement())
+  createdAt DateTime  @default(now())
+  updatedAt DateTime  @updatedAt
   name      String
   dueDate   DateTime?
 }

examples/auth/mailers/forgotPasswordMailer.ts

@@ -0,0 +1,45 @@
+/* TODO - You need to add a mailer integration in `integrations/` and import here.
+ *
+ * The integration file can be very simple. Instantiate the email client
+ * and then export it. That way you can import here and anywhere else
+ * and use it straight away.
+ */
+import previewEmail from "preview-email"
+
+type ResetPasswordMailer = {
+  to: string
+  token: string
+}
+
+export function forgotPasswordMailer({to, token}: ResetPasswordMailer) {
+  // In production, set APP_ORIGIN to your production server origin
+  const origin = process.env.APP_ORIGIN || process.env.BLITZ_DEV_SERVER_ORIGIN
+  const resetUrl = `${origin}/reset-password?token=${token}`
+
+  const msg = {
+    from: "TODO@example.com",
+    to,
+    subject: "Your Password Reset Instructions",
+    html: `
+      <h1>Reset Your Password</h1>
+      <h3>NOTE: You must set up a production email integration in mailers/forgotPasswordMailer.ts</h3>
+
+      <a href="${resetUrl}">
+        Click here to set a new password
+      </a>
+    `,
+  }
+
+  return {
+    async send() {
+      if (process.env.NODE_ENV === "production") {
+        // TODO - send the production email, like this:
+        // await postmark.sendEmail(msg)
+        throw new Error("No production email implementation in mailers/forgotPasswordMailer")
+      } else {
+        // Preview email in the browser
+        await previewEmail(msg)
+      }
+    },
+  }
+}

examples/auth/package.json

@@ -1,17 +1,18 @@
 {
   "name": "@examples/auth",
-  "version": "0.29.2",
+  "version": "0.32.1",
   "scripts": {
+    "dev": "blitz dev",
+    "build": "blitz build",
     "start": "blitz start",
     "studio": "blitz prisma studio",
-    "build": "blitz build",
     "lint": "eslint --ignore-path .gitignore --ext .js,.ts,.tsx .",
     "analyze": "cross-env ANALYZE=true blitz build",
     "cy:open": "cypress open",
-    "cy:run": "cypress run || cypress run",
+    "cy:run": "cypress run --browser chrome",
     "test": "prisma generate && yarn test:jest && yarn test:e2e",
     "test:jest": "jest",
-    "test:server": "blitz prisma migrate deploy --preview-feature && blitz build && blitz start --production -p 3099",
+    "test:server": "cross-env NODE_ENV=test blitz prisma migrate deploy --preview-feature && blitz build && cross-env NODE_ENV=test blitz start -p 3099",
     "test:e2e": "cross-env NODE_ENV=test start-server-and-test test:server http://localhost:3099 cy:run"
   },
   "browserslist": [
@@ -26,25 +27,14 @@
     "bracketSpacing": false,
     "trailingComma": "all"
   },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged && pretty-quick --staged",
-      "pre-push": "blitz test"
-    }
-  },
-  "lint-staged": {
-    "*.{js,ts,tsx}": [
-      "eslint --fix"
-    ]
-  },
   "dependencies": {
-    "@prisma/cli": "2.15.0",
-    "@prisma/client": "2.15.0",
-    "blitz": "0.29.2",
+    "@prisma/client": "2.17.0",
+    "blitz": "0.32.1",
     "final-form": "4.20.1",
     "passport-auth0": "1.4.0",
     "passport-github2": "0.1.12",
     "passport-twitter": "1.0.4",
+    "prisma": "2.17.0",
     "react": "0.0.0-experimental-3310209d0",
     "react-dom": "0.0.0-experimental-3310209d0",
     "react-error-boundary": "3.1.0",
@@ -53,20 +43,22 @@
   },
   "devDependencies": {
     "@cypress/skip-test": "2.6.0",
-    "@next/bundle-analyzer": "^10.0.5",
-    "@testing-library/react": "11.2.3",
-    "@testing-library/react-hooks": "4.0.1",
+    "@next/bundle-analyzer": "^10.0.6",
+    "@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/preview-email": "2.0.0",
     "@types/react": "17.0.0",
     "cross-env": "7.0.3",
     "cypress": "6.2.1",
-    "eslint": "7.17.0",
-    "husky": "4.3.7",
+    "eslint": "7.18.0",
+    "husky": "5.1.2",
     "lint-staged": "10.5.3",
     "prettier": "2.2.1",
     "pretty-quick": "3.1.0",
+    "preview-email": "3.0.3",
     "start-server-and-test": "1.11.7",
     "typescript": "4.1.3"
   },

examples/auth/test/setup.ts

@@ -1,2 +1,4 @@
 // This is the jest 'setupFilesAfterEnv' setup file
 // It's a good place to set globals, add global before/after hooks, etc
+
+export {} // so TS doesn't complain

examples/auth/test/utils.tsx

@@ -13,14 +13,6 @@ export * from "@testing-library/react"
 // This is the place to add any other context providers you need while testing.
 // --------------------------------------------------------------------------------
 
-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>}
-
 // --------------------------------------------------
 // render()
 // --------------------------------------------------
@@ -74,6 +66,7 @@ export const mockRouter: BlitzRouter = {
   params: {},
   query: {},
   isReady: true,
+  isLocaleDomain: false,
   push: jest.fn(),
   replace: jest.fn(),
   reload: jest.fn(),
@@ -87,3 +80,11 @@ export const mockRouter: BlitzRouter = {
   },
   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/auth/tsconfig.json

@@ -1,11 +1,11 @@
 {
   "compilerOptions": {
+    "strict": true,
     "target": "es5",
     "lib": ["dom", "dom.iterable", "esnext"],
     "baseUrl": "./",
     "allowJs": true,
     "skipLibCheck": true,
-    "strict": false,
     "strictNullChecks": true,
     "forceConsistentCasingInFileNames": true,
     "noEmit": true,
@@ -14,8 +14,9 @@
     "moduleResolution": "node",
     "resolveJsonModule": true,
     "isolatedModules": true,
+    "downlevelIteration": true,
     "jsx": "preserve"
   },
-  "exclude": ["node_modules"],
-  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"]
+  "exclude": ["node_modules", "cypress"],
+  "include": ["**/*.ts", "**/*.tsx"]
 }

examples/auth/types

@@ -0,0 +1 @@
+../../types

examples/auth/types.ts

@@ -1,16 +1,18 @@
-import {DefaultCtx, SessionContext, DefaultPublicData} from "blitz"
-import {simpleRolesIsAuthorized} from "@blitzjs/server"
+import {DefaultCtx, SessionContext, SimpleRolesIsAuthorized} from "blitz"
 import {User} from "db"
 
+export type Role = "ADMIN" | "USER"
+
 declare module "blitz" {
   export interface Ctx extends DefaultCtx {
     session: SessionContext
   }
-  export interface PublicData extends DefaultPublicData {
-    userId: User["id"]
-    views?: number
-  }
   export interface Session {
-    isAuthorized: typeof simpleRolesIsAuthorized
+    isAuthorized: SimpleRolesIsAuthorized<Role>
+    PublicData: {
+      userId: User["id"]
+      role: Role
+      views?: number
+    }
   }
 }

examples/custom-server/README.md

@@ -13,10 +13,10 @@
 3. Start the dev server
 
 ```sh
-blitz start
+blitz dev
 
 // Or if you want hot-reloading of server.js, use:
-yarn start
+yarn dev
 ```
 
 Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.
@@ -25,5 +25,5 @@ Open [http://localhost:3000](http://localhost:3000) with your browser to see the
 
 ```sh
 blitz build
-blitz start --production
+blitz start
 ```

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

@@ -9,7 +9,7 @@ export default async function login(input: LoginInputType, {session}: Ctx) {
   // This throws an error if credentials are invalid
   const user = await authenticateUser(email, password)
 
-  await session.$create({userId: user.id, roles: [user.role]})
+  await session.$create({userId: user.id})
 
   return user
 }

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

@@ -13,7 +13,7 @@ export default async function signup(input: SignupInputType, {session}: Ctx) {
     select: {id: true, name: true, email: true, role: true},
   })
 
-  await session.$create({userId: user.id, roles: [user.role]})
+  await session.$create({userId: user.id})
 
   return user
 }

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

@@ -1,26 +0,0 @@
-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

@@ -84,7 +84,7 @@ const Home: BlitzPage = () => {
             <code>Ctrl + c</code>
           </pre>
           <pre>
-            <code>blitz start</code>
+            <code>blitz dev</code>
           </pre>
           <p>
             and go to{" "}

examples/custom-server/blitz.config.js

@@ -1,6 +1,7 @@
-const {sessionMiddleware, simpleRolesIsAuthorized} = require("@blitzjs/server")
+const {sessionMiddleware, simpleRolesIsAuthorized} = require("blitz")
+const withMonorepoBuildTooling = require("@preconstruct/next")
 
-module.exports = {
+module.exports = withMonorepoBuildTooling({
   middleware: [
     sessionMiddleware({
       isAuthorized: simpleRolesIsAuthorized,
@@ -14,4 +15,4 @@ module.exports = {
     return config
   },
   */
-}
+})

examples/custom-server/package.json

@@ -1,17 +1,18 @@
 {
   "name": "@examples/custom-server",
-  "version": "0.29.2",
+  "version": "0.32.1",
   "scripts": {
-    "start": "nodemon --watch server.js --exec 'blitz start'",
+    "dev": "nodemon --watch server.js --exec 'blitz dev'",
     "build": "blitz build",
+    "start": "blitz start",
     "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:jest": "jest --passWithNoTests",
+    "test-server": "blitz build && blitz start",
     "test:e2e": "cross-env NODE_ENV=test PORT=3099 start-server-and-test test-server http://localhost:3099 cy-run",
     "test": "run-s test:*"
   },
@@ -27,25 +28,14 @@
     "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.15.0",
-    "@prisma/client": "2.15.0",
-    "blitz": "0.29.2",
+    "@prisma/client": "2.17.0",
+    "blitz": "0.32.1",
     "final-form": "4.20.1",
-    "react": "0.0.0-experimental-4ead6b530",
-    "react-dom": "0.0.0-experimental-4ead6b530",
-    "react-error-boundary": "2.3.2",
+    "prisma": "2.17.0",
+    "react": "0.0.0-experimental-3310209d0",
+    "react-dom": "0.0.0-experimental-3310209d0",
+    "react-error-boundary": "3.1.0",
     "react-final-form": "6.5.2",
     "secure-password": "4.0.0",
     "typescript": "4.1.3",
@@ -53,36 +43,19 @@
   },
   "devDependencies": {
     "@cypress/skip-test": "2.6.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",
+    "@testing-library/react": "^11.2.3",
+    "@testing-library/react-hooks": "^4.0.1",
+    "@types/react": "17.0.0",
     "@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",
+    "eslint": "7.18.0",
+    "husky": "5.1.2",
+    "lint-staged": "10.5.3",
     "nodemon": "2.0.7",
     "npm-run-all": "4.1.5",
-    "prettier": "2.2.0",
+    "prettier": "2.2.1",
     "pretty-quick": "3.1.0",
-    "react-test-renderer": "16.14.0",
-    "start-server-and-test": "1.11.2",
-    "ts-jest": "26.4.4"
+    "start-server-and-test": "1.11.7"
   },
   "private": true
 }

examples/custom-server/server.js

@@ -1,6 +1,6 @@
 const {createServer} = require("http")
 const {parse} = require("url")
-const blitz = require("@blitzjs/server")
+const blitz = require("blitz/custom-server")
 const {log} = require("@blitzjs/display")
 
 const {PORT = "3000"} = process.env

examples/custom-server/test/utils.tsx

@@ -67,6 +67,7 @@ export const mockRouter: BlitzRouter = {
   params: {},
   query: {},
   isReady: true,
+  isLocaleDomain: false,
   push: jest.fn(),
   replace: jest.fn(),
   reload: jest.fn(),

examples/custom-server/types

@@ -0,0 +1 @@
+../../types

examples/custom-server/types.ts

@@ -1,13 +1,15 @@
-import {DefaultCtx, SessionContext, DefaultPublicData} from "blitz"
-import {User} from "db"
+import {DefaultCtx, SessionContext, SimpleRolesIsAuthorized} from "blitz"
 import React from "react"
 
 declare module "blitz" {
   export interface Ctx extends DefaultCtx {
     session: SessionContext
   }
-  export interface PublicData extends DefaultPublicData {
-    userId: User["id"]
+  export interface Session {
+    isAuthorized: SimpleRolesIsAuthorized
+    PublicData: {
+      userId: number
+    }
   }
 }
 

examples/fauna/.npmrc

@@ -1 +1,2 @@
 save-exact=true
+legacy-peer-deps=true

examples/fauna/README.md

@@ -31,7 +31,7 @@ FAUNA_SECRET=YOUR_AUTH_KEY
 2. Start the dev server
 
 ```
-yarn blitz start
+yarn blitz dev
 ```
 
 Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.

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

@@ -9,7 +9,7 @@ export default async function login(input: LoginInputType, { session }: Ctx) {
   // This throws an error if credentials are invalid
   const user = await authenticateUser(email, password)
 
-  await session.$create({ userId: user.id, roles: [user.role] })
+  await session.$create({ userId: user.id })
 
   return user
 }

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

@@ -23,7 +23,7 @@ export default async function signup(input: SignupInputType, { session }: Ctx) {
   )
   console.log("Create user result:", user)
 
-  await session.$create({ userId: user.id, roles: [user.role] })
+  await session.$create({ userId: user.id })
 
   return user
 }

examples/fauna/blitz.config.js

@@ -1,4 +1,5 @@
-const { sessionMiddleware, simpleRolesIsAuthorized } = require("@blitzjs/server")
+const { sessionMiddleware, simpleRolesIsAuthorized } = require("blitz")
+const withMonorepoBuildTooling = require("@preconstruct/next")
 const { GraphQLClient, gql } = require("graphql-request")
 
 const graphQLClient = new GraphQLClient("https://graphql.fauna.com/graphql", {
@@ -17,7 +18,7 @@ const normalizeSession = (faunaSession) => {
   }
 }
 
-module.exports = {
+module.exports = withMonorepoBuildTooling({
   middleware: [
     sessionMiddleware({
       isAuthorized: simpleRolesIsAuthorized,
@@ -158,4 +159,4 @@ module.exports = {
     return config
   },
   */
-}
+})

examples/fauna/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@examples/fauna",
-  "version": "0.29.2",
+  "version": "0.32.1",
   "scripts": {
+    "dev": "blitz dev",
+    "build": "blitz build",
     "start": "blitz start",
     "studio": "blitz prisma studio",
-    "build": "blitz build",
     "lint": "eslint --ignore-path .gitignore --ext .js,.ts,.tsx .",
     "test": "echo \"No tests yet\""
   },
@@ -27,9 +28,9 @@
     ]
   },
   "dependencies": {
-    "blitz": "0.29.2",
+    "blitz": "0.32.1",
     "final-form": "4.20.1",
-    "graphql": "15.4.0",
+    "graphql": "15.5.0",
     "graphql-request": "3.4.0",
     "react": "0.0.0-experimental-3310209d0",
     "react-dom": "0.0.0-experimental-3310209d0",
@@ -39,31 +40,31 @@
     "zod": "1.11.11"
   },
   "devDependencies": {
-    "@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",
+    "@testing-library/jest-dom": "5.11.9",
+    "@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": "4.12.0",
-    "@typescript-eslint/parser": "4.12.0",
-    "babel-eslint": "10.1.0",
-    "eslint": "7.17.0",
-    "eslint-config-react-app": "6.0.0",
-    "eslint-plugin-flowtype": "5.2.0",
-    "eslint-plugin-import": "2.22.1",
-    "eslint-plugin-jsx-a11y": "6.4.1",
-    "eslint-plugin-react": "7.22.0",
-    "eslint-plugin-react-hooks": "4.2.0",
-    "husky": "4.3.7",
-    "jest": "26.6.3",
-    "jest-environment-jsdom-fourteen": "1.0.1",
-    "jest-watch-typeahead": "0.6.1",
+    "@typescript-eslint/eslint-plugin": "~4.14.0",
+    "@typescript-eslint/parser": "~4.14.0",
+    "babel-eslint": "~10.1.0",
+    "eslint": "7.18.0",
+    "eslint-config-react-app": "~6.0.0",
+    "eslint-plugin-flowtype": "~5.2.0",
+    "eslint-plugin-import": "~2.22.1",
+    "eslint-plugin-jsx-a11y": "~6.4.1",
+    "eslint-plugin-react": "~7.22.0",
+    "eslint-plugin-react-hooks": "~4.2.0",
+    "husky": "5.1.2",
+    "jest": "^26.6.3",
+    "jest-environment-jsdom-fourteen": "^1.0.1",
+    "jest-watch-typeahead": "^0.6.1",
     "lint-staged": "10.5.3",
     "prettier": "2.2.1",
     "pretty-quick": "3.1.0",
     "start-server-and-test": "1.11.7",
-    "ts-jest": "26.4.4",
+    "ts-jest": "26.5.0",
     "typescript": "4.1.3"
   },
   "private": true

examples/fauna/test/utils.tsx

@@ -78,6 +78,7 @@ export const mockRouter: BlitzRouter = {
   params: {},
   query: {},
   isReady: true,
+  isLocaleDomain: false,
   push: jest.fn(),
   replace: jest.fn(),
   reload: jest.fn(),

examples/fauna/types

@@ -0,0 +1 @@
+../../types

examples/fauna/types.ts

@@ -1,11 +1,13 @@
-import { DefaultCtx, SessionContext, DefaultPublicData } from "blitz"
-import { User } from "db"
+import { DefaultCtx, SessionContext, SimpleRolesIsAuthorized } from "blitz"
 
 declare module "blitz" {
   export interface Ctx extends DefaultCtx {
     session: SessionContext
   }
-  export interface PublicData extends DefaultPublicData {
-    userId: User["id"]
+  export interface Session {
+    isAuthorized: SimpleRolesIsAuthorized
+    PublicData: {
+      userId: string
+    }
   }
 }

examples/no-prisma/README.md

@@ -14,7 +14,7 @@ model Project {
 3. Start the dev server
 
 ```
-blitz start
+blitz dev
 ```
 
 Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.

examples/no-prisma/blitz.config.js

@@ -1,4 +1,6 @@
-module.exports = {
+const withMonorepoBuildTooling = require("@preconstruct/next")
+
+module.exports = withMonorepoBuildTooling({
   webpack: (config, { buildId, dev, isServer, defaultLoaders, webpack }) => {
     // Note: we provide webpack above so you should not `require` it
     // Perform customizations to webpack config
@@ -10,4 +12,4 @@ module.exports = {
     // Important: return the modified config
     return config
   },
-}
+})

examples/no-prisma/package.json

@@ -1,9 +1,10 @@
 {
   "name": "no-prisma",
-  "version": "0.29.2",
+  "version": "0.32.1",
   "scripts": {
-    "start": "blitz start",
+    "dev": "blitz dev",
     "build": "blitz build",
+    "start": "blitz start",
     "lint": "eslint --ignore-path .gitignore --ext .js,.ts,.tsx .",
     "test": "echo \"No tests yet\""
   },
@@ -16,8 +17,7 @@
   },
   "husky": {
     "hooks": {
-      "pre-commit": "lint-staged && pretty-quick --staged",
-      "pre-push": "blitz test"
+      "pre-commit": "lint-staged && pretty-quick --staged"
     }
   },
   "lint-staged": {
@@ -26,7 +26,7 @@
     ]
   },
   "dependencies": {
-    "blitz": "0.29.2",
+    "blitz": "0.32.1",
     "knex": "0.21.16",
     "react": "0.0.0-experimental-3310209d0",
     "react-dom": "0.0.0-experimental-3310209d0",
@@ -34,17 +34,17 @@
   },
   "devDependencies": {
     "@types/react": "17.0.0",
-    "@typescript-eslint/eslint-plugin": "4.12.0",
-    "@typescript-eslint/parser": "4.12.0",
-    "babel-eslint": "10.1.0",
-    "eslint": "7.17.0",
-    "eslint-config-react-app": "6.0.0",
-    "eslint-plugin-flowtype": "5.2.0",
-    "eslint-plugin-import": "2.22.1",
-    "eslint-plugin-jsx-a11y": "6.4.1",
-    "eslint-plugin-react": "7.22.0",
-    "eslint-plugin-react-hooks": "4.2.0",
-    "husky": "4.3.7",
+    "@typescript-eslint/eslint-plugin": "~4.14.0",
+    "@typescript-eslint/parser": "~4.14.0",
+    "babel-eslint": "~10.1.0",
+    "eslint": "7.18.0",
+    "eslint-config-react-app": "~6.0.0",
+    "eslint-plugin-flowtype": "~5.2.0",
+    "eslint-plugin-import": "~2.22.1",
+    "eslint-plugin-jsx-a11y": "~6.4.1",
+    "eslint-plugin-react": "~7.22.0",
+    "eslint-plugin-react-hooks": "~4.2.0",
+    "husky": "5.1.2",
     "lint-staged": "10.5.3",
     "prettier": "2.2.1",
     "pretty-quick": "3.1.0",

examples/no-prisma/types

@@ -0,0 +1 @@
+../../types

examples/plain-js/README.md

@@ -20,7 +20,7 @@ blitz prisma migrate dev --preview-feature
 3. Start the dev server
 
 ```
-blitz start
+blitz dev
 ```
 
 Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.

examples/plain-js/package.json

@@ -1,9 +1,10 @@
 {
   "name": "@examples/plain-js",
-  "version": "0.29.2",
+  "version": "0.32.1",
   "scripts": {
-    "start": "blitz start",
+    "dev": "blitz dev",
     "build": "blitz prisma migrate deploy --preview-feature && blitz build",
+    "start": "blitz start",
     "lint": "eslint --ignore-path .gitignore --ext .js,.ts,.tsx .",
     "test": "echo \"DISABLED\""
   },
@@ -18,8 +19,7 @@
   },
   "husky": {
     "hooks": {
-      "pre-commit": "lint-staged && pretty-quick --staged",
-      "pre-push": "blitz test"
+      "pre-commit": "lint-staged && pretty-quick --staged"
     }
   },
   "lint-staged": {
@@ -29,24 +29,24 @@
     ]
   },
   "dependencies": {
-    "@prisma/cli": "2.15.0",
-    "@prisma/client": "2.15.0",
-    "blitz": "0.29.2",
+    "@prisma/client": "2.17.0",
+    "blitz": "0.32.1",
+    "prisma": "2.17.0",
     "react": "0.0.0-experimental-3310209d0",
     "react-dom": "0.0.0-experimental-3310209d0"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "4.12.0",
-    "@typescript-eslint/parser": "4.12.0",
-    "babel-eslint": "10.1.0",
-    "eslint": "7.17.0",
-    "eslint-config-react-app": "6.0.0",
-    "eslint-plugin-flowtype": "5.2.0",
-    "eslint-plugin-import": "2.22.1",
-    "eslint-plugin-jsx-a11y": "6.4.1",
-    "eslint-plugin-react": "7.22.0",
-    "eslint-plugin-react-hooks": "4.2.0",
-    "husky": "4.3.7",
+    "@typescript-eslint/eslint-plugin": "~4.14.0",
+    "@typescript-eslint/parser": "~4.14.0",
+    "babel-eslint": "~10.1.0",
+    "eslint": "7.18.0",
+    "eslint-config-react-app": "~6.0.0",
+    "eslint-plugin-flowtype": "~5.2.0",
+    "eslint-plugin-import": "~2.22.1",
+    "eslint-plugin-jsx-a11y": "~6.4.1",
+    "eslint-plugin-react": "~7.22.0",
+    "eslint-plugin-react-hooks": "~4.2.0",
+    "husky": "5.1.2",
     "lint-staged": "10.5.3",
     "prettier": "2.2.1",
     "pretty-quick": "3.1.0",