Merge branch 'master' into nested-dynamic-routes

This commit is contained in:
Sébastien Chopin 2016-12-13 17:38:44 +01:00
commit efd6b5cefa
2 changed files with 3 additions and 2 deletions

View File

@ -3,6 +3,7 @@
"description": "", "description": "",
"dependencies": { "dependencies": {
"body-parser": "^1.15.2", "body-parser": "^1.15.2",
"cross-env": "^3.1.3",
"express": "^4.14.0", "express": "^4.14.0",
"express-session": "^1.14.2", "express-session": "^1.14.2",
"nuxt": "latest", "nuxt": "latest",
@ -11,6 +12,6 @@
"scripts": { "scripts": {
"dev": "node server.js", "dev": "node server.js",
"build": "nuxt build", "build": "nuxt build",
"start": "NODE_ENV=production node server.js" "start": "cross-env NODE_ENV=production & node server.js"
} }
} }

View File

@ -47,7 +47,7 @@ export default {
}, },
<% } %> <% } %>
components: { components: {
NuxtError<%= (loading ? ',\n\t\tNuxtLoading' : '') %> NuxtError<%= (loading ? ',\n NuxtLoading' : '') %>
} }
} }
</script> </script>