Unverified Commit 77b65327 authored by Tobias Koppers's avatar Tobias Koppers Committed by GitHub

show partial compiled message and correct module count (#29795)

```
event - compiled successfully in 4.1s (1597 modules)
event - compiled client successfully in 271 ms (1076 modules)
```

instead of

```
event - compiled successfully in 4.1 s (1597 modules)
event - compiled successfully in 271 ms (1708 modules)
```

* spacing for seconds
* module count only counts modules from compilers that were running
* add a note to message when only one compiler had something to do
parent 71c013b1
...@@ -96,6 +96,9 @@ export function formatAmpMessages(amp: AmpPageStatus) { ...@@ -96,6 +96,9 @@ export function formatAmpMessages(amp: AmpPageStatus) {
} }
const buildStore = createStore<BuildStatusStore>() const buildStore = createStore<BuildStatusStore>()
let buildWasDone = false
let clientWasLoading = true
let serverWasLoading = true
buildStore.subscribe((state) => { buildStore.subscribe((state) => {
const { amp, client, server, trigger } = state const { amp, client, server, trigger } = state
...@@ -115,15 +118,28 @@ buildStore.subscribe((state) => { ...@@ -115,15 +118,28 @@ buildStore.subscribe((state) => {
} as OutputState, } as OutputState,
true true
) )
clientWasLoading = (!buildWasDone && clientWasLoading) || client.loading
serverWasLoading = (!buildWasDone && serverWasLoading) || server.loading
buildWasDone = false
return return
} }
buildWasDone = true
let partialState: Partial<OutputState> = { let partialState: Partial<OutputState> = {
bootstrap: false, bootstrap: false,
appUrl: appUrl!, appUrl: appUrl!,
loading: false, loading: false,
typeChecking: false, typeChecking: false,
modules: client.modules + server.modules, partial:
clientWasLoading && !serverWasLoading
? 'client'
: serverWasLoading && !clientWasLoading
? 'server'
: undefined,
modules:
(clientWasLoading ? client.modules : 0) +
(serverWasLoading ? server.modules : 0),
} }
if (client.errors) { if (client.errors) {
// Show only client errors // Show only client errors
......
...@@ -14,6 +14,7 @@ export type OutputState = ...@@ -14,6 +14,7 @@ export type OutputState =
| { | {
loading: false loading: false
typeChecking: boolean typeChecking: boolean
partial: 'client' | 'server' | undefined
modules: number modules: number
errors: string[] | null errors: string[] | null
warnings: string[] | null warnings: string[] | null
...@@ -95,7 +96,7 @@ store.subscribe((state) => { ...@@ -95,7 +96,7 @@ store.subscribe((state) => {
startTime = 0 startTime = 0
timeMessage = timeMessage =
time > 2000 ? ` in ${Math.round(time / 100) / 10} s` : ` in ${time} ms` time > 2000 ? ` in ${Math.round(time / 100) / 10}s` : ` in ${time} ms`
} }
let modulesMessage = '' let modulesMessage = ''
...@@ -103,6 +104,11 @@ store.subscribe((state) => { ...@@ -103,6 +104,11 @@ store.subscribe((state) => {
modulesMessage = ` (${state.modules} modules)` modulesMessage = ` (${state.modules} modules)`
} }
let partialMessage = ''
if (state.partial) {
partialMessage = ` ${state.partial}`
}
if (state.warnings) { if (state.warnings) {
Log.warn(state.warnings.join('\n\n')) Log.warn(state.warnings.join('\n\n'))
// Ensure traces are flushed after each compile in development mode // Ensure traces are flushed after each compile in development mode
...@@ -112,12 +118,14 @@ store.subscribe((state) => { ...@@ -112,12 +118,14 @@ store.subscribe((state) => {
if (state.typeChecking) { if (state.typeChecking) {
Log.info( Log.info(
`bundled successfully${timeMessage}${modulesMessage}, waiting for typecheck results...` `bundled${partialMessage} successfully${timeMessage}${modulesMessage}, waiting for typecheck results...`
) )
return return
} }
Log.event(`compiled successfully${timeMessage}${modulesMessage}`) Log.event(
`compiled${partialMessage} successfully${timeMessage}${modulesMessage}`
)
// Ensure traces are flushed after each compile in development mode // Ensure traces are flushed after each compile in development mode
flushAllTraces() flushAllTraces()
}) })
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