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

Implement hot reloader interface for Turbopack (#54632)

Implements the `NextJsHotReloaderInterface` type for the Turbopack
implementation. This removes the Proxy that had an `any` type and did
not have all methods implemented.

<!-- Thanks for opening a PR! Your contribution is much appreciated.
To make sure your PR is handled as smoothly as possible we request that
you follow the checklist sections below.
Choose the right checklist for the change(s) that you're making:

## For Contributors

### Improving Documentation

- Run `pnpm prettier-fix` to fix formatting issues before opening the
PR.
- Read the Docs Contribution Guide to ensure your contribution follows
the docs guidelines:
https://nextjs.org/docs/community/contribution-guide

### Adding or Updating Examples

- The "examples guidelines" are followed from our contributing doc
https://github.com/vercel/next.js/blob/canary/contributing/examples/adding-examples.md
- Make sure the linting passes by running `pnpm build && pnpm lint`. See
https://github.com/vercel/next.js/blob/canary/contributing/repository/linting.md

### Fixing a bug

- Related issues linked using `fixes #number`
- Tests added. See:
https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs
- Errors have a helpful link attached, see
https://github.com/vercel/next.js/blob/canary/contributing.md

### Adding a feature

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


## For Maintainers

- Minimal description (aim for explaining to someone not on the team to
understand the PR)
- When linking to a Slack thread, you might want to share details of the
conclusion
- Link both the Linear (Fixes NEXT-xxx) and the GitHub issues
- Add review comments if necessary to explain to the reviewer the logic
behind a change

### What?

### Why?

### How?

Closes NEXT-
Fixes #

-->
parent 41368670
......@@ -6,7 +6,7 @@ import type getBaseWebpackConfig from '../../build/webpack-config'
import type { RouteMatch } from '../future/route-matches/route-match'
export interface NextJsHotReloaderInterface {
activeConfigs?: Array<Awaited<ReturnType<typeof getBaseWebpackConfig>>>
activeWebpackConfigs?: Array<Awaited<ReturnType<typeof getBaseWebpackConfig>>>
serverStats: webpack.Stats | null
edgeServerStats: webpack.Stats | null
run(
......
......@@ -211,7 +211,7 @@ export default class HotReloader implements NextJsHotReloaderInterface {
public serverStats: webpack.Stats | null
public edgeServerStats: webpack.Stats | null
public multiCompiler?: webpack.MultiCompiler
public activeConfigs?: Array<
public activeWebpackConfigs?: Array<
UnwrapPromise<ReturnType<typeof getBaseWebpackConfig>>
>
......@@ -721,9 +721,9 @@ export default class HotReloader implements NextJsHotReloaderInterface {
// Files outside of the distDir can be "type": "module"
await fs.writeFile(distPackageJsonPath, '{"type": "commonjs"}')
this.activeConfigs = await this.getWebpackConfig(startSpan)
this.activeWebpackConfigs = await this.getWebpackConfig(startSpan)
for (const config of this.activeConfigs) {
for (const config of this.activeWebpackConfigs) {
const defaultEntry = config.entry
config.entry = async (...args) => {
const outputPath = this.multiCompiler?.outputPath || ''
......@@ -995,10 +995,10 @@ export default class HotReloader implements NextJsHotReloaderInterface {
// Enable building of client compilation before server compilation in development
// @ts-ignore webpack 5
this.activeConfigs.parallelism = 1
this.activeWebpackConfigs.parallelism = 1
this.multiCompiler = webpack(
this.activeConfigs
this.activeWebpackConfigs
) as unknown as webpack.MultiCompiler
// Copy over the filesystem so that it is shared between all compilers.
......@@ -1359,7 +1359,7 @@ export default class HotReloader implements NextJsHotReloaderInterface {
this.watcher = await new Promise((resolve) => {
const watcher = this.multiCompiler?.watch(
// @ts-ignore webpack supports an array of watchOptions when using a multiCompiler
this.activeConfigs.map((config) => config.watchOptions!),
this.activeWebpackConfigs.map((config) => config.watchOptions!),
// Errors are handled separately
(_err: any) => {
if (!booted) {
......
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