Add support for react-markup behind experimental.reactMarkup flag

Author: eps1lon

package.json

@@ -215,6 +215,7 @@
     "react-dom-experimental-builtin": "npm:[email protected]",
     "react-experimental-builtin": "npm:[email protected]",
     "react-is-builtin": "npm:[email protected]",
+    "react-markup-experimental-builtin": "npm:[email protected]",
     "react-server-dom-turbopack": "19.0.0-rc-1eaccd82-20240816",
     "react-server-dom-turbopack-experimental": "npm:[email protected]",
     "react-server-dom-webpack": "19.0.0-rc-1eaccd82-20240816",

packages/next/src/build/create-compiler-aliases.ts

@@ -272,6 +272,7 @@ export function createRSCAliases(
     // optimizations to ignore the legacy build of react-dom/server in `server.browser` build
     'react-dom/server.edge$': `next/dist/build/webpack/alias/react-dom-server-edge${bundledReactChannel}.js`,
     'react-dom/server.browser$': `next/dist/build/webpack/alias/react-dom-server-browser${bundledReactChannel}.js`,
+    'react-markup$': `next/dist/compiled/react-markup${bundledReactChannel}`,
     // react-server-dom-webpack alias
     ...createRSCRendererAliases(bundledReactChannel),
   }
@@ -284,6 +285,7 @@ export function createRSCAliases(
         'react/compiler-runtime$': `next/dist/server/route-modules/app-page/vendored/${layer}/react-compiler-runtime`,
         react$: `next/dist/server/route-modules/app-page/vendored/${layer}/react`,
         'react-dom$': `next/dist/server/route-modules/app-page/vendored/${layer}/react-dom`,
+        'react-markup$': `next/dist/server/route-modules/app-page/vendored/${layer}/react-markup`,
         'react-server-dom-webpack/client.edge$': `next/dist/server/route-modules/app-page/vendored/${layer}/react-server-dom-webpack-client-edge`,
       })
     } else if (layer === WEBPACK_LAYERS.reactServerComponents) {
@@ -293,6 +295,7 @@ export function createRSCAliases(
         'react/compiler-runtime$': `next/dist/server/route-modules/app-page/vendored/${layer}/react-compiler-runtime`,
         react$: `next/dist/server/route-modules/app-page/vendored/${layer}/react`,
         'react-dom$': `next/dist/server/route-modules/app-page/vendored/${layer}/react-dom`,
+        'react-markup$': `next/dist/server/route-modules/app-page/vendored/${layer}/react-markup`,
         'react-server-dom-webpack/server.edge$': `next/dist/server/route-modules/app-page/vendored/${layer}/react-server-dom-webpack-server-edge`,
         'react-server-dom-webpack/server.node$': `next/dist/server/route-modules/app-page/vendored/${layer}/react-server-dom-webpack-server-node`,
       })
@@ -315,6 +318,9 @@ export function createRSCAliases(
         'react-dom$': `next/dist/compiled/react-dom${bundledReactChannel}/react-dom.react-server`,
         'next/dist/compiled/react-dom$': `next/dist/compiled/react-dom${bundledReactChannel}/react-dom.react-server`,
         'next/dist/compiled/react-dom-experimental$': `next/dist/compiled/react-dom-experimental/react-dom.react-server`,
+        'react-markup$': `next/dist/compiled/react-markup${bundledReactChannel}/react-markup.react-server`,
+        'next/dist/compiled/react-markup$': `next/dist/compiled/react-markup${bundledReactChannel}/react-markup.react-server`,
+        'next/dist/compiled/react-markup-experimental$': `next/dist/compiled/react-markup-experimental/react-markup.react-server`,
       })
     }
   }

packages/next/src/build/handle-externals.ts

@@ -12,7 +12,8 @@ import {
 } from './webpack-config'
 import { isWebpackBundledLayer, isWebpackServerOnlyLayer } from './utils'
 import { normalizePathSep } from '../shared/lib/page-path/normalize-path-sep'
-const reactPackagesRegex = /^(react|react-dom|react-server-dom-webpack)($|\/)/
+const reactPackagesRegex =
+  /^(react|react-dom|react-markup|react-server-dom-webpack)($|\/)/
 
 const pathSeparators = '[/\\\\]'
 const optionalEsmPart = `((${pathSeparators}esm)?${pathSeparators})`

packages/next/src/build/webpack-config.ts

@@ -126,7 +126,7 @@ const browserNonTranspileModules = [
   /[\\/]node_modules[\\/]process[\\/]browser/,
   // Exclude precompiled react packages from browser compilation due to SWC helper insertion (#61791),
   // We fixed the issue but it's safer to exclude them from compilation since they don't need to be re-compiled.
-  /[\\/]next[\\/]dist[\\/]compiled[\\/](react|react-dom|react-server-dom-webpack)(-experimental)?($|[\\/])/,
+  /[\\/]next[\\/]dist[\\/]compiled[\\/](react|react-dom|react-markup|react-server-dom-webpack)(-experimental)?($|[\\/])/,
 ]
 const precompileRegex = /[\\/]next[\\/]dist[\\/]compiled[\\/]/
 
@@ -777,10 +777,12 @@ export default async function getBaseWebpackConfig(
   for (const packageName of [
     'react',
     'react-dom',
+    'react-markup',
     ...(hasAppDir
       ? [
           `next/dist/compiled/react${bundledReactChannel}`,
           `next/dist/compiled/react-dom${bundledReactChannel}`,
+          `next/dist/compiled/react-markup${bundledReactChannel}`,
         ]
       : []),
   ]) {

packages/next/src/compiled/react-markup-experimental/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+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
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.