From f2a948cae4a218f75683424cc2a5e3af68a69cf9 Mon Sep 17 00:00:00 2001
From: Daniel Choudhury <dannychoudhury@gmail.com>
Date: Fri, 4 Aug 2023 21:16:09 +0700
Subject: [PATCH 01/12] Update packages/vite/src/streamHelpers.ts

---
 packages/vite/src/streamHelpers.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/vite/src/streamHelpers.ts b/packages/vite/src/streamHelpers.ts
index 47ec04af8879..94f44a449547 100644
--- a/packages/vite/src/streamHelpers.ts
+++ b/packages/vite/src/streamHelpers.ts
@@ -54,7 +54,6 @@ export function reactRenderToStream({
 
   // This ensures an isolated state for each request
   const { injectionState, injectToPage } = createInjector()
-  console.log(`👉 \n ~ file: streamHelpers.ts:57 ~ injectToPage:`, injectToPage)
   console.log(
     `👉 \n ~ file: streamHelpers.ts:57 ~ injectionState:`,
     injectionState

From ef46c606d7a33e533fa0c404cbb7b643fcadaeeb Mon Sep 17 00:00:00 2001
From: Daniel Choudhury <dannychoudhury@gmail.com>
Date: Fri, 4 Aug 2023 21:17:06 +0700
Subject: [PATCH 02/12] Remove debug logs

---
 packages/vite/src/streamHelpers.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/vite/src/streamHelpers.ts b/packages/vite/src/streamHelpers.ts
index 94f44a449547..89ea16ffef83 100644
--- a/packages/vite/src/streamHelpers.ts
+++ b/packages/vite/src/streamHelpers.ts
@@ -54,10 +54,6 @@ export function reactRenderToStream({
 
   // This ensures an isolated state for each request
   const { injectionState, injectToPage } = createInjector()
-  console.log(
-    `👉 \n ~ file: streamHelpers.ts:57 ~ injectionState:`,
-    injectionState
-  )
 
   // This is effectively a transformer stream
   const intermediateStream = createServerInjectionStream({

From fbf9d00e5f44ebb20fee10f6d41dde5a5f2c1eaf Mon Sep 17 00:00:00 2001
From: Orta Therox <git@orta.io>
Date: Fri, 28 Jul 2023 10:18:24 +0100
Subject: [PATCH 03/12] Remove the indexed type reference on AvailableRoutes
 (#8918)

Co-authored-by: Daniel Choudhury <dannychoudhury@gmail.com>
---
 packages/router/src/AuthenticatedRoute.tsx | 20 +++++++++++++++-----
 packages/router/src/index.ts               | 10 +++-------
 packages/router/src/util.ts                | 14 ++++++++++----
 3 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/packages/router/src/AuthenticatedRoute.tsx b/packages/router/src/AuthenticatedRoute.tsx
index 0a7a6941e2e0..dbac615d2446 100644
--- a/packages/router/src/AuthenticatedRoute.tsx
+++ b/packages/router/src/AuthenticatedRoute.tsx
@@ -3,10 +3,19 @@ import React, { useCallback } from 'react'
 import { Redirect } from './links'
 import { routes } from './router'
 import { useRouterState } from './router-context'
+import type { GeneratedRoutesMap } from './util'
 
-export function AuthenticatedRoute(props: any) {
+interface AuthenticatedRouteProps {
+  children: React.ReactNode
+  roles?: string | string[]
+  unauthenticated?: keyof GeneratedRoutesMap
+  whileLoadingAuth?: () => React.ReactElement | null
+  private?: boolean
+}
+
+export function AuthenticatedRoute(props: AuthenticatedRouteProps) {
   const {
-    private: privateSet,
+    private: isPrivate,
     unauthenticated,
     roles,
     whileLoadingAuth,
@@ -24,7 +33,7 @@ export function AuthenticatedRoute(props: any) {
   }, [isAuthenticated, roles, hasRole])
 
   // Make sure `wrappers` is always an array with at least one wrapper component
-  if (privateSet && unauthorized()) {
+  if (isPrivate && unauthorized()) {
     if (!unauthenticated) {
       throw new Error(
         'Private Sets need to specify what route to redirect unauthorized ' +
@@ -39,14 +48,15 @@ export function AuthenticatedRoute(props: any) {
         globalThis.location.pathname +
         encodeURIComponent(globalThis.location.search)
 
-      if (!routes[unauthenticated]) {
+      // We reassign the type like this, because AvailableRoutes is generated in the user's project
+      if (!(routes as GeneratedRoutesMap)[unauthenticated]) {
         throw new Error(`We could not find a route named ${unauthenticated}`)
       }
 
       let unauthenticatedPath
 
       try {
-        unauthenticatedPath = routes[unauthenticated]()
+        unauthenticatedPath = (routes as GeneratedRoutesMap)[unauthenticated]()
       } catch (e) {
         if (
           e instanceof Error &&
diff --git a/packages/router/src/index.ts b/packages/router/src/index.ts
index 83bbdc26dff7..7f879cf6b21c 100644
--- a/packages/router/src/index.ts
+++ b/packages/router/src/index.ts
@@ -22,8 +22,8 @@ export * from './route-focus'
 export { parseSearch, getRouteRegexAndParams, matchPath } from './util'
 
 /**
- * A more specific interface will be generated by
- * babel-plugin-redwood-routes-auto-loader when a redwood project is built
+ * A more specific interface is created in `.redwood/types/includes/web-routerRoutes`
+ * when the site is built, which will describe all known routes.
  *
  * @example
  * interface AvailableRoutes {
@@ -32,11 +32,7 @@ export { parseSearch, getRouteRegexAndParams, matchPath } from './util'
  * }
  */
 // Keep this in index.ts so it can be extended with declaration merging
-export interface AvailableRoutes {
-  [key: string]: (
-    args?: Record<string | number, string | number | boolean>
-  ) => string
-}
+export interface AvailableRoutes {}
 
 export { SkipNavLink, SkipNavContent } from '@reach/skip-nav'
 
diff --git a/packages/router/src/util.ts b/packages/router/src/util.ts
index 8631d55febea..32081ec7c4b2 100644
--- a/packages/router/src/util.ts
+++ b/packages/router/src/util.ts
@@ -9,8 +9,6 @@ import {
 import { PageType } from './router'
 import { isPrivateNode, isSetNode } from './Set'
 
-import { AvailableRoutes } from './'
-
 /** Create a React Context with the given name. */
 export function createNamedContext<T>(name: string, defaultValue?: T) {
   const Ctx = React.createContext<T | undefined>(defaultValue)
@@ -445,6 +443,14 @@ interface AnayzeRoutesOptions {
 
 type WhileLoadingPage = () => ReactElement | null
 
+// Not using AvailableRoutes because the type is generated in the user's project
+// We can't index it correctly in the framework
+export type GeneratedRoutesMap = {
+  [key: string]: (
+    args?: Record<string | number, string | number | boolean>
+  ) => string
+}
+
 type RoutePath = string
 interface AnalyzedRoute {
   path: RoutePath
@@ -462,7 +468,7 @@ export function analyzeRoutes(
   { currentPathName, userParamTypes }: AnayzeRoutesOptions
 ) {
   const pathRouteMap: Record<RoutePath, AnalyzedRoute> = {}
-  const namedRoutesMap: AvailableRoutes = {}
+  const namedRoutesMap: GeneratedRoutesMap = {}
   let hasHomeRoute = false
   let NotFoundPage: PageType | undefined
   let activeRoutePath: string | undefined
@@ -478,7 +484,7 @@ export function analyzeRoutes(
 
   // Track the number of sets found.
   // Because Sets are virtually rendered we can use this setId as a key to properly manage re-rendering
-  // When a some uses the same wrapper Component for different Sets
+  // When using the same wrapper Component for different Sets
   // Example:
   //   <Router>
   //   <Set wrap={SetContextProvider}>

From 1446b9b6d57394d8480196d1d757f8c3163c7abf Mon Sep 17 00:00:00 2001
From: Daniel Choudhury <dannychoudhury@gmail.com>
Date: Fri, 4 Aug 2023 14:25:09 +0700
Subject: [PATCH 04/12] fix(router): Prevent rerendering authenticated routes
 on hash change (#9007)

---
 packages/router/src/AuthenticatedRoute.tsx    |  5 +++--
 packages/router/src/__tests__/router.test.tsx | 11 +++++++++--
 packages/router/src/router.tsx                | 18 ++++++++++++------
 packages/router/src/util.ts                   |  5 +++--
 4 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/packages/router/src/AuthenticatedRoute.tsx b/packages/router/src/AuthenticatedRoute.tsx
index dbac615d2446..a3bdba1726d5 100644
--- a/packages/router/src/AuthenticatedRoute.tsx
+++ b/packages/router/src/AuthenticatedRoute.tsx
@@ -12,8 +12,9 @@ interface AuthenticatedRouteProps {
   whileLoadingAuth?: () => React.ReactElement | null
   private?: boolean
 }
-
-export function AuthenticatedRoute(props: AuthenticatedRouteProps) {
+export const AuthenticatedRoute: React.FC<AuthenticatedRouteProps> = (
+  props
+) => {
   const {
     private: isPrivate,
     unauthenticated,
diff --git a/packages/router/src/__tests__/router.test.tsx b/packages/router/src/__tests__/router.test.tsx
index b81709992c7e..acb1116fa870 100644
--- a/packages/router/src/__tests__/router.test.tsx
+++ b/packages/router/src/__tests__/router.test.tsx
@@ -36,7 +36,7 @@ import {
   Route,
   Private,
   Redirect,
-  routes,
+  routes as generatedRoutes,
   Link,
   navigate,
   back,
@@ -45,7 +45,7 @@ import {
 import { useLocation } from '../location'
 import { useParams } from '../params'
 import { Set } from '../Set'
-import { Spec } from '../util'
+import type { Spec, GeneratedRoutesMap } from '../util'
 
 /** running into intermittent test timeout behavior in https://github.com/redwoodjs/redwood/pull/4992
  attempting to work around by bumping the default timeout of 5000 */
@@ -59,9 +59,16 @@ type UnknownAuthContextInterface = AuthContextInterface<
   unknown,
   unknown,
   unknown,
+  unknown,
+  unknown,
+  unknown,
+  unknown,
   unknown
 >
 
+// The types are generated in the user's project
+const routes = generatedRoutes as GeneratedRoutesMap
+
 function createDummyAuthContextValues(
   partial: Partial<UnknownAuthContextInterface>
 ) {
diff --git a/packages/router/src/router.tsx b/packages/router/src/router.tsx
index 461a6497966f..e3934e82e088 100644
--- a/packages/router/src/router.tsx
+++ b/packages/router/src/router.tsx
@@ -27,6 +27,7 @@ import {
   TrailingSlashesTypes,
   validatePath,
 } from './util'
+import type { Wrappers } from './util'
 
 import type { AvailableRoutes } from './index'
 
@@ -203,7 +204,7 @@ const LocationAwareRouter: React.FC<RouterProps> = ({
 }
 
 interface WrappedPageProps {
-  wrappers: ReactNode[]
+  wrappers: Wrappers
   routeLoaderElement: ReactNode
   setProps: Record<any, any>
 }
@@ -220,6 +221,9 @@ interface WrappedPageProps {
  */
 const WrappedPage = memo(
   ({ wrappers, routeLoaderElement, setProps }: WrappedPageProps) => {
+    // @NOTE: don't mutate the wrappers array, it causes full page re-renders
+    // Instead just create a new array with the AuthenticatedRoute wrapper
+    let wrappersWithAuthMaybe = wrappers
     if (setProps.private) {
       if (!setProps.unauthenticated) {
         throw new Error(
@@ -227,12 +231,14 @@ const WrappedPage = memo(
         )
       }
 
-      wrappers.unshift(AuthenticatedRoute as any)
+      wrappersWithAuthMaybe = [AuthenticatedRoute, ...wrappers]
     }
 
-    if (wrappers.length > 0) {
-      // If wrappers exist e.g. [a,b,c] -> <a><b><c><routeLoader></c></b></a>
-      return wrappers.reduceRight((acc, wrapper) => {
+    if (wrappersWithAuthMaybe.length > 0) {
+      // If wrappers exist e.g. [a,b,c] -> <a><b><c><routeLoader></c></b></a> and returns a single ReactNode
+      // Wrap AuthenticatedRoute this way, because if we mutate the wrappers array itself
+      // it causes full rerenders of the page
+      return wrappersWithAuthMaybe.reduceRight((acc, wrapper) => {
         return React.createElement(
           wrapper as any,
           {
@@ -240,7 +246,7 @@ const WrappedPage = memo(
           },
           acc ? acc : routeLoaderElement
         )
-      }, undefined) as any
+      }, undefined as ReactNode)
     }
 
     return routeLoaderElement
diff --git a/packages/router/src/util.ts b/packages/router/src/util.ts
index 32081ec7c4b2..ebb2188e2fcf 100644
--- a/packages/router/src/util.ts
+++ b/packages/router/src/util.ts
@@ -452,13 +452,14 @@ export type GeneratedRoutesMap = {
 }
 
 type RoutePath = string
+export type Wrappers = Array<(props: any) => ReactNode>
 interface AnalyzedRoute {
   path: RoutePath
   name: string | null
   whileLoadingPage?: WhileLoadingPage
   page: PageType | null
   redirect: string | null
-  wrappers: ReactNode[]
+  wrappers: Wrappers
   setProps: Record<any, any>
   setId: number
 }
@@ -476,7 +477,7 @@ export function analyzeRoutes(
   interface RecurseParams {
     nodes: ReturnType<typeof Children.toArray>
     whileLoadingPageFromSet?: WhileLoadingPage
-    wrappersFromSet?: ReactNode[]
+    wrappersFromSet?: Wrappers
     // we don't know, or care about, what props users are passing down
     propsFromSet?: Record<string, unknown>
     setId?: number

From 5c8fb2c0cd2233b12e10983292a35884f6e22bc3 Mon Sep 17 00:00:00 2001
From: Dominic Saadi <dominiceliassaadi@gmail.com>
Date: Fri, 4 Aug 2023 11:40:43 -0700
Subject: [PATCH 05/12] v6.0.3

---
 __fixtures__/test-project/api/package.json    |   6 +-
 __fixtures__/test-project/package.json        |   2 +-
 __fixtures__/test-project/web/package.json    |  10 +-
 lerna.json                                    |   2 +-
 packages/api-server/package.json              |   4 +-
 packages/api/package.json                     |   2 +-
 .../auth-providers/auth0/api/package.json     |   4 +-
 .../auth-providers/auth0/setup/package.json   |   4 +-
 .../auth-providers/auth0/web/package.json     |   4 +-
 .../azureActiveDirectory/api/package.json     |   4 +-
 .../azureActiveDirectory/setup/package.json   |   4 +-
 .../azureActiveDirectory/web/package.json     |   4 +-
 .../auth-providers/clerk/api/package.json     |   4 +-
 .../auth-providers/clerk/setup/package.json   |   4 +-
 .../auth-providers/clerk/web/package.json     |   4 +-
 .../auth-providers/custom/setup/package.json  |   4 +-
 .../auth-providers/dbAuth/api/package.json    |   4 +-
 .../auth-providers/dbAuth/setup/package.json  |   4 +-
 .../auth-providers/dbAuth/web/package.json    |   4 +-
 .../auth-providers/firebase/api/package.json  |   4 +-
 .../firebase/setup/package.json               |   4 +-
 .../auth-providers/firebase/web/package.json  |   4 +-
 .../auth-providers/netlify/api/package.json   |   4 +-
 .../auth-providers/netlify/setup/package.json |   4 +-
 .../auth-providers/netlify/web/package.json   |   4 +-
 .../auth-providers/supabase/api/package.json  |   4 +-
 .../supabase/setup/package.json               |   4 +-
 .../auth-providers/supabase/web/package.json  |   2 +-
 .../supertokens/api/package.json              |   4 +-
 .../supertokens/setup/package.json            |   4 +-
 .../supertokens/web/package.json              |   4 +-
 packages/auth/package.json                    |   2 +-
 packages/cli-helpers/package.json             |   6 +-
 packages/cli-packages/storybook/package.json  |   8 +-
 packages/cli/package.json                     |  18 +-
 packages/codemods/package.json                |   4 +-
 packages/core/package.json                    |  12 +-
 packages/create-redwood-app/package.json      |   4 +-
 .../templates/js/api/package.json             |   4 +-
 .../templates/js/package.json                 |   2 +-
 .../templates/js/web/package.json             |   8 +-
 .../create-redwood-app/templates/js/yarn.lock | 262 +++++++++---------
 .../templates/ts/api/package.json             |   4 +-
 .../templates/ts/package.json                 |   2 +-
 .../templates/ts/web/package.json             |   8 +-
 .../create-redwood-app/templates/ts/yarn.lock | 262 +++++++++---------
 packages/eslint-config/package.json           |   8 +-
 packages/eslint-plugin/package.json           |   2 +-
 packages/fastify/package.json                 |   6 +-
 packages/forms/package.json                   |   2 +-
 packages/graphql-server/package.json          |   8 +-
 packages/internal/package.json                |   6 +-
 packages/prerender/package.json               |  14 +-
 packages/project-config/package.json          |   2 +-
 packages/realtime/package.json                |   2 +-
 packages/record/package.json                  |   4 +-
 packages/router/package.json                  |   4 +-
 packages/structure/package.json               |   4 +-
 packages/studio/package.json                  |   6 +-
 packages/telemetry/package.json               |   6 +-
 packages/testing/package.json                 |  14 +-
 packages/tui/package.json                     |   2 +-
 packages/vite/package.json                    |   6 +-
 packages/web/package.json                     |   4 +-
 yarn.lock                                     | 192 ++++++-------
 65 files changed, 511 insertions(+), 511 deletions(-)

diff --git a/__fixtures__/test-project/api/package.json b/__fixtures__/test-project/api/package.json
index 2d3fa0850317..d41d76fe79f3 100644
--- a/__fixtures__/test-project/api/package.json
+++ b/__fixtures__/test-project/api/package.json
@@ -3,8 +3,8 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "@redwoodjs/api": "6.0.2",
-    "@redwoodjs/auth-dbauth-api": "6.0.2",
-    "@redwoodjs/graphql-server": "6.0.2"
+    "@redwoodjs/api": "6.0.3",
+    "@redwoodjs/auth-dbauth-api": "6.0.3",
+    "@redwoodjs/graphql-server": "6.0.3"
   }
 }
diff --git a/__fixtures__/test-project/package.json b/__fixtures__/test-project/package.json
index 6c98ff73770b..9604d0242e0f 100644
--- a/__fixtures__/test-project/package.json
+++ b/__fixtures__/test-project/package.json
@@ -7,7 +7,7 @@
     ]
   },
   "devDependencies": {
-    "@redwoodjs/core": "6.0.2"
+    "@redwoodjs/core": "6.0.3"
   },
   "eslintConfig": {
     "extends": "@redwoodjs/eslint-config",
diff --git a/__fixtures__/test-project/web/package.json b/__fixtures__/test-project/web/package.json
index 275992264ce6..d97347157eb5 100644
--- a/__fixtures__/test-project/web/package.json
+++ b/__fixtures__/test-project/web/package.json
@@ -11,17 +11,17 @@
     ]
   },
   "dependencies": {
-    "@redwoodjs/auth-dbauth-web": "6.0.2",
-    "@redwoodjs/forms": "6.0.2",
-    "@redwoodjs/router": "6.0.2",
-    "@redwoodjs/web": "6.0.2",
+    "@redwoodjs/auth-dbauth-web": "6.0.3",
+    "@redwoodjs/forms": "6.0.3",
+    "@redwoodjs/router": "6.0.3",
+    "@redwoodjs/web": "6.0.3",
     "humanize-string": "2.1.0",
     "prop-types": "15.8.1",
     "react": "18.2.0",
     "react-dom": "18.2.0"
   },
   "devDependencies": {
-    "@redwoodjs/vite": "6.0.2",
+    "@redwoodjs/vite": "6.0.3",
     "autoprefixer": "^10.4.14",
     "postcss": "^8.4.25",
     "postcss-loader": "^7.3.3",
diff --git a/lerna.json b/lerna.json
index ab9ed29ad9ce..66eccd9e4611 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "6.0.2",
+  "version": "6.0.3",
   "npmClient": "yarn",
   "command": {
     "publish": {
diff --git a/packages/api-server/package.json b/packages/api-server/package.json
index b6cd376a9d08..dc0435586579 100644
--- a/packages/api-server/package.json
+++ b/packages/api-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/api-server",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "description": "Redwood's HTTP server for Serverless Functions",
   "repository": {
     "type": "git",
@@ -33,7 +33,7 @@
     "@fastify/http-proxy": "9.2.1",
     "@fastify/static": "6.10.2",
     "@fastify/url-data": "5.3.1",
-    "@redwoodjs/project-config": "6.0.2",
+    "@redwoodjs/project-config": "6.0.3",
     "ansi-colors": "4.1.3",
     "chalk": "4.1.2",
     "chokidar": "3.5.3",
diff --git a/packages/api/package.json b/packages/api/package.json
index 1045a1036de8..41fb82e0882f 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/api",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
diff --git a/packages/auth-providers/auth0/api/package.json b/packages/auth-providers/auth0/api/package.json
index 68c28d8d4905..87fabacd180c 100644
--- a/packages/auth-providers/auth0/api/package.json
+++ b/packages/auth-providers/auth0/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/auth-auth0-api",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -30,7 +30,7 @@
   "devDependencies": {
     "@babel/cli": "7.22.9",
     "@babel/core": "7.22.9",
-    "@redwoodjs/api": "6.0.2",
+    "@redwoodjs/api": "6.0.3",
     "@types/jsonwebtoken": "9.0.2",
     "jest": "29.6.1",
     "typescript": "5.1.6"
diff --git a/packages/auth-providers/auth0/setup/package.json b/packages/auth-providers/auth0/setup/package.json
index bfe415f43f4c..9d283532d621 100644
--- a/packages/auth-providers/auth0/setup/package.json
+++ b/packages/auth-providers/auth0/setup/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/auth-auth0-setup",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "7.22.6",
-    "@redwoodjs/cli-helpers": "6.0.2",
+    "@redwoodjs/cli-helpers": "6.0.3",
     "core-js": "3.31.1"
   },
   "devDependencies": {
diff --git a/packages/auth-providers/auth0/web/package.json b/packages/auth-providers/auth0/web/package.json
index c822b97ea3a5..e559c4f8feaa 100644
--- a/packages/auth-providers/auth0/web/package.json
+++ b/packages/auth-providers/auth0/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/auth-auth0-web",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "7.22.6",
-    "@redwoodjs/auth": "6.0.2",
+    "@redwoodjs/auth": "6.0.3",
     "core-js": "3.31.1"
   },
   "devDependencies": {
diff --git a/packages/auth-providers/azureActiveDirectory/api/package.json b/packages/auth-providers/azureActiveDirectory/api/package.json
index 25e7cb4f8a45..c09e840107d3 100644
--- a/packages/auth-providers/azureActiveDirectory/api/package.json
+++ b/packages/auth-providers/azureActiveDirectory/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/auth-azure-active-directory-api",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -30,7 +30,7 @@
   "devDependencies": {
     "@babel/cli": "7.22.9",
     "@babel/core": "7.22.9",
-    "@redwoodjs/api": "6.0.2",
+    "@redwoodjs/api": "6.0.3",
     "@types/aws-lambda": "8.10.119",
     "@types/jsonwebtoken": "9.0.2",
     "jest": "29.6.1",
diff --git a/packages/auth-providers/azureActiveDirectory/setup/package.json b/packages/auth-providers/azureActiveDirectory/setup/package.json
index 00bae0cebea6..dac6fb0bac89 100644
--- a/packages/auth-providers/azureActiveDirectory/setup/package.json
+++ b/packages/auth-providers/azureActiveDirectory/setup/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/auth-azure-active-directory-setup",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "7.22.6",
-    "@redwoodjs/cli-helpers": "6.0.2",
+    "@redwoodjs/cli-helpers": "6.0.3",
     "core-js": "3.31.1"
   },
   "devDependencies": {
diff --git a/packages/auth-providers/azureActiveDirectory/web/package.json b/packages/auth-providers/azureActiveDirectory/web/package.json
index 19ff58ffcba6..21bb2fc818ca 100644
--- a/packages/auth-providers/azureActiveDirectory/web/package.json
+++ b/packages/auth-providers/azureActiveDirectory/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/auth-azure-active-directory-web",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "7.22.6",
-    "@redwoodjs/auth": "6.0.2",
+    "@redwoodjs/auth": "6.0.3",
     "core-js": "3.31.1"
   },
   "devDependencies": {
diff --git a/packages/auth-providers/clerk/api/package.json b/packages/auth-providers/clerk/api/package.json
index 341adaa4f254..d8bc979a0184 100644
--- a/packages/auth-providers/clerk/api/package.json
+++ b/packages/auth-providers/clerk/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/auth-clerk-api",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -29,7 +29,7 @@
   "devDependencies": {
     "@babel/cli": "7.22.9",
     "@babel/core": "7.22.9",
-    "@redwoodjs/api": "6.0.2",
+    "@redwoodjs/api": "6.0.3",
     "@types/aws-lambda": "8.10.119",
     "jest": "29.6.1",
     "typescript": "5.1.6"
diff --git a/packages/auth-providers/clerk/setup/package.json b/packages/auth-providers/clerk/setup/package.json
index 4fc50472cf26..503a22168be9 100644
--- a/packages/auth-providers/clerk/setup/package.json
+++ b/packages/auth-providers/clerk/setup/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/auth-clerk-setup",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "7.22.6",
-    "@redwoodjs/cli-helpers": "6.0.2",
+    "@redwoodjs/cli-helpers": "6.0.3",
     "core-js": "3.31.1"
   },
   "devDependencies": {
diff --git a/packages/auth-providers/clerk/web/package.json b/packages/auth-providers/clerk/web/package.json
index 2b445fd9420f..f177999df4c7 100644
--- a/packages/auth-providers/clerk/web/package.json
+++ b/packages/auth-providers/clerk/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/auth-clerk-web",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "7.22.6",
-    "@redwoodjs/auth": "6.0.2",
+    "@redwoodjs/auth": "6.0.3",
     "core-js": "3.31.1"
   },
   "devDependencies": {
diff --git a/packages/auth-providers/custom/setup/package.json b/packages/auth-providers/custom/setup/package.json
index ba62926dd407..005cefe01298 100644
--- a/packages/auth-providers/custom/setup/package.json
+++ b/packages/auth-providers/custom/setup/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/auth-custom-setup",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "7.22.6",
-    "@redwoodjs/cli-helpers": "6.0.2",
+    "@redwoodjs/cli-helpers": "6.0.3",
     "core-js": "3.31.1"
   },
   "devDependencies": {
diff --git a/packages/auth-providers/dbAuth/api/package.json b/packages/auth-providers/dbAuth/api/package.json
index 5819c8ca6f82..6c9f1d38ca38 100644
--- a/packages/auth-providers/dbAuth/api/package.json
+++ b/packages/auth-providers/dbAuth/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/auth-dbauth-api",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -32,7 +32,7 @@
   "devDependencies": {
     "@babel/cli": "7.22.9",
     "@babel/core": "7.22.9",
-    "@redwoodjs/api": "6.0.2",
+    "@redwoodjs/api": "6.0.3",
     "@simplewebauthn/server": "7.3.1",
     "@types/crypto-js": "4.1.1",
     "@types/md5": "2.3.2",
diff --git a/packages/auth-providers/dbAuth/setup/package.json b/packages/auth-providers/dbAuth/setup/package.json
index 8d306b2a1dc0..9460a725cd42 100644
--- a/packages/auth-providers/dbAuth/setup/package.json
+++ b/packages/auth-providers/dbAuth/setup/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/auth-dbauth-setup",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "7.22.6",
-    "@redwoodjs/cli-helpers": "6.0.2",
+    "@redwoodjs/cli-helpers": "6.0.3",
     "@simplewebauthn/browser": "7.2.0",
     "core-js": "3.31.1",
     "prompts": "2.4.2",
diff --git a/packages/auth-providers/dbAuth/web/package.json b/packages/auth-providers/dbAuth/web/package.json
index 8bfc1fe69877..9b3cf2e7bc75 100644
--- a/packages/auth-providers/dbAuth/web/package.json
+++ b/packages/auth-providers/dbAuth/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/auth-dbauth-web",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "7.22.6",
-    "@redwoodjs/auth": "6.0.2",
+    "@redwoodjs/auth": "6.0.3",
     "@simplewebauthn/browser": "7.2.0",
     "core-js": "3.31.1"
   },
diff --git a/packages/auth-providers/firebase/api/package.json b/packages/auth-providers/firebase/api/package.json
index b93a6b1f8fc5..30731f48d887 100644
--- a/packages/auth-providers/firebase/api/package.json
+++ b/packages/auth-providers/firebase/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/auth-firebase-api",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -29,7 +29,7 @@
   "devDependencies": {
     "@babel/cli": "7.22.9",
     "@babel/core": "7.22.9",
-    "@redwoodjs/api": "6.0.2",
+    "@redwoodjs/api": "6.0.3",
     "@types/aws-lambda": "8.10.119",
     "jest": "29.6.1",
     "typescript": "5.1.6"
diff --git a/packages/auth-providers/firebase/setup/package.json b/packages/auth-providers/firebase/setup/package.json
index b84cfc82df1d..e2e4a65b2cc7 100644
--- a/packages/auth-providers/firebase/setup/package.json
+++ b/packages/auth-providers/firebase/setup/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/auth-firebase-setup",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "7.22.6",
-    "@redwoodjs/cli-helpers": "6.0.2",
+    "@redwoodjs/cli-helpers": "6.0.3",
     "core-js": "3.31.1"
   },
   "devDependencies": {
diff --git a/packages/auth-providers/firebase/web/package.json b/packages/auth-providers/firebase/web/package.json
index 3aaa4e18cd7c..05412a856887 100644
--- a/packages/auth-providers/firebase/web/package.json
+++ b/packages/auth-providers/firebase/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/auth-firebase-web",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "7.22.6",
-    "@redwoodjs/auth": "6.0.2",
+    "@redwoodjs/auth": "6.0.3",
     "core-js": "3.31.1"
   },
   "devDependencies": {
diff --git a/packages/auth-providers/netlify/api/package.json b/packages/auth-providers/netlify/api/package.json
index 2eb868c96479..7c09677303c9 100644
--- a/packages/auth-providers/netlify/api/package.json
+++ b/packages/auth-providers/netlify/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/auth-netlify-api",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -29,7 +29,7 @@
   "devDependencies": {
     "@babel/cli": "7.22.9",
     "@babel/core": "7.22.9",
-    "@redwoodjs/api": "6.0.2",
+    "@redwoodjs/api": "6.0.3",
     "@types/aws-lambda": "8.10.119",
     "@types/jsonwebtoken": "9.0.2",
     "jest": "29.6.1",
diff --git a/packages/auth-providers/netlify/setup/package.json b/packages/auth-providers/netlify/setup/package.json
index b076a20708b9..88606d34cb4a 100644
--- a/packages/auth-providers/netlify/setup/package.json
+++ b/packages/auth-providers/netlify/setup/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/auth-netlify-setup",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "7.22.6",
-    "@redwoodjs/cli-helpers": "6.0.2",
+    "@redwoodjs/cli-helpers": "6.0.3",
     "core-js": "3.31.1"
   },
   "devDependencies": {
diff --git a/packages/auth-providers/netlify/web/package.json b/packages/auth-providers/netlify/web/package.json
index 3d383304bc64..4ebc908d240e 100644
--- a/packages/auth-providers/netlify/web/package.json
+++ b/packages/auth-providers/netlify/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/auth-netlify-web",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "7.22.6",
-    "@redwoodjs/auth": "6.0.2",
+    "@redwoodjs/auth": "6.0.3",
     "core-js": "3.31.1"
   },
   "devDependencies": {
diff --git a/packages/auth-providers/supabase/api/package.json b/packages/auth-providers/supabase/api/package.json
index 68053509a3d9..f0c9a082ed59 100644
--- a/packages/auth-providers/supabase/api/package.json
+++ b/packages/auth-providers/supabase/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/auth-supabase-api",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -29,7 +29,7 @@
   "devDependencies": {
     "@babel/cli": "7.22.9",
     "@babel/core": "7.22.9",
-    "@redwoodjs/api": "6.0.2",
+    "@redwoodjs/api": "6.0.3",
     "@types/aws-lambda": "8.10.119",
     "@types/jsonwebtoken": "9.0.2",
     "jest": "29.6.1",
diff --git a/packages/auth-providers/supabase/setup/package.json b/packages/auth-providers/supabase/setup/package.json
index a692c753296e..7e808051b44e 100644
--- a/packages/auth-providers/supabase/setup/package.json
+++ b/packages/auth-providers/supabase/setup/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/auth-supabase-setup",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "7.22.6",
-    "@redwoodjs/cli-helpers": "6.0.2",
+    "@redwoodjs/cli-helpers": "6.0.3",
     "core-js": "3.31.1"
   },
   "devDependencies": {
diff --git a/packages/auth-providers/supabase/web/package.json b/packages/auth-providers/supabase/web/package.json
index cd84dd3e6dc9..b9d528e58d0a 100644
--- a/packages/auth-providers/supabase/web/package.json
+++ b/packages/auth-providers/supabase/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/auth-supabase-web",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
diff --git a/packages/auth-providers/supertokens/api/package.json b/packages/auth-providers/supertokens/api/package.json
index 171c0c04b085..260be596f9e1 100644
--- a/packages/auth-providers/supertokens/api/package.json
+++ b/packages/auth-providers/supertokens/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/auth-supertokens-api",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -30,7 +30,7 @@
   "devDependencies": {
     "@babel/cli": "7.22.9",
     "@babel/core": "7.22.9",
-    "@redwoodjs/api": "6.0.2",
+    "@redwoodjs/api": "6.0.3",
     "@types/jsonwebtoken": "9.0.2",
     "jest": "29.6.1",
     "typescript": "5.1.6"
diff --git a/packages/auth-providers/supertokens/setup/package.json b/packages/auth-providers/supertokens/setup/package.json
index 20c6601a7e93..5b55ea98bf9a 100644
--- a/packages/auth-providers/supertokens/setup/package.json
+++ b/packages/auth-providers/supertokens/setup/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/auth-supertokens-setup",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "7.22.6",
-    "@redwoodjs/cli-helpers": "6.0.2",
+    "@redwoodjs/cli-helpers": "6.0.3",
     "core-js": "3.31.1"
   },
   "devDependencies": {
diff --git a/packages/auth-providers/supertokens/web/package.json b/packages/auth-providers/supertokens/web/package.json
index 337786f1ed12..4f3ab5779ab4 100644
--- a/packages/auth-providers/supertokens/web/package.json
+++ b/packages/auth-providers/supertokens/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/auth-supertokens-web",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "7.22.6",
-    "@redwoodjs/auth": "6.0.2",
+    "@redwoodjs/auth": "6.0.3",
     "core-js": "3.31.1"
   },
   "devDependencies": {
diff --git a/packages/auth/package.json b/packages/auth/package.json
index 894fe3568801..5d3369f5ac49 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/auth",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
diff --git a/packages/cli-helpers/package.json b/packages/cli-helpers/package.json
index 126980fe7729..d5dd97247e66 100644
--- a/packages/cli-helpers/package.json
+++ b/packages/cli-helpers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/cli-helpers",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -25,8 +25,8 @@
     "@babel/core": "7.22.9",
     "@babel/runtime-corejs3": "7.22.6",
     "@opentelemetry/api": "1.4.1",
-    "@redwoodjs/project-config": "6.0.2",
-    "@redwoodjs/telemetry": "6.0.2",
+    "@redwoodjs/project-config": "6.0.3",
+    "@redwoodjs/telemetry": "6.0.3",
     "chalk": "4.1.2",
     "core-js": "3.31.1",
     "execa": "5.1.1",
diff --git a/packages/cli-packages/storybook/package.json b/packages/cli-packages/storybook/package.json
index d1dc6c4ca0cc..d188257c7381 100644
--- a/packages/cli-packages/storybook/package.json
+++ b/packages/cli-packages/storybook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/cli-storybook",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -24,9 +24,9 @@
     ]
   },
   "dependencies": {
-    "@redwoodjs/cli-helpers": "6.0.2",
-    "@redwoodjs/project-config": "6.0.2",
-    "@redwoodjs/telemetry": "6.0.2",
+    "@redwoodjs/cli-helpers": "6.0.3",
+    "@redwoodjs/project-config": "6.0.3",
+    "@redwoodjs/telemetry": "6.0.3",
     "@storybook/addon-a11y": "7.1.1",
     "@storybook/addon-docs": "7.1.1",
     "@storybook/addon-essentials": "7.1.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 77f51d32df15..f9aee7f8f0b4 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/cli",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "description": "The Redwood Command Line",
   "repository": {
     "type": "git",
@@ -37,14 +37,14 @@
     "@opentelemetry/sdk-trace-node": "1.15.0",
     "@opentelemetry/semantic-conventions": "1.15.0",
     "@prisma/internals": "5.0.0",
-    "@redwoodjs/api-server": "6.0.2",
-    "@redwoodjs/cli-helpers": "6.0.2",
-    "@redwoodjs/fastify": "6.0.2",
-    "@redwoodjs/internal": "6.0.2",
-    "@redwoodjs/prerender": "6.0.2",
-    "@redwoodjs/project-config": "6.0.2",
-    "@redwoodjs/structure": "6.0.2",
-    "@redwoodjs/telemetry": "6.0.2",
+    "@redwoodjs/api-server": "6.0.3",
+    "@redwoodjs/cli-helpers": "6.0.3",
+    "@redwoodjs/fastify": "6.0.3",
+    "@redwoodjs/internal": "6.0.3",
+    "@redwoodjs/prerender": "6.0.3",
+    "@redwoodjs/project-config": "6.0.3",
+    "@redwoodjs/structure": "6.0.3",
+    "@redwoodjs/telemetry": "6.0.3",
     "@types/secure-random-password": "0.2.1",
     "boxen": "5.1.2",
     "camelcase": "6.3.0",
diff --git a/packages/codemods/package.json b/packages/codemods/package.json
index 5d2fa588a694..8c57926a55a2 100644
--- a/packages/codemods/package.json
+++ b/packages/codemods/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/codemods",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "description": "Codemods to ease upgrading a RedwoodJS Project",
   "repository": {
     "type": "git",
@@ -29,7 +29,7 @@
     "@babel/runtime-corejs3": "7.22.6",
     "@babel/traverse": "7.22.8",
     "@iarna/toml": "2.2.5",
-    "@redwoodjs/project-config": "6.0.2",
+    "@redwoodjs/project-config": "6.0.3",
     "@svgr/core": "8.0.0",
     "@svgr/plugin-jsx": "8.0.1",
     "@vscode/ripgrep": "1.15.5",
diff --git a/packages/core/package.json b/packages/core/package.json
index a471ac01d96d..8e745b097371 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/core",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "description": "Foundational packages and config required to build RedwoodJS.",
   "repository": {
     "type": "git",
@@ -44,11 +44,11 @@
     "@babel/preset-typescript": "7.22.5",
     "@babel/runtime-corejs3": "7.22.6",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.10",
-    "@redwoodjs/cli": "6.0.2",
-    "@redwoodjs/eslint-config": "6.0.2",
-    "@redwoodjs/internal": "6.0.2",
-    "@redwoodjs/project-config": "6.0.2",
-    "@redwoodjs/testing": "6.0.2",
+    "@redwoodjs/cli": "6.0.3",
+    "@redwoodjs/eslint-config": "6.0.3",
+    "@redwoodjs/internal": "6.0.3",
+    "@redwoodjs/project-config": "6.0.3",
+    "@redwoodjs/testing": "6.0.3",
     "babel-loader": "9.1.3",
     "babel-plugin-auto-import": "1.1.0",
     "babel-plugin-graphql-tag": "3.3.0",
diff --git a/packages/create-redwood-app/package.json b/packages/create-redwood-app/package.json
index ceca547a14bf..c918dc58a01d 100644
--- a/packages/create-redwood-app/package.json
+++ b/packages/create-redwood-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-redwood-app",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -25,7 +25,7 @@
     "@opentelemetry/resources": "1.15.0",
     "@opentelemetry/sdk-trace-node": "1.15.0",
     "@opentelemetry/semantic-conventions": "1.15.0",
-    "@redwoodjs/tui": "6.0.2",
+    "@redwoodjs/tui": "6.0.3",
     "chalk": "4.1.2",
     "check-node-version": "4.2.1",
     "ci-info": "3.8.0",
diff --git a/packages/create-redwood-app/templates/js/api/package.json b/packages/create-redwood-app/templates/js/api/package.json
index f27c7e52bae1..e4759a5969d4 100644
--- a/packages/create-redwood-app/templates/js/api/package.json
+++ b/packages/create-redwood-app/templates/js/api/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "@redwoodjs/api": "6.0.2",
-    "@redwoodjs/graphql-server": "6.0.2"
+    "@redwoodjs/api": "6.0.3",
+    "@redwoodjs/graphql-server": "6.0.3"
   }
 }
diff --git a/packages/create-redwood-app/templates/js/package.json b/packages/create-redwood-app/templates/js/package.json
index 6c98ff73770b..9604d0242e0f 100644
--- a/packages/create-redwood-app/templates/js/package.json
+++ b/packages/create-redwood-app/templates/js/package.json
@@ -7,7 +7,7 @@
     ]
   },
   "devDependencies": {
-    "@redwoodjs/core": "6.0.2"
+    "@redwoodjs/core": "6.0.3"
   },
   "eslintConfig": {
     "extends": "@redwoodjs/eslint-config",
diff --git a/packages/create-redwood-app/templates/js/web/package.json b/packages/create-redwood-app/templates/js/web/package.json
index 17ddd56f2a55..f1434a8aa11e 100644
--- a/packages/create-redwood-app/templates/js/web/package.json
+++ b/packages/create-redwood-app/templates/js/web/package.json
@@ -11,14 +11,14 @@
     ]
   },
   "dependencies": {
-    "@redwoodjs/forms": "6.0.2",
-    "@redwoodjs/router": "6.0.2",
-    "@redwoodjs/web": "6.0.2",
+    "@redwoodjs/forms": "6.0.3",
+    "@redwoodjs/router": "6.0.3",
+    "@redwoodjs/web": "6.0.3",
     "prop-types": "15.8.1",
     "react": "18.2.0",
     "react-dom": "18.2.0"
   },
   "devDependencies": {
-    "@redwoodjs/vite": "6.0.2"
+    "@redwoodjs/vite": "6.0.3"
   }
 }
diff --git a/packages/create-redwood-app/templates/js/yarn.lock b/packages/create-redwood-app/templates/js/yarn.lock
index e3093515389a..d99cc7f0eacc 100644
--- a/packages/create-redwood-app/templates/js/yarn.lock
+++ b/packages/create-redwood-app/templates/js/yarn.lock
@@ -4498,16 +4498,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@redwoodjs/api-server@npm:6.0.2":
-  version: 6.0.2
-  resolution: "@redwoodjs/api-server@npm:6.0.2"
+"@redwoodjs/api-server@npm:6.0.3":
+  version: 6.0.3
+  resolution: "@redwoodjs/api-server@npm:6.0.3"
   dependencies:
     "@babel/plugin-transform-runtime": 7.22.9
     "@babel/runtime-corejs3": 7.22.6
     "@fastify/http-proxy": 9.2.1
     "@fastify/static": 6.10.2
     "@fastify/url-data": 5.3.1
-    "@redwoodjs/project-config": 6.0.2
+    "@redwoodjs/project-config": 6.0.3
     ansi-colors: 4.1.3
     chalk: 4.1.2
     chokidar: 3.5.3
@@ -4526,13 +4526,13 @@ __metadata:
     rw-api-server-watch: dist/watch.js
     rw-log-formatter: dist/logFormatter/bin.js
     rw-server: dist/index.js
-  checksum: d39c93ea9c1946b34c8b725f9444233d599742c32d3ac5ce450765c1f564fd846008f2622d6bd88f4d789d49ce668f08f7defe5bebe53c2196ffa8e6c99a76b7
+  checksum: eab3010dd61b7c20e5c900b3155d1da116a2f55c400faf39536416818684daf325791dc01617c64a454b691006de82bf1d5f5c796a822439dfb45fd78920b3d8
   languageName: node
   linkType: hard
 
-"@redwoodjs/api@npm:6.0.2":
-  version: 6.0.2
-  resolution: "@redwoodjs/api@npm:6.0.2"
+"@redwoodjs/api@npm:6.0.3":
+  version: 6.0.3
+  resolution: "@redwoodjs/api@npm:6.0.3"
   dependencies:
     "@babel/runtime-corejs3": 7.22.6
     "@prisma/client": 5.0.0
@@ -4556,30 +4556,30 @@ __metadata:
     rw: dist/bins/redwood.js
     rwfw: dist/bins/rwfw.js
     tsc: dist/bins/tsc.js
-  checksum: 4ce805eb237f019a43c4298ba736c9ac4dc9801180feab79ea2f119ea11a9842ba7e6303c4cc110ed837cdaea86c4691f8fc9bfcbd753555fbdec9f239905854
+  checksum: e880bf1e1ec5b88f7cb6031888ff9e3f7a119c3bda46902fa259bbece0a8cc56d9cbccddec156ab3fb604c8dc5c46a37dae76b6fd7344e27ac8a825eb7b950c3
   languageName: node
   linkType: hard
 
-"@redwoodjs/auth@npm:6.0.2":
-  version: 6.0.2
-  resolution: "@redwoodjs/auth@npm:6.0.2"
+"@redwoodjs/auth@npm:6.0.3":
+  version: 6.0.3
+  resolution: "@redwoodjs/auth@npm:6.0.3"
   dependencies:
     "@babel/runtime-corejs3": 7.22.6
     core-js: 3.31.1
     react: 18.2.0
-  checksum: 14072360c4e8ba2e361401d5940038267f454d608fb3a6c8d7695e1e5063996983a76ef50357d9ebf25576a8b67a4759d472c061cba7a83ebd286cffea0a9617
+  checksum: 9cc4390b7ffb74bb0ea22b3291ff5433b1a8b1ab14a4151814ed127baccefdfd423dde34e3f64abaf6b5e0dd06c4898afdd9054b31f9007a69fdfb55a1cb1356
   languageName: node
   linkType: hard
 
-"@redwoodjs/cli-helpers@npm:6.0.2":
-  version: 6.0.2
-  resolution: "@redwoodjs/cli-helpers@npm:6.0.2"
+"@redwoodjs/cli-helpers@npm:6.0.3":
+  version: 6.0.3
+  resolution: "@redwoodjs/cli-helpers@npm:6.0.3"
   dependencies:
     "@babel/core": 7.22.9
     "@babel/runtime-corejs3": 7.22.6
     "@opentelemetry/api": 1.4.1
-    "@redwoodjs/project-config": 6.0.2
-    "@redwoodjs/telemetry": 6.0.2
+    "@redwoodjs/project-config": 6.0.3
+    "@redwoodjs/telemetry": 6.0.3
     chalk: 4.1.2
     core-js: 3.31.1
     execa: 5.1.1
@@ -4589,13 +4589,13 @@ __metadata:
     prettier: 2.8.8
     prompts: 2.4.2
     terminal-link: 2.1.1
-  checksum: c8eb5fd8475d796572f49bc7e791dd4d877b43cd35e907f8d812a31e6707fbb984d1af3f432c61b3fcbd3857213c343c93dc7521859a4a378a51882ff2ec6ca6
+  checksum: c8d304e93dcef11811cb1105fee230bb8ce023df6063cc93f060c5d78db52822c4b293d57d42ad9863714745332b364ae5c54150ada5f77964611abd38c63705
   languageName: node
   linkType: hard
 
-"@redwoodjs/cli@npm:6.0.2":
-  version: 6.0.2
-  resolution: "@redwoodjs/cli@npm:6.0.2"
+"@redwoodjs/cli@npm:6.0.3":
+  version: 6.0.3
+  resolution: "@redwoodjs/cli@npm:6.0.3"
   dependencies:
     "@babel/runtime-corejs3": 7.22.6
     "@iarna/toml": 2.2.5
@@ -4606,14 +4606,14 @@ __metadata:
     "@opentelemetry/sdk-trace-node": 1.15.0
     "@opentelemetry/semantic-conventions": 1.15.0
     "@prisma/internals": 5.0.0
-    "@redwoodjs/api-server": 6.0.2
-    "@redwoodjs/cli-helpers": 6.0.2
-    "@redwoodjs/fastify": 6.0.2
-    "@redwoodjs/internal": 6.0.2
-    "@redwoodjs/prerender": 6.0.2
-    "@redwoodjs/project-config": 6.0.2
-    "@redwoodjs/structure": 6.0.2
-    "@redwoodjs/telemetry": 6.0.2
+    "@redwoodjs/api-server": 6.0.3
+    "@redwoodjs/cli-helpers": 6.0.3
+    "@redwoodjs/fastify": 6.0.3
+    "@redwoodjs/internal": 6.0.3
+    "@redwoodjs/prerender": 6.0.3
+    "@redwoodjs/project-config": 6.0.3
+    "@redwoodjs/structure": 6.0.3
+    "@redwoodjs/telemetry": 6.0.3
     "@types/secure-random-password": 0.2.1
     boxen: 5.1.2
     camelcase: 6.3.0
@@ -4655,13 +4655,13 @@ __metadata:
     redwood: dist/index.js
     rw: dist/index.js
     rwfw: dist/rwfw.js
-  checksum: 64b9fe01d2217ddca625fa5204e7ed66aae10f74c2bcb9186b0f6da71d44a5fbed6968437be6e9a4e1fa4ba36036bcfa2a99f4dbad65028ef9f6e45f8f8eb186
+  checksum: 8febbec80055e7d5b6807ef256bcf28febfaddc0722f88ac83fe179a28e7d1438bba9a02e1c342cb91d966e2094a52786c2f90f63f1b4b01fc9dbf0d18d747f2
   languageName: node
   linkType: hard
 
-"@redwoodjs/core@npm:6.0.2":
-  version: 6.0.2
-  resolution: "@redwoodjs/core@npm:6.0.2"
+"@redwoodjs/core@npm:6.0.3":
+  version: 6.0.3
+  resolution: "@redwoodjs/core@npm:6.0.3"
   dependencies:
     "@babel/cli": 7.22.9
     "@babel/core": 7.22.9
@@ -4674,11 +4674,11 @@ __metadata:
     "@babel/preset-typescript": 7.22.5
     "@babel/runtime-corejs3": 7.22.6
     "@pmmmwh/react-refresh-webpack-plugin": 0.5.10
-    "@redwoodjs/cli": 6.0.2
-    "@redwoodjs/eslint-config": 6.0.2
-    "@redwoodjs/internal": 6.0.2
-    "@redwoodjs/project-config": 6.0.2
-    "@redwoodjs/testing": 6.0.2
+    "@redwoodjs/cli": 6.0.3
+    "@redwoodjs/eslint-config": 6.0.3
+    "@redwoodjs/internal": 6.0.3
+    "@redwoodjs/project-config": 6.0.3
+    "@redwoodjs/testing": 6.0.3
     babel-loader: 9.1.3
     babel-plugin-auto-import: 1.1.0
     babel-plugin-graphql-tag: 3.3.0
@@ -4724,20 +4724,20 @@ __metadata:
     rw-gen-watch: dist/bins/rw-gen-watch.js
     rw-log-formatter: dist/bins/rw-log-formatter.js
     rwfw: dist/bins/rwfw.js
-  checksum: 2466337a02f420dfe642b5c0d8930cb14d819437f106380977bf44b14c19b707cda5c6bf29ff44eeb55c95678dfc67820810b8aad9161d53bc8d9ad866e95850
+  checksum: fbb96668727dc6644a1fea505de06080d659765ba5b02d532e416f83b7120707d71b127889042d6df03db3137955f96f041458560792a6bec909c061d97551f6
   languageName: node
   linkType: hard
 
-"@redwoodjs/eslint-config@npm:6.0.2":
-  version: 6.0.2
-  resolution: "@redwoodjs/eslint-config@npm:6.0.2"
+"@redwoodjs/eslint-config@npm:6.0.3":
+  version: 6.0.3
+  resolution: "@redwoodjs/eslint-config@npm:6.0.3"
   dependencies:
     "@babel/core": 7.22.9
     "@babel/eslint-parser": 7.22.9
     "@babel/eslint-plugin": 7.22.5
-    "@redwoodjs/eslint-plugin": 6.0.2
-    "@redwoodjs/internal": 6.0.2
-    "@redwoodjs/project-config": 6.0.2
+    "@redwoodjs/eslint-plugin": 6.0.3
+    "@redwoodjs/internal": 6.0.3
+    "@redwoodjs/project-config": 6.0.3
     "@typescript-eslint/eslint-plugin": 5.61.0
     "@typescript-eslint/parser": 5.61.0
     eslint: 8.45.0
@@ -4751,42 +4751,42 @@ __metadata:
     eslint-plugin-react: 7.32.2
     eslint-plugin-react-hooks: 4.6.0
     prettier: 2.8.8
-  checksum: 48784f6a40f29c892228f34f7e4a245bc5292c8199919992229f2b7712d17cb564c41a77e3d66e791e415d9dbc36df31c84269a98406ea2c7b799920c4df9126
+  checksum: 86545185aea4a0b585881dffbb001da45879f3eff640cf2a9fbf66c6e4e1f7ca40626fa1f0c4254882c925b7a3f26d0898aead0f456a47b1bc98d9597439d226
   languageName: node
   linkType: hard
 
-"@redwoodjs/eslint-plugin@npm:6.0.2":
-  version: 6.0.2
-  resolution: "@redwoodjs/eslint-plugin@npm:6.0.2"
+"@redwoodjs/eslint-plugin@npm:6.0.3":
+  version: 6.0.3
+  resolution: "@redwoodjs/eslint-plugin@npm:6.0.3"
   dependencies:
     "@typescript-eslint/utils": 5.61.0
     eslint: 8.45.0
-  checksum: c6979ad079178c03a23bdf223b4cc3dbd70d5b3634abd04fae604900358a5fb29151c4d8918556d35fa4e9eaf09fd0bc52f5cea3bdd1d889e9b2ab216fe818fc
+  checksum: b0a132995056bfdeb9b31be73b97989f7bd68463c62d2e9fc101bb927ea9efdd594fbc7cd4ebc842ebc9d21d2798d8ebef41a03290330c6771342a425f30c5a1
   languageName: node
   linkType: hard
 
-"@redwoodjs/fastify@npm:6.0.2":
-  version: 6.0.2
-  resolution: "@redwoodjs/fastify@npm:6.0.2"
+"@redwoodjs/fastify@npm:6.0.3":
+  version: 6.0.3
+  resolution: "@redwoodjs/fastify@npm:6.0.3"
   dependencies:
     "@fastify/http-proxy": 9.2.1
     "@fastify/static": 6.10.2
     "@fastify/url-data": 5.3.1
-    "@redwoodjs/graphql-server": 6.0.2
-    "@redwoodjs/project-config": 6.0.2
+    "@redwoodjs/graphql-server": 6.0.3
+    "@redwoodjs/project-config": 6.0.3
     ansi-colors: 4.1.3
     fast-glob: 3.2.12
     fastify: 4.20.0
     fastify-raw-body: 4.2.1
     lodash: 4.17.21
     qs: 6.11.2
-  checksum: 1796488488fa58a70ed9f40b230ca00ae7d40562a8761c6e500621f7624983f57b0277f94750f15edf7fa2d13bfdf18515dc1b29aa71b3981b3164fcb89f5d0a
+  checksum: 4f2e9381329492460741c786ffb9ac124389b8185f358edc5915ec68dd6cd9d9aaa19cde3a277c6525cbbf9b74757f1d572a2ab40795f3c0272443e256b502c3
   languageName: node
   linkType: hard
 
-"@redwoodjs/forms@npm:6.0.2":
-  version: 6.0.2
-  resolution: "@redwoodjs/forms@npm:6.0.2"
+"@redwoodjs/forms@npm:6.0.3":
+  version: 6.0.3
+  resolution: "@redwoodjs/forms@npm:6.0.3"
   dependencies:
     "@babel/runtime-corejs3": 7.22.6
     core-js: 3.31.1
@@ -4795,13 +4795,13 @@ __metadata:
   peerDependencies:
     graphql: 16.7.1
     react: 18.2.0
-  checksum: 4fe9f7e6819c492a5d24b27845e7c7df7a92a1e41b7e8f82e9b86b3490b67628764725954ee356ddbd713d48883ff474857610017a42f044fbafa999e0e89ff2
+  checksum: ba0decdf55a886165807aa995f68e2890b8d9a17f7c19161a712acb6601f21e27a61548dc7c60908643fc959e0febce7a2c1c693307a8d713a70ea9537844db8
   languageName: node
   linkType: hard
 
-"@redwoodjs/graphql-server@npm:6.0.2":
-  version: 6.0.2
-  resolution: "@redwoodjs/graphql-server@npm:6.0.2"
+"@redwoodjs/graphql-server@npm:6.0.3":
+  version: 6.0.3
+  resolution: "@redwoodjs/graphql-server@npm:6.0.3"
   dependencies:
     "@babel/runtime-corejs3": 7.22.6
     "@envelop/core": 4.0.0
@@ -4814,8 +4814,8 @@ __metadata:
     "@graphql-tools/schema": 10.0.0
     "@graphql-tools/utils": 10.0.1
     "@opentelemetry/api": 1.4.1
-    "@redwoodjs/api": 6.0.2
-    "@redwoodjs/project-config": 6.0.2
+    "@redwoodjs/api": 6.0.3
+    "@redwoodjs/project-config": 6.0.3
     core-js: 3.31.1
     graphql: 16.7.1
     graphql-scalars: 1.22.2
@@ -4823,13 +4823,13 @@ __metadata:
     graphql-yoga: 4.0.2
     lodash: 4.17.21
     uuid: 9.0.0
-  checksum: cd871be0c4bc0f4c11ba02f6114bb2d0fc561fe3a48dfafe306aea2952581cca3b202cc2eee2f30ede33ad5ce64d58a858cc75342c54e7fa58786c59d12085e5
+  checksum: 1addc0aeabf22b4ac565efd177e86b26d473c173d9095723f777992a85c1c5afabb5918f012a76fc5a24a6d6a4608ed1c62f9665b534209cdec8daa08ade8d5e
   languageName: node
   linkType: hard
 
-"@redwoodjs/internal@npm:6.0.2":
-  version: 6.0.2
-  resolution: "@redwoodjs/internal@npm:6.0.2"
+"@redwoodjs/internal@npm:6.0.3":
+  version: 6.0.3
+  resolution: "@redwoodjs/internal@npm:6.0.3"
   dependencies:
     "@babel/parser": 7.22.7
     "@babel/plugin-transform-class-properties": 7.22.5
@@ -4847,8 +4847,8 @@ __metadata:
     "@graphql-codegen/typescript-operations": 3.0.4
     "@graphql-codegen/typescript-react-apollo": 3.3.7
     "@graphql-codegen/typescript-resolvers": 3.2.1
-    "@redwoodjs/graphql-server": 6.0.2
-    "@redwoodjs/project-config": 6.0.2
+    "@redwoodjs/graphql-server": 6.0.3
+    "@redwoodjs/project-config": 6.0.3
     "@sdl-codegen/node": 0.0.10
     babel-plugin-graphql-tag: 3.3.0
     babel-plugin-polyfill-corejs3: 0.8.3
@@ -4870,21 +4870,21 @@ __metadata:
   bin:
     rw-gen: dist/generate/generate.js
     rw-gen-watch: dist/generate/watch.js
-  checksum: 966a84344d273ef74a1d194a2a5bf83cd9fbafe0e44adac7c9de1d8c5adff19661ac01f5029fc2af78200c70184c5ee13cb3a2d23fe128bfb056a4b6d0f96d02
+  checksum: 7121c5e88ddd626a1b9e37f7a08da2acb03f1bb41e8fc53d5a331563f7ca635a68955a143074d0893b45646e8f03caaa189f5ee3a3cdf83f137a35d789615710
   languageName: node
   linkType: hard
 
-"@redwoodjs/prerender@npm:6.0.2":
-  version: 6.0.2
-  resolution: "@redwoodjs/prerender@npm:6.0.2"
+"@redwoodjs/prerender@npm:6.0.3":
+  version: 6.0.3
+  resolution: "@redwoodjs/prerender@npm:6.0.3"
   dependencies:
     "@babel/runtime-corejs3": 7.22.6
-    "@redwoodjs/auth": 6.0.2
-    "@redwoodjs/internal": 6.0.2
-    "@redwoodjs/project-config": 6.0.2
-    "@redwoodjs/router": 6.0.2
-    "@redwoodjs/structure": 6.0.2
-    "@redwoodjs/web": 6.0.2
+    "@redwoodjs/auth": 6.0.3
+    "@redwoodjs/internal": 6.0.3
+    "@redwoodjs/project-config": 6.0.3
+    "@redwoodjs/router": 6.0.3
+    "@redwoodjs/structure": 6.0.3
+    "@redwoodjs/web": 6.0.3
     "@whatwg-node/fetch": 0.9.7
     babel-plugin-ignore-html-and-css-imports: 0.1.0
     cheerio: 1.0.0-rc.12
@@ -4894,45 +4894,45 @@ __metadata:
   peerDependencies:
     react: 18.2.0
     react-dom: 18.2.0
-  checksum: c5485d45bcc1965280b2e229dcdf577ff4a24d5df8397207a7b9d89620392a45db43bb5541e6d4cb1ef3fecd2ac14c3ab4cc9c132ec7d732b3d8fa78c49a42aa
+  checksum: 3278038149cf256457cb8817acd248a60e15c28d9f4e6d5e226d9afe73a9cbf967988298c2f31c7071d9dadfbdb57bd46ade3e159ea9218a0f5e07c3d31ee91f
   languageName: node
   linkType: hard
 
-"@redwoodjs/project-config@npm:6.0.2":
-  version: 6.0.2
-  resolution: "@redwoodjs/project-config@npm:6.0.2"
+"@redwoodjs/project-config@npm:6.0.3":
+  version: 6.0.3
+  resolution: "@redwoodjs/project-config@npm:6.0.3"
   dependencies:
     "@iarna/toml": 2.2.5
     deepmerge: 4.3.1
     fast-glob: 3.2.12
     string-env-interpolation: 1.0.1
-  checksum: 163ecd38efff0d09a42f43776af7eb16d30ec02186101298972738d7bbe9ebb34865875d52eb60e2b56644cde83f5d5e92b002026fd7b78e5b8ddf8b405768b2
+  checksum: f0a8f3f66f424a94b0ae80355c0fb86ea21c2b5d130a23a256e43a1388733ed3fed30d5598bd57a2aa1efd1e3bce02c5ba43d2892dc067b35bf500b73af45a01
   languageName: node
   linkType: hard
 
-"@redwoodjs/router@npm:6.0.2":
-  version: 6.0.2
-  resolution: "@redwoodjs/router@npm:6.0.2"
+"@redwoodjs/router@npm:6.0.3":
+  version: 6.0.3
+  resolution: "@redwoodjs/router@npm:6.0.3"
   dependencies:
     "@babel/runtime-corejs3": 7.22.6
     "@reach/skip-nav": 0.18.0
-    "@redwoodjs/auth": 6.0.2
+    "@redwoodjs/auth": 6.0.3
     core-js: 3.31.1
   peerDependencies:
     react: 18.2.0
     react-dom: 18.2.0
-  checksum: 7f7ca9c425cb8624143d6d40d870833ed2227bf9f79bba7a88a0d07f0c92088aa21334f04f9c5f36825f16df013e02dfecd45047ed0619a72076f4e00255830c
+  checksum: 7567bad5acd9e648ac178fcf68bb1d204f690730d4eaa14eb6ae1fd802d0538c19e2b34d1e3cf7a840f408eb4136140cf6ccb05e887fb83babfa518f967b509d
   languageName: node
   linkType: hard
 
-"@redwoodjs/structure@npm:6.0.2":
-  version: 6.0.2
-  resolution: "@redwoodjs/structure@npm:6.0.2"
+"@redwoodjs/structure@npm:6.0.3":
+  version: 6.0.3
+  resolution: "@redwoodjs/structure@npm:6.0.3"
   dependencies:
     "@babel/runtime-corejs3": 7.22.6
     "@iarna/toml": 2.2.5
     "@prisma/internals": 5.0.0
-    "@redwoodjs/project-config": 6.0.2
+    "@redwoodjs/project-config": 6.0.3
     "@types/line-column": 1.0.0
     camelcase: 6.3.0
     core-js: 3.31.1
@@ -4952,17 +4952,17 @@ __metadata:
     vscode-languageserver-textdocument: 1.0.8
     vscode-languageserver-types: 3.17.3
     yargs-parser: 21.1.1
-  checksum: 784aed787f83aaf8ffcafd9c730a9f00da0855f029840eb8b397d5550da1ca69bfd0b1d32a8510742e3708caef7fbbd6620a68b34a3884ba6fc1a7ebad7e689c
+  checksum: 7f593a8c61f6d666e7fd0f16a9a64aa621ff47d0cc6a1ded11d564d8607484dab92e4da1da84452a49a85dfcebb17081586010ff9a48197a05362fc7271b0a39
   languageName: node
   linkType: hard
 
-"@redwoodjs/telemetry@npm:6.0.2":
-  version: 6.0.2
-  resolution: "@redwoodjs/telemetry@npm:6.0.2"
+"@redwoodjs/telemetry@npm:6.0.3":
+  version: 6.0.3
+  resolution: "@redwoodjs/telemetry@npm:6.0.3"
   dependencies:
     "@babel/runtime-corejs3": 7.22.6
-    "@redwoodjs/project-config": 6.0.2
-    "@redwoodjs/structure": 6.0.2
+    "@redwoodjs/project-config": 6.0.3
+    "@redwoodjs/structure": 6.0.3
     "@whatwg-node/fetch": 0.9.7
     ci-info: 3.8.0
     core-js: 3.31.1
@@ -4970,21 +4970,21 @@ __metadata:
     systeminformation: 5.18.5
     uuid: 9.0.0
     yargs: 17.7.2
-  checksum: 1a1be610506ccf2774af4bb82a1939d84ba2fb438bc4b56cf07f6336c2f48a125ae6edcedc44c5546ea8ab7dca570f930c257ee703ef090ecbc3597854ec106e
+  checksum: 3fb3ce9d22d6aae5afe745314c9be276a73fdad9699aeb4b03d25ea1e53624bbf99e7f7ae2d0a7f6e4aaa4d572d966ec0fcf181e3c4cd11e4bd05bd253a3e910
   languageName: node
   linkType: hard
 
-"@redwoodjs/testing@npm:6.0.2":
-  version: 6.0.2
-  resolution: "@redwoodjs/testing@npm:6.0.2"
+"@redwoodjs/testing@npm:6.0.3":
+  version: 6.0.3
+  resolution: "@redwoodjs/testing@npm:6.0.3"
   dependencies:
     "@babel/runtime-corejs3": 7.22.6
-    "@redwoodjs/auth": 6.0.2
-    "@redwoodjs/graphql-server": 6.0.2
-    "@redwoodjs/internal": 6.0.2
-    "@redwoodjs/project-config": 6.0.2
-    "@redwoodjs/router": 6.0.2
-    "@redwoodjs/web": 6.0.2
+    "@redwoodjs/auth": 6.0.3
+    "@redwoodjs/graphql-server": 6.0.3
+    "@redwoodjs/internal": 6.0.3
+    "@redwoodjs/project-config": 6.0.3
+    "@redwoodjs/router": 6.0.3
+    "@redwoodjs/web": 6.0.3
     "@testing-library/jest-dom": 5.16.5
     "@testing-library/react": 14.0.0
     "@testing-library/user-event": 14.4.3
@@ -5005,17 +5005,17 @@ __metadata:
     msw: 1.2.3
     ts-toolbelt: 9.6.0
     whatwg-fetch: 3.6.2
-  checksum: f4ccb8d7368312752163b49cea1b63633181aaefca01986d32a46358ff7802c988fd092ff0601471b0864559fbdfa27cadbee685140079e1b81b1fb601cc95ae
+  checksum: 6ac11a0de1a6b435f96d3981fd5e9e143ab457d068cb0eb895d3e92ef5add045592db96d41e2694d9b196046e944a34cf82723ffa08c8015afd9cbee01b257df
   languageName: node
   linkType: hard
 
-"@redwoodjs/vite@npm:6.0.2":
-  version: 6.0.2
-  resolution: "@redwoodjs/vite@npm:6.0.2"
+"@redwoodjs/vite@npm:6.0.3":
+  version: 6.0.3
+  resolution: "@redwoodjs/vite@npm:6.0.3"
   dependencies:
     "@babel/runtime-corejs3": 7.22.6
-    "@redwoodjs/internal": 6.0.2
-    "@redwoodjs/project-config": 6.0.2
+    "@redwoodjs/internal": 6.0.3
+    "@redwoodjs/project-config": 6.0.3
     "@vitejs/plugin-react": 4.0.3
     buffer: 6.0.3
     core-js: 3.31.1
@@ -5025,17 +5025,17 @@ __metadata:
     rw-vite-build: bins/rw-vite-build.mjs
     rw-vite-dev: bins/rw-vite-dev.mjs
     vite: bins/vite.mjs
-  checksum: 74149d2105c39cb3b2710d5f9a8cd73b8af207b84935970ad0c306d3034ec37bbf43c1de57db3c3d49ef5ac8b0cfc5db01ad9b30b50f968efaaf59c7067afe69
+  checksum: d9d7a2089308d1cb756e18cd28721998c6a847a65e15d734d712202f8f0f87cf0a4bbbeb1eaa71ec8f96b76898c77100a4e0ca0a312aac4b7d3fa929c7b4aeb9
   languageName: node
   linkType: hard
 
-"@redwoodjs/web@npm:6.0.2":
-  version: 6.0.2
-  resolution: "@redwoodjs/web@npm:6.0.2"
+"@redwoodjs/web@npm:6.0.3":
+  version: 6.0.3
+  resolution: "@redwoodjs/web@npm:6.0.3"
   dependencies:
     "@apollo/client": 3.7.17
     "@babel/runtime-corejs3": 7.22.6
-    "@redwoodjs/auth": 6.0.2
+    "@redwoodjs/auth": 6.0.3
     core-js: 3.31.1
     graphql: 16.7.1
     graphql-tag: 2.12.6
@@ -5056,7 +5056,7 @@ __metadata:
     storybook: dist/bins/storybook.js
     tsc: dist/bins/tsc.js
     webpack: dist/bins/webpack.js
-  checksum: cf7bfff7c8b82d5cdb39b2a184a3e7655051daa4858218abe0076fc3705cf0391c2769bfa9b7ac943a9441295c07d86b6e8415cb8099ce696dae413eaee0beac
+  checksum: 4c900cfa004c1f8ca94d7af39c8d8223db9046eb99cdf1593507bb0a8b2c0df70d81d18d3bd8eb3fcb865da67075693f23065da077cb9202dc97c95099fcd53d
   languageName: node
   linkType: hard
 
@@ -6901,8 +6901,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "api@workspace:api"
   dependencies:
-    "@redwoodjs/api": 6.0.2
-    "@redwoodjs/graphql-server": 6.0.2
+    "@redwoodjs/api": 6.0.3
+    "@redwoodjs/graphql-server": 6.0.3
   languageName: unknown
   linkType: soft
 
@@ -18125,7 +18125,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "root-workspace-0b6124@workspace:."
   dependencies:
-    "@redwoodjs/core": 6.0.2
+    "@redwoodjs/core": 6.0.3
   languageName: unknown
   linkType: soft
 
@@ -20693,10 +20693,10 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "web@workspace:web"
   dependencies:
-    "@redwoodjs/forms": 6.0.2
-    "@redwoodjs/router": 6.0.2
-    "@redwoodjs/vite": 6.0.2
-    "@redwoodjs/web": 6.0.2
+    "@redwoodjs/forms": 6.0.3
+    "@redwoodjs/router": 6.0.3
+    "@redwoodjs/vite": 6.0.3
+    "@redwoodjs/web": 6.0.3
     prop-types: 15.8.1
     react: 18.2.0
     react-dom: 18.2.0
diff --git a/packages/create-redwood-app/templates/ts/api/package.json b/packages/create-redwood-app/templates/ts/api/package.json
index f27c7e52bae1..e4759a5969d4 100644
--- a/packages/create-redwood-app/templates/ts/api/package.json
+++ b/packages/create-redwood-app/templates/ts/api/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "@redwoodjs/api": "6.0.2",
-    "@redwoodjs/graphql-server": "6.0.2"
+    "@redwoodjs/api": "6.0.3",
+    "@redwoodjs/graphql-server": "6.0.3"
   }
 }
diff --git a/packages/create-redwood-app/templates/ts/package.json b/packages/create-redwood-app/templates/ts/package.json
index 6c98ff73770b..9604d0242e0f 100644
--- a/packages/create-redwood-app/templates/ts/package.json
+++ b/packages/create-redwood-app/templates/ts/package.json
@@ -7,7 +7,7 @@
     ]
   },
   "devDependencies": {
-    "@redwoodjs/core": "6.0.2"
+    "@redwoodjs/core": "6.0.3"
   },
   "eslintConfig": {
     "extends": "@redwoodjs/eslint-config",
diff --git a/packages/create-redwood-app/templates/ts/web/package.json b/packages/create-redwood-app/templates/ts/web/package.json
index 17ddd56f2a55..f1434a8aa11e 100644
--- a/packages/create-redwood-app/templates/ts/web/package.json
+++ b/packages/create-redwood-app/templates/ts/web/package.json
@@ -11,14 +11,14 @@
     ]
   },
   "dependencies": {
-    "@redwoodjs/forms": "6.0.2",
-    "@redwoodjs/router": "6.0.2",
-    "@redwoodjs/web": "6.0.2",
+    "@redwoodjs/forms": "6.0.3",
+    "@redwoodjs/router": "6.0.3",
+    "@redwoodjs/web": "6.0.3",
     "prop-types": "15.8.1",
     "react": "18.2.0",
     "react-dom": "18.2.0"
   },
   "devDependencies": {
-    "@redwoodjs/vite": "6.0.2"
+    "@redwoodjs/vite": "6.0.3"
   }
 }
diff --git a/packages/create-redwood-app/templates/ts/yarn.lock b/packages/create-redwood-app/templates/ts/yarn.lock
index e3093515389a..d99cc7f0eacc 100644
--- a/packages/create-redwood-app/templates/ts/yarn.lock
+++ b/packages/create-redwood-app/templates/ts/yarn.lock
@@ -4498,16 +4498,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@redwoodjs/api-server@npm:6.0.2":
-  version: 6.0.2
-  resolution: "@redwoodjs/api-server@npm:6.0.2"
+"@redwoodjs/api-server@npm:6.0.3":
+  version: 6.0.3
+  resolution: "@redwoodjs/api-server@npm:6.0.3"
   dependencies:
     "@babel/plugin-transform-runtime": 7.22.9
     "@babel/runtime-corejs3": 7.22.6
     "@fastify/http-proxy": 9.2.1
     "@fastify/static": 6.10.2
     "@fastify/url-data": 5.3.1
-    "@redwoodjs/project-config": 6.0.2
+    "@redwoodjs/project-config": 6.0.3
     ansi-colors: 4.1.3
     chalk: 4.1.2
     chokidar: 3.5.3
@@ -4526,13 +4526,13 @@ __metadata:
     rw-api-server-watch: dist/watch.js
     rw-log-formatter: dist/logFormatter/bin.js
     rw-server: dist/index.js
-  checksum: d39c93ea9c1946b34c8b725f9444233d599742c32d3ac5ce450765c1f564fd846008f2622d6bd88f4d789d49ce668f08f7defe5bebe53c2196ffa8e6c99a76b7
+  checksum: eab3010dd61b7c20e5c900b3155d1da116a2f55c400faf39536416818684daf325791dc01617c64a454b691006de82bf1d5f5c796a822439dfb45fd78920b3d8
   languageName: node
   linkType: hard
 
-"@redwoodjs/api@npm:6.0.2":
-  version: 6.0.2
-  resolution: "@redwoodjs/api@npm:6.0.2"
+"@redwoodjs/api@npm:6.0.3":
+  version: 6.0.3
+  resolution: "@redwoodjs/api@npm:6.0.3"
   dependencies:
     "@babel/runtime-corejs3": 7.22.6
     "@prisma/client": 5.0.0
@@ -4556,30 +4556,30 @@ __metadata:
     rw: dist/bins/redwood.js
     rwfw: dist/bins/rwfw.js
     tsc: dist/bins/tsc.js
-  checksum: 4ce805eb237f019a43c4298ba736c9ac4dc9801180feab79ea2f119ea11a9842ba7e6303c4cc110ed837cdaea86c4691f8fc9bfcbd753555fbdec9f239905854
+  checksum: e880bf1e1ec5b88f7cb6031888ff9e3f7a119c3bda46902fa259bbece0a8cc56d9cbccddec156ab3fb604c8dc5c46a37dae76b6fd7344e27ac8a825eb7b950c3
   languageName: node
   linkType: hard
 
-"@redwoodjs/auth@npm:6.0.2":
-  version: 6.0.2
-  resolution: "@redwoodjs/auth@npm:6.0.2"
+"@redwoodjs/auth@npm:6.0.3":
+  version: 6.0.3
+  resolution: "@redwoodjs/auth@npm:6.0.3"
   dependencies:
     "@babel/runtime-corejs3": 7.22.6
     core-js: 3.31.1
     react: 18.2.0
-  checksum: 14072360c4e8ba2e361401d5940038267f454d608fb3a6c8d7695e1e5063996983a76ef50357d9ebf25576a8b67a4759d472c061cba7a83ebd286cffea0a9617
+  checksum: 9cc4390b7ffb74bb0ea22b3291ff5433b1a8b1ab14a4151814ed127baccefdfd423dde34e3f64abaf6b5e0dd06c4898afdd9054b31f9007a69fdfb55a1cb1356
   languageName: node
   linkType: hard
 
-"@redwoodjs/cli-helpers@npm:6.0.2":
-  version: 6.0.2
-  resolution: "@redwoodjs/cli-helpers@npm:6.0.2"
+"@redwoodjs/cli-helpers@npm:6.0.3":
+  version: 6.0.3
+  resolution: "@redwoodjs/cli-helpers@npm:6.0.3"
   dependencies:
     "@babel/core": 7.22.9
     "@babel/runtime-corejs3": 7.22.6
     "@opentelemetry/api": 1.4.1
-    "@redwoodjs/project-config": 6.0.2
-    "@redwoodjs/telemetry": 6.0.2
+    "@redwoodjs/project-config": 6.0.3
+    "@redwoodjs/telemetry": 6.0.3
     chalk: 4.1.2
     core-js: 3.31.1
     execa: 5.1.1
@@ -4589,13 +4589,13 @@ __metadata:
     prettier: 2.8.8
     prompts: 2.4.2
     terminal-link: 2.1.1
-  checksum: c8eb5fd8475d796572f49bc7e791dd4d877b43cd35e907f8d812a31e6707fbb984d1af3f432c61b3fcbd3857213c343c93dc7521859a4a378a51882ff2ec6ca6
+  checksum: c8d304e93dcef11811cb1105fee230bb8ce023df6063cc93f060c5d78db52822c4b293d57d42ad9863714745332b364ae5c54150ada5f77964611abd38c63705
   languageName: node
   linkType: hard
 
-"@redwoodjs/cli@npm:6.0.2":
-  version: 6.0.2
-  resolution: "@redwoodjs/cli@npm:6.0.2"
+"@redwoodjs/cli@npm:6.0.3":
+  version: 6.0.3
+  resolution: "@redwoodjs/cli@npm:6.0.3"
   dependencies:
     "@babel/runtime-corejs3": 7.22.6
     "@iarna/toml": 2.2.5
@@ -4606,14 +4606,14 @@ __metadata:
     "@opentelemetry/sdk-trace-node": 1.15.0
     "@opentelemetry/semantic-conventions": 1.15.0
     "@prisma/internals": 5.0.0
-    "@redwoodjs/api-server": 6.0.2
-    "@redwoodjs/cli-helpers": 6.0.2
-    "@redwoodjs/fastify": 6.0.2
-    "@redwoodjs/internal": 6.0.2
-    "@redwoodjs/prerender": 6.0.2
-    "@redwoodjs/project-config": 6.0.2
-    "@redwoodjs/structure": 6.0.2
-    "@redwoodjs/telemetry": 6.0.2
+    "@redwoodjs/api-server": 6.0.3
+    "@redwoodjs/cli-helpers": 6.0.3
+    "@redwoodjs/fastify": 6.0.3
+    "@redwoodjs/internal": 6.0.3
+    "@redwoodjs/prerender": 6.0.3
+    "@redwoodjs/project-config": 6.0.3
+    "@redwoodjs/structure": 6.0.3
+    "@redwoodjs/telemetry": 6.0.3
     "@types/secure-random-password": 0.2.1
     boxen: 5.1.2
     camelcase: 6.3.0
@@ -4655,13 +4655,13 @@ __metadata:
     redwood: dist/index.js
     rw: dist/index.js
     rwfw: dist/rwfw.js
-  checksum: 64b9fe01d2217ddca625fa5204e7ed66aae10f74c2bcb9186b0f6da71d44a5fbed6968437be6e9a4e1fa4ba36036bcfa2a99f4dbad65028ef9f6e45f8f8eb186
+  checksum: 8febbec80055e7d5b6807ef256bcf28febfaddc0722f88ac83fe179a28e7d1438bba9a02e1c342cb91d966e2094a52786c2f90f63f1b4b01fc9dbf0d18d747f2
   languageName: node
   linkType: hard
 
-"@redwoodjs/core@npm:6.0.2":
-  version: 6.0.2
-  resolution: "@redwoodjs/core@npm:6.0.2"
+"@redwoodjs/core@npm:6.0.3":
+  version: 6.0.3
+  resolution: "@redwoodjs/core@npm:6.0.3"
   dependencies:
     "@babel/cli": 7.22.9
     "@babel/core": 7.22.9
@@ -4674,11 +4674,11 @@ __metadata:
     "@babel/preset-typescript": 7.22.5
     "@babel/runtime-corejs3": 7.22.6
     "@pmmmwh/react-refresh-webpack-plugin": 0.5.10
-    "@redwoodjs/cli": 6.0.2
-    "@redwoodjs/eslint-config": 6.0.2
-    "@redwoodjs/internal": 6.0.2
-    "@redwoodjs/project-config": 6.0.2
-    "@redwoodjs/testing": 6.0.2
+    "@redwoodjs/cli": 6.0.3
+    "@redwoodjs/eslint-config": 6.0.3
+    "@redwoodjs/internal": 6.0.3
+    "@redwoodjs/project-config": 6.0.3
+    "@redwoodjs/testing": 6.0.3
     babel-loader: 9.1.3
     babel-plugin-auto-import: 1.1.0
     babel-plugin-graphql-tag: 3.3.0
@@ -4724,20 +4724,20 @@ __metadata:
     rw-gen-watch: dist/bins/rw-gen-watch.js
     rw-log-formatter: dist/bins/rw-log-formatter.js
     rwfw: dist/bins/rwfw.js
-  checksum: 2466337a02f420dfe642b5c0d8930cb14d819437f106380977bf44b14c19b707cda5c6bf29ff44eeb55c95678dfc67820810b8aad9161d53bc8d9ad866e95850
+  checksum: fbb96668727dc6644a1fea505de06080d659765ba5b02d532e416f83b7120707d71b127889042d6df03db3137955f96f041458560792a6bec909c061d97551f6
   languageName: node
   linkType: hard
 
-"@redwoodjs/eslint-config@npm:6.0.2":
-  version: 6.0.2
-  resolution: "@redwoodjs/eslint-config@npm:6.0.2"
+"@redwoodjs/eslint-config@npm:6.0.3":
+  version: 6.0.3
+  resolution: "@redwoodjs/eslint-config@npm:6.0.3"
   dependencies:
     "@babel/core": 7.22.9
     "@babel/eslint-parser": 7.22.9
     "@babel/eslint-plugin": 7.22.5
-    "@redwoodjs/eslint-plugin": 6.0.2
-    "@redwoodjs/internal": 6.0.2
-    "@redwoodjs/project-config": 6.0.2
+    "@redwoodjs/eslint-plugin": 6.0.3
+    "@redwoodjs/internal": 6.0.3
+    "@redwoodjs/project-config": 6.0.3
     "@typescript-eslint/eslint-plugin": 5.61.0
     "@typescript-eslint/parser": 5.61.0
     eslint: 8.45.0
@@ -4751,42 +4751,42 @@ __metadata:
     eslint-plugin-react: 7.32.2
     eslint-plugin-react-hooks: 4.6.0
     prettier: 2.8.8
-  checksum: 48784f6a40f29c892228f34f7e4a245bc5292c8199919992229f2b7712d17cb564c41a77e3d66e791e415d9dbc36df31c84269a98406ea2c7b799920c4df9126
+  checksum: 86545185aea4a0b585881dffbb001da45879f3eff640cf2a9fbf66c6e4e1f7ca40626fa1f0c4254882c925b7a3f26d0898aead0f456a47b1bc98d9597439d226
   languageName: node
   linkType: hard
 
-"@redwoodjs/eslint-plugin@npm:6.0.2":
-  version: 6.0.2
-  resolution: "@redwoodjs/eslint-plugin@npm:6.0.2"
+"@redwoodjs/eslint-plugin@npm:6.0.3":
+  version: 6.0.3
+  resolution: "@redwoodjs/eslint-plugin@npm:6.0.3"
   dependencies:
     "@typescript-eslint/utils": 5.61.0
     eslint: 8.45.0
-  checksum: c6979ad079178c03a23bdf223b4cc3dbd70d5b3634abd04fae604900358a5fb29151c4d8918556d35fa4e9eaf09fd0bc52f5cea3bdd1d889e9b2ab216fe818fc
+  checksum: b0a132995056bfdeb9b31be73b97989f7bd68463c62d2e9fc101bb927ea9efdd594fbc7cd4ebc842ebc9d21d2798d8ebef41a03290330c6771342a425f30c5a1
   languageName: node
   linkType: hard
 
-"@redwoodjs/fastify@npm:6.0.2":
-  version: 6.0.2
-  resolution: "@redwoodjs/fastify@npm:6.0.2"
+"@redwoodjs/fastify@npm:6.0.3":
+  version: 6.0.3
+  resolution: "@redwoodjs/fastify@npm:6.0.3"
   dependencies:
     "@fastify/http-proxy": 9.2.1
     "@fastify/static": 6.10.2
     "@fastify/url-data": 5.3.1
-    "@redwoodjs/graphql-server": 6.0.2
-    "@redwoodjs/project-config": 6.0.2
+    "@redwoodjs/graphql-server": 6.0.3
+    "@redwoodjs/project-config": 6.0.3
     ansi-colors: 4.1.3
     fast-glob: 3.2.12
     fastify: 4.20.0
     fastify-raw-body: 4.2.1
     lodash: 4.17.21
     qs: 6.11.2
-  checksum: 1796488488fa58a70ed9f40b230ca00ae7d40562a8761c6e500621f7624983f57b0277f94750f15edf7fa2d13bfdf18515dc1b29aa71b3981b3164fcb89f5d0a
+  checksum: 4f2e9381329492460741c786ffb9ac124389b8185f358edc5915ec68dd6cd9d9aaa19cde3a277c6525cbbf9b74757f1d572a2ab40795f3c0272443e256b502c3
   languageName: node
   linkType: hard
 
-"@redwoodjs/forms@npm:6.0.2":
-  version: 6.0.2
-  resolution: "@redwoodjs/forms@npm:6.0.2"
+"@redwoodjs/forms@npm:6.0.3":
+  version: 6.0.3
+  resolution: "@redwoodjs/forms@npm:6.0.3"
   dependencies:
     "@babel/runtime-corejs3": 7.22.6
     core-js: 3.31.1
@@ -4795,13 +4795,13 @@ __metadata:
   peerDependencies:
     graphql: 16.7.1
     react: 18.2.0
-  checksum: 4fe9f7e6819c492a5d24b27845e7c7df7a92a1e41b7e8f82e9b86b3490b67628764725954ee356ddbd713d48883ff474857610017a42f044fbafa999e0e89ff2
+  checksum: ba0decdf55a886165807aa995f68e2890b8d9a17f7c19161a712acb6601f21e27a61548dc7c60908643fc959e0febce7a2c1c693307a8d713a70ea9537844db8
   languageName: node
   linkType: hard
 
-"@redwoodjs/graphql-server@npm:6.0.2":
-  version: 6.0.2
-  resolution: "@redwoodjs/graphql-server@npm:6.0.2"
+"@redwoodjs/graphql-server@npm:6.0.3":
+  version: 6.0.3
+  resolution: "@redwoodjs/graphql-server@npm:6.0.3"
   dependencies:
     "@babel/runtime-corejs3": 7.22.6
     "@envelop/core": 4.0.0
@@ -4814,8 +4814,8 @@ __metadata:
     "@graphql-tools/schema": 10.0.0
     "@graphql-tools/utils": 10.0.1
     "@opentelemetry/api": 1.4.1
-    "@redwoodjs/api": 6.0.2
-    "@redwoodjs/project-config": 6.0.2
+    "@redwoodjs/api": 6.0.3
+    "@redwoodjs/project-config": 6.0.3
     core-js: 3.31.1
     graphql: 16.7.1
     graphql-scalars: 1.22.2
@@ -4823,13 +4823,13 @@ __metadata:
     graphql-yoga: 4.0.2
     lodash: 4.17.21
     uuid: 9.0.0
-  checksum: cd871be0c4bc0f4c11ba02f6114bb2d0fc561fe3a48dfafe306aea2952581cca3b202cc2eee2f30ede33ad5ce64d58a858cc75342c54e7fa58786c59d12085e5
+  checksum: 1addc0aeabf22b4ac565efd177e86b26d473c173d9095723f777992a85c1c5afabb5918f012a76fc5a24a6d6a4608ed1c62f9665b534209cdec8daa08ade8d5e
   languageName: node
   linkType: hard
 
-"@redwoodjs/internal@npm:6.0.2":
-  version: 6.0.2
-  resolution: "@redwoodjs/internal@npm:6.0.2"
+"@redwoodjs/internal@npm:6.0.3":
+  version: 6.0.3
+  resolution: "@redwoodjs/internal@npm:6.0.3"
   dependencies:
     "@babel/parser": 7.22.7
     "@babel/plugin-transform-class-properties": 7.22.5
@@ -4847,8 +4847,8 @@ __metadata:
     "@graphql-codegen/typescript-operations": 3.0.4
     "@graphql-codegen/typescript-react-apollo": 3.3.7
     "@graphql-codegen/typescript-resolvers": 3.2.1
-    "@redwoodjs/graphql-server": 6.0.2
-    "@redwoodjs/project-config": 6.0.2
+    "@redwoodjs/graphql-server": 6.0.3
+    "@redwoodjs/project-config": 6.0.3
     "@sdl-codegen/node": 0.0.10
     babel-plugin-graphql-tag: 3.3.0
     babel-plugin-polyfill-corejs3: 0.8.3
@@ -4870,21 +4870,21 @@ __metadata:
   bin:
     rw-gen: dist/generate/generate.js
     rw-gen-watch: dist/generate/watch.js
-  checksum: 966a84344d273ef74a1d194a2a5bf83cd9fbafe0e44adac7c9de1d8c5adff19661ac01f5029fc2af78200c70184c5ee13cb3a2d23fe128bfb056a4b6d0f96d02
+  checksum: 7121c5e88ddd626a1b9e37f7a08da2acb03f1bb41e8fc53d5a331563f7ca635a68955a143074d0893b45646e8f03caaa189f5ee3a3cdf83f137a35d789615710
   languageName: node
   linkType: hard
 
-"@redwoodjs/prerender@npm:6.0.2":
-  version: 6.0.2
-  resolution: "@redwoodjs/prerender@npm:6.0.2"
+"@redwoodjs/prerender@npm:6.0.3":
+  version: 6.0.3
+  resolution: "@redwoodjs/prerender@npm:6.0.3"
   dependencies:
     "@babel/runtime-corejs3": 7.22.6
-    "@redwoodjs/auth": 6.0.2
-    "@redwoodjs/internal": 6.0.2
-    "@redwoodjs/project-config": 6.0.2
-    "@redwoodjs/router": 6.0.2
-    "@redwoodjs/structure": 6.0.2
-    "@redwoodjs/web": 6.0.2
+    "@redwoodjs/auth": 6.0.3
+    "@redwoodjs/internal": 6.0.3
+    "@redwoodjs/project-config": 6.0.3
+    "@redwoodjs/router": 6.0.3
+    "@redwoodjs/structure": 6.0.3
+    "@redwoodjs/web": 6.0.3
     "@whatwg-node/fetch": 0.9.7
     babel-plugin-ignore-html-and-css-imports: 0.1.0
     cheerio: 1.0.0-rc.12
@@ -4894,45 +4894,45 @@ __metadata:
   peerDependencies:
     react: 18.2.0
     react-dom: 18.2.0
-  checksum: c5485d45bcc1965280b2e229dcdf577ff4a24d5df8397207a7b9d89620392a45db43bb5541e6d4cb1ef3fecd2ac14c3ab4cc9c132ec7d732b3d8fa78c49a42aa
+  checksum: 3278038149cf256457cb8817acd248a60e15c28d9f4e6d5e226d9afe73a9cbf967988298c2f31c7071d9dadfbdb57bd46ade3e159ea9218a0f5e07c3d31ee91f
   languageName: node
   linkType: hard
 
-"@redwoodjs/project-config@npm:6.0.2":
-  version: 6.0.2
-  resolution: "@redwoodjs/project-config@npm:6.0.2"
+"@redwoodjs/project-config@npm:6.0.3":
+  version: 6.0.3
+  resolution: "@redwoodjs/project-config@npm:6.0.3"
   dependencies:
     "@iarna/toml": 2.2.5
     deepmerge: 4.3.1
     fast-glob: 3.2.12
     string-env-interpolation: 1.0.1
-  checksum: 163ecd38efff0d09a42f43776af7eb16d30ec02186101298972738d7bbe9ebb34865875d52eb60e2b56644cde83f5d5e92b002026fd7b78e5b8ddf8b405768b2
+  checksum: f0a8f3f66f424a94b0ae80355c0fb86ea21c2b5d130a23a256e43a1388733ed3fed30d5598bd57a2aa1efd1e3bce02c5ba43d2892dc067b35bf500b73af45a01
   languageName: node
   linkType: hard
 
-"@redwoodjs/router@npm:6.0.2":
-  version: 6.0.2
-  resolution: "@redwoodjs/router@npm:6.0.2"
+"@redwoodjs/router@npm:6.0.3":
+  version: 6.0.3
+  resolution: "@redwoodjs/router@npm:6.0.3"
   dependencies:
     "@babel/runtime-corejs3": 7.22.6
     "@reach/skip-nav": 0.18.0
-    "@redwoodjs/auth": 6.0.2
+    "@redwoodjs/auth": 6.0.3
     core-js: 3.31.1
   peerDependencies:
     react: 18.2.0
     react-dom: 18.2.0
-  checksum: 7f7ca9c425cb8624143d6d40d870833ed2227bf9f79bba7a88a0d07f0c92088aa21334f04f9c5f36825f16df013e02dfecd45047ed0619a72076f4e00255830c
+  checksum: 7567bad5acd9e648ac178fcf68bb1d204f690730d4eaa14eb6ae1fd802d0538c19e2b34d1e3cf7a840f408eb4136140cf6ccb05e887fb83babfa518f967b509d
   languageName: node
   linkType: hard
 
-"@redwoodjs/structure@npm:6.0.2":
-  version: 6.0.2
-  resolution: "@redwoodjs/structure@npm:6.0.2"
+"@redwoodjs/structure@npm:6.0.3":
+  version: 6.0.3
+  resolution: "@redwoodjs/structure@npm:6.0.3"
   dependencies:
     "@babel/runtime-corejs3": 7.22.6
     "@iarna/toml": 2.2.5
     "@prisma/internals": 5.0.0
-    "@redwoodjs/project-config": 6.0.2
+    "@redwoodjs/project-config": 6.0.3
     "@types/line-column": 1.0.0
     camelcase: 6.3.0
     core-js: 3.31.1
@@ -4952,17 +4952,17 @@ __metadata:
     vscode-languageserver-textdocument: 1.0.8
     vscode-languageserver-types: 3.17.3
     yargs-parser: 21.1.1
-  checksum: 784aed787f83aaf8ffcafd9c730a9f00da0855f029840eb8b397d5550da1ca69bfd0b1d32a8510742e3708caef7fbbd6620a68b34a3884ba6fc1a7ebad7e689c
+  checksum: 7f593a8c61f6d666e7fd0f16a9a64aa621ff47d0cc6a1ded11d564d8607484dab92e4da1da84452a49a85dfcebb17081586010ff9a48197a05362fc7271b0a39
   languageName: node
   linkType: hard
 
-"@redwoodjs/telemetry@npm:6.0.2":
-  version: 6.0.2
-  resolution: "@redwoodjs/telemetry@npm:6.0.2"
+"@redwoodjs/telemetry@npm:6.0.3":
+  version: 6.0.3
+  resolution: "@redwoodjs/telemetry@npm:6.0.3"
   dependencies:
     "@babel/runtime-corejs3": 7.22.6
-    "@redwoodjs/project-config": 6.0.2
-    "@redwoodjs/structure": 6.0.2
+    "@redwoodjs/project-config": 6.0.3
+    "@redwoodjs/structure": 6.0.3
     "@whatwg-node/fetch": 0.9.7
     ci-info: 3.8.0
     core-js: 3.31.1
@@ -4970,21 +4970,21 @@ __metadata:
     systeminformation: 5.18.5
     uuid: 9.0.0
     yargs: 17.7.2
-  checksum: 1a1be610506ccf2774af4bb82a1939d84ba2fb438bc4b56cf07f6336c2f48a125ae6edcedc44c5546ea8ab7dca570f930c257ee703ef090ecbc3597854ec106e
+  checksum: 3fb3ce9d22d6aae5afe745314c9be276a73fdad9699aeb4b03d25ea1e53624bbf99e7f7ae2d0a7f6e4aaa4d572d966ec0fcf181e3c4cd11e4bd05bd253a3e910
   languageName: node
   linkType: hard
 
-"@redwoodjs/testing@npm:6.0.2":
-  version: 6.0.2
-  resolution: "@redwoodjs/testing@npm:6.0.2"
+"@redwoodjs/testing@npm:6.0.3":
+  version: 6.0.3
+  resolution: "@redwoodjs/testing@npm:6.0.3"
   dependencies:
     "@babel/runtime-corejs3": 7.22.6
-    "@redwoodjs/auth": 6.0.2
-    "@redwoodjs/graphql-server": 6.0.2
-    "@redwoodjs/internal": 6.0.2
-    "@redwoodjs/project-config": 6.0.2
-    "@redwoodjs/router": 6.0.2
-    "@redwoodjs/web": 6.0.2
+    "@redwoodjs/auth": 6.0.3
+    "@redwoodjs/graphql-server": 6.0.3
+    "@redwoodjs/internal": 6.0.3
+    "@redwoodjs/project-config": 6.0.3
+    "@redwoodjs/router": 6.0.3
+    "@redwoodjs/web": 6.0.3
     "@testing-library/jest-dom": 5.16.5
     "@testing-library/react": 14.0.0
     "@testing-library/user-event": 14.4.3
@@ -5005,17 +5005,17 @@ __metadata:
     msw: 1.2.3
     ts-toolbelt: 9.6.0
     whatwg-fetch: 3.6.2
-  checksum: f4ccb8d7368312752163b49cea1b63633181aaefca01986d32a46358ff7802c988fd092ff0601471b0864559fbdfa27cadbee685140079e1b81b1fb601cc95ae
+  checksum: 6ac11a0de1a6b435f96d3981fd5e9e143ab457d068cb0eb895d3e92ef5add045592db96d41e2694d9b196046e944a34cf82723ffa08c8015afd9cbee01b257df
   languageName: node
   linkType: hard
 
-"@redwoodjs/vite@npm:6.0.2":
-  version: 6.0.2
-  resolution: "@redwoodjs/vite@npm:6.0.2"
+"@redwoodjs/vite@npm:6.0.3":
+  version: 6.0.3
+  resolution: "@redwoodjs/vite@npm:6.0.3"
   dependencies:
     "@babel/runtime-corejs3": 7.22.6
-    "@redwoodjs/internal": 6.0.2
-    "@redwoodjs/project-config": 6.0.2
+    "@redwoodjs/internal": 6.0.3
+    "@redwoodjs/project-config": 6.0.3
     "@vitejs/plugin-react": 4.0.3
     buffer: 6.0.3
     core-js: 3.31.1
@@ -5025,17 +5025,17 @@ __metadata:
     rw-vite-build: bins/rw-vite-build.mjs
     rw-vite-dev: bins/rw-vite-dev.mjs
     vite: bins/vite.mjs
-  checksum: 74149d2105c39cb3b2710d5f9a8cd73b8af207b84935970ad0c306d3034ec37bbf43c1de57db3c3d49ef5ac8b0cfc5db01ad9b30b50f968efaaf59c7067afe69
+  checksum: d9d7a2089308d1cb756e18cd28721998c6a847a65e15d734d712202f8f0f87cf0a4bbbeb1eaa71ec8f96b76898c77100a4e0ca0a312aac4b7d3fa929c7b4aeb9
   languageName: node
   linkType: hard
 
-"@redwoodjs/web@npm:6.0.2":
-  version: 6.0.2
-  resolution: "@redwoodjs/web@npm:6.0.2"
+"@redwoodjs/web@npm:6.0.3":
+  version: 6.0.3
+  resolution: "@redwoodjs/web@npm:6.0.3"
   dependencies:
     "@apollo/client": 3.7.17
     "@babel/runtime-corejs3": 7.22.6
-    "@redwoodjs/auth": 6.0.2
+    "@redwoodjs/auth": 6.0.3
     core-js: 3.31.1
     graphql: 16.7.1
     graphql-tag: 2.12.6
@@ -5056,7 +5056,7 @@ __metadata:
     storybook: dist/bins/storybook.js
     tsc: dist/bins/tsc.js
     webpack: dist/bins/webpack.js
-  checksum: cf7bfff7c8b82d5cdb39b2a184a3e7655051daa4858218abe0076fc3705cf0391c2769bfa9b7ac943a9441295c07d86b6e8415cb8099ce696dae413eaee0beac
+  checksum: 4c900cfa004c1f8ca94d7af39c8d8223db9046eb99cdf1593507bb0a8b2c0df70d81d18d3bd8eb3fcb865da67075693f23065da077cb9202dc97c95099fcd53d
   languageName: node
   linkType: hard
 
@@ -6901,8 +6901,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "api@workspace:api"
   dependencies:
-    "@redwoodjs/api": 6.0.2
-    "@redwoodjs/graphql-server": 6.0.2
+    "@redwoodjs/api": 6.0.3
+    "@redwoodjs/graphql-server": 6.0.3
   languageName: unknown
   linkType: soft
 
@@ -18125,7 +18125,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "root-workspace-0b6124@workspace:."
   dependencies:
-    "@redwoodjs/core": 6.0.2
+    "@redwoodjs/core": 6.0.3
   languageName: unknown
   linkType: soft
 
@@ -20693,10 +20693,10 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "web@workspace:web"
   dependencies:
-    "@redwoodjs/forms": 6.0.2
-    "@redwoodjs/router": 6.0.2
-    "@redwoodjs/vite": 6.0.2
-    "@redwoodjs/web": 6.0.2
+    "@redwoodjs/forms": 6.0.3
+    "@redwoodjs/router": 6.0.3
+    "@redwoodjs/vite": 6.0.3
+    "@redwoodjs/web": 6.0.3
     prop-types: 15.8.1
     react: 18.2.0
     react-dom: 18.2.0
diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json
index f23d162c06ee..12e0b8339459 100644
--- a/packages/eslint-config/package.json
+++ b/packages/eslint-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/eslint-config",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -15,9 +15,9 @@
     "@babel/core": "7.22.9",
     "@babel/eslint-parser": "7.22.9",
     "@babel/eslint-plugin": "7.22.5",
-    "@redwoodjs/eslint-plugin": "6.0.2",
-    "@redwoodjs/internal": "6.0.2",
-    "@redwoodjs/project-config": "6.0.2",
+    "@redwoodjs/eslint-plugin": "6.0.3",
+    "@redwoodjs/internal": "6.0.3",
+    "@redwoodjs/project-config": "6.0.3",
     "@typescript-eslint/eslint-plugin": "5.61.0",
     "@typescript-eslint/parser": "5.61.0",
     "eslint": "8.45.0",
diff --git a/packages/eslint-plugin/package.json b/packages/eslint-plugin/package.json
index 67b2a83f53a8..68038bee799d 100644
--- a/packages/eslint-plugin/package.json
+++ b/packages/eslint-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/eslint-plugin",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
diff --git a/packages/fastify/package.json b/packages/fastify/package.json
index 94c716aba3e5..1b0a25d8f273 100644
--- a/packages/fastify/package.json
+++ b/packages/fastify/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/fastify",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -21,8 +21,8 @@
     "@fastify/http-proxy": "9.2.1",
     "@fastify/static": "6.10.2",
     "@fastify/url-data": "5.3.1",
-    "@redwoodjs/graphql-server": "6.0.2",
-    "@redwoodjs/project-config": "6.0.2",
+    "@redwoodjs/graphql-server": "6.0.3",
+    "@redwoodjs/project-config": "6.0.3",
     "ansi-colors": "4.1.3",
     "fast-glob": "3.2.12",
     "fastify": "4.20.0",
diff --git a/packages/forms/package.json b/packages/forms/package.json
index 1f510836f6ef..515210a99ffe 100644
--- a/packages/forms/package.json
+++ b/packages/forms/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/forms",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
diff --git a/packages/graphql-server/package.json b/packages/graphql-server/package.json
index 8fae63a2e54c..c90fe1698e0d 100644
--- a/packages/graphql-server/package.json
+++ b/packages/graphql-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/graphql-server",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -33,8 +33,8 @@
     "@graphql-tools/schema": "10.0.0",
     "@graphql-tools/utils": "10.0.1",
     "@opentelemetry/api": "1.4.1",
-    "@redwoodjs/api": "6.0.2",
-    "@redwoodjs/project-config": "6.0.2",
+    "@redwoodjs/api": "6.0.3",
+    "@redwoodjs/project-config": "6.0.3",
     "core-js": "3.31.1",
     "graphql": "16.7.1",
     "graphql-scalars": "1.22.2",
@@ -48,7 +48,7 @@
     "@babel/core": "7.22.9",
     "@envelop/testing": "6.0.0",
     "@envelop/types": "4.0.0",
-    "@redwoodjs/realtime": "6.0.2",
+    "@redwoodjs/realtime": "6.0.3",
     "@types/jsonwebtoken": "9.0.2",
     "@types/lodash": "4.14.195",
     "@types/uuid": "9.0.2",
diff --git a/packages/internal/package.json b/packages/internal/package.json
index 81c8dbfef165..3c5d7987efc0 100644
--- a/packages/internal/package.json
+++ b/packages/internal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/internal",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -44,8 +44,8 @@
     "@graphql-codegen/typescript-operations": "3.0.4",
     "@graphql-codegen/typescript-react-apollo": "3.3.7",
     "@graphql-codegen/typescript-resolvers": "3.2.1",
-    "@redwoodjs/graphql-server": "6.0.2",
-    "@redwoodjs/project-config": "6.0.2",
+    "@redwoodjs/graphql-server": "6.0.3",
+    "@redwoodjs/project-config": "6.0.3",
     "@sdl-codegen/node": "0.0.10",
     "babel-plugin-graphql-tag": "3.3.0",
     "babel-plugin-polyfill-corejs3": "0.8.3",
diff --git a/packages/prerender/package.json b/packages/prerender/package.json
index bb383cc4d13d..576a6691bc99 100644
--- a/packages/prerender/package.json
+++ b/packages/prerender/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/prerender",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "description": "RedwoodJS prerender",
   "repository": {
     "type": "git",
@@ -25,12 +25,12 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "7.22.6",
-    "@redwoodjs/auth": "6.0.2",
-    "@redwoodjs/internal": "6.0.2",
-    "@redwoodjs/project-config": "6.0.2",
-    "@redwoodjs/router": "6.0.2",
-    "@redwoodjs/structure": "6.0.2",
-    "@redwoodjs/web": "6.0.2",
+    "@redwoodjs/auth": "6.0.3",
+    "@redwoodjs/internal": "6.0.3",
+    "@redwoodjs/project-config": "6.0.3",
+    "@redwoodjs/router": "6.0.3",
+    "@redwoodjs/structure": "6.0.3",
+    "@redwoodjs/web": "6.0.3",
     "@whatwg-node/fetch": "0.9.7",
     "babel-plugin-ignore-html-and-css-imports": "0.1.0",
     "cheerio": "1.0.0-rc.12",
diff --git a/packages/project-config/package.json b/packages/project-config/package.json
index 2ab171944682..ecc007ccd37a 100644
--- a/packages/project-config/package.json
+++ b/packages/project-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/project-config",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
diff --git a/packages/realtime/package.json b/packages/realtime/package.json
index 3ad705a66859..903c5b47071f 100644
--- a/packages/realtime/package.json
+++ b/packages/realtime/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/realtime",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
diff --git a/packages/record/package.json b/packages/record/package.json
index 43c905824b78..68f10bccfd60 100644
--- a/packages/record/package.json
+++ b/packages/record/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/record",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -29,7 +29,7 @@
   "dependencies": {
     "@babel/runtime-corejs3": "7.22.6",
     "@prisma/client": "5.0.0",
-    "@redwoodjs/project-config": "6.0.2",
+    "@redwoodjs/project-config": "6.0.3",
     "core-js": "3.31.1"
   },
   "devDependencies": {
diff --git a/packages/router/package.json b/packages/router/package.json
index 82c6b9f50afe..53ab5c02476c 100644
--- a/packages/router/package.json
+++ b/packages/router/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/router",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@babel/runtime-corejs3": "7.22.6",
     "@reach/skip-nav": "0.18.0",
-    "@redwoodjs/auth": "6.0.2",
+    "@redwoodjs/auth": "6.0.3",
     "core-js": "3.31.1"
   },
   "devDependencies": {
diff --git a/packages/structure/package.json b/packages/structure/package.json
index b27b171316b7..71b6512e1b38 100644
--- a/packages/structure/package.json
+++ b/packages/structure/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/structure",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "description": "noun: the arrangement of and relations between the parts or elements of something complex",
   "repository": {
     "type": "git",
@@ -33,7 +33,7 @@
     "@babel/runtime-corejs3": "7.22.6",
     "@iarna/toml": "2.2.5",
     "@prisma/internals": "5.0.0",
-    "@redwoodjs/project-config": "6.0.2",
+    "@redwoodjs/project-config": "6.0.3",
     "@types/line-column": "1.0.0",
     "camelcase": "6.3.0",
     "core-js": "3.31.1",
diff --git a/packages/studio/package.json b/packages/studio/package.json
index e77ffaa46874..0ba8c2c4c882 100644
--- a/packages/studio/package.json
+++ b/packages/studio/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/studio",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "description": "Redwood's development studio",
   "repository": {
     "type": "git",
@@ -29,8 +29,8 @@
     "@fastify/http-proxy": "9.2.1",
     "@fastify/static": "6.10.2",
     "@fastify/url-data": "5.3.1",
-    "@redwoodjs/internal": "6.0.2",
-    "@redwoodjs/project-config": "6.0.2",
+    "@redwoodjs/internal": "6.0.3",
+    "@redwoodjs/project-config": "6.0.3",
     "ansi-colors": "4.1.3",
     "chokidar": "3.5.3",
     "core-js": "3.31.1",
diff --git a/packages/telemetry/package.json b/packages/telemetry/package.json
index 9f47fabeb345..ff339699f7f8 100644
--- a/packages/telemetry/package.json
+++ b/packages/telemetry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/telemetry",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "7.22.6",
-    "@redwoodjs/project-config": "6.0.2",
-    "@redwoodjs/structure": "6.0.2",
+    "@redwoodjs/project-config": "6.0.3",
+    "@redwoodjs/structure": "6.0.3",
     "@whatwg-node/fetch": "0.9.7",
     "ci-info": "3.8.0",
     "core-js": "3.31.1",
diff --git a/packages/testing/package.json b/packages/testing/package.json
index b3eb7e76f19b..51a3c66bb85f 100644
--- a/packages/testing/package.json
+++ b/packages/testing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/testing",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "description": "Tools, wrappers and configuration for testing a Redwood project.",
   "repository": {
     "type": "git",
@@ -28,12 +28,12 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "7.22.6",
-    "@redwoodjs/auth": "6.0.2",
-    "@redwoodjs/graphql-server": "6.0.2",
-    "@redwoodjs/internal": "6.0.2",
-    "@redwoodjs/project-config": "6.0.2",
-    "@redwoodjs/router": "6.0.2",
-    "@redwoodjs/web": "6.0.2",
+    "@redwoodjs/auth": "6.0.3",
+    "@redwoodjs/graphql-server": "6.0.3",
+    "@redwoodjs/internal": "6.0.3",
+    "@redwoodjs/project-config": "6.0.3",
+    "@redwoodjs/router": "6.0.3",
+    "@redwoodjs/web": "6.0.3",
     "@testing-library/jest-dom": "5.16.5",
     "@testing-library/react": "14.0.0",
     "@testing-library/user-event": "14.4.3",
diff --git a/packages/tui/package.json b/packages/tui/package.json
index aa7ca4ca7d8c..810de8bdda81 100644
--- a/packages/tui/package.json
+++ b/packages/tui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/tui",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
diff --git a/packages/vite/package.json b/packages/vite/package.json
index 3c67a2ca3895..2b7e49e93aa9 100644
--- a/packages/vite/package.json
+++ b/packages/vite/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/vite",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "description": "Vite configuration package for Redwood",
   "repository": {
     "type": "git",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "7.22.6",
-    "@redwoodjs/internal": "6.0.2",
-    "@redwoodjs/project-config": "6.0.2",
+    "@redwoodjs/internal": "6.0.3",
+    "@redwoodjs/project-config": "6.0.3",
     "@vitejs/plugin-react": "4.0.3",
     "buffer": "6.0.3",
     "core-js": "3.31.1",
diff --git a/packages/web/package.json b/packages/web/package.json
index a745a956f411..f66f0a955431 100644
--- a/packages/web/package.json
+++ b/packages/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/web",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -37,7 +37,7 @@
   "dependencies": {
     "@apollo/client": "3.7.17",
     "@babel/runtime-corejs3": "7.22.6",
-    "@redwoodjs/auth": "6.0.2",
+    "@redwoodjs/auth": "6.0.3",
     "core-js": "3.31.1",
     "graphql": "16.7.1",
     "graphql-tag": "2.12.6",
diff --git a/yarn.lock b/yarn.lock
index f99c07a9abbb..da9d9985d447 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6678,7 +6678,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@redwoodjs/api-server@6.0.2, @redwoodjs/api-server@workspace:packages/api-server":
+"@redwoodjs/api-server@6.0.3, @redwoodjs/api-server@workspace:packages/api-server":
   version: 0.0.0-use.local
   resolution: "@redwoodjs/api-server@workspace:packages/api-server"
   dependencies:
@@ -6689,7 +6689,7 @@ __metadata:
     "@fastify/http-proxy": 9.2.1
     "@fastify/static": 6.10.2
     "@fastify/url-data": 5.3.1
-    "@redwoodjs/project-config": 6.0.2
+    "@redwoodjs/project-config": 6.0.3
     "@types/aws-lambda": 8.10.119
     "@types/lodash": 4.14.195
     "@types/qs": 6.9.7
@@ -6719,7 +6719,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@redwoodjs/api@6.0.2, @redwoodjs/api@workspace:packages/api":
+"@redwoodjs/api@6.0.3, @redwoodjs/api@workspace:packages/api":
   version: 0.0.0-use.local
   resolution: "@redwoodjs/api@workspace:packages/api"
   dependencies:
@@ -6768,7 +6768,7 @@ __metadata:
     "@babel/cli": 7.22.9
     "@babel/core": 7.22.9
     "@babel/runtime-corejs3": 7.22.6
-    "@redwoodjs/api": 6.0.2
+    "@redwoodjs/api": 6.0.3
     "@types/jsonwebtoken": 9.0.2
     core-js: 3.31.1
     jest: 29.6.1
@@ -6785,7 +6785,7 @@ __metadata:
     "@babel/cli": 7.22.9
     "@babel/core": 7.22.9
     "@babel/runtime-corejs3": 7.22.6
-    "@redwoodjs/cli-helpers": 6.0.2
+    "@redwoodjs/cli-helpers": 6.0.3
     "@types/yargs": 17.0.24
     core-js: 3.31.1
     jest: 29.6.1
@@ -6801,7 +6801,7 @@ __metadata:
     "@babel/cli": 7.22.9
     "@babel/core": 7.22.9
     "@babel/runtime-corejs3": 7.22.6
-    "@redwoodjs/auth": 6.0.2
+    "@redwoodjs/auth": 6.0.3
     "@types/react": 18.2.14
     core-js: 3.31.1
     jest: 29.6.1
@@ -6819,7 +6819,7 @@ __metadata:
     "@babel/cli": 7.22.9
     "@babel/core": 7.22.9
     "@babel/runtime-corejs3": 7.22.6
-    "@redwoodjs/api": 6.0.2
+    "@redwoodjs/api": 6.0.3
     "@types/aws-lambda": 8.10.119
     "@types/jsonwebtoken": 9.0.2
     core-js: 3.31.1
@@ -6837,7 +6837,7 @@ __metadata:
     "@babel/cli": 7.22.9
     "@babel/core": 7.22.9
     "@babel/runtime-corejs3": 7.22.6
-    "@redwoodjs/cli-helpers": 6.0.2
+    "@redwoodjs/cli-helpers": 6.0.3
     "@types/yargs": 17.0.24
     core-js: 3.31.1
     jest: 29.6.1
@@ -6853,7 +6853,7 @@ __metadata:
     "@babel/cli": 7.22.9
     "@babel/core": 7.22.9
     "@babel/runtime-corejs3": 7.22.6
-    "@redwoodjs/auth": 6.0.2
+    "@redwoodjs/auth": 6.0.3
     "@types/netlify-identity-widget": 1.9.3
     "@types/react": 18.2.14
     core-js: 3.31.1
@@ -6873,7 +6873,7 @@ __metadata:
     "@babel/core": 7.22.9
     "@babel/runtime-corejs3": 7.22.6
     "@clerk/clerk-sdk-node": 4.10.15
-    "@redwoodjs/api": 6.0.2
+    "@redwoodjs/api": 6.0.3
     "@types/aws-lambda": 8.10.119
     core-js: 3.31.1
     jest: 29.6.1
@@ -6888,7 +6888,7 @@ __metadata:
     "@babel/cli": 7.22.9
     "@babel/core": 7.22.9
     "@babel/runtime-corejs3": 7.22.6
-    "@redwoodjs/cli-helpers": 6.0.2
+    "@redwoodjs/cli-helpers": 6.0.3
     "@types/yargs": 17.0.24
     core-js: 3.31.1
     jest: 29.6.1
@@ -6905,7 +6905,7 @@ __metadata:
     "@babel/runtime-corejs3": 7.22.6
     "@clerk/clerk-react": 4.22.0
     "@clerk/types": 3.46.1
-    "@redwoodjs/auth": 6.0.2
+    "@redwoodjs/auth": 6.0.3
     "@types/react": 18.2.14
     core-js: 3.31.1
     jest: 29.6.1
@@ -6923,7 +6923,7 @@ __metadata:
     "@babel/cli": 7.22.9
     "@babel/core": 7.22.9
     "@babel/runtime-corejs3": 7.22.6
-    "@redwoodjs/cli-helpers": 6.0.2
+    "@redwoodjs/cli-helpers": 6.0.3
     "@types/yargs": 17.0.24
     core-js: 3.31.1
     jest: 29.6.1
@@ -6938,7 +6938,7 @@ __metadata:
     "@babel/cli": 7.22.9
     "@babel/core": 7.22.9
     "@babel/runtime-corejs3": 7.22.6
-    "@redwoodjs/api": 6.0.2
+    "@redwoodjs/api": 6.0.3
     "@simplewebauthn/server": 7.3.1
     "@types/crypto-js": 4.1.1
     "@types/md5": 2.3.2
@@ -6960,7 +6960,7 @@ __metadata:
     "@babel/cli": 7.22.9
     "@babel/core": 7.22.9
     "@babel/runtime-corejs3": 7.22.6
-    "@redwoodjs/cli-helpers": 6.0.2
+    "@redwoodjs/cli-helpers": 6.0.3
     "@simplewebauthn/browser": 7.2.0
     "@simplewebauthn/typescript-types": 7.0.0
     "@types/secure-random-password": 0.2.1
@@ -6981,7 +6981,7 @@ __metadata:
     "@babel/cli": 7.22.9
     "@babel/core": 7.22.9
     "@babel/runtime-corejs3": 7.22.6
-    "@redwoodjs/auth": 6.0.2
+    "@redwoodjs/auth": 6.0.3
     "@simplewebauthn/browser": 7.2.0
     "@simplewebauthn/typescript-types": 7.0.0
     "@types/react": 18.2.14
@@ -6999,7 +6999,7 @@ __metadata:
     "@babel/cli": 7.22.9
     "@babel/core": 7.22.9
     "@babel/runtime-corejs3": 7.22.6
-    "@redwoodjs/api": 6.0.2
+    "@redwoodjs/api": 6.0.3
     "@types/aws-lambda": 8.10.119
     core-js: 3.31.1
     firebase-admin: 11.10.1
@@ -7015,7 +7015,7 @@ __metadata:
     "@babel/cli": 7.22.9
     "@babel/core": 7.22.9
     "@babel/runtime-corejs3": 7.22.6
-    "@redwoodjs/cli-helpers": 6.0.2
+    "@redwoodjs/cli-helpers": 6.0.3
     "@types/yargs": 17.0.24
     core-js: 3.31.1
     jest: 29.6.1
@@ -7030,7 +7030,7 @@ __metadata:
     "@babel/cli": 7.22.9
     "@babel/core": 7.22.9
     "@babel/runtime-corejs3": 7.22.6
-    "@redwoodjs/auth": 6.0.2
+    "@redwoodjs/auth": 6.0.3
     "@types/react": 18.2.14
     core-js: 3.31.1
     firebase: 10.1.0
@@ -7049,7 +7049,7 @@ __metadata:
     "@babel/cli": 7.22.9
     "@babel/core": 7.22.9
     "@babel/runtime-corejs3": 7.22.6
-    "@redwoodjs/api": 6.0.2
+    "@redwoodjs/api": 6.0.3
     "@types/aws-lambda": 8.10.119
     "@types/jsonwebtoken": 9.0.2
     core-js: 3.31.1
@@ -7066,7 +7066,7 @@ __metadata:
     "@babel/cli": 7.22.9
     "@babel/core": 7.22.9
     "@babel/runtime-corejs3": 7.22.6
-    "@redwoodjs/cli-helpers": 6.0.2
+    "@redwoodjs/cli-helpers": 6.0.3
     "@types/yargs": 17.0.24
     core-js: 3.31.1
     jest: 29.6.1
@@ -7081,7 +7081,7 @@ __metadata:
     "@babel/cli": 7.22.9
     "@babel/core": 7.22.9
     "@babel/runtime-corejs3": 7.22.6
-    "@redwoodjs/auth": 6.0.2
+    "@redwoodjs/auth": 6.0.3
     "@types/netlify-identity-widget": 1.9.3
     "@types/react": 18.2.14
     core-js: 3.31.1
@@ -7100,7 +7100,7 @@ __metadata:
     "@babel/cli": 7.22.9
     "@babel/core": 7.22.9
     "@babel/runtime-corejs3": 7.22.6
-    "@redwoodjs/api": 6.0.2
+    "@redwoodjs/api": 6.0.3
     "@types/aws-lambda": 8.10.119
     "@types/jsonwebtoken": 9.0.2
     core-js: 3.31.1
@@ -7117,7 +7117,7 @@ __metadata:
     "@babel/cli": 7.22.9
     "@babel/core": 7.22.9
     "@babel/runtime-corejs3": 7.22.6
-    "@redwoodjs/cli-helpers": 6.0.2
+    "@redwoodjs/cli-helpers": 6.0.3
     "@types/yargs": 17.0.24
     core-js: 3.31.1
     jest: 29.6.1
@@ -7150,7 +7150,7 @@ __metadata:
     "@babel/cli": 7.22.9
     "@babel/core": 7.22.9
     "@babel/runtime-corejs3": 7.22.6
-    "@redwoodjs/api": 6.0.2
+    "@redwoodjs/api": 6.0.3
     "@types/jsonwebtoken": 9.0.2
     core-js: 3.31.1
     jest: 29.6.1
@@ -7169,7 +7169,7 @@ __metadata:
     "@babel/cli": 7.22.9
     "@babel/core": 7.22.9
     "@babel/runtime-corejs3": 7.22.6
-    "@redwoodjs/cli-helpers": 6.0.2
+    "@redwoodjs/cli-helpers": 6.0.3
     "@types/yargs": 17.0.24
     core-js: 3.31.1
     jest: 29.6.1
@@ -7184,7 +7184,7 @@ __metadata:
     "@babel/cli": 7.22.9
     "@babel/core": 7.22.9
     "@babel/runtime-corejs3": 7.22.6
-    "@redwoodjs/auth": 6.0.2
+    "@redwoodjs/auth": 6.0.3
     "@types/react": 18.2.14
     core-js: 3.31.1
     jest: 29.6.1
@@ -7196,7 +7196,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@redwoodjs/auth@6.0.2, @redwoodjs/auth@workspace:packages/auth":
+"@redwoodjs/auth@6.0.3, @redwoodjs/auth@workspace:packages/auth":
   version: 0.0.0-use.local
   resolution: "@redwoodjs/auth@workspace:packages/auth"
   dependencies:
@@ -7213,7 +7213,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@redwoodjs/cli-helpers@6.0.2, @redwoodjs/cli-helpers@workspace:packages/cli-helpers":
+"@redwoodjs/cli-helpers@6.0.3, @redwoodjs/cli-helpers@workspace:packages/cli-helpers":
   version: 0.0.0-use.local
   resolution: "@redwoodjs/cli-helpers@workspace:packages/cli-helpers"
   dependencies:
@@ -7221,8 +7221,8 @@ __metadata:
     "@babel/core": 7.22.9
     "@babel/runtime-corejs3": 7.22.6
     "@opentelemetry/api": 1.4.1
-    "@redwoodjs/project-config": 6.0.2
-    "@redwoodjs/telemetry": 6.0.2
+    "@redwoodjs/project-config": 6.0.3
+    "@redwoodjs/telemetry": 6.0.3
     "@types/lodash": 4.14.195
     "@types/pascalcase": 1.0.1
     "@types/yargs": 17.0.24
@@ -7244,9 +7244,9 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@redwoodjs/cli-storybook@workspace:packages/cli-packages/storybook"
   dependencies:
-    "@redwoodjs/cli-helpers": 6.0.2
-    "@redwoodjs/project-config": 6.0.2
-    "@redwoodjs/telemetry": 6.0.2
+    "@redwoodjs/cli-helpers": 6.0.3
+    "@redwoodjs/project-config": 6.0.3
+    "@redwoodjs/telemetry": 6.0.3
     "@storybook/addon-a11y": 7.1.1
     "@storybook/addon-docs": 7.1.1
     "@storybook/addon-essentials": 7.1.1
@@ -7264,7 +7264,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@redwoodjs/cli@6.0.2, @redwoodjs/cli@workspace:packages/cli":
+"@redwoodjs/cli@6.0.3, @redwoodjs/cli@workspace:packages/cli":
   version: 0.0.0-use.local
   resolution: "@redwoodjs/cli@workspace:packages/cli"
   dependencies:
@@ -7279,14 +7279,14 @@ __metadata:
     "@opentelemetry/sdk-trace-node": 1.15.0
     "@opentelemetry/semantic-conventions": 1.15.0
     "@prisma/internals": 5.0.0
-    "@redwoodjs/api-server": 6.0.2
-    "@redwoodjs/cli-helpers": 6.0.2
-    "@redwoodjs/fastify": 6.0.2
-    "@redwoodjs/internal": 6.0.2
-    "@redwoodjs/prerender": 6.0.2
-    "@redwoodjs/project-config": 6.0.2
-    "@redwoodjs/structure": 6.0.2
-    "@redwoodjs/telemetry": 6.0.2
+    "@redwoodjs/api-server": 6.0.3
+    "@redwoodjs/cli-helpers": 6.0.3
+    "@redwoodjs/fastify": 6.0.3
+    "@redwoodjs/internal": 6.0.3
+    "@redwoodjs/prerender": 6.0.3
+    "@redwoodjs/project-config": 6.0.3
+    "@redwoodjs/structure": 6.0.3
+    "@redwoodjs/telemetry": 6.0.3
     "@types/crypto-js": 4.1.1
     "@types/secure-random-password": 0.2.1
     boxen: 5.1.2
@@ -7345,7 +7345,7 @@ __metadata:
     "@babel/runtime-corejs3": 7.22.6
     "@babel/traverse": 7.22.8
     "@iarna/toml": 2.2.5
-    "@redwoodjs/project-config": 6.0.2
+    "@redwoodjs/project-config": 6.0.3
     "@svgr/core": 8.0.0
     "@svgr/plugin-jsx": 8.0.1
     "@types/babel__core": 7.20.1
@@ -7391,11 +7391,11 @@ __metadata:
     "@babel/preset-typescript": 7.22.5
     "@babel/runtime-corejs3": 7.22.6
     "@pmmmwh/react-refresh-webpack-plugin": 0.5.10
-    "@redwoodjs/cli": 6.0.2
-    "@redwoodjs/eslint-config": 6.0.2
-    "@redwoodjs/internal": 6.0.2
-    "@redwoodjs/project-config": 6.0.2
-    "@redwoodjs/testing": 6.0.2
+    "@redwoodjs/cli": 6.0.3
+    "@redwoodjs/eslint-config": 6.0.3
+    "@redwoodjs/internal": 6.0.3
+    "@redwoodjs/project-config": 6.0.3
+    "@redwoodjs/testing": 6.0.3
     "@types/lodash": 4.14.195
     babel-loader: 9.1.3
     babel-plugin-auto-import: 1.1.0
@@ -7446,7 +7446,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@redwoodjs/eslint-config@6.0.2, @redwoodjs/eslint-config@workspace:packages/eslint-config":
+"@redwoodjs/eslint-config@6.0.3, @redwoodjs/eslint-config@workspace:packages/eslint-config":
   version: 0.0.0-use.local
   resolution: "@redwoodjs/eslint-config@workspace:packages/eslint-config"
   dependencies:
@@ -7454,9 +7454,9 @@ __metadata:
     "@babel/core": 7.22.9
     "@babel/eslint-parser": 7.22.9
     "@babel/eslint-plugin": 7.22.5
-    "@redwoodjs/eslint-plugin": 6.0.2
-    "@redwoodjs/internal": 6.0.2
-    "@redwoodjs/project-config": 6.0.2
+    "@redwoodjs/eslint-plugin": 6.0.3
+    "@redwoodjs/internal": 6.0.3
+    "@redwoodjs/project-config": 6.0.3
     "@typescript-eslint/eslint-plugin": 5.61.0
     "@typescript-eslint/parser": 5.61.0
     eslint: 8.45.0
@@ -7475,7 +7475,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@redwoodjs/eslint-plugin@6.0.2, @redwoodjs/eslint-plugin@workspace:packages/eslint-plugin":
+"@redwoodjs/eslint-plugin@6.0.3, @redwoodjs/eslint-plugin@workspace:packages/eslint-plugin":
   version: 0.0.0-use.local
   resolution: "@redwoodjs/eslint-plugin@workspace:packages/eslint-plugin"
   dependencies:
@@ -7491,15 +7491,15 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@redwoodjs/fastify@6.0.2, @redwoodjs/fastify@workspace:packages/fastify":
+"@redwoodjs/fastify@6.0.3, @redwoodjs/fastify@workspace:packages/fastify":
   version: 0.0.0-use.local
   resolution: "@redwoodjs/fastify@workspace:packages/fastify"
   dependencies:
     "@fastify/http-proxy": 9.2.1
     "@fastify/static": 6.10.2
     "@fastify/url-data": 5.3.1
-    "@redwoodjs/graphql-server": 6.0.2
-    "@redwoodjs/project-config": 6.0.2
+    "@redwoodjs/graphql-server": 6.0.3
+    "@redwoodjs/project-config": 6.0.3
     "@types/aws-lambda": 8.10.119
     "@types/lodash": 4.14.195
     "@types/qs": 6.9.7
@@ -7544,7 +7544,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@redwoodjs/graphql-server@6.0.2, @redwoodjs/graphql-server@workspace:packages/graphql-server":
+"@redwoodjs/graphql-server@6.0.3, @redwoodjs/graphql-server@workspace:packages/graphql-server":
   version: 0.0.0-use.local
   resolution: "@redwoodjs/graphql-server@workspace:packages/graphql-server"
   dependencies:
@@ -7563,9 +7563,9 @@ __metadata:
     "@graphql-tools/schema": 10.0.0
     "@graphql-tools/utils": 10.0.1
     "@opentelemetry/api": 1.4.1
-    "@redwoodjs/api": 6.0.2
-    "@redwoodjs/project-config": 6.0.2
-    "@redwoodjs/realtime": 6.0.2
+    "@redwoodjs/api": 6.0.3
+    "@redwoodjs/project-config": 6.0.3
+    "@redwoodjs/realtime": 6.0.3
     "@types/jsonwebtoken": 9.0.2
     "@types/lodash": 4.14.195
     "@types/uuid": 9.0.2
@@ -7584,7 +7584,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@redwoodjs/internal@6.0.2, @redwoodjs/internal@workspace:packages/internal":
+"@redwoodjs/internal@6.0.3, @redwoodjs/internal@workspace:packages/internal":
   version: 0.0.0-use.local
   resolution: "@redwoodjs/internal@workspace:packages/internal"
   dependencies:
@@ -7606,8 +7606,8 @@ __metadata:
     "@graphql-codegen/typescript-operations": 3.0.4
     "@graphql-codegen/typescript-react-apollo": 3.3.7
     "@graphql-codegen/typescript-resolvers": 3.2.1
-    "@redwoodjs/graphql-server": 6.0.2
-    "@redwoodjs/project-config": 6.0.2
+    "@redwoodjs/graphql-server": 6.0.3
+    "@redwoodjs/project-config": 6.0.3
     "@sdl-codegen/node": 0.0.10
     "@types/babel-plugin-tester": 9.0.5
     "@types/babel__core": 7.20.1
@@ -7639,19 +7639,19 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@redwoodjs/prerender@6.0.2, @redwoodjs/prerender@workspace:packages/prerender":
+"@redwoodjs/prerender@6.0.3, @redwoodjs/prerender@workspace:packages/prerender":
   version: 0.0.0-use.local
   resolution: "@redwoodjs/prerender@workspace:packages/prerender"
   dependencies:
     "@babel/cli": 7.22.9
     "@babel/core": 7.22.9
     "@babel/runtime-corejs3": 7.22.6
-    "@redwoodjs/auth": 6.0.2
-    "@redwoodjs/internal": 6.0.2
-    "@redwoodjs/project-config": 6.0.2
-    "@redwoodjs/router": 6.0.2
-    "@redwoodjs/structure": 6.0.2
-    "@redwoodjs/web": 6.0.2
+    "@redwoodjs/auth": 6.0.3
+    "@redwoodjs/internal": 6.0.3
+    "@redwoodjs/project-config": 6.0.3
+    "@redwoodjs/router": 6.0.3
+    "@redwoodjs/structure": 6.0.3
+    "@redwoodjs/web": 6.0.3
     "@types/mime-types": 2.1.1
     "@whatwg-node/fetch": 0.9.7
     babel-plugin-ignore-html-and-css-imports: 0.1.0
@@ -7668,7 +7668,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@redwoodjs/project-config@6.0.2, @redwoodjs/project-config@workspace:packages/project-config":
+"@redwoodjs/project-config@6.0.3, @redwoodjs/project-config@workspace:packages/project-config":
   version: 0.0.0-use.local
   resolution: "@redwoodjs/project-config@workspace:packages/project-config"
   dependencies:
@@ -7683,7 +7683,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@redwoodjs/realtime@6.0.2, @redwoodjs/realtime@workspace:packages/realtime":
+"@redwoodjs/realtime@6.0.3, @redwoodjs/realtime@workspace:packages/realtime":
   version: 0.0.0-use.local
   resolution: "@redwoodjs/realtime@workspace:packages/realtime"
   dependencies:
@@ -7720,14 +7720,14 @@ __metadata:
     "@babel/runtime-corejs3": 7.22.6
     "@prisma/client": 5.0.0
     "@prisma/internals": 5.0.0
-    "@redwoodjs/project-config": 6.0.2
+    "@redwoodjs/project-config": 6.0.3
     core-js: 3.31.1
     esbuild: 0.18.16
     jest: 29.6.1
   languageName: unknown
   linkType: soft
 
-"@redwoodjs/router@6.0.2, @redwoodjs/router@workspace:packages/router":
+"@redwoodjs/router@6.0.3, @redwoodjs/router@workspace:packages/router":
   version: 0.0.0-use.local
   resolution: "@redwoodjs/router@workspace:packages/router"
   dependencies:
@@ -7735,7 +7735,7 @@ __metadata:
     "@babel/core": 7.22.9
     "@babel/runtime-corejs3": 7.22.6
     "@reach/skip-nav": 0.18.0
-    "@redwoodjs/auth": 6.0.2
+    "@redwoodjs/auth": 6.0.3
     "@types/react": 18.2.14
     "@types/react-dom": 18.2.6
     core-js: 3.31.1
@@ -7749,7 +7749,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@redwoodjs/structure@6.0.2, @redwoodjs/structure@workspace:packages/structure":
+"@redwoodjs/structure@6.0.3, @redwoodjs/structure@workspace:packages/structure":
   version: 0.0.0-use.local
   resolution: "@redwoodjs/structure@workspace:packages/structure"
   dependencies:
@@ -7758,7 +7758,7 @@ __metadata:
     "@babel/runtime-corejs3": 7.22.6
     "@iarna/toml": 2.2.5
     "@prisma/internals": 5.0.0
-    "@redwoodjs/project-config": 6.0.2
+    "@redwoodjs/project-config": 6.0.3
     "@types/fs-extra": 11.0.1
     "@types/line-column": 1.0.0
     "@types/lodash": 4.14.195
@@ -7799,8 +7799,8 @@ __metadata:
     "@fastify/http-proxy": 9.2.1
     "@fastify/static": 6.10.2
     "@fastify/url-data": 5.3.1
-    "@redwoodjs/internal": 6.0.2
-    "@redwoodjs/project-config": 6.0.2
+    "@redwoodjs/internal": 6.0.3
+    "@redwoodjs/project-config": 6.0.3
     "@types/aws-lambda": 8.10.119
     "@types/crypto-js": 4.1.1
     "@types/jsonwebtoken": 9.0.2
@@ -7835,15 +7835,15 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@redwoodjs/telemetry@6.0.2, @redwoodjs/telemetry@workspace:packages/telemetry":
+"@redwoodjs/telemetry@6.0.3, @redwoodjs/telemetry@workspace:packages/telemetry":
   version: 0.0.0-use.local
   resolution: "@redwoodjs/telemetry@workspace:packages/telemetry"
   dependencies:
     "@babel/cli": 7.22.9
     "@babel/core": 7.22.9
     "@babel/runtime-corejs3": 7.22.6
-    "@redwoodjs/project-config": 6.0.2
-    "@redwoodjs/structure": 6.0.2
+    "@redwoodjs/project-config": 6.0.3
+    "@redwoodjs/structure": 6.0.3
     "@types/envinfo": 7.8.1
     "@types/uuid": 9.0.2
     "@types/yargs": 17.0.24
@@ -7858,19 +7858,19 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@redwoodjs/testing@6.0.2, @redwoodjs/testing@workspace:packages/testing":
+"@redwoodjs/testing@6.0.3, @redwoodjs/testing@workspace:packages/testing":
   version: 0.0.0-use.local
   resolution: "@redwoodjs/testing@workspace:packages/testing"
   dependencies:
     "@babel/cli": 7.22.9
     "@babel/core": 7.22.9
     "@babel/runtime-corejs3": 7.22.6
-    "@redwoodjs/auth": 6.0.2
-    "@redwoodjs/graphql-server": 6.0.2
-    "@redwoodjs/internal": 6.0.2
-    "@redwoodjs/project-config": 6.0.2
-    "@redwoodjs/router": 6.0.2
-    "@redwoodjs/web": 6.0.2
+    "@redwoodjs/auth": 6.0.3
+    "@redwoodjs/graphql-server": 6.0.3
+    "@redwoodjs/internal": 6.0.3
+    "@redwoodjs/project-config": 6.0.3
+    "@redwoodjs/router": 6.0.3
+    "@redwoodjs/web": 6.0.3
     "@testing-library/jest-dom": 5.16.5
     "@testing-library/react": 14.0.0
     "@testing-library/user-event": 14.4.3
@@ -7895,7 +7895,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@redwoodjs/tui@6.0.2, @redwoodjs/tui@workspace:packages/tui":
+"@redwoodjs/tui@6.0.3, @redwoodjs/tui@workspace:packages/tui":
   version: 0.0.0-use.local
   resolution: "@redwoodjs/tui@workspace:packages/tui"
   dependencies:
@@ -7915,8 +7915,8 @@ __metadata:
   dependencies:
     "@babel/cli": 7.22.9
     "@babel/runtime-corejs3": 7.22.6
-    "@redwoodjs/internal": 6.0.2
-    "@redwoodjs/project-config": 6.0.2
+    "@redwoodjs/internal": 6.0.3
+    "@redwoodjs/project-config": 6.0.3
     "@types/yargs-parser": 21.0.0
     "@vitejs/plugin-react": 4.0.3
     buffer: 6.0.3
@@ -7933,7 +7933,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@redwoodjs/web@6.0.2, @redwoodjs/web@workspace:packages/web":
+"@redwoodjs/web@6.0.3, @redwoodjs/web@workspace:packages/web":
   version: 0.0.0-use.local
   resolution: "@redwoodjs/web@workspace:packages/web"
   dependencies:
@@ -7941,7 +7941,7 @@ __metadata:
     "@babel/cli": 7.22.9
     "@babel/core": 7.22.9
     "@babel/runtime-corejs3": 7.22.6
-    "@redwoodjs/auth": 6.0.2
+    "@redwoodjs/auth": 6.0.3
     "@testing-library/jest-dom": 5.16.5
     "@testing-library/react": 14.0.0
     "@types/prop-types": 15.7.5
@@ -14789,7 +14789,7 @@ __metadata:
     "@opentelemetry/resources": 1.15.0
     "@opentelemetry/sdk-trace-node": 1.15.0
     "@opentelemetry/semantic-conventions": 1.15.0
-    "@redwoodjs/tui": 6.0.2
+    "@redwoodjs/tui": 6.0.3
     "@types/babel__core": 7.20.1
     chalk: 4.1.2
     check-node-version: 4.2.1

From f3cde6464d3844f64bc4a7ff6ea2dc4e7e5802bf Mon Sep 17 00:00:00 2001
From: Cristi Ciobanu <c-ciobanu@protonmail.com>
Date: Fri, 4 Aug 2023 20:54:50 +0200
Subject: [PATCH 06/12] Docs: remove useless code in code snippet (#8990)

The paragraph above this code block says:
`We're not going to let anyone update or delete a message, so we can
remove those fields completely. Here's what the SDL file looks like
after the changes:`
Everything is removed from the code block except the
`UpdateContactInput` that is not gonna be used by anything. This is just
for the TS file, the JS file has the `UpdateContactInput` removed
correctly.
---
 docs/docs/tutorial/chapter3/saving-data.md | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/docs/docs/tutorial/chapter3/saving-data.md b/docs/docs/tutorial/chapter3/saving-data.md
index f6a2a3c1ffc1..67b8c1f8de47 100644
--- a/docs/docs/tutorial/chapter3/saving-data.md
+++ b/docs/docs/tutorial/chapter3/saving-data.md
@@ -239,12 +239,6 @@ export const schema = gql`
     message: String!
   }
 
-  input UpdateContactInput {
-    name: String
-    email: String
-    message: String
-  }
-
   // highlight-start
   type Mutation {
     createContact(input: CreateContactInput!): Contact! @skipAuth

From cb860440786c2e283d2932980e33fbeb5289388b Mon Sep 17 00:00:00 2001
From: Daniel Choudhury <dannychoudhury@gmail.com>
Date: Sat, 5 Aug 2023 01:55:27 +0700
Subject: [PATCH 07/12] docs(fonts): Update @font-face recommendation (#8986)

Updates the docs to suggest using the absolute path from public as root

---------

Co-authored-by: Tobbe Lundberg <tobbe@tlundberg.com>
---
 docs/docs/assets-and-files.md                 | 22 ++++++++++++++-----
 .../version-6.0/assets-and-files.md           | 22 +++++++++++++++----
 2 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/docs/docs/assets-and-files.md b/docs/docs/assets-and-files.md
index 302143fe5add..785f92861ef5 100644
--- a/docs/docs/assets-and-files.md
+++ b/docs/docs/assets-and-files.md
@@ -145,24 +145,36 @@ export const CarIcon = (props: SVGProps) => {
 If you needed to convert a whole library of SVGs into stylable (or animatable!) components, one easy way would be to use the [SVGR cli](https://react-svgr.com/docs/cli/)
 
 
-
 ## Custom fonts
 There are many different ways to peel this potato – it's all a search away – but if you're using the CSS `@font-face` rule, we have a quick tip for you:
 
 1. Place your fonts in the public folder, so it gets carried across
-2. In your CSS, use relative paths to point to the font file, for example:
+2. In your CSS, use absolute paths - the public folder being your root - to point to the font file (same as the [Vite docs](https://vitejs.dev/guide/assets.html#the-public-directory)), for example:
+
+```shell
+web/
+├── src
+  ├── App.tsx
+  ├── entry.client.tsx
+  ├── index.css
+  ├── ...
+├── public
+│   ├── favicon.png
+│   ├── fonts
+// highlight-next-line
+│   │   └── RedwoodNeue.woff2
+```
 
 ```css
-/* in some CSS file you are loading in your project */
+/* in e.g. index.css */
 @font-face {
   font-family: 'Redwood Neue';
   /* 👇 it's a relative path */
   // highlight-next-line
-  src: url('../../public/fonts/RedwoodNeue.woff2')
+  src: url('/fonts/RedwoodNeue.woff2')
     format('woff2');
   font-weight: 300;
   font-style: italic;
   ascent-override: 97%;
 }
 ```
-This will make sure that the fonts are being loaded correctly across your dev server and storybook – where there are subtle differences in how paths are processed.
diff --git a/docs/versioned_docs/version-6.0/assets-and-files.md b/docs/versioned_docs/version-6.0/assets-and-files.md
index 302143fe5add..c2a70ef92596 100644
--- a/docs/versioned_docs/version-6.0/assets-and-files.md
+++ b/docs/versioned_docs/version-6.0/assets-and-files.md
@@ -150,19 +150,33 @@ If you needed to convert a whole library of SVGs into stylable (or animatable!)
 There are many different ways to peel this potato – it's all a search away – but if you're using the CSS `@font-face` rule, we have a quick tip for you:
 
 1. Place your fonts in the public folder, so it gets carried across
-2. In your CSS, use relative paths to point to the font file, for example:
+2. In your CSS, use absolute paths - the public folder being your root - to point to the font file (same as the [Vite docs](https://vitejs.dev/guide/assets.html#the-public-directory)), for example:
+
+
+```shell
+web/
+├── src
+  ├── App.tsx
+  ├── entry.client.tsx
+  ├── index.css
+  ├── ...
+├── public
+│   ├── favicon.png
+│   ├── fonts
+// highlight-next-line
+│   │   └── RedwoodNeue.woff2
+```
 
 ```css
-/* in some CSS file you are loading in your project */
+/* in e.g. index.css */
 @font-face {
   font-family: 'Redwood Neue';
   /* 👇 it's a relative path */
   // highlight-next-line
-  src: url('../../public/fonts/RedwoodNeue.woff2')
+  src: url('/fonts/RedwoodNeue.woff2')
     format('woff2');
   font-weight: 300;
   font-style: italic;
   ascent-override: 97%;
 }
 ```
-This will make sure that the fonts are being loaded correctly across your dev server and storybook – where there are subtle differences in how paths are processed.

From d255c0052ea2001eb03c67860c2d3c48cf19b5ea Mon Sep 17 00:00:00 2001
From: Daniel Choudhury <dannychoudhury@gmail.com>
Date: Mon, 7 Aug 2023 12:13:05 +0700
Subject: [PATCH 08/12] Fix portal head not rendering on the server

---
 packages/vite/ambient.d.ts                    | 16 +++++++--
 packages/vite/src/devFeServer.ts              | 10 +++---
 packages/vite/src/runFeServer.ts              |  7 ++--
 packages/vite/src/runRscFeServer.ts           |  5 +--
 .../vite/src/streaming/registerGlobals.ts     | 34 +++++++++++++++++++
 .../vite/src/{ => streaming}/streamHelpers.ts |  0
 .../src/{ => streaming}/triggerRouteHooks.ts  |  0
 packages/web/src/components/MetaTags.tsx      |  1 +
 packages/web/src/components/PortalHead.tsx    |  2 ++
 packages/web/src/components/ServerInject.tsx  |  8 +++--
 10 files changed, 68 insertions(+), 15 deletions(-)
 create mode 100644 packages/vite/src/streaming/registerGlobals.ts
 rename packages/vite/src/{ => streaming}/streamHelpers.ts (100%)
 rename packages/vite/src/{ => streaming}/triggerRouteHooks.ts (100%)

diff --git a/packages/vite/ambient.d.ts b/packages/vite/ambient.d.ts
index 9857529d3b60..da81612adf7a 100644
--- a/packages/vite/ambient.d.ts
+++ b/packages/vite/ambient.d.ts
@@ -3,12 +3,22 @@
 import type { HelmetServerState } from 'react-helmet-async'
 
 declare global {
+  // Provided by Vite.config, or Webpack in the user's project
+  // but "regsitered" in packages/vite/src/streaming/registerGlobals.ts
+  // for it to be available to framework code
   var RWJS_ENV: {
-    RWJS_API_GRAPHQL_URL?: string
+    RWJS_API_GRAPHQL_URL: string
     /** URL or absolute path to serverless functions */
-    RWJS_API_URL?: string
+    RWJS_API_URL: string
+    RWJS_EXP_STREAMING_SSR: boolean
+    RWJS_EXP_RSC: boolean
 
-    __REDWOOD__APP_TITLE?: string
+    __REDWOOD__APP_TITLE: string
+  }
+
+  var RWJS_DEBUG_ENV: {
+    RWJS_SRC_ROOT: string
+    REDWOOD_ENV_EDITOR: string
   }
 
   var __REDWOOD__PRERENDER_PAGES: any
diff --git a/packages/vite/src/devFeServer.ts b/packages/vite/src/devFeServer.ts
index 1ddbe1ecb414..6504de2fc178 100644
--- a/packages/vite/src/devFeServer.ts
+++ b/packages/vite/src/devFeServer.ts
@@ -8,19 +8,19 @@ import { getAppRouteHook, getConfig, getPaths } from '@redwoodjs/project-config'
 import { matchPath } from '@redwoodjs/router'
 import type { TagDescriptor } from '@redwoodjs/web'
 
-import { reactRenderToStream } from './streamHelpers'
-import { loadAndRunRouteHooks } from './triggerRouteHooks'
+import { registerFwGlobals } from './streaming/registerGlobals'
+import { reactRenderToStream } from './streaming/streamHelpers'
+import { loadAndRunRouteHooks } from './streaming/triggerRouteHooks'
 import { ensureProcessDirWeb, stripQueryStringAndHashFromPath } from './utils'
 
-// These values are defined in the vite.config.ts
-globalThis.RWJS_ENV = {}
-
 // TODO (STREAMING) Just so it doesn't error out. Not sure how to handle this.
 globalThis.__REDWOOD__PRERENDER_PAGES = {}
 
 async function createServer() {
   ensureProcessDirWeb()
 
+  registerFwGlobals()
+
   const app = express()
   const rwPaths = getPaths()
 
diff --git a/packages/vite/src/runFeServer.ts b/packages/vite/src/runFeServer.ts
index a2e9eff85687..3170de8eb25b 100644
--- a/packages/vite/src/runFeServer.ts
+++ b/packages/vite/src/runFeServer.ts
@@ -18,12 +18,11 @@ import { getConfig, getPaths } from '@redwoodjs/project-config'
 import { matchPath } from '@redwoodjs/router'
 import type { TagDescriptor } from '@redwoodjs/web'
 
-import { loadAndRunRouteHooks } from './triggerRouteHooks'
+import { registerFwGlobals } from './streaming/registerGlobals'
+import { loadAndRunRouteHooks } from './streaming/triggerRouteHooks'
 import { RWRouteManifest } from './types'
 import { stripQueryStringAndHashFromPath } from './utils'
 
-globalThis.RWJS_ENV = {}
-
 /**
  * TODO (STREAMING)
  * We have this server in the vite package only temporarily.
@@ -50,6 +49,8 @@ export async function runFeServer() {
   const rwPaths = getPaths()
   const rwConfig = getConfig()
 
+  registerFwGlobals()
+
   // TODO When https://github.com/tc39/proposal-import-attributes and
   // https://github.com/microsoft/TypeScript/issues/53656 have both landed we
   // should try to do this instead:
diff --git a/packages/vite/src/runRscFeServer.ts b/packages/vite/src/runRscFeServer.ts
index 1b62b7533996..af4cde8bb392 100644
--- a/packages/vite/src/runRscFeServer.ts
+++ b/packages/vite/src/runRscFeServer.ts
@@ -15,10 +15,9 @@ import type { Manifest as ViteBuildManifest } from 'vite'
 
 import { getConfig, getPaths } from '@redwoodjs/project-config'
 
+import { registerFwGlobals } from './streaming/registerGlobals'
 import { renderRSC, setClientEntries } from './waku-lib/rsc-handler-worker'
 
-globalThis.RWJS_ENV = {}
-
 /**
  * TODO (STREAMING)
  * We have this server in the vite package only temporarily.
@@ -45,6 +44,8 @@ export async function runFeServer() {
   const rwPaths = getPaths()
   const rwConfig = getConfig()
 
+  registerFwGlobals()
+
   await setClientEntries('load')
 
   // TODO When https://github.com/tc39/proposal-import-attributes and
diff --git a/packages/vite/src/streaming/registerGlobals.ts b/packages/vite/src/streaming/registerGlobals.ts
new file mode 100644
index 000000000000..fd21a2855dc5
--- /dev/null
+++ b/packages/vite/src/streaming/registerGlobals.ts
@@ -0,0 +1,34 @@
+import path from 'node:path'
+
+import { getConfig, getPaths } from '@redwoodjs/project-config'
+
+/**
+ * Use this function on the web server
+ *
+ * Because although this is defined in Vite/index.ts
+ * They are only available in the user's code (and not in FW code)
+ * because define STATICALLY replaces it in user's code, not in node_modules
+ *
+ * It's still available on the client side though, probably because its processed by Vite
+ */
+export const registerFwGlobals = () => {
+  const rwConfig = getConfig()
+  const rwPaths = getPaths()
+
+  globalThis.RWJS_ENV = {
+    // @NOTE we're avoiding process.env here, unlike webpack
+    RWJS_API_GRAPHQL_URL:
+      rwConfig.web.apiGraphQLUrl ?? rwConfig.web.apiUrl + '/graphql',
+    RWJS_API_URL: rwConfig.web.apiUrl,
+    __REDWOOD__APP_TITLE: rwConfig.web.title || path.basename(rwPaths.base),
+    RWJS_EXP_STREAMING_SSR:
+      rwConfig.experimental.streamingSsr &&
+      rwConfig.experimental.streamingSsr.enabled,
+    RWJS_EXP_RSC: rwConfig.experimental?.rsc?.enabled,
+  }
+
+  globalThis.RWJS_DEBUG_ENV = {
+    RWJS_SRC_ROOT: rwPaths.web.src,
+    REDWOOD_ENV_EDITOR: JSON.stringify(process.env.REDWOOD_ENV_EDITOR),
+  }
+}
diff --git a/packages/vite/src/streamHelpers.ts b/packages/vite/src/streaming/streamHelpers.ts
similarity index 100%
rename from packages/vite/src/streamHelpers.ts
rename to packages/vite/src/streaming/streamHelpers.ts
diff --git a/packages/vite/src/triggerRouteHooks.ts b/packages/vite/src/streaming/triggerRouteHooks.ts
similarity index 100%
rename from packages/vite/src/triggerRouteHooks.ts
rename to packages/vite/src/streaming/triggerRouteHooks.ts
diff --git a/packages/web/src/components/MetaTags.tsx b/packages/web/src/components/MetaTags.tsx
index 1b1c5ebd492f..4b6ed0d92c61 100644
--- a/packages/web/src/components/MetaTags.tsx
+++ b/packages/web/src/components/MetaTags.tsx
@@ -86,6 +86,7 @@ export const MetaTags = (props: MetaTagsProps) => {
   let Head: typeof HelmetHead | typeof PortalHead = HelmetHead
 
   if (RWJS_ENV.RWJS_EXP_STREAMING_SSR) {
+    console.log('xxxxx using portal head')
     Head = PortalHead
   }
 
diff --git a/packages/web/src/components/PortalHead.tsx b/packages/web/src/components/PortalHead.tsx
index 78e710d54c49..829c1ccc5687 100644
--- a/packages/web/src/components/PortalHead.tsx
+++ b/packages/web/src/components/PortalHead.tsx
@@ -4,6 +4,8 @@ import { useServerInsertedHTML } from './ServerInject'
 
 const PortalHead: React.FC<React.PropsWithChildren> = ({ children }) => {
   useServerInsertedHTML(() => {
+    // @TODO this component should be wrapped in: document.head.append()
+    // because its possible for meta tags to be rendered after <head> is closed
     return children
   })
 
diff --git a/packages/web/src/components/ServerInject.tsx b/packages/web/src/components/ServerInject.tsx
index 93c011579deb..e5d8aec06c3a 100644
--- a/packages/web/src/components/ServerInject.tsx
+++ b/packages/web/src/components/ServerInject.tsx
@@ -1,4 +1,4 @@
-import React, { Fragment, ReactNode, useContext } from 'react'
+import React, { Fragment, ReactNode, useContext, useId } from 'react'
 
 /**
  *
@@ -51,8 +51,12 @@ export const ServerInjectedHtml = ({
     injectionState.delete(callback)
   }
 
+  const fragmentId = useId()
+
   return serverInsertedHtml.map((html, i) => {
-    return <Fragment key={`rwjs-server-injected-${i}`}>{html}</Fragment>
+    return (
+      <Fragment key={`rw-server-inserted-${fragmentId}-${i}`}>{html}</Fragment>
+    )
   })
 }
 

From 8622bd28b3b70067e913cdffdc3276e3c34aa1f1 Mon Sep 17 00:00:00 2001
From: Daniel Choudhury <dannychoudhury@gmail.com>
Date: Mon, 7 Aug 2023 12:22:14 +0700
Subject: [PATCH 09/12] Use node path for consistency

---
 packages/vite/src/streaming/streamHelpers.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/vite/src/streaming/streamHelpers.ts b/packages/vite/src/streaming/streamHelpers.ts
index 89ea16ffef83..818eb0bb0dbc 100644
--- a/packages/vite/src/streaming/streamHelpers.ts
+++ b/packages/vite/src/streaming/streamHelpers.ts
@@ -1,5 +1,5 @@
+import path from 'node:path'
 import { Writable } from 'node:stream'
-import path from 'path'
 
 import React from 'react'
 

From a00f6c2a1510c604293088baeba4905b5c9a75d3 Mon Sep 17 00:00:00 2001
From: Daniel Choudhury <dannychoudhury@gmail.com>
Date: Mon, 7 Aug 2023 17:53:33 +0700
Subject: [PATCH 10/12] More suggestions, fix wrong path on reactRefresh script

---
 packages/vite/src/devFeServer.ts                 | 11 +++++++----
 packages/vite/src/streaming/streamHelpers.ts     |  4 ++--
 packages/vite/src/streaming/triggerRouteHooks.ts |  2 +-
 packages/web/ambient.d.ts                        |  5 +++++
 packages/web/src/components/MetaTags.tsx         |  1 -
 packages/web/src/components/ServerInject.tsx     | 11 +++++++++++
 packages/web/src/components/htmlTags.tsx         | 14 +++++++++-----
 7 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/packages/vite/src/devFeServer.ts b/packages/vite/src/devFeServer.ts
index 6504de2fc178..20c3c2885d95 100644
--- a/packages/vite/src/devFeServer.ts
+++ b/packages/vite/src/devFeServer.ts
@@ -8,7 +8,7 @@ import { getAppRouteHook, getConfig, getPaths } from '@redwoodjs/project-config'
 import { matchPath } from '@redwoodjs/router'
 import type { TagDescriptor } from '@redwoodjs/web'
 
-import { registerFwGlobals } from './streaming/registerGlobals'
+// import { registerFwGlobals } from './streaming/registerGlobals'
 import { reactRenderToStream } from './streaming/streamHelpers'
 import { loadAndRunRouteHooks } from './streaming/triggerRouteHooks'
 import { ensureProcessDirWeb, stripQueryStringAndHashFromPath } from './utils'
@@ -16,10 +16,13 @@ import { ensureProcessDirWeb, stripQueryStringAndHashFromPath } from './utils'
 // TODO (STREAMING) Just so it doesn't error out. Not sure how to handle this.
 globalThis.__REDWOOD__PRERENDER_PAGES = {}
 
+// @ts-expect-error bazinga
+globalThis.RWJS_ENV = {}
+
 async function createServer() {
   ensureProcessDirWeb()
 
-  registerFwGlobals()
+  // registerFwGlobals()
 
   const app = express()
   const rwPaths = getPaths()
@@ -51,8 +54,6 @@ async function createServer() {
     const currentPathName = stripQueryStringAndHashFromPath(req.originalUrl)
     globalThis.__REDWOOD__HELMET_CONTEXT = {}
 
-    res.setHeader('content-type', 'text/html; charset=utf-8')
-
     try {
       const routes = getProjectRoutes()
 
@@ -112,6 +113,8 @@ async function createServer() {
 
       const pageWithJs = currentRoute?.renderMode !== 'html'
 
+      res.setHeader('content-type', 'text/html; charset=utf-8')
+
       reactRenderToStream({
         ServerEntry,
         currentPathName,
diff --git a/packages/vite/src/streaming/streamHelpers.ts b/packages/vite/src/streaming/streamHelpers.ts
index 818eb0bb0dbc..bed2ad5bccf0 100644
--- a/packages/vite/src/streaming/streamHelpers.ts
+++ b/packages/vite/src/streaming/streamHelpers.ts
@@ -33,7 +33,7 @@ export function reactRenderToStream({
   const rwPaths = getPaths()
 
   const bootstrapModules = [
-    path.join(__dirname, '../inject', 'reactRefresh.js'),
+    path.join(__dirname, '../../inject', 'reactRefresh.js'),
   ]
 
   if (includeJs) {
@@ -78,7 +78,7 @@ export function reactRenderToStream({
     ),
     {
       bootstrapScriptContent: includeJs
-        ? `window.__assetMap = function() { return ${assetMap} }`
+        ? `window.__REDWOOD__ASSET_MAP = ${assetMap}`
         : undefined,
       bootstrapModules,
       onShellReady() {
diff --git a/packages/vite/src/streaming/triggerRouteHooks.ts b/packages/vite/src/streaming/triggerRouteHooks.ts
index af383255df44..285bcd0c6cd3 100644
--- a/packages/vite/src/streaming/triggerRouteHooks.ts
+++ b/packages/vite/src/streaming/triggerRouteHooks.ts
@@ -112,6 +112,6 @@ export const loadAndRunRouteHooks = async ({
     }
   } catch (e) {
     console.error(`Error loading route hooks in ${routeHookPath}}`)
-    throw new Error(e as any)
+    throw e
   }
 }
diff --git a/packages/web/ambient.d.ts b/packages/web/ambient.d.ts
index e452d2016432..151c7972b58a 100644
--- a/packages/web/ambient.d.ts
+++ b/packages/web/ambient.d.ts
@@ -8,6 +8,11 @@ declare global {
   var __REDWOOD__APP_TITLE: string
   var __REDWOOD__APOLLO_STATE: NormalizedCacheObject
 
+  var __REDWOOD__ASSET_MAP: {
+    css?: string[]
+    meta?: TagDescriptor[]
+  }
+
   // Provided by Vite.config, or Webpack in the user's project
   var RWJS_ENV: {
     RWJS_API_GRAPHQL_URL: string
diff --git a/packages/web/src/components/MetaTags.tsx b/packages/web/src/components/MetaTags.tsx
index 4b6ed0d92c61..1b1c5ebd492f 100644
--- a/packages/web/src/components/MetaTags.tsx
+++ b/packages/web/src/components/MetaTags.tsx
@@ -86,7 +86,6 @@ export const MetaTags = (props: MetaTagsProps) => {
   let Head: typeof HelmetHead | typeof PortalHead = HelmetHead
 
   if (RWJS_ENV.RWJS_EXP_STREAMING_SSR) {
-    console.log('xxxxx using portal head')
     Head = PortalHead
   }
 
diff --git a/packages/web/src/components/ServerInject.tsx b/packages/web/src/components/ServerInject.tsx
index e5d8aec06c3a..1e1819243dfd 100644
--- a/packages/web/src/components/ServerInject.tsx
+++ b/packages/web/src/components/ServerInject.tsx
@@ -69,3 +69,14 @@ export function useServerInsertedHTML(callback: () => React.ReactNode): void {
     addInsertedServerHTMLCallback(callback)
   }
 }
+
+// @TODO use this in streamHelpers final block
+export const AppendToHead = ({ tagsToAppend }: { tagsToAppend: string }) => {
+  return (
+    <script
+      dangerouslySetInnerHTML={{
+        __html: `document?.head.append(${tagsToAppend})`,
+      }}
+    />
+  )
+}
diff --git a/packages/web/src/components/htmlTags.tsx b/packages/web/src/components/htmlTags.tsx
index 57482830ece8..4763bfdd8d52 100644
--- a/packages/web/src/components/htmlTags.tsx
+++ b/packages/web/src/components/htmlTags.tsx
@@ -1,11 +1,13 @@
 import { Fragment } from 'react'
 /** CSS is a specialised metatag */
-export const Css = ({ css = [] }: { css: string[] }) => {
+export const Css = ({ css }: { css: string[] }) => {
+  const cssLinks = css || window?.__REDWOOD__ASSET_MAP?.css || []
+
   return (
     <>
-      {css.map((cssLinks, index) => {
+      {cssLinks.map((cssLink, index) => {
         return (
-          <link rel="stylesheet" key={`css-${index}`} href={`/${cssLinks}`} />
+          <link rel="stylesheet" key={`css-${index}`} href={`/${cssLink}`} />
         )
       })}
     </>
@@ -77,10 +79,12 @@ interface MetaProps {
   tags: TagDescriptor[] | undefined
 }
 
-export const Meta = ({ tags = [] }: MetaProps) => {
+export const Meta = ({ tags }: MetaProps) => {
+  const metaTags = tags || window?.__REDWOOD__ASSET_MAP?.meta || []
+
   return (
     <>
-      {tags.map((tag, index) => {
+      {metaTags.map((tag, index) => {
         if (!tag) {
           return null
         }

From f339c6c96c7ca700142d6c17d59cbfb0c2177b07 Mon Sep 17 00:00:00 2001
From: Daniel Choudhury <dannychoudhury@gmail.com>
Date: Mon, 7 Aug 2023 17:57:46 +0700
Subject: [PATCH 11/12] Update packages/vite/src/utils.ts

Co-authored-by: Dominic Saadi <dominiceliassaadi@gmail.com>
---
 packages/vite/src/utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/vite/src/utils.ts b/packages/vite/src/utils.ts
index 3430a17a32a1..e721c32177f3 100644
--- a/packages/vite/src/utils.ts
+++ b/packages/vite/src/utils.ts
@@ -11,7 +11,7 @@ export function ensureProcessDirWeb(webDir: string = getPaths().web.base) {
     console.error('⚠️  Warning: CWD is ', process.cwd())
     console.warn('~'.repeat(50))
     console.warn(
-      'The cwd must be web/. Please use invoke with yarn rw {command} or run the command from the web/ directory.'
+      'The cwd must be web/. Please use `yarn rw <command>` or run the command from the web/ directory.'
     )
     console.log(`Changing cwd to ${webDir}....`)
     console.log()

From 37a20a80fb2f7a348c7c9391248f2ac60a306156 Mon Sep 17 00:00:00 2001
From: Daniel Choudhury <dannychoudhury@gmail.com>
Date: Mon, 7 Aug 2023 17:58:22 +0700
Subject: [PATCH 12/12] Whoops

---
 packages/vite/src/devFeServer.ts | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/packages/vite/src/devFeServer.ts b/packages/vite/src/devFeServer.ts
index 20c3c2885d95..462ff2a1b9d0 100644
--- a/packages/vite/src/devFeServer.ts
+++ b/packages/vite/src/devFeServer.ts
@@ -8,7 +8,7 @@ import { getAppRouteHook, getConfig, getPaths } from '@redwoodjs/project-config'
 import { matchPath } from '@redwoodjs/router'
 import type { TagDescriptor } from '@redwoodjs/web'
 
-// import { registerFwGlobals } from './streaming/registerGlobals'
+import { registerFwGlobals } from './streaming/registerGlobals'
 import { reactRenderToStream } from './streaming/streamHelpers'
 import { loadAndRunRouteHooks } from './streaming/triggerRouteHooks'
 import { ensureProcessDirWeb, stripQueryStringAndHashFromPath } from './utils'
@@ -16,13 +16,10 @@ import { ensureProcessDirWeb, stripQueryStringAndHashFromPath } from './utils'
 // TODO (STREAMING) Just so it doesn't error out. Not sure how to handle this.
 globalThis.__REDWOOD__PRERENDER_PAGES = {}
 
-// @ts-expect-error bazinga
-globalThis.RWJS_ENV = {}
-
 async function createServer() {
   ensureProcessDirWeb()
 
-  // registerFwGlobals()
+  registerFwGlobals()
 
   const app = express()
   const rwPaths = getPaths()