Merge branch 'main' into fix-find-db

* Export enhancePrisma from the server entry point

* Changeset

* Update pnpm lock

.all-contributorsrc

@@ -3733,6 +3733,15 @@
         "doc",
         "code"
       ]
+    },
+    {
+      "login": "joneskj55",
+      "name": "Kevin Jones",
+      "avatar_url": "https://avatars.githubusercontent.com/u/20748598?v=4",
+      "profile": "https://kevinjones.engineer",
+      "contributions": [
+        "doc"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.changeset/pink-eggs-sleep.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Fix Error: Cannot find module 'db' when running blitz generate for a javascript project.

.changeset/silent-lies-run.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Fix `useSession` hook by exporting `enhancePrisma` from the server entry point instead of server

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-395-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-396-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/main/LICENSE">
     <img alt="" src="https://img.shields.io/npm/l/blitz.svg?style=for-the-badge&labelColor=000000&color=blue">
@@ -730,6 +730,7 @@ Thanks to these wonderful people ([emoji key](https://allcontributors.org/docs/e
     <td align="center"><a href="https://github.com/corydeppen"><img src="https://avatars.githubusercontent.com/u/313264?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Cory Deppen</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=corydeppen" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/oloost"><img src="https://avatars.githubusercontent.com/u/72395941?v=4?s=100" width="100px;" alt=""/><br /><sub><b>oloost</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=oloost" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/janvennemann"><img src="https://avatars.githubusercontent.com/u/1406024?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jan Vennemann</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=janvennemann" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=janvennemann" title="Code">💻</a></td>
+    <td align="center"><a href="https://kevinjones.engineer"><img src="https://avatars.githubusercontent.com/u/20748598?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kevin Jones</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=joneskj55" title="Documentation">📖</a></td>
   </tr>
 </table>
 

packages/blitz/src/index-browser.tsx

@@ -96,4 +96,3 @@ if (typeof window !== "undefined" && process.env.NODE_ENV === "development") {
 export * from "./utils"
 export * from "./types"
 export * from "./utils/zod"
-export * from "./utils/prisma"

packages/blitz/src/index-server.ts

@@ -5,9 +5,11 @@ import {Ctx} from "./types"
 export * from "./index-browser"
 export * from "./types"
 export * from "./utils/run-prisma"
+export * from "./utils/enhance-prisma"
 export * from "./middleware"
 export * from "./paginate"
 export * from "./logging"
+
 export {startWatcher, stopWatcher} from "./cli/utils/routes-manifest"
 
 export interface MiddlewareResponse<C extends Ctx = Ctx> extends ServerResponse {

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

@@ -2,7 +2,7 @@ import { setupBlitzServer } from '@blitzjs/next';
 import { AuthServerPlugin, PrismaStorage } from '@blitzjs/auth';
 import { simpleRolesIsAuthorized } from '@blitzjs/auth';
 import { BlitzLogger } from 'blitz';
-import db from 'db';
+import db from '../db';
 import { authConfig } from './blitz-client';
 
 export const { gSSP, gSP, api } = setupBlitzServer({

pnpm-lock.yaml

@@ -49,7 +49,7 @@ importers:
       "@types/preview-email": 2.0.1
       "@types/react": 18.0.17
       "@typescript-eslint/eslint-plugin": 5.9.1
-      blitz: workspace:2.0.0-beta.13
+      blitz: workspace:2.0.0-beta.14
       eslint: 7.32.0
       eslint-config-next: 12.3.1
       eslint-config-prettier: 8.5.0
@@ -120,7 +120,7 @@ importers:
       "@types/preview-email": 2.0.1
       "@types/react": 18.0.17
       "@typescript-eslint/eslint-plugin": 5.9.1
-      blitz: workspace:2.0.0-beta.13
+      blitz: workspace:2.0.0-beta.14
       eslint: 7.32.0
       eslint-config-next: 12.3.1
       eslint-config-prettier: 8.5.0
@@ -235,7 +235,7 @@ importers:
       "@types/node-fetch": 2.6.1
       "@types/react": 18.0.17
       b64-lite: 1.4.0
-      blitz: workspace:2.0.0-beta.13
+      blitz: workspace:2.0.0-beta.14
       eslint: 7.32.0
       fs-extra: 10.0.1
       get-port: 6.1.2
@@ -450,7 +450,7 @@ importers:
       "@vitejs/plugin-react": 1.3.0
       delay: 5.0.0
       eslint: 7.32.0
-      eslint-config-next: 12.3.1_hrkuebk64jiu2ut2d2sm4oylnu
+      eslint-config-next: 13.0.0_hrkuebk64jiu2ut2d2sm4oylnu
       eslint-plugin-testing-library: 5.0.1_hrkuebk64jiu2ut2d2sm4oylnu
       jsdom: 19.0.0
       typescript: 4.6.3
@@ -650,8 +650,8 @@ importers:
 
   packages/blitz:
     specifiers:
-      "@blitzjs/config": workspace:2.0.0-beta.13
-      "@blitzjs/generator": 2.0.0-beta.13
+      "@blitzjs/config": workspace:2.0.0-beta.14
+      "@blitzjs/generator": 2.0.0-beta.14
       "@mrleebo/prisma-ast": 0.2.6
       "@types/cookie": 0.4.1
       "@types/cross-spawn": 6.0.2
@@ -797,7 +797,7 @@ importers:
 
   packages/blitz-auth:
     specifiers:
-      "@blitzjs/config": workspace:2.0.0-beta.13
+      "@blitzjs/config": workspace:2.0.0-beta.14
       "@testing-library/react": 13.0.0
       "@testing-library/react-hooks": 7.0.2
       "@types/b64-lite": 1.3.0
@@ -811,7 +811,7 @@ importers:
       "@types/secure-password": 3.1.1
       b64-lite: 1.4.0
       bad-behavior: 1.0.1
-      blitz: 2.0.0-beta.13
+      blitz: 2.0.0-beta.14
       cookie: 0.4.1
       cookie-session: 2.0.0
       debug: 4.3.3
@@ -864,8 +864,8 @@ importers:
 
   packages/blitz-next:
     specifiers:
-      "@blitzjs/config": workspace:2.0.0-beta.13
-      "@blitzjs/rpc": 2.0.0-beta.13
+      "@blitzjs/config": workspace:2.0.0-beta.14
+      "@blitzjs/rpc": 2.0.0-beta.14
       "@tanstack/react-query": 4.0.10
       "@testing-library/dom": 8.13.0
       "@testing-library/jest-dom": 5.16.3
@@ -877,7 +877,7 @@ importers:
       "@types/react": 18.0.17
       "@types/react-dom": 17.0.14
       "@types/testing-library__react-hooks": 4.0.0
-      blitz: 2.0.0-beta.13
+      blitz: 2.0.0-beta.14
       cross-spawn: 7.0.3
       debug: 4.3.3
       find-up: 4.1.0
@@ -927,15 +927,15 @@ importers:
 
   packages/blitz-rpc:
     specifiers:
-      "@blitzjs/auth": 2.0.0-beta.13
-      "@blitzjs/config": workspace:2.0.0-beta.13
+      "@blitzjs/auth": 2.0.0-beta.14
+      "@blitzjs/config": workspace:2.0.0-beta.14
       "@tanstack/react-query": 4.0.10
       "@types/debug": 4.1.7
       "@types/react": 18.0.17
       "@types/react-dom": 17.0.14
       b64-lite: 1.4.0
       bad-behavior: 1.0.1
-      blitz: 2.0.0-beta.13
+      blitz: 2.0.0-beta.14
       chalk: ^4.1.0
       debug: 4.3.3
       next: 12.2.5
@@ -978,12 +978,12 @@ importers:
       "@babel/plugin-syntax-typescript": 7.17.12
       "@babel/preset-env": 7.12.10
       "@blitzjs/config": workspace:*
-      "@blitzjs/generator": 2.0.0-beta.13
+      "@blitzjs/generator": 2.0.0-beta.14
       "@types/jscodeshift": 0.11.2
       "@types/node": 17.0.16
       arg: 5.0.1
       ast-types: 0.14.2
-      blitz: 2.0.0-beta.13
+      blitz: 2.0.0-beta.14
       chalk: ^4.1.0
       cross-spawn: 7.0.3
       debug: 4.3.3
@@ -1038,7 +1038,7 @@ importers:
       "@babel/plugin-transform-typescript": 7.12.1
       "@babel/preset-env": 7.12.10
       "@babel/types": 7.12.10
-      "@blitzjs/config": 2.0.0-beta.13
+      "@blitzjs/config": 2.0.0-beta.14
       "@juanm04/cpx": 2.0.1
       "@mrleebo/prisma-ast": 0.4.1
       "@types/babel__core": 7.1.19
@@ -1131,7 +1131,7 @@ importers:
 
   packages/pkg-template:
     specifiers:
-      "@blitzjs/config": 2.0.0-beta.13
+      "@blitzjs/config": 2.0.0-beta.14
       "@types/react": 18.0.17
       "@types/react-dom": 17.0.14
       "@typescript-eslint/eslint-plugin": 5.9.1
@@ -1155,7 +1155,7 @@ importers:
   recipes/base-web:
     specifiers:
       "@types/jscodeshift": 0.11.2
-      blitz: 2.0.0-beta.13
+      blitz: 2.0.0-beta.14
       jscodeshift: 0.13.0
     dependencies:
       blitz: link:../../packages/blitz
@@ -1166,7 +1166,7 @@ importers:
   recipes/bulma:
     specifiers:
       "@types/jscodeshift": 0.11.2
-      blitz: 2.0.0-beta.13
+      blitz: 2.0.0-beta.14
       jscodeshift: 0.13.0
     dependencies:
       blitz: link:../../packages/blitz
@@ -1178,7 +1178,7 @@ importers:
     specifiers:
       "@types/jscodeshift": 0.11.2
       ast-types: 0.14.2
-      blitz: 2.0.0-beta.13
+      blitz: 2.0.0-beta.14
       jscodeshift: 0.13.0
     dependencies:
       blitz: link:../../packages/blitz
@@ -1191,7 +1191,7 @@ importers:
     specifiers:
       "@types/jscodeshift": 0.11.2
       ast-types: 0.14.2
-      blitz: 2.0.0-beta.13
+      blitz: 2.0.0-beta.14
       jscodeshift: 0.13.0
     dependencies:
       blitz: link:../../packages/blitz
@@ -1203,7 +1203,7 @@ importers:
   recipes/emotion:
     specifiers:
       "@types/jscodeshift": 0.11.2
-      blitz: 2.0.0-beta.13
+      blitz: 2.0.0-beta.14
       jscodeshift: 0.13.0
     dependencies:
       blitz: link:../../packages/blitz
@@ -1213,20 +1213,20 @@ importers:
 
   recipes/gh-action-yarn-mariadb:
     specifiers:
-      blitz: 2.0.0-beta.13
+      blitz: 2.0.0-beta.14
     dependencies:
       blitz: link:../../packages/blitz
 
   recipes/gh-action-yarn-postgres:
     specifiers:
-      blitz: 2.0.0-beta.13
+      blitz: 2.0.0-beta.14
     dependencies:
       blitz: link:../../packages/blitz
 
   recipes/ghost:
     specifiers:
       "@types/jscodeshift": 0.11.2
-      blitz: 2.0.0-beta.13
+      blitz: 2.0.0-beta.14
       jscodeshift: 0.13.0
     dependencies:
       blitz: link:../../packages/blitz
@@ -1237,7 +1237,7 @@ importers:
   recipes/graphql-apollo-server:
     specifiers:
       "@types/jscodeshift": 0.11.2
-      blitz: 2.0.0-beta.13
+      blitz: 2.0.0-beta.14
       jscodeshift: 0.13.0
       uuid: ^8.3.1
     dependencies:
@@ -1250,7 +1250,7 @@ importers:
   recipes/logrocket:
     specifiers:
       "@types/jscodeshift": 0.11.2
-      blitz: 2.0.0-beta.13
+      blitz: 2.0.0-beta.14
       jscodeshift: 0.13.0
     dependencies:
       blitz: link:../../packages/blitz
@@ -1261,7 +1261,7 @@ importers:
   recipes/material-ui:
     specifiers:
       "@types/jscodeshift": 0.11.2
-      blitz: 2.0.0-beta.13
+      blitz: 2.0.0-beta.14
       jscodeshift: 0.13.0
     dependencies:
       blitz: link:../../packages/blitz
@@ -1273,7 +1273,7 @@ importers:
     specifiers:
       "@types/jscodeshift": 0.11.2
       ast-types: 0.14.2
-      blitz: 2.0.0-beta.13
+      blitz: 2.0.0-beta.14
       jscodeshift: 0.13.0
     dependencies:
       blitz: link:../../packages/blitz
@@ -1284,13 +1284,13 @@ importers:
 
   recipes/passenger:
     specifiers:
-      blitz: 2.0.0-beta.13
+      blitz: 2.0.0-beta.14
     dependencies:
       blitz: link:../../packages/blitz
 
   recipes/quirrel:
     specifiers:
-      blitz: 2.0.0-beta.13
+      blitz: 2.0.0-beta.14
     dependencies:
       blitz: link:../../packages/blitz
 
@@ -1298,7 +1298,7 @@ importers:
     specifiers:
       "@types/jscodeshift": 0.11.2
       ast-types: 0.14.2
-      blitz: 2.0.0-beta.13
+      blitz: 2.0.0-beta.14
       jscodeshift: 0.13.0
     dependencies:
       blitz: link:../../packages/blitz
@@ -1309,14 +1309,14 @@ importers:
 
   recipes/render:
     specifiers:
-      blitz: 2.0.0-beta.13
+      blitz: 2.0.0-beta.14
     dependencies:
       blitz: link:../../packages/blitz
 
   recipes/secureheaders:
     specifiers:
       "@types/jscodeshift": 0.11.2
-      blitz: 2.0.0-beta.13
+      blitz: 2.0.0-beta.14
       jscodeshift: 0.13.0
       uuid: ^8.3.1
     dependencies:
@@ -1329,7 +1329,7 @@ importers:
   recipes/stitches:
     specifiers:
       "@types/jscodeshift": 0.11.2
-      blitz: 2.0.0-beta.13
+      blitz: 2.0.0-beta.14
       jscodeshift: 0.13.0
     dependencies:
       blitz: link:../../packages/blitz
@@ -1341,7 +1341,7 @@ importers:
     specifiers:
       "@types/jscodeshift": 0.11.2
       ast-types: 0.14.2
-      blitz: 2.0.0-beta.13
+      blitz: 2.0.0-beta.14
       jscodeshift: 0.13.0
     dependencies:
       blitz: link:../../packages/blitz
@@ -1353,7 +1353,7 @@ importers:
   recipes/tailwind:
     specifiers:
       "@types/jscodeshift": 0.11.2
-      blitz: 2.0.0-beta.13
+      blitz: 2.0.0-beta.14
       jscodeshift: 0.13.0
     dependencies:
       blitz: link:../../packages/blitz
@@ -1365,7 +1365,7 @@ importers:
     specifiers:
       "@types/jscodeshift": 0.11.2
       ast-types: 0.14.2
-      blitz: 2.0.0-beta.13
+      blitz: 2.0.0-beta.14
       jscodeshift: 0.13.0
     dependencies:
       blitz: link:../../packages/blitz
@@ -1377,7 +1377,7 @@ importers:
   recipes/vanilla-extract:
     specifiers:
       "@types/jscodeshift": 0.11.2
-      blitz: 2.0.0-beta.13
+      blitz: 2.0.0-beta.14
       jscodeshift: 0.13.0
     dependencies:
       blitz: link:../../packages/blitz
@@ -4507,6 +4507,15 @@ packages:
     dependencies:
       glob: 7.1.7
 
+  /@next/eslint-plugin-next/13.0.0:
+    resolution:
+      {
+        integrity: sha512-z+gnX4Zizatqatc6f4CQrcC9oN8Us3Vrq/OLyc98h7K/eWctrnV91zFZodmJHUjx0cITY8uYM7LXD7IdYkg3kg==,
+      }
+    dependencies:
+      glob: 7.1.7
+    dev: true
+
   /@next/swc-android-arm-eabi/12.2.5:
     resolution:
       {
@@ -10067,6 +10076,34 @@ packages:
       - supports-color
     dev: false
 
+  /eslint-config-next/13.0.0_hrkuebk64jiu2ut2d2sm4oylnu:
+    resolution:
+      {
+        integrity: sha512-y2nqWS2tycWySdVhb+rhp6CuDmDazGySqkzzQZf3UTyfHyC7og1m5m/AtMFwCo5mtvDqvw1BENin52kV9733lg==,
+      }
+    peerDependencies:
+      eslint: ^7.23.0 || ^8.0.0
+      typescript: ">=3.3.1"
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+    dependencies:
+      "@next/eslint-plugin-next": 13.0.0
+      "@rushstack/eslint-patch": 1.1.3
+      "@typescript-eslint/parser": 5.28.0_hrkuebk64jiu2ut2d2sm4oylnu
+      eslint: 7.32.0
+      eslint-import-resolver-node: 0.3.6
+      eslint-import-resolver-typescript: 2.7.1_hpmu7kn6tcn2vnxpfzvv33bxmy
+      eslint-plugin-import: 2.26.0_zhtk6rij7obli3ams3sxis7j7e
+      eslint-plugin-jsx-a11y: 6.5.1_eslint@7.32.0
+      eslint-plugin-react: 7.31.8_eslint@7.32.0
+      eslint-plugin-react-hooks: 4.5.0_eslint@7.32.0
+      typescript: 4.6.3
+    transitivePeerDependencies:
+      - eslint-import-resolver-webpack
+      - supports-color
+    dev: true
+
   /eslint-config-prettier/8.5.0:
     resolution:
       {
@@ -12864,7 +12901,7 @@ packages:
       pretty-format: 27.5.1
       slash: 3.0.0
       strip-json-comments: 3.1.1
-      ts-node: 10.7.0_typescript@4.6.3
+      ts-node: 10.7.0_fxg3r7oju3tntkxsvleuiot4fa
     transitivePeerDependencies:
       - bufferutil
       - canvas
@@ -18405,6 +18442,7 @@ packages:
       typescript: 4.6.3
       v8-compile-cache-lib: 3.0.1
       yn: 3.1.1
+    dev: false
 
   /ts-node/10.7.0_typescript@4.6.3:
     resolution:
@@ -18437,6 +18475,7 @@ packages:
       typescript: 4.6.3
       v8-compile-cache-lib: 3.0.1
       yn: 3.1.1
+    dev: false
 
   /ts-node/10.9.1_kakyiqi62sfonxvjmz3ft5vt7y:
     resolution: