Adjust codegen logic for suspense patch (#4138)

Co-authored-by: Brandon Bayer <[email protected]>
Co-authored-by: Siddharth Suresh <[email protected]>

.changeset/fresh-crews-chew.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": minor
+---
+
+Fix the DYNAMIC_SERVER_USAGE error for Next.js 13.3.1+

packages/blitz/src/cli/utils/codegen-tasks.ts

@@ -16,6 +16,7 @@ export const codegenTasks = async () => {
     */
     const nextDir = await resolveCwd("next")
     const nextClientIndex = join(nextDir, "../..", "client", "index.js")
+    console.log(nextClientIndex)
     const readFile = await fs.readFile(nextClientIndex)
     const packageJson = await getPackageJson()
     const version = packageJson.dependencies.next
@@ -39,15 +40,24 @@ export const codegenTasks = async () => {
         )
       await fs.writeFile(nextClientIndex, updatedFile)
       log.success("Next.js was successfully patched with a React Suspense fix")
-    } else if (nextVersion && semver.satisfies(nextVersion, ">=13.2")) {
+    } else if (nextVersion && semver.satisfies(nextVersion, "13.1 - 13.3.0")) {
       const updatedFile = readFile
         .toString()
         .replace(
-          /_onRecoverableError\.default/,
+          /_onRecoverableError\.default$/gm,
           `(err) => (err.toString().includes("DYNAMIC_SERVER_USAGE") || err.toString().includes("could not finish this Suspense boundary") || err.toString().includes("Minified React error #419")) ? null : _onRecoverableError.default(err)`,
         )
       await fs.writeFile(nextClientIndex, updatedFile)
       log.success("Next.js was successfully patched with a React Suspense fix")
+    } else if (nextVersion && semver.satisfies(nextVersion, ">=13.3.1")) {
+      const updatedFile = readFile
+        .toString()
+        .replace(
+          /_onrecoverableerror\.default$/gm,
+          `(err) => (err.toString().includes("DYNAMIC_SERVER_USAGE") || err.toString().includes("could not finish this Suspense boundary") || err.toString().includes("Minified React error #419")) ? null : _onrecoverableerror.default(err)`,
+        )
+      await fs.writeFile(nextClientIndex, updatedFile)
+      log.success("Next.js was successfully patched with a React Suspense fix")
     }
   } catch (err) {
     log.error(JSON.stringify(err, null, 2))