Update pnpm-lock.yaml

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

.changeset/empty-turkeys-wave.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+Use `useRouter` from next/router in useParams function

.changeset/fuzzy-jars-admire.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/codemod": patch
+---
+
+fix codemod for wrapping \_app arrow function & fix codemod for nested pages directory

.changeset/nervous-beds-travel.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+useParam & useParams functions now accessible from @blitzjs/next

.changeset/pre.json

@@ -27,11 +27,13 @@
     "dirty-monkeys-greet",
     "eleven-humans-sort",
     "empty-berries-rule",
+    "empty-turkeys-wave",
     "fair-wombats-sneeze",
     "famous-kings-explain",
     "fast-trainers-kneel",
     "flat-bees-approve",
     "four-meals-fry",
+    "fuzzy-jars-admire",
     "gentle-dogs-reply",
     "great-months-train",
     "green-papayas-do",
@@ -41,6 +43,7 @@
     "lucky-cows-try",
     "modern-cameras-pull",
     "moody-squids-cheer",
+    "nervous-beds-travel",
     "nice-starfishes-live",
     "nine-onions-admire",
     "ninety-pets-heal",
@@ -59,6 +62,7 @@
     "small-socks-confess",
     "stupid-walls-sell",
     "swift-drinks-dress",
+    "tame-keys-reply",
     "tasty-news-collect",
     "ten-rivers-burn",
     "tender-pianos-check",
@@ -66,6 +70,7 @@
     "thirty-countries-build",
     "twenty-beans-pump",
     "two-kiwis-help",
+    "two-tigers-type",
     "unlucky-papayas-sleep",
     "violet-bags-leave",
     "violet-lions-help",

.changeset/tame-keys-reply.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Add aliases for Blitz CLI commands

.changeset/two-tigers-type.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Fix running bin commands with Blitz CLI

apps/toolkit-app/package.json

@@ -29,7 +29,7 @@
     "@blitzjs/rpc": "workspace:*",
     "@hookform/resolvers": "2.8.8",
     "@prisma/client": "3.9.0",
-    "blitz": "workspace:2.0.0-alpha.38",
+    "blitz": "workspace:2.0.0-alpha.43",
     "next": "12.1.6-canary.17",
     "prisma": "3.9.0",
     "react": "18.0.0",

packages/blitz-auth/CHANGELOG.md

@@ -1,5 +1,37 @@
 # @blitzjs/auth
 
+## 2.0.0-alpha.43
+
+### Patch Changes
+
+- Updated dependencies [527e48ac]
+  - blitz@2.0.0-alpha.43
+
+## 2.0.0-alpha.42
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.42
+
+## 2.0.0-alpha.41
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.41
+
+## 2.0.0-alpha.40
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.40
+
+## 2.0.0-alpha.39
+
+### Patch Changes
+
+- Updated dependencies [b918055b]
+  - blitz@2.0.0-alpha.39
+
 ## 2.0.0-alpha.38
 
 ### Patch Changes

packages/blitz-auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/auth",
-  "version": "2.0.0-alpha.38",
+  "version": "2.0.0-alpha.43",
   "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.38",
+    "blitz": "2.0.0-alpha.43",
     "cookie": "0.4.1",
     "cookie-session": "2.0.0",
     "debug": "4.3.3",
@@ -39,7 +39,7 @@
     "url": "0.11.0"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.38",
+    "@blitzjs/config": "workspace:2.0.0-alpha.43",
     "@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,37 @@
 # @blitzjs/next
 
+## 2.0.0-alpha.43
+
+### Patch Changes
+
+- @blitzjs/rpc@2.0.0-alpha.43
+
+## 2.0.0-alpha.42
+
+### Patch Changes
+
+- 9c2e7d37: Use `useRouter` from next/router in useParams function
+  - @blitzjs/rpc@2.0.0-alpha.42
+
+## 2.0.0-alpha.41
+
+### Patch Changes
+
+- @blitzjs/rpc@2.0.0-alpha.41
+
+## 2.0.0-alpha.40
+
+### Patch Changes
+
+- 9ded8dac: useParam & useParams functions now accessible from @blitzjs/next
+  - @blitzjs/rpc@2.0.0-alpha.40
+
+## 2.0.0-alpha.39
+
+### Patch Changes
+
+- @blitzjs/rpc@2.0.0-alpha.39
+
 ## 2.0.0-alpha.38
 
 ### Patch Changes

packages/blitz-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/next",
-  "version": "2.0.0-alpha.38",
+  "version": "2.0.0-alpha.43",
   "scripts": {
     "build": "unbuild",
     "dev": "pnpm predev && pnpm watch unbuild src --wait=0.2",
@@ -23,7 +23,7 @@
     "eslint.js"
   ],
   "dependencies": {
-    "@blitzjs/rpc": "2.0.0-alpha.38",
+    "@blitzjs/rpc": "2.0.0-alpha.43",
     "@types/hoist-non-react-statics": "3.3.1",
     "debug": "4.3.3",
     "fs-extra": "10.0.1",
@@ -32,21 +32,19 @@
     "superjson": "1.8.0"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.38",
+    "@blitzjs/config": "workspace:2.0.0-alpha.43",
     "@testing-library/dom": "8.13.0",
     "@testing-library/jest-dom": "5.16.3",
     "@testing-library/react": "13.0.0",
     "@testing-library/react-hooks": "7.0.2",
     "@testing-library/user-event": "13.5.0",
-    "@types/lodash.frompairs": "4.0.6",
     "@types/node": "17.0.16",
     "@types/react": "18.0.1",
     "@types/react-dom": "17.0.14",
     "@types/testing-library__react-hooks": "4.0.0",
-    "blitz": "2.0.0-alpha.38",
+    "blitz": "2.0.0-alpha.43",
     "cross-spawn": "7.0.3",
     "find-up": "4.1.0",
-    "lodash.frompairs": "4.0.1",
     "next": "12.1.6-canary.17",
     "react": "18.0.0",
     "react-dom": "18.0.0",

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

@@ -17,6 +17,7 @@ import {Router} from "next/router"
 
 export * from "./error-boundary"
 export * from "./error-component"
+export * from "./use-params"
 export {Routes} from ".blitz"
 
 const compose =

packages/blitz-next/src/use-params.test.tsx

@@ -1,9 +1,8 @@
 /**
  * @vitest-environment jsdom
  */
-
 import React from "react"
-import {describe, it, expect, vi} from "vitest"
+import {describe, it, expect, vi, afterEach} from "vitest"
 import {extractRouterParams, useParam, useParams} from "./use-params"
 import {renderHook as defaultRenderHook} from "@testing-library/react-hooks"
 import {NextRouter} from "next/router"
@@ -16,6 +15,14 @@ type RenderHookOptions = DefaultHookParams[1] & {
   dehydratedState?: unknown
 }
 
+// This is the router query object which includes route params
+const query = {
+  id: "1",
+  cat: "category",
+  slug: ["example", "multiple", "slugs"],
+  empty: "",
+}
+
 const mockRouter: NextRouter = {
   basePath: "",
   pathname: "/",
@@ -54,6 +61,10 @@ export function renderHook(
 }
 
 describe("extractRouterParams", () => {
+  afterEach(() => {
+    vi.clearAllMocks()
+  })
+
   it("returns proper params", () => {
     const routerQuery = {
       id: "1",
@@ -81,92 +92,99 @@ describe("extractRouterParams", () => {
 })
 
 describe("useParams", () => {
+  afterEach(() => {
+    vi.clearAllMocks()
+  })
+
   it("works without parameter", () => {
-    // This is the router query object which includes route params
-    const query = {
-      id: "1",
-      cat: "category",
-      slug: ["example", "multiple", "slugs"],
-      empty: "",
-    }
-
-    const {result} = renderHook(() => useParams(), {router: {query}})
-    expect(result.current).toEqual({
-      id: "1",
-      cat: "category",
-      slug: ["example", "multiple", "slugs"],
-      empty: "",
+    vi.mock("next/router", () => {
+      return {
+        useRouter: vi.fn(() => ({...mockRouter, query})),
+      }
     })
-  })
 
-  it("works with string", () => {
-    // This is the router query object which includes route params
-    const query = {
-      id: "1",
-      cat: "category",
-      slug: ["example", "multiple", "slugs"],
-      empty: "",
-    }
+    it("works with string", () => {
+      vi.mock("next/router", () => {
+        return {
+          useRouter: vi.fn(() => ({...mockRouter, query})),
+        }
+      })
 
-    const {result} = renderHook(() => useParams("string"), {
-      router: {query},
+      const {result} = renderHook(() => useParams("string"), {
+        router: {query},
+      })
+      expect(result.current).toEqual({
+        id: "1",
+        cat: "category",
+        empty: "",
+      })
     })
-    expect(result.current).toEqual({
-      id: "1",
-      cat: "category",
-      empty: "",
-    })
-  })
 
-  it("works with number", () => {
-    // This is the router query object which includes route params
-    const query = {
-      id: "1",
-      cat: "category",
-      slug: ["example", "multiple", "slugs"],
-      empty: "",
-    }
+    it("works with string", () => {
+      vi.mock("next/router", () => {
+        return {
+          useRouter: vi.fn(() => ({...mockRouter, query})),
+        }
+      })
 
-    const {result} = renderHook(() => useParams("number"), {
-      router: {query},
+      const {result} = renderHook(() => useParams("string"), {
+        router: {query},
+      })
+      expect(result.current).toEqual({
+        id: "1",
+        cat: "category",
+        empty: "",
+      })
     })
-    expect(result.current).toEqual({
-      id: 1,
-      cat: undefined,
-      slug: undefined,
-    })
-  })
 
-  it("works with array", () => {
-    // This is the router query object which includes route params
-    const query = {
-      id: "1",
-      cat: "category",
-      slug: ["example", "multiple", "slugs"],
-      empty: "",
-    }
+    it("works with number", () => {
+      vi.mock("next/router", () => {
+        return {
+          useRouter: vi.fn(() => ({...mockRouter, query})),
+        }
+      })
 
-    const {result} = renderHook(() => useParams("array"), {
-      router: {query},
+      const {result} = renderHook(() => useParams("number"), {
+        router: {query},
+      })
+      expect(result.current).toEqual({
+        id: 1,
+        cat: undefined,
+        slug: undefined,
+      })
     })
-    expect(result.current).toEqual({
-      id: ["1"],
-      cat: ["category"],
-      slug: ["example", "multiple", "slugs"],
-      empty: [""],
+
+    it("works with array", () => {
+      vi.mock("next/router", () => {
+        return {
+          useRouter: vi.fn(() => ({...mockRouter, query})),
+        }
+      })
+
+      const {result} = renderHook(() => useParams("array"), {
+        router: {query},
+      })
+      expect(result.current).toEqual({
+        id: ["1"],
+        cat: ["category"],
+        slug: ["example", "multiple", "slugs"],
+        empty: [""],
+      })
     })
   })
 })
 
 describe("useParam", () => {
+  afterEach(() => {
+    vi.clearAllMocks()
+  })
+
   it("works without parameter", () => {
-    // This is the router query object which includes route params
-    const query = {
-      id: "1",
-      cat: "category",
-      slug: ["example", "multiple", "slugs"],
-      empty: "",
-    }
+    vi.mock("next/router", () => {
+      return {
+        useRouter: vi.fn(() => ({...mockRouter, query})),
+      }
+    })
 
     let {result} = renderHook(() => useParam("id"), {router: {query}})
     expect(result.current).toEqual("1")
@@ -183,13 +201,11 @@ describe("useParam", () => {
   })
 
   it("works with string", () => {
-    // This is the router query object which includes route params
-    const query = {
-      id: "1",
-      cat: "category",
-      slug: ["example", "multiple", "slugs"],
-      empty: "",
-    }
+    vi.mock("next/router", () => {
+      return {
+        useRouter: vi.fn(() => ({...mockRouter, query})),
+      }
+    })
 
     let {result} = renderHook(() => useParam("id", "string"), {
       router: {query},

packages/blitz-next/src/use-params.tsx

@@ -1,22 +1,10 @@
-import fromPairs from "lodash.frompairs"
-import {NextRouter} from "next/router"
+import {useRouter} from "next/router"
 import {ParsedUrlQuery} from "querystring"
 import React from "react"
-import {RouterContext} from "./router-context"
 
 type Dict<T> = Record<string, T | undefined>
 type ReturnTypes = "string" | "number" | "array"
 
-/**
- * `useRouter` is a React hook used to access `router` object within components
- *
- * @returns `router` object
- * @see Docs {@link https://blitzjs.com/docs/router#router-object | router}
- */
-export function useRouter(): NextRouter {
-  return React.useContext(RouterContext)
-}
-
 /*
  * Based on the code of https://github.com/lukeed/qss
  */
@@ -81,7 +69,7 @@ function areQueryValuesEqual(value1: ParsedUrlQueryValue, value2: ParsedUrlQuery
 }
 
 export function extractRouterParams(routerQuery: ParsedUrlQuery, asPathQuery: ParsedUrlQuery) {
-  return fromPairs(
+  return Object.fromEntries(
     Object.entries(routerQuery).filter(
       ([key, value]) =>
         typeof asPathQuery[key] === "undefined" || !areQueryValuesEqual(value, asPathQuery[key]),

packages/blitz-rpc/CHANGELOG.md

@@ -1,5 +1,42 @@
 # @blitzjs/rpc
 
+## 2.0.0-alpha.43
+
+### Patch Changes
+
+- Updated dependencies [527e48ac]
+  - blitz@2.0.0-alpha.43
+  - @blitzjs/auth@2.0.0-alpha.43
+
+## 2.0.0-alpha.42
+
+### Patch Changes
+
+- @blitzjs/auth@2.0.0-alpha.42
+- blitz@2.0.0-alpha.42
+
+## 2.0.0-alpha.41
+
+### Patch Changes
+
+- @blitzjs/auth@2.0.0-alpha.41
+- blitz@2.0.0-alpha.41
+
+## 2.0.0-alpha.40
+
+### Patch Changes
+
+- @blitzjs/auth@2.0.0-alpha.40
+- blitz@2.0.0-alpha.40
+
+## 2.0.0-alpha.39
+
+### Patch Changes
+
+- Updated dependencies [b918055b]
+  - blitz@2.0.0-alpha.39
+  - @blitzjs/auth@2.0.0-alpha.39
+
 ## 2.0.0-alpha.38
 
 ### Patch Changes

packages/blitz-rpc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/rpc",
-  "version": "2.0.0-alpha.38",
+  "version": "2.0.0-alpha.43",
   "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.38",
+    "@blitzjs/auth": "2.0.0-alpha.43",
     "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": "workspace:2.0.0-alpha.38",
+    "@blitzjs/config": "workspace:2.0.0-alpha.43",
     "@types/debug": "4.1.7",
     "@types/react": "18.0.1",
     "@types/react-dom": "17.0.14",
-    "blitz": "2.0.0-alpha.38",
+    "blitz": "2.0.0-alpha.43",
     "next": "12.1.6-canary.17",
     "react": "18.0.0",
     "react-dom": "18.0.0",
@@ -43,7 +43,7 @@
     "watch": "1.0.2"
   },
   "peerDependencies": {
-    "blitz": "2.0.0-alpha.38",
+    "blitz": "2.0.0-alpha.43",
     "next": "*"
   },
   "publishConfig": {

packages/blitz/CHANGELOG.md

@@ -1,5 +1,37 @@
 # blitz
 
+## 2.0.0-alpha.43
+
+### Patch Changes
+
+- 527e48ac: Fix running bin commands with Blitz CLI
+  - @blitzjs/generator@2.0.0-alpha.43
+
+## 2.0.0-alpha.42
+
+### Patch Changes
+
+- @blitzjs/generator@2.0.0-alpha.42
+
+## 2.0.0-alpha.41
+
+### Patch Changes
+
+- @blitzjs/generator@2.0.0-alpha.41
+
+## 2.0.0-alpha.40
+
+### Patch Changes
+
+- @blitzjs/generator@2.0.0-alpha.40
+
+## 2.0.0-alpha.39
+
+### Patch Changes
+
+- b918055b: Add aliases for Blitz CLI commands
+  - @blitzjs/generator@2.0.0-alpha.39
+
 ## 2.0.0-alpha.38
 
 ### Patch Changes

packages/blitz/package.json

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

packages/blitz/src/cli/index.ts

@@ -1,6 +1,5 @@
 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"
@@ -10,7 +9,7 @@ import pkgDir from "pkg-dir"
 import {join} from "path"
 
 const commonArgs = {
-  // Types
+  // Flags
   "--version": Boolean,
   "--help": Boolean,
   "--inspect": Boolean,
@@ -25,9 +24,9 @@ const args = arg(commonArgs, {
   permissive: true,
 })
 
-const defaultCommand = "dev"
 export type CliCommand = (argv?: string[]) => void
-const commands: {[command: string]: () => Promise<CliCommand>} = {
+
+const commands = {
   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),
@@ -36,28 +35,39 @@ const commands: {[command: string]: () => Promise<CliCommand>} = {
   codegen: () => import("./commands/codegen").then((i) => i.codegen),
   db: () => import("./commands/db").then((i) => i.db),
 }
-const foundCommand = Boolean(commands[args._[0] as string])
-const command = foundCommand ? (args._[0] as string) : defaultCommand
-const forwardedArgs = foundCommand ? args._.slice(1) : args._
+
+const aliases: Record<string, keyof typeof commands> = {
+  d: "dev",
+  b: "build",
+  s: "start",
+  n: "new",
+  g: "generate",
+}
+
+type Command = keyof typeof commands
+type Alias = keyof typeof aliases
+
+let blitzCommand: Command | undefined
+if (commands[args._[0] as Command]) {
+  blitzCommand = args._[0] as Command
+}
+if (aliases[args._[0] as Alias]) {
+  blitzCommand = aliases[args._[0] as Alias]
+}
+
+const forwardedArgs = blitzCommand ? args._.slice(1) : args._
 
 const globalBlitzPath = resolveFrom(__dirname, "blitz")
 const localBlitzPath = resolveFrom.silent(process.cwd(), "blitz")
 
-const isInDevelopmentAsGloballyLinked = __dirname.includes("packages/blitz/dist")
-
-let blitzPkgPath
-if (isInDevelopmentAsGloballyLinked) {
-  blitzPkgPath = globalBlitzPath
-} else {
-  // localBlitzPath won't exist if used outside a blitz app directory
-  blitzPkgPath = localBlitzPath || globalBlitzPath
-}
-
 async function runCommandFromBin() {
-  const command = args._[0] as string
+  if (!args._[0]) {
+    console.log("No command specified")
+    process.exit(1)
+  }
   let commandBin: string | null = null
   try {
-    commandBin = await getCommandBin(command)
+    commandBin = await getCommandBin(args._[0])
   } catch (e: any) {
     console.error(`Error: ${e.message}`)
   }
@@ -96,10 +106,10 @@ async function printEnvInfo() {
     {showNotFound: true},
   )
 
-  const globalBlitzPkgJsonPath = pkgDir.sync(globalBlitzPath) as string
+  const globalBlitzPkgJsonPath = pkgDir.sync(globalBlitzPath)
   const localBlitzPkgJsonPath = pkgDir.sync(localBlitzPath)
 
-  if (globalBlitzPkgJsonPath !== localBlitzPkgJsonPath) {
+  if (globalBlitzPkgJsonPath && globalBlitzPkgJsonPath !== localBlitzPkgJsonPath) {
     // This branch won't run if user does `npx blitz` or `yarn blitz`
     const globalVersion = require(join(globalBlitzPkgJsonPath, "package.json")).version
     console.log(`Blitz version: ${globalVersion} (global)`)
@@ -135,23 +145,26 @@ async function main() {
   }
 
   // env variable should default to dev unless the command is build or start
-  const defaultEnv = command === "build" || command === "start" ? "production" : "development"
+  const defaultEnv =
+    blitzCommand === "build" || blitzCommand === "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
+
+  process.env.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]?.()
+  if (blitzCommand) {
+    const commandFn = commands[blitzCommand]
+    commandFn?.()
       .then((exec: any) => exec(forwardedArgs))
       .then(() => {
-        if (command === "build") {
+        if (blitzCommand === "build") {
           // ensure process exits after build completes so open handles/connections
           // don't cause process to hang
           process.exit(0)
@@ -162,13 +175,21 @@ async function main() {
       })
   } else {
     if (args["--help"] && args._.length === 0) {
+      // TODO: add back the generate command description once it's working
+      // generate, g     Generate new files for your Blitz project 🤠
+
       console.log(`
       Usage
         $ blitz <command>
   
       Available commands
-        ${Object.keys(commands).join(", ")}
-  
+        dev, d          Start a development server 🪄
+        build, b        Create a production build 🏗️
+        start, s        Start the production server 🐎
+        new, n          Create a new Blitz project ✨
+        codegen         Run the blitz codegen 🤖
+        db              Run database commands 🗄️
+        
       Options
         --env, -e       App environment name
         --version, -v   Version number

packages/codemod/CHANGELOG.md

@@ -1,5 +1,43 @@
 # @blitzjs/codemod
 
+## 2.0.0-alpha.43
+
+### Patch Changes
+
+- Updated dependencies [527e48ac]
+  - blitz@2.0.0-alpha.43
+  - @blitzjs/generator@2.0.0-alpha.43
+
+## 2.0.0-alpha.42
+
+### Patch Changes
+
+- @blitzjs/generator@2.0.0-alpha.42
+- blitz@2.0.0-alpha.42
+
+## 2.0.0-alpha.41
+
+### Patch Changes
+
+- bbac7906: fix codemod for wrapping \_app arrow function & fix codemod for nested pages directory
+  - @blitzjs/generator@2.0.0-alpha.41
+  - blitz@2.0.0-alpha.41
+
+## 2.0.0-alpha.40
+
+### Patch Changes
+
+- @blitzjs/generator@2.0.0-alpha.40
+- blitz@2.0.0-alpha.40
+
+## 2.0.0-alpha.39
+
+### Patch Changes
+
+- Updated dependencies [b918055b]
+  - blitz@2.0.0-alpha.39
+  - @blitzjs/generator@2.0.0-alpha.39
+
 ## 2.0.0-alpha.38
 
 ### Patch Changes

packages/codemod/package.json

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

packages/codemod/src/upgrade-legacy.ts

@@ -374,6 +374,35 @@ const upgradeLegacy = async () => {
     },
   })
 
+  steps.push({
+    name: "Add cookiePrefix to blitz server",
+    action: async () => {
+      const blitzConfigProgram = getCollectionFromSource(blitzConfigFile)
+      const cookieIdentifier = blitzConfigProgram.find(
+        j.Identifier,
+        (node) => node.name === "cookiePrefix",
+      )
+      if (cookieIdentifier.length) {
+        const cookiePrefix = cookieIdentifier.get().parentPath.value.value.value
+        const blitzClientProgram = getCollectionFromSource(
+          path.join(appDir, `blitz-client.${isTypescript ? "ts" : "js"}`),
+        )
+        const cookieIdentifierBlitzClient = blitzClientProgram.find(
+          j.Identifier,
+          (node) => node.name === "cookiePrefix",
+        )
+        cookieIdentifierBlitzClient.get().parentPath.value.value.value = cookiePrefix
+
+        fs.writeFileSync(
+          `${appDir}/blitz-client.${isTypescript ? "ts" : "js"}`,
+          blitzClientProgram.toSource(),
+        )
+      } else {
+        log.error("Cookie Prefix not found in blitz config file")
+      }
+    },
+  })
+
   steps.push({
     name: "create pages/api/rpc directory and add [[...blitz]].ts wildecard API route",
     action: async () => {
@@ -479,22 +508,41 @@ const upgradeLegacy = async () => {
         return pageDir
       }
 
-      getAllPagesDirs(appDir).forEach((pages, index) => {
+      getAllPagesDirs(appDir).forEach((pages) => {
         if (pages.subModel) {
-          fs.moveSync(pages.path, path.join(path.resolve("pages"), pages.model, pages.subModel))
+          // If the directory exists with a sub model (sub page directory), loop through the directory manually move each file/directory
+          if (fs.existsSync(path.join(path.resolve("pages"), pages.model))) {
+            let subs = fs.readdirSync(pages.path)
+            subs.forEach((sub) => {
+              fs.moveSync(
+                path.join(pages.path, sub),
+                path.join(path.resolve("pages"), pages.model, pages.subModel!, sub),
+              )
+            })
+          } else {
+            fs.moveSync(pages.path, path.join(path.resolve("pages"), pages.model, pages.subModel))
+          }
         } else {
-          fs.moveSync(pages.path, path.join(path.resolve("pages"), pages.model))
+          // If the directory exists without a sub model (sub page directory), loop through the directory manually move each file/directory
+          if (fs.existsSync(path.join(path.resolve("pages"), pages.model))) {
+            let subs = fs.readdirSync(pages.path)
+            subs.forEach((sub) => {
+              fs.moveSync(
+                path.join(pages.path, sub),
+                path.join(path.resolve("pages"), pages.model, sub),
+              )
+            })
+          } else {
+            fs.moveSync(pages.path, path.join(path.resolve("pages"), pages.model))
+          }
         }
+      })
 
-        // Delete left over pages directory
-        let subs = fs.readdirSync(path.join(appDir, pages.model))
-        // We can only delete a directory once 😅
-        if (
-          getAllPagesDirs(appDir)[index - 1]?.model !== getAllPagesDirs(appDir)[index]?.model &&
-          index === getAllPagesDirs(appDir).length &&
-          subs.includes("pages")
-        ) {
-          fs.removeSync(path.join(appDir, pages.model, "pages"))
+      //Clean up
+      getAllPagesDirs(appDir).forEach((page) => {
+        let subs = fs.readdirSync(path.join(appDir, page.model))
+        if (subs.includes("pages")) {
+          fs.removeSync(path.join(appDir, page.model, "pages"))
         }
       })
     },
@@ -710,19 +758,38 @@ const upgradeLegacy = async () => {
       const program = getCollectionFromSource(
         path.join(pagesDir, `_app.${isTypescript ? "tsx" : "jsx"}`),
       )
-
       const appFunction = program.find(j.FunctionDeclaration, (node) => {
         return node.id.name === "App"
       })
 
-      // Store the App function
-      const storeFunction = {...appFunction.get().value}
+      const appIdentifier = program.find(j.Identifier, (node) => {
+        return node.name === "App"
+      })
 
-      // Create a new withBlitz call expresion with an empty argument
-      const withBlitzFunction = (appFunction.get().parentPath.value.declaration =
-        j.expressionStatement(j.callExpression(j.identifier("withBlitz"), []))) as any
-      // Push stored function above into the argument
-      withBlitzFunction.expression.arguments.push(storeFunction)
+      if (appFunction.length) {
+        // Store the App function
+        const storeFunction = {...appFunction.get().value}
+        // Create a new withBlitz call expresion with an empty argument
+        const withBlitzFunction = (appFunction.get().parentPath.value.declaration =
+          j.expressionStatement(j.callExpression(j.identifier("withBlitz"), []))) as any
+        // Push stored function above into the argument
+        withBlitzFunction.expression.arguments.push(storeFunction)
+      } else if (appIdentifier.length) {
+        appIdentifier.forEach((a) => {
+          switch (a.name) {
+            case "declaration":
+              const storeFunction = {...a.get().value}
+              // Create a new withBlitz call expresion with an empty argument
+              const withBlitzFunction = (a.get().parentPath.value.declaration =
+                j.expressionStatement(j.callExpression(j.identifier("withBlitz"), []))) as any
+              // Push stored function above into the argument
+              withBlitzFunction.expression.arguments.push(storeFunction)
+              break
+          }
+        })
+      } else {
+        log.error("App function not found")
+      }
 
       addNamedImport(program, "withBlitz", "app/blitz-client")
 

packages/config/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @blitzjs/config
 
+## 2.0.0-alpha.43
+
+## 2.0.0-alpha.42
+
+## 2.0.0-alpha.41
+
+## 2.0.0-alpha.40
+
+## 2.0.0-alpha.39
+
 ## 2.0.0-alpha.38
 
 ## 2.0.0-alpha.37

packages/config/package.json

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

packages/generator/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @blitzjs/generator
 
+## 2.0.0-alpha.43
+
+## 2.0.0-alpha.42
+
+## 2.0.0-alpha.41
+
+## 2.0.0-alpha.40
+
+## 2.0.0-alpha.39
+
 ## 2.0.0-alpha.38
 
 ### Patch Changes

packages/generator/package.json

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

packages/pkg-template/package.json

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