Skip to content

Commit

Permalink
fix: eslint issues
Browse files Browse the repository at this point in the history
  • Loading branch information
aam229 committed Jan 20, 2016
1 parent c045ac8 commit f92282d
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 15 deletions.
2 changes: 1 addition & 1 deletion bin/merge-configs.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ module.exports = (userConfig) => {
} else {
combinedWebpackConfig.resolve.alias.middleware = path.resolve(__dirname, '../lib/helpers/empty.js');
}
if(universalReduxConfig.rootComponent){
if (universalReduxConfig.rootComponent) {
combinedWebpackConfig.resolve.alias.rootComponent = universalReduxConfig.rootComponent;
} else {
combinedWebpackConfig.resolve.alias.rootComponent = path.resolve(__dirname, '../lib/helpers/rootComponent.js');
Expand Down
2 changes: 1 addition & 1 deletion config/universal-redux.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ module.exports = (projectRoot, sourceRoot) => {
/*
// The root component factory file. Optional. Will be added to Webpack aliases.
*/
//rootComponent: sourceRoot + '/rootComponent.js',
// rootComponent: sourceRoot + '/rootComponent.js',

html: {
/*
Expand Down
8 changes: 4 additions & 4 deletions src/client.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ const store = createStore(middleware, history, window.__data);
const routes = getRoutes(store);
const devComponent = renderDevtools();

//There is probably no need to be asynchronous here
// There is probably no need to be asynchronous here
createRootComponentForClient(store, {routes, history})
.then(({root, component}) => {
.then(({root}) => {
ReactDOM.render(root, dest);

if (process.env.NODE_ENV !== 'production') {
Expand All @@ -32,8 +32,8 @@ createRootComponentForClient(store, {routes, history})
return devComponent ? createRootComponentForClient(store, {routes, history, devComponent}) : {};
})
.then(({root}) => {
if(root) ReactDOM.render(root, dest);
if (root) ReactDOM.render(root, dest);
})
.catch((err) => {
console.error(err, err.stack);
});
});
4 changes: 1 addition & 3 deletions src/client/devtools.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import React from 'react';
import ReactDOM from 'react-dom';
import { Provider } from 'react-redux';
import { compose as _compose, applyMiddleware } from 'redux';
import { createDevTools, persistState } from 'redux-devtools';

Expand Down Expand Up @@ -37,6 +35,6 @@ export function listenToRouter(routerMiddleware, store) {
export function render() {
if (__DEVTOOLS__ && !window.devToolsExtension) {
const Tools = __DEVTOOLS_IS_VISIBLE__ ? DevTools : InvisibleDevTools;
return <Tools />
return <Tools />;
}
}
6 changes: 2 additions & 4 deletions src/helpers/rootComponent.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import { Provider } from 'react-redux';
import { RouterContext, Router } from 'react-router';

export function createForServer(store, renderProps){
export function createForServer(store, renderProps) {
const root = (
<Provider store={store} key="provider">
<div>
Expand All @@ -13,7 +13,7 @@ export function createForServer(store, renderProps){
return Promise.resolve({root});
}

export function createForClient(store, {routes, history, devComponent}){
export function createForClient(store, {routes, history, devComponent}) {
const component = (
<Router history={history}>
{routes}
Expand All @@ -30,5 +30,3 @@ export function createForClient(store, {routes, history, devComponent}){

return Promise.resolve({root});
}


3 changes: 1 addition & 2 deletions src/server/renderer.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import path from 'path';
import React from 'react';
import { match } from 'react-router';
import PrettyError from 'pretty-error';
import createMemoryHistory from 'react-router/lib/createMemoryHistory';
Expand All @@ -18,7 +17,7 @@ export default (projectConfig, projectToolsConfig) => {
const tools = getTools(projectConfig, projectToolsConfig);
const config = configure(projectConfig);
const getRoutes = require(path.resolve(config.routes)).default;
const rootComponent = require(config.rootComponent ? path.resolve(config.rootComponent) : '../helpers/rootComponent') ;
const rootComponent = require(config.rootComponent ? path.resolve(config.rootComponent) : '../helpers/rootComponent');
const pretty = new PrettyError();

return (req, res) => {
Expand Down

0 comments on commit f92282d

Please sign in to comment.