change queries & mutation test package.json to different name

* add mounted check in app generator

* add changeset

.changeset/empty-berries-rule.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+fix app generator for pnpm unmet dependency

.changeset/fair-wombats-sneeze.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+added superjson

.changeset/nice-starfishes-live.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+add mounted check to app generator template

.changeset/poor-shrimps-think.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+Setup SuperJson for GSSP and GSP

.changeset/pre.json

@@ -18,19 +18,26 @@
   "changesets": [
     "breezy-cameras-double",
     "dirty-monkeys-greet",
+    "empty-berries-rule",
+    "fair-wombats-sneeze",
     "flat-bees-approve",
     "great-months-train",
     "lovely-colts-share",
     "nine-onions-admire",
     "ninety-pets-heal",
     "poor-peas-lick",
+    "poor-shrimps-think",
     "quiet-feet-travel",
+    "sharp-falcons-begin",
     "silent-colts-reply",
+    "stupid-walls-sell",
     "swift-drinks-dress",
     "ten-rivers-burn",
     "thirty-countries-build",
     "twenty-beans-pump",
+    "two-kiwis-help",
     "unlucky-papayas-sleep",
-    "wicked-ghosts-cough"
+    "wicked-ghosts-cough",
+    "wise-frogs-give"
   ]
 }

.changeset/sharp-falcons-begin.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Use routes manifest in template app

.changeset/stupid-walls-sell.md

@@ -0,0 +1,8 @@
+---
+"blitz": patch
+"@blitzjs/auth": patch
+"@blitzjs/next": patch
+"@blitzjs/rpc": patch
+---
+
+testing set dist-tag

.changeset/two-kiwis-help.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+fix generate cli command

.changeset/wise-frogs-give.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+use latest tag for generator template on rpc & auth packages

.github/workflows/release.yml

@@ -0,0 +1,37 @@
+name: Release
+
+on:
+  push:
+    branches:
+      - main
+
+concurrency: ${{ github.workflow }}-${{ github.ref }}
+
+jobs:
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v2
+
+      - name: Setup Node.js 16.x
+        uses: actions/setup-node@v2
+        with:
+          node-version: 16.x
+
+      - name: Pre-publish
+        uses: pnpm/action-setup@646cdf48217256a3d0b80361c5a50727664284f2
+        with:
+          version: 6.32.6
+      - run: pnpm install --frozen-lockfile
+      - run: pnpm changeset version
+      - run: pnpm build
+
+      - name: Create Release Pull Request
+        uses: changesets/action@v1
+        with:
+          publish: pnpm changeset publish
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

apps/toolkit-app/CHANGELOG.md

@@ -1,5 +1,59 @@
 # toolkit-app
 
+## 1.0.1-alpha.16
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.21
+- @blitzjs/auth@2.0.0-alpha.21
+- @blitzjs/next@2.0.0-alpha.21
+- @blitzjs/rpc@2.0.0-alpha.21
+- @blitzjs/config@2.0.0-alpha.21
+
+## 1.0.1-alpha.15
+
+### Patch Changes
+
+- Updated dependencies
+  - blitz@2.0.0-alpha.20
+  - @blitzjs/auth@2.0.0-alpha.20
+  - @blitzjs/next@2.0.0-alpha.20
+  - @blitzjs/rpc@2.0.0-alpha.20
+  - @blitzjs/config@2.0.0-alpha.20
+
+## 1.0.1-alpha.14
+
+### Patch Changes
+
+- Updated dependencies
+- Updated dependencies [2150dcc3]
+  - @blitzjs/next@2.0.0-alpha.19
+  - blitz@2.0.0-alpha.19
+  - @blitzjs/auth@2.0.0-alpha.19
+  - @blitzjs/rpc@2.0.0-alpha.19
+  - @blitzjs/config@2.0.0-alpha.19
+
+## 1.0.1-alpha.13
+
+### Patch Changes
+
+- Updated dependencies
+  - blitz@2.0.0-alpha.18
+  - @blitzjs/auth@2.0.0-alpha.18
+  - @blitzjs/next@2.0.0-alpha.18
+  - @blitzjs/rpc@2.0.0-alpha.18
+  - @blitzjs/config@2.0.0-alpha.18
+
+## 1.0.1-alpha.12
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.17
+- @blitzjs/auth@2.0.0-alpha.17
+- @blitzjs/next@2.0.0-alpha.17
+- @blitzjs/rpc@2.0.0-alpha.17
+- @blitzjs/config@2.0.0-alpha.17
+
 ## 1.0.1-alpha.11
 
 ### Patch Changes

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

@@ -5,6 +5,7 @@ import { Form, FORM_ERROR } from "app/core/components/Form"
 import login from "app/auth/mutations/login"
 import { Login } from "app/auth/validations"
 import { useMutation } from "@blitzjs/rpc"
+import { Routes } from "@blitzjs/next"
 
 type LoginFormProps = {
   onSuccess?: (user: PromiseReturnType<typeof login>) => void
@@ -39,7 +40,7 @@ export const LoginForm = (props: LoginFormProps) => {
         <LabeledTextField name="email" label="Email" placeholder="Email" />
         <LabeledTextField name="password" label="Password" placeholder="Password" type="password" />
         <div>
-          <Link href="/auth/forgot-password" passHref>
+          <Link href={Routes.ForgotPasswordPage()} passHref>
             <a>Forgot your password?</a>
           </Link>
         </div>
@@ -47,7 +48,7 @@ export const LoginForm = (props: LoginFormProps) => {
 
       <div style={{ marginTop: "1rem" }}>
         Or{" "}
-        <Link href="/auth/signup" passHref>
+        <Link href={Routes.SignupPage()} passHref>
           <a>Sign Up</a>
         </Link>
       </div>

apps/toolkit-app/db/migrations/20220427214932_/migration.sql

@@ -0,0 +1,47 @@
+-- CreateTable
+CREATE TABLE "User" (
+    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    "name" TEXT,
+    "email" TEXT NOT NULL,
+    "hashedPassword" TEXT,
+    "role" TEXT NOT NULL DEFAULT 'USER'
+);
+
+-- CreateTable
+CREATE TABLE "Session" (
+    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    "expiresAt" DATETIME,
+    "handle" TEXT NOT NULL,
+    "hashedSessionToken" TEXT,
+    "antiCSRFToken" TEXT,
+    "publicData" TEXT,
+    "privateData" TEXT,
+    "userId" INTEGER,
+    CONSTRAINT "Session_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User" ("id") ON DELETE SET NULL ON UPDATE CASCADE
+);
+
+-- CreateTable
+CREATE TABLE "Token" (
+    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    "hashedToken" TEXT NOT NULL,
+    "type" TEXT NOT NULL,
+    "expiresAt" DATETIME NOT NULL,
+    "sentTo" TEXT NOT NULL,
+    "userId" INTEGER NOT NULL,
+    CONSTRAINT "Token_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "User_email_key" ON "User"("email");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Session_handle_key" ON "Session"("handle");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Token_hashedToken_type_key" ON "Token"("hashedToken", "type");

apps/toolkit-app/package.json

@@ -1,9 +1,9 @@
 {
   "name": "toolkit-app",
-  "version": "1.0.1-alpha.11",
+  "version": "1.0.1-alpha.16",
   "scripts": {
     "start:dev": "pnpm run prisma:start && next dev",
-    "buildapp": "prisma generate && next build",
+    "buildapp": "pnpm i && pnpm prisma generate && next build",
     "start": "next start",
     "lint": "next lint",
     "prisma:start": "prisma generate && prisma migrate deploy",
@@ -29,8 +29,8 @@
     "@blitzjs/rpc": "workspace:*",
     "@hookform/resolvers": "2.8.8",
     "@prisma/client": "3.9.0",
-    "blitz": "workspace:2.0.0-alpha.16",
-    "next": "12.1.1",
+    "blitz": "workspace:2.0.0-alpha.21",
+    "next": "12.1.6-canary.17",
     "prisma": "3.9.0",
     "react": "18.0.0",
     "react-dom": "18.0.0",

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

@@ -1,13 +1,14 @@
 import { useRouter } from "next/router"
 import Layout from "app/core/layouts/Layout"
 import { SignupForm } from "app/auth/components/SignupForm"
+import { Routes } from "@blitzjs/next"
 
 const SignupPage = () => {
   const router = useRouter()
 
   return (
     <Layout title="Sign Up">
-      <SignupForm onSuccess={() => router.push("/")} />
+      <SignupForm onSuccess={() => router.push(Routes.Home())} />
     </Layout>
   )
 }

apps/toolkit-app/pages/index.tsx

@@ -6,6 +6,7 @@ import { useCurrentUser } from "app/core/hooks/useCurrentUser"
 import logout from "app/auth/mutations/logout"
 import logo from "public/logo.png"
 import { useMutation } from "@blitzjs/rpc"
+import { Routes } from "@blitzjs/next"
 
 /*
  * This file is just for a pleasant getting started page for your new app.
@@ -37,12 +38,12 @@ const UserInfo = () => {
   } else {
     return (
       <>
-        <Link href="/auth/signup" passHref>
+        <Link href={Routes.SignupPage()} passHref>
           <a className="button small">
             <strong>Sign Up</strong>
           </a>
         </Link>
-        <Link href="/auth/login" passHref>
+        <Link href={Routes.LoginPage()} passHref>
           <a className="button small">
             <strong>Login</strong>
           </a>

apps/toolkit-app/tsconfig.json

@@ -2,7 +2,7 @@
   "compilerOptions": {
     "target": "es5",
     "lib": ["dom", "dom.iterable", "esnext"],
-    "baseUrl": "./",
+    "baseUrl": ".",
     "allowJs": true,
     "skipLibCheck": true,
     "strict": false,

apps/web/package.json

@@ -21,7 +21,7 @@
     "@types/jest": "27.4.1",
     "blitz": "workspace:*",
     "jest": "27.5.1",
-    "next": "12.1.1",
+    "next": "12.1.6-canary.17",
     "prisma": "3.9.0",
     "react": "18.0.0",
     "react-dom": "18.0.0",

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

@@ -1,14 +1,11 @@
 import {gSP} from "app/blitz-server"
 
-export const getStaticProps = gSP(async ({ctx}) => {
+export const getStaticProps = gSP<{data: {test: string}}>(async ({ctx}) => {
   return {
     props: {
       data: {
-        // userId: ctx?.session.userId,
-        // session: {
-        //   id: session.userId,
-        //   publicData: session.$publicData,
-        // },
+        test: "hello",
+        date: new Date(),
       },
     },
   }

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

@@ -12,6 +12,7 @@ export const getServerSideProps = gSSP<Props>(async ({ctx}) => {
     props: {
       userId: session.userId,
       publicData: session.$publicData,
+      publishedAt: new Date(0),
     },
   }
 })

integration-tests/auth/package.json

@@ -19,7 +19,7 @@
     "@prisma/client": "3.9.0",
     "blitz": "workspace:*",
     "lowdb": "3.0.0",
-    "next": "12.1.1",
+    "next": "12.1.6-canary.17",
     "prisma": "3.9.0",
     "react": "18.0.0",
     "react-dom": "18.0.0"

integration-tests/qm/.eslintrc.js

@@ -0,0 +1 @@
+module.exports = require("@blitzjs/config/eslint")

integration-tests/qm/.gitignore

@@ -0,0 +1,3 @@
+node_modules
+# Keep environment variables out of version control
+*.sqlite

integration-tests/qm/next-env.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="next" />
+/// <reference types="next/image-types/global" />
+
+// NOTE: This file should not be edited
+// see https://nextjs.org/docs/basic-features/typescript for more information.

integration-tests/qm/next.config.js

@@ -0,0 +1,4 @@
+const {withBlitz} = require("@blitzjs/next")
+module.exports = withBlitz({
+  // update me
+})

integration-tests/qm/package.json

@@ -0,0 +1,34 @@
+{
+  "name": "test-qm",
+  "version": "0.0.0",
+  "private": true,
+  "scripts": {
+    "test": "vitest run",
+    "test-watch": "vitest",
+    "clean": "rm -rf .turbo && rm -rf node_modules"
+  },
+  "dependencies": {
+    "@blitzjs/auth": "workspace:*",
+    "@blitzjs/config": "workspace:*",
+    "@blitzjs/next": "workspace:*",
+    "@blitzjs/rpc": "workspace:*",
+    "@prisma/client": "3.9.0",
+    "blitz": "workspace:*",
+    "next": "12.1.6-canary.17",
+    "prisma": "3.9.0",
+    "react": "18.0.0",
+    "react-dom": "18.0.0",
+    "react-query": "3.21.1"
+  },
+  "devDependencies": {
+    "@testing-library/react": "13.0.0",
+    "@types/react": "17.0.43",
+    "@vitejs/plugin-react": "1.3.0",
+    "delay": "5.0.0",
+    "eslint": "7.32.0",
+    "eslint-config-next": "latest",
+    "eslint-plugin-testing-library": "5.0.1",
+    "jsdom": "^19.0.0",
+    "typescript": "^4.5.3"
+  }
+}

integration-tests/qm/test/__snapshots__/use-mutation.test.tsx.snap

@@ -0,0 +1,5 @@
+// Vitest Snapshot v1
+
+exports[`useMutation > useMutation calls the resolver with the argument > shouldn't work with query function 1`] = `"\\"useMutation\\" was expected to be called with a mutation but was called with a \\"query\\""`;
+
+exports[`useMutation > useMutation calls the resolver with the argument > shouldn't work with regular functions 1`] = `"Either the file path to your resolver is incorrect (must be in a \\"queries\\" or \\"mutations\\" folder that isn't nested inside \\"pages\\" or \\"api\\") or you are trying to use Blitz's useQuery to fetch from third-party APIs (to do that, import useQuery directly from \\"react-query\\")"`;

integration-tests/qm/test/__snapshots__/use-query.test.tsx.snap

@@ -0,0 +1,5 @@
+// Vitest Snapshot v1
+
+exports[`useQuery > a "query" that converts the string parameter to uppercase > shouldn't work with mutation function 1`] = `"Cannot read properties of null (reading 'isReady')"`;
+
+exports[`useQuery > a "query" that converts the string parameter to uppercase > shouldn't work with regular functions 1`] = `"Cannot read properties of null (reading 'isReady')"`;

integration-tests/qm/test/use-mutation.test.tsx

@@ -0,0 +1,55 @@
+import {describe, it, expect, beforeAll, vi} from "vitest"
+import {act, screen} from "@testing-library/react"
+import {useMutation} from "@blitzjs/rpc"
+import React from "react"
+import {buildMutationRpc, buildQueryRpc, render} from "../../utils/blitz-test-utils"
+
+beforeAll(() => {
+  globalThis.__BLITZ_SESSION_COOKIE_PREFIX = "qm-test-cookie-prefix"
+  globalThis.IS_REACT_ACT_ENVIRONMENT = true
+})
+
+describe("useMutation", () => {
+  const setupHook = (resolver: (...args: any) => Promise<any>): [{mutate?: Function}, Function] => {
+    let res = {}
+
+    function TestHarness() {
+      const [mutate, {isSuccess}] = useMutation(resolver)
+
+      Object.assign(res, {mutate})
+      return <div id="harness">{isSuccess ? "Sent" : "Waiting"}</div>
+    }
+
+    const ui = () => <TestHarness />
+
+    const {rerender} = render(ui())
+    return [res, () => rerender(ui())]
+  }
+
+  describe("useMutation calls the resolver with the argument", () => {
+    // eslint-disable-next-line require-await
+    const mutateFn = vi.fn()
+    it("should work with Blitz mutations", async () => {
+      const [res] = setupHook(buildMutationRpc(mutateFn))
+      await act(async () => {
+        await res.mutate!("data")
+      })
+
+      await screen.findByText("Sent")
+      expect(mutateFn).toHaveBeenCalledTimes(1)
+      expect(mutateFn).toHaveBeenCalledWith("data", {fromQueryHook: true})
+    })
+
+    it("shouldn't work with regular functions", () => {
+      console.error = vi.fn()
+      expect(() => setupHook(mutateFn)).toThrowErrorMatchingSnapshot()
+    })
+
+    it("shouldn't work with query function", () => {
+      console.error = vi.fn()
+      const mutationFn = vi.fn()
+
+      expect(() => setupHook(buildQueryRpc(mutationFn))).toThrowErrorMatchingSnapshot()
+    })
+  })
+})

integration-tests/qm/test/use-query.test.tsx

@@ -0,0 +1,166 @@
+import {describe, it, expect, beforeAll, vi} from "vitest"
+import {act, screen, waitForElementToBeRemoved, waitFor} from "@testing-library/react"
+import {useQuery, useInfiniteQuery} from "@blitzjs/rpc"
+import React from "react"
+import delay from "delay"
+import {buildMutationRpc, buildQueryRpc, render} from "../../utils/blitz-test-utils"
+
+describe("useQuery", () => {
+  it("Placeholder", async () => {
+    console.log("placeholder")
+  })
+})
+// beforeAll(() => {
+//   globalThis.__BLITZ_SESSION_COOKIE_PREFIX = "qm-test-cookie-prefix"
+//   globalThis.IS_REACT_ACT_ENVIRONMENT = true
+// })
+
+// describe("useQuery", () => {
+//   const setupHook = (
+//     params: any,
+//     queryFn: (...args: any) => any,
+//     options: Parameters<typeof useQuery>[2] = {} as any,
+//   ): [{data?: any; setQueryData?: any}, Function] => {
+//     let res = {}
+//     function TestHarness() {
+//       const [data, {setQueryData}] = useQuery(queryFn, params, {
+//         suspense: true,
+//         ...options,
+//       } as any)
+//       Object.assign(res, {data, setQueryData})
+//       return (
+//         <div id="harness">
+//           <span>{data ? "Ready" : "No data"}</span>
+//           <span>{data}</span>
+//         </div>
+//       )
+//     }
+
+//     const ui = () => (
+//       <React.Suspense fallback="Loading...">
+//         <TestHarness />
+//       </React.Suspense>
+//     )
+
+//     const {rerender} = render(ui())
+//     return [res, () => rerender(ui())]
+//   }
+
+//   describe('a "query" that converts the string parameter to uppercase', () => {
+//     const upcase = async (args: string) => {
+//       await delay(1000)
+//       return args.toUpperCase()
+//     }
+//     it("should work with Blitz queries", async () => {
+//       const [res] = setupHook("test", buildQueryRpc(upcase))
+//       await waitForElementToBeRemoved(() => screen.getByText("Loading..."))
+//       await act(async () => {
+//         await screen.findByText("Ready")
+//         expect(res.data).toBe("TEST")
+//       })
+//     })
+
+//     it("should be able to change the data with setQueryData", async () => {
+//       const [res] = setupHook("test", buildQueryRpc(upcase))
+//       await waitForElementToBeRemoved(() => screen.getByText("Loading..."))
+//       await act(async () => {
+//         await screen.findByText("Ready")
+//         expect(res.data).toBe("TEST")
+//         res.setQueryData((p: string) => p.substr(1, 2), {refetch: false})
+//         await waitFor(() => screen.getByText("ES"))
+//       })
+//     })
+
+//     it("shouldn't work with regular functions", () => {
+//       console.error = vi.fn()
+//       expect(() => setupHook("test", upcase)).toThrowErrorMatchingSnapshot()
+//     })
+
+//     it("shouldn't work with mutation function", () => {
+//       console.error = vi.fn()
+//       expect(() => setupHook("test", buildMutationRpc(upcase))).toThrowErrorMatchingSnapshot()
+//     })
+
+//     it("suspense disabled if enabled is false", async () => {
+//       setupHook("test", buildQueryRpc(upcase), {enabled: false})
+//       await screen.findByText("No data")
+//     })
+
+//     it("suspense disabled if enabled is undefined", async () => {
+//       setupHook("test", buildQueryRpc(upcase), {enabled: undefined})
+//       await screen.findByText("No data")
+//     })
+
+//     it("suspense disabled if enabled is false and suspense set", async () => {
+//       setupHook("test", buildQueryRpc(upcase), {
+//         enabled: false,
+//         suspense: true,
+//       })
+//       await screen.findByText("No data")
+//     })
+//   })
+
+//   // it("works with options other than enabled & suspense without type error", () => {
+//   //   const queryFn = ((() => true) as unknown) as () => Promise<boolean>
+//   //   useQuery(queryFn, undefined, {refetchInterval: 10000})
+//   // })
+// })
+
+// describe("useInfiniteQuery", () => {
+//   const setupHook = (
+//     params: (arg?: any) => any,
+//     queryFn: (...args: any) => any,
+//   ): [{data?: any; setQueryData?: any}, Function] => {
+//     let res = {}
+//     function TestHarness() {
+//       // TODO - fix typing
+//       //@ts-ignore
+//       const [groupedData] = useInfiniteQuery(queryFn, params, {
+//         suspense: true,
+//         getNextPageParam: () => {},
+//       })
+//       Object.assign(res, {groupedData})
+//       return (
+//         <div id="harness">
+//           <span>{groupedData ? "Ready" : "No data"}</span>
+//           <div>
+//             {groupedData.map((data: any, i) => (
+//               <div key={i}>{data}</div>
+//             ))}
+//           </div>
+//         </div>
+//       )
+//     }
+
+//     const ui = () => (
+//       <React.Suspense fallback="Loading...">
+//         <TestHarness />
+//       </React.Suspense>
+//     )
+
+//     const {rerender} = render(ui())
+//     return [res, () => rerender(ui())]
+//   }
+
+//   const getItems = ({id}: {id: number}) => {
+//     if (id === 1) {
+//       return "item1"
+//     } else if (id === 2) {
+//       return "item2"
+//     } else {
+//       throw new Error("No item for this id")
+//     }
+//   }
+//   it("should work", async () => {
+//     setupHook(() => ({id: 1}), buildQueryRpc(getItems))
+//     await waitForElementToBeRemoved(() => screen.getByText("Loading..."))
+//     await act(async () => {
+//       await screen.findByText("item1")
+//     })
+
+//     setupHook(() => ({id: 2}), buildQueryRpc(getItems))
+//     await act(async () => {
+//       await screen.findByText("item2")
+//     })
+//   })
+// })

integration-tests/qm/tsconfig.json

@@ -0,0 +1,13 @@
+{
+  "extends": "@blitzjs/config/tsconfig.nextjs.json",
+  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "../utils/blitz-test-utils.tsx"],
+  "compilerOptions": {
+    "declaration": true,
+    "declarationMap": true,
+    "paths": {
+      "react": ["./node_modules/@types/react"]
+    }
+  },
+  "exclude": ["node_modules"],
+  "baseUrl": "."
+}

integration-tests/qm/vitest.config.ts

@@ -0,0 +1,12 @@
+/// <reference types="vitest" />
+
+import { defineConfig } from 'vitest/config'
+import react from '@vitejs/plugin-react'
+
+// https://vitejs.dev/config/
+export default defineConfig({
+  plugins: [react()],
+  test: {
+    environment: 'jsdom',
+  },
+})

integration-tests/rpc/next.config.js

@@ -1,4 +1,4 @@
 const {withBlitz} = require("@blitzjs/next")
 module.exports = withBlitz({
-  // update me
+  target: 'experimental-serverless-trace',
 })

integration-tests/rpc/package.json

@@ -12,7 +12,7 @@
     "@blitzjs/next": "workspace:*",
     "@blitzjs/rpc": "workspace:*",
     "blitz": "workspace:*",
-    "next": "12.1.1",
+    "next": "12.1.6-canary.17",
     "react": "18.0.0",
     "react-dom": "18.0.0"
   },

integration-tests/utils/blitz-test-utils.tsx

@@ -0,0 +1,123 @@
+import {render as defaultRender} from "@testing-library/react"
+import {NextRouter} from "next/router"
+import {vi} from "vitest"
+import {QueryClient, QueryClientProvider} from "react-query"
+import React from "react"
+import {BlitzRpcPlugin} from "@blitzjs/rpc"
+
+const mockRouter: NextRouter = {
+  basePath: "",
+  pathname: "/",
+  route: "/",
+  asPath: "/",
+  query: {},
+  isReady: true,
+  isLocaleDomain: false,
+  isPreview: false,
+  push: vi.fn(),
+  replace: vi.fn(),
+  reload: vi.fn(),
+  back: vi.fn(),
+  prefetch: vi.fn(),
+  beforePopState: vi.fn(),
+  events: {
+    on: vi.fn(),
+    off: vi.fn(),
+    emit: vi.fn(),
+  },
+  isFallback: false,
+}
+
+type DefaultParams = Parameters<typeof defaultRender>
+type RenderUI = DefaultParams[0]
+type RenderOptions = DefaultParams[1] & {
+  router?: Partial<NextRouter>
+}
+export type BlitzProviderProps = {
+  client?: QueryClient
+  contextSharing?: boolean
+}
+
+const BlitzProvider = ({
+  client,
+  contextSharing = false,
+  children,
+}: BlitzProviderProps & {children: JSX.Element}) => {
+  if (globalThis.queryClient) {
+    return (
+      <QueryClientProvider
+        client={client || globalThis.queryClient}
+        contextSharing={contextSharing}
+      >
+        {children}
+      </QueryClientProvider>
+    )
+  }
+
+  return children
+}
+export const RouterContext = React.createContext(null as any)
+RouterContext.displayName = "RouterContext"
+const compose =
+  (...rest) =>
+  (x: React.ComponentType<any>) =>
+    rest.reduceRight((y, f) => f(y), x)
+
+const BlitzWrapper = ({plugins, children}) => {
+  const providers = plugins.reduce((acc, plugin) => {
+    return plugin.withProvider ? acc.concat(plugin.withProvider) : acc
+  }, [])
+  const withPlugins = compose(...providers)
+  const component = React.useMemo(() => withPlugins(children), [children])
+
+  return (
+    <BlitzProvider>
+      <RouterContext.Provider value={{...mockRouter}}>{component}</RouterContext.Provider>
+    </BlitzProvider>
+  )
+}
+
+export function render(ui: RenderUI, {wrapper, router, ...options}: RenderOptions = {}) {
+  if (!wrapper) {
+    wrapper = ({children}) => {
+      return (
+        <BlitzWrapper
+          plugins={[
+            BlitzRpcPlugin({
+              reactQueryOptions: {
+                queries: {
+                  staleTime: 7000,
+                },
+              },
+            }),
+          ]}
+        >
+          {children}
+        </BlitzWrapper>
+      )
+    }
+  }
+
+  return defaultRender(ui, {wrapper, ...options})
+}
+
+// This enhance fn does what buildRpcFunction does during build time
+export function buildQueryRpc(fn: any) {
+  const newFn = (...args: any) => {
+    const [data, ...rest] = args
+    return fn(data, ...rest)
+  }
+  newFn._isRpcClient = true
+  newFn._resolverType = "query"
+  newFn._routePath = "/api/test/url/" + Math.random()
+  return newFn
+}
+
+// This enhance fn does what buildRpcFunction does during build time
+export function buildMutationRpc(fn: any) {
+  const newFn = (...args: any) => fn(...args)
+  newFn._isRpcClient = true
+  newFn._resolverType = "mutation"
+  newFn._routePath = "/api/test/url"
+  return newFn
+}

integration-tests/utils/next-webdriver.ts

@@ -12,6 +12,8 @@ export function waitFor(millis) {
   return new Promise((resolve) => setTimeout(resolve, millis))
 }
 
+export {By}
+
 const {
   BROWSER_NAME: browserName = "chrome",
   BROWSERSTACK,

integration-tests/utils/package.json

@@ -3,6 +3,9 @@
   "version": "0.0.0",
   "private": true,
   "devDependencies": {
+    "@blitzjs/config": "workspace: *",
+    "@blitzjs/rpc": "workspace: *",
+    "@testing-library/react": "13.0.0",
     "@types/express": "4.17.13",
     "@types/fs-extra": "9.0.13",
     "@types/node-fetch": "2.6.1",
@@ -16,6 +19,9 @@
     "fs-extra": "10.0.1",
     "get-port": "6.1.2",
     "node-fetch": "3.2.3",
+    "react": "18.0.0",
+    "react-dom": "18.0.0",
+    "react-query": "3.21.1",
     "rimraf": "3.0.2",
     "selenium-webdriver": "4.1.1",
     "tree-kill": "1.2.2",

integration-tests/utils/tsconfig.json

@@ -0,0 +1,13 @@
+{
+  "extends": "@blitzjs/config/tsconfig.nextjs.json",
+  "include": ["*.ts", "*.tsx"],
+  "compilerOptions": {
+    "declaration": true,
+    "declarationMap": true,
+    "paths": {
+      "react": ["./node_modules/@types/react"]
+    }
+  },
+  "exclude": ["node_modules"],
+  "baseUrl": "."
+}

integration-tests/utils/wd-chain.ts

@@ -88,6 +88,10 @@ export default class Chain {
     return this.updateChain(() => this.browser.findElements(By.css(sel)))
   }
 
+  elementsById(sel) {
+    return this.updateChain(() => this.browser.findElements(By.id(sel)))
+  }
+
   waitForElementByCss(sel, timeout) {
     return this.updateChain(() => this.browser.wait(until.elementLocated(By.css(sel), timeout)))
   }

package.json

@@ -25,9 +25,9 @@
     "@changesets/cli": "2.22.0",
     "eslint": "7.32.0",
     "husky": "7.0.4",
-    "jsdom": "19.0.0",
+    "jsdom": "^19.0.0",
     "lint-staged": "12.1.7",
-    "next": "12.1.1",
+    "next": "12.1.6-canary.17",
     "only-allow": "1.1.0",
     "patch-package": "6.4.7",
     "prettier": "^2.5.1",

packages/blitz-auth/CHANGELOG.md

@@ -1,5 +1,38 @@
 # @blitzjs/auth
 
+## 2.0.0-alpha.21
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.21
+
+## 2.0.0-alpha.20
+
+### Patch Changes
+
+- testing set dist-tag
+- Updated dependencies
+  - blitz@2.0.0-alpha.20
+
+## 2.0.0-alpha.19
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.19
+
+## 2.0.0-alpha.18
+
+### Patch Changes
+
+- Updated dependencies
+  - blitz@2.0.0-alpha.18
+
+## 2.0.0-alpha.17
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.17
+
 ## 2.0.0-alpha.16
 
 ### Patch Changes

packages/blitz-auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/auth",
-  "version": "2.0.0-alpha.16",
+  "version": "2.0.0-alpha.21",
   "scripts": {
     "build": "unbuild",
     "predev": "wait-on -d 250 ../blitz/dist/index-server.d.ts",
@@ -24,7 +24,7 @@
     "@types/secure-password": "3.1.1",
     "b64-lite": "1.4.0",
     "bad-behavior": "1.0.1",
-    "blitz": "2.0.0-alpha.16",
+    "blitz": "2.0.0-alpha.21",
     "cookie": "0.4.1",
     "debug": "4.3.3",
     "http": "0.0.1-security",
@@ -35,7 +35,7 @@
     "url": "0.11.0"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.16",
+    "@blitzjs/config": "workspace:2.0.0-alpha.21",
     "@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

@@ -138,7 +138,10 @@ export const useSession = (options: UseSessionOptions = {}): ClientSession => {
     initialState = {...options.initialPublicData, isLoading: false}
   } else if (suspense) {
     if (isServer) {
-      throw new Promise((_) => {})
+      const e = new Error()
+      e.name = "Rendering Suspense fallback..."
+      delete e.stack
+      throw e
     } else {
       initialState = {...getPublicDataStore().getData(), isLoading: false}
     }

packages/blitz-next/CHANGELOG.md

@@ -1,5 +1,39 @@
 # @blitzjs/next
 
+## 2.0.0-alpha.21
+
+### Patch Changes
+
+- @blitzjs/rpc@2.0.0-alpha.21
+
+## 2.0.0-alpha.20
+
+### Patch Changes
+
+- testing set dist-tag
+- Updated dependencies
+  - @blitzjs/rpc@2.0.0-alpha.20
+
+## 2.0.0-alpha.19
+
+### Patch Changes
+
+- added superjson
+- 2150dcc3: Setup SuperJson for GSSP and GSP
+  - @blitzjs/rpc@2.0.0-alpha.19
+
+## 2.0.0-alpha.18
+
+### Patch Changes
+
+- @blitzjs/rpc@2.0.0-alpha.18
+
+## 2.0.0-alpha.17
+
+### Patch Changes
+
+- @blitzjs/rpc@2.0.0-alpha.17
+
 ## 2.0.0-alpha.16
 
 ### Patch Changes

packages/blitz-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/next",
-  "version": "2.0.0-alpha.16",
+  "version": "2.0.0-alpha.21",
   "scripts": {
     "build": "unbuild",
     "dev": "pnpm predev && pnpm watch unbuild src --wait=0.2",
@@ -23,13 +23,16 @@
     "eslint.js"
   ],
   "dependencies": {
-    "@blitzjs/rpc": "2.0.0-alpha.16",
+    "@blitzjs/rpc": "2.0.0-alpha.21",
+    "@types/hoist-non-react-statics": "3.3.1",
     "debug": "4.3.3",
     "fs-extra": "10.0.1",
-    "react-query": "3.21.1"
+    "hoist-non-react-statics": "3.3.2",
+    "react-query": "3.21.1",
+    "superjson": "1.8.0"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.16",
+    "@blitzjs/config": "workspace:2.0.0-alpha.21",
     "@testing-library/dom": "8.13.0",
     "@testing-library/jest-dom": "5.16.3",
     "@testing-library/react": "13.0.0",
@@ -40,11 +43,11 @@
     "@types/react": "17.0.43",
     "@types/react-dom": "17.0.14",
     "@types/testing-library__react-hooks": "4.0.0",
-    "blitz": "2.0.0-alpha.16",
+    "blitz": "2.0.0-alpha.21",
     "cross-spawn": "7.0.3",
     "find-up": "4.1.0",
     "lodash.frompairs": "4.0.1",
-    "next": "12.1.1",
+    "next": "12.1.6-canary.17",
     "react": "18.0.0",
     "react-dom": "18.0.0",
     "resolve-from": "5.0.0",

packages/blitz-next/src/index-browser.tsx

@@ -10,6 +10,7 @@ import Head from "next/head"
 import React from "react"
 import {QueryClient, QueryClientProvider} from "react-query"
 import {Hydrate, HydrateOptions} from "react-query/hydration"
+import {withSuperJSONPage} from "./superjson"
 
 export * from "./error-boundary"
 export * from "./error-component"
@@ -47,7 +48,7 @@ const buildWithBlitz = <TPlugins extends readonly ClientPlugin<object>[]>(plugin
         </BlitzProvider>
       )
     }
-    return BlitzOuterRoot
+    return withSuperJSONPage(BlitzOuterRoot)
   }
 }
 

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

@@ -1,6 +1,7 @@
 import {GetServerSideProps, GetStaticProps, NextApiRequest, NextApiResponse} from "next"
 import type {Ctx as BlitzCtx, BlitzServerPlugin, Middleware, MiddlewareResponse} from "blitz"
 import {handleRequestWithMiddleware} from "blitz"
+import {withSuperJSONPropsGsp, withSuperJSONPropsGssp} from "./superjson"
 
 export * from "./index-browser"
 
@@ -27,10 +28,10 @@ export type BlitzGSSPHandler<TProps> = ({
   ...args
 }: Parameters<GetServerSideProps<TProps>>[0] & {ctx: Ctx}) => ReturnType<GetServerSideProps<TProps>>
 
-export type BlitzGSPHandler = ({
+export type BlitzGSPHandler<TProps> = ({
   ctx,
   ...args
-}: Parameters<GetStaticProps>[0] & {ctx: Ctx}) => ReturnType<GetServerSideProps>
+}: Parameters<GetStaticProps<TProps>>[0] & {ctx: Ctx}) => ReturnType<GetStaticProps<TProps>>
 
 export type BlitzAPIHandler = (
   req: Parameters<NextApiHandler>[0],
@@ -42,23 +43,21 @@ export const setupBlitzServer = ({plugins}: SetupBlitzOptions) => {
   const middlewares = plugins.flatMap((p) => p.middlewares)
   const contextMiddleware = plugins.flatMap((p) => p.contextMiddleware).filter(Boolean)
 
-  const gSSP =
-    <TProps>(handler: BlitzGSSPHandler<TProps>): GetServerSideProps<TProps> =>
-    async ({req, res, ...rest}) => {
+  const gSSP = <TProps>(handler: BlitzGSSPHandler<TProps>): GetServerSideProps<TProps> =>
+    withSuperJSONPropsGssp<TProps>(async ({req, res, ...rest}) => {
       await handleRequestWithMiddleware(req, res, middlewares)
       const ctx = contextMiddleware.reduceRight(
         (y, f) => (f ? f(y) : y),
         (res as MiddlewareResponse).blitzCtx,
       )
       return handler({req, res, ctx, ...rest})
-    }
+    })
 
-  const gSP =
-    (handler: BlitzGSPHandler): GetStaticProps =>
-    async (context) => {
+  const gSP = <TProps>(handler: BlitzGSPHandler<TProps>): GetStaticProps<TProps> =>
+    withSuperJSONPropsGsp<TProps>(async (context) => {
       const ctx = contextMiddleware.reduceRight((y, f) => (f ? f(y) : y), {} as Ctx)
       return handler({...context, ctx: ctx})
-    }
+    })
 
   const api =
     (handler: BlitzAPIHandler): NextApiHandler =>

packages/blitz-next/src/superjson.tsx

@@ -0,0 +1,89 @@
+import hoistNonReactStatics from "hoist-non-react-statics"
+import type {
+  GetServerSideProps,
+  GetServerSidePropsResult,
+  GetStaticProps,
+  GetStaticPropsResult,
+} from "next"
+import * as React from "react"
+import SuperJSON from "superjson"
+
+export type SuperJSONProps<P = any> = P & {
+  _superjson?: any
+}
+
+function excludeProps<P>(
+  result: GetServerSidePropsResult<P> | GetStaticPropsResult<P>,
+  exclude: string[] = [],
+) {
+  if (!("props" in result)) {
+    return result
+  }
+
+  if (!result.props) {
+    return result
+  }
+
+  const excludedPropValues = exclude.map((propKey) => {
+    const value = (result.props as any)[propKey]
+    delete (result.props as any)[propKey]
+    return value
+  })
+
+  const {json, meta} = SuperJSON.serialize(result.props)
+  const props = json as any
+
+  if (meta) {
+    props._superjson = meta
+  }
+
+  exclude.forEach((key, index) => {
+    const excludedPropValue = excludedPropValues[index]
+    if (typeof excludedPropValue !== "undefined") {
+      props[key] = excludedPropValue
+    }
+  })
+
+  return {
+    ...result,
+    props,
+  }
+}
+
+export function withSuperJSONPropsGssp<P>(
+  handler: GetServerSideProps<P>,
+  exclude: string[] = [],
+): GetServerSideProps<SuperJSONProps<P>> {
+  return async function withSuperJSON(...args) {
+    const result = await handler(...args)
+    return excludeProps(result, exclude)
+  }
+}
+
+export function withSuperJSONPropsGsp<P>(
+  handler: GetStaticProps<P>,
+  exclude: string[] = [],
+): GetStaticProps<P> {
+  return async function withSuperJSON(...args) {
+    const result = await handler(...args)
+
+    return excludeProps<any>(result, exclude)
+  }
+}
+
+export function deserializeProps<P>(serializedProps: SuperJSONProps<P>): P {
+  const {_superjson, ...props} = serializedProps
+  return SuperJSON.deserialize({json: props as any, meta: _superjson})
+}
+
+export function withSuperJSONPage<P>(
+  Page: React.ComponentType<P>,
+): React.ComponentType<SuperJSONProps<P>> {
+  function WithSuperJSON(serializedProps: SuperJSONProps<P>) {
+    return <Page {...deserializeProps<P>(serializedProps)} />
+  }
+
+  hoistNonReactStatics(WithSuperJSON, Page)
+
+  return WithSuperJSON
+}

packages/blitz-rpc/CHANGELOG.md

@@ -1,5 +1,43 @@
 # @blitzjs/rpc
 
+## 2.0.0-alpha.21
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.21
+- @blitzjs/auth@2.0.0-alpha.21
+
+## 2.0.0-alpha.20
+
+### Patch Changes
+
+- testing set dist-tag
+- Updated dependencies
+  - blitz@2.0.0-alpha.20
+  - @blitzjs/auth@2.0.0-alpha.20
+
+## 2.0.0-alpha.19
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.19
+- @blitzjs/auth@2.0.0-alpha.19
+
+## 2.0.0-alpha.18
+
+### Patch Changes
+
+- Updated dependencies
+  - blitz@2.0.0-alpha.18
+  - @blitzjs/auth@2.0.0-alpha.18
+
+## 2.0.0-alpha.17
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.17
+- @blitzjs/auth@2.0.0-alpha.17
+
 ## 2.0.0-alpha.16
 
 ### Patch Changes

packages/blitz-rpc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/rpc",
-  "version": "2.0.0-alpha.16",
+  "version": "2.0.0-alpha.21",
   "scripts": {
     "build": "unbuild",
     "predev": "wait-on -d 250 ../blitz/dist/index-server.d.ts && wait-on -d 250 ../blitz-auth/dist/index-browser.d.ts",
@@ -20,7 +20,7 @@
     "dist/**"
   ],
   "dependencies": {
-    "@blitzjs/auth": "2.0.0-alpha.16",
+    "@blitzjs/auth": "2.0.0-alpha.21",
     "b64-lite": "1.4.0",
     "bad-behavior": "1.0.1",
     "chalk": "^4.1.0",
@@ -30,12 +30,12 @@
     "zod": "3.10.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.16",
+    "@blitzjs/config": "workspace:2.0.0-alpha.21",
     "@types/debug": "4.1.7",
     "@types/react": "17.0.43",
     "@types/react-dom": "17.0.14",
-    "blitz": "2.0.0-alpha.16",
-    "next": "12.1.1",
+    "blitz": "2.0.0-alpha.21",
+    "next": "12.1.6-canary.17",
     "react": "18.0.0",
     "react-dom": "18.0.0",
     "typescript": "^4.5.3",
@@ -43,7 +43,7 @@
     "watch": "1.0.2"
   },
   "peerDependencies": {
-    "blitz": "2.0.0-alpha.16",
+    "blitz": "2.0.0-alpha.21",
     "next": "*"
   },
   "publishConfig": {

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

@@ -99,7 +99,10 @@ export function useQuery<
     (!options || !("suspense" in options) || options.suspense) &&
     (!options || !("enabled" in options) || options.enabled)
   ) {
-    throw new Promise(() => {})
+    const e = new Error()
+    e.name = "Rendering Suspense fallback..."
+    delete e.stack
+    throw e
   }
 
   const rest = {
@@ -182,7 +185,10 @@ export function usePaginatedQuery<
     (!options || !("suspense" in options) || options.suspense) &&
     (!options || !("enabled" in options) || options.enabled)
   ) {
-    throw new Promise(() => {})
+    const e = new Error()
+    e.name = "Rendering Suspense fallback..."
+    delete e.stack
+    throw e
   }
 
   const rest = {
@@ -278,7 +284,10 @@ export function useInfiniteQuery<
     (!options || !("suspense" in options) || options.suspense) &&
     (!options || !("enabled" in options) || options.enabled)
   ) {
-    throw new Promise(() => {})
+    const e = new Error()
+    e.name = "Rendering Suspense fallback..."
+    delete e.stack
+    throw e
   }
 
   const rest = {

packages/blitz-rpc/test/blitz-test-utils.ts

@@ -0,0 +1,20 @@
+// This enhance fn does what buildRpcFunction does during build time
+export function buildQueryRpc(fn: any) {
+  const newFn = (...args: any) => {
+    const [data, ...rest] = args
+    return fn(data, ...rest)
+  }
+  newFn._isRpcClient = true
+  newFn._resolverType = "query"
+  newFn._routePath = "/api/test/url/" + Math.random()
+  return newFn
+}
+
+// This enhance fn does what buildRpcFunction does during build time
+export function buildMutationRpc(fn: any) {
+  const newFn = (...args: any) => fn(...args)
+  newFn._isRpcClient = true
+  newFn._resolverType = "mutation"
+  newFn._routePath = "/api/test/url"
+  return newFn
+}

packages/blitz-rpc/test/unit/react-query-utils.unit.test.ts

@@ -0,0 +1,98 @@
+/**
+ * @vitest-environment jsdom
+ */
+import {assert, expect, test, beforeEach, describe, spyOn, it} from "vitest"
+
+import {queryClient, invalidateQuery, setQueryData} from "../../src/data-client"
+
+import {getQueryCacheFunctions} from "../../src/data-client/react-query-utils"
+import {buildQueryRpc} from "../blitz-test-utils"
+
+// eslint-disable-next-line require-await
+const isEmpty = async (arg: string): Promise<boolean> => {
+  return Boolean(arg)
+}
+
+describe("getQueryCacheFunctions", () => {
+  const spyRefetchQueries = spyOn(queryClient, "invalidateQueries")
+
+  beforeEach(() => {
+    spyRefetchQueries.mockReset()
+  })
+
+  it("returns a setQueryData function with working options", async () => {
+    window.requestIdleCallback = undefined as any
+
+    const {setQueryData} = getQueryCacheFunctions(buildQueryRpc(isEmpty), "a")
+    expect(setQueryData).toBeTruthy()
+    await setQueryData(true)
+    expect(spyRefetchQueries).toBeCalledTimes(1)
+    await setQueryData(true, {refetch: false})
+    expect(spyRefetchQueries).toBeCalledTimes(1)
+    await setQueryData(true, {refetch: true})
+    expect(spyRefetchQueries).toBeCalledTimes(2)
+  })
+
+  it("works even when requestIdleCallback is undefined", async () => {
+    window.requestIdleCallback = undefined as any
+    const {setQueryData} = getQueryCacheFunctions(buildQueryRpc(isEmpty), "a")
+    expect(setQueryData).toBeTruthy()
+    await setQueryData(true)
+    expect(spyRefetchQueries).toBeCalledTimes(1)
+    await setQueryData(true, {refetch: false})
+    expect(spyRefetchQueries).toBeCalledTimes(1)
+    await setQueryData(true, {refetch: true})
+    expect(spyRefetchQueries).toBeCalledTimes(2)
+  })
+})
+
+describe("invalidateQuery", () => {
+  const spyRefetchQueries = spyOn(queryClient, "invalidateQueries")
+
+  beforeEach(() => {
+    spyRefetchQueries.mockReset()
+  })
+
+  it("invalidates a query given resolver and params", async () => {
+    await invalidateQuery(buildQueryRpc(isEmpty), "a")
+    expect(spyRefetchQueries).toBeCalledTimes(1)
+    const calledWith = spyRefetchQueries.mock.calls[0][0] as any
+    // json of the queryKey is "a"
+    expect(calledWith[1].json).toEqual("a")
+  })
+})
+
+describe("setQueryData", () => {
+  const spyRefetchQueries = spyOn(queryClient, "invalidateQueries")
+  const spySetQueryData = spyOn(queryClient, "setQueryData")
+
+  beforeEach(() => {
+    spyRefetchQueries.mockReset()
+    spySetQueryData.mockReset()
+  })
+
+  it("without refetch will not invalidate queries", async () => {
+    await setQueryData(buildQueryRpc(isEmpty), "params", "newValue", {
+      refetch: false,
+    })
+    expect(spyRefetchQueries).toBeCalledTimes(0)
+    expect(spySetQueryData).toBeCalledTimes(1)
+
+    const calledWith = spySetQueryData.mock.calls[0] as Array<any>
+    expect(calledWith[0][1].json).toEqual("params")
+    expect(calledWith[1]).toEqual("newValue")
+  })
+
+  it("will invalidate queries by default", async () => {
+    await setQueryData(buildQueryRpc(isEmpty), "params", "newValue")
+    expect(spyRefetchQueries).toBeCalledTimes(1)
+    expect(spySetQueryData).toBeCalledTimes(1)
+
+    const invalidateCalledWith = spyRefetchQueries.mock.calls[0][0] as any
+    expect(invalidateCalledWith[1].json).toEqual("params")
+
+    const calledWith = spySetQueryData.mock.calls[0] as Array<any>
+    expect(calledWith[0][1].json).toEqual("params")
+    expect(calledWith[1]).toEqual("newValue")
+  })
+})

packages/blitz/CHANGELOG.md

@@ -1,5 +1,40 @@
 # blitz
 
+## 2.0.0-alpha.21
+
+### Patch Changes
+
+- Updated dependencies
+  - @blitzjs/generator@2.0.0-alpha.21
+
+## 2.0.0-alpha.20
+
+### Patch Changes
+
+- testing set dist-tag
+  - @blitzjs/generator@2.0.0-alpha.20
+
+## 2.0.0-alpha.19
+
+### Patch Changes
+
+- Updated dependencies [63605961]
+  - @blitzjs/generator@2.0.0-alpha.19
+
+## 2.0.0-alpha.18
+
+### Patch Changes
+
+- fix generate cli command
+  - @blitzjs/generator@2.0.0-alpha.18
+
+## 2.0.0-alpha.17
+
+### Patch Changes
+
+- Updated dependencies
+  - @blitzjs/generator@2.0.0-alpha.17
+
 ## 2.0.0-alpha.16
 
 ### Patch Changes

packages/blitz/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blitz",
-  "version": "2.0.0-alpha.16",
+  "version": "2.0.0-alpha.21",
   "scripts": {
     "build": "unbuild",
     "dev": "watch unbuild src --wait=0.2",
@@ -23,7 +23,7 @@
     "blitz": "bin/blitz"
   },
   "dependencies": {
-    "@blitzjs/generator": "2.0.0-alpha.16",
+    "@blitzjs/generator": "2.0.0-alpha.21",
     "arg": "5.0.1",
     "chalk": "^4.1.0",
     "console-table-printer": "2.10.0",
@@ -47,7 +47,7 @@
     "tslog": "3.3.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.16",
+    "@blitzjs/config": "workspace:2.0.0-alpha.21",
     "@types/cookie": "0.4.1",
     "@types/cross-spawn": "6.0.2",
     "@types/debug": "4.1.7",

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

@@ -133,8 +133,9 @@ const validateModelName = (modelName: string): void => {
 
 const determineType = async () => {
   if (
-    !args["--type"] ||
-    (args["--type"] && !Object.keys(generatorMap).includes(args["--type"].toLowerCase()))
+    !args["_"].slice(1)[0] ||
+    (args["_"].slice(1)[0] &&
+      !Object.keys(generatorMap).includes(args["_"].slice(1)[0]?.toLowerCase() as string))
   ) {
     const res = await prompts({
       type: "select",
@@ -148,12 +149,12 @@ const determineType = async () => {
 
     selectedType = res.type
   } else {
-    selectedType = args["--type"]
+    selectedType = args["_"].slice(1)[0]?.toLowerCase() as string
   }
 }
 
 const determineName = async () => {
-  if (!args["--name"]) {
+  if (!args["_"].slice(1)[1]) {
     const res = await prompts({
       type: "text",
       name: "model",
@@ -164,7 +165,7 @@ const determineName = async () => {
     selectedModelName = model
     selectedContext = context
   } else {
-    const {model, context} = getModelNameAndContext(args["--name"])
+    const {model, context} = getModelNameAndContext(args["_"].slice(1)[1]!)
     selectedModelName = model
     selectedContext = context
   }
@@ -249,7 +250,7 @@ const generate: CliCommand = async (argv) => {
       const generator = new GeneratorClass({
         destinationRoot: require("path").resolve(),
         // templateDir: blitzConfig.codegen?.templateDir,
-        extraArgs: args["_"].slice(1) as string[],
+        extraArgs: args["_"].slice(3) as string[],
         modelName: singularRootContext,
         modelNames: modelNames(singularRootContext),
         ModelName: ModelName(singularRootContext),

packages/config/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @blitzjs/config
 
+## 2.0.0-alpha.21
+
+## 2.0.0-alpha.20
+
+## 2.0.0-alpha.19
+
+## 2.0.0-alpha.18
+
+## 2.0.0-alpha.17
+
 ## 2.0.0-alpha.16
 
 ## 2.0.0-alpha.15

packages/config/package.json

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

packages/generator/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @blitzjs/generator
 
+## 2.0.0-alpha.21
+
+### Patch Changes
+
+- use latest tag for generator template on rpc & auth packages
+
+## 2.0.0-alpha.20
+
+## 2.0.0-alpha.19
+
+### Patch Changes
+
+- 63605961: Use routes manifest in template app
+
+## 2.0.0-alpha.18
+
+## 2.0.0-alpha.17
+
+### Patch Changes
+
+- fix app generator for pnpm unmet dependency
+
 ## 2.0.0-alpha.16
 
 ## 2.0.0-alpha.15

packages/generator/package.json

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

packages/generator/src/generators/app-generator.ts

@@ -155,6 +155,12 @@ export class AppGenerator extends Generator<AppGeneratorOptions> {
         cp.stdout?.setEncoding("utf8")
         cp.stderr?.setEncoding("utf8")
         cp.stdout?.on("data", (data) => {
+          if (pkgManager === "pnpm") {
+            if (data.includes("ERR_PNPM_PEER_DEP_ISSUES  Unmet peer dependencies")) {
+              spinners[spinners.length - 1]?.succeed()
+            }
+          }
+
           if (pkgManager === "yarn") {
             let json = getJSON(data)
             if (json && json.type === "step") {

packages/generator/templates/app/app/auth/components/LoginForm.tsx

@@ -5,6 +5,7 @@ import { Form, FORM_ERROR } from "app/core/components/Form"
 import login from "app/auth/mutations/login"
 import { Login } from "app/auth/validations"
 import { useMutation } from "@blitzjs/rpc"
+import { Routes } from "@blitzjs/next"
 
 type LoginFormProps = {
   onSuccess?: (user: PromiseReturnType<typeof login>) => void
@@ -39,7 +40,7 @@ export const LoginForm = (props: LoginFormProps) => {
         <LabeledTextField name="email" label="Email" placeholder="Email" />
         <LabeledTextField name="password" label="Password" placeholder="Password" type="password" />
         <div>
-          <Link href="/auth/forgot-password">
+          <Link href={Routes.ForgotPasswordPage()}>
             <a>Forgot your password?</a>
           </Link>
         </div>
@@ -47,7 +48,7 @@ export const LoginForm = (props: LoginFormProps) => {
 
       <div style={{ marginTop: "1rem" }}>
         Or{" "}
-        <Link href="/auth/signup">
+        <Link href={Routes.SignupPage()}>
           <a>Sign Up</a>
         </Link>
       </div>

packages/generator/templates/app/package.js.json

@@ -22,9 +22,9 @@
     "*.{js}": ["eslint --fix"]
   },
   "dependencies": {
-    "@blitzjs/auth": "alpha",
+    "@blitzjs/auth": "latest",
     "@blitzjs/next": "alpha",
-    "@blitzjs/rpc": "alpha",
+    "@blitzjs/rpc": "latest",
     "@prisma/client": "3.9.0",
     "blitz": "alpha",
     "next": "12.1.1",

packages/generator/templates/app/package.ts.json

@@ -22,9 +22,9 @@
     "*.{js,ts,tsx}": ["eslint --fix"]
   },
   "dependencies": {
-    "@blitzjs/auth": "alpha",
+    "@blitzjs/auth": "latest",
     "@blitzjs/next": "alpha",
-    "@blitzjs/rpc": "alpha",
+    "@blitzjs/rpc": "latest",
     "@prisma/client": "3.9.0",
     "blitz": "alpha",
     "next": "12.1.1",

packages/generator/templates/app/pages/_app.tsx

@@ -25,11 +25,15 @@ function RootErrorFallback({error}: ErrorFallbackProps) {
 }
 
 function MyApp({Component, pageProps}: AppProps) {
+  const [mounted, setMounted] = React.useState(false)
+  React.useEffect(() => {
+    setMounted(true)
+  }, [])
   return (
     <ErrorBoundary FallbackComponent={RootErrorFallback}>
-      <Suspense fallback="Loading...">
+      {mounted && <Suspense fallback="Loading...">
         <Component {...pageProps} />
-      </Suspense>
+      </Suspense> }
     </ErrorBoundary>
   )
 }

packages/generator/templates/app/pages/auth/signup.tsx

@@ -1,13 +1,14 @@
 import { useRouter } from "next/router"
 import Layout from "app/core/layouts/Layout"
 import { SignupForm } from "app/auth/components/SignupForm"
+import { Routes } from "@blitzjs/next"
 
 const SignupPage = () => {
   const router = useRouter()
 
   return (
     <Layout title="Sign Up">
-      <SignupForm onSuccess={() => router.push("/")} />
+      <SignupForm onSuccess={() => router.push(Routes.Home())} />
     </Layout>
   )
 }

packages/generator/templates/app/pages/index.tsx

@@ -6,6 +6,7 @@ import { useCurrentUser } from "app/core/hooks/useCurrentUser"
 import logout from "app/auth/mutations/logout"
 import logo from "public/logo.png"
 import { useMutation } from "@blitzjs/rpc"
+import { Routes } from "@blitzjs/next"
 
 /*
  * This file is just for a pleasant getting started page for your new app.
@@ -37,12 +38,12 @@ const UserInfo = () => {
   } else {
     return (
       <>
-        <Link href="/auth/signup">
+        <Link href={Routes.SignupPage()}>
           <a className="button small">
             <strong>Sign Up</strong>
           </a>
         </Link>
-        <Link href="/auth/login">
+        <Link href={Routes.LoginPage()}>
           <a className="button small">
             <strong>Login</strong>
           </a>

packages/generator/templates/app/tsconfig.json

@@ -2,7 +2,7 @@
   "compilerOptions": {
     "target": "es5",
     "lib": ["dom", "dom.iterable", "esnext"],
-    "baseUrl": "./",
+    "baseUrl": ".",
     "allowJs": true,
     "skipLibCheck": true,
     "strict": false,
@@ -17,7 +17,7 @@
     "isolatedModules": true,
     "jsx": "preserve",
     "incremental": true,
-    "tsBuildInfoFile": ".tsbuildinfo"
+    "tsBuildInfoFile": ".tsbuildinfo",
   },
   "exclude": ["node_modules", "**/*.e2e.ts", "cypress"],
   "include": ["blitz-env.d.ts", "**/*.ts", "**/*.tsx", "types"]

packages/generator/templates/minimalapp/tsconfig.json

@@ -2,7 +2,7 @@
   "compilerOptions": {
     "target": "es5",
     "lib": ["dom", "dom.iterable", "esnext"],
-    "baseUrl": "./",
+    "baseUrl": ".",
     "allowJs": true,
     "skipLibCheck": true,
     "strict": false,

packages/pkg-template/package.json

@@ -25,7 +25,7 @@
     "@typescript-eslint/parser": "5.9.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "2.0.0-alpha.16",
+    "@blitzjs/config": "2.0.0-alpha.21",
     "@types/react": "17.0.43",
     "@types/react-dom": "17.0.14",
     "react": "18.0.0",