alpha.14

changeset version

.changeset/breezy-cameras-double.md

@@ -0,0 +1,7 @@
+---
+"blitz": patch
+"@blitzjs/next": patch
+"@blitzjs/generator": patch
+---
+
+Fix codegen and postinstall to make work with pnpm

.changeset/dirty-monkeys-greet.md

@@ -0,0 +1,6 @@
+---
+"blitz": patch
+"@blitzjs/generator": patch
+---
+
+Use alpha version for blitz dependency, fix package manager selection

.changeset/flat-bees-approve.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+set default enviornment variable to development unless build and start command

.changeset/great-months-train.md

@@ -0,0 +1,9 @@
+---
+"blitz": patch
+"@blitzjs/next": patch
+"@blitzjs/auth": patch
+"@blitzjs/rpc": patch
+"@blitzjs/generator": patch
+---
+
+fix route manifest codegen

.changeset/lovely-colts-share.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+fix broken cli versioning

.changeset/pre.json

@@ -16,10 +16,19 @@
     "toolkit-app": "1.0.0"
   },
   "changesets": [
+    "breezy-cameras-double",
+    "dirty-monkeys-greet",
+    "flat-bees-approve",
+    "great-months-train",
+    "lovely-colts-share",
     "nine-onions-admire",
     "ninety-pets-heal",
     "poor-peas-lick",
+    "quiet-feet-travel",
+    "silent-colts-reply",
+    "swift-drinks-dress",
     "ten-rivers-burn",
+    "thirty-countries-build",
     "twenty-beans-pump"
   ]
 }

.changeset/quiet-feet-travel.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+fix source path for templates

.changeset/silent-colts-reply.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+added index.cjs to blitz externals

.changeset/swift-drinks-dress.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+Fix postinstall script not being found

.changeset/thirty-countries-build.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+add @blitzjs/generator as external

.gitignore

@@ -62,6 +62,7 @@ examples/auth2
 .idea
 .ultra.cache.json
 db.sqlite-journal
+**/db/db.sqlite
 test/integration/**/db.json
 test/**/*/out
 test/**/blitz-env.d.ts

README.md

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

apps/toolkit-app/.eslintrc.js

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

apps/toolkit-app/CHANGELOG.md

@@ -1,5 +1,103 @@
 # toolkit-app
 
+## 1.0.1-alpha.9
+
+### Patch Changes
+
+- Updated dependencies
+  - blitz@2.0.0-alpha.14
+  - @blitzjs/auth@2.0.0-alpha.14
+  - @blitzjs/next@2.0.0-alpha.14
+  - @blitzjs/rpc@2.0.0-alpha.14
+  - @blitzjs/config@2.0.0-alpha.14
+
+## 1.0.1-alpha.8
+
+### Patch Changes
+
+- Updated dependencies
+  - blitz@2.0.0-alpha.13
+  - @blitzjs/next@2.0.0-alpha.13
+  - @blitzjs/auth@2.0.0-alpha.13
+  - @blitzjs/rpc@2.0.0-alpha.13
+  - @blitzjs/config@2.0.0-alpha.13
+
+## 1.0.1-alpha.7
+
+### Patch Changes
+
+- Updated dependencies
+  - blitz@2.0.0-alpha.12
+  - @blitzjs/auth@2.0.0-alpha.12
+  - @blitzjs/next@2.0.0-alpha.12
+  - @blitzjs/rpc@2.0.0-alpha.12
+  - @blitzjs/config@2.0.0-alpha.12
+
+## 1.0.1-alpha.6
+
+### Patch Changes
+
+- Updated dependencies
+  - @blitzjs/next@2.0.0-alpha.11
+  - @blitzjs/auth@2.0.0-alpha.11
+  - @blitzjs/rpc@2.0.0-alpha.11
+  - @blitzjs/config@2.0.0-alpha.11
+  - blitz@2.0.0-alpha.11
+
+## 1.0.1-alpha.5
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.10
+- @blitzjs/auth@2.0.0-alpha.10
+- @blitzjs/next@2.0.0-alpha.10
+- @blitzjs/rpc@2.0.0-alpha.10
+- @blitzjs/config@2.0.0-alpha.10
+
+## 1.0.1-alpha.4
+
+### Patch Changes
+
+- Updated dependencies
+  - blitz@2.0.0-alpha.9
+  - @blitzjs/auth@2.0.0-alpha.9
+  - @blitzjs/next@2.0.0-alpha.9
+  - @blitzjs/rpc@2.0.0-alpha.9
+  - @blitzjs/config@2.0.0-alpha.9
+
+## 1.0.1-alpha.3
+
+### Patch Changes
+
+- Updated dependencies
+  - blitz@2.0.0-alpha.8
+  - @blitzjs/auth@2.0.0-alpha.8
+  - @blitzjs/next@2.0.0-alpha.8
+  - @blitzjs/rpc@2.0.0-alpha.8
+  - @blitzjs/config@2.0.0-alpha.8
+
+## 1.0.1-alpha.2
+
+### Patch Changes
+
+- Updated dependencies
+  - blitz@2.0.0-alpha.7
+  - @blitzjs/auth@2.0.0-alpha.7
+  - @blitzjs/next@2.0.0-alpha.7
+  - @blitzjs/rpc@2.0.0-alpha.7
+  - @blitzjs/config@2.0.0-alpha.7
+
+## 1.0.1-alpha.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @blitzjs/next@2.0.0-alpha.6
+  - blitz@2.0.0-alpha.6
+  - @blitzjs/auth@2.0.0-alpha.6
+  - @blitzjs/rpc@2.0.0-alpha.6
+  - @blitzjs/config@2.0.0-alpha.6
+
 ## 1.0.1-alpha.0
 
 ### Patch Changes

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

@@ -1,5 +1,5 @@
 import { NotFoundError } from "blitz"
-import { prisma as db } from "db"
+import { db } from "db"
 import { authenticateUser } from "./login"
 import { ChangePassword } from "../validations"
 import { resolver } from "@blitzjs/rpc"

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

@@ -1,6 +1,6 @@
 import { generateToken, hash256 } from "@blitzjs/auth"
 import { resolver } from "@blitzjs/rpc"
-import { prisma as db } from "db"
+import { db } from "db"
 import { forgotPasswordMailer } from "mailers/forgotPasswordMailer"
 import { ForgotPassword } from "../validations"
 

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

@@ -1,7 +1,7 @@
 import { SecurePassword } from "@blitzjs/auth"
 import { resolver } from "@blitzjs/rpc"
 import { AuthenticationError } from "blitz"
-import { prisma as db, User } from "db"
+import { db } from "db"
 import { Role } from "types"
 import { Login } from "../validations"
 

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

@@ -1,5 +1,5 @@
 import { SecurePassword, hash256 } from "@blitzjs/auth"
-import { prisma } from "db"
+import { db } from "db"
 import { ResetPassword } from "../validations"
 import login from "./login"
 
@@ -12,7 +12,7 @@ export default async function resetPassword(input, ctx) {
   ResetPassword.parse(input)
   // 1. Try to find this token in the database
   const hashedToken = hash256(input.token)
-  const possibleToken = await prisma.token.findFirst({
+  const possibleToken = await db.token.findFirst({
     where: { hashedToken, type: "RESET_PASSWORD" },
     include: { user: true },
   })
@@ -24,7 +24,7 @@ export default async function resetPassword(input, ctx) {
   const savedToken = possibleToken
 
   // 3. Delete token so it can't be used again
-  await prisma.token.delete({ where: { id: savedToken.id } })
+  await db.token.delete({ where: { id: savedToken.id } })
 
   // 4. If token has expired, error
   if (savedToken.expiresAt < new Date()) {
@@ -33,13 +33,13 @@ export default async function resetPassword(input, ctx) {
 
   // 5. Since token is valid, now we can update the user's password
   const hashedPassword = await SecurePassword.hash(input.password.trim())
-  const user = await prisma.user.update({
+  const user = await db.user.update({
     where: { id: savedToken.userId },
     data: { hashedPassword },
   })
 
   // 6. Revoke all existing login sessions for this user
-  await prisma.session.deleteMany({ where: { userId: user.id } })
+  await db.session.deleteMany({ where: { userId: user.id } })
 
   // 7. Now log the user in with the new credentials
   await login({ email: user.email, password: input.password }, ctx)

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

@@ -1,4 +1,4 @@
-import { prisma } from "db"
+import { db } from "db"
 import { SecurePassword } from "@blitzjs/auth"
 
 export default async function signup(input, ctx) {
@@ -6,7 +6,7 @@ export default async function signup(input, ctx) {
 
   const hashedPassword = await SecurePassword.hash((input.password as string) || "test-password")
   const email = (input.email as string) || "test" + Math.random() + "@test.com"
-  const user = await prisma.user.create({
+  const user = await db.user.create({
     data: { email, hashedPassword, role: "user" },
     select: { id: true, name: true, email: true, role: true },
   })

apps/toolkit-app/app/blitz-client.ts

@@ -1,8 +1,8 @@
 import { AuthClientPlugin } from "@blitzjs/auth"
-import { setupClient } from "@blitzjs/next"
+import { setupBlitzClient } from "@blitzjs/next"
 import { BlitzRpcPlugin } from "@blitzjs/rpc"
 
-const { withBlitz } = setupClient({
+export const { withBlitz } = setupBlitzClient({
   plugins: [
     AuthClientPlugin({
       cookiePrefix: "web-cookie-prefix",
@@ -16,5 +16,3 @@ const { withBlitz } = setupClient({
     }),
   ],
 })
-
-export { withBlitz }

apps/toolkit-app/app/blitz-server.ts

@@ -1,9 +1,9 @@
-import { setupBlitz } from "@blitzjs/next"
+import { setupBlitzServer } from "@blitzjs/next"
 import { AuthServerPlugin, PrismaStorage } from "@blitzjs/auth"
-import { prisma as db } from "../db/index"
+import { db } from "db"
 import { simpleRolesIsAuthorized } from "@blitzjs/auth"
 
-const { gSSP, gSP, api } = setupBlitz({
+const { gSSP, gSP, api } = setupBlitzServer({
   plugins: [
     AuthServerPlugin({
       cookiePrefix: "web-cookie-prefix",

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

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

apps/toolkit-app/db/index.ts

@@ -4,5 +4,5 @@ import { PrismaClient } from "@prisma/client"
 const EnhancedPrisma = enhancePrisma(PrismaClient)
 
 export * from "@prisma/client"
-const prisma = new EnhancedPrisma()
-export { prisma }
+const db = new EnhancedPrisma()
+export { db }

apps/toolkit-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "toolkit-app",
-  "version": "1.0.1-alpha.0",
+  "version": "1.0.1-alpha.9",
   "scripts": {
     "start:dev": "pnpm run prisma:start && next dev",
     "buildapp": "prisma generate && next build",
@@ -29,7 +29,7 @@
     "@blitzjs/rpc": "workspace:*",
     "@hookform/resolvers": "2.8.8",
     "@prisma/client": "3.9.0",
-    "blitz": "workspace:2.0.0-alpha.5",
+    "blitz": "workspace:2.0.0-alpha.14",
     "next": "12.1.1",
     "prisma": "3.9.0",
     "react": "18.0.0",

apps/web/app/blitz-client.ts

@@ -1,8 +1,8 @@
 import {AuthClientPlugin} from "@blitzjs/auth"
-import {setupClient} from "@blitzjs/next"
+import {setupBlitzClient} from "@blitzjs/next"
 import {BlitzRpcPlugin} from "@blitzjs/rpc"
 
-const {withBlitz} = setupClient({
+const {withBlitz} = setupBlitzClient({
   plugins: [
     AuthClientPlugin({
       cookiePrefix: "webapp-cookie-prefix",

apps/web/app/blitz-server.ts

@@ -1,9 +1,9 @@
-import {setupBlitz} from "@blitzjs/next"
+import {setupBlitzServer} from "@blitzjs/next"
 import {AuthServerPlugin, PrismaStorage} from "@blitzjs/auth"
 import {prisma as db} from "../prisma/index"
 import {simpleRolesIsAuthorized} from "@blitzjs/auth"
 
-const {gSSP, gSP, api} = setupBlitz({
+const {gSSP, gSP, api} = setupBlitzServer({
   plugins: [
     AuthServerPlugin({
       cookiePrefix: "webapp-cookie-prefix",

integration-tests/auth/app/blitz-client.ts

@@ -1,7 +1,7 @@
 import {AuthClientPlugin} from "@blitzjs/auth"
-import {setupClient} from "@blitzjs/next"
+import {setupBlitzClient} from "@blitzjs/next"
 
-const {withBlitz} = setupClient({
+const {withBlitz} = setupBlitzClient({
   plugins: [
     AuthClientPlugin({
       cookiePrefix: "auth-tests-cookie-prefix",

integration-tests/auth/app/blitz-server.ts

@@ -1,9 +1,9 @@
-import {setupBlitz} from "@blitzjs/next"
+import {setupBlitzServer} from "@blitzjs/next"
 import {AuthServerPlugin, PrismaStorage} from "@blitzjs/auth"
 import {simpleRolesIsAuthorized} from "@blitzjs/auth"
 import {prisma as db} from "../prisma/index"
 
-const {gSSP, gSP, api} = setupBlitz({
+const {gSSP, gSP, api} = setupBlitzServer({
   plugins: [
     AuthServerPlugin({
       cookiePrefix: "auth-tests-cookie-prefix",

package.json

@@ -17,7 +17,7 @@
     "test": "turbo run test",
     "clean": "turbo run clean && rm -rf node_modules",
     "format": "prettier --write \"**/*.{ts,tsx,md}\"",
-    "pre-publish": "pnpm i && pnpm build && changeset add && changeset version && git add . && git commit -v",
+    "pre-publish": "pnpm i && changeset add && changeset version && pnpm build && git add . && git commit -v",
     "publish-release": "changeset publish && git push --follow-tags"
   },
   "dependencies": {

packages/blitz-auth/CHANGELOG.md

@@ -1,5 +1,67 @@
 # @blitzjs/auth
 
+## 2.0.0-alpha.14
+
+### Patch Changes
+
+- Updated dependencies
+  - blitz@2.0.0-alpha.14
+
+## 2.0.0-alpha.13
+
+### Patch Changes
+
+- Updated dependencies
+  - blitz@2.0.0-alpha.13
+
+## 2.0.0-alpha.12
+
+### Patch Changes
+
+- Updated dependencies
+  - blitz@2.0.0-alpha.12
+
+## 2.0.0-alpha.11
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.11
+
+## 2.0.0-alpha.10
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.10
+
+## 2.0.0-alpha.9
+
+### Patch Changes
+
+- Updated dependencies
+  - blitz@2.0.0-alpha.9
+
+## 2.0.0-alpha.8
+
+### Patch Changes
+
+- Updated dependencies
+  - blitz@2.0.0-alpha.8
+
+## 2.0.0-alpha.7
+
+### Patch Changes
+
+- Updated dependencies
+  - blitz@2.0.0-alpha.7
+
+## 2.0.0-alpha.6
+
+### Patch Changes
+
+- fix route manifest codegen
+- Updated dependencies
+  - blitz@2.0.0-alpha.6
+
 ## 2.0.0-alpha.5
 
 ### Patch Changes

packages/blitz-auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/auth",
-  "version": "2.0.0-alpha.5",
+  "version": "2.0.0-alpha.14",
   "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.5",
+    "blitz": "2.0.0-alpha.14",
     "cookie": "0.4.1",
     "debug": "4.3.3",
     "http": "0.0.1-security",
@@ -35,7 +35,7 @@
     "url": "0.11.0"
   },
   "devDependencies": {
-    "@blitzjs/config": "2.0.0-alpha.5",
+    "@blitzjs/config": "workspace:2.0.0-alpha.14",
     "@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,63 @@
 # @blitzjs/next
 
+## 2.0.0-alpha.14
+
+### Patch Changes
+
+- @blitzjs/rpc@2.0.0-alpha.14
+
+## 2.0.0-alpha.13
+
+### Patch Changes
+
+- Fix codegen and postinstall to make work with pnpm
+  - @blitzjs/rpc@2.0.0-alpha.13
+
+## 2.0.0-alpha.12
+
+### Patch Changes
+
+- @blitzjs/rpc@2.0.0-alpha.12
+
+## 2.0.0-alpha.11
+
+### Patch Changes
+
+- Fix postinstall script not being found
+  - @blitzjs/rpc@2.0.0-alpha.11
+
+## 2.0.0-alpha.10
+
+### Patch Changes
+
+- @blitzjs/rpc@2.0.0-alpha.10
+
+## 2.0.0-alpha.9
+
+### Patch Changes
+
+- @blitzjs/rpc@2.0.0-alpha.9
+
+## 2.0.0-alpha.8
+
+### Patch Changes
+
+- @blitzjs/rpc@2.0.0-alpha.8
+
+## 2.0.0-alpha.7
+
+### Patch Changes
+
+- @blitzjs/rpc@2.0.0-alpha.7
+
+## 2.0.0-alpha.6
+
+### Patch Changes
+
+- fix route manifest codegen
+- Updated dependencies
+  - @blitzjs/rpc@2.0.0-alpha.6
+
 ## 2.0.0-alpha.5
 
 ### Patch Changes

packages/blitz-next/build.config.ts

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

packages/blitz-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/next",
-  "version": "2.0.0-alpha.5",
+  "version": "2.0.0-alpha.14",
   "scripts": {
     "build": "unbuild",
     "dev": "pnpm predev && pnpm watch unbuild src --wait=0.2",
@@ -8,7 +8,8 @@
     "lint": "eslint . --fix",
     "test": "vitest run",
     "test-watch": "vitest",
-    "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf dist"
+    "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf dist",
+    "postinstall": "node scripts/postinstall.js"
   },
   "main": "./dist/index-server.cjs",
   "module": "./dist/index-server.mjs",
@@ -18,16 +19,17 @@
   "license": "MIT",
   "files": [
     "dist/**",
+    "scripts/**",
     "eslint.js"
   ],
   "dependencies": {
-    "@blitzjs/rpc": "2.0.0-alpha.5",
+    "@blitzjs/rpc": "2.0.0-alpha.14",
     "debug": "4.3.3",
     "fs-extra": "10.0.1",
     "react-query": "3.21.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "2.0.0-alpha.5",
+    "@blitzjs/config": "workspace:2.0.0-alpha.14",
     "@testing-library/dom": "8.13.0",
     "@testing-library/jest-dom": "5.16.3",
     "@testing-library/react": "13.0.0",
@@ -38,11 +40,14 @@
     "@types/react": "17.0.43",
     "@types/react-dom": "17.0.14",
     "@types/testing-library__react-hooks": "4.0.0",
-    "blitz": "2.0.0-alpha.5",
+    "blitz": "2.0.0-alpha.14",
+    "cross-spawn": "7.0.3",
+    "find-up": "4.1.0",
     "lodash.frompairs": "4.0.1",
     "next": "12.1.1",
     "react": "18.0.0",
     "react-dom": "18.0.0",
+    "resolve-from": "5.0.0",
     "ts-jest": "27.1.4",
     "typescript": "^4.5.3",
     "unbuild": "0.6.9",

packages/blitz-next/scripts/default-index-browser.js

@@ -0,0 +1,3 @@
+exports.Routes = {
+  ThisFileHasNotYetBeenGeneratedPleaseRunBlitzCodeGen: (query) => ({pathname: "⚡️", query}),
+}

packages/blitz-next/scripts/default-index.d.ts

@@ -0,0 +1,6 @@
+import type {ParsedUrlQueryInput} from "querystring"
+import type {UrlObject} from "url"
+
+export const Routes: {
+  ThisFileHasNotYetBeenGeneratedPleaseRunBlitzCodeGen(query?: ParsedUrlQueryInput): UrlObject
+}

packages/blitz-next/scripts/default-index.js

@@ -0,0 +1,3 @@
+exports.Routes = {
+  ThisFileHasNotYetBeenGeneratedPleaseRunBlitzCodeGen: (query) => ({pathname: "⚡️", query}),
+}

packages/blitz-next/scripts/postinstall.js

@@ -0,0 +1,342 @@
+const childProcess = require("cross-spawn")
+const {promisify} = require("util")
+const fs = require("fs")
+const path = require("path")
+const resolveFrom = require("resolve-from")
+const findUp = require("find-up")
+
+const copyFile = promisify(fs.copyFile)
+const mkdir = promisify(fs.mkdir)
+const stat = promisify(fs.stat)
+
+const debug = require("debug")("blitz:postinstall")
+
+const isInBlitzMonorepo = fs.existsSync(path.join(__dirname, "../../blitz-next"))
+let isInstalledGlobally = isInBlitzMonorepo ? false : true // default
+
+try {
+  const maybeGlobalBlitzPath = resolveFrom(__dirname, "blitz")
+  const localBlitzPath = resolveFrom.silent(process.cwd(), "blitz/dist/index.cjs")
+  isInstalledGlobally = maybeGlobalBlitzPath !== localBlitzPath
+} catch (error) {
+  // noop
+}
+
+// todo: we should reuse `findNodeModulesRoot` from /nextjs/packages/next/build/routes.ts
+async function findNodeModulesRoot(src) {
+  let root
+  if (isInBlitzMonorepo) {
+    root = path.join(src, "node_modules")
+  } else if (src.includes(".pnpm")) {
+    const blitzPkgLocation = path.dirname(
+      (await findUp("package.json", {
+        cwd: resolveFrom(src, "blitz"),
+      })) || "",
+    )
+    if (!blitzPkgLocation) {
+      throw new Error("Internal Blitz Error: unable to find 'blitz' package location")
+    }
+    root = path.join(blitzPkgLocation, "../../../../")
+  } else {
+    const blitzPkgLocation = path.dirname(
+      (await findUp("package.json", {
+        cwd: resolveFrom(src, "blitz"),
+      })) || "",
+    )
+    if (!blitzPkgLocation) {
+      throw new Error("Internal Blitz Error: unable to find 'blitz' package location")
+    }
+
+    root = path.join(blitzPkgLocation, "../")
+  }
+  return path.join(root, ".blitz")
+}
+
+/*
+  Adapted from https://github.com/prisma/prisma/blob/974cbeff4a7f616137ce540d0ec88a2a86365892/src/packages/client/scripts/postinstall.js
+*/
+function codegen() {
+  async function main() {
+    if (process.env.INIT_CWD) {
+      process.chdir(process.env.INIT_CWD) // necessary, because npm chooses __dirname as process.cwd()
+      // in the postinstall hook
+    }
+    await ensureEmptyDotBlitz()
+
+    const localPath = getLocalPackagePath()
+
+    // Only execute if !localpath
+    const installedGlobally = localPath ? undefined : await isInstalledGlobally()
+
+    debug({
+      localPath,
+      installedGlobally,
+      init_cwd: process.env.INIT_CWD,
+    })
+    try {
+      if (localPath) {
+        await run("node", [
+          localPath,
+          "codegen",
+          "--postinstall",
+          doubleQuote(getPostInstallTrigger()),
+        ])
+        return
+      }
+
+      if (installedGlobally) {
+        await run("blitz", ["codegen", "--postinstall", doubleQuote(getPostInstallTrigger())])
+        return
+      }
+    } catch (e) {
+      // if exit code = 1 do not print
+      if (e && e !== 1) {
+        console.error(e)
+      }
+      debug(e)
+    }
+
+    if (!localPath && !installedGlobally) {
+      console.error(`Please install Blitz CLI. You can install it with "npm add -D blitz".`)
+    }
+  }
+
+  function getLocalPackagePath() {
+    try {
+      const packagePath = require.resolve("blitz/package.json")
+      if (packagePath) {
+        const blitzPkg = require.resolve("blitz/dist/index.cjs")
+        if (blitzPkg.includes(".pnpm")) {
+          return path.join(blitzPkg, "../../../../../../blitz/dist/index.cjs")
+        } else {
+          return path.join(blitzPkg)
+        }
+      }
+    } catch (e) {
+      //
+    }
+
+    return null
+  }
+
+  async function isInstalledGlobally() {
+    try {
+      await run("blitz", ["-v"], process.cwd(), ["ignore"])
+      return true
+    } catch (e) {
+      return false
+    }
+  }
+
+  if (!process.env.BLITZ_SKIP_POSTINSTALL_GENERATE) {
+    main()
+      .catch((e) => {
+        console.error(e)
+        process.exit(0)
+      })
+      .finally(() => {
+        debug(`postinstall trigger: ${getPostInstallTrigger()}`)
+      })
+  }
+
+  function run(cmd, params, cwd = process.cwd(), stdio = ["pipe", "inherit", "inherit"]) {
+    const child = childProcess.spawn(cmd, params, {
+      stdio,
+      cwd,
+    })
+
+    return new Promise((resolve, reject) => {
+      child.on("close", () => {
+        resolve()
+      })
+      child.on("exit", (code) => {
+        if (code === 0) {
+          resolve()
+        } else {
+          reject(code)
+        }
+      })
+      child.on("error", () => {
+        reject()
+      })
+    })
+  }
+
+  async function ensureEmptyDotBlitz() {
+    try {
+      const dotBlitzDir = isInBlitzMonorepo
+        ? path.join(process.cwd(), "node_modules/.blitz")
+        : await findNodeModulesRoot(__dirname)
+
+      await makeDir(dotBlitzDir)
+      const defaultIndexJsPath = path.join(dotBlitzDir, "index.js")
+      const defaultIndexBrowserJSPath = path.join(dotBlitzDir, "index-browser.js")
+      const defaultIndexDTSPath = path.join(dotBlitzDir, "index.d.ts")
+
+      if (!fs.existsSync(defaultIndexJsPath)) {
+        await copyFile(path.join(__dirname, "default-index.js"), defaultIndexJsPath)
+      }
+      if (!fs.existsSync(defaultIndexBrowserJSPath)) {
+        await copyFile(path.join(__dirname, "default-index-browser.js"), defaultIndexBrowserJSPath)
+      }
+
+      if (!fs.existsSync(defaultIndexDTSPath)) {
+        await copyFile(path.join(__dirname, "default-index.d.ts"), defaultIndexDTSPath)
+      }
+    } catch (e) {
+      console.error(e)
+    }
+  }
+
+  async function makeDir(input) {
+    const make = async (pth) => {
+      try {
+        await mkdir(pth)
+
+        return pth
+      } catch (error) {
+        if (error.code === "EPERM") {
+          throw error
+        }
+
+        if (error.code === "ENOENT") {
+          if (path.dirname(pth) === pth) {
+            throw new Error(`operation not permitted, mkdir '${pth}'`)
+          }
+
+          if (error.message.includes("null bytes")) {
+            throw error
+          }
+
+          await make(path.dirname(pth))
+
+          return make(pth)
+        }
+
+        try {
+          const stats = await stat(pth)
+          if (!stats.isDirectory()) {
+            throw new Error("The path is not a directory")
+          }
+        } catch (_) {
+          throw error
+        }
+
+        return pth
+      }
+    }
+
+    return await make(path.resolve(input))
+  }
+
+  /**
+   * Get the command that triggered this postinstall script being run. If there is
+   * an error while attempting to get this value then the string constant
+   * 'ERROR_WHILE_FINDING_POSTINSTALL_TRIGGER' is returned.
+   * This information is just necessary for telemetry.
+   * This get's passed in to Generate, which then automatically get's propagated to telemetry.
+   */
+  function getPostInstallTrigger() {
+    /*
+  npm_config_argv` is not officially documented so here are our (Prisma's) research notes
+  `npm_config_argv` is available to the postinstall script when the containing package has been installed by npm into some project.
+  An example of its value:
+  ```
+  npm_config_argv: '{"remain":["../test"],"cooked":["add","../test"],"original":["add","../test"]}',
+  ```
+  We are interesting in the data contained in the "original" field.
+  Trivia/Note: `npm_config_argv` is not available when running e.g. `npm install` on the containing package itself (e.g. when working on it)
+  Yarn mimics this data and environment variable. Here is an example following `yarn add` for the same package:
+  ```
+  npm_config_argv: '{"remain":[],"cooked":["add"],"original":["add","../test"]}'
+  ```
+  Other package managers like `pnpm` have not been tested.
+  */
+
+    const maybe_npm_config_argv_string = process.env.npm_config_argv
+
+    if (maybe_npm_config_argv_string === undefined) {
+      return UNABLE_TO_FIND_POSTINSTALL_TRIGGER__ENVAR_MISSING
+    }
+
+    let npm_config_argv
+    try {
+      npm_config_argv = JSON.parse(maybe_npm_config_argv_string)
+    } catch (e) {
+      return `${UNABLE_TO_FIND_POSTINSTALL_TRIGGER_JSON_PARSE_ERROR}: ${maybe_npm_config_argv_string}`
+    }
+
+    if (typeof npm_config_argv !== "object" || npm_config_argv === null) {
+      return `${UNABLE_TO_FIND_POSTINSTALL_TRIGGER_JSON_SCHEMA_ERROR}: ${maybe_npm_config_argv_string}`
+    }
+
+    const npm_config_arv_original_arr = npm_config_argv.original
+
+    if (!Array.isArray(npm_config_arv_original_arr)) {
+      return `${UNABLE_TO_FIND_POSTINSTALL_TRIGGER_JSON_SCHEMA_ERROR}: ${maybe_npm_config_argv_string}`
+    }
+
+    const npm_config_arv_original = npm_config_arv_original_arr
+      .filter((arg) => arg !== "")
+      .join(" ")
+
+    const command =
+      npm_config_arv_original === ""
+        ? getPackageManagerName()
+        : [getPackageManagerName(), npm_config_arv_original].join(" ")
+
+    return command
+  }
+
+  /**
+   * Wrap double quotes around the given string.
+   */
+  function doubleQuote(x) {
+    return `"${x}"`
+  }
+
+  /**
+   * Get the package manager name currently being used. If parsing fails, then the following pattern is returned:
+   * UNKNOWN_NPM_CONFIG_USER_AGENT(<string received>).
+   */
+  function getPackageManagerName() {
+    const userAgent = process.env.npm_config_user_agent
+    if (!userAgent) return "MISSING_NPM_CONFIG_USER_AGENT"
+
+    const name = parsePackageManagerName(userAgent)
+    if (!name) return `UNKNOWN_NPM_CONFIG_USER_AGENT(${userAgent})`
+
+    return name
+  }
+
+  /**
+   * Parse package manager name from useragent. If parsing fails, `null` is returned.
+   */
+  function parsePackageManagerName(userAgent) {
+    let packageManager = null
+
+    // example: 'yarn/1.22.4 npm/? node/v13.11.0 darwin x64'
+    // References:
+    // - https://pnpm.js.org/en/3.6/only-allow-pnpm
+    // - https://github.com/cameronhunter/npm-config-user-agent-parser
+    if (userAgent) {
+      const matchResult = userAgent.match(/^([^/]+)\/.+/)
+      if (matchResult) {
+        packageManager = matchResult[1].trim()
+      }
+    }
+
+    return packageManager
+  }
+
+  // prettier-ignore
+  const UNABLE_TO_FIND_POSTINSTALL_TRIGGER__ENVAR_MISSING = 'UNABLE_TO_FIND_POSTINSTALL_TRIGGER__ENVAR_MISSING'
+  // prettier-ignore
+  const UNABLE_TO_FIND_POSTINSTALL_TRIGGER_JSON_PARSE_ERROR = 'UNABLE_TO_FIND_POSTINSTALL_TRIGGER_JSON_PARSE_ERROR'
+  // prettier-ignore
+  const UNABLE_TO_FIND_POSTINSTALL_TRIGGER_JSON_SCHEMA_ERROR = 'UNABLE_TO_FIND_POSTINSTALL_TRIGGER_JSON_SCHEMA_ERROR'
+}
+
+// if (!isInstalledGlobally) {
+codegen()
+// }

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

@@ -13,6 +13,7 @@ import {Hydrate, HydrateOptions} from "react-query/hydration"
 
 export * from "./error-boundary"
 export * from "./error-component"
+export {Routes} from ".blitz"
 
 const compose =
   (...rest: BlitzProviderType[]) =>

packages/blitz-rpc/CHANGELOG.md

@@ -1,5 +1,76 @@
 # @blitzjs/rpc
 
+## 2.0.0-alpha.14
+
+### Patch Changes
+
+- Updated dependencies
+  - blitz@2.0.0-alpha.14
+  - @blitzjs/auth@2.0.0-alpha.14
+
+## 2.0.0-alpha.13
+
+### Patch Changes
+
+- Updated dependencies
+  - blitz@2.0.0-alpha.13
+  - @blitzjs/auth@2.0.0-alpha.13
+
+## 2.0.0-alpha.12
+
+### Patch Changes
+
+- Updated dependencies
+  - blitz@2.0.0-alpha.12
+  - @blitzjs/auth@2.0.0-alpha.12
+
+## 2.0.0-alpha.11
+
+### Patch Changes
+
+- @blitzjs/auth@2.0.0-alpha.11
+- blitz@2.0.0-alpha.11
+
+## 2.0.0-alpha.10
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.10
+- @blitzjs/auth@2.0.0-alpha.10
+
+## 2.0.0-alpha.9
+
+### Patch Changes
+
+- Updated dependencies
+  - blitz@2.0.0-alpha.9
+  - @blitzjs/auth@2.0.0-alpha.9
+
+## 2.0.0-alpha.8
+
+### Patch Changes
+
+- Updated dependencies
+  - blitz@2.0.0-alpha.8
+  - @blitzjs/auth@2.0.0-alpha.8
+
+## 2.0.0-alpha.7
+
+### Patch Changes
+
+- Updated dependencies
+  - blitz@2.0.0-alpha.7
+  - @blitzjs/auth@2.0.0-alpha.7
+
+## 2.0.0-alpha.6
+
+### Patch Changes
+
+- fix route manifest codegen
+- Updated dependencies
+  - blitz@2.0.0-alpha.6
+  - @blitzjs/auth@2.0.0-alpha.6
+
 ## 2.0.0-alpha.5
 
 ### Patch Changes

packages/blitz-rpc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/rpc",
-  "version": "2.0.0-alpha.5",
+  "version": "2.0.0-alpha.14",
   "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.5",
+    "@blitzjs/auth": "2.0.0-alpha.14",
     "b64-lite": "1.4.0",
     "bad-behavior": "1.0.1",
     "chalk": "^4.1.0",
@@ -30,11 +30,11 @@
     "zod": "3.10.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "2.0.0-alpha.5",
+    "@blitzjs/config": "workspace:2.0.0-alpha.14",
     "@types/debug": "4.1.7",
     "@types/react": "17.0.43",
     "@types/react-dom": "17.0.14",
-    "blitz": "2.0.0-alpha.5",
+    "blitz": "2.0.0-alpha.14",
     "next": "12.1.1",
     "react": "18.0.0",
     "react-dom": "18.0.0",
@@ -43,7 +43,7 @@
     "watch": "1.0.2"
   },
   "peerDependencies": {
-    "blitz": "2.0.0-alpha.5",
+    "blitz": "2.0.0-alpha.14",
     "next": "*"
   },
   "publishConfig": {

packages/blitz/CHANGELOG.md

@@ -1,5 +1,70 @@
 # blitz
 
+## 2.0.0-alpha.14
+
+### Patch Changes
+
+- set default enviornment variable to development unless build and start command
+  - @blitzjs/generator@2.0.0-alpha.14
+
+## 2.0.0-alpha.13
+
+### Patch Changes
+
+- Fix codegen and postinstall to make work with pnpm
+- Updated dependencies
+  - @blitzjs/generator@2.0.0-alpha.13
+
+## 2.0.0-alpha.12
+
+### Patch Changes
+
+- Use alpha version for blitz dependency, fix package manager selection
+- Updated dependencies
+  - @blitzjs/generator@2.0.0-alpha.12
+
+## 2.0.0-alpha.11
+
+### Patch Changes
+
+- @blitzjs/generator@2.0.0-alpha.11
+
+## 2.0.0-alpha.10
+
+### Patch Changes
+
+- Updated dependencies
+  - @blitzjs/generator@2.0.0-alpha.10
+
+## 2.0.0-alpha.9
+
+### Patch Changes
+
+- add @blitzjs/generator as external
+  - @blitzjs/generator@2.0.0-alpha.9
+
+## 2.0.0-alpha.8
+
+### Patch Changes
+
+- fix broken cli versioning
+  - @blitzjs/generator@2.0.0-alpha.8
+
+## 2.0.0-alpha.7
+
+### Patch Changes
+
+- added index.cjs to blitz externals
+  - @blitzjs/generator@2.0.0-alpha.7
+
+## 2.0.0-alpha.6
+
+### Patch Changes
+
+- fix route manifest codegen
+- Updated dependencies
+  - @blitzjs/generator@2.0.0-alpha.6
+
 ## 2.0.0-alpha.5
 
 ### Patch Changes

packages/blitz/build.config.ts

@@ -2,7 +2,7 @@ import {BuildConfig} from "unbuild"
 
 const config: BuildConfig = {
   entries: ["./src/index-browser", "./src/index-server", "./src/cli/index"],
-  externals: ["index-browser.cjs", "index-browser.mjs", "zod"],
+  externals: ["index-browser.cjs", "index-browser.mjs", "index.cjs", "zod"],
   declaration: true,
   rollup: {
     emitCJS: true,

packages/blitz/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blitz",
-  "version": "2.0.0-alpha.5",
+  "version": "2.0.0-alpha.14",
   "scripts": {
     "build": "unbuild",
     "dev": "watch unbuild src --wait=0.2",
@@ -23,7 +23,7 @@
     "blitz": "bin/blitz"
   },
   "dependencies": {
-    "@blitzjs/generator": "2.0.0-alpha.5",
+    "@blitzjs/generator": "2.0.0-alpha.14",
     "arg": "5.0.1",
     "chalk": "^4.1.0",
     "console-table-printer": "2.10.0",
@@ -33,6 +33,7 @@
     "dotenv": "16.0.0",
     "dotenv-expand": "8.0.3",
     "esbuild": "0.14.34",
+    "find-up": "4.1.0",
     "fs-extra": "10.0.1",
     "hasbin": "1.2.3",
     "npm-which": "3.0.1",
@@ -41,11 +42,12 @@
     "pkg-dir": "5.0.0",
     "prompts": "2.4.2",
     "resolve-cwd": "3.0.0",
+    "resolve-from": "5.0.0",
     "superjson": "1.8.0",
     "tslog": "3.3.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "2.0.0-alpha.5",
+    "@blitzjs/config": "workspace:2.0.0-alpha.14",
     "@types/cookie": "0.4.1",
     "@types/cross-spawn": "6.0.2",
     "@types/debug": "4.1.7",

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

@@ -193,13 +193,15 @@ const determinePkgManagerToInstallDeps = async () => {
         message: "Install dependencies?",
         initial: 0,
         choices: [
-          {title: "npm"},
-          {title: "yarn", disabled: !IS_YARN_INSTALLED},
-          {title: "pnpm", disabled: !IS_PNPM_INSTALLED},
+          {title: "npm", value: "npm"},
+          {title: "yarn", value: "yarn", disabled: !IS_YARN_INSTALLED},
+          {title: "pnpm", value: "pnpm", disabled: !IS_PNPM_INSTALLED},
           {title: "skip"},
         ],
       })
 
+      projectPkgManger = res.pkgManager
+
       if (res.pkgManager === "skip") {
         shouldInstallDeps = false
       } else {

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

@@ -1,5 +1,5 @@
 import {Readable} from "stream"
-import {getPrismaBin} from "../utils/config"
+import {getCommandBin} from "../utils/config"
 import {CliCommand} from "../index"
 import arg from "arg"
 
@@ -8,7 +8,7 @@ let prismaBin: string
 export const runPrisma = async (args: string[], silent = false) => {
   if (!prismaBin) {
     try {
-      prismaBin = await getPrismaBin(process.cwd())
+      prismaBin = await getCommandBin("prisma")
     } catch (err) {
       throw err
     }

packages/blitz/src/cli/index.ts

@@ -2,6 +2,8 @@ import {NON_STANDARD_NODE_ENV} from "./utils/constants"
 import arg from "arg"
 import packageJson from "../../package.json"
 import {loadEnvConfig} from "../env-utils"
+import {getCommandBin} from "./utils/config"
+import spawn from "cross-spawn"
 
 const commonArgs = {
   // Types
@@ -22,17 +24,9 @@ const commands: {[command: string]: () => Promise<CliCommand>} = {
   dev: () => import("./commands/next/dev").then((i) => i.dev),
   build: () => import("./commands/next/build").then((i) => i.build),
   start: () => import("./commands/next/start").then((i) => i.start),
-  next: async () => (argv) => {
-    if (argv?.[0] && ["dev", "start", "build"].includes(argv[0])) {
-      const command = argv[0] as "dev" | "start" | "build"
-      return import("./commands/next").then((i) => i[command]())
-    }
-    console.error(`Invalid command provided: "blitz next ${argv?.[0]}".`)
-  },
   new: () => import("./commands/new").then((i) => i.newApp),
   generate: () => import("./commands/generate").then((i) => i.generate),
   codegen: () => import("./commands/codegen").then((i) => i.codegen),
-  prisma: () => import("./commands/prisma").then((i) => i.prisma),
 }
 
 const args = arg(commonArgs, {
@@ -53,8 +47,46 @@ if (args["--version"]) {
 
 const foundCommand = Boolean(commands[args._[0] as string])
 
-if (!foundCommand && args["--help"]) {
-  console.log(`
+const command = foundCommand ? (args._[0] as string) : defaultCommand
+const forwardedArgs = foundCommand ? args._.slice(1) : args._
+
+if (args["--env"]) {
+  process.env.APP_ENV = args["--env"]
+}
+
+if (args["--help"]) {
+  forwardedArgs.push("--help")
+}
+
+// env variable should default to dev unless the command is build or start
+const defaultEnv = command === "build" || command === "start" ? "production" : "development"
+
+const standardEnv = ["production", "development", "test"]
+if (process.env.NODE_ENV && !standardEnv.includes(process.env.NODE_ENV)) {
+  console.warn(NON_STANDARD_NODE_ENV)
+}
+;(process.env as any).NODE_ENV = process.env.NODE_ENV || defaultEnv
+
+// Make sure commands gracefully respect termination signals (e.g. from Docker)
+process.on("SIGTERM", () => process.exit(0))
+process.on("SIGINT", () => process.exit(0))
+
+if (foundCommand) {
+  commands[command]?.()
+    .then((exec: any) => exec(forwardedArgs))
+    .then(() => {
+      if (command === "build") {
+        // ensure process exits after build completes so open handles/connections
+        // don't cause process to hang
+        process.exit(0)
+      }
+    })
+    .catch((err) => {
+      console.log(err)
+    })
+} else {
+  if (args["--help"] && args._.length === 0) {
+    console.log(`
     Usage
       $ blitz <command>
 
@@ -69,41 +101,26 @@ if (!foundCommand && args["--help"]) {
     For more information run a command with the --help flag
       $ blitz build --help
   `)
-  process.exit(0)
+    process.exit(0)
+  } else {
+    // If the command is not found, we assume it is a command from the bin
+    void runCommandFromBin()
+  }
 }
 
-const command = foundCommand ? (args._[0] as string) : defaultCommand
-const forwardedArgs = foundCommand ? args._.slice(1) : args._
+async function runCommandFromBin() {
+  const command = args._[0] as string
+  let commandBin: string | null = null
+  try {
+    commandBin = await getCommandBin(command)
+  } catch (e: any) {
+    console.error(`Error: ${e.message}`)
+  }
 
-if (args["--help"]) {
-  forwardedArgs.push("--help")
+  if (!commandBin) {
+    process.exit(1)
+  }
+
+  const result = spawn.sync(commandBin, process.argv.slice(3), {stdio: "inherit"})
+  process.exit(result.status || 0)
 }
-
-if (args["--env"]) {
-  process.env.APP_ENV = args["--env"]
-}
-
-const defaultEnv = command === "dev" ? "development" : "production"
-
-const standardEnv = ["production", "development", "test"]
-if (process.env.NODE_ENV && !standardEnv.includes(process.env.NODE_ENV)) {
-  console.warn(NON_STANDARD_NODE_ENV)
-}
-;(process.env as any).NODE_ENV = process.env.NODE_ENV || defaultEnv
-
-// Make sure commands gracefully respect termination signals (e.g. from Docker)
-process.on("SIGTERM", () => process.exit(0))
-process.on("SIGINT", () => process.exit(0))
-
-commands[command]?.()
-  .then((exec: any) => exec(forwardedArgs))
-  .then(() => {
-    if (command === "build") {
-      // ensure process exits after build completes so open handles/connections
-      // don't cause process to hang
-      process.exit(0)
-    }
-  })
-  .catch((err) => {
-    console.log(err)
-  })

packages/blitz/src/cli/utils/config.ts

@@ -83,24 +83,17 @@ export async function normalize(config: ServerConfig): Promise<NormalizedConfig>
     watch: config.watch ?? env === "dev",
     clean: config.clean,
     // -
-    nextBin: await getNextBin(rootFolder, env === "dev"),
+    nextBin: await getCommandBin("next", rootFolder, env === "dev"),
   }
 }
 
-async function getNextBin(rootFolder: string, _usePatched: boolean = false): Promise<string> {
-  const nextBinPkg = "next"
-  const nextBin = await resolveBinAsync(nextBinPkg)
-  return resolve(rootFolder, nextBin)
-}
-
-export async function getPrismaBin(
-  rootFolder: string,
+export async function getCommandBin(
+  command: string,
+  rootFolder: string = process.cwd(),
   _usePatched: boolean = false,
 ): Promise<string> {
-  const prismaBinPkg = "prisma"
-  const prismaBin = await resolveBinAsync(prismaBinPkg)
-
-  return resolve(rootFolder, prismaBin)
+  const bin = await resolveBinAsync(command)
+  return resolve(rootFolder, bin)
 }
 
 async function getIsTypeScript(rootFolder: string): Promise<boolean> {

packages/blitz/src/cli/utils/routes-manifest.ts

@@ -1,8 +1,10 @@
 import {join, dirname} from "path"
 import os from "os"
-import {readdirSync, promises} from "fs"
+import {promises} from "fs"
 const readFile = promises.readFile
 import {outputFile} from "fs-extra"
+import findUp from "find-up"
+import resolveFrom from "resolve-from"
 
 export const CONFIG_FILE = ".blitz.config.compiled.js"
 export const NEXT_CONFIG_FILE = "next.config.js"
@@ -495,7 +497,7 @@ export async function generateManifest() {
 
   const {declaration, implementation} = setupManifest(routes)
 
-  const dotBlitz = join(process.cwd(), ".blitz")
+  const dotBlitz = join(await findNodeModulesRoot(process.cwd()), ".blitz")
 
   await outputFile(join(dotBlitz, "index.js"), implementation, {
     encoding: "utf-8",
@@ -507,9 +509,41 @@ export async function generateManifest() {
     encoding: "utf-8",
   })
 }
-// export const findBlitzConfigDirectory = () => {
-//   let blitzDir = readdirSync(join(process.cwd(), ".blitz"))
-//   if (blitzDir.length) {
-//     return join(process.cwd(), ".blitz/index.js")
-//   }
-// }
+
+export const isInternalBlitzMonorepoDevelopment = __dirname.match(
+  /[\\/]packages[\\/]blitz[\\/]dist[\\/]chunks$/,
+)
+
+async function findNodeModulesRoot(src: string) {
+  /*
+   *  Because of our package structure, and because of how things like pnpm link modules,
+   *  we must first find blitz package, and then find `next` and then
+   *  the root of `next`
+   *
+   *  This is because we import from `.blitz` inside `next/stdlib`.
+   *  If that changes, then this logic here will need to change
+   */
+
+  let root: string
+  if (isInternalBlitzMonorepoDevelopment) {
+    root = join(__dirname, "..", "..", "..", "..", "/node_modules")
+  } else {
+    const blitzPkgLocation = dirname(
+      (await findUp("package.json", {
+        cwd: resolveFrom(src, "blitz"),
+      })) ?? "",
+    )
+
+    if (!blitzPkgLocation) {
+      throw new Error("Internal Blitz Error: unable to find 'blitz' package location")
+    }
+
+    if (blitzPkgLocation.includes(".pnpm")) {
+      root = join(blitzPkgLocation, "../../../../")
+    } else {
+      root = join(blitzPkgLocation, "../")
+    }
+  }
+
+  return root
+}

packages/config/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @blitzjs/config
 
+## 2.0.0-alpha.14
+
+## 2.0.0-alpha.13
+
+## 2.0.0-alpha.12
+
+## 2.0.0-alpha.11
+
+## 2.0.0-alpha.10
+
+## 2.0.0-alpha.9
+
+## 2.0.0-alpha.8
+
+## 2.0.0-alpha.7
+
+## 2.0.0-alpha.6
+
+### Patch Changes
+
+- fix route manifest codegen
+
 ## 2.0.0-alpha.5
 
 ### Patch Changes

packages/config/package.json

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

packages/generator/CHANGELOG.md

@@ -1,5 +1,39 @@
 # @blitzjs/generator
 
+## 2.0.0-alpha.14
+
+## 2.0.0-alpha.13
+
+### Patch Changes
+
+- Fix codegen and postinstall to make work with pnpm
+
+## 2.0.0-alpha.12
+
+### Patch Changes
+
+- Use alpha version for blitz dependency, fix package manager selection
+
+## 2.0.0-alpha.11
+
+## 2.0.0-alpha.10
+
+### Patch Changes
+
+- fix source path for templates
+
+## 2.0.0-alpha.9
+
+## 2.0.0-alpha.8
+
+## 2.0.0-alpha.7
+
+## 2.0.0-alpha.6
+
+### Patch Changes
+
+- fix route manifest codegen
+
 ## 2.0.0-alpha.5
 
 ### Patch Changes

packages/generator/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/generator",
-  "version": "2.0.0-alpha.5",
+  "version": "2.0.0-alpha.14",
   "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.5",
+    "@blitzjs/config": "2.0.0-alpha.14",
     "@juanm04/cpx": "2.0.1",
     "@types/babel__core": "7.1.19",
     "@types/diff": "5.0.2",

packages/generator/src/generator.ts

@@ -302,7 +302,9 @@ export abstract class Generator<
       return path.join(
         __dirname,
         "..",
-        process.env.NODE_ENV === "test" ? "../templates" : "./templates",
+        process.env.NODE_ENV === "test" || process.env.NODE_ENV === "development"
+          ? "./templates"
+          : "./dist/templates",
         this.sourceRoot.path,
         ...paths,
       )

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

@@ -78,7 +78,7 @@ export class AppGenerator extends Generator<AppGeneratorOptions> {
     )
     this.fs.move(
       this.destinationPath(`pages/api/rpc/blitzrpcroute.${this.options.useTs ? "ts" : "js"}`),
-      this.destinationPath(`pages/api/rpc/[...blitz].${this.options.useTs ? "ts" : "js"}`),
+      this.destinationPath(`pages/api/rpc/[[...blitz]].${this.options.useTs ? "ts" : "js"}`),
     )
 
     if (!this.options.template.skipForms) {
@@ -111,7 +111,7 @@ export class AppGenerator extends Generator<AppGeneratorOptions> {
     const [
       {value: newDependencies, isFallback: dependenciesUsedFallback},
       {value: newDevDependencies, isFallback: devDependenciesUsedFallback},
-      {value: blitzDependencyVersion, isFallback: blitzUsedFallback},
+      {value: blitzDependencyVersion},
     ] = await Promise.all([
       fetchLatestVersionsFor(pkg.dependencies),
       fetchLatestVersionsFor(pkg.devDependencies),
@@ -122,8 +122,7 @@ export class AppGenerator extends Generator<AppGeneratorOptions> {
     pkg.devDependencies = newDevDependencies
     pkg.dependencies.blitz = blitzDependencyVersion
 
-    const fallbackUsed =
-      dependenciesUsedFallback || devDependenciesUsedFallback || blitzUsedFallback
+    const fallbackUsed = dependenciesUsedFallback || devDependenciesUsedFallback
 
     await writeJson(pkgJsonLocation, pkg, {spaces: 2})
 
@@ -235,14 +234,6 @@ export class AppGenerator extends Generator<AppGeneratorOptions> {
       }
     }
 
-    // if(this.options.useTs) {
-    // if(templatedPathSuffix === "pages/api/rpc/blitzrpcroute.js") {
-    //   this.fs.write(this.destinationPath("pages/api/rpc/[...blitz].js"), this.sourcePath("pages/api/rpc/blitzrpcroute.js"))
-    //  } else {
-
-    //  }
-    // }
-
     if (!this.options.skipGit && gitInitSuccessful) {
       this.commitChanges()
     }

packages/generator/src/utils/fallbackable.ts

@@ -1,4 +1,4 @@
 export interface Fallbackable<T> {
   value: T
-  isFallback: boolean
+  isFallback?: boolean
 }

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

@@ -6,16 +6,17 @@ export const getBlitzDependencyVersion = async (
   cliVersion: string,
 ): Promise<Fallbackable<string>> => {
   try {
-    const {latest, canary} = await fetchDistTags("blitz")
+    // TODO: Need to update this to handle alpha, beta and major
+    const {alpha} = await fetchDistTags("blitz")
 
-    if (cliVersion.includes("canary")) {
-      return {value: canary, isFallback: false}
+    if (alpha) {
+      return {value: alpha}
     }
 
-    return {value: latest, isFallback: false}
+    logFailedVersionFetch("blitz")
+    return {value: ""}
   } catch (error) {
-    const fallback = "latest"
-    logFailedVersionFetch("blitz", fallback)
-    return {value: fallback, isFallback: true}
+    logFailedVersionFetch("blitz")
+    return {value: ""}
   }
 }

packages/generator/src/utils/get-latest-version.ts

@@ -2,12 +2,10 @@ import chalk from "chalk"
 import {Fallbackable} from "./fallbackable"
 import {fetchAllVersions, fetchLatestDistVersion} from "./npm-fetch"
 
-export const logFailedVersionFetch = (dependency: string, fallback: string) => {
-  // log.clearLine()
+export const logFailedVersionFetch = (dependency: string, fallback?: string) => {
   console.warn(
-    `Failed to fetch latest version of '${chalk.bold(dependency)}', falling back to '${chalk.bold(
-      fallback,
-    )}'.`,
+    `Failed to fetch latest version of '${chalk.bold(dependency)}'`,
+    fallback ? `Falling back to '${chalk.bold(fallback)}'` : "",
   )
 }
 

packages/generator/src/utils/npm-fetch.ts

@@ -12,7 +12,7 @@ export const fetchAllVersions = async (dependency: string) => {
   return Object.keys(res.versions)
 }
 
-type NpmDistTagsResponse = {latest: string; canary: string}
+type NpmDistTagsResponse = {latest: string; canary: string; alpha: string}
 
 export const fetchDistTags = async (dependency: string) => {
   const res = await got(`https://registry.npmjs.org/-/package/${dependency}/dist-tags`, {

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

@@ -1,7 +1,7 @@
 import { SecurePassword } from "@blitzjs/auth"
 import { resolver } from "@blitzjs/rpc"
 import { AuthenticationError } from "blitz"
-import { prisma as db, User } from "db"
+import { db} from "db"
 import { Role } from "types"
 import { Login } from "../validations"
 

packages/generator/templates/app/app/blitz-server.ts

@@ -7,7 +7,6 @@ export const { gSSP, gSP, api } = setupBlitzServer({
   plugins: [
     AuthServerPlugin({
       cookiePrefix: "__safeNameSlug__-cookie-prefix",
-      // TODO fix type
       storage: PrismaStorage(db as any),
       isAuthorized: simpleRolesIsAuthorized,
     }),

packages/generator/templates/app/next.config.js

@@ -1,10 +1,3 @@
-const withBundleAnalyzer = require("@next/bundle-analyzer")({
-  enabled: process.env.ANALYZE === "true",
-})
 const {withBlitz} = require("@blitzjs/next")
 
-module.exports = withBlitz(
-  withBundleAnalyzer({
-    reactStrictMode: true,
-  }),
-)
+module.exports = withBlitz()

packages/pkg-template/package.json

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