mirror of
https://github.com/nuxt/nuxt.git
synced 2025-01-30 15:22:39 +00:00
Merge branch 'master' into nested-dynamic-routes
This commit is contained in:
commit
efd6b5cefa
@ -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"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -47,7 +47,7 @@ export default {
|
|||||||
},
|
},
|
||||||
<% } %>
|
<% } %>
|
||||||
components: {
|
components: {
|
||||||
NuxtError<%= (loading ? ',\n\t\tNuxtLoading' : '') %>
|
NuxtError<%= (loading ? ',\n NuxtLoading' : '') %>
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
Loading…
Reference in New Issue
Block a user