From 749274d22a8451cefc31485be733a819d9ab725c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Mon, 7 Nov 2016 20:57:44 +0100
Subject: [PATCH] Version 0.1.5

- Add examples/with-store/ to show how to use Vuex with nuxt.js
- Fix fetch().then when fetch does not return a promise
- Map static folder to /static/
---
 bin/nuxt-init                        |   3 +-
 bin/nuxt-start                       |  27 +++++++-------
 examples/hello-world/pages/about.vue |  14 +++++++-
 examples/hello-world/pages/index.vue |  14 +++++++-
 examples/hello-world/static/nuxt.png | Bin 0 -> 3427 bytes
 examples/with-store/README.md        |  51 +++++++++++++++++++++++++++
 examples/with-store/nuxt.config.js   |   3 ++
 examples/with-store/pages/about.vue  |   8 +++++
 examples/with-store/pages/index.vue  |  26 ++++++++++++++
 examples/with-store/store/index.js   |  17 +++++++++
 lib/app/client.js                    |   1 +
 package.json                         |   2 +-
 12 files changed, 147 insertions(+), 19 deletions(-)
 create mode 100644 examples/hello-world/static/nuxt.png
 create mode 100644 examples/with-store/README.md
 create mode 100644 examples/with-store/nuxt.config.js
 create mode 100644 examples/with-store/pages/about.vue
 create mode 100644 examples/with-store/pages/index.vue
 create mode 100644 examples/with-store/store/index.js

diff --git a/bin/nuxt-init b/bin/nuxt-init
index 6331dcd080..d48a255d76 100755
--- a/bin/nuxt-init
+++ b/bin/nuxt-init
@@ -58,8 +58,7 @@ const baseConfig = `module.exports = {
 }
 `
 
-const basePage = `
-<template>
+const basePage = `<template>
   <p>Hello {{ name }}!</p>
 </template>
 
diff --git a/bin/nuxt-start b/bin/nuxt-start
index 595f61643f..1b60554bbc 100755
--- a/bin/nuxt-start
+++ b/bin/nuxt-start
@@ -1,7 +1,9 @@
 #!/usr/bin/env node --harmony_proxies
 
 const http = require('http')
+const co = require('co')
 const fs = require('fs')
+const pify = require('pify')
 const serveStatic = require('serve-static')
 const Nuxt = require('../')
 const { resolve } = require('path')
@@ -30,19 +32,27 @@ class Server {
 
   constructor (nuxt) {
     this.server = http.createServer(this.handle.bind(this))
-    this.staticServer = serveStatic('static', { fallthrough: false })
+    this.serveStatic = pify(serveStatic(resolve(rootDir, 'static')))
     this.nuxt = 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)
     }
-    this._staticHandler(req, res)
-    .catch((e) => {
+    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)
     })
@@ -56,15 +66,4 @@ class Server {
     })
   }
 
-  _staticHandler (req, res) {
-    return new Promise((resolve, reject) => {
-      this.staticServer(req, res, (error) => {
-        if (!error) {
-          return resolve()
-        }
-        error.message = `Route ${error.message} while resolving ${req.url}`
-        reject(error)
-      })
-    })
-  }
 }
diff --git a/examples/hello-world/pages/about.vue b/examples/hello-world/pages/about.vue
index 36382aa404..0b121b4e33 100755
--- a/examples/hello-world/pages/about.vue
+++ b/examples/hello-world/pages/about.vue
@@ -1,3 +1,15 @@
 <template>
-  <div>About us</div>
+  <div class="container">
+    <img src="/static/nuxt.png" />
+    <h2>About</h2>
+    <p><router-link to='/'>Home</router-link></p>
+  </div>
 </template>
+
+<style scoped>
+.container {
+  font-family: serif;
+  margin-top: 200px;
+  text-align: center;
+}
+</style>
diff --git a/examples/hello-world/pages/index.vue b/examples/hello-world/pages/index.vue
index b6677d0e9c..30ec792d62 100755
--- a/examples/hello-world/pages/index.vue
+++ b/examples/hello-world/pages/index.vue
@@ -1,3 +1,15 @@
 <template>
-  <div>Hello World. <router-link to='/about'>About</router-link></div>
+  <div class="container">
+    <img src="/static/nuxt.png" />
+    <h2>Hello World.</h2>
+    <p><router-link to='/about'>About</router-link></p>
+  </div>
 </template>
+
+<style scoped>
+.container {
+  font-family: sans-serif;
+  margin-top: 200px;
+  text-align: center;
+}
+</style>
diff --git a/examples/hello-world/static/nuxt.png b/examples/hello-world/static/nuxt.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9b484a4329c9a20898bc0488216c1428d30e0b1
GIT binary patch
literal 3427
zcmV-p4V?0cP)<h;3K|Lk000e1NJLTq006oG002A)1^@s6(dVEv00004XF*Lt006O%
z3;baP000ddNkl<ZcmeHP3(!?n6^4+9jEG<&0R|FCY7&V|X{2BfT80l`gaUgwrKzE5
zIU*ug9=<aZdJs$qj3YWoG1^0VARz`rGoTYipbWyO_(BXc2!y`xu-4!D5BJ`4_CDua
z=Kue_X1=@D*=Mb_&sk^Pb@txp+}pg_A-W7~7w`w!E}ET;4u%512evwP)(-k3fDOPZ
zM_XU@K``tFECTib)u=0WUIaV~tgoh+<GvyA)dhG0c+dFl0C_Y(ekAB1I{gc<@<?<Z
z@AK1W-~kci;yVl4UL*Z2_wYYWZ2tq^(Zk-=qz4Q>02rU^fh2kq3e?>R^Z<&c;pjlG
z-*;l2EiwC4=Sc9LvE!=w=7-Q@Z`12c$R9D=MTw`0W92UWs7)If@y<{*^+5-W6G{6%
zv{n9dqcpb%zrDOlZmlig=|1CalaVPV-F;%}g>14&ykCfC2d78HbdSaM6yRI2_OO{g
z0&}4{0cZ(a0o(<|6A(?g&{%jmMLh8fwk+oLYuM&+%V+4)9d@^hzqQ~$7ukg!fbt)K
z?Jh<|=`vUc4fa7U`c}hnB>Q|5aHYjC(BtjzYV4su%=9-ar9G2Ek8wdt8&@?Jsh3PY
zUvYJipwHOqIWXo8n)H@zPl5rQWE+C)9D(Vu*eh0Jz(4NnA=%*TP|<?KN$<jBlcuXt
zF3}kcR{35{H!PXYd>cH>7B3t}=RH<$1)sNxf3nE{hY5iyL?E8%yG1Wl^$G!VXy({l
zCxe$mPBW2B>;6h8b{FM!;0=Cgk@m!W_2P*>AC9;zM*1qC6P>6bd^knmRcPx3j&UwI
zSyxu(YSTosn|BM2r2|!oKs?cz<UbPqB5t`=4y94<x*KPuOKT$`pOM2^UIiar#SfoH
zJeh;fM(-k?=se*Efp_H0i<(G@`$o@R#~J=a&aydpNn~Hv7KXPN<FII8f>BK@m+1e7
z!Tn;y{drHMsvS>b+{XtxI`_F0a=#2Gc@1nki~UOQr!)9!Ql{k+odK8uye*N)dm<%n
zn+)T#0>+cXs(wc#xqlo3lbelMsOBaZNn)i$-vz^a#h5x=z6#_Y0p1~brz8yr`bU!6
z$9JKAf|x7=CjzC6K&3>dImec7h@Vm5pAb1P_XzBO3Fkgau2ub57=B-k!9z7S!AK)k
zOZ4~PK&v`$xuL43iD+dVu4Zvni}WRcZ;hs<8=$CfYI0o8@p&MJ2vkdSy7?)vUHpvz
z?<;a(?h#;;KVZz#R&~CRb)&Hh)!YOlt(cVPeCL~M!6a7o5`{qC5%@7IIgBCkWwCQ2
zsrtuF*xg=Ko&@LGc_7CKBqciC%>ww8k8}ypFOtHCPXst2<#MA^QdK`5isME3Ab42n
z)yO&WG>OjlHSQF@p{hFuxQzNtv~kIiGz9ouB$fZ*a$-B#wHSO|d9~1*6oE8}P9Jjs
zzL7_|7&tSM!iP@;`0z+4`Lv%>!AU2yUnl$cW@1<js1T?$&1n;TFP!lmYo(-HuIdF|
zJ_2@<KL{#=%c${De_LsP419eVozRpr0%;SS?&bn7i{FdD2Z$V)dj#HxiB9rq9WNYR
z(563h{s3|b2$UfLE{XnM^fS%$RWfoA-6LQp`5dQnysk6>LL1pw0KQRo1nw6Bmqcd|
z4+EPifW8R0JoJc+!be>M>?EI!TGda2{B6<N2R>Egz%oR@HPQFS0<RY*!yz<j)7dzC
zo#b;({Q`hLk!uBzI9$}i5;cSmzX-S{I(y-*bdz+)haP8(9GH6q;=@5cIsJyX;R1ji
zD!O|Q7IhKuNpwz*rqp@(|1H-v1<@e_tlC>d|5WgnBHL;&O@aAFz$ek!*Q3A&>2xUg
zK#>D;k3hL`IA6Wchji{9gT-MH@J)19bvr({@?o8XhQtWWhsLW$YaZm+%ytknM!+}G
z+3n+iKEya5^0{mb<Q0KFu<C3qx!joL+89?sWCXGVlaHlsCAV^ju3H33P`B6ObZn1t
za}l(wMZgBPnqH-Si?HJb**OS&u*iX>kH9CP%6I)q91<$=-If-*5qP!;WKHyg=)PnQ
z!OEsNh*cuMJ7II#&k5-BBKHQrLgc_QMj&gVv-@8IYvnjNPXD~ffh9-aEU55pP|{A|
zhX5<N(j*AF+^B7Vdqg0QL}yjE7blF>(_e@wMwLnaF0cgno3x({ex=BPWr#o?iO%l%
z6ED3upM}h|^+44lz$eNViptyI{F$B7?J9sz1X`QzAbLa~uS93p_Tq%9o_sNEHNPL~
zyNt>2AU`MD-N3Il`-12ZfjkqP7iX0m1FIEZPzqE&0-Vd}Yq|Vc-HbA79G@%MA7N-)
z;0_VUGtt?t9jlidj-#om+G>6ePM-gv6Q@6;;TdV<!=&p(4$LD0c_;c(9K%XE4!*0-
zch&>dj{sMt&XcC?;QU!#C9=c8A3#ZeC|yavF}3prw=cxNVO%BR&kp$y6|~`qq9ag`
z#$t;rC&cu6d;B)e7hm+Zrh*GrFz(l1!&gu%+st3X>+$w4tC4TxFw@_x99**y=<#2l
z!r#+I|F#tRd8shAdYp`Tt%-fUWxyBR7M3}PHfVbY;EL6LfHr*ab^urb@F{b>$Ijf&
zgLunbE{?cP{N+5HHWDA4x9|rRq*s76UmRQ2Z-UKnG;RWP8P4&;26G@E6+7=1*nSLP
zF&YhUb&59R=K@=Rs2Juwbb;T9CaVBmGIAawe^{)<Z*$RfwCR9VB@5ZH`CV|dCxx@s
z(0NMqnB+|MK!+m0LV6)E6yRcrzCyvu{wy#Km=6?E(dm~J{ZAA?X9D{4FKWp6vBTKc
zqPp2WxZdqcyt54u<89#lVMSVERp&5*#NiIBR-k6hK7$~v1GXjwqo|6`e&bcWdD6k8
z+;5YuLrR-0YPJviC3Eq~bGOxe8n*c}y0o+wioX)&cHlRsHEiU1yf&PKCQ^}!&Pf+n
zVMzUeOCu@!hfTIF+1(|2=xQ|Vm&`OLiadA5fV2geOTm#?IJBx?3z<ufO`TZHIoa%!
z6o?`doqgMh6faaBRsBVCQoMB)O}3AhJUU~H?=W^#A@4KWX~n-okrOWxtJs7{YT6%M
zkz!n)0=S%AmBwN(D+MvVs;1x0--vJeA1N-fEH54dA50YbdrkZm#ahAf9)NxA1USog
zrO_~;J+TRhuN<H$HL-GWqD5bv7<U7Tq9eV$7(cHWXjl|)#CA_$1;Ds4*G2&?fqGPQ
zMQ3M|O^=kb_PHBA)`-u};I`sQb8d_?`qtuYIk?X1({{iwhCTl&*yaWCrGLTj5i#b9
z(?nlKjmT~@&V@^f!-2g3<HI(tPSq<+W6{70K@?HZ;Wm2pRQtFb+gU0){gnXq_c$90
zB326RhvQ;b;_{Z-Z-87c@UG58|6|~KN8^OHhqUL-8cIcvpZ5u9xD#N~&jacTYb_G}
zQ|Ryjz>B^f;BA-kn}83U2qUhi(+4YLUm$N93Wu7cJWdXoT!=#y4pr307#HIN-Py+P
zFB5cqcQ@2T*Yh0+frVhaHq;`~+1C?*UUcQYiB5kH7=KKt_H4|FPJ*8|06orIJp6vs
z*z?O>S6MuK#Z5kn239N{AHV3mfxM}qCpzQtAh3i&p24TTYQ&WXUYNY-UO3X_zFv^I
z&V1O5JRY5OhYe@(yakfB0y85i{YOivPBQ8x$h@QFMLecC;*7(glE{J8kHB--JX@P;
zRngfW$J1IR$+J{+`Wp=Bc$NOP0OtU{bTJJ1<<Vo@1=(j<bd~Y(Jmls;-o$4JIt1h-
z`ShGSsAWYz3&(z6!tpP}e%FFC2sVsSRM2ag=%=AmUKCBFtcea+&6rd={#U<C(KZZd
z4I~lA-lKpufZCIDd^a3$CHA=uP+yn0I&jdp!?$uvZw{^wQ>|s9^VM1o#kibXiPmDr
zwXvN?$F}2}SEGS;5!Eu$+2JFACP5yFPM;S5c1*4Q`E6bX%m7Njc;I`$RN!a8YQWwR
z)b2&J4*-1V8W^dcx*+>FN?~&%baYbAFZ&rOY|^UKGSNHWpmqcCMAl>F_2qS9p|tc0
zHb&Y8BlAnJ5x7U&_&TIsm|L~6Kz<5*@0UJb&as~^@HG$EBfj;VT==`NWtD6P_|jq+
zYM&!~ojBNW!lnJ);9!@edaCieAW1ppey&9Q6?nLe{y4PpF8UC_BGU=r7nkq#>;k3%
zak>!=93lJy7y@(!dI3!S7l2JbTOc9|s{pR^_KaGJ|KJ6A9bkpcn;4*pzzRUCohCv#
z&g5PSu$s6oA;RP^;y9m`W)4uq*gW3hacE%j`~%=c&XYJC;>7p7oSZV(-U3!v@HY_c
z&j5Pec$eA;@JmoBmV>eHw*bEkdVP05<`?F8Afigfy1$|GmN<dFKsTVHfE9p&cn8=F
z{1ae61Jx!1EGDenL?vQgb^&;uIQ&dYouJ6k0`2P2{{Vx##;e)m4d?&>002ovPDHLk
FV1gj#dvO2&

literal 0
HcmV?d00001

diff --git a/examples/with-store/README.md b/examples/with-store/README.md
new file mode 100644
index 0000000000..22d5d7daab
--- /dev/null
+++ b/examples/with-store/README.md
@@ -0,0 +1,51 @@
+# Nuxt.js with Vuex
+
+> Using a store to manage the state is important to every big application, that's why nuxt.js implement Vuex in its core.
+
+## Activate the store option
+
+First, we need to tell nuxt.js to activate the store, for this, we add a `nuxt.config.js` file:
+
+```js
+module.exports = {
+  store: true
+}
+```
+
+## Create the store folder
+
+When the store option is activated, nuxt will import it via `require('./store')`
+
+After creating the `store/` folder, we can create our `store/index.js` file:
+
+```js
+import Vue from 'vue'
+import Vuex from 'vuex'
+
+Vue.use(Vuex)
+
+const store = new Vuex.Store({
+  state: {
+    counter: 0
+  },
+  mutations: {
+    increment (state) {
+      state.counter++
+    }
+  }
+})
+
+export default store
+```
+
+> You don't need to install vuex since it's shipped with nuxt.js
+
+## Voilà !
+
+You're ready to use `this.$store` inside your `.vue` files :)
+
+```html
+<template>
+  <button @click="$store.commit('increment')">{{ $store.state.counter }}</button>
+</template>
+```
diff --git a/examples/with-store/nuxt.config.js b/examples/with-store/nuxt.config.js
new file mode 100644
index 0000000000..f86f36b8d9
--- /dev/null
+++ b/examples/with-store/nuxt.config.js
@@ -0,0 +1,3 @@
+module.exports = {
+  store: true
+}
diff --git a/examples/with-store/pages/about.vue b/examples/with-store/pages/about.vue
new file mode 100644
index 0000000000..734bf8e201
--- /dev/null
+++ b/examples/with-store/pages/about.vue
@@ -0,0 +1,8 @@
+<template>
+  <div>
+    <p>
+      <button @click="$store.commit('increment')">{{ $store.state.counter }}</button><br>
+      <router-link to="/">Home</router-link>
+    </p>
+  </div>
+</template>
diff --git a/examples/with-store/pages/index.vue b/examples/with-store/pages/index.vue
new file mode 100644
index 0000000000..cf3bfa73a7
--- /dev/null
+++ b/examples/with-store/pages/index.vue
@@ -0,0 +1,26 @@
+<template>
+  <div>
+    <p>
+      <button @click="increment">{{ counter }}</button><br>
+      <router-link to="/about">About</router-link>
+    </p>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+
+export default {
+  // fetch(context) is called by the server-side
+  // and nuxt before instantiating the component
+  fetch ({ store }) {
+    store.commit('increment')
+  },
+  computed: mapState([
+    'counter'
+  ]),
+  methods: {
+    increment () { this.$store.commit('increment') }
+  }
+}
+</script>
diff --git a/examples/with-store/store/index.js b/examples/with-store/store/index.js
new file mode 100644
index 0000000000..e5ad937c65
--- /dev/null
+++ b/examples/with-store/store/index.js
@@ -0,0 +1,17 @@
+import Vue from 'vue'
+import Vuex from 'vuex'
+
+Vue.use(Vuex)
+
+const store = new Vuex.Store({
+  state: {
+    counter: 0
+  },
+  mutations: {
+    increment (state) {
+      state.counter++
+    }
+  }
+})
+
+export default store
diff --git a/lib/app/client.js b/lib/app/client.js
index 84b937aed6..83b89a7c52 100644
--- a/lib/app/client.js
+++ b/lib/app/client.js
@@ -71,6 +71,7 @@ function render (to, from, next) {
     }
     if (Component.fetch) {
       var p = Component.fetch(context)
+      if (!(p instanceof Promise)) { p = Promise.resolve(p) }
       <%= (loading ? 'p.then(() => this.$loading.increase && this.$loading.increase(30))' : '') %>
       promises.push(p)
     }
diff --git a/package.json b/package.json
index ae867e3d88..90520d8d58 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nuxt",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "A minimalistic framework for server-rendered Vue.js applications (inspired by Next.js)",
   "main": "index.js",
   "license": "MIT",