From 207e9212c03fb875ce761a5dc85ec18489bdee59 Mon Sep 17 00:00:00 2001 From: Jiachi Liu Date: Tue, 12 Sep 2023 21:02:08 +0200 Subject: [PATCH 1/5] Only log start info where there's no error --- packages/next/src/server/lib/start-server.ts | 99 ++++++++++++-------- 1 file changed, 61 insertions(+), 38 deletions(-) diff --git a/packages/next/src/server/lib/start-server.ts b/packages/next/src/server/lib/start-server.ts index b6e43bbb1013..2943feaf1003 100644 --- a/packages/next/src/server/lib/start-server.ts +++ b/packages/next/src/server/lib/start-server.ts @@ -86,6 +86,54 @@ export async function getRequestHandlers({ }) } +function logStartInfo({ + port, + actualHostname, + appUrl, + hostname, + envInfo, + expFeatureInfo, +}: { + port: number + actualHostname: string + appUrl: string + hostname: string + envInfo: string[] | undefined + expFeatureInfo: string[] | undefined +}) { + Log.bootstrap( + chalk.bold( + chalk.hex('#ad7fa8')( + ` ${`${Log.prefixes.ready} Next.js`} ${process.env.__NEXT_VERSION}` + ) + ) + ) + Log.bootstrap(` - Local: ${appUrl}`) + if (hostname) { + Log.bootstrap( + ` - Network: ${actualHostname}${ + (port + '').startsWith(':') ? '' : ':' + }${port}` + ) + } + if (envInfo?.length) Log.bootstrap(` - Environments: ${envInfo.join(', ')}`) + + if (expFeatureInfo?.length) { + Log.bootstrap(` - Experiments (use at your own risk):`) + // only show maximum 3 flags + for (const exp of expFeatureInfo.slice(0, 3)) { + Log.bootstrap(` · ${exp}`) + } + /* ${expFeatureInfo.length - 3} more */ + if (expFeatureInfo.length > 3) { + Log.bootstrap(` · ...`) + } + } + + // New line after the bootstrap info + Log.info('') +} + export async function startServer({ dir, port, @@ -229,44 +277,8 @@ export async function startServer({ ) } - if (logReady) { - Log.bootstrap( - chalk.bold( - chalk.hex('#ad7fa8')( - ` ${`${Log.prefixes.ready} Next.js`} ${ - process.env.__NEXT_VERSION - }` - ) - ) - ) - Log.bootstrap(` - Local: ${appUrl}`) - if (hostname) { - Log.bootstrap( - ` - Network: ${actualHostname}${ - (port + '').startsWith(':') ? '' : ':' - }${port}` - ) - } - if (envInfo?.length) - Log.bootstrap(` - Environments: ${envInfo.join(', ')}`) - - if (expFeatureInfo?.length) { - Log.bootstrap(` - Experiments (use at your own risk):`) - // only show maximum 3 flags - for (const exp of expFeatureInfo.slice(0, 3)) { - Log.bootstrap(` · ${exp}`) - } - /* ${expFeatureInfo.length - 3} more */ - if (expFeatureInfo.length > 3) { - Log.bootstrap(` · ...`) - } - } - // expose the main port to render workers - process.env.PORT = port + '' - - // New line after the bootstrap info - Log.info('') - } + // expose the main port to render workers + process.env.PORT = port + '' try { const cleanup = (code: number | null) => { @@ -305,6 +317,17 @@ export async function startServer({ process.exit(1) } + if (logReady) { + logStartInfo({ + port, + actualHostname, + appUrl, + hostname, + envInfo, + expFeatureInfo, + }) + } + resolve() }) server.listen(port, hostname) From 589d68a2afd1aadc8deb1083cb372c1158e8dd7d Mon Sep 17 00:00:00 2001 From: Jiachi Liu Date: Tue, 12 Sep 2023 21:21:04 +0200 Subject: [PATCH 2/5] fix test --- test/integration/nullish-config/test/index.test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/integration/nullish-config/test/index.test.js b/test/integration/nullish-config/test/index.test.js index 7ec38040a7b6..b1b169a949df 100644 --- a/test/integration/nullish-config/test/index.test.js +++ b/test/integration/nullish-config/test/index.test.js @@ -28,7 +28,7 @@ const runTests = (type) => { const stdout = await getStdout() if (type === 'dev') { - expect(stdout).toMatch(/- Local:/i) + expect(stdout).toMatch(/ready/i) } else { expect(stdout).toMatch(/Compiled successfully/i) } @@ -53,7 +53,7 @@ const runTests = (type) => { const stdout = await getStdout() if (type === 'dev') { - expect(stdout).toMatch(/- Local:/i) + expect(stdout).toMatch(/ready/i) } else { expect(stdout).toMatch(/Compiled successfully/i) } From 27c6da26586c83642d747b82de848f1b9a464c9e Mon Sep 17 00:00:00 2001 From: Jiachi Liu Date: Tue, 12 Sep 2023 21:53:37 +0200 Subject: [PATCH 3/5] move ready log --- packages/next/src/build/output/store.ts | 1 - packages/next/src/server/lib/router-utils/setup-dev.ts | 2 -- packages/next/src/server/lib/start-server.ts | 1 + 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/next/src/build/output/store.ts b/packages/next/src/build/output/store.ts index dbf4457a7238..8964fcfbbb3c 100644 --- a/packages/next/src/build/output/store.ts +++ b/packages/next/src/build/output/store.ts @@ -138,7 +138,6 @@ store.subscribe((state) => { } if (trigger === 'initial') { - Log.event('ready') trigger = '' } else if (trigger) { if (loadingLogTimer) { diff --git a/packages/next/src/server/lib/router-utils/setup-dev.ts b/packages/next/src/server/lib/router-utils/setup-dev.ts index c0019bff3ed2..309b6415423b 100644 --- a/packages/next/src/server/lib/router-utils/setup-dev.ts +++ b/packages/next/src/server/lib/router-utils/setup-dev.ts @@ -953,8 +953,6 @@ async function startWatcher(opts: SetupOpts) { // Not implemented yet. }, async start() { - // Align with nextjs logging for ready start event - Log.event('ready') // Not implemented yet. }, async stop() { diff --git a/packages/next/src/server/lib/start-server.ts b/packages/next/src/server/lib/start-server.ts index 2943feaf1003..ee1910530027 100644 --- a/packages/next/src/server/lib/start-server.ts +++ b/packages/next/src/server/lib/start-server.ts @@ -132,6 +132,7 @@ function logStartInfo({ // New line after the bootstrap info Log.info('') + Log.event('ready') } export async function startServer({ From c2710f27d9704e9366e8956ef65be4039836dd9f Mon Sep 17 00:00:00 2001 From: Jiachi Liu Date: Tue, 12 Sep 2023 22:01:57 +0200 Subject: [PATCH 4/5] only post ready message --- packages/next/src/server/lib/start-server.ts | 23 ++++++++++---------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/packages/next/src/server/lib/start-server.ts b/packages/next/src/server/lib/start-server.ts index ee1910530027..5cfbb72a0921 100644 --- a/packages/next/src/server/lib/start-server.ts +++ b/packages/next/src/server/lib/start-server.ts @@ -132,7 +132,6 @@ function logStartInfo({ // New line after the bootstrap info Log.info('') - Log.event('ready') } export async function startServer({ @@ -278,6 +277,17 @@ export async function startServer({ ) } + if (logReady) { + logStartInfo({ + port, + actualHostname, + appUrl, + hostname, + envInfo, + expFeatureInfo, + }) + } + // expose the main port to render workers process.env.PORT = port + '' @@ -318,16 +328,7 @@ export async function startServer({ process.exit(1) } - if (logReady) { - logStartInfo({ - port, - actualHostname, - appUrl, - hostname, - envInfo, - expFeatureInfo, - }) - } + Log.event('ready') resolve() }) From 1839f18b6f031b68d4cb5a9966d0b57f0afc712e Mon Sep 17 00:00:00 2001 From: Jiachi Liu Date: Tue, 12 Sep 2023 22:02:53 +0200 Subject: [PATCH 5/5] rm logReady --- packages/next/src/server/lib/start-server.ts | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/packages/next/src/server/lib/start-server.ts b/packages/next/src/server/lib/start-server.ts index 5cfbb72a0921..c674f181bff0 100644 --- a/packages/next/src/server/lib/start-server.ts +++ b/packages/next/src/server/lib/start-server.ts @@ -33,7 +33,6 @@ if (process.env.NEXT_CPU_PROF) { export interface StartServerOptions { dir: string port: number - logReady?: boolean isDev: boolean hostname: string allowRetry?: boolean @@ -143,7 +142,6 @@ export async function startServer({ allowRetry, keepAliveTimeout, isExperimentalTestProxy, - logReady = true, selfSignedCertificate, envInfo, expFeatureInfo, @@ -277,16 +275,14 @@ export async function startServer({ ) } - if (logReady) { - logStartInfo({ - port, - actualHostname, - appUrl, - hostname, - envInfo, - expFeatureInfo, - }) - } + logStartInfo({ + port, + actualHostname, + appUrl, + hostname, + envInfo, + expFeatureInfo, + }) // expose the main port to render workers process.env.PORT = port + ''