Version Packages (beta) (#3967)

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

.all-contributorsrc

@@ -2314,7 +2314,9 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/32314?v=4",
       "profile": "https://macwright.com/",
       "contributions": [
-        "doc"
+        "doc",
+        "test",
+        "code"
       ]
     },
     {
@@ -3742,6 +3744,17 @@
       "contributions": [
         "doc"
       ]
+    },
+    {
+      "login": "paulm17",
+      "name": "Paul",
+      "avatar_url": "https://avatars.githubusercontent.com/u/387463?v=4",
+      "profile": "https://github.com/paulm17",
+      "contributions": [
+        "doc",
+        "code",
+        "test"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.changeset/brave-zebras-deny.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/rpc": minor
+---
+
+internal: remove unneeed useSession from useQuery hooks

.changeset/olive-dragons-drum.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/rpc": patch
+---
+
+Add ability to put your query and mutation resolvers in a separate monorepo folder, allowing you to use them in multiple apps.

.changeset/pre.json

@@ -52,6 +52,7 @@
     "big-phones-bow",
     "blue-flowers-peel",
     "blue-pigs-tan",
+    "brave-zebras-deny",
     "breezy-bees-beg",
     "breezy-cameras-double",
     "breezy-moose-behave",
@@ -171,6 +172,7 @@
     "ninety-rice-tickle",
     "odd-bears-run",
     "olive-bees-buy",
+    "olive-dragons-drum",
     "olive-feet-rhyme",
     "olive-kings-invent",
     "olive-sheep-rhyme",
@@ -189,6 +191,7 @@
     "purple-donkeys-smash",
     "purple-singers-greet",
     "quick-cycles-confess",
+    "quick-dots-fetch",
     "quiet-feet-travel",
     "quiet-pans-hunt",
     "quiet-sloths-rule",

.changeset/quick-dots-fetch.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/rpc": minor
+---
+
+Fix mutability bug in RPC configuration

.github/workflows/main.yml

@@ -20,7 +20,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: pnpm/action-setup@646cdf48217256a3d0b80361c5a50727664284f2
         with:
-          version: 6.32.6
+          version: 7.11.0
       - name: Setup node
         uses: actions/setup-node@v2
         with:
@@ -35,9 +35,9 @@ jobs:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           server-token: ${{ env.TURBO_TOKEN }}
       - name: Build
-        run: pnpm build -- --api="http://127.0.0.1:9080"
+        run: pnpm build
       - name: Lint
-        run: pnpm lint -- --api="http://127.0.0.1:9080"
+        run: pnpm lint
 
   build:
     runs-on: ubuntu-latest
@@ -46,7 +46,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: pnpm/action-setup@646cdf48217256a3d0b80361c5a50727664284f2
         with:
-          version: 6.32.6
+          version: 7.11.0
       - name: Setup node
         uses: actions/setup-node@v2
         with:
@@ -60,9 +60,9 @@ jobs:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           server-token: ${{ env.TURBO_TOKEN }}
       - name: Build
-        run: pnpm build -- --api="http://127.0.0.1:9080"
+        run: pnpm build
       - name: Build Apps
-        run: pnpm build:apps -- --api="http://127.0.0.1:9080"
+        run: pnpm build:apps
 
   Unit-Tests:
     name: "Unit Test: ${{ matrix.os }} (node@16)"
@@ -82,7 +82,7 @@ jobs:
       - name: Setup PNPM
         uses: pnpm/action-setup@646cdf48217256a3d0b80361c5a50727664284f2
         with:
-          version: 6.32.6
+          version: 7.11.0
 
       - name: Setup node@16
         uses: actions/setup-node@v2
@@ -104,7 +104,7 @@ jobs:
           server-token: ${{ env.TURBO_TOKEN }}
 
       - name: Build
-        run: pnpm build -- --api="http://127.0.0.1:9080"
+        run: pnpm build
         shell: bash
 
       - name: Test Packages
@@ -150,7 +150,7 @@ jobs:
       - name: Setup PNPM
         uses: pnpm/action-setup@646cdf48217256a3d0b80361c5a50727664284f2
         with:
-          version: 6.32.6
+          version: 7.11.0
 
       - name: Setup node@${{ matrix.NODE_VERSION }}
         uses: actions/setup-node@v2
@@ -176,7 +176,7 @@ jobs:
           server-token: ${{ env.TURBO_TOKEN }}
 
       - name: Build
-        run: pnpm build -- --api="http://127.0.0.1:9080"
+        run: pnpm build
         shell: bash
 
       - name: Test Packages

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-396-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-397-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">
@@ -535,7 +535,7 @@ Thanks to these wonderful people ([emoji key](https://allcontributors.org/docs/e
     <td align="center"><a href="https://bhanuteja.dev/"><img src="https://avatars.githubusercontent.com/u/17903466?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Bhanu Teja Pachipulusu</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=pbteja1998" title="Code">💻</a></td>
     <td align="center"><a href="https://twitter.com/pavestru"><img src="https://avatars.githubusercontent.com/u/10186479?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pavel Struhar</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=pavestru" title="Code">💻</a></td>
     <td align="center"><a href="https://in-thepink.com/"><img src="https://avatars.githubusercontent.com/u/42126368?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Reo Ishiyama</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=reo777" title="Code">💻</a></td>
-    <td align="center"><a href="https://macwright.com/"><img src="https://avatars.githubusercontent.com/u/32314?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tom MacWright</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=tmcw" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://macwright.com/"><img src="https://avatars.githubusercontent.com/u/32314?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tom MacWright</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=tmcw" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=tmcw" title="Tests">⚠️</a> <a href="https://github.com/blitz-js/blitz/commits?author=tmcw" title="Code">💻</a></td>
     <td align="center"><a href="https://francoisbest.com"><img src="https://avatars.githubusercontent.com/u/1174092?v=4?s=100" width="100px;" alt=""/><br /><sub><b>François Best</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=franky47" title="Code">💻</a></td>
   </tr>
   <tr>
@@ -732,6 +732,7 @@ Thanks to these wonderful people ([emoji key](https://allcontributors.org/docs/e
     <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>
+    <td align="center"><a href="https://github.com/paulm17"><img src="https://avatars.githubusercontent.com/u/387463?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Paul</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=paulm17" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=paulm17" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=paulm17" title="Tests">⚠️</a></td>
   </tr>
 </table>
 

apps/toolkit-app-passportjs/package.json

@@ -30,7 +30,7 @@
     "@hookform/error-message": "2.0.0",
     "@hookform/resolvers": "2.9.10",
     "@prisma/client": "4.6.0",
-    "blitz": "workspace:2.0.0-beta.17",
+    "blitz": "workspace:2.0.0-beta.18",
     "next": "12.2.5",
     "openid-client": "5.2.1",
     "prisma": "4.6.0",

apps/toolkit-app/package.json

@@ -30,7 +30,7 @@
     "@hookform/error-message": "2.0.0",
     "@hookform/resolvers": "2.9.10",
     "@prisma/client": "4.6.0",
-    "blitz": "workspace:2.0.0-beta.17",
+    "blitz": "workspace:2.0.0-beta.18",
     "next": "12.2.5",
     "prisma": "4.6.0",
     "react": "18.2.0",

integration-tests/auth/package.json

@@ -21,7 +21,7 @@
     "@blitzjs/config": "workspace:*",
     "@blitzjs/next": "workspace:*",
     "@prisma/client": "4.6.0",
-    "blitz": "workspace:2.0.0-beta.17",
+    "blitz": "workspace:2.0.0-beta.18",
     "lowdb": "3.0.0",
     "next": "12.2.5",
     "prisma": "4.6.0",

integration-tests/no-suspense/app/queries/getBasic.ts

@@ -1,3 +0,0 @@
-export default async function getBasic() {
-  return "basic-result"
-}

integration-tests/no-suspense/app/queries/getNoSuspenseBasic.ts

@@ -0,0 +1,3 @@
+export default async function getNoSuspenseBasic() {
+  return "basic-result"
+}

integration-tests/no-suspense/pages/use-query.tsx

@@ -1,9 +1,9 @@
-import getBasic from "../app/queries/getBasic"
+import getNoSuspenseBasic from "../app/queries/getNoSuspenseBasic"
 import {useQuery} from "@blitzjs/rpc"
 import React from "react"
 
 function Content() {
-  const [result, {isFetching}] = useQuery(getBasic, undefined)
+  const [result, {isFetching}] = useQuery(getNoSuspenseBasic, undefined)
 
   if (isFetching) {
     return <>Loading...</>

integration-tests/react-query-utils/next.config.js

@@ -1,2 +1,6 @@
 const {withBlitz} = require("@blitzjs/next")
-module.exports = withBlitz({})
+module.exports = withBlitz({
+  blitz: {
+    includeRPCFolders: ["../no-suspense/app"],
+  },
+})

integration-tests/react-query-utils/pages/page-with-monorepo-query.tsx

@@ -0,0 +1,35 @@
+import {getQueryData, useQuery} from "@blitzjs/rpc"
+import {Suspense, useState} from "react"
+import getNoSuspenseBasic from "../../no-suspense/app/queries/getNoSuspenseBasic"
+
+function Content() {
+  const [data] = useQuery(getNoSuspenseBasic, undefined)
+  const [newData, setNewData] = useState<string>()
+  return (
+    <div>
+      <div>{data}</div>
+      {newData && <div id="new-data">{newData}</div>}
+      <button
+        id="button"
+        onClick={async () => {
+          const newData = getQueryData(getNoSuspenseBasic, undefined)
+          setNewData(newData)
+        }}
+      >
+        Call getQueryData
+      </button>
+    </div>
+  )
+}
+
+function PageWithGetQueryData() {
+  return (
+    <div id="page">
+      <Suspense fallback={"Loading..."}>
+        <Content />
+      </Suspense>
+    </div>
+  )
+}
+
+export default PageWithGetQueryData

integration-tests/react-query-utils/test/index.test.ts

@@ -32,6 +32,25 @@ const runTests = () => {
     )
   })
 
+  describe("get query data from monorepo", () => {
+    it(
+      "should work",
+      async () => {
+        const browser = await webdriver(appPort, "/page-with-monorepo-query")
+
+        browser.waitForElementByCss("#button", 0)
+        await browser.elementByCss("#button").click()
+
+        browser.waitForElementByCss("#new-data", 0)
+        const newText = await browser.elementByCss("#new-data").text()
+        expect(newText).toMatch(/basic-result/)
+
+        if (browser) await browser.close()
+      },
+      5000 * 60 * 2,
+    )
+  })
+
   describe("prefetch infinite query", () => {
     it(
       "should work",

packages/blitz-auth/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @blitzjs/auth
 
+## 2.0.0-beta.18
+
+### Patch Changes
+
+- blitz@2.0.0-beta.18
+
 ## 2.0.0-beta.17
 
 ### Patch Changes

packages/blitz-auth/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@blitzjs/auth",
-  "version": "2.0.0-beta.17",
+  "version": "2.0.0-beta.18",
   "scripts": {
     "build": "unbuild",
     "predev": "wait-on -d 250 ../blitz/dist/index-server.d.ts",
-    "dev": "pnpm run predev && watch unbuild src --wait=0.2",
+    "dev": "rm -rf dist && pnpm run predev && watch unbuild src --wait=0.2",
     "lint": "eslint . --fix",
     "test": "vitest run",
     "test-watch": "vitest",
@@ -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.17",
+    "blitz": "2.0.0-beta.18",
     "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.17",
+    "@blitzjs/config": "workspace:2.0.0-beta.18",
     "@testing-library/react": "13.4.0",
     "@testing-library/react-hooks": "8.0.1",
     "@types/cookie": "0.4.1",

packages/blitz-next/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @blitzjs/next
 
+## 2.0.0-beta.18
+
+### Patch Changes
+
+- Updated dependencies [72a4e594]
+- Updated dependencies [ed2b0e22]
+- Updated dependencies [c0a3b1ee]
+  - @blitzjs/rpc@2.0.0-beta.18
+
 ## 2.0.0-beta.17
 
 ### Patch Changes

packages/blitz-next/build.config.ts

@@ -2,7 +2,17 @@ import {BuildConfig} from "unbuild"
 
 const config: BuildConfig = {
   entries: ["./src/index-browser", "./src/index-server"],
-  externals: ["index-browser.cjs", "index-browser.mjs", "blitz", ".blitz", "next", "react"],
+  externals: [
+    "index-browser.cjs",
+    "index-browser.mjs",
+    "blitz",
+    ".blitz",
+    "react",
+    "next",
+    "next/head",
+    "next/router",
+    "next/dist/shared/lib/router/router",
+  ],
   declaration: true,
   rollup: {
     emitCJS: true,

packages/blitz-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/next",
-  "version": "2.0.0-beta.17",
+  "version": "2.0.0-beta.18",
   "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.17",
+    "@blitzjs/rpc": "2.0.0-beta.18",
     "@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.17",
+    "@blitzjs/config": "workspace:2.0.0-beta.18",
     "@testing-library/dom": "8.13.0",
     "@testing-library/jest-dom": "5.16.3",
     "@testing-library/react": "13.4.0",
@@ -44,7 +44,7 @@
     "@types/react": "18.0.25",
     "@types/react-dom": "17.0.14",
     "@types/testing-library__react-hooks": "4.0.0",
-    "blitz": "2.0.0-beta.17",
+    "blitz": "2.0.0-beta.18",
     "cross-spawn": "7.0.3",
     "find-up": "4.1.0",
     "next": "12.2.5",

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

@@ -222,6 +222,7 @@ export const setupBlitzServer = ({plugins, onError, logger}: SetupBlitzOptions)
 export interface BlitzConfig extends NextConfig {
   blitz?: {
     resolverPath?: ResolverPathOptions
+    includeRPCFolders?: string[]
     customServer?: {
       hotReload?: boolean
     }
@@ -252,6 +253,7 @@ export function withBlitz(nextConfig: BlitzConfig = {}) {
         webpackConfig: config,
         webpackRuleOptions: {
           resolverPath: nextConfig.blitz?.resolverPath,
+          includeRPCFolders: nextConfig.blitz?.includeRPCFolders,
         },
       })
       if (typeof nextConfig.webpack === "function") {

packages/blitz-rpc/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @blitzjs/rpc
 
+## 2.0.0-beta.18
+
+### Minor Changes
+
+- 72a4e594: internal: remove unneeed useSession from useQuery hooks
+- c0a3b1ee: Fix mutability bug in RPC configuration
+
+### Patch Changes
+
+- ed2b0e22: Add ability to put your query and mutation resolvers in a separate monorepo folder, allowing you to use them in multiple apps.
+  - @blitzjs/auth@2.0.0-beta.18
+
 ## 2.0.0-beta.17
 
 ### Patch Changes

packages/blitz-rpc/build.config.ts

@@ -17,6 +17,10 @@ const config: BuildConfig = {
     "blitz",
     "next",
     "zod",
+    "next",
+    "next/router",
+    "next/dist/client/normalize-trailing-slash",
+    "next/dist/client/add-base-path",
   ],
   declaration: true,
   rollup: {

packages/blitz-rpc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/rpc",
-  "version": "2.0.0-beta.17",
+  "version": "2.0.0-beta.18",
   "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,7 @@
     "dist/**"
   ],
   "dependencies": {
-    "@blitzjs/auth": "2.0.0-beta.17",
+    "@blitzjs/auth": "2.0.0-beta.18",
     "@swc/core": "1.3.7",
     "@tanstack/react-query": "4.0.10",
     "b64-lite": "1.4.0",
@@ -31,11 +31,11 @@
     "supports-color": "8.1.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.17",
+    "@blitzjs/config": "workspace:2.0.0-beta.18",
     "@types/debug": "4.1.7",
     "@types/react": "18.0.25",
     "@types/react-dom": "17.0.14",
-    "blitz": "2.0.0-beta.17",
+    "blitz": "2.0.0-beta.18",
     "next": "12.2.5",
     "react": "18.2.0",
     "react-dom": "18.2.0",

packages/blitz-rpc/src/data-client/react-query.tsx

@@ -10,7 +10,6 @@ import {
   UseMutationOptions,
   UseMutationResult,
 } from "@tanstack/react-query"
-import {useSession} from "@blitzjs/auth"
 import {isServer, FirstParam, PromiseReturnType, AsyncFunc} from "blitz"
 import {
   emptyQueryFn,
@@ -73,11 +72,6 @@ export function useQuery<
   const suspenseEnabled = Boolean(globalThis.__BLITZ_SUSPENSE_ENABLED)
   let enabled = isServer && suspenseEnabled ? false : options?.enabled ?? options?.enabled !== null
   const suspense = enabled === false ? false : options?.suspense
-  const session = useSession({suspense})
-  if (session.isLoading) {
-    enabled = false
-  }
-
   const routerIsReady = useRouter().isReady || (isServer && suspenseEnabled)
   const enhancedResolverRpcClient = sanitizeQuery(queryFn)
   const queryKey = getQueryKey(queryFn, params)
@@ -157,12 +151,6 @@ export function usePaginatedQuery<
   const suspenseEnabled = Boolean(globalThis.__BLITZ_SUSPENSE_ENABLED)
   let enabled = isServer && suspenseEnabled ? false : options?.enabled ?? options?.enabled !== null
   const suspense = enabled === false ? false : options?.suspense
-
-  const session = useSession({suspense})
-  if (session.isLoading) {
-    enabled = false
-  }
-
   const routerIsReady = useRouter().isReady || (isServer && suspenseEnabled)
   const enhancedResolverRpcClient = sanitizeQuery(queryFn)
   const queryKey = getQueryKey(queryFn, params)
@@ -252,11 +240,6 @@ export function useInfiniteQuery<
   const suspenseEnabled = Boolean(globalThis.__BLITZ_SUSPENSE_ENABLED)
   let enabled = isServer && suspenseEnabled ? false : options?.enabled ?? options?.enabled !== null
   const suspense = enabled === false ? false : options?.suspense
-  const session = useSession({suspense})
-  if (session.isLoading) {
-    enabled = false
-  }
-
   const routerIsReady = useRouter().isReady || (isServer && suspenseEnabled)
   const enhancedResolverRpcClient = sanitizeQuery(queryFn)
   const queryKey = getInfiniteQueryKey(queryFn, getQueryParams)

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

@@ -61,6 +61,7 @@ const loaderServerResolvers = resolve(dir, "./loader-server-resolvers.cjs")
 
 interface WebpackRuleOptions {
   resolverPath: ResolverPathOptions | undefined
+  includeRPCFolders: string[] | undefined
 }
 
 interface WebpackRule {

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

@@ -17,12 +17,13 @@ export async function loader(this: Loader, input: string): Promise<string> {
   const compiler = this._compiler!
   const id = this.resource
   const root = this._compiler!.context
+  const rpcFolders = this.query.includeRPCFolders ? this.query.includeRPCFolders : []
 
   const isSSR = compiler.name === "server"
   if (isSSR) {
     this.cacheable(false)
 
-    const resolvers = await collectResolvers(root, ["ts", "js"])
+    const resolvers = await collectResolvers(root, rpcFolders, ["ts", "js"])
     return await transformBlitzRpcServer(
       input,
       toPosixPath(id),
@@ -56,17 +57,30 @@ export async function transformBlitzRpcServer(
   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}'));`
+    const routePath = convertPageFilePathToRoutePath(slash(resolverFilePath), options?.resolverPath)
+
+    code += `__internal_addBlitzRpcResolver('${routePath}',() => import('${slash(
+      resolverFilePath,
+    )}'));`
     code += "\n"
   }
   // console.log("NEW CODE", code)
   return code
 }
 
-export function collectResolvers(directory: string, pageExtensions: string[]): Promise<string[]> {
-  return recursiveFindResolvers(directory, buildPageExtensionRegex(pageExtensions))
+export function collectResolvers(
+  directory: string,
+  rpcFolders: string[],
+  pageExtensions: string[],
+): Promise<string[]> {
+  return recursiveFindResolvers(
+    directory,
+    buildPageExtensionRegex(pageExtensions),
+    undefined,
+    [],
+    directory,
+    rpcFolders,
+  )
 }
 
 export async function recursiveFindResolvers(
@@ -75,11 +89,13 @@ export async function recursiveFindResolvers(
   ignore?: RegExp,
   arr: string[] = [],
   rootDir: string = dir,
+  rpcFolders: string[] = [],
 ): Promise<string[]> {
   let folders = await promises.readdir(dir)
 
   if (dir === rootDir) {
     folders = folders.filter((folder) => topLevelFoldersThatMayContainResolvers.includes(folder))
+    folders.push(...rpcFolders)
   }
 
   await Promise.all(
@@ -90,17 +106,18 @@ export async function recursiveFindResolvers(
       const pathStat = await promises.stat(absolutePath)
 
       if (pathStat.isDirectory()) {
-        await recursiveFindResolvers(absolutePath, filter, ignore, arr, rootDir)
-        return
+        if (!absolutePath.includes("node_modules")) {
+          await recursiveFindResolvers(absolutePath, filter, ignore, arr, rootDir)
+          return
+        }
       }
 
       if (!filter.test(part)) {
         return
       }
 
-      const relativeFromRoot = absolutePath.replace(rootDir, "")
-      if (getIsRpcFile(relativeFromRoot)) {
-        arr.push(relativeFromRoot)
+      if (getIsRpcFile(absolutePath)) {
+        arr.push(absolutePath)
         return
       }
     }),

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

@@ -4,6 +4,7 @@ import {ResolverPathOptions} from "./index-server"
 
 export interface LoaderOptions {
   resolverPath: ResolverPathOptions
+  includeRPCFolders?: string[]
 }
 
 export interface Loader {

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

@@ -0,0 +1,30 @@
+import {describe, expect, it} from "vitest"
+import {getResolverConfig} from "./parse-rpc-config"
+
+describe("getResolverConfig", () => {
+  it("base case: no configuration", async () => {
+    const result = getResolverConfig("")
+    expect(result).toHaveProperty("httpMethod", "POST")
+  })
+
+  it("customized to get", async () => {
+    const result = getResolverConfig(`
+      export const config = {
+        httpMethod: 'GET'
+      }
+    `)
+    expect(result).toHaveProperty("httpMethod", "GET")
+  })
+
+  it("evaluation is hermetic", async () => {
+    expect(
+      getResolverConfig(`
+      export const config = {
+        httpMethod: 'GET'
+      }
+    `),
+    ).toHaveProperty("httpMethod", "GET")
+
+    expect(getResolverConfig(``)).toHaveProperty("httpMethod", "POST")
+  })
+})

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

@@ -3,12 +3,10 @@ import {ResolverConfig} from "blitz"
 
 type _ResolverType = "GET" | "POST"
 
-const defaultResolverConfig: ResolverConfig = {
-  httpMethod: "POST",
-}
-
 export function getResolverConfig(content: string): ResolverConfig {
-  const resolverConfig = defaultResolverConfig
+  const resolverConfig: ResolverConfig = {
+    httpMethod: "POST",
+  }
   const resolver = parseSync(content, {
     syntax: "typescript",
     target: "es2020",

packages/blitz/CHANGELOG.md

@@ -1,5 +1,11 @@
 # blitz
 
+## 2.0.0-beta.18
+
+### Patch Changes
+
+- @blitzjs/generator@2.0.0-beta.18
+
 ## 2.0.0-beta.17
 
 ### Patch Changes

packages/blitz/bin/blitz

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-require("blitz/dist/index.cjs")
+require("../dist/index.cjs")

packages/blitz/package.json

@@ -1,9 +1,9 @@
 {
   "name": "blitz",
-  "version": "2.0.0-beta.17",
+  "version": "2.0.0-beta.18",
   "scripts": {
     "build": "unbuild",
-    "dev": "pnpm run predev && watch unbuild src --wait=0.2",
+    "dev": "rm -rf dist && pnpm run predev && watch unbuild src --wait=0.2",
     "lint": "eslint . --fix",
     "test": "vitest run",
     "test-watch": "vitest",
@@ -25,7 +25,7 @@
     "blitz": "bin/blitz"
   },
   "dependencies": {
-    "@blitzjs/generator": "2.0.0-beta.17",
+    "@blitzjs/generator": "2.0.0-beta.18",
     "@mrleebo/prisma-ast": "0.2.6",
     "@types/global-agent": "2.1.1",
     "arg": "5.0.1",
@@ -73,7 +73,7 @@
     "watchpack": "2.1.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.17",
+    "@blitzjs/config": "workspace:2.0.0-beta.18",
     "@types/cookie": "0.4.1",
     "@types/cross-spawn": "6.0.2",
     "@types/debug": "4.1.7",

packages/codemod/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @blitzjs/codemod
 
+## 2.0.0-beta.18
+
+### Patch Changes
+
+- @blitzjs/generator@2.0.0-beta.18
+- blitz@2.0.0-beta.18
+
 ## 2.0.0-beta.17
 
 ### Patch Changes

packages/codemod/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/codemod",
-  "version": "2.0.0-beta.17",
+  "version": "2.0.0-beta.18",
   "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.17",
+    "@blitzjs/generator": "2.0.0-beta.18",
     "arg": "5.0.1",
-    "blitz": "2.0.0-beta.17",
+    "blitz": "2.0.0-beta.18",
     "chalk": "^4.1.0",
     "cross-spawn": "7.0.3",
     "debug": "4.3.3",

packages/config/CHANGELOG.md

@@ -1,5 +1,7 @@
 # @blitzjs/config
 
+## 2.0.0-beta.18
+
 ## 2.0.0-beta.17
 
 ## 2.0.0-beta.16

packages/config/package.json

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

packages/generator/CHANGELOG.md

@@ -1,5 +1,7 @@
 # @blitzjs/generator
 
+## 2.0.0-beta.18
+
 ## 2.0.0-beta.17
 
 ### Patch Changes

packages/generator/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/generator",
-  "version": "2.0.0-beta.17",
+  "version": "2.0.0-beta.18",
   "scripts": {
     "dev": "watch unbuild src --wait=0.2",
     "build": "unbuild && pnpm build:templates",
@@ -47,7 +47,7 @@
     "vinyl": "2.2.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "2.0.0-beta.17",
+    "@blitzjs/config": "2.0.0-beta.18",
     "@juanm04/cpx": "2.0.1",
     "@types/babel__core": "7.1.19",
     "@types/diff": "5.0.2",

packages/pkg-template/package.json

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

pnpm-lock.yaml

@@ -50,7 +50,7 @@ importers:
       "@types/preview-email": 2.0.1
       "@types/react": 18.0.25
       "@typescript-eslint/eslint-plugin": 5.42.1
-      blitz: workspace:2.0.0-beta.16
+      blitz: workspace:2.0.0-beta.17
       eslint: 8.27.0
       eslint-config-next: 12.3.1
       eslint-config-prettier: 8.5.0
@@ -125,7 +125,7 @@ importers:
       "@types/preview-email": 2.0.1
       "@types/react": 18.0.25
       "@typescript-eslint/eslint-plugin": 5.42.1
-      blitz: workspace:2.0.0-beta.16
+      blitz: workspace:2.0.0-beta.17
       eslint: 8.27.0
       eslint-config-next: 12.3.1
       eslint-config-prettier: 8.5.0
@@ -245,7 +245,7 @@ importers:
       "@types/node-fetch": 2.6.1
       "@types/react": 18.0.25
       b64-lite: 1.4.0
-      blitz: workspace:2.0.0-beta.16
+      blitz: workspace:2.0.0-beta.17
       eslint: 8.27.0
       fs-extra: 10.0.1
       get-port: 6.1.2
@@ -460,7 +460,7 @@ importers:
       "@vitejs/plugin-react": 1.3.0
       delay: 5.0.0
       eslint: 8.27.0
-      eslint-config-next: 13.0.2_rmayb2veg2btbq6mbmnyivgasy
+      eslint-config-next: 13.0.3_rmayb2veg2btbq6mbmnyivgasy
       eslint-plugin-testing-library: 5.0.1_rmayb2veg2btbq6mbmnyivgasy
       jsdom: 19.0.0
       typescript: 4.8.4
@@ -660,8 +660,8 @@ importers:
 
   packages/blitz:
     specifiers:
-      "@blitzjs/config": workspace:2.0.0-beta.16
-      "@blitzjs/generator": 2.0.0-beta.16
+      "@blitzjs/config": workspace:2.0.0-beta.17
+      "@blitzjs/generator": 2.0.0-beta.17
       "@mrleebo/prisma-ast": 0.2.6
       "@types/cookie": 0.4.1
       "@types/cross-spawn": 6.0.2
@@ -807,7 +807,7 @@ importers:
 
   packages/blitz-auth:
     specifiers:
-      "@blitzjs/config": workspace:2.0.0-beta.16
+      "@blitzjs/config": workspace:2.0.0-beta.17
       "@testing-library/react": 13.4.0
       "@testing-library/react-hooks": 8.0.1
       "@types/b64-lite": 1.3.0
@@ -821,7 +821,7 @@ importers:
       "@types/secure-password": 3.1.1
       b64-lite: 1.4.0
       bad-behavior: 1.0.1
-      blitz: 2.0.0-beta.16
+      blitz: 2.0.0-beta.17
       cookie: 0.4.1
       cookie-session: 2.0.0
       debug: 4.3.3
@@ -874,8 +874,8 @@ importers:
 
   packages/blitz-next:
     specifiers:
-      "@blitzjs/config": workspace:2.0.0-beta.16
-      "@blitzjs/rpc": 2.0.0-beta.16
+      "@blitzjs/config": workspace:2.0.0-beta.17
+      "@blitzjs/rpc": 2.0.0-beta.17
       "@tanstack/react-query": 4.0.10
       "@testing-library/dom": 8.13.0
       "@testing-library/jest-dom": 5.16.3
@@ -887,7 +887,7 @@ importers:
       "@types/react": 18.0.25
       "@types/react-dom": 17.0.14
       "@types/testing-library__react-hooks": 4.0.0
-      blitz: 2.0.0-beta.16
+      blitz: 2.0.0-beta.17
       cross-spawn: 7.0.3
       debug: 4.3.3
       find-up: 4.1.0
@@ -937,8 +937,8 @@ importers:
 
   packages/blitz-rpc:
     specifiers:
-      "@blitzjs/auth": 2.0.0-beta.16
-      "@blitzjs/config": workspace:2.0.0-beta.16
+      "@blitzjs/auth": 2.0.0-beta.17
+      "@blitzjs/config": workspace:2.0.0-beta.17
       "@swc/core": 1.3.7
       "@tanstack/react-query": 4.0.10
       "@types/debug": 4.1.7
@@ -946,7 +946,7 @@ importers:
       "@types/react-dom": 17.0.14
       b64-lite: 1.4.0
       bad-behavior: 1.0.1
-      blitz: 2.0.0-beta.16
+      blitz: 2.0.0-beta.17
       chalk: ^4.1.0
       debug: 4.3.3
       next: 12.2.5
@@ -990,12 +990,12 @@ importers:
       "@babel/plugin-syntax-typescript": 7.17.12
       "@babel/preset-env": 7.12.10
       "@blitzjs/config": workspace:*
-      "@blitzjs/generator": 2.0.0-beta.16
+      "@blitzjs/generator": 2.0.0-beta.17
       "@types/jscodeshift": 0.11.2
       "@types/node": 18.11.9
       arg: 5.0.1
       ast-types: 0.14.2
-      blitz: 2.0.0-beta.16
+      blitz: 2.0.0-beta.17
       chalk: ^4.1.0
       cross-spawn: 7.0.3
       debug: 4.3.3
@@ -1050,7 +1050,7 @@ importers:
       "@babel/plugin-transform-typescript": 7.12.1
       "@babel/preset-env": 7.12.10
       "@babel/types": 7.12.10
-      "@blitzjs/config": 2.0.0-beta.16
+      "@blitzjs/config": 2.0.0-beta.17
       "@juanm04/cpx": 2.0.1
       "@mrleebo/prisma-ast": 0.4.1
       "@types/babel__core": 7.1.19
@@ -1145,7 +1145,7 @@ importers:
 
   packages/pkg-template:
     specifiers:
-      "@blitzjs/config": 2.0.0-beta.16
+      "@blitzjs/config": 2.0.0-beta.17
       "@types/react": 18.0.25
       "@types/react-dom": 17.0.14
       "@typescript-eslint/eslint-plugin": 5.42.1
@@ -1169,7 +1169,7 @@ importers:
   recipes/base-web:
     specifiers:
       "@types/jscodeshift": 0.11.2
-      blitz: 2.0.0-beta.16
+      blitz: 2.0.0-beta.17
       jscodeshift: 0.13.0
     dependencies:
       blitz: link:../../packages/blitz
@@ -1180,7 +1180,7 @@ importers:
   recipes/bulma:
     specifiers:
       "@types/jscodeshift": 0.11.2
-      blitz: 2.0.0-beta.16
+      blitz: 2.0.0-beta.17
       jscodeshift: 0.13.0
     dependencies:
       blitz: link:../../packages/blitz
@@ -1192,7 +1192,7 @@ importers:
     specifiers:
       "@types/jscodeshift": 0.11.2
       ast-types: 0.14.2
-      blitz: 2.0.0-beta.16
+      blitz: 2.0.0-beta.17
       jscodeshift: 0.13.0
     dependencies:
       blitz: link:../../packages/blitz
@@ -1205,7 +1205,7 @@ importers:
     specifiers:
       "@types/jscodeshift": 0.11.2
       ast-types: 0.14.2
-      blitz: 2.0.0-beta.16
+      blitz: 2.0.0-beta.17
       jscodeshift: 0.13.0
     dependencies:
       blitz: link:../../packages/blitz
@@ -1217,7 +1217,7 @@ importers:
   recipes/emotion:
     specifiers:
       "@types/jscodeshift": 0.11.2
-      blitz: 2.0.0-beta.16
+      blitz: 2.0.0-beta.17
       jscodeshift: 0.13.0
     dependencies:
       blitz: link:../../packages/blitz
@@ -1227,20 +1227,20 @@ importers:
 
   recipes/gh-action-yarn-mariadb:
     specifiers:
-      blitz: 2.0.0-beta.16
+      blitz: 2.0.0-beta.17
     dependencies:
       blitz: link:../../packages/blitz
 
   recipes/gh-action-yarn-postgres:
     specifiers:
-      blitz: 2.0.0-beta.16
+      blitz: 2.0.0-beta.17
     dependencies:
       blitz: link:../../packages/blitz
 
   recipes/ghost:
     specifiers:
       "@types/jscodeshift": 0.11.2
-      blitz: 2.0.0-beta.16
+      blitz: 2.0.0-beta.17
       jscodeshift: 0.13.0
     dependencies:
       blitz: link:../../packages/blitz
@@ -1251,7 +1251,7 @@ importers:
   recipes/graphql-apollo-server:
     specifiers:
       "@types/jscodeshift": 0.11.2
-      blitz: 2.0.0-beta.16
+      blitz: 2.0.0-beta.17
       jscodeshift: 0.13.0
       uuid: ^8.3.1
     dependencies:
@@ -1264,7 +1264,7 @@ importers:
   recipes/logrocket:
     specifiers:
       "@types/jscodeshift": 0.11.2
-      blitz: 2.0.0-beta.16
+      blitz: 2.0.0-beta.17
       jscodeshift: 0.13.0
     dependencies:
       blitz: link:../../packages/blitz
@@ -1275,7 +1275,7 @@ importers:
   recipes/material-ui:
     specifiers:
       "@types/jscodeshift": 0.11.2
-      blitz: 2.0.0-beta.16
+      blitz: 2.0.0-beta.17
       jscodeshift: 0.13.0
     dependencies:
       blitz: link:../../packages/blitz
@@ -1287,7 +1287,7 @@ importers:
     specifiers:
       "@types/jscodeshift": 0.11.2
       ast-types: 0.14.2
-      blitz: 2.0.0-beta.16
+      blitz: 2.0.0-beta.17
       jscodeshift: 0.13.0
     dependencies:
       blitz: link:../../packages/blitz
@@ -1298,13 +1298,13 @@ importers:
 
   recipes/passenger:
     specifiers:
-      blitz: 2.0.0-beta.16
+      blitz: 2.0.0-beta.17
     dependencies:
       blitz: link:../../packages/blitz
 
   recipes/quirrel:
     specifiers:
-      blitz: 2.0.0-beta.16
+      blitz: 2.0.0-beta.17
     dependencies:
       blitz: link:../../packages/blitz
 
@@ -1312,7 +1312,7 @@ importers:
     specifiers:
       "@types/jscodeshift": 0.11.2
       ast-types: 0.14.2
-      blitz: 2.0.0-beta.16
+      blitz: 2.0.0-beta.17
       jscodeshift: 0.13.0
     dependencies:
       blitz: link:../../packages/blitz
@@ -1323,14 +1323,14 @@ importers:
 
   recipes/render:
     specifiers:
-      blitz: 2.0.0-beta.16
+      blitz: 2.0.0-beta.17
     dependencies:
       blitz: link:../../packages/blitz
 
   recipes/secureheaders:
     specifiers:
       "@types/jscodeshift": 0.11.2
-      blitz: 2.0.0-beta.16
+      blitz: 2.0.0-beta.17
       jscodeshift: 0.13.0
       uuid: ^8.3.1
     dependencies:
@@ -1343,7 +1343,7 @@ importers:
   recipes/stitches:
     specifiers:
       "@types/jscodeshift": 0.11.2
-      blitz: 2.0.0-beta.16
+      blitz: 2.0.0-beta.17
       jscodeshift: 0.13.0
     dependencies:
       blitz: link:../../packages/blitz
@@ -1355,7 +1355,7 @@ importers:
     specifiers:
       "@types/jscodeshift": 0.11.2
       ast-types: 0.14.2
-      blitz: 2.0.0-beta.16
+      blitz: 2.0.0-beta.17
       jscodeshift: 0.13.0
     dependencies:
       blitz: link:../../packages/blitz
@@ -1367,7 +1367,7 @@ importers:
   recipes/tailwind:
     specifiers:
       "@types/jscodeshift": 0.11.2
-      blitz: 2.0.0-beta.16
+      blitz: 2.0.0-beta.17
       jscodeshift: 0.13.0
     dependencies:
       blitz: link:../../packages/blitz
@@ -1379,7 +1379,7 @@ importers:
     specifiers:
       "@types/jscodeshift": 0.11.2
       ast-types: 0.14.2
-      blitz: 2.0.0-beta.16
+      blitz: 2.0.0-beta.17
       jscodeshift: 0.13.0
     dependencies:
       blitz: link:../../packages/blitz
@@ -1391,7 +1391,7 @@ importers:
   recipes/vanilla-extract:
     specifiers:
       "@types/jscodeshift": 0.11.2
-      blitz: 2.0.0-beta.16
+      blitz: 2.0.0-beta.17
       jscodeshift: 0.13.0
     dependencies:
       blitz: link:../../packages/blitz
@@ -3487,7 +3487,6 @@ packages:
       semver: 5.7.1
     transitivePeerDependencies:
       - supports-color
-    dev: false
 
   /@babel/preset-flow/7.17.12_@babel+core@7.18.2:
     resolution:
@@ -4558,10 +4557,10 @@ packages:
     dependencies:
       glob: 7.1.7
 
-  /@next/eslint-plugin-next/13.0.2:
+  /@next/eslint-plugin-next/13.0.3:
     resolution:
       {
-        integrity: sha512-W+fIIIaFU7Kct7Okx91C7XDRGolv/w2RUenX2yZFeeNVcuVzDIKUcNmckrYbYcwrNQUSXmtwrs3g8xwast0YtA==,
+        integrity: sha512-slmTAHNKDyc7jhx4VF8lFbmOPWJ3PShtUUWpb6x9+ga59CyOxgP6AdcDhxfapnWYACKe/TwYiaveufu7LqXgZg==,
       }
     dependencies:
       glob: 7.1.7
@@ -6278,7 +6277,6 @@ packages:
       typescript: 4.8.4
     transitivePeerDependencies:
       - supports-color
-    dev: false
 
   /@typescript-eslint/experimental-utils/5.28.0_rmayb2veg2btbq6mbmnyivgasy:
     resolution:
@@ -6340,6 +6338,29 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
+  /@typescript-eslint/parser/5.43.0_rmayb2veg2btbq6mbmnyivgasy:
+    resolution:
+      {
+        integrity: sha512-2iHUK2Lh7PwNUlhFxxLI2haSDNyXvebBO9izhjhMoDC+S3XI9qt2DGFUsiJ89m2k7gGYch2aEpYqV5F/+nwZug==,
+      }
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+      typescript: "*"
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+    dependencies:
+      "@typescript-eslint/scope-manager": 5.43.0
+      "@typescript-eslint/types": 5.43.0
+      "@typescript-eslint/typescript-estree": 5.43.0_typescript@4.8.4
+      debug: 4.3.4
+      eslint: 8.27.0
+      typescript: 4.8.4
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@typescript-eslint/parser/5.9.1_nw6v2wse7au2evadw7vu3hneg4:
     resolution:
       {
@@ -6383,7 +6404,6 @@ packages:
       typescript: 4.8.4
     transitivePeerDependencies:
       - supports-color
-    dev: false
 
   /@typescript-eslint/scope-manager/5.28.0:
     resolution:
@@ -6405,6 +6425,17 @@ packages:
       "@typescript-eslint/types": 5.42.1
       "@typescript-eslint/visitor-keys": 5.42.1
 
+  /@typescript-eslint/scope-manager/5.43.0:
+    resolution:
+      {
+        integrity: sha512-XNWnGaqAtTJsUiZaoiGIrdJYHsUOd3BZ3Qj5zKp9w6km6HsrjPk/TGZv0qMTWyWj0+1QOqpHQ2gZOLXaGA9Ekw==,
+      }
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dependencies:
+      "@typescript-eslint/types": 5.43.0
+      "@typescript-eslint/visitor-keys": 5.43.0
+    dev: true
+
   /@typescript-eslint/scope-manager/5.9.1:
     resolution:
       {
@@ -6497,6 +6528,14 @@ packages:
       }
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
 
+  /@typescript-eslint/types/5.43.0:
+    resolution:
+      {
+        integrity: sha512-jpsbcD0x6AUvV7tyOlyvon0aUsQpF8W+7TpJntfCUWU1qaIKu2K34pMwQKSzQH8ORgUrGYY6pVIh1Pi8TNeteg==,
+      }
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dev: true
+
   /@typescript-eslint/types/5.9.1:
     resolution:
       {
@@ -6574,6 +6613,30 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
+  /@typescript-eslint/typescript-estree/5.43.0_typescript@4.8.4:
+    resolution:
+      {
+        integrity: sha512-BZ1WVe+QQ+igWal2tDbNg1j2HWUkAa+CVqdU79L4HP9izQY6CNhXfkNwd1SS4+sSZAP/EthI1uiCSY/+H0pROg==,
+      }
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      typescript: "*"
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+    dependencies:
+      "@typescript-eslint/types": 5.43.0
+      "@typescript-eslint/visitor-keys": 5.43.0
+      debug: 4.3.4
+      globby: 11.1.0
+      is-glob: 4.0.3
+      semver: 7.3.7
+      tsutils: 3.21.0_typescript@4.8.4
+      typescript: 4.8.4
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@typescript-eslint/typescript-estree/5.9.1_rlpflyxsp53dgdidn3vadezrry:
     resolution:
       {
@@ -6731,6 +6794,17 @@ packages:
       "@typescript-eslint/types": 5.42.1
       eslint-visitor-keys: 3.3.0
 
+  /@typescript-eslint/visitor-keys/5.43.0:
+    resolution:
+      {
+        integrity: sha512-icl1jNH/d18OVHLfcwdL3bWUKsBeIiKYTGxMJCoGe7xFht+E4QgzOqoWYrU8XSLJWhVw8nTacbm03v23J/hFTg==,
+      }
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dependencies:
+      "@typescript-eslint/types": 5.43.0
+      eslint-visitor-keys: 3.3.0
+    dev: true
+
   /@typescript-eslint/visitor-keys/5.9.1:
     resolution:
       {
@@ -10005,12 +10079,11 @@ packages:
     transitivePeerDependencies:
       - eslint-import-resolver-webpack
       - supports-color
-    dev: false
 
-  /eslint-config-next/13.0.2_rmayb2veg2btbq6mbmnyivgasy:
+  /eslint-config-next/13.0.3_rmayb2veg2btbq6mbmnyivgasy:
     resolution:
       {
-        integrity: sha512-SrrHp+zBDYLjOFZdM5b9aW/pliK687Xxfa+qpDuL08Z04ReHhmz3L+maXaAqgrEVZHQximP7nh0El4yNDJW+CA==,
+        integrity: sha512-i2JoQP8gGv303GjXTonA27fm1ckRRkRoAP1WYEQgN0D2DDoFeBPqlJgHlMHnXKWjmNct/sW8jQEvy9am2juc8g==,
       }
     peerDependencies:
       eslint: ^7.23.0 || ^8.0.0
@@ -10019,13 +10092,13 @@ packages:
       typescript:
         optional: true
     dependencies:
-      "@next/eslint-plugin-next": 13.0.2
+      "@next/eslint-plugin-next": 13.0.3
       "@rushstack/eslint-patch": 1.1.3
-      "@typescript-eslint/parser": 5.28.0_rmayb2veg2btbq6mbmnyivgasy
+      "@typescript-eslint/parser": 5.43.0_rmayb2veg2btbq6mbmnyivgasy
       eslint: 8.27.0
       eslint-import-resolver-node: 0.3.6
       eslint-import-resolver-typescript: 2.7.1_dcpv4nbdr5ks2h5677xdltrk6e
-      eslint-plugin-import: 2.26.0_7sezpqhbdjczyeiiusolu3czuy
+      eslint-plugin-import: 2.26.0_ttnp75sbivpcvanbhjbkcsh3ly
       eslint-plugin-jsx-a11y: 6.5.1_eslint@8.27.0
       eslint-plugin-react: 7.31.8_eslint@8.27.0
       eslint-plugin-react-hooks: 4.5.0_eslint@8.27.0
@@ -10043,7 +10116,6 @@ packages:
     hasBin: true
     peerDependencies:
       eslint: ">=7.0.0"
-    dev: false
 
   /eslint-config-prettier/8.5.0_eslint@8.27.0:
     resolution:
@@ -10080,7 +10152,7 @@ packages:
     dependencies:
       debug: 4.3.4
       eslint: 8.27.0
-      eslint-plugin-import: 2.26.0_7sezpqhbdjczyeiiusolu3czuy
+      eslint-plugin-import: 2.26.0_ttnp75sbivpcvanbhjbkcsh3ly
       glob: 7.2.0
       is-glob: 4.0.3
       resolve: 1.22.0
@@ -10137,6 +10209,36 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
+  /eslint-module-utils/2.7.3_rmba4edv35vyqs75pdxciqmxgu:
+    resolution:
+      {
+        integrity: sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==,
+      }
+    engines: {node: ">=4"}
+    peerDependencies:
+      "@typescript-eslint/parser": "*"
+      eslint-import-resolver-node: "*"
+      eslint-import-resolver-typescript: "*"
+      eslint-import-resolver-webpack: "*"
+    peerDependenciesMeta:
+      "@typescript-eslint/parser":
+        optional: true
+      eslint-import-resolver-node:
+        optional: true
+      eslint-import-resolver-typescript:
+        optional: true
+      eslint-import-resolver-webpack:
+        optional: true
+    dependencies:
+      "@typescript-eslint/parser": 5.43.0_rmayb2veg2btbq6mbmnyivgasy
+      debug: 3.2.7
+      eslint-import-resolver-node: 0.3.6
+      eslint-import-resolver-typescript: 2.7.1_dcpv4nbdr5ks2h5677xdltrk6e
+      find-up: 2.1.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /eslint-plugin-import/2.26.0_7sezpqhbdjczyeiiusolu3czuy:
     resolution:
       {
@@ -10171,6 +10273,40 @@ packages:
       - supports-color
     dev: true
 
+  /eslint-plugin-import/2.26.0_ttnp75sbivpcvanbhjbkcsh3ly:
+    resolution:
+      {
+        integrity: sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==,
+      }
+    engines: {node: ">=4"}
+    peerDependencies:
+      "@typescript-eslint/parser": "*"
+      eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8
+    peerDependenciesMeta:
+      "@typescript-eslint/parser":
+        optional: true
+    dependencies:
+      "@typescript-eslint/parser": 5.43.0_rmayb2veg2btbq6mbmnyivgasy
+      array-includes: 3.1.5
+      array.prototype.flat: 1.3.0
+      debug: 2.6.9
+      doctrine: 2.1.0
+      eslint: 8.27.0
+      eslint-import-resolver-node: 0.3.6
+      eslint-module-utils: 2.7.3_rmba4edv35vyqs75pdxciqmxgu
+      has: 1.0.3
+      is-core-module: 2.8.1
+      is-glob: 4.0.3
+      minimatch: 3.1.2
+      object.values: 1.1.5
+      resolve: 1.22.0
+      tsconfig-paths: 3.14.1
+    transitivePeerDependencies:
+      - eslint-import-resolver-typescript
+      - eslint-import-resolver-webpack
+      - supports-color
+    dev: true
+
   /eslint-plugin-import/2.26.0_xtdmsd4adcznatktegie3poqce:
     resolution:
       {
@@ -20009,4 +20145,4 @@ packages:
     resolution:
       {
         integrity: sha512-LYjZsEDhCdYET9ikFu6dVPGp2YH9DegXjdJToSzD9rO6fy4qiRYFoyEYwps88OseJlPyl2NOe2iJuhEhL7IpEA==,
-      }
+      }

recipes/base-web/package.json

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

recipes/bulma/package.json

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

recipes/bumbag-ui/package.json

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

recipes/chakra-ui/package.json

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

recipes/emotion/package.json

@@ -22,7 +22,7 @@
   },
   "homepage": "https://github.com/blitz-js/blitz#readme",
   "dependencies": {
-    "blitz": "2.0.0-beta.17",
+    "blitz": "2.0.0-beta.18",
     "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": "2.0.0-beta.17"
+    "blitz": "2.0.0-beta.18"
   }
 }

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

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

recipes/ghost/package.json

@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/blitz-js/blitz#readme",
   "dependencies": {
-    "blitz": "2.0.0-beta.17",
+    "blitz": "2.0.0-beta.18",
     "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": "2.0.0-beta.17",
+    "blitz": "2.0.0-beta.18",
     "jscodeshift": "0.13.0",
     "uuid": "^8.3.1"
   },

recipes/logrocket/package.json

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

recipes/material-ui/package.json

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

recipes/next-ui/package.json

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

recipes/passenger/package.json

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

recipes/quirrel/package.json

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

recipes/reflexjs/package.json

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

recipes/render/package.json

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

recipes/secureheaders/package.json

@@ -22,7 +22,7 @@
   },
   "homepage": "https://github.com/blitz-js/blitz#readme",
   "dependencies": {
-    "blitz": "2.0.0-beta.17",
+    "blitz": "2.0.0-beta.18",
     "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": "2.0.0-beta.17",
+    "blitz": "2.0.0-beta.18",
     "jscodeshift": "0.13.0"
   },
   "devDependencies": {

recipes/styled-components/package.json

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

recipes/tailwind/package.json

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

recipes/theme-ui/package.json

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

recipes/vanilla-extract/package.json

@@ -25,7 +25,7 @@
   },
   "homepage": "https://github.com/blitz-js/blitz#readme",
   "dependencies": {
-    "blitz": "2.0.0-beta.17",
+    "blitz": "2.0.0-beta.18",
     "jscodeshift": "0.13.0"
   },
   "devDependencies": {