From d81693435d9107cb8570f389b3e6eca834a40ea0 Mon Sep 17 00:00:00 2001 From: tkostuch Date: Fri, 21 Feb 2020 09:02:44 +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 18fc502220..561adbb6bc 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) => { context.state = store.state if (buildTimeConfig.server.dynamicConfigReload) { const excludeFromConfig = buildTimeConfig.server.dynamicConfigExclude From 440d24338559bcabb88ca4e00d28635d7559e1fb Mon Sep 17 00:00:00 2001 From: tkostuch Date: Fri, 21 Feb 2020 09:03:17 +0100 Subject: [PATCH 2/2] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e68f0ad4c0..ef970a61ca 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 `isBackRoute` that informs if user returns to route, skip loading products for category if he does - @gibkigonzo (issue#4066) +- Add server context to async data loader - @gibkigonzo (pr#4113) ### Changed / Improved - optimizations - improved prefetch strategy - @gibkigonzo (#4080)