From 3d206de7a51084ab228355e77697d375360ba401 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= Date: Mon, 7 Nov 2016 14:12:59 +0100 Subject: [PATCH] Async-data example working --- examples/async-data/pages/index.vue | 3 ++- examples/async-data/pages/post.vue | 15 +++++++++++---- lib/build/index.js | 1 - package.json | 2 +- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/examples/async-data/pages/index.vue b/examples/async-data/pages/index.vue index bf43114004..c35cb36adc 100644 --- a/examples/async-data/pages/index.vue +++ b/examples/async-data/pages/index.vue @@ -20,10 +20,11 @@ export default { } - diff --git a/examples/async-data/pages/post.vue b/examples/async-data/pages/post.vue index 28a4b8cbf8..96fd266566 100644 --- a/examples/async-data/pages/post.vue +++ b/examples/async-data/pages/post.vue @@ -10,17 +10,24 @@ const axios = require('axios') export default { - async data ({ req }) { - const res = await axios.get('https://jsonplaceholder.typicode.com/posts/1') - return { post: res.data } + data ({ req }) { + return new Promise((resolve, reject) => { + axios.get('https://jsonplaceholder.typicode.com/posts/1') + .then((res) => { + resolve({ + post: res.data + }) + }) + }) } } - diff --git a/lib/build/index.js b/lib/build/index.js index 5840dc7527..bf12d081e8 100644 --- a/lib/build/index.js +++ b/lib/build/index.js @@ -208,7 +208,6 @@ function webpackWatchAndUpdate () { const MFS = require('memory-fs') // <- dependencies of webpack const mfs = new MFS() const serverConfig = getWebpackServerConfig.call(this) - console.log(serverConfig) const serverCompiler = webpack(serverConfig) const outputPath = join(serverConfig.output.path, serverConfig.output.filename) serverCompiler.outputFileSystem = mfs diff --git a/package.json b/package.json index 23b6aea3f3..04dc1bc1b9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nuxt", - "version": "0.1.2", + "version": "0.1.3", "description": "A minimalistic framework for server-rendered Vue.js applications (inspired by Next.js)", "main": "index.js", "license": "MIT",