diff --git a/lib/builder/generator.js b/lib/builder/generator.js index d6ad41565d..3466c870df 100644 --- a/lib/builder/generator.js +++ b/lib/builder/generator.js @@ -76,7 +76,7 @@ export default class Generator { ...args ) } catch (e) { - console.error('Could not resolve routes') // eslint-disable-line no-console + logger.error('Could not resolve routes') throw e // eslint-disable-line no-unreachable } } diff --git a/lib/core/middleware/error.js b/lib/core/middleware/error.js index b877c8406d..338d3838cd 100644 --- a/lib/core/middleware/error.js +++ b/lib/core/middleware/error.js @@ -1,8 +1,11 @@ import path from 'path' +import consola from 'consola' import Youch from '@nuxtjs/youch' import fs from 'fs-extra' +const logger = consola.withScope('nuxt:error') + export default function errorMiddleware(err, req, res, next) { // ensure statusCode, message and name fields err.statusCode = err.statusCode || 500 @@ -11,7 +14,7 @@ export default function errorMiddleware(err, req, res, next) { // We hide actual errors from end users, so show them on server logs if (err.statusCode !== 404) { - console.error(err) // eslint-disable-line no-console + logger.error(err) } const sendResponse = (content, type = 'text/html') => { diff --git a/lib/core/middleware/nuxt.js b/lib/core/middleware/nuxt.js index 8f075d5926..1f7ba1edd7 100644 --- a/lib/core/middleware/nuxt.js +++ b/lib/core/middleware/nuxt.js @@ -1,8 +1,11 @@ import generateETag from 'etag' import fresh from 'fresh' +import consola from 'consola' import { getContext } from '../../common/utils' +const logger = consola.withScope('nuxt:middleware') + export default async function nuxtMiddleware(req, res, next) { // Get context const context = getContext(req, res) @@ -103,7 +106,7 @@ export default async function nuxtMiddleware(req, res, next) { } catch (err) { /* istanbul ignore if */ if (context && context.redirected) { - console.error(err) // eslint-disable-line no-console + logger.error(err) return err } diff --git a/lib/core/renderer.js b/lib/core/renderer.js index 9dd78bacd8..5bc14fc583 100644 --- a/lib/core/renderer.js +++ b/lib/core/renderer.js @@ -7,9 +7,9 @@ import compression from 'compression' import _ from 'lodash' import fs from 'fs-extra' import { createBundleRenderer } from 'vue-server-renderer' -import Debug from 'debug' import connect from 'connect' import launchMiddleware from 'launch-editor-middleware' +import consola from 'consola' import { isUrl, waitFor, timeout } from '../common/utils' import defaults from '../common/nuxt.config' @@ -18,8 +18,7 @@ import MetaRenderer from './meta' import errorMiddleware from './middleware/error' import nuxtMiddleware from './middleware/nuxt' -const debug = Debug('nuxt:render') -debug.color = 4 // Force blue color +const logger = consola.withScope('nuxt:render') let jsdom = null @@ -290,7 +289,7 @@ export default class Renderer { } // Log rendered url - debug(`Rendering url ${url}`) + logger.debug(`Rendering url ${url}`) // Add url and isSever to the context context.url = url @@ -400,11 +399,11 @@ export default class Renderer { try { jsdom = this.nuxt.requireModule('jsdom') } catch (e) /* istanbul ignore next */ { - /* eslint-disable no-console */ - console.error('Fail when calling nuxt.renderAndGetWindow(url)') - console.error('jsdom module is not installed') - console.error('Please install jsdom with: npm install --save-dev jsdom') - /* eslint-enable no-console */ + consola.error(` + Fail when calling nuxt.renderAndGetWindow(url) + jsdom module is not installed + Please install jsdom with: npm install --save-dev jsdom + `) throw e } } @@ -418,7 +417,7 @@ export default class Renderer { } const jsdomErrHandler = err => { throw err } if (opts.virtualConsole !== false) { - options.virtualConsole = new jsdom.VirtualConsole().sendTo(console) + options.virtualConsole = new jsdom.VirtualConsole().sendTo(consola) // throw error when window creation failed options.virtualConsole.on('jsdomError', jsdomErrHandler) }