Unverified Commit 8ab38cef authored by Tim Neutkens's avatar Tim Neutkens Committed by GitHub

Improve compile time on large application (#50792)

## What?

While investigating slow compilation for a page on vercel.com in
development I found that there was close to 10 seconds of time
unaccounted for in `.next/trace`. Ran a profile and found that time was
spent in watchpack `batch`, specifically calling `close` many times.
When I tried to debug this further by running unbundled webpack I
noticed the same issue didn't exists.

### Before

<img width="1329" alt="Before"
src="https://github.com/vercel/next.js/assets/6324199/9ace4628-db04-4de7-993f-65aef9dffc55">

### After

<img width="1278" alt="After"
src="https://github.com/vercel/next.js/assets/6324199/55d5e58b-4a27-4235-8dea-723a7a78c117">

## Raw numbers

<table>
<tr>
 <td>Before</td>
 <td>After</td>
 <td>Delta</td>
 <td>Delta (percent)</td>
</tr>
<tr>
 <td>13840 ms</td>
 <td>3580 ms</td>
 <td>-10260 ms</td>
  <td>-74.13%</td>
</tr>
</table>

## How?

Investigated further and found that specifically not minifying watchpack
solved the issue.

<!-- 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 or adding/fixing 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 886b3891
......@@ -89,6 +89,7 @@
"caniuse-lite": "^1.0.30001406",
"postcss": "8.4.14",
"styled-jsx": "5.1.1",
"watchpack": "2.4.0",
"zod": "3.21.4"
},
"peerDependencies": {
......
......@@ -20,7 +20,7 @@ import { findPagesDir } from '../lib/find-pages-dir'
import { findRootDir } from '../lib/find-root'
import { fileExists, FileType } from '../lib/file-exists'
import { getNpxCommand } from '../lib/helpers/get-npx-command'
import Watchpack from 'next/dist/compiled/watchpack'
import Watchpack from 'watchpack'
import stripAnsi from 'next/dist/compiled/strip-ansi'
import { getPossibleInstrumentationHookFilenames } from '../build/worker'
......@@ -479,7 +479,9 @@ const nextDev: CliCommand = async (argv) => {
}
previousInstrumentationFiles.clear()
knownFiles.forEach((_, key) => previousInstrumentationFiles.add(key))
knownFiles.forEach((_: any, key: any) =>
previousInstrumentationFiles.add(key)
)
})
const projectFolderWatcher = new Watchpack({
......
This diff is collapsed.
......@@ -17,7 +17,7 @@ import fs from 'fs'
import { Worker } from 'next/dist/compiled/jest-worker'
import findUp from 'next/dist/compiled/find-up'
import { join as pathJoin, relative, resolve as pathResolve, sep } from 'path'
import Watchpack from 'next/dist/compiled/watchpack'
import Watchpack from 'watchpack'
import { ampValidation } from '../../build/output'
import {
INSTRUMENTATION_HOOK_FILENAME,
......@@ -128,7 +128,7 @@ export interface Options extends ServerOptions {
export default class DevServer extends Server {
private devReady: Promise<void>
private setDevReady?: Function
private webpackWatcher?: Watchpack | null
private webpackWatcher?: any | null
private hotReloader?: HotReloader
private isCustomServer: boolean
protected sortedRoutes?: string[]
......
......@@ -591,13 +591,7 @@ export async function ncc_next_font(task, opts) {
}
// eslint-disable-next-line camelcase
externals['watchpack'] = 'next/dist/compiled/watchpack'
export async function ncc_watchpack(task, opts) {
await task
.source(relative(__dirname, require.resolve('watchpack')))
.ncc({ packageName: 'watchpack', externals })
.target('src/compiled/watchpack')
}
externals['watchpack'] = 'watchpack'
// eslint-disable-next-line camelcase
externals['jest-worker'] = 'next/dist/compiled/jest-worker'
......@@ -2195,7 +2189,6 @@ export async function ncc(task, opts) {
.parallel(
[
'ncc_node_html_parser',
'ncc_watchpack',
'ncc_chalk',
'ncc_napirs_triples',
'ncc_p_limit',
......
......@@ -156,6 +156,10 @@ declare module 'next/dist/compiled/babel/preset-env' {
const anyType: any
export default anyType
}
declare module 'watchpack' {
const anyType: any
export default anyType
}
declare module 'next/dist/compiled/babel/core' {
export * from '@babel/core'
}
......
......@@ -727,6 +727,7 @@ importers:
react-dom: 18.2.0_react@18.2.0
sass: 1.54.0
styled-jsx: 5.1.1_uuaxwgga6hqycsez5ok7v2wg4i
watchpack: 2.4.0
zod: 3.21.4
devDependencies:
'@ampproject/toolbox-optimizer': 2.8.3
......@@ -894,7 +895,7 @@ importers:
react-is: 18.2.0
react-refresh: 0.12.0
regenerator-runtime: 0.13.4
sass-loader: 12.4.0_bjhf4pgiqnihj2we567o7p2vqu
sass-loader: 12.4.0_webpack@5.74.0
schema-utils2: /schema-utils/2.7.1
schema-utils3: /schema-utils/3.0.0
semver: 7.3.2
......@@ -921,7 +922,6 @@ importers:
util: 0.12.4
uuid: 8.3.2
vm-browserify: 1.1.2
watchpack: 2.4.0
web-vitals: 3.0.0
webpack: 5.74.0
webpack-sources1: /webpack-sources/1.4.3
......@@ -14304,6 +14304,7 @@ packages:
requiresBuild: true
dependencies:
detect-libc: 1.0.3
dev: false
/figgy-pudding/3.5.1:
resolution: {integrity: sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==}
......@@ -23923,7 +23924,7 @@ packages:
/safer-buffer/2.1.2:
resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
/sass-loader/12.4.0_bjhf4pgiqnihj2we567o7p2vqu:
/sass-loader/12.4.0_webpack@5.74.0:
resolution: {integrity: sha512-7xN+8khDIzym1oL9XyS6zP6Ges+Bo2B2xbPrjdMHEYyV3AQYhd/wXeru++3ODHF0zMjYmVadblSKrPrjEkL8mg==}
engines: {node: '>= 12.13.0'}
peerDependencies:
......@@ -23939,10 +23940,8 @@ packages:
sass:
optional: true
dependencies:
fibers: 5.0.3
klona: 2.0.4
neo-async: 2.6.2
sass: 1.54.0
webpack: 5.74.0
dev: true
......
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