From d88948bdeac9cd3b8c8f1c1456198e666e49664e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Thu, 10 Nov 2016 02:19:47 +0100
Subject: [PATCH] map static to /

v0.3.0
---
 README.md                                   |  11 +++++--
 bin/nuxt-build                              |   2 +-
 bin/nuxt-dev                                |   4 ++-
 bin/nuxt-start                              |   2 +-
 examples/hello-world/pages/about.vue        |  20 +++++++++----
 examples/hello-world/pages/index.vue        |   2 +-
 examples/hello-world/static/nuxt-square.png | Bin 0 -> 4799 bytes
 examples/with-ava/test/index.test.js        |   9 +++++-
 lib/build/index.js                          |  10 +++++--
 lib/nuxt.js                                 |  31 ++++++++++++--------
 lib/server.js                               |  29 +-----------------
 package.json                                |   2 +-
 12 files changed, 64 insertions(+), 58 deletions(-)
 create mode 100644 examples/hello-world/static/nuxt-square.png

diff --git a/README.md b/README.md
index 0372efb24a..fa9cf1c083 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ So far, we get:
 - Automatic transpilation and bundling (with webpack and babel)
 - Hot code reloading
 - Server rendering and indexing of `./pages`
-- Static file serving. `./static/` is mapped to `/static/`
+- Static file serving. `./static/` is mapped to `/`
 - Config file `nuxt.config.js`
 - Code splitting via webpack
 
@@ -97,8 +97,13 @@ This is mostly used for tests purpose but who knows!
 
 ```js
 nuxt.renderRoute('/about', context)
-.then(function (html) {
-  // HTML
+.then(function ({ html, error }) {
+  // You can check error to know if your app displayed the error page for this route
+  // Useful to set the correct status status code if an error appended:
+  if (error) {
+    return res.status(error.statusCode || 500).send(html)
+  }
+  res.send(html)
 })
 .catch(function (error) {
   // And error appended while rendering the route
diff --git a/bin/nuxt-build b/bin/nuxt-build
index b20a727b15..780c3fe3d8 100755
--- a/bin/nuxt-build
+++ b/bin/nuxt-build
@@ -23,5 +23,5 @@ new Nuxt(options)
 })
 .catch((err) => {
   console.error(err)
-  process.exit()
+  process.exit(1)
 })
diff --git a/bin/nuxt-dev b/bin/nuxt-dev
index 069e62aaf0..d772cd4b67 100755
--- a/bin/nuxt-dev
+++ b/bin/nuxt-dev
@@ -15,6 +15,8 @@ if (typeof options.rootDir !== 'string') {
   options.rootDir = rootDir
 }
 
+options.dev = true // Add hot reloading and watching changes
+
 new Nuxt(options)
 .then((nuxt) => {
   new Server(nuxt)
@@ -22,5 +24,5 @@ new Nuxt(options)
 })
 .catch((err) => {
   console.error(err)
-  process.exit()
+  process.exit(1)
 })
diff --git a/bin/nuxt-start b/bin/nuxt-start
index 1ef5bdd692..b0e0f23820 100755
--- a/bin/nuxt-start
+++ b/bin/nuxt-start
@@ -25,5 +25,5 @@ new Nuxt(options)
 })
 .catch((err) => {
   console.error(err)
-  process.exit()
+  process.exit(1)
 })
diff --git a/examples/hello-world/pages/about.vue b/examples/hello-world/pages/about.vue
index 934bfbfe09..10b34ee7f8 100755
--- a/examples/hello-world/pages/about.vue
+++ b/examples/hello-world/pages/about.vue
@@ -1,15 +1,25 @@
 <template>
   <div class="container">
-    <img src="/static/nuxt.png" />
-    <h2>About</h2>
-    <p><router-link to="/">Home</router-link></p>
+    <img src="/nuxt-square.png" />
+    <h2>Thank you for testing nuxt.js</h2>
+    <p><router-link to="/">Back home</router-link></p>
   </div>
 </template>
 
 <style scoped>
 .container {
-  font-family: serif;
-  margin-top: 200px;
+  position: absolute;
+  top: 0;
+  left: 0;
+  height: 100%;
+  width: 100%;
+  background: black;
+  color: white;
+  font-family: "Lucida Console", Monaco, monospace;
+  padding-top: 130px;
   text-align: center;
 }
+a {
+  color: silver;
+}
 </style>
diff --git a/examples/hello-world/pages/index.vue b/examples/hello-world/pages/index.vue
index 52c820e2d7..83731c889d 100755
--- a/examples/hello-world/pages/index.vue
+++ b/examples/hello-world/pages/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="container">
-    <img src="/static/nuxt.png" />
+    <img src="/nuxt.png" />
     <h2>Hello World.</h2>
     <p><router-link to="/about">About</router-link></p>
   </div>
diff --git a/examples/hello-world/static/nuxt-square.png b/examples/hello-world/static/nuxt-square.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ef326eca3f0b89b0202407cf4df5c0101020b4f
GIT binary patch
literal 4799
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

literal 0
HcmV?d00001

diff --git a/examples/with-ava/test/index.test.js b/examples/with-ava/test/index.test.js
index 7869688653..ccaef820e6 100755
--- a/examples/with-ava/test/index.test.js
+++ b/examples/with-ava/test/index.test.js
@@ -40,6 +40,13 @@ async function renderAndGetWindow (route) {
       },
       done (err, window) {
         if (err) return reject(err)
+        // If Nuxt could not be loaded (error from the server-side)
+        if (!window.__NUXT__) {
+          return reject({
+            message: 'Could not load the nuxt app',
+            body: window.document.getElementsByTagName('body')[0].innerHTML
+          })
+        }
         // Used by nuxt.js to say when the components are loaded and the app ready
         window.onNuxtReady = function () {
           resolve(window)
@@ -54,7 +61,7 @@ async function renderAndGetWindow (route) {
 */
 test('Route / exits and render HTML', async t => {
   let context = {}
-  const html = await nuxt.renderRoute('/', context)
+  const { html } = await nuxt.renderRoute('/', context)
   t.true(html.includes('<p class="red-color">Hello world!</p>'))
   t.is(context.nuxt.error, null)
   t.is(context.nuxt.data[0].name, 'world')
diff --git a/lib/build/index.js b/lib/build/index.js
index 2e0813c0ba..4f211f5184 100644
--- a/lib/build/index.js
+++ b/lib/build/index.js
@@ -52,6 +52,10 @@ module.exports = function * () {
   if (noBuild) {
     const serverConfig = getWebpackServerConfig.call(this)
     const bundlePath = join(serverConfig.output.path, serverConfig.output.filename)
+    if (!fs.existsSync(bundlePath)) {
+      console.error('> No build files found, please run `nuxt build` before launching `nuxt start`')
+      process.exit(1)
+    }
     createRenderer.call(this, fs.readFileSync(bundlePath, 'utf8'))
     return Promise.resolve()
   }
@@ -64,15 +68,15 @@ module.exports = function * () {
     } else {
       console.error('> Couldn\'t find a `pages` directory. Please create one under the project root')
     }
-    process.exit()
+    process.exit(1)
   }
   if (this.options.store && !fs.existsSync(join(this.dir, 'store'))) {
     console.error('> No `store` directory found (store option activated). Please create on under the project root')
-    process.exit()
+    process.exit(1)
   }
   if (this.options.store && !fs.existsSync(join(this.dir, 'store', 'index.js'))) {
     console.error('> No `store/index.js` file found (store option activated). Please create the file.')
-    process.exit()
+    process.exit(1)
   }
   debug(`App root: ${this.dir}`)
   debug('Generating .nuxt/ files...')
diff --git a/lib/nuxt.js b/lib/nuxt.js
index 92014d4dbd..cb704eaacd 100644
--- a/lib/nuxt.js
+++ b/lib/nuxt.js
@@ -44,8 +44,11 @@ class Nuxt {
     })
     // renderer used by Vue.js (via createBundleRenderer)
     this.renderer = null
+    // For serving static/ files to /
+    this.serveStatic = pify(serveStatic(resolve(this.dir, 'static')))
     // For serving .nuxt/dist/ files
-    this.serveStatic = pify(serveStatic(resolve(this.dir, '.nuxt', 'dist')))
+    this._nuxtRegexp = /^\/_nuxt\//
+    this.serveStaticNuxt = pify(serveStatic(resolve(this.dir, '.nuxt', 'dist')))
     // Add this.build
     this.build = build.bind(this)
     // Launch build and set this.renderer
@@ -74,25 +77,27 @@ class Nuxt {
         // Call webpack middlewares only in development
         yield self.webpackDevMiddleware(req, res)
         yield self.webpackHotMiddleware(req, res)
-        return
       }
-      if (req.url.includes('/_nuxt/')) {
+      // Serve static/ files
+      yield self.serveStatic(req, res)
+      // Serve .nuxt/dist/ files (only for production)
+      if (!self.dev && self._nuxtRegexp.test(req.url)) {
         const url = req.url
-        req.url = req.url.replace('/_nuxt/', '/')
-        yield self.serveStatic(req, res)
+        req.url = req.url.replace(self._nuxtRegexp, '/')
+        yield self.serveStaticNuxt(req, res)
         req.url = url
       }
     })
     .then(() => {
-      if (this.dev && req.url.includes('/_nuxt/') && req.url.includes('.hot-update.json')) {
+      if (this.dev && this._nuxtRegexp.test(req.url) && req.url.includes('.hot-update.json')) {
         res.statusCode = 404
         return res.end()
       }
       return this.renderRoute(req.url, context)
     })
-    .then((html) => {
-      if (context.nuxt.error && context.nuxt.error.statusCode) {
-        res.statusCode = context.nuxt.error.statusCode
+    .then(({ html, error }) => {
+      if (error) {
+        res.statusCode = context.nuxt.error.statusCode || 500
       }
       res.end(html, 'utf8')
     })
@@ -110,13 +115,13 @@ class Nuxt {
     // Call rendertoSting from the bundleRenderer and generate the HTML (will update the context as well)
     const self = this
     return co(function * () {
-      const html = yield self.renderToString(context)
+      const app = yield self.renderToString(context)
       if (context.nuxt && context.nuxt.error instanceof Error) {
         context.nuxt.error = { statusCode: 500, message: context.nuxt.error.message }
       }
-      const app = self.appTemplate({
+      const html = self.appTemplate({
         dev: self.dev, // Use to add the extracted CSS <link> in production
-        APP: html,
+        APP: app,
         context: context,
         files: {
           css: join('/_nuxt/', self.options.build.filenames.css),
@@ -124,7 +129,7 @@ class Nuxt {
           app: join('/_nuxt/', self.options.build.filenames.app)
         }
       })
-      return app
+      return { html, error: context.nuxt.error }
     })
   }
 
diff --git a/lib/server.js b/lib/server.js
index af58bd2fed..e75a24aaf0 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -1,41 +1,14 @@
 'use strict'
 
 const http = require('http')
-const co = require('co')
-const pify = require('pify')
-const serveStatic = require('serve-static')
-const { resolve } = require('path')
 
 class Server {
 
   constructor (nuxt) {
-    this.server = http.createServer(this.handle.bind(this))
-    this.serveStatic = pify(serveStatic(resolve(nuxt.dir, 'static')))
-    this.nuxt = nuxt
+    this.server = http.createServer(nuxt.render.bind(nuxt))
     return this
   }
 
-  handle (req, res) {
-    const method = req.method.toUpperCase()
-    const self = this
-
-    if (method !== 'GET' && method !== 'HEAD') {
-      return this.nuxt.render(req, res)
-    }
-    co(function * () {
-      if (req.url.includes('/static/')) {
-        const url = req.url
-        req.url = req.url.replace('/static/', '/')
-        yield self.serveStatic(req, res)
-        req.url = url
-      }
-    })
-    .then(() => {
-      // File not found
-      this.nuxt.render(req, res)
-    })
-  }
-
   listen (port, host) {
     host = host || 'localhost'
     port = port || 3000
diff --git a/package.json b/package.json
index fa4e6643d0..620f1d0fd9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nuxt",
-  "version": "0.2.6",
+  "version": "0.3.0",
   "description": "A minimalistic framework for server-rendered Vue.js applications (inspired by Next.js)",
   "main": "index.js",
   "license": "MIT",