Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve compile time on large application #50792

Merged
merged 5 commits into from
Jun 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/next/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
6 changes: 4 additions & 2 deletions packages/next/src/cli/next-dev.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down Expand Up @@ -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({
Expand Down
2 changes: 1 addition & 1 deletion packages/next/src/compiled/sass-loader/cjs.js

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion packages/next/src/compiled/watchpack/watchpack.js

This file was deleted.

2 changes: 1 addition & 1 deletion packages/next/src/compiled/webpack/bundle5.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions packages/next/src/server/dev/next-dev-server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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[]
Expand Down
9 changes: 1 addition & 8 deletions packages/next/taskfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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',
Expand Down
4 changes: 4 additions & 0 deletions packages/next/types/misc.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand Down
9 changes: 4 additions & 5 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.