Merge pull request #4113 from gibkigonzo/bugfix/add-server-context-toAsyncDataLoader

andrzejewsky · web-flow · commit b3cb5eeb652a · 2020-02-21T14:47:17.000+01:00
add server context to async data loader
diff --git 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)
diff --git 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 {

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ function _ssrHydrateSubcomponents (components, store, router, resolve, reject, a`
`31`	`31`	`return Promise.resolve(null)`
`32`	`32`	`}`
`33`	`33`	`})).then(() => {`
`34`		`- AsyncDataLoader.flush({ store, route: router.currentRoute, context: null } /* AsyncDataLoaderActionContext */).then((r) => {`
	`34`	`+ AsyncDataLoader.flush({ store, route: router.currentRoute, context } /* AsyncDataLoaderActionContext */).then((r) => {`
`35`	`35`	`if (buildTimeConfig.ssr.useInitialStateFilter) {`
`36`	`36`	`context.state = omit(store.state, config.ssr.initialStateFilter)`
`37`	`37`	`} else {`