fix routes for finding blitz in node_modules

.all-contributorsrc

@@ -971,8 +971,7 @@
       "profile": "https://twitter.com/dillonraphael",
       "contributions": [
         "code",
-        "doc",
-        "test"
+        "doc"
       ]
     },
     {
@@ -3650,16 +3649,6 @@
         "doc",
         "code"
       ]
-    },
-    {
-      "login": "chaiwattsw",
-      "name": "Chaiwat Trisuwan",
-      "avatar_url": "https://avatars.githubusercontent.com/u/30198386?v=4",
-      "profile": "https://chaiwattsw.com/",
-      "contributions": [
-        "doc",
-        "code"
-      ]
     }
   ],
   "contributorsPerLine": 7,

.changeset/calm-tomatoes-drive.md

@@ -1,5 +0,0 @@
----
-"@blitzjs/generator": patch
----
-
-Include `.env.test` file to the generator templates

.changeset/fair-carrots-guess.md

@@ -1,5 +0,0 @@
----
-"blitz": patch
----
-
-Fixes loading production env variables by default for blitz build command

.changeset/gorgeous-games-obey.md

@@ -1,5 +0,0 @@
----
-"@blitzjs/next": patch
----
-
-Avoid `invalid config detected` warnings by deleting `"blitz"` key from next config object

.changeset/great-terms-rescue.md

@@ -1,5 +0,0 @@
----
-"blitz": patch
----
-
-Add BlitzServerMiddleware utility function to wrap middleware in blitz server file

.changeset/green-pillows-hammer.md

@@ -1,5 +0,0 @@
----
-"blitz": patch
----
-
-Runs the codegen on the blitz build command

.changeset/light-donkeys-double.md

@@ -1,5 +0,0 @@
----
-"blitz": patch
----
-
-Run `prisma generate` as a `blitz codegen` step if "prisma" is found in project's dependencies

.changeset/ninety-rice-tickle.md

@@ -1,6 +0,0 @@
----
-"blitz": patch
-"@blitzjs/generator": patch
----
-
-Improve `blitz new` messaging and fix minor issues

.changeset/pre.json

@@ -27,7 +27,6 @@
     "bright-mangos-run",
     "calm-carpets-deny",
     "calm-nails-wait",
-    "calm-tomatoes-drive",
     "clean-walls-wink",
     "cool-doors-invent",
     "cool-horses-check",
@@ -37,7 +36,6 @@
     "eleven-humans-sort",
     "empty-berries-rule",
     "empty-turkeys-wave",
-    "fair-carrots-guess",
     "fair-wombats-sneeze",
     "famous-kings-explain",
     "fast-trainers-kneel",
@@ -51,11 +49,8 @@
     "good-apes-drum",
     "good-insects-wink",
     "gorgeous-buses-scream",
-    "gorgeous-games-obey",
     "great-months-train",
-    "great-terms-rescue",
     "green-papayas-do",
-    "green-pillows-hammer",
     "happy-hotels-visit",
     "healthy-rice-shout",
     "heavy-apes-judge",
@@ -65,7 +60,6 @@
     "late-steaks-give",
     "lemon-games-press",
     "lemon-seas-push",
-    "light-donkeys-double",
     "lovely-colts-share",
     "lucky-cows-try",
     "mean-gorillas-reply",
@@ -82,7 +76,6 @@
     "nine-onions-admire",
     "ninety-lies-press",
     "ninety-pets-heal",
-    "ninety-rice-tickle",
     "olive-bees-buy",
     "olive-feet-rhyme",
     "olive-sheep-rhyme",
@@ -99,7 +92,6 @@
     "quiet-feet-travel",
     "quiet-pans-hunt",
     "quiet-sloths-rule",
-    "red-badgers-retire",
     "rich-chairs-invent",
     "rich-queens-travel",
     "sharp-falcons-begin",
@@ -115,7 +107,6 @@
     "smooth-stingrays-drum",
     "soft-adults-smell",
     "sour-lemons-hunt",
-    "spicy-beds-float",
     "strong-apes-reply",
     "stupid-walls-sell",
     "sweet-kiwis-cross",
@@ -129,13 +120,11 @@
     "tender-pianos-check",
     "thick-parrots-float",
     "thirty-countries-build",
-    "three-lies-pull",
     "tidy-clouds-smoke",
     "tough-toes-pull",
     "twelve-lemons-smile",
     "twenty-beans-pump",
     "two-carpets-rhyme",
-    "two-eyes-knock",
     "two-kiwis-help",
     "two-tigers-type",
     "unlucky-papayas-sleep",
@@ -144,7 +133,6 @@
     "weak-suns-shave",
     "wicked-ghosts-cough",
     "wicked-rings-walk",
-    "wise-frogs-give",
-    "wise-rabbits-complain"
+    "wise-frogs-give"
   ]
 }

.changeset/red-badgers-retire.md

@@ -1,8 +0,0 @@
----
-"blitz": patch
-"@blitzjs/next": patch
-"@blitzjs/rpc": patch
-"@blitzjs/generator": patch
----
-
-Fixes peer dependency warnings

.changeset/spicy-beds-float.md

@@ -1,8 +0,0 @@
----
-"@blitzjs/auth": patch
-"@blitzjs/next": patch
-"@blitzjs/rpc": patch
-"blitz": patch
-"@blitzjs/generator": patch
----
-Fixes the supports-color warning for pnpm

.changeset/three-lies-pull.md

@@ -1,5 +0,0 @@
----
-"@blitzjs/rpc": patch
----
-
-moves zod to devDependencies

.changeset/wise-rabbits-complain.md

@@ -1,5 +0,0 @@
----
-"@blitzjs/generator": patch
----
-
-Mocks @blitzjs/auth instead of blitz inside the forgotPassword mutation test & hardcodes blitz package version types instead of just using the alpha tag.

README.md

@@ -6,7 +6,7 @@
     <img alt="" src="https://img.shields.io/badge/Join%20our%20community-6700EB.svg?style=for-the-badge&labelColor=000000&logoWidth=20&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAQ9SURBVHgB7d3dVdtAEIbhcSpICUoH0IEogQqSVBBSAU4FSSpIOoAORAfQgSghHXzZ1U/YcMD4R9rZmf2ec3y448LyiNf27iLiGIAmPLrweC9Un3DhrzG6EarLNP09nlwJ1SOZ/lQr5N80/S/p2QMVCBf5N17XCfm1Y/rBHqjAG9PPHvBsz+mf9WAP+HLA9M/YA14cOP2payH7jpj+VCtk1wnTP+vj7xCy6cTpn7EHLMLp059iD1iD8eveJbVCNsSLheX1YA/YgOWnf8YeKB3Wmf7Ud6Fy4f/FHmtpxbl3YlC4MJ/Cj0bWdwPnPbARg+L0S54XQHS32WwuxClzd4CM0z9rPfeAuTtA5ulPXYQ7wZ04Y+oOoDD9KZc9YOoOoDj9s4dwFzgXR6w1wIPoOvPWA9buAHEJ173o3gWiy3AnuBUHLEbgmYwvAk1/wuM8vAgexThzbwPDkx7/DHwVXfFOxP2GmsKd4Ab6zPeAyU8CI7AHFmH2BRCBPXAyk18GzUrqAXCTiR4ssyj0VFw/oCU8+e+RZ33AWz6KMaYbIIWxB+JSLs1bsbkeMN0AqakHvoku9oA2sAfqBvbAQdw0QArsgb25aYBUQT3QgT2gB+yBuqGcHij2UCqXDZACe2Anlw2QYg/QAOyBuoE98CL3DZDCuK4/rh/Q7oGL6U+TOvcNkJoijN8X1C48+T+g75eQDrAH/qmqAVJgDwyqaoAUe4AGYA/UDZX3QLUNkEIZPRCd5+6BahsgVUgPROwBTSijB7jpVAvGHriHvmw9wAZ4BpX1ABvgmakHtPcbRuwBTWAPULgAV9D/jKDY9YRvwvgEaurD44uQHvAol7qBW7WKluVtIHiUS7GyvA0s6CiXDnxrpQfsgbqBS7GKk/2jYHCrVlGyfxTMrVo0ALdq1Q3sgSKofh0M9oA61a+D2QM0AHugbmAPqClmSRjK2apVVQ8UsySsoK1aHdgDesCtWnUDeyCrIpeFg1u3sylyWTi3btMA7IG6gT2wuuK3hoE9sKrit4YVslWLPaAN7IG6ocKt2zmY2h4O9sDiTG0PZw/QANy6XTewBxZj9ogYVHy025LMHhEz9cBn0We6B0yfERReBLfhx0/R1YQHPx/QBPbA0VwcEwf2wNFcHBPHHjiem3MC2QPHcXdSaJjA+KfgTPQ8hhfjBzHC40mhlzJ+Xq9lK4a4PCs43AVaGTed5mZq+iOXZwWHi3AnOj2wFWNcnxYe7gTxLtBKHuamP/J+Wnh8a5irB7ZC5Yk9gPX1QuXC+usHWqGyhYvUYR0a7zboUOFCNVhnk0krZAOW7wFOvzXhom2xnEbIHizTA1wEYhWW6YFGyC6c1gOcfg9wfA80Qj7g8B7g9HuCww+haIR8wf49wOn3Cvv9k8tGyC/s7gFOv3fY3QONkH+v9MBWqB7PeqDn9FcIT//kcitUn6kHOu/T/xfWzlQy3dEHhwAAAABJRU5ErkJggg==">
   </a>
 <!-- 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-388-17BB8A.svg?style=for-the-badge&labelColor=000000"></a>
+<a aria-label="All Contributors" href="#contributors-"><img alt="" src="https://img.shields.io/badge/all_contributors-387-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">
     <img alt="" src="https://img.shields.io/npm/l/blitz.svg?style=for-the-badge&labelColor=000000&color=blue">
@@ -337,7 +337,7 @@ Thanks to these wonderful people ([emoji key](https://allcontributors.org/docs/e
   </tr>
   <tr>
     <td align="center"><a href="https://github.com/jschepmans"><img src="https://avatars2.githubusercontent.com/u/5782977?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Johan Schepmans</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=jschepmans" title="Code">💻</a></td>
-    <td align="center"><a href="https://twitter.com/dillonraphael"><img src="https://avatars0.githubusercontent.com/u/3496193?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Dillon Raphael</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=dillonraphael" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=dillonraphael" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=dillonraphael" title="Tests">⚠️</a></td>
+    <td align="center"><a href="https://twitter.com/dillonraphael"><img src="https://avatars0.githubusercontent.com/u/3496193?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Dillon Raphael</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=dillonraphael" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=dillonraphael" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/clgeoio"><img src="https://avatars2.githubusercontent.com/u/37571416?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Cody G</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=clgeoio" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=clgeoio" title="Tests">⚠️</a></td>
     <td align="center"><a href="https://github.com/madflow"><img src="https://avatars0.githubusercontent.com/u/183248?v=4?s=100" width="100px;" alt=""/><br /><sub><b>madflow</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=madflow" title="Documentation">📖</a></td>
     <td align="center"><a href="https://twitter.com/nitaking_"><img src="https://avatars2.githubusercontent.com/u/10850034?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Satoshi Nitawaki</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=nitaking" title="Code">💻</a> <a href="#maintenance-nitaking" title="Maintenance">🚧</a> <a href="#question-nitaking" title="Answering Questions">💬</a> <a href="https://github.com/blitz-js/blitz/commits?author=nitaking" title="Documentation">📖</a></td>
@@ -707,7 +707,6 @@ Thanks to these wonderful people ([emoji key](https://allcontributors.org/docs/e
   <tr>
     <td align="center"><a href="https://github.com/tommywong-dev"><img src="https://avatars.githubusercontent.com/u/79971095?v=4?s=100" width="100px;" alt=""/><br /><sub><b>tommywong-dev</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=tommywong-dev" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/datner"><img src="https://avatars.githubusercontent.com/u/22598347?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Datner</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=datner" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=datner" title="Code">💻</a></td>
-    <td align="center"><a href="https://chaiwattsw.com/"><img src="https://avatars.githubusercontent.com/u/30198386?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Chaiwat Trisuwan</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=chaiwattsw" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=chaiwattsw" title="Code">💻</a></td>
   </tr>
 </table>
 

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.66",
+    "blitz": "workspace:2.0.0-alpha.65",
     "next": "12.2.0",
     "prisma": "4.0.0",
     "react": "18.0.0",

packages/blitz-auth/CHANGELOG.md

@@ -1,19 +1,5 @@
 # @blitzjs/auth
 
-## 2.0.0-alpha.66
-
-### Patch Changes
-
-- a3e6c49c: Fixes the supports-color warning for pnpm
-- Updated dependencies [928e840b]
-- Updated dependencies [240f3f34]
-- Updated dependencies [55b1cb20]
-- Updated dependencies [4d7d126d]
-- Updated dependencies [890b0c0c]
-- Updated dependencies [807a2b56]
-- Updated dependencies [a3e6c49c]
-  - blitz@2.0.0-alpha.66
-
 ## 2.0.0-alpha.65
 
 ### Patch Changes

packages/blitz-auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/auth",
-  "version": "2.0.0-alpha.66",
+  "version": "2.0.0-alpha.65",
   "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.66",
+    "blitz": "2.0.0-alpha.65",
     "cookie": "0.4.1",
     "cookie-session": "2.0.0",
     "debug": "4.3.3",
@@ -36,11 +36,10 @@
     "passport": "0.5.2",
     "path": "0.12.7",
     "secure-password": "4.0.0",
-    "supports-color": "8.1.1",
     "url": "0.11.0"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.66",
+    "@blitzjs/config": "workspace:2.0.0-alpha.65",
     "@testing-library/react": "13.0.0",
     "@testing-library/react-hooks": "7.0.2",
     "@types/cookie": "0.4.1",

packages/blitz-next/CHANGELOG.md

@@ -1,17 +1,5 @@
 # @blitzjs/next
 
-## 2.0.0-alpha.66
-
-### Patch Changes
-
-- ccb1af8d: Avoid `invalid config detected` warnings by deleting `"blitz"` key from next config object
-- 807a2b56: Fixes peer dependency warnings
-- a3e6c49c: Fixes the supports-color warning for pnpm
-- Updated dependencies [807a2b56]
-- Updated dependencies [a3e6c49c]
-- Updated dependencies [9620ef6b]
-  - @blitzjs/rpc@2.0.0-alpha.66
-
 ## 2.0.0-alpha.65
 
 ### 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", ".blitz", "next", "react"],
+  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.66",
+  "version": "2.0.0-alpha.65",
   "scripts": {
     "build": "unbuild",
     "dev": "pnpm predev && pnpm watch unbuild src --wait=0.2",
@@ -24,17 +24,16 @@
     "eslint.js"
   ],
   "dependencies": {
-    "@blitzjs/rpc": "2.0.0-alpha.66",
+    "@blitzjs/rpc": "2.0.0-alpha.65",
     "@tanstack/react-query": "4.0.10",
     "@types/hoist-non-react-statics": "3.3.1",
     "debug": "4.3.3",
     "fs-extra": "10.0.1",
     "hoist-non-react-statics": "3.3.2",
-    "superjson": "1.8.0",
-    "supports-color": "8.1.1"
+    "superjson": "1.8.0"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.66",
+    "@blitzjs/config": "workspace:2.0.0-alpha.65",
     "@testing-library/dom": "8.13.0",
     "@testing-library/jest-dom": "5.16.3",
     "@testing-library/react": "13.0.0",
@@ -44,7 +43,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.66",
+    "blitz": "2.0.0-alpha.65",
     "cross-spawn": "7.0.3",
     "find-up": "4.1.0",
     "next": "12.2.0",
@@ -58,5 +57,9 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "peerDependencies": {
+    "next": ">=12.2.0",
+    "react": "*"
   }
 }

packages/blitz-next/scripts/postinstall.js

@@ -12,17 +12,7 @@ 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) {
@@ -105,11 +95,10 @@ function codegen() {
     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")
+        if (packagePath.includes(".pnpm")) {
+          return path.join(packagePath, "../../blitz/dist/index.cjs")
         } else {
-          return path.join(blitzPkg)
+          return path.join(packagePath, "../dist/index.cjs")
         }
       }
     } catch (e) {
@@ -337,6 +326,4 @@ function codegen() {
   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-server.ts

@@ -209,8 +209,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,15 +1,5 @@
 # @blitzjs/rpc
 
-## 2.0.0-alpha.66
-
-### Patch Changes
-
-- 807a2b56: Fixes peer dependency warnings
-- a3e6c49c: Fixes the supports-color warning for pnpm
-- 9620ef6b: moves zod to devDependencies
-- Updated dependencies [a3e6c49c]
-  - @blitzjs/auth@2.0.0-alpha.66
-
 ## 2.0.0-alpha.65
 
 ### Patch Changes

packages/blitz-rpc/build.config.ts

@@ -14,9 +14,6 @@ const config: BuildConfig = {
     "index-server.cjs",
     "index-server.mjs",
     "react",
-    "blitz",
-    "next",
-    "zod",
   ],
   declaration: true,
   rollup: {

packages/blitz-rpc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/rpc",
-  "version": "2.0.0-alpha.66",
+  "version": "2.0.0-alpha.65",
   "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,28 +20,31 @@
     "dist/**"
   ],
   "dependencies": {
-    "@blitzjs/auth": "2.0.0-alpha.66",
+    "@blitzjs/auth": "2.0.0-alpha.65",
     "@tanstack/react-query": "4.0.10",
     "b64-lite": "1.4.0",
     "bad-behavior": "1.0.1",
     "chalk": "^4.1.0",
     "debug": "4.3.3",
     "superjson": "1.8.0",
-    "supports-color": "8.1.1"
+    "zod": "3.17.3"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.66",
+    "@blitzjs/config": "workspace:2.0.0-alpha.65",
     "@types/debug": "4.1.7",
     "@types/react": "18.0.1",
     "@types/react-dom": "17.0.14",
-    "blitz": "2.0.0-alpha.66",
+    "blitz": "2.0.0-alpha.65",
     "next": "12.2.0",
     "react": "18.0.0",
     "react-dom": "18.0.0",
     "typescript": "^4.5.3",
     "unbuild": "0.7.6",
-    "watch": "1.0.2",
-    "zod": "3.17.3"
+    "watch": "1.0.2"
+  },
+  "peerDependencies": {
+    "blitz": "2.0.0-alpha.65",
+    "next": ">=12.2.0"
   },
   "publishConfig": {
     "access": "public"

packages/blitz/CHANGELOG.md

@@ -1,24 +1,5 @@
 # blitz
 
-## 2.0.0-alpha.66
-
-### Patch Changes
-
-- 928e840b: Fixes loading production env variables by default for blitz build command
-- 240f3f34: Add BlitzServerMiddleware utility function to wrap middleware in blitz server file
-- 55b1cb20: Runs the codegen on the blitz build command
-- 4d7d126d: Run `prisma generate` as a `blitz codegen` step if "prisma" is found in project's dependencies
-- 890b0c0c: Improve `blitz new` messaging and fix minor issues
-- 807a2b56: Fixes peer dependency warnings
-- a3e6c49c: Fixes the supports-color warning for pnpm
-- Updated dependencies [91aa5356]
-- Updated dependencies [890b0c0c]
-- Updated dependencies [807a2b56]
-- Updated dependencies [a3e6c49c]
-- Updated dependencies [065db256]
-- Updated dependencies [f202aac1]
-  - @blitzjs/generator@2.0.0-alpha.66
-
 ## 2.0.0-alpha.65
 
 ### 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", "index.cjs", "zod", "react"],
+  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.66",
+  "version": "2.0.0-alpha.65",
   "scripts": {
     "build": "unbuild",
     "dev": "watch unbuild src --wait=0.2",
@@ -23,7 +23,7 @@
     "blitz": "bin/blitz"
   },
   "dependencies": {
-    "@blitzjs/generator": "2.0.0-alpha.66",
+    "@blitzjs/generator": "2.0.0-alpha.65",
     "arg": "5.0.1",
     "boxen": "7.0.0",
     "chalk": "^4.1.0",
@@ -48,14 +48,13 @@
     "resolve-cwd": "3.0.0",
     "resolve-from": "5.0.0",
     "superjson": "1.8.0",
-    "supports-color": "8.1.1",
     "ts-node": "10.7.0",
     "tsconfig-paths": "4.0.0",
     "tslog": "3.3.1",
     "watchpack": "2.1.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.66",
+    "@blitzjs/config": "workspace:2.0.0-alpha.65",
     "@types/cookie": "0.4.1",
     "@types/cross-spawn": "6.0.2",
     "@types/debug": "4.1.7",
@@ -79,6 +78,9 @@
     "watch": "1.0.2",
     "zod": "3.17.3"
   },
+  "peerDependencies": {
+    "react": "*"
+  },
   "publishConfig": {
     "access": "public"
   }

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

@@ -1,14 +1,37 @@
 import {CliCommand} from "../index"
-import {codegenTasks} from "../utils/codegen-tasks"
+/* @ts-ignore */
+import {generateManifest} from "../utils/routes-manifest"
+import resolveCwd from "resolve-cwd"
+import {join} from "path"
+import fs from "fs-extra"
 
 const codegen: CliCommand = async () => {
   try {
-    await codegenTasks()
-    process.exit(0)
+    /* 
+      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)
   } catch (err) {
     console.log(err)
-    process.exit(1)
   }
+
+  try {
+    await generateManifest()
+  } catch (err) {
+    console.log(err)
+  }
+
+  process.exit(0)
 }
 
 export {codegen}

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

@@ -9,15 +9,17 @@ import {AppGenerator, AppGeneratorOptions, getLatestVersion} from "@blitzjs/gene
 import {checkLatestVersion} from "../utils/check-latest-version"
 import {runPrisma} from "../../run-prisma"
 
-const forms: Record<AppGeneratorOptions["form"], string> = {
-  finalform: "React Final Form (recommended)",
-  hookform: "React Hook Form",
-  formik: "Formik",
+const forms = {
+  "react-final-form": "React Final Form" as const,
+  "react-hook-form": "React Hook Form" as const,
+  formik: "Formik" as const,
 }
 
+type TForms = keyof typeof forms
+
 const language = {
   typescript: "TypeScript",
-  javascript: "JavaScript",
+  javascript: "Javascript",
 }
 
 type TLanguage = keyof typeof language
@@ -73,7 +75,7 @@ const args = arg(
 let projectName: string = ""
 let projectPath: string = ""
 let projectLanguage: string | TLanguage = ""
-let projectFormLib: AppGeneratorOptions["form"] = "finalform"
+let projectFormLib: AppGeneratorOptions["form"] = undefined
 let projectTemplate: AppGeneratorOptions["template"] = templates.full
 let projectPkgManger: TPkgManager = PREFERABLE_PKG_MANAGER
 let shouldInstallDeps: boolean = true
@@ -108,7 +110,7 @@ const determineLanguage = async () => {
     const res = await prompts({
       type: "select",
       name: "language",
-      message: "Pick a new project's language",
+      message: "Pick which language you'd like to use for your new blitz project",
       initial: 0,
       choices: Object.entries(language).map((c) => {
         return {title: c[1], value: c[1]}
@@ -127,16 +129,16 @@ const determineFormLib = async () => {
     const res = await prompts({
       type: "select",
       name: "form",
-      message: "Pick a form library (you can switch to something else later if you want)",
+      message: "Pick which form you'd like to use for your new blitz project",
       initial: 0,
       choices: Object.entries(forms).map((c) => {
-        return {value: c[0], title: c[1]}
+        return {title: c[1], value: c[1]}
       }),
     })
 
     projectFormLib = res.form
   } else {
-    projectFormLib = args["--form"] as AppGeneratorOptions["form"]
+    projectFormLib = forms[args["--form"] as TForms]
   }
 }
 
@@ -146,17 +148,14 @@ const determineTemplate = async () => {
     !args["--template"] ||
     (args["--template"] && !Object.keys(templates).includes(args["--template"].toLowerCase()))
   ) {
-    const choices: Array<{value: keyof typeof templates; title: string}> = [
-      {value: "full", title: "Full - includes DB and auth (Recommended)"},
-      {value: "minimal", title: "Minimal — no DB, no auth"},
-    ]
-
     const res = await prompts({
       type: "select",
       name: "template",
-      message: "Pick your new app template",
+      message: "Pick which template you'd like to use for your new blitz project",
       initial: 0,
-      choices,
+      choices: Object.entries(templates).map((c) => {
+        return {title: c[0], value: c[0]}
+      }),
     })
 
     projectTemplate = templates[res.template as TTemplate]
@@ -204,11 +203,7 @@ const determinePkgManagerToInstallDeps = async () => {
         ],
       })
 
-      if (res.pkgManager === "skip") {
-        projectPkgManger = PREFERABLE_PKG_MANAGER
-      } else {
-        projectPkgManger = res.pkgManager
-      }
+      projectPkgManger = res.pkgManager
 
       shouldInstallDeps = res.pkgManager !== "skip"
     } else {

packages/blitz/src/cli/commands/next/build.ts

@@ -15,7 +15,7 @@ const build: CliCommand = async () => {
   const config: ServerConfig = {
     rootFolder: process.cwd(),
     inspect: nextArgs["--inspect"],
-    env: "prod",
+    env: process.env.NODE_ENV === "production" ? "prod" : "dev",
   }
 
   await import("../../utils/next-commands").then((i) => i.build(config))

packages/blitz/src/cli/index.ts

@@ -124,6 +124,7 @@ async function main() {
   if (args["--env"]) {
     process.env.APP_ENV = args["--env"]
   }
+  loadEnvConfig(process.cwd(), undefined, {error: console.error, info: console.info})
 
   // Version is inlined into the file using taskr build pipeline
   if (args["_"].length === 0 && args["--version"]) {
@@ -144,7 +145,7 @@ async function main() {
   }
 
   process.env.NODE_ENV = process.env.NODE_ENV || defaultEnv
-  loadEnvConfig(process.cwd(), undefined, {error: console.error, info: console.info})
+
   // Make sure commands gracefully respect termination signals (e.g. from Docker)
   process.on("SIGTERM", () => process.exit(0))
   process.on("SIGINT", () => process.exit(0))

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 "../../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()
-      } 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/get-package-json.ts

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

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

@@ -9,11 +9,10 @@ import {
 } from "./next-utils"
 import {checkLatestVersion} from "./check-latest-version"
 import {readBlitzConfig} from "../../server-utils"
-import {codegenTasks} from "./codegen-tasks"
 
 export async function build(config: ServerConfig) {
   const {rootFolder, nextBin, watch} = await normalize(config)
-  await codegenTasks()
+
   await nextBuild(nextBin, rootFolder, {} as any, config)
   if (customServerExists()) await buildCustomServer({watch})
 }

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

@@ -590,7 +590,7 @@ export async function stopWatcher(): Promise<void> {
   if (!webpackWatcher) {
     return
   }
-
+  console.log("stopWatcher")
   webpackWatcher.close()
   webpackWatcher = null
 }

packages/blitz/src/index-server.ts

@@ -60,11 +60,3 @@ export function createSetupServer<TMiddleware extends RequestMiddleware, TExport
 ) {
   return setupServerConstructor
 }
-
-export const BlitzServerMiddleware = <
-  TMiddleware extends RequestMiddleware<any, any> = RequestMiddleware,
->(
-  middleware: TMiddleware,
-): BlitzServerPlugin => ({
-  requestMiddlewares: [middleware],
-})

packages/codemod/CHANGELOG.md

@@ -1,22 +1,5 @@
 # @blitzjs/codemod
 
-## 2.0.0-alpha.66
-
-### Patch Changes
-
-- Updated dependencies [91aa5356]
-- Updated dependencies [928e840b]
-- Updated dependencies [240f3f34]
-- Updated dependencies [55b1cb20]
-- Updated dependencies [4d7d126d]
-- Updated dependencies [890b0c0c]
-- Updated dependencies [807a2b56]
-- Updated dependencies [a3e6c49c]
-- Updated dependencies [065db256]
-- Updated dependencies [f202aac1]
-  - @blitzjs/generator@2.0.0-alpha.66
-  - blitz@2.0.0-alpha.66
-
 ## 2.0.0-alpha.65
 
 ### Patch Changes

packages/codemod/package.json

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

packages/config/CHANGELOG.md

@@ -1,7 +1,5 @@
 # @blitzjs/config
 
-## 2.0.0-alpha.66
-
 ## 2.0.0-alpha.65
 
 ## 2.0.0-alpha.64

packages/config/package.json

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

packages/generator/CHANGELOG.md

@@ -1,16 +1,5 @@
 # @blitzjs/generator
 
-## 2.0.0-alpha.66
-
-### Patch Changes
-
-- 91aa5356: Include `.env.test` file to the generator templates
-- 890b0c0c: Improve `blitz new` messaging and fix minor issues
-- 807a2b56: Fixes peer dependency warnings
-- a3e6c49c: Fixes the supports-color warning for pnpm
-- 065db256: Update new app templates to use blitz-rpc's resolver function
-- f202aac1: Mocks @blitzjs/auth instead of blitz inside the forgotPassword mutation test & hardcodes blitz package version types instead of just using the alpha tag.
-
 ## 2.0.0-alpha.65
 
 ## 2.0.0-alpha.64

packages/generator/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/generator",
-  "version": "2.0.0-alpha.66",
+  "version": "2.0.0-alpha.65",
   "scripts": {
     "dev": "watch unbuild src --wait=0.2",
     "build": "unbuild && pnpm build:templates",
@@ -40,13 +40,12 @@
     "pluralize": "8.0.0",
     "prettier": "^2.5.1",
     "recast": "0.20.5",
-    "supports-color": "8.1.1",
     "tslog": "3.3.1",
     "username": "5.1.0",
     "vinyl": "2.2.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "2.0.0-alpha.66",
+    "@blitzjs/config": "2.0.0-alpha.65",
     "@juanm04/cpx": "2.0.1",
     "@types/babel__core": "7.1.19",
     "@types/diff": "5.0.2",
@@ -71,5 +70,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "peerDependencies": {
+    "react": "*"
   }
 }

packages/generator/src/generator.ts

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

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

@@ -27,7 +27,7 @@ export interface AppGeneratorOptions extends GeneratorOptions {
   version: string
   skipInstall: boolean
   skipGit: boolean
-  form?: "finalform" | "hookform" | "formik"
+  form?: "React Final Form" | "React Hook Form" | "Formik"
   onPostInstall?: () => Promise<void>
 }
 
@@ -126,9 +126,6 @@ export class AppGenerator extends Generator<AppGeneratorOptions> {
     pkg.dependencies = newDependencies
     pkg.devDependencies = newDevDependencies
     pkg.dependencies.blitz = blitzDependencyVersion
-    pkg.dependencies["@blitzjs/next"] = blitzDependencyVersion
-    pkg.dependencies["@blitzjs/rpc"] = blitzDependencyVersion
-    pkg.dependencies["@blitzjs/auth"] = blitzDependencyVersion
 
     const fallbackUsed = dependenciesUsedFallback || devDependenciesUsedFallback
 
@@ -302,18 +299,21 @@ export class AppGenerator extends Generator<AppGeneratorOptions> {
     assert(pkg, "couldn't find package.json")
 
     const ext = this.options.useTs ? "tsx" : "js"
+    let type: string = ""
 
-    const type = this.options.form
-    switch (type) {
-      case "finalform":
+    switch (this.options.form) {
+      case "React Final Form":
+        type = "finalform"
         pkg.dependencies["final-form"] = "4.x"
         pkg.dependencies["react-final-form"] = "6.x"
         break
-      case "hookform":
+      case "React Hook Form":
+        type = "hookform"
         pkg.dependencies["react-hook-form"] = "7.x"
         pkg.dependencies["@hookform/resolvers"] = "2.x"
         break
-      case "formik":
+      case "Formik":
+        type = "formik"
         pkg.dependencies["formik"] = "2.x"
         break
     }

packages/generator/templates/app/.env.test

@@ -1,5 +0,0 @@
-# SQLite is ready to go out of the box, but you can switch to Postgres
-# by first changing the provider from "sqlite" to "postgres" in the Prisma
-# schema file and by second swapping the DATABASE_URL below.
-DATABASE_URL="file:./db_test.sqlite"
-# DATABASE_URL=postgresql://__username__@localhost:5432/__name___test

packages/generator/templates/app/app/auth/mutations/forgotPassword.test.ts

@@ -9,8 +9,8 @@ beforeEach(async () => {
 })
 
 const generatedToken = "plain-token"
-jest.mock("@blitzjs/auth", () => ({
-  ...jest.requireActual<Record<string, unknown>>("@blitzjs/auth")!,
+jest.mock("blitz", () => ({
+  ...jest.requireActual<Record<string, unknown>>("blitz")!,
   generateToken: () => generatedToken,
 }))
 jest.mock("preview-email", () => jest.fn())

packages/generator/templates/minimalapp/.env.test

@@ -1,5 +0,0 @@
-# SQLite is ready to go out of the box, but you can switch to Postgres
-# by first changing the provider from "sqlite" to "postgres" in the Prisma
-# schema file and by second swapping the DATABASE_URL below.
-DATABASE_URL="file:./db_test.sqlite"
-# DATABASE_URL=postgresql://__username__@localhost:5432/__name___test

packages/pkg-template/package.json

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