From 001ba775fa8b9d5d8a84f5609289f3982f6a1732 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pyapar@gmail.com>
Date: Sat, 30 Mar 2019 23:23:56 +0430
Subject: [PATCH] revert(core): call ready to prevent breaking changes (#5413)

---
 README.md                       |  5 ++---
 packages/core/src/nuxt.js       | 11 ++++++++---
 packages/core/test/nuxt.test.js | 12 +++++-------
 test/unit/renderer.test.js      | 15 ++++++---------
 4 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/README.md b/README.md
index 473e56ae7b..fa3c38bae6 100644
--- a/README.md
+++ b/README.md
@@ -100,11 +100,10 @@ Or you can start by using one of our starter templates:
 const { Nuxt, Builder } = require('nuxt')
 
 // Import and set nuxt.js options
-let config = require('./nuxt.config.js')
+const config = require('./nuxt.config.js')
 config.dev = (process.env.NODE_ENV !== 'production')
 
-let nuxt = new Nuxt(config)
-nuxt.ready().catch(console.error)
+const nuxt = new Nuxt(config)
 
 // Start build process (only in development)
 if (config.dev) {
diff --git a/packages/core/src/nuxt.js b/packages/core/src/nuxt.js
index 395437196c..edac169a6d 100644
--- a/packages/core/src/nuxt.js
+++ b/packages/core/src/nuxt.js
@@ -38,6 +38,13 @@ export default class Nuxt extends Hookable {
     if (this.options.server !== false) {
       this._initServer()
     }
+
+    // Call ready
+    if (this.options._ready !== false) {
+      this.ready().catch((err) => {
+        consola.fatal(err)
+      })
+    }
   }
 
   static get version() {
@@ -46,9 +53,7 @@ export default class Nuxt extends Hookable {
 
   ready() {
     if (!this._ready) {
-      this._ready = this._init().catch((err) => {
-        consola.fatal(err)
-      })
+      this._ready = this._init()
     }
     return this._ready
   }
diff --git a/packages/core/test/nuxt.test.js b/packages/core/test/nuxt.test.js
index 23850ace59..6f664a1077 100644
--- a/packages/core/test/nuxt.test.js
+++ b/packages/core/test/nuxt.test.js
@@ -1,4 +1,3 @@
-import consola from 'consola'
 import { defineAlias } from '@nuxt/utils'
 import { getNuxtConfig } from '@nuxt/config'
 import { Server } from '@nuxt/server'
@@ -14,7 +13,9 @@ jest.mock('@nuxt/utils')
 jest.mock('@nuxt/server')
 
 jest.mock('@nuxt/config', () => ({
-  getNuxtConfig: jest.fn(() => ({}))
+  getNuxtConfig: jest.fn(() => ({
+    _ready: false
+  }))
 }))
 
 describe('core: nuxt', () => {
@@ -67,10 +68,7 @@ describe('core: nuxt', () => {
     const err = new Error('nuxt ready failed')
     const nuxt = new Nuxt()
     nuxt._init = () => Promise.reject(err)
-    await nuxt.ready()
-
-    expect(consola.fatal).toBeCalledTimes(1)
-    expect(consola.fatal).toBeCalledWith(err)
+    await expect(nuxt.ready()).rejects.toThrow(err)
   })
 
   test('should return nuxt version from package.json', () => {
@@ -113,7 +111,7 @@ describe('core: nuxt', () => {
 
   test('should add object hooks', async () => {
     const hooks = {}
-    getNuxtConfig.mockReturnValueOnce({ hooks })
+    getNuxtConfig.mockReturnValueOnce({ hooks, _ready: false })
     const nuxt = new Nuxt()
 
     nuxt.addHooks = jest.fn()
diff --git a/test/unit/renderer.test.js b/test/unit/renderer.test.js
index 3cc974f99c..b0331e3ba0 100644
--- a/test/unit/renderer.test.js
+++ b/test/unit/renderer.test.js
@@ -16,9 +16,8 @@ describe('renderer', () => {
       dev: false,
       buildDir: '/path/to/404'
     })
-    await nuxt.ready()
-    await expect(nuxt.renderer.renderer.isReady).toBe(false)
-    expect(consola.fatal).toHaveBeenCalledWith(expect.objectContaining({
+
+    await expect(nuxt.ready()).rejects.toThrow(expect.objectContaining({
       message: expect.stringMatching(NO_BUILD_MSG)
     }))
   })
@@ -30,9 +29,8 @@ describe('renderer', () => {
       dev: false,
       buildDir: '/path/to/404'
     })
-    await nuxt.ready()
-    await expect(nuxt.renderer.renderer.isReady).toBe(false)
-    expect(consola.fatal).toHaveBeenCalledWith(expect.objectContaining({
+
+    await expect(nuxt.ready()).rejects.toThrow(expect.objectContaining({
       message: expect.stringMatching(NO_BUILD_MSG)
     }))
   })
@@ -44,9 +42,8 @@ describe('renderer', () => {
       dev: false,
       buildDir: '/path/to/404'
     })
-    await nuxt.ready()
-    await expect(nuxt.renderer.renderer.isModernReady).toBe(false)
-    expect(consola.fatal).toHaveBeenCalledWith(expect.objectContaining({
+
+    await expect(nuxt.ready()).rejects.toThrow(expect.objectContaining({
       message: expect.stringMatching(NO_MODERN_BUILD_MSG)
     }))
   })