Upgrade react-server-dom-webpack and precompiled assets (vercel#41547)

Upgrade `react-server-dom-webpack` for exports renaming purpose x-ref: facebook/react#25504
Kikobeats · Oct 24, 2022 · 5d7d272 · 5d7d272
1 parent 2b5cf10
commit 5d7d272
Show file tree

Hide file tree

Showing 60 changed files with 5,282 additions and 7,427 deletions.
diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts
@@ -125,7 +125,7 @@ function isResourceInPackages(resource: string, packageNames?: string[]) {
 const builtInReactImports = [
   'react',
   'react/jsx-runtime',
-  'next/dist/compiled/react-server-dom-webpack/writer.browser.server',
+  'next/dist/compiled/react-server-dom-webpack/server.browser',
 ]
 
 export function getDefineEnv({

diff --git a/packages/next/build/webpack/loaders/next-app-loader.ts b/packages/next/build/webpack/loaders/next-app-loader.ts
@@ -201,7 +201,7 @@ const nextAppLoader: webpack.LoaderDefinitionFunction<{
 
     export const serverHooks = require('next/dist/client/components/hooks-server-context.js')
 
-    export const renderToReadableStream = require('next/dist/compiled/react-server-dom-webpack/writer.browser.server').renderToReadableStream
+    export const renderToReadableStream = require('next/dist/compiled/react-server-dom-webpack/server.browser').renderToReadableStream
     export const __next_app_webpack_require__ = __webpack_require__
   `
 

diff --git a/packages/next/build/webpack/plugins/nextjs-require-cache-hot-reloader.ts b/packages/next/build/webpack/plugins/nextjs-require-cache-hot-reloader.ts
@@ -82,18 +82,18 @@ export class NextJsRequireCacheHotReloader implements WebpackPluginInstance {
       if (hasAppPath) {
         // ensure we reset the cache for sc_server components
         // loaded via react-server-dom-webpack
-        const reactWebpackModId = require.resolve(
-          'next/dist/compiled/react-server-dom-webpack'
+        const reactServerDomModId = require.resolve(
+          'next/dist/compiled/react-server-dom-webpack/client'
         )
-        const reactWebpackMod = require.cache[reactWebpackModId]
+        const reactServerDomMod = require.cache[reactServerDomModId]
 
-        if (reactWebpackMod) {
-          for (const child of reactWebpackMod.children) {
+        if (reactServerDomMod) {
+          for (const child of reactServerDomMod.children) {
             child.parent = null
             delete require.cache[child.id]
           }
         }
-        delete require.cache[reactWebpackModId]
+        delete require.cache[reactServerDomModId]
       }
 
       entries.forEach((page) => {

diff --git a/packages/next/client/app-index.tsx b/packages/next/client/app-index.tsx
@@ -4,7 +4,7 @@ import '../build/polyfills/polyfill-module'
 import ReactDOMClient from 'react-dom/client'
 // TODO-APP: change to React.use once it becomes stable
 import React, { experimental_use as use } from 'react'
-import { createFromReadableStream } from 'next/dist/compiled/react-server-dom-webpack'
+import { createFromReadableStream } from 'next/dist/compiled/react-server-dom-webpack/client'
 
 import measureWebVitals from './performance-relayer'
 import { HeadManagerContext } from '../shared/lib/head-manager-context'

diff --git a/packages/next/client/components/app-router.tsx b/packages/next/client/components/app-router.tsx
@@ -2,7 +2,7 @@
 
 import type { ReactNode } from 'react'
 import React, { useEffect, useMemo, useCallback } from 'react'
-import { createFromFetch } from 'next/dist/compiled/react-server-dom-webpack'
+import { createFromFetch } from 'next/dist/compiled/react-server-dom-webpack/client'
 import {
   AppRouterContext,
   LayoutRouterContext,

diff --git a/packages/next/compiled/react-dom/LICENSE b/packages/next/compiled/react-dom/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) Facebook, Inc. and its affiliates.
+Copyright (c) Meta Platforms, Inc. and affiliates.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal