Fix module error for findDOMNode on edge

packages/next/client/components/layout-router.tsx

@@ -9,10 +9,11 @@ import type {
 } from '../../server/app-render'
 import type { ErrorComponent } from './error-boundary'
 import type { FocusAndScrollRef } from './reducer'
+import type { findDOMNode as TFindDOMNode } from 'react-dom'
+import type { ChildProp } from '../../server/app-render'
 
 import React, { useContext, useEffect, use } from 'react'
-import { findDOMNode as ReactDOMfindDOMNode } from 'react-dom'
-import type { ChildProp } from '../../server/app-render'
+import ReactDOM from 'react-dom'
 import {
   CacheStates,
   LayoutRouterContext,
@@ -80,8 +81,8 @@ function walkAddRefetch(
  * Wraps ReactDOM.findDOMNode with additional logic to hide React Strict Mode warning
  */
 function findDOMNode(
-  instance: Parameters<typeof ReactDOMfindDOMNode>[0]
-): ReturnType<typeof ReactDOMfindDOMNode> {
+  instance: Parameters<typeof TFindDOMNode>[0]
+): ReturnType<typeof TFindDOMNode> {
   // Only apply strict mode warning when not in production
   if (process.env.NODE_ENV !== 'production') {
     const originalConsoleError = console.error
@@ -92,12 +93,12 @@ function findDOMNode(
           originalConsoleError(...messages)
         }
       }
-      return ReactDOMfindDOMNode(instance)
+      return ReactDOM.findDOMNode(instance)
     } finally {
       console.error = originalConsoleError!
     }
   }
-  return ReactDOMfindDOMNode(instance)
+  return ReactDOM.findDOMNode(instance)
 }
 
 /**

test/e2e/app-dir/app-edge.test.ts

@@ -34,6 +34,17 @@ describe('app-dir edge SSR', () => {
   })
 
   if ((globalThis as any).isNextDev) {
+    it('should resolve module without error in edge runtime', async () => {
+      const logs = []
+      next.on('stderr', (log) => {
+        logs.push(log)
+      })
+      await renderViaHTTP(next.url, 'app-edge')
+      expect(logs.some((log) => log.includes(`Attempted import error:`))).toBe(
+        false
+      )
+    })
+
     it('should handle edge rsc hmr', async () => {
       const pageFile = 'app/app-edge/page.tsx'
       const content = await next.readFile(pageFile)
@@ -53,9 +64,8 @@ describe('app-dir edge SSR', () => {
         return html
       }, /Edge!/)
     })
-  }
-
-  if (!(globalThis as any).isNextDev) {
+  } else {
+    // Production tests
     it('should generate matchers correctly in middleware manifest', async () => {
       const manifest = JSON.parse(
         await next.readFile('.next/server/middleware-manifest.json')

test/e2e/streaming-ssr/index.test.ts

@@ -10,11 +10,6 @@ import {
   renderViaHTTP,
 } from 'next-test-utils'
 
-const react18Deps = {
-  react: '^18.0.0',
-  'react-dom': '^18.0.0',
-}
-
 const isNextProd = !(global as any).isNextDev && !(global as any).isNextDeploy
 
 describe('streaming SSR with custom next configs', () => {
@@ -31,7 +26,6 @@ describe('streaming SSR with custom next configs', () => {
         pages: new FileRef(join(__dirname, 'streaming-ssr/pages')),
       },
       nextConfig: require(join(__dirname, 'streaming-ssr/next.config.js')),
-      dependencies: react18Deps,
       installCommand: 'npm install',
     })
   })
@@ -116,7 +110,6 @@ if (isNextProd) {
           'server.js': new FileRef(join(__dirname, 'custom-server/server.js')),
         },
         nextConfig: require(join(__dirname, 'custom-server/next.config.js')),
-        dependencies: react18Deps,
       })
       await next.stop()
 
@@ -185,7 +178,6 @@ if (isNextProd) {
             return config
           },
         },
-        dependencies: react18Deps,
       })
     })
     afterAll(() => {

test/e2e/streaming-ssr/streaming-ssr/pages/router.js

@@ -6,6 +6,4 @@ export default () => {
   return <Link href="/">link</Link>
 }
 
-export const config = {
-  runtime: 'experimental-edge',
-}
+export const config = { runtime: 'experimental-edge' }