Fix suspense/hydration bug (on canary) (#2785)

(patch)
blitz-js · Oct 2, 2021 · 5105ed4 · 5105ed4
1 parent 25782cd
commit 5105ed4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/examples/auth/cypress/integration/index.test.ts b/examples/auth/cypress/integration/index.test.ts
@@ -23,6 +23,7 @@ describe("index page", () => {
 
     cy.location("pathname").should("equal", "/")
     cy.contains("button", "Logout")
+    cy.wait(1000)
   })
 
   it("allows the user to log in", () => {
@@ -42,6 +43,7 @@ describe("index page", () => {
     cy.location("pathname").should("equal", "/")
     cy.wait(1000)
     cy.contains("button", "Logout")
+    cy.wait(1000)
   })
 
   it("allows the user to logout", () => {

diff --git a/nextjs/packages/next/build/webpack-config.ts b/nextjs/packages/next/build/webpack-config.ts
@@ -258,6 +258,10 @@ export default async function getBaseWebpackConfig(
         semver.coerce(reactDomVersion)?.version === '18.0.0')) ||
     hasReactExperimental // blitz
   const hasReactRoot: boolean = config.experimental.reactRoot ?? hasReact18
+  // Have to set this suspense env for the actual build, because the webpack
+  // string replace below only affects the build output, not anything during
+  // the build like static page optimization
+  process.env.__BLITZ_SUSPENSE_ENABLED = String(hasReactRoot)
 
   const babelConfigFile = await [
     '.babelrc',