Fix package.json depend missing

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

.changeset/few-dogs-fetch.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Use correct path for log utilities import

.changeset/poor-walls-relax.md

@@ -0,0 +1,10 @@
+---
+"@blitzjs/codemod": patch
+"@blitzjs/generator": patch
+"@blitzjs/auth": patch
+"@blitzjs/next": patch
+"@blitzjs/rpc": patch
+"@blitzjs/config": patch
+---
+
+Set current Blitz tag to latest

.changeset/pre.json

@@ -1,18 +1,18 @@
 {
   "mode": "pre",
-  "tag": "alpha",
+  "tag": "beta",
   "initialVersions": {
     "web": "0.0.0",
     "test-auth": "0.0.0",
     "test-rpc": "0.0.0",
     "test-utils": "0.0.0",
-    "blitz": "2.0.0-alpha.0",
-    "@blitzjs/auth": "2.0.0-alpha.0",
-    "@blitzjs/next": "2.0.0-alpha.0",
-    "@blitzjs/rpc": "2.0.0-alpha.0",
+    "blitz": "2.0.0-beta.0",
+    "@blitzjs/auth": "2.0.0-beta.0",
+    "@blitzjs/next": "2.0.0-beta.0",
+    "@blitzjs/rpc": "2.0.0-beta.0",
     "@blitzjs/config": "0.0.0",
-    "@blitzjs/generator": "2.0.0-alpha.0",
-    "@blitzjs/codemod": "2.0.0-alpha.0",
+    "@blitzjs/generator": "2.0.0-beta.0",
+    "@blitzjs/codemod": "2.0.0-beta.0",
     "template": "0.0.0",
     "toolkit-app": "1.0.0",
     "test-qm": "0.0.0",
@@ -50,6 +50,7 @@
     "fair-wombats-sneeze",
     "famous-kings-explain",
     "fast-trainers-kneel",
+    "few-dogs-fetch",
     "flat-bees-approve",
     "four-brooms-juggle",
     "four-meals-fry",
@@ -106,6 +107,7 @@
     "poor-peas-lick",
     "poor-penguins-look",
     "poor-shrimps-think",
+    "poor-walls-relax",
     "popular-teachers-pay",
     "pretty-games-march",
     "purple-singers-greet",
@@ -168,6 +170,7 @@
     "weak-suns-shave",
     "wicked-ghosts-cough",
     "wicked-rings-walk",
+    "wise-eels-visit",
     "wise-frogs-give",
     "wise-rabbits-complain"
   ]

.changeset/wise-eels-visit.md

@@ -0,0 +1,11 @@
+---
+"blitz": patch
+"@blitzjs/auth": patch
+"@blitzjs/next": patch
+"@blitzjs/rpc": patch
+"@blitzjs/codemod": patch
+"@blitzjs/config": patch
+"@blitzjs/generator": patch
+---
+
+Beta release

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Contributing
 
-[Read the Contributing Guide at Blitzjs.com](https://alpha.blitzjs.com/docs/contributing)
+[Read the Contributing Guide at Blitzjs.com](https://blitzjs.com/docs/contributing)
 
 ## To run tests
 

README.md

@@ -8,7 +8,7 @@
 <!-- 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-391-17BB8A.svg?style=for-the-badge&labelColor=000000"></a>
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
-  <a aria-label="License" href="https://github.com/blitz-js/blitz/blob/canary/LICENSE">
+  <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">
   </a>
   <a aria-label="NPM version" href="https://www.npmjs.com/package/blitz">
@@ -66,16 +66,16 @@ Your financial contributions help ensure Blitz continues to be developed and mai
 <table>
   <tr>
  <td><a aria-label="Andreas Asprou" href="https://andreas.fyi">
-<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/canary/assets/andreas.jpg" width="40px"/>
+<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/main/assets/andreas.jpg" width="40px"/>
 </a></td>
  <td><a aria-label="Digas" href="https://digsas.com">
-<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/canary/assets/digsas.svg" width="40px"/>
+<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/main/assets/digsas.svg" width="40px"/>
 </a></td>
  <td><a aria-label="userTrack" href="https://www.usertrack.net/?ref=blitzjs">
-<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/canary/assets/usertrack.png" width="40px"/>
+<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/main/assets/usertrack.png" width="40px"/>
 </a></td>
  <td><a aria-label="MeetKai" href="https://meetkai.com/?ref=blitzjs">
-<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/canary/assets/meetkai.png" width="40px"/>
+<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/main/assets/meetkai.png" width="40px"/>
 </a></td>
   </tr>
 </table>
@@ -85,14 +85,11 @@ Your financial contributions help ensure Blitz continues to be developed and mai
 
 <table>
   <tr>
-<td><a aria-label="Render.com" href="https://render.com?utm_source=BlitzJS&utm_medium=sponsorship&utm_campaign=BlitzJS_Sponsorship_2020">
-<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/canary/assets/render-logo-color2.png" width="200px">
-</a></td>
 <td><a aria-label="RIT" href="https://rit-inc.co.jp/?utm_source=BlitzJS&utm_medium=sponsorship&utm_campaign=BlitzJS_Sponsorship_2021">
-<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/canary/assets/rit_logo.png" width="200px">
+<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/main/assets/rit_logo.png" width="200px">
 </a></td>
 <td><a aria-label="Boostry" href="https://boostry.co.jp/?utm_source=BlitzJS&utm_medium=sponsorship&utm_campaign=BlitzJS_Sponsorship_2021">
-<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/canary/assets/boostry.svg" width="200px">
+<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/main/assets/boostry.svg" width="200px">
 </a></td>
   </tr>
 </table>
@@ -105,7 +102,7 @@ Your financial contributions help ensure Blitz continues to be developed and mai
   <tr>
   <td>
 <a aria-label="Fauna" href="https://dashboard.fauna.com/accounts/register?utm_source=BlitzJS&utm_medium=sponsorship&utm_campaign=BlitzJS_Sponsorship_2020">
-<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/canary/assets/Fauna_Logo_Blue.png" width="300px">
+<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/main/assets/Fauna_Logo_Blue.png" width="300px">
 </a>
 </td>
   </tr>
@@ -119,9 +116,13 @@ Your financial contributions help ensure Blitz continues to be developed and mai
 
 ### 💎 Diamond Sponsors
 
-<a aria-label="Your Company" href="#">
-<img alt="" src="https://dummyimage.com/1000x330/efe8ff/000000.png&text=Your+Logo+Here" width="500px">
-</a>
+<table>
+  <tr>
+    <a aria-label="Flightcontrol" href="https://www.flightcontrol.dev?ref=blitzjs">
+    <img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/main/assets/flightcontrol.png" width="400px">
+    </a>
+  </tr>
+</table>
 
 <br>
 

apps/toolkit-app/package.json

@@ -29,7 +29,7 @@
     "@blitzjs/rpc": "workspace:*",
     "@hookform/resolvers": "2.8.8",
     "@prisma/client": "4.0.0",
-    "blitz": "workspace:2.0.0-alpha.70",
+    "blitz": "workspace:2.0.0-beta.1",
     "next": "12.2.0",
     "prisma": "4.0.0",
     "react": "18.0.0",

packages/blitz-auth/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @blitzjs/auth
 
+## 2.0.0-beta.1
+
+### Patch Changes
+
+- 0f4926fd: Set current Blitz tag to latest
+  - blitz@2.0.0-beta.1
+
+## 2.0.0-beta.72
+
+### Patch Changes
+
+- 2cc888ef: Beta release
+- Updated dependencies [2cc888ef]
+  - blitz@2.0.0-beta.72
+
+## 2.0.0-alpha.71
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.71
+
 ## 2.0.0-alpha.70
 
 ### Patch Changes

packages/blitz-auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/auth",
-  "version": "2.0.0-alpha.70",
+  "version": "2.0.0-beta.1",
   "scripts": {
     "build": "unbuild",
     "predev": "wait-on -d 250 ../blitz/dist/index-server.d.ts",
@@ -26,7 +26,7 @@
     "@types/secure-password": "3.1.1",
     "b64-lite": "1.4.0",
     "bad-behavior": "1.0.1",
-    "blitz": "2.0.0-alpha.70",
+    "blitz": "2.0.0-beta.1",
     "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-alpha.70",
+    "@blitzjs/config": "workspace:2.0.0-beta.1",
     "@testing-library/react": "13.0.0",
     "@testing-library/react-hooks": "7.0.2",
     "@types/cookie": "0.4.1",

packages/blitz-next/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @blitzjs/next
 
+## 2.0.0-beta.1
+
+### Patch Changes
+
+- 0f4926fd: Set current Blitz tag to latest
+- Updated dependencies [0f4926fd]
+  - @blitzjs/rpc@2.0.0-beta.1
+
+## 2.0.0-beta.72
+
+### Patch Changes
+
+- 2cc888ef: Beta release
+- Updated dependencies [2cc888ef]
+  - @blitzjs/rpc@2.0.0-beta.72
+
+## 2.0.0-alpha.71
+
+### Patch Changes
+
+- @blitzjs/rpc@2.0.0-alpha.71
+
 ## 2.0.0-alpha.70
 
 ### Patch Changes

packages/blitz-next/package.json

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

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

@@ -240,8 +240,7 @@ export function withBlitz(nextConfig: BlitzConfig = {}) {
     },
   })
 
-  const {blitz, ...rest} = config
-  return rest
+  return config
 }
 
 export type PrefetchQueryFn = <T extends AsyncFunc, TInput = FirstParam<T>>(

packages/blitz-rpc/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @blitzjs/rpc
 
+## 2.0.0-beta.1
+
+### Patch Changes
+
+- 0f4926fd: Set current Blitz tag to latest
+- Updated dependencies [0f4926fd]
+  - @blitzjs/auth@2.0.0-beta.1
+
+## 2.0.0-beta.72
+
+### Patch Changes
+
+- 2cc888ef: Beta release
+- Updated dependencies [2cc888ef]
+  - @blitzjs/auth@2.0.0-beta.72
+
+## 2.0.0-alpha.71
+
+### Patch Changes
+
+- @blitzjs/auth@2.0.0-alpha.71
+
 ## 2.0.0-alpha.70
 
 ### Patch Changes

packages/blitz-rpc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/rpc",
-  "version": "2.0.0-alpha.70",
+  "version": "2.0.0-beta.1",
   "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.70",
+    "@blitzjs/auth": "2.0.0-beta.1",
     "@tanstack/react-query": "4.0.10",
     "b64-lite": "1.4.0",
     "bad-behavior": "1.0.1",
@@ -30,11 +30,11 @@
     "supports-color": "8.1.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.70",
+    "@blitzjs/config": "workspace:2.0.0-beta.1",
     "@types/debug": "4.1.7",
     "@types/react": "18.0.1",
     "@types/react-dom": "17.0.14",
-    "blitz": "2.0.0-alpha.70",
+    "blitz": "2.0.0-beta.1",
     "next": "12.2.0",
     "react": "18.0.0",
     "react-dom": "18.0.0",

packages/blitz/CHANGELOG.md

@@ -1,5 +1,27 @@
 # blitz
 
+## 2.0.0-beta.1
+
+### Patch Changes
+
+- Updated dependencies [0f4926fd]
+  - @blitzjs/generator@2.0.0-beta.1
+
+## 2.0.0-beta.72
+
+### Patch Changes
+
+- 2cc888ef: Beta release
+- Updated dependencies [2cc888ef]
+  - @blitzjs/generator@2.0.0-beta.72
+
+## 2.0.0-alpha.71
+
+### Patch Changes
+
+- Updated dependencies [176c7b8b]
+  - @blitzjs/generator@2.0.0-alpha.71
+
 ## 2.0.0-alpha.70
 
 ### Patch Changes

packages/blitz/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blitz",
-  "version": "2.0.0-alpha.70",
+  "version": "2.0.0-beta.1",
   "scripts": {
     "build": "unbuild",
     "dev": "watch unbuild src --wait=0.2",
@@ -23,7 +23,7 @@
     "blitz": "bin/blitz"
   },
   "dependencies": {
-    "@blitzjs/generator": "2.0.0-alpha.70",
+    "@blitzjs/generator": "2.0.0-beta.1",
     "arg": "5.0.1",
     "boxen": "7.0.0",
     "chalk": "^4.1.0",
@@ -47,6 +47,7 @@
     "prompts": "2.4.2",
     "resolve-cwd": "3.0.0",
     "resolve-from": "5.0.0",
+    "semver": "7.3.7",
     "superjson": "1.8.0",
     "supports-color": "8.1.1",
     "ts-node": "10.7.0",
@@ -55,7 +56,7 @@
     "watchpack": "2.1.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.70",
+    "@blitzjs/config": "workspace:2.0.0-beta.1",
     "@types/cookie": "0.4.1",
     "@types/cross-spawn": "6.0.2",
     "@types/debug": "4.1.7",

packages/blitz/src/cli/utils/codegen-tasks.ts

@@ -1,54 +0,0 @@
-import {generateManifest} from "./routes-manifest"
-import {log} from "../../logging"
-import resolveCwd from "resolve-cwd"
-import {join} from "path"
-import fs from "fs-extra"
-import {getPackageJson} from "./get-package-json"
-import {runPrisma} from "../../utils/run-prisma"
-
-export const codegenTasks = async () => {
-  try {
-    /* 
-      Updates the user's nextjs file and adds onRecoverableError to the hydrateRoot 3rd parameter object.
-      We can remove this when https://github.com/vercel/next.js/pull/38207 is merged into next.js
-    */
-    const nextDir = await resolveCwd("next")
-    const nextClientIndex = join(nextDir, "../..", "client", "index.js")
-    const readFile = await fs.readFile(nextClientIndex)
-    const updatedFile = readFile
-      .toString()
-      .replace(
-        /ReactDOM\.hydrateRoot\(.*?\);/,
-        `ReactDOM.hydrateRoot(domEl, reactEl, process.env.NODE_ENV === 'development' ? {onRecoverableError: (err) => err.toString().includes("could not finish this Suspense boundary") ? null : console.error(err)} : undefined);`,
-      )
-    await fs.writeFile(nextClientIndex, updatedFile)
-    log.success("Next.js was successfully patched with a React Suspense fix")
-  } catch (err) {
-    log.error(JSON.stringify(err, null, 2))
-  }
-
-  try {
-    await generateManifest()
-    log.success("Routes manifest was successfully generated")
-
-    const {dependencies, devDependencies} = await getPackageJson()
-
-    const hasPrisma = Object.keys({...dependencies, ...devDependencies}).some(
-      (name) => name === "prisma",
-    )
-
-    if (hasPrisma) {
-      let prismaSpinner = log.spinner(`Generating Prisma client`).start()
-      const result = await runPrisma(["generate"], true)
-      if (result.success) {
-        prismaSpinner.succeed(log.greenText("Generated Prisma client"))
-      } else {
-        prismaSpinner.fail()
-        console.log("\n" + result.stderr)
-        process.exit(1)
-      }
-    }
-  } catch (err) {
-    log.error(JSON.stringify(err, null, 2))
-  }
-}

packages/blitz/src/cli/utils/codegen-tasks/generatePrisma.ts

@@ -0,0 +1,22 @@
+import {log} from "../../../logging"
+import {runPrisma} from "../../../utils/run-prisma"
+import {getPackageJson} from "../get-package-json"
+
+export const generatePrismaClient = async () => {
+  const {dependencies, devDependencies} = await getPackageJson()
+  const hasPrisma = Object.keys({...dependencies, ...devDependencies}).some(
+    (name) => name === "prisma",
+  )
+
+  if (hasPrisma) {
+    let prismaSpinner = log.spinner(`Generating Prisma client`).start()
+    const result = await runPrisma(["generate"], true)
+    if (result.success) {
+      prismaSpinner.succeed(log.greenText("Generated Prisma client"))
+    } else {
+      prismaSpinner.fail()
+      console.log("\n" + result.stderr)
+      process.exit(1)
+    }
+  }
+}

packages/blitz/src/cli/utils/codegen-tasks/index.ts

@@ -0,0 +1,25 @@
+import {generateManifest} from "../routes-manifest"
+import {log} from "../../../logging"
+
+import {generatePrismaClient} from "./generatePrisma"
+import {patchNextSuspenseBug, patchNextConfigWarning} from "./patchNextJs"
+
+const _tryCatch = async (fn: () => Promise<unknown>) => {
+  try {
+    await fn()
+  } catch (err) {
+    log.error(JSON.stringify(err, null, 2))
+  }
+}
+
+export const codegenTasks = async () => {
+  await _tryCatch(patchNextSuspenseBug)
+  await _tryCatch(patchNextConfigWarning)
+
+  await _tryCatch(async () => {
+    await generateManifest()
+    log.success("Routes manifest was successfully generated")
+  })
+
+  await _tryCatch(generatePrismaClient)
+}

packages/blitz/src/cli/utils/codegen-tasks/patchNextJs.ts

@@ -0,0 +1,63 @@
+import {join} from "path"
+import semver from "semver"
+import resolveCwd from "resolve-cwd"
+import fs from "fs-extra"
+
+import {log} from "../../../logging"
+import {getPackageJson} from "../get-package-json"
+
+const modifyNextFile = async (
+  path: string,
+  replacer: (str: string) => string,
+  semverCheck?: (version: string) => boolean,
+) => {
+  const nextDir = resolveCwd("next")
+  if (semverCheck) {
+    const pkgJson = await getPackageJson(nextDir)
+    if (!semverCheck(pkgJson.version)) {
+      return
+    }
+  }
+
+  const nextClientIndex = join(nextDir, path)
+  const readFile = await fs.readFile(nextClientIndex)
+  const updatedFile = replacer(readFile.toString())
+
+  await fs.writeFile(nextClientIndex, updatedFile)
+}
+
+export const patchNextSuspenseBug = async () => {
+  /*
+    Updates the user's nextjs file and adds onRecoverableError to the hydrateRoot 3rd parameter object.
+    We can remove this when https://github.com/vercel/next.js/pull/38207 is merged into next.js
+  */
+
+  await modifyNextFile("../../client/index.js", (str) => {
+    return str.replace(
+      /ReactDOM\.hydrateRoot\(.*?\);/,
+      `ReactDOM.hydrateRoot(domEl, reactEl, process.env.NODE_ENV === 'development' ? {onRecoverableError: (err) => err.toString().includes("could not finish this Suspense boundary") ? null : console.error(err)} : undefined);`,
+    )
+  })
+
+  log.success("Next.js was successfully patched with a React Suspense fix")
+}
+
+export const patchNextConfigWarning = async () => {
+  /*
+    Updates the user's nextjs config validation to add blitz as a valid prop in the config schema
+    We can remove this when https://github.com/vercel/next.js/issues/39606 issue gets resolved
+  */
+
+  await modifyNextFile(
+    "../../client/index.js",
+    (str) => {
+      return str.replace(
+        /type:"object",additionalProperties:false,properties:{amp:{/,
+        `type:"object",additionalProperties:false,properties:{blitz:{type:"any"},amp:{`,
+      )
+    },
+    (version) => semver.gte(version, "12.2.3"),
+  )
+
+  log.success("Next.js was successfully patched with config warning fix")
+}

packages/blitz/src/cli/utils/get-package-json.ts

@@ -2,8 +2,8 @@ import {existsSync} from "fs"
 import {readJSON} from "fs-extra"
 import {join} from "path"
 
-export const getPackageJson = async () => {
-  const pkgJsonPath = join(process.cwd(), "package.json")
+export const getPackageJson = async (path = process.cwd()) => {
+  const pkgJsonPath = join(path, "package.json")
   if (existsSync(pkgJsonPath)) {
     return readJSON(pkgJsonPath)
   }

packages/codemod/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @blitzjs/codemod
 
+## 2.0.0-beta.1
+
+### Patch Changes
+
+- 0f4926fd: Set current Blitz tag to latest
+- Updated dependencies [0f4926fd]
+  - @blitzjs/generator@2.0.0-beta.1
+  - blitz@2.0.0-beta.1
+
+## 2.0.0-beta.72
+
+### Patch Changes
+
+- 2cc888ef: Beta release
+- Updated dependencies [2cc888ef]
+  - blitz@2.0.0-beta.72
+  - @blitzjs/generator@2.0.0-beta.72
+
+## 2.0.0-alpha.71
+
+### Patch Changes
+
+- Updated dependencies [176c7b8b]
+  - @blitzjs/generator@2.0.0-alpha.71
+  - blitz@2.0.0-alpha.71
+
 ## 2.0.0-alpha.70
 
 ### Patch Changes

packages/codemod/package.json

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

packages/codemod/src/upgrade-legacy.ts

@@ -23,7 +23,7 @@ import {
 } from "./utils"
 import {log} from "blitz"
 
-const CURRENT_BLITZ_TAG = "alpha"
+const CURRENT_BLITZ_TAG = "latest"
 
 class ExpectedError extends Error {
   constructor(message: string) {

packages/config/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @blitzjs/config
 
+## 2.0.0-beta.1
+
+### Patch Changes
+
+- 0f4926fd: Set current Blitz tag to latest
+
+## 2.0.0-beta.72
+
+### Patch Changes
+
+- 2cc888ef: Beta release
+
+## 2.0.0-alpha.71
+
 ## 2.0.0-alpha.70
 
 ## 2.0.0-alpha.69

packages/config/package.json

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

packages/generator/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @blitzjs/generator
 
+## 2.0.0-beta.1
+
+### Patch Changes
+
+- 0f4926fd: Set current Blitz tag to latest
+
+## 2.0.0-beta.72
+
+### Patch Changes
+
+- 2cc888ef: Beta release
+
+## 2.0.0-alpha.71
+
+### Patch Changes
+
+- 176c7b8b: Use correct path for log utilities import
+
 ## 2.0.0-alpha.70
 
 ### Patch Changes

packages/generator/package.json

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

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

@@ -2,7 +2,7 @@ import * as ast from "@mrleebo/prisma-ast"
 import {spawn} from "cross-spawn"
 import which from "npm-which"
 import path from "path"
-import {log} from "src/utils/log"
+import {log} from "../utils/log"
 import {Generator, GeneratorOptions, SourceRootType} from "../generator"
 import {Field} from "../prisma/field"
 import {Model} from "../prisma/model"

packages/generator/src/utils/get-blitz-dependency-version.ts

@@ -1,7 +1,7 @@
 import {logFailedVersionFetch} from "./get-latest-version"
 import {fetchDistTags} from "./npm-fetch"
 
-const CURRENT_BLITZ_TAG = "alpha"
+const CURRENT_BLITZ_TAG = "latest"
 
 export const getBlitzDependencyVersion = async () => {
   try {

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

@@ -22,11 +22,11 @@
     "*.{js}": ["eslint --fix"]
   },
   "dependencies": {
-    "@blitzjs/auth": "alpha",
-    "@blitzjs/next": "alpha",
-    "@blitzjs/rpc": "alpha",
+    "@blitzjs/auth": "latest",
+    "@blitzjs/next": "latest",
+    "@blitzjs/rpc": "latest",
     "@prisma/client": "4.0.0",
-    "blitz": "alpha",
+    "blitz": "latest",
     "next": "12.2.0",
     "prisma": "4.0.0",
     "react": "18.0.0",

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

@@ -22,11 +22,11 @@
     "*.{js,ts,tsx}": ["eslint --fix"]
   },
   "dependencies": {
-    "@blitzjs/auth": "alpha",
-    "@blitzjs/next": "alpha",
-    "@blitzjs/rpc": "alpha",
+    "@blitzjs/auth": "latest",
+    "@blitzjs/next": "latest",
+    "@blitzjs/rpc": "latest",
     "@prisma/client": "4.0.0",
-    "blitz": "alpha",
+    "blitz": "latest",
     "next": "12.2.0",
     "prisma": "4.0.0",
     "react": "18.0.0",

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

@@ -18,8 +18,8 @@
     "*.{js}": ["eslint --fix"]
   },
   "dependencies": {
-    "@blitzjs/next": "alpha",
-    "blitz": "alpha",
+    "@blitzjs/next": "latest",
+    "blitz": "latest",
     "next": "12.2.0",
     "react": "18.0.0",
     "react-dom": "18.0.0",

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

@@ -20,8 +20,8 @@
     ]
   },
   "dependencies": {
-    "@blitzjs/next": "alpha",
-    "blitz": "alpha",
+    "@blitzjs/next": "latest",
+    "blitz": "latest",
     "next": "12.2.0",
     "react": "18.0.0",
     "react-dom": "18.0.0",

packages/pkg-template/package.json

@@ -25,7 +25,7 @@
     "@typescript-eslint/parser": "5.9.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "2.0.0-alpha.70",
+    "@blitzjs/config": "2.0.0-beta.1",
     "@types/react": "18.0.1",
     "@types/react-dom": "17.0.14",
     "react": "18.0.0",

pnpm-lock.yaml

@@ -49,7 +49,7 @@ importers:
       "@types/preview-email": 2.0.1
       "@types/react": 18.0.1
       "@typescript-eslint/eslint-plugin": 5.9.1
-      blitz: workspace:2.0.0-alpha.69
+      blitz: workspace:2.0.0-beta.1
       eslint: 7.32.0
       eslint-config-next: 12.2.0
       eslint-config-prettier: 8.5.0
@@ -524,8 +524,8 @@ importers:
 
   packages/blitz:
     specifiers:
-      "@blitzjs/config": workspace:2.0.0-alpha.69
-      "@blitzjs/generator": 2.0.0-alpha.69
+      "@blitzjs/config": workspace:2.0.0-beta.1
+      "@blitzjs/generator": 2.0.0-beta.1
       "@types/cookie": 0.4.1
       "@types/cross-spawn": 6.0.2
       "@types/debug": 4.1.7
@@ -566,6 +566,7 @@ importers:
       react: 18.0.0
       resolve-cwd: 3.0.0
       resolve-from: 5.0.0
+      semver: 7.3.7
       superjson: 1.8.0
       supports-color: 8.1.1
       test-listen: 1.1.0
@@ -602,6 +603,7 @@ importers:
       prompts: 2.4.2
       resolve-cwd: 3.0.0
       resolve-from: 5.0.0
+      semver: 7.3.7
       superjson: 1.8.0_supports-color@8.1.1
       supports-color: 8.1.1
       ts-node: 10.7.0_typescript@4.6.3
@@ -635,7 +637,7 @@ importers:
 
   packages/blitz-auth:
     specifiers:
-      "@blitzjs/config": workspace:2.0.0-alpha.69
+      "@blitzjs/config": workspace:2.0.0-beta.1
       "@testing-library/react": 13.0.0
       "@testing-library/react-hooks": 7.0.2
       "@types/b64-lite": 1.3.0
@@ -649,7 +651,7 @@ importers:
       "@types/secure-password": 3.1.1
       b64-lite: 1.4.0
       bad-behavior: 1.0.1
-      blitz: 2.0.0-alpha.69
+      blitz: 2.0.0-beta.1
       cookie: 0.4.1
       cookie-session: 2.0.0
       debug: 4.3.3
@@ -702,8 +704,8 @@ importers:
 
   packages/blitz-next:
     specifiers:
-      "@blitzjs/config": workspace:2.0.0-alpha.69
-      "@blitzjs/rpc": 2.0.0-alpha.69
+      "@blitzjs/config": workspace:2.0.0-beta.1
+      "@blitzjs/rpc": 2.0.0-beta.1
       "@tanstack/react-query": 4.0.10
       "@testing-library/dom": 8.13.0
       "@testing-library/jest-dom": 5.16.3
@@ -715,7 +717,7 @@ importers:
       "@types/react": 18.0.1
       "@types/react-dom": 17.0.14
       "@types/testing-library__react-hooks": 4.0.0
-      blitz: 2.0.0-alpha.69
+      blitz: 2.0.0-beta.1
       cross-spawn: 7.0.3
       debug: 4.3.3
       find-up: 4.1.0
@@ -765,15 +767,15 @@ importers:
 
   packages/blitz-rpc:
     specifiers:
-      "@blitzjs/auth": 2.0.0-alpha.69
-      "@blitzjs/config": workspace:2.0.0-alpha.69
+      "@blitzjs/auth": 2.0.0-beta.1
+      "@blitzjs/config": workspace:2.0.0-beta.1
       "@tanstack/react-query": 4.0.10
       "@types/debug": 4.1.7
       "@types/react": 18.0.1
       "@types/react-dom": 17.0.14
       b64-lite: 1.4.0
       bad-behavior: 1.0.1
-      blitz: 2.0.0-alpha.69
+      blitz: 2.0.0-beta.1
       chalk: ^4.1.0
       debug: 4.3.3
       next: 12.2.0
@@ -816,12 +818,12 @@ importers:
       "@babel/plugin-syntax-typescript": 7.17.12
       "@babel/preset-env": 7.12.10
       "@blitzjs/config": workspace:*
-      "@blitzjs/generator": 2.0.0-alpha.69
+      "@blitzjs/generator": 2.0.0-beta.1
       "@types/jscodeshift": 0.11.2
       "@types/node": 17.0.16
       arg: 5.0.1
       ast-types: 0.14.2
-      blitz: 2.0.0-alpha.69
+      blitz: 2.0.0-beta.1
       chalk: ^4.1.0
       cross-spawn: 7.0.3
       debug: 4.3.3
@@ -876,7 +878,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-alpha.69
+      "@blitzjs/config": 2.0.0-beta.1
       "@juanm04/cpx": 2.0.1
       "@mrleebo/prisma-ast": 0.2.6
       "@types/babel__core": 7.1.19
@@ -969,7 +971,7 @@ importers:
 
   packages/pkg-template:
     specifiers:
-      "@blitzjs/config": 2.0.0-alpha.69
+      "@blitzjs/config": 2.0.0-beta.1
       "@types/react": 18.0.1
       "@types/react-dom": 17.0.14
       "@typescript-eslint/eslint-plugin": 5.9.1
@@ -3109,6 +3111,7 @@ packages:
       semver: 5.7.1
     transitivePeerDependencies:
       - supports-color
+    dev: false
 
   /@babel/preset-flow/7.17.12_@babel+core@7.18.2:
     resolution:
@@ -5539,6 +5542,7 @@ packages:
       typescript: 4.6.3
     transitivePeerDependencies:
       - supports-color
+    dev: false
 
   /@typescript-eslint/experimental-utils/5.28.0_hrkuebk64jiu2ut2d2sm4oylnu:
     resolution:
@@ -9365,6 +9369,7 @@ packages:
     transitivePeerDependencies:
       - eslint-import-resolver-webpack
       - supports-color
+    dev: false
 
   /eslint-config-next/12.2.5_hrkuebk64jiu2ut2d2sm4oylnu:
     resolution:
@@ -9402,6 +9407,7 @@ packages:
     hasBin: true
     peerDependencies:
       eslint: ">=7.0.0"
+    dev: false
 
   /eslint-config-prettier/8.5.0_eslint@7.32.0:
     resolution: