Update to copy necessary RSC files from dep (#30505)

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
vercel · Oct 28, 2021 · 215cc58 · 215cc58
1 parent 88131eb
commit 215cc58
Show file tree

Hide file tree

Showing 12 changed files with 1,643 additions and 9 deletions.
diff --git a/packages/next/build/webpack/loaders/next-middleware-ssr-loader/index.ts b/packages/next/build/webpack/loaders/next-middleware-ssr-loader/index.ts
@@ -34,8 +34,8 @@ export default function middlewareRSCLoader(this: any) {
         ${
           isServerComponent
             ? `
-        import { renderToReadableStream } from 'react-server-dom-webpack/writer.browser.server'
-        import { createFromReadableStream } from 'react-server-dom-webpack'`
+        import { renderToReadableStream } from 'next/dist/compiled/react-server-dom-webpack/writer.browser.server'
+        import { createFromReadableStream } from 'next/dist/compiled/react-server-dom-webpack'`
             : ''
         }
 

diff --git a/packages/next/client/index.tsx b/packages/next/client/index.tsx
@@ -657,7 +657,9 @@ if (process.env.__NEXT_RSC) {
     serialized?: string
     _fresh?: boolean
   }) => {
-    const { createFromFetch } = require('react-server-dom-webpack')
+    const {
+      createFromFetch,
+    } = require('next/dist/compiled/react-server-dom-webpack')
     let response = rscCache.get(cacheKey)
 
     // If there is no cache, or there is serialized data already