Skip to content

Optimize server runtime bundles #77723

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 3, 2025
Merged

Optimize server runtime bundles #77723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
daf408d
Optimize server runtime bundles
unstubbable Apr 2, 2025
522a8a5
Remove `react-server-dom-turbopack` import
unstubbable Apr 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions packages/next/next-runtime.webpack-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ const appExternals = [
'next/dist/compiled/react-dom-experimental/cjs/react-dom-server-legacy.browser.production.js',
]

function makeAppAliases(reactChannel = '') {
function makeAppAliases({ experimental, bundler }) {
const reactChannel = experimental ? '-experimental' : ''

return {
react$: `next/dist/compiled/react${reactChannel}`,
'react/react.react-server$': `next/dist/compiled/react${reactChannel}/react.react-server`,
Expand All @@ -61,19 +63,16 @@ function makeAppAliases(reactChannel = '') {
'react-server-dom-turbopack/server.edge$': `next/dist/compiled/react-server-dom-turbopack${reactChannel}/server.edge`,
'react-server-dom-turbopack/server.node$': `next/dist/compiled/react-server-dom-turbopack${reactChannel}/server.node`,
'react-server-dom-turbopack/static.edge$': `next/dist/compiled/react-server-dom-turbopack${reactChannel}/static.edge`,
'react-server-dom-webpack/client$': `next/dist/compiled/react-server-dom-webpack${reactChannel}/client`,
'react-server-dom-webpack/client.edge$': `next/dist/compiled/react-server-dom-webpack${reactChannel}/client.edge`,
'react-server-dom-webpack/server.edge$': `next/dist/compiled/react-server-dom-webpack${reactChannel}/server.edge`,
'react-server-dom-webpack/server.node$': `next/dist/compiled/react-server-dom-webpack${reactChannel}/server.node`,
'react-server-dom-webpack/static.edge$': `next/dist/compiled/react-server-dom-webpack${reactChannel}/static.edge`,
'react-server-dom-webpack/client$': `next/dist/compiled/react-server-dom-${bundler}${reactChannel}/client`,
'react-server-dom-webpack/client.edge$': `next/dist/compiled/react-server-dom-${bundler}${reactChannel}/client.edge`,
'react-server-dom-webpack/server.edge$': `next/dist/compiled/react-server-dom-${bundler}${reactChannel}/server.edge`,
'react-server-dom-webpack/server.node$': `next/dist/compiled/react-server-dom-${bundler}${reactChannel}/server.node`,
'react-server-dom-webpack/static.edge$': `next/dist/compiled/react-server-dom-${bundler}${reactChannel}/static.edge`,
'@vercel/turbopack-ecmascript-runtime/browser/dev/hmr-client/hmr-client.ts':
'next/dist/client/dev/noop-turbopack-hmr',
}
}

const appAliases = makeAppAliases()
const appExperimentalAliases = makeAppAliases('-experimental')

const sharedExternals = [
'styled-jsx',
'styled-jsx/style',
Expand Down Expand Up @@ -230,7 +229,7 @@ module.exports = ({ dev, turbo, bundleType, experimental, ...rest }) => {
experimental ? true : false
),
'process.env.NEXT_RUNTIME': JSON.stringify('nodejs'),
...(!dev ? { 'process.env.TURBOPACK': JSON.stringify(turbo) } : {}),
'process.env.TURBOPACK': JSON.stringify(turbo),
}),
!!process.env.ANALYZE &&
new BundleAnalyzerPlugin({
Expand Down Expand Up @@ -262,9 +261,10 @@ module.exports = ({ dev, turbo, bundleType, experimental, ...rest }) => {
resolve: {
alias:
bundleType === 'app'
? experimental
? appExperimentalAliases
: appAliases
? makeAppAliases({
experimental,
bundler: turbo ? 'turbopack' : 'webpack',
})
: {},
},
module: {
Expand Down
6 changes: 3 additions & 3 deletions packages/next/src/build/webpack/plugins/flight-manifest-plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ interface UninlinedCssFile {
export interface ClientReferenceManifest extends ClientReferenceManifestForRsc {
readonly moduleLoading: {
prefix: string
crossOrigin: string | null
crossOrigin?: 'use-credentials' | ''
}
ssrModuleMapping: {
[moduleId: string]: ManifestNode
Expand Down Expand Up @@ -246,8 +246,8 @@ export class ClientReferenceManifestPlugin {
typeof configuredCrossOriginLoading === 'string'
? configuredCrossOriginLoading === 'use-credentials'
? configuredCrossOriginLoading
: 'anonymous'
: null
: '' // === 'anonymous'
: undefined

if (typeof compilation.outputOptions.publicPath !== 'string') {
throw new Error(
Expand Down
13 changes: 3 additions & 10 deletions packages/next/src/server/app-render/app-render.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4135,16 +4135,9 @@ export async function warmFlightResponse(
flightStream: ReadableStream<Uint8Array>,
clientReferenceManifest: DeepReadonly<ClientReferenceManifest>
) {
let createFromReadableStream
if (process.env.TURBOPACK) {
createFromReadableStream =
// eslint-disable-next-line import/no-extraneous-dependencies
require('react-server-dom-turbopack/client.edge').createFromReadableStream
} else {
createFromReadableStream =
// eslint-disable-next-line import/no-extraneous-dependencies
require('react-server-dom-webpack/client.edge').createFromReadableStream
}
const { createFromReadableStream } =
// eslint-disable-next-line import/no-extraneous-dependencies
require('react-server-dom-webpack/client.edge') as typeof import('react-server-dom-webpack/client.edge')

try {
createFromReadableStream(flightStream, {
Expand Down
16 changes: 4 additions & 12 deletions packages/next/src/server/app-render/use-flight-response.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,11 @@ export function useFlightStream<T>(
}

// react-server-dom-webpack/client.edge must not be hoisted for require cache clearing to work correctly
let createFromReadableStream
// @TODO: investigate why the aliasing for turbopack doesn't pick this up, requiring this runtime check
if (process.env.TURBOPACK) {
createFromReadableStream =
// eslint-disable-next-line import/no-extraneous-dependencies
require('react-server-dom-turbopack/client.edge').createFromReadableStream
} else {
createFromReadableStream =
// eslint-disable-next-line import/no-extraneous-dependencies
require('react-server-dom-webpack/client.edge').createFromReadableStream
}
const { createFromReadableStream } =
// eslint-disable-next-line import/no-extraneous-dependencies
require('react-server-dom-webpack/client.edge') as typeof import('react-server-dom-webpack/client.edge')

const newResponse = createFromReadableStream(flightStream, {
const newResponse = createFromReadableStream<T>(flightStream, {
serverConsumerManifest: {
moduleLoading: clientReferenceManifest.moduleLoading,
moduleMap: isEdgeRuntime
Expand Down
13 changes: 11 additions & 2 deletions packages/next/src/server/dev/hot-reloader-turbopack.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import {
} from '../../client/components/react-dev-overlay/server/middleware-turbopack'
import { PageNotFoundError } from '../../shared/lib/utils'
import { debounce } from '../utils'
import { deleteAppClientCache, deleteCache } from './require-cache'
import { deleteCache, deleteFromRequireCache } from './require-cache'
import {
clearAllModuleContexts,
clearModuleContext,
Expand Down Expand Up @@ -339,7 +339,16 @@ export async function createHotReloaderTurbopack(
)

if (hasAppPaths) {
deleteAppClientCache()
deleteFromRequireCache(
require.resolve(
'next/dist/compiled/next-server/app-page-turbo.runtime.dev.js'
)
)
deleteFromRequireCache(
require.resolve(
'next/dist/compiled/next-server/app-page-turbo-experimental.runtime.dev.js'
)
)
}

const serverPaths = writtenEndpoint.serverPaths.map(({ path: p }) =>
Expand Down
13 changes: 1 addition & 12 deletions packages/next/src/server/dev/require-cache.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import isError from '../../lib/is-error'
import { realpathSync } from '../../lib/realpath'
import { clearManifestCache } from '../load-manifest'

function deleteFromRequireCache(filePath: string) {
export function deleteFromRequireCache(filePath: string) {
try {
filePath = realpathSync(filePath)
} catch (e) {
Expand All @@ -27,17 +27,6 @@ function deleteFromRequireCache(filePath: string) {
return false
}

export function deleteAppClientCache() {
deleteFromRequireCache(
require.resolve('next/dist/compiled/next-server/app-page.runtime.dev.js')
)
deleteFromRequireCache(
require.resolve(
'next/dist/compiled/next-server/app-page-experimental.runtime.dev.js'
)
)
}

export function deleteCache(filePath: string) {
// try to clear it from the fs cache
clearManifestCache(filePath)
Expand Down
28 changes: 20 additions & 8 deletions packages/next/src/server/route-modules/app-page/module.compiled.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,31 @@ if (process.env.NEXT_RUNTIME === 'edge') {
} else {
if (process.env.__NEXT_EXPERIMENTAL_REACT) {
if (process.env.NODE_ENV === 'development') {
module.exports = require('next/dist/compiled/next-server/app-page-experimental.runtime.dev.js')
} else if (process.env.TURBOPACK) {
module.exports = require('next/dist/compiled/next-server/app-page-turbo-experimental.runtime.prod.js')
if (process.env.TURBOPACK) {
module.exports = require('next/dist/compiled/next-server/app-page-turbo-experimental.runtime.dev.js')
} else {
module.exports = require('next/dist/compiled/next-server/app-page-experimental.runtime.dev.js')
}
} else {
module.exports = require('next/dist/compiled/next-server/app-page-experimental.runtime.prod.js')
if (process.env.TURBOPACK) {
module.exports = require('next/dist/compiled/next-server/app-page-turbo-experimental.runtime.prod.js')
} else {
module.exports = require('next/dist/compiled/next-server/app-page-experimental.runtime.prod.js')
}
}
} else {
if (process.env.NODE_ENV === 'development') {
module.exports = require('next/dist/compiled/next-server/app-page.runtime.dev.js')
} else if (process.env.TURBOPACK) {
module.exports = require('next/dist/compiled/next-server/app-page-turbo.runtime.prod.js')
if (process.env.TURBOPACK) {
module.exports = require('next/dist/compiled/next-server/app-page-turbo.runtime.dev.js')
} else {
module.exports = require('next/dist/compiled/next-server/app-page.runtime.dev.js')
}
} else {
module.exports = require('next/dist/compiled/next-server/app-page.runtime.prod.js')
if (process.env.TURBOPACK) {
module.exports = require('next/dist/compiled/next-server/app-page-turbo.runtime.prod.js')
} else {
module.exports = require('next/dist/compiled/next-server/app-page.runtime.prod.js')
}
}
}
}
28 changes: 20 additions & 8 deletions packages/next/src/server/route-modules/app-route/module.compiled.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,31 @@ if (process.env.NEXT_RUNTIME === 'edge') {
} else {
if (process.env.__NEXT_EXPERIMENTAL_REACT) {
if (process.env.NODE_ENV === 'development') {
module.exports = require('next/dist/compiled/next-server/app-route-experimental.runtime.dev.js')
} else if (process.env.TURBOPACK) {
module.exports = require('next/dist/compiled/next-server/app-route-turbo-experimental.runtime.prod.js')
if (process.env.TURBOPACK) {
module.exports = require('next/dist/compiled/next-server/app-route-turbo-experimental.runtime.dev.js')
} else {
module.exports = require('next/dist/compiled/next-server/app-route-experimental.runtime.dev.js')
}
} else {
module.exports = require('next/dist/compiled/next-server/app-route-experimental.runtime.prod.js')
if (process.env.TURBOPACK) {
module.exports = require('next/dist/compiled/next-server/app-route-turbo-experimental.runtime.prod.js')
} else {
module.exports = require('next/dist/compiled/next-server/app-route-experimental.runtime.prod.js')
}
}
} else {
if (process.env.NODE_ENV === 'development') {
module.exports = require('next/dist/compiled/next-server/app-route.runtime.dev.js')
} else if (process.env.TURBOPACK) {
module.exports = require('next/dist/compiled/next-server/app-route-turbo.runtime.prod.js')
if (process.env.TURBOPACK) {
module.exports = require('next/dist/compiled/next-server/app-route-turbo.runtime.dev.js')
} else {
module.exports = require('next/dist/compiled/next-server/app-route.runtime.dev.js')
}
} else {
module.exports = require('next/dist/compiled/next-server/app-route.runtime.prod.js')
if (process.env.TURBOPACK) {
module.exports = require('next/dist/compiled/next-server/app-route-turbo.runtime.prod.js')
} else {
module.exports = require('next/dist/compiled/next-server/app-route.runtime.prod.js')
}
}
}
}
14 changes: 10 additions & 4 deletions packages/next/src/server/route-modules/pages-api/module.compiled.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,16 @@ if (process.env.NEXT_RUNTIME === 'edge') {
module.exports = require('next/dist/server/route-modules/pages-api/module.js')
} else {
if (process.env.NODE_ENV === 'development') {
module.exports = require('next/dist/compiled/next-server/pages-api.runtime.dev.js')
} else if (process.env.TURBOPACK) {
module.exports = require('next/dist/compiled/next-server/pages-api-turbo.runtime.prod.js')
if (process.env.TURBOPACK) {
module.exports = require('next/dist/compiled/next-server/pages-api-turbo.runtime.dev.js')
} else {
module.exports = require('next/dist/compiled/next-server/pages-api.runtime.dev.js')
}
} else {
module.exports = require('next/dist/compiled/next-server/pages-api.runtime.prod.js')
if (process.env.TURBOPACK) {
module.exports = require('next/dist/compiled/next-server/pages-api-turbo.runtime.prod.js')
} else {
module.exports = require('next/dist/compiled/next-server/pages-api.runtime.prod.js')
}
}
}
14 changes: 10 additions & 4 deletions packages/next/src/server/route-modules/pages/module.compiled.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,16 @@ if (process.env.NEXT_RUNTIME === 'edge') {
module.exports = require('next/dist/server/route-modules/pages/module.js')
} else {
if (process.env.NODE_ENV === 'development') {
module.exports = require('next/dist/compiled/next-server/pages.runtime.dev.js')
} else if (process.env.TURBOPACK) {
module.exports = require('next/dist/compiled/next-server/pages-turbo.runtime.prod.js')
if (process.env.TURBOPACK) {
module.exports = require('next/dist/compiled/next-server/pages-turbo.runtime.dev.js')
} else {
module.exports = require('next/dist/compiled/next-server/pages.runtime.dev.js')
}
} else {
module.exports = require('next/dist/compiled/next-server/pages.runtime.prod.js')
if (process.env.TURBOPACK) {
module.exports = require('next/dist/compiled/next-server/pages-turbo.runtime.prod.js')
} else {
module.exports = require('next/dist/compiled/next-server/pages.runtime.prod.js')
}
}
}
Loading
Loading