Unverified Commit 318aacca authored by Tim Neutkens's avatar Tim Neutkens Committed by GitHub

Development: Only load HotReloaderWebpack when it is used (#83609)

## What?

Currently both hot-reloader paths are loaded, this ensures
HotReloaderWebpack does not get loaded when using Turbopack.

Note: This does not solve webpack being required because it's still
loaded in `config-shared`, that's for a future follow-up.
parent 7a76e9fa
...@@ -13,11 +13,9 @@ import url from 'url' ...@@ -13,11 +13,9 @@ import url from 'url'
import path from 'path' import path from 'path'
import qs from 'querystring' import qs from 'querystring'
import Watchpack from 'next/dist/compiled/watchpack' import Watchpack from 'next/dist/compiled/watchpack'
import { loadEnvConfig } from '@next/env'
import findUp from 'next/dist/compiled/find-up' import findUp from 'next/dist/compiled/find-up'
import { buildCustomRoute } from './filesystem' import { buildCustomRoute } from './filesystem'
import * as Log from '../../../build/output/log' import * as Log from '../../../build/output/log'
import HotReloaderWebpack from '../../dev/hot-reloader-webpack'
import { setGlobal } from '../../../trace/shared' import { setGlobal } from '../../../trace/shared'
import type { Telemetry } from '../../../telemetry/storage' import type { Telemetry } from '../../../telemetry/storage'
import type { IncomingMessage, ServerResponse } from 'http' import type { IncomingMessage, ServerResponse } from 'http'
...@@ -63,7 +61,6 @@ import { devPageFiles } from '../../../build/webpack/plugins/next-types-plugin/s ...@@ -63,7 +61,6 @@ import { devPageFiles } from '../../../build/webpack/plugins/next-types-plugin/s
import type { LazyRenderServerInstance } from '../router-server' import type { LazyRenderServerInstance } from '../router-server'
import { HMR_MESSAGE_SENT_TO_BROWSER } from '../../dev/hot-reloader-types' import { HMR_MESSAGE_SENT_TO_BROWSER } from '../../dev/hot-reloader-types'
import { PAGE_TYPES } from '../../../lib/page-types' import { PAGE_TYPES } from '../../../lib/page-types'
import { createHotReloaderTurbopack } from '../../dev/hot-reloader-turbopack'
import { generateEncryptionKeyBase64 } from '../../app-render/encryption-utils-server' import { generateEncryptionKeyBase64 } from '../../app-render/encryption-utils-server'
import { isMetadataRouteFile } from '../../../lib/metadata/is-metadata-route' import { isMetadataRouteFile } from '../../../lib/metadata/is-metadata-route'
import { normalizeMetadataPageToRoute } from '../../../lib/metadata/get-metadata-route' import { normalizeMetadataPageToRoute } from '../../../lib/metadata/get-metadata-route'
...@@ -186,8 +183,22 @@ async function startWatcher( ...@@ -186,8 +183,22 @@ async function startWatcher(
}) })
const hotReloader: NextJsHotReloaderInterface = opts.turbo const hotReloader: NextJsHotReloaderInterface = opts.turbo
? await createHotReloaderTurbopack(opts, serverFields, distDir, resetFetch) ? await (async () => {
: new HotReloaderWebpack(opts.dir, { const createHotReloaderTurbopack = (
require('../../dev/hot-reloader-turbopack') as typeof import('../../dev/hot-reloader-turbopack')
).createHotReloaderTurbopack
return await createHotReloaderTurbopack(
opts,
serverFields,
distDir,
resetFetch
)
})()
: await (async () => {
const HotReloaderWebpack = (
require('../../dev/hot-reloader-webpack') as typeof import('../../dev/hot-reloader-webpack')
).default
return new HotReloaderWebpack(opts.dir, {
isSrcDir: opts.isSrcDir, isSrcDir: opts.isSrcDir,
appDir, appDir,
pagesDir, pagesDir,
...@@ -203,6 +214,7 @@ async function startWatcher( ...@@ -203,6 +214,7 @@ async function startWatcher(
previewProps: opts.fsChecker.prerenderManifest.preview, previewProps: opts.fsChecker.prerenderManifest.preview,
resetFetch, resetFetch,
}) })
})()
await hotReloader.start() await hotReloader.start()
...@@ -718,6 +730,9 @@ async function startWatcher( ...@@ -718,6 +730,9 @@ async function startWatcher(
if (envChange || tsconfigChange) { if (envChange || tsconfigChange) {
if (envChange) { if (envChange) {
const loadEnvConfig = (
require('@next/env') as typeof import('@next/env')
).loadEnvConfig
const { loadedEnvFiles } = loadEnvConfig( const { loadedEnvFiles } = loadEnvConfig(
dir, dir,
process.env.NODE_ENV === 'development', process.env.NODE_ENV === 'development',
......
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