Merge branch 'canary' into bugfix/avoid-absolute

vercel · Oct 11, 2021 · 9deeb61 · 9deeb61
2 parents ad41ad1 + 77b6532
commit 9deeb61
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 4 deletions.
diff --git a/packages/next/build/output/index.ts b/packages/next/build/output/index.ts
@@ -96,6 +96,9 @@ export function formatAmpMessages(amp: AmpPageStatus) {
 }
 
 const buildStore = createStore<BuildStatusStore>()
+let buildWasDone = false
+let clientWasLoading = true
+let serverWasLoading = true
 
 buildStore.subscribe((state) => {
   const { amp, client, server, trigger } = state
@@ -115,15 +118,28 @@ buildStore.subscribe((state) => {
       } as OutputState,
       true
     )
+    clientWasLoading = (!buildWasDone && clientWasLoading) || client.loading
+    serverWasLoading = (!buildWasDone && serverWasLoading) || server.loading
+    buildWasDone = false
     return
   }
 
+  buildWasDone = true
+
   let partialState: Partial<OutputState> = {
     bootstrap: false,
     appUrl: appUrl!,
     loading: 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) {
     // Show only client errors

diff --git a/packages/next/build/output/store.ts b/packages/next/build/output/store.ts
@@ -14,6 +14,7 @@ export type OutputState =
       | {
           loading: false
           typeChecking: boolean
+          partial: 'client' | 'server' | undefined
           modules: number
           errors: string[] | null
           warnings: string[] | null
@@ -95,14 +96,19 @@ store.subscribe((state) => {
     startTime = 0
 
     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 = ''
   if (state.modules) {
     modulesMessage = ` (${state.modules} modules)`
   }
 
+  let partialMessage = ''
+  if (state.partial) {
+    partialMessage = ` ${state.partial}`
+  }
+
   if (state.warnings) {
     Log.warn(state.warnings.join('\n\n'))
     // Ensure traces are flushed after each compile in development mode
@@ -112,12 +118,14 @@ store.subscribe((state) => {
 
   if (state.typeChecking) {
     Log.info(
-      `bundled successfully${timeMessage}${modulesMessage}, waiting for typecheck results...`
+      `bundled${partialMessage} successfully${timeMessage}${modulesMessage}, waiting for typecheck results...`
     )
     return
   }
 
-  Log.event(`compiled successfully${timeMessage}${modulesMessage}`)
+  Log.event(
+    `compiled${partialMessage} successfully${timeMessage}${modulesMessage}`
+  )
   // Ensure traces are flushed after each compile in development mode
   flushAllTraces()
 })