Eagerly bundle external ESM dependencies for pages

packages/next/build/webpack-config.ts

@@ -1256,11 +1256,16 @@ export default async function getBaseWebpackConfig(
       }
     }
 
-    const shouldBeBundled = isResourceInPackages(
-      res,
-      config.experimental.transpilePackages,
-      resolvedExternalPackageDirs
-    )
+    // If a package is included in `transpilePackages`, we don't want to make it external.
+    // And also, if that resource is an ES module, we bundle it too because we can't
+    // rely on the require hook to alias `react` to our precompiled version.
+    const shouldBeBundled =
+      isResourceInPackages(
+        res,
+        config.experimental.transpilePackages,
+        resolvedExternalPackageDirs
+      ) ||
+      (isEsm && config.experimental.appDir)
 
     if (/node_modules[/\\].*\.[mc]?js$/.test(res)) {
       if (layer === WEBPACK_LAYERS.server) {

test/e2e/app-dir/rsc-external.test.ts → test/e2e/app-dir/app-external.test.ts

@@ -18,7 +18,7 @@ async function resolveStreamResponse(response: any, onData?: any) {
   return result
 }
 
-describe('app dir - rsc external dependency', () => {
+describe('app dir - external dependency', () => {
   let next: NextInstance
 
   if ((global as any).isNextDeploy) {
@@ -28,7 +28,7 @@ describe('app dir - rsc external dependency', () => {
 
   beforeAll(async () => {
     next = await createNext({
-      files: new FileRef(path.join(__dirname, './rsc-external')),
+      files: new FileRef(path.join(__dirname, './app-external')),
       dependencies: {
         '@next/font': 'canary',
         react: 'latest',
@@ -166,4 +166,30 @@ describe('app dir - rsc external dependency', () => {
       )
     ).toMatch(/^__myFont_.{6}, __myFont_Fallback_.{6}$/)
   })
+
+  describe('react in external esm packages', () => {
+    it('should use the same react in client app', async () => {
+      const html = await renderViaHTTP(next.url, '/esm/client')
+
+      const v1 = html.match(/App React Version: ([^<]+)</)[1]
+      const v2 = html.match(/External React Version: ([^<]+)</)[1]
+      expect(v1).toBe(v2)
+    })
+
+    it('should use the same react in server app', async () => {
+      const html = await renderViaHTTP(next.url, '/esm/server')
+
+      const v1 = html.match(/App React Version: ([^<]+)</)[1]
+      const v2 = html.match(/External React Version: ([^<]+)</)[1]
+      expect(v1).toBe(v2)
+    })
+
+    it('should use the same react in pages', async () => {
+      const html = await renderViaHTTP(next.url, '/test-pages-esm')
+
+      const v1 = html.match(/App React Version: ([^<]+)</)[1]
+      const v2 = html.match(/External React Version: ([^<]+)</)[1]
+      expect(v1).toBe(v2)
+    })
+  })
 })

test/e2e/app-dir/app-external/app/esm/client/page.js

@@ -0,0 +1,15 @@
+'use client'
+import { version, useValue } from 'esm-with-react'
+
+import React from 'react'
+
+export default function Index() {
+  const value = useValue()
+  return (
+    <div>
+      <h2>{'App React Version: ' + React.version}</h2>
+      <h2>{'External React Version: ' + version}</h2>
+      <h2>{'Test: ' + value}</h2>
+    </div>
+  )
+}

test/e2e/app-dir/app-external/app/esm/server/page.js

@@ -0,0 +1,12 @@
+import { version } from 'esm-with-react'
+
+import React from 'react'
+
+export default function Index() {
+  return (
+    <div>
+      <h2>{'App React Version: ' + React.version}</h2>
+      <h2>{'External React Version: ' + version}</h2>
+    </div>
+  )
+}

test/e2e/app-dir/app-external/node_modules_bak/esm-with-react/index.js

@@ -0,0 +1,6 @@
+import React from 'react'
+
+const Context = React.createContext ? React.createContext('hello') : null
+
+export const version = React.version
+export const useValue = () => React.useContext(Context)

test/e2e/app-dir/app-external/node_modules_bak/esm-with-react/package.json

@@ -0,0 +1,9 @@
+{
+  "name": "esm-with-react",
+  "type": "module",
+  "exports": "./index.js",
+  "dependencies": {
+    "react": "^18",
+    "react-dom": "^18"
+  }
+}

test/e2e/app-dir/app-external/pages/test-pages-esm.jsx

@@ -0,0 +1,14 @@
+import { version, useValue } from 'esm-with-react'
+
+import React from 'react'
+
+export default function Index() {
+  const value = useValue()
+  return (
+    <div>
+      <h2>{'App React Version: ' + React.version}</h2>
+      <h2>{'External React Version: ' + version}</h2>
+      <h2>{'Test: ' + value}</h2>
+    </div>
+  )
+}