From 1b03e6a4ced74261f4a652ae4928b45f881e127e Mon Sep 17 00:00:00 2001 From: tkostuch Date: Fri, 21 Feb 2020 08:53:47 +0100 Subject: [PATCH 1/2] add server context to AsyncDataLoader --- core/server-entry.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/server-entry.ts b/core/server-entry.ts index 5a03915503..5cae194415 100755 --- a/core/server-entry.ts +++ b/core/server-entry.ts @@ -31,7 +31,7 @@ function _ssrHydrateSubcomponents (components, store, router, resolve, reject, a return Promise.resolve(null) } })).then(() => { - AsyncDataLoader.flush({ store, route: router.currentRoute, context: null } /* AsyncDataLoaderActionContext */).then((r) => { + AsyncDataLoader.flush({ store, route: router.currentRoute, context } /* AsyncDataLoaderActionContext */).then((r) => { if (buildTimeConfig.ssr.useInitialStateFilter) { context.state = omit(store.state, config.ssr.initialStateFilter) } else { From ca700f5edb5d97d5c0b43c9f5c004456b8ddede1 Mon Sep 17 00:00:00 2001 From: tkostuch Date: Fri, 21 Feb 2020 09:01:38 +0100 Subject: [PATCH 2/2] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 78f4925132..4e2e255bf0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Added - Add lazy create cart token - @gibkigonzo (#3994) +- Add server context to async data loader - @gibkigonzo (pr#4113) ### Fixed - Fix low-quality images styles - @przspa (#3906)