Skip to content
This repository was archived by the owner on Apr 30, 2020. It is now read-only.

Commit 92d9dd3

Browse files
author
lepon01
committed
shuffle what i just pushed
1 parent 7ddbe43 commit 92d9dd3

File tree

1 file changed

+15
-14
lines changed

1 file changed

+15
-14
lines changed

server/middleware/renderer.js

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,22 +35,23 @@ export default (req, res, next) => {
3535
for (let i = 0; i < routes.length; i += 1) {
3636
const match = matchPath(req.baseUrl, routes[i]);
3737
const route = routes[i];
38-
if (match && route.component.serverFetch) {
39-
for (let j = 0; j < route.component.serverFetch.length; j += 1) {
40-
const serverFetch = route.component.serverFetch[j];
41-
const payload = serverFetch.payload;
42-
43-
if (serverFetch.pass.includes('match')) {
44-
payload.match = match;
45-
}
46-
47-
if (serverFetch.pass.includes('pathname')) {
48-
payload.pathname = req.baseUrl;
38+
if (match) {
39+
if (route.component.serverFetch) {
40+
for (let j = 0; j < route.component.serverFetch.length; j += 1) {
41+
const serverFetch = route.component.serverFetch[j];
42+
const payload = serverFetch.payload;
43+
44+
if (serverFetch.pass.includes('match')) {
45+
payload.match = match;
46+
}
47+
48+
if (serverFetch.pass.includes('pathname')) {
49+
payload.pathname = req.baseUrl;
50+
}
51+
52+
promises.push(store.dispatch(serverFetch.function(payload)));
4953
}
50-
51-
promises.push(store.dispatch(serverFetch.function(payload)));
5254
}
53-
// Stop looking for matches
5455
break;
5556
}
5657
}

0 commit comments

Comments
 (0)