Unverified Commit af066d96 authored by Justin Ridgewell's avatar Justin Ridgewell Committed by GitHub

Add new diagnostics (#41429)

## Bug

- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Errors have a helpful link attached, see `contributing.md`

## Feature

- [ ] Implements an existing feature request or RFC. Make sure the
feature request has been accepted for implementation before opening a
PR.
- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Documentation added
- [ ] Telemetry added. In case of a feature if it's used or not.
- [ ] Errors have a helpful link attached, see `contributing.md`

## Documentation / Examples

- [ ] Make sure the linting passes by running `pnpm lint`
- [ ] The "examples guidelines" are followed from [our contributing
doc](https://github.com/vercel/next.js/blob/canary/contributing/examples/adding-examples.md)
Co-authored-by: 's avatarJJ Kasper <jj@jjsweb.site>
parent 0d376b36
...@@ -207,6 +207,11 @@ async function loadWasm(importPath = '') { ...@@ -207,6 +207,11 @@ async function loadWasm(importPath = '') {
getTargetTriple() { getTargetTriple() {
return undefined return undefined
}, },
diagnostics: {
startDiagnostics: () => {
Log.error('Wasm binding does not support --diagnostics yet')
},
},
} }
return wasmBindings return wasmBindings
} catch (e) { } catch (e) {
...@@ -333,6 +338,10 @@ function loadNative() { ...@@ -333,6 +338,10 @@ function loadNative() {
initCustomTraceSubscriber: bindings.initCustomTraceSubscriber, initCustomTraceSubscriber: bindings.initCustomTraceSubscriber,
teardownTraceSubscriber: bindings.teardownTraceSubscriber, teardownTraceSubscriber: bindings.teardownTraceSubscriber,
teardownCrashReporter: bindings.teardownCrashReporter, teardownCrashReporter: bindings.teardownCrashReporter,
diagnostics: {
startDiagnostics: (options) =>
bindings.startDiagnostics(toBuffer(options)),
},
} }
return nativeBindings return nativeBindings
} }
......
...@@ -10,6 +10,7 @@ import isError from '../lib/is-error' ...@@ -10,6 +10,7 @@ import isError from '../lib/is-error'
import { getProjectDir } from '../lib/get-project-dir' import { getProjectDir } from '../lib/get-project-dir'
import { CONFIG_FILES } from '../shared/lib/constants' import { CONFIG_FILES } from '../shared/lib/constants'
import path from 'path' import path from 'path'
import { loadBindings } from '../build/swc'
const nextDev: cliCommand = (argv) => { const nextDev: cliCommand = (argv) => {
const validArgs: arg.Spec = { const validArgs: arg.Spec = {
...@@ -17,6 +18,7 @@ const nextDev: cliCommand = (argv) => { ...@@ -17,6 +18,7 @@ const nextDev: cliCommand = (argv) => {
'--help': Boolean, '--help': Boolean,
'--port': Number, '--port': Number,
'--hostname': String, '--hostname': String,
'--diagnostics': Boolean,
// Aliases // Aliases
'-h': '--help', '-h': '--help',
...@@ -85,46 +87,65 @@ const nextDev: cliCommand = (argv) => { ...@@ -85,46 +87,65 @@ const nextDev: cliCommand = (argv) => {
// some set-ups that rely on listening on other interfaces // some set-ups that rely on listening on other interfaces
const host = args['--hostname'] const host = args['--hostname']
startServer({ const devServerOptions = {
allowRetry, allowRetry,
dev: true, dev: true,
dir, dir,
hostname: host, hostname: host,
isNextDevCommand: true, isNextDevCommand: true,
port, port,
}) }
.then(async (app) => {
const appUrl = `http://${app.hostname}:${app.port}` if (args['--diagnostics']) {
startedDevelopmentServer(appUrl, `${host || '0.0.0.0'}:${app.port}`) Log.warn('running diagnostics...')
loadBindings().then((bindings: any) => {
const packagePath = require('next/dist/compiled/find-up').sync(
'package.json'
)
let r = bindings.diagnostics.startDiagnostics({
...devServerOptions,
rootDir: path.dirname(packagePath),
})
// Start preflight after server is listening and ignore errors: // Start preflight after server is listening and ignore errors:
preflight().catch(() => {}) preflight().catch(() => {})
// Finalize server bootup: return r
await app.prepare()
}) })
.catch((err) => { } else {
if (err.code === 'EADDRINUSE') { startServer(devServerOptions)
let errorMessage = `Port ${port} is already in use.` .then(async (app) => {
const pkgAppPath = require('next/dist/compiled/find-up').sync( const appUrl = `http://${app.hostname}:${app.port}`
'package.json', startedDevelopmentServer(appUrl, `${host || '0.0.0.0'}:${app.port}`)
{ // Start preflight after server is listening and ignore errors:
cwd: dir, preflight().catch(() => {})
} // Finalize server bootup:
) await app.prepare()
const appPackage = require(pkgAppPath) })
if (appPackage.scripts) { .catch((err) => {
const nextScript = Object.entries(appPackage.scripts).find( if (err.code === 'EADDRINUSE') {
(scriptLine) => scriptLine[1] === 'next' let errorMessage = `Port ${port} is already in use.`
const pkgAppPath = require('next/dist/compiled/find-up').sync(
'package.json',
{
cwd: dir,
}
) )
if (nextScript) { const appPackage = require(pkgAppPath)
errorMessage += `\nUse \`npm run ${nextScript[0]} -- -p <some other port>\`.` if (appPackage.scripts) {
const nextScript = Object.entries(appPackage.scripts).find(
(scriptLine) => scriptLine[1] === 'next'
)
if (nextScript) {
errorMessage += `\nUse \`npm run ${nextScript[0]} -- -p <some other port>\`.`
}
} }
console.error(errorMessage)
} else {
console.error(err)
} }
console.error(errorMessage) process.nextTick(() => process.exit(1))
} else { })
console.error(err) }
}
process.nextTick(() => process.exit(1))
})
for (const CONFIG_FILE of CONFIG_FILES) { for (const CONFIG_FILE of CONFIG_FILES) {
watchFile(path.join(dir, CONFIG_FILE), (cur: any, prev: any) => { watchFile(path.join(dir, CONFIG_FILE), (cur: any, prev: any) => {
......
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