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.

Sign up for GitHub

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

Turbopack: Log build progress in development like webpack does #54806

Merged
merged 3 commits into from
Sep 1, 2023
Merged

Turbopack: Log build progress in development like webpack does #54806

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e693f93
Turbopack: Log build progress in development like webpack does
wbinnssmith Aug 31, 2023
cf194c5
fixup! Turbopack: Log build progress in development like webpack does
wbinnssmith Aug 31, 2023
a5ab671
Merge branch 'canary' into wbinnssmith/turbopack-log-dev
huozhi Sep 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 50 additions & 5 deletions packages/next/src/server/lib/router-utils/setup-dev.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ import { normalizePathSep } from '../../../shared/lib/page-path/normalize-path-s
import { createClientRouterFilter } from '../../../lib/create-client-router-filter'
import { absolutePathToPage } from '../../../shared/lib/page-path/absolute-path-to-page'
import { generateInterceptionRoutesRewrites } from '../../../lib/generate-interception-routes-rewrites'
import { OutputState, store as consoleStore } from '../../../build/output/store'

import {
APP_BUILD_MANIFEST,
Expand Down Expand Up @@ -336,6 +337,8 @@ async function startWatcher(opts: SetupOpts) {
)
}

const buildingReported = new Set<string>()

async function changeSubscription(
page: string,
endpoint: Endpoint | undefined,
Expand Down Expand Up @@ -744,13 +747,13 @@ async function startWatcher(opts: SetupOpts) {
break
}

case 'span-end':
case 'client-error': // { errorCount, clientId }
case 'client-warning': // { warningCount, clientId }
case 'client-success': // { clientId }
case 'server-component-reload-page': // { clientId }
case 'client-reload-page': // { clientId }
case 'client-full-reload': // { stackTrace, hadRuntimeError }
case 'span-end': // { startTime, endTime, spanName, attributes }
// TODO
break

Expand All @@ -772,9 +775,10 @@ async function startWatcher(opts: SetupOpts) {
break

default:
// Might have been a Next.js message...
if (!parsedData.event) {
throw new Error(`unrecognized Turbopack message "${data}"`)
throw new Error(
`unrecognized Turbopack HMR message "${data}"`
)
}
}
})
Expand Down Expand Up @@ -861,6 +865,35 @@ async function startWatcher(opts: SetupOpts) {
throw new PageNotFoundError(`route not found ${page}`)
}

if (!buildingReported.has(page)) {
buildingReported.add(page)
let suffix
switch (route.type) {
case 'app-page':
suffix = 'page'
break
case 'app-route':
suffix = 'route'
break
case 'page':
case 'page-api':
suffix = ''
break
default:
throw new Error('Unexpected route type ' + route.type)
}

consoleStore.setState(
{
loading: true,
trigger: `${page}${
!page.endsWith('/') && suffix.length > 0 ? '/' : ''
}${suffix} (client and server)`,
} as OutputState,
true
)
}

switch (route.type) {
case 'page': {
if (isApp) {
Expand All @@ -870,13 +903,15 @@ async function startWatcher(opts: SetupOpts) {
}

await processResult('_app', await globalEntries.app?.writeToDisk())

await loadBuildManifest('_app')
await loadPagesManifest('_app')

await processResult(
'_document',
await globalEntries.document?.writeToDisk()
)

changeSubscription('_document', globalEntries?.document, () => {
return { action: 'reloadPage' }
})
Expand All @@ -886,7 +921,8 @@ async function startWatcher(opts: SetupOpts) {
page,
await route.htmlEndpoint.writeToDisk()
)
changeSubscription(page, route.dataEndpoint, (pageName, change) => {

changeSubscription(page, route.htmlEndpoint, (pageName, change) => {
switch (change) {
case ServerClientChangeType.Server:
case ServerClientChangeType.Both:
Expand Down Expand Up @@ -939,7 +975,8 @@ async function startWatcher(opts: SetupOpts) {
}
case 'app-page': {
await processResult(page, await route.htmlEndpoint.writeToDisk())
changeSubscription(page, route.rscEndpoint, (_page, change) => {

changeSubscription(page, route.htmlEndpoint, (_page, change) => {
switch (change) {
case ServerClientChangeType.Server:
case ServerClientChangeType.Both:
Expand Down Expand Up @@ -984,6 +1021,14 @@ async function startWatcher(opts: SetupOpts) {
throw new Error(`unknown route type ${route.type} for ${page}`)
}
}

consoleStore.setState(
{
loading: false,
partial: 'client and server',
} as OutputState,
true
)
},
}

Expand Down