remove fetchAllData pending #16 resolution

bdefore · Dec 26, 2015 · e254909 · e254909
1 parent ee588c0
commit e254909
Showing 1 changed file with 10 additions and 29 deletions.
diff --git a/src/server.js b/src/server.js
@@ -111,36 +111,17 @@ function setupRenderer() {
         res.status(500);
         hydrateOnClient();
       } else {
-        // fetch and render:
-        try {
-          fetchAllData(
-            renderProps.components,
-            store.getState, store.dispatch,
-            renderProps.location,
-            renderProps.params
-          ).then(() => {
-            // const component = (
-            //   <Provider store={store} key="provider">
-            //     <RoutingContext {...renderProps}/>
-            //   </Provider>
-            // );
-            const component = (
-              <Provider store={store} key="provider">
-                <RoutingContext />
-              </Provider>
-            );
-
-            const status = getStatusFromRoutes(renderProps.routes);
-            if (status) {
-              res.status(status);
-            }
-            res.send('<!doctype html>\n' + ReactDOM.renderToString(<CustomHtml assets={tools.assets()} component={component} store={store} headers={res._headers} />));
-          });
-        } catch (err) {
-          console.error('DATA FETCHING ERROR:', pretty.render(err));
-          res.status(500);
-          hydrateOnClient();
+        const component = (
+          <Provider store={store} key="provider">
+            <RoutingContext {...renderProps}/>
+          </Provider>
+        );
+
+        const status = getStatusFromRoutes(renderProps.routes);
+        if (status) {
+          res.status(status);
         }
+        res.send('<!doctype html>\n' + ReactDOM.renderToString(<CustomHtml assets={tools.assets()} component={component} store={store} headers={res._headers} />));
       }
     });
   });