Commit 04776761 authored by Will Binns-Smith's avatar Will Binns-Smith Committed by Will Binns-Smith

[DO NOT MERGE] Enable server HMR by default for testing

Do not merge this. This PR currently exists only so that we can run the e2e test suite with server hmr applied.
parent 94db8c6e
...@@ -313,10 +313,6 @@ program ...@@ -313,10 +313,6 @@ program
'--experimental-https-ca, <path>', '--experimental-https-ca, <path>',
'Path to a HTTPS certificate authority file.' 'Path to a HTTPS certificate authority file.'
) )
.option(
'--experimental-server-fast-refresh',
'Enable experimental server-side Fast Refresh.'
)
.option( .option(
'--experimental-upload-trace, <traceUrl>', '--experimental-upload-trace, <traceUrl>',
'Reports a subset of the debugging trace to a remote HTTP URL. Includes sensitive data.' 'Reports a subset of the debugging trace to a remote HTTP URL. Includes sensitive data.'
......
...@@ -60,7 +60,6 @@ export type NextDevOptions = { ...@@ -60,7 +60,6 @@ export type NextDevOptions = {
experimentalUploadTrace?: string experimentalUploadTrace?: string
experimentalNextConfigStripTypes?: boolean experimentalNextConfigStripTypes?: boolean
experimentalCpuProf?: boolean experimentalCpuProf?: boolean
experimentalServerFastRefresh?: boolean
} }
type PortSource = 'cli' | 'default' | 'env' type PortSource = 'cli' | 'default' | 'env'
...@@ -255,7 +254,6 @@ const nextDev = async ( ...@@ -255,7 +254,6 @@ const nextDev = async (
const enabledFeatures = Object.fromEntries( const enabledFeatures = Object.fromEntries(
Object.entries({ Object.entries({
experimentalServerFastRefresh: options.experimentalServerFastRefresh,
experimentalCpuProf: options.experimentalCpuProf, experimentalCpuProf: options.experimentalCpuProf,
}).filter(([_, value]) => value) }).filter(([_, value]) => value)
) )
...@@ -275,7 +273,6 @@ const nextDev = async ( ...@@ -275,7 +273,6 @@ const nextDev = async (
allowRetry, allowRetry,
isDev: true, isDev: true,
hostname: host, hostname: host,
experimentalServerFastRefresh: options.experimentalServerFastRefresh,
} }
const startServerPath = require.resolve('../server/lib/start-server') const startServerPath = require.resolve('../server/lib/start-server')
......
...@@ -307,8 +307,7 @@ export async function createHotReloaderTurbopack( ...@@ -307,8 +307,7 @@ export async function createHotReloaderTurbopack(
serverFields: ServerFields, serverFields: ServerFields,
distDir: string, distDir: string,
resetFetch: () => void, resetFetch: () => void,
lockfile: Lockfile | undefined, lockfile: Lockfile | undefined
experimentalServerFastRefresh?: boolean
): Promise<NextJsHotReloaderInterface> { ): Promise<NextJsHotReloaderInterface> {
const dev = true const dev = true
const buildId = 'development' const buildId = 'development'
...@@ -1819,32 +1818,30 @@ export async function createHotReloaderTurbopack( ...@@ -1819,32 +1818,30 @@ export async function createHotReloaderTurbopack(
process.exit(1) process.exit(1)
}) })
if (experimentalServerFastRefresh) { serverHmrSubscriptions = setupServerHmr(project, {
serverHmrSubscriptions = setupServerHmr(project, { clear: async () => {
clear: async () => { // Clear Node's require cache of all Turbopack-built modules
// Clear Node's require cache of all Turbopack-built modules for (const chunkPath of serverHmrSubscriptions?.keys() ?? []) {
for (const chunkPath of serverHmrSubscriptions?.keys() ?? []) { deleteCache(join(distDir, chunkPath))
deleteCache(join(distDir, chunkPath)) }
}
// Clear Turbopack's runtime caches // Clear Turbopack's runtime caches
if (typeof __next__clear_chunk_cache__ === 'function') { if (typeof __next__clear_chunk_cache__ === 'function') {
__next__clear_chunk_cache__() __next__clear_chunk_cache__()
} }
// Clear all edge contexts // Clear all edge contexts
await clearAllModuleContexts() await clearAllModuleContexts()
resetFetch() resetFetch()
// Tell browsers to refetch RSC (soft refresh, not full page reload) // Tell browsers to refetch RSC (soft refresh, not full page reload)
hotReloader.send({ hotReloader.send({
type: HMR_MESSAGE_SENT_TO_BROWSER.SERVER_COMPONENT_CHANGES, type: HMR_MESSAGE_SENT_TO_BROWSER.SERVER_COMPONENT_CHANGES,
hash: String(++hmrHash), hash: String(++hmrHash),
}) })
}, },
}) })
}
return hotReloader return hotReloader
} }
...@@ -90,7 +90,6 @@ export async function initialize(opts: { ...@@ -90,7 +90,6 @@ export async function initialize(opts: {
keepAliveTimeout?: number keepAliveTimeout?: number
customServer?: boolean customServer?: boolean
experimentalHttpsServer?: boolean experimentalHttpsServer?: boolean
experimentalServerFastRefresh?: boolean
startServerSpan?: Span startServerSpan?: Span
quiet?: boolean quiet?: boolean
}): Promise<ServerInitResult> { }): Promise<ServerInitResult> {
...@@ -179,7 +178,6 @@ export async function initialize(opts: { ...@@ -179,7 +178,6 @@ export async function initialize(opts: {
port: opts.port, port: opts.port,
onDevServerCleanup: opts.onDevServerCleanup, onDevServerCleanup: opts.onDevServerCleanup,
resetFetch, resetFetch,
experimentalServerFastRefresh: opts.experimentalServerFastRefresh,
}) })
) )
......
...@@ -114,7 +114,6 @@ export type SetupOpts = { ...@@ -114,7 +114,6 @@ export type SetupOpts = {
port: number port: number
onDevServerCleanup: ((listener: () => Promise<void>) => void) | undefined onDevServerCleanup: ((listener: () => Promise<void>) => void) | undefined
resetFetch: () => void resetFetch: () => void
experimentalServerFastRefresh?: boolean
} }
export interface DevRoutesManifest { export interface DevRoutesManifest {
...@@ -237,8 +236,7 @@ async function startWatcher( ...@@ -237,8 +236,7 @@ async function startWatcher(
serverFields, serverFields,
distDir, distDir,
resetFetch, resetFetch,
lockfile, lockfile
opts.experimentalServerFastRefresh
) )
})() })()
: await (async () => { : await (async () => {
......
...@@ -129,7 +129,6 @@ export interface StartServerOptions { ...@@ -129,7 +129,6 @@ export interface StartServerOptions {
keepAliveTimeout?: number keepAliveTimeout?: number
// this is dev-server only // this is dev-server only
selfSignedCertificate?: SelfSignedCertificate selfSignedCertificate?: SelfSignedCertificate
experimentalServerFastRefresh?: boolean
} }
export async function getRequestHandlers({ export async function getRequestHandlers({
...@@ -142,7 +141,6 @@ export async function getRequestHandlers({ ...@@ -142,7 +141,6 @@ export async function getRequestHandlers({
minimalMode, minimalMode,
keepAliveTimeout, keepAliveTimeout,
experimentalHttpsServer, experimentalHttpsServer,
experimentalServerFastRefresh,
quiet, quiet,
}: { }: {
dir: string dir: string
...@@ -154,7 +152,6 @@ export async function getRequestHandlers({ ...@@ -154,7 +152,6 @@ export async function getRequestHandlers({
minimalMode?: boolean minimalMode?: boolean
keepAliveTimeout?: number keepAliveTimeout?: number
experimentalHttpsServer?: boolean experimentalHttpsServer?: boolean
experimentalServerFastRefresh?: boolean
quiet?: boolean quiet?: boolean
}): ReturnType<typeof initialize> { }): ReturnType<typeof initialize> {
return initialize({ return initialize({
...@@ -167,7 +164,6 @@ export async function getRequestHandlers({ ...@@ -167,7 +164,6 @@ export async function getRequestHandlers({
server, server,
keepAliveTimeout, keepAliveTimeout,
experimentalHttpsServer, experimentalHttpsServer,
experimentalServerFastRefresh,
startServerSpan, startServerSpan,
quiet, quiet,
}) })
...@@ -188,7 +184,6 @@ export async function startServer( ...@@ -188,7 +184,6 @@ export async function startServer(
allowRetry, allowRetry,
keepAliveTimeout, keepAliveTimeout,
selfSignedCertificate, selfSignedCertificate,
experimentalServerFastRefresh,
} = serverOptions } = serverOptions
let { port } = serverOptions let { port } = serverOptions
...@@ -489,7 +484,6 @@ export async function startServer( ...@@ -489,7 +484,6 @@ export async function startServer(
minimalMode, minimalMode,
keepAliveTimeout, keepAliveTimeout,
experimentalHttpsServer: !!selfSignedCertificate, experimentalHttpsServer: !!selfSignedCertificate,
experimentalServerFastRefresh,
}) })
requestHandler = initResult.requestHandler requestHandler = initResult.requestHandler
upgradeHandler = initResult.upgradeHandler upgradeHandler = initResult.upgradeHandler
......
...@@ -47,7 +47,6 @@ function parseTraceFile(tracePath: string): TraceStructure { ...@@ -47,7 +47,6 @@ function parseTraceFile(tracePath: string): TraceStructure {
describe('enabled features in trace', () => { describe('enabled features in trace', () => {
const { next, isNextDev } = nextTestSetup({ const { next, isNextDev } = nextTestSetup({
files: __dirname, files: __dirname,
startArgs: ['--experimental-server-fast-refresh'],
}) })
if (!isNextDev) { if (!isNextDev) {
......
...@@ -4,7 +4,6 @@ import { retry } from 'next-test-utils' ...@@ -4,7 +4,6 @@ import { retry } from 'next-test-utils'
describe('server-hmr', () => { describe('server-hmr', () => {
const { next, isTurbopack, isNextDev } = nextTestSetup({ const { next, isTurbopack, isNextDev } = nextTestSetup({
files: __dirname, files: __dirname,
startArgs: ['--experimental-server-fast-refresh'],
}) })
// Server HMR is a Turbopack-only feature, only available in dev mode // Server HMR is a Turbopack-only feature, only available in dev mode
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment