2.0.0-alpha.4 fix more cli stuff

.changeset/pre.json

@@ -14,5 +14,5 @@
     "@blitzjs/generator": "2.0.0-alpha.0",
     "template": "0.0.0"
   },
-  "changesets": ["nine-onions-admire", "ninety-pets-heal", "poor-peas-lick"]
+  "changesets": ["nine-onions-admire", "ninety-pets-heal", "poor-peas-lick", "ten-rivers-burn"]
 }

.changeset/ten-rivers-burn.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+fix more cli problems

packages/blitz-auth/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @blitzjs/auth
 
+## 2.0.0-alpha.4
+
+### Patch Changes
+
+- Updated dependencies
+  - blitz@2.0.0-alpha.4
+
 ## 2.0.0-alpha.3
 
 ### Patch Changes

packages/blitz-auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/auth",
-  "version": "2.0.0-alpha.3",
+  "version": "2.0.0-alpha.4",
   "scripts": {
     "build": "unbuild",
     "predev": "wait-on -d 250 ../blitz/dist/index-server.d.ts",

packages/blitz-next/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @blitzjs/next
 
+## 2.0.0-alpha.4
+
+### Patch Changes
+
+- @blitzjs/rpc@2.0.0-alpha.4
+
 ## 2.0.0-alpha.3
 
 ### Patch Changes

packages/blitz-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/next",
-  "version": "2.0.0-alpha.3",
+  "version": "2.0.0-alpha.4",
   "scripts": {
     "build": "unbuild",
     "dev": "pnpm predev && pnpm watch unbuild src --wait=0.2",
@@ -20,7 +20,7 @@
     "dist/**"
   ],
   "dependencies": {
-    "@blitzjs/rpc": "2.0.0-alpha.3",
+    "@blitzjs/rpc": "2.0.0-alpha.4",
     "debug": "4.3.3",
     "fs-extra": "10.0.1",
     "react-query": "3.21.1"

packages/blitz-rpc/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @blitzjs/rpc
 
+## 2.0.0-alpha.4
+
+### Patch Changes
+
+- Updated dependencies
+  - blitz@2.0.0-alpha.4
+  - @blitzjs/auth@2.0.0-alpha.4
+
 ## 2.0.0-alpha.3
 
 ### Patch Changes

packages/blitz-rpc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/rpc",
-  "version": "2.0.0-alpha.3",
+  "version": "2.0.0-alpha.4",
   "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.3",
+    "@blitzjs/auth": "2.0.0-alpha.4",
     "b64-lite": "1.4.0",
     "bad-behavior": "1.0.1",
     "chalk": "^4.1.0",
@@ -33,7 +33,7 @@
     "@types/debug": "4.1.7",
     "@types/react": "17.0.43",
     "@types/react-dom": "17.0.14",
-    "blitz": "2.0.0-alpha.3",
+    "blitz": "2.0.0-alpha.4",
     "next": "12.1.1",
     "react": "18.0.0",
     "react-dom": "18.0.0",
@@ -42,7 +42,7 @@
     "watch": "1.0.2"
   },
   "peerDependencies": {
-    "blitz": "2.0.0-alpha.3",
+    "blitz": "2.0.0-alpha.4",
     "next": "*"
   },
   "publishConfig": {

packages/blitz/CHANGELOG.md

@@ -1,5 +1,12 @@
 # blitz
 
+## 2.0.0-alpha.4
+
+### Patch Changes
+
+- fix more cli problems
+  - @blitzjs/generator@2.0.0-alpha.4
+
 ## 2.0.0-alpha.3
 
 ### Patch Changes

packages/blitz/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blitz",
-  "version": "2.0.0-alpha.3",
+  "version": "2.0.0-alpha.4",
   "scripts": {
     "build": "unbuild",
     "dev": "watch unbuild src --wait=0.2",

packages/blitz/src/cli/index.ts

@@ -56,12 +56,15 @@ if (!foundCommand && args["--help"]) {
   console.log(`
     Usage
       $ blitz <command>
+
     Available commands
       ${Object.keys(commands).join(", ")}
+
     Options
       --env, -e       App environment name
       --version, -v   Version number
       --help, -h      Displays this message
+
     For more information run a command with the --help flag
       $ blitz build --help
   `)
@@ -71,20 +74,6 @@ if (!foundCommand && args["--help"]) {
 const command = foundCommand ? (args._[0] as string) : defaultCommand
 const forwardedArgs = foundCommand ? args._.slice(1) : args._
 
-// Don't check for react or react-dom when running blitz new
-if (command !== "new") {
-  ;["react", "react-dom"].forEach((dependency) => {
-    try {
-      // When 'npm link' is used it checks the clone location. Not the project.
-      require.resolve(dependency)
-    } catch (err) {
-      console.warn(
-        `The module '${dependency}' was not found. Blitz.js requires that you include it in 'dependencies' of your 'package.json'. To add it, run 'npm install ${dependency}'`,
-      )
-    }
-  })
-}
-
 if (args["--help"]) {
   forwardedArgs.push("--help")
 }
@@ -117,21 +106,3 @@ commands[command]?.()
   .catch((err) => {
     console.log(err)
   })
-
-if (command === "dev") {
-  const {watchFile} = require("fs")
-  watchFile(`${process.cwd()}/blitz.config.js`, (cur: any, prev: any) => {
-    if (cur.size > 0 || prev.size > 0) {
-      console.log(
-        `\n> Found a change in blitz.config.js. Restart the server to see the changes in effect.`,
-      )
-    }
-  })
-  watchFile(`${process.cwd()}/blitz.config.ts`, (cur: any, prev: any) => {
-    if (cur.size > 0 || prev.size > 0) {
-      console.log(
-        `\n> Found a change in blitz.config.ts. Restart the server to see the changes in effect.`,
-      )
-    }
-  })
-}

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

@@ -2,12 +2,12 @@ import fs, {promises} from "fs"
 import {join, resolve} from "path"
 import {readJSON} from "fs-extra"
 import path from "path"
-import {packageDirectory} from "pkg-dir"
+import pkgDir from "pkg-dir"
 import resolveCwd from "resolve-cwd"
 const debug = require("debug")("blitz:utils")
 
 export async function resolveBinAsync(pkg: string, executable = pkg) {
-  const packageDir = await packageDirectory({cwd: resolveCwd(pkg)})
+  const packageDir = await pkgDir(resolveCwd(pkg))
   if (!packageDir) throw new Error(`Could not find package.json for '${pkg}'`)
 
   const {bin} = await readJSON(path.join(packageDir, "package.json"))

packages/blitz/src/cli/utils/next-utils.ts

@@ -4,7 +4,7 @@ import detect from "detect-port"
 import path from "path"
 import {existsSync, readJSONSync} from "fs-extra"
 import * as esbuild from "esbuild"
-import {packageDirectorySync} from "pkg-dir"
+import pkgDir from "pkg-dir"
 import type {ServerConfig} from "./config"
 
 const debug = require("debug")("blitz:utils")
@@ -50,7 +50,7 @@ export function getCustomServerBuildPath() {
 }
 
 const getEsbuildOptions = (): esbuild.BuildOptions => {
-  const pkg = readJSONSync(path.join(packageDirectorySync()!, "package.json"))
+  const pkg = readJSONSync(path.join(pkgDir.sync()!, "package.json"))
   return {
     entryPoints: [getCustomServerPath()],
     outfile: getCustomServerBuildPath(),

packages/config/CHANGELOG.md

@@ -1,5 +1,7 @@
 # @blitzjs/config
 
+## 2.0.0-alpha.4
+
 ## 2.0.0-alpha.3
 
 ## 2.0.0-alpha.2

packages/config/package.json

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

packages/generator/CHANGELOG.md

@@ -1,5 +1,7 @@
 # @blitzjs/generator
 
+## 2.0.0-alpha.4
+
 ## 2.0.0-alpha.3
 
 ## 2.0.0-alpha.2

packages/generator/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/generator",
-  "version": "2.0.0-alpha.3",
+  "version": "2.0.0-alpha.4",
   "scripts": {
     "dev": "watch unbuild src --wait=0.2",
     "build": "unbuild && pnpm build:templates",