Revert "perf: add bundled rendering runtimes (#52997)"

.eslintrc.json

@@ -162,10 +162,7 @@
     },
     {
       "files": ["packages/**"],
-      "excludedFiles": [
-        "packages/next/taskfile*.js",
-        "packages/next/webpack.config.js"
-      ],
+      "excludedFiles": ["packages/next/taskfile.js"],
       "rules": {
         "no-shadow": ["warn", { "builtinGlobals": false }],
         "import/no-extraneous-dependencies": [

packages/next-swc/crates/next-core/js/src/entry/app-edge-renderer.tsx

@@ -2,8 +2,6 @@
 // the other imports
 import startOperationStreamHandler from '../internal/operation-stream'
 
-import 'next/dist/server/node-polyfill-fetch'
-
 import { join } from 'path'
 import { parse as parseUrl } from 'node:url'
 

packages/next-swc/crates/next-core/js/src/entry/app-renderer.tsx

@@ -3,15 +3,13 @@
 import startOperationStreamHandler from '../internal/operation-stream'
 
 import '../polyfill/app-polyfills.ts'
-// TODO: when actions are supported, this should be removed/changed
-process.env.__NEXT_PRIVATE_PREBUNDLED_REACT = 'next'
-import 'next/dist/server/require-hook'
 
 import type { IncomingMessage } from 'node:http'
 
 import type { RenderData } from 'types/turbopack'
 import type { RenderOpts } from 'next/dist/server/app-render/types'
 
+import { renderToHTMLOrFlight } from 'next/dist/server/app-render/app-render'
 import { RSC_VARY_HEADER } from 'next/dist/client/components/app-router-headers'
 import { headersFromEntries, initProxiedHeaders } from '../internal/headers'
 import { parse, ParsedUrlQuery } from 'node:querystring'
@@ -25,10 +23,6 @@ import { join } from 'node:path'
 import { nodeFs } from 'next/dist/server/lib/node-fs-methods'
 import { IncrementalCache } from 'next/dist/server/lib/incremental-cache'
 
-const {
-  renderToHTMLOrFlight,
-} = require('next/dist/compiled/next-server/app-page.runtime.dev')
-
 installRequireAndChunkLoad()
 
 const MIME_TEXT_HTML_UTF8 = 'text/html; charset=utf-8'

packages/next-swc/crates/next-core/js/src/entry/app/hydrate.tsx

@@ -6,7 +6,7 @@ import { createFromReadableStream } from 'next/dist/compiled/react-server-dom-we
 import { callServer } from 'next/dist/client/app-call-server'
 import { linkGc } from 'next/dist/client/app-link-gc'
 
-import { HeadManagerContext } from 'next/dist/shared/lib/head-manager-context.shared-runtime'
+import { HeadManagerContext } from 'next/dist/shared/lib/head-manager-context'
 
 import { initializeHMR } from '@vercel/turbopack-next/dev/client'
 

packages/next-swc/crates/next-core/js/src/internal/page-server-handler.tsx

@@ -3,12 +3,11 @@
 import { IPC } from '@vercel/turbopack-node/ipc/index'
 
 import 'next/dist/server/node-polyfill-fetch.js'
-import 'next/dist/server/require-hook'
 import './shims'
 
 import type { IncomingMessage, ServerResponse } from 'node:http'
 
-import type { RenderOpts } from 'next/dist/server/render'
+import { renderToHTML, RenderOpts } from 'next/dist/server/render'
 import { getRedirectStatus } from 'next/dist/lib/redirect-status'
 import { PERMANENT_REDIRECT_STATUS } from 'next/dist/shared/lib/constants'
 import { buildStaticPaths } from 'next/dist/build/utils'
@@ -22,9 +21,6 @@ import type { RenderData } from 'types/turbopack'
 import type { ChunkGroup } from 'types/next'
 import type { NextComponentType } from 'next/types'
 import { parse } from 'node:querystring'
-const {
-  renderToHTML,
-} = require('next/dist/compiled/next-server/pages.runtime.dev')
 
 const ipc = IPC as Ipc<IpcIncomingMessage, IpcOutgoingMessage>
 

packages/next-swc/crates/next-core/src/app_source.rs

@@ -2,7 +2,7 @@ use std::{collections::HashMap, io::Write as _, iter::once};
 
 use anyhow::{bail, Result};
 use indexmap::indexmap;
-use indoc::formatdoc;
+use indoc::indoc;
 use serde_json::Value as JsonValue;
 use turbo_tasks::Vc;
 use turbopack_binding::{
@@ -964,18 +964,13 @@ impl AppRenderer {
             .emit();
         }
 
-        let mut result = RopeBuilder::from(
-            formatdoc!(
-                "
-                \"TURBOPACK {{ chunking-type: isolatedParallel; transition: {rsc_transition} }}\";
+        let mut result = RopeBuilder::from(indoc! {"
+                \"TURBOPACK { chunking-type: isolatedParallel; transition: next-edge-server-component }\";
                 import GlobalErrorMod from \"next/dist/client/components/error-boundary\"
-                const {{ GlobalError }} = GlobalErrorMod;
-                \"TURBOPACK {{ chunking-type: isolatedParallel; transition: {rsc_transition} }}\";
+                const { GlobalError } = GlobalErrorMod;
+                \"TURBOPACK { chunking-type: isolatedParallel; transition: next-edge-server-component }\";
                 import base from \"next/dist/server/app-render/entry-base\"\n
-            "
-            )
-            .into_bytes(),
-        );
+            "});
 
         for import in loader_tree_module.imports {
             writeln!(result, "{import}")?;

packages/next-swc/crates/next-core/src/next_edge/context.rs

@@ -96,9 +96,10 @@ pub async fn get_edge_resolve_options_context(
     ];
 
     match ty {
-        ServerContextType::AppRSC { .. } => custom_conditions.push("react-server".to_string()),
-        ServerContextType::AppRoute { .. }
-        | ServerContextType::Pages { .. }
+        ServerContextType::AppRSC { .. } | ServerContextType::AppRoute { .. } => {
+            custom_conditions.push("react-server".to_string())
+        }
+        ServerContextType::Pages { .. }
         | ServerContextType::PagesData { .. }
         | ServerContextType::AppSSR { .. }
         | ServerContextType::Middleware { .. } => {}

packages/next-swc/crates/next-core/src/next_edge/route_transition.rs

@@ -58,26 +58,24 @@ impl Transition for NextEdgeRouteTransition {
 
     #[turbo_tasks::function]
     async fn process_module(
-        self: Vc<Self>,
+        &self,
         asset: Vc<Box<dyn Module>>,
         context: Vc<ModuleAssetContext>,
     ) -> Result<Vc<Box<dyn Module>>> {
-        let new_context = self.process_context(context);
-        let this = self.await?;
         let new_asset = route_bootstrap(
             asset,
-            Vc::upcast(new_context),
-            this.base_path,
-            this.bootstrap_asset,
+            Vc::upcast(context),
+            self.base_path,
+            self.bootstrap_asset,
             Vc::cell(indexmap! {
-                "NAME".to_string() => this.entry_name.clone(),
+                "NAME".to_string() => self.entry_name.clone(),
             }),
         );
 
         let asset = ChunkGroupFilesAsset {
             module: Vc::upcast(new_asset),
-            client_root: this.output_path,
-            chunking_context: this.edge_chunking_context,
+            client_root: self.output_path,
+            chunking_context: self.edge_chunking_context,
             runtime_entries: None,
         };
 

packages/next-swc/crates/next-core/src/next_import_map.rs

@@ -216,34 +216,32 @@ pub async fn get_next_server_import_map(
     let ty = ty.into_value();
 
     insert_next_server_special_aliases(&mut import_map, ty, mode, NextRuntime::NodeJs).await?;
-    let external: Vc<ImportMapping> = ImportMapping::External(None).cell();
+    let external = ImportMapping::External(None).cell();
 
-    import_map.insert_exact_alias("next/dist/server/require-hook", external);
     match ty {
         ServerContextType::Pages { .. } | ServerContextType::PagesData { .. } => {
+            import_map.insert_exact_alias("next", external);
+            import_map.insert_wildcard_alias("next/", external);
             import_map.insert_exact_alias("react", external);
             import_map.insert_wildcard_alias("react/", external);
             import_map.insert_exact_alias("react-dom", external);
             import_map.insert_wildcard_alias("react-dom/", external);
             import_map.insert_exact_alias("styled-jsx", external);
             import_map.insert_wildcard_alias("styled-jsx/", external);
-            import_map.insert_wildcard_alias("react-server-dom-webpack/", external);
-            // TODO: we should not bundle next/dist/build/utils in the pages renderer at all
-            import_map.insert_wildcard_alias("next/dist/build/utils", external);
+            import_map.insert_exact_alias("react-server-dom-webpack/", external);
         }
         ServerContextType::AppSSR { .. }
         | ServerContextType::AppRSC { .. }
         | ServerContextType::AppRoute { .. } => {
             match mode {
-                NextMode::Build => {
+                NextMode::Development | NextMode::Build => {
                     import_map.insert_wildcard_alias("next/dist/server/", external);
                     import_map.insert_wildcard_alias("next/dist/shared/", external);
                 }
                 NextMode::DevServer => {
                     // The sandbox can't be bundled and needs to be external
                     import_map.insert_exact_alias("next/dist/server/web/sandbox", external);
                 }
-                NextMode::Development => {}
             }
             import_map.insert_exact_alias(
                 "next/head",
@@ -379,11 +377,6 @@ async fn insert_next_server_special_aliases(
         NextRuntime::Edge => request_to_import_mapping(context_dir, request),
         NextRuntime::NodeJs => external_request_to_import_mapping(request),
     };
-    let passthrough_external_if_node =
-        move |context_dir: Vc<FileSystemPath>, request: &str| match runtime {
-            NextRuntime::Edge => request_to_import_mapping(context_dir, request),
-            NextRuntime::NodeJs => ImportMapping::External(None).cell(),
-        };
     match (mode, ty) {
         (_, ServerContextType::Pages { pages_dir }) => {
             import_map.insert_exact_alias(
@@ -420,7 +413,12 @@ async fn insert_next_server_special_aliases(
         (_, ServerContextType::PagesData { .. }) => {}
         // In development, we *always* use the bundled version of React, even in
         // SSR, since we're bundling Next.js alongside it.
-        (NextMode::DevServer, ServerContextType::AppSSR { app_dir }) => {
+        (
+            NextMode::DevServer,
+            ServerContextType::AppSSR { app_dir }
+            | ServerContextType::AppRSC { app_dir, .. }
+            | ServerContextType::AppRoute { app_dir },
+        ) => {
             import_map.insert_exact_alias(
                 "@opentelemetry/api",
                 // TODO(WEB-625) this actually need to prefer the local version of
@@ -429,40 +427,28 @@ async fn insert_next_server_special_aliases(
             );
             import_map.insert_exact_alias(
                 "react",
-                passthrough_external_if_node(app_dir, "next/dist/compiled/react"),
+                request_to_import_mapping(app_dir, "next/dist/compiled/react"),
             );
             import_map.insert_wildcard_alias(
                 "react/",
-                passthrough_external_if_node(app_dir, "next/dist/compiled/react/*"),
+                request_to_import_mapping(app_dir, "next/dist/compiled/react/*"),
             );
             import_map.insert_exact_alias(
                 "react-dom",
-                passthrough_external_if_node(
+                request_to_import_mapping(
                     app_dir,
                     "next/dist/compiled/react-dom/server-rendering-stub.js",
                 ),
             );
             import_map.insert_wildcard_alias(
                 "react-dom/",
-                passthrough_external_if_node(app_dir, "next/dist/compiled/react-dom/*"),
-            );
-            import_map.insert_exact_alias(
-                "styled-jsx",
-                passthrough_external_if_node(app_dir, "next/dist/compiled/styled-jsx"),
-            );
-            import_map.insert_wildcard_alias(
-                "styled-jsx/",
-                passthrough_external_if_node(app_dir, "next/dist/compiled/styled-jsx/*"),
+                request_to_import_mapping(app_dir, "next/dist/compiled/react-dom/*"),
             );
             import_map.insert_wildcard_alias(
                 "react-server-dom-webpack/",
-                passthrough_external_if_node(
-                    app_dir,
-                    "next/dist/compiled/react-server-dom-webpack/*",
-                ),
+                request_to_import_mapping(app_dir, "next/dist/compiled/react-server-dom-webpack/*"),
             );
         }
-
         // NOTE(alexkirsz) This logic maps loosely to
         // `next.js/packages/next/src/build/webpack-config.ts`, where:
         //
@@ -474,7 +460,7 @@ async fn insert_next_server_special_aliases(
         // * passes through (react|react-dom|react-server-dom-webpack)/(.*) to
         //   next/dist/compiled/$1/$2
         (
-            NextMode::Build | NextMode::Development | NextMode::DevServer,
+            NextMode::Build | NextMode::Development,
             ServerContextType::AppRSC { app_dir, .. } | ServerContextType::AppRoute { app_dir },
         ) => {
             import_map.insert_exact_alias(
@@ -483,20 +469,10 @@ async fn insert_next_server_special_aliases(
                 // @opentelemetry/api
                 request_to_import_mapping(app_dir, "next/dist/compiled/@opentelemetry/api"),
             );
-            if matches!(ty, ServerContextType::AppRSC { .. }) {
-                import_map.insert_exact_alias(
-                    "react",
-                    request_to_import_mapping(
-                        app_dir,
-                        "next/dist/compiled/react/react.shared-subset",
-                    ),
-                );
-            } else {
-                import_map.insert_exact_alias(
-                    "react",
-                    request_to_import_mapping(app_dir, "next/dist/compiled/react"),
-                );
-            }
+            import_map.insert_exact_alias(
+                "react",
+                request_to_import_mapping(app_dir, "next/dist/compiled/react/react.shared-subset"),
+            );
             import_map.insert_exact_alias(
                 "react-dom",
                 request_to_import_mapping(