Merge branch 'main' into fix-find-db

.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.

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

@@ -18442,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: