Unverified Commit 2c68f241 authored by Tim Neutkens's avatar Tim Neutkens Committed by GitHub

Don't enable dev watcher when turbopack is used (#46231)

Ensures the dev server watcher is not booted when turbopack is used.


## Bug

- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Errors have a helpful link attached, see [`contributing.md`](https://github.com/vercel/next.js/blob/canary/contributing.md)

## Feature

- [ ] Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR.
- [ ] Related issues linked using `fixes #number`
- [ ] [e2e](https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs) tests added
- [ ] Documentation added
- [ ] Telemetry added. In case of a feature if it's used or not.
- [ ] Errors have a helpful link attached, see [`contributing.md`](https://github.com/vercel/next.js/blob/canary/contributing.md)

## Documentation / Examples

- [ ] Make sure the linting passes by running `pnpm build && pnpm lint`
- [ ] The "examples guidelines" are followed from [our contributing doc](https://github.com/vercel/next.js/blob/canary/contributing/examples/adding-examples.md)
parent 1dc76942
...@@ -323,7 +323,8 @@ export default abstract class Server<ServerOptions extends Options = Options> { ...@@ -323,7 +323,8 @@ export default abstract class Server<ServerOptions extends Options = Options> {
forceReload?: boolean forceReload?: boolean
}): void }): void
protected readonly matchers: RouteMatcherManager // TODO-APP(@wyattjoh): Make protected again. Used for turbopack in route-resolver.ts right now.
public readonly matchers: RouteMatcherManager
protected readonly handlers: RouteHandlerManager protected readonly handlers: RouteHandlerManager
protected readonly localeNormalizer?: LocaleRouteNormalizer protected readonly localeNormalizer?: LocaleRouteNormalizer
......
...@@ -66,7 +66,8 @@ export async function makeResolver(dir: string, nextConfig: NextConfig) { ...@@ -66,7 +66,8 @@ export async function makeResolver(dir: string, nextConfig: NextConfig) {
dir, dir,
conf: nextConfig, conf: nextConfig,
}) })
await devServer.startWatcher.bind(devServer)() await devServer.matchers.reload()
// @ts-expect-error // @ts-expect-error
devServer.customRoutes = await loadCustomRoutes(nextConfig) devServer.customRoutes = await loadCustomRoutes(nextConfig)
......
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