Version Packages (beta) (#3930)

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

.all-contributorsrc

@@ -3733,6 +3733,15 @@
         "doc",
         "code"
       ]
+    },
+    {
+      "login": "joneskj55",
+      "name": "Kevin Jones",
+      "avatar_url": "https://avatars.githubusercontent.com/u/20748598?v=4",
+      "profile": "https://kevinjones.engineer",
+      "contributions": [
+        "doc"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.changeset/afraid-ears-repair.md

@@ -0,0 +1,6 @@
+---
+"blitz": patch
+"@blitzjs/generator": patch
+---
+
+Upgrade `tslog` to the latest version

.changeset/chilly-nails-nail.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Remove unnecessary `as number` assertions from new app templates

.changeset/heavy-students-buy.md

@@ -0,0 +1,6 @@
+---
+"@blitzjs/auth": minor
+"@blitzjs/rpc": minor
+---
+
+maybe fix anon session CSRF issue + add ability to customize anon session expiry time

.changeset/honest-comics-vanish.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Fix Blitz Install issue that gets stuck on "Generating file diff"

.changeset/itchy-cups-double.md

@@ -0,0 +1,7 @@
+---
+"blitz": patch
+"@blitzjs/rpc": patch
+---
+
+Add an opt-in GET request support to RPC specification by exporting a `config` object that has the `httpMethod` property.
+from `query` files.

.changeset/lemon-pillows-switch.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Fix reset token being undefined when passed to the resetPassword mutation

.changeset/light-squids-draw.md

@@ -0,0 +1,6 @@
+---
+"blitz": patch
+"@blitzjs/generator": patch
+---
+
+Fix `cannot find module db error` in JavaScript template. Replace requiring the config using `esbuild` with parsing using `jscodeshift` to get the `cliConfig` values. Added logic to find the `blitz-server` file in `src` directory 

.changeset/moody-spoons-rhyme.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Fix Custom Server TS error - add `es6` target config to esbuild 

.changeset/odd-bears-run.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": minor
+---
+
+Change setupBlitzServer logger config to be optional. Will default to BlitzLogger

.changeset/pre.json

@@ -48,6 +48,7 @@
   },
   "changesets": [
     "afraid-dancers-juggle",
+    "afraid-ears-repair",
     "big-phones-bow",
     "blue-flowers-peel",
     "blue-pigs-tan",
@@ -61,6 +62,7 @@
     "calm-nails-wait",
     "calm-tomatoes-drive",
     "chilled-carrots-own",
+    "chilly-nails-nail",
     "clean-hats-pump",
     "clean-walls-wink",
     "clever-radios-lie",
@@ -116,13 +118,16 @@
     "healthy-rice-shout",
     "heavy-apes-judge",
     "heavy-cobras-own",
+    "heavy-students-buy",
     "hip-buttons-dance",
     "honest-candles-yawn",
     "honest-cherries-push",
+    "honest-comics-vanish",
     "hot-cups-rhyme",
     "hot-drinks-approve",
     "hungry-baboons-swim",
     "hungry-pens-collect",
+    "itchy-cups-double",
     "itchy-houses-marry",
     "itchy-spoons-tan",
     "khaki-ducks-cheer",
@@ -130,8 +135,10 @@
     "late-steaks-give",
     "lazy-maps-sort",
     "lemon-games-press",
+    "lemon-pillows-switch",
     "lemon-seas-push",
     "light-donkeys-double",
+    "light-squids-draw",
     "little-pears-ring",
     "long-bees-hope",
     "long-dancers-jog",
@@ -145,6 +152,7 @@
     "modern-cameras-pull",
     "modern-ligers-behave",
     "moody-bags-walk",
+    "moody-spoons-rhyme",
     "moody-squids-cheer",
     "nasty-suns-wash",
     "nervous-beds-travel",
@@ -158,6 +166,7 @@
     "ninety-lies-press",
     "ninety-pets-heal",
     "ninety-rice-tickle",
+    "odd-bears-run",
     "olive-bees-buy",
     "olive-feet-rhyme",
     "olive-kings-invent",
@@ -191,6 +200,7 @@
     "shy-olives-hang",
     "shy-pumpkins-try",
     "silent-colts-reply",
+    "silent-lies-run",
     "silly-apricots-share",
     "silly-shoes-agree",
     "six-apricots-kick",
@@ -213,6 +223,7 @@
     "spotty-peas-hope",
     "spotty-zoos-film",
     "stale-jobs-drum",
+    "stale-parents-yawn",
     "strong-apes-reply",
     "strong-keys-lie",
     "stupid-walls-sell",

.changeset/silent-lies-run.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Fix `useSession` hook by exporting `enhancePrisma` from the server entry point instead of server

.changeset/stale-parents-yawn.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Include resolvers in `src` directory in blitz console

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-395-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-396-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/main/LICENSE">
     <img alt="" src="https://img.shields.io/npm/l/blitz.svg?style=for-the-badge&labelColor=000000&color=blue">
@@ -730,6 +730,7 @@ Thanks to these wonderful people ([emoji key](https://allcontributors.org/docs/e
     <td align="center"><a href="https://github.com/corydeppen"><img src="https://avatars.githubusercontent.com/u/313264?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Cory Deppen</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=corydeppen" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/oloost"><img src="https://avatars.githubusercontent.com/u/72395941?v=4?s=100" width="100px;" alt=""/><br /><sub><b>oloost</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=oloost" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/janvennemann"><img src="https://avatars.githubusercontent.com/u/1406024?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jan Vennemann</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=janvennemann" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=janvennemann" title="Code">💻</a></td>
+    <td align="center"><a href="https://kevinjones.engineer"><img src="https://avatars.githubusercontent.com/u/20748598?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kevin Jones</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=joneskj55" title="Documentation">📖</a></td>
   </tr>
 </table>
 

apps/toolkit-app-passportjs/app/auth/mutations/changePassword.ts

@@ -9,7 +9,7 @@ export default resolver.pipe(
   resolver.zod(ChangePassword),
   resolver.authorize(),
   async ({ currentPassword, newPassword }, ctx) => {
-    const user = await db.user.findFirst({ where: { id: ctx.session.userId as number } })
+    const user = await db.user.findFirst({ where: { id: ctx.session.userId } })
     if (!user) throw new NotFoundError()
 
     await authenticateUser(user.email, currentPassword)

apps/toolkit-app-passportjs/app/users/queries/getCurrentUser.ts

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

apps/toolkit-app-passportjs/package.json

@@ -29,7 +29,7 @@
     "@blitzjs/rpc": "workspace:*",
     "@hookform/resolvers": "2.8.8",
     "@prisma/client": "4.0.0",
-    "blitz": "workspace:2.0.0-beta.13",
+    "blitz": "workspace:2.0.0-beta.16",
     "next": "12.2.5",
     "openid-client": "5.1.8",
     "prisma": "4.0.0",

apps/toolkit-app/app/auth/mutations/changePassword.ts

@@ -9,7 +9,7 @@ export default resolver.pipe(
   resolver.zod(ChangePassword),
   resolver.authorize(),
   async ({ currentPassword, newPassword }, ctx) => {
-    const user = await db.user.findFirst({ where: { id: ctx.session.userId as number } })
+    const user = await db.user.findFirst({ where: { id: ctx.session.userId } })
     if (!user) throw new NotFoundError()
 
     await authenticateUser(user.email, currentPassword)

apps/toolkit-app/app/users/queries/getCurrentUser.ts

@@ -5,9 +5,13 @@ export default async function getCurrentUser(_ = null, { session }: Ctx) {
   if (!session.userId) return null
 
   const user = await db.user.findFirst({
-    where: { id: session.userId as number },
+    where: { id: session.userId },
     select: { id: true, name: true, email: true, role: true },
   })
 
   return user
 }
+
+export const config = {
+  httpMethod: "GET",
+}

apps/toolkit-app/package.json

@@ -29,7 +29,7 @@
     "@blitzjs/rpc": "workspace:*",
     "@hookform/resolvers": "2.8.8",
     "@prisma/client": "4.0.0",
-    "blitz": "workspace:2.0.0-beta.13",
+    "blitz": "workspace:2.0.0-beta.16",
     "next": "12.2.5",
     "prisma": "4.0.0",
     "react": "18.2.0",

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

@@ -1,3 +1,4 @@
+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"
@@ -9,9 +10,14 @@ import { useMutation } from "@blitzjs/rpc"
 import Link from "next/link"
 
 const ResetPasswordPage: BlitzPage = () => {
+  const [token, setToken] = useState("")
   const router = useRouter()
   const [resetPasswordMutation, { isSuccess }] = useMutation(resetPassword)
 
+  useEffect(() => {
+    setToken(router.query.token as string)
+  }, [router.isReady])
+
   return (
     <div>
       <h1>Set a New Password</h1>
@@ -30,11 +36,11 @@ const ResetPasswordPage: BlitzPage = () => {
           initialValues={{
             password: "",
             passwordConfirmation: "",
-            token: router.query.token as string,
+            token,
           }}
           onSubmit={async (values) => {
             try {
-              await resetPasswordMutation(values)
+              await resetPasswordMutation({ ...values, token })
             } catch (error: any) {
               if (error.name === "ResetPasswordError") {
                 return {

integration-tests/auth/package.json

@@ -21,7 +21,7 @@
     "@blitzjs/config": "workspace:*",
     "@blitzjs/next": "workspace:*",
     "@prisma/client": "4.0.0",
-    "blitz": "workspace:2.0.0-beta.13",
+    "blitz": "workspace:2.0.0-beta.16",
     "lowdb": "3.0.0",
     "next": "12.2.5",
     "prisma": "4.0.0",

integration-tests/rpc/app/queries/getBasicWithGET.js

@@ -0,0 +1,16 @@
+if (typeof window !== "undefined") {
+  throw new Error("This should not be loaded on the client")
+}
+
+export default async function getBasicWithGET() {
+  if (typeof window !== "undefined") {
+    throw new Error("This should not be loaded on the client")
+  }
+
+  global.basic ??= "basic-result"
+  return global.basic
+}
+
+export const config = {
+  httpMethod: "GET",
+}

integration-tests/rpc/test/index.test.js

@@ -9,13 +9,10 @@ import {
   nextBuild,
   nextStart,
   nextExport,
-  getPageFileFromBuildManifest,
-  getPageFileFromPagesManifest,
 } from "../../utils/next-test-utils"
 
 // jest.setTimeout(1000 * 60 * 2)
 const appDir = join(__dirname, "../")
-const nextConfig = join(appDir, "next.config.js")
 let appPort
 let mode
 let app
@@ -33,17 +30,6 @@ function runTests(dev = false) {
       5000 * 60 * 2,
     )
 
-    it(
-      "returns 404 for GET",
-      async () => {
-        const res = await fetchViaHTTP(appPort, "/api/rpc/getBasic", null, {
-          method: "GET",
-        })
-        expect(res.status).toEqual(404)
-      },
-      5000 * 60 * 2,
-    )
-
     it(
       "requires params",
       async () => {
@@ -58,6 +44,71 @@ function runTests(dev = false) {
       5000 * 60 * 2,
     )
 
+    it(
+      "GET - returns 200 only when enabled",
+      async () => {
+        const res = await fetchViaHTTP(
+          appPort,
+          "/api/rpc/getBasicWithGET?params=%7B%7D&meta=%7B%7D",
+          null,
+          {
+            method: "GET",
+          },
+        )
+        expect(res.status).toEqual(200)
+      },
+      5000 * 60 * 2,
+    )
+
+    it(
+      "GET - returns 404 otherwise",
+      async () => {
+        const res = await fetchViaHTTP(
+          appPort,
+          "/api/rpc/getBasic?params=%7B%7D&meta=%7B%7D",
+          null,
+          {
+            method: "GET",
+          },
+        )
+        expect(res.status).toEqual(404)
+      },
+      5000 * 60 * 2,
+    )
+
+    it(
+      "query works - GET",
+      async () => {
+        const res = await fetchViaHTTP(
+          appPort,
+          "/api/rpc/getBasicWithGET?params=%7B%7D&meta=%7B%7D",
+          null,
+          {
+            method: "GET",
+          },
+        )
+        const json = await res.json()
+        expect(json).toEqual({result: "basic-result", error: null, meta: {}})
+        expect(res.status).toEqual(200)
+      },
+      5000 * 60 * 2,
+    )
+
+    it(
+      "requires params - GET",
+      async () => {
+        const res = await fetchViaHTTP(appPort, "/api/rpc/getBasicWithGET", null, {
+          method: "GET",
+        })
+        const json = await res.json()
+        expect(res.status).toEqual(400)
+        expect(json.error.message).toBe(
+          "Request query is missing the required `params` and `meta` keys",
+        )
+      },
+      5000 * 60 * 2,
+    )
+
     it(
       "query works",
       async () => {

packages/blitz-auth/CHANGELOG.md

@@ -1,5 +1,34 @@
 # @blitzjs/auth
 
+## 2.0.0-beta.16
+
+### Minor Changes
+
+- 55a43ce1: maybe fix anon session CSRF issue + add ability to customize anon session expiry time
+
+### Patch Changes
+
+- Updated dependencies [1569bd53]
+- Updated dependencies [ceb7db27]
+- Updated dependencies [8e5903c0]
+- Updated dependencies [45459129]
+  - blitz@2.0.0-beta.16
+
+## 2.0.0-beta.15
+
+### Patch Changes
+
+- Updated dependencies [1b798d9a]
+  - blitz@2.0.0-beta.15
+
+## 2.0.0-beta.14
+
+### Patch Changes
+
+- Updated dependencies [78fd5c48]
+- Updated dependencies [0a8b0cb3]
+  - blitz@2.0.0-beta.14
+
 ## 2.0.0-beta.13
 
 ### Patch Changes

packages/blitz-auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/auth",
-  "version": "2.0.0-beta.13",
+  "version": "2.0.0-beta.16",
   "scripts": {
     "build": "unbuild",
     "predev": "wait-on -d 250 ../blitz/dist/index-server.d.ts",
@@ -26,7 +26,7 @@
     "@types/secure-password": "3.1.1",
     "b64-lite": "1.4.0",
     "bad-behavior": "1.0.1",
-    "blitz": "2.0.0-beta.13",
+    "blitz": "2.0.0-beta.16",
     "cookie": "0.4.1",
     "cookie-session": "2.0.0",
     "debug": "4.3.3",
@@ -40,7 +40,7 @@
     "url": "0.11.0"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.13",
+    "@blitzjs/config": "workspace:2.0.0-beta.16",
     "@testing-library/react": "13.0.0",
     "@testing-library/react-hooks": "7.0.2",
     "@types/cookie": "0.4.1",

packages/blitz-auth/src/client/index.tsx

@@ -116,10 +116,17 @@ export const getPublicDataStore = (): PublicDataStore => {
   return (window as any).__publicDataStore
 }
 
-export const getAntiCSRFToken = () => {
+// because safari automatically deletes non-httponly cookies after 7 days
+export const backupAntiCSRFTokenToLocalStorage = () => {
   const cookieValue = readCookie(COOKIE_CSRF_TOKEN())
   if (cookieValue) {
     localStorage.setItem(LOCALSTORAGE_CSRF_TOKEN(), cookieValue)
+  }
+}
+
+export const getAntiCSRFToken = () => {
+  const cookieValue = readCookie(COOKIE_CSRF_TOKEN())
+  if (cookieValue) {
     return cookieValue
   } else {
     return localStorage.getItem(LOCALSTORAGE_CSRF_TOKEN())

packages/blitz-auth/src/global.ts

@@ -1,7 +1,8 @@
-import {SessionConfig} from "./shared/types"
+import {AuthPluginOptions} from "./server"
+import {SessionConfigMethods} from "./shared"
 
 declare global {
-  var sessionConfig: SessionConfig
+  var sessionConfig: AuthPluginOptions & SessionConfigMethods
   var __BLITZ_SESSION_COOKIE_PREFIX: string | undefined
   var __BLITZ_SUSPENSE_ENABLED: boolean
 }

packages/blitz-auth/src/server/auth-plugin.ts

@@ -7,6 +7,7 @@ import {getSession} from "./auth-sessions"
 interface SessionConfigOptions {
   cookiePrefix?: string
   sessionExpiryMinutes?: number
+  anonSessionExpiryMinutes?: number
   method?: "essential" | "advanced"
   sameSite?: "none" | "lax" | "strict"
   secureCookies?: boolean
@@ -69,13 +70,14 @@ export const PrismaStorage = <Client extends PrismaClientWithSession>(
 
 const defaultConfig_: SessionConfigOptions = {
   sessionExpiryMinutes: 30 * 24 * 60, // Sessions expire after 30 days of being idle
+  anonSessionExpiryMinutes: 5 * 365 * 24 * 60, // Sessions expire after 5 years of being idle
   method: "essential",
   sameSite: "lax",
   publicDataKeysToSyncAcrossSessions: ["role", "roles"],
   secureCookies: !process.env.DISABLE_SECURE_COOKIES && process.env.NODE_ENV === "production",
 }
 
-interface AuthPluginOptions extends Partial<SessionConfigOptions>, IsAuthorized {
+export interface AuthPluginOptions extends Partial<SessionConfigOptions>, IsAuthorized {
   storage: SessionConfigMethods
 }
 

packages/blitz-auth/src/server/auth-sessions.ts

@@ -690,7 +690,10 @@ async function createNewSession(
     const anonymousSessionToken = createAnonymousSessionToken(payload)
     const publicDataToken = createPublicDataToken(args.publicData)
 
-    const expiresAt = addYears(new Date(), 30)
+    const expiresAt = addMinutes(
+      new Date(),
+      global.sessionConfig.anonSessionExpiryMinutes as number,
+    )
     setAnonymousSessionCookie(req, res, anonymousSessionToken, expiresAt)
     setCSRFCookie(req, res, antiCSRFToken, expiresAt)
     setPublicDataCookie(req, res, publicDataToken, expiresAt)

packages/blitz-auth/src/shared/types.ts

@@ -50,17 +50,6 @@ export interface SessionConfigMethods {
   deleteSession: (handle: string) => Promise<SessionModel | undefined>
 }
 
-export interface SessionConfig extends SessionConfigMethods {
-  cookiePrefix?: string
-  sessionExpiryMinutes?: number
-  method?: "essential" | "advanced"
-  sameSite?: "none" | "lax" | "strict"
-  secureCookies?: boolean
-  domain?: string
-  publicDataKeysToSyncAcrossSessions?: string[]
-  isAuthorized: (data: {ctx: BlitzCtx; args: any}) => boolean
-}
-
 export interface SessionContextBase {
   $handle: string | null
   $publicData: unknown

packages/blitz-next/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @blitzjs/next
 
+## 2.0.0-beta.16
+
+### Minor Changes
+
+- 11b548ed: Change setupBlitzServer logger config to be optional. Will default to BlitzLogger
+
+### Patch Changes
+
+- Updated dependencies [55a43ce1]
+- Updated dependencies [ceb7db27]
+  - @blitzjs/rpc@2.0.0-beta.16
+
+## 2.0.0-beta.15
+
+### Patch Changes
+
+- @blitzjs/rpc@2.0.0-beta.15
+
+## 2.0.0-beta.14
+
+### Patch Changes
+
+- @blitzjs/rpc@2.0.0-beta.14
+
 ## 2.0.0-beta.13
 
 ### Patch Changes

packages/blitz-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/next",
-  "version": "2.0.0-beta.13",
+  "version": "2.0.0-beta.16",
   "scripts": {
     "build": "unbuild",
     "dev": "pnpm predev && pnpm watch unbuild src --wait=0.2",
@@ -24,7 +24,7 @@
     "eslint.js"
   ],
   "dependencies": {
-    "@blitzjs/rpc": "2.0.0-beta.13",
+    "@blitzjs/rpc": "2.0.0-beta.16",
     "@tanstack/react-query": "4.0.10",
     "@types/hoist-non-react-statics": "3.3.1",
     "debug": "4.3.3",
@@ -34,7 +34,7 @@
     "supports-color": "8.1.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.13",
+    "@blitzjs/config": "workspace:2.0.0-beta.16",
     "@testing-library/dom": "8.13.0",
     "@testing-library/jest-dom": "5.16.3",
     "@testing-library/react": "13.0.0",
@@ -44,7 +44,7 @@
     "@types/react": "18.0.17",
     "@types/react-dom": "17.0.14",
     "@types/testing-library__react-hooks": "4.0.0",
-    "blitz": "2.0.0-beta.13",
+    "blitz": "2.0.0-beta.16",
     "cross-spawn": "7.0.3",
     "find-up": "4.1.0",
     "next": "12.2.5",

packages/blitz-next/src/index-server.ts

@@ -52,7 +52,7 @@ export type NextApiHandler<TResult> = (
 type SetupBlitzOptions = {
   plugins: BlitzServerPlugin<RequestMiddleware, Ctx>[]
   onError?: (err: Error) => void
-  logger: ReturnType<typeof BlitzLogger>
+  logger?: ReturnType<typeof BlitzLogger>
 }
 
 export type Redirect =
@@ -131,7 +131,7 @@ const prefetchQueryFactory = (
 }
 
 export const setupBlitzServer = ({plugins, onError, logger}: SetupBlitzOptions) => {
-  initializeLogger(logger)
+  initializeLogger(logger ?? BlitzLogger())
 
   const middlewares = plugins.flatMap((p) => p.requestMiddlewares)
   const contextMiddleware = plugins.flatMap((p) => p.contextMiddleware).filter(Boolean)

packages/blitz-rpc/CHANGELOG.md

@@ -1,5 +1,30 @@
 # @blitzjs/rpc
 
+## 2.0.0-beta.16
+
+### Minor Changes
+
+- 55a43ce1: maybe fix anon session CSRF issue + add ability to customize anon session expiry time
+
+### Patch Changes
+
+- ceb7db27: Add an opt-in GET request support to RPC specification by exporting a `config` object that has the `httpMethod` property.
+  from `query` files.
+- Updated dependencies [55a43ce1]
+  - @blitzjs/auth@2.0.0-beta.16
+
+## 2.0.0-beta.15
+
+### Patch Changes
+
+- @blitzjs/auth@2.0.0-beta.15
+
+## 2.0.0-beta.14
+
+### Patch Changes
+
+- @blitzjs/auth@2.0.0-beta.14
+
 ## 2.0.0-beta.13
 
 ### Patch Changes

packages/blitz-rpc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/rpc",
-  "version": "2.0.0-beta.13",
+  "version": "2.0.0-beta.16",
   "scripts": {
     "build": "unbuild",
     "predev": "wait-on -d 400 ../blitz/dist/index-server.d.ts && wait-on -d 400 ../blitz-auth/dist/index-browser.d.ts",
@@ -20,7 +20,8 @@
     "dist/**"
   ],
   "dependencies": {
-    "@blitzjs/auth": "2.0.0-beta.13",
+    "@blitzjs/auth": "2.0.0-beta.16",
+    "@swc/core": "1.3.7",
     "@tanstack/react-query": "4.0.10",
     "b64-lite": "1.4.0",
     "bad-behavior": "1.0.1",
@@ -30,11 +31,11 @@
     "supports-color": "8.1.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.13",
+    "@blitzjs/config": "workspace:2.0.0-beta.16",
     "@types/debug": "4.1.7",
     "@types/react": "18.0.17",
     "@types/react-dom": "17.0.14",
-    "blitz": "2.0.0-beta.13",
+    "blitz": "2.0.0-beta.16",
     "next": "12.2.5",
     "react": "18.2.0",
     "react-dom": "18.2.0",

packages/blitz-rpc/src/data-client/rpc.ts

@@ -4,9 +4,11 @@ import {deserialize, serialize} from "superjson"
 import {SuperJSONResult} from "superjson/dist/types"
 import {CSRFTokenMismatchError, isServer} from "blitz"
 import {getQueryKeyFromUrlAndParams, getQueryClient} from "./react-query-utils"
+import {stringify} from "superjson"
 import {
   getAntiCSRFToken,
   getPublicDataStore,
+  backupAntiCSRFTokenToLocalStorage,
   HEADER_CSRF,
   HEADER_CSRF_ERROR,
   HEADER_PUBLIC_DATA_TOKEN,
@@ -23,6 +25,7 @@ export interface BuildRpcClientParams {
   resolverName: string
   resolverType: ResolverType
   routePath: string
+  httpMethod: string
 }
 
 export interface RpcOptions {
@@ -54,9 +57,10 @@ export function __internal_buildRpcClient({
   resolverName,
   resolverType,
   routePath,
+  httpMethod,
 }: BuildRpcClientParams): RpcClient {
   const fullRoutePath = normalizeApiRoute("/api/rpc" + routePath)
-
+  const routePathURL = new URL(fullRoutePath, window.location.origin)
   const httpClient: RpcClientBase = async (params, opts = {}, signal = undefined) => {
     const debug = (await import("debug")).default("blitz:rpc")
     if (!opts.fromQueryHook && !opts.fromInvoke) {
@@ -93,23 +97,32 @@ export function __internal_buildRpcClient({
       serialized = serialize(params)
     }
 
+    if (httpMethod === "GET") {
+      routePathURL.searchParams.set("params", stringify(serialized.json))
+      routePathURL.searchParams.set("meta", stringify(serialized.meta))
+    }
+
     const promise = window
-      .fetch(fullRoutePath, {
-        method: "POST",
+      .fetch(routePathURL, {
+        method: httpMethod,
         headers,
         credentials: "include",
         redirect: "follow",
-        body: JSON.stringify({
-          params: serialized.json,
-          meta: {
-            params: serialized.meta,
-          },
-        }),
+        body:
+          httpMethod === "POST"
+            ? JSON.stringify({
+                params: serialized.json,
+                meta: {
+                  params: serialized.meta,
+                },
+              })
+            : undefined,
         signal,
       })
       .then(async (response) => {
         debug("Received request for", routePath)
         if (response.headers) {
+          backupAntiCSRFTokenToLocalStorage()
           if (response.headers.get(HEADER_PUBLIC_DATA_TOKEN)) {
             getPublicDataStore().updateState()
             debug("Public data updated")

packages/blitz-rpc/src/index-server.ts

@@ -1,6 +1,6 @@
-import {assert, baseLogger, Ctx, newLine, prettyMs} from "blitz"
+import {assert, baseLogger, Ctx, newLine, prettyMs, ResolverConfig} from "blitz"
 import {NextApiRequest, NextApiResponse} from "next"
-import {deserialize, serialize as superjsonSerialize} from "superjson"
+import {deserialize, serialize as superjsonSerialize, parse} from "superjson"
 import {resolve} from "path"
 import chalk from "chalk"
 
@@ -14,6 +14,10 @@ function isObject(value: unknown): value is Record<string | symbol, unknown> {
   return typeof value === "object" && value !== null
 }
 
+const defaultConfig: ResolverConfig = {
+  httpMethod: "POST",
+}
+
 function getGlobalObject<T extends Record<string, unknown>>(key: string, defaultValue: T): T {
   assert(key.startsWith("__internal_blitz"), "unsupported key")
   if (typeof global === "undefined") {
@@ -25,7 +29,7 @@ function getGlobalObject<T extends Record<string, unknown>>(key: string, default
 }
 
 type Resolver = (...args: unknown[]) => Promise<unknown>
-type ResolverFiles = Record<string, () => Promise<{default?: Resolver}>>
+type ResolverFiles = Record<string, () => Promise<{default?: Resolver; config?: ResolverConfig}>>
 export type ResolverPathOptions = "queries|mutations" | "root" | ((path: string) => string)
 
 // We define `global.__internal_blitzRpcResolverFiles` to ensure we use the same global object.
@@ -43,7 +47,7 @@ export function loadBlitzRpcResolverFilesWithInternalMechanism() {
 
 export function __internal_addBlitzRpcResolver(
   routePath: string,
-  resolver: () => Promise<{default?: Resolver}>,
+  resolver: () => Promise<{default?: Resolver; config?: ResolverConfig}>,
 ) {
   g.blitzRpcResolverFilesLoaded = g.blitzRpcResolverFilesLoaded || {}
   g.blitzRpcResolverFilesLoaded[routePath] = resolver
@@ -169,19 +173,33 @@ export function rpcHandler(config: RpcConfig) {
       throw new Error("No resolver for path: " + routePath)
     }
 
-    const resolver = (await loadableResolver()).default
+    const {default: resolver, config: resolverConfig} = await loadableResolver()
+
     if (!resolver) {
       throw new Error("No default export for resolver path: " + routePath)
     }
 
+    const resolverConfigWithDefaults = {...defaultConfig, ...resolverConfig}
+
     if (req.method === "HEAD") {
       // We used to initiate database connection here
       res.status(200).end()
       return
-    } else if (req.method === "POST") {
-      // Handle RPC call
-
-      if (typeof req.body.params === "undefined") {
+    } else if (
+      req.method === "POST" ||
+      (req.method === "GET" && resolverConfigWithDefaults.httpMethod === "GET")
+    ) {
+      if (req.method === "GET") {
+        if (Object.keys(req.query).length === 1 && req.query.blitz) {
+          const error = {message: "Request query is missing the required `params` and `meta` keys"}
+          log.error(error.message)
+          res.status(400).json({
+            result: null,
+            error,
+          })
+          return
+        }
+      } else if (typeof req.body.params === "undefined") {
         const error = {message: "Request body is missing the `params` key"}
         log.error(error.message)
         res.status(400).json({
@@ -193,10 +211,9 @@ export function rpcHandler(config: RpcConfig) {
 
       try {
         const data = deserialize({
-          json: req.body.params,
-          meta: req.body.meta?.params,
+          json: req.method === "POST" ? req.body.params : parse(`${req.query.params}`),
+          meta: req.method === "POST" ? req.body.meta?.params : parse(`${req.query.meta}`),
         })
-
         log.info(customChalk.dim("Starting with input:"), data ? data : JSON.stringify(data))
         const startTime = Date.now()
         const result = await resolver(data, (res as any).blitzCtx)

packages/blitz-rpc/src/loader-client.ts

@@ -8,6 +8,8 @@ import {
   toPosixPath,
 } from "./loader-utils"
 import {posix} from "path"
+import {log, ResolverConfig} from "blitz"
+import {getResolverConfig} from "./parse-rpc-config"
 
 // Subset of `import type { LoaderDefinitionFunction } from 'webpack'`
 
@@ -39,12 +41,24 @@ export async function transformBlitzRpcResolverClient(
 ) {
   assertPosixPath(id)
   assertPosixPath(root)
-
   const resolverFilePath = "/" + posix.relative(root, id)
   assertPosixPath(resolverFilePath)
   const routePath = convertPageFilePathToRoutePath(resolverFilePath, options?.resolverPath)
   const resolverName = convertFilePathToResolverName(resolverFilePath)
   const resolverType = convertFilePathToResolverType(resolverFilePath)
+  const resolverConfig: ResolverConfig = {
+    httpMethod: "POST",
+  }
+  if (resolverType === "query") {
+    try {
+      const {httpMethod} = getResolverConfig(_src)
+      if (httpMethod) {
+        resolverConfig.httpMethod = httpMethod
+      }
+    } catch (e) {
+      log.error(e as string)
+    }
+  }
 
   const code = `
     // @ts-nocheck
@@ -53,6 +67,7 @@ export async function transformBlitzRpcResolverClient(
       resolverName: "${resolverName}",
       resolverType: "${resolverType}",
       routePath: "${routePath}",
+      httpMethod: "${resolverConfig.httpMethod}",
     });
   `
 

packages/blitz-rpc/src/loader-server.ts

@@ -1,4 +1,4 @@
-import {dirname, join, posix, relative} from "path"
+import {dirname, join, relative} from "path"
 import {promises} from "fs"
 import {
   assertPosixPath,
@@ -52,18 +52,15 @@ export async function transformBlitzRpcServer(
   assertPosixPath(root)
 
   const blitzImport = 'import { __internal_addBlitzRpcResolver } from "@blitzjs/rpc";'
-
   // No break line between `blitzImport` and `src` in order to preserve the source map's line mapping
   let code = blitzImport + src
   code += "\n\n"
-
   for (let resolverFilePath of resolvers) {
     const relativeResolverPath = slash(relative(dirname(id), join(root, resolverFilePath)))
     const routePath = convertPageFilePathToRoutePath(resolverFilePath, options?.resolverPath)
-    code += `__internal_addBlitzRpcResolver('${routePath}', () => import('${relativeResolverPath}'));`
+    code += `__internal_addBlitzRpcResolver('${routePath}',() => import('${relativeResolverPath}'));`
     code += "\n"
   }
-
   // console.log("NEW CODE", code)
   return code
 }

packages/blitz-rpc/src/parse-rpc-config.ts

@@ -0,0 +1,57 @@
+import {parseSync} from "@swc/core"
+import {ResolverConfig} from "blitz"
+
+type _ResolverType = "GET" | "POST"
+
+const defaultResolverConfig: ResolverConfig = {
+  httpMethod: "POST",
+}
+
+export function getResolverConfig(content: string): ResolverConfig {
+  const resolverConfig = defaultResolverConfig
+  const resolver = parseSync(content, {
+    syntax: "typescript",
+    target: "es2020",
+  })
+  const exportDelaration = resolver.body.find((node) => {
+    if (node.type === "ExportDeclaration") {
+      if (node.declaration.type === "VariableDeclaration") {
+        if (node.declaration.declarations[0]?.id.type === "Identifier") {
+          if (node.declaration.declarations[0].id.value === "config") {
+            return true
+          }
+        }
+      }
+    }
+    return false
+  })
+  if (exportDelaration && exportDelaration.type == "ExportDeclaration") {
+    const declaration = exportDelaration.declaration
+    if (declaration && declaration.type == "VariableDeclaration") {
+      const declarator = declaration.declarations[0]
+      if (declarator && declarator.type == "VariableDeclarator") {
+        const variable = declarator.init
+        if (variable && variable.type == "ObjectExpression") {
+          const properties = variable.properties
+          if (properties) {
+            const httpMethodProperty = properties.find((property) => {
+              if (property.type == "KeyValueProperty") {
+                if (property.key.type == "Identifier") {
+                  return property.key.value == "httpMethod"
+                }
+              }
+              return false
+            })
+            if (httpMethodProperty && httpMethodProperty.type == "KeyValueProperty") {
+              const value = httpMethodProperty.value
+              if (value && value.type == "StringLiteral") {
+                resolverConfig.httpMethod = value.value as _ResolverType
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  return resolverConfig
+}

packages/blitz/CHANGELOG.md

@@ -1,5 +1,35 @@
 # blitz
 
+## 2.0.0-beta.16
+
+### Patch Changes
+
+- 1569bd53: Upgrade `tslog` to the latest version
+- ceb7db27: Add an opt-in GET request support to RPC specification by exporting a `config` object that has the `httpMethod` property.
+  from `query` files.
+- 8e5903c0: Fix `cannot find module db error` in JavaScript template. Replace requiring the config using `esbuild` with parsing using `jscodeshift` to get the `cliConfig` values. Added logic to find the `blitz-server` file in `src` directory
+- 45459129: Include resolvers in `src` directory in blitz console
+- Updated dependencies [1569bd53]
+- Updated dependencies [8e5903c0]
+  - @blitzjs/generator@2.0.0-beta.16
+
+## 2.0.0-beta.15
+
+### Patch Changes
+
+- 1b798d9a: Fix `useSession` hook by exporting `enhancePrisma` from the server entry point instead of server
+  - @blitzjs/generator@2.0.0-beta.15
+
+## 2.0.0-beta.14
+
+### Patch Changes
+
+- 78fd5c48: Fix Blitz Install issue that gets stuck on "Generating file diff"
+- 0a8b0cb3: Fix Custom Server TS error - add `es6` target config to esbuild
+- Updated dependencies [54761393]
+- Updated dependencies [60de0574]
+  - @blitzjs/generator@2.0.0-beta.14
+
 ## 2.0.0-beta.13
 
 ### Patch Changes

packages/blitz/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blitz",
-  "version": "2.0.0-beta.13",
+  "version": "2.0.0-beta.16",
   "scripts": {
     "build": "unbuild",
     "dev": "pnpm run predev && watch unbuild src --wait=0.2",
@@ -25,7 +25,7 @@
     "blitz": "bin/blitz"
   },
   "dependencies": {
-    "@blitzjs/generator": "2.0.0-beta.13",
+    "@blitzjs/generator": "2.0.0-beta.16",
     "@mrleebo/prisma-ast": "0.2.6",
     "@types/global-agent": "2.1.1",
     "arg": "5.0.1",
@@ -63,16 +63,17 @@
     "recast": "0.20.5",
     "resolve-cwd": "3.0.0",
     "resolve-from": "5.0.0",
+    "rimraf": "3.0.2",
     "superjson": "1.9.1",
     "supports-color": "8.1.1",
     "tar": "6.1.11",
     "ts-node": "10.7.0",
     "tsconfig-paths": "4.0.0",
-    "tslog": "3.3.1",
+    "tslog": "3.3.4",
     "watchpack": "2.1.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.13",
+    "@blitzjs/config": "workspace:2.0.0-beta.16",
     "@types/cookie": "0.4.1",
     "@types/cross-spawn": "6.0.2",
     "@types/debug": "4.1.7",

packages/blitz/src/cli/commands/generate.ts

@@ -15,7 +15,7 @@ import {
   MutationsGenerator,
   ModelGenerator,
   QueryGenerator,
-  addCustomTemplatesBlitzConfig,
+  customTemplatesBlitzConfig,
 } from "@blitzjs/generator"
 import {log} from "../../logging"
 
@@ -65,7 +65,7 @@ const createCustomTemplates = async () => {
   })
   const templatesPathValue: string = templatesPath.value
   const isTypeScript = await getIsTypeScript()
-  addCustomTemplatesBlitzConfig(templatesPathValue, isTypeScript)
+  await customTemplatesBlitzConfig(isTypeScript, templatesPathValue, true) // to run the codemod
   log.success(`🚀 Custom templates path added/updated in app/blitz-server file`)
   const customTemplatesPath = require("path").join(process.cwd(), templatesPathValue)
   const fsExtra = await import("fs-extra")
@@ -275,20 +275,12 @@ const generate: CliCommand = async () => {
     const generators = generatorMap[selectedType as keyof typeof generatorMap]
 
     const isTypeScript = await getIsTypeScript()
-    const blitzServerPath = isTypeScript ? "app/blitz-server.ts" : "app/blitz-server.js"
-    const blitzServer = require("path").join(process.cwd(), blitzServerPath)
-    const {register} = require("esbuild-register/dist/node")
-    const {unregister} = register({
-      target: "es6",
-    })
-    const blitzConfig = require(blitzServer)
-    const {cliConfig} = blitzConfig
-    unregister()
+    const cliConfig = await customTemplatesBlitzConfig(isTypeScript)
 
     for (const GeneratorClass of generators) {
       const generator = new GeneratorClass({
         destinationRoot: require("path").resolve(),
-        templateDir: cliConfig?.customTemplates,
+        templateDir: cliConfig,
         extraArgs: args["_"].slice(3) as string[],
         modelName: singularRootContext,
         modelNames: modelNames(singularRootContext),

packages/blitz/src/cli/commands/install.ts

@@ -4,11 +4,14 @@ import prompts from "prompts"
 import {bootstrap} from "global-agent"
 import {baseLogger, log} from "../../logging"
 const debug = require("debug")("blitz:cli")
-import {join, resolve} from "path"
+import {join, resolve, dirname} from "path"
 import {Stream} from "stream"
 import {promisify} from "util"
 import {RecipeCLIFlags, RecipeExecutor} from "../../installer"
 import {setupTsnode} from "../utils/setup-ts-node"
+import {isInternalBlitzMonorepoDevelopment} from "../utils/helpers"
+import findUp from "find-up"
+import resolveFrom from "resolve-from"
 
 interface GlobalAgent {
   HTTP_PROXY?: string
@@ -62,8 +65,9 @@ const requireJSON = (file: string) => {
   return JSON.parse(require("fs-extra").readFileSync(file).toString("utf-8"))
 }
 
-const checkLockFileExists = (filename: string) => {
-  return require("fs-extra").existsSync(resolve(filename))
+const checkLockFileExists = async (filename: string) => {
+  const dotBlitz = join(await findNodeModulesRoot(process.cwd()), ".blitz")
+  return require("fs-extra").existsSync(resolve(join(dotBlitz, "..", "..", filename)))
 }
 
 const GH_ROOT = "https://github.com/"
@@ -153,13 +157,39 @@ const normalizeRecipePath = (recipeArg: string): RecipeMeta => {
   }
 }
 
+async function findNodeModulesRoot(src: string) {
+  let root: string
+  if (isInternalBlitzMonorepoDevelopment) {
+    root = join(__dirname, "..", "..", "..", "..", "/node_modules")
+  } else {
+    const blitzPkgLocation = dirname(
+      (await findUp("package.json", {
+        cwd: resolveFrom(src, "blitz"),
+      })) ?? "",
+    )
+
+    if (!blitzPkgLocation) {
+      throw new Error("Internal Blitz Error: unable to find 'blitz' package location")
+    }
+
+    if (blitzPkgLocation.includes(".pnpm")) {
+      root = join(blitzPkgLocation, "../../../../")
+    } else {
+      root = join(blitzPkgLocation, "../")
+    }
+  }
+
+  return root
+}
+
 const cloneRepo = async (
   repoFullName: string,
   defaultBranch: string,
   subdirectory?: string,
 ): Promise<string> => {
   debug("[cloneRepo] starting...")
-  const recipeDir = join(process.cwd(), ".blitz", "recipe-install")
+  const dotBlitz = join(await findNodeModulesRoot(process.cwd()), ".blitz")
+  const recipeDir = join(dotBlitz, "..", "..", "recipe-install")
   // clean up from previous run in case of error
   require("rimraf").sync(recipeDir)
   require("fs-extra").mkdirsSync(recipeDir)
@@ -206,7 +236,6 @@ const setupProxySupport = async () => {
 
 const install: CliCommand = async () => {
   setupTsnode()
-
   let selectedRecipe: string | null = args._[1] ? `${args._[1]}` : null
   await setupProxySupport()
 
@@ -281,10 +310,10 @@ ${chalk.dim("- Available recipes listed at https://github.com/blitz-js/blitz/tre
         let pkgManager = "npm"
         let installArgs = ["install", "--legacy-peer-deps", "--ignore-scripts"]
 
-        if (checkLockFileExists("yarn.lock")) {
+        if (await checkLockFileExists("yarn.lock")) {
           pkgManager = "yarn"
           installArgs = ["install", "--ignore-scripts"]
-        } else if (checkLockFileExists("pnpm-lock.yaml")) {
+        } else if (await checkLockFileExists("pnpm-lock.yaml")) {
           pkgManager = "pnpm"
           installArgs = ["install", "--ignore-scripts"]
         }
@@ -297,7 +326,7 @@ ${chalk.dim("- Available recipes listed at https://github.com/blitz-js/blitz/tre
 
         const recipePackageMain = requireJSON("./package.json").main
         const recipeEntry = resolve(recipePackageMain)
-        process.chdir(process.cwd())
+        process.chdir(join(process.cwd(), ".."))
 
         await installRecipeAtPath(recipeEntry, cliArgs, cliFlags)
 

packages/blitz/src/cli/utils/next-console.ts

@@ -71,32 +71,30 @@ export const forceRequire = (modulePath: string) => {
   }
 }
 
-export async function getBlitzModulePaths() {
+export async function getBlitzModulePaths(onlyDb = false) {
   const projectRoot = getProjectRootSync()
-  const {globby} = await import("globby")
-  const paths = await globby(
-    [
-      "app/**/{queries,mutations}/**/*.{js,ts,tsx}",
-      "utils/*.{js,ts,tsx}",
-      "jobs/**/*.{js,ts,tsx}",
-      "integrations/**/*.{js,ts,tsx}",
-      "!**/*.test.*",
-      "!**/*.spec.*",
-    ],
-    {cwd: projectRoot, gitignore: true},
-  )
-  paths.push(getDbFolder())
-  debug("Paths", paths)
-
+  const paths = [getDbFolder()]
+  if (!onlyDb) {
+    const {globby} = await import("globby")
+    paths.push(
+      ...(await globby(
+        [
+          "{app,src}/**/{queries,mutations}/**/*.{js,ts,tsx}",
+          "utils/*.{js,ts,tsx}",
+          "jobs/**/*.{js,ts,tsx}",
+          "integrations/**/*.{js,ts,tsx}",
+          "!**/*.test.*",
+          "!**/*.spec.*",
+        ],
+        {cwd: projectRoot, gitignore: true},
+      )),
+    )
+  }
   return [...paths.map((p: string) => path.join(projectRoot, p))]
 }
 
 export const loadBlitz = async (onlyDb: boolean, module = "") => {
-  let paths = await getBlitzModulePaths()
-
-  if (onlyDb) {
-    paths = paths.filter((p) => p.includes(getDbFolder()))
-  }
+  let paths = await getBlitzModulePaths(onlyDb)
 
   if (module) {
     paths = paths.filter((p) => module.includes(p) || p.includes(module))

packages/blitz/src/cli/utils/next-utils.ts

@@ -55,6 +55,7 @@ const getEsbuildOptions = (): esbuild.BuildOptions => {
     entryPoints: [getCustomServerPath()],
     outfile: getCustomServerBuildPath(),
     format: "cjs",
+    target: "es6",
     bundle: true,
     platform: "node",
     external: [

packages/blitz/src/index-browser.tsx

@@ -96,4 +96,3 @@ if (typeof window !== "undefined" && process.env.NODE_ENV === "development") {
 export * from "./utils"
 export * from "./types"
 export * from "./utils/zod"
-export * from "./utils/prisma"

packages/blitz/src/index-server.ts

@@ -5,9 +5,11 @@ import {Ctx} from "./types"
 export * from "./index-browser"
 export * from "./types"
 export * from "./utils/run-prisma"
+export * from "./utils/enhance-prisma"
 export * from "./middleware"
 export * from "./paginate"
 export * from "./logging"
+
 export {startWatcher, stopWatcher} from "./cli/utils/routes-manifest"
 
 export interface MiddlewareResponse<C extends Ctx = Ctx> extends ServerResponse {

packages/blitz/src/types.ts

@@ -6,6 +6,10 @@ export interface RouteUrlObject extends Pick<UrlObject, "pathname" | "query"> {
   pathname: string
 }
 
+export type ResolverConfig = {
+  httpMethod: "GET" | "POST"
+}
+
 export type BlitzCliConfig = {
   customTemplates?: string
 }

packages/codemod/CHANGELOG.md

@@ -1,5 +1,35 @@
 # @blitzjs/codemod
 
+## 2.0.0-beta.16
+
+### Patch Changes
+
+- Updated dependencies [1569bd53]
+- Updated dependencies [ceb7db27]
+- Updated dependencies [8e5903c0]
+- Updated dependencies [45459129]
+  - blitz@2.0.0-beta.16
+  - @blitzjs/generator@2.0.0-beta.16
+
+## 2.0.0-beta.15
+
+### Patch Changes
+
+- Updated dependencies [1b798d9a]
+  - blitz@2.0.0-beta.15
+  - @blitzjs/generator@2.0.0-beta.15
+
+## 2.0.0-beta.14
+
+### Patch Changes
+
+- Updated dependencies [54761393]
+- Updated dependencies [78fd5c48]
+- Updated dependencies [60de0574]
+- Updated dependencies [0a8b0cb3]
+  - @blitzjs/generator@2.0.0-beta.14
+  - blitz@2.0.0-beta.14
+
 ## 2.0.0-beta.13
 
 ### Patch Changes

packages/codemod/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/codemod",
-  "version": "2.0.0-beta.13",
+  "version": "2.0.0-beta.16",
   "scripts": {
     "build": "unbuild",
     "dev": "watch unbuild src --wait=0.2",
@@ -25,9 +25,9 @@
     "@babel/plugin-proposal-class-properties": "7.17.12",
     "@babel/plugin-syntax-jsx": "7.17.12",
     "@babel/plugin-syntax-typescript": "7.17.12",
-    "@blitzjs/generator": "2.0.0-beta.13",
+    "@blitzjs/generator": "2.0.0-beta.16",
     "arg": "5.0.1",
-    "blitz": "2.0.0-beta.13",
+    "blitz": "2.0.0-beta.16",
     "chalk": "^4.1.0",
     "cross-spawn": "7.0.3",
     "debug": "4.3.3",

packages/config/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @blitzjs/config
 
+## 2.0.0-beta.16
+
+## 2.0.0-beta.15
+
+## 2.0.0-beta.14
+
 ## 2.0.0-beta.13
 
 ### Patch Changes

packages/config/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@blitzjs/config",
   "private": true,
-  "version": "2.0.0-beta.13",
+  "version": "2.0.0-beta.16",
   "license": "MIT",
   "dependencies": {
     "@typescript-eslint/eslint-plugin": "5.9.1",

packages/generator/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @blitzjs/generator
 
+## 2.0.0-beta.16
+
+### Patch Changes
+
+- 1569bd53: Upgrade `tslog` to the latest version
+- 8e5903c0: Fix `cannot find module db error` in JavaScript template. Replace requiring the config using `esbuild` with parsing using `jscodeshift` to get the `cliConfig` values. Added logic to find the `blitz-server` file in `src` directory
+
+## 2.0.0-beta.15
+
+## 2.0.0-beta.14
+
+### Patch Changes
+
+- 54761393: Remove unnecessary `as number` assertions from new app templates
+- 60de0574: Fix reset token being undefined when passed to the resetPassword mutation
+
 ## 2.0.0-beta.13
 
 ### Patch Changes

packages/generator/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/generator",
-  "version": "2.0.0-beta.13",
+  "version": "2.0.0-beta.16",
   "scripts": {
     "dev": "watch unbuild src --wait=0.2",
     "build": "unbuild && pnpm build:templates",
@@ -31,6 +31,7 @@
     "diff": "5.0.0",
     "enquirer": "2.3.6",
     "fs-extra": "10.0.1",
+    "globby": "13.1.2",
     "got": "^11.8.1",
     "jscodeshift": "0.13.0",
     "mem-fs": "1.2.0",
@@ -41,12 +42,12 @@
     "prettier": "^2.5.1",
     "recast": "0.20.5",
     "supports-color": "8.1.1",
-    "tslog": "3.3.1",
+    "tslog": "3.3.4",
     "username": "5.1.0",
     "vinyl": "2.2.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "2.0.0-beta.13",
+    "@blitzjs/config": "2.0.0-beta.16",
     "@juanm04/cpx": "2.0.1",
     "@types/babel__core": "7.1.19",
     "@types/diff": "5.0.2",

packages/generator/src/generator.ts

@@ -16,12 +16,31 @@ import {readdirRecursive} from "./utils/readdir-recursive"
 import prettier from "prettier"
 const debug = require("debug")("blitz:generator")
 
-export const addCustomTemplatesBlitzConfig = (
-  customTemplatesPath: string,
+export function getProjectRootSync() {
+  return path.dirname(getConfigSrcPath())
+}
+
+export function getConfigSrcPath() {
+  const jsPath = path.resolve(path.join(process.cwd(), "next.config.js"))
+  return jsPath
+}
+
+export const customTemplatesBlitzConfig = async (
   isTypeScript: boolean,
+  customTemplatesPath = "",
+  codemod = false,
 ) => {
-  const blitzServer = isTypeScript ? "app/blitz-server.ts" : "app/blitz-server.js"
-  const blitzServerPath = require("path").join(process.cwd(), blitzServer)
+  const {globby} = await import("globby")
+  const blitzServer = await globby(["{app,src}/**/blitz-server.{ts,js}"], {
+    cwd: getProjectRootSync(),
+  })
+  if (blitzServer.length === 0) {
+    throw new Error("Could not find blitz-server.js or blitz-server.ts in app or src folder")
+  }
+  if (blitzServer.length > 1) {
+    throw new Error("Found more than one blitz-server.js or blitz-server.ts in app or src folder")
+  }
+  const blitzServerPath = require("path").join(process.cwd(), blitzServer.at(0))
   const userConfigModuleSource = fs.readFileSync(blitzServerPath, {encoding: "utf-8"})
   const userConfigModule = j(userConfigModuleSource, {parser: customTsParser})
   const program = userConfigModule.get()
@@ -86,6 +105,9 @@ export const addCustomTemplatesBlitzConfig = (
             if (customTemplatesProperty.type === "ObjectProperty") {
               const customValue = customTemplatesProperty.value
               if (customValue.type === "StringLiteral") {
+                if (!codemod) {
+                  return customValue.value
+                }
                 customValue.value = customTemplatesPath
               }
             }
@@ -94,8 +116,10 @@ export const addCustomTemplatesBlitzConfig = (
       }
     }
   }
-  const newSource = userConfigModule.toSource()
-  fs.writeFileSync(blitzServerPath, newSource)
+  if (codemod) {
+    const newSource = userConfigModule.toSource()
+    fs.writeFileSync(blitzServerPath, newSource)
+  }
 }
 
 export const customTsParser = {

packages/generator/templates/app/app/auth/mutations/changePassword.ts

@@ -1,22 +1,22 @@
-import { NotFoundError, AuthenticationError } from "blitz"
-import { resolver } from "@blitzjs/rpc"
-import { SecurePassword } from "@blitzjs/auth"
-import db from "db"
-import { authenticateUser } from "./login"
-import { ChangePassword } from "../validations"
+import { NotFoundError, AuthenticationError } from 'blitz'
+import { resolver } from '@blitzjs/rpc'
+import { SecurePassword } from '@blitzjs/auth'
+import db from 'db'
+import { authenticateUser } from './login'
+import { ChangePassword } from '../validations'
 
 export default resolver.pipe(
   resolver.zod(ChangePassword),
   resolver.authorize(),
   async ({ currentPassword, newPassword }, ctx) => {
-    const user = await db.user.findFirst({ where: { id: ctx.session.userId as number } })
+    const user = await db.user.findFirst({ where: { id: ctx.session.userId } })
     if (!user) throw new NotFoundError()
 
-   try {
+    try {
       await authenticateUser(user.email, currentPassword)
-    } catch (error: any) {
+    } catch (error) {
       if (error instanceof AuthenticationError) {
-        throw new Error("Invalid Password")
+        throw new Error('Invalid Password')
       }
       throw error
     }
@@ -28,5 +28,5 @@ export default resolver.pipe(
     })
 
     return true
-  }
+  },
 )

packages/generator/templates/app/app/users/queries/getCurrentUser.ts

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

packages/generator/templates/app/pages/auth/reset-password.tsx

@@ -1,3 +1,4 @@
+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"
@@ -9,9 +10,14 @@ import { useMutation } from "@blitzjs/rpc"
 import Link from "next/link"
 
 const ResetPasswordPage: BlitzPage = () => {
+  const [token, setToken] = useState("")
   const router = useRouter()
   const [resetPasswordMutation, { isSuccess }] = useMutation(resetPassword)
 
+  useEffect(() => {
+    setToken(router.query.token as string)
+  }, [router.isReady])
+
   return (
     <div>
       <h1>Set a New Password</h1>
@@ -27,10 +33,14 @@ const ResetPasswordPage: BlitzPage = () => {
         <Form
           submitText="Reset Password"
           schema={ResetPassword}
-          initialValues={{ password: "", passwordConfirmation: "", token: router.query.token as string }}
+          initialValues={{
+            password: "",
+            passwordConfirmation: "",
+            token,
+          }}
           onSubmit={async (values) => {
             try {
-              await resetPasswordMutation(values)
+              await resetPasswordMutation({...values, token})
             } catch (error: any) {
               if (error.name === "ResetPasswordError") {
                 return {

packages/pkg-template/package.json

@@ -25,7 +25,7 @@
     "@typescript-eslint/parser": "5.9.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "2.0.0-beta.13",
+    "@blitzjs/config": "2.0.0-beta.16",
     "@types/react": "18.0.17",
     "@types/react-dom": "17.0.14",
     "react": "18.2.0",

recipes/base-web/index.ts

@@ -12,9 +12,11 @@ export default RecipeBuilder()
     stepName: "Add dependencies",
     explanation: `Add 'baseui' and Styletron as a dependency too -- it's a toolkit for CSS in JS styling which Base Web relies on.`,
     packages: [
-      {name: "baseui", version: "10.x"},
-      {name: "styletron-engine-atomic", version: "1.x"},
-      {name: "styletron-react", version: "6.x"},
+      {name: "baseui", version: "^10.5.0"},
+      {name: "styletron-engine-atomic", version: "^1.4.8"},
+      {name: "styletron-react", version: "^6.0.2"},
+      {name: "@types/styletron-engine-atomic", version: "^1.1.1"},
+      {name: "@types/styletron-react", version: "^5.0.3"},
     ],
   })
   .addNewFilesStep({
@@ -54,43 +56,40 @@ export default RecipeBuilder()
       addImport(program, themeAndBaseProviderImport)
 
       program
-        .find(j.JSXElement)
-        .filter(
-          (path) =>
-            path.parent?.parent?.parent?.value?.id?.name === "App" &&
-            path.parent?.value.type === j.ReturnStatement.toString(),
-        )
+        .find(j.FunctionDeclaration, (node) => node.id.name === "MyApp")
         .forEach((path) => {
-          const {node} = path
-          path.replace(
-            j.jsxElement(
-              j.jsxOpeningElement(j.jsxIdentifier("StyletronProvider"), [
-                j.jsxAttribute(
-                  j.jsxIdentifier("value"),
-                  j.jsxExpressionContainer(j.identifier("styletron")),
-                ),
-                j.jsxAttribute(
-                  j.jsxIdentifier("debug"),
-                  j.jsxExpressionContainer(j.identifier("debug")),
-                ),
-                j.jsxAttribute(j.jsxIdentifier("debugAfterHydration")),
-              ]),
-              j.jsxClosingElement(j.jsxIdentifier("StyletronProvider")),
-              [
-                j.literal("\n"),
-                j.jsxElement(
-                  j.jsxOpeningElement(j.jsxIdentifier("BaseProvider"), [
-                    j.jsxAttribute(
-                      j.jsxIdentifier("theme"),
-                      j.jsxExpressionContainer(j.identifier("LightTheme")),
-                    ),
-                  ]),
-                  j.jsxClosingElement(j.jsxIdentifier("BaseProvider")),
-                  [j.literal("\n"), node, j.literal("\n")],
-                ),
-                j.literal("\n"),
-              ],
-            ),
+          const statement = path.value.body.body.filter(
+            (b) => b.type === "ReturnStatement",
+          )[0] as j.ReturnStatement
+          const argument = statement?.argument as j.JSXElement
+
+          statement.argument = j.jsxElement(
+            j.jsxOpeningElement(j.jsxIdentifier("StyletronProvider"), [
+              j.jsxAttribute(
+                j.jsxIdentifier("value"),
+                j.jsxExpressionContainer(j.identifier("styletron")),
+              ),
+              j.jsxAttribute(
+                j.jsxIdentifier("debug"),
+                j.jsxExpressionContainer(j.identifier("debug")),
+              ),
+              j.jsxAttribute(j.jsxIdentifier("debugAfterHydration")),
+            ]),
+            j.jsxClosingElement(j.jsxIdentifier("StyletronProvider")),
+            [
+              j.literal("\n"),
+              j.jsxElement(
+                j.jsxOpeningElement(j.jsxIdentifier("BaseProvider"), [
+                  j.jsxAttribute(
+                    j.jsxIdentifier("theme"),
+                    j.jsxExpressionContainer(j.identifier("LightTheme")),
+                  ),
+                ]),
+                j.jsxClosingElement(j.jsxIdentifier("BaseProvider")),
+                [j.literal("\n"), argument, j.literal("\n")],
+              ),
+              j.literal("\n"),
+            ],
           )
         })
 
@@ -109,7 +108,7 @@ export default RecipeBuilder()
       )
 
       const styletronServerAndSheetImport = j.importDeclaration(
-        [j.importSpecifier(j.identifier("Sheet"))],
+        [j.importSpecifier(j.identifier("Server")), j.importSpecifier(j.identifier("Sheet"))],
         j.literal("styletron-engine-atomic"),
       )
 
@@ -122,16 +121,18 @@ export default RecipeBuilder()
       addImport(program, styletronServerAndSheetImport)
       addImport(program, styletronImport)
 
-      program.find(j.ImportDeclaration, {source: {value: "blitz"}}).forEach((blitzImportPath) => {
-        let specifiers = blitzImportPath.value.specifiers || []
-        if (
-          !specifiers
-            .filter((spec) => j.ImportSpecifier.check(spec))
-            .some((node) => (node as j.ImportSpecifier)?.imported?.name === "DocumentContext")
-        ) {
-          specifiers.push(j.importSpecifier(j.identifier("DocumentContext")))
-        }
-      })
+      program
+        .find(j.ImportDeclaration, {source: {value: "next/document"}})
+        .forEach((nextDocumentImportPath) => {
+          let specifiers = nextDocumentImportPath.value.specifiers || []
+          if (
+            !specifiers
+              .filter((spec) => j.ImportSpecifier.check(spec))
+              .some((node) => (node as j.ImportSpecifier)?.imported?.name === "DocumentContext")
+          ) {
+            specifiers.push(j.importSpecifier(j.identifier("DocumentContext")))
+          }
+        })
 
       program.find(j.ClassDeclaration).forEach((path) => {
         const props = j.typeAlias(
@@ -233,7 +234,15 @@ export default RecipeBuilder()
               j.logicalExpression(
                 "||",
                 j.callExpression(
-                  j.memberExpression(j.identifier("styletron"), j.identifier("getStylesheets")),
+                  j.memberExpression(
+                    j.parenthesizedExpression(
+                      j.tsAsExpression(
+                        j.identifier("styletron"),
+                        j.tsTypeReference(j.identifier("Server")),
+                      ),
+                    ),
+                    j.identifier("getStylesheets"),
+                  ),
                   [],
                 ),
                 j.arrayExpression([]),
@@ -263,93 +272,82 @@ export default RecipeBuilder()
         node.body.splice(0, 0, getInitialPropsMethod)
       })
 
-      program
-        .find(j.JSXElement, {openingElement: {name: {name: "DocumentHead"}}})
-        .forEach((path) => {
-          const {node} = path
-          path.replace(
-            j.jsxElement(
-              j.jsxOpeningElement(j.jsxIdentifier("DocumentHead")),
-              j.jsxClosingElement(j.jsxIdentifier("DocumentHead")),
-              [
-                ...(node.children || []),
-                j.literal("\n"),
-                j.jsxExpressionContainer(
-                  j.callExpression(
+      program.find(j.JSXElement, {openingElement: {name: {name: "Head"}}}).forEach((path) => {
+        const {node} = path
+        path.replace(
+          j.jsxElement(
+            j.jsxOpeningElement(j.jsxIdentifier("Head")),
+            j.jsxClosingElement(j.jsxIdentifier("Head")),
+            [
+              ...(node.children || []),
+              j.literal("\n"),
+              j.jsxExpressionContainer(
+                j.callExpression(
+                  j.memberExpression(
                     j.memberExpression(
-                      j.memberExpression(
-                        j.memberExpression(j.thisExpression(), j.identifier("props")),
-                        j.identifier("stylesheets"),
-                      ),
-                      j.identifier("map"),
+                      j.memberExpression(j.thisExpression(), j.identifier("props")),
+                      j.identifier("stylesheets"),
                     ),
-                    [
-                      j.arrowFunctionExpression(
-                        [j.identifier("sheet"), j.identifier("i")],
-                        j.jsxElement(
-                          j.jsxOpeningElement(
-                            j.jsxIdentifier("style"),
-                            [
-                              j.jsxAttribute(
-                                j.jsxIdentifier("className"),
-                                j.literal("_styletron_hydrate_"),
-                              ),
-                              j.jsxAttribute(
-                                j.jsxIdentifier("dangerouslySetInnerHTML"),
-                                j.jsxExpressionContainer(
-                                  j.objectExpression([
-                                    j.objectProperty(
-                                      j.identifier("__html"),
-                                      j.memberExpression(
-                                        j.identifier("sheet"),
-                                        j.identifier("css"),
-                                      ),
-                                    ),
-                                  ]),
-                                ),
-                              ),
-                              j.jsxAttribute(
-                                j.jsxIdentifier("media"),
-                                j.jsxExpressionContainer(
-                                  j.memberExpression(
-                                    j.memberExpression(
-                                      j.identifier("sheet"),
-                                      j.identifier("attrs"),
-                                    ),
-                                    j.identifier("media"),
+                    j.identifier("map"),
+                  ),
+                  [
+                    j.arrowFunctionExpression(
+                      [j.identifier("sheet"), j.identifier("i")],
+                      j.jsxElement(
+                        j.jsxOpeningElement(
+                          j.jsxIdentifier("style"),
+                          [
+                            j.jsxAttribute(
+                              j.jsxIdentifier("className"),
+                              j.literal("_styletron_hydrate_"),
+                            ),
+                            j.jsxAttribute(
+                              j.jsxIdentifier("dangerouslySetInnerHTML"),
+                              j.jsxExpressionContainer(
+                                j.objectExpression([
+                                  j.objectProperty(
+                                    j.identifier("__html"),
+                                    j.memberExpression(j.identifier("sheet"), j.identifier("css")),
                                   ),
+                                ]),
+                              ),
+                            ),
+                            j.jsxAttribute(
+                              j.jsxIdentifier("media"),
+                              j.jsxExpressionContainer(
+                                j.memberExpression(
+                                  j.memberExpression(j.identifier("sheet"), j.identifier("attrs")),
+                                  j.identifier("media"),
                                 ),
                               ),
-                              j.jsxAttribute(
-                                j.jsxIdentifier("data-hydrate"),
-                                j.jsxExpressionContainer(
-                                  j.memberExpression(
-                                    j.memberExpression(
-                                      j.identifier("sheet"),
-                                      j.identifier("attrs"),
-                                    ),
-                                    j.stringLiteral("data-hydrate"),
-                                    true,
-                                  ),
+                            ),
+                            j.jsxAttribute(
+                              j.jsxIdentifier("data-hydrate"),
+                              j.jsxExpressionContainer(
+                                j.memberExpression(
+                                  j.memberExpression(j.identifier("sheet"), j.identifier("attrs")),
+                                  j.stringLiteral("data-hydrate"),
+                                  true,
                                 ),
                               ),
-                              j.jsxAttribute(
-                                j.jsxIdentifier("key"),
-                                j.jsxExpressionContainer(j.jsxIdentifier("i")),
-                              ),
-                            ],
-                            true,
-                          ),
+                            ),
+                            j.jsxAttribute(
+                              j.jsxIdentifier("key"),
+                              j.jsxExpressionContainer(j.jsxIdentifier("i")),
+                            ),
+                          ],
+                          true,
                         ),
                       ),
-                    ],
-                  ),
+                    ),
+                  ],
                 ),
-                j.literal("\n"),
-              ],
-            ),
-          )
-        })
+              ),
+              j.literal("\n"),
+            ],
+          ),
+        )
+      })
 
       return program
     },

recipes/base-web/package.json

@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/blitz-js/blitz#readme",
   "dependencies": {
-    "blitz": "workspace:2.0.0-beta.13",
+    "blitz": "2.0.0-beta.16",
     "jscodeshift": "0.13.0"
   },
   "devDependencies": {

recipes/base-web/templates/utils/styletron.ts

@@ -1,7 +1,8 @@
 import {Client, Server} from "styletron-engine-atomic"
 import {DebugEngine} from "styletron-react"
 
-const getHydrateClass = () => document.getElementsByClassName("_styletron_hydrate_")
+const getHydrateClass = () =>
+  document.getElementsByClassName("_styletron_hydrate_") as HTMLCollectionOf<HTMLStyleElement>
 
 export const styletron =
   typeof window === "undefined"

recipes/bulma/package.json

@@ -22,7 +22,7 @@
   },
   "homepage": "https://github.com/blitz-js/blitz#readme",
   "dependencies": {
-    "blitz": "workspace:2.0.0-beta.13",
+    "blitz": "2.0.0-beta.16",
     "jscodeshift": "0.13.0"
   },
   "devDependencies": {

recipes/bumbag-ui/index.ts

@@ -4,21 +4,18 @@ import j from "jscodeshift"
 
 function wrapComponentWithBumbagProvider(program: Program) {
   program
-    .find(j.JSXElement)
-    .filter(
-      (path) =>
-        path.parent?.parent?.parent?.value?.id?.name === "App" &&
-        path.parent?.value.type === j.ReturnStatement.toString(),
-    )
-    .forEach((path: NodePath) => {
-      const {node} = path
+    .find(j.FunctionDeclaration, (node) => node.id.name === "MyApp")
+    .forEach((path) => {
+      const statement = path.value.body.body.filter(
+        (b) => b.type === "ReturnStatement",
+      )[0] as j.ReturnStatement
+      const argument = statement?.argument as j.JSXElement
+
       try {
-        path.replace(
-          j.jsxElement(
-            j.jsxOpeningElement(j.jsxIdentifier("BumbagProvider isSSR")),
-            j.jsxClosingElement(j.jsxIdentifier("BumbagProvider")),
-            [j.jsxText("\n"), node, j.jsxText("\n")],
-          ),
+        statement.argument = j.jsxElement(
+          j.jsxOpeningElement(j.jsxIdentifier("BumbagProvider isSSR")),
+          j.jsxClosingElement(j.jsxIdentifier("BumbagProvider")),
+          [j.jsxText("\n"), argument, j.jsxText("\n")],
         )
       } catch {
         console.error("Already installed recipe")

recipes/bumbag-ui/package.json

@@ -24,7 +24,7 @@
   },
   "homepage": "https://github.com/blitz-js/blitz#readme",
   "dependencies": {
-    "blitz": "workspace:2.0.0-beta.13",
+    "blitz": "2.0.0-beta.16",
     "jscodeshift": "0.13.0"
   },
   "devDependencies": {

recipes/chakra-ui/package.json

@@ -24,7 +24,7 @@
   },
   "homepage": "https://github.com/blitz-js/blitz#readme",
   "dependencies": {
-    "blitz": "workspace:2.0.0-beta.13",
+    "blitz": "2.0.0-beta.16",
     "jscodeshift": "0.13.0"
   },
   "devDependencies": {

recipes/emotion/package.json

@@ -22,7 +22,7 @@
   },
   "homepage": "https://github.com/blitz-js/blitz#readme",
   "dependencies": {
-    "blitz": "workspace:2.0.0-beta.13",
+    "blitz": "2.0.0-beta.16",
     "jscodeshift": "0.13.0"
   },
   "devDependencies": {

recipes/gh-action-yarn-mariadb/package.json

@@ -24,6 +24,6 @@
   },
   "homepage": "https://github.com/blitz-js/blitz#readme",
   "dependencies": {
-    "blitz": "workspace:2.0.0-beta.13"
+    "blitz": "2.0.0-beta.16"
   }
 }

recipes/gh-action-yarn-postgres/package.json

@@ -24,6 +24,6 @@
   },
   "homepage": "https://github.com/blitz-js/blitz#readme",
   "dependencies": {
-    "blitz": "workspace:2.0.0-beta.13"
+    "blitz": "2.0.0-beta.16"
   }
 }

recipes/ghost/package.json

@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/blitz-js/blitz#readme",
   "dependencies": {
-    "blitz": "workspace:2.0.0-beta.13",
+    "blitz": "2.0.0-beta.16",
     "jscodeshift": "0.13.0"
   },
   "devDependencies": {

recipes/graphql-apollo-server/package.json

@@ -22,7 +22,7 @@
   },
   "homepage": "https://github.com/blitz-js/blitz#readme",
   "dependencies": {
-    "blitz": "workspace:2.0.0-beta.13",
+    "blitz": "2.0.0-beta.16",
     "jscodeshift": "0.13.0",
     "uuid": "^8.3.1"
   },

recipes/logrocket/index.ts

@@ -30,17 +30,11 @@ export default RecipeBuilder()
     explanation: `We will add logic to initialize the LogRocket session and upon login, identify the user within LogRocket`,
     singleFileSearch: paths.app(),
     transform(program) {
-      // Ensure useSession is in the blitz imports.
-      program.find(j.ImportDeclaration, {source: {value: "blitz"}}).forEach((blitzImportPath) => {
-        let specifiers = blitzImportPath.value.specifiers || []
-        if (
-          !specifiers
-            .filter((spec) => j.ImportSpecifier.check(spec))
-            .some((node) => (node as j.ImportSpecifier)?.imported?.name === "useSession")
-        ) {
-          specifiers.splice(0, 0, j.importSpecifier(j.identifier("useSession")))
-        }
-      })
+      const useSessionImport = j.importDeclaration(
+        [j.importSpecifier(j.identifier("useSession"))],
+        j.literal("@blitzjs/auth"),
+      )
+      addImport(program, useSessionImport)
 
       const logrocketImport = j.importDeclaration(
         [j.importDefaultSpecifier(j.identifier("* as LogRocket"))],
@@ -52,21 +46,23 @@ export default RecipeBuilder()
       let isReactImported = false
 
       // Ensure useEffect is in the react import.
-      program.find(j.ImportDeclaration, {source: "react"}).forEach((path) => {
-        // check if React is already imported
-        // if yes then we can skip importing it
-        // since we need it for useEffect
-        isReactImported = true
+      program
+        .find(j.ImportDeclaration, (node) => node.source.value === "react")
+        .forEach((path) => {
+          // check if React is already imported
+          // if yes then we can skip importing it
+          // since we need it for useEffect
+          isReactImported = true
 
-        // currently, we only check if the default export is there
-        // because we use the hook as React.useEffect
-        // if not then add the default export
-        let specifiers = path.value.specifiers || []
+          // currently, we only check if the default export is there
+          // because we use the hook as React.useEffect
+          // if not then add the default export
+          let specifiers = path.value.specifiers || []
 
-        if (!specifiers.some((node) => j.ImportDefaultSpecifier.check(node))) {
-          specifiers.splice(0, 0, j.importDefaultSpecifier(j.identifier("React")))
-        }
-      })
+          if (!specifiers.some((node) => j.ImportDefaultSpecifier.check(node))) {
+            specifiers.splice(0, 0, j.importDefaultSpecifier(j.identifier("React")))
+          }
+        })
 
       // import React if it wasn't already imported
       if (!isReactImported) {
@@ -79,33 +75,33 @@ export default RecipeBuilder()
 
       const isSessionDeclared = program.findVariableDeclarators("session")
 
-      program.find(j.FunctionDeclaration, {id: {name: "App"}}).forEach((path) => {
-        // Declare router and/or session if not declared.
-        if (!isSessionDeclared.length) {
-          path
-            .get("body")
-            .get("body")
-            .value.unshift(
-              j.variableDeclaration("const", [
-                j.variableDeclarator(
-                  j.identifier("session"),
-                  j.callExpression(j.identifier("useSession"), [
-                    j.objectExpression([
-                      j.objectProperty(j.identifier("suspense"), j.booleanLiteral(false)),
+      program
+        .find(j.FunctionDeclaration, (node) => node.id.name === "MyApp")
+        .forEach((path) => {
+          // Declare router and/or session if not declared.
+          if (!isSessionDeclared.length) {
+            path
+              .get("body")
+              .get("body")
+              .value.unshift(
+                j.variableDeclaration("const", [
+                  j.variableDeclarator(
+                    j.identifier("session"),
+                    j.callExpression(j.identifier("useSession"), [
+                      j.objectExpression([
+                        j.objectProperty(j.identifier("suspense"), j.booleanLiteral(false)),
+                      ]),
                     ]),
-                  ]),
-                ),
-              ]),
-            )
-        }
-      })
+                  ),
+                ]),
+              )
+          }
+        })
 
-      const returnStm = program.find(j.ReturnStatement).filter((path) => {
-        return (
-          path.parent?.parent?.parent?.value?.declaration?.id?.name === "App" &&
-          path.parent?.parent?.parent?.value?.type === j.ExportDefaultDeclaration.toString()
-        )
-      })
+      const returnStm = program.find(
+        j.ReturnStatement,
+        (node) => node.argument.openingElement.name.name === "ErrorBoundary",
+      )
 
       if (returnStm) {
         returnStm.insertBefore(

recipes/logrocket/package.json

@@ -23,6 +23,10 @@
   },
   "homepage": "https://github.com/blitz-js/blitz#readme",
   "dependencies": {
-    "blitz": "workspace:2.0.0-beta.13"
+    "blitz": "2.0.0-beta.16",
+    "jscodeshift": "0.13.0"
+  },
+  "devDependencies": {
+    "@types/jscodeshift": "0.11.2"
   }
 }

recipes/material-ui/index.ts

@@ -1,4 +1,4 @@
-import {addImport, paths, RecipeBuilder, withComments, withTypeAnnotation} from "blitz/installer"
+import {addImport, paths, RecipeBuilder, withTypeAnnotation} from "blitz/installer"
 import j from "jscodeshift"
 import {join} from "path"
 
@@ -57,26 +57,30 @@ export default RecipeBuilder()
         ),
       )
 
-      // import theme from 'app/core/styles/theme'
+      // import theme from 'app/styles/theme'
       addImport(
         program,
         j.importDeclaration(
           [j.importDefaultSpecifier(j.identifier("theme"))],
-          j.literal("app/core/styles/theme"),
+          j.literal("app/styles/theme"),
         ),
       )
 
-      // import createEmotionCache from 'app/core/utils/createEmotionCache'
+      // import createEmotionCache from 'app/utils/createEmotionCache'
       addImport(
         program,
         j.importDeclaration(
           [j.importDefaultSpecifier(j.identifier("createEmotionCache"))],
-          j.literal("app/core/utils/createEmotionCache"),
+          j.literal("app/utils/createEmotionCache"),
         ),
       )
 
-      program.find(j.ExportDefaultDeclaration).forEach((path) => {
-        path.insertBefore(
+      program.find(j.ImportDeclaration).forEach((i, idx, path) => {
+        if (idx !== path.length - 1) {
+          return
+        }
+
+        path[path.length - 1]?.insertAfter(
           j.interfaceDeclaration(
             j.identifier("MyAppProps"),
             j.objectTypeAnnotation([
@@ -90,26 +94,19 @@ export default RecipeBuilder()
           ),
         )
 
-        path.insertBefore(
-          withComments(
-            j.variableDeclaration("const", [
-              j.variableDeclarator(
-                j.identifier("clientSideEmotionCache"),
-                j.callExpression(j.identifier("createEmotionCache"), []),
-              ),
-            ]),
-            [
-              j.commentLine(
-                " Client-side cache, shared for the whole session of the user in the browser.",
-              ),
-            ],
-          ),
+        path[path.length - 1]?.insertAfter(
+          j.variableDeclaration("const", [
+            j.variableDeclarator(
+              j.identifier("clientSideEmotionCache"),
+              j.callExpression(j.identifier("createEmotionCache"), []),
+            ),
+          ]),
         )
       })
 
       program
         .find(j.FunctionDeclaration)
-        .filter((path) => path.value?.id?.name === "App")
+        .filter((path) => path.value?.id?.name === "MyApp")
         .forEach((path) => {
           let objProps = [
             j.property("init", j.identifier("Component"), j.identifier("Component")),
@@ -136,44 +133,41 @@ export default RecipeBuilder()
         })
 
       program
-        .find(j.JSXElement)
-        .filter(
-          (path) =>
-            path.parent?.parent?.parent?.value?.id?.name === "App" &&
-            path.parent?.value.type === j.ReturnStatement.toString(),
-        )
+        .find(j.FunctionDeclaration, (node) => node.id.name === "MyApp")
         .forEach((path) => {
-          const {node} = path
-          path.replace(
-            j.jsxElement(
-              j.jsxOpeningElement(j.jsxIdentifier("CacheProvider"), [
-                j.jsxAttribute(
-                  j.jsxIdentifier("value"),
-                  j.jsxExpressionContainer(j.identifier("emotionCache")),
-                ),
-              ]),
-              j.jsxClosingElement(j.jsxIdentifier("CacheProvider")),
-              [
-                j.literal("\n"),
-                j.jsxElement(
-                  j.jsxOpeningElement(j.jsxIdentifier("ThemeProvider"), [
-                    j.jsxAttribute(
-                      j.jsxIdentifier("theme"),
-                      j.jsxExpressionContainer(j.identifier("theme")),
-                    ),
-                  ]),
-                  j.jsxClosingElement(j.jsxIdentifier("ThemeProvider")),
-                  [
-                    j.literal("\n"),
-                    j.jsxElement(j.jsxOpeningElement(j.jsxIdentifier("CssBaseline"), [], true)),
-                    j.literal("\n"),
-                    node,
-                    j.literal("\n"),
-                  ],
-                ),
-                j.literal("\n"),
-              ],
-            ),
+          const statement = path.value.body.body.filter(
+            (b) => b.type === "ReturnStatement",
+          )[0] as j.ReturnStatement
+          const argument = statement?.argument as j.JSXElement
+
+          statement.argument = j.jsxElement(
+            j.jsxOpeningElement(j.jsxIdentifier("CacheProvider"), [
+              j.jsxAttribute(
+                j.jsxIdentifier("value"),
+                j.jsxExpressionContainer(j.identifier("emotionCache")),
+              ),
+            ]),
+            j.jsxClosingElement(j.jsxIdentifier("CacheProvider")),
+            [
+              j.literal("\n"),
+              j.jsxElement(
+                j.jsxOpeningElement(j.jsxIdentifier("ThemeProvider"), [
+                  j.jsxAttribute(
+                    j.jsxIdentifier("theme"),
+                    j.jsxExpressionContainer(j.identifier("theme")),
+                  ),
+                ]),
+                j.jsxClosingElement(j.jsxIdentifier("ThemeProvider")),
+                [
+                  j.literal("\n"),
+                  j.jsxElement(j.jsxOpeningElement(j.jsxIdentifier("CssBaseline"), [], true)),
+                  j.literal("\n"),
+                  argument,
+                  j.literal("\n"),
+                ],
+              ),
+              j.literal("\n"),
+            ],
           )
         })
 

recipes/material-ui/package.json

@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/blitz-js/blitz#readme",
   "dependencies": {
-    "blitz": "workspace:2.0.0-beta.13",
+    "blitz": "2.0.0-beta.16",
     "jscodeshift": "0.13.0"
   },
   "devDependencies": {

recipes/material-ui/templates/pages/_document.tsx

@@ -1,16 +1,15 @@
-import {
+import Document, {
   NextScript,
-  Document,
   DocumentContext,
-  DocumentHead,
+  Head,
   DocumentInitialProps,
   Html,
   Main,
 } from "next/document"
 import {Children} from "react"
 import createEmotionServer from "@emotion/server/create-instance"
-import theme from "app/core/styles/theme"
-import createEmotionCache from "app/core/utils/createEmotionCache"
+import theme from "app/styles/theme"
+import createEmotionCache from "app/utils/createEmotionCache"
 
 export default class MyDocument extends Document {
   static async getInitialProps(ctx: DocumentContext): Promise<DocumentInitialProps> {
@@ -73,7 +72,7 @@ export default class MyDocument extends Document {
   render() {
     return (
       <Html lang="en">
-        <DocumentHead>
+        <Head>
           {/* PWA primary color */}
           <meta name="theme-color" content={theme.palette.primary.main} />
           <link
@@ -81,7 +80,7 @@ export default class MyDocument extends Document {
             href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap"
           />
           <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons" />
-        </DocumentHead>
+        </Head>
         <body>
           <Main />
           <NextScript />

recipes/next-ui/index.ts

@@ -5,20 +5,17 @@ import j, {JSXIdentifier} from "jscodeshift"
 // Copied from https://github.com/blitz-js/legacy-framework/pull/805, let's add this to the blitz
 function wrapComponentWithChakraProvider(program: Program) {
   program
-    .find(j.JSXElement)
-    .filter(
-      (path) =>
-        path.parent?.parent?.parent?.value?.id?.name === "App" &&
-        path.parent?.value.type === j.ReturnStatement.toString(),
-    )
+    .find(j.FunctionDeclaration, (node) => node.id.name === "MyApp")
     .forEach((path: NodePath) => {
-      const {node} = path
-      path.replace(
-        j.jsxElement(
-          j.jsxOpeningElement(j.jsxIdentifier("NextUIProvider")),
-          j.jsxClosingElement(j.jsxIdentifier("NextUIProvider")),
-          [j.jsxText("\n"), node, j.jsxText("\n")],
-        ),
+      const statement = path.value.body.body.filter(
+        (b) => b.type === "ReturnStatement",
+      )[0] as j.ReturnStatement
+      const argument = statement?.argument as j.JSXElement
+
+      statement.argument = j.jsxElement(
+        j.jsxOpeningElement(j.jsxIdentifier("NextUIProvider")),
+        j.jsxClosingElement(j.jsxIdentifier("NextUIProvider")),
+        [j.jsxText("\n"), argument, j.jsxText("\n")],
       )
     })
   return program

recipes/next-ui/package.json

@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/blitz-js/blitz#readme",
   "dependencies": {
-    "blitz": "workspace:2.0.0-beta.13",
+    "blitz": "2.0.0-beta.16",
     "jscodeshift": "0.13.0"
   },
   "devDependencies": {

recipes/passenger/package.json

@@ -23,6 +23,6 @@
   },
   "homepage": "https://github.com/blitz-js/blitz#readme",
   "dependencies": {
-    "blitz": "workspace:2.0.0-beta.13"
+    "blitz": "2.0.0-beta.16"
   }
 }

recipes/passenger/templates/passenger.js

@@ -2,7 +2,7 @@
 // Run `blitz build` before starting
 const path = require("path")
 
-const blitzPath = path.join(__dirname, "node_modules", "next", "dist", "bin", "next")
+const blitzPath = path.join(__dirname, "node_modules", "blitz", "bin", "blitz")
 
 process.argv.length = 1
 process.argv.push(blitzPath, "start")

recipes/quirrel/index.ts

@@ -34,11 +34,19 @@ export default RecipeBuilder()
     },
   })
   .addNewFilesStep({
-    stepId: "addExamples",
-    stepName: "Add example files",
+    stepId: "addExamplesMutations",
+    stepName: "Add example Mutation files",
     explanation: "Create one example Queue and CronJob that illustrate Quirrel usage.",
     targetDirectory: "app",
     templatePath: path.join(__dirname, "templates", "app"),
     templateValues: {},
   })
+  .addNewFilesStep({
+    stepId: "addExamplesApi",
+    stepName: "Add example API files",
+    explanation: "Create one example Queue and CronJob that illustrate Quirrel usage.",
+    targetDirectory: "pages",
+    templatePath: path.join(__dirname, "templates", "pages"),
+    templateValues: {},
+  })
   .build()

recipes/quirrel/package.json

@@ -22,6 +22,6 @@
   },
   "homepage": "https://github.com/blitz-js/blitz#readme",
   "dependencies": {
-    "blitz": "workspace:2.0.0-beta.13"
+    "blitz": "2.0.0-beta.16"
   }
 }

recipes/quirrel/templates/app/mutations/enqueueGreeting.ts

@@ -1,4 +1,4 @@
-import greetingsQueue from "app/api/greetingsQueue"
+import greetingsQueue from "pages/api/greetingsQueue"
 
 export default async function enqueueGreeting() {
   await greetingsQueue.enqueue({

recipes/reflexjs/index.ts

@@ -5,25 +5,19 @@ import {join} from "path"
 
 function wrapComponentWithThemeProvider(program: Program) {
   program
-    .find(j.JSXElement)
-    .filter(
-      (path) =>
-        path.parent?.parent?.parent?.value?.id?.name === "App" &&
-        path.parent?.value.type === j.ReturnStatement.toString(),
-    )
+    .find(j.FunctionDeclaration, (node) => node.id.name === "MyApp")
     .forEach((path: NodePath) => {
-      const {node} = path
-      path.replace(
-        j.jsxElement(
-          j.jsxOpeningElement(j.jsxIdentifier("ThemeProvider"), [
-            j.jsxAttribute(
-              j.jsxIdentifier("theme"),
-              j.jsxExpressionContainer(j.identifier("theme")),
-            ),
-          ]),
-          j.jsxClosingElement(j.jsxIdentifier("ThemeProvider")),
-          [j.jsxText("\n"), node, j.jsxText("\n")],
-        ),
+      const statement = path.value.body.body.filter(
+        (b) => b.type === "ReturnStatement",
+      )[0] as j.ReturnStatement
+      const argument = statement?.argument as j.JSXElement
+
+      statement.argument = j.jsxElement(
+        j.jsxOpeningElement(j.jsxIdentifier("ThemeProvider"), [
+          j.jsxAttribute(j.jsxIdentifier("theme"), j.jsxExpressionContainer(j.identifier("theme"))),
+        ]),
+        j.jsxClosingElement(j.jsxIdentifier("ThemeProvider")),
+        [j.jsxText("\n"), argument, j.jsxText("\n")],
       )
     })
 
@@ -107,6 +101,14 @@ export default RecipeBuilder()
       return injectInitializeColorMode(program)
     },
   })
+  .addNewFilesStep({
+    stepId: "create babel file",
+    stepName: "Create babel file",
+    explanation: `Adding default babel file.`,
+    targetDirectory: "./babel.config.js",
+    templatePath: join(__dirname, "templates", "babel.config.js"),
+    templateValues: {},
+  })
   .addTransformFilesStep({
     stepId: "updateBabelConfig",
     stepName: "Add Babel preset",
@@ -116,7 +118,7 @@ export default RecipeBuilder()
 
     transform(program) {
       return addBabelPreset(program, [
-        "blitz/babel",
+        "next/babel",
         {
           "preset-react": {
             runtime: "automatic",

recipes/reflexjs/package.json

@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/blitz-js/blitz#readme",
   "dependencies": {
-    "blitz": "workspace:2.0.0-beta.13",
+    "blitz": "2.0.0-beta.16",
     "jscodeshift": "0.13.0"
   },
   "devDependencies": {

recipes/reflexjs/templates/babel.config.js

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

recipes/render/package.json

@@ -22,6 +22,6 @@
   },
   "homepage": "https://github.com/blitz-js/blitz#readme",
   "dependencies": {
-    "blitz": "workspace:2.0.0-beta.13"
+    "blitz": "2.0.0-beta.16"
   }
 }

recipes/secureheaders/index.ts

@@ -37,11 +37,11 @@ export default RecipeBuilder()
         addImport(program, secureHeadersImport)
       }
 
-      program.findJSXElements("DocumentHead").forEach((path) => {
+      program.findJSXElements("Head").forEach((path) => {
         path.replace(
           j.jsxElement(
-            j.jsxOpeningElement(j.jsxIdentifier("DocumentHead")),
-            j.jsxClosingElement(j.jsxIdentifier("DocumentHead")),
+            j.jsxOpeningElement(j.jsxIdentifier("Head")),
+            j.jsxClosingElement(j.jsxIdentifier("Head")),
             [
               ...addHttpMetaTag(
                 "Content-Security-Policy",
@@ -137,7 +137,7 @@ const addHttpHeaders = (program: Program, headers: Array<{name: string; value: s
   )
   headersFunction.async = true
   const headersCollection = transformNextConfig(program).configObj.find(
-    (value) =>
+    (value: {type: string; key: {type: string; name: string}}) =>
       value.type === "ObjectProperty" &&
       value.key.type === "Identifier" &&
       value.key.name === "headers",
@@ -152,7 +152,7 @@ const addHttpHeaders = (program: Program, headers: Array<{name: string; value: s
   }
 
   const poweredByProp = transformNextConfig(program).configObj.find(
-    (value) =>
+    (value: {type: string; key: {type: string; name: string}}) =>
       value.type === "ObjectProperty" &&
       value.key.type === "Identifier" &&
       value.key.name === "poweredByHeader",

recipes/secureheaders/package.json

@@ -22,7 +22,7 @@
   },
   "homepage": "https://github.com/blitz-js/blitz#readme",
   "dependencies": {
-    "blitz": "workspace:2.0.0-beta.13",
+    "blitz": "2.0.0-beta.16",
     "jscodeshift": "0.13.0",
     "uuid": "^8.3.1"
   },

recipes/stitches/package.json

@@ -24,7 +24,7 @@
   },
   "homepage": "https://github.com/blitz-js/blitz#readme",
   "dependencies": {
-    "blitz": "workspace:2.0.0-beta.13",
+    "blitz": "2.0.0-beta.16",
     "jscodeshift": "0.13.0"
   },
   "devDependencies": {

recipes/styled-components/index.ts

@@ -5,32 +5,29 @@ import {join} from "path"
 
 function wrapComponentWithStyledComponentsThemeProvider(program: Program) {
   program
-    .find(j.JSXElement)
-    .filter(
-      (path) =>
-        path.parent?.parent?.parent?.value?.id?.name === "App" &&
-        path.parent?.value.type === j.ReturnStatement.toString(),
-    )
+    .find(j.FunctionDeclaration, (node) => node.id.name === "MyApp")
     .forEach((path: NodePath) => {
-      const {node} = path
-      path.replace(
-        j.jsxFragment(j.jsxOpeningFragment(), j.jsxClosingFragment(), [
-          j.jsxText("\n"),
-          j.jsxElement(j.jsxOpeningElement(j.jsxIdentifier("GlobalStyle"), [], true)),
-          j.jsxText("\n"),
-          j.jsxElement(
-            j.jsxOpeningElement(j.jsxIdentifier("ThemeProvider"), [
-              j.jsxAttribute(
-                j.jsxIdentifier("theme"),
-                j.jsxExpressionContainer(j.identifier("theme")),
-              ),
-            ]),
-            j.jsxClosingElement(j.jsxIdentifier("ThemeProvider")),
-            [j.jsxText("\n"), node, j.jsxText("\n")],
-          ),
-          j.jsxText("\n"),
-        ]),
-      )
+      const statement = path.value.body.body.filter(
+        (b) => b.type === "ReturnStatement",
+      )[0] as j.ReturnStatement
+      const argument = statement?.argument as j.JSXElement
+
+      statement.argument = j.jsxFragment(j.jsxOpeningFragment(), j.jsxClosingFragment(), [
+        j.jsxText("\n"),
+        j.jsxElement(j.jsxOpeningElement(j.jsxIdentifier("GlobalStyle"), [], true)),
+        j.jsxText("\n"),
+        j.jsxElement(
+          j.jsxOpeningElement(j.jsxIdentifier("ThemeProvider"), [
+            j.jsxAttribute(
+              j.jsxIdentifier("theme"),
+              j.jsxExpressionContainer(j.identifier("theme")),
+            ),
+          ]),
+          j.jsxClosingElement(j.jsxIdentifier("ThemeProvider")),
+          [j.jsxText("\n"), argument, j.jsxText("\n")],
+        ),
+        j.jsxText("\n"),
+      ])
     })
   return program
 }
@@ -72,16 +69,18 @@ export default RecipeBuilder()
       )
 
       // Ensure DocumentContext is in the blitz imports.
-      program.find(j.ImportDeclaration, {source: {value: "blitz"}}).forEach((blitzImportPath) => {
-        let specifiers = blitzImportPath.value.specifiers || []
-        if (
-          !specifiers
-            .filter((spec) => j.ImportSpecifier.check(spec))
-            .some((node) => (node as j.ImportSpecifier)?.imported?.name === "DocumentContext")
-        ) {
-          specifiers.splice(0, 0, j.importSpecifier(j.identifier("DocumentContext")))
-        }
-      })
+      program
+        .find(j.ImportDeclaration, {source: {value: "next/document"}})
+        .forEach((blitzImportPath) => {
+          let specifiers = blitzImportPath.value.specifiers || []
+          if (
+            !specifiers
+              .filter((spec) => j.ImportSpecifier.check(spec))
+              .some((node) => (node as j.ImportSpecifier)?.imported?.name === "DocumentContext")
+          ) {
+            specifiers.splice(0, 0, j.importSpecifier(j.identifier("DocumentContext")))
+          }
+        })
       program.find(j.ClassBody).forEach((path) => {
         const {node} = path
 
@@ -234,6 +233,14 @@ export default RecipeBuilder()
       return wrapComponentWithStyledComponentsThemeProvider(program)
     },
   })
+  .addNewFilesStep({
+    stepId: "create babel file",
+    stepName: "Create babel file",
+    explanation: `Adding default babel file.`,
+    targetDirectory: "./babel.config.js",
+    templatePath: join(__dirname, "templates", "babel.config.js"),
+    templateValues: {},
+  })
   .addTransformFilesStep({
     stepId: "updateBabelConfig",
     stepName: "Add Babel plugin and preset",

recipes/styled-components/package.json

@@ -24,7 +24,7 @@
   },
   "homepage": "https://github.com/blitz-js/blitz#readme",
   "dependencies": {
-    "blitz": "workspace:2.0.0-beta.13",
+    "blitz": "2.0.0-beta.16",
     "jscodeshift": "0.13.0"
   },
   "devDependencies": {

recipes/styled-components/templates/babel.config.js

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

recipes/tailwind/package.json

@@ -22,7 +22,7 @@
   },
   "homepage": "https://github.com/blitz-js/blitz#readme",
   "dependencies": {
-    "blitz": "workspace:2.0.0-beta.13",
+    "blitz": "2.0.0-beta.16",
     "jscodeshift": "0.13.0"
   },
   "devDependencies": {