Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2024-12-04 19:37:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of git://github.com/nuxt/nuxt.js into dev

Browse Source
This commit is contained in:
Nolan Darilek 2017-09-15 11:03:42 -05:00
commit 35b975f061
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/vue-apollo/package.json
View File

@ -1,8 +1,8 @@
{ {
"name": "nuxt-vue-apollo", "name": "nuxt-vue-apollo",
"dependencies": { "dependencies": {
"@nuxtjs/apollo": "^2.0.0", "@nuxtjs/apollo": "^2.1.1",
"nuxt": "^1.0.0-rc6" "nuxt": "^1.0.0-rc9"
}, },
"scripts": { "scripts": {
"dev": "nuxt", "dev": "nuxt",

9
lib/app/index.js
View File

@ -43,7 +43,11 @@ const defaultTransition = <%=
async function createApp (ssrContext) { async function createApp (ssrContext) {
const router = createRouter() const router = createRouter()
<% if (store) { %>const store = createStore()<% } %> <% if (store) { %>
const store = createStore()
// Add this.$router into store actions/mutations
store.$router = router
<% } %>
// Create Root instance // Create Root instance
// here we inject the router and store to all child components, // here we inject the router and store to all child components,
@ -151,6 +155,9 @@ async function createApp (ssrContext) {
if (typeof <%= plugin.name %> === 'function') await <%= plugin.name %>(ctx, inject)<% }) %> if (typeof <%= plugin.name %> === 'function') await <%= plugin.name %>(ctx, inject)<% }) %>
}<% } %> }<% } %>
// Inject context
inject('ctx', ctx)
if (process.server && ssrContext && ssrContext.url) { if (process.server && ssrContext && ssrContext.url) {
await new Promise((resolve, reject) => { await new Promise((resolve, reject) => {
router.push(ssrContext.url, resolve, reject) router.push(ssrContext.url, resolve, reject)