Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(vue-app): middleware not executing on double browser back navigation #6775

Merged
merged 8 commits into from Mar 13, 2020
Merged

fix(vue-app): middleware not executing on double browser back navigation #6775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1cb00a3
Add fix for #c10049
jsonpoindexter Dec 4, 2019
18b3c64
Merge branch 'dev' into fix/universal-middleware
Atinux Dec 16, 2019
8cf91c8
Merge branch 'dev' into fix/universal-middleware
Atinux Dec 19, 2019
46385de
Merge branch 'dev' into fix/universal-middleware
Atinux Jan 7, 2020
d470422
Merge branch 'dev' into fix/universal-middleware
pi0 Jan 10, 2020
604fc14
Merge branch 'dev' into fix/universal-middleware
jsonpoindexter Feb 20, 2020
3c78ffa
Merge branch 'dev' into fix/universal-middleware
jsonpoindexter Mar 7, 2020
c9263b7
Merge branch 'dev' into fix/universal-middleware
pi0 Mar 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/vue-app/template/client.js
View file
Open in desktop
Expand Up @@ -818,8 +818,8 @@ function addHotReload ($component, depth) {
router.beforeEach(loadAsyncComponents.bind(_app))
router.beforeEach(render.bind(_app))

// If page already is server rendered
if (NUXT.serverRendered) {
// If page already is server rendered and it was done on the same route path as client side render
if (NUXT.serverRendered && NUXT.routePath === _app.context.route.path) {
mount()
return
}
Expand Down
4 changes: 3 additions & 1 deletion packages/vue-app/template/server.js
View file
Open in desktop
Expand Up @@ -72,10 +72,12 @@ export default async (ssrContext) => {
// Used for beforeNuxtRender({ Components, nuxtState })
ssrContext.beforeRenderFns = []
// Nuxt object (window{{globals.context}}, defaults to window.__NUXT__)
ssrContext.nuxt = { <% if (features.layouts) { %>layout: 'default', <% } %>data: [], <% if (features.fetch) { %>fetch: [], <% } %>error: null<%= (store ? ', state: null' : '') %>, serverRendered: true }
ssrContext.nuxt = { <% if (features.layouts) { %>layout: 'default', <% } %>data: [], <% if (features.fetch) { %>fetch: [], <% } %>error: null<%= (store ? ', state: null' : '') %>, serverRendered: true, routePath: '' }
// Create the app definition and the instance (created for each request)
const { app, router<%= (store ? ', store' : '') %> } = await createApp(ssrContext)
const _app = new Vue(app)
// Add ssr route path to nuxt context so we can account for page navigation between ssr and csr
ssrContext.nuxt.routePath = app.context.route.path

<% if (features.meta) { %>
// Add meta infos (used in renderer.js)
Expand Down