Version Packages (beta) (#3955)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

.changeset/fast-papayas-grow.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Update generator templates to use the src directory instead of app

.changeset/funny-cups-pay.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Check if blitz-server & blitz-client is located in either the app or src directory and return the correct path for blitz recipes.

.changeset/fuzzy-dots-cross.md

@@ -0,0 +1,9 @@
+---
+"blitz": patch
+"@blitzjs/auth": patch
+"@blitzjs/next": patch
+"@blitzjs/rpc": patch
+"@blitzjs/generator": patch
+---
+
+Update dependencies

.changeset/pre.json

@@ -86,6 +86,7 @@
     "fair-wombats-sneeze",
     "famous-kings-explain",
     "fast-clocks-push",
+    "fast-papayas-grow",
     "fast-trainers-kneel",
     "few-dogs-fetch",
     "few-shrimps-leave",
@@ -96,7 +97,9 @@
     "four-brooms-juggle",
     "four-meals-fry",
     "four-sheep-judge",
+    "funny-cups-pay",
     "fuzzy-bees-warn",
+    "fuzzy-dots-cross",
     "fuzzy-jars-admire",
     "gentle-dogs-reply",
     "gentle-lions-explode",
@@ -191,9 +194,11 @@
     "quiet-sloths-rule",
     "rare-crews-sleep",
     "red-badgers-retire",
+    "red-gorillas-marry",
     "rich-chairs-invent",
     "rich-queens-travel",
     "rotten-rocks-remember",
+    "serious-mugs-leave",
     "shaggy-carpets-brake",
     "sharp-falcons-begin",
     "sharp-olives-sip",

.changeset/red-gorillas-marry.md

@@ -0,0 +1,6 @@
+---
+"@blitzjs/auth": patch
+"@blitzjs/next": patch
+---
+
+Added option `role` to `authenticate` property of `BlitzPage` to authenticate page with respect to the role of the user. `String` value or `Array` of strings can be passed to authorize users.

.changeset/serious-mugs-leave.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Patch next13 for suspense error

README.md

@@ -135,8 +135,9 @@ Your financial contributions help ensure Blitz continues to be developed and mai
 <table>
   <tr>
     <td align="center"><a href="https://twitter.com/flybayer"><img src="https://avatars3.githubusercontent.com/u/8813276?v=4" width="100px;" alt=""/><br /><sub><b>Brandon Bayer</b></sub></a><br />Creator</td>
-    <td align="center"><a href="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 />Lead Maintainer</td>
-    <td align="center"><a href="http://twitter.com/dillonraphael"><img src="https://avatars.githubusercontent.com/u/3496193?v=4" width="100px;" alt=""/><br /><sub><b>Dillon Raphael</b></sub></a><br />Senior Maintainer</td>
+    <td align="center"><a href="http://twitter.com/dillonraphael"><img src="https://avatars.githubusercontent.com/u/3496193?v=4" width="100px;" alt=""/><br /><sub><b>Dillon Raphael</b></sub></a><br />Lead Maintainer</td>
+    <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 />Core Maintainer</td>
+
 
   </tr>
 </table>

apps/toolkit-app-passportjs/package.json

@@ -27,38 +27,40 @@
     "@blitzjs/config": "workspace:*",
     "@blitzjs/next": "workspace:*",
     "@blitzjs/rpc": "workspace:*",
-    "@hookform/resolvers": "2.8.8",
-    "@prisma/client": "4.0.0",
-    "blitz": "workspace:2.0.0-beta.16",
+    "@hookform/error-message": "2.0.0",
+    "@hookform/resolvers": "2.9.10",
+    "@prisma/client": "4.6.0",
+    "blitz": "workspace:2.0.0-beta.17",
     "next": "12.2.5",
-    "openid-client": "5.1.8",
-    "prisma": "4.0.0",
+    "openid-client": "5.2.1",
+    "prisma": "4.6.0",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "react-hook-form": "7.29.0",
-    "ts-node": "10.7.0",
-    "zod": "3.17.3"
+    "react-hook-form": "7.39.1",
+    "ts-node": "10.9.1",
+    "zod": "3.19.1"
   },
   "devDependencies": {
     "@next/bundle-analyzer": "12.0.8",
-    "@testing-library/react": "13.0.0",
-    "@testing-library/react-hooks": "7.0.2",
-    "@types/jest": "27.4.1",
-    "@types/node": "17.0.16",
+    "@testing-library/react": "13.4.0",
+    "@testing-library/react-hooks": "8.0.1",
+    "@types/jest": "29.2.2",
+    "@types/node": "18.11.9",
     "@types/preview-email": "2.0.1",
-    "@types/react": "18.0.17",
-    "@typescript-eslint/eslint-plugin": "5.9.1",
-    "eslint": "7.32.0",
+    "@types/react": "18.0.25",
+    "@typescript-eslint/eslint-plugin": "5.42.1",
+    "eslint": "8.27.0",
     "eslint-config-next": "12.3.1",
     "eslint-config-prettier": "8.5.0",
-    "husky": "7.0.4",
-    "jest": "27.5.1",
-    "lint-staged": "12.1.7",
-    "prettier": "^2.5.1",
-    "prettier-plugin-prisma": "3.8.0",
+    "husky": "8.0.2",
+    "jest": "29.3.0",
+    "jest-environment-jsdom": "29.3.0",
+    "lint-staged": "13.0.3",
+    "prettier": "^2.7.1",
+    "prettier-plugin-prisma": "4.4.0",
     "pretty-quick": "3.1.3",
-    "preview-email": "3.x",
-    "typescript": "^4.5.3"
+    "preview-email": "3.0.7",
+    "typescript": "^4.8.4"
   },
   "private": true
 }

apps/toolkit-app-passportjs/src/auth/components/LoginForm.tsx

@@ -1,9 +1,9 @@
 import { AuthenticationError, PromiseReturnType } from "blitz"
 import Link from "next/link"
-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"
+import { LabeledTextField } from "src/core/components/LabeledTextField"
+import { Form, FORM_ERROR } from "src/core/components/Form"
+import login from "src/auth/mutations/login"
+import { Login } from "src/auth/validations"
 import { useMutation } from "@blitzjs/rpc"
 import { Routes } from "@blitzjs/next"
 

apps/toolkit-app-passportjs/src/auth/components/SignupForm.tsx

@@ -1,7 +1,7 @@
-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"
+import { LabeledTextField } from "src/core/components/LabeledTextField"
+import { Form, FORM_ERROR } from "src/core/components/Form"
+import signup from "src/auth/mutations/signup"
+import { Signup } from "src/auth/validations"
 import { useMutation } from "@blitzjs/rpc"
 
 type SignupFormProps = {

apps/toolkit-app-passportjs/src/core/components/LabeledTextField.tsx

@@ -1,5 +1,6 @@
 import { forwardRef, PropsWithoutRef, ComponentPropsWithoutRef } from "react"
 import { useFormContext } from "react-hook-form"
+import { ErrorMessage } from "@hookform/error-message"
 
 export interface LabeledTextFieldProps extends PropsWithoutRef<JSX.IntrinsicElements["input"]> {
   /** Field name. */
@@ -18,9 +19,6 @@ export const LabeledTextField = forwardRef<HTMLInputElement, LabeledTextFieldPro
       register,
       formState: { isSubmitting, errors },
     } = useFormContext()
-    const error = Array.isArray(errors[name])
-      ? errors[name].join(", ")
-      : errors[name]?.message || errors[name]
 
     return (
       <div {...outerProps}>
@@ -29,11 +27,15 @@ export const LabeledTextField = forwardRef<HTMLInputElement, LabeledTextFieldPro
           <input disabled={isSubmitting} {...register(name)} {...props} />
         </label>
 
-        {error && (
-          <div role="alert" style={{ color: "red" }}>
-            {error}
-          </div>
-        )}
+        <ErrorMessage
+          render={({ message }) => (
+            <div role="alert" style={{ color: "red" }}>
+              {message}
+            </div>
+          )}
+          errors={errors}
+          name={name}
+        />
 
         <style jsx>{`
           label {

apps/toolkit-app-passportjs/src/pages/_app.tsx

@@ -1,7 +1,7 @@
 import { ErrorFallbackProps, ErrorComponent, ErrorBoundary, AppProps } from "@blitzjs/next"
 import { AuthenticationError, AuthorizationError } from "blitz"
 import React from "react"
-import { withBlitz } from "app/blitz-client"
+import { withBlitz } from "src/blitz-client"
 
 function RootErrorFallback({ error }: ErrorFallbackProps) {
   if (error instanceof AuthenticationError) {

apps/toolkit-app-passportjs/src/pages/api/auth/[...auth].ts

@@ -1,5 +1,5 @@
 import { passportAuth } from "@blitzjs/auth"
-import { api } from "app/blitz-server"
+import { api } from "src/blitz-server"
 import db, { User } from "db"
 import { Issuer, Strategy as OpenIdStrategy } from "openid-client"
 

apps/toolkit-app-passportjs/src/pages/api/rpc/[[...blitz]].ts

@@ -1,4 +1,4 @@
 import { rpcHandler } from "@blitzjs/rpc"
-import { api } from "app/blitz-server"
+import { api } from "src/blitz-server"
 
 export default api(rpcHandler({ onError: console.log }))

apps/toolkit-app-passportjs/src/pages/auth/forgot-password.tsx

@@ -1,8 +1,8 @@
-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"
+import Layout from "src/core/layouts/Layout"
+import { LabeledTextField } from "src/core/components/LabeledTextField"
+import { Form, FORM_ERROR } from "src/core/components/Form"
+import { ForgotPassword } from "src/auth/validations"
+import forgotPassword from "src/auth/mutations/forgotPassword"
 import { useMutation } from "@blitzjs/rpc"
 import { BlitzPage } from "@blitzjs/next"
 

apps/toolkit-app-passportjs/src/pages/auth/login.tsx

@@ -1,5 +1,5 @@
-import Layout from "app/core/layouts/Layout"
-import { LoginForm } from "app/auth/components/LoginForm"
+import Layout from "src/core/layouts/Layout"
+import { LoginForm } from "src/auth/components/LoginForm"
 import { useRouter } from "next/router"
 import { BlitzPage } from "@blitzjs/next"
 import Link from "next/link"

apps/toolkit-app-passportjs/src/pages/auth/reset-password.tsx

@@ -1,8 +1,8 @@
-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"
+import Layout from "src/core/layouts/Layout"
+import { LabeledTextField } from "src/core/components/LabeledTextField"
+import { Form, FORM_ERROR } from "src/core/components/Form"
+import { ResetPassword } from "src/auth/validations"
+import resetPassword from "src/auth/mutations/resetPassword"
 import { BlitzPage, Routes } from "@blitzjs/next"
 import { useRouter } from "next/router"
 import { useMutation } from "@blitzjs/rpc"

apps/toolkit-app-passportjs/src/pages/auth/signup.tsx

@@ -1,6 +1,6 @@
 import { useRouter } from "next/router"
-import Layout from "app/core/layouts/Layout"
-import { SignupForm } from "app/auth/components/SignupForm"
+import Layout from "src/core/layouts/Layout"
+import { SignupForm } from "src/auth/components/SignupForm"
 import { BlitzPage, Routes } from "@blitzjs/next"
 
 const SignupPage: BlitzPage = () => {

apps/toolkit-app-passportjs/src/pages/index.tsx

@@ -1,9 +1,9 @@
 import { Suspense } from "react"
 import Image from "next/image"
 import Link from "next/link"
-import Layout from "app/core/layouts/Layout"
-import { useCurrentUser } from "app/users/hooks/useCurrentUser"
-import logout from "app/auth/mutations/logout"
+import Layout from "src/core/layouts/Layout"
+import { useCurrentUser } from "src/users/hooks/useCurrentUser"
+import logout from "src/auth/mutations/logout"
 import logo from "public/logo.png"
 import { useMutation } from "@blitzjs/rpc"
 import { Routes, BlitzPage } from "@blitzjs/next"

apps/toolkit-app-passportjs/src/users/hooks/useCurrentUser.ts

@@ -1,5 +1,5 @@
 import { useQuery } from "@blitzjs/rpc"
-import getCurrentUser from "app/users/queries/getCurrentUser"
+import getCurrentUser from "src/users/queries/getCurrentUser"
 
 export const useCurrentUser = () => {
   const [user] = useQuery(getCurrentUser, null)

apps/toolkit-app/jest.config.js

@@ -4,8 +4,4 @@ const createJestConfig = nextJest({
   dir: "./",
 })
 
-const customJestConfig = {
-  testEnvironment: "jest-environment-jsdom",
-}
-
 module.exports = createJestConfig(customJestConfig)

apps/toolkit-app/package.json

@@ -27,37 +27,39 @@
     "@blitzjs/config": "workspace:*",
     "@blitzjs/next": "workspace:*",
     "@blitzjs/rpc": "workspace:*",
-    "@hookform/resolvers": "2.8.8",
-    "@prisma/client": "4.0.0",
-    "blitz": "workspace:2.0.0-beta.16",
+    "@hookform/error-message": "2.0.0",
+    "@hookform/resolvers": "2.9.10",
+    "@prisma/client": "4.6.0",
+    "blitz": "workspace:2.0.0-beta.17",
     "next": "12.2.5",
-    "prisma": "4.0.0",
+    "prisma": "4.6.0",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "react-hook-form": "7.29.0",
-    "ts-node": "10.7.0",
-    "zod": "3.17.3"
+    "react-hook-form": "7.39.1",
+    "ts-node": "10.9.1",
+    "zod": "3.19.1"
   },
   "devDependencies": {
     "@next/bundle-analyzer": "12.0.8",
-    "@testing-library/react": "13.0.0",
-    "@testing-library/react-hooks": "7.0.2",
-    "@types/jest": "27.4.1",
-    "@types/node": "17.0.16",
+    "@testing-library/react": "13.4.0",
+    "@testing-library/react-hooks": "8.0.1",
+    "@types/jest": "29.2.2",
+    "@types/node": "18.11.9",
     "@types/preview-email": "2.0.1",
-    "@types/react": "18.0.17",
-    "@typescript-eslint/eslint-plugin": "5.9.1",
-    "eslint": "7.32.0",
+    "@types/react": "18.0.25",
+    "@typescript-eslint/eslint-plugin": "5.42.1",
+    "eslint": "8.27.0",
     "eslint-config-next": "12.3.1",
     "eslint-config-prettier": "8.5.0",
-    "husky": "7.0.4",
-    "jest": "27.5.1",
-    "lint-staged": "12.1.7",
-    "prettier": "^2.5.1",
-    "prettier-plugin-prisma": "3.8.0",
+    "husky": "8.0.2",
+    "jest": "29.3.0",
+    "jest-environment-jsdom": "29.3.0",
+    "lint-staged": "13.0.3",
+    "prettier": "^2.7.1",
+    "prettier-plugin-prisma": "4.4.0",
     "pretty-quick": "3.1.3",
-    "preview-email": "3.x",
-    "typescript": "^4.5.3"
+    "preview-email": "3.0.7",
+    "typescript": "^4.8.4"
   },
   "private": true
 }

apps/toolkit-app/src/auth/components/LoginForm.tsx

@@ -1,9 +1,9 @@
 import { AuthenticationError, PromiseReturnType } from "blitz"
 import Link from "next/link"
-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"
+import { LabeledTextField } from "src/core/components/LabeledTextField"
+import { Form, FORM_ERROR } from "src/core/components/Form"
+import login from "src/auth/mutations/login"
+import { Login } from "src/auth/validations"
 import { useMutation } from "@blitzjs/rpc"
 import { Routes } from "@blitzjs/next"
 

apps/toolkit-app/src/auth/components/SignupForm.tsx

@@ -1,7 +1,7 @@
-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"
+import { LabeledTextField } from "src/core/components/LabeledTextField"
+import { Form, FORM_ERROR } from "src/core/components/Form"
+import signup from "src/auth/mutations/signup"
+import { Signup } from "src/auth/validations"
 import { useMutation } from "@blitzjs/rpc"
 
 type SignupFormProps = {

apps/toolkit-app/src/core/components/LabeledTextField.tsx

@@ -1,5 +1,6 @@
 import { forwardRef, PropsWithoutRef, ComponentPropsWithoutRef } from "react"
 import { useFormContext } from "react-hook-form"
+import { ErrorMessage } from "@hookform/error-message"
 
 export interface LabeledTextFieldProps extends PropsWithoutRef<JSX.IntrinsicElements["input"]> {
   /** Field name. */
@@ -18,9 +19,6 @@ export const LabeledTextField = forwardRef<HTMLInputElement, LabeledTextFieldPro
       register,
       formState: { isSubmitting, errors },
     } = useFormContext()
-    const error = Array.isArray(errors[name])
-      ? errors[name].join(", ")
-      : errors[name]?.message || errors[name]
 
     return (
       <div {...outerProps}>
@@ -29,11 +27,15 @@ export const LabeledTextField = forwardRef<HTMLInputElement, LabeledTextFieldPro
           <input disabled={isSubmitting} {...register(name)} {...props} />
         </label>
 
-        {error && (
-          <div role="alert" style={{ color: "red" }}>
-            {error}
-          </div>
-        )}
+        <ErrorMessage
+          render={({ message }) => (
+            <div role="alert" style={{ color: "red" }}>
+              {message}
+            </div>
+          )}
+          errors={errors}
+          name={name}
+        />
 
         <style jsx>{`
           label {

apps/toolkit-app/src/pages/_app.tsx

@@ -1,7 +1,7 @@
 import { ErrorFallbackProps, ErrorComponent, ErrorBoundary, AppProps } from "@blitzjs/next"
 import { AuthenticationError, AuthorizationError } from "blitz"
 import React from "react"
-import { withBlitz } from "app/blitz-client"
+import { withBlitz } from "src/blitz-client"
 
 function RootErrorFallback({ error }: ErrorFallbackProps) {
   if (error instanceof AuthenticationError) {

apps/toolkit-app/src/pages/api/rpc/[[...blitz]].ts

@@ -1,4 +1,4 @@
 import { rpcHandler } from "@blitzjs/rpc"
-import { api } from "app/blitz-server"
+import { api } from "src/blitz-server"
 
 export default api(rpcHandler({ onError: console.log }))

apps/toolkit-app/src/pages/auth/forgot-password.tsx

@@ -1,8 +1,8 @@
-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"
+import Layout from "src/core/layouts/Layout"
+import { LabeledTextField } from "src/core/components/LabeledTextField"
+import { Form, FORM_ERROR } from "src/core/components/Form"
+import { ForgotPassword } from "src/auth/validations"
+import forgotPassword from "src/auth/mutations/forgotPassword"
 import { useMutation } from "@blitzjs/rpc"
 import { BlitzPage } from "@blitzjs/next"
 

apps/toolkit-app/src/pages/auth/login.tsx

@@ -1,7 +1,7 @@
-import { BlitzPage } from "@blitzjs/next"
-import Layout from "app/core/layouts/Layout"
-import { LoginForm } from "app/auth/components/LoginForm"
+import Layout from "src/core/layouts/Layout"
+import { LoginForm } from "src/auth/components/LoginForm"
 import { useRouter } from "next/router"
+import { BlitzPage } from "@blitzjs/next"
 
 const LoginPage: BlitzPage = () => {
   const router = useRouter()

apps/toolkit-app/src/pages/auth/reset-password.tsx

@@ -1,9 +1,9 @@
 import { useEffect, useState } from "react"
-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"
+import Layout from "src/core/layouts/Layout"
+import { LabeledTextField } from "src/core/components/LabeledTextField"
+import { Form, FORM_ERROR } from "src/core/components/Form"
+import { ResetPassword } from "src/auth/validations"
+import resetPassword from "src/auth/mutations/resetPassword"
 import { BlitzPage, Routes } from "@blitzjs/next"
 import { useRouter } from "next/router"
 import { useMutation } from "@blitzjs/rpc"

apps/toolkit-app/src/pages/auth/signup.tsx

@@ -1,6 +1,6 @@
 import { useRouter } from "next/router"
-import Layout from "app/core/layouts/Layout"
-import { SignupForm } from "app/auth/components/SignupForm"
+import Layout from "src/core/layouts/Layout"
+import { SignupForm } from "src/auth/components/SignupForm"
 import { BlitzPage, Routes } from "@blitzjs/next"
 
 const SignupPage: BlitzPage = () => {

apps/toolkit-app/src/pages/index.tsx

@@ -1,9 +1,9 @@
 import { Suspense } from "react"
 import Image from "next/image"
 import Link from "next/link"
-import Layout from "app/core/layouts/Layout"
-import { useCurrentUser } from "app/users/hooks/useCurrentUser"
-import logout from "app/auth/mutations/logout"
+import Layout from "src/core/layouts/Layout"
+import { useCurrentUser } from "src/users/hooks/useCurrentUser"
+import logout from "src/auth/mutations/logout"
 import logo from "public/logo.png"
 import { useMutation } from "@blitzjs/rpc"
 import { Routes, BlitzPage } from "@blitzjs/next"

apps/toolkit-app/src/users/hooks/useCurrentUser.ts

@@ -1,5 +1,5 @@
 import { useQuery } from "@blitzjs/rpc"
-import getCurrentUser from "app/users/queries/getCurrentUser"
+import getCurrentUser from "src/users/queries/getCurrentUser"
 
 export const useCurrentUser = () => {
   const [user] = useQuery(getCurrentUser, null)

apps/toolkit-app/test/index.test.tsx

@@ -1,9 +1,9 @@
-import { useCurrentUser } from "app/users/hooks/useCurrentUser"
+import { useCurrentUser } from "src/users/hooks/useCurrentUser"
 import { render } from "test/utils"
 
-import Home from "../pages/index"
+import Home from "../src/pages/index"
 
-jest.mock("app/users/hooks/useCurrentUser")
+jest.mock("src/users/hooks/useCurrentUser")
 const mockUseCurrentUser = useCurrentUser as jest.MockedFunction<typeof useCurrentUser>
 
 describe("renders blitz documentation link", () => {

apps/web/jest.config.js

@@ -4,8 +4,4 @@ const createJestConfig = nextJest({
   dir: "./",
 })
 
-const customJestConfig = {
-  testEnvironment: "jest-environment-jsdom",
-}
-
-module.exports = createJestConfig(customJestConfig)
+module.exports = createJestConfig({})

apps/web/package.json

@@ -20,23 +20,24 @@
     "@blitzjs/config": "workspace:*",
     "@blitzjs/next": "workspace:*",
     "@blitzjs/rpc": "workspace:*",
-    "@prisma/client": "4.0.0",
-    "@types/jest": "27.4.1",
+    "@prisma/client": "4.6.0",
+    "@types/jest": "29.2.2",
     "@types/passport-twitter": "1.0.37",
     "blitz": "workspace:*",
-    "jest": "27.5.1",
+    "jest": "29.3.0",
+    "jest-environment-jsdom": "29.3.0",
     "next": "12.2.5",
     "passport-mock-strategy": "2.0.0",
     "passport-twitter": "1.0.4",
-    "prisma": "4.0.0",
+    "prisma": "4.6.0",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "ts-node": "10.7.0"
+    "ts-node": "10.9.1"
   },
   "devDependencies": {
     "@next/bundle-analyzer": "12.0.8",
-    "@types/react": "18.0.17",
-    "eslint": "7.32.0",
-    "typescript": "^4.5.3"
+    "@types/react": "18.0.25",
+    "eslint": "8.27.0",
+    "typescript": "^4.8.4"
   }
 }

apps/web/src/pages/_app.tsx

@@ -1,7 +1,7 @@
 import {ErrorFallbackProps, ErrorComponent, ErrorBoundary, AppProps} from "@blitzjs/next"
 import {AuthenticationError, AuthorizationError} from "blitz"
 import React, {Suspense} from "react"
-import {withBlitz} from "app/blitz-client"
+import {withBlitz} from "src/blitz-client"
 
 function RootErrorFallback({error}: ErrorFallbackProps) {
   if (error instanceof AuthenticationError) {

apps/web/src/pages/api/auth/[...auth].ts

@@ -1,5 +1,5 @@
 import {passportAuth} from "@blitzjs/auth"
-import {api} from "app/blitz-server"
+import {api} from "src/blitz-server"
 import db from "db"
 import {Strategy as TwitterStrategy} from "passport-twitter"
 

apps/web/src/pages/api/get-user.ts

@@ -1,4 +1,4 @@
-import {api} from "app/blitz-server"
+import {api} from "src/blitz-server"
 import db from "db"
 
 export default api(async (_req, res, ctx) => {

apps/web/src/pages/api/is-authorized.ts

@@ -1,4 +1,4 @@
-import {api} from "app/blitz-server"
+import {api} from "src/blitz-server"
 
 export default api(async (_req, res, ctx) => {
   const {session} = ctx

apps/web/src/pages/api/logout.ts

@@ -1,4 +1,4 @@
-import {api} from "app/blitz-server"
+import {api} from "src/blitz-server"
 
 export default api(async (_req, res, ctx) => {
   const blitzContext = ctx

apps/web/src/pages/api/revoke-all-sessions.ts

@@ -1,4 +1,4 @@
-import {api} from "app/blitz-server"
+import {api} from "src/blitz-server"
 import db from "db"
 
 export default api(async (_req, res) => {

apps/web/src/pages/api/rpc/[[...blitz]].ts

@@ -1,4 +1,4 @@
 import {rpcHandler} from "@blitzjs/rpc"
-import {api} from "app/blitz-server"
+import {api} from "src/blitz-server"
 
 export default api(rpcHandler({onError: console.log}))

apps/web/src/pages/api/set-public-data.ts

@@ -1,5 +1,5 @@
 import {setPublicDataForUser} from "@blitzjs/auth"
-import {api} from "app/blitz-server"
+import {api} from "src/blitz-server"
 import db from "db"
 
 export default api(async (req, res, ctx) => {

apps/web/src/pages/api/signin.ts

@@ -1,4 +1,4 @@
-import {api} from "app/blitz-server"
+import {api} from "src/blitz-server"
 import db from "db"
 import {SecurePassword} from "@blitzjs/auth"
 

apps/web/src/pages/api/signup.ts

@@ -1,4 +1,4 @@
-import {api} from "app/blitz-server"
+import {api} from "src/blitz-server"
 import db from "db"
 import {SecurePassword} from "@blitzjs/auth"
 

apps/web/src/pages/create-user.tsx

@@ -1,6 +1,6 @@
 import {useState} from "react"
 import {useMutation} from "@blitzjs/rpc"
-import createUser from "app/mutations/createUser"
+import createUser from "src/mutations/createUser"
 import {User} from "db"
 
 function Page() {

apps/web/src/pages/index.tsx

@@ -1,5 +1,5 @@
 import {invoke} from "@blitzjs/rpc"
-import getBasic from "app/queries/getBasic"
+import getBasic from "src/queries/getBasic"
 
 export const getServerSideProps = () => {
   return {props: {}}

apps/web/src/pages/page-with-get-query-data.tsx

@@ -1,5 +1,5 @@
 import {getQueryData, useQuery} from "@blitzjs/rpc"
-import getBasic from "../app/queries/getBasic"
+import getBasic from "src/queries/getBasic"
 import {useState} from "react"
 
 function PageWithGetQueryData() {

apps/web/src/pages/page-with-gsp.tsx

@@ -1,4 +1,4 @@
-import {gSP} from "app/blitz-server"
+import {gSP} from "src/blitz-server"
 
 export const getStaticProps = gSP<{data: {test: string}}>(async ({ctx}) => {
   return {

apps/web/src/pages/page-with-gssp-redirect.tsx

@@ -1,6 +1,6 @@
 import {SessionContext} from "@blitzjs/auth"
 import {Routes} from "@blitzjs/next"
-import {gSSP} from "app/blitz-server"
+import {gSSP} from "src/blitz-server"
 
 type Props = {
   userId: unknown

apps/web/src/pages/page-with-gssp.tsx

@@ -1,5 +1,5 @@
 import {SessionContext} from "@blitzjs/auth"
-import {gSSP} from "app/blitz-server"
+import {gSSP} from "src/blitz-server"
 
 type Props = {
   userId: unknown

apps/web/src/pages/page-with-inf-prefetch.tsx

@@ -1,6 +1,6 @@
 import {useInfiniteQuery} from "@blitzjs/rpc"
-import {gSSP} from "app/blitz-server"
-import getInfiniteUsers from "app/queries/getInfiniteUsers"
+import {gSSP} from "src/blitz-server"
+import getInfiniteUsers from "src/queries/getInfiniteUsers"
 
 export const getServerSideProps = gSSP(async ({ctx}) => {
   const {prefetchInfiniteQuery} = ctx

apps/web/src/pages/page-with-invoke-ctx.tsx

@@ -1,7 +1,7 @@
 import {SessionContext} from "@blitzjs/auth"
 import {invokeWithCtx} from "@blitzjs/rpc"
-import {gSSP} from "app/blitz-server"
-import getUsersAuth from "app/queries/getUsersAuth"
+import {gSSP} from "src/blitz-server"
+import getUsersAuth from "src/queries/getUsersAuth"
 
 type Props = {
   userId: unknown

apps/web/src/pages/page-with-prefetch.tsx

@@ -1,6 +1,6 @@
 import {useQuery} from "@blitzjs/rpc"
-import {gSSP} from "app/blitz-server"
-import getUsers from "app/queries/getUsers"
+import {gSSP} from "src/blitz-server"
+import getUsers from "src/queries/getUsers"
 
 export const getServerSideProps = gSSP(async ({ctx}) => {
   const {prefetchQuery} = ctx

apps/web/src/pages/users.tsx

@@ -1,5 +1,5 @@
 import {useQuery} from "@blitzjs/rpc"
-import getUsers from "app/queries/getUsers"
+import getUsers from "src/queries/getUsers"
 
 function UsersPage() {
   const [users] = useQuery(getUsers, {})