server: bundle vendored react

packages/next/src/build/index.ts

@@ -146,9 +146,9 @@ import { generateInterceptionRoutesRewrites } from '../lib/generate-interception
 
 import { buildDataRoute } from '../server/lib/router-utils/build-data-route'
 import {
-  baseOverrides,
+  // baseOverrides,
   defaultOverrides,
-  experimentalOverrides,
+  // experimentalOverrides,
 } from '../server/import-overrides'
 import { initialize as initializeIncrementalCache } from '../server/lib/incremental-cache-server'
 import { nodeFs } from '../server/lib/node-fs-methods'
@@ -2112,12 +2112,12 @@ export default async function build(
             )
 
             const sharedEntriesSet = [
-              ...Object.values(baseOverrides).map((override) =>
-                require.resolve(override)
-              ),
-              ...Object.values(experimentalOverrides).map((override) =>
-                require.resolve(override)
-              ),
+              // ...Object.values(baseOverrides).map((override) =>
+              //   require.resolve(override)
+              // ),
+              // ...Object.values(experimentalOverrides).map((override) =>
+              //   require.resolve(override)
+              // ),
               ...(config.experimental.turbotrace
                 ? []
                 : Object.keys(defaultOverrides).map((value) =>

packages/next/src/build/webpack/plugins/nextjs-require-cache-hot-reloader.ts

@@ -12,29 +12,30 @@ const originModules = [
   require.resolve('../../../server/require'),
   require.resolve('../../../server/load-components'),
   require.resolve('../../../server/next-server'),
-  require.resolve('../../../compiled/react-server-dom-webpack/client.edge'),
-  require.resolve(
-    '../../../compiled/react-server-dom-webpack-experimental/client.edge'
-  ),
+  // require.resolve('../../../compiled/react-server-dom-webpack/client.edge'),
+  // require.resolve(
+  //   '../../../compiled/react-server-dom-webpack-experimental/client.edge'
+  // ),
 ]
 
 const RUNTIME_NAMES = ['webpack-runtime', 'webpack-api-runtime']
 
 export function deleteAppClientCache() {
-  // ensure we reset the cache for rsc components
-  // loaded via react-server-dom-webpack
-  const reactServerDomModId = require.resolve(
-    'react-server-dom-webpack/client.edge'
-  )
-  const reactServerDomMod = require.cache[reactServerDomModId]
+  return
+  // // ensure we reset the cache for rsc components
+  // // loaded via react-server-dom-webpack
+  // const reactServerDomModId = require.resolve(
+  //   'react-server-dom-webpack/client.edge'
+  // )
+  // const reactServerDomMod = require.cache[reactServerDomModId]
 
-  if (reactServerDomMod) {
-    for (const child of reactServerDomMod.children) {
-      child.parent = null
-      delete require.cache[child.id]
-    }
-  }
-  delete require.cache[reactServerDomModId]
+  // if (reactServerDomMod) {
+  //   for (const child of reactServerDomMod.children) {
+  //     child.parent = null
+  //     delete require.cache[child.id]
+  //   }
+  // }
+  // delete require.cache[reactServerDomModId]
 }
 
 export function deleteCache(filePath: string) {

packages/next/src/client/components/router-reducer/fetch-server-response.ts

@@ -2,7 +2,15 @@
 
 // @ts-ignore
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { createFromFetch } from 'react-server-dom-webpack/client'
+// import { createFromFetch } from 'react-server-dom-webpack/client'
+const { createFromFetch } = (
+  typeof window === 'undefined'
+    ? // eslint-disable-next-line import/no-extraneous-dependencies
+      require('react-server-dom-webpack/client.edge')
+    : // eslint-disable-next-line import/no-extraneous-dependencies
+      require('react-server-dom-webpack/client')
+) as typeof import('react-server-dom-webpack/client')
+
 import type {
   FlightRouterState,
   FlightData,

packages/next/src/client/components/router-reducer/reducers/server-action-reducer.ts

@@ -12,10 +12,17 @@ import {
 } from '../../app-router-headers'
 import { createRecordFromThenable } from '../create-record-from-thenable'
 import { readRecordValue } from '../read-record-value'
-// eslint-disable-next-line import/no-extraneous-dependencies
-import { createFromFetch } from 'react-server-dom-webpack/client'
-// eslint-disable-next-line import/no-extraneous-dependencies
-import { encodeReply } from 'react-server-dom-webpack/client'
+// // eslint-disable-next-line import/no-extraneous-dependencies
+// import { createFromFetch } from 'react-server-dom-webpack/client'
+// // eslint-disable-next-line import/no-extraneous-dependencies
+// import { encodeReply } from 'react-server-dom-webpack/client'
+const { createFromFetch, encodeReply } = (
+  typeof window === 'undefined'
+    ? // eslint-disable-next-line import/no-extraneous-dependencies
+      require('react-server-dom-webpack/client.edge')
+    : // eslint-disable-next-line import/no-extraneous-dependencies
+      require('react-server-dom-webpack/client')
+) as typeof import('react-server-dom-webpack/client')
 
 import {
   ReadonlyReducerState,

packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.browser.development.js

@@ -14,7 +14,7 @@ if (process.env.NODE_ENV !== "production") {
   (function() {
 'use strict';
 
-var React = require("next/dist/compiled/react-experimental");
+var React = require('react');
 var ReactDOM = require('react-dom');
 
 var ReactVersion = '18.3.0-experimental-dd480ef92-20230822';

packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.node.development.js

@@ -14,7 +14,7 @@ if (process.env.NODE_ENV !== "production") {
   (function() {
 'use strict';
 
-var React = require("next/dist/compiled/react-experimental");
+var React = require('react');
 var ReactDOM = require('react-dom');
 var stream = require('stream');
 

packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-rendering-stub.development.js

@@ -14,7 +14,7 @@ if (process.env.NODE_ENV !== "production") {
   (function() {
 'use strict';
 
-var React = require("next/dist/compiled/react-experimental");
+var React = require('react');
 
 var ReactVersion = '18.3.0-experimental-dd480ef92-20230822';
 

packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-rendering-stub.production.min.js

@@ -7,6 +7,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-'use strict';var d=require("next/dist/compiled/react-experimental"),e={usingClientEntryPoint:!1,Events:null,Dispatcher:{current:null}};function f(b){for(var a="https://reactjs.org/docs/error-decoder.html?invariant="+b,c=1;c<arguments.length;c++)a+="&args[]="+encodeURIComponent(arguments[c]);return"Minified React error #"+b+"; visit "+a+" for the full message or use the non-minified dev environment for full errors and additional helpful warnings."}var g=e.Dispatcher,h=d.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentDispatcher;
+'use strict';var d=require("react"),e={usingClientEntryPoint:!1,Events:null,Dispatcher:{current:null}};function f(b){for(var a="https://reactjs.org/docs/error-decoder.html?invariant="+b,c=1;c<arguments.length;c++)a+="&args[]="+encodeURIComponent(arguments[c]);return"Minified React error #"+b+"; visit "+a+" for the full message or use the non-minified dev environment for full errors and additional helpful warnings."}var g=e.Dispatcher,h=d.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentDispatcher;
 exports.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED=e;exports.createPortal=function(){throw Error(f(448));};exports.experimental_useFormStatus=function(){return h.current.useHostTransitionStatus()};exports.flushSync=function(){throw Error(f(449));};exports.preconnect=function(b,a){var c=g.current;c&&c.preconnect(b,a)};exports.prefetchDNS=function(b){var a=g.current;a&&a.prefetchDNS(b)};exports.preinit=function(b,a){var c=g.current;c&&c.preinit(b,a)};
 exports.preload=function(b,a){var c=g.current;c&&c.preload(b,a)};exports.unstable_batchedUpdates=function(b,a){return b(a)};exports.version="18.3.0-experimental-dd480ef92-20230822";

packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.browser.development.js

@@ -14,7 +14,7 @@ if (process.env.NODE_ENV !== "production") {
   (function() {
 'use strict';
 
-var React = require("next/dist/compiled/react-experimental");
+var React = require('react');
 var ReactDOM = require('react-dom');
 
 var ReactVersion = '18.3.0-experimental-dd480ef92-20230822';

packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.edge.development.js

@@ -14,7 +14,7 @@ if (process.env.NODE_ENV !== "production") {
   (function() {
 'use strict';
 
-var React = require("next/dist/compiled/react-experimental");
+var React = require('react');
 var ReactDOM = require('react-dom');
 
 var ReactVersion = '18.3.0-experimental-dd480ef92-20230822';

packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.node.development.js

@@ -14,7 +14,7 @@ if (process.env.NODE_ENV !== "production") {
   (function() {
 'use strict';
 
-var React = require("next/dist/compiled/react-experimental");
+var React = require('react');
 var util = require('util');
 var async_hooks = require('async_hooks');
 var ReactDOM = require('react-dom');

packages/next/src/compiled/react-dom-experimental/cjs/react-dom-static.browser.development.js

@@ -14,7 +14,7 @@ if (process.env.NODE_ENV !== "production") {
   (function() {
 'use strict';
 
-var React = require("next/dist/compiled/react-experimental");
+var React = require('react');
 var ReactDOM = require('react-dom');
 
 var ReactVersion = '18.3.0-experimental-dd480ef92-20230822';