From 612d9ffb418390e1aa5616dedcd261dc77185187 Mon Sep 17 00:00:00 2001
From: Daniel Choudhury <dannychoudhury@gmail.com>
Date: Thu, 26 Oct 2023 22:50:13 +0700
Subject: [PATCH 01/29] Setup handler now setups up apollo ssr

---
 .../cli/src/commands/experimental/setupStreamingSsrHandler.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/cli/src/commands/experimental/setupStreamingSsrHandler.js b/packages/cli/src/commands/experimental/setupStreamingSsrHandler.js
index 007e1bdf7b99..9c431b5a41f7 100644
--- a/packages/cli/src/commands/experimental/setupStreamingSsrHandler.js
+++ b/packages/cli/src/commands/experimental/setupStreamingSsrHandler.js
@@ -3,6 +3,7 @@ import path from 'path'
 
 import { Listr } from 'listr2'
 
+import { addWebPackages } from '@redwoodjs/cli-helpers'
 import { getConfigPath } from '@redwoodjs/project-config'
 import { errorTelemetry } from '@redwoodjs/telemetry'
 
@@ -158,6 +159,9 @@ export const handler = async ({ force, verbose }) => {
           })
         },
       },
+      addWebPackages([
+        '@apollo/experimental-nextjs-app-support@0.0.0-commit-b8a73fe',
+      ]),
       {
         task: () => {
           printTaskEpilogue(command, description, EXPERIMENTAL_TOPIC_ID)

From 03fda296166cfd14d6a248b1813dfb91be8bd17a Mon Sep 17 00:00:00 2001
From: Daniel Choudhury <dannychoudhury@gmail.com>
Date: Fri, 27 Oct 2023 00:02:42 +0700
Subject: [PATCH 02/29] Add ability to generate delayedPage and setup streaming
 experiment in test project

---
 tasks/test-project/codemods/delayedPage.js | 122 +++++++++++++++++++++
 tasks/test-project/tasks.js                |  78 ++++++++-----
 tasks/test-project/test-project            |  16 ++-
 tasks/test-project/tui-tasks.js            |  28 +----
 4 files changed, 192 insertions(+), 52 deletions(-)
 create mode 100644 tasks/test-project/codemods/delayedPage.js

diff --git a/tasks/test-project/codemods/delayedPage.js b/tasks/test-project/codemods/delayedPage.js
new file mode 100644
index 000000000000..1305fd650b4e
--- /dev/null
+++ b/tasks/test-project/codemods/delayedPage.js
@@ -0,0 +1,122 @@
+// @ts-check
+
+const delayedComponents = `
+function DelayedComponent({
+  time,
+  delays,
+}: {
+  time: number
+  delays: Map<number, Promise<void>>
+}) {
+  const logged = useRef(false)
+  if (typeof window === 'undefined') {
+    const delay =
+      delays.get(time) ??
+      new Promise<void>((resolve) => setTimeout(resolve, time * 1000))
+    delays.set(time, delay)
+    use(delay)
+
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    useServerInsertedHTML(() => {
+      if (!logged.current) {
+        logged.current = true
+        return (
+          <script
+            dangerouslySetInnerHTML={{
+              __html: 'console.log("delayed by \${time} seconds")',
+            }}
+          />
+        )
+      }
+      return <></>
+    })
+  }
+  return <>Delayed by {time} seconds</>
+}
+
+function DelayedStuff() {
+  const [delays] = useState(new Map<number, Promise<void>>())
+  return (
+    <>
+      <Suspense>
+        <DelayedComponent time={1} delays={delays} />
+        <br />
+      </Suspense>
+      <Suspense>
+        <DelayedComponent time={2} delays={delays} />
+        <br />
+      </Suspense>
+      <Suspense>
+        <DelayedComponent time={3} delays={delays} />
+        <br />
+      </Suspense>
+      <Suspense>
+        <DelayedComponent time={4} delays={delays} />
+        <br />
+      </Suspense>
+    </>
+  )
+}
+`
+
+const body = `
+{
+ return (
+  <>
+  <MetaTags title="Delayed" description="Delayed page" />
+
+  <h1>DelayedPage</h1>
+  <p>The following component will render over 4 seconds...</p>
+  <p>
+    Injecting to HTML and logging to console, once each second during
+    streaming-ssr
+  </p>
+  <DelayedStuff />
+ </>
+)
+}
+`
+
+export default (file, api) => {
+  const j = api.jscodeshift
+  const root = j(file.source)
+
+  const serverInjectImport = j.importDeclaration(
+    [j.importSpecifier(j.identifier('useServerInsertedHTML'))],
+    j.stringLiteral('@redwoodjs/web')
+  )
+
+  const reactImports = j.importDeclaration(
+    ['Suspense', 'useState', 'use', 'useRef'].map((importName) =>
+      j.importSpecifier(j.identifier(importName))
+    ),
+    j.stringLiteral('react')
+  )
+
+  root
+    .find(j.ImportDeclaration, {
+      source: {
+        type: 'Literal',
+        value: '@redwoodjs/router',
+      },
+    })
+    .remove()
+
+  root.find(j.VariableDeclaration).insertBefore(serverInjectImport)
+  root.find(j.VariableDeclaration).insertBefore(reactImports)
+  root.find(j.VariableDeclaration).insertBefore(delayedComponents)
+
+  return root
+    .find(j.VariableDeclarator, {
+      id: {
+        type: 'Identifier',
+        name: 'DelayedPage',
+      },
+    })
+    .replaceWith((nodePath) => {
+      const { node } = nodePath
+      node.init.body = body
+      return node
+    })
+    .toSource()
+}
diff --git a/tasks/test-project/tasks.js b/tasks/test-project/tasks.js
index 7a62ffe69ffa..21aef383bc1a 100644
--- a/tasks/test-project/tasks.js
+++ b/tasks/test-project/tasks.js
@@ -27,24 +27,22 @@ function fullPath(name, { addExtension } = { addExtension: true }) {
   return path.join(OUTPUT_PATH, name)
 }
 
-async function webTasks(outputPath, { linkWithLatestFwBuild, verbose }) {
-  OUTPUT_PATH = outputPath
+const createBuilder = (cmd) => {
+  return async function createItem(positionals) {
+    await execa(
+      cmd,
+      Array.isArray(positionals) ? positionals : [positionals],
+      getExecaOptions(OUTPUT_PATH)
+    )
+  }
+}
 
-  const execaOptions = getExecaOptions(outputPath)
+const createPage = createBuilder('yarn redwood g page')
 
-  const createBuilder = (cmd) => {
-    return async function createItem(positionals) {
-      await execa(
-        cmd,
-        Array.isArray(positionals) ? positionals : [positionals],
-        execaOptions
-      )
-    }
-  }
+async function webTasks(outputPath, { linkWithLatestFwBuild, verbose }) {
+  OUTPUT_PATH = outputPath
 
   const createPages = async () => {
-    const createPage = createBuilder('yarn redwood g page')
-
     return new Listr([
       {
         title: 'Creating home page',
@@ -342,18 +340,6 @@ async function addModel(schema) {
 async function apiTasks(outputPath, { verbose, linkWithLatestFwBuild }) {
   OUTPUT_PATH = outputPath
 
-  const execaOptions = getExecaOptions(outputPath)
-
-  const createBuilder = (cmd) => {
-    return async function createItem(positionals) {
-      await execa(
-        cmd,
-        Array.isArray(positionals) ? positionals : [positionals],
-        execaOptions
-      )
-    }
-  }
-
   const addDbAuth = async () => {
     // Temporarily disable postinstall script
     updatePkgJsonScripts({
@@ -748,7 +734,47 @@ export default DoublePage`
   )
 }
 
+/**
+ *
+ * Separates the streaming-ssr related steps. These are all web tasks,
+ * if we choose to move them later
+ * @param {string} outputPath
+ */
+async function streamingTasks(outputPath, { verbose }) {
+  OUTPUT_PATH = outputPath
+
+  const tasks = [
+    {
+      title: 'Creating Delayed suspense delayed page',
+      task: async () => {
+        await createPage('delayed')
+
+        await applyCodemod(
+          'delayedPage.js',
+          fullPath('web/src/pages/DelayedPage/DelayedPage')
+        )
+      },
+    },
+    {
+      title: 'Enable streaming-ssr experiment',
+      task: async () => {
+        const setupExperiment = createBuilder(
+          'yarn rw experimental setup-streaming-ssr'
+        )
+        await setupExperiment('--force')
+      },
+    },
+  ]
+
+  return new Listr(tasks, {
+    exitOnError: true,
+    renderer: verbose && 'verbose',
+    renderOptions: { collapseSubtasks: false },
+  })
+}
+
 module.exports = {
   apiTasks,
   webTasks,
+  streamingTasks,
 }
diff --git a/tasks/test-project/test-project b/tasks/test-project/test-project
index d6e300a8cc2e..4716aba566b4 100755
--- a/tasks/test-project/test-project
+++ b/tasks/test-project/test-project
@@ -16,7 +16,7 @@ const {
   addFrameworkDepsToProject,
   copyFrameworkPackages,
 } = require('./frameworkLinking')
-const { webTasks, apiTasks } = require('./tasks')
+const { webTasks, apiTasks, streamingTasks } = require('./tasks')
 const {
   getExecaOptions,
   updatePkgJsonScripts,
@@ -41,6 +41,11 @@ const args = yargs(hideBin(process.argv))
     type: 'boolean',
     describe: 'Copy the test project from the __fixtures__ folder',
   })
+  .option('streamingSsr', {
+    default: false,
+    type: 'boolean',
+    describe: 'Enable streaming-ssr experiment (RW v7)',
+  })
   .option('rebuildFixture', {
     default: false,
     hidden: true,
@@ -74,6 +79,7 @@ const {
   copyFromFixture,
   rebuildFixture,
   javascript,
+  streamingSsr,
 } = args
 
 if (rebuildFixture) {
@@ -263,6 +269,13 @@ const globalTasks = () =>
           }),
         enabled: () => !copyFromFixture,
       },
+      {
+        // These are also web tasks... we can move them into the webTasks function
+        // when streaming isn't experimental
+        title: 'Enabling streaming-ssr experiment and applying codemods....',
+        task: () => streamingTasks(OUTPUT_PROJECT_PATH, { verbose }),
+        enabled: () => streamingSsr,
+      },
       {
         title: 'Apply api codemods',
         task: () =>
@@ -339,6 +352,7 @@ const globalTasks = () =>
     ],
     {
       exitOnError: true,
+      // @ts-expect-error Allowed
       renderer: verbose && 'verbose',
       renderOptions: { collapseSubtasks: false },
     }
diff --git a/tasks/test-project/tui-tasks.js b/tasks/test-project/tui-tasks.js
index caa1e29336a4..8599baa81063 100644
--- a/tasks/test-project/tui-tasks.js
+++ b/tasks/test-project/tui-tasks.js
@@ -5,7 +5,7 @@ const path = require('path')
 
 const {
   getExecaOptions: utilGetExecaOptions,
-  // applyCodemod,
+  applyCodemod,
   updatePkgJsonScripts,
   exec,
 } = require('./util')
@@ -31,28 +31,6 @@ function fullPath(name, { addExtension } = { addExtension: true }) {
   return path.join(OUTPUT_PATH, name)
 }
 
-// TODO: Import from ./util.js when everything is using @rwjs/tui
-async function applyCodemod(codemod, target) {
-  const args = [
-    '--fail-on-error',
-    '-t',
-    `${path.resolve(__dirname, 'codemods', codemod)} ${target}`,
-    '--parser',
-    'tsx',
-    '--verbose=2',
-  ]
-
-  args.push()
-
-  const subprocess = exec(
-    'yarn jscodeshift',
-    args,
-    getExecaOptions(path.resolve(__dirname))
-  )
-
-  return subprocess
-}
-
 /**
  * @param {string} cmd The command to run
  * @returns {((positionalArguments: string | string[]) => import('execa').ExecaChildProcess<string>)
@@ -74,14 +52,14 @@ const createBuilder = (cmd) => {
   }
 }
 
+const createPage = createBuilder('yarn redwood g page')
+
 async function webTasks(outputPath, { linkWithLatestFwBuild }) {
   OUTPUT_PATH = outputPath
 
   const execaOptions = getExecaOptions(outputPath)
 
   const createPages = async () => {
-    const createPage = createBuilder('yarn redwood g page')
-
     /** @type import('./typing').TuiTaskList */
     const tuiTaskList = [
       {

From f140db5dbfd1cfeb0b56f6616b39b9beaca4a37e Mon Sep 17 00:00:00 2001
From: Daniel Choudhury <dannychoudhury@gmail.com>
Date: Fri, 27 Oct 2023 00:09:39 +0700
Subject: [PATCH 03/29] Undo tui-tasks change

---
 tasks/test-project/tui-tasks.js | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/tasks/test-project/tui-tasks.js b/tasks/test-project/tui-tasks.js
index 8599baa81063..caa1e29336a4 100644
--- a/tasks/test-project/tui-tasks.js
+++ b/tasks/test-project/tui-tasks.js
@@ -5,7 +5,7 @@ const path = require('path')
 
 const {
   getExecaOptions: utilGetExecaOptions,
-  applyCodemod,
+  // applyCodemod,
   updatePkgJsonScripts,
   exec,
 } = require('./util')
@@ -31,6 +31,28 @@ function fullPath(name, { addExtension } = { addExtension: true }) {
   return path.join(OUTPUT_PATH, name)
 }
 
+// TODO: Import from ./util.js when everything is using @rwjs/tui
+async function applyCodemod(codemod, target) {
+  const args = [
+    '--fail-on-error',
+    '-t',
+    `${path.resolve(__dirname, 'codemods', codemod)} ${target}`,
+    '--parser',
+    'tsx',
+    '--verbose=2',
+  ]
+
+  args.push()
+
+  const subprocess = exec(
+    'yarn jscodeshift',
+    args,
+    getExecaOptions(path.resolve(__dirname))
+  )
+
+  return subprocess
+}
+
 /**
  * @param {string} cmd The command to run
  * @returns {((positionalArguments: string | string[]) => import('execa').ExecaChildProcess<string>)
@@ -52,14 +74,14 @@ const createBuilder = (cmd) => {
   }
 }
 
-const createPage = createBuilder('yarn redwood g page')
-
 async function webTasks(outputPath, { linkWithLatestFwBuild }) {
   OUTPUT_PATH = outputPath
 
   const execaOptions = getExecaOptions(outputPath)
 
   const createPages = async () => {
+    const createPage = createBuilder('yarn redwood g page')
+
     /** @type import('./typing').TuiTaskList */
     const tuiTaskList = [
       {

From bebbe4706fbf867ff9ad511cde8145892450275c Mon Sep 17 00:00:00 2001
From: Daniel Choudhury <dannychoudhury@gmail.com>
Date: Fri, 27 Oct 2023 14:37:17 +0700
Subject: [PATCH 04/29] Add plugin to swap apollo provider

---
 packages/vite/src/index.ts                    |  3 +++
 .../__tests__/swap-apollo-provider.test.mts   | 18 +++++++++++++
 .../vite-plugin-swap-apollo-provider.ts       | 26 +++++++++++++++++++
 3 files changed, 47 insertions(+)
 create mode 100644 packages/vite/src/plugins/__tests__/swap-apollo-provider.test.mts
 create mode 100644 packages/vite/src/plugins/vite-plugin-swap-apollo-provider.ts

diff --git a/packages/vite/src/index.ts b/packages/vite/src/index.ts
index 6803a9a813a2..f394a266674e 100644
--- a/packages/vite/src/index.ts
+++ b/packages/vite/src/index.ts
@@ -10,6 +10,7 @@ import { getConfig, getPaths } from '@redwoodjs/project-config'
 
 import handleJsAsJsx from './plugins/vite-plugin-jsx-loader'
 import removeFromBundle from './plugins/vite-plugin-remove-from-bundle'
+import swapApolloProvider from './plugins/vite-plugin-swap-apollo-provider'
 
 /**
  * Pre-configured vite plugin, with required config for Redwood apps.
@@ -261,6 +262,8 @@ export default function redwoodPluginVite(): PluginOption[] {
         }
       },
     },
+    // We can remove when streaming is stable
+    rwConfig.experimental.streamingSsr.enabled && swapApolloProvider(),
     // -----------------
     handleJsAsJsx(),
     // Remove the splash-page from the bundle.
diff --git a/packages/vite/src/plugins/__tests__/swap-apollo-provider.test.mts b/packages/vite/src/plugins/__tests__/swap-apollo-provider.test.mts
new file mode 100644
index 000000000000..35f352a1e8fc
--- /dev/null
+++ b/packages/vite/src/plugins/__tests__/swap-apollo-provider.test.mts
@@ -0,0 +1,18 @@
+import assert from 'node:assert/strict'
+import { describe, it } from 'node:test'
+
+import plugin from '../vite-plugin-swap-apollo-provider.js'
+
+// @ts-expect-error node test not configured correctly
+const swapApolloProvider = plugin.default
+
+
+describe('excludeModule', () => {
+  it('should swap the import', async() => {
+    const plugin = swapApolloProvider()
+
+   const output = await plugin.transform(`import ApolloProvider from '@redwoodjs/web/apollo'`, '/Users/dac09/Experiments/ssr-2354/web/src/App.tsx')
+
+   assert.strictEqual(output, "import ApolloProvider from '@redwoodjs/web/dist/apollo/suspense'")
+})
+})
diff --git a/packages/vite/src/plugins/vite-plugin-swap-apollo-provider.ts b/packages/vite/src/plugins/vite-plugin-swap-apollo-provider.ts
new file mode 100644
index 000000000000..8f3742492b4c
--- /dev/null
+++ b/packages/vite/src/plugins/vite-plugin-swap-apollo-provider.ts
@@ -0,0 +1,26 @@
+import type { PluginOption } from 'vite'
+
+/**
+ *
+ * Temporary plugin, that swaps the ApolloProvider import with the Suspense enabled one,
+ * until it becomes stable.
+ *
+ * import { RedwoodApolloProvider } from "@redwoodjs/web/apollo" ->
+ * import { RedwoodApolloProvider } from "@redwoodjs/web/dist/apollo/suspense"
+ *
+ */
+export default function swapApolloProvider(): PluginOption {
+  return {
+    name: 'redwood-swap-apollo-provider',
+    async transform(code: string, id: string) {
+      if (/web\/src\/App\.(ts|tsx|js|jsx)$/.test(id)) {
+        return code.replace(
+          '@redwoodjs/web/apollo',
+          '@redwoodjs/web/dist/apollo/suspense'
+        )
+      }
+
+      return code
+    },
+  }
+}

From 3a34e87db18649486b093e3f9519ab712b312438 Mon Sep 17 00:00:00 2001
From: Daniel Choudhury <dannychoudhury@gmail.com>
Date: Fri, 27 Oct 2023 14:37:57 +0700
Subject: [PATCH 05/29] Swap localhost for 127.0.0.1 in production

---
 packages/vite/src/streaming/registerGlobals.ts | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/packages/vite/src/streaming/registerGlobals.ts b/packages/vite/src/streaming/registerGlobals.ts
index 1ace576f59b2..75d034636579 100644
--- a/packages/vite/src/streaming/registerGlobals.ts
+++ b/packages/vite/src/streaming/registerGlobals.ts
@@ -33,11 +33,11 @@ export const registerFwGlobals = () => {
       if (/^[a-zA-Z][a-zA-Z\d+\-.]*?:/.test(apiPath)) {
         return apiPath
       } else {
-        const proxiedApiUrl =
-          // NOTE: rwConfig.web.host defaults to "localhost", which is
-          //       troublesome in regards to IPv6/IPv4. So all the more
-          //       reason to set RWJS_EXP_SSR_GRAPHQL_ENDPOINT
+        // NOTE: rwConfig.web.host defaults to "localhost", which is
+        // When running in production, the api server does not listen on localhost
+        const proxiedApiUrl = swapLocalhostFor127(
           'http://' + rwConfig.web.host + ':' + rwConfig.web.port + apiPath
+        )
 
         if (
           process.env.NODE_ENV === 'production' &&
@@ -47,9 +47,7 @@ export const registerFwGlobals = () => {
           console.warn()
           console.warn()
 
-          console.warn(
-            `You haven't configured your API absolute url. Localhost is unlikely to work in production`
-          )
+          console.warn(`You haven't configured your API absolute url.`)
 
           console.warn(`Using ${proxiedApiUrl}`)
           console.warn()
@@ -64,7 +62,7 @@ export const registerFwGlobals = () => {
           return proxiedApiUrl
         }
 
-        return (
+        return swapLocalhostFor127(
           (process.env.RWJS_EXP_SSR_GRAPHQL_ENDPOINT as string) ?? proxiedApiUrl
         )
       }
@@ -76,3 +74,7 @@ export const registerFwGlobals = () => {
     REDWOOD_ENV_EDITOR: JSON.stringify(process.env.REDWOOD_ENV_EDITOR),
   }
 }
+
+function swapLocalhostFor127(hostString: string) {
+  return hostString.replace('localhost', '127.0.0.1')
+}

From 045affa231b407ce50e3269b4e5524e3a66fd1d4 Mon Sep 17 00:00:00 2001
From: Daniel Choudhury <dannychoudhury@gmail.com>
Date: Fri, 27 Oct 2023 15:08:19 +0700
Subject: [PATCH 06/29] Enable canary for streaming test-project

---
 tasks/test-project/test-project | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasks/test-project/test-project b/tasks/test-project/test-project
index 4716aba566b4..69f4abe70946 100755
--- a/tasks/test-project/test-project
+++ b/tasks/test-project/test-project
@@ -258,7 +258,7 @@ const globalTasks = () =>
             getExecaOptions(OUTPUT_PROJECT_PATH)
           )
         },
-        enabled: () => canary && !link,
+        enabled: () => (canary && !link) || streamingSsr, // @NOTE we need canary for the dev server binary
       },
       {
         title: 'Apply web codemods',

From 5fefc3aa5e07aafce969fac87137bc400ce0b8eb Mon Sep 17 00:00:00 2001
From: Daniel Choudhury <dannychoudhury@gmail.com>
Date: Sun, 29 Oct 2023 14:08:43 +0700
Subject: [PATCH 07/29] Add script to convert test-project to ssr-fixture

---
 tasks/test-project/convert-to-ssr-fixture | 34 +++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100755 tasks/test-project/convert-to-ssr-fixture

diff --git a/tasks/test-project/convert-to-ssr-fixture b/tasks/test-project/convert-to-ssr-fixture
new file mode 100755
index 000000000000..792990bef3dd
--- /dev/null
+++ b/tasks/test-project/convert-to-ssr-fixture
@@ -0,0 +1,34 @@
+#!/usr/bin/env node
+/* eslint-env node, es6*/
+const path = require('path')
+
+const { hideBin } = require('yargs/helpers')
+const yargs = require('yargs/yargs')
+
+const { streamingTasks } = require('./tasks')
+
+const args = yargs(hideBin(process.argv))
+  .usage('Usage: $0 <project directory> [option]')
+  .parseSync()
+
+/**
+ *
+ * This script runs a subset of tasks from the test-project.
+ * It takes a regular test-project, and adds some extra files/config so
+ * we can run e2e tests for ssr & streaming on it.
+ *
+ */
+
+async function runCommand() {
+  const OUTPUT_PROJECT_PATH = path.resolve(String(args._))
+  const tasks = await streamingTasks(OUTPUT_PROJECT_PATH, {
+    verbose: true,
+  })
+
+  tasks.run().catch((err) => {
+    console.error(err)
+    process.exit(1)
+  })
+}
+
+runCommand()

From 458b48d358d45417530691a01d03e6bcafaa0962 Mon Sep 17 00:00:00 2001
From: Daniel Choudhury <dannychoudhury@gmail.com>
Date: Sun, 29 Oct 2023 20:34:40 +0700
Subject: [PATCH 08/29] Add initial test for cell ssr

---
 .../streaming-ssr/playwright.config.ts        | 24 ++++++++
 .../tests/progressiveRendering.spec.ts        | 56 +++++++++++++++++++
 2 files changed, 80 insertions(+)
 create mode 100644 tasks/smoke-tests/streaming-ssr/playwright.config.ts
 create mode 100644 tasks/smoke-tests/streaming-ssr/tests/progressiveRendering.spec.ts

diff --git a/tasks/smoke-tests/streaming-ssr/playwright.config.ts b/tasks/smoke-tests/streaming-ssr/playwright.config.ts
new file mode 100644
index 000000000000..8720f71263e8
--- /dev/null
+++ b/tasks/smoke-tests/streaming-ssr/playwright.config.ts
@@ -0,0 +1,24 @@
+import { defineConfig } from '@playwright/test'
+
+import { basePlaywrightConfig } from '../basePlaywright.config'
+
+// See https://playwright.dev/docs/test-configuration#global-configuration
+export default defineConfig({
+  ...basePlaywrightConfig,
+  use: {
+    baseURL: 'http://localhost:8910',
+    launchOptions: {
+      slowMo: 1000,
+      headless: false,
+    },
+  },
+
+  // Run your local dev server before starting the tests
+  webServer: {
+    command: 'yarn redwood dev --no-generate --fwd="--no-open"',
+    cwd: process.env.REDWOOD_TEST_PROJECT_PATH,
+    url: 'http://localhost:8910',
+    reuseExistingServer: !process.env.CI,
+    stdout: 'pipe',
+  },
+})
diff --git a/tasks/smoke-tests/streaming-ssr/tests/progressiveRendering.spec.ts b/tasks/smoke-tests/streaming-ssr/tests/progressiveRendering.spec.ts
new file mode 100644
index 000000000000..6e35fdc9c86a
--- /dev/null
+++ b/tasks/smoke-tests/streaming-ssr/tests/progressiveRendering.spec.ts
@@ -0,0 +1,56 @@
+import { setTimeout } from 'node:timers/promises'
+
+import type { Page } from '@playwright/test'
+import { expect, test } from '@playwright/test'
+
+let pageWithClientBlocked: Page
+
+test.beforeAll(async ({ browser }) => {
+  const page = await browser.newPage()
+
+  // Disable loading of client-side JS
+  await page.route('**/entry.client.{js,tsx,ts,jsx}', (route) => route.abort())
+  await page.route('**/App.{js,tsx,ts,jsx}', (route) => route.abort())
+
+  pageWithClientBlocked = page
+})
+
+test('Check that homepage has content progressively loaded', async () => {
+  await pageWithClientBlocked.goto('/')
+
+  await pageWithClientBlocked.waitForSelector('article')
+
+  const apiServerLoading = await pageWithClientBlocked.locator(
+    'text=The RedwoodJS API server is not available or is currently reloading'
+  )
+
+  while (await apiServerLoading.isVisible()) {
+    await pageWithClientBlocked.reload()
+    await setTimeout(500)
+  }
+
+  await pageWithClientBlocked.pause()
+
+  const cellSuccessState = await pageWithClientBlocked
+    .locator('main')
+    .innerHTML()
+
+  expect(cellSuccessState).toMatch(/Welcome to the blog!/)
+  expect(cellSuccessState).toMatch(/A little more about me/)
+  expect(cellSuccessState).toMatch(/What is the meaning of life\?/)
+
+  const navTitle = await pageWithClientBlocked
+    .locator('header >> h1')
+    .innerText()
+  expect(navTitle).toBe('Redwood Blog')
+
+  const navLinks = await pageWithClientBlocked.locator('nav >> ul').innerText()
+  expect(navLinks.split('\n')).toEqual([
+    'About',
+    'Contact Us',
+    'Admin',
+    'Log In',
+  ])
+
+  pageWithClientBlocked.close()
+})

From f06eb66cbabae95a903df86756f1274e677f3d08 Mon Sep 17 00:00:00 2001
From: Daniel Choudhury <dannychoudhury@gmail.com>
Date: Mon, 30 Oct 2023 15:58:29 +0700
Subject: [PATCH 09/29] Add playwright tests for progressive rendering

---
 tasks/smoke-tests/common.ts                   | 21 ++++-
 .../prerender/tests/prerender.spec.ts         | 18 +----
 .../tests/progressiveRendering.spec.ts        | 79 +++++++++++++------
 tasks/test-project/codemods/delayedPage.js    |  2 +-
 4 files changed, 78 insertions(+), 42 deletions(-)

diff --git a/tasks/smoke-tests/common.ts b/tasks/smoke-tests/common.ts
index d2ab977dddba..b1dc760a60d7 100644
--- a/tasks/smoke-tests/common.ts
+++ b/tasks/smoke-tests/common.ts
@@ -1,5 +1,5 @@
 import { expect } from '@playwright/test'
-import type { PlaywrightTestArgs } from '@playwright/test'
+import type { Page, PlaywrightTestArgs } from '@playwright/test'
 
 export async function smokeTest({ page }: PlaywrightTestArgs) {
   await page.goto('/')
@@ -108,3 +108,22 @@ export const loginAsTestUser = async ({
     page.locator('button:has-text("Login")').click(),
   ])
 }
+
+export async function checkHomePageCellRender(page: Page) {
+  const cellSuccessState = await page.locator('main').innerHTML()
+
+  expect(cellSuccessState).toMatch(/Welcome to the blog!/)
+  expect(cellSuccessState).toMatch(/A little more about me/)
+  expect(cellSuccessState).toMatch(/What is the meaning of life\?/)
+
+  const navTitle = await page.locator('header >> h1').innerText()
+  expect(navTitle).toBe('Redwood Blog')
+
+  const navLinks = await page.locator('nav >> ul').innerText()
+  expect(navLinks.split('\n')).toEqual([
+    'About',
+    'Contact Us',
+    'Admin',
+    'Log In',
+  ])
+}
diff --git a/tasks/smoke-tests/prerender/tests/prerender.spec.ts b/tasks/smoke-tests/prerender/tests/prerender.spec.ts
index 77557ec35613..9bab02330a0b 100644
--- a/tasks/smoke-tests/prerender/tests/prerender.spec.ts
+++ b/tasks/smoke-tests/prerender/tests/prerender.spec.ts
@@ -10,6 +10,8 @@ import type {
 // @ts-expect-error - With `* as` you have to use .default() when calling execa
 import execa from 'execa'
 
+import { checkHomePageCellRender } from '../../common'
+
 let noJsBrowser: BrowserContext
 
 test.beforeAll(async ({ browser }: PlaywrightWorkerArgs) => {
@@ -22,21 +24,7 @@ test('Check that homepage is prerendered', async () => {
   const pageWithoutJs = await noJsBrowser.newPage()
   await pageWithoutJs.goto('/')
 
-  const cellSuccessState = await pageWithoutJs.locator('main').innerHTML()
-  expect(cellSuccessState).toMatch(/Welcome to the blog!/)
-  expect(cellSuccessState).toMatch(/A little more about me/)
-  expect(cellSuccessState).toMatch(/What is the meaning of life\?/)
-
-  const navTitle = await pageWithoutJs.locator('header >> h1').innerText()
-  expect(navTitle).toBe('Redwood Blog')
-
-  const navLinks = await pageWithoutJs.locator('nav >> ul').innerText()
-  expect(navLinks.split('\n')).toEqual([
-    'About',
-    'Contact Us',
-    'Admin',
-    'Log In',
-  ])
+  checkHomePageCellRender(pageWithoutJs)
 
   pageWithoutJs.close()
 })
diff --git a/tasks/smoke-tests/streaming-ssr/tests/progressiveRendering.spec.ts b/tasks/smoke-tests/streaming-ssr/tests/progressiveRendering.spec.ts
index 6e35fdc9c86a..db3b28c96630 100644
--- a/tasks/smoke-tests/streaming-ssr/tests/progressiveRendering.spec.ts
+++ b/tasks/smoke-tests/streaming-ssr/tests/progressiveRendering.spec.ts
@@ -3,6 +3,8 @@ import { setTimeout } from 'node:timers/promises'
 import type { Page } from '@playwright/test'
 import { expect, test } from '@playwright/test'
 
+import { checkHomePageCellRender } from '../../common'
+
 let pageWithClientBlocked: Page
 
 test.beforeAll(async ({ browser }) => {
@@ -11,46 +13,73 @@ test.beforeAll(async ({ browser }) => {
   // Disable loading of client-side JS
   await page.route('**/entry.client.{js,tsx,ts,jsx}', (route) => route.abort())
   await page.route('**/App.{js,tsx,ts,jsx}', (route) => route.abort())
+  await page.route('**/index.*.{js,tsx,ts,jsx}', (route) => route.abort())
 
   pageWithClientBlocked = page
 })
 
-test('Check that homepage has content progressively loaded', async () => {
-  await pageWithClientBlocked.goto('/')
+test.afterAll(() => {
+  pageWithClientBlocked.close()
+})
 
-  await pageWithClientBlocked.waitForSelector('article')
+test('Check that homepage has content rendered from the server (progressively)', async () => {
+  await pageWithClientBlocked.goto('/')
 
-  const apiServerLoading = await pageWithClientBlocked.locator(
-    'text=The RedwoodJS API server is not available or is currently reloading'
-  )
+  // @NOTE: It shows loading when the fetch fails, so client side can recover.
+  const apiServerLoading = pageWithClientBlocked.getByText('Loading...')
 
   while (await apiServerLoading.isVisible()) {
     await pageWithClientBlocked.reload()
     await setTimeout(500)
   }
 
-  await pageWithClientBlocked.pause()
+  // Appears when Cell is successfully rendered
+  await pageWithClientBlocked.waitForSelector('article')
 
-  const cellSuccessState = await pageWithClientBlocked
-    .locator('main')
-    .innerHTML()
+  await checkHomePageCellRender(pageWithClientBlocked)
+})
 
-  expect(cellSuccessState).toMatch(/Welcome to the blog!/)
-  expect(cellSuccessState).toMatch(/A little more about me/)
-  expect(cellSuccessState).toMatch(/What is the meaning of life\?/)
+test('Check delayed page has content progressively rendered', async () => {
+  const delayedLogStatements: { message: string; time: number }[] = []
 
-  const navTitle = await pageWithClientBlocked
-    .locator('header >> h1')
-    .innerText()
-  expect(navTitle).toBe('Redwood Blog')
+  pageWithClientBlocked.on('console', (message) => {
+    if (message.type() === 'log') {
+      const messageText = message.text()
 
-  const navLinks = await pageWithClientBlocked.locator('nav >> ul').innerText()
-  expect(navLinks.split('\n')).toEqual([
-    'About',
-    'Contact Us',
-    'Admin',
-    'Log In',
-  ])
+      if (messageText.includes('delayed by')) {
+        delayedLogStatements.push({
+          message: messageText,
+          time: Date.now(),
+        })
+      }
+    }
+  })
 
-  pageWithClientBlocked.close()
+  await pageWithClientBlocked.goto('/delayed')
+
+  expect(delayedLogStatements.length).toBe(4)
+
+  delayedLogStatements.forEach((log, index) => {
+    if (index > 0) {
+      const timeDiff = log.time - delayedLogStatements[index - 1].time
+
+      // With room for error, approximately 1 second
+      expect(timeDiff).toBeGreaterThan(600)
+      expect(timeDiff).toBeLessThan(1400)
+    }
+  })
+
+  // Check that its actually rendered on the page. Important when **not** progressively rendering
+  await expect(
+    pageWithClientBlocked.locator('[data-test-id="delayed-text-1"]')
+  ).toHaveCount(1)
+  await expect(
+    pageWithClientBlocked.locator('[data-test-id="delayed-text-2"]')
+  ).toHaveCount(1)
+  await expect(
+    pageWithClientBlocked.locator('[data-test-id="delayed-text-3"]')
+  ).toHaveCount(1)
+  await expect(
+    pageWithClientBlocked.locator('[data-test-id="delayed-text-4"]')
+  ).toHaveCount(1)
 })
diff --git a/tasks/test-project/codemods/delayedPage.js b/tasks/test-project/codemods/delayedPage.js
index 1305fd650b4e..d392b084e6f6 100644
--- a/tasks/test-project/codemods/delayedPage.js
+++ b/tasks/test-project/codemods/delayedPage.js
@@ -31,7 +31,7 @@ function DelayedComponent({
       return <></>
     })
   }
-  return <>Delayed by {time} seconds</>
+  return <p data-test-id={\`delayed-text-\${time}\`}>Delayed by {time} seconds</p>
 }
 
 function DelayedStuff() {

From 1b362b0e6006fe31ac301c597d4c277b1545a0da Mon Sep 17 00:00:00 2001
From: Daniel Choudhury <dannychoudhury@gmail.com>
Date: Mon, 30 Oct 2023 19:04:31 +0700
Subject: [PATCH 10/29] Add to ci

---
 .github/workflows/ci.yml | 56 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e809bd381b3c..3813dd29044f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -232,6 +232,62 @@ jobs:
     steps:
       - run: echo "Only doc changes"
 
+  ssr-smoke-tests:
+    needs: only-doc-changes
+    if: needs.only-doc-changes.outputs.only-doc-changes == 'false'
+
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest]
+
+    name: 🔁 SSR Smoke tests / ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+
+    env:
+      REDWOOD_CI: 1
+      REDWOOD_VERBOSE_TELEMETRY: 1
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: ⬢ Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+
+      - name: 🐈 Set up yarn cache
+        uses: ./.github/actions/set-up-yarn-cache
+
+      - name: 🐈 Yarn install
+        run: yarn install --inline-builds
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+
+      - name: 🔨 Build
+        run: yarn build
+
+      - name: 🌲 Set up test project
+        id: set-up-test-project
+        uses: ./.github/actions/set-up-test-project
+        with:
+          bundler: vite
+        env:
+          REDWOOD_DISABLE_TELEMETRY: 1
+          YARN_ENABLE_IMMUTABLE_INSTALLS: false
+
+      - name: Run SSR codemods on test project
+        run: ./.tasks/test-project/convert-to-ssr-fixture ${{ steps.set-up-test-project.outputs.test-project-path }}
+
+      - name: 🎭 Install playwright dependencies
+        run: npx playwright install --with-deps chromium
+
+      - name: Run SSR smoke tests
+        working-directory: ./tasks/smoke-tests/streaming-ssr
+        run: npx playwright test
+        env:
+          REDWOOD_TEST_PROJECT_PATH: '${{ steps.set-up-test-project.outputs.test-project-path }}'
+          REDWOOD_DISABLE_TELEMETRY: 1
+
   smoke-tests:
     needs: check
 

From 42dd0dc4b2b28fff6c11fc04f9b39e552b14e5f2 Mon Sep 17 00:00:00 2001
From: Daniel Choudhury <dannychoudhury@gmail.com>
Date: Mon, 30 Oct 2023 19:11:47 +0700
Subject: [PATCH 11/29] Typo

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3813dd29044f..43dcd6c70b07 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -276,7 +276,7 @@ jobs:
           YARN_ENABLE_IMMUTABLE_INSTALLS: false
 
       - name: Run SSR codemods on test project
-        run: ./.tasks/test-project/convert-to-ssr-fixture ${{ steps.set-up-test-project.outputs.test-project-path }}
+        run: ./tasks/test-project/convert-to-ssr-fixture ${{ steps.set-up-test-project.outputs.test-project-path }}
 
       - name: 🎭 Install playwright dependencies
         run: npx playwright install --with-deps chromium

From a65fa2f2ca945fd44637bdc3ad8f095dbba00980 Mon Sep 17 00:00:00 2001
From: Daniel Choudhury <dannychoudhury@gmail.com>
Date: Mon, 30 Oct 2023 19:23:59 +0700
Subject: [PATCH 12/29] Upgrade to canary as part of streaming fixture setup

---
 tasks/test-project/tasks.js     | 12 ++++++++++++
 tasks/test-project/test-project |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/tasks/test-project/tasks.js b/tasks/test-project/tasks.js
index 21aef383bc1a..03a1eff9ef82 100644
--- a/tasks/test-project/tasks.js
+++ b/tasks/test-project/tasks.js
@@ -744,6 +744,18 @@ async function streamingTasks(outputPath, { verbose }) {
   OUTPUT_PATH = outputPath
 
   const tasks = [
+    // This could be done in test-project, but for CI
+    // it's easier to do it here
+    {
+      title: 'Upgrading to latest canary version',
+      task: async () => {
+        return execa(
+          'yarn rw upgrade -t canary',
+          [],
+          getExecaOptions(outputPath)
+        )
+      },
+    },
     {
       title: 'Creating Delayed suspense delayed page',
       task: async () => {
diff --git a/tasks/test-project/test-project b/tasks/test-project/test-project
index 69f4abe70946..4716aba566b4 100755
--- a/tasks/test-project/test-project
+++ b/tasks/test-project/test-project
@@ -258,7 +258,7 @@ const globalTasks = () =>
             getExecaOptions(OUTPUT_PROJECT_PATH)
           )
         },
-        enabled: () => (canary && !link) || streamingSsr, // @NOTE we need canary for the dev server binary
+        enabled: () => canary && !link,
       },
       {
         title: 'Apply web codemods',

From 3a1fef936c6c2a4459865711539df0083de23dc9 Mon Sep 17 00:00:00 2001
From: Daniel Choudhury <dannychoudhury@gmail.com>
Date: Mon, 30 Oct 2023 19:24:09 +0700
Subject: [PATCH 13/29] Disable telemetry for converting to ssr-fixture

---
 .github/workflows/ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 43dcd6c70b07..13fceb4efc76 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -277,6 +277,8 @@ jobs:
 
       - name: Run SSR codemods on test project
         run: ./tasks/test-project/convert-to-ssr-fixture ${{ steps.set-up-test-project.outputs.test-project-path }}
+        env:
+          REDWOOD_DISABLE_TELEMETRY: 1
 
       - name: 🎭 Install playwright dependencies
         run: npx playwright install --with-deps chromium

From f3f9a7f06cb82a0c507bb60215a0783e89999014 Mon Sep 17 00:00:00 2001
From: Daniel Choudhury <dannychoudhury@gmail.com>
Date: Tue, 31 Oct 2023 13:41:58 +0700
Subject: [PATCH 14/29] Keep upgrading to canary in test-project

---
 tasks/test-project/tasks.js     | 12 ------------
 tasks/test-project/test-project |  2 +-
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/tasks/test-project/tasks.js b/tasks/test-project/tasks.js
index 03a1eff9ef82..21aef383bc1a 100644
--- a/tasks/test-project/tasks.js
+++ b/tasks/test-project/tasks.js
@@ -744,18 +744,6 @@ async function streamingTasks(outputPath, { verbose }) {
   OUTPUT_PATH = outputPath
 
   const tasks = [
-    // This could be done in test-project, but for CI
-    // it's easier to do it here
-    {
-      title: 'Upgrading to latest canary version',
-      task: async () => {
-        return execa(
-          'yarn rw upgrade -t canary',
-          [],
-          getExecaOptions(outputPath)
-        )
-      },
-    },
     {
       title: 'Creating Delayed suspense delayed page',
       task: async () => {
diff --git a/tasks/test-project/test-project b/tasks/test-project/test-project
index 4716aba566b4..7452adbed7d8 100755
--- a/tasks/test-project/test-project
+++ b/tasks/test-project/test-project
@@ -258,7 +258,7 @@ const globalTasks = () =>
             getExecaOptions(OUTPUT_PROJECT_PATH)
           )
         },
-        enabled: () => canary && !link,
+        enabled: () => (canary && !link) || streamingSsr,
       },
       {
         title: 'Apply web codemods',

From 80194099ffcaf47b807a9c4885b7d63d1053d3e3 Mon Sep 17 00:00:00 2001
From: Daniel Choudhury <dannychoudhury@gmail.com>
Date: Tue, 31 Oct 2023 14:26:07 +0700
Subject: [PATCH 15/29] Add ability to create canary test project Only run ssr
 smoke tests conditionally

---
 .github/actions/actionsLib.mjs                |  8 +--
 .../set-up-test-project/setUpTestProject.mjs  | 19 +++++-
 .../actions/ssr_related_changes/action.yml    |  8 +++
 .../actions/ssr_related_changes/package.json  |  9 +++
 .../ssr_related_changes.mjs                   | 43 ++++++++++++
 .github/actions/ssr_related_changes/yarn.lock | 66 +++++++++++++++++++
 .github/workflows/ci.yml                      | 30 ++++++++-
 7 files changed, 174 insertions(+), 9 deletions(-)
 create mode 100644 .github/actions/ssr_related_changes/action.yml
 create mode 100644 .github/actions/ssr_related_changes/package.json
 create mode 100644 .github/actions/ssr_related_changes/ssr_related_changes.mjs
 create mode 100644 .github/actions/ssr_related_changes/yarn.lock

diff --git a/.github/actions/actionsLib.mjs b/.github/actions/actionsLib.mjs
index 686beb1dc88d..ba377167c53d 100644
--- a/.github/actions/actionsLib.mjs
+++ b/.github/actions/actionsLib.mjs
@@ -62,9 +62,9 @@ export function projectCopy(redwoodProjectCwd) {
 }
 
 /**
- * @param {{ baseKeyPrefix: string, distKeyPrefix: string }} options
+ * @param {{ baseKeyPrefix: string, distKeyPrefix: string, canary: boolean }} options
  */
-export async function createCacheKeys({ baseKeyPrefix, distKeyPrefix }) {
+export async function createCacheKeys({ baseKeyPrefix, distKeyPrefix, canary }) {
   const baseKey = [
     baseKeyPrefix,
     process.env.RUNNER_OS,
@@ -76,7 +76,7 @@ export async function createCacheKeys({ baseKeyPrefix, distKeyPrefix }) {
     baseKey,
     'dependencies',
     await hashFiles(['yarn.lock', '.yarnrc.yml'].join('\n')),
-  ].join('-')
+  ].join('-') + canary ? '-canary' : ''
 
   const distKey = [
     dependenciesKey,
@@ -91,7 +91,7 @@ export async function createCacheKeys({ baseKeyPrefix, distKeyPrefix }) {
       'lerna.json',
       'packages',
     ].join('\n'))
-  ].join('-')
+  ].join('-') + canary ? '-canary' : ''
 
   return {
     baseKey,
diff --git a/.github/actions/set-up-test-project/setUpTestProject.mjs b/.github/actions/set-up-test-project/setUpTestProject.mjs
index a06c43f3c393..e8eb2da6a80b 100644
--- a/.github/actions/set-up-test-project/setUpTestProject.mjs
+++ b/.github/actions/set-up-test-project/setUpTestProject.mjs
@@ -25,8 +25,12 @@ core.setOutput('test-project-path', TEST_PROJECT_PATH)
 
 const bundler = core.getInput('bundler')
 
+const canary = core.getInput('canary') === 'true'
+
+
 console.log({
   bundler,
+  canary
 })
 
 console.log()
@@ -34,7 +38,7 @@ console.log()
 const {
   dependenciesKey,
   distKey
-} = await createCacheKeys({ baseKeyPrefix: 'test-project', distKeyPrefix: bundler })
+} = await createCacheKeys({ baseKeyPrefix: 'test-project', distKeyPrefix: bundler, canary })
 
 /**
  * @returns {Promise<void>}
@@ -54,7 +58,9 @@ async function main() {
     await sharedTasks()
   } else {
     console.log(`Cache not found for input keys: ${distKey}, ${dependenciesKey}`)
-    await setUpTestProject()
+    await setUpTestProject({
+      canary: true
+    })
   }
 
   await cache.saveCache([TEST_PROJECT_PATH], distKey)
@@ -62,9 +68,10 @@ async function main() {
 }
 
 /**
+ *  *@param {{canary: boolean}} options
  * @returns {Promise<void>}
  */
-async function setUpTestProject() {
+async function setUpTestProject({ canary }) {
   const TEST_PROJECT_FIXTURE_PATH = path.join(
     REDWOOD_FRAMEWORK_PATH,
     '__fixtures__',
@@ -83,6 +90,12 @@ async function setUpTestProject() {
   await execInProject('yarn install')
   console.log()
 
+  if (canary) {
+    console.log(`Upgrading project to canary`)
+    await execInProject('yarn rw upgrade -t canary')
+    console.log()
+  }
+
   await cache.saveCache([TEST_PROJECT_PATH], dependenciesKey)
   console.log(`Cache saved with key: ${dependenciesKey}`)
 
diff --git a/.github/actions/ssr_related_changes/action.yml b/.github/actions/ssr_related_changes/action.yml
new file mode 100644
index 000000000000..47a1122f2142
--- /dev/null
+++ b/.github/actions/ssr_related_changes/action.yml
@@ -0,0 +1,8 @@
+name: Streaming-SSR Related Changes
+description: Determines if the PR makes any changes related to SSR or streaming
+outputs:
+  rsc-related-changes:
+    description: If the PR makes any SSR related changes
+runs:
+  using: node20
+  main: ssr_related_changes.mjs
diff --git a/.github/actions/ssr_related_changes/package.json b/.github/actions/ssr_related_changes/package.json
new file mode 100644
index 000000000000..2b643b34dd1e
--- /dev/null
+++ b/.github/actions/ssr_related_changes/package.json
@@ -0,0 +1,9 @@
+{
+  "name": "ssr_related_changes",
+  "private": true,
+  "dependencies": {
+    "@actions/core": "1.10.0",
+    "@actions/exec": "1.1.1"
+  },
+  "packageManager": "yarn@3.6.3"
+}
diff --git a/.github/actions/ssr_related_changes/ssr_related_changes.mjs b/.github/actions/ssr_related_changes/ssr_related_changes.mjs
new file mode 100644
index 000000000000..b2d597b4b848
--- /dev/null
+++ b/.github/actions/ssr_related_changes/ssr_related_changes.mjs
@@ -0,0 +1,43 @@
+import core from '@actions/core'
+import { exec, getExecOutput } from '@actions/exec'
+
+async function main() {
+  const branch = process.env.GITHUB_BASE_REF
+
+  // If there is no branch, we're not in a pull request
+  if (!branch) {
+    core.setOutput('ssr-related-changes', false)
+    return
+  }
+
+  await exec(`git fetch origin ${branch}`)
+
+  const { stdout } = await getExecOutput(
+    `git diff origin/${branch} --name-only`
+  )
+
+  const changedFiles = stdout.toString().trim().split('\n').filter(Boolean)
+
+  for (const changedFile of changedFiles) {
+    console.log('changedFile', changedFile)
+
+    if (
+      changedFile.startsWith('tasks/smoke-tests/streaming-ssr') ||
+      changedFile.startsWith('tasks/smoke-tests/basePlaywright.config.ts') ||
+      changedFile.startsWith('github/actions/ssr_related_changes/') ||
+      changedFile.startsWith('packages/internal/') ||
+      changedFile.startsWith('packages/project-config/') ||
+      changedFile.startsWith('packages/web/') ||
+      changedFile.startsWith('packages/router/') ||
+      changedFile.startsWith('packages/web-server/') ||
+      changedFile.startsWith('packages/vite/')
+    ) {
+      core.setOutput('ssr-related-changes', true)
+      return
+    }
+  }
+
+  core.setOutput('ssr-related-changes', false)
+}
+
+main()
diff --git a/.github/actions/ssr_related_changes/yarn.lock b/.github/actions/ssr_related_changes/yarn.lock
new file mode 100644
index 000000000000..527838bbdcb8
--- /dev/null
+++ b/.github/actions/ssr_related_changes/yarn.lock
@@ -0,0 +1,66 @@
+# This file is generated by running "yarn install" inside your project.
+# Manual changes might be lost - proceed with caution!
+
+__metadata:
+  version: 6
+  cacheKey: 8c0
+
+"@actions/core@npm:1.10.0":
+  version: 1.10.0
+  resolution: "@actions/core@npm:1.10.0"
+  dependencies:
+    "@actions/http-client": ^2.0.1
+    uuid: ^8.3.2
+  checksum: 9214d1e0cf5cf2a5d48b8f3b12488c6be9f6722ea60f2397409226e8410b5a3e12e558d9b66c93469d180399865ec20180119408a1770f026bd9ecac6965fcda
+  languageName: node
+  linkType: hard
+
+"@actions/exec@npm:1.1.1":
+  version: 1.1.1
+  resolution: "@actions/exec@npm:1.1.1"
+  dependencies:
+    "@actions/io": ^1.0.1
+  checksum: 4a09f6bdbe50ce68b5cf8a7254d176230d6a74bccf6ecc3857feee209a8c950ba9adec87cc5ecceb04110182d1c17117234e45557d72fde6229b7fd3a395322a
+  languageName: node
+  linkType: hard
+
+"@actions/http-client@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "@actions/http-client@npm:2.0.1"
+  dependencies:
+    tunnel: ^0.0.6
+  checksum: b58987ba2f53d7988f612ede7ff834573a3360c21f8fdea9fea92f26ada0fd0efafb22aa7d83f49c18965a5b765775d5253e2edb8d9476d924c4b304ef726b67
+  languageName: node
+  linkType: hard
+
+"@actions/io@npm:^1.0.1":
+  version: 1.1.2
+  resolution: "@actions/io@npm:1.1.2"
+  checksum: 61c871bbee1cf58f57917d9bb2cf6bb7ea4dc40de3f65c7fb4ec619ceff57fc98f56be9cca2d476b09e7a96e1cba0d88cd125c4f690d384b9483935186f256c1
+  languageName: node
+  linkType: hard
+
+"only_doc_changes@workspace:.":
+  version: 0.0.0-use.local
+  resolution: "only_doc_changes@workspace:."
+  dependencies:
+    "@actions/core": 1.10.0
+    "@actions/exec": 1.1.1
+  languageName: unknown
+  linkType: soft
+
+"tunnel@npm:^0.0.6":
+  version: 0.0.6
+  resolution: "tunnel@npm:0.0.6"
+  checksum: e27e7e896f2426c1c747325b5f54efebc1a004647d853fad892b46d64e37591ccd0b97439470795e5262b5c0748d22beb4489a04a0a448029636670bfd801b75
+  languageName: node
+  linkType: hard
+
+"uuid@npm:^8.3.2":
+  version: 8.3.2
+  resolution: "uuid@npm:8.3.2"
+  bin:
+    uuid: dist/bin/uuid
+  checksum: bcbb807a917d374a49f475fae2e87fdca7da5e5530820ef53f65ba1d12131bd81a92ecf259cc7ce317cbe0f289e7d79fdfebcef9bfa3087c8c8a2fa304c9be54
+  languageName: node
+  linkType: hard
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 13fceb4efc76..611b470ec1fb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -64,6 +64,31 @@ jobs:
         id: rsc-related-changes
         uses: ./.github/actions/rsc_related_changes
 
+  ssr-related-changes:
+    needs: check
+    if: github.repository == 'redwoodjs/redwood'
+    name: 🌤️ SSR related changes?
+    runs-on: ubuntu-latest
+    outputs:
+      ssr-related-changes: ${{ steps.ssr-related-changes.outputs.ssr-related-changes }}
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: ⬢ Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+
+      - name: 🐈 Yarn install
+        working-directory: ./.github/actions/ssr_related_changes
+        run: yarn install --inline-builds
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+
+      - name: 🌤️ SSR related changes?
+        id: ssr-related-changes
+        uses: ./.github/actions/ssr_related_changes
+
   check:
     needs: only-doc-changes
     if: needs.only-doc-changes.outputs.only-doc-changes == 'false'
@@ -233,8 +258,8 @@ jobs:
       - run: echo "Only doc changes"
 
   ssr-smoke-tests:
-    needs: only-doc-changes
-    if: needs.only-doc-changes.outputs.only-doc-changes == 'false'
+    needs: ssr-related-changes
+    if: needs.ssr-related-changes.outputs.ssr-related-changes == 'true'
 
     strategy:
       matrix:
@@ -271,6 +296,7 @@ jobs:
         uses: ./.github/actions/set-up-test-project
         with:
           bundler: vite
+          canary: true
         env:
           REDWOOD_DISABLE_TELEMETRY: 1
           YARN_ENABLE_IMMUTABLE_INSTALLS: false

From 210a022e554f6cb9ef529c0f56b3d80edbba630f Mon Sep 17 00:00:00 2001
From: Daniel Choudhury <dannychoudhury@gmail.com>
Date: Tue, 31 Oct 2023 14:32:32 +0700
Subject: [PATCH 16/29] Update yarn.lock

---
 .github/actions/ssr_related_changes/yarn.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/actions/ssr_related_changes/yarn.lock b/.github/actions/ssr_related_changes/yarn.lock
index 527838bbdcb8..b44c78774462 100644
--- a/.github/actions/ssr_related_changes/yarn.lock
+++ b/.github/actions/ssr_related_changes/yarn.lock
@@ -40,9 +40,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"only_doc_changes@workspace:.":
+"ssr_related_changes@workspace:.":
   version: 0.0.0-use.local
-  resolution: "only_doc_changes@workspace:."
+  resolution: "ssr_related_changes@workspace:."
   dependencies:
     "@actions/core": 1.10.0
     "@actions/exec": 1.1.1

From c02d35b521e4d9a339afeba1af0916d2cdde02a6 Mon Sep 17 00:00:00 2001
From: Daniel Choudhury <dannychoudhury@gmail.com>
Date: Tue, 31 Oct 2023 15:10:08 +0700
Subject: [PATCH 17/29] Tweaks

---
 .github/actions/actionsLib.mjs                       | 4 ++--
 .github/actions/set-up-test-project/action.yaml      | 3 +++
 tasks/smoke-tests/streaming-ssr/playwright.config.ts | 4 ----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/actions/actionsLib.mjs b/.github/actions/actionsLib.mjs
index ba377167c53d..0ef01d2313b2 100644
--- a/.github/actions/actionsLib.mjs
+++ b/.github/actions/actionsLib.mjs
@@ -76,7 +76,7 @@ export async function createCacheKeys({ baseKeyPrefix, distKeyPrefix, canary })
     baseKey,
     'dependencies',
     await hashFiles(['yarn.lock', '.yarnrc.yml'].join('\n')),
-  ].join('-') + canary ? '-canary' : ''
+  ].join('-') + (canary ? '-canary' : '')
 
   const distKey = [
     dependenciesKey,
@@ -91,7 +91,7 @@ export async function createCacheKeys({ baseKeyPrefix, distKeyPrefix, canary })
       'lerna.json',
       'packages',
     ].join('\n'))
-  ].join('-') + canary ? '-canary' : ''
+  ].join('-') + (canary ? '-canary' : '')
 
   return {
     baseKey,
diff --git a/.github/actions/set-up-test-project/action.yaml b/.github/actions/set-up-test-project/action.yaml
index 9866507ab1db..0c0e623056a5 100644
--- a/.github/actions/set-up-test-project/action.yaml
+++ b/.github/actions/set-up-test-project/action.yaml
@@ -9,6 +9,9 @@ inputs:
   bundler:
     description: The bundler to use (vite or webpack)
     default: vite
+  canary:
+    description: Upgrade the project to canary?
+    default: "false"
 
 outputs:
   test-project-path:
diff --git a/tasks/smoke-tests/streaming-ssr/playwright.config.ts b/tasks/smoke-tests/streaming-ssr/playwright.config.ts
index 8720f71263e8..907f29603ffd 100644
--- a/tasks/smoke-tests/streaming-ssr/playwright.config.ts
+++ b/tasks/smoke-tests/streaming-ssr/playwright.config.ts
@@ -7,10 +7,6 @@ export default defineConfig({
   ...basePlaywrightConfig,
   use: {
     baseURL: 'http://localhost:8910',
-    launchOptions: {
-      slowMo: 1000,
-      headless: false,
-    },
   },
 
   // Run your local dev server before starting the tests

From 904e1667c53043998f4e06243b7b92b7125ba70b Mon Sep 17 00:00:00 2001
From: Daniel Choudhury <dannychoudhury@gmail.com>
Date: Wed, 1 Nov 2023 13:26:27 +0700
Subject: [PATCH 18/29] Fix delayed page codemod bug

---
 tasks/test-project/codemods/delayedPage.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasks/test-project/codemods/delayedPage.js b/tasks/test-project/codemods/delayedPage.js
index d392b084e6f6..99eb5728b41a 100644
--- a/tasks/test-project/codemods/delayedPage.js
+++ b/tasks/test-project/codemods/delayedPage.js
@@ -23,7 +23,7 @@ function DelayedComponent({
         return (
           <script
             dangerouslySetInnerHTML={{
-              __html: 'console.log("delayed by \${time} seconds")',
+              __html: \`console.log("delayed by \${time} seconds")\`,
             }}
           />
         )

From 6416f423376920639d1328aa30cb158787ba1930 Mon Sep 17 00:00:00 2001
From: Daniel Choudhury <dannychoudhury@gmail.com>
Date: Wed, 1 Nov 2023 13:27:28 +0700
Subject: [PATCH 19/29] Bump to latest react experimental package

---
 .../auth-providers/auth0/web/package.json     |  2 +-
 .../azureActiveDirectory/web/package.json     |  2 +-
 .../auth-providers/clerk/web/package.json     |  2 +-
 .../auth-providers/dbAuth/web/package.json    |  2 +-
 .../auth-providers/firebase/web/package.json  |  2 +-
 .../auth-providers/netlify/web/package.json   |  2 +-
 .../auth-providers/supabase/web/package.json  |  2 +-
 .../supertokens/web/package.json              |  2 +-
 packages/auth/package.json                    |  2 +-
 .../templates/js/web/package.json             |  4 +-
 .../templates/ts/web/package.json             |  4 +-
 packages/forms/package.json                   |  6 +-
 packages/prerender/package.json               |  4 +-
 packages/router/package.json                  |  8 +-
 packages/studio/package.json                  |  4 +-
 packages/vite/package.json                    |  4 +-
 packages/web/package.json                     |  8 +-
 yarn.lock                                     | 92 +++++++++----------
 18 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/packages/auth-providers/auth0/web/package.json b/packages/auth-providers/auth0/web/package.json
index 38784fb9c801..9be3d9e40d62 100644
--- a/packages/auth-providers/auth0/web/package.json
+++ b/packages/auth-providers/auth0/web/package.json
@@ -32,7 +32,7 @@
     "@babel/core": "^7.22.20",
     "@types/react": "18.2.14",
     "jest": "29.7.0",
-    "react": "0.0.0-experimental-e5205658f-20230913",
+    "react": "0.0.0-experimental-08a39539f-20231031",
     "typescript": "5.2.2"
   },
   "peerDependencies": {
diff --git a/packages/auth-providers/azureActiveDirectory/web/package.json b/packages/auth-providers/azureActiveDirectory/web/package.json
index ac088253a4c5..a67913d1b3ef 100644
--- a/packages/auth-providers/azureActiveDirectory/web/package.json
+++ b/packages/auth-providers/azureActiveDirectory/web/package.json
@@ -33,7 +33,7 @@
     "@types/netlify-identity-widget": "1.9.3",
     "@types/react": "18.2.14",
     "jest": "29.7.0",
-    "react": "0.0.0-experimental-e5205658f-20230913",
+    "react": "0.0.0-experimental-08a39539f-20231031",
     "typescript": "5.2.2"
   },
   "peerDependencies": {
diff --git a/packages/auth-providers/clerk/web/package.json b/packages/auth-providers/clerk/web/package.json
index 61d42d2c5465..f36d6d325623 100644
--- a/packages/auth-providers/clerk/web/package.json
+++ b/packages/auth-providers/clerk/web/package.json
@@ -33,7 +33,7 @@
     "@clerk/types": "3.52.0",
     "@types/react": "18.2.14",
     "jest": "29.7.0",
-    "react": "0.0.0-experimental-e5205658f-20230913",
+    "react": "0.0.0-experimental-08a39539f-20231031",
     "typescript": "5.2.2"
   },
   "peerDependencies": {
diff --git a/packages/auth-providers/dbAuth/web/package.json b/packages/auth-providers/dbAuth/web/package.json
index a0a30c413800..c23998be155c 100644
--- a/packages/auth-providers/dbAuth/web/package.json
+++ b/packages/auth-providers/dbAuth/web/package.json
@@ -34,7 +34,7 @@
     "@simplewebauthn/typescript-types": "7.0.0",
     "@types/react": "18.2.14",
     "jest": "29.7.0",
-    "react": "0.0.0-experimental-e5205658f-20230913",
+    "react": "0.0.0-experimental-08a39539f-20231031",
     "typescript": "5.2.2"
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
diff --git a/packages/auth-providers/firebase/web/package.json b/packages/auth-providers/firebase/web/package.json
index 69f0f00257e2..e501796dc369 100644
--- a/packages/auth-providers/firebase/web/package.json
+++ b/packages/auth-providers/firebase/web/package.json
@@ -32,7 +32,7 @@
     "@types/react": "18.2.14",
     "firebase": "10.4.0",
     "jest": "29.7.0",
-    "react": "0.0.0-experimental-e5205658f-20230913",
+    "react": "0.0.0-experimental-08a39539f-20231031",
     "typescript": "5.2.2"
   },
   "peerDependencies": {
diff --git a/packages/auth-providers/netlify/web/package.json b/packages/auth-providers/netlify/web/package.json
index 9e75eb93c319..83deb5b15b2c 100644
--- a/packages/auth-providers/netlify/web/package.json
+++ b/packages/auth-providers/netlify/web/package.json
@@ -32,7 +32,7 @@
     "@types/netlify-identity-widget": "1.9.3",
     "@types/react": "18.2.14",
     "jest": "29.7.0",
-    "react": "0.0.0-experimental-e5205658f-20230913",
+    "react": "0.0.0-experimental-08a39539f-20231031",
     "typescript": "5.2.2"
   },
   "peerDependencies": {
diff --git a/packages/auth-providers/supabase/web/package.json b/packages/auth-providers/supabase/web/package.json
index 3fce1a0bc8e5..f2bf1de9a809 100644
--- a/packages/auth-providers/supabase/web/package.json
+++ b/packages/auth-providers/supabase/web/package.json
@@ -31,7 +31,7 @@
     "@supabase/supabase-js": "2.26.0",
     "@types/react": "18.2.14",
     "jest": "29.7.0",
-    "react": "0.0.0-experimental-e5205658f-20230913",
+    "react": "0.0.0-experimental-08a39539f-20231031",
     "typescript": "5.2.2"
   },
   "peerDependencies": {
diff --git a/packages/auth-providers/supertokens/web/package.json b/packages/auth-providers/supertokens/web/package.json
index f441c1c347bf..adb39cd47287 100644
--- a/packages/auth-providers/supertokens/web/package.json
+++ b/packages/auth-providers/supertokens/web/package.json
@@ -31,7 +31,7 @@
     "@babel/core": "^7.22.20",
     "@types/react": "18.2.14",
     "jest": "29.7.0",
-    "react": "0.0.0-experimental-e5205658f-20230913",
+    "react": "0.0.0-experimental-08a39539f-20231031",
     "supertokens-auth-react": "0.34.0",
     "typescript": "5.2.2"
   },
diff --git a/packages/auth/package.json b/packages/auth/package.json
index 1b326a17c8c3..78c05dd302e2 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -24,7 +24,7 @@
   "dependencies": {
     "@babel/runtime-corejs3": "7.23.2",
     "core-js": "3.32.2",
-    "react": "0.0.0-experimental-e5205658f-20230913"
+    "react": "0.0.0-experimental-08a39539f-20231031"
   },
   "devDependencies": {
     "@babel/cli": "7.23.0",
diff --git a/packages/create-redwood-app/templates/js/web/package.json b/packages/create-redwood-app/templates/js/web/package.json
index 841204785412..ecdafd543974 100644
--- a/packages/create-redwood-app/templates/js/web/package.json
+++ b/packages/create-redwood-app/templates/js/web/package.json
@@ -14,8 +14,8 @@
     "@redwoodjs/forms": "6.0.7",
     "@redwoodjs/router": "6.0.7",
     "@redwoodjs/web": "6.0.7",
-    "react": "0.0.0-experimental-e5205658f-20230913",
-    "react-dom": "0.0.0-experimental-e5205658f-20230913"
+    "react": "0.0.0-experimental-08a39539f-20231031",
+    "react-dom": "0.0.0-experimental-08a39539f-20231031"
   },
   "devDependencies": {
     "@types/react": "18.2.14",
diff --git a/packages/create-redwood-app/templates/ts/web/package.json b/packages/create-redwood-app/templates/ts/web/package.json
index 841204785412..ecdafd543974 100644
--- a/packages/create-redwood-app/templates/ts/web/package.json
+++ b/packages/create-redwood-app/templates/ts/web/package.json
@@ -14,8 +14,8 @@
     "@redwoodjs/forms": "6.0.7",
     "@redwoodjs/router": "6.0.7",
     "@redwoodjs/web": "6.0.7",
-    "react": "0.0.0-experimental-e5205658f-20230913",
-    "react-dom": "0.0.0-experimental-e5205658f-20230913"
+    "react": "0.0.0-experimental-08a39539f-20231031",
+    "react-dom": "0.0.0-experimental-08a39539f-20231031"
   },
   "devDependencies": {
     "@types/react": "18.2.14",
diff --git a/packages/forms/package.json b/packages/forms/package.json
index 8391e8ee8636..45a8751ee6fa 100644
--- a/packages/forms/package.json
+++ b/packages/forms/package.json
@@ -41,13 +41,13 @@
     "graphql": "16.8.1",
     "jest": "29.7.0",
     "nodemon": "2.0.22",
-    "react": "0.0.0-experimental-e5205658f-20230913",
-    "react-dom": "0.0.0-experimental-e5205658f-20230913",
+    "react": "0.0.0-experimental-08a39539f-20231031",
+    "react-dom": "0.0.0-experimental-08a39539f-20231031",
     "typescript": "5.2.2"
   },
   "peerDependencies": {
     "graphql": "16.8.1",
-    "react": "0.0.0-experimental-e5205658f-20230913"
+    "react": "0.0.0-experimental-08a39539f-20231031"
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
 }
diff --git a/packages/prerender/package.json b/packages/prerender/package.json
index 35c20dbc0b32..884a5bb50968 100644
--- a/packages/prerender/package.json
+++ b/packages/prerender/package.json
@@ -47,8 +47,8 @@
     "typescript": "5.2.2"
   },
   "peerDependencies": {
-    "react": "0.0.0-experimental-e5205658f-20230913",
-    "react-dom": "0.0.0-experimental-e5205658f-20230913"
+    "react": "0.0.0-experimental-08a39539f-20231031",
+    "react-dom": "0.0.0-experimental-08a39539f-20231031"
   },
   "externals": {
     "react": "react",
diff --git a/packages/router/package.json b/packages/router/package.json
index a9ce2abbd533..6048116a5dbe 100644
--- a/packages/router/package.json
+++ b/packages/router/package.json
@@ -33,13 +33,13 @@
     "@types/react": "18.2.14",
     "@types/react-dom": "18.2.6",
     "jest": "29.7.0",
-    "react": "0.0.0-experimental-e5205658f-20230913",
-    "react-dom": "0.0.0-experimental-e5205658f-20230913",
+    "react": "0.0.0-experimental-08a39539f-20231031",
+    "react-dom": "0.0.0-experimental-08a39539f-20231031",
     "typescript": "5.2.2"
   },
   "peerDependencies": {
-    "react": "0.0.0-experimental-e5205658f-20230913",
-    "react-dom": "0.0.0-experimental-e5205658f-20230913"
+    "react": "0.0.0-experimental-08a39539f-20231031",
+    "react-dom": "0.0.0-experimental-08a39539f-20231031"
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
 }
diff --git a/packages/studio/package.json b/packages/studio/package.json
index a76ac633deef..2f46812a120d 100644
--- a/packages/studio/package.json
+++ b/packages/studio/package.json
@@ -91,8 +91,8 @@
     "json-bigint-patch": "0.0.8",
     "postcss": "8.4.31",
     "pretty-ms": "7.0.1",
-    "react": "0.0.0-experimental-e5205658f-20230913",
-    "react-dom": "0.0.0-experimental-e5205658f-20230913",
+    "react": "0.0.0-experimental-08a39539f-20231031",
+    "react-dom": "0.0.0-experimental-08a39539f-20231031",
     "react-error-boundary": "4.0.11",
     "react-grid-layout": "1.3.4",
     "react-router-dom": "6.8.1",
diff --git a/packages/vite/package.json b/packages/vite/package.json
index 30c01bf7d8bc..e1ec1c842cde 100644
--- a/packages/vite/package.json
+++ b/packages/vite/package.json
@@ -78,8 +78,8 @@
     "express": "4.18.2",
     "http-proxy-middleware": "2.0.6",
     "isbot": "3.6.8",
-    "react": "0.0.0-experimental-e5205658f-20230913",
-    "react-server-dom-webpack": "0.0.0-experimental-e5205658f-20230913",
+    "react": "0.0.0-experimental-08a39539f-20231031",
+    "react-server-dom-webpack": "0.0.0-experimental-08a39539f-20231031",
     "vite": "4.5.0",
     "yargs-parser": "21.1.1"
   },
diff --git a/packages/web/package.json b/packages/web/package.json
index a7e30fec1377..392d42164acd 100644
--- a/packages/web/package.json
+++ b/packages/web/package.json
@@ -59,13 +59,13 @@
     "jest": "29.7.0",
     "jest-runner-tsd": "5.0.0",
     "nodemon": "2.0.22",
-    "react": "0.0.0-experimental-e5205658f-20230913",
-    "react-dom": "0.0.0-experimental-e5205658f-20230913",
+    "react": "0.0.0-experimental-08a39539f-20231031",
+    "react-dom": "0.0.0-experimental-08a39539f-20231031",
     "typescript": "5.2.2"
   },
   "peerDependencies": {
-    "react": "0.0.0-experimental-e5205658f-20230913",
-    "react-dom": "0.0.0-experimental-e5205658f-20230913"
+    "react": "0.0.0-experimental-08a39539f-20231031",
+    "react-dom": "0.0.0-experimental-08a39539f-20231031"
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
 }
diff --git a/yarn.lock b/yarn.lock
index b59464229d1e..9c2e80473308 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7924,7 +7924,7 @@ __metadata:
     "@types/react": 18.2.14
     core-js: 3.32.2
     jest: 29.7.0
-    react: 0.0.0-experimental-e5205658f-20230913
+    react: 0.0.0-experimental-08a39539f-20231031
     typescript: 5.2.2
   peerDependencies:
     "@auth0/auth0-spa-js": 2.1.1
@@ -7977,7 +7977,7 @@ __metadata:
     "@types/react": 18.2.14
     core-js: 3.32.2
     jest: 29.7.0
-    react: 0.0.0-experimental-e5205658f-20230913
+    react: 0.0.0-experimental-08a39539f-20231031
     typescript: 5.2.2
   peerDependencies:
     "@azure/msal-browser": 2.38.1
@@ -8028,7 +8028,7 @@ __metadata:
     "@types/react": 18.2.14
     core-js: 3.32.2
     jest: 29.7.0
-    react: 0.0.0-experimental-e5205658f-20230913
+    react: 0.0.0-experimental-08a39539f-20231031
     typescript: 5.2.2
   peerDependencies:
     "@clerk/clerk-react": 4.25.1
@@ -8107,7 +8107,7 @@ __metadata:
     "@types/react": 18.2.14
     core-js: 3.32.2
     jest: 29.7.0
-    react: 0.0.0-experimental-e5205658f-20230913
+    react: 0.0.0-experimental-08a39539f-20231031
     typescript: 5.2.2
   languageName: unknown
   linkType: soft
@@ -8155,7 +8155,7 @@ __metadata:
     core-js: 3.32.2
     firebase: 10.4.0
     jest: 29.7.0
-    react: 0.0.0-experimental-e5205658f-20230913
+    react: 0.0.0-experimental-08a39539f-20231031
     typescript: 5.2.2
   peerDependencies:
     firebase: 10.4.0
@@ -8206,7 +8206,7 @@ __metadata:
     "@types/react": 18.2.14
     core-js: 3.32.2
     jest: 29.7.0
-    react: 0.0.0-experimental-e5205658f-20230913
+    react: 0.0.0-experimental-08a39539f-20231031
     typescript: 5.2.2
   peerDependencies:
     netlify-identity-widget: 1.9.2
@@ -8256,7 +8256,7 @@ __metadata:
     "@types/react": 18.2.14
     core-js: 3.32.2
     jest: 29.7.0
-    react: 0.0.0-experimental-e5205658f-20230913
+    react: 0.0.0-experimental-08a39539f-20231031
     typescript: 5.2.2
   peerDependencies:
     "@supabase/supabase-js": 2.26.0
@@ -8308,7 +8308,7 @@ __metadata:
     "@types/react": 18.2.14
     core-js: 3.32.2
     jest: 29.7.0
-    react: 0.0.0-experimental-e5205658f-20230913
+    react: 0.0.0-experimental-08a39539f-20231031
     supertokens-auth-react: 0.34.0
     typescript: 5.2.2
   peerDependencies:
@@ -8328,7 +8328,7 @@ __metadata:
     core-js: 3.32.2
     jest: 29.7.0
     msw: 1.3.1
-    react: 0.0.0-experimental-e5205658f-20230913
+    react: 0.0.0-experimental-08a39539f-20231031
     typescript: 5.2.2
   languageName: unknown
   linkType: soft
@@ -8705,13 +8705,13 @@ __metadata:
     jest: 29.7.0
     nodemon: 2.0.22
     pascalcase: 1.0.0
-    react: 0.0.0-experimental-e5205658f-20230913
-    react-dom: 0.0.0-experimental-e5205658f-20230913
+    react: 0.0.0-experimental-08a39539f-20231031
+    react-dom: 0.0.0-experimental-08a39539f-20231031
     react-hook-form: 7.46.1
     typescript: 5.2.2
   peerDependencies:
     graphql: 16.8.1
-    react: 0.0.0-experimental-e5205658f-20230913
+    react: 0.0.0-experimental-08a39539f-20231031
   languageName: unknown
   linkType: soft
 
@@ -8917,8 +8917,8 @@ __metadata:
     mime-types: 2.1.35
     typescript: 5.2.2
   peerDependencies:
-    react: 0.0.0-experimental-e5205658f-20230913
-    react-dom: 0.0.0-experimental-e5205658f-20230913
+    react: 0.0.0-experimental-08a39539f-20231031
+    react-dom: 0.0.0-experimental-08a39539f-20231031
   languageName: unknown
   linkType: soft
 
@@ -8995,12 +8995,12 @@ __metadata:
     "@types/react-dom": 18.2.6
     core-js: 3.32.2
     jest: 29.7.0
-    react: 0.0.0-experimental-e5205658f-20230913
-    react-dom: 0.0.0-experimental-e5205658f-20230913
+    react: 0.0.0-experimental-08a39539f-20231031
+    react-dom: 0.0.0-experimental-08a39539f-20231031
     typescript: 5.2.2
   peerDependencies:
-    react: 0.0.0-experimental-e5205658f-20230913
-    react-dom: 0.0.0-experimental-e5205658f-20230913
+    react: 0.0.0-experimental-08a39539f-20231031
+    react-dom: 0.0.0-experimental-08a39539f-20231031
   languageName: unknown
   linkType: soft
 
@@ -9106,8 +9106,8 @@ __metadata:
     pretty-bytes: 5.6.0
     pretty-ms: 7.0.1
     qs: 6.11.2
-    react: 0.0.0-experimental-e5205658f-20230913
-    react-dom: 0.0.0-experimental-e5205658f-20230913
+    react: 0.0.0-experimental-08a39539f-20231031
+    react-dom: 0.0.0-experimental-08a39539f-20231031
     react-error-boundary: 4.0.11
     react-grid-layout: 1.3.4
     react-router-dom: 6.8.1
@@ -9226,8 +9226,8 @@ __metadata:
     http-proxy-middleware: 2.0.6
     isbot: 3.6.8
     jest: 29.7.0
-    react: 0.0.0-experimental-e5205658f-20230913
-    react-server-dom-webpack: 0.0.0-experimental-e5205658f-20230913
+    react: 0.0.0-experimental-08a39539f-20231031
+    react-server-dom-webpack: 0.0.0-experimental-08a39539f-20231031
     rollup: 3.27.2
     typescript: 5.2.2
     vite: 4.5.0
@@ -9283,16 +9283,16 @@ __metadata:
     jest: 29.7.0
     jest-runner-tsd: 5.0.0
     nodemon: 2.0.22
-    react: 0.0.0-experimental-e5205658f-20230913
-    react-dom: 0.0.0-experimental-e5205658f-20230913
+    react: 0.0.0-experimental-08a39539f-20231031
+    react-dom: 0.0.0-experimental-08a39539f-20231031
     react-helmet-async: 1.3.0
     react-hot-toast: 2.4.1
     stacktracey: 2.1.8
     ts-toolbelt: 9.6.0
     typescript: 5.2.2
   peerDependencies:
-    react: 0.0.0-experimental-e5205658f-20230913
-    react-dom: 0.0.0-experimental-e5205658f-20230913
+    react: 0.0.0-experimental-08a39539f-20231031
+    react-dom: 0.0.0-experimental-08a39539f-20231031
   bin:
     cross-env: ./dist/bins/cross-env.js
     msw: ./dist/bins/msw.js
@@ -30051,15 +30051,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-dom@npm:0.0.0-experimental-e5205658f-20230913":
-  version: 0.0.0-experimental-e5205658f-20230913
-  resolution: "react-dom@npm:0.0.0-experimental-e5205658f-20230913"
+"react-dom@npm:0.0.0-experimental-08a39539f-20231031":
+  version: 0.0.0-experimental-08a39539f-20231031
+  resolution: "react-dom@npm:0.0.0-experimental-08a39539f-20231031"
   dependencies:
     loose-envify: ^1.1.0
-    scheduler: 0.0.0-experimental-e5205658f-20230913
+    scheduler: 0.0.0-experimental-08a39539f-20231031
   peerDependencies:
-    react: 0.0.0-experimental-e5205658f-20230913
-  checksum: b8e0e0edf05161a39cd8495ac11dbebccda0e69245d1f33d07697122e65649a1f0539ff8ad7277d833aabc9cbee8da9d80de14d0766262412da5bf824d5eb823
+    react: 0.0.0-experimental-08a39539f-20231031
+  checksum: 3a829cb929446fe03115d076fbf2afd52f5ce5bd32a7db0f6b3aaba7f18ef901ef44bfaf9bc722cb490fa25a74a610eec06137f42e727af0762934d32dad5136
   languageName: node
   linkType: hard
 
@@ -30365,18 +30365,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-server-dom-webpack@npm:0.0.0-experimental-e5205658f-20230913":
-  version: 0.0.0-experimental-e5205658f-20230913
-  resolution: "react-server-dom-webpack@npm:0.0.0-experimental-e5205658f-20230913"
+"react-server-dom-webpack@npm:0.0.0-experimental-08a39539f-20231031":
+  version: 0.0.0-experimental-08a39539f-20231031
+  resolution: "react-server-dom-webpack@npm:0.0.0-experimental-08a39539f-20231031"
   dependencies:
     acorn-loose: ^8.3.0
     loose-envify: ^1.1.0
     neo-async: ^2.6.1
   peerDependencies:
-    react: 0.0.0-experimental-e5205658f-20230913
-    react-dom: 0.0.0-experimental-e5205658f-20230913
+    react: 0.0.0-experimental-08a39539f-20231031
+    react-dom: 0.0.0-experimental-08a39539f-20231031
     webpack: ^5.59.0
-  checksum: 94c29f986209c3d174a3b200526a8f1e8e10c9c831d29e9938e5f6e08146020a37a5ec19410af73d21e32906c35c7c1f68b044c720ef5d785d4de6cbb0438a88
+  checksum: ab97b3a0011033ea385484cde0a5cf0639e486c92801ed0798605c4f1fcc689d95f4e278e6fae45d70e1e35874bce654488f7cd9cbf187973d7fd15ca458c50c
   languageName: node
   linkType: hard
 
@@ -30476,12 +30476,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react@npm:0.0.0-experimental-e5205658f-20230913":
-  version: 0.0.0-experimental-e5205658f-20230913
-  resolution: "react@npm:0.0.0-experimental-e5205658f-20230913"
+"react@npm:0.0.0-experimental-08a39539f-20231031":
+  version: 0.0.0-experimental-08a39539f-20231031
+  resolution: "react@npm:0.0.0-experimental-08a39539f-20231031"
   dependencies:
     loose-envify: ^1.1.0
-  checksum: 69f384cd192d6fc83bd77457b539c171cd89b44fd105c67c77a2c57b237c1068c598470ddf524084bdb7d9b0bc16362918493dbc3fbcb909af8edd92c6be9759
+  checksum: e3682b361ffb1bf8f1b4a4b8593ea0c6160191213333b1b8be585035682a38944f9f3e6e20bb25f1a602246d37b833ec1075b9f49a5a199f438f08d2bdbe366f
   languageName: node
   linkType: hard
 
@@ -31622,12 +31622,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"scheduler@npm:0.0.0-experimental-e5205658f-20230913":
-  version: 0.0.0-experimental-e5205658f-20230913
-  resolution: "scheduler@npm:0.0.0-experimental-e5205658f-20230913"
+"scheduler@npm:0.0.0-experimental-08a39539f-20231031":
+  version: 0.0.0-experimental-08a39539f-20231031
+  resolution: "scheduler@npm:0.0.0-experimental-08a39539f-20231031"
   dependencies:
     loose-envify: ^1.1.0
-  checksum: 20475be7524bb89002818cfc0f54af122c0e2c07c07ddb92275e10c0e8d1a51a9c7ca3b4b95e9b27017da4e22f1510c478afe08becc1073decfd03ae5823f452
+  checksum: bf051d8e2c3b4454112bf894c8dfd7bb21c4b532e5762872ffdc9e7321e9962eb4d329d462128410baa12e1321ef2279bf78dc8592e3cd336527b3206b4f0e5b
   languageName: node
   linkType: hard
 

From c8feb802523dc6369f17414af95d6394d10245f3 Mon Sep 17 00:00:00 2001
From: Daniel Choudhury <dannychoudhury@gmail.com>
Date: Wed, 1 Nov 2023 14:08:51 +0700
Subject: [PATCH 20/29] Rebuild fixture

---
 __fixtures__/test-project/web/package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/__fixtures__/test-project/web/package.json b/__fixtures__/test-project/web/package.json
index 02a6dc8b0fb2..4c68a92b4cd3 100644
--- a/__fixtures__/test-project/web/package.json
+++ b/__fixtures__/test-project/web/package.json
@@ -16,8 +16,8 @@
     "@redwoodjs/router": "6.0.7",
     "@redwoodjs/web": "6.0.7",
     "humanize-string": "2.1.0",
-    "react": "0.0.0-experimental-e5205658f-20230913",
-    "react-dom": "0.0.0-experimental-e5205658f-20230913"
+    "react": "0.0.0-experimental-08a39539f-20231031",
+    "react-dom": "0.0.0-experimental-08a39539f-20231031"
   },
   "devDependencies": {
     "@redwoodjs/vite": "6.0.7",
@@ -27,6 +27,6 @@
     "postcss": "^8.4.31",
     "postcss-loader": "^7.3.3",
     "prettier-plugin-tailwindcss": "0.4.1",
-    "tailwindcss": "^3.3.3"
+    "tailwindcss": "^3.3.5"
   }
 }

From b28988ffaf22173901e5d5ae9fbdd0ae6c466604 Mon Sep 17 00:00:00 2001
From: Daniel Choudhury <dannychoudhury@gmail.com>
Date: Wed, 1 Nov 2023 16:48:30 +0700
Subject: [PATCH 21/29] Add tests for ssr prod

---
 .github/workflows/ci.yml                      | 17 ++++++-
 tasks/smoke-tests/dev/tests/dev.spec.ts       |  2 +-
 .../prerender/tests/prerender.spec.ts         |  3 +-
 tasks/smoke-tests/serve/tests/serve.spec.ts   |  2 +-
 tasks/smoke-tests/{ => shared}/common.ts      | 21 +--------
 tasks/smoke-tests/shared/delayedPage.ts       | 47 +++++++++++++++++++
 tasks/smoke-tests/shared/homePage.ts          | 21 +++++++++
 .../playwright.config.ts                      |  1 +
 .../tests/progressiveRendering.spec.ts        |  2 +-
 .../streaming-ssr-prod/playwright.config.ts   | 21 +++++++++
 .../tests/botRendering.spec.ts                | 42 +++++++++++++++++
 .../tests/progressiveRendering.spec.ts        | 37 +++++++++++++++
 12 files changed, 189 insertions(+), 27 deletions(-)
 rename tasks/smoke-tests/{ => shared}/common.ts (83%)
 create mode 100644 tasks/smoke-tests/shared/delayedPage.ts
 create mode 100644 tasks/smoke-tests/shared/homePage.ts
 rename tasks/smoke-tests/{streaming-ssr => streaming-ssr-dev}/playwright.config.ts (96%)
 rename tasks/smoke-tests/{streaming-ssr => streaming-ssr-dev}/tests/progressiveRendering.spec.ts (97%)
 create mode 100644 tasks/smoke-tests/streaming-ssr-prod/playwright.config.ts
 create mode 100644 tasks/smoke-tests/streaming-ssr-prod/tests/botRendering.spec.ts
 create mode 100644 tasks/smoke-tests/streaming-ssr-prod/tests/progressiveRendering.spec.ts

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 611b470ec1fb..e0ab53238853 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -309,8 +309,21 @@ jobs:
       - name: 🎭 Install playwright dependencies
         run: npx playwright install --with-deps chromium
 
-      - name: Run SSR smoke tests
-        working-directory: ./tasks/smoke-tests/streaming-ssr
+      - name: Run SSR [DEV] smoke tests
+        working-directory: ./tasks/smoke-tests/streaming-ssr-dev
+        run: npx playwright test
+        env:
+          REDWOOD_TEST_PROJECT_PATH: '${{ steps.set-up-test-project.outputs.test-project-path }}'
+          REDWOOD_DISABLE_TELEMETRY: 1
+
+      - name: Build for production
+        working-directory: ${{ steps.set-up-test-project.outputs.test-project-path }}
+        run: yarn rw build --no-prerender
+        env:
+          REDWOOD_DISABLE_TELEMETRY: 1
+
+      - name: Run SSR [PROD] smoke tests
+        working-directory: ./tasks/smoke-tests/streaming-ssr-prod
         run: npx playwright test
         env:
           REDWOOD_TEST_PROJECT_PATH: '${{ steps.set-up-test-project.outputs.test-project-path }}'
diff --git a/tasks/smoke-tests/dev/tests/dev.spec.ts b/tasks/smoke-tests/dev/tests/dev.spec.ts
index c36dd405d595..17a5e003c9ef 100644
--- a/tasks/smoke-tests/dev/tests/dev.spec.ts
+++ b/tasks/smoke-tests/dev/tests/dev.spec.ts
@@ -1,5 +1,5 @@
 import { test } from '@playwright/test'
 
-import { smokeTest } from '../../common'
+import { smokeTest } from '../../shared/common'
 
 test('Smoke test with dev server', smokeTest)
diff --git a/tasks/smoke-tests/prerender/tests/prerender.spec.ts b/tasks/smoke-tests/prerender/tests/prerender.spec.ts
index 9bab02330a0b..4dd89b0e32c5 100644
--- a/tasks/smoke-tests/prerender/tests/prerender.spec.ts
+++ b/tasks/smoke-tests/prerender/tests/prerender.spec.ts
@@ -7,10 +7,9 @@ import type {
   PlaywrightTestArgs,
   PlaywrightWorkerArgs,
 } from '@playwright/test'
-// @ts-expect-error - With `* as` you have to use .default() when calling execa
 import execa from 'execa'
 
-import { checkHomePageCellRender } from '../../common'
+import { checkHomePageCellRender } from '../../shared/homePage'
 
 let noJsBrowser: BrowserContext
 
diff --git a/tasks/smoke-tests/serve/tests/serve.spec.ts b/tasks/smoke-tests/serve/tests/serve.spec.ts
index 08fbb4cd3c82..715ee04b6c1d 100644
--- a/tasks/smoke-tests/serve/tests/serve.spec.ts
+++ b/tasks/smoke-tests/serve/tests/serve.spec.ts
@@ -1,5 +1,5 @@
 import { test } from '@playwright/test'
 
-import { smokeTest } from '../../common'
+import { smokeTest } from '../../shared/common'
 
 test('Smoke test with rw serve', smokeTest)
diff --git a/tasks/smoke-tests/common.ts b/tasks/smoke-tests/shared/common.ts
similarity index 83%
rename from tasks/smoke-tests/common.ts
rename to tasks/smoke-tests/shared/common.ts
index b1dc760a60d7..d2ab977dddba 100644
--- a/tasks/smoke-tests/common.ts
+++ b/tasks/smoke-tests/shared/common.ts
@@ -1,5 +1,5 @@
 import { expect } from '@playwright/test'
-import type { Page, PlaywrightTestArgs } from '@playwright/test'
+import type { PlaywrightTestArgs } from '@playwright/test'
 
 export async function smokeTest({ page }: PlaywrightTestArgs) {
   await page.goto('/')
@@ -108,22 +108,3 @@ export const loginAsTestUser = async ({
     page.locator('button:has-text("Login")').click(),
   ])
 }
-
-export async function checkHomePageCellRender(page: Page) {
-  const cellSuccessState = await page.locator('main').innerHTML()
-
-  expect(cellSuccessState).toMatch(/Welcome to the blog!/)
-  expect(cellSuccessState).toMatch(/A little more about me/)
-  expect(cellSuccessState).toMatch(/What is the meaning of life\?/)
-
-  const navTitle = await page.locator('header >> h1').innerText()
-  expect(navTitle).toBe('Redwood Blog')
-
-  const navLinks = await page.locator('nav >> ul').innerText()
-  expect(navLinks.split('\n')).toEqual([
-    'About',
-    'Contact Us',
-    'Admin',
-    'Log In',
-  ])
-}
diff --git a/tasks/smoke-tests/shared/delayedPage.ts b/tasks/smoke-tests/shared/delayedPage.ts
new file mode 100644
index 000000000000..4b52aaf7c85f
--- /dev/null
+++ b/tasks/smoke-tests/shared/delayedPage.ts
@@ -0,0 +1,47 @@
+import type { Page } from '@playwright/test'
+import { expect } from '@playwright/test'
+
+export async function checkDelayedPageRendering(
+  page: Page,
+  { expectedDelay }: { expectedDelay: number }
+) {
+  const delayedLogStatements: { message: string; time: number }[] = []
+
+  page.on('console', (message) => {
+    if (message.type() === 'log') {
+      const messageText = message.text()
+
+      if (messageText.includes('delayed by')) {
+        delayedLogStatements.push({
+          message: messageText,
+          time: Date.now(),
+        })
+      }
+    }
+  })
+
+  await page.goto('/delayed')
+
+  expect(delayedLogStatements.length).toBe(4)
+
+  delayedLogStatements.forEach((log, index) => {
+    if (index > 0) {
+      const timeDiff = log.time - delayedLogStatements[index - 1].time
+      // If we're not expecting a delay
+      // Check that timeDiff is less than 300ms (with margin of error)
+      if (expectedDelay === 0) {
+        expect(timeDiff).toBeLessThan(300)
+      } else {
+        // Allow a 300ms margin of error
+        expect(timeDiff).toBeGreaterThan(expectedDelay - 300)
+        expect(timeDiff).toBeLessThan(expectedDelay + 300)
+      }
+    }
+  })
+
+  // Check that its actually rendered on the page. Important when **not** progressively rendering
+  await expect(page.locator('[data-test-id="delayed-text-1"]')).toHaveCount(1)
+  await expect(page.locator('[data-test-id="delayed-text-2"]')).toHaveCount(1)
+  await expect(page.locator('[data-test-id="delayed-text-3"]')).toHaveCount(1)
+  await expect(page.locator('[data-test-id="delayed-text-4"]')).toHaveCount(1)
+}
diff --git a/tasks/smoke-tests/shared/homePage.ts b/tasks/smoke-tests/shared/homePage.ts
new file mode 100644
index 000000000000..dc442192999c
--- /dev/null
+++ b/tasks/smoke-tests/shared/homePage.ts
@@ -0,0 +1,21 @@
+import { expect } from '@playwright/test'
+import type { Page } from '@playwright/test'
+
+export async function checkHomePageCellRender(page: Page) {
+  const cellSuccessState = await page.locator('main').innerHTML()
+
+  expect(cellSuccessState).toMatch(/Welcome to the blog!/)
+  expect(cellSuccessState).toMatch(/A little more about me/)
+  expect(cellSuccessState).toMatch(/What is the meaning of life\?/)
+
+  const navTitle = await page.locator('header >> h1').innerText()
+  expect(navTitle).toBe('Redwood Blog')
+
+  const navLinks = await page.locator('nav >> ul').innerText()
+  expect(navLinks.split('\n')).toEqual([
+    'About',
+    'Contact Us',
+    'Admin',
+    'Log In',
+  ])
+}
diff --git a/tasks/smoke-tests/streaming-ssr/playwright.config.ts b/tasks/smoke-tests/streaming-ssr-dev/playwright.config.ts
similarity index 96%
rename from tasks/smoke-tests/streaming-ssr/playwright.config.ts
rename to tasks/smoke-tests/streaming-ssr-dev/playwright.config.ts
index 907f29603ffd..b188c0d86434 100644
--- a/tasks/smoke-tests/streaming-ssr/playwright.config.ts
+++ b/tasks/smoke-tests/streaming-ssr-dev/playwright.config.ts
@@ -7,6 +7,7 @@ export default defineConfig({
   ...basePlaywrightConfig,
   use: {
     baseURL: 'http://localhost:8910',
+    // headless: false,
   },
 
   // Run your local dev server before starting the tests
diff --git a/tasks/smoke-tests/streaming-ssr/tests/progressiveRendering.spec.ts b/tasks/smoke-tests/streaming-ssr-dev/tests/progressiveRendering.spec.ts
similarity index 97%
rename from tasks/smoke-tests/streaming-ssr/tests/progressiveRendering.spec.ts
rename to tasks/smoke-tests/streaming-ssr-dev/tests/progressiveRendering.spec.ts
index db3b28c96630..5bf571952116 100644
--- a/tasks/smoke-tests/streaming-ssr/tests/progressiveRendering.spec.ts
+++ b/tasks/smoke-tests/streaming-ssr-dev/tests/progressiveRendering.spec.ts
@@ -3,7 +3,7 @@ import { setTimeout } from 'node:timers/promises'
 import type { Page } from '@playwright/test'
 import { expect, test } from '@playwright/test'
 
-import { checkHomePageCellRender } from '../../common'
+import { checkHomePageCellRender } from '../../common/homePage'
 
 let pageWithClientBlocked: Page
 
diff --git a/tasks/smoke-tests/streaming-ssr-prod/playwright.config.ts b/tasks/smoke-tests/streaming-ssr-prod/playwright.config.ts
new file mode 100644
index 000000000000..29c14c8da4a3
--- /dev/null
+++ b/tasks/smoke-tests/streaming-ssr-prod/playwright.config.ts
@@ -0,0 +1,21 @@
+import { defineConfig } from '@playwright/test'
+
+import { basePlaywrightConfig } from '../basePlaywright.config'
+
+// See https://playwright.dev/docs/test-configuration#global-configuration
+export default defineConfig({
+  ...basePlaywrightConfig,
+  use: {
+    baseURL: 'http://localhost:8910',
+    // headless: false,
+  },
+
+  // Run your local dev server before starting the tests
+  webServer: {
+    command: 'yarn redwood serve',
+    cwd: process.env.REDWOOD_TEST_PROJECT_PATH,
+    url: 'http://localhost:8910',
+    reuseExistingServer: !process.env.CI,
+    stdout: 'pipe',
+  },
+})
diff --git a/tasks/smoke-tests/streaming-ssr-prod/tests/botRendering.spec.ts b/tasks/smoke-tests/streaming-ssr-prod/tests/botRendering.spec.ts
new file mode 100644
index 000000000000..439db2806448
--- /dev/null
+++ b/tasks/smoke-tests/streaming-ssr-prod/tests/botRendering.spec.ts
@@ -0,0 +1,42 @@
+import type { Page } from '@playwright/test'
+import { test } from '@playwright/test'
+
+import { checkDelayedPageRendering } from '../../shared/delayedPage'
+import { checkHomePageCellRender } from '../../shared/homePage'
+
+let botPageNoJs: Page
+
+test.beforeAll(async ({ browser }) => {
+  // UA taken from https://developers.google.com/search/docs/crawling-indexing/overview-google-crawlers
+  const botContext = await browser.newContext({
+    userAgent:
+      'Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko; compatible; Googlebot/2.1; +http://www.google.com/bot.html) Chrome/W.X.Y.Z Safari/537.36',
+    // @@MARK TODO awaiting react team feedback. I dont understand why React is still injecting JS instead of giving us
+    // a fully formed HTML page
+    // javaScriptEnabled: false,
+  })
+
+  const botPage = await botContext.newPage()
+  await botPage.route('**/*.*.{js,tsx,ts,jsx}', (route) => route.abort())
+
+  botPageNoJs = botPage
+})
+
+test.afterAll(() => {
+  botPageNoJs.close()
+})
+
+test('Check that homepage has content rendered from the server', async () => {
+  await botPageNoJs.goto('/')
+
+  // Appears when Cell is successfully rendered
+  await botPageNoJs.waitForSelector('article')
+
+  await checkHomePageCellRender(botPageNoJs)
+})
+
+test('Check delayed page is NOT progressively rendered', async () => {
+  await checkDelayedPageRendering(botPageNoJs, {
+    expectedDelay: 0,
+  })
+})
diff --git a/tasks/smoke-tests/streaming-ssr-prod/tests/progressiveRendering.spec.ts b/tasks/smoke-tests/streaming-ssr-prod/tests/progressiveRendering.spec.ts
new file mode 100644
index 000000000000..f95495dc915c
--- /dev/null
+++ b/tasks/smoke-tests/streaming-ssr-prod/tests/progressiveRendering.spec.ts
@@ -0,0 +1,37 @@
+import type { Page } from '@playwright/test'
+import { test } from '@playwright/test'
+
+import { checkDelayedPageRendering } from '../../shared/delayedPage'
+import { checkHomePageCellRender } from '../../shared/homePage'
+
+let pageWithClientBlocked: Page
+
+test.beforeAll(async ({ browser }) => {
+  const page = await browser.newPage()
+
+  // Disable loading of client-side JS
+  // Note that we don't want to disable JS entirely, because progressive rendering
+  // requires JS injected in <script> tags to be executed
+  await page.route('**/*.*.{js,tsx,ts,jsx}', (route) => route.abort())
+
+  pageWithClientBlocked = page
+})
+
+test.afterAll(() => {
+  pageWithClientBlocked.close()
+})
+
+test('Check that homepage has content rendered from the server (progressively)', async () => {
+  await pageWithClientBlocked.goto('/')
+
+  // Appears when Cell is successfully rendered
+  await pageWithClientBlocked.waitForSelector('article')
+
+  await checkHomePageCellRender(pageWithClientBlocked)
+})
+
+test('Check delayed page has content progressively rendered', async () => {
+  await checkDelayedPageRendering(pageWithClientBlocked, {
+    expectedDelay: 1000,
+  })
+})

From 4c4b85e1f68b01c068e48606fb421e131ec71717 Mon Sep 17 00:00:00 2001
From: Daniel Choudhury <dannychoudhury@gmail.com>
Date: Wed, 1 Nov 2023 17:06:49 +0700
Subject: [PATCH 22/29] Fix broken import

---
 tasks/smoke-tests/auth/tests/authChecks.spec.ts | 2 +-
 tasks/smoke-tests/smoke-tests.mjs               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tasks/smoke-tests/auth/tests/authChecks.spec.ts b/tasks/smoke-tests/auth/tests/authChecks.spec.ts
index d5b8fa1c5632..b20171bbe277 100644
--- a/tasks/smoke-tests/auth/tests/authChecks.spec.ts
+++ b/tasks/smoke-tests/auth/tests/authChecks.spec.ts
@@ -1,6 +1,6 @@
 import { test, expect } from '@playwright/test'
 
-import { loginAsTestUser, signUpTestUser } from '../../common'
+import { loginAsTestUser, signUpTestUser } from '../../shared/common'
 
 // Signs up a user before these tests
 
diff --git a/tasks/smoke-tests/smoke-tests.mjs b/tasks/smoke-tests/smoke-tests.mjs
index 0bfb1db7c46f..fddbe1b0c708 100644
--- a/tasks/smoke-tests/smoke-tests.mjs
+++ b/tasks/smoke-tests/smoke-tests.mjs
@@ -64,7 +64,7 @@ async function main() {
     .readdirSync(path.dirname(fileURLToPath(import.meta.url)), {
       withFileTypes: true,
     })
-    .filter((dirent) => dirent.isDirectory())
+    .filter((dirent) => dirent.isDirectory() && dirent.name !== 'shared')
     .map((dirent) => dirent.name)
 
   if (smokeTest === undefined) {

From b96b471ac699db18f5791937c313ed0235827809 Mon Sep 17 00:00:00 2001
From: Daniel Choudhury <dannychoudhury@gmail.com>
Date: Wed, 1 Nov 2023 17:07:29 +0700
Subject: [PATCH 23/29] Couple more imports

---
 tasks/smoke-tests/auth/tests/rbacChecks.spec.ts                | 3 +--
 .../streaming-ssr-dev/tests/progressiveRendering.spec.ts       | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/tasks/smoke-tests/auth/tests/rbacChecks.spec.ts b/tasks/smoke-tests/auth/tests/rbacChecks.spec.ts
index 216c49e97f48..280c2ad4c820 100644
--- a/tasks/smoke-tests/auth/tests/rbacChecks.spec.ts
+++ b/tasks/smoke-tests/auth/tests/rbacChecks.spec.ts
@@ -3,10 +3,9 @@ import * as path from 'node:path'
 
 import { test, expect } from '@playwright/test'
 import type { PlaywrightTestArgs, Page } from '@playwright/test'
-// @ts-expect-error - With `* as` you have to use .default() when calling execa
 import execa from 'execa'
 
-import { loginAsTestUser, signUpTestUser } from '../../common'
+import { loginAsTestUser, signUpTestUser } from '../../shared/common'
 
 // This is a special test that does the following
 // Signup a user (admin@bazinga.com), because salt/secrets won't match, we need to do this
diff --git a/tasks/smoke-tests/streaming-ssr-dev/tests/progressiveRendering.spec.ts b/tasks/smoke-tests/streaming-ssr-dev/tests/progressiveRendering.spec.ts
index 5bf571952116..0f630a02bae9 100644
--- a/tasks/smoke-tests/streaming-ssr-dev/tests/progressiveRendering.spec.ts
+++ b/tasks/smoke-tests/streaming-ssr-dev/tests/progressiveRendering.spec.ts
@@ -3,7 +3,7 @@ import { setTimeout } from 'node:timers/promises'
 import type { Page } from '@playwright/test'
 import { expect, test } from '@playwright/test'
 
-import { checkHomePageCellRender } from '../../common/homePage'
+import { checkHomePageCellRender } from '../../shared/homePage'
 
 let pageWithClientBlocked: Page
 

From 06bee5d80f60f05c3463d733b240481710ee942a Mon Sep 17 00:00:00 2001
From: Daniel Choudhury <dannychoudhury@gmail.com>
Date: Wed, 1 Nov 2023 17:27:45 +0700
Subject: [PATCH 24/29] Hash all files in test-project

---
 .github/actions/actionsLib.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/actionsLib.mjs b/.github/actions/actionsLib.mjs
index 0ef01d2313b2..e4b2899016ff 100644
--- a/.github/actions/actionsLib.mjs
+++ b/.github/actions/actionsLib.mjs
@@ -69,7 +69,7 @@ export async function createCacheKeys({ baseKeyPrefix, distKeyPrefix, canary })
     baseKeyPrefix,
     process.env.RUNNER_OS,
     process.env.GITHUB_REF.replaceAll('/', '-'),
-    await hashFiles(path.join('__fixtures__', 'test-project'))
+    await hashFiles(path.join('__fixtures__', 'test-project/**/*'))
   ].join('-')
 
   const dependenciesKey = [

From 55067f03731e7b6b7e7b3b7c1e89b8479002184d Mon Sep 17 00:00:00 2001
From: Daniel Choudhury <dannychoudhury@gmail.com>
Date: Wed, 1 Nov 2023 17:35:39 +0700
Subject: [PATCH 25/29] Undo change, add extra line to yarn.lock

---
 .github/actions/actionsLib.mjs | 2 +-
 yarn.lock                      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/actions/actionsLib.mjs b/.github/actions/actionsLib.mjs
index e4b2899016ff..0ef01d2313b2 100644
--- a/.github/actions/actionsLib.mjs
+++ b/.github/actions/actionsLib.mjs
@@ -69,7 +69,7 @@ export async function createCacheKeys({ baseKeyPrefix, distKeyPrefix, canary })
     baseKeyPrefix,
     process.env.RUNNER_OS,
     process.env.GITHUB_REF.replaceAll('/', '-'),
-    await hashFiles(path.join('__fixtures__', 'test-project/**/*'))
+    await hashFiles(path.join('__fixtures__', 'test-project'))
   ].join('-')
 
   const dependenciesKey = [
diff --git a/yarn.lock b/yarn.lock
index 91c5bd00b75d..87932f13cd54 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -36201,3 +36201,4 @@ __metadata:
   checksum: 1089ff81a7a88a72b0c0eb4469d77c1540d774c1a8ff0bd728b79dbf595caa382fb5534ab59ea24d69bf4f44753931d5bf7346669314be45616fb224144b8143
   languageName: node
   linkType: hard
+

From 50e98887fa541c85422d41afcbdad1527eabc429 Mon Sep 17 00:00:00 2001
From: Daniel Choudhury <dannychoudhury@gmail.com>
Date: Wed, 1 Nov 2023 17:40:21 +0700
Subject: [PATCH 26/29] Force cache to be invalidated

---
 .yarnrc.yml | 1 +
 yarn.lock   | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/.yarnrc.yml b/.yarnrc.yml
index a46601216899..e57c81ecfa7a 100644
--- a/.yarnrc.yml
+++ b/.yarnrc.yml
@@ -17,3 +17,4 @@ plugins:
 preferInteractive: true
 
 yarnPath: .yarn/releases/yarn-3.6.3.cjs
+
diff --git a/yarn.lock b/yarn.lock
index 87932f13cd54..91c5bd00b75d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -36201,4 +36201,3 @@ __metadata:
   checksum: 1089ff81a7a88a72b0c0eb4469d77c1540d774c1a8ff0bd728b79dbf595caa382fb5534ab59ea24d69bf4f44753931d5bf7346669314be45616fb224144b8143
   languageName: node
   linkType: hard
-

From c8e6edae4830efe692929a68480fd00971f635a3 Mon Sep 17 00:00:00 2001
From: Daniel Choudhury <dannychoudhury@gmail.com>
Date: Wed, 1 Nov 2023 17:57:52 +0700
Subject: [PATCH 27/29] Revert "Rebuild fixture"

This reverts commit c8feb802523dc6369f17414af95d6394d10245f3.
---
 __fixtures__/test-project/web/package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/__fixtures__/test-project/web/package.json b/__fixtures__/test-project/web/package.json
index 4c68a92b4cd3..02a6dc8b0fb2 100644
--- a/__fixtures__/test-project/web/package.json
+++ b/__fixtures__/test-project/web/package.json
@@ -16,8 +16,8 @@
     "@redwoodjs/router": "6.0.7",
     "@redwoodjs/web": "6.0.7",
     "humanize-string": "2.1.0",
-    "react": "0.0.0-experimental-08a39539f-20231031",
-    "react-dom": "0.0.0-experimental-08a39539f-20231031"
+    "react": "0.0.0-experimental-e5205658f-20230913",
+    "react-dom": "0.0.0-experimental-e5205658f-20230913"
   },
   "devDependencies": {
     "@redwoodjs/vite": "6.0.7",
@@ -27,6 +27,6 @@
     "postcss": "^8.4.31",
     "postcss-loader": "^7.3.3",
     "prettier-plugin-tailwindcss": "0.4.1",
-    "tailwindcss": "^3.3.5"
+    "tailwindcss": "^3.3.3"
   }
 }

From 386c6e8b38509138dcdfd62cfdb641e1960b63e4 Mon Sep 17 00:00:00 2001
From: Daniel Choudhury <dannychoudhury@gmail.com>
Date: Wed, 1 Nov 2023 17:58:10 +0700
Subject: [PATCH 28/29] Revert "Bump to latest react experimental package"

This reverts commit 6416f423376920639d1328aa30cb158787ba1930.
---
 .../auth-providers/auth0/web/package.json     |  2 +-
 .../azureActiveDirectory/web/package.json     |  2 +-
 .../auth-providers/clerk/web/package.json     |  2 +-
 .../auth-providers/dbAuth/web/package.json    |  2 +-
 .../auth-providers/firebase/web/package.json  |  2 +-
 .../auth-providers/netlify/web/package.json   |  2 +-
 .../auth-providers/supabase/web/package.json  |  2 +-
 .../supertokens/web/package.json              |  2 +-
 packages/auth/package.json                    |  2 +-
 .../templates/js/web/package.json             |  4 +-
 .../templates/ts/web/package.json             |  4 +-
 packages/forms/package.json                   |  6 +-
 packages/prerender/package.json               |  4 +-
 packages/router/package.json                  |  8 +-
 packages/studio/package.json                  |  4 +-
 packages/vite/package.json                    |  4 +-
 packages/web/package.json                     |  8 +-
 yarn.lock                                     | 92 +++++++++----------
 18 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/packages/auth-providers/auth0/web/package.json b/packages/auth-providers/auth0/web/package.json
index 9be3d9e40d62..38784fb9c801 100644
--- a/packages/auth-providers/auth0/web/package.json
+++ b/packages/auth-providers/auth0/web/package.json
@@ -32,7 +32,7 @@
     "@babel/core": "^7.22.20",
     "@types/react": "18.2.14",
     "jest": "29.7.0",
-    "react": "0.0.0-experimental-08a39539f-20231031",
+    "react": "0.0.0-experimental-e5205658f-20230913",
     "typescript": "5.2.2"
   },
   "peerDependencies": {
diff --git a/packages/auth-providers/azureActiveDirectory/web/package.json b/packages/auth-providers/azureActiveDirectory/web/package.json
index a67913d1b3ef..ac088253a4c5 100644
--- a/packages/auth-providers/azureActiveDirectory/web/package.json
+++ b/packages/auth-providers/azureActiveDirectory/web/package.json
@@ -33,7 +33,7 @@
     "@types/netlify-identity-widget": "1.9.3",
     "@types/react": "18.2.14",
     "jest": "29.7.0",
-    "react": "0.0.0-experimental-08a39539f-20231031",
+    "react": "0.0.0-experimental-e5205658f-20230913",
     "typescript": "5.2.2"
   },
   "peerDependencies": {
diff --git a/packages/auth-providers/clerk/web/package.json b/packages/auth-providers/clerk/web/package.json
index f36d6d325623..61d42d2c5465 100644
--- a/packages/auth-providers/clerk/web/package.json
+++ b/packages/auth-providers/clerk/web/package.json
@@ -33,7 +33,7 @@
     "@clerk/types": "3.52.0",
     "@types/react": "18.2.14",
     "jest": "29.7.0",
-    "react": "0.0.0-experimental-08a39539f-20231031",
+    "react": "0.0.0-experimental-e5205658f-20230913",
     "typescript": "5.2.2"
   },
   "peerDependencies": {
diff --git a/packages/auth-providers/dbAuth/web/package.json b/packages/auth-providers/dbAuth/web/package.json
index c23998be155c..a0a30c413800 100644
--- a/packages/auth-providers/dbAuth/web/package.json
+++ b/packages/auth-providers/dbAuth/web/package.json
@@ -34,7 +34,7 @@
     "@simplewebauthn/typescript-types": "7.0.0",
     "@types/react": "18.2.14",
     "jest": "29.7.0",
-    "react": "0.0.0-experimental-08a39539f-20231031",
+    "react": "0.0.0-experimental-e5205658f-20230913",
     "typescript": "5.2.2"
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
diff --git a/packages/auth-providers/firebase/web/package.json b/packages/auth-providers/firebase/web/package.json
index e501796dc369..69f0f00257e2 100644
--- a/packages/auth-providers/firebase/web/package.json
+++ b/packages/auth-providers/firebase/web/package.json
@@ -32,7 +32,7 @@
     "@types/react": "18.2.14",
     "firebase": "10.4.0",
     "jest": "29.7.0",
-    "react": "0.0.0-experimental-08a39539f-20231031",
+    "react": "0.0.0-experimental-e5205658f-20230913",
     "typescript": "5.2.2"
   },
   "peerDependencies": {
diff --git a/packages/auth-providers/netlify/web/package.json b/packages/auth-providers/netlify/web/package.json
index 83deb5b15b2c..9e75eb93c319 100644
--- a/packages/auth-providers/netlify/web/package.json
+++ b/packages/auth-providers/netlify/web/package.json
@@ -32,7 +32,7 @@
     "@types/netlify-identity-widget": "1.9.3",
     "@types/react": "18.2.14",
     "jest": "29.7.0",
-    "react": "0.0.0-experimental-08a39539f-20231031",
+    "react": "0.0.0-experimental-e5205658f-20230913",
     "typescript": "5.2.2"
   },
   "peerDependencies": {
diff --git a/packages/auth-providers/supabase/web/package.json b/packages/auth-providers/supabase/web/package.json
index f2bf1de9a809..3fce1a0bc8e5 100644
--- a/packages/auth-providers/supabase/web/package.json
+++ b/packages/auth-providers/supabase/web/package.json
@@ -31,7 +31,7 @@
     "@supabase/supabase-js": "2.26.0",
     "@types/react": "18.2.14",
     "jest": "29.7.0",
-    "react": "0.0.0-experimental-08a39539f-20231031",
+    "react": "0.0.0-experimental-e5205658f-20230913",
     "typescript": "5.2.2"
   },
   "peerDependencies": {
diff --git a/packages/auth-providers/supertokens/web/package.json b/packages/auth-providers/supertokens/web/package.json
index adb39cd47287..f441c1c347bf 100644
--- a/packages/auth-providers/supertokens/web/package.json
+++ b/packages/auth-providers/supertokens/web/package.json
@@ -31,7 +31,7 @@
     "@babel/core": "^7.22.20",
     "@types/react": "18.2.14",
     "jest": "29.7.0",
-    "react": "0.0.0-experimental-08a39539f-20231031",
+    "react": "0.0.0-experimental-e5205658f-20230913",
     "supertokens-auth-react": "0.34.0",
     "typescript": "5.2.2"
   },
diff --git a/packages/auth/package.json b/packages/auth/package.json
index 78c05dd302e2..1b326a17c8c3 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -24,7 +24,7 @@
   "dependencies": {
     "@babel/runtime-corejs3": "7.23.2",
     "core-js": "3.32.2",
-    "react": "0.0.0-experimental-08a39539f-20231031"
+    "react": "0.0.0-experimental-e5205658f-20230913"
   },
   "devDependencies": {
     "@babel/cli": "7.23.0",
diff --git a/packages/create-redwood-app/templates/js/web/package.json b/packages/create-redwood-app/templates/js/web/package.json
index ecdafd543974..841204785412 100644
--- a/packages/create-redwood-app/templates/js/web/package.json
+++ b/packages/create-redwood-app/templates/js/web/package.json
@@ -14,8 +14,8 @@
     "@redwoodjs/forms": "6.0.7",
     "@redwoodjs/router": "6.0.7",
     "@redwoodjs/web": "6.0.7",
-    "react": "0.0.0-experimental-08a39539f-20231031",
-    "react-dom": "0.0.0-experimental-08a39539f-20231031"
+    "react": "0.0.0-experimental-e5205658f-20230913",
+    "react-dom": "0.0.0-experimental-e5205658f-20230913"
   },
   "devDependencies": {
     "@types/react": "18.2.14",
diff --git a/packages/create-redwood-app/templates/ts/web/package.json b/packages/create-redwood-app/templates/ts/web/package.json
index ecdafd543974..841204785412 100644
--- a/packages/create-redwood-app/templates/ts/web/package.json
+++ b/packages/create-redwood-app/templates/ts/web/package.json
@@ -14,8 +14,8 @@
     "@redwoodjs/forms": "6.0.7",
     "@redwoodjs/router": "6.0.7",
     "@redwoodjs/web": "6.0.7",
-    "react": "0.0.0-experimental-08a39539f-20231031",
-    "react-dom": "0.0.0-experimental-08a39539f-20231031"
+    "react": "0.0.0-experimental-e5205658f-20230913",
+    "react-dom": "0.0.0-experimental-e5205658f-20230913"
   },
   "devDependencies": {
     "@types/react": "18.2.14",
diff --git a/packages/forms/package.json b/packages/forms/package.json
index 45a8751ee6fa..8391e8ee8636 100644
--- a/packages/forms/package.json
+++ b/packages/forms/package.json
@@ -41,13 +41,13 @@
     "graphql": "16.8.1",
     "jest": "29.7.0",
     "nodemon": "2.0.22",
-    "react": "0.0.0-experimental-08a39539f-20231031",
-    "react-dom": "0.0.0-experimental-08a39539f-20231031",
+    "react": "0.0.0-experimental-e5205658f-20230913",
+    "react-dom": "0.0.0-experimental-e5205658f-20230913",
     "typescript": "5.2.2"
   },
   "peerDependencies": {
     "graphql": "16.8.1",
-    "react": "0.0.0-experimental-08a39539f-20231031"
+    "react": "0.0.0-experimental-e5205658f-20230913"
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
 }
diff --git a/packages/prerender/package.json b/packages/prerender/package.json
index 884a5bb50968..35c20dbc0b32 100644
--- a/packages/prerender/package.json
+++ b/packages/prerender/package.json
@@ -47,8 +47,8 @@
     "typescript": "5.2.2"
   },
   "peerDependencies": {
-    "react": "0.0.0-experimental-08a39539f-20231031",
-    "react-dom": "0.0.0-experimental-08a39539f-20231031"
+    "react": "0.0.0-experimental-e5205658f-20230913",
+    "react-dom": "0.0.0-experimental-e5205658f-20230913"
   },
   "externals": {
     "react": "react",
diff --git a/packages/router/package.json b/packages/router/package.json
index 6048116a5dbe..a9ce2abbd533 100644
--- a/packages/router/package.json
+++ b/packages/router/package.json
@@ -33,13 +33,13 @@
     "@types/react": "18.2.14",
     "@types/react-dom": "18.2.6",
     "jest": "29.7.0",
-    "react": "0.0.0-experimental-08a39539f-20231031",
-    "react-dom": "0.0.0-experimental-08a39539f-20231031",
+    "react": "0.0.0-experimental-e5205658f-20230913",
+    "react-dom": "0.0.0-experimental-e5205658f-20230913",
     "typescript": "5.2.2"
   },
   "peerDependencies": {
-    "react": "0.0.0-experimental-08a39539f-20231031",
-    "react-dom": "0.0.0-experimental-08a39539f-20231031"
+    "react": "0.0.0-experimental-e5205658f-20230913",
+    "react-dom": "0.0.0-experimental-e5205658f-20230913"
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
 }
diff --git a/packages/studio/package.json b/packages/studio/package.json
index 2f46812a120d..a76ac633deef 100644
--- a/packages/studio/package.json
+++ b/packages/studio/package.json
@@ -91,8 +91,8 @@
     "json-bigint-patch": "0.0.8",
     "postcss": "8.4.31",
     "pretty-ms": "7.0.1",
-    "react": "0.0.0-experimental-08a39539f-20231031",
-    "react-dom": "0.0.0-experimental-08a39539f-20231031",
+    "react": "0.0.0-experimental-e5205658f-20230913",
+    "react-dom": "0.0.0-experimental-e5205658f-20230913",
     "react-error-boundary": "4.0.11",
     "react-grid-layout": "1.3.4",
     "react-router-dom": "6.8.1",
diff --git a/packages/vite/package.json b/packages/vite/package.json
index e1ec1c842cde..30c01bf7d8bc 100644
--- a/packages/vite/package.json
+++ b/packages/vite/package.json
@@ -78,8 +78,8 @@
     "express": "4.18.2",
     "http-proxy-middleware": "2.0.6",
     "isbot": "3.6.8",
-    "react": "0.0.0-experimental-08a39539f-20231031",
-    "react-server-dom-webpack": "0.0.0-experimental-08a39539f-20231031",
+    "react": "0.0.0-experimental-e5205658f-20230913",
+    "react-server-dom-webpack": "0.0.0-experimental-e5205658f-20230913",
     "vite": "4.5.0",
     "yargs-parser": "21.1.1"
   },
diff --git a/packages/web/package.json b/packages/web/package.json
index 392d42164acd..a7e30fec1377 100644
--- a/packages/web/package.json
+++ b/packages/web/package.json
@@ -59,13 +59,13 @@
     "jest": "29.7.0",
     "jest-runner-tsd": "5.0.0",
     "nodemon": "2.0.22",
-    "react": "0.0.0-experimental-08a39539f-20231031",
-    "react-dom": "0.0.0-experimental-08a39539f-20231031",
+    "react": "0.0.0-experimental-e5205658f-20230913",
+    "react-dom": "0.0.0-experimental-e5205658f-20230913",
     "typescript": "5.2.2"
   },
   "peerDependencies": {
-    "react": "0.0.0-experimental-08a39539f-20231031",
-    "react-dom": "0.0.0-experimental-08a39539f-20231031"
+    "react": "0.0.0-experimental-e5205658f-20230913",
+    "react-dom": "0.0.0-experimental-e5205658f-20230913"
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
 }
diff --git a/yarn.lock b/yarn.lock
index 91c5bd00b75d..f9da81e21b8b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7936,7 +7936,7 @@ __metadata:
     "@types/react": 18.2.14
     core-js: 3.32.2
     jest: 29.7.0
-    react: 0.0.0-experimental-08a39539f-20231031
+    react: 0.0.0-experimental-e5205658f-20230913
     typescript: 5.2.2
   peerDependencies:
     "@auth0/auth0-spa-js": 2.1.1
@@ -7989,7 +7989,7 @@ __metadata:
     "@types/react": 18.2.14
     core-js: 3.32.2
     jest: 29.7.0
-    react: 0.0.0-experimental-08a39539f-20231031
+    react: 0.0.0-experimental-e5205658f-20230913
     typescript: 5.2.2
   peerDependencies:
     "@azure/msal-browser": 2.38.1
@@ -8040,7 +8040,7 @@ __metadata:
     "@types/react": 18.2.14
     core-js: 3.32.2
     jest: 29.7.0
-    react: 0.0.0-experimental-08a39539f-20231031
+    react: 0.0.0-experimental-e5205658f-20230913
     typescript: 5.2.2
   peerDependencies:
     "@clerk/clerk-react": 4.25.1
@@ -8119,7 +8119,7 @@ __metadata:
     "@types/react": 18.2.14
     core-js: 3.32.2
     jest: 29.7.0
-    react: 0.0.0-experimental-08a39539f-20231031
+    react: 0.0.0-experimental-e5205658f-20230913
     typescript: 5.2.2
   languageName: unknown
   linkType: soft
@@ -8167,7 +8167,7 @@ __metadata:
     core-js: 3.32.2
     firebase: 10.4.0
     jest: 29.7.0
-    react: 0.0.0-experimental-08a39539f-20231031
+    react: 0.0.0-experimental-e5205658f-20230913
     typescript: 5.2.2
   peerDependencies:
     firebase: 10.4.0
@@ -8218,7 +8218,7 @@ __metadata:
     "@types/react": 18.2.14
     core-js: 3.32.2
     jest: 29.7.0
-    react: 0.0.0-experimental-08a39539f-20231031
+    react: 0.0.0-experimental-e5205658f-20230913
     typescript: 5.2.2
   peerDependencies:
     netlify-identity-widget: 1.9.2
@@ -8268,7 +8268,7 @@ __metadata:
     "@types/react": 18.2.14
     core-js: 3.32.2
     jest: 29.7.0
-    react: 0.0.0-experimental-08a39539f-20231031
+    react: 0.0.0-experimental-e5205658f-20230913
     typescript: 5.2.2
   peerDependencies:
     "@supabase/supabase-js": 2.26.0
@@ -8320,7 +8320,7 @@ __metadata:
     "@types/react": 18.2.14
     core-js: 3.32.2
     jest: 29.7.0
-    react: 0.0.0-experimental-08a39539f-20231031
+    react: 0.0.0-experimental-e5205658f-20230913
     supertokens-auth-react: 0.34.0
     typescript: 5.2.2
   peerDependencies:
@@ -8340,7 +8340,7 @@ __metadata:
     core-js: 3.32.2
     jest: 29.7.0
     msw: 1.3.1
-    react: 0.0.0-experimental-08a39539f-20231031
+    react: 0.0.0-experimental-e5205658f-20230913
     typescript: 5.2.2
   languageName: unknown
   linkType: soft
@@ -8717,13 +8717,13 @@ __metadata:
     jest: 29.7.0
     nodemon: 2.0.22
     pascalcase: 1.0.0
-    react: 0.0.0-experimental-08a39539f-20231031
-    react-dom: 0.0.0-experimental-08a39539f-20231031
+    react: 0.0.0-experimental-e5205658f-20230913
+    react-dom: 0.0.0-experimental-e5205658f-20230913
     react-hook-form: 7.46.1
     typescript: 5.2.2
   peerDependencies:
     graphql: 16.8.1
-    react: 0.0.0-experimental-08a39539f-20231031
+    react: 0.0.0-experimental-e5205658f-20230913
   languageName: unknown
   linkType: soft
 
@@ -8929,8 +8929,8 @@ __metadata:
     mime-types: 2.1.35
     typescript: 5.2.2
   peerDependencies:
-    react: 0.0.0-experimental-08a39539f-20231031
-    react-dom: 0.0.0-experimental-08a39539f-20231031
+    react: 0.0.0-experimental-e5205658f-20230913
+    react-dom: 0.0.0-experimental-e5205658f-20230913
   languageName: unknown
   linkType: soft
 
@@ -9008,12 +9008,12 @@ __metadata:
     "@types/react-dom": 18.2.6
     core-js: 3.32.2
     jest: 29.7.0
-    react: 0.0.0-experimental-08a39539f-20231031
-    react-dom: 0.0.0-experimental-08a39539f-20231031
+    react: 0.0.0-experimental-e5205658f-20230913
+    react-dom: 0.0.0-experimental-e5205658f-20230913
     typescript: 5.2.2
   peerDependencies:
-    react: 0.0.0-experimental-08a39539f-20231031
-    react-dom: 0.0.0-experimental-08a39539f-20231031
+    react: 0.0.0-experimental-e5205658f-20230913
+    react-dom: 0.0.0-experimental-e5205658f-20230913
   languageName: unknown
   linkType: soft
 
@@ -9119,8 +9119,8 @@ __metadata:
     pretty-bytes: 5.6.0
     pretty-ms: 7.0.1
     qs: 6.11.2
-    react: 0.0.0-experimental-08a39539f-20231031
-    react-dom: 0.0.0-experimental-08a39539f-20231031
+    react: 0.0.0-experimental-e5205658f-20230913
+    react-dom: 0.0.0-experimental-e5205658f-20230913
     react-error-boundary: 4.0.11
     react-grid-layout: 1.3.4
     react-router-dom: 6.8.1
@@ -9239,8 +9239,8 @@ __metadata:
     http-proxy-middleware: 2.0.6
     isbot: 3.6.8
     jest: 29.7.0
-    react: 0.0.0-experimental-08a39539f-20231031
-    react-server-dom-webpack: 0.0.0-experimental-08a39539f-20231031
+    react: 0.0.0-experimental-e5205658f-20230913
+    react-server-dom-webpack: 0.0.0-experimental-e5205658f-20230913
     rollup: 3.27.2
     typescript: 5.2.2
     vite: 4.5.0
@@ -9296,16 +9296,16 @@ __metadata:
     jest: 29.7.0
     jest-runner-tsd: 5.0.0
     nodemon: 2.0.22
-    react: 0.0.0-experimental-08a39539f-20231031
-    react-dom: 0.0.0-experimental-08a39539f-20231031
+    react: 0.0.0-experimental-e5205658f-20230913
+    react-dom: 0.0.0-experimental-e5205658f-20230913
     react-helmet-async: 1.3.0
     react-hot-toast: 2.4.1
     stacktracey: 2.1.8
     ts-toolbelt: 9.6.0
     typescript: 5.2.2
   peerDependencies:
-    react: 0.0.0-experimental-08a39539f-20231031
-    react-dom: 0.0.0-experimental-08a39539f-20231031
+    react: 0.0.0-experimental-e5205658f-20230913
+    react-dom: 0.0.0-experimental-e5205658f-20230913
   bin:
     cross-env: ./dist/bins/cross-env.js
     msw: ./dist/bins/msw.js
@@ -30064,15 +30064,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-dom@npm:0.0.0-experimental-08a39539f-20231031":
-  version: 0.0.0-experimental-08a39539f-20231031
-  resolution: "react-dom@npm:0.0.0-experimental-08a39539f-20231031"
+"react-dom@npm:0.0.0-experimental-e5205658f-20230913":
+  version: 0.0.0-experimental-e5205658f-20230913
+  resolution: "react-dom@npm:0.0.0-experimental-e5205658f-20230913"
   dependencies:
     loose-envify: ^1.1.0
-    scheduler: 0.0.0-experimental-08a39539f-20231031
+    scheduler: 0.0.0-experimental-e5205658f-20230913
   peerDependencies:
-    react: 0.0.0-experimental-08a39539f-20231031
-  checksum: 3a829cb929446fe03115d076fbf2afd52f5ce5bd32a7db0f6b3aaba7f18ef901ef44bfaf9bc722cb490fa25a74a610eec06137f42e727af0762934d32dad5136
+    react: 0.0.0-experimental-e5205658f-20230913
+  checksum: b8e0e0edf05161a39cd8495ac11dbebccda0e69245d1f33d07697122e65649a1f0539ff8ad7277d833aabc9cbee8da9d80de14d0766262412da5bf824d5eb823
   languageName: node
   linkType: hard
 
@@ -30378,18 +30378,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-server-dom-webpack@npm:0.0.0-experimental-08a39539f-20231031":
-  version: 0.0.0-experimental-08a39539f-20231031
-  resolution: "react-server-dom-webpack@npm:0.0.0-experimental-08a39539f-20231031"
+"react-server-dom-webpack@npm:0.0.0-experimental-e5205658f-20230913":
+  version: 0.0.0-experimental-e5205658f-20230913
+  resolution: "react-server-dom-webpack@npm:0.0.0-experimental-e5205658f-20230913"
   dependencies:
     acorn-loose: ^8.3.0
     loose-envify: ^1.1.0
     neo-async: ^2.6.1
   peerDependencies:
-    react: 0.0.0-experimental-08a39539f-20231031
-    react-dom: 0.0.0-experimental-08a39539f-20231031
+    react: 0.0.0-experimental-e5205658f-20230913
+    react-dom: 0.0.0-experimental-e5205658f-20230913
     webpack: ^5.59.0
-  checksum: ab97b3a0011033ea385484cde0a5cf0639e486c92801ed0798605c4f1fcc689d95f4e278e6fae45d70e1e35874bce654488f7cd9cbf187973d7fd15ca458c50c
+  checksum: 94c29f986209c3d174a3b200526a8f1e8e10c9c831d29e9938e5f6e08146020a37a5ec19410af73d21e32906c35c7c1f68b044c720ef5d785d4de6cbb0438a88
   languageName: node
   linkType: hard
 
@@ -30489,12 +30489,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react@npm:0.0.0-experimental-08a39539f-20231031":
-  version: 0.0.0-experimental-08a39539f-20231031
-  resolution: "react@npm:0.0.0-experimental-08a39539f-20231031"
+"react@npm:0.0.0-experimental-e5205658f-20230913":
+  version: 0.0.0-experimental-e5205658f-20230913
+  resolution: "react@npm:0.0.0-experimental-e5205658f-20230913"
   dependencies:
     loose-envify: ^1.1.0
-  checksum: e3682b361ffb1bf8f1b4a4b8593ea0c6160191213333b1b8be585035682a38944f9f3e6e20bb25f1a602246d37b833ec1075b9f49a5a199f438f08d2bdbe366f
+  checksum: 69f384cd192d6fc83bd77457b539c171cd89b44fd105c67c77a2c57b237c1068c598470ddf524084bdb7d9b0bc16362918493dbc3fbcb909af8edd92c6be9759
   languageName: node
   linkType: hard
 
@@ -31635,12 +31635,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"scheduler@npm:0.0.0-experimental-08a39539f-20231031":
-  version: 0.0.0-experimental-08a39539f-20231031
-  resolution: "scheduler@npm:0.0.0-experimental-08a39539f-20231031"
+"scheduler@npm:0.0.0-experimental-e5205658f-20230913":
+  version: 0.0.0-experimental-e5205658f-20230913
+  resolution: "scheduler@npm:0.0.0-experimental-e5205658f-20230913"
   dependencies:
     loose-envify: ^1.1.0
-  checksum: bf051d8e2c3b4454112bf894c8dfd7bb21c4b532e5762872ffdc9e7321e9962eb4d329d462128410baa12e1321ef2279bf78dc8592e3cd336527b3206b4f0e5b
+  checksum: 20475be7524bb89002818cfc0f54af122c0e2c07c07ddb92275e10c0e8d1a51a9c7ca3b4b95e9b27017da4e22f1510c478afe08becc1073decfd03ae5823f452
   languageName: node
   linkType: hard
 

From e40a6ecfa5c7944543fc36f19b117edef1d94d99 Mon Sep 17 00:00:00 2001
From: Daniel Choudhury <dannychoudhury@gmail.com>
Date: Fri, 3 Nov 2023 12:35:56 +0700
Subject: [PATCH 29/29] Disable windows ssr tests for now

---
 .github/workflows/ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e0ab53238853..8dbddbb7f4cb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -263,7 +263,9 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest]
+        # [ubuntu-latest, windows-latest] disabled, because windows misbehaving
+        # waiting for help from main-man Josh
 
     name: 🔁 SSR Smoke tests / ${{ matrix.os }}
     runs-on: ${{ matrix.os }}